From: Peter Eisentraut <peter_e@gmx.net>
Date: Mon, 13 Sep 2004 12:35:18 +0000 (+0000)
Subject: Translation updates
X-Git-Tag: REL8_0_0BETA3~84
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=95c034e311921bdf9e009e40dea53e42926eedcc;p=postgresql

Translation updates
---

diff --git a/src/backend/po/zh_TW.po b/src/backend/po/zh_TW.po
index da32c8381b..3c1b1fdeee 100644
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.5\n"
 "POT-Creation-Date: 2004-08-04 01:34-0300\n"
-"PO-Revision-Date: 2004-08-06 00:56+0800\n"
+"PO-Revision-Date: 2004-08-18 12:15+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -424,7 +424,7 @@ msgstr "刪除交易日誌檔\"%s\""
 #: access/transam/xlog.c:2176
 #, c-format
 msgid "could not read transaction log directory \"%s\": %m"
-msgstr ""
+msgstr "無法讀取交易記錄目錄 \"%s\": %m"
 
 #: access/transam/xlog.c:2251
 #, c-format
@@ -465,12 +465,12 @@ msgstr "記錄長度 %u 於 %X/%X 太長"
 #: access/transam/xlog.c:2471
 #, c-format
 msgid "invalid resource manager ID %u at %X/%X"
-msgstr ""
+msgstr "無效的資源管理器 ID %u 於 %X/%X"
 
 #: access/transam/xlog.c:2503
 #, c-format
 msgid "could not read from log file %u, segment %u, offset %u: %m"
-msgstr ""
+msgstr "無法讀取日誌檔 %u，區段 %u，偏移位置 %u：%m"
 
 #: access/transam/xlog.c:2512
 #, c-format
@@ -495,12 +495,12 @@ msgstr ""
 #: access/transam/xlog.c:2618
 #: access/transam/xlog.c:2626
 msgid "WAL file is from different system"
-msgstr ""
+msgstr "WAL 檔是來自不同系統"
 
 #: access/transam/xlog.c:2619
 #, c-format
 msgid "WAL file SYSID is %s, pg_control SYSID is %s"
-msgstr ""
+msgstr "WAL 檔 SYSID 為 %s，pg_control SYSID 為 %s"
 
 #: access/transam/xlog.c:2627
 msgid "Incorrect XLOG_SEG_SIZE in page header."
@@ -509,12 +509,12 @@ msgstr "page header中的XLOG_SEG_SIZE不正確"
 #: access/transam/xlog.c:2636
 #, c-format
 msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u"
-msgstr ""
+msgstr "非預期的pageaddr %X/%X於日誌檔 %u，區段 %u，偏移位置 %u"
 
 #: access/transam/xlog.c:2648
 #, c-format
 msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u"
-msgstr ""
+msgstr "非預期的timeline ID %u於日誌檔 %u，區段 %u，偏移位置 %u"
 
 #: access/transam/xlog.c:2666
 #, c-format
@@ -535,7 +535,7 @@ msgstr "歷史記錄檔中有語法錯誤：%s"
 
 #: access/transam/xlog.c:2736
 msgid "Expected a numeric timeline ID."
-msgstr ""
+msgstr "預期一個數字timeline ID。"
 
 #: access/transam/xlog.c:2741
 #, c-format
@@ -580,7 +580,7 @@ msgstr "不合法的LC_CTYPE設定"
 
 #: access/transam/xlog.c:3084
 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one"
-msgstr ""
+msgstr "sizeof(ControlFileData) 大於 BLCKSZ; 修正其中一項"
 
 #: access/transam/xlog.c:3094
 #, c-format
@@ -1018,14 +1018,12 @@ msgstr "無法fdatasync日誌檔 %u，區段 %u：%m"
 
 #: access/transam/xlog.c:5081
 #: access/transam/xlog.c:5178
-#, fuzzy
 msgid "must be superuser to run a backup"
-msgstr "只有管理者能建立使用者"
+msgstr "只有管理者能執行備份"
 
 #: access/transam/xlog.c:5116
-#, fuzzy
 msgid "a backup is already in progress"
-msgstr "已經有交易在執行中"
+msgstr "已有備份動作正在進行"
 
 #: access/transam/xlog.c:5117
 #, c-format
@@ -1034,19 +1032,18 @@ msgstr "如果您確定沒有備份動作正在進行，移除檔案 \"%s\" 並
 
 #: access/transam/xlog.c:5135
 #: access/transam/xlog.c:5248
-#, fuzzy, c-format
+#, c-format
 msgid "could not write file \"%s\": %m"
-msgstr "無法寫入檔案\"%s\"：%m"
+msgstr "無法寫入檔案 \"%s\": %m"
 
 #: access/transam/xlog.c:5213
-#, fuzzy
 msgid "a backup is not in progress"
-msgstr "沒有執行中的交易"
+msgstr "有一個備份動作不在運行"
 
 #: access/transam/xlog.c:5224
-#, fuzzy, c-format
+#, c-format
 msgid "invalid data in file \"%s\""
-msgstr "歷史記錄檔\"%s\"中有無效資料"
+msgstr "歷史記錄檔 \"%s\" 中有無效資料"
 
 #: bootstrap/bootstrap.c:302
 #: postmaster/postmaster.c:494
@@ -1265,7 +1262,7 @@ msgstr ""
 #: catalog/aclchk.c:245
 #, c-format
 msgid "invalid privilege type %s for table"
-msgstr ""
+msgstr "無效的 table 權限型別 %s"
 
 #: catalog/aclchk.c:333
 #: catalog/aclchk.c:491
@@ -1306,7 +1303,7 @@ msgstr "只能取消部份權限"
 #: catalog/aclchk.c:413
 #, c-format
 msgid "invalid privilege type %s for database"
-msgstr ""
+msgstr "無效的 database 權限型別 %s"
 
 #: catalog/aclchk.c:450
 #: commands/comment.c:458
@@ -1324,12 +1321,12 @@ msgstr "資料庫\"%s\"不存在"
 #: catalog/aclchk.c:571
 #, c-format
 msgid "invalid privilege type %s for function"
-msgstr ""
+msgstr "無效的 function 權限型別 %s"
 
 #: catalog/aclchk.c:725
 #, c-format
 msgid "invalid privilege type %s for language"
-msgstr ""
+msgstr "無效的 language 權限型別 %s"
 
 #: catalog/aclchk.c:757
 #: commands/comment.c:1000
@@ -1349,7 +1346,7 @@ msgstr "語言\"%s\"不受信任"
 #: catalog/aclchk.c:887
 #, c-format
 msgid "invalid privilege type %s for schema"
-msgstr ""
+msgstr "無效的 schema 權限型別 %s"
 
 #: catalog/aclchk.c:919
 #: catalog/namespace.c:255
@@ -1368,7 +1365,7 @@ msgstr "schema \"%s\"不存在"
 #: catalog/aclchk.c:1041
 #, c-format
 msgid "invalid privilege type %s for tablespace"
-msgstr ""
+msgstr "無效的 tablespace 權限型別 %s"
 
 #: catalog/aclchk.c:1078
 #: commands/dbcommands.c:275
@@ -1556,7 +1553,7 @@ msgstr "OID為 %u 的conversion不存在"
 
 #: catalog/pg_aggregate.c:80
 msgid "cannot determine transition data type"
-msgstr ""
+msgstr "無法判斷交易資料型別"
 
 #: catalog/pg_aggregate.c:81
 msgid "An aggregate using \"anyarray\" or \"anyelement\" as transition type must have one of them as its base type."
@@ -1733,7 +1730,7 @@ msgstr "共享的索引 \"%s\" 只能在 stand-alone 模式下重新索引"
 #: catalog/namespace.c:228
 #, c-format
 msgid "cross-database references are not implemented: \"%s.%s.%s\""
-msgstr ""
+msgstr "跨資料庫參照尚未實做：\"%s.%s.%s\""
 
 #: catalog/namespace.c:195
 #, c-format
@@ -1904,15 +1901,15 @@ msgstr ""
 #: catalog/pg_proc.c:394
 #: catalog/pg_proc.c:425
 msgid "Function's final statement must be a SELECT."
-msgstr ""
+msgstr "函式最後的敘述必須是SELECT。"
 
 #: catalog/pg_proc.c:415
 msgid "Function's final statement must not be a SELECT."
-msgstr ""
+msgstr "函式最後的敘述不能是SELECT。"
 
 #: catalog/pg_proc.c:449
 msgid "Final SELECT must return exactly one column."
-msgstr ""
+msgstr "最後的SELECT只能傳回一個欄位。"
 
 #: catalog/pg_proc.c:457
 #, c-format
@@ -1921,16 +1918,16 @@ msgstr "實際傳回型別是%s。"
 
 #: catalog/pg_proc.c:509
 msgid "Final SELECT returns too many columns."
-msgstr ""
+msgstr "最後的SELECT傳回過多欄位。"
 
 #: catalog/pg_proc.c:521
 #, c-format
 msgid "Final SELECT returns %s instead of %s at column %d."
-msgstr ""
+msgstr "最後的SELECT傳回 %s 而非 %s 於欄位 %d。"
 
 #: catalog/pg_proc.c:541
 msgid "Final SELECT returns too few columns."
-msgstr ""
+msgstr "最後的SELECT傳回欄位不足。"
 
 #: catalog/pg_proc.c:581
 #, c-format
@@ -2004,15 +2001,15 @@ msgstr ""
 
 #: commands/aggregatecmds.c:107
 msgid "aggregate basetype must be specified"
-msgstr ""
+msgstr "必須指定aggregate basetype"
 
 #: commands/aggregatecmds.c:111
 msgid "aggregate stype must be specified"
-msgstr ""
+msgstr "必須指定aggregate stype"
 
 #: commands/aggregatecmds.c:115
 msgid "aggregate sfunc must be specified"
-msgstr ""
+msgstr "必須指定aggregate sfunc"
 
 #: commands/aggregatecmds.c:138
 #, c-format
@@ -2046,12 +2043,12 @@ msgstr "只有管理者能修改擁有者"
 #: commands/analyze.c:153
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can analyze it"
-msgstr ""
+msgstr "忽略\"%s\" -- 只有資料表或資料庫擁有者能進行分析"
 
 #: commands/analyze.c:169
 #, c-format
 msgid "skipping \"%s\" --- cannot analyze indexes, views, or special system tables"
-msgstr ""
+msgstr "忽略\"%s\" -- 無法分析索引、view或特殊系統資料表"
 
 #: commands/analyze.c:199
 #, c-format
@@ -2657,22 +2654,24 @@ msgstr ""
 #: commands/copy.c:2047
 #: commands/copy.c:2065
 msgid "literal carriage return found in data"
-msgstr ""
+msgstr "資料裡含有歸位(carriage return)實量"
 
 #: commands/copy.c:2048
 #: commands/copy.c:2066
 msgid "Use \"\\r\" to represent carriage return."
-msgstr ""
+msgstr "使用 \"\\r\" 表示歸位(carriage return)。"
 
 #: commands/copy.c:2083
 msgid "literal newline found in data"
-msgstr ""
+msgstr "資料裡含有換行(newline)實量"
 
 #: commands/copy.c:2084
 msgid ""
 "Use \"\\n"
 "\" to represent newline."
 msgstr ""
+"使用 \"\\n"
+"\" 表示換行(newline)。"
 
 #: commands/copy.c:2104
 #: commands/copy.c:2120
@@ -3085,7 +3084,7 @@ msgstr "資料表\"%s\"沒有索引"
 
 #: commands/indexcmds.c:981
 msgid "can only reindex the currently open database"
-msgstr ""
+msgstr "只能重新索引目前開啟的資料庫"
 
 #: commands/indexcmds.c:1064
 #, c-format
@@ -3248,27 +3247,27 @@ msgstr "記憶體用盡"
 
 #: commands/sequence.c:937
 msgid "INCREMENT must not be zero"
-msgstr ""
+msgstr "INCREMENT 不可為 0"
 
 #: commands/sequence.c:987
 #, c-format
 msgid "MINVALUE (%s) must be less than MAXVALUE (%s)"
-msgstr ""
+msgstr "MINVALUE (%s) 必須小於 MAXVALUE (%s)"
 
 #: commands/sequence.c:1018
 #, c-format
 msgid "START value (%s) can't be less than MINVALUE (%s)"
-msgstr ""
+msgstr "START 值 (%s) 不可小於 MINVALUE (%s)"
 
 #: commands/sequence.c:1030
 #, c-format
 msgid "START value (%s) can't be greater than MAXVALUE (%s)"
-msgstr ""
+msgstr "START 值 (%s) 不可大於 MAXVALUE (%s)"
 
 #: commands/sequence.c:1045
 #, c-format
 msgid "CACHE (%s) must be greater than zero"
-msgstr ""
+msgstr "CACHE (%s) 必須大於 0"
 
 #: commands/proclang.c:64
 msgid "must be superuser to create procedural language"
@@ -3302,7 +3301,7 @@ msgstr ""
 #: commands/user.c:880
 #: commands/user.c:1015
 msgid "permission denied"
-msgstr ""
+msgstr "權限不足"
 
 #: commands/schemacmds.c:87
 #, c-format
@@ -3341,7 +3340,7 @@ msgstr ""
 #: tcop/utility.c:217
 #, c-format
 msgid "permission denied: \"%s\" is a system catalog"
-msgstr ""
+msgstr "權限不足: \"%s\" 是系統 catalog"
 
 #: commands/tablecmds.c:555
 #, c-format
@@ -3743,7 +3742,7 @@ msgstr ""
 #: commands/typecmds.c:173
 #, c-format
 msgid "array element type cannot be %s"
-msgstr ""
+msgstr "陣列元素型別不可為 %s"
 
 #: commands/typecmds.c:206
 #, c-format
@@ -3897,7 +3896,7 @@ msgstr ""
 #: commands/user.c:400
 #, c-format
 msgid "could not write to temporary file \"%s\": %m"
-msgstr ""
+msgstr "無法寫入暫存檔\"%s\"：%m"
 
 #: commands/user.c:207
 #, c-format
@@ -3913,7 +3912,7 @@ msgstr "不合法的使用者名稱\"%s\""
 #: commands/user.c:376
 #, c-format
 msgid "invalid user password \"%s\""
-msgstr ""
+msgstr "無效的使用者密碼 \"%s\""
 
 #: commands/user.c:635
 msgid "user ID must be positive"
@@ -3960,7 +3959,7 @@ msgstr "不能刪除目前的使用者"
 
 #: commands/user.c:1112
 msgid "session user cannot be dropped"
-msgstr ""
+msgstr "不能刪除session使用者"
 
 #: commands/user.c:1139
 #, c-format
@@ -3974,11 +3973,11 @@ msgstr "使用者擁有資料庫\"%s\"。"
 
 #: commands/user.c:1241
 msgid "session user may not be renamed"
-msgstr ""
+msgstr "不能重新命名session使用者"
 
 #: commands/user.c:1255
 msgid "must be superuser to rename users"
-msgstr ""
+msgstr "只有管理者能重新命名使用者"
 
 #: commands/user.c:1274
 msgid "MD5 password cleared because of user rename"
@@ -4081,18 +4080,18 @@ msgstr ""
 #: commands/vacuum.c:927
 #, c-format
 msgid "skipping \"%s\" --- only table or database owner can vacuum it"
-msgstr ""
+msgstr "忽略\"%s\" --- 只有資料表或資料庫擁有者能進行重整"
 
 #: commands/vacuum.c:943
 #, c-format
 msgid "skipping \"%s\" --- cannot vacuum indexes, views, or special system tables"
-msgstr ""
+msgstr "忽略\"%s\" --- 無法重整索引、view或特殊系統資料表"
 
 #: commands/vacuum.c:1166
 #: commands/vacuumlazy.c:205
 #, c-format
 msgid "vacuuming \"%s.%s\""
-msgstr ""
+msgstr "重整\"%s.%s\""
 
 #: commands/vacuum.c:1208
 #: commands/vacuumlazy.c:263
@@ -4141,7 +4140,7 @@ msgstr ""
 #: tcop/postgres.c:3295
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
 #: commands/vacuum.c:2779
 #: commands/vacuumlazy.c:767
@@ -4174,7 +4173,7 @@ msgstr ""
 #: commands/vacuum.c:2890
 #: commands/vacuum.c:2959
 msgid "Rebuild the index with REINDEX."
-msgstr ""
+msgstr "以 REINDEX 重建索引。"
 
 #: commands/vacuum.c:2940
 #: commands/vacuumlazy.c:661
@@ -4219,7 +4218,7 @@ msgstr ""
 #: commands/variable.c:398
 #, c-format
 msgid "unrecognized time zone name: \"%s\""
-msgstr ""
+msgstr "無法識別的時區名稱: \"%s\""
 
 #: commands/variable.c:406
 #, c-format
@@ -4246,12 +4245,12 @@ msgstr ""
 
 #: commands/view.c:89
 msgid "view must have at least one column"
-msgstr ""
+msgstr "view至少要有一個欄位"
 
 #: commands/view.c:170
 #: commands/view.c:182
 msgid "cannot change number of columns in view"
-msgstr ""
+msgstr "不能變更view的欄位數"
 
 #: commands/view.c:187
 #, c-format
@@ -4261,7 +4260,7 @@ msgstr "無法修改view欄位\"%s\"的名稱"
 #: commands/view.c:194
 #, c-format
 msgid "cannot change data type of view column \"%s\""
-msgstr ""
+msgstr "不能變更view欄位\"%s\"的資料型別"
 
 #: commands/tablespace.c:142
 #, c-format
@@ -4293,18 +4292,18 @@ msgstr ""
 
 #: commands/tablespace.c:231
 msgid "tablespace location must be an absolute path"
-msgstr ""
+msgstr "tablespace的位置必須是絕對路徑"
 
 #: commands/tablespace.c:241
 #, c-format
 msgid "tablespace location \"%s\" is too long"
-msgstr ""
+msgstr "tablespace位置\"%s\"過長"
 
 #: commands/tablespace.c:251
 #: commands/tablespace.c:722
 #, c-format
 msgid "unacceptable tablespace name \"%s\""
-msgstr ""
+msgstr "無法接受tablespace名稱\"%s\""
 
 #: commands/tablespace.c:253
 #: commands/tablespace.c:723
@@ -4315,7 +4314,7 @@ msgstr ""
 #: commands/tablespace.c:735
 #, c-format
 msgid "tablespace \"%s\" already exists"
-msgstr ""
+msgstr "tablespace \"%s\"已經存在"
 
 #: commands/tablespace.c:302
 #, c-format
@@ -4539,7 +4538,7 @@ msgstr ""
 #: executor/spi.c:1497
 #, c-format
 msgid "SQL query \"%s\""
-msgstr ""
+msgstr "SQL查詢\"%s\""
 
 #: executor/nodeMergejoin.c:1474
 msgid "RIGHT JOIN is only supported with merge-joinable join conditions"
@@ -4567,16 +4566,16 @@ msgstr ""
 
 #: libpq/be-fsstubs.c:378
 msgid "must be superuser to use server-side lo_import()"
-msgstr ""
+msgstr "必須是管理者才能使用伺服端 lo_import()"
 
 #: libpq/be-fsstubs.c:379
 msgid "Anyone can use the client-side lo_import() provided by libpq."
-msgstr ""
+msgstr "任何人都能使用 libpq 提供的客戶端 lo_import()。"
 
 #: libpq/be-fsstubs.c:394
 #, c-format
 msgid "could not open server file \"%s\": %m"
-msgstr ""
+msgstr "無法開啟伺服器檔案 \"%s\": %m"
 
 #: libpq/be-fsstubs.c:415
 #, c-format
@@ -4585,11 +4584,11 @@ msgstr "無法讀取伺服器檔案\"%s\"：%m"
 
 #: libpq/be-fsstubs.c:445
 msgid "must be superuser to use server-side lo_export()"
-msgstr ""
+msgstr "必須是管理者才能使用伺服端 lo_export()"
 
 #: libpq/be-fsstubs.c:446
 msgid "Anyone can use the client-side lo_export() provided by libpq."
-msgstr ""
+msgstr "任何人都能使用 libpq 提供的客戶端 lo_export()。"
 
 #: libpq/be-fsstubs.c:472
 #, c-format
@@ -4604,7 +4603,7 @@ msgstr "無法寫入伺服器檔案\"%s\"：%m"
 #: libpq/auth.c:113
 #, c-format
 msgid "Kerberos error: %s"
-msgstr ""
+msgstr "Kerberos 錯誤: %s"
 
 #: libpq/auth.c:119
 #, c-format
@@ -4619,49 +4618,49 @@ msgstr ""
 
 #: libpq/auth.c:140
 msgid "Kerberos 4 not implemented on this server"
-msgstr ""
+msgstr "這個伺服器並未實作 Kerberos 4"
 
 #: libpq/auth.c:201
 #, c-format
 msgid "Kerberos initialization returned error %d"
-msgstr ""
+msgstr "Kerberos 初始化傳回錯誤 %d"
 
 #: libpq/auth.c:211
 #, c-format
 msgid "Kerberos keytab resolving returned error %d"
-msgstr ""
+msgstr "Kerberos keytab解析傳回錯誤%d"
 
 #: libpq/auth.c:224
 #, c-format
 msgid "Kerberos sname_to_principal(\"%s\") returned error %d"
-msgstr ""
+msgstr "Kerberos sname_to_principal(\"%s\")傳回錯誤%d"
 
 #: libpq/auth.c:269
 #, c-format
 msgid "Kerberos recvauth returned error %d"
-msgstr ""
+msgstr "Kerberos recvauth傳回錯誤%d"
 
 #: libpq/auth.c:294
 #, c-format
 msgid "Kerberos unparse_name returned error %d"
-msgstr ""
+msgstr "Kerberos unparse_name傳回錯誤%d"
 
 #: libpq/auth.c:327
 msgid "Kerberos 5 not implemented on this server"
-msgstr ""
+msgstr "這個伺服器並未實作 Kerberos 5"
 
 #: libpq/auth.c:394
 #, c-format
 msgid "%s authentication failed for user \"%s\""
-msgstr ""
+msgstr "%s驗證失敗，使用者\"%s\""
 
 #: libpq/auth.c:418
 msgid "missing or erroneous pg_hba.conf file"
-msgstr ""
+msgstr "找不到pg_hba.conf或內容不正確"
 
 #: libpq/auth.c:419
 msgid "See server log for details."
-msgstr ""
+msgstr "查看伺服器記錄檔以獲得詳細資料。"
 
 #: libpq/auth.c:445
 #, c-format
@@ -4670,11 +4669,11 @@ msgstr ""
 
 #: libpq/auth.c:447
 msgid "SSL on"
-msgstr ""
+msgstr "SSL 開啟"
 
 #: libpq/auth.c:447
 msgid "SSL off"
-msgstr ""
+msgstr "SSL 關閉"
 
 #: libpq/auth.c:451
 #, c-format
@@ -4683,7 +4682,7 @@ msgstr ""
 
 #: libpq/auth.c:463
 msgid "Kerberos 4 only supports IPv4 connections"
-msgstr ""
+msgstr "Kerberos 4 只支援 IPv4 連線"
 
 #: libpq/auth.c:494
 #, c-format
@@ -4727,7 +4726,7 @@ msgstr "pam_authenticate失敗：%s"
 #: libpq/auth.c:722
 #, c-format
 msgid "pam_acct_mgmt failed: %s"
-msgstr ""
+msgstr "pam_acct_mgmt失敗：%s"
 
 #: libpq/auth.c:733
 #, c-format
@@ -4741,34 +4740,34 @@ msgstr ""
 
 #: libpq/auth.c:799
 msgid "invalid password packet size"
-msgstr ""
+msgstr "無效的密碼封包大小"
 
 #: libpq/auth.c:803
 msgid "received password packet"
-msgstr ""
+msgstr "已接收密碼封包"
 
 #: libpq/be-secure.c:274
 #: libpq/be-secure.c:359
 #, c-format
 msgid "SSL SYSCALL error: %m"
-msgstr ""
+msgstr "SSL SYSCALL 錯誤: %m"
 
 #: libpq/be-secure.c:279
 #: libpq/be-secure.c:364
 msgid "SSL SYSCALL error: EOF detected"
-msgstr ""
+msgstr "SSL SYSCALL 錯誤: 偵測到 EOF"
 
 #: libpq/be-secure.c:287
 #: libpq/be-secure.c:372
 #, c-format
 msgid "SSL error: %s"
-msgstr ""
+msgstr "SSL 錯誤: %s"
 
 #: libpq/be-secure.c:296
 #: libpq/be-secure.c:381
 #, c-format
 msgid "unrecognized SSL error code %d"
-msgstr ""
+msgstr "無法識別的 SSL 錯誤碼 %d"
 
 #: libpq/be-secure.c:327
 #: libpq/be-secure.c:331
@@ -4890,22 +4889,22 @@ msgstr ""
 
 #: libpq/hba.c:1151
 msgid "cannot use Ident authentication without usermap field"
-msgstr ""
+msgstr "無法使用Ident驗證，沒有usermap欄位"
 
 #: libpq/hba.c:1206
 #, c-format
 msgid "could not open Ident usermap file \"%s\": %m"
-msgstr ""
+msgstr "無法開啟Ident usermap檔\"%s\"：%m"
 
 #: libpq/hba.c:1383
 #, c-format
 msgid "could not create socket for Ident connection: %m"
-msgstr ""
+msgstr "無法為Ident連線建立socket：%m"
 
 #: libpq/hba.c:1399
 #, c-format
 msgid "could not bind to local address \"%s\": %m"
-msgstr ""
+msgstr "無法bind至local位址\"%s\"：%m"
 
 #: libpq/hba.c:1411
 #, c-format
@@ -4939,7 +4938,7 @@ msgstr ""
 #: libpq/hba.c:1601
 #, c-format
 msgid "local user with ID %d does not exist"
-msgstr ""
+msgstr "本機使用者 ID %d 的使用者並不存在"
 
 #: libpq/hba.c:1613
 msgid "Ident authentication is not supported on local connections on this platform"
@@ -4962,20 +4961,20 @@ msgstr ""
 
 #: libpq/pqcomm.c:286
 msgid "IPv4"
-msgstr ""
+msgstr "IPv4"
 
 #: libpq/pqcomm.c:290
 msgid "IPv6"
-msgstr ""
+msgstr "IPv6"
 
 #: libpq/pqcomm.c:295
 msgid "Unix"
-msgstr ""
+msgstr "Unix"
 
 #: libpq/pqcomm.c:300
 #, c-format
 msgid "unrecognized address family %d"
-msgstr ""
+msgstr "無法識別的address family %d"
 
 #  translator: %s is IPv4, IPv6, or Unix
 #. translator: %s is IPv4, IPv6, or Unix
@@ -4994,11 +4993,11 @@ msgstr "setsockopt(SO_REUSEADDR)失敗：%m"
 msgid "setsockopt(IPV6_V6ONLY) failed: %m"
 msgstr "setsockopt(IPV6_V6ONLY)失敗：%m"
 
-#. translator: %s is IPv4, IPv6, or Unix
+#  translator: %s is IPv4, IPv6, or Unix
 #: libpq/pqcomm.c:356
 #, c-format
 msgid "could not bind %s socket: %m"
-msgstr ""
+msgstr "無法bind %s socket：%m"
 
 #: libpq/pqcomm.c:359
 #, c-format
@@ -5010,11 +5009,11 @@ msgstr ""
 msgid "Is another postmaster already running on port %d? If not, wait a few seconds and retry."
 msgstr ""
 
-#. translator: %s is IPv4, IPv6, or Unix
+#  translator: %s is IPv4, IPv6, or Unix
 #: libpq/pqcomm.c:396
 #, c-format
 msgid "could not listen on %s socket: %m"
-msgstr ""
+msgstr "無法傾聽%s socket：%m"
 
 #: libpq/pqcomm.c:486
 #, c-format
@@ -5024,17 +5023,17 @@ msgstr ""
 #: libpq/pqcomm.c:497
 #, c-format
 msgid "could not set permissions of file \"%s\": %m"
-msgstr ""
+msgstr "無法設定檔案 \"%s\" 的權限: %m"
 
 #: libpq/pqcomm.c:527
 #, c-format
 msgid "could not accept new connection: %m"
-msgstr ""
+msgstr "無法接受新連線: %m"
 
 #: libpq/pqcomm.c:679
 #, c-format
 msgid "could not receive data from client: %m"
-msgstr ""
+msgstr "無法由客戶端接收資料: %m"
 
 #: libpq/pqcomm.c:842
 msgid "unexpected EOF within message length word"
@@ -5120,17 +5119,17 @@ msgstr "%s：不合法的effective UID：%d\n"
 #: main/main.c:314
 #, c-format
 msgid "%s: could not determine user name (GetUserName failed)\n"
-msgstr ""
+msgstr "%s: 無法判斷使用者名稱 (GetUserName 失敗)\n"
 
 #: nodes/params.c:112
 #, c-format
 msgid "no value found for parameter \"%s\""
-msgstr ""
+msgstr "未發現參數 \"%s\" 的值"
 
 #: nodes/params.c:117
 #, c-format
 msgid "no value found for parameter %d"
-msgstr ""
+msgstr "未發現參數 %d 的值"
 
 #: optimizer/path/allpaths.c:224
 msgid "SELECT FOR UPDATE is not supported for inheritance queries"
@@ -5164,7 +5163,7 @@ msgstr ""
 
 #: optimizer/plan/planner.c:681
 msgid "SELECT FOR UPDATE is not allowed in subqueries"
-msgstr ""
+msgstr "子查詢不能使用SELECT FOR UPDATE"
 
 #: optimizer/util/clauses.c:2250
 #, c-format
@@ -5179,11 +5178,11 @@ msgstr ""
 #: gram.y:5128
 #: parser/parse_clause.c:420
 msgid "subquery in FROM must have an alias"
-msgstr ""
+msgstr "FROM中的子查詢要有別名"
 
 #: parser/parse_clause.c:443
 msgid "subquery in FROM may not have SELECT INTO"
-msgstr ""
+msgstr "FROM中的子查詢不能有SELECT INTO"
 
 #: parser/parse_clause.c:465
 msgid "subquery in FROM may not refer to other relations of same query level"
@@ -5239,19 +5238,19 @@ msgstr ""
 msgid "argument of %s must not contain aggregates"
 msgstr ""
 
-#. translator: %s is name of a SQL construct, eg LIMIT
+#  translator: %s is name of a SQL construct, eg LIMIT
 #: parser/parse_clause.c:1060
 #, c-format
 msgid "argument of %s must not contain subqueries"
 msgstr ""
 
-#. translator: first %s is name of a SQL construct, eg ORDER BY
+#  translator: first %s is name of a SQL construct, eg ORDER BY
 #: parser/parse_clause.c:1168
 #, c-format
 msgid "%s \"%s\" is ambiguous"
 msgstr ""
 
-#. translator: %s is name of a SQL construct, eg ORDER BY
+#  translator: %s is name of a SQL construct, eg ORDER BY
 #: parser/parse_clause.c:1190
 #, c-format
 msgid "non-integer constant in %s"
@@ -5306,12 +5305,12 @@ msgstr ""
 #: parser/analyze.c:1310
 #, c-format
 msgid "column \"%s\" appears twice in primary key constraint"
-msgstr ""
+msgstr "欄位\"%s\"在主鍵constraint出現兩次"
 
 #: parser/analyze.c:1315
 #, c-format
 msgid "column \"%s\" appears twice in unique constraint"
-msgstr ""
+msgstr "欄位\"%s\"在unique constraint出現兩次"
 
 #: parser/analyze.c:1498
 msgid "index expression may not return a set"
@@ -5386,7 +5385,7 @@ msgstr ""
 #: parser/analyze.c:2652
 #, c-format
 msgid "Expected %d parameters but got %d."
-msgstr ""
+msgstr "預期%d個參數，但是收到%d個。"
 
 #: parser/analyze.c:2667
 msgid "cannot use subquery in EXECUTE parameter"
@@ -5474,7 +5473,7 @@ msgstr ""
 #: parser/parse_expr.c:122
 #, c-format
 msgid "there is no parameter $%d"
-msgstr ""
+msgstr "並沒有參數 $%d"
 
 #: parser/analyze.c:3133
 #: tcop/postgres.c:1194
@@ -5936,19 +5935,19 @@ msgstr ""
 
 #: scan.l:312
 msgid "unterminated /* comment"
-msgstr ""
+msgstr "未結束的 /* 註解"
 
 #: scan.l:339
 msgid "unterminated bit string literal"
-msgstr ""
+msgstr "未結束的位元字串實量"
 
 #: scan.l:358
 msgid "unterminated hexadecimal string literal"
-msgstr ""
+msgstr "未結束的十六進位字串實量"
 
 #: scan.l:407
 msgid "unterminated quoted string"
-msgstr ""
+msgstr "未結束的引號字串"
 
 #: scan.l:441
 msgid "unterminated dollar-quoted string"
@@ -6186,7 +6185,7 @@ msgstr ""
 #: gram.y:8199
 #: y.tab.c:18948
 msgid "syntax error"
-msgstr ""
+msgstr "語法錯誤"
 
 #: y.tab.c:19062
 msgid "parser stack overflow"
@@ -6401,7 +6400,7 @@ msgstr ""
 
 #: postmaster/postmaster.c:969
 msgid "Permissions should be u=rwx (0700)."
-msgstr ""
+msgstr "權限必須是 u=rwx (0700)。"
 
 #: postmaster/postmaster.c:980
 #, c-format
@@ -6587,15 +6586,15 @@ msgstr ""
 
 #: postmaster/postmaster.c:1543
 msgid "the database system is starting up"
-msgstr ""
+msgstr "資料庫系統正在啟動"
 
 #: postmaster/postmaster.c:1548
 msgid "the database system is shutting down"
-msgstr ""
+msgstr "資料庫系統正在關閉"
 
 #: postmaster/postmaster.c:1553
 msgid "the database system is in recovery mode"
-msgstr ""
+msgstr "資料庫系統正在復原模式"
 
 #: postmaster/postmaster.c:1558
 #: storage/ipc/sinval.c:106
@@ -6634,7 +6633,7 @@ msgstr ""
 #: postmaster/postmaster.c:2028
 #: postmaster/postmaster.c:2184
 msgid "background writer process"
-msgstr ""
+msgstr "background writer 行程"
 
 #: postmaster/postmaster.c:2043
 msgid "archiver process"
@@ -6646,7 +6645,7 @@ msgstr "統計資料收集器行程"
 
 #: postmaster/postmaster.c:2083
 msgid "all server processes terminated; reinitializing"
-msgstr ""
+msgstr "所有伺服器行程已中止; 重新初始化"
 
 #: postmaster/postmaster.c:2129
 #: postmaster/postmaster.c:2185
@@ -6655,7 +6654,7 @@ msgstr "伺服器行程"
 
 #: postmaster/postmaster.c:2188
 msgid "terminating any other active server processes"
-msgstr ""
+msgstr "中止所有其他運行中的伺服器行程"
 
 #: postmaster/postmaster.c:2283
 #, c-format
@@ -6729,7 +6728,7 @@ msgstr ""
 #: postmaster/pgstat.c:257
 #, c-format
 msgid "could not resolve \"localhost\": %s"
-msgstr ""
+msgstr "無法解析 \"localhost\": %s"
 
 #: postmaster/pgstat.c:284
 #, c-format
@@ -6760,7 +6759,7 @@ msgstr ""
 #: postmaster/pgstat.c:1608
 #, c-format
 msgid "select() failed in statistics collector: %m"
-msgstr ""
+msgstr "在統計資料收集器中 select() 失敗: %m"
 
 #: postmaster/pgstat.c:380
 msgid "test message did not get through on socket for statistics collector"
@@ -6782,7 +6781,7 @@ msgstr ""
 #: postmaster/pgstat.c:431
 #, c-format
 msgid "could not set statistics collector socket to nonblocking mode: %m"
-msgstr ""
+msgstr "無法將統計資料收集器 socket 設為非阻擋模式"
 
 #: postmaster/pgstat.c:569
 msgid "statistics collector startup skipped"
@@ -6791,16 +6790,16 @@ msgstr "跳過統計資料收集器啟動程序"
 #: postmaster/pgstat.c:603
 #, c-format
 msgid "could not fork statistics buffer: %m"
-msgstr ""
+msgstr "無法 fork 統計資料緩衝區: %m"
 
 #: postmaster/pgstat.c:961
 msgid "must be superuser to reset statistics counters"
-msgstr ""
+msgstr "只有管理者能重設統計資料計數器"
 
 #: postmaster/pgstat.c:1409
 #, c-format
 msgid "could not create pipe for statistics buffer: %m"
-msgstr ""
+msgstr "無法為統計資料緩衝區建立管道"
 
 #: postmaster/pgstat.c:1422
 #, c-format
@@ -6820,35 +6819,35 @@ msgstr "無法fork統計資料收集器：%m"
 #: postmaster/pgstat.c:2864
 #: postmaster/pgstat.c:3046
 msgid "out of memory in statistics collector --- abort"
-msgstr ""
+msgstr "統計資料收集器記憶體用盡 --- 中止"
 
 #: postmaster/pgstat.c:1650
 #, c-format
 msgid "could not read from statistics collector pipe: %m"
-msgstr ""
+msgstr "無法由統計資料收集器管道讀取資料: %m"
 
 #: postmaster/pgstat.c:1672
 msgid "invalid statistics message length"
-msgstr ""
+msgstr "無效的統計資料訊息長度"
 
 #: postmaster/pgstat.c:1819
 #, c-format
 msgid "could not set statistics collector pipe to nonblocking mode: %m"
-msgstr ""
+msgstr "無法將統計資料收集器管道設為非阻擋模式: %m"
 
 #: postmaster/pgstat.c:1859
 msgid "statistics buffer is full"
-msgstr ""
+msgstr "統計資料緩衝區已滿"
 
 #: postmaster/pgstat.c:1890
 #, c-format
 msgid "select() failed in statistics buffer: %m"
-msgstr ""
+msgstr "在統計資料緩衝區中 select() 失敗: %m"
 
 #: postmaster/pgstat.c:1906
 #, c-format
 msgid "could not read statistics message: %m"
-msgstr ""
+msgstr "無法讀取統計資料訊息: %m"
 
 #: postmaster/pgstat.c:1971
 #, c-format
@@ -6863,7 +6862,7 @@ msgstr "不合法的伺服器行程ID %d"
 #: postmaster/pgstat.c:2232
 #, c-format
 msgid "could not open temporary statistics file \"%s\": %m"
-msgstr ""
+msgstr "無法開啟統計資料暫存檔 \"%s\": %m"
 
 #: postmaster/pgstat.c:2259
 msgid "database hash table corrupted during cleanup --- abort"
@@ -6877,12 +6876,12 @@ msgstr ""
 #: postmaster/pgstat.c:2345
 #, c-format
 msgid "could not close temporary statistics file \"%s\": %m"
-msgstr ""
+msgstr "無法關閉統計資料暫存檔 \"%s\": %m"
 
 #: postmaster/pgstat.c:2354
 #, c-format
 msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m"
-msgstr ""
+msgstr "無法將統計資料暫存檔由 \"%s\" 更名為 \"%s\": %m"
 
 #: postmaster/pgstat.c:2376
 msgid "dead-server-process hash table corrupted during cleanup --- abort"
@@ -8416,30 +8415,27 @@ msgid "text too long to convert to MAC address"
 msgstr ""
 
 #: utils/adt/misc.c:80
-#, fuzzy
 msgid "must be superuser to signal other server processes"
-msgstr "只有管理者能建立使用者"
+msgstr "只有管理者能傳送信號至其他伺服器行程"
 
 #: utils/adt/misc.c:89
-#, fuzzy, c-format
+#, c-format
 msgid "PID %d is not a PostgreSQL server process"
-msgstr ""
-"%s 是PostgreSQL伺服器。\n"
-"\n"
+msgstr "PID %d 不是 PostgreSQL 伺服器行程"
 
 #: utils/adt/misc.c:97
-#, fuzzy, c-format
+#, c-format
 msgid "could not send signal to process %d: %m"
-msgstr "無法傳送資料給用戶端：%m"
+msgstr "無法傳送信號至行程 %d: %m"
 
 #: utils/adt/misc.c:155
 msgid "global tablespace never has databases"
 msgstr ""
 
 #: utils/adt/misc.c:176
-#, fuzzy, c-format
+#, c-format
 msgid "%u is not a tablespace oid"
-msgstr "\"%s\"不是資料表或索引"
+msgstr "%u 不是 tablespace oid"
 
 #: utils/adt/nabstime.c:244
 #, c-format
@@ -9610,7 +9606,7 @@ msgstr ""
 
 #: utils/misc/guc.c:424
 msgid "Shows whether the current user is a superuser."
-msgstr ""
+msgstr "顯示目前的使用者是否為管理者。"
 
 #: utils/misc/guc.c:433
 msgid "Enables SSL connections."
@@ -9634,15 +9630,15 @@ msgstr ""
 
 #: utils/misc/guc.c:465
 msgid "Runs the server silently."
-msgstr ""
+msgstr "靜默地運行伺服器。"
 
 #: utils/misc/guc.c:466
 msgid "If this parameter is set, the server will automatically run in the background and any controlling terminals are dissociated."
-msgstr ""
+msgstr "如果這個參數被設置，伺服器將自動在背景運行並和任何控制的終端機分離。"
 
 #: utils/misc/guc.c:474
 msgid "Logs each successful connection."
-msgstr ""
+msgstr "記錄每個成功的連線。"
 
 #: utils/misc/guc.c:482
 msgid "Logs end of a session, including duration"
@@ -9666,7 +9662,7 @@ msgstr ""
 #: utils/misc/guc.c:1064
 #: utils/misc/guc.c:1124
 msgid "no description available"
-msgstr ""
+msgstr "沒有敘述可用"
 
 #: utils/misc/guc.c:513
 msgid "Logs the duration each completed SQL statement."
@@ -9738,7 +9734,7 @@ msgstr ""
 
 #: utils/misc/guc.c:697
 msgid "Logs the host name in the connection logs."
-msgstr ""
+msgstr "在連線記錄裡記錄主機名稱。"
 
 #: utils/misc/guc.c:698
 msgid "By default, connection logs only show the IP address of the connecting host. If you want them to show the host name you can turn this on, but depending on your host name resolution setup it might impose a non-negligible performance penalty."
@@ -9758,7 +9754,7 @@ msgstr ""
 
 #: utils/misc/guc.c:725
 msgid "Encrypt passwords."
-msgstr ""
+msgstr "加密密碼。"
 
 #: utils/misc/guc.c:726
 msgid "When a password is specified in CREATE USER or ALTER USER without writing either ENCRYPTED or UNENCRYPTED, this parameter determines whether the password is to be encrypted."
@@ -9778,7 +9774,7 @@ msgstr ""
 
 #: utils/misc/guc.c:756
 msgid "This parameter doesn't do anything."
-msgstr ""
+msgstr "這個參數不做任何事。"
 
 #: utils/misc/guc.c:757
 msgid "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-vintage clients."
@@ -9863,7 +9859,7 @@ msgstr ""
 
 #: utils/misc/guc.c:922
 msgid "Sets the maximum number of concurrent connections."
-msgstr ""
+msgstr "設定最大同時連線數。"
 
 #: utils/misc/guc.c:931
 msgid "Sets the number of connection slots reserved for superusers."
@@ -9871,7 +9867,7 @@ msgstr ""
 
 #: utils/misc/guc.c:940
 msgid "Sets the number of shared memory buffers used by the server."
-msgstr ""
+msgstr "設定供伺服器使用的共享記憶體緩衝區數。"
 
 #: utils/misc/guc.c:949
 msgid "Sets the TCP port the server listens on."
@@ -9895,15 +9891,15 @@ msgstr ""
 
 #: utils/misc/guc.c:982
 msgid "Sets the maximum memory to be used for maintenance operations."
-msgstr ""
+msgstr "設定給維護性操作使用的最大記憶體量。"
 
 #: utils/misc/guc.c:983
 msgid "This includes operations such as VACUUM and CREATE INDEX."
-msgstr ""
+msgstr "這包括像 VACUUM 和 CREATE INDEX 的操作。"
 
 #: utils/misc/guc.c:991
 msgid "Sets the maximum stack depth, in kilobytes."
-msgstr ""
+msgstr "設定最大堆疊深度，以 kilobytes 為單位。"
 
 #: utils/misc/guc.c:1000
 msgid "Vacuum cost for a page found in the buffer cache."
@@ -9927,7 +9923,7 @@ msgstr ""
 
 #: utils/misc/guc.c:1045
 msgid "Sets the maximum number of simultaneously open files for each server process."
-msgstr ""
+msgstr "為每個伺服器行程設定可同時開啟的最大檔案數。"
 
 #: utils/misc/guc.c:1075
 msgid "Sets the maximum allowed duration (in milliseconds) of any statement."
@@ -9935,7 +9931,7 @@ msgstr ""
 
 #: utils/misc/guc.c:1076
 msgid "A value of 0 turns off the timeout."
-msgstr ""
+msgstr "0 值關閉逾時機制。"
 
 #: utils/misc/guc.c:1084
 msgid "Sets the maximum number of tables and indexes for which free space is tracked."
@@ -10093,7 +10089,7 @@ msgstr "設定送給用戶端的訊息等級。"
 
 #: utils/misc/guc.c:1399
 msgid "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, LOG, NOTICE, WARNING, and ERROR. Each level includes all the levels that follow it. The later the level, the fewer messages are sent."
-msgstr ""
+msgstr "有效值為 DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, LOG, NOTICE, WARNING, 和 ERROR。每個等級都包含位於它之後的所有等級。越後面的等級送出越少的訊息。"
 
 #: utils/misc/guc.c:1410
 msgid "Sets the message levels that are logged."
@@ -10101,7 +10097,7 @@ msgstr "設定記茄的訊息等級。"
 
 #: utils/misc/guc.c:1411
 msgid "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, WARNING, ERROR, LOG, FATAL, and PANIC. Each level includes all the levels that follow it."
-msgstr ""
+msgstr "有效值為 DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, WARNING, ERROR, LOG, FATAL, 和 PANIC。每個等級都包含位於它之後的所有等級。"
 
 #: utils/misc/guc.c:1421
 msgid "Sets the verbosity of logged messages."
@@ -10109,7 +10105,7 @@ msgstr "設定記錄訊息的詳細程度。"
 
 #: utils/misc/guc.c:1422
 msgid "Valid values are \"terse\", \"default\", and \"verbose\"."
-msgstr ""
+msgstr "有效值為 \"terse\", \"default\", 和 \"verbose\"。"
 
 #: utils/misc/guc.c:1429
 msgid "Sets the type of statements logged."
@@ -10217,11 +10213,11 @@ msgstr "顯示伺服器版本。"
 
 #: utils/misc/guc.c:1619
 msgid "Sets the session user name."
-msgstr ""
+msgstr "設定 session 使用者名稱。"
 
 #: utils/misc/guc.c:1629
 msgid "Sets the destination for server log output."
-msgstr ""
+msgstr "設定伺服器記錄輸出目的地。"
 
 #: utils/misc/guc.c:1630
 msgid "Valid values are combinations of stderr, syslog and eventlog, depending on platform."
@@ -10229,7 +10225,7 @@ msgstr ""
 
 #: utils/misc/guc.c:1641
 msgid "Sets the syslog \"facility\" to be used when syslog enabled."
-msgstr ""
+msgstr "設定當系統記錄啟用時的被使用的系統記錄 \"facility\"。"
 
 #: utils/misc/guc.c:1642
 msgid "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7."
@@ -10237,7 +10233,7 @@ msgstr "合法的值有LOCAL0、LOCAL1、LOCAL2、LOCAL3、LOCAL4、LOCAL5、LOC
 
 #: utils/misc/guc.c:1650
 msgid "Sets the program name used to identify PostgreSQL messages in syslog."
-msgstr ""
+msgstr "設定用來在系統記錄中識別 PostgreSQL 訊息的程式名稱。"
 
 #: utils/misc/guc.c:1661
 msgid "Sets the time zone for displaying and interpreting time stamps."
@@ -10349,7 +10345,7 @@ msgstr "參數\"%s\"要求整數值"
 #: utils/misc/guc.c:3269
 #, c-format
 msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)"
-msgstr ""
+msgstr "%d 超出參數 \"%s\" 的有效範圍 (%d .. %d)"
 
 #: utils/misc/guc.c:3287
 #: utils/misc/guc.c:3396
@@ -10364,7 +10360,7 @@ msgstr "參數\"%s\"要求numeric值"
 #: utils/misc/guc.c:3382
 #, c-format
 msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)"
-msgstr ""
+msgstr "%g 超出參數 \"%s\" 的有效範圍 (%g .. %g)"
 
 #: utils/misc/guc.c:3417
 #, c-format
@@ -10406,7 +10402,7 @@ msgstr ""
 #: utils/misc/guc.c:5094
 #, c-format
 msgid "unrecognised \"log_destination\" key word: \"%s\""
-msgstr ""
+msgstr "無法識別的 \"log_destination\" 關鍵字: \"%s\""
 
 #: utils/misc/guc.c:5327
 msgid "SET AUTOCOMMIT TO OFF is no longer supported"
@@ -10419,7 +10415,7 @@ msgstr ""
 
 #: utils/misc/guc.c:5406
 msgid "cannot enable parameter when \"log_statement_stats\" is true."
-msgstr ""
+msgstr "當 \"log_statement_stats\" 為真時無法啟用參數"
 
 #: utils/misc/guc.c:5426
 msgid ""
@@ -10431,7 +10427,7 @@ msgstr ""
 
 #: utils/misc/guc.c:5445
 msgid "cannot set transaction read-write mode inside a read-only transaction"
-msgstr ""
+msgstr "無法在唯讀交易中設定交易讀寫模式"
 
 #: guc-file.l:269
 #, c-format
diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 6709cb5f04..429e1a8de6 100644
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.11 2004/09/13 12:20:21 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.12 2004/09/13 12:26:40 petere Exp $
 CATALOG_NAME	:= initdb
-AVAIL_LANGUAGES	:= de es fr it pt_BR ru sk sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs de es fr it pt_BR ru sk sv zh_CN zh_TW
 GETTEXT_FILES	:= initdb.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/initdb/po/cs.po b/src/bin/initdb/po/cs.po
new file mode 100644
index 0000000000..6ff6e64e9c
--- /dev/null
+++ b/src/bin/initdb/po/cs.po
@@ -0,0 +1,513 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.0\n"
+"POT-Creation-Date: 2004-08-10 01:27-0300\n"
+"PO-Revision-Date: 2004-08-10 18:07+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: initdb.c:233
+#: initdb.c:247
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek pamìti\n"
+
+#: initdb.c:329
+#: initdb.c:1300
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nelze otevøít soubor \"%s\" pro ètení: %s\n"
+
+#: initdb.c:387
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: nelze otevøít soubor \"%s\" pro zápis: %s\n"
+
+#: initdb.c:515
+#: initdb.c:524
+#: initdb.c:532
+#, c-format
+msgid "%s: failed\n"
+msgstr "%s: selhalo\n"
+
+#: initdb.c:521
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: odstraòuji datový adresáø \"%s\"\n"
+
+#: initdb.c:529
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: odstraòuji obsah datového adresáøe \"%s\"\n"
+
+#: initdb.c:540
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: datový adresáø \"%s\" nebyl na ¾ádost u¾ivatele odstranìn\n"
+
+#: initdb.c:566
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: nemù¾e bì¾et pod u¾ivatelem root\n"
+"Prosím pøihla¹te se jako (neprivilegovaný) u¾ivatel, který bude vlastníkem\n"
+"serverového procesu (napøíklad pomocí pøíkazu \"su\").\n"
+
+#: initdb.c:617
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" není platný název kódování znakù\n"
+
+#: initdb.c:772
+#, c-format
+msgid "%s: warning: encoding mismatch\n"
+msgstr "%s: varování: nesouhlasí kódování znakù\n"
+
+#: initdb.c:774
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the selected\n"
+"locale uses (%s) are not known to match.  This may lead to\n"
+"misbehavior in various character string processing functions.  To fix\n"
+"this situation, rerun %s and either do not specify an encoding\n"
+"explicitly, or choose a matching combination.\n"
+msgstr ""
+"Kódování znakù, které jste vybral (%s) a kódování pou¾ité vybraným\n"
+"národním nastavením (%s) si neodpovídají. To mù¾e vést k neoèekávanému\n"
+"chování rùzných funkcí pro manipulaci s øetìzci. Pro opravu této situace\n"
+"spus»te znovu %s a buï nespecifikujte kódování znakù explicitnì, nebo\n"
+"vyberte takovou kombinaci, která si odpovídá.\n"
+
+#: initdb.c:926
+#, c-format
+msgid ""
+"%s: file \"%s\" does not exist\n"
+"This means you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"%s: soubor \"%s\" neexistuje\n"
+"To znamená, ¾e va¹e instalace je po¹kozena, nebo jste\n"
+"zadal chybný adresáø v parametru -L pøi spu¹tìní.\n"
+
+#: initdb.c:991
+msgid "selecting default max_connections ... "
+msgstr "vybírám základní nastavení max_connections ... "
+
+#: initdb.c:1027
+msgid "selecting default shared_buffers ... "
+msgstr "vybárám základní nastavení shared_buffers ... "
+
+#: initdb.c:1060
+msgid "creating configuration files ... "
+msgstr "vytváøím konfiguraèní soubory ..."
+
+#: initdb.c:1147
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "vytváøím databázi template1 v %s/base/1 ... "
+
+#: initdb.c:1163
+#, c-format
+msgid ""
+"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
+"Check your installation or specify the correct path using the option -L.\n"
+msgstr ""
+"%s: vstupní soubor \"%s\" nepatøí PostgreSQL %s\n"
+"Zkontrolujte si va¹i instalaci nebo zadejte platnou cestu pomocí\n"
+"parametru -L.\n"
+
+#: initdb.c:1239
+msgid "initializing pg_shadow ... "
+msgstr "inicializuji pg_shadow ... "
+
+#: initdb.c:1275
+msgid "Enter new superuser password: "
+msgstr "Zadejte nové heslo pro superu¾ivatele: "
+
+#: initdb.c:1276
+msgid "Enter it again: "
+msgstr "Zadejte ho znovu: "
+
+#: initdb.c:1279
+msgid "Passwords didn't match.\n"
+msgstr "Hesla nesouhlasí.\n"
+
+#: initdb.c:1306
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: nemohu pøeèíst heslo ze souboru \"%s\": %s\n"
+
+#: initdb.c:1319
+msgid "setting password ... "
+msgstr "nastavuji heslo ... "
+
+#: initdb.c:1343
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr "%s: Soubor s hesly nebyl vytvoøen. Prosíme oznamte tento problém tvùrcùm.\n"
+
+#: initdb.c:1373
+msgid "enabling unlimited row size for system tables ... "
+msgstr "zapínám neomezenou velikost øádku pro systémové tabulky ..."
+
+#: initdb.c:1446
+msgid "initializing pg_depend ... "
+msgstr "inicializuji pg_depend ... "
+
+#: initdb.c:1474
+msgid "creating system views ... "
+msgstr "vytváøím systémové pohledy ... "
+
+#: initdb.c:1511
+msgid "loading pg_description ... "
+msgstr "vytváøím pg_description ... "
+
+#: initdb.c:1559
+msgid "creating conversions ... "
+msgstr "vytváøím pøevody ... "
+
+#: initdb.c:1615
+msgid "setting privileges on built-in objects ... "
+msgstr "nastavuji oprávnìní pro vestavìné objekty ... "
+
+#: initdb.c:1673
+msgid "creating information schema ... "
+msgstr "vytváøím schéma \"information\" ... "
+
+#: initdb.c:1735
+msgid "vacuuming database template1 ... "
+msgstr "pou¹tím VACUUM na databázi template1 ... "
+
+#: initdb.c:1791
+msgid "copying template1 to template0 ... "
+msgstr "kopíruji template1 do template0 ... "
+
+#: initdb.c:1848
+msgid "caught signal\n"
+msgstr "signál obdr¾en\n"
+
+#: initdb.c:1853
+#, fuzzy
+msgid "could not write to child process\n"
+msgstr "nemohu zapsat do procesu potomka\n"
+
+#: initdb.c:1859
+msgid "ok\n"
+msgstr "ok\n"
+
+#: initdb.c:1889
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: neplatný název národního nastavení (locale) \"%s\"\n"
+
+#: initdb.c:1956
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s inicializuje databázový klastr PostgreSQL.\n"
+"\n"
+
+#: initdb.c:1957
+msgid "Usage:\n"
+msgstr "Pou¾ití:\n"
+
+#: initdb.c:1958
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [PØEPÍNAÈ]... [DATAADR]\n"
+
+#: initdb.c:1959
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Pøepínaèe:\n"
+
+#: initdb.c:1960
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr " [-D, --pgdata=]DATAADR     umístìní tohoto databázového klastru\n"
+
+#: initdb.c:1961
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr "  -E, --encoding=KÓDOVÁNÍ   nastavení výchozího kódování pro nové databáze\n"
+
+#: initdb.c:1962
+msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
+msgstr "  --locale=LOCALE           inicializuj klastr s tímto národním nastavením\n"
+
+#: initdb.c:1963
+msgid ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            initialize database cluster with given locale\n"
+"                            in the respective category (default taken from\n"
+"                            environment)\n"
+msgstr ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            inicializuj klastr s daným národním nastavením\n"
+"                            v pøíslu¹ných kategoriích (výchozí hodnoty se \n"
+"                            vezmou z nastavení prostøedí)\n"
+
+#: initdb.c:1968
+msgid "  --no-locale               equivalent to --locale=C\n"
+msgstr "  --no-locale               ekvivalent --locale=C\n"
+
+#: initdb.c:1969
+msgid "  -A, --auth=method         default authentication method for local connections\n"
+msgstr "  -A, --auth=metoda         výchozí autentikaèní metoda pro lokální spojení\n"
+
+#: initdb.c:1970
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=JMÉNO      jméno databázového superu¾ivatele\n"
+
+#: initdb.c:1971
+msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            zeptej se na heslo pro nového superu¾ivatele\n"
+
+#: initdb.c:1972
+msgid "  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=filename         naèti heslo pro nového superu¾ivatele ze souboru\n"
+
+#: initdb.c:1973
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                uka¾ tuto nápovìdu, potom skonèi\n"
+
+#: initdb.c:1974
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             vypi¹ infomace o verzi, potom skonèi\n"
+
+#: initdb.c:1975
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"Ménì èasto pou¾ívané pøepínaèe:\n"
+
+#: initdb.c:1976
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               generuj spoustu ladicích informací\n"
+
+#: initdb.c:1977
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                uka¾ interní nastavení\n"
+
+#: initdb.c:1978
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L DIRECTORY              kde se nalézají vstupní soubory\n"
+
+#: initdb.c:1979
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             neuklízet po chybì\n"
+
+#: initdb.c:1980
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Pokud není specifikován datový adresáø, pou¾ije se promìnná\n"
+"prostøedí PGDATA.\n"
+
+#: initdb.c:1982
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"Chyby hla¹te na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: initdb.c:2073
+msgid "Running in debug mode.\n"
+msgstr "Bì¾ím v ladicím re¾imu.\n"
+
+#: initdb.c:2077
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "Be¾ím v neèistém re¾imu.  Chybné kroky nebudou uklizeny.\n"
+
+#: initdb.c:2113
+#: initdb.c:2130
+#: initdb.c:2336
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
+
+#: initdb.c:2128
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: pøíli¹ mnoho argumentù v pøíkazové øádce (první je \"%s\")\n"
+
+#: initdb.c:2136
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s: není mo¾no po¾adovat jak výzvu k zadání hesla, tak soubor s heslem\n"
+
+#: initdb.c:2142
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections.\n"
+"You can change this by editing pg_hba.conf or using the -A flag the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"VAROVÁNÍ: zapínám \"trust\" autentikaci pro lokální spojení.\n"
+"Toto mù¾ete zmìnit úpravou souboru pg_hba.conf nebo pou¾itím\n"
+"pøepínaèe -A pøi pøí¹tím spu¹tìní initdb.\n"
+
+#: initdb.c:2164
+#, c-format
+msgid "%s: unknown authentication method \"%s\".\n"
+msgstr "%s: neznámá autentikaèní metoda \"%s\".\n"
+
+#: initdb.c:2173
+#, c-format
+msgid "%s: you need to specify a password for the superuser to enable %s authentication.\n"
+msgstr "%s: musíte zadat heslo superu¾ivatele pro pou¾ití autentikace typu %s.\n"
+
+#: initdb.c:2188
+#, c-format
+msgid ""
+"%s: no data directory specified\n"
+"You must identify the directory where the data for this database system\n"
+"will reside.  Do this with either the invocation option -D or the\n"
+"environment variable PGDATA.\n"
+msgstr ""
+"%s: není zadán datový adresáø\n"
+"Musíte zadat adresáø, ve kterém se bude nacházet tato databáze.\n"
+"Uèiòte tak buï pou¾itím pøepínaèe -D nebo nastavením promìnné\n"
+"prostøedí PGDATA.\n"
+
+#: initdb.c:2214
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postgres\" je vy¾adován aplikací %s ale nebyl nalezen ve stejném adresáøi jako \"%s\".\n"
+"Zkontrolujte va¹i instalaci.\n"
+
+#: initdb.c:2220
+#, c-format
+msgid ""
+"The program \"postgres\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"Program \"postgres\" byl nalezen aplikací %s ale nebyl ve stejné verzi jako \"%s\".\n"
+"Zkontrolujte va¹i instalaci.\n"
+
+#: initdb.c:2242
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: nemohu zjistit platné krátké oznaèení verze\n"
+
+#: initdb.c:2295
+#, c-format
+msgid ""
+"The files belonging to this database system will be owned by user \"%s\".\n"
+"This user must also own the server process.\n"
+"\n"
+msgstr ""
+"Soubory patøící k této databázi budou vlastnìny u¾ivatelem \"%s\".\n"
+"Tento u¾ivatel musí být také vlastníkem serverového procesu.\n"
+"\n"
+
+#: initdb.c:2306
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "Databázový klastr bude inicializován s národním nastavením %s.\n"
+
+#: initdb.c:2310
+#, c-format
+msgid ""
+"The database cluster will be initialized with locales\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+msgstr ""
+"Databázový klastr bude inicializován s národním nastavením\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2334
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: nemohu najít vhodné kódování pro národní nastavení \"%s\"\n"
+
+#: initdb.c:2335
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "Spus»te znovu %s s pøepínaèem -E.\n"
+
+#: initdb.c:2342
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "Výchozí kódování pro databáze bylo odpovídajícím zpùsobem nastaveno na %s.\n"
+
+#: initdb.c:2383
+#, c-format
+msgid "creating directory %s ... "
+msgstr "vytváøím adresáø %s ... "
+
+#: initdb.c:2397
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "opravuji oprávnìní pro existující adresáø %s ... "
+
+#: initdb.c:2415
+#, c-format
+msgid ""
+"%s: directory \"%s\" exists but is not empty\n"
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"%s: adresáø \"%s\" existuje, ale není prázdný\n"
+"Pokud chcete v tomto adresáøi inicializovat databázi, odstraòte nebo\n"
+"vyprázdnìte adresáø \"%s\" nebo spus»te %s\n"
+"s argumentem jiným ne¾ \"%s\".\n"
+
+#: initdb.c:2432
+#, c-format
+msgid "creating directory %s/%s ... "
+msgstr "vytváøím adresáø %s/%s ... "
+
+#: initdb.c:2493
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"or\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"Povedlo se. Mù¾ete zaèít pou¾ívat databázový server spu¹tìním:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"nebo\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l soubor_logu start\n"
+"\n"
+
diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
index 70dd3b86ed..700ad52fa9 100644
--- a/src/bin/initdb/po/zh_CN.po
+++ b/src/bin/initdb/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 14:27+0000\n"
+"POT-Creation-Date: 2004-08-31 08:59+0000\n"
 "PO-Revision-Date: 2003-09-15 13:48:19+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -19,7 +19,7 @@ msgstr ""
 msgid "%s: out of memory\n"
 msgstr "%s: ÄÚ´æÒç³ö\n"
 
-#: initdb.c:329 initdb.c:1300
+#: initdb.c:329 initdb.c:1298
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: ΪÁ˶ÁÈ¡, ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"
@@ -60,17 +60,17 @@ msgstr ""
 "ÇëÒÔ·þÎñÆ÷½ø³ÌËùÓÐÕßµÄÓû§ (ÎÞÌØȨ) Éí·Ý\n"
 "µÇ½ (ʹÓÃ, e.g., \"su\").\n"
 
-#: initdb.c:617
+#: initdb.c:615
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" ²»ÊÇÒ»¸öÓÐЧµÄ·þÎñÆ÷±àÂëÃû×Ö\n"
 
-#: initdb.c:772
+#: initdb.c:770
 #, c-format
 msgid "%s: warning: encoding mismatch\n"
 msgstr "%s: ¾¯¸æ: ±àÂ벻ƥÅä\n"
 
-#: initdb.c:774
+#: initdb.c:772
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected\n"
@@ -85,7 +85,7 @@ msgstr ""
 "ÀàÐÍ.\n"
 "\n"
 
-#: initdb.c:926
+#: initdb.c:924
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -96,26 +96,26 @@ msgstr ""
 "ÕâÒâζ×ÅÄúµÄ°²×°·¢ÉúÁË´íÎó»ò\n"
 "ʹÓà -L Ñ¡ÏîÖ¸¶¨ÁË´íÎóµÄ·¾¶.\n"
 
-#: initdb.c:991
+#: initdb.c:989
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "Ñ¡ÔñĬÈÏ×î´óÁª½ÓÊý (max_connections) ... "
 
-#: initdb.c:1027
+#: initdb.c:1025
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "Ñ¡ÔñĬÈϹ²Ïí»º³åÇø´óС (shared_buffers) ... "
 
-#: initdb.c:1060
+#: initdb.c:1058
 msgid "creating configuration files ... "
 msgstr "´´½¨ÅäÖÃÎļþ ... "
 
-#: initdb.c:1147
+#: initdb.c:1145
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "ÔÚ %s/base/1 Öд´½¨ template1 Êý¾Ý¿â ... "
 
-#: initdb.c:1163
+#: initdb.c:1161
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -124,95 +124,95 @@ msgstr ""
 "%s: ÊäÈëÎļþ \"%s\" ²»ÊôÓÚ PostgreSQL %s\n"
 "¼ì²éÄãµÄ°²×°»òʹÓà -L Ñ¡ÏîÖ¸¶¨ÕýÈ·µÄ·¾¶.\n"
 
-#: initdb.c:1239
+#: initdb.c:1237
 msgid "initializing pg_shadow ... "
 msgstr "³õʼ»¯ pg_shadow ... "
 
-#: initdb.c:1275
+#: initdb.c:1273
 msgid "Enter new superuser password: "
 msgstr "ÊäÈëеij¬¼¶Óû§¿ÚÁî: "
 
-#: initdb.c:1276
+#: initdb.c:1274
 msgid "Enter it again: "
 msgstr "ÔÙÊäÈëÒ»±é: "
 
-#: initdb.c:1279
+#: initdb.c:1277
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "¿ÚÁƥÅä.\n"
 
-#: initdb.c:1306
+#: initdb.c:1304
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨´ÓÎļþ \"%s\" ¶ÁÈ¡¿ÚÁî: %s\n"
 
-#: initdb.c:1319
+#: initdb.c:1317
 #, c-format
 msgid "setting password ... "
 msgstr "ÉèÖÿÚÁî ... "
 
-#: initdb.c:1343
+#: initdb.c:1341
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr "%s: ¿ÚÁîÎļþûÓÐÉú³É. Ç뱨¸æÕâ¸öÎÊÌâ.\n"
 
-#: initdb.c:1373
+#: initdb.c:1371
 msgid "enabling unlimited row size for system tables ... "
 msgstr "Æô¶¯²»ÏÞÖÆϵͳ±íÐдóС ... "
 
-#: initdb.c:1446
+#: initdb.c:1444
 msgid "initializing pg_depend ... "
 msgstr "³õʼ»¯ pg_depend ... "
 
-#: initdb.c:1474
+#: initdb.c:1472
 msgid "creating system views ... "
 msgstr "´´½¨ÏµÍ³ÊÓͼ ... "
 
-#: initdb.c:1511
+#: initdb.c:1509
 msgid "loading pg_description ... "
 msgstr "¼ÓÔØ pg_description ... "
 
-#: initdb.c:1559
+#: initdb.c:1557
 msgid "creating conversions ... "
 msgstr "´´½¨×Ö·û¼¯×ª»» ... "
 
-#: initdb.c:1615
+#: initdb.c:1613
 msgid "setting privileges on built-in objects ... "
 msgstr "¶ÔÄÚ½¨¶ÔÏóÉèÖÃȨÏÞ ... "
 
-#: initdb.c:1673
+#: initdb.c:1671
 msgid "creating information schema ... "
 msgstr "´´½¨ÐÅϢģʽ ... "
 
-#: initdb.c:1735
+#: initdb.c:1734
 msgid "vacuuming database template1 ... "
 msgstr "ÇåÀíÊý¾Ý¿â template1 ... "
 
-#: initdb.c:1791
+#: initdb.c:1790
 msgid "copying template1 to template0 ... "
 msgstr "¿½±´ template1 µ½ template0 ... "
 
-#: initdb.c:1848
+#: initdb.c:1847
 #, c-format
 msgid "caught signal\n"
 msgstr "²¶»ñÐźÅ\n"
 
-#: initdb.c:1853
+#: initdb.c:1852
 #, c-format
 msgid "could not write to child process\n"
 msgstr "ÎÞ·¨Ð´µ½×Ó½ø³Ì\n"
 
-#: initdb.c:1859
+#: initdb.c:1858
 #, c-format
 msgid "ok\n"
 msgstr "³É¹¦\n"
 
-#: initdb.c:1889
+#: initdb.c:1888
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: ÎÞЧµÄ locale Ãû×Ö \"%s\"\n"
 
-#: initdb.c:1956
+#: initdb.c:1955
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -221,17 +221,17 @@ msgstr ""
 "%s ³õʼ»¯Ò»¸ö PostgreSQL Êý¾Ý¿â´Ø.\n"
 "\n"
 
-#: initdb.c:1957
+#: initdb.c:1956
 #, c-format
 msgid "Usage:\n"
 msgstr "ʹÓ÷½·¨:\n"
 
-#: initdb.c:1958
+#: initdb.c:1957
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [Ñ¡Ïî]... [DATADIR]\n"
 
-#: initdb.c:1959
+#: initdb.c:1958
 #, c-format
 msgid ""
 "\n"
@@ -240,23 +240,23 @@ msgstr ""
 "\n"
 "Ñ¡Ïî:\n"
 
-#: initdb.c:1960
+#: initdb.c:1959
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr "  -D, --pgdata=DATADIR      µ±Ç°Êý¾Ý¿â´ØµÄλÖÃ\n"
 
-#: initdb.c:1961
+#: initdb.c:1960
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   ΪÐÂÊý¾Ý¿âÉèÖÃĬÈϱàÂë\n"
 
-#: initdb.c:1962
+#: initdb.c:1961
 #, c-format
 msgid ""
 "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr "  --locale=LOCALE           ³õʼ»¯Êý¾Ý¿â´ØµÄ locale\n"
 
-#: initdb.c:1963
+#: initdb.c:1962
 #, c-format
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
@@ -271,47 +271,46 @@ msgstr ""
 "                            locale (ĬÈÏʹÓû·¾³±ä\n"
 "                            Á¿)\n"
 
-#: initdb.c:1968
+#: initdb.c:1967
 #, c-format
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale               µÈͬÓÚ --locale=C\n"
 
-#: initdb.c:1969
+#: initdb.c:1968
 #, c-format
 msgid ""
 "  -A, --auth=method         default authentication method for local "
 "connections\n"
-msgstr ""
-"  -A, --auth=method         ±¾µØÁ¬½ÓµÄĬÈÏÈÏÖ¤·½·¨\n"
+msgstr "  -A, --auth=method         ±¾µØÁ¬½ÓµÄĬÈÏÈÏÖ¤·½·¨\n"
 
-#: initdb.c:1970
+#: initdb.c:1969
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       Êý¾Ý¿â³¬¼¶Óû§Ãû\n"
 
-#: initdb.c:1971
+#: initdb.c:1970
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            ¶ÔÓÚеij¬¼¶Óû§ÌáʾÊäÈë¿ÚÁî\n"
 
-#: initdb.c:1972
+#: initdb.c:1971
 #, c-format
 msgid ""
 "  --pwfile=filename         read password for the new superuser from file\n"
 msgstr "  --pwfile=ÎļþÃû           ¶ÔÓÚеij¬¼¶Óû§´ÓÎļþ¶ÁÈ¡¿ÚÁî\n"
 
-#: initdb.c:1973
+#: initdb.c:1972
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                ÏÔʾ´Ë°ïÖú, È»ºóÍ˳ö\n"
 
-#: initdb.c:1974
+#: initdb.c:1973
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: initdb.c:1975
+#: initdb.c:1974
 #, c-format
 msgid ""
 "\n"
@@ -320,27 +319,27 @@ msgstr ""
 "\n"
 "·ÇÆÕͨʹÓÃÑ¡Ïî:\n"
 
-#: initdb.c:1976
+#: initdb.c:1975
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               ²úÉú´óÁ¿µÄ³ý´íÐÅÏ¢\n"
 
-#: initdb.c:1977
+#: initdb.c:1976
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                ÏÔʾÄÚ²¿ÉèÖÃ\n"
 
-#: initdb.c:1978
+#: initdb.c:1977
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              ÊäÈëÎļþµÄλÖÃ\n"
 
-#: initdb.c:1979
+#: initdb.c:1978
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             ³ö´íºó²»ÇåÀí\n"
 
-#: initdb.c:1980
+#: initdb.c:1979
 #, c-format
 msgid ""
 "\n"
@@ -350,7 +349,7 @@ msgstr ""
 "\n"
 "Èç¹ûûÓÐÖ¸¶¨Êý¾ÝĿ¼, ½«Ê¹Óû·¾³±äÁ¿ PGDATA\n"
 
-#: initdb.c:1982
+#: initdb.c:1981
 #, c-format
 msgid ""
 "\n"
@@ -359,32 +358,32 @@ msgstr ""
 "\n"
 "±¨¸æ´íÎóÖÁ <pgql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2073
+#: initdb.c:2072
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "ÔËÐÐÔÚ³ý´íģʽÖÐ. \n"
 
-#: initdb.c:2077
+#: initdb.c:2076
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "ÔËÐÐÔÚ noclean ģʽÖÐ. ´íÎ󽫲»±»ÇåÀí.\n"
 
-#: initdb.c:2113 initdb.c:2130 initdb.c:2335
+#: initdb.c:2112 initdb.c:2129 initdb.c:2341
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: initdb.c:2128
+#: initdb.c:2127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: ÃüÁîÐвÎÊýÌ«¶à (µÚÒ»¸öÊÇ \"%s\")\n"
 
-#: initdb.c:2136
+#: initdb.c:2135
 #, c-format
 msgid "%s: you cannot specify both password prompt and password file\n"
 msgstr "%s: Äã²»ÄÜͬʱָ¶¨ÌáʾÊäÈë¿ÚÁîºÍ¿ÚÁîÎļþ\n"
 
-#: initdb.c:2142
+#: initdb.c:2141
 msgid ""
 "\n"
 "WARNING: enabling \"trust\" authentication for local connections.\n"
@@ -396,20 +395,19 @@ msgstr ""
 "Äã¿ÉÒÔͨ¹ý±à¼­ pg_hba.conf ¸ü¸Ä»òÄãÏÂ\n"
 "´ÎÔËÐÐ initdb ʱʹÓà -A Ñ¡Ïî.\n"
 
-#: initdb.c:2164
+#: initdb.c:2165
 #, c-format
 msgid "%s: unknown authentication method \"%s\".\n"
 msgstr "%s: δ֪ÈÏÖ¤·½·¨ \"%s\".\n"
 
-#: initdb.c:2173
+#: initdb.c:2174
 #, c-format
 msgid ""
 "%s: you need to specify a password for the superuser to enable %s "
 "authentication.\n"
-msgstr ""
-"%s: ΪÁËÆô¶¯ %s ÈÏÖ¤, ÄãÐèҪΪ³¬¼¶Óû§Ö¸¶¨Ò»¸ö¿ÚÁî.\n"
+msgstr "%s: ΪÁËÆô¶¯ %s ÈÏÖ¤, ÄãÐèҪΪ³¬¼¶Óû§Ö¸¶¨Ò»¸ö¿ÚÁî.\n"
 
-#: initdb.c:2188
+#: initdb.c:2189
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -422,7 +420,7 @@ msgstr ""
 "´æÔÚ. ʹÓà -D Ñ¡Ïî»òÕß\n"
 "»·¾³±äÁ¿ PGDATA.\n"
 
-#: initdb.c:2214
+#: initdb.c:2215
 #, c-format
 msgid ""
 "The program \"postgres\" is needed by %s but was not found in the same "
@@ -432,7 +430,7 @@ msgstr ""
 "%s ÐèÒª³ÌÐò \"postgres\", µ«ÊÇÔÚͬһ¸öĿ¼ \"%s\" ÖÐûÕÒµ½.\n"
 "¼ì²éÄúµÄ°²×°.\n"
 
-#: initdb.c:2220
+#: initdb.c:2221
 #, c-format
 msgid ""
 "The program \"postgres\" was found by %s but was not the same version as \"%s"
@@ -442,12 +440,17 @@ msgstr ""
 "%s ÕÒµ½³ÌÐò \"postgres\", µ«ÊǺͰ汾 \"%s\" ²»Ò»ÖÂ.\n"
 "¼ì²éÄúµÄ°²×°.\n"
 
-#: initdb.c:2241
+#: initdb.c:2240
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s: ÊäÈëÎļþλÖñØÐëΪ¾ø¶Ô·¾¶\n"
+
+#: initdb.c:2248
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s: ÎÞ·¨È·¶¨ÓÐЧµÄ¶Ì°æ±¾×Ö·û´®\n"
 
-#: initdb.c:2294
+#: initdb.c:2301
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -457,12 +460,12 @@ msgstr ""
 "ÊôÓÚ´ËÊý¾Ý¿âϵͳµÄÎļþËÞÖ÷ΪÓû§ \"%s\".\n"
 "´ËÓû§Ò²±ØÐëΪ·þÎñÆ÷½ø³ÌµÄËÞÖ÷.\n"
 
-#: initdb.c:2305
+#: initdb.c:2311
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "Êý¾Ý¿â´Ø½«´øÓÐ locale %s ³õʼ»¯.\n"
 
-#: initdb.c:2309
+#: initdb.c:2314
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -481,32 +484,32 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2333
+#: initdb.c:2339
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: ÎÞ·¨Îª locale \"%s\" ÕÒµ½ºÏÊʵıàÂë\n"
 
-#: initdb.c:2334
+#: initdb.c:2340
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "´ø -E Ñ¡ÏîÖØÐÂÔËÐÐ %s.\n"
 
-#: initdb.c:2341
+#: initdb.c:2347
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "ĬÈϵÄÊý¾Ý¿â±àÂëÒѾ­ÏàÓ¦µÄÉèÖÃΪ %s.\n"
 
-#: initdb.c:2382
+#: initdb.c:2388
 #, c-format
 msgid "creating directory %s ... "
 msgstr "´´½¨Ä¿Â¼ %s ... "
 
-#: initdb.c:2396
+#: initdb.c:2402
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "ÐÞ¸´ÒÑ´æÔÚĿ¼ %s µÄȨÏÞ ... "
 
-#: initdb.c:2414
+#: initdb.c:2420
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -519,12 +522,12 @@ msgstr ""
 "Ŀ¼ \"%s\" »òÕßÔËÐдø²ÎÊýµÄ %s\n"
 "¶ø²»ÊÇ \"%s\".\n"
 
-#: initdb.c:2431
+#: initdb.c:2437
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "´´½¨Ä¿Â¼ %s/%s ... "
 
-#: initdb.c:2492
+#: initdb.c:2501
 #, c-format
 msgid ""
 "\n"
diff --git a/src/bin/pg_controldata/po/cs.po b/src/bin/pg_controldata/po/cs.po
index a73f208af8..f5d19eb532 100644
--- a/src/bin/pg_controldata/po/cs.po
+++ b/src/bin/pg_controldata/po/cs.po
@@ -1,20 +1,29 @@
 # Czech translation of pg_controldata messages.
 # Karel Zak <zakkr@zf.jcu.cz>, 2003.
 #
-# $PostgreSQL: pgsql/src/bin/pg_controldata/po/cs.po,v 1.2 2003/11/29 22:40:44 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_controldata/po/cs.po,v 1.3 2004/09/13 12:26:43 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-06-29 12:25+0200\n"
-"PO-Revision-Date: 2003-07-12 23:20-0000\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
+"POT-Creation-Date: 2004-08-12 01:15-0300\n"
+"PO-Revision-Date: 2004-08-12 22:17+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
 "Language-Team: Karel Zak <zakkr@zf.jcu.cz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_controldata.c:31
+#: pg_controldata.c:28
+#, c-format
+msgid ""
+"%s displays control information of a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s uká¾e kontrolní informace o PostgreSQL databázi.\n"
+"\n"
+
+#: pg_controldata.c:32
 #, c-format
 msgid ""
 "Usage:\n"
@@ -22,37 +31,32 @@ msgid ""
 "\n"
 "Options:\n"
 "  DATADIR        show cluster control information for DATADIR\n"
-"  -?, --help     display this help and exit\n"
-"  -V, --version  display pg_controldata's version and exit\n"
-"\n"
+"  --help         show this help, then exit\n"
+"  --version      output version information, then exit\n"
 msgstr ""
 "Pou¾ití:\n"
 "   %s [PØEPÍNAÈ]\n"
 "\n"
 "Pøepínaèe:\n"
 " ADRESÁØ        uká¾e kontrolní informace pro ADRESÁØ\n"
-" -?, --help     uká¾e tuto nápovìdu a skonèí\n"
-" -V, --version  uká¾e verzi tohoto programu a skonèí\n"
-"\n"
-
-#: pg_controldata.c:40
-#, c-format
-msgid "%s displays PostgreSQL database cluster control information.\n"
-msgstr "%s uká¾e kontrolní informace o PostgreSQL databázi.\n"
+"  --help         uká¾e tuto nápovìdu a skonèí\n"
+"  --version      uká¾e verzi tohoto programu a skonèí\n"
 
 #: pg_controldata.c:41
 msgid ""
+"\n"
 "If no data directory is specified, the environment variable PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
+"\n"
 "Není-li specifikován datový adresáø je pou¾ita promìnná prostøedí\n"
 "PGDATA.\n"
 "\n"
 
 #: pg_controldata.c:42
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "Chyby posílejte do <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby posílejte na adresu <pgsql-bugs@postgresql.org>.\n"
 
 #: pg_controldata.c:52
 msgid "starting up"
@@ -76,154 +80,165 @@ msgstr "v provozu"
 
 #: pg_controldata.c:62
 msgid "unrecognized status code"
-msgstr "neoèekávaný stavový kód"
+msgstr "neznámý stavový kód"
 
-#: pg_controldata.c:107
+#: pg_controldata.c:104
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: není specifikován datový adresáø\n"
 
-#: pg_controldata.c:108
+#: pg_controldata.c:105
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Zkuste '%s --help' pro více informací.\n"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
 
-#: pg_controldata.c:116
+#: pg_controldata.c:113
 #, c-format
-msgid "%s: could not open file \"%s\" for reading (%s)\n"
-msgstr "%s: nelze otevøít soubor \"%s\" pro ètení (%s)\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nelze otevøít soubor \"%s\" pro ètení: %s\n"
 
-#: pg_controldata.c:123
+#: pg_controldata.c:120
 #, c-format
-msgid "%s: could not read file \"%s\" (%s)\n"
-msgstr "%s: nelze èíst soubor \"%s\" (%s)\n"
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nelze èíst soubor \"%s\": %s\n"
 
-#: pg_controldata.c:137
+#: pg_controldata.c:134
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
 "Either the file is corrupt, or it has a different layout than this program\n"
 "is expecting.  The results below are untrustworthy.\n"
 "\n"
 msgstr ""
-"UPOZORNÌNÍ: Spoèítaný CRC kontrolní souèet nesouhlasí s hodnotou ulo¾enou v souboru.\n"
-"Buï je soubor po¹kozen nebo má jinou úpravu ne¾ tento program\n"
+"UPOZORNÌNÍ: Spoèítaný CRC kontrolní souèet nesouhlasí s hodnotou ulo¾enou\n"
+"v souboru. Buï je soubor po¹kozen nebo má jinou úpravu ne¾ tento program\n"
 "oèekává.  Ní¾e uvedené výsledky jsou nedùvìryhodné.\n"
 "\n"
 
-#: pg_controldata.c:150
+#: pg_controldata.c:153
 #, c-format
 msgid "pg_control version number:            %u\n"
-msgstr "Èíslo verze pg_controlu:            %u\n"
+msgstr "èíslo verze pg_controlu:              %u\n"
 
-#: pg_controldata.c:151
+#: pg_controldata.c:154
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Èíslo verze katalogu:               %u\n"
 
-#: pg_controldata.c:152
+#: pg_controldata.c:155
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identifikátor databázového systému:   %s\n"
+
+#: pg_controldata.c:156
 #, c-format
 msgid "Database cluster state:               %s\n"
-msgstr "Status seskupení databáze:               %s\n"
+msgstr "Status databázového klastu:           %s\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:157
 #, c-format
 msgid "pg_control last modified:             %s\n"
-msgstr "Poslední modifikace pg_controlu:             %s\n"
+msgstr "poslední modifikace pg_controlu:      %s\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:158
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "ID souèasného log souboru:                  %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:159
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Následující segment log souboru:                %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:160
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "Poslední umístìní kontrolního bodu:           %X/%X\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:162
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "Pøede¹lé umístìní kontrolního bodu:            %X/%X\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:164
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
-msgstr "Poslednìj¹í umístìní REDO kontrolního bodu:    %X/%X\n"
+msgstr "Poslední umístìní REDO kontrolního bodu:    %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:166
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "Poslední umístìní UNDO kontrolního bodu:    %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:168
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "Poslední umístìní StartUpID kontrolního bodu:        %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr 
+"TimeLineID posledního kontrolního bodu:     %u\n"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "Poslední umístìní NextXID kontrolního bodu:          %u\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:170
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "Poslední umístìní NextOID kontrolního bodu:          %u\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:171
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
-msgstr "Èas posledního kontrolního bodu:            %s\n"
+msgstr"Èas posledního kontrolního bodu:       %s\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:172
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Velikost databázového bloku:                  %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:173
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blokù v segmentu velké relace: %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:174
+#, c-format
+msgid "Bytes per WAL segment:                %u\n"
+msgstr "Bytù ve WAL sementu:                  %u\n"
+
+#: pg_controldata.c:175
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximální délka identifikátorù:        %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:176
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maximální poèet argumentù funkcí: %u\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:177
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Zpùsob ulo¾ení typu date/time:               %s\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:178
 msgid "64-bit integers"
 msgstr "64-bitová èísla"
 
-#: pg_controldata.c:173
-msgid "Floating point"
-msgstr "Plovoucí èárka"
+#: pg_controldata.c:178
+msgid "floating-point numbers"
+msgstr "èísla s plovoucí øádovou èárkou"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:179
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maximální délka jména locale:        %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:180
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE (porovnávání øetìzcù):                           %s\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:181
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE (typy znakù):                             %s\n"
diff --git a/src/bin/pg_controldata/po/zh_CN.po b/src/bin/pg_controldata/po/zh_CN.po
index 59d85d08f8..a9b237d29e 100644
--- a/src/bin/pg_controldata/po/zh_CN.po
+++ b/src/bin/pg_controldata/po/zh_CN.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-22 09:35+0000\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
 "PO-Revision-Date: 2004-01-10 13:45+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -116,130 +116,130 @@ msgstr ""
 "ÏÂÃæµÄ½á¹ûÊDz»¿É¿¿µÄ.\n"
 "\n"
 
-#: pg_controldata.c:153
+#: pg_controldata.c:154
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control °æ±¾:                      %u\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:155
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog °æ±¾:                         %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:156
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "Êý¾Ý¿âϵͳ±êʶ·û:                     %s\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:157
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "Êý¾Ý¿â´Ø״̬:                         %s\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:158
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control ×îºóÐÞ¸Ä:                  %s\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:159
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "µ±Ç°ÈÕÖ¾ÎļþID:                       %u\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:160
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "ÏÂÒ»¸öÈÕÖ¾Îļþ¶Î:                     %u\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:161
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "×îмì²éµãλÖÃ:                       %X/%X\n"
 
-#: pg_controldata.c:162
+#: pg_controldata.c:163
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "ÓÅÏȼì²éµãλÖÃ:                       %X/%X\n"
 
-#: pg_controldata.c:164
+#: pg_controldata.c:165
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "×îмì²éµãµÄ REDO λÖÃ:               %X/%X\n"
 
-#: pg_controldata.c:166
+#: pg_controldata.c:167
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "×îмì²éµãµÄ UNDO λÖÃ:               %X/%X\n"
 
-#: pg_controldata.c:168
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "×îмì²éµãµÄ TimeLineID:              %u\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:170
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "×îмì²éµãµÄ NextXID:                 %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:171
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "×îмì²éµãµÄ NextOID:                 %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:172
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "×îмì²éµãµÄʱ¼ä:                     %s\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:173
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Êý¾Ý¿â¿é´óС:                         %u\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:174
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "´ó¹ØϵµÄÿ¶Î¿éÊý:                     %u\n"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:175
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "ÿһ¸ö WAL ¶Î×Ö½ÚÊý:                  %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:176
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "±êʶ·ûµÄ×î´ó³¤¶È:                     %u\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:177
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "º¯Êý²ÎÊýµÄ×î´ó¸öÊý:                   %u\n"
 
-#: pg_controldata.c:177
+#: pg_controldata.c:178
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "ÈÕÆÚ/ʱ¼ä ÀàÐÍ´æ´¢:                   %s\n"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:179
 msgid "64-bit integers"
 msgstr "64λÕûÊý"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:179
 msgid "floating-point numbers"
 msgstr "¸¡µãÊý"
 
-#: pg_controldata.c:179
+#: pg_controldata.c:180
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "±¾µØÃû×ÖµÄ×î´ó³¤¶È:                   %u\n"
 
-#: pg_controldata.c:180
+#: pg_controldata.c:181
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:181
+#: pg_controldata.c:182
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index 98a3a5e63c..b53f44484a 100644
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.6 2004/09/13 12:20:23 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.7 2004/09/13 12:26:45 petere Exp $
 CATALOG_NAME	:= pg_ctl
-AVAIL_LANGUAGES	:= es ru sk sv zh_CN zh_TW
+AVAIL_LANGUAGES	:= cs es ru sk sv zh_CN zh_TW
 GETTEXT_FILES	:= pg_ctl.c
 GETTEXT_TRIGGERS:= _ simple_prompt
diff --git a/src/bin/pg_ctl/po/cs.po b/src/bin/pg_ctl/po/cs.po
new file mode 100644
index 0000000000..3161127d36
--- /dev/null
+++ b/src/bin/pg_ctl/po/cs.po
@@ -0,0 +1,463 @@
+# SOME DESCRIPTIVE TITLE.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.0\n"
+"POT-Creation-Date: 2004-08-12 01:16-0300\n"
+"PO-Revision-Date: 2004-08-13 19:12+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
+"Language-Team: Czech <cs@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=iso-8859-2\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_ctl.c:184
+#: pg_ctl.c:200
+#: pg_ctl.c:1230
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: nedostatek pamìti\n"
+
+#: pg_ctl.c:431
+#, c-format
+msgid "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgstr "%s: Dal¹í postmaster mo¾ná bì¾í. Zkou¹ím ho pøesto spustit.\n"
+
+#: pg_ctl.c:449
+#, c-format
+msgid "%s: cannot read %s\n"
+msgstr "%s: nemohu èíst %s\n"
+
+#: pg_ctl.c:455
+#, c-format
+msgid "%s: option file %s must have exactly 1 line\n"
+msgstr "%s: soubor s pøepínaèi %s musí mít pøesnì 1 øádku\n"
+
+#: pg_ctl.c:497
+#, c-format
+msgid ""
+"The program \"postmaster\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s potøebuje program \"postmaster\", který ale nebyl  nalezen ve stejném adresáøi jako \"%s\".\n"
+"Zkontrolujte va¹i instalaci.\n"
+
+#: pg_ctl.c:503
+#, c-format
+msgid ""
+"The program \"postmaster\" was found by %s but was not the same version as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s nalezl program \"postmaster\", ten je ale jiné verze ne¾ \"%s\".\n"
+"Zkontrolujte va¹i instalaci.\n"
+
+#: pg_ctl.c:514
+msgid "Unable to run the postmaster binary\n"
+msgstr "Nemohu spustit binární program postmaster.\n"
+
+#: pg_ctl.c:524
+#, c-format
+msgid ""
+"%s: cannot start postmaster\n"
+"Examine the log output\n"
+msgstr ""
+"%s: nemohu spusit postmaster\n"
+"Zkontrolujte výstup v logu\n"
+
+#: pg_ctl.c:535
+msgid "waiting for postmaster to start..."
+msgstr "èekám na start postmastera..."
+
+#: pg_ctl.c:540
+msgid "could not start postmaster\n"
+msgstr "nebylo mo¾no spustit postmaster\n"
+
+#: pg_ctl.c:542
+msgid ""
+"done\n"
+"postmaster started\n"
+msgstr ""
+"hotovo\n"
+"postmaster spu¹tìn\n"
+
+#: pg_ctl.c:545
+msgid "postmaster starting\n"
+msgstr "postmaster startuje\n"
+
+#: pg_ctl.c:560
+#: pg_ctl.c:639
+#: pg_ctl.c:709
+#, c-format
+msgid "%s: could not find %s\n"
+msgstr "%s: nebylo mo¾no najít %s\n"
+
+#: pg_ctl.c:561
+#: pg_ctl.c:710
+msgid "Is postmaster running?\n"
+msgstr "Bì¾í postmaster?\n"
+
+#: pg_ctl.c:567
+#, c-format
+msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nemohu zastavit postmaster; postgres bì¾í (PID: %ld)\n"
+
+#: pg_ctl.c:575
+#: pg_ctl.c:656
+#, c-format
+msgid "stop signal failed (PID: %ld): %s\n"
+msgstr "signál stop selhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:583
+msgid "postmaster shutting down\n"
+msgstr "postmaster se ukonèuje\n"
+
+#: pg_ctl.c:590
+#: pg_ctl.c:663
+msgid "waiting for postmaster to shut down..."
+msgstr "èekám na ukonèení postmastera..."
+
+#: pg_ctl.c:612
+#: pg_ctl.c:687
+msgid " failed\n"
+msgstr " selhalo\n"
+
+#: pg_ctl.c:614
+#: pg_ctl.c:689
+#, c-format
+msgid "%s: postmaster does not shut down\n"
+msgstr "%s: postmaster se neukonèuje\n"
+
+#: pg_ctl.c:618
+#: pg_ctl.c:694
+msgid "done\n"
+msgstr "hotovo\n"
+
+#: pg_ctl.c:620
+#: pg_ctl.c:696
+msgid "postmaster stopped\n"
+msgstr "postmaster zastaven\n"
+
+#: pg_ctl.c:640
+msgid ""
+"Is postmaster running?\n"
+"starting postmaster anyway\n"
+msgstr ""
+"Be¾í ji¾ postmaster?\n"
+"pøesto postmaster spou¹tím\n"
+
+#: pg_ctl.c:647
+#, c-format
+msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nemohu restartovat postmaster; postgres bì¾í (PID: %ld)\n"
+
+#: pg_ctl.c:650
+#: pg_ctl.c:719
+msgid "Please terminate postgres and try again.\n"
+msgstr "Prosím ukonèete postgres a zkuste znovu.\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: nemohu znovunaèíst postmaster; postgres bì¾í (PID: %ld)\n"
+
+#: pg_ctl.c:725
+#, c-format
+msgid "reload signal failed (PID: %ld): %s\n"
+msgstr "signál znovunaètení selhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:731
+msgid "postmaster signaled\n"
+msgstr "postmaster obdr¾el signál\n"
+
+#: pg_ctl.c:746
+#, c-format
+msgid "%s: postmaster or postgres not running\n"
+msgstr "%s: postmaster nebo postgres nebì¾í\n"
+
+#: pg_ctl.c:752
+#, c-format
+msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+msgstr "%s: samostatný \"postgres\" bì¾í (PID: %ld)\n"
+
+#: pg_ctl.c:758
+#, c-format
+msgid "%s: postmaster is running (PID: %ld)\n"
+msgstr "%s: postmaster bì¾í (PID: %ld)\n"
+
+#: pg_ctl.c:774
+#, c-format
+msgid "signal %d failed (PID: %ld): %s\n"
+msgstr "signál %d selhal (PID: %ld): %s\n"
+
+#: pg_ctl.c:801
+msgid "Unable to find exe"
+msgstr "Nemohu najít exe"
+
+#: pg_ctl.c:844
+#: pg_ctl.c:875
+msgid "Unable to open service manager\n"
+msgstr "Nemohu otevøít správce slu¾eb\n"
+
+#: pg_ctl.c:850
+#, c-format
+msgid "Service \"%s\" already registered\n"
+msgstr "Slu¾ba \"%s\" je ji¾ registrována\n"
+
+#: pg_ctl.c:861
+#, c-format
+msgid "Unable to register service \"%s\" [%d]\n"
+msgstr "Nemohu registrovat slu¾bu \"%s\" [%d]\n"
+
+#: pg_ctl.c:881
+#, c-format
+msgid "Service \"%s\" not registered\n"
+msgstr "Slu¾ba \"%s\" neregistrována\n"
+
+#: pg_ctl.c:888
+#, c-format
+msgid "Unable to open service \"%s\" [%d]\n"
+msgstr "Nemohu otevøít slu¾bu \"%s\" [%d]\n"
+
+#: pg_ctl.c:894
+#, c-format
+msgid "Unable to unregister service \"%s\" [%d]\n"
+msgstr "Nemohu zaregistrovat slu¾bu \"%s\" [%d]\n"
+
+#: pg_ctl.c:1012
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information.\n"
+msgstr ""
+"\n"
+"Zkuste \"%s --help\" pro více informací.\n"
+
+#: pg_ctl.c:1020
+#, c-format
+msgid ""
+"%s is a utility to start, stop, restart, reload configuration files,\n"
+"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"\n"
+msgstr ""
+"%s je pomùcka pro spu¹tìní, zastavení, restart, znovunaètení konfiguraèních\n"
+"souborù, nahlá¹ení stavu PostgreSQL serveru nebo ukonèení PostgreSQL\n"
+"procesu.\n"
+"\n"
+
+#: pg_ctl.c:1022
+msgid "Usage:\n"
+msgstr "Pou¾ití:\n"
+
+#: pg_ctl.c:1023
+#, c-format
+msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr "  %s start   [-w] [-D ADRESÁØ] [-s] [-l SOUBOR] [-o \"PØEPÍNAÈE\"]\n"
+
+#: pg_ctl.c:1024
+#, c-format
+msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-D ADRESÁØ] [-s] [-m MÓD-UKONÈENÍ]\n"
+
+#: pg_ctl.c:1025
+#, c-format
+msgid "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
+msgstr "  %s restart [-w] [-D ADRESÁØ] [-s] [-m MÓD-UKONÈENÍ] [-o \"PØEPÍNAÈE\"]\n"
+
+#: pg_ctl.c:1026
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D ADRESÁØ] [-s]\n"
+
+#: pg_ctl.c:1027
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D ADRESÁØ]\n"
+
+#: pg_ctl.c:1028
+#, c-format
+msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgstr "  %s kill    SIGNÁL IDPROCESU\n"
+
+#: pg_ctl.c:1030
+#, c-format
+msgid "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-o \"OPTIONS\"]\n"
+msgstr "  %s register   [-N jméno-slu¾by] [-U u¾ivatel] [-P heslo] [-D ADRESÁØ] [-o \"PØEPÍNAÈE\"]\n"
+
+#: pg_ctl.c:1031
+#, c-format
+msgid "  %s unregister [-N servicename]\n"
+msgstr "  %s unregister [-N jméno-slu¾by]\n"
+
+#: pg_ctl.c:1033
+msgid "Common options:\n"
+msgstr "Spoleèné pøepínaèe:\n"
+
+#: pg_ctl.c:1034
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata ADRESÁØ   umístìní úlo¾i¹tì databáze\n"
+
+#: pg_ctl.c:1035
+msgid "  -s, --silent only print errors, no informational messages\n"
+msgstr "  -s, --silent vypisuj jen chyby, ¾ádné informativní zprávy\n"
+
+#: pg_ctl.c:1037
+msgid "  -N       service name with which to register PostgreSQL server\n"
+msgstr "  -N       jméno slu¾by, pod kterým registrovat PostgreSQL server\n"
+
+#: pg_ctl.c:1038
+msgid "  -P       password of account to register PostgreSQL server\n"
+msgstr "  -P       heslo k úètu pro registraci PostreSQL serveru\n"
+
+#: pg_ctl.c:1039
+msgid "  -U       user name of account to register PostgreSQL server\n"
+msgstr "  -U        u¾ivatelské jméno pro registraci PostgreSQL server\n"
+
+#: pg_ctl.c:1041
+msgid "  -w           wait until operation completes\n"
+msgstr "  -w           èekat na dokonèení operace\n"
+
+#: pg_ctl.c:1042
+msgid "  -W           do not wait until operation completes\n"
+msgstr "  -W           neèekat na dokonèení operace\n"
+
+#: pg_ctl.c:1043
+msgid "  --help       show this help, then exit\n"
+msgstr "  --help       vypsat tuto nápovìdu, potom skonèit\n"
+
+#: pg_ctl.c:1044
+msgid "  --version    output version information, then exit\n"
+msgstr "  --version    vypsat informace o verzi, potom skonèit\n"
+
+#: pg_ctl.c:1045
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(Výchozí chování je èekat na ukonèení, ale ne pøi startu nebo restartu.)\n"
+"\n"
+
+#: pg_ctl.c:1046
+msgid ""
+"If the -D option is omitted, the environment variable PGDATA is used.\n"
+"\n"
+msgstr ""
+"Pokud je vynechán parametr -D, pou¾ije se promìnná prostøedí PGDATA.\n"
+"\n"
+
+#: pg_ctl.c:1047
+msgid "Options for start or restart:\n"
+msgstr "Pøepínaèe pro start nebo restart:\n"
+
+#: pg_ctl.c:1048
+msgid ""
+"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
+"                          use of this option is highly recommended.\n"
+msgstr ""
+"  -l, --log SOUBOR        zapisuj (nebo pøipoj na konec) log serveru do SOUBORU.\n"
+"                          Pou¾ití tohoto pøepínaèe se vøele doporuèuje.\n"
+
+#: pg_ctl.c:1050
+msgid ""
+"  -o OPTIONS              command line options to pass to the postmaster\n"
+"                          (PostgreSQL server executable)\n"
+msgstr ""
+"  -o PØEPÍNAÈE            pøepínaèe, které budou pøedány postmasteru\n"
+"                          (co¾ je vlastní program PostgreSQL serveru)\n"
+
+#: pg_ctl.c:1052
+msgid ""
+"  -p PATH-TO-POSTMASTER   normally not necessary\n"
+"\n"
+msgstr ""
+"  -p CESTA-K-POSTMASTERU  za normálních okolností není potøeba\n"
+"\n"
+
+#: pg_ctl.c:1053
+msgid "Options for stop or restart:\n"
+msgstr "Pøepínaèe pro zastavení nebo restart:\n"
+
+#: pg_ctl.c:1054
+msgid ""
+"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"\n"
+msgstr ""
+"  -m MÓD-UKONÈENÍ    mù¾e být 'smart', 'fast' nebo 'immediate'\n"
+"\n"
+
+#: pg_ctl.c:1055
+msgid "Allowed signal names for kill:\n"
+msgstr "Povolené signály pro \"kill\":\n"
+
+#: pg_ctl.c:1056
+msgid ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+msgstr ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+
+#: pg_ctl.c:1057
+msgid "Shutdown modes are:\n"
+msgstr "Módy ukonèení jsou:\n"
+
+#: pg_ctl.c:1058
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       skonèi potom, co se odpojí v¹ichni klienti\n"
+
+#: pg_ctl.c:1059
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        skonèi ihned, s patøièným ukonèením\n"
+
+#: pg_ctl.c:1060
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on restart\n"
+"\n"
+msgstr ""
+"  immediate   skonèi bez úplného ukonèení; pøi dal¹ím startu se spustí obnovení\n"
+"\n"
+
+#: pg_ctl.c:1061
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "Chyby hla¹te na adresu <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1086
+#, c-format
+msgid "%s: invalid shutdown mode %s\n"
+msgstr "%s: neplatný mód ukonèení %s\n"
+
+#: pg_ctl.c:1119
+#, c-format
+msgid "%s: invalid signal \"%s\"\n"
+msgstr "%s: neplatný signál \"%s\"\n"
+
+#: pg_ctl.c:1246
+#, c-format
+msgid "%s: invalid option %s\n"
+msgstr "%s: neplatný pøepínaè %s\n"
+
+#: pg_ctl.c:1257
+#, c-format
+msgid "%s: extra operation mode %s\n"
+msgstr "%s: extra operation mode %s\n"
+
+#: pg_ctl.c:1276
+#, c-format
+msgid "%s: invalid kill syntax\n"
+msgstr "%s: neplatná syntaxe ukonèení (kill)\n"
+
+#: pg_ctl.c:1294
+#, c-format
+msgid "%s: invalid operation mode %s\n"
+msgstr "%s: neplatný mód práce %s\n"
+
+#: pg_ctl.c:1304
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: není specifikována operace\n"
+
+#: pg_ctl.c:1320
+#, c-format
+msgid "%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: není zadán datový adresáø a ani není nastavena promìnná prostøedí PGDATA\n"
+
diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
index 3cc2a423e3..3a46d1314b 100644
--- a/src/bin/pg_ctl/po/zh_CN.po
+++ b/src/bin/pg_ctl/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 14:26+0000\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
 "PO-Revision-Date: 2004-06-10 11:23+0000\n"
 "Last-Translator: Bao Wei<weibao@imsi.cn>\n"
 "Language-Team: Weiping He <laser@imsi.cn>\n"
@@ -14,28 +14,28 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:184 pg_ctl.c:200 pg_ctl.c:1230
+#: pg_ctl.c:193 pg_ctl.c:209 pg_ctl.c:1293
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: ÄÚ´æÒç³ö\n"
 
-#: pg_ctl.c:431
+#: pg_ctl.c:452
 #, c-format
 msgid ""
 "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
 msgstr "%s: ÆäËû postmaster ¿ÉÄÜÕýÔÚÔËÐÐ. ³¢ÊÔÆô¶¯ postmaster.\n"
 
-#: pg_ctl.c:449
+#: pg_ctl.c:470
 #, c-format
 msgid "%s: cannot read %s\n"
 msgstr "%s: ÎÞ·¨¶ÁÈ¡ %s\n"
 
-#: pg_ctl.c:455
+#: pg_ctl.c:476
 #, c-format
 msgid "%s: option file %s must have exactly 1 line\n"
 msgstr "%s: Ñ¡ÏîÎļþ %s Ö»ÄÜÓÐÒ»ÐÐ\n"
 
-#: pg_ctl.c:497
+#: pg_ctl.c:522
 #, c-format
 msgid ""
 "The program \"postmaster\" is needed by %s but was not found in the same "
@@ -45,7 +45,7 @@ msgstr ""
 "³ÌÐò \"postmaster\" ÊÇ %s ÐèÒªµÄ, µ«Ã»ÓÐÔÚͬһ¸öĿ¼ \"%s\" ·¢ÏÖ.\n"
 "¼ì²éÄúµÄ°²×°.\n"
 
-#: pg_ctl.c:503
+#: pg_ctl.c:528
 #, c-format
 msgid ""
 "The program \"postmaster\" was found by %s but was not the same version as "
@@ -55,11 +55,11 @@ msgstr ""
 "%s ÕÒµ½³ÌÐò \"postmaster\", µ«°æ±¾ºÍ \"%s\" ²»Ò»ÖÂ.\n"
 "¼ì²éÄúµÄ°²×°.\n"
 
-#: pg_ctl.c:514
+#: pg_ctl.c:539
 msgid "Unable to run the postmaster binary\n"
 msgstr "ÎÞ·¨ÔËÐÐ postmaster ¶þ½øÖÆÎļþ\n"
 
-#: pg_ctl.c:524
+#: pg_ctl.c:549
 #, c-format
 msgid ""
 "%s: cannot start postmaster\n"
@@ -68,17 +68,17 @@ msgstr ""
 "%s: ÎÞ·¨Æô¶¯ postmaster\n"
 "¼ì²éÈÕÖ¾Êä³ö\n"
 
-#: pg_ctl.c:535
+#: pg_ctl.c:560
 #, c-format
 msgid "waiting for postmaster to start..."
 msgstr "µÈ´ý postmaster Æô¶¯ ..."
 
-#: pg_ctl.c:540
+#: pg_ctl.c:565
 #, c-format
 msgid "could not start postmaster\n"
 msgstr "ÎÞ·¨Æô¶¯ postmaster\n"
 
-#: pg_ctl.c:542
+#: pg_ctl.c:567
 #, c-format
 msgid ""
 "done\n"
@@ -87,61 +87,61 @@ msgstr ""
 "Íê³É\n"
 "postmaster ÒѾ­Æô¶¯\n"
 
-#: pg_ctl.c:545
+#: pg_ctl.c:570
 #, c-format
 msgid "postmaster starting\n"
 msgstr "Æô¶¯ postmaster\n"
 
-#: pg_ctl.c:560 pg_ctl.c:639 pg_ctl.c:709
+#: pg_ctl.c:585 pg_ctl.c:664 pg_ctl.c:734
 #, c-format
 msgid "%s: could not find %s\n"
 msgstr "%s: ÎÞ·¨ÕÒµ½ %s\n"
 
-#: pg_ctl.c:561 pg_ctl.c:710
+#: pg_ctl.c:586 pg_ctl.c:735
 msgid "Is postmaster running?\n"
 msgstr "ÊÇ·ñ postmaster ÕýÔÚÔËÐÐ?\n"
 
-#: pg_ctl.c:567
+#: pg_ctl.c:592
 #, c-format
 msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: ÎÞ·¨Í£Ö¹ postmaster; postgres ÕýÔÚÔËÐÐ (PID: %ld)\n"
 
-#: pg_ctl.c:575 pg_ctl.c:656
+#: pg_ctl.c:600 pg_ctl.c:681
 #, c-format
 msgid "stop signal failed (PID: %ld): %s\n"
 msgstr "Í£Ö¹ÐźÅʧ°Ü (PID: %ld): %s\n"
 
-#: pg_ctl.c:583
+#: pg_ctl.c:608
 #, c-format
 msgid "postmaster shutting down\n"
 msgstr "¹Ø±Õ postmaster\n"
 
-#: pg_ctl.c:590 pg_ctl.c:663
+#: pg_ctl.c:615 pg_ctl.c:688
 #, c-format
 msgid "waiting for postmaster to shut down..."
 msgstr "µÈ´ý postmaster ¹Ø±Õ ..."
 
-#: pg_ctl.c:612 pg_ctl.c:687
+#: pg_ctl.c:637 pg_ctl.c:712
 #, c-format
 msgid " failed\n"
 msgstr " ʧ°Ü\n"
 
-#: pg_ctl.c:614 pg_ctl.c:689
+#: pg_ctl.c:639 pg_ctl.c:714
 #, c-format
 msgid "%s: postmaster does not shut down\n"
 msgstr "%s: postmaster ûÓйرÕ\n"
 
-#: pg_ctl.c:618 pg_ctl.c:694
+#: pg_ctl.c:643 pg_ctl.c:719
 #, c-format
 msgid "done\n"
 msgstr "Íê³É\n"
 
-#: pg_ctl.c:620 pg_ctl.c:696
+#: pg_ctl.c:645 pg_ctl.c:721
 #, c-format
 msgid "postmaster stopped\n"
 msgstr "postmaster ÒѾ­¹Ø±Õ\n"
 
-#: pg_ctl.c:640
+#: pg_ctl.c:665
 msgid ""
 "Is postmaster running?\n"
 "starting postmaster anyway\n"
@@ -149,84 +149,84 @@ msgstr ""
 "ÊÇ·ñ postmaster ÕýÔÚÔËÐÐ?\n"
 "³¢ÊÔÆô¶¯ postmaster\n"
 
-#: pg_ctl.c:647
+#: pg_ctl.c:672
 #, c-format
 msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: ÎÞ·¨ÖØÆô postmaster; postgres ÕýÔÚÔËÐÐ (PID: %ld)\n"
 
-#: pg_ctl.c:650 pg_ctl.c:719
+#: pg_ctl.c:675 pg_ctl.c:744
 msgid "Please terminate postgres and try again.\n"
 msgstr "ÇëÖÕÖ¹ postgres ÔÙÖØÊÔ.\n"
 
-#: pg_ctl.c:716
+#: pg_ctl.c:741
 #, c-format
 msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: ÎÞ·¨ÖØÔØ postmaser; postgres ÕýÔÚÔËÐÐ (PID: %ld)\n"
 
-#: pg_ctl.c:725
+#: pg_ctl.c:750
 #, c-format
 msgid "reload signal failed (PID: %ld): %s\n"
 msgstr "ÖØÔØÐźÅʧ°Ü (PID: %ld): %s\n"
 
-#: pg_ctl.c:731
+#: pg_ctl.c:756
 #, c-format
 msgid "postmaster signaled\n"
 msgstr "postmaster ·¢³öÐźÅ\n"
 
-#: pg_ctl.c:746
+#: pg_ctl.c:771
 #, c-format
 msgid "%s: postmaster or postgres not running\n"
 msgstr "%s: postmaster »òÕß postgres ûÓÐÔËÐÐ\n"
 
-#: pg_ctl.c:752
+#: pg_ctl.c:777
 #, c-format
 msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
 msgstr "%s: Ò»¸ö¶ÀÁ¢µÄºó¶Ë \"postgres\" ÕýÔÚÔËÐÐ (PID: %ld)\n"
 
-#: pg_ctl.c:758
+#: pg_ctl.c:784
 #, c-format
 msgid "%s: postmaster is running (PID: %ld)\n"
 msgstr "%s: postmaster ÕýÔÚÔËÐÐ (PID: %ld)\n"
 
-#: pg_ctl.c:774
+#: pg_ctl.c:800
 #, c-format
 msgid "signal %d failed (PID: %ld): %s\n"
 msgstr "ÐźŠ%d ʧ°Ü (PID: %ld): %s\n"
 
-#: pg_ctl.c:801
+#: pg_ctl.c:831
 msgid "Unable to find exe"
 msgstr "ÎÞ·¨ÕÒµ½Ö´ÐÐÎļþ"
 
-#: pg_ctl.c:844 pg_ctl.c:875
+#: pg_ctl.c:878 pg_ctl.c:910
 msgid "Unable to open service manager\n"
 msgstr "ÎÞ·¨´ò¿ª·þÎñ¹ÜÀíÆ÷\n"
 
-#: pg_ctl.c:850
+#: pg_ctl.c:884
 #, c-format
 msgid "Service \"%s\" already registered\n"
 msgstr "·þÎñ \"%s\" ÒѾ­×¢²áÁË\n"
 
-#: pg_ctl.c:861
+#: pg_ctl.c:895
 #, c-format
 msgid "Unable to register service \"%s\" [%d]\n"
 msgstr "ÎÞ·¨×¢²á·þÎñ \"%s\" [%d]\n"
 
-#: pg_ctl.c:881
+#: pg_ctl.c:916
 #, c-format
 msgid "Service \"%s\" not registered\n"
 msgstr "·þÎñ \"%s\" ûÓÐ×¢²á\n"
 
-#: pg_ctl.c:888
+#: pg_ctl.c:923
 #, c-format
 msgid "Unable to open service \"%s\" [%d]\n"
 msgstr "ÎÞ·¨´ò¿ª·þÎñ \"%s\" [%d]\n"
 
-#: pg_ctl.c:894
+#: pg_ctl.c:930
 #, c-format
 msgid "Unable to unregister service \"%s\" [%d]\n"
 msgstr "ÎÞ·¨È¡Ïû×¢²á·þÎñ \"%s\" [%d]\n"
 
-#: pg_ctl.c:1012
+#: pg_ctl.c:1067
 #, c-format
 msgid ""
 "\n"
@@ -235,7 +235,7 @@ msgstr ""
 "\n"
 "ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: pg_ctl.c:1020
+#: pg_ctl.c:1075
 #, c-format
 msgid ""
 "%s is a utility to start, stop, restart, reload configuration files,\n"
@@ -246,107 +246,107 @@ msgstr ""
 "»òÕßɱµô PostgreSQL ½ø³ÌµÄ¹¤¾ß\n"
 "\n"
 
-#: pg_ctl.c:1022
+#: pg_ctl.c:1077
 #, c-format
 msgid "Usage:\n"
 msgstr "ʹÓ÷½·¨:\n"
 
-#: pg_ctl.c:1023
+#: pg_ctl.c:1078
 #, c-format
 msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-D Êý¾ÝĿ¼] [-s] [-l ÎļþÃû] [-o \"Ñ¡Ïî\"]\n"
 
-#: pg_ctl.c:1024
+#: pg_ctl.c:1079
 #, c-format
 msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-D Êý¾ÝĿ¼] [-s] [-m ¹Ø±Õģʽ]\n"
 
-#: pg_ctl.c:1025
+#: pg_ctl.c:1080
 #, c-format
 msgid ""
 "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
 msgstr "  %s restart [-w] [-D Êý¾ÝĿ¼] [-s] [-m ¹Ø±Õģʽ] [-o \"Ñ¡Ïî\"]\n"
 
-#: pg_ctl.c:1026
+#: pg_ctl.c:1081
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D Êý¾ÝĿ¼] [-s]\n"
 
-#: pg_ctl.c:1027
+#: pg_ctl.c:1082
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D Êý¾ÝĿ¼]\n"
 
-#: pg_ctl.c:1028
+#: pg_ctl.c:1083
 #, c-format
 msgid "  %s kill    SIGNALNAME PROCESSID\n"
 msgstr "  %s kill    ÐźÅÃû³Æ ½ø³Ì ID\n"
 
-#: pg_ctl.c:1030
+#: pg_ctl.c:1085
 #, c-format
 msgid ""
 "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-"
-"o \"OPTIONS\"]\n"
+"w] [-o \"OPTIONS\"]\n"
 msgstr ""
-"  %s register   [-N ·þÎñÃû³Æ] [-U Óû§Ãû] [-P ¿ÚÁî] [-D DATADIR] [-o "
-"\"OPTIONS\"]\n"
+"  %s register   [-N ·þÎñÃû³Æ] [-U Óû§Ãû] [-P ¿ÚÁî] [-D DATADIR] [-"
+"w] [-o \"Ñ¡Ïî\"]\n"
 
-#: pg_ctl.c:1031
+#: pg_ctl.c:1086
 #, c-format
 msgid "  %s unregister [-N servicename]\n"
 msgstr "  %s unregister [-N ·þÎñÃû³Æ]\n"
 
-#: pg_ctl.c:1033
+#: pg_ctl.c:1088
 #, c-format
 msgid "Common options:\n"
 msgstr "ÆÕͨѡÏî:\n"
 
-#: pg_ctl.c:1034
+#: pg_ctl.c:1089
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata Êý¾ÝĿ¼  Êý¾Ý´æ´¢µÄλÖÃ\n"
 
-#: pg_ctl.c:1035
+#: pg_ctl.c:1090
 #, c-format
 msgid "  -s, --silent only print errors, no informational messages\n"
 msgstr "  -s, --silent Ö»´òÓ¡´íÎóÐÅÏ¢, ûÓÐÆäËûÐÅÏ¢\n"
 
-#: pg_ctl.c:1037
+#: pg_ctl.c:1092
 #, c-format
 msgid "  -N       service name with which to register PostgreSQL server\n"
 msgstr "  -N       ×¢²áµ½ PostgreSQL ·þÎñÆ÷µÄ·þÎñÃû³Æ\n"
 
-#: pg_ctl.c:1038
+#: pg_ctl.c:1093
 #, c-format
 msgid "  -P       password of account to register PostgreSQL server\n"
 msgstr "  -P       ×¢²áµ½ PostgreSQL ·þÎñÆ÷ÕÊ»§µÄ¿ÚÁî\n"
 
-#: pg_ctl.c:1039
+#: pg_ctl.c:1094
 #, c-format
 msgid "  -U       user name of account to register PostgreSQL server\n"
 msgstr "  -U       ×¢²áµ½ PostgreSQL ·þÎñÆ÷ÕÊ»§µÄÓû§Ãû\n"
 
-#: pg_ctl.c:1041
+#: pg_ctl.c:1096
 #, c-format
 msgid "  -w           wait until operation completes\n"
 msgstr "  -w           µÈ´ýÖ±µ½²Ù×÷Íê³É\n"
 
-#: pg_ctl.c:1042
+#: pg_ctl.c:1097
 #, c-format
 msgid "  -W           do not wait until operation completes\n"
 msgstr "  -W           ²»Óõȴý²Ù×÷Íê³É\n"
 
-#: pg_ctl.c:1043
+#: pg_ctl.c:1098
 #, c-format
 msgid "  --help       show this help, then exit\n"
 msgstr "  --help       ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_ctl.c:1044
+#: pg_ctl.c:1099
 #, c-format
 msgid "  --version    output version information, then exit\n"
 msgstr "  --version    Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_ctl.c:1045
+#: pg_ctl.c:1100
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -355,7 +355,7 @@ msgstr ""
 "(ĬÈÏΪ¹Ø±ÕµÈ´ý, µ«²»ÊÇÆô¶¯»òÖØÆô.)\n"
 "\n"
 
-#: pg_ctl.c:1046
+#: pg_ctl.c:1101
 #, c-format
 msgid ""
 "If the -D option is omitted, the environment variable PGDATA is used.\n"
@@ -364,12 +364,12 @@ msgstr ""
 "Èç¹ûÊ¡ÂÔÁË -D Ñ¡Ïî, ½«Ê¹Óà PGDATA »·¾³±äÁ¿.\n"
 "\n"
 
-#: pg_ctl.c:1047
+#: pg_ctl.c:1102
 #, c-format
 msgid "Options for start or restart:\n"
 msgstr "Æô¶¯»òÖØÆôµÄÑ¡Ïî:\n"
 
-#: pg_ctl.c:1048
+#: pg_ctl.c:1103
 #, c-format
 msgid ""
 "  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
@@ -378,7 +378,7 @@ msgstr ""
 "  -l, --log FILENAME      дÈë (»ò×·¼Ó) ·þÎñÆ÷ÈÕÖ¾µ½Îļþ FILENAME.\n"
 "                          Ç¿ÁÒ½¨ÒéʹÓôËÑ¡Ïî.\n"
 
-#: pg_ctl.c:1050
+#: pg_ctl.c:1105
 #, c-format
 msgid ""
 "  -o OPTIONS              command line options to pass to the postmaster\n"
@@ -387,7 +387,7 @@ msgstr ""
 "  -o OPTIONS              ´«µÝ¸ø postmaster µÄÃüÁîÐÐÑ¡Ïî\n"
 "                          (PostgreSQL ·þÎñÆ÷Ö´ÐÐ)\n"
 
-#: pg_ctl.c:1052
+#: pg_ctl.c:1107
 #, c-format
 msgid ""
 "  -p PATH-TO-POSTMASTER   normally not necessary\n"
@@ -396,12 +396,12 @@ msgstr ""
 "  -p PATH-TO-POSTMASTER   Õý³£Çé¿ö²»ÐèÒª\n"
 "\n"
 
-#: pg_ctl.c:1053
+#: pg_ctl.c:1108
 #, c-format
 msgid "Options for stop or restart:\n"
 msgstr "Í£Ö¹»òÖØÆôµÄÑ¡Ïî:\n"
 
-#: pg_ctl.c:1054
+#: pg_ctl.c:1109
 #, c-format
 msgid ""
 "  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
@@ -410,12 +410,12 @@ msgstr ""
 "  -m SHUTDOWN-MODE   ¿ÉÒÔÊÇ 'smart', 'fast', »òÕß 'immediate'\n"
 "\n"
 
-#: pg_ctl.c:1055
+#: pg_ctl.c:1110
 #, c-format
 msgid "Allowed signal names for kill:\n"
 msgstr "ÔÊÐí¹Ø±ÕµÄÐźÅÃû³Æ:\n"
 
-#: pg_ctl.c:1056
+#: pg_ctl.c:1111
 #, c-format
 msgid ""
 "  HUP INT QUIT ABRT TERM USR1 USR2\n"
@@ -424,22 +424,22 @@ msgstr ""
 "  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
 
-#: pg_ctl.c:1057
+#: pg_ctl.c:1112
 #, c-format
 msgid "Shutdown modes are:\n"
 msgstr "¹Ø±ÕģʽÓÐÈçϼ¸ÖÖ:\n"
 
-#: pg_ctl.c:1058
+#: pg_ctl.c:1113
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       ËùÓпͻ§¶Ë¶Ï¿ªÁ¬½ÓºóÍ˳ö\n"
 
-#: pg_ctl.c:1059
+#: pg_ctl.c:1114
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        Ö±½ÓÍ˳ö, ÕýÈ·µÄ¹Ø±Õ\n"
 
-#: pg_ctl.c:1060
+#: pg_ctl.c:1115
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
@@ -449,47 +449,47 @@ msgstr ""
 "  immediate   ²»ÍêÈ«µÄ¹Ø±ÕÍ˳ö; ÖØÆôºó»Ö¸´\n"
 "\n"
 
-#: pg_ctl.c:1061
+#: pg_ctl.c:1116
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "´íÎ󱨸æÖÁ <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_ctl.c:1086
+#: pg_ctl.c:1141
 #, c-format
 msgid "%s: invalid shutdown mode %s\n"
 msgstr "%s: ÎÞЧµÄ¹Ø±Õģʽ %s\n"
 
-#: pg_ctl.c:1119
+#: pg_ctl.c:1174
 #, c-format
 msgid "%s: invalid signal \"%s\"\n"
 msgstr "%s: ÎÞЧÐźŠ\"%s\"\n"
 
-#: pg_ctl.c:1246
+#: pg_ctl.c:1309
 #, c-format
 msgid "%s: invalid option %s\n"
 msgstr "%s: ÎÞЧѡÏî %s\n"
 
-#: pg_ctl.c:1257
+#: pg_ctl.c:1320
 #, c-format
 msgid "%s: extra operation mode %s\n"
 msgstr "%s: ¶îÍâµÄ²Ù×÷ģʽ %s\n"
 
-#: pg_ctl.c:1276
+#: pg_ctl.c:1339
 #, c-format
 msgid "%s: invalid kill syntax\n"
 msgstr "%s: ÎÞЧµÄ kill Óï·¨\n"
 
-#: pg_ctl.c:1294
+#: pg_ctl.c:1357
 #, c-format
 msgid "%s: invalid operation mode %s\n"
 msgstr "%s: ÎÞЧµÄ²Ù×÷ģʽ %s\n"
 
-#: pg_ctl.c:1304
+#: pg_ctl.c:1367
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: ûÓÐÖ¸¶¨²Ù×÷\n"
 
-#: pg_ctl.c:1320
+#: pg_ctl.c:1383
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
index 3b1c6f0840..27491a8091 100644
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -1,12 +1,12 @@
 # simplified Chinese translation file for pg_dump and friends
 # Weiping He <laser@zhengmai.com.cn>, 2001.
-# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.5 2004/08/10 19:06:21 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.6 2004/09/13 12:35:12 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 14:25+0000\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
 "PO-Revision-Date: 2004-01-10 13:46:59+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -14,22 +14,22 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_dump.c:363 pg_restore.c:225
+#: pg_dump.c:363 pg_restore.c:229
 msgid "User name: "
 msgstr "̞: "
 
-#: pg_dump.c:399 pg_restore.c:252 pg_dumpall.c:238
+#: pg_dump.c:399 pg_restore.c:256 pg_dumpall.c:239
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: ÎÞЧµÄ -X Ñ¡Ïî -- %s\n"
 
-#: pg_dump.c:401 pg_dump.c:415 pg_dump.c:424 pg_restore.c:254 pg_restore.c:264
-#: pg_restore.c:281 pg_dumpall.c:240 pg_dumpall.c:249 pg_dumpall.c:266
+#: pg_dump.c:401 pg_dump.c:415 pg_dump.c:424 pg_restore.c:258 pg_restore.c:268
+#: pg_restore.c:285 pg_dumpall.c:241 pg_dumpall.c:250 pg_dumpall.c:267
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÊäÈë \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: pg_dump.c:422 pg_dumpall.c:264
+#: pg_dump.c:422 pg_dumpall.c:265
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: ÃüÁîÐвÎÊýÌ«¶à (µÚÒ»¸öÊÇ \"%s\")\n"
@@ -81,7 +81,7 @@ msgstr "
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "ÎÞ·¨´ò¿ªÊä³öÎļþ \"%s\" ÓÃÓÚд³ö\n"
 
-#: pg_dump.c:515 pg_backup_db.c:48
+#: pg_dump.c:515 pg_backup_db.c:52
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "ÎÞ·¨·ÖÎö°æ±¾×Ö´® \"%s\"\n"
@@ -91,7 +91,7 @@ msgstr "
 msgid "last built-in OID is %u\n"
 msgstr "×îºóµÄÄÚÖà OID ÊÇ %u\n"
 
-#: pg_dump.c:663
+#: pg_dump.c:662
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -100,17 +100,17 @@ msgstr ""
 "%s °ÑÒ»¸öÊý¾Ý¿âת´¢Îª´¿Îı¾Îļþ»òÕßÊÇÆäËü¸ñʽ.\n"
 "\n"
 
-#: pg_dump.c:664 pg_restore.c:354 pg_dumpall.c:311
+#: pg_dump.c:663 pg_restore.c:359 pg_dumpall.c:312
 #, c-format
 msgid "Usage:\n"
 msgstr "Ó÷¨:\n"
 
-#: pg_dump.c:665
+#: pg_dump.c:664
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû×Ö]\n"
 
-#: pg_dump.c:667 pg_restore.c:357 pg_dumpall.c:314
+#: pg_dump.c:666 pg_restore.c:362 pg_dumpall.c:315
 #, c-format
 msgid ""
 "\n"
@@ -119,18 +119,18 @@ msgstr ""
 "\n"
 "Ò»°ãÑ¡Ïî:\n"
 
-#: pg_dump.c:668 pg_restore.c:359
+#: pg_dump.c:667 pg_restore.c:364
 #, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ÎļþÃû        Êä³öÎļþÃû\n"
 
-#: pg_dump.c:669
+#: pg_dump.c:668
 #, c-format
 msgid ""
 "  -F, --format=c|t|p       output file format (custom, tar, plain text)\n"
 msgstr "  -F, --format=c|t|p       Êä³öÎļþ¸ñʽ (¶¨ÖÆ, tar, Ã÷ÎÄ)\n"
 
-#: pg_dump.c:670
+#: pg_dump.c:669
 #, c-format
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
@@ -139,27 +139,27 @@ msgstr ""
 "  -i, --ignore-version     µ±·þÎñÆ÷µÄ°æ±¾ºÅÓë pg_dump µÄ°æ±¾ºÅ²»Æ¥Åäʱ\n"
 "                           ÈÔ¼ÌÐøÔËÐÐ\n"
 
-#: pg_dump.c:672 pg_restore.c:363
+#: pg_dump.c:671 pg_restore.c:368
 #, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            Ïêϸģʽ\n"
 
-#: pg_dump.c:673
+#: pg_dump.c:672
 #, c-format
 msgid "  -Z, --compress=0-9       compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9       ±»Ñ¹Ëõ¸ñʽµÄѹËõ¼¶±ð\n"
 
-#: pg_dump.c:674 pg_restore.c:364 pg_dumpall.c:317
+#: pg_dump.c:673 pg_restore.c:369 pg_dumpall.c:318
 #, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_dump.c:675 pg_restore.c:365 pg_dumpall.c:318
+#: pg_dump.c:674 pg_restore.c:370 pg_dumpall.c:319
 #, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_dump.c:677 pg_restore.c:367 pg_dumpall.c:319
+#: pg_dump.c:676 pg_restore.c:372 pg_dumpall.c:320
 #, c-format
 msgid ""
 "\n"
@@ -168,51 +168,51 @@ msgstr ""
 "\n"
 "¿ØÖÆÊä³öÄÚÈÝÑ¡Ïî:\n"
 
-#: pg_dump.c:678 pg_dumpall.c:320
+#: pg_dump.c:677 pg_dumpall.c:321
 #, c-format
 msgid "  -a, --data-only          dump only the data, not the schema\n"
 msgstr "  -a, --data-only          ֻת´¢Êý¾Ý,²»°üÀ¨Ä£Ê½\n"
 
-#: pg_dump.c:679
+#: pg_dump.c:678
 #, c-format
 msgid "  -b, --blobs              include large objects in dump\n"
 msgstr "  -b, --blobs              ÔÚת´¢ÖаüÀ¨´ó¶ÔÏó\n"
 
-#: pg_dump.c:680 pg_restore.c:369
+#: pg_dump.c:679 pg_restore.c:374
 #, c-format
 msgid "  -c, --clean              clean (drop) schema prior to create\n"
 msgstr "  -c, --clean              ÏÈÇå³þ(ɾ³ý)Ô¤ÏȵÄģʽ,ÔÙ½¨Á¢\n"
 
-#: pg_dump.c:681
+#: pg_dump.c:680
 #, c-format
 msgid ""
 "  -C, --create             include commands to create database in dump\n"
 msgstr "  -C, --create             ÔÚת´¢ÖаüÀ¨ÃüÁî,ÒԱ㴴½¨Êý¾Ý¿â\n"
 
-#: pg_dump.c:682 pg_dumpall.c:322
+#: pg_dump.c:681 pg_dumpall.c:323
 #, c-format
 msgid ""
 "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
 msgstr ""
 "  -d, --inserts            Ïó INSERT Ò»ÑùµÄת´¢Êý¾Ý, Ï൱ÓÚ COPY, ÃüÁî\n"
 
-#: pg_dump.c:683 pg_dumpall.c:323
+#: pg_dump.c:682 pg_dumpall.c:324
 #, c-format
 msgid ""
 "  -D, --column-inserts     dump data as INSERT commands with column names\n"
 msgstr "  -D, --column-inserts     Ïó INSERT ´ø×Ö¶ÎÃû×ÖÃüÁîÒ»Ñùת´¢Êý¾Ý\n"
 
-#: pg_dump.c:684
+#: pg_dump.c:683
 #, c-format
 msgid "  -n, --schema=SCHEMA      dump the named schema only\n"
 msgstr "  -n, --schema=SCHEMA      ֻת´¢Ö¸¶¨Ãû³ÆµÄģʽ\n"
 
-#: pg_dump.c:685 pg_dumpall.c:325
+#: pg_dump.c:684 pg_dumpall.c:326
 #, c-format
 msgid "  -o, --oids               include OIDs in dump\n"
 msgstr "  -o, --oids               ÔÚת´¢ÖаüÀ¨ OID\n"
 
-#: pg_dump.c:686
+#: pg_dump.c:685
 #, c-format
 msgid ""
 "  -O, --no-owner           do not output commands to set object ownership\n"
@@ -221,12 +221,12 @@ msgstr ""
 "  -O, --no-owner           ÔÚÃ÷ÎĸñʽÖÐ, ÉèÖöÔÏóËùÊôÕßʱ²»Êä³ö\n"
 "                           Ã÷Áî\n"
 
-#: pg_dump.c:688 pg_dumpall.c:327
+#: pg_dump.c:687 pg_dumpall.c:328
 #, c-format
 msgid "  -s, --schema-only        dump only the schema, no data\n"
 msgstr "  -s, --schema-only        ֻת´¢Ä£Ê½, ²»°üÀ¨Êý¾Ý\n"
 
-#: pg_dump.c:689
+#: pg_dump.c:688
 #, c-format
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
@@ -235,17 +235,17 @@ msgstr ""
 "  -S, --superuser=NAME     ÔÚÃ÷ÎĸñʽÖÐ, ʹÓÃÖ¸¶¨µÄ³¬¼¶Óû§\n"
 "                           Ãû³Æ\n"
 
-#: pg_dump.c:691
+#: pg_dump.c:690
 #, c-format
 msgid "  -t, --table=TABLE        dump the named table only\n"
 msgstr "  -t, --table=TABLE        ֻת´¢Ö¸¶¨Ãû³ÆµÄ±í\n"
 
-#: pg_dump.c:692 pg_dumpall.c:329
+#: pg_dump.c:691 pg_dumpall.c:330
 #, c-format
 msgid "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      ²»Òª×ª´¢È¨ÏÞ (grant/revoke)\n"
 
-#: pg_dump.c:693 pg_dumpall.c:330
+#: pg_dump.c:692 pg_dumpall.c:331
 #, c-format
 msgid ""
 "  -X disable-dollar-quoting, --disable-dollar-quoting\n"
@@ -254,7 +254,7 @@ msgstr ""
 "  -X disable-dollar-quoting, --disable-dollar-quoting\n"
 "                           È¡ÏûÃÀÔª (·ûºÅ) ÒýºÅ, ʹÓà SQL ±ê×¼ÒýºÅ\n"
 
-#: pg_dump.c:695 pg_restore.c:383 pg_dumpall.c:332
+#: pg_dump.c:694 pg_restore.c:388 pg_dumpall.c:333
 #, c-format
 msgid ""
 "  -X disable-triggers, --disable-triggers\n"
@@ -263,7 +263,7 @@ msgstr ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           ÔÚÖ»»Ö¸´Êý¾ÝµÄ¹ý³ÌÖÐÈ¡Ïû´¥·¢Æ÷\n"
 
-#: pg_dump.c:697 pg_restore.c:385 pg_dumpall.c:334
+#: pg_dump.c:696 pg_restore.c:390 pg_dumpall.c:335
 #, c-format
 msgid ""
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
@@ -274,7 +274,7 @@ msgstr ""
 "                           ʹÓà SESSION AUTHORIZATION ÃüÁî´úÌæ\n"
 "                           OWNER TO ÃüÁî\n"
 
-#: pg_dump.c:701 pg_restore.c:389 pg_dumpall.c:338
+#: pg_dump.c:700 pg_restore.c:394 pg_dumpall.c:339
 #, c-format
 msgid ""
 "\n"
@@ -283,29 +283,29 @@ msgstr ""
 "\n"
 "Áª½ÓÑ¡Ïî:\n"
 
-#: pg_dump.c:702 pg_restore.c:390 pg_dumpall.c:339
+#: pg_dump.c:701 pg_restore.c:395 pg_dumpall.c:340
 #, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=Ö÷»úÃû        Êý¾Ý¿â·þÎñÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
 
-#: pg_dump.c:703 pg_restore.c:391 pg_dumpall.c:340
+#: pg_dump.c:702 pg_restore.c:396 pg_dumpall.c:341
 #, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=¶Ë¿ÚºÅ        Êý¾Ý¿â·þÎñÆ÷µÄ¶Ë¿ÚºÅ\n"
 
-#: pg_dump.c:704 pg_restore.c:392 pg_dumpall.c:341
+#: pg_dump.c:703 pg_restore.c:397 pg_dumpall.c:342
 #, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=Ãû×Ö      ÒÔÖ¸¶¨µÄÊý¾Ý¿âÓû§Áª½Ó\n"
 
-#: pg_dump.c:705 pg_restore.c:393 pg_dumpall.c:342
+#: pg_dump.c:704 pg_restore.c:398 pg_dumpall.c:343
 #, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
 msgstr "  -W, --password           Ç¿ÖÆ¿ÚÁîÌáʾ (×Ô¶¯)\n"
 
-#: pg_dump.c:707
+#: pg_dump.c:706
 #, c-format
 msgid ""
 "\n"
@@ -318,33 +318,33 @@ msgstr ""
 "µÄÊýÖµ.\n"
 "\n"
 
-#: pg_dump.c:709 pg_restore.c:396 pg_dumpall.c:345
+#: pg_dump.c:708 pg_restore.c:402 pg_dumpall.c:346
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "±¨¸æ´íÎóÖÁ <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_dump.c:717 pg_backup_archiver.c:1195
+#: pg_dump.c:716 pg_backup_archiver.c:1208
 msgid "*** aborted because of error\n"
 msgstr "*** ÒòΪ´íÎóÍ˳ö\n"
 
-#: pg_dump.c:799
+#: pg_dump.c:798
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "ÕýÔÚת´¢±í %s µÄÄÚÈÝ\n"
 
-#: pg_dump.c:911
+#: pg_dump.c:910
 #, c-format
 msgid ""
 "SQL command to dump the contents of table \"%s\" failed: PQendcopy() "
 "failed.\n"
 msgstr "ת´¢±í \"%s\" µÄÄÚÈÝµÄ SQL ÃüÁîʧ°Ü: PQendcopy() ʧ°Ü.\n"
 
-#: pg_dump.c:912 pg_dump.c:8057
+#: pg_dump.c:911 pg_dump.c:8058
 #, c-format
 msgid "Error message from server: %s"
 msgstr "À´×Ô·þÎñÆ÷µÄ´íÎóÐÅÏ¢: %s"
 
-#: pg_dump.c:913 pg_dump.c:8058
+#: pg_dump.c:912 pg_dump.c:8059
 #, c-format
 msgid "The command was: %s\n"
 msgstr "ÃüÁîÊÇ: %s\n"
@@ -364,55 +364,55 @@ msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr "²éѯΪÊý¾Ý¿â \"%2$s\" ·µ»ØÁ˳¬¹ýÒ»Ìõ (%1$d) pg_database ¼Ç¼\n"
 
-#: pg_dump.c:1343
+#: pg_dump.c:1341
 msgid "saving encoding\n"
 msgstr "±£´æ±àÂë\n"
 
-#: pg_dump.c:1393
+#: pg_dump.c:1391
 msgid "saving large objects\n"
 msgstr "±£´æ´ó¶ÔÏó\n"
 
-#: pg_dump.c:1426
+#: pg_dump.c:1424
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): ÎÞ·¨´ò¿ª´ó¶ÔÏó: %s"
 
-#: pg_dump.c:1439
+#: pg_dump.c:1437
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): ¶ÁÈ¡´ó¶ÔÏó´íÎó: %s"
 
-#: pg_dump.c:1573
+#: pg_dump.c:1571
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ģʽ \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:1590
+#: pg_dump.c:1588
 #, c-format
 msgid "specified schema \"%s\" does not exist\n"
 msgstr "Ö¸¶¨µÄģʽ \"%s\" ²»´æÔÚ\n"
 
-#: pg_dump.c:1627
+#: pg_dump.c:1625
 #, c-format
 msgid "schema with OID %u does not exist\n"
 msgstr "OID %u µÄģʽ²»´æÔÚ\n"
 
-#: pg_dump.c:1812
+#: pg_dump.c:1810
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: Êý¾ÝÀàÐÍ \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:1910
+#: pg_dump.c:1908
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ²Ù×÷·û \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:2075
+#: pg_dump.c:2074
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ²Ù×÷·û±í \"%s\" ÎÞЧ\n"
 
-#: pg_dump.c:2179
+#: pg_dump.c:2178
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ¾Û¼¯º¯Êý \"%s\" µÄËùÓÐÕß·Ç·¨\n"
@@ -427,32 +427,32 @@ msgstr "
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: Êý¾Ý±í \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:2608
+#: pg_dump.c:2609
 #, c-format
 msgid "specified table \"%s\" does not exist\n"
 msgstr "Ö¸¶¨µÄ±í \"%s\" ²»´æÔÚ\n"
 
-#: pg_dump.c:2715
+#: pg_dump.c:2716
 #, c-format
 msgid "reading indexes for table \"%s\"\n"
 msgstr "Ϊ±í \"%s\" ¶ÁÈ¡Ë÷Òý\n"
 
-#: pg_dump.c:2952
+#: pg_dump.c:2953
 #, c-format
 msgid "reading foreign key constraints for table \"%s\"\n"
 msgstr "Ϊ±í \"%s\" ¶ÁÈ¡Íâ¼üÔ¼Êø\n"
 
-#: pg_dump.c:3227
+#: pg_dump.c:3229
 #, c-format
 msgid "reading triggers for table \"%s\"\n"
 msgstr "Ϊ±í \"%s\" ¶ÁÈ¡´¥·¢Æ÷\n"
 
-#: pg_dump.c:3299
+#: pg_dump.c:3301
 #, c-format
 msgid "expected %d triggers on table \"%s\" but found %d\n"
 msgstr "Ô¤ÆÚÔÚ±í \"%2$s\" ÉÏÓд¥·¢Æ÷ %1$d , È´·¢ÏÖ %3$d\n"
 
-#: pg_dump.c:3344
+#: pg_dump.c:3346
 #, c-format
 msgid ""
 "query produced null referenced table name for foreign key trigger \"%s\" on "
@@ -461,138 +461,138 @@ msgstr ""
 "¶ÔÔÚ±í \"%2$s\" ÉϵÄÍâ¼ü´¥·¢Æ÷ \"%1$s\" ÉϵIJéѯÉú³ÉÁË NULL ¸öÒýÓñí(±íµÄ "
 "OID ÊÇ: %3$u)\n"
 
-#: pg_dump.c:3644
+#: pg_dump.c:3647
 #, c-format
 msgid "finding the columns and types of table \"%s\"\n"
 msgstr "ÕýÔÚ²éÕÒ±í \"%s\" µÄ×ֶκÍÀàÐÍ\n"
 
-#: pg_dump.c:3730
+#: pg_dump.c:3733
 #, c-format
 msgid "invalid column numbering in table \"%s\"\n"
 msgstr "ÔÚ±í \"%s\" ÖеÄ×ֶθöÊýÊÇÎÞЧµÄ\n"
 
-#: pg_dump.c:3764
+#: pg_dump.c:3767
 #, c-format
 msgid "finding default expressions of table \"%s\"\n"
 msgstr "ÕýÔÚ²éÕÒ±í \"%s\" µÄĬÈϱí´ïʽ\n"
 
-#: pg_dump.c:3847
+#: pg_dump.c:3850
 #, c-format
 msgid "invalid adnum value %d for table \"%s\"\n"
 msgstr "±í \"%2$s\" µÄÎÞЧ adnum Öµ %1$d\n"
 
-#: pg_dump.c:3865
+#: pg_dump.c:3868
 #, c-format
 msgid "finding check constraints for table \"%s\"\n"
 msgstr "ÕýÔÚΪ±í \"%s\" ²éÕÒ¼ì²éÔ¼Êø\n"
 
-#: pg_dump.c:3929
+#: pg_dump.c:3932
 #, c-format
 msgid "expected %d check constraints on table \"%s\" but found %d\n"
 msgstr "Ô¤¼ÆÓÐ %d ¸ö¼ì²éÔ¼ÊøÔÚ±í \"%s\" ÉÏ, µ«Ö»ÕÒµ½ %d ¸ö\n"
 
-#: pg_dump.c:3931
+#: pg_dump.c:3934
 msgid "(The system catalogs might be corrupted.)\n"
 msgstr "(ϵͳ±í¿ÉÄÜËð»µÁË.)\n"
 
-#: pg_dump.c:4617 pg_dump.c:4782 pg_dump.c:5188 pg_dump.c:5572 pg_dump.c:5869
-#: pg_dump.c:6069 pg_dump.c:6252
+#: pg_dump.c:4621 pg_dump.c:4786 pg_dump.c:5185 pg_dump.c:5570 pg_dump.c:5867
+#: pg_dump.c:6067 pg_dump.c:6250
 #, c-format
 msgid "Got %d rows instead of one from: %s"
 msgstr "Òѵõ½ %d Ìõ¼Ç¼Ìæ´úÀ´×Ô %s µÄÒ»Ìõ"
 
-#: pg_dump.c:4891
+#: pg_dump.c:4894
 #, c-format
 msgid "query yielded no rows: %s\n"
 msgstr "²éѯ·ÅÆú, ûÓмǼ: %s\n"
 
-#: pg_dump.c:5243
+#: pg_dump.c:5241
 msgid "WARNING: could not parse proargnames array\n"
 msgstr "¾¯¸æ: ÎÞ·¨·ÖÎö proargnames Êý×é\n"
 
-#: pg_dump.c:5280
+#: pg_dump.c:5278
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "º¯Êý \"%s\" µÄÒâÍâÕýÏòÒ×ʧֵ\n"
 
-#: pg_dump.c:5794
+#: pg_dump.c:5792
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "¾¯¸æ: δÕÒµ½ OID Ϊ %s µÄ²Ù×÷·û\n"
 
-#: pg_dump.c:6280
+#: pg_dump.c:6278
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
 "database version; ignored\n"
 msgstr "¾¯¸æ: ÎÞ·¨Îª´Ë°æ±¾µÄÊý¾Ý¿âÕýȷת´¢¾Û¼¯º¯Êý \"%s\"; ºöÂÔ\n"
 
-#: pg_dump.c:6412
+#: pg_dump.c:6410
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "ÎÞ·¨Îª¶ÔÏó \"%2$s\" ·ÖÎö ACL Áбí (%1$s) (%3$s)\n"
 
-#: pg_dump.c:6505
+#: pg_dump.c:6503
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "»ñÈ¡ÊÓͼ \"%s\" ¶¨ÒåµÄ²éѯûÓзµ»ØÊý¾Ý\n"
 
-#: pg_dump.c:6508
+#: pg_dump.c:6506
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "»ñÈ¡ÊÓͼ \"%s\" ¶¨ÒåµÄ²éѯ·µ»Ø³¬¹ýÒ»¸ö¶¨Òå\n"
 
-#: pg_dump.c:6517
+#: pg_dump.c:6515
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "ÊÓͼ \"%s\" µÄ¶¨ÒåÊÇ¿ÕµÄ(Á㳤)\n"
 
-#: pg_dump.c:6824
+#: pg_dump.c:6822
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "¶ÔÓÚ±í \"%2$s\" ×ֶθöÊý %1$d ÊÇÎÞЧµÄ\n"
 
-#: pg_dump.c:6925
+#: pg_dump.c:6923
 #, c-format
 msgid "missing index for constraint %s\n"
 msgstr "¶ÔÓÚÔ¼Êø %s ȱÉÙË÷Òý\n"
 
-#: pg_dump.c:7092
+#: pg_dump.c:7090
 msgid "unexpected constraint type\n"
 msgstr "ÒâÍâµÄÔ¼ÊøÀàÐÍ\n"
 
-#: pg_dump.c:7134
+#: pg_dump.c:7132
 msgid "inserted invalid OID\n"
 msgstr "²åÈëÁË·Ç·¨ OID\n"
 
-#: pg_dump.c:7140
+#: pg_dump.c:7138
 #, c-format
 msgid "maximum system OID is %u\n"
 msgstr "×î´óϵͳ OID ÊÇ %u\n"
 
-#: pg_dump.c:7181
+#: pg_dump.c:7179
 msgid "missing pg_database entry for this database\n"
 msgstr "ȱÉÙ´ËÊý¾Ý¿âµÄ pg_database ¼Ç¼\n"
 
-#: pg_dump.c:7186
+#: pg_dump.c:7184
 msgid "found more than one pg_database entry for this database\n"
 msgstr "ÕÒµ½´ËÊý¾Ý¿âµÄ¶àÓÚÒ»ÌõµÄ pg_database ¼Ç¼\n"
 
-#: pg_dump.c:7218
+#: pg_dump.c:7216
 msgid "could not find entry for pg_indexes in pg_class\n"
 msgstr "ÔÚ pg_class ÖÐÎÞ·¨Îª pg_indexes ÕÒµ½¼Ç¼\n"
 
-#: pg_dump.c:7223
+#: pg_dump.c:7221
 msgid "found more than one entry for pg_indexes in pg_class\n"
 msgstr "ÔÚ pg_class ±íÖÐÕÒµ½¶àÌõ pg_indexes µÄ¼Ç¼\n"
 
-#: pg_dump.c:7272
+#: pg_dump.c:7270
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
 msgstr "»ñÈ¡ÐòÁÐ \"%s\" µÄÊý¾ÝµÄ²éѯ·µ»ØÁË %d ÐÐ (Ô¤ÆÚÊÇ 1)\n"
 
-#: pg_dump.c:7281
+#: pg_dump.c:7279
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "»ñÈ¡ÐòÁÐ \"%s\" µÄÊý¾ÝµÄ²éѯ·µ»ØÁËÃû×Ö \"%s\"\n"
@@ -613,12 +613,12 @@ msgstr "
 msgid "fetching dependency data\n"
 msgstr "È¡»Ø´ÓÊôÊý¾Ý\n"
 
-#: pg_dump.c:7865
+#: pg_dump.c:7866
 #, c-format
 msgid "query yielded %d rows instead of one: %s\n"
 msgstr "²éѯ·ÅÆú %d Ìõ¼Ç¼, ÓÉÒ»Ìõ¼Ç¼´úÌæ: %s\n"
 
-#: pg_dump.c:8052
+#: pg_dump.c:8053
 msgid "SQL command failed\n"
 msgstr "SQL ÃüÁîʧ°Ü\n"
 
@@ -694,12 +694,12 @@ msgstr "
 msgid "reading triggers\n"
 msgstr "¶ÁÈ¡´¥·¢Æ÷\n"
 
-#: common.c:421 common.c:553 common.c:587 pg_backup_archiver.c:602
-#: pg_backup_archiver.c:946 pg_backup_archiver.c:1060
-#: pg_backup_archiver.c:1469 pg_backup_archiver.c:1619
-#: pg_backup_archiver.c:1652 pg_backup_custom.c:141 pg_backup_custom.c:146
+#: common.c:421 common.c:553 common.c:587 pg_backup_archiver.c:616
+#: pg_backup_archiver.c:959 pg_backup_archiver.c:1073
+#: pg_backup_archiver.c:1511 pg_backup_archiver.c:1661
+#: pg_backup_archiver.c:1694 pg_backup_custom.c:141 pg_backup_custom.c:146
 #: pg_backup_custom.c:152 pg_backup_custom.c:167 pg_backup_custom.c:544
-#: pg_backup_db.c:152 pg_backup_db.c:228 pg_backup_files.c:112
+#: pg_backup_db.c:156 pg_backup_db.c:232 pg_backup_files.c:112
 #: pg_backup_tar.c:168 pg_backup_tar.c:960
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
@@ -721,7 +721,7 @@ msgstr "
 msgid "archiver"
 msgstr "¹éµµ"
 
-#: pg_backup_archiver.c:126
+#: pg_backup_archiver.c:125
 msgid "could not close output archive file\n"
 msgstr "ÎÞ·¨¹Ø±ÕÊä³ö¹éµµÎļþ\n"
 
@@ -737,279 +737,296 @@ msgstr "Ϊ
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr "1.3 ÒÔÇ°µÄ¹éµµÀï²»Ö§³ÖÖ±½ÓÊý¾Ý¿âÁª½Ó\n"
 
-#: pg_backup_archiver.c:198
+#: pg_backup_archiver.c:204
 msgid "implied data-only restore\n"
 msgstr "Òþº¬µÄÖ»»Ö¸´Êý¾Ý\n"
 
-#: pg_backup_archiver.c:227
+#: pg_backup_archiver.c:237
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "ɾ³ý %s %s\n"
 
-#: pg_backup_archiver.c:251 pg_backup_archiver.c:253
+#: pg_backup_archiver.c:263 pg_backup_archiver.c:265
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "À´×Ôԭʼת´¢ÎļþµÄ¾¯¸æ: %s\n"
 
-#: pg_backup_archiver.c:260
+#: pg_backup_archiver.c:272
 #, c-format
 msgid "creating %s %s\n"
 msgstr "´´½¨ %s %s\n"
 
-#: pg_backup_archiver.c:268
+#: pg_backup_archiver.c:280
 #, c-format
 msgid "connecting to new database \"%s\" as user \"%s\"\n"
 msgstr "ÒÔÓû§ \"%2$s\" Éí·ÝÁª½Óµ½ÐÂÊý¾Ý¿â \"%1$s\"\n"
 
-#: pg_backup_archiver.c:293
+#: pg_backup_archiver.c:305
 msgid ""
 "cannot restore from compressed archive (not configured for compression "
 "support)\n"
 msgstr "ÎÞ·¨´ÓѹËõµÄ¹éµµÖлָ´ (δÅäÖÃѹËõÖ§³Ö)\n"
 
-#: pg_backup_archiver.c:313
+#: pg_backup_archiver.c:325
 msgid "WARNING: skipping large-object restoration\n"
 msgstr "¾¯¸æ: ºöÂÔ´ó¶ÔÏóµÄ»Ö¸´\n"
 
-#: pg_backup_archiver.c:323
+#: pg_backup_archiver.c:335
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "Ϊ±í \"%s\" »Ö¸´Êý¾Ý\n"
 
-#: pg_backup_archiver.c:355 pg_backup_archiver.c:440
+#: pg_backup_archiver.c:367 pg_backup_archiver.c:453
 #, c-format
 msgid "fixing up large-object cross-reference for \"%s\"\n"
 msgstr "Ϊ \"%s\" ÐÞ¸´´ó¶ÔÏóµÄ½»²æÒýÓÃ\n"
 
-#: pg_backup_archiver.c:366
+#: pg_backup_archiver.c:378
 #, c-format
 msgid "executing %s %s\n"
 msgstr "Ö´ÐÐ %s %s\n"
 
-#: pg_backup_archiver.c:386
+#: pg_backup_archiver.c:398
 #, c-format
 msgid "setting owner and acl for %s %s\n"
 msgstr "Ϊ %s %s ÉèÖÃÊôÖ÷ºÍȨÏÞ (acl)\n"
 
-#: pg_backup_archiver.c:502
+#: pg_backup_archiver.c:516
 msgid "disabling triggers\n"
 msgstr "¹Ø±Õ´¥·¢Æ÷\n"
 
-#: pg_backup_archiver.c:541
+#: pg_backup_archiver.c:555
 msgid "enabling triggers\n"
 msgstr "´ò¿ª´¥·¢Æ÷\n"
 
-#: pg_backup_archiver.c:576
+#: pg_backup_archiver.c:590
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine\n"
 msgstr "ÄÚ²¿´íÎó -- WriteData ²»ÄÜÔÚ DataDumper ¹ý³ÌµÄ»·¾³Ö®Íâµ÷ÓÃ\n"
 
-#: pg_backup_archiver.c:709
+#: pg_backup_archiver.c:723
 msgid "large-object output not supported in chosen format\n"
 msgstr "Ñ¡¶¨µÄ¸ñʽ²»Ö§³Ö´ó¶ÔÏóÊä³ö\n"
 
-#: pg_backup_archiver.c:749 pg_backup_archiver.c:837
+#: pg_backup_archiver.c:763 pg_backup_archiver.c:851
 msgid "committing large-object transactions\n"
 msgstr "Ìá½»´ó¶ÔÏóÊÂÎñ\n"
 
-#: pg_backup_archiver.c:759
+#: pg_backup_archiver.c:773
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "»Ö¸´ÁË %d ¸ö´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:776
+#: pg_backup_archiver.c:790
 msgid "cannot restore large objects without a database connection\n"
 msgstr "ûÓÐÊý¾Ý¿âÁª½ÓʱÎÞ·¨»Ö¸´´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:790
+#: pg_backup_archiver.c:804
 msgid "starting large-object transactions\n"
 msgstr "¿ªÊ¼´ó¶ÔÏóÊÂÎñ\n"
 
-#: pg_backup_archiver.c:798
+#: pg_backup_archiver.c:812
 msgid "could not create large object\n"
 msgstr "ÎÞ·¨´´½¨´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:800
+#: pg_backup_archiver.c:814
 #, c-format
 msgid "restoring large object with OID %u as %u\n"
 msgstr "°Ñ OID Ϊ %u µÄ´ó¶ÔÏó»Ö¸´Îª %u\n"
 
-#: pg_backup_archiver.c:806
+#: pg_backup_archiver.c:820
 msgid "could not open large object\n"
 msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:821
+#: pg_backup_archiver.c:835
 #, c-format
 msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
 msgstr "дʣÏÂÁË %lu ×ֽڵĴó¶ÔÏóÊý¾Ý (½á¹û = %lu)\n"
 
-#: pg_backup_archiver.c:824 pg_backup_archiver.c:1117
+#: pg_backup_archiver.c:838 pg_backup_archiver.c:1130
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "ÎÞ·¨Ð´Èë´ó¶ÔÏó (½á¹û: %lu, Ô¤ÆÚ: %lu)\n"
 
-#: pg_backup_archiver.c:870
+#: pg_backup_archiver.c:884
 msgid "could not open TOC file\n"
 msgstr "ÎÞ·¨´ò¿ª TOC Îļþ\n"
 
-#: pg_backup_archiver.c:891
+#: pg_backup_archiver.c:905
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "¾¯¸æ: ºöÂÔµÄÐÐ: %s\n"
 
-#: pg_backup_archiver.c:898
+#: pg_backup_archiver.c:912
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "ÎÞ·¨Îª ID %d ÕÒµ½¼Ç¼\n"
 
-#: pg_backup_archiver.c:908 pg_backup_files.c:156 pg_backup_files.c:439
+#: pg_backup_archiver.c:922 pg_backup_files.c:156 pg_backup_files.c:439
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "ÎÞ·¨¹Ø±Õ TOC Îļþ: %s\n"
 
-#: pg_backup_archiver.c:1008 pg_backup_files.c:130
+#: pg_backup_archiver.c:1021 pg_backup_files.c:130
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "ÎÞ·¨´ò¿ªÊä³öÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1024
+#: pg_backup_archiver.c:1037
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "ÎÞ·¨¹Ø±ÕÊä³öÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1113
+#: pg_backup_archiver.c:1126
 #, c-format
 msgid "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr "дÁË %lu ×ֽڵĴó¶ÔÏóÊý¾Ý (½á¹û = %lu)\n"
 
-#: pg_backup_archiver.c:1135
+#: pg_backup_archiver.c:1148
 msgid "could not write to compressed archive\n"
 msgstr "ÎÞ·¨Ð´ÈëѹËõµÄ¹éµµ\n"
 
-#: pg_backup_archiver.c:1143
+#: pg_backup_archiver.c:1156
 msgid "could not write to custom output routine\n"
 msgstr "ÎÞ·¨Ð´³öµ½¿Í»§Êä³ö¹ý³Ì\n"
 
-#: pg_backup_archiver.c:1158
+#: pg_backup_archiver.c:1171
 #, c-format
 msgid "could not write to output file (%lu != %lu)\n"
 msgstr "ÎÞ·¨Ð´³öµ½Êä³öÎļþ (%lu != %lu)\n"
 
-#: pg_backup_archiver.c:1362
+#: pg_backup_archiver.c:1256
+msgid "Error while INITIALIZING:\n"
+msgstr "INITIALIZING ʱ´íÎó:\n"
+
+#: pg_backup_archiver.c:1261
+msgid "Error while PROCESSING TOC:\n"
+msgstr "PROCESSING TOC ʱ´íÎó:\n"
+
+#: pg_backup_archiver.c:1266
+msgid "Error while FINALIZING:\n"
+msgstr "FINALIZING ʱ´íÎó:\n"
+
+#: pg_backup_archiver.c:1271
+#, c-format
+msgid "Error from TOC Entry %d; %u %u %s %s %s\n"
+msgstr "´íÎóÀ´×Ô TOC ¼Ç¼ %d; %u %u %s %s %s\n"
+
+#: pg_backup_archiver.c:1404
 #, c-format
 msgid "Unexpected data offset flag %d\n"
 msgstr "ÒâÍâµÄÊý¾ÝÆ«ÒƱêÖ¾ %d\n"
 
-#: pg_backup_archiver.c:1375
+#: pg_backup_archiver.c:1417
 msgid "file offset in dump file is too large\n"
 msgstr "ÔÚת´¢ÎļþÖеÄÎļþÆ«ÒÆÁ¿Ì«´ó\n"
 
-#: pg_backup_archiver.c:1487
+#: pg_backup_archiver.c:1529
 msgid "attempting to ascertain archive format\n"
 msgstr "ÊÔͼȷÈϹ鵵¸ñʽ\n"
 
-#: pg_backup_archiver.c:1507 pg_backup_files.c:148
+#: pg_backup_archiver.c:1549 pg_backup_files.c:148
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "ÎÞ·¨´ò¿ªÊäÈëÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1514
+#: pg_backup_archiver.c:1556
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡ÊäÈëÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1516
+#: pg_backup_archiver.c:1558
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "ÊäÈëÎļþÌ«¶Ì (¶ÁÁË %lu, Ô¤ÆÚ 5)\n"
 
-#: pg_backup_archiver.c:1569
+#: pg_backup_archiver.c:1611
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "ÊäÈëÎļþ¿´ÉÏÈ¥²»ÏóÓÐЧµÄ¹éµµ (Ì«¶Ì?)\n"
 
-#: pg_backup_archiver.c:1572
+#: pg_backup_archiver.c:1614
 msgid "input file does not appear to be a valid archive\n"
 msgstr "ÊäÈëÎļþ¿´ÉÏÈ¥²»ÏóÓÐЧµÄ¹éµµ\n"
 
-#: pg_backup_archiver.c:1590
+#: pg_backup_archiver.c:1632
 #, c-format
 msgid "read %lu bytes into lookahead buffer\n"
 msgstr "¶ÁÈ¡ %lu ×Ö½Úµ½Ô¤ÀÀ»º³åÇø\n"
 
-#: pg_backup_archiver.c:1597
+#: pg_backup_archiver.c:1639
 #, c-format
 msgid "could not close the input file after reading header: %s\n"
 msgstr "¶ÁÈ¡Í·Ö®ºóÎÞ·¨¹Ø±ÕÊäÈëÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1614
+#: pg_backup_archiver.c:1656
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "Ϊ %s ·ÖÅä AH, ¸ñʽ %d\n"
 
-#: pg_backup_archiver.c:1668
+#: pg_backup_archiver.c:1710
 #, c-format
 msgid "archive format is %d\n"
 msgstr "¹éµµ¸ñʽÊÇ %d\n"
 
-#: pg_backup_archiver.c:1696
+#: pg_backup_archiver.c:1738
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "²»¿Éʶ±ðµÄÎļþ¸ñʽ \"%d\"\n"
 
-#: pg_backup_archiver.c:1823
+#: pg_backup_archiver.c:1865
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "¼Ç¼ ID %d ³¬³ö·¶Î§ - ¿ÉÄÜÊÇËð»µÁ赀 TOC\n"
 
-#: pg_backup_archiver.c:1905
+#: pg_backup_archiver.c:1947
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "Ϊ %3$s %4$s ¶ÁÈ¡ TOC ¼Ç¼ %1$d (ID %2$d)\n"
 
-#: pg_backup_archiver.c:2064
+#: pg_backup_archiver.c:2109
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "ÎÞ·¨ÉèÖûỰÓû§Îª \"%s\": %s"
 
-#: pg_backup_archiver.c:2427
+#: pg_backup_archiver.c:2494
 msgid ""
 "WARNING: requested compression not available in this installation -- archive "
 "will be uncompressed\n"
 msgstr "¾¯¸æ: ËùÒªÇóµÄѹËõÎÞ·¨ÔÚ±¾´Î°²×°ÖлñÈ¡ - ¹éµµ½«²»±»Ñ¹Ëõ\n"
 
-#: pg_backup_archiver.c:2460
+#: pg_backup_archiver.c:2527
 msgid "did not find magic string in file header\n"
 msgstr "ÔÚÎļþÍ·ÖÐûÓÐÕÒµ½Ä§Êõ×Ö´®\n"
 
-#: pg_backup_archiver.c:2474
+#: pg_backup_archiver.c:2541
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "ÔÚÎļþÍ·ÖÐÓв»Ö§³ÖµÄ°æ±¾ (%d.%d)\n"
 
-#: pg_backup_archiver.c:2479
+#: pg_backup_archiver.c:2546
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "ÕûÊý³ß´ç (%lu) µÄ½¡È«¼ì²éʧ°Ü\n"
 
-#: pg_backup_archiver.c:2483
+#: pg_backup_archiver.c:2550
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "may fail\n"
 msgstr "¾¯¸æ: ¹éµµÊÇÔÚһ̨ÓÐןü´óµÄÕûÊýµÄ»úÆ÷ÉÏÖÆ×÷µÄ, ÓÐЩ²Ù×÷¿ÉÄÜʧ°Ü\n"
 
-#: pg_backup_archiver.c:2493
+#: pg_backup_archiver.c:2560
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "Ô¤Æڵĸñʽ (%d) ºÍÔÚÎļþÀïÕÒµ½µÄ¸ñʽ (%d) ²»Í¬\n"
 
-#: pg_backup_archiver.c:2509
+#: pg_backup_archiver.c:2576
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression -- no data will be available\n"
 msgstr "¾¯¸æ: ¹éµµÊÇѹËõ¹ýµÄ, µ«Êǵ±Ç°°²×°²»Ö§³ÖѹËõ - Êý¾Ý½«²»¿ÉʹÓÃ\n"
 
-#: pg_backup_archiver.c:2527
+#: pg_backup_archiver.c:2594
 msgid "WARNING: invalid creation date in header\n"
 msgstr "¾¯¸æ: ÔÚÍ·ÖеĴ´½¨ÈÕÆÚÎÞЧ\n"
 
@@ -1119,146 +1136,146 @@ msgstr "
 msgid "archiver (db)"
 msgstr "¹éµµ (db)"
 
-#: pg_backup_db.c:64
+#: pg_backup_db.c:68
 msgid "could not get server_version from libpq\n"
 msgstr "ÎÞ·¨´Ó libpq »ñÈ¡·þÎñÆ÷°æ±¾\n"
 
-#: pg_backup_db.c:74
+#: pg_backup_db.c:78
 #, c-format
 msgid "server version: %s; %s version: %s\n"
 msgstr "·þÎñÆ÷°æ±¾: %s; %s °æ±¾: %s\n"
 
-#: pg_backup_db.c:77
+#: pg_backup_db.c:81
 msgid "proceeding despite version mismatch\n"
 msgstr "ºöÂÔ°æ±¾²îÒì¼ÌÐø´¦Àí\n"
 
-#: pg_backup_db.c:79
+#: pg_backup_db.c:83
 msgid ""
 "aborting because of version mismatch  (Use the -i option to proceed "
 "anyway.)\n"
 msgstr "Òò°æ±¾²îÒìÍ˳ö (Óà -i Ñ¡ÏîºöÂÔ²îÒì¼ÌÐø´¦Àí.)\n"
 
-#: pg_backup_db.c:146
+#: pg_backup_db.c:150
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "ÒÔÓû§ \"%2$s\" µÄÉí·ÝÁª½Óµ½Êý¾Ý¿â \"%1$s\"\n"
 
-#: pg_backup_db.c:150 pg_backup_db.c:183 pg_backup_db.c:226 pg_backup_db.c:255
-#: pg_dumpall.c:887 pg_dumpall.c:913
+#: pg_backup_db.c:154 pg_backup_db.c:187 pg_backup_db.c:230 pg_backup_db.c:259
+#: pg_dumpall.c:916 pg_dumpall.c:942
 msgid "Password: "
 msgstr "¿ÚÁî: "
 
-#: pg_backup_db.c:162
+#: pg_backup_db.c:166
 msgid "failed to reconnect to database\n"
 msgstr "ÓëÊý¾Ý¿âÖØÐÂÁª½Óʧ°Ü\n"
 
-#: pg_backup_db.c:186
+#: pg_backup_db.c:190
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "ÎÞ·¨ÓëÊý¾Ý¿âÖØÐÂÁª½Ó: %s"
 
-#: pg_backup_db.c:222
+#: pg_backup_db.c:226
 msgid "already connected to a database\n"
 msgstr "ÒѾ­ÓëÒ»¸öÊý¾Ý¿âÁª½Ó\n"
 
-#: pg_backup_db.c:245
+#: pg_backup_db.c:249
 msgid "failed to connect to database\n"
 msgstr "ÓëÊý¾Ý¿âÁª½Óʧ°Ü\n"
 
-#: pg_backup_db.c:264
+#: pg_backup_db.c:268
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "ÓëÊý¾Ý¿â \"%s\" Áª½Óʧ°Ü: %s"
 
-#: pg_backup_db.c:279
+#: pg_backup_db.c:283
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:307
+#: pg_backup_db.c:312
 #, c-format
 msgid "%s: no result from server\n"
 msgstr "%s: ûÓÐÀ´×Ô·þÎñÆ÷µÄ½á¹û\n"
 
-#: pg_backup_db.c:314
+#: pg_backup_db.c:319
 msgid "COPY command executed in non-primary connection\n"
 msgstr "COPY ÃüÁîÔÚûÓÐÖ÷Áª½ÓµÄ»·¾³ÏÂÖ´ÐÐ\n"
 
-#: pg_backup_db.c:393
+#: pg_backup_db.c:409
 msgid "error returned by PQputline\n"
 msgstr "PQputline ·µ»Ø´íÎó\n"
 
-#: pg_backup_db.c:404
+#: pg_backup_db.c:420
 msgid "error returned by PQendcopy\n"
 msgstr "PQendcopy ·µ»Ø´íÎó\n"
 
-#: pg_backup_db.c:448
+#: pg_backup_db.c:480
 msgid "could not execute query"
 msgstr "ÎÞ·¨Ö´Ðвéѯ"
 
-#: pg_backup_db.c:583
+#: pg_backup_db.c:700
 #, c-format
 msgid "could not find OID columns of table \"%s\": %s"
 msgstr "ÎÞ·¨Ñ°ÕÒ±í \"%s\" µÄ OID ×Ö¶Î: %s"
 
-#: pg_backup_db.c:589
+#: pg_backup_db.c:706
 #, c-format
 msgid "no OID type columns in table %s\n"
 msgstr "±í %s ÖÐûÓÐ OID ÀàÐÍ×Ö¶Î\n"
 
-#: pg_backup_db.c:603
+#: pg_backup_db.c:720
 #, c-format
 msgid "fixing large object cross-references for %s.%s\n"
 msgstr "Ϊ %s.%s ÐÞ²¹´ó¶ÔÏó½»²æÒýÓÃ\n"
 
-#: pg_backup_db.c:642
+#: pg_backup_db.c:759
 #, c-format
 msgid "SQL: %s\n"
 msgstr "SQL: %s\n"
 
-#: pg_backup_db.c:647
+#: pg_backup_db.c:764
 #, c-format
 msgid "could not update column \"%s\" of table \"%s\": %s"
 msgstr "ÎÞ·¨¸üбí \"%2$s\" µÄ×ֶΠ\"%1$s\": %3$s"
 
-#: pg_backup_db.c:652
+#: pg_backup_db.c:769
 #, c-format
 msgid "error while updating column \"%s\" of table \"%s\": %s"
 msgstr "¸üбí \"%2$s\" µÄ×ֶΠ\"%1$s\" ʱ³ö´í: %3$s"
 
-#: pg_backup_db.c:675
+#: pg_backup_db.c:792
 msgid "creating table for large object cross-references\n"
 msgstr "Ϊ´ó¶ÔÏó½»²æÒýÓô´½¨±í\n"
 
-#: pg_backup_db.c:678
+#: pg_backup_db.c:795
 msgid "could not create large object cross-reference table"
 msgstr "ÎÞ·¨´´½¨´ó¶ÔÏó½»²æÒýÓñí"
 
-#: pg_backup_db.c:688
+#: pg_backup_db.c:805
 msgid "creating index for large object cross-references\n"
 msgstr "Ϊ´ó¶ÔÏó½»²æÒýÓô´½¨Ë÷Òý\n"
 
-#: pg_backup_db.c:692
+#: pg_backup_db.c:809
 msgid "could not create index on large object cross-reference table"
 msgstr "ÎÞ·¨ÔÚ´ó¶ÔÏó½»²æÒýÓñíÉÏ´´½¨Ë÷Òý"
 
-#: pg_backup_db.c:705
+#: pg_backup_db.c:822
 msgid "could not create large object cross-reference entry"
 msgstr "ÎÞ·¨´´½¨´ó¶ÔÏó½»²æÒýÓüǼ"
 
-#: pg_backup_db.c:717
+#: pg_backup_db.c:834
 msgid "could not start database transaction"
 msgstr "ÎÞ·¨¿ªÊ¼Êý¾Ý¿âÊÂÎñ"
 
-#: pg_backup_db.c:731
+#: pg_backup_db.c:848
 msgid "could not start transaction for large object cross-references"
 msgstr "ÎÞ·¨Îª´ó¶ÔÏó½»²æÒýÓÃÆô¶¯ÊÂÎñ"
 
-#: pg_backup_db.c:744
+#: pg_backup_db.c:861
 msgid "could not commit database transaction"
 msgstr "ÎÞ·¨Ìá½»Êý¾Ý¿âÊÂÎñ"
 
-#: pg_backup_db.c:757
+#: pg_backup_db.c:874
 msgid "could not commit transaction for large object cross-references"
 msgstr "ÎÞ·¨Îª´ó¶ÔÏó½»²æÒýÓÃÌá½»ÊÂÎñ"
 
@@ -1482,17 +1499,17 @@ msgstr ""
 msgid "could not write tar header\n"
 msgstr "ÎÞ·¨Ð´ tar Í·\n"
 
-#: pg_restore.c:279
+#: pg_restore.c:283
 #, c-format
 msgid "%s: cannot specify both -d and -f output\n"
 msgstr "%s: ²»ÄÜͬʱָ¶¨ -d ºÍ -f Êä³ö\n"
 
-#: pg_restore.c:339
+#: pg_restore.c:344
 #, c-format
 msgid "WARNING, errors ignored on restore: %d\n"
 msgstr "¾¯¸æ, »Ö¸´ÖкöÂÔ´íÎó: %d\n"
 
-#: pg_restore.c:353
+#: pg_restore.c:358
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1501,48 +1518,48 @@ msgstr ""
 "%s ´ÓÒ»¸ö¹éµµÖлָ´Ò»¸öÓÉ pg_dump ´´½¨µÄ PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: pg_restore.c:355
+#: pg_restore.c:360
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [Ñ¡Ïî]... [ÎļþÃû]\n"
 
-#: pg_restore.c:358
+#: pg_restore.c:363
 #, c-format
 msgid "  -d, --dbname=NAME        output database name\n"
 msgstr "  -d, --dbname=Ãû×Ö        Êý¾Ý¿âÃû×Ö\n"
 
-#: pg_restore.c:360
+#: pg_restore.c:365
 #, c-format
 msgid "  -F, --format=c|t         specify backup file format\n"
 msgstr "  -F, --format=c|t         Ö¸¶¨±¸·ÝÎļþ¸ñʽ\n"
 
-#: pg_restore.c:361
+#: pg_restore.c:366
 #, c-format
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 msgstr "  -i, --ignore-version     µ±·þÎñÆ÷°æ±¾²»Æ¥Åäʱ¼ÌÐøÔËÐÐ\n"
 
-#: pg_restore.c:362
+#: pg_restore.c:367
 #, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               ´òÓ¡¹éµµÎļþµÄ TOC ¸ÅÊö\n"
 
-#: pg_restore.c:368
+#: pg_restore.c:373
 #, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
 msgstr "  -a, --data-only          Ö»»Ö¸´Êý¾Ý, ²»°üÀ¨Ä£Ê½\n"
 
-#: pg_restore.c:370
+#: pg_restore.c:375
 #, c-format
 msgid "  -C, --create             issue commands to create the database\n"
 msgstr "  -C, --create             ÔËÐÐÃüÁî´´½¨Êý¾Ý¿â\n"
 
-#: pg_restore.c:371
+#: pg_restore.c:376
 #, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=Ãû×Ö         »Ö¸´Ö¸¶¨Ãü×ÖµÄË÷Òý\n"
 
-#: pg_restore.c:372
+#: pg_restore.c:377
 #, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
@@ -1551,7 +1568,7 @@ msgstr ""
 "  -L, --use-list=ÎļþÃû    ´ÓÕâ¸öÎļþÖÐʹÓÃÖ¸¶¨µÄÄÚÈݱíÅÅÐò\n"
 "                           Êä³ö\n"
 
-#: pg_restore.c:374 pg_dumpall.c:326
+#: pg_restore.c:379 pg_dumpall.c:327
 #, c-format
 msgid ""
 "  -O, --no-owner           do not output commands to set object ownership\n"
@@ -1559,7 +1576,7 @@ msgstr ""
 "  -O, --no-owner           ÉèÖöÔÏóµÄËùÊôÕßʱ²»Êä³ö\n"
 "                           ÃüÁî\n"
 
-#: pg_restore.c:375
+#: pg_restore.c:380
 #, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
@@ -1568,12 +1585,12 @@ msgstr ""
 "  -P, --function=Ãû×Ö(²ÎÊý)\n"
 "                           »Ö¸´Ö¸¶¨Ãû×ֵĺ¯Êý\n"
 
-#: pg_restore.c:377
+#: pg_restore.c:382
 #, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
 msgstr "  -s, --schema-only        Ö»»Ö¸´Ä£Ê½, ²»°üÀ¨Êý¾Ý\n"
 
-#: pg_restore.c:378
+#: pg_restore.c:383
 #, c-format
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use for\n"
@@ -1582,24 +1599,29 @@ msgstr ""
 "  -S, --superuser=NAME     ʹÓÃÖ¸¶¨µÄ³¬¼¶Óû§À´È¡Ïû\n"
 "                           ´¥·¢Æ÷\n"
 
-#: pg_restore.c:380
+#: pg_restore.c:385
 #, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAME         »Ö¸´Ö¸¶¨Ãü×ֵıí\n"
 
-#: pg_restore.c:381
+#: pg_restore.c:386
 #, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAME       »Ö¸´Ö¸¶¨Ãü×ֵĴ¥·¢Æ÷\n"
 
-#: pg_restore.c:382
+#: pg_restore.c:387
 #, c-format
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr "  -x, --no-privileges      Ìø¹ý´¦ÀíȨÏ޵Ļָ´ (grant/revoke)\n"
 
-#: pg_restore.c:395
+#: pg_restore.c:399
+#, c-format
+msgid "  -e, --exit-on-error      exit on error, default is to continue\n"
+msgstr "  -e, --exit-on-error      ·¢Éú´íÎóÍ˳ö, ĬÈÏΪ¼ÌÐø\n"
+
+#: pg_restore.c:401
 #, c-format
 msgid ""
 "\n"
@@ -1610,7 +1632,7 @@ msgstr ""
 "Èç¹ûûÓÐÌṩÊäÈëÎļþÃû, ÔòʹÓñê×¼ÊäÈë.\n"
 "\n"
 
-#: pg_dumpall.c:143
+#: pg_dumpall.c:144
 #, c-format
 msgid ""
 "The program \"pg_dump\" is needed by %s but was not found in the same "
@@ -1620,7 +1642,7 @@ msgstr ""
 "%s ÐèÒª³ÌÐò \"pg_dump\", µ«ÊÇÔÚͬһ¸öĿ¼ \"%s\" ûÓÐÕÒµ½.\n"
 "¼ì²éÄúµÄ°²×°.\n"
 
-#: pg_dumpall.c:149
+#: pg_dumpall.c:150
 #, c-format
 msgid ""
 "The program \"pg_dump\" was found by %s but was not the same version as \"%s"
@@ -1630,7 +1652,7 @@ msgstr ""
 "%s ÕÒµ½³ÌÐò \"pg_dump\", µ«ÊǺͰ汾 \"%s\" ²»Ò»ÖÂ.\n"
 "¼ì²éÄúµÄ°²×°.\n"
 
-#: pg_dumpall.c:310
+#: pg_dumpall.c:311
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -1639,12 +1661,12 @@ msgstr ""
 "%s ³éÈ¡Ò»¸ö PostgreSQL Êý¾Ý¿â´Ø½øÒ»¸ö SQL ½Å±¾Îļþ.\n"
 "\n"
 
-#: pg_dumpall.c:312
+#: pg_dumpall.c:313
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [Ñ¡Ïî]...\n"
 
-#: pg_dumpall.c:315
+#: pg_dumpall.c:316
 #, c-format
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
@@ -1653,24 +1675,24 @@ msgstr ""
 "  -i, --ignore-version     µ±·þÎñÆ÷°æ±¾Óë pg_dumpall ²»Æ¥Åäʱ\n"
 "                           ¼ÌÐøÔËÐÐ\n"
 
-#: pg_dumpall.c:321
+#: pg_dumpall.c:322
 #, c-format
 msgid "  -c, --clean              clean (drop) databases prior to create\n"
 msgstr "  -c, --clean              Çå³ý (ɾ³ý) Ô¤ÏȵÄÊý¾Ý¿â, ÒÔ±ãÔÙ´´½¨\n"
 
-#: pg_dumpall.c:324
+#: pg_dumpall.c:325
 #, c-format
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr "  -g, --globals-only       ֻת´¢È«¾Ö¶ÔÏó, ²»°üÀ¨Êý¾Ý¿â\n"
 
-#: pg_dumpall.c:328
+#: pg_dumpall.c:329
 #, c-format
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in the "
 "dump\n"
 msgstr "  -S, --superuser=NAME     ÔÚת´¢ÖÐ, Ö¸¶¨µÄ³¬¼¶Óû§Ãû\n"
 
-#: pg_dumpall.c:344
+#: pg_dumpall.c:345
 #, c-format
 msgid ""
 "\n"
@@ -1681,62 +1703,62 @@ msgstr ""
 "½«°Ñ SQL ½Å±¾Ð´µ½±ê×¼Êä³öÉÏ.\n"
 "\n"
 
-#: pg_dumpall.c:539
+#: pg_dumpall.c:545
 #, c-format
 msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
 msgstr "%1$s: ÎÞ·¨Îª±í¿Õ¼ä \"%3$s\" ·ÖÎö ACL Áбí (%2$s)\n"
 
-#: pg_dumpall.c:671
+#: pg_dumpall.c:677
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%1$s: ÎÞ·¨ÎªÊý¾Ý¿â \"%3$s\" ·ÖÎö ACL Áбí (%2$s)\n"
 
-#: pg_dumpall.c:817
+#: pg_dumpall.c:827
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: ÕýÔÚת´¢Êý¾Ý¿â \"%s\"...\n"
 
-#: pg_dumpall.c:823
+#: pg_dumpall.c:833
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: pg_dump ʧ°ÜÔÚÊý¾Ý¿â \"%s\", ÕýÔÚÍ˳ö\n"
 
-#: pg_dumpall.c:859
+#: pg_dumpall.c:888
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: ÕýÔÚÔËÐÐ \"%s\"\n"
 
-#: pg_dumpall.c:900
+#: pg_dumpall.c:929
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: ÎÞ·¨ÓëÊý¾Ý¿â \"%s\" Áª½Ó\n"
 
-#: pg_dumpall.c:923
+#: pg_dumpall.c:952
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨ÓëÊý¾Ý¿â \"%s\" Áª½Ó: %s\n"
 
-#: pg_dumpall.c:931
+#: pg_dumpall.c:960
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: ÎÞ·¨´Ó·þÎñÆ÷»ñÈ¡°æ±¾\n"
 
-#: pg_dumpall.c:937
+#: pg_dumpall.c:966
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: ÎÞ·¨·ÖÎö°æ±¾×Ö´® \"%s\"\n"
 
-#: pg_dumpall.c:956
+#: pg_dumpall.c:985
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: Ö´ÐÐ %s\n"
 
-#: pg_dumpall.c:962
+#: pg_dumpall.c:991
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ²éѯʧ°Ü: %s"
 
-#: pg_dumpall.c:963
+#: pg_dumpall.c:992
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: ²éѯÊÇ: %s\n"
diff --git a/src/bin/pg_resetxlog/po/cs.po b/src/bin/pg_resetxlog/po/cs.po
index 354494c996..88fd2c32ad 100644
--- a/src/bin/pg_resetxlog/po/cs.po
+++ b/src/bin/pg_resetxlog/po/cs.po
@@ -1,76 +1,76 @@
 # Czech translation of pg_resetxlog messages
 # Karel Zak <zakkr@zf.jcu.cz>, 2003.
 #
-# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/cs.po,v 1.2 2003/11/29 22:40:48 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_resetxlog/po/cs.po,v 1.3 2004/09/13 12:26:46 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-06-29 12:25+0200\n"
-"PO-Revision-Date: 2003-07-13 00:04-0000\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
+"POT-Creation-Date: 2004-08-16 13:07-0300\n"
+"PO-Revision-Date: 2004-08-17 09:20+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
 "Language-Team: Karel ®ák <zakkr@zf.jcu.cz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:120
 #, c-format
-msgid "%s: invalid argument for -x option\n"
-msgstr "%s: neplatný parametr pro -x pøepínaè\n"
+msgid "%s: invalid argument for option -x\n"
+msgstr "%s: neplatný argument pro pøepínaè -x\n"
 
-#: pg_resetxlog.c:142
-#: pg_resetxlog.c:157
+#: pg_resetxlog.c:121
+#: pg_resetxlog.c:136
+#: pg_resetxlog.c:151
+#: pg_resetxlog.c:158
+#: pg_resetxlog.c:164
 #: pg_resetxlog.c:172
-#: pg_resetxlog.c:179
-#: pg_resetxlog.c:185
-#: pg_resetxlog.c:193
 #, c-format
-msgid "Try '%s --help' for more information.\n"
-msgstr "Zkuste '%s --help' pro více informací.\n"
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "Zkuste \"%s --help\" pro více informací.\n"
 
-#: pg_resetxlog.c:147
+#: pg_resetxlog.c:126
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ID transakce (-x) nesmí být 0\n"
 
-#: pg_resetxlog.c:156
+#: pg_resetxlog.c:135
 #, c-format
-msgid "%s: invalid argument for -o option\n"
-msgstr "%s: neplatný parametr pro -o pøepínaè\n"
+msgid "%s: invalid argument for option -o\n"
+msgstr "%s: neplatný argument pro pøepínaè -o\n"
 
-#: pg_resetxlog.c:162
+#: pg_resetxlog.c:141
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) nesmí být 0\n"
 
-#: pg_resetxlog.c:171
-#: pg_resetxlog.c:178
+#: pg_resetxlog.c:150
+#: pg_resetxlog.c:157
 #, c-format
-msgid "%s: invalid argument for -l option\n"
-msgstr "%s: neplatný parametr pro -l pøepínaè\n"
+msgid "%s: invalid argument for option -l\n"
+msgstr "%s: neplatný argument pro pøepínaè -l\n"
 
-#: pg_resetxlog.c:192
+#: pg_resetxlog.c:171
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: není specifikován datový adresáø\n"
 
-#: pg_resetxlog.c:212
-#: pg_resetxlog.c:308
+#: pg_resetxlog.c:191
+#: pg_resetxlog.c:287
 #, c-format
-msgid "%s: could not open %s for reading: %s\n"
-msgstr "%s: nelze otevøít %s pro ètení: %s\n"
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: nelze otevøít soubor \"%s\" pro ètení: %s\n"
 
-#: pg_resetxlog.c:218
+#: pg_resetxlog.c:197
 #, c-format
 msgid ""
-"%s: lock file %s exists\n"
+"%s: lock file \"%s\" exists\n"
 "Is a server running? If not, delete the lock file and try again.\n"
 msgstr ""
-"%s: soubor se zámkem %s existuje\n"
-"Nebì¾í ji¾ server? Jestli¾e ne sma¾te soubor se zámkem a zkuste to znova.\n"
+"%s: soubor se zámkem \"%s\" existuje\n"
+"Nebì¾í ji¾ server? Jestli¾e ne, sma¾te soubor se zámkem a zkuste to znova.\n"
 
-#: pg_resetxlog.c:257
+#: pg_resetxlog.c:236
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -78,7 +78,7 @@ msgstr ""
 "\n"
 "Jestli¾e tyto hodnoty vypadají akceptovatelnì, pou¾ijte -f pro vynucený reset.\n"
 
-#: pg_resetxlog.c:269
+#: pg_resetxlog.c:248
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -86,49 +86,49 @@ msgid ""
 msgstr ""
 "Databázový server nebyl ukonèen standardnì.\n"
 "Resetování transakèního logu mù¾e být dùvodem ke ztrátì dat.\n"
-"Jestli¾e to chcete i tak provést pou¾ijte -f pro vynucený reset.\n"
+"Jestli¾e i pøesto chcete pokraèovat, pou¾ijte -f pro vynucený reset.\n"
 
-#: pg_resetxlog.c:282
+#: pg_resetxlog.c:261
 msgid "Transaction log reset\n"
 msgstr "Transakèní log resetován\n"
 
-#: pg_resetxlog.c:311
+#: pg_resetxlog.c:290
 #, c-format
 msgid ""
-"If you are sure the data directory path is correct, do\n"
+"If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
 "and try again.\n"
 msgstr ""
-"Máte-li jistotu, ¾e jsou data v adresáøi korektní, proveïte\n"
+"Máte-li jistotu, ¾e je cesta k datovému adresáøi správná, proveïte\n"
 "  touch %s\n"
 "a zkuste to znovu.\n"
 
-#: pg_resetxlog.c:324
+#: pg_resetxlog.c:303
 #, c-format
-msgid "%s: could not read %s: %s\n"
-msgstr "%s: nelze èíst %s: %s\n"
+msgid "%s: could not read file \"%s\": %s\n"
+msgstr "%s: nelze èíst soubor \"%s\": %s\n"
 
-#: pg_resetxlog.c:347
+#: pg_resetxlog.c:326
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control existuje, ale s neplatným kontrolním souètem CRC; postupujte opatrnì\n"
 
-#: pg_resetxlog.c:356
+#: pg_resetxlog.c:335
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control existuje, ale je po¹kozen nebo neznáme verze; ignoruji to\n"
+msgstr "%s: pg_control existuje, ale je po¹kozen nebo neznámé verze; ignoruji to\n"
 
-#: pg_resetxlog.c:407
+#: pg_resetxlog.c:399
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
-msgstr "%s: neplatné LC_COLLATE nastavení\n"
+msgstr "%s: neplatné nastavení LC_COLLATE\n"
 
-#: pg_resetxlog.c:414
+#: pg_resetxlog.c:406
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
-msgstr "%s: neplatné LC_CTYPE nastavení\n"
+msgstr "%s: neplatné nastavení LC_CTYPE\n"
 
-#: pg_resetxlog.c:436
+#: pg_resetxlog.c:430
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -136,7 +136,7 @@ msgstr ""
 "Odhadnuté hodnoty pg_controlu:\n"
 "\n"
 
-#: pg_resetxlog.c:438
+#: pg_resetxlog.c:432
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -144,146 +144,151 @@ msgstr ""
 "Hodnoty pg_controlu:\n"
 "\n"
 
-#: pg_resetxlog.c:440
+#: pg_resetxlog.c:441
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "Èíslo verze pg_controlu:            %u\n"
 
-#: pg_resetxlog.c:441
+#: pg_resetxlog.c:442
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Èíslo verze katalogu:               %u\n"
 
-#: pg_resetxlog.c:442
+#: pg_resetxlog.c:443
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Identifikátor databázového systému:   %s\n"
+
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "Souèasné ID log souboru:                  %u\n"
 
-#: pg_resetxlog.c:443
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "Následující segment log souboru:                %u\n"
 
-#: pg_resetxlog.c:444
+#: pg_resetxlog.c:446
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "Poslední umístìní StartUpID kontrolního bodu:        %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "TimeLineID posledního kontrolního bodu: %u\n"
 
-#: pg_resetxlog.c:445
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
-msgstr "Poslední umístìní NextXID kontrolního bodu:          %u\n"
+msgstr "NextXID posledního kontrolního bodu:  %u\n"
 
-#: pg_resetxlog.c:446
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
-msgstr "Poslední umístìní NextOID kontrolního bodu:          %u\n"
+msgstr "NextOID posledního kontrolního bodu:  %u\n"
 
-#: pg_resetxlog.c:447
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Velikost databázového bloku:                  %u\n"
 
-#: pg_resetxlog.c:448
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "Blokù v segmentu velké relace: %u\n"
 
-#: pg_resetxlog.c:449
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "Maximální délka identifikátorù:        %u\n"
 
-#: pg_resetxlog.c:450
+#: pg_resetxlog.c:452
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "Maximální poèet argumentù funkcí: %u\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:453
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "Zpùsob ulo¾ení typu date/time:               %s\n"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
 msgid "64-bit integers"
-msgstr "64-bitová èísla"
+msgstr "64-bitová celá èísla"
 
-#: pg_resetxlog.c:452
-msgid "Floating point"
-msgstr "Plovoucí èárka"
+#: pg_resetxlog.c:454
+msgid "floating-point numbers"
+msgstr "èísla s plovoucí èárkou"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "Maximální délka jména locale:        %u\n"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:456
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE (porovnávání øetìzcù):                           %s\n"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE (typy znakù):                             %s\n"
 
-#: pg_resetxlog.c:508
+#: pg_resetxlog.c:518
 #, c-format
 msgid "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr "%s: interní chyba -- sizeof(ControlFileData) je pøíli¹ velký ... opravte xlog.c\n"
 
-#: pg_resetxlog.c:521
+#: pg_resetxlog.c:531
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: nelze vytvoøit pg_control soubor: %s\n"
 
-#: pg_resetxlog.c:532
+#: pg_resetxlog.c:542
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: nelze zapsat pg_control soubor: %s\n"
 
-#: pg_resetxlog.c:539
-#: pg_resetxlog.c:680
+#: pg_resetxlog.c:549
+#: pg_resetxlog.c:704
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync chyba: %s\n"
 
-#: pg_resetxlog.c:560
+#: pg_resetxlog.c:570
 #, c-format
-msgid "%s: could not open directory %s: %s\n"
-msgstr "%s: nelze otevøít adresáø %s: %s\n"
+msgid "%s: could not open directory \"%s\": %s\n"
+msgstr "%s: nelze otevøít adresáø \"%s\": %s\n"
 
-#: pg_resetxlog.c:574
+#: pg_resetxlog.c:584
 #, c-format
-msgid "%s: could not delete file %s: %s\n"
-msgstr "%s: nelze smazat soubor %s: %s\n"
+msgid "%s: could not delete file \"%s\": %s\n"
+msgstr "%s: nelze smazat soubor \"%s\": %s\n"
 
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:600
 #, c-format
-msgid "%s: could not read from directory %s: %s\n"
-msgstr "%s: nelze èíst z adresáøe %s: %s\n"
+msgid "%s: could not read from directory \"%s\": %s\n"
+msgstr "%s: nelze èíst z adresáøe \"%s\": %s\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:671
 #, c-format
-msgid "%s: could not open %s: %s\n"
-msgstr "%s: nelze otevøít %s: %s\n"
+msgid "%s: could not open file \"%s\": %s\n"
+msgstr "%s: nelze otevøít soubor \"%s\": %s\n"
 
-#: pg_resetxlog.c:658
-#: pg_resetxlog.c:672
+#: pg_resetxlog.c:682
+#: pg_resetxlog.c:696
 #, c-format
-msgid "%s: could not write %s: %s\n"
-msgstr "%s: nelze zapsat %s: %s\n"
+msgid "%s: could not write file \"%s\": %s\n"
+msgstr "%s: nelze zapsat do souboru \"%s\": %s\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:715
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
 "\n"
 msgstr ""
-"%s resetuji PostgreSQL transakèní log.\n"
+"%s resetuje PostgreSQL transakèní log.\n"
 "\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:716
 #, c-format
 msgid ""
 "Usage:\n"
@@ -294,43 +299,43 @@ msgstr ""
 "  %s [PØEPÍNAÈ]... ADRESÁØ\n"
 "\n"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:717
 msgid "Options:\n"
 msgstr "Pøepínaèe:\n"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:718
 msgid "  -f              force update to be done\n"
 msgstr "  -f              provede vynucený update\n"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:719
 msgid "  -l FILEID,SEG   force minimum WAL starting location for new transaction log\n"
 msgstr "  -l FILEID,SEG   vynutí minimální poèáteèní WAL pozici pro novou transakèní log\n"
 
-#: pg_resetxlog.c:696
+#: pg_resetxlog.c:720
 msgid "  -n              no update, just show extracted control values (for testing)\n"
 msgstr "  -n              bez zmìny, jen uká¾e získané kontrolní hodnoty (pro testování)\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:721
 msgid "  -o OID          set next OID\n"
 msgstr "  -o OID          nastaví následující OID\n"
 
-#: pg_resetxlog.c:698
+#: pg_resetxlog.c:722
 msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID          nastaví následující ID transakce\n"
 
-#: pg_resetxlog.c:699
+#: pg_resetxlog.c:723
 msgid "  --help          show this help, then exit\n"
 msgstr "  --help          uká¾e tuto nápovìdu a skonèí\n"
 
-#: pg_resetxlog.c:700
+#: pg_resetxlog.c:724
 msgid "  --version       output version information, then exit\n"
 msgstr "  --version       uká¾e informace o verzi a skonèí\n"
 
-#: pg_resetxlog.c:701
+#: pg_resetxlog.c:725
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"Chybová hlá¹ení posílejte do <pgsql-bugs@postgresql.org>.\n"
+"Chyby hla¹te na adresu <pgsql-bugs@postgresql.org>.\n"
 
diff --git a/src/bin/pg_resetxlog/po/zh_CN.po b/src/bin/pg_resetxlog/po/zh_CN.po
index 6b922364e4..ab5f7efb53 100644
--- a/src/bin/pg_resetxlog/po/zh_CN.po
+++ b/src/bin/pg_resetxlog/po/zh_CN.po
@@ -5,56 +5,56 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-05 22:13+0000\n"
-"PO-Revision-Date: 2003-09-15 13:47+0800\n"
-"Last-Translator: Bao Wei <bao_paul@yahoo.com.cn>\n"
-"Language-Team: Bao Wei <bao_paul@yahoo.com.cn>\n"
+"POT-Creation-Date: 2004-08-31 08:57+0000\n"
+"PO-Revision-Date: 2004-01-10 13:47+0800\n"
+"Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:120
 #, c-format
 msgid "%s: invalid argument for option -x\n"
 msgstr "%s: Ϊ -x Ñ¡ÏîµÄÎÞЧ²ÎÊý\n"
 
-#: pg_resetxlog.c:142 pg_resetxlog.c:157 pg_resetxlog.c:172 pg_resetxlog.c:179
-#: pg_resetxlog.c:185 pg_resetxlog.c:193
+#: pg_resetxlog.c:121 pg_resetxlog.c:136 pg_resetxlog.c:151 pg_resetxlog.c:158
+#: pg_resetxlog.c:164 pg_resetxlog.c:172
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÊäÈë \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: pg_resetxlog.c:147
+#: pg_resetxlog.c:126
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: ÊÂÎñ ID (-x) ²»ÄÜΪ 0\n"
 
-#: pg_resetxlog.c:156
+#: pg_resetxlog.c:135
 #, c-format
 msgid "%s: invalid argument for option -o\n"
 msgstr "%s: Ϊ -o Ñ¡ÏîµÄÎÞЧ²ÎÊý\n"
 
-#: pg_resetxlog.c:162
+#: pg_resetxlog.c:141
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) ²»ÄÜΪ 0\n"
 
-#: pg_resetxlog.c:171 pg_resetxlog.c:178
+#: pg_resetxlog.c:150 pg_resetxlog.c:157
 #, c-format
 msgid "%s: invalid argument for option -l\n"
 msgstr "%s: Ϊ -l Ñ¡ÏîµÄÎÞЧ²ÎÊý\n"
 
-#: pg_resetxlog.c:192
+#: pg_resetxlog.c:171
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: ûÓÐÖ¸¶¨Êý¾ÝĿ¼\n"
 
-#: pg_resetxlog.c:212 pg_resetxlog.c:308
+#: pg_resetxlog.c:191 pg_resetxlog.c:287
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: ÎÞ·¨´ò¿ªÎļþ \"%s\" ¶ÁÈ¡ÐÅÏ¢: %s\n"
 
-#: pg_resetxlog.c:218
+#: pg_resetxlog.c:197
 #, c-format
 msgid ""
 "%s: lock file \"%s\" exists\n"
@@ -63,7 +63,8 @@ msgstr ""
 "%s: ËøÎļþ \"%s\" ÒѾ­´æÔÚ\n"
 "ÊÇ·ñÓÐÒ»¸ö·þÎñÕýÔÚÔËÐÐ? Èç¹ûûÓÐ, ɾ³ýÄǸöËøÎļþÈ»ºóÔÙÊÔÒ»´Î.\n"
 
-#: pg_resetxlog.c:257
+#: pg_resetxlog.c:236
+#, c-format
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
@@ -71,7 +72,8 @@ msgstr ""
 "\n"
 "Èç¹ûÕâЩֵ¿É½ÓÊÜ, Óà -f Ç¿ÖÆÖØÖÃ.\n"
 
-#: pg_resetxlog.c:269
+#: pg_resetxlog.c:248
+#, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
 "Resetting the transaction log may cause data to be lost.\n"
@@ -81,11 +83,12 @@ msgstr ""
 "ÖØÖÃÊÂÎñÈÕÖ¾ÓпÉÄÜ»áÒýÆð¶ªÊ§Êý¾Ý.\n"
 "Èç¹ûÄãÈÔÏë¼ÌÐø, Óà -f Ç¿ÖÆÖØÖÃ.\n"
 
-#: pg_resetxlog.c:282
+#: pg_resetxlog.c:261
+#, c-format
 msgid "Transaction log reset\n"
 msgstr "ÊÂÎñÈÕÖ¾ÖØÖÃ\n"
 
-#: pg_resetxlog.c:311
+#: pg_resetxlog.c:290
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -96,32 +99,33 @@ msgstr ""
 "  touch %s\n"
 "È»ºóÔÙÊÔÒ»´Î.\n"
 
-#: pg_resetxlog.c:324
+#: pg_resetxlog.c:303
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨¶ÁÈ¡Îļþ \"%s\": %s\n"
 
-#: pg_resetxlog.c:347
+#: pg_resetxlog.c:326
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control ÒѾ­´æÔÚ, µ«ÓÐÎÞЧµÄCRC; ´øÓо¯¸æµÄ¼ÌÐøÔËÐÐ\n"
 
-#: pg_resetxlog.c:356
+#: pg_resetxlog.c:335
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
 msgstr "%s: pg_control ÒѾ­´æÔÚ, µ«ÒÑÆÆ»µ»òÎÞЧ°æ±¾; ºöÂÔËü\n"
 
-#: pg_resetxlog.c:407
+#: pg_resetxlog.c:399
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: ÎÞЧµÄ LC_COLLATE ÉèÖÃ\n"
 
-#: pg_resetxlog.c:414
+#: pg_resetxlog.c:406
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: ÎÞЧµÄ LC_CTYPE ÉèÖÃ\n"
 
-#: pg_resetxlog.c:436
+#: pg_resetxlog.c:430
+#, c-format
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
@@ -129,7 +133,8 @@ msgstr ""
 "²Â²âµÄ pg_control Öµ:\n"
 "\n"
 
-#: pg_resetxlog.c:438
+#: pg_resetxlog.c:432
+#, c-format
 msgid ""
 "pg_control values:\n"
 "\n"
@@ -137,136 +142,141 @@ msgstr ""
 "pg_control Öµ:\n"
 "\n"
 
-#: pg_resetxlog.c:440
+#: pg_resetxlog.c:441
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control °æ±¾:                      %u\n"
 
-#: pg_resetxlog.c:441
+#: pg_resetxlog.c:442
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog °æ±¾:                         %u\n"
 
-#: pg_resetxlog.c:442
+#: pg_resetxlog.c:443
+#, c-format
+msgid "Database system identifier:           %s\n"
+msgstr "Êý¾Ý¿âϵͳ±êʶ·û:                     %s\n"
+
+#: pg_resetxlog.c:444
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "µ±Ç°ÈÕÖ¾ÎļþID:                       %u\n"
 
-#: pg_resetxlog.c:443
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "ÏÂÒ»¸öÈÕÖ¾Îļþ¶Î:                     %u\n"
 
-#: pg_resetxlog.c:444
+#: pg_resetxlog.c:446
 #, c-format
-msgid "Latest checkpoint's StartUpID:        %u\n"
-msgstr "×îмì²éµãµÄ StartUpID:               %u\n"
+msgid "Latest checkpoint's TimeLineID:       %u\n"
+msgstr "×îмì²éµãµÄ TimeLineID:              %u\n"
 
-#: pg_resetxlog.c:445
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "×îмì²éµãµÄ NextXID:                 %u\n"
 
-#: pg_resetxlog.c:446
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "×îмì²éµãµÄ NextOID:                 %u\n"
 
-#: pg_resetxlog.c:447
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "Êý¾Ý¿â¿é´óС:                         %u\n"
 
-#: pg_resetxlog.c:448
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "´ó¹ØϵµÄÿ¶Î¿éÊý:                     %u\n"
 
-#: pg_resetxlog.c:449
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "±êʾ·ûµÄ×î´ó³¤¶È:                     %u\n"
 
-#: pg_resetxlog.c:450
+#: pg_resetxlog.c:452
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "º¯Êý²ÎÊýµÄ×î´ó¸öÊý:                   %u\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:453
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "ÈÕÆÚ/ʱ¼äÀàÐÍ´æ´¢:                    %s\n"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
 msgid "64-bit integers"
 msgstr "64λÕûÐÍ"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:454
 msgid "floating-point numbers"
 msgstr "¸¡µãÊý"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "±¾µØÃû×ÖµÄ×î´ó³¤¶È:                   %u\n"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:456
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:457
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:508
+#: pg_resetxlog.c:518
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr "%s: ÄÚ²¿´íÎó -- sizeof(ControlFileData) Ì«´ó ... ÐÞ¸´ xlog.c\n"
 
-#: pg_resetxlog.c:521
+#: pg_resetxlog.c:531
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: ÎÞ·¨´´½¨ pg_control Îļþ: %s\n"
 
-#: pg_resetxlog.c:532
+#: pg_resetxlog.c:542
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: ÎÞ·¨Ð´ pg_control Îļþ: %s\n"
 
-#: pg_resetxlog.c:539 pg_resetxlog.c:680
+#: pg_resetxlog.c:549 pg_resetxlog.c:705
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync ´íÎó: %s\n"
 
-#: pg_resetxlog.c:560
+#: pg_resetxlog.c:570
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨´ò¿ªÄ¿Â¼ \"%s\": %s\n"
 
-#: pg_resetxlog.c:574
+#: pg_resetxlog.c:584
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨É¾³ýÎļþ \"%s\": %s\n"
 
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:603
 #, c-format
 msgid "%s: could not read from directory \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨´ÓĿ¼ \"%s\" ÖжÁÈ¡: %s\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetxlog.c:672
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"
 
-#: pg_resetxlog.c:658 pg_resetxlog.c:672
+#: pg_resetxlog.c:683 pg_resetxlog.c:697
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨Ð´Îļþ \"%s\": %s\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetxlog.c:716
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -275,7 +285,7 @@ msgstr ""
 "%s ÖØÖà PostgreSQL ÊÂÎñÈÕÖ¾.\n"
 "\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetxlog.c:717
 #, c-format
 msgid ""
 "Usage:\n"
@@ -286,43 +296,52 @@ msgstr ""
 "  %s [Ñ¡Ïî]... Êý¾ÝĿ¼\n"
 "\n"
 
-#: pg_resetxlog.c:693
+#: pg_resetxlog.c:718
+#, c-format
 msgid "Options:\n"
 msgstr "Ñ¡Ïî:\n"
 
-#: pg_resetxlog.c:694
+#: pg_resetxlog.c:719
+#, c-format
 msgid "  -f              force update to be done\n"
 msgstr "  -f                Ç¿ÖƸüÐÂ\n"
 
-#: pg_resetxlog.c:695
+#: pg_resetxlog.c:720
+#, c-format
 msgid ""
 "  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
 msgstr "  -l FILEID,SEG     ÔÚеÄÊÂÎñÈÕÖ¾ÖÐÇ¿ÖÆ×îС WAL ÆðʼλÖÃ\n"
 
-#: pg_resetxlog.c:696
+#: pg_resetxlog.c:721
+#, c-format
 msgid ""
 "  -n              no update, just show extracted control values (for "
 "testing)\n"
 msgstr "  -n                δ¸üÐÂ, Ö»ÏÔʾ³éÈ¡µÄ¿ØÖÆÖµ (²âÊÔÓÃ;)\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetxlog.c:722
+#, c-format
 msgid "  -o OID          set next OID\n"
 msgstr "  -o OID            ÉèÖÃÏÂÒ»¸ö OID\n"
 
-#: pg_resetxlog.c:698
+#: pg_resetxlog.c:723
+#, c-format
 msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID            ÉèÖÃÏÂÒ»¸öÊÂÎñ ID\n"
 
-#: pg_resetxlog.c:699
+#: pg_resetxlog.c:724
+#, c-format
 msgid "  --help          show this help, then exit\n"
 msgstr "  --help            ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_resetxlog.c:700
+#: pg_resetxlog.c:725
+#, c-format
 msgid "  --version       output version information, then exit\n"
 msgstr "  --version         Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_resetxlog.c:701
+#: pg_resetxlog.c:726
+#, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -330,6 +349,9 @@ msgstr ""
 "\n"
 "±¨¸æ´íÎóÖÁ <pgsql-bugs@postgresql.org>.\n"
 
+#~ msgid "Latest checkpoint's StartUpID:        %u\n"
+#~ msgstr "×îмì²éµãµÄ StartUpID:               %u\n"
+
 #~ msgid "%s: invalid argument for -x option\n"
 #~ msgstr "%s: Ϊ -x Ñ¡ÏîµÄÎÞЧ²ÎÊý\n"
 
diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index 620049f4ef..e624318586 100644
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -1,13 +1,13 @@
 # simplified Chinese translation file for psql
 # Weiping He <laser@zhengmai.com.cn>, 2002.
 # 
-# $PostgreSQL: pgsql/src/bin/psql/po/zh_CN.po,v 1.5 2004/08/10 19:02:01 petere Exp $
+# $PostgreSQL: pgsql/src/bin/psql/po/zh_CN.po,v 1.6 2004/09/13 12:35:15 petere Exp $
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-05 10:13+0000\n"
+"POT-Creation-Date: 2004-08-31 08:54+0000\n"
 "PO-Revision-Date: 2004-01-12 13:48:19+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -44,257 +44,257 @@ msgstr "
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: ²»Äܸı䵽 \"%s\" Ŀ¼: %s\n"
 
-#: command.c:370 command.c:759
+#: command.c:370 command.c:760
 msgid "no query buffer\n"
 msgstr "ÎÞ²éѯ»º³åÇø\n"
 
-#: command.c:432
+#: command.c:433
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s: ÎÞЧ±àÂëÃû×Ö»òûÓÐÕÒµ½×ª»»¹ý³Ì\n"
 
-#: command.c:500 command.c:534 command.c:548 command.c:565 command.c:611
-#: command.c:739 command.c:770
+#: command.c:501 command.c:535 command.c:549 command.c:566 command.c:612
+#: command.c:740 command.c:771
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: ȱÉÙËùÐè²ÎÊý\n"
 
-#: command.c:597
+#: command.c:598
 msgid "Query buffer is empty."
 msgstr "²éѯ»º³åÇøΪ¿Õ."
 
-#: command.c:631
+#: command.c:632
 msgid "Query buffer reset (cleared)."
 msgstr "ÖØÖÃ(Çå¿Õ)²éѯ»º³åÇø."
 
-#: command.c:645
+#: command.c:646
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
 msgstr "ÏòÎļþ \"%s\" ÖÐдÈëÀúÊ·.\n"
 
-#: command.c:680 common.c:86 common.c:100 mainloop.c:70
+#: command.c:681 common.c:85 common.c:99 mainloop.c:71
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
 
-#: command.c:695 command.c:744
+#: command.c:696 command.c:745
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: ´íÎó\n"
 
-#: command.c:725
+#: command.c:726
 msgid "Timing is on."
 msgstr "¿ªÊ¼¼Æʱ."
 
-#: command.c:727
+#: command.c:728
 msgid "Timing is off."
 msgstr "½áÊø¼Æʱ."
 
-#: command.c:787 command.c:807 command.c:1163 command.c:1170 command.c:1180
-#: command.c:1192 command.c:1205 command.c:1219 command.c:1241 command.c:1272
-#: common.c:171 copy.c:539 copy.c:584
+#: command.c:788 command.c:808 command.c:1164 command.c:1171 command.c:1181
+#: command.c:1193 command.c:1206 command.c:1220 command.c:1242 command.c:1273
+#: common.c:170 copy.c:530 copy.c:575
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:914 command.c:938 startup.c:184 startup.c:202
+#: command.c:915 command.c:939 startup.c:184 startup.c:202
 msgid "Password: "
 msgstr "¿ÚÁî: "
 
-#: command.c:952 common.c:217 common.c:599 common.c:654 common.c:897
+#: command.c:953 common.c:216 common.c:605 common.c:660 common.c:903
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:956
+#: command.c:957
 msgid "Previous connection kept\n"
 msgstr "±£ÁôÉÏÒ»´ÎÁª½Ó\n"
 
-#: command.c:968
+#: command.c:969
 #, c-format
 msgid "\\connect: %s"
 msgstr "\\Áª½Ó: %s"
 
-#: command.c:980
+#: command.c:981
 #, c-format
 msgid "You are now connected to database \"%s\".\n"
 msgstr "ÄãÏÖÔÚÒѾ­Áª½Óµ½Êý¾Ý¿â \"%s\".\n"
 
-#: command.c:982
+#: command.c:983
 #, c-format
 msgid "You are now connected as new user \"%s\".\n"
 msgstr "ÄãÏÖÔÚÊÇ×÷ΪÐÂÓû§ \"%s\" Áª½ÓµÄ.\n"
 
-#: command.c:985
+#: command.c:986
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "ÄãÏÖÔÚÊÇÒÔÓû§ \"%2$s\" µÄÉí·ÝÁª½Óµ½Êý¾Ý¿â \"%1$s\".\n"
 
-#: command.c:1102
+#: command.c:1103
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "ÎÞ·¨ÔËÐб༭Æ÷ \"%s\"\n"
 
-#: command.c:1104
+#: command.c:1105
 msgid "could not start /bin/sh\n"
 msgstr "ÎÞ·¨ÔËÐÐ /bin/sh\n"
 
-#: command.c:1148
+#: command.c:1149
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "ÎÞ·¨´ò¿ªÁÙʱÎļþ \"%s\": %s\n"
 
-#: command.c:1340
+#: command.c:1341
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: ÔÊÐíµÄ¸ñʽÊÇÎÞ¶ÔÆë, ¶ÔÆë, html, latex\n"
 
-#: command.c:1345
+#: command.c:1346
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Êä³ö¸ñʽÊÇ %s.\n"
 
-#: command.c:1355
+#: command.c:1356
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "±ß½ç·ç¸ñÊÇ %d.\n"
 
-#: command.c:1364
+#: command.c:1365
 #, c-format
 msgid "Expanded display is on.\n"
 msgstr "À©Õ¹ÏÔʾÒÑ´ò¿ª.\n"
 
-#: command.c:1365
+#: command.c:1366
 #, c-format
 msgid "Expanded display is off.\n"
 msgstr "À©Õ¹ÏÔʾÒѹرÕ.\n"
 
-#: command.c:1377
+#: command.c:1378
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null ÏÔʾΪ \"%s\".\n"
 
-#: command.c:1389
+#: command.c:1390
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Óò·Ö¸ô·ûÊÇ \"%s\".\n"
 
-#: command.c:1403
+#: command.c:1404
 #, c-format
 msgid "Record separator is <newline>."
 msgstr "¼Ç¼·Ö¸ô·ûÊÇ <ÐÂÐÐ>."
 
-#: command.c:1405
+#: command.c:1406
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "¼Ç¼·Ö¸ô·ûÊÇ \"%s\".\n"
 
-#: command.c:1416
+#: command.c:1417
 msgid "Showing only tuples."
 msgstr "Ö»ÏÔʾԪ×é."
 
-#: command.c:1418
+#: command.c:1419
 msgid "Tuples only is off."
 msgstr "¹Ø±ÕÖ»ÏÔʾԪ×é."
 
-#: command.c:1434
+#: command.c:1435
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "±êÌâÊÇ \"%s\".\n"
 
-#: command.c:1436
+#: command.c:1437
 #, c-format
 msgid "Title is unset.\n"
 msgstr "ÎÞ±êÌâ.\n"
 
-#: command.c:1452
+#: command.c:1453
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "±íÊôÐÔÊÇ \"%s\".\n"
 
-#: command.c:1454
+#: command.c:1455
 #, c-format
 msgid "Table attributes unset.\n"
 msgstr "δÉèÖñíÊôÐÔ.\n"
 
-#: command.c:1470
+#: command.c:1471
 msgid "Pager is used for long output."
 msgstr "·ÖÒ³Æ÷ÊÇΪ³¤Êä³öʹÓõÄ."
 
-#: command.c:1472
+#: command.c:1473
 msgid "Pager is always used."
 msgstr "×ÜÊÇʹÓ÷ÖÒ³Æ÷."
 
-#: command.c:1474
+#: command.c:1475
 msgid "Pager usage is off."
 msgstr "¹Ø±Õ·ÖÒ³Æ÷µÄʹÓÃ."
 
-#: command.c:1485
+#: command.c:1486
 msgid "Default footer is on."
 msgstr "´ò¿ªÈ±Ê¡½Å±ê."
 
-#: command.c:1487
+#: command.c:1488
 msgid "Default footer is off."
 msgstr "¹Ø±Õȱʡ½Å±ê."
 
-#: command.c:1493
+#: command.c:1494
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: δ֪ѡÏî: %s\n"
 
-#: command.c:1532
+#: command.c:1533
 msgid "\\!: failed\n"
 msgstr "\\!: ʧ°Ü\n"
 
-#: common.c:79
+#: common.c:78
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: ÎÞ·¨¸´ÖÆ¿ÕÖ¸Õë(ÄÚ²¿´íÎó)\n"
 
-#: common.c:124
+#: common.c:123
 msgid "out of memory"
 msgstr "ÄÚ´æÓþ¡"
 
-#: common.c:299
+#: common.c:298
 msgid "connection to server was lost\n"
 msgstr "ÓëÊý¾Ý¿âµÄÁª½Ó¶ªÊ§\n"
 
-#: common.c:303
+#: common.c:302
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Óë·þÎñÆ÷µÄÁª½ÓÒѶªÊ§. ³¢ÊÔÖØÖÃ: "
 
-#: common.c:308
+#: common.c:307
 msgid "Failed.\n"
 msgstr "ʧ°Ü.\n"
 
-#: common.c:315
+#: common.c:314
 msgid "Succeeded.\n"
 msgstr "³É¹¦.\n"
 
-#: common.c:383
+#: common.c:391
 #, c-format
 msgid "INTERNAL ERROR: unexpected statement position \"%s\"\n"
 msgstr "ÄÚ²¿´íÎó: ÒâÍâµÄÓï¾äλÖà \"%s\"\n"
 
-#: common.c:519
+#: common.c:527
 #, c-format
 msgid "LINE %d: "
 msgstr "µÚ %d ÐÐ: "
 
-#: common.c:538 common.c:547
+#: common.c:544 common.c:553
 #, c-format
 msgid "%s\n"
 msgstr "%s\n"
 
-#: common.c:630 common.c:865
+#: common.c:636 common.c:871
 msgid "You are currently not connected to a database.\n"
 msgstr "ÄãĿǰûÓÐÓëÊý¾Ý¿âÁª½Ó.\n"
 
-#: common.c:685
+#: common.c:691
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "½ÓÊÕµ½·þÎñÆ÷½ø³Ì PID %2$d µÄÒ첽֪ͨ \"%1$s\".\n"
 
-#: common.c:873
+#: common.c:879
 #, c-format
 msgid ""
 "***(Single step mode: verify command)"
@@ -307,7 +307,7 @@ msgstr ""
 "%s\n"
 "***(°´»Ø³µ¼ÌÐø»òÕßÊäÈë x È»ºó°´»Ø³µÈ¡Ïû)********************\n"
 
-#: common.c:924
+#: common.c:930
 #, c-format
 msgid "Time: %.3f ms\n"
 msgstr "ʱ¼ä: %.3f ms\n"
@@ -316,31 +316,31 @@ msgstr "ʱ
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: ÐèÒª²ÎÊý\n"
 
-#: copy.c:412
+#: copy.c:408
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: ÔÚ \"%s\" ·ÖÎö´íÎó\n"
 
-#: copy.c:414
+#: copy.c:410
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: ÔÚÐÐβ·ÖÎö´íÎó\n"
 
-#: copy.c:550
+#: copy.c:541
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: ÎÞ·¨´ÓÒ»¸öĿ¼¿½±´, »ò¿½±´µ½Ò»¸öĿ¼\n"
 
-#: copy.c:571
+#: copy.c:562
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\¿½±´: %s"
 
-#: copy.c:575
+#: copy.c:566
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: ÒâÍâÏìÓ¦(%d)\n"
 
-#: copy.c:676
+#: copy.c:668
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -891,7 +891,7 @@ msgstr ""
 "ûÓÐ \"%-.*s\" µÄ¿ÉÓðïÖú.\n"
 "Óò»´ø²ÎÊýµÄ \\h »ñÈ¡¿ÉÓðïÖú.\n"
 
-#: input.c:215
+#: input.c:214
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "ÎÞ·¨½«ÀúÊ·±£´æµ½Îļþ \"%s\": %s\n"
@@ -911,9 +911,9 @@ msgstr "%s: 
 msgid "%s: unknown transaction status\n"
 msgstr "%s: δ֪ÊÂÎñ״̬\n"
 
-#: large_obj.c:255 describe.c:83 describe.c:180 describe.c:253 describe.c:315
-#: describe.c:362 describe.c:462 describe.c:749 describe.c:1472
-#: describe.c:1719
+#: large_obj.c:255 describe.c:83 describe.c:187 describe.c:260 describe.c:322
+#: describe.c:369 describe.c:469 describe.c:758 describe.c:1483
+#: describe.c:1730
 msgid "Description"
 msgstr "ÃèÊö"
 
@@ -921,21 +921,21 @@ msgstr "
 msgid "Large objects"
 msgstr "´ó¶ÔÏó"
 
-#: mainloop.c:173
+#: mainloop.c:172
 #, c-format
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "ʹÓà \"\\q\" À뿪 %s.\n"
 
-#: print.c:424
+#: print.c:428
 msgid "(No rows)\n"
 msgstr "(ûÓÐÐÐ)\n"
 
-#: print.c:1193
+#: print.c:1200
 #, c-format
 msgid "(1 row)"
 msgstr "(1 ÐÐ)"
 
-#: print.c:1195
+#: print.c:1202
 #, c-format
 msgid "(%d rows)"
 msgstr "(%d ÐÐ)"
@@ -949,7 +949,7 @@ msgstr "%s: 
 msgid "User name: "
 msgstr "̞:"
 
-#: startup.c:283
+#: startup.c:286
 #, c-format
 msgid ""
 "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
@@ -970,41 +970,41 @@ msgstr ""
 "       \\q         Í˳ö\n"
 "\n"
 
-#: startup.c:444
+#: startup.c:447
 #, c-format
 msgid "%s: couldn't set printing parameter \"%s\"\n"
 msgstr "%s: ÎÞ·¨ÉèÖôòÓ¡²ÎÊý \"%s\"\n"
 
-#: startup.c:490
+#: startup.c:493
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: ÎÞ·¨É¾³ý±äÁ¿ \"%s\"\n"
 
-#: startup.c:500
+#: startup.c:503
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: ÎÞ·¨ÉèÖñäÁ¿ \"%s\"\n"
 
-#: startup.c:531 startup.c:537
+#: startup.c:534 startup.c:540
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "Óà \"%s --help\" »ñÈ¡¸ü¶àÐÅÏ¢.\n"
 
-#: startup.c:555
+#: startup.c:558
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: ¾¯¸æ: ºöÂÔ¶îÍâµÄÃüÁîÐвÎÊý \"%s\"\n"
 
-#: startup.c:562
+#: startup.c:565
 #, c-format
 msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: ¾¯¸æ: -u Ñ¡ÏîÒѾ­·ÏÆú. ÇëÓà -U.\n"
 
-#: startup.c:626
+#: startup.c:629
 msgid "contains support for command-line editing"
 msgstr "°üÀ¨ÃüÁîÐб༭µÄÖ§³Ö"
 
-#: startup.c:649
+#: startup.c:652
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -1013,14 +1013,14 @@ msgstr ""
 "SSL Áª½Ó (¼ÓÃÜ: %s, λ: %i)\n"
 "\n"
 
-#: describe.c:82 describe.c:170 describe.c:240 describe.c:313 describe.c:408
-#: describe.c:462 describe.c:1465 describe.c:1571 describe.c:1619
+#: describe.c:82 describe.c:177 describe.c:247 describe.c:320 describe.c:415
+#: describe.c:469 describe.c:1476 describe.c:1582 describe.c:1630
 msgid "Schema"
 msgstr "ģʽ"
 
-#: describe.c:82 describe.c:121 describe.c:170 describe.c:240 describe.c:313
-#: describe.c:355 describe.c:408 describe.c:462 describe.c:1465
-#: describe.c:1572 describe.c:1620 describe.c:1713
+#: describe.c:82 describe.c:128 describe.c:177 describe.c:247 describe.c:320
+#: describe.c:362 describe.c:415 describe.c:469 describe.c:1476
+#: describe.c:1583 describe.c:1631 describe.c:1724
 msgid "Name"
 msgstr "Ãû×Ö"
 
@@ -1036,217 +1036,222 @@ msgstr "
 msgid "List of aggregate functions"
 msgstr "¾Û¼¯º¯ÊýÁбí"
 
-#: describe.c:121 describe.c:179 describe.c:355 describe.c:1467
-#: describe.c:1713
+#: describe.c:117
+#, c-format
+msgid "This server version (%d) does not support tablespaces.\n"
+msgstr "´Ë·þÎñÆ÷°æ±¾ (%d) ²»Ö§³Ö±í¿Õ¼ä.\n"
+
+#: describe.c:128 describe.c:186 describe.c:362 describe.c:1478
+#: describe.c:1724
 msgid "Owner"
 msgstr "ËùÓÐÕß"
 
-#: describe.c:121
+#: describe.c:128
 msgid "Location"
 msgstr "λÖÃ"
 
-#: describe.c:126 describe.c:408 describe.c:1719
+#: describe.c:133 describe.c:415 describe.c:1730
 msgid "Access privileges"
 msgstr "·ÃÎÊȨÏÞ"
 
-#: describe.c:143
+#: describe.c:150
 msgid "List of tablespaces"
 msgstr "±í¿Õ¼äÁбí"
 
-#: describe.c:170
+#: describe.c:177
 msgid "Result data type"
 msgstr "½á¹ûÊý¾ÝÀàÐÍ"
 
-#: describe.c:171
+#: describe.c:178
 msgid "Argument data types"
 msgstr "²ÎÊýÊý¾ÝÀàÐÍ"
 
-#: describe.c:179
+#: describe.c:186
 msgid "Language"
 msgstr "ÓïÑÔ"
 
-#: describe.c:180
+#: describe.c:187
 msgid "Source code"
 msgstr "Ô´´úÂë"
 
-#: describe.c:214
+#: describe.c:221
 msgid "List of functions"
 msgstr "º¯ÊýÁбí"
 
-#: describe.c:250
+#: describe.c:257
 msgid "Internal name"
 msgstr "ÄÚ²¿Ãû³Æ"
 
-#: describe.c:250
+#: describe.c:257
 msgid "Size"
 msgstr "´óС"
 
-#: describe.c:282
+#: describe.c:289
 msgid "List of data types"
 msgstr "Êý¾ÝÀàÐÍÁбí"
 
-#: describe.c:314
+#: describe.c:321
 msgid "Left arg type"
 msgstr "×ó²ÎÊýÀàÐÍ"
 
-#: describe.c:314
+#: describe.c:321
 msgid "Right arg type"
 msgstr "ÓÒ²ÎÊýÀàÐÍ"
 
-#: describe.c:315
+#: describe.c:322
 msgid "Result type"
 msgstr "½á¹ûÀàÐÍ"
 
-#: describe.c:329
+#: describe.c:336
 msgid "List of operators"
 msgstr "²Ù×÷·ûÁбí"
 
-#: describe.c:358
+#: describe.c:365
 msgid "Encoding"
 msgstr "±àÂë"
 
-#: describe.c:374
+#: describe.c:381
 msgid "List of databases"
 msgstr "Êý¾Ý¿âÁбí"
 
-#: describe.c:408 describe.c:536 describe.c:1466
+#: describe.c:415 describe.c:543 describe.c:1477
 msgid "table"
 msgstr "±í"
 
-#: describe.c:408 describe.c:536 describe.c:1466
+#: describe.c:415 describe.c:543 describe.c:1477
 msgid "view"
 msgstr "ÊÓͼ"
 
-#: describe.c:408 describe.c:536 describe.c:1466
+#: describe.c:415 describe.c:543 describe.c:1477
 msgid "sequence"
 msgstr "ÐòÁÐ"
 
-#: describe.c:408 describe.c:736 describe.c:1467 describe.c:1573
+#: describe.c:415 describe.c:745 describe.c:1478 describe.c:1584
 msgid "Type"
 msgstr "ÀàÐÍ"
 
-#: describe.c:430
+#: describe.c:437
 #, c-format
 msgid "Access privileges for database \"%s\""
 msgstr "Êý¾Ý¿â \"%s\" µÄ·ÃÎÊȨÏÞ"
 
-#: describe.c:462
+#: describe.c:469
 msgid "Object"
 msgstr "¶ÔÏó"
 
-#: describe.c:473
+#: describe.c:480
 msgid "aggregate"
 msgstr "¾Û¼¯"
 
-#: describe.c:491
+#: describe.c:498
 msgid "function"
 msgstr "º¯Êý"
 
-#: describe.c:505
+#: describe.c:512
 msgid "operator"
 msgstr "²Ù×÷·û"
 
-#: describe.c:519
+#: describe.c:526
 msgid "data type"
 msgstr "Êý¾ÝÀàÐÍ"
 
-#: describe.c:536 describe.c:1466
+#: describe.c:543 describe.c:1477
 msgid "index"
 msgstr "Ë÷Òý"
 
-#: describe.c:552
+#: describe.c:559
 msgid "rule"
 msgstr "¹æÔò"
 
-#: describe.c:568
+#: describe.c:575
 msgid "trigger"
 msgstr "´¥·¢Æ÷"
 
-#: describe.c:586
+#: describe.c:593
 msgid "Object descriptions"
 msgstr "¶ÔÏóÃèÊö"
 
-#: describe.c:634
+#: describe.c:641
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "ûÓÐÕÒµ½ÈκÎÃûΪ \"%s\" µÄ¹Øϵ.\n"
 
-#: describe.c:720
+#: describe.c:728
 #, c-format
 msgid "Did not find any relation with OID %s.\n"
 msgstr "ûÓÐÕÒµ½ÈκΠOID Ϊ %s µÄ¹Øϵ.\n"
 
-#: describe.c:735
+#: describe.c:744
 msgid "Column"
 msgstr "×Ö¶ÎÃû"
 
-#: describe.c:743
+#: describe.c:752
 msgid "Modifiers"
 msgstr "ÐÞÊδÊ"
 
-#: describe.c:850
+#: describe.c:859
 #, c-format
 msgid "Table \"%s.%s\""
 msgstr "±í \"%s.%s\""
 
-#: describe.c:854
+#: describe.c:863
 #, c-format
 msgid "View \"%s.%s\""
 msgstr "ÊÓͼ \"%s.%s\""
 
-#: describe.c:858
+#: describe.c:867
 #, c-format
 msgid "Sequence \"%s.%s\""
 msgstr "ÐòÁÐ \"%s.%s\""
 
-#: describe.c:862
+#: describe.c:871
 #, c-format
 msgid "Index \"%s.%s\""
 msgstr "Ë÷Òý \"%s.%s\""
 
-#: describe.c:866
+#: describe.c:875
 #, c-format
 msgid "Special relation \"%s.%s\""
 msgstr "ÌØÊâ¹Øϵ \"%s.%s\""
 
-#: describe.c:870
+#: describe.c:879
 #, c-format
 msgid "TOAST table \"%s.%s\""
 msgstr "TOAST ±í \"%s.%s\""
 
-#: describe.c:874
+#: describe.c:883
 #, c-format
 msgid "Composite type \"%s.%s\""
 msgstr "¸´ºÏÀàÐÍ \"%s.%s\""
 
-#: describe.c:878
+#: describe.c:887
 #, c-format
 msgid "?%c? \"%s.%s\""
 msgstr "?%c? \"%s.%s\""
 
-#: describe.c:916
+#: describe.c:925
 msgid "PRIMARY KEY, "
 msgstr " PRIMARY KEY, "
 
-#: describe.c:918
+#: describe.c:927
 msgid "UNIQUE, "
 msgstr " UNIQUE, "
 
-#: describe.c:924
+#: describe.c:933
 #, c-format
 msgid "for table \"%s.%s\""
 msgstr "¸ø±í \"%s.%s\""
 
-#: describe.c:928
+#: describe.c:937
 #, c-format
 msgid ", predicate (%s)"
 msgstr ", ÊõÓï (%s)"
 
-#: describe.c:931
+#: describe.c:940
 msgid ", CLUSTER"
 msgstr ", CLUSTER"
 
-#: describe.c:968
+#: describe.c:977
 #, c-format
 msgid ""
 "View definition:\n"
@@ -1255,192 +1260,192 @@ msgstr ""
 "ÊÓͼ¶¨Òå:\n"
 "%s"
 
-#: describe.c:974 describe.c:1195
+#: describe.c:983 describe.c:1204
 msgid "Rules:"
 msgstr "¹æÔò:"
 
-#: describe.c:1129
+#: describe.c:1138
 msgid "Indexes:"
 msgstr "Ë÷Òý:"
 
-#: describe.c:1137
+#: describe.c:1146
 #, c-format
 msgid "    \"%s\""
 msgstr "    \"%s\""
 
-#: describe.c:1143
+#: describe.c:1152
 msgid " PRIMARY KEY,"
 msgstr " PRIMARY KEY,"
 
-#: describe.c:1145
+#: describe.c:1154
 msgid " UNIQUE,"
 msgstr " UNIQUE,"
 
-#: describe.c:1156
+#: describe.c:1165
 msgid " CLUSTER"
 msgstr " CLUSTER"
 
-#: describe.c:1165
+#: describe.c:1174
 msgid "Check constraints:"
 msgstr "¼ì²éÔ¼Êø:"
 
-#: describe.c:1169 describe.c:1184
+#: describe.c:1178 describe.c:1193
 #, c-format
 msgid "    \"%s\" %s"
 msgstr "    \"%s\" %s"
 
-#: describe.c:1180
+#: describe.c:1189
 msgid "Foreign-key constraints:"
 msgstr "Íâ¼üÔ¼Êø:"
 
-#: describe.c:1214
+#: describe.c:1223
 msgid "Triggers:"
 msgstr "´¥·¢Æ÷:"
 
-#: describe.c:1236
+#: describe.c:1245
 msgid "Inherits"
 msgstr "¼Ì³Ð"
 
-#: describe.c:1250
+#: describe.c:1259
 msgid "Contains OIDs"
 msgstr "Contains OIDs"
 
-#: describe.c:1252 describe.c:1623 describe.c:1680
+#: describe.c:1262 describe.c:1634 describe.c:1691
 msgid "yes"
 msgstr "yes"
 
-#: describe.c:1252 describe.c:1624 describe.c:1678
+#: describe.c:1262 describe.c:1635 describe.c:1689
 msgid "no"
 msgstr "no"
 
-#: describe.c:1331
+#: describe.c:1342
 #, c-format
 msgid "Tablespace: \"%s\""
 msgstr "±í¿Õ¼ä: \"%s\""
 
-#: describe.c:1364
+#: describe.c:1375
 msgid "User name"
 msgstr "̞"
 
-#: describe.c:1364
+#: describe.c:1375
 msgid "User ID"
 msgstr "Óû§ ID"
 
-#: describe.c:1365
+#: describe.c:1376
 msgid "superuser, create database"
 msgstr "³¬¼¶Óû§, ´´½¨Êý¾Ý¿â"
 
-#: describe.c:1366
+#: describe.c:1377
 msgid "superuser"
 msgstr "³¬¼¶Óû§"
 
-#: describe.c:1366
+#: describe.c:1377
 msgid "create database"
 msgstr "´´½¨Êý¾Ý¿â"
 
-#: describe.c:1367
+#: describe.c:1378
 msgid "Attributes"
 msgstr "ÊôÐÔ"
 
-#: describe.c:1367
+#: describe.c:1378
 msgid "Groups"
 msgstr "×é"
 
-#: describe.c:1380
+#: describe.c:1391
 msgid "List of database users"
 msgstr "Êý¾Ý¿âÓû§Áбí"
 
-#: describe.c:1407
+#: describe.c:1418
 msgid "Group name"
 msgstr "×éÃû"
 
-#: describe.c:1407
+#: describe.c:1418
 msgid "Group ID"
 msgstr "×é ID"
 
-#: describe.c:1420
+#: describe.c:1431
 msgid "List of database groups"
 msgstr "Êý¾Ý¿â×éÁбí"
 
-#: describe.c:1467
+#: describe.c:1478
 msgid "special"
 msgstr "ÌØÊâ"
 
-#: describe.c:1482
+#: describe.c:1493
 msgid "Table"
 msgstr "±í"
 
-#: describe.c:1528
+#: describe.c:1539
 #, c-format
 msgid "No matching relations found.\n"
 msgstr "ûÓÐÕÒµ½Æ¥ÅäµÄ¹Øϵ.\n"
 
-#: describe.c:1530
+#: describe.c:1541
 #, c-format
 msgid "No relations found.\n"
 msgstr "ûÓÐÕÒµ½¹Øϵ.\n"
 
-#: describe.c:1535
+#: describe.c:1546
 msgid "List of relations"
 msgstr "¹ØϵÁбí"
 
-#: describe.c:1574
+#: describe.c:1585
 msgid "Modifier"
 msgstr "ÐÞ¸ÄÕß"
 
-#: describe.c:1588
+#: describe.c:1599
 msgid "List of domains"
 msgstr "ÓòÁбí"
 
-#: describe.c:1621
+#: describe.c:1632
 msgid "Source"
 msgstr "Source"
 
-#: describe.c:1622
+#: describe.c:1633
 msgid "Destination"
 msgstr "Destination"
 
-#: describe.c:1625
+#: describe.c:1636
 msgid "Default?"
 msgstr "Default?"
 
-#: describe.c:1639
+#: describe.c:1650
 msgid "List of conversions"
 msgstr "ת»»Áбí"
 
-#: describe.c:1674
+#: describe.c:1685
 msgid "Source type"
 msgstr "Ô´ÀàÐÍ"
 
-#: describe.c:1675
+#: describe.c:1686
 msgid "Target type"
 msgstr "Ä¿±êÀàÐÍ"
 
-#: describe.c:1676
+#: describe.c:1687
 msgid "(binary compatible)"
 msgstr "(¶þ½øÖƼæÈÝ)"
 
-#: describe.c:1677
+#: describe.c:1688
 msgid "Function"
 msgstr "º¯Êý"
 
-#: describe.c:1679
+#: describe.c:1690
 msgid "in assignment"
 msgstr "in assignment"
 
-#: describe.c:1681
+#: describe.c:1692
 msgid "Implicit?"
 msgstr "Òþº¬µÄ?"
 
-#: describe.c:1689
+#: describe.c:1700
 msgid "List of casts"
 msgstr "ÀàÐÍת»»Áбí"
 
-#: describe.c:1739
+#: describe.c:1750
 msgid "List of schemas"
 msgstr "ģʽÁбí"
 
-#: sql_help.h:25 sql_help.h:369
+#: sql_help.h:25 sql_help.h:373
 msgid "abort the current transaction"
 msgstr "ÖÕÖ¹µ±Ç°ÊÂÎñ"
 
@@ -1549,18 +1554,44 @@ msgstr ""
 "ALTER GROUP ×éÃû RENAME TO ÐÂÃû×Ö"
 
 #: sql_help.h:53
+msgid "change the definition of an index"
+msgstr "¸Ä±äÒ»¸öË÷ÒýµÄ¶¨Òå"
+
+#: sql_help.h:54
+msgid ""
+"ALTER INDEX name \n"
+"    action [, ... ]\n"
+"ALTER INDEX name\n"
+"    RENAME TO new_name\n"
+"\n"
+"where action is one of:\n"
+"\n"
+"    OWNER TO new_owner\n"
+"    SET TABLESPACE indexspace_name"
+msgstr ""
+"ALTER INDEX Ë÷ÒýÃû³Æ \n"
+"    ¶¯×÷ [, ... ]\n"
+"ALTER INDEX Ë÷Òý¾ÉÃû³Æ\n"
+"    RENAME TO Ë÷ÒýÐÂÃû³Æ\n"
+"\n"
+"¶¯×÷ΪÒÔÏÂÖ®Ò»:\n"
+"\n"
+"    OWNER TO ÐÂÊôÖ÷\n"
+"    SET TABLESPACE indexspace_name"
+
+#: sql_help.h:57
 msgid "change the definition of a procedural language"
 msgstr "¸Ä±äÒ»¸ö¹ý³ÌÓïÑԵĶ¨Òå"
 
-#: sql_help.h:54
+#: sql_help.h:58
 msgid "ALTER LANGUAGE name RENAME TO newname"
 msgstr "ALTER LANGUAGE Ãû×Ö RENAME TO ÐÂÃû×Ö"
 
-#: sql_help.h:57
+#: sql_help.h:61
 msgid "change the definition of an operator class"
 msgstr "¸Ä±äÒ»¸ö²Ù×÷·û±íµÄ¶¨Òå"
 
-#: sql_help.h:58
+#: sql_help.h:62
 msgid ""
 "ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"
 "ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"
@@ -1568,11 +1599,11 @@ msgstr ""
 "ALTER OPERATOR CLASS Ãû×Ö USING Ë÷Òý·½·¨ RENAME TO ÐÂÃû×Ö\n"
 "ALTER OPERATOR CLASS Ãû×Ö USING Ë÷Òý·½·¨ OWNER TO ÐÂÊôÖ÷"
 
-#: sql_help.h:61
+#: sql_help.h:65
 msgid "change the definition of an operator"
 msgstr "¸Ä±äÒ»¸ö²Ù×÷·ûµÄ¶¨Òå"
 
-#: sql_help.h:62
+#: sql_help.h:66
 msgid ""
 "ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER TO "
 "newowner"
@@ -1580,11 +1611,11 @@ msgstr ""
 "ALTER OPERATOR Ãû×Ö ( { ×ó±ßÀàÐÍ | NONE } , { ÓÒ±ßÀàÐÍ | NONE } ) OWNER TO ÐÂ"
 "ÊôÖ÷"
 
-#: sql_help.h:65
+#: sql_help.h:69
 msgid "change the definition of a schema"
 msgstr "¸Ä±äÒ»¸öģʽµÄ¶¨Òå"
 
-#: sql_help.h:66
+#: sql_help.h:70
 msgid ""
 "ALTER SCHEMA name RENAME TO newname\n"
 "ALTER SCHEMA name OWNER TO newowner"
@@ -1592,11 +1623,11 @@ msgstr ""
 "ALTER SCHEMA Ãû×Ö RENAME TO ÐÂÃû×Ö\n"
 "ALTER SCHEMA Ãû×Ö OWNER TO ÐÂÊôÖ÷"
 
-#: sql_help.h:69
-msgid "alter the definition of a sequence generator"
-msgstr "¸Ä±äÒ»¸öÐòÁеĶ¨Òå"
+#: sql_help.h:73
+msgid "change the definition of a sequence generator"
+msgstr "¸Ä±äÒ»¸öÐòÁÐÉú³ÉÆ÷µÄ¶¨Òå"
 
-#: sql_help.h:70
+#: sql_help.h:74
 msgid ""
 "ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
@@ -1606,11 +1637,11 @@ msgstr ""
 "    [ MINVALUE ×îСֵ | NO MINVALUE ] [ MAXVALUE ×î´óÖµ | NO MAXVALUE ]\n"
 "    [ RESTART [ WITH ] ¿ªÊ¼ ] [ CACHE »º´æ ] [ [ NO ] CYCLE ]"
 
-#: sql_help.h:73
+#: sql_help.h:77
 msgid "change the definition of a table"
 msgstr "¸Ä±äÒ»¸ö±íµÄ¶¨Òå"
 
-#: sql_help.h:74
+#: sql_help.h:78
 msgid ""
 "ALTER TABLE [ ONLY ] name [ * ]\n"
 "    action [, ... ]\n"
@@ -1664,11 +1695,11 @@ msgstr ""
 "    OWNER TO ÐÂÊôÖ÷\n"
 "    SET TABLESPACE ±í¿Õ¼äÃû×Ö"
 
-#: sql_help.h:77
+#: sql_help.h:81
 msgid "change the definition of a tablespace"
 msgstr "¸Ä±äÒ»¸ö±í¿Õ¼äµÄ¶¨Òå"
 
-#: sql_help.h:78
+#: sql_help.h:82
 msgid ""
 "ALTER TABLESPACE name RENAME TO newname\n"
 "ALTER TABLESPACE name OWNER TO newowner"
@@ -1676,27 +1707,27 @@ msgstr ""
 "ALTER TABLESPACE Ãû×Ö RENAME TO ÐÂÃû×Ö\n"
 "ALTER TABLESPACE Ãû×Ö OWNER TO ÐÂÊôÖ÷"
 
-#: sql_help.h:81
+#: sql_help.h:85
 msgid "change the definition of a trigger"
 msgstr "¸Ä±äÒ»¸ö´¥·¢Æ÷µÄ¶¨Òå"
 
-#: sql_help.h:82
+#: sql_help.h:86
 msgid "ALTER TRIGGER name ON table RENAME TO newname"
 msgstr "ALTER TRIGGER Ãû×Ö ON ±í RENAME TO ÐÂÃû×Ö"
 
-#: sql_help.h:85
+#: sql_help.h:89
 msgid "change the definition of a type"
 msgstr "¸Ä±äÒ»¸öÀàÐ͵Ķ¨Òå"
 
-#: sql_help.h:86
+#: sql_help.h:90
 msgid "ALTER TYPE name OWNER TO new_owner"
 msgstr "ALTER TYPE Ãû×Ö OWNER TO ÐÂÊôÖ÷"
 
-#: sql_help.h:89
+#: sql_help.h:93
 msgid "change a database user account"
 msgstr "¸Ä±äÒ»¸öÊý¾Ý¿âÓû§"
 
-#: sql_help.h:90
+#: sql_help.h:94
 msgid ""
 "ALTER USER name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -1726,51 +1757,57 @@ msgstr ""
 "ALTER USER Ãû×Ö SET ²ÎÊý { TO | = } { Öµ | DEFAULT }\n"
 "ALTER USER Ãû×Ö RESET ²ÎÊý"
 
-#: sql_help.h:93
+#: sql_help.h:97
 msgid "collect statistics about a database"
 msgstr "ÊÕ¼¯¹ØÓÚÊý¾Ý¿âµÄͳ¼ÆÊý×Ö"
 
-#: sql_help.h:94
+#: sql_help.h:98
 msgid "ANALYZE [ VERBOSE ] [ table [ (column [, ...] ) ] ]"
 msgstr "ANALYZE [ VERBOSE ] [ ±í [ (×ֶΠ[, ...] ) ] ]"
 
-#: sql_help.h:97 sql_help.h:409
+#: sql_help.h:101 sql_help.h:413
 msgid "start a transaction block"
 msgstr "¿ªÊ¼Ò»¸öÊÂÎñ¿é"
 
-#: sql_help.h:98
+#: sql_help.h:102
 msgid ""
-"BEGIN [ WORK | TRANSACTION ]\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]"
+"BEGIN [ WORK | TRANSACTION ] [ transaction_mode [, ...] ]\n"
+"\n"
+"where transaction_mode is one of:\n"
+"\n"
+"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
+"UNCOMMITTED }\n"
+"    READ WRITE | READ ONLY"
 msgstr ""
-"BEGIN [ WORK | TRANSACTION ]\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]"
+"BEGIN [ WORK | TRANSACTION ] [ ÊÂÎïģʽ [, ...] ]\n"
+"\n"
+"ÊÂÎïģʽΪÏÂÃæÖ®Ò»:\n"
+"\n"
+"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
+"UNCOMMITTED }\n"
+"    READ WRITE | READ ONLY"
 
-#: sql_help.h:101
+#: sql_help.h:105
 msgid "force a transaction log checkpoint"
 msgstr "Ç¿Ðн»Ò×ÈÕÖ¾¼ì²é"
 
-#: sql_help.h:102
+#: sql_help.h:106
 msgid "CHECKPOINT"
 msgstr "CHECKPOINT"
 
-#: sql_help.h:105
+#: sql_help.h:109
 msgid "close a cursor"
 msgstr "¹Ø±ÕÒ»¸öÓαê"
 
-#: sql_help.h:106
+#: sql_help.h:110
 msgid "CLOSE name"
 msgstr "CLOSE Ãû×Ö"
 
-#: sql_help.h:109
+#: sql_help.h:113
 msgid "cluster a table according to an index"
 msgstr "¸ù¾ÝÒ»¸öË÷Òý½¨±í´Ø"
 
-#: sql_help.h:110
+#: sql_help.h:114
 msgid ""
 "CLUSTER indexname ON tablename\n"
 "CLUSTER tablename\n"
@@ -1780,11 +1817,11 @@ msgstr ""
 "CLUSTER ±íÃû\n"
 "CLUSTER"
 
-#: sql_help.h:113
+#: sql_help.h:117
 msgid "define or change the comment of an object"
 msgstr "¶¨Òå»ò¸Ä±äÒ»¸ö¶ÔÏóµÄÆÀ×¢"
 
-#: sql_help.h:114
+#: sql_help.h:118
 msgid ""
 "COMMENT ON\n"
 "{\n"
@@ -1834,19 +1871,19 @@ msgstr ""
 "  VIEW object_name\n"
 "} IS 'text'"
 
-#: sql_help.h:117 sql_help.h:305
+#: sql_help.h:121 sql_help.h:309
 msgid "commit the current transaction"
 msgstr "Ìá½»µ±Ç°ÊÂÎñ"
 
-#: sql_help.h:118
+#: sql_help.h:122
 msgid "COMMIT [ WORK | TRANSACTION ]"
 msgstr "COMMIT [ WORK | TRANSACTION ]"
 
-#: sql_help.h:121
+#: sql_help.h:125
 msgid "copy data between a file and a table"
 msgstr "ÔÚÒ»¸öÎļþºÍÒ»¸ö±íÖ®¼ä¿½±´Êý¾Ý"
 
-#: sql_help.h:122
+#: sql_help.h:126
 msgid ""
 "COPY tablename [ ( column [, ...] ) ]\n"
 "    FROM { 'filename' | STDIN }\n"
@@ -1892,11 +1929,11 @@ msgstr ""
 "                [ ESCAPE [ AS ] 'escape' ]\n"
 "                [ FORCE QUOTE column [, ...] ]"
 
-#: sql_help.h:125
+#: sql_help.h:129
 msgid "define a new aggregate function"
 msgstr "¶¨ÒåÒ»¸öеľۼ¯º¯Êý"
 
-#: sql_help.h:126
+#: sql_help.h:130
 msgid ""
 "CREATE AGGREGATE name (\n"
 "    BASETYPE = input_data_type,\n"
@@ -1914,11 +1951,11 @@ msgstr ""
 "    [ , INITCOND = initial_condition ]\n"
 ")"
 
-#: sql_help.h:129
+#: sql_help.h:133
 msgid "define a new cast"
 msgstr "¶¨ÒåÒ»¸öеÄÀàÐÍת»»"
 
-#: sql_help.h:130
+#: sql_help.h:134
 msgid ""
 "CREATE CAST (sourcetype AS targettype)\n"
 "    WITH FUNCTION funcname (argtypes)\n"
@@ -1936,11 +1973,11 @@ msgstr ""
 "    WITHOUT FUNCTION\n"
 "    [ AS ASSIGNMENT | AS IMPLICIT ]"
 
-#: sql_help.h:133
+#: sql_help.h:137
 msgid "define a new constraint trigger"
 msgstr "¶¨ÒåÒ»¸öеÄÔ¼Êø´¥·¢Æ÷"
 
-#: sql_help.h:134
+#: sql_help.h:138
 msgid ""
 "CREATE CONSTRAINT TRIGGER name\n"
 "    AFTER events ON\n"
@@ -1952,11 +1989,11 @@ msgstr ""
 "    tablename constraint attributes\n"
 "    FOR EACH ROW EXECUTE PROCEDURE funcname ( args )"
 
-#: sql_help.h:137
+#: sql_help.h:141
 msgid "define a new conversion"
 msgstr "¶¨ÒåÒ»¸öеÄת»»"
 
-#: sql_help.h:138
+#: sql_help.h:142
 msgid ""
 "CREATE [DEFAULT] CONVERSION name\n"
 "    FOR source_encoding TO dest_encoding FROM funcname"
@@ -1964,11 +2001,11 @@ msgstr ""
 "CREATE [DEFAULT] CONVERSION Ãû×Ö\n"
 "    FOR Ô´±àÂë TO Ä¿±ê±àÂë FROM º¯ÊýÃû"
 
-#: sql_help.h:141
+#: sql_help.h:145
 msgid "create a new database"
 msgstr "´´½¨Ò»¸öеÄÊý¾Ý¿â"
 
-#: sql_help.h:142
+#: sql_help.h:146
 msgid ""
 "CREATE DATABASE name\n"
 "    [ [ WITH ] [ OWNER [=] dbowner ]\n"
@@ -1982,11 +2019,11 @@ msgstr ""
 "           [ ENCODING [=] ±àÂë ]\n"
 "           [ TABLESPACE [=] ±í¿Õ¼ä ] ]"
 
-#: sql_help.h:145
+#: sql_help.h:149
 msgid "define a new domain"
 msgstr "¶¨ÒåÒ»¸öеÄÓò"
 
-#: sql_help.h:146
+#: sql_help.h:150
 msgid ""
 "CREATE DOMAIN name [AS] data_type\n"
 "    [ DEFAULT expression ]\n"
@@ -2006,11 +2043,11 @@ msgstr ""
 "[ CONSTRAINT constraint_name ]\n"
 "{ NOT NULL | NULL | CHECK (expression) }"
 
-#: sql_help.h:149
+#: sql_help.h:153
 msgid "define a new function"
 msgstr "¶¨ÒåÒ»¸öеĺ¯Êý"
 
-#: sql_help.h:150
+#: sql_help.h:154
 msgid ""
 "CREATE [ OR REPLACE ] FUNCTION name ( [ [ argname ] argtype [, ...] ] )\n"
 "    RETURNS rettype\n"
@@ -2034,11 +2071,11 @@ msgstr ""
 "  } ...\n"
 "    [ WITH ( attribute [, ...] ) ]"
 
-#: sql_help.h:153
+#: sql_help.h:157
 msgid "define a new user group"
 msgstr "¶¨ÒåÒ»¸öеÄÓû§×é"
 
-#: sql_help.h:154
+#: sql_help.h:158
 msgid ""
 "CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -2054,11 +2091,11 @@ msgstr ""
 "     SYSID gid\n"
 "   | USER  username [, ...]"
 
-#: sql_help.h:157
+#: sql_help.h:161
 msgid "define a new index"
 msgstr "¶¨ÒåÒ»¸öеÄË÷Òý"
 
-#: sql_help.h:158
+#: sql_help.h:162
 msgid ""
 "CREATE [ UNIQUE ] INDEX name ON table [ USING method ]\n"
 "    ( { column | ( expression ) } [ opclass ] [, ...] )\n"
@@ -2070,11 +2107,11 @@ msgstr ""
 "    [ TABLESPACE tablespace ]\n"
 "    [ WHERE predicate ]"
 
-#: sql_help.h:161
+#: sql_help.h:165
 msgid "define a new procedural language"
 msgstr "¶¨ÒåÒ»¸öеĹý³ÌÓïÑÔ"
 
-#: sql_help.h:162
+#: sql_help.h:166
 msgid ""
 "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
 "    HANDLER call_handler [ VALIDATOR valfunction ]"
@@ -2082,11 +2119,11 @@ msgstr ""
 "CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"
 "    HANDLER call_handler [ VALIDATOR valfunction ]"
 
-#: sql_help.h:165
+#: sql_help.h:169
 msgid "define a new operator class"
 msgstr "¶¨ÒåÒ»¸öеIJÙ×÷·ûÀà"
 
-#: sql_help.h:166
+#: sql_help.h:170
 msgid ""
 "CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type USING index_method "
 "AS\n"
@@ -2104,11 +2141,11 @@ msgstr ""
 "   | STORAGE storage_type\n"
 "  } [, ... ]"
 
-#: sql_help.h:169
+#: sql_help.h:173
 msgid "define a new operator"
 msgstr "¶¨ÒåÒ»¸öеIJÙ×÷·û"
 
-#: sql_help.h:170
+#: sql_help.h:174
 msgid ""
 "CREATE OPERATOR name (\n"
 "    PROCEDURE = funcname\n"
@@ -2130,11 +2167,11 @@ msgstr ""
 "    [, LTCMP = less_than_op ] [, GTCMP = greater_than_op ]\n"
 ")"
 
-#: sql_help.h:173
+#: sql_help.h:177
 msgid "define a new rewrite rule"
 msgstr "¶¨ÒåÒ»¸öеÄÖØд¹æÔò"
 
-#: sql_help.h:174
+#: sql_help.h:178
 msgid ""
 "CREATE [ OR REPLACE ] RULE name AS ON event\n"
 "    TO table [ WHERE condition ]\n"
@@ -2144,11 +2181,11 @@ msgstr ""
 "    TO ±í [ WHERE Ìõ¼þ ]\n"
 "    DO [ ALSO | INSTEAD ] { NOTHING | ÃüÁî | ( ÃüÁî ; ÃüÁî ... ) }"
 
-#: sql_help.h:177
+#: sql_help.h:181
 msgid "define a new schema"
 msgstr "¶¨ÒåÒ»¸öеÄģʽ"
 
-#: sql_help.h:178
+#: sql_help.h:182
 msgid ""
 "CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ TABLESPACE "
 "tablespace ] [ schema_element [ ... ] ]\n"
@@ -2160,11 +2197,11 @@ msgstr ""
 "CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] "
 "[ schema_element [ ... ] ]"
 
-#: sql_help.h:181
+#: sql_help.h:185
 msgid "define a new sequence generator"
 msgstr "¶¨ÒåÒ»¸öеÄÐòÁÐÉú³ÉÆ÷"
 
-#: sql_help.h:182
+#: sql_help.h:186
 msgid ""
 "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
@@ -2174,11 +2211,11 @@ msgstr ""
 "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"
 "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]"
 
-#: sql_help.h:185
+#: sql_help.h:189
 msgid "define a new table"
 msgstr "¶¨ÒåÒ»¸öеıí"
 
-#: sql_help.h:186
+#: sql_help.h:190
 msgid ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (\n"
 "  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "
@@ -2256,11 +2293,11 @@ msgstr ""
 "UPDATE action ] }\n"
 "[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]"
 
-#: sql_help.h:189 sql_help.h:385
-msgid "create a new table from the results of a query"
-msgstr "ÒÔÒ»¸ö²éѯµÄ½á¹û´´½¨Ò»¸öеıí"
+#: sql_help.h:193 sql_help.h:389
+msgid "define a new table from the results of a query"
+msgstr "ÒÔÒ»¸ö²éѯµÄ½á¹û¶¨ÒåÒ»¸öеıí"
 
-#: sql_help.h:190
+#: sql_help.h:194
 msgid ""
 "CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name "
 "[ (column_name [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]\n"
@@ -2270,20 +2307,20 @@ msgstr ""
 "[, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]\n"
 "    AS query"
 
-#: sql_help.h:193
+#: sql_help.h:197
 msgid "define a new tablespace"
 msgstr "¶¨ÒåÒ»¸öеıí¿Õ¼ä"
 
-#: sql_help.h:194
+#: sql_help.h:198
 msgid ""
 "CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"
 msgstr "CREATE TABLESPACE ±í¿Õ¼äÃû³Æ [ OWNER Óû§Ãû ] LOCATION 'Ŀ¼'"
 
-#: sql_help.h:197
+#: sql_help.h:201
 msgid "define a new trigger"
 msgstr "¶¨ÒåÒ»¸öеĴ¥·¢Æ÷"
 
-#: sql_help.h:198
+#: sql_help.h:202
 msgid ""
 "CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"
 "    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
@@ -2293,11 +2330,11 @@ msgstr ""
 "    ON ±í [ FOR [ EACH ] { ROW | STATEMENT } ]\n"
 "    EXECUTE PROCEDURE º¯ÊýÃû ( ²ÎÊý )"
 
-#: sql_help.h:201
+#: sql_help.h:205
 msgid "define a new data type"
 msgstr "¶¨ÒåÒ»¸öеÄÊý¾ÝÀàÐÍ"
 
-#: sql_help.h:202
+#: sql_help.h:206
 msgid ""
 "CREATE TYPE name AS\n"
 "    ( attribute_name data_type [, ... ] )\n"
@@ -2335,11 +2372,11 @@ msgstr ""
 "    [ , DELIMITER = delimiter ]\n"
 ")"
 
-#: sql_help.h:205
+#: sql_help.h:209
 msgid "define a new database user account"
 msgstr "¶¨ÒåÒ»¸öеÄÊý¾Ý¿âÓû§ÕÊ»§"
 
-#: sql_help.h:206
+#: sql_help.h:210
 msgid ""
 "CREATE USER name [ [ WITH ] option [ ... ] ]\n"
 "\n"
@@ -2363,27 +2400,27 @@ msgstr ""
 "    | IN GROUP groupname [, ...]\n"
 "    | VALID UNTIL 'abstime'"
 
-#: sql_help.h:209
+#: sql_help.h:213
 msgid "define a new view"
 msgstr "¶¨ÒåÒ»¸öеÄÊÓͼ"
 
-#: sql_help.h:210
+#: sql_help.h:214
 msgid "CREATE [ OR REPLACE ] VIEW name [ ( column_name [, ...] ) ] AS query"
 msgstr "CREATE [ OR REPLACE ] VIEW Ãû×Ö [ ( ×Ö¶ÎÃû [, ...] ) ] AS query"
 
-#: sql_help.h:213
+#: sql_help.h:217
 msgid "deallocate a prepared statement"
 msgstr "½â³ýÒ»¸ö×¼±¸ºÃµÄÓï¾ä"
 
-#: sql_help.h:214
+#: sql_help.h:218
 msgid "DEALLOCATE [ PREPARE ] plan_name"
 msgstr "DEALLOCATE [ PREPARE ] ¹æ»®Ãû³Æ"
 
-#: sql_help.h:217
+#: sql_help.h:221
 msgid "define a cursor"
 msgstr "¶¨ÒåÒ»¸öÓαê"
 
-#: sql_help.h:218
+#: sql_help.h:222
 msgid ""
 "DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"
 "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query\n"
@@ -2393,99 +2430,99 @@ msgstr ""
 "    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query\n"
 "    [ FOR { READ ONLY | UPDATE [ OF column [, ...] ] } ]"
 
-#: sql_help.h:221
+#: sql_help.h:225
 msgid "delete rows of a table"
 msgstr "ɾ³ýÒ»¸ö±íµÄ¼Ç¼"
 
-#: sql_help.h:222
+#: sql_help.h:226
 msgid "DELETE FROM [ ONLY ] table [ WHERE condition ]"
 msgstr "DELETE FROM [ ONLY ] ±í [ WHERE Ìõ¼þ ]"
 
-#: sql_help.h:225
+#: sql_help.h:229
 msgid "remove an aggregate function"
 msgstr "ɾ³ýÒ»¸ö¾Û¼¯º¯Êý"
 
-#: sql_help.h:226
+#: sql_help.h:230
 msgid "DROP AGGREGATE name ( type ) [ CASCADE | RESTRICT ]"
 msgstr "DROP AGGREGATE Ãû×Ö ( ÀàÐÍ ) [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:229
+#: sql_help.h:233
 msgid "remove a cast"
 msgstr "ɾ³ýÒ»¸öÀàÐÍת»»"
 
-#: sql_help.h:230
+#: sql_help.h:234
 msgid "DROP CAST (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
 msgstr "DROP CAST (Ô´ÀàÐÍ AS Ä¿±êÀàÐÍ) [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:233
+#: sql_help.h:237
 msgid "remove a conversion"
 msgstr "ɾ³ýÒ»¸öת»»"
 
-#: sql_help.h:234
+#: sql_help.h:238
 msgid "DROP CONVERSION name [ CASCADE | RESTRICT ]"
 msgstr "DROP CONVERSION Ãû×Ö [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:237
+#: sql_help.h:241
 msgid "remove a database"
 msgstr "ɾ³ýÒ»¸öÊý¾Ý¿â"
 
-#: sql_help.h:238
+#: sql_help.h:242
 msgid "DROP DATABASE name"
 msgstr "DROP DATABASE Ãû×Ö"
 
-#: sql_help.h:241
+#: sql_help.h:245
 msgid "remove a domain"
 msgstr "ɾ³ýÒ»¸öÓò"
 
-#: sql_help.h:242
+#: sql_help.h:246
 msgid "DROP DOMAIN name [, ...]  [ CASCADE | RESTRICT ]"
 msgstr "DROP DOMAIN Ãû×Ö [, ...]  [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:245
+#: sql_help.h:249
 msgid "remove a function"
 msgstr "ɾ³ýÒ»¸öº¯Êý"
 
-#: sql_help.h:246
+#: sql_help.h:250
 msgid "DROP FUNCTION name ( [ type [, ...] ] ) [ CASCADE | RESTRICT ]"
 msgstr "DROP FUNCTION Ãû×Ö ( [ ÀàÐÍ [, ...] ] ) [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:249
+#: sql_help.h:253
 msgid "remove a user group"
 msgstr "ɾ³ýÒ»¸öÓû§×é"
 
-#: sql_help.h:250
+#: sql_help.h:254
 msgid "DROP GROUP name"
 msgstr "DROP GROUP Ãû×Ö"
 
-#: sql_help.h:253
+#: sql_help.h:257
 msgid "remove an index"
 msgstr "ɾ³ýÒ»¸öË÷Òý"
 
-#: sql_help.h:254
+#: sql_help.h:258
 msgid "DROP INDEX name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP INDEX Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:257
+#: sql_help.h:261
 msgid "remove a procedural language"
 msgstr "ɾ³ýÒ»¸ö¹ý³ÌÓïÑÔ"
 
-#: sql_help.h:258
+#: sql_help.h:262
 msgid "DROP [ PROCEDURAL ] LANGUAGE name [ CASCADE | RESTRICT ]"
 msgstr "DROP [ PROCEDURAL ] LANGUAGE Ãû×Ö [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:261
+#: sql_help.h:265
 msgid "remove an operator class"
 msgstr "ɾ³ýÒ»¸ö²Ù×÷·ûÀà"
 
-#: sql_help.h:262
+#: sql_help.h:266
 msgid "DROP OPERATOR CLASS name USING index_method [ CASCADE | RESTRICT ]"
 msgstr "DROP OPERATOR CLASS name USING index_method [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:265
+#: sql_help.h:269
 msgid "remove an operator"
 msgstr "ɾ³ýÒ»¸ö²Ù×÷·û"
 
-#: sql_help.h:266
+#: sql_help.h:270
 msgid ""
 "DROP OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE "
 "| RESTRICT ]"
@@ -2493,103 +2530,103 @@ msgstr ""
 "DROP OPERATOR Ãû×Ö ( { ×ó±ßÀàÐÍ | NONE } , { ÓÒ±ßÀàÐÍ | NONE } ) [ CASCADE | "
 "RESTRICT ]"
 
-#: sql_help.h:269
+#: sql_help.h:273
 msgid "remove a rewrite rule"
 msgstr "ɾ³ýÒ»¸öÖØд¹æÔò"
 
-#: sql_help.h:270
+#: sql_help.h:274
 msgid "DROP RULE name ON relation [ CASCADE | RESTRICT ]"
 msgstr "DROP RULE Ãû×Ö ON ¹Øϵ [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:273
+#: sql_help.h:277
 msgid "remove a schema"
 msgstr "ɾ³ýÒ»¸öģʽ"
 
-#: sql_help.h:274
+#: sql_help.h:278
 msgid "DROP SCHEMA name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP SCHEMA Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:277
+#: sql_help.h:281
 msgid "remove a sequence"
 msgstr "ɾ³ýÒ»¸öÐòÁÐ"
 
-#: sql_help.h:278
+#: sql_help.h:282
 msgid "DROP SEQUENCE name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP SEQUENCE Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:281
+#: sql_help.h:285
 msgid "remove a table"
 msgstr "ɾ³ýÒ»¸ö±í"
 
-#: sql_help.h:282
+#: sql_help.h:286
 msgid "DROP TABLE name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP TABLE Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:285
+#: sql_help.h:289
 msgid "remove a tablespace"
 msgstr "ɾ³ýÒ»¸ö±í¿Õ¼ä"
 
-#: sql_help.h:286
+#: sql_help.h:290
 msgid "DROP TABLESPACE tablespacename"
 msgstr "DROP TABLESPACE ±í¿Õ¼äÃû×Ö"
 
-#: sql_help.h:289
+#: sql_help.h:293
 msgid "remove a trigger"
 msgstr "ɾ³ýÒ»¸ö´¥·¢Æ÷"
 
-#: sql_help.h:290
+#: sql_help.h:294
 msgid "DROP TRIGGER name ON table [ CASCADE | RESTRICT ]"
 msgstr "DROP TRIGGER Ãû×Ö ON ±í [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:293
+#: sql_help.h:297
 msgid "remove a data type"
 msgstr "ɾ³ýÒ»¸öÊý¾ÝÀàÐÍ"
 
-#: sql_help.h:294
+#: sql_help.h:298
 msgid "DROP TYPE name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP TYPE Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:297
+#: sql_help.h:301
 msgid "remove a database user account"
 msgstr "ɾ³ýÒ»¸öÊý¾Ý¿âÓû§ÕÊ»§"
 
-#: sql_help.h:298
+#: sql_help.h:302
 msgid "DROP USER name"
 msgstr "DROP USER Ãû×Ö"
 
-#: sql_help.h:301
+#: sql_help.h:305
 msgid "remove a view"
 msgstr "ɾ³ýÒ»¸öÊÓͼ"
 
-#: sql_help.h:302
+#: sql_help.h:306
 msgid "DROP VIEW name [, ...] [ CASCADE | RESTRICT ]"
 msgstr "DROP VIEW Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:306
+#: sql_help.h:310
 msgid "END [ WORK | TRANSACTION ]"
 msgstr "END [ WORK | TRANSACTION ]"
 
-#: sql_help.h:309
+#: sql_help.h:313
 msgid "execute a prepared statement"
 msgstr "Ö´ÐÐÒ»¸ö×¼±¸ºÃµÄÓï¾ä"
 
-#: sql_help.h:310
+#: sql_help.h:314
 msgid "EXECUTE plan_name [ (parameter [, ...] ) ]"
 msgstr "EXECUTE ¹æ»®Ãû³Æ [ (²ÎÊý [, ...] ) ]"
 
-#: sql_help.h:313
+#: sql_help.h:317
 msgid "show the execution plan of a statement"
 msgstr "ÏÔʾÓï¾äµÄÖ´Ðй滮"
 
-#: sql_help.h:314
+#: sql_help.h:318
 msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
 msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] Óï¾ä"
 
-#: sql_help.h:317
+#: sql_help.h:321
 msgid "retrieve rows from a query using a cursor"
 msgstr "»Ö¸´À´×ÔÒ»¸öʹÓÃÓαê²éѯµÄÐÐ"
 
-#: sql_help.h:318
+#: sql_help.h:322
 msgid ""
 "FETCH [ direction { FROM | IN } ] cursorname\n"
 "\n"
@@ -2629,11 +2666,11 @@ msgstr ""
 "    BACKWARD count\n"
 "    BACKWARD ALL"
 
-#: sql_help.h:321
+#: sql_help.h:325
 msgid "define access privileges"
 msgstr "¶¨Òå·ÃÎÊȨÏÞ"
 
-#: sql_help.h:322
+#: sql_help.h:326
 msgid ""
 "GRANT { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"
 "    [,...] | ALL [ PRIVILEGES ] }\n"
@@ -2690,11 +2727,11 @@ msgstr ""
 "    ON SCHEMA ģʽÃû³Æ [, ...]\n"
 "    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]"
 
-#: sql_help.h:325
+#: sql_help.h:329
 msgid "create new rows in a table"
 msgstr "ÔÚÒ»¸ö±íÖд´½¨ÐÂÐÐ"
 
-#: sql_help.h:326
+#: sql_help.h:330
 msgid ""
 "INSERT INTO table [ ( column [, ...] ) ]\n"
 "    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) | query }"
@@ -2702,27 +2739,27 @@ msgstr ""
 "INSERT INTO ±íÃû [ ( ×ֶΠ[, ...] ) ]\n"
 "    { DEFAULT VALUES | VALUES ( { ±í´ïʽ | DEFAULT } [, ...] ) | ×Ó²éѯ }"
 
-#: sql_help.h:329
+#: sql_help.h:333
 msgid "listen for a notification"
 msgstr "¼àÌýÒ»¸ö֪ͨ"
 
-#: sql_help.h:330
+#: sql_help.h:334
 msgid "LISTEN name"
 msgstr "LISTEN Ãû×Ö"
 
-#: sql_help.h:333
+#: sql_help.h:337
 msgid "load or reload a shared library file"
 msgstr "ÌáÈ¡»òÖØÔØÒ»¸ö¹²Ïí¿âÎļþ"
 
-#: sql_help.h:334
+#: sql_help.h:338
 msgid "LOAD 'filename'"
 msgstr "LOAD 'ÎļþÃû'"
 
-#: sql_help.h:337
+#: sql_help.h:341
 msgid "lock a table"
 msgstr "Ëø¶¨Ò»¸ö±í"
 
-#: sql_help.h:338
+#: sql_help.h:342
 msgid ""
 "LOCK [ TABLE ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"
 "\n"
@@ -2738,51 +2775,51 @@ msgstr ""
 "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
 "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 
-#: sql_help.h:341
+#: sql_help.h:345
 msgid "position a cursor"
 msgstr "¶¨Î»Ò»¸öÓαê"
 
-#: sql_help.h:342
+#: sql_help.h:346
 msgid "MOVE [ direction { FROM | IN } ] cursorname"
 msgstr "MOVE [ direction { FROM | IN } ] cursorname"
 
-#: sql_help.h:345
+#: sql_help.h:349
 msgid "generate a notification"
 msgstr "Éú³ÉÒ»¸ö֪ͨ"
 
-#: sql_help.h:346
+#: sql_help.h:350
 msgid "NOTIFY name"
 msgstr "NOTIFY Ãû×Ö"
 
-#: sql_help.h:349
+#: sql_help.h:353
 msgid "prepare a statement for execution"
 msgstr "ΪִÐÐ×¼±¸Ò»ÌõÓï¾ä"
 
-#: sql_help.h:350
+#: sql_help.h:354
 msgid "PREPARE plan_name [ (datatype [, ...] ) ] AS statement"
 msgstr "PREPARE ¹æ»®Ãû³Æ [ (Êý¾ÝÀàÐÍ [, ...] ) ] AS Óï¾ä"
 
-#: sql_help.h:353
+#: sql_help.h:357
 msgid "rebuild indexes"
 msgstr "Öؽ¨Ë÷Òý"
 
-#: sql_help.h:354
+#: sql_help.h:358
 msgid "REINDEX { DATABASE | TABLE | INDEX } name [ FORCE ]"
 msgstr "REINDEX { DATABASE | TABLE | INDEX } Ãû×Ö [ FORCE ]"
 
-#: sql_help.h:357
+#: sql_help.h:361
 msgid "destroy a previously defined savepoint"
 msgstr "ɾ³ýÒ»¸öÒÔÇ°¶¨ÒåµÄ savepoint"
 
-#: sql_help.h:358
-msgid "RELEASE savepoint_name"
-msgstr "RELEASE savepoint_name"
+#: sql_help.h:362
+msgid "RELEASE [ SAVEPOINT ] savepoint_name"
+msgstr "RELEASE [ SAVEPOINT ] savepoint_name"
 
-#: sql_help.h:361
+#: sql_help.h:365
 msgid "restore the value of a run-time parameter to the default value"
 msgstr "»Ö¸´ÔËÐÐʱ²ÎÊýֵΪĬÈÏÖµ"
 
-#: sql_help.h:362
+#: sql_help.h:366
 msgid ""
 "RESET name\n"
 "RESET ALL"
@@ -2790,11 +2827,11 @@ msgstr ""
 "RESET Ãû×Ö\n"
 "RESET ALL"
 
-#: sql_help.h:365
+#: sql_help.h:369
 msgid "remove access privileges"
 msgstr "ɾ³ý·ÃÎÊȨÏÞ"
 
-#: sql_help.h:366
+#: sql_help.h:370
 msgid ""
 "REVOKE [ GRANT OPTION FOR ]\n"
 "    { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"
@@ -2870,31 +2907,31 @@ msgstr ""
 "    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"
 "    [ CASCADE | RESTRICT ]"
 
-#: sql_help.h:370
+#: sql_help.h:374
 msgid "ROLLBACK [ WORK | TRANSACTION ]"
 msgstr "ROLLBACK [ WORK | TRANSACTION ]"
 
-#: sql_help.h:373
+#: sql_help.h:377
 msgid "roll back to a savepoint"
 msgstr "»Ø¹öµ½Ò»¸ö savepoint"
 
-#: sql_help.h:374
-msgid "ROLLBACK TO savepoint_name"
-msgstr "ROLLBACK TO savepoint_name"
+#: sql_help.h:378
+msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
+msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
 
-#: sql_help.h:377
+#: sql_help.h:381
 msgid "define a new savepoint within the current transaction"
 msgstr "ÔÚµ±Ç°ÊÂÎïÖж¨ÒåÒ»¸öÐ嵀 savepoint"
 
-#: sql_help.h:378
+#: sql_help.h:382
 msgid "SAVEPOINT savepoint_name"
 msgstr "SAVEPOINT savepoint_name"
 
-#: sql_help.h:381
+#: sql_help.h:385
 msgid "retrieve rows from a table or view"
 msgstr "»Ö¸´Ò»¸ö±í»òÊÓͼµÄÐÐ"
 
-#: sql_help.h:382
+#: sql_help.h:386
 msgid ""
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
 "    * | expression [ AS output_name ] [, ...]\n"
@@ -2940,7 +2977,7 @@ msgstr ""
 "    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "
 "( join_column [, ...] ) ]"
 
-#: sql_help.h:386
+#: sql_help.h:390
 msgid ""
 "SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"
 "    * | expression [ AS output_name ] [, ...]\n"
@@ -2968,11 +3005,11 @@ msgstr ""
 "    [ OFFSET start ]\n"
 "    [ FOR UPDATE [ OF tablename [, ...] ] ]"
 
-#: sql_help.h:389
+#: sql_help.h:393
 msgid "change a run-time parameter"
 msgstr "¸Ä±äÒ»¸öÔËÐÐʱ²ÎÊý"
 
-#: sql_help.h:390
+#: sql_help.h:394
 msgid ""
 "SET [ SESSION | LOCAL ] name { TO | = } { value | 'value' | DEFAULT }\n"
 "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
@@ -2980,21 +3017,21 @@ msgstr ""
 "SET [ SESSION | LOCAL ] Ãû×Ö { TO | = } { Öµ | 'Öµ' | DEFAULT }\n"
 "SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"
 
-#: sql_help.h:393
+#: sql_help.h:397
 msgid "set the constraint mode of the current transaction"
 msgstr "ÉèÖõ±Ç°½»Ò×µÄÔ¼Êøģʽ"
 
-#: sql_help.h:394
+#: sql_help.h:398
 msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
 msgstr "SET CONSTRAINTS { ALL | Ãû×Ö [, ...] } { DEFERRED | IMMEDIATE }"
 
-#: sql_help.h:397
+#: sql_help.h:401
 msgid ""
 "set the session user identifier and the current user identifier of the "
 "current session"
 msgstr "ÉèÖõ±Ç°»á»°µÄ»á»°Óû§È·ÈϺ͵±Ç°Óû§È·ÈÏ"
 
-#: sql_help.h:398
+#: sql_help.h:402
 msgid ""
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
@@ -3004,37 +3041,35 @@ msgstr ""
 "SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"
 "RESET SESSION AUTHORIZATION"
 
-#: sql_help.h:401
+#: sql_help.h:405
 msgid "set the characteristics of the current transaction"
 msgstr "ÉèÖõ±Ç°½»Ò×µÄÊôÐÔ"
 
-#: sql_help.h:402
+#: sql_help.h:406
 msgid ""
-"SET TRANSACTION\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]\n"
+"SET TRANSACTION transaction_mode [, ...]\n"
+"SET SESSION CHARACTERISTICS AS TRANSACTION transaction_mode [, ...]\n"
 "\n"
-"SET SESSION CHARACTERISTICS AS TRANSACTION\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]"
+"where transaction_mode is one of:\n"
+"\n"
+"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
+"UNCOMMITTED }\n"
+"    READ WRITE | READ ONLY"
 msgstr ""
-"SET TRANSACTION\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]\n"
+"SET TRANSACTION ÊÂÎïģʽ [, ...]\n"
+"SET SESSION CHARACTERISTICS AS TRANSACTION ÊÂÎïģʽ [, ...]\n"
+"\n"
+"ÊÂÎïģʽΪÏÂÃæÖ®Ò»:\n"
 "\n"
-"SET SESSION CHARACTERISTICS AS TRANSACTION\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]"
+"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
+"UNCOMMITTED }\n"
+"    READ WRITE | READ ONLY"
 
-#: sql_help.h:405
+#: sql_help.h:409
 msgid "show the value of a run-time parameter"
 msgstr "ÏÔʾÔËÐÐʱ²ÎÊýÖµ"
 
-#: sql_help.h:406
+#: sql_help.h:410
 msgid ""
 "SHOW name\n"
 "SHOW ALL"
@@ -3042,39 +3077,45 @@ msgstr ""
 "SHOW Ãû×Ö\n"
 "SHOW ALL"
 
-#: sql_help.h:410
+#: sql_help.h:414
 msgid ""
-"START TRANSACTION\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]"
+"START TRANSACTION [ transaction_mode [, ...] ]\n"
+"\n"
+"where transaction_mode is one of:\n"
+"\n"
+"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
+"UNCOMMITTED }\n"
+"    READ WRITE | READ ONLY"
 msgstr ""
-"START TRANSACTION\n"
-"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "
-"| SERIALIZABLE } ]\n"
-"    [ READ WRITE | READ ONLY ]"
+"START TRANSACTION [ ÊÂÎïģʽ [, ...] ]\n"
+"\n"
+"ÊÂÎïģʽΪÏÂÃæÖ®Ò»:\n"
+"\n"
+"    ISOLATION LEVEL { SERIALIZABLE | REPEATABLE READ | READ COMMITTED | READ "
+"UNCOMMITTED }\n"
+"    READ WRITE | READ ONLY"
 
-#: sql_help.h:413
+#: sql_help.h:417
 msgid "empty a table"
 msgstr "Çå¿ÕÒ»¸ö±í"
 
-#: sql_help.h:414
+#: sql_help.h:418
 msgid "TRUNCATE [ TABLE ] name"
 msgstr "TRUNCATE [ TABLE ] Ãû×Ö"
 
-#: sql_help.h:417
+#: sql_help.h:421
 msgid "stop listening for a notification"
 msgstr "Í£Ö¹¼àÌý֪ͨ"
 
-#: sql_help.h:418
+#: sql_help.h:422
 msgid "UNLISTEN { name | * }"
 msgstr "UNLISTEN { Ãû×Ö | * }"
 
-#: sql_help.h:421
+#: sql_help.h:425
 msgid "update rows of a table"
 msgstr "¸üÐÂÒ»¸ö±íµÄ¼Ç¼"
 
-#: sql_help.h:422
+#: sql_help.h:426
 msgid ""
 "UPDATE [ ONLY ] table SET column = { expression | DEFAULT } [, ...]\n"
 "    [ FROM fromlist ]\n"
@@ -3084,11 +3125,11 @@ msgstr ""
 "    [ FROM fromlist ]\n"
 "    [ WHERE Ìõ¼þ ]"
 
-#: sql_help.h:425
+#: sql_help.h:429
 msgid "garbage-collect and optionally analyze a database"
 msgstr "À¬»ø»ØÊպͿÉÑ¡Ôñ·ÖÎöÒ»¸öÊý¾Ý¿â"
 
-#: sql_help.h:426
+#: sql_help.h:430
 msgid ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "
@@ -3097,6 +3138,33 @@ msgstr ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ±í ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ ±í [ (ÁÐ [, ...] ) ] ]"
 
+#~ msgid "RELEASE savepoint_name"
+#~ msgstr "RELEASE savepoint_name"
+
+#~ msgid "ROLLBACK TO savepoint_name"
+#~ msgstr "ROLLBACK TO savepoint_name"
+
+#~ msgid ""
+#~ "SET TRANSACTION\n"
+#~ "    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE "
+#~ "READ | SERIALIZABLE } ]\n"
+#~ "    [ READ WRITE | READ ONLY ]\n"
+#~ "\n"
+#~ "SET SESSION CHARACTERISTICS AS TRANSACTION\n"
+#~ "    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE "
+#~ "READ | SERIALIZABLE } ]\n"
+#~ "    [ READ WRITE | READ ONLY ]"
+#~ msgstr ""
+#~ "SET TRANSACTION\n"
+#~ "    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE "
+#~ "READ | SERIALIZABLE } ]\n"
+#~ "    [ READ WRITE | READ ONLY ]\n"
+#~ "\n"
+#~ "SET SESSION CHARACTERISTICS AS TRANSACTION\n"
+#~ "    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE "
+#~ "READ | SERIALIZABLE } ]\n"
+#~ "    [ READ WRITE | READ ONLY ]"
+
 #~ msgid "  \\db [PATTERN]  list tablespaces\n"
 #~ msgstr "  \\db [ģʽ]       Áгö±í¿Õ¼ä\n"
 
diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index 1785518173..dd6987ceed 100644
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-06-26 10:44+0000\n"
+"POT-Creation-Date: 2004-08-31 08:56+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -17,13 +17,13 @@ msgstr ""
 #: createdb.c:102 createdb.c:121 createlang.c:97 createlang.c:118
 #: createlang.c:160 createuser.c:117 createuser.c:132 dropdb.c:84 dropdb.c:93
 #: dropdb.c:101 droplang.c:94 droplang.c:115 droplang.c:157 dropuser.c:84
-#: dropuser.c:99 clusterdb.c:97 clusterdb.c:112 vacuumdb.c:114 vacuumdb.c:129
+#: dropuser.c:99 clusterdb.c:95 clusterdb.c:110 vacuumdb.c:112 vacuumdb.c:127
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
 #: createdb.c:119 createlang.c:116 createuser.c:130 dropdb.c:99 droplang.c:113
-#: dropuser.c:97 clusterdb.c:110 vacuumdb.c:127
+#: dropuser.c:97 clusterdb.c:108 vacuumdb.c:125
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: Ì«¶àµÄÃüÁîÐвÎÊý (µÚÒ»¸öÊÇ \"%s\")\n"
@@ -53,7 +53,7 @@ msgstr ""
 "\n"
 
 #: createdb.c:218 createlang.c:299 createuser.c:240 dropdb.c:147
-#: droplang.c:280 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
+#: droplang.c:280 dropuser.c:147 clusterdb.c:234 vacuumdb.c:260
 #, c-format
 msgid "Usage:\n"
 msgstr "ʹÓ÷½·¨:\n"
@@ -64,7 +64,7 @@ msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû³Æ] [ÃèÊö]\n"
 
 #: createdb.c:220 createlang.c:301 createuser.c:242 dropdb.c:149
-#: droplang.c:282 dropuser.c:149 clusterdb.c:238 vacuumdb.c:264
+#: droplang.c:282 dropuser.c:149 clusterdb.c:236 vacuumdb.c:262
 #, c-format
 msgid ""
 "\n"
@@ -114,7 +114,7 @@ msgstr "  --help                       
 msgid "  --version                    output version information, then exit\n"
 msgstr "  --versoin                    Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createdb.c:229 createuser.c:255 clusterdb.c:246 vacuumdb.c:275
+#: createdb.c:229 createuser.c:255 clusterdb.c:244 vacuumdb.c:273
 #, c-format
 msgid ""
 "\n"
@@ -155,7 +155,7 @@ msgstr ""
 "ĬÈÏÇé¿öÏÂ, ÒÔµ±Ç°Óû§µÄÓû§Ãû´´½¨Êý¾Ý¿â.\n"
 
 #: createdb.c:235 createlang.c:312 createuser.c:262 dropdb.c:159
-#: droplang.c:292 dropuser.c:159 clusterdb.c:252 vacuumdb.c:281
+#: droplang.c:292 dropuser.c:159 clusterdb.c:250 vacuumdb.c:279
 #, c-format
 msgid ""
 "\n"
@@ -232,7 +232,7 @@ msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAME       Òª°²×°ÓïÑÔµÄÊý¾Ý¿â\n"
 
 #: createlang.c:303 createuser.c:251 dropdb.c:150 droplang.c:284
-#: dropuser.c:150 clusterdb.c:242
+#: dropuser.c:150 clusterdb.c:240
 #, c-format
 msgid ""
 "  -e, --echo                show the commands being sent to the server\n"
@@ -251,35 +251,35 @@ msgid ""
 msgstr "  -L, --pglib=DIRECTORY     ÔÚ DIRECTORY Ŀ¼ÖвéÕÒÓïÑÔ·­ÒëÎļþ\n"
 
 #: createlang.c:306 createuser.c:256 dropdb.c:153 droplang.c:286
-#: dropuser.c:153 clusterdb.c:247 vacuumdb.c:276
+#: dropuser.c:153 clusterdb.c:245 vacuumdb.c:274
 #, c-format
 msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
 msgstr "  -h, --host=HOSTNAM        Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
 
 #: createlang.c:307 createuser.c:257 dropdb.c:154 droplang.c:287
-#: dropuser.c:154 clusterdb.c:248 vacuumdb.c:277
+#: dropuser.c:154 clusterdb.c:246 vacuumdb.c:275
 #, c-format
 msgid "  -p, --port=PORT           database server port\n"
 msgstr "  -p, --port=PORT           Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
 
-#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:249 vacuumdb.c:278
+#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:247 vacuumdb.c:276
 #, c-format
 msgid "  -U, --username=USERNAME   user name to connect as\n"
 msgstr "  -U, --username=USERNAME   Áª½ÓµÄÓû§Ãû\n"
 
-#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:250 vacuumdb.c:279
+#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:248 vacuumdb.c:277
 #, c-format
 msgid "  -W, --password            prompt for password\n"
 msgstr "  -W, --password            ÌáʾÊäÈë¿ÚÁî\n"
 
 #: createlang.c:310 createuser.c:253 dropdb.c:157 droplang.c:290
-#: dropuser.c:157 clusterdb.c:244
+#: dropuser.c:157 clusterdb.c:242
 #, c-format
 msgid "  --help                    show this help, then exit\n"
 msgstr "  --help                    ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
 #: createlang.c:311 createuser.c:254 dropdb.c:158 droplang.c:291
-#: dropuser.c:158 clusterdb.c:245
+#: dropuser.c:158 clusterdb.c:243
 #, c-format
 msgid "  --version                 output version information, then exit\n"
 msgstr "  --version                 Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
@@ -373,7 +373,7 @@ msgstr "  -N, --unencrypted         
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
 msgstr "  -i, --sysid=SYSID         Ñ¡ÔñÒ»¸ö sysid ¸øÐÂÓû§\n"
 
-#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:243
+#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:241
 #, c-format
 msgid "  -q, --quiet               don't write any messages\n"
 msgstr "  -q, --quiet               ²»Ð´ÈκÎÐÅÏ¢\n"
@@ -498,32 +498,32 @@ msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
 msgstr "  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇҪɾ³ýµÄÓû§Ãû)\n"
 
-#: clusterdb.c:120
+#: clusterdb.c:118
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr "%s: ÎÞ·¨¶ÔËùÓÐÊý¾Ý¿âºÍÒ»¸öÖ¸¶¨µÄÊý¾Ý¿âͬʱ½¨´Ø\n"
 
-#: clusterdb.c:126
+#: clusterdb.c:124
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr "%s: ÎÞ·¨ÔÚËùÓÐÊý¾Ý¿âÖжÔÒ»¸öÖ¸¶¨µÄ±í½øÐн¨´Ø\n"
 
-#: clusterdb.c:182
+#: clusterdb.c:180
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: ÔÚÊý¾Ý¿â \"%3$s\" Öеıí \"%2$s\" ½¨´Øʧ°Ü: %4$s"
 
-#: clusterdb.c:185
+#: clusterdb.c:183
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: Êý¾Ý¿â \"%s\" ½¨´Øʧ°Ü: %s"
 
-#: clusterdb.c:221
+#: clusterdb.c:219
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: ¶ÔÊý¾Ý¿â \"%s\" ½øÐн¨´Ø\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:233
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -532,27 +532,27 @@ msgstr ""
 "%s ¶ÔÒ»¸öÊý¾Ý¿âÖÐÏÈÇ°ÒѾ­½¨¹ý´ØµÄ±í½øÐн¨´Ø.\n"
 "\n"
 
-#: clusterdb.c:237 vacuumdb.c:263
+#: clusterdb.c:235 vacuumdb.c:261
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû]\n"
 
-#: clusterdb.c:239
+#: clusterdb.c:237
 #, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 ¶ÔËùÓÐÊý¾Ý¿â½¨´Ø\n"
 
-#: clusterdb.c:240
+#: clusterdb.c:238
 #, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       ¶ÔÊý¾Ý¿â DBNAME ½¨´Ø\n"
 
-#: clusterdb.c:241
+#: clusterdb.c:239
 #, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         Ö»¶ÔÖ¸¶¨µÄ±í TABLE ½¨´Ø\n"
 
-#: clusterdb.c:251
+#: clusterdb.c:249
 #, c-format
 msgid ""
 "\n"
@@ -561,32 +561,32 @@ msgstr ""
 "\n"
 "ÔĶÁ SQL ÃüÁî CLUSTER µÄÃèÊöÐÅÏ¢, ÒÔ±ã»ñµÃ¸üÏêϸµÄÐÅÏ¢.\n"
 
-#: vacuumdb.c:137
+#: vacuumdb.c:135
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr "%s: ÎÞ·¨¶ÔËùÓÐÊý¾Ý¿âºÍÒ»¸öÖ¸¶¨µÄÊý¾Ý¿âͬʱÇåÀí\n"
 
-#: vacuumdb.c:143
+#: vacuumdb.c:141
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: ÎÞ·¨ÔÚËùÓÐÊý¾Ý¿âÖжÔÒ»¸öÖ¸¶¨µÄ±í½øÐÐÇåÀí\n"
 
-#: vacuumdb.c:207
+#: vacuumdb.c:205
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: ÔÚÊý¾Ý¿â \"%3$s\" Öеıí \"%2$s\" ÇåÀíʧ°Ü: %4$s"
 
-#: vacuumdb.c:210
+#: vacuumdb.c:208
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: Êý¾Ý¿â \"%s\" ÇåÀíʧ°Ü: %s"
 
-#: vacuumdb.c:247
+#: vacuumdb.c:245
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: ÇåÀíÊý¾Ý¿â \"%s\"\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:259
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -595,60 +595,60 @@ msgstr ""
 "%s ÇåÀí²¢ÇÒÓÅ»¯Ò»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:263
 #, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       ÇåÀíËùÓеÄÊý¾Ý¿â\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:264
 #, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             ÇåÀíÊý¾Ý¿â DBNAME\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:265
 #, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr "  -t, --table='TABLE[(COLUMNS)]'  Ö»ÇåÀíÖ¸¶¨µÄ±í TABLE\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:266
 #, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      ÍêÈ«ÇåÀí\n"
 
-#: vacuumdb.c:269
+#: vacuumdb.c:267
 #, c-format
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr "  -z, --anaylze                   ¸üÐÂÓÅ»¯Æ÷ÐÅÏ¢\n"
 
-#: vacuumdb.c:270
+#: vacuumdb.c:268
 #, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
 msgstr "  -e, --echo                      ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
 
-#: vacuumdb.c:271
+#: vacuumdb.c:269
 #, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     ²»Ð´ÈκÎÐÅÏ¢\n"
 
-#: vacuumdb.c:272
+#: vacuumdb.c:270
 #, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   д´óÁ¿µÄÊä³ö\n"
 
-#: vacuumdb.c:273
+#: vacuumdb.c:271
 #, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:272
 #, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
 msgstr "  --versoin                       Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: vacuumdb.c:280
+#: vacuumdb.c:278
 #, c-format
 msgid ""
 "\n"
diff --git a/src/interfaces/libpq/po/cs.po b/src/interfaces/libpq/po/cs.po
index 8d81dad68b..61b2c87ada 100644
--- a/src/interfaces/libpq/po/cs.po
+++ b/src/interfaces/libpq/po/cs.po
@@ -1,14 +1,14 @@
 # Czech translation of libpq messages
 # Karel Zak <zakkr@zf.jcu.cz>, 2001-2003.
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/cs.po,v 1.3 2003/11/29 22:41:29 pgsql Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/cs.po,v 1.4 2004/09/13 12:26:47 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
-"POT-Creation-Date: 2003-06-29 12:25+0200\n"
-"PO-Revision-Date: 2003-07-22 13:40+0100\n"
-"Last-Translator: Karel Zak <zakkr@zf.jcu.cz>\n"
+"POT-Creation-Date: 2004-08-12 01:17-0300\n"
+"PO-Revision-Date: 2004-08-12 22:04+0100\n"
+"Last-Translator: Michal Taborsky <michal@taborsky.cz>\n"
 "Language-Team: Karel Zak <zakkr@zf.jcu.cz>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-2\n"
@@ -22,7 +22,7 @@ msgstr "Kerberos 4 chyba: %s\n"
 #: fe-auth.c:394
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
-msgstr "nelze nastavit blokovaný mód soketu: %s\n"
+msgstr "nelze nastavit soket do blokujícího módu: %s\n"
 
 #: fe-auth.c:411
 #: fe-auth.c:415
@@ -33,9 +33,9 @@ msgstr "Kerberos 5 autentifikace odm
 #: fe-auth.c:441
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "nelze obnovit neblokovaný mód soketu: %s\n"
+msgstr "nelze obnovit neblokující mód soketu: %s\n"
 
-#: fe-auth.c:509
+#: fe-auth.c:508
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "autentifikaèní metoda SCM_CRED není podporována\n"
 
@@ -43,44 +43,54 @@ msgstr "autentifika
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 autentifikace selhala\n"
 
-#: fe-auth.c:606
+#: fe-auth.c:608
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "Kerberos 4 autentifikace není podporována\n"
 
-#: fe-auth.c:616
+#: fe-auth.c:619
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 autentifikace selhala\n"
 
-#: fe-auth.c:622
+#: fe-auth.c:627
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "Kerberos 5 autentifikace není podporována\n"
 
-#: fe-auth.c:650
+#: fe-auth.c:655
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "autentifikaèní metoda %u není podporována\n"
 
-#: fe-auth.c:687
+#: fe-auth.c:692
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
-msgstr "neplatné jméno autentifikaèní slu¾by \"%s\" ignorováno\n"
+msgstr "neplatné jméno autentifikaèní slu¾by \"%s\", ignorováno\n"
 
-#: fe-auth.c:758
+#: fe-auth.c:764
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: neplatný autentifikaèní systém: %d\n"
 
-#: fe-connect.c:717
+#: fe-connect.c:452
+#, c-format
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "neplatná hodnota sslmode: \"%s\"\n"
+
+#: fe-connect.c:472
+#, c-format
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "hodnota sslmode \"%s\" je naplatná pokud není zakompilována podpora SSL\n"
+
+#: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "nelze nastavit neblokovaný mód soketu: %s\n"
+msgstr "nelze nastavit soket do neblokujícího módu: %s\n"
 
-#: fe-connect.c:744
+#: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "nelze nastavit \"no delay\" mód TCP soketu: %s\n"
 
-#: fe-connect.c:772
+#: fe-connect.c:841
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -91,241 +101,251 @@ msgstr ""
 "\tJe spu¹tìn server lokálnì a akceptuje\n"
 "\tspojení pomocí Unix soketu \"%s\"?\n"
 
-#: fe-connect.c:780
+#: fe-connect.c:853
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
-"\tIs the server running on host %s and accepting\n"
+"\tIs the server running on host \"%s\" and accepting\n"
 "\tTCP/IP connections on port %s?\n"
 msgstr ""
 "nelze navázat spojení se serverem: %s\n"
-"\tJe server na %s spu¹tìn a akceptuje\n"
+"\tJe server na \"%s\" spu¹tìn a akceptuje\n"
 "\tTCP/IP spojení na portu %s?\n"
 
-#: fe-connect.c:862
+#: fe-connect.c:945
 #, c-format
-msgid "getaddrinfo() failed: %s\n"
-msgstr "getaddrinfo() selhal: %s\n"
+msgid "could not translate host name \"%s\" to address: %s\n"
+msgstr "nemohu pøelo¾it jméno hostitele \"%s\" na adresu: %s\n"
 
-#: fe-connect.c:1056
+#: fe-connect.c:949
+#, c-format
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "nemohu pøelo¾it cestu Unix-domain soketu \"%s\" na adresu: %s\n"
+
+#: fe-connect.c:1153
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "neplatný status spojení, pravdìpodobnì indikující poru¹ení pamìti\n"
+msgstr "neplatný stav spojení, pravdìpodobnì indikující poru¹ení pamìti\n"
 
-#: fe-connect.c:1101
+#: fe-connect.c:1196
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "nelze vytvoøit soket: %s\n"
 
-#: fe-connect.c:1207
+#: fe-connect.c:1307
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "nelze obdr¾et chybový status soketu: %s\n"
 
-#: fe-connect.c:1244
+#: fe-connect.c:1346
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "nelze získat adresu klienta ze soketu: %s\n"
 
-#: fe-connect.c:1289
+#: fe-connect.c:1391
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "nelze poslat SSL \"negotiation packet\": %s\n"
 
-#: fe-connect.c:1311
-#: fe-connect.c:2361
-#: fe-connect.c:2370
-#: fe-connect.c:2937
-#: fe-lobj.c:538
+#: fe-connect.c:1413
+#: fe-connect.c:2536
+#: fe-connect.c:2545
+#: fe-connect.c:3122
+#: fe-lobj.c:548
 msgid "out of memory\n"
 msgstr "nedostatek pamìti\n"
 
-#: fe-connect.c:1324
+#: fe-connect.c:1426
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "nelze poslat poèáteèní paket: %s\n"
 
-#: fe-connect.c:1364
+#: fe-connect.c:1466
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "nelze obdr¾et odpovìï serveru na SSL \"negotiation packet\": %s\n"
 
-#: fe-connect.c:1383
-#: fe-connect.c:1400
+#: fe-connect.c:1485
+#: fe-connect.c:1502
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "server nepodporuje SSL, leè SSL je vy¾adováno\n"
 
-#: fe-connect.c:1416
+#: fe-connect.c:1518
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "pøijata neplatná odpovìï na SSL negotiation: %c\n"
 
-#: fe-connect.c:1472
-#: fe-connect.c:1504
+#: fe-connect.c:1575
+#: fe-connect.c:1607
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "oèekáván byl autentifikaèní dotaz ze serveru, ale pøijat byl %c\n"
 
-#: fe-connect.c:1698
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "neoèekávaná zpráva ze serveru bìhem startu\n"
 
-#: fe-connect.c:1767
+#: fe-connect.c:1913
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "neplatný status spojení %c, pravdìpodobnì indikující poru¹ení pamìti\n"
 
-#: fe-connect.c:2409
+#: fe-connect.c:2584
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "chybné \"=\" po \"%s\" v informaèním øetìzci spojení\n"
 
-#: fe-connect.c:2458
+#: fe-connect.c:2633
 msgid "unterminated quoted string in connection info string\n"
 msgstr "neukonèený øetìzec v uvozovkách v informaèním øetìzci spojení\n"
 
-#: fe-connect.c:2492
+#: fe-connect.c:2667
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "neplatný parametr spojení \"%s\"\n"
 
-#: fe-connect.c:2704
+#: fe-connect.c:2889
 msgid "connection pointer is NULL\n"
 msgstr "pointer spojení je NULL\n"
 
-#: fe-connect.c:2955
+#: fe-connect.c:3140
 #, c-format
 msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
 msgstr "UPOZORNÌNÍ: Soubor s hesly %s má pøístupová práva pro ètení pro skupinu nebo v¹echny u¾ivatele; práva by mìla být u=rw (0600)\n"
 
-#: fe-exec.c:474
+#: fe-exec.c:484
 msgid "NOTICE"
 msgstr "POZNÁMKA"
 
-#: fe-exec.c:623
-#: fe-exec.c:682
+#: fe-exec.c:653
+#: fe-exec.c:705
 msgid "command string is a null pointer\n"
-msgstr "øetìzec pøíkazu je NULL\n"
+msgstr "øetìzec pøíkazu je prázdný ukazatel\n"
 
-#: fe-exec.c:675
-#: fe-exec.c:1310
-msgid "function requires at least 3.0 protocol\n"
-msgstr "funkce vy¾aduje alespoò protokol 3.0\n"
+#: fe-exec.c:740
+msgid "statement name is a null pointer\n"
+msgstr "název výrazu je prázdný ukazatel\n"
 
-#: fe-exec.c:821
+#: fe-exec.c:771
 msgid "no connection to the server\n"
 msgstr "není spojení se serverem\n"
 
-#: fe-exec.c:828
+#: fe-exec.c:778
 msgid "another command is already in progress\n"
 msgstr "zpracovává se ji¾ jiný pøíkaz\n"
 
-#: fe-exec.c:1013
+#: fe-exec.c:814
+#: fe-exec.c:1465
+msgid "function requires at least protocol version 3.0\n"
+msgstr "funkce vy¾aduje protokol alespoò 3.0 a vy¹¹í\n"
+
+#: fe-exec.c:1116
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "neoèekávaný asyncStatus: %d\n"
 
-#: fe-exec.c:1092
+#: fe-exec.c:1221
 msgid "COPY terminated by new PQexec"
 msgstr "COPY bylo ukonèeno novým PQexec"
 
-#: fe-exec.c:1104
+#: fe-exec.c:1229
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN status musí být nejdøíve ukonèen\n"
 
-#: fe-exec.c:1125
+#: fe-exec.c:1249
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT status musí být nejdøíve ukonèen\n"
 
-#: fe-exec.c:1225
-#: fe-exec.c:1279
-#: fe-exec.c:1352
+#: fe-exec.c:1358
+#: fe-exec.c:1423
+#: fe-exec.c:1507
 msgid "no COPY in progress\n"
 msgstr "COPY se neprovádí\n"
 
-#: fe-exec.c:1544
+#: fe-exec.c:1699
 msgid "connection in wrong state\n"
 msgstr "spojení je ve ¹patném stavu\n"
 
-#: fe-exec.c:1575
+#: fe-exec.c:1730
 msgid "invalid ExecStatusType code"
 msgstr "neplatný ExecStatusType kód"
 
-#: fe-exec.c:1639
-#: fe-exec.c:1662
+#: fe-exec.c:1794
+#: fe-exec.c:1817
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "èíslo sloupce %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:1655
+#: fe-exec.c:1810
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "èíslo øádky %d je mimo rozsah 0..%d"
 
-#: fe-exec.c:1892
+#: fe-exec.c:2094
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "nelze interpretovat výsledek ze serveru: %s"
 
-#: fe-lobj.c:401
-#: fe-lobj.c:485
+#: fe-lobj.c:402
+#: fe-lobj.c:487
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "nelze otevøít soubor \"%s\": %s\n"
 
-#: fe-lobj.c:413
+#: fe-lobj.c:414
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "nelze vytvoøit \"large object\" pro soubor \"%s\"\n"
 
-#: fe-lobj.c:423
-#: fe-lobj.c:473
+#: fe-lobj.c:424
+#: fe-lobj.c:474
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "nelze otevøít \"large object\" %u\n"
 
-#: fe-lobj.c:438
+#: fe-lobj.c:439
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "chyba bìhem ètení souboru \"%s\"\n"
 
-#: fe-lobj.c:500
+#: fe-lobj.c:502
+#: fe-lobj.c:515
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "chyba bìhem zápisu do souboru \"%s\"\n"
 
-#: fe-lobj.c:566
+#: fe-lobj.c:593
 msgid "query to initialize large object functions did not return data\n"
 msgstr "dotaz inicializující \"large object\" funkce nevrátil data\n"
 
-#: fe-lobj.c:604
+#: fe-lobj.c:631
 msgid "cannot determine OID of function lo_open\n"
 msgstr "nelze urèit OID funkce lo_open\n"
 
-#: fe-lobj.c:611
+#: fe-lobj.c:638
 msgid "cannot determine OID of function lo_close\n"
 msgstr "nelze urèit OID funkce lo_close\n"
 
-#: fe-lobj.c:618
+#: fe-lobj.c:645
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "nelze urèit OID funkce lo_create\n"
 
-#: fe-lobj.c:625
+#: fe-lobj.c:652
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "nelze urèit OID funkce lo_unlink\n"
 
-#: fe-lobj.c:632
+#: fe-lobj.c:659
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "nelze urèit OID funkce lo_lseek\n"
 
-#: fe-lobj.c:639
+#: fe-lobj.c:666
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "nelze urèit OID funkce lo_tell\n"
 
-#: fe-lobj.c:646
+#: fe-lobj.c:673
 msgid "cannot determine OID of function loread\n"
 msgstr "nelze urèit OID funkce loread\n"
 
-#: fe-lobj.c:653
+#: fe-lobj.c:680
 msgid "cannot determine OID of function lowrite\n"
 msgstr "nelze urèit OID funkce lowrite\n"
 
@@ -339,19 +359,19 @@ msgstr "pqGetInt nepodporuje integer velikosti %lu"
 msgid "integer of size %lu not supported by pqPutInt"
 msgstr "pqPutInt nepodporuje integer velikosti %lu"
 
-#: fe-misc.c:540
-#: fe-misc.c:732
+#: fe-misc.c:544
+#: fe-misc.c:748
 msgid "connection not open\n"
 msgstr "spojení není otevøeno\n"
 
-#: fe-misc.c:605
-#: fe-misc.c:685
+#: fe-misc.c:610
+#: fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "nelze pøijmout data ze serveru: %s\n"
 
-#: fe-misc.c:702
-#: fe-misc.c:770
+#: fe-misc.c:718
+#: fe-misc.c:786
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -361,140 +381,140 @@ msgstr ""
 "\tToto pravdìpodobnì znamená, ¾e byl ukonèen nestandardnì\n"
 "\tpøed nebo bìhem vykonávání po¾adavku.\n"
 
-#: fe-misc.c:787
+#: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "nelze poslat data na server: %s\n"
 
-#: fe-misc.c:889
+#: fe-misc.c:922
 msgid "timeout expired\n"
 msgstr "èasový interval ubìhl\n"
 
-#: fe-misc.c:934
+#: fe-misc.c:967
 msgid "socket not open\n"
 msgstr "soket není otevøen\n"
 
-#: fe-misc.c:959
+#: fe-misc.c:990
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() selhal: %s\n"
 
-#: fe-secure.c:246
+#: fe-secure.c:260
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "nelze vytvoøit SSL spojení: %s\n"
 
-#: fe-secure.c:306
-#: fe-secure.c:373
-#: fe-secure.c:881
+#: fe-secure.c:323
+#: fe-secure.c:403
+#: fe-secure.c:1022
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL chyba: %s\n"
 
-#: fe-secure.c:310
-#: fe-secure.c:377
-#: fe-secure.c:885
+#: fe-secure.c:328
+#: fe-secure.c:408
+#: fe-secure.c:1026
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL chyba: detekován EOF\n"
 
-#: fe-secure.c:316
-#: fe-secure.c:382
-#: fe-secure.c:891
+#: fe-secure.c:339
+#: fe-secure.c:418
+#: fe-secure.c:1034
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL chyba: %s\n"
 
-#: fe-secure.c:325
-#: fe-secure.c:391
-#: fe-secure.c:897
-msgid "Unknown SSL error code\n"
-msgstr "Neznámý SSL chybový kód\n"
+#: fe-secure.c:349
+#: fe-secure.c:428
+#: fe-secure.c:1042
+msgid "unrecognized SSL error code\n"
+msgstr "neznámý chybový kód SSL\n"
 
-#: fe-secure.c:447
+#: fe-secure.c:490
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "chyba dotazování soketu: %s\n"
 
-#: fe-secure.c:469
+#: fe-secure.c:518
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "nelze obdr¾et informace o hostu (%s): %s\n"
 
-#: fe-secure.c:488
+#: fe-secure.c:537
 msgid "unsupported protocol\n"
 msgstr "nepodporovaný protokol\n"
 
-#: fe-secure.c:510
+#: fe-secure.c:559
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "jméno serveru \"%s\" nelze pøelo¾it na %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:517
+#: fe-secure.c:566
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "jméno serveru \"%s\" nelze pøelo¾it na peer adresu\n"
 
-#: fe-secure.c:692
+#: fe-secure.c:749
 msgid "could not get user information\n"
 msgstr "nelze obdr¾et informace o u¾ivateli\n"
 
-#: fe-secure.c:704
+#: fe-secure.c:761
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "nelze otevøít certifikát (%s): %s\n"
 
-#: fe-secure.c:711
+#: fe-secure.c:769
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "nelze èíst certifikát (%s): %s\n"
 
-#: fe-secure.c:724
+#: fe-secure.c:783
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "certifikát je pøítomen, ale privátní klíè ne (%s)\n"
 
-#: fe-secure.c:733
+#: fe-secure.c:792
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "privátní klíè (%s) má ¹patné oprávnìní\n"
 
-#: fe-secure.c:740
+#: fe-secure.c:799
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "nelze otevøít soubor s privátním klíèem (%s): %s\n"
 
-#: fe-secure.c:749
+#: fe-secure.c:808
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "privátní klíè (%s) byl za chodu zmìnìn bìhem\n"
 
-#: fe-secure.c:756
+#: fe-secure.c:816
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "nelze èíst privátní klíè (%s): %s\n"
 
-#: fe-secure.c:768
+#: fe-secure.c:830
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "certifikát/privátní klíè nesouhlasí (%s): %s\n"
 
-#: fe-secure.c:798
+#: fe-secure.c:909
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "nelze vytvoøit SSL kontext: %s\n"
 
-#: fe-secure.c:815
-#: fe-secure.c:823
+#: fe-secure.c:953
+#: fe-secure.c:962
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "nelze èíst certifikátový koøenový seznam (%s): %s\n"
 
-#: fe-secure.c:915
+#: fe-secure.c:1061
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "certifikát není platný: %s\n"
 
-#: fe-secure.c:927
+#: fe-secure.c:1074
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "certifikát nelze obdr¾et: %s\n"
diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index 61554aea1e..c8d12aec42 100644
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,13 +1,13 @@
 # simplified Chinese translation file for libpq
 # Bao Wei <weibao@forevertek.com>, 2002
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.5 2004/08/10 19:02:03 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.6 2004/09/13 12:35:18 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-07-22 09:41+0000\n"
+"POT-Creation-Date: 2004-08-31 08:59+0000\n"
 "PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -129,117 +129,117 @@ msgstr ""
 "%s É쵀 TCP/IP Áª½Ó?\n"
 
 # fe-misc.c:702
-#: fe-connect.c:945
+#: fe-connect.c:946
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "ÎÞ·¨½âÊÍÖ÷»úÃû \"%s\" µ½µØÖ·: %s\n"
 
 # fe-misc.c:702
-#: fe-connect.c:949
+#: fe-connect.c:950
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "ÎÞ·¨½âÊÍ Unix-domian Ì×½Ó×Ö·¾¶ \"%s\" µ½µØÖ·: %s\n"
 
 # fe-connect.c:1232
-#: fe-connect.c:1153
+#: fe-connect.c:1154
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:891
-#: fe-connect.c:1196
+#: fe-connect.c:1197
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "ÎÞ·¨´´½¨Ì×½Ó×Ö: %s\n"
 
 # fe-connect.c:1263
-#: fe-connect.c:1307
+#: fe-connect.c:1308
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "ÎÞ·¨»ñÈ¡Ì×½Ó×Ö´íÎó״̬: %s\n"
 
 # fe-connect.c:1283
-#: fe-connect.c:1346
+#: fe-connect.c:1347
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "ÎÞ·¨´ÓÌ×½Ó×Ö»ñÈ¡¿Í»§¶ËµØÖ·: %s\n"
 
 # fe-connect.c:959
-#: fe-connect.c:1391
+#: fe-connect.c:1392
 #, 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:1413 fe-connect.c:2536 fe-connect.c:2545 fe-connect.c:3112
-#: fe-lobj.c:548
+#: fe-connect.c:1414 fe-connect.c:2538 fe-connect.c:2547 fe-connect.c:3126
+#: fe-lobj.c:556
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
 
 # fe-connect.c:1322
-#: fe-connect.c:1426
+#: fe-connect.c:1427
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍÆô¶¯°ü: %s\n"
 
 # fe-connect.c:972
-#: fe-connect.c:1466
+#: fe-connect.c:1467
 #, 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:1485 fe-connect.c:1502
+#: fe-connect.c:1486 fe-connect.c:1503
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "·þÎñÆ÷²»Ö§³Ö SSL, µ«ÊÇÒªÇóʹÓà SSL\n"
 
 # fe-connect.c:1001
-#: fe-connect.c:1518
+#: fe-connect.c:1519
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ÊÕµ½¶Ô SSL ÎÕÊÖµÄÎÞЧÏìÓ¦: %c\n"
 
 # fe-connect.c:1378
-#: fe-connect.c:1575 fe-connect.c:1607
+#: fe-connect.c:1576 fe-connect.c:1608
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ÆÚ´ýÀ´×Ô·þÎñÆ÷µÄÈÏÖ¤ÇëÇó, È´ÊÕµ½ %c\n"
 
 # fe-connect.c:1490
-#: fe-connect.c:1843
+#: fe-connect.c:1844
 msgid "unexpected message from server during startup\n"
 msgstr "Æô¶¯¹ý³ÌÖÐÊÕµ½À´×Ô·þÎñÆ÷µÄ·ÇÔ¤ÆÚÐÅÏ¢\n"
 
 # fe-connect.c:1549
-#: fe-connect.c:1913
+#: fe-connect.c:1914
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:2475
-#: fe-connect.c:2584
+#: fe-connect.c:2586
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "ÔÚÁª½ÓÐÅÏ¢×Ö´®ÀïµÄ \"%s\" ºóÃæȱÉÙ \"=\"\n"
 
 # fe-connect.c:2524
-#: fe-connect.c:2633
+#: fe-connect.c:2635
 msgid "unterminated quoted string in connection info string\n"
 msgstr "Áª½ÓÐÅÏ¢×Ö´®ÖÐδ½áÊøµÄÒýºÅ×Ö´®\n"
 
 # fe-connect.c:2558
-#: fe-connect.c:2667
+#: fe-connect.c:2669
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "·Ç·¨Áª½ÓÑ¡Ïî \"%s\"\n"
 
 # fe-connect.c:2744
-#: fe-connect.c:2879
+#: fe-connect.c:2891
 msgid "connection pointer is NULL\n"
 msgstr "Áª½ÓÖ¸ÕëÊÇ NULL\n"
 
 # fe-connect.c:2953
-#: fe-connect.c:3130
+#: fe-connect.c:3148
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -270,7 +270,7 @@ msgstr "û
 msgid "another command is already in progress\n"
 msgstr "ÒѾ­ÓÐÁíÍâÒ»ÌõÃüÁîÔÚ´¦Àí\n"
 
-#: fe-exec.c:814 fe-exec.c:1465
+#: fe-exec.c:814 fe-exec.c:1466
 msgid "function requires at least protocol version 3.0\n"
 msgstr "º¯ÊýÖÁÉÙÐèÒª 3.0 °æ±¾µÄЭÒé\n"
 
@@ -295,110 +295,110 @@ msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT ״̬±ØÐëÏȽáÊø\n"
 
 # fe-exec.c:1780
-#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1507
+#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1508
 msgid "no COPY in progress\n"
 msgstr "ûÓÐÕýÔÚ´¦ÀíµÄ COPY\n"
 
 # fe-exec.c:1884
-#: fe-exec.c:1699
+#: fe-exec.c:1700
 msgid "connection in wrong state\n"
 msgstr "Áª½Ó´¦ÓÚ´íÎó״̬\n"
 
 # fe-exec.c:2055
-#: fe-exec.c:1730
+#: fe-exec.c:1731
 msgid "invalid ExecStatusType code"
 msgstr "·Ç·¨ ExecStatusType ´úÂë"
 
 # fe-exec.c:2108 fe-exec.c:2141
-#: fe-exec.c:1794 fe-exec.c:1817
+#: fe-exec.c:1795 fe-exec.c:1818
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "ÁкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
 
 # fe-exec.c:2130
-#: fe-exec.c:1810
+#: fe-exec.c:1811
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "ÐкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
 
 # fe-exec.c:2325
-#: fe-exec.c:2094
+#: fe-exec.c:2093
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "ÎÞ·¨½âÊÍÀ´×Ô·þÎñÆ÷µÄ½á¹û: %s"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-lobj.c:402 fe-lobj.c:487
+#: fe-lobj.c:410 fe-lobj.c:495
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"
 
 # fe-lobj.c:412
-#: fe-lobj.c:414
+#: fe-lobj.c:422
 #, 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:424 fe-lobj.c:474
+#: fe-lobj.c:432 fe-lobj.c:482
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó %u\n"
 
 # fe-lobj.c:437
-#: fe-lobj.c:439
+#: fe-lobj.c:447
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "¶ÁÈ¡Îļþ \"%s\" ʱ³ö´í\n"
 
 # fe-lobj.c:498
-#: fe-lobj.c:502 fe-lobj.c:515
+#: fe-lobj.c:510 fe-lobj.c:523
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "дÈëÎļþ \"%s\" ʱ³ö´í\n"
 
 # fe-lobj.c:564
-#: fe-lobj.c:593
+#: fe-lobj.c:601
 msgid "query to initialize large object functions did not return data\n"
 msgstr "³õʼ»¯´ó¶ÔÏóº¯ÊýµÄ²éѯûÓзµ»ØÊý¾Ý\n"
 
 # fe-lobj.c:602
-#: fe-lobj.c:631
+#: fe-lobj.c:639
 msgid "cannot determine OID of function lo_open\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_open µÄ OID\n"
 
 # fe-lobj.c:609
-#: fe-lobj.c:638
+#: fe-lobj.c:646
 msgid "cannot determine OID of function lo_close\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_close µÄ OID\n"
 
 # fe-lobj.c:616
-#: fe-lobj.c:645
+#: fe-lobj.c:653
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_creat µÄ OID\n"
 
 # fe-lobj.c:623
-#: fe-lobj.c:652
+#: fe-lobj.c:660
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_unlink µÄ OID\n"
 
 # fe-lobj.c:630
-#: fe-lobj.c:659
+#: fe-lobj.c:667
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_lseek µÄ OID\n"
 
 # fe-lobj.c:637
-#: fe-lobj.c:666
+#: fe-lobj.c:674
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_tell µÄ OID\n"
 
 # fe-lobj.c:644
-#: fe-lobj.c:673
+#: fe-lobj.c:681
 msgid "cannot determine OID of function loread\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý loread µÄ OID\n"
 
 # fe-lobj.c:651
-#: fe-lobj.c:680
+#: fe-lobj.c:688
 msgid "cannot determine OID of function lowrite\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lowrite µÄ OID\n"
 
@@ -442,137 +442,137 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "ÎÞ·¨Ïò·þÎñÆ÷·¢ËÍÊý¾Ý: %s\n"
 
-#: fe-misc.c:922
+#: fe-misc.c:923
 msgid "timeout expired\n"
 msgstr "³¬Ê±Âú\n"
 
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798
-#: fe-misc.c:967
+#: fe-misc.c:968
 msgid "socket not open\n"
 msgstr "Ì×½Ó×Öδ´ò¿ª\n"
 
 # fe-misc.c:389 fe-misc.c:423 fe-misc.c:838
-#: fe-misc.c:990
+#: fe-misc.c:991
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() ʧ°Ü: %s\n"
 
-#: fe-secure.c:260
+#: fe-secure.c:262
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "ÎÞ·¨½¨Á¢ SSL Áª½Ó: %s\n"
 
-#: fe-secure.c:323 fe-secure.c:403 fe-secure.c:1022
+#: fe-secure.c:325 fe-secure.c:406 fe-secure.c:1036
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL ´íÎó: %s\n"
 
-#: fe-secure.c:328 fe-secure.c:408 fe-secure.c:1026
+#: fe-secure.c:330 fe-secure.c:411 fe-secure.c:1040
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL ´íÎó: ·¢ÏÖ½áÊø·û\n"
 
 # fe-auth.c:232
-#: fe-secure.c:339 fe-secure.c:418 fe-secure.c:1034
+#: fe-secure.c:342 fe-secure.c:422 fe-secure.c:1049
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL ´íÎó: %s\n"
 
-#: fe-secure.c:349 fe-secure.c:428 fe-secure.c:1042
+#: fe-secure.c:352 fe-secure.c:432 fe-secure.c:1057
 msgid "unrecognized SSL error code\n"
 msgstr "δ֪µÄ SSL ´íÎóÂë\n"
 
 # fe-lobj.c:498
-#: fe-secure.c:490
+#: fe-secure.c:494
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "²éѯÌ×½Ó×Ö´íÎó: %s\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:518
+#: fe-secure.c:522
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "ÎÞ·¨»ñÈ¡¹ØÓÚÖ÷»ú (%s) µÄÐÅÏ¢: %s\n"
 
-#: fe-secure.c:537
+#: fe-secure.c:541
 msgid "unsupported protocol\n"
 msgstr "²»Ö§³ÖµÄЭÒé\n"
 
-#: fe-secure.c:559
+#: fe-secure.c:563
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½ %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:566
+#: fe-secure.c:570
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½¶Ô¶ËµØÖ·\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:749
+#: fe-secure.c:753
 msgid "could not get user information\n"
 msgstr "ÎÞ·¨»ñÈ¡Óû§ÐÅÏ¢\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:761
+#: fe-secure.c:765
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "ÎÞ·¨´ò¿ªÖ¤Êé (%s): %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:769
+#: fe-secure.c:774
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡Ö¤Êé (%s): %s\n"
 
-#: fe-secure.c:783
+#: fe-secure.c:788
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "ÓÐÖ¤Êé, µ«²»ÊÇ˽Կ (%s)\n"
 
-#: fe-secure.c:792
+#: fe-secure.c:797
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "˽Կ (%s) ÓдíÎóµÄÐí¿É\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:799
+#: fe-secure.c:804
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "ÎÞ·¨´ò¿ªË½Ô¿Îļþ (%s): %s\n"
 
-#: fe-secure.c:808
+#: fe-secure.c:813
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "ÔÚÖ´Ðйý³ÌÖÐ˽Կ (%s) ¸Ä±äÁË\n"
 
 # fe-connect.c:891
-#: fe-secure.c:816
+#: fe-secure.c:822
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "ÎÞ·¨¶Áȡ˽Կ (%s): %s\n"
 
-#: fe-secure.c:830
+#: fe-secure.c:837
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "Ö¤Êé/˽Կ²»Æ¥Åä (%s): %s\n"
 
-#: fe-secure.c:909
+#: fe-secure.c:921
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "ÎÞ·¨´´½¨ SSL »·¾³: %s\n"
 
 # fe-connect.c:891
-#: fe-secure.c:953 fe-secure.c:962
+#: fe-secure.c:966 fe-secure.c:976
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡¸ùÖ¤ÊéÁбí (%s): %s\n"
 
-#: fe-secure.c:1061
+#: fe-secure.c:1076
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "ÎÞ·¨ÑéÖ¤Ö¤Êé: %s\n"
 
-#: fe-secure.c:1074
+#: fe-secure.c:1090
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "ÎÞ·¨»ñµÃÖ¤Êé: %s\n"
diff --git a/src/interfaces/libpq/po/zh_TW.po b/src/interfaces/libpq/po/zh_TW.po
index 02331e7992..f0f68ee5f2 100644
--- a/src/interfaces/libpq/po/zh_TW.po
+++ b/src/interfaces/libpq/po/zh_TW.po
@@ -3,9 +3,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-07-29 01:12-0300\n"
-"PO-Revision-Date: 2004-08-01 13:21+0800\n"
+"Project-Id-Version: PostgreSQL 7.5\n"
+"POT-Creation-Date: 2004-08-04 02:53-0300\n"
+"PO-Revision-Date: 2004-08-18 12:15+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -386,7 +386,7 @@ msgstr "無法向伺服器傳送資料: %s\n"
 
 #: fe-misc.c:922
 msgid "timeout expired\n"
-msgstr "發生愈時\n"
+msgstr "發生逾時\n"
 
 #: fe-misc.c:967
 msgid "socket not open\n"