Translation updates

398d4822 · Peter Eisentraut · cb2a8a9e · 398d4822 · 398d4822 · 398d4822
5 changed file
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
--- a/src/bin/pg_ctl/po/zh_TW.po
+++ b/src/bin/pg_ctl/po/zh_TW.po
@@ -4,37 +4,37 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-07-29 19:16-0300\n"
-"PO-Revision-Date: 2004-08-01 13:21+0800\n"
+"POT-Creation-Date: 2004-09-17 01:09+0100\n"
+"PO-Revision-Date: 2004-09-17 13:54+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\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 directory as \"%s\".\n"
@@ -43,7 +43,7 @@ msgstr ""
 "%s 需要\"postmaster\"程式，但是在與\"%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 \"%s\".\n"
@@ -52,11 +52,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"
@@ -65,15 +65,15 @@ msgstr ""
 "%s: 無法啟動postmaster\n"
 "請檢查log輸出\n"

-#: pg_ctl.c:535
+#: pg_ctl.c:560
 msgid "waiting for postmaster to start..."
 msgstr "等待postmaster啟動..."

-#: pg_ctl.c:540
+#: pg_ctl.c:565
 msgid "could not start postmaster\n"
 msgstr "無法啟動postmaster\n"

-#: pg_ctl.c:542
+#: pg_ctl.c:567
 msgid ""
 "done\n"
 "postmaster started\n"
@@ -81,64 +81,64 @@ msgstr ""
 "完成\n"
 "postmaster已經啟動\n"

-#: pg_ctl.c:545
+#: pg_ctl.c:570
 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 "stop信號失敗(PID: %ld): %s\n"

-#: pg_ctl.c:583
+#: pg_ctl.c:608
 msgid "postmaster shutting down\n"
 msgstr "postmaster正在關閉\n"

-#: pg_ctl.c:590
-#: pg_ctl.c:663
+#: pg_ctl.c:615
+#: pg_ctl.c:688
 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
 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
 msgid "done\n"
 msgstr "完成\n"

-#: pg_ctl.c:620
-#: pg_ctl.c:696
+#: pg_ctl.c:645
+#: pg_ctl.c:721
 msgid "postmaster stopped\n"
 msgstr "postmaster停止執行\n"

-#: pg_ctl.c:640
+#: pg_ctl.c:665
 msgid ""
 "Is postmaster running?\n"
 "starting postmaster anyway\n"
@@ -146,85 +146,85 @@ 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: 無法重新載入postmaster， postgres正在執行(PID: %ld)\n"

-#: pg_ctl.c:725
+#: pg_ctl.c:750
 #, c-format
 msgid "reload signal failed (PID: %ld): %s\n"
 msgstr "reload信號失敗(PID: %ld): %s\n"

-#: pg_ctl.c:731
+#: pg_ctl.c:756
 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"
@@ -233,7 +233,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"
@@ -244,91 +244,91 @@ msgstr ""
 "報告PostgreSQL伺服器狀態，或是殺掉PostgreSQL行程\n"
 "\n"

-#: pg_ctl.c:1022
+#: pg_ctl.c:1077
 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"
-msgstr "  %s register   [-N 服務名稱] [-U 使用者] [-P 密碼] [-D 資料目錄] [-o \"選項\"]\n"
+msgid "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-w] [-o \"OPTIONS\"]\n"
+msgstr "  %s register   [-N 服務名稱] [-U 使用者] [-P 密碼] [-D 資料目錄] [-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
 msgid "Common options:\n"
 msgstr "一般選項:\n"

-#: pg_ctl.c:1034
+#: pg_ctl.c:1089
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata 資料目錄  存放資料庫的目錄\n"

-#: pg_ctl.c:1035
+#: pg_ctl.c:1090
 msgid "  -s, --silent only print errors, no informational messages\n"
 msgstr "  -s, --silent 只顯示錯誤，不顯示其它訊息\n"

-#: pg_ctl.c:1037
+#: pg_ctl.c:1092
 msgid "  -N       service name with which to register PostgreSQL server\n"
 msgstr "  -N       用來註冊PostgreSQL伺服器的服務名稱\n"

-#: pg_ctl.c:1038
+#: pg_ctl.c:1093
 msgid "  -P       password of account to register PostgreSQL server\n"
 msgstr "  -P       用來註冊PostgreSQL伺服器的密碼\n"

-#: pg_ctl.c:1039
+#: pg_ctl.c:1094
 msgid "  -U       user name of account to register PostgreSQL server\n"
 msgstr "  -U       用來註冊PostgreSQL伺服器的帳號\n"

-#: pg_ctl.c:1041
+#: pg_ctl.c:1096
 msgid "  -w           wait until operation completes\n"
 msgstr "  -w           等待操作完成\n"

-#: pg_ctl.c:1042
+#: pg_ctl.c:1097
 msgid "  -W           do not wait until operation completes\n"
 msgstr "  -W           不等待操作完成\n"

-#: pg_ctl.c:1043
+#: pg_ctl.c:1098
 msgid "  --help       show this help, then exit\n"
 msgstr "  --help       顯示這份說明然後結束\n"

-#: pg_ctl.c:1044
+#: pg_ctl.c:1099
 msgid "  --version    output version information, then exit\n"
 msgstr "  --version    顯示版本資訊然後結束\n"

-#: pg_ctl.c:1045
+#: pg_ctl.c:1100
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
 "\n"
@@ -336,7 +336,7 @@ msgstr ""
 "(預設是關閉時而非啟動或重新啟動時等待。)\n"
 "\n"

-#: pg_ctl.c:1046
+#: pg_ctl.c:1101
 msgid ""
 "If the -D option is omitted, the environment variable PGDATA is used.\n"
 "\n"
@@ -344,23 +344,23 @@ msgstr ""
 "選項 -D 已經取消，改用環境變數PGDATA。\n"
 "\n"

-#: pg_ctl.c:1047
+#: pg_ctl.c:1102
 msgid "Options for start or restart:\n"
 msgstr "啟動或重新啟動可用選項:\n"

-#: pg_ctl.c:1048
+#: pg_ctl.c:1103
 msgid ""
 "  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
 "                          use of this option is highly recommended.\n"
 msgstr "  -l, --log 檔名          將伺服器log寫入檔案，建議使用。\n"

-#: pg_ctl.c:1050
+#: pg_ctl.c:1105
 msgid ""
 "  -o OPTIONS              command line options to pass to the postmaster\n"
 "                          (PostgreSQL server executable)\n"
 msgstr "  -o 選項                 傳給postmaster(PostgreSQL伺服器執行檔)的命令列選項\n"

-#: pg_ctl.c:1052
+#: pg_ctl.c:1107
 msgid ""
 "  -p PATH-TO-POSTMASTER   normally not necessary\n"
 "\n"
@@ -368,11 +368,11 @@ msgstr ""
 "  -p postmaster的路徑     通常不需要\n"
 "\n"

-#: pg_ctl.c:1053
+#: pg_ctl.c:1108
 msgid "Options for stop or restart:\n"
 msgstr "停止或重新啟動可用選項:\n"

-#: pg_ctl.c:1054
+#: pg_ctl.c:1109
 msgid ""
 "  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
 "\n"
@@ -380,29 +380,29 @@ msgstr ""
 "  -m 關閉模式        可以是'smart'、'fast'或'immediate'\n"
 "\n"

-#: pg_ctl.c:1055
+#: pg_ctl.c:1110
 msgid "Allowed signal names for kill:\n"
 msgstr "kill可以使用的信號名稱:\n"

-#: pg_ctl.c:1056
+#: pg_ctl.c:1111
 msgid ""
 "  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
 msgstr ""

-#: pg_ctl.c:1057
+#: pg_ctl.c:1112
 msgid "Shutdown modes are:\n"
 msgstr "關閉模式:\n"

-#: pg_ctl.c:1058
+#: pg_ctl.c:1113
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       在所有用戶端斷線後關閉\n"

-#: pg_ctl.c:1059
+#: pg_ctl.c:1114
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        直接正常關閉\n"

-#: pg_ctl.c:1060
+#: pg_ctl.c:1115
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 "\n"
@@ -410,46 +410,46 @@ msgstr ""
 "  immediate   立即關閉，會導致下次啟動時需要復原程序\n"
 "\n"

-#: pg_ctl.c:1061
+#: pg_ctl.c:1116
 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"
 msgstr "%s: 未指定資料目錄和設定環境變數PGDATA\n"

--- a/src/bin/pg_dump/po/zh_TW.po
+++ b/src/bin/pg_dump/po/zh_TW.po
--- a/src/bin/psql/po/zh_TW.po
+++ b/src/bin/psql/po/zh_TW.po
--- a/src/interfaces/libpq/po/zh_TW.po
+++ b/src/interfaces/libpq/po/zh_TW.po
@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "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"
+"POT-Creation-Date: 2004-09-17 01:13+0100\n"
+"PO-Revision-Date: 2004-09-17 13:49+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -110,102 +110,104 @@ msgstr ""
 "\t伺服器是否在主機\"%s\"上執行並且準備接受在\n"
 "\t埠號 %s 上的 TCP/IP 連線？\n"

-#: 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-connect.c:949
+#: fe-connect.c:950
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "無法將Unix-domain socket路徑\"%s\"轉換成位址: %s\n"

-#: fe-connect.c:1153
+#: fe-connect.c:1154
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "無效的連線狀態，可能是記憶體中的資料被破壞\n"

-#: fe-connect.c:1196
+#: fe-connect.c:1197
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "無法建立 socket: %s\n"

-#: fe-connect.c:1307
+#: fe-connect.c:1308
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "無法取得 socket 的錯誤狀態: %s\n"

-#: fe-connect.c:1346
+#: fe-connect.c:1347
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "無法從 socket 取得客戶端位址: %s\n"

-#: 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: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
+#: fe-protocol2.c:1002
+#: fe-protocol3.c:944
 msgid "out of memory\n"
 msgstr "記憶體用盡\n"

-#: fe-connect.c:1426
+#: fe-connect.c:1427
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "無法傳送啟動封包: %s\n"

-#: 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: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:1518
+#: fe-connect.c:1519
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "收到無效的 SSL 交談回應: %c\n"

-#: 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:1843
+#: fe-connect.c:1844
 msgid "unexpected message from server during startup\n"
 msgstr "啟動過程中收到來自伺服器的非預期訊息\n"

-#: 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:2584
+#: fe-connect.c:2586
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "在連線資訊字串裡的 \"%s\" 後面缺少 \"=\"\n"

-#: fe-connect.c:2633
+#: fe-connect.c:2635
 msgid "unterminated quoted string in connection info string\n"
 msgstr "連線資訊字串中有未結束的引號\n"

-#: fe-connect.c:2667
+#: fe-connect.c:2669
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "無效的連線選項 \"%s\"\n"

-#: fe-connect.c:2879
+#: fe-connect.c:2891
 msgid "connection pointer is NULL\n"
 msgstr "連線指標是 NULL\n"

-#: fe-connect.c:3130
+#: fe-connect.c:3148
 #, c-format
 msgid "WARNING: Password file %s has world or group read access; permission should be u=rw (0600)\n"
 msgstr "警告：密碼檔%s可以被其他人或群組存取，應該將權限設為u=rw(0600)\n"
@@ -232,7 +234,7 @@ msgid "another command is already in progress\n"
 msgstr "另外一條命令正在執行中\n"

 #: fe-exec.c:814
-#: fe-exec.c:1465
+#: fe-exec.c:1466
 msgid "function requires at least protocol version 3.0\n"
 msgstr "函式需要3.0版以上的協定\n"

@@ -255,95 +257,97 @@ msgstr "必須先結束 COPY OUT 狀態\n"

 #: fe-exec.c:1358
 #: fe-exec.c:1423
-#: fe-exec.c:1507
+#: fe-exec.c:1508
+#: fe-protocol2.c:1148
+#: fe-protocol3.c:1101
 msgid "no COPY in progress\n"
 msgstr "沒有執行中的 COPY 命令\n"

-#: fe-exec.c:1699
+#: fe-exec.c:1700
 msgid "connection in wrong state\n"
 msgstr "連線處於錯誤的狀態\n"

-#: fe-exec.c:1730
+#: fe-exec.c:1731
 msgid "invalid ExecStatusType code"
 msgstr "無效的 ExecStatusType 代碼"

-#: 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:1810
+#: fe-exec.c:1811
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "行號 %d 超出了範圍 0..%d"

-#: fe-exec.c:2094
+#: fe-exec.c:2093
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "無法解讀來自伺服器的結果: %s"

-#: 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:414
+#: fe-lobj.c:422
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "無法為檔案 \"%s\" 建立 large object\n"

-#: 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 "無法開啟 large object %u\n"

-#: fe-lobj.c:439
+#: fe-lobj.c:447
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "讀取檔案 \"%s\" 時發生錯誤\n"

-#: 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:593
+#: fe-lobj.c:601
 msgid "query to initialize large object functions did not return data\n"
 msgstr "初始化大型物件函式的查詢沒有傳回資料\n"

-#: 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:638
+#: fe-lobj.c:646
 msgid "cannot determine OID of function lo_close\n"
 msgstr "無法判斷函式 lo_close 的 OID\n"

-#: 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:652
+#: fe-lobj.c:660
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "無法判斷函式 lo_unlink 的 OID\n"

-#: 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:666
+#: fe-lobj.c:674
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "無法判斷函式 lo_tell 的 OID\n"

-#: fe-lobj.c:673
+#: fe-lobj.c:681
 msgid "cannot determine OID of function loread\n"
 msgstr "無法判斷函式 loread 的 OID\n"

-#: fe-lobj.c:680
+#: fe-lobj.c:688
 msgid "cannot determine OID of function lowrite\n"
 msgstr "無法判斷函式 lowrite 的 OID\n"

@@ -384,135 +388,255 @@ 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:967
+#: fe-misc.c:968
 msgid "socket not open\n"
 msgstr "socket 未開啟\n"

-#: fe-misc.c:990
+#: fe-misc.c:991
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() 失敗: %s\n"

-#: fe-secure.c:260
+#: fe-protocol2.c:91
+#, c-format
+msgid "invalid setenv state %c, probably indicative of memory corruption\n"
+msgstr "無效的setenv狀態 %c，可能是記憶體中的資料被破壞\n"
+
+#: fe-protocol2.c:333
+#, c-format
+msgid "invalid state %c, probably indicative of memory corruption\n"
+msgstr "無效的狀態 %c，可能是記憶體中的資料被破壞\n"
+
+#: fe-protocol2.c:423
+#: fe-protocol3.c:183
+#, c-format
+msgid "message type 0x%02x arrived from server while idle"
+msgstr "idle時收到伺服器送來類型為0x%02x的訊息"
+
+#: fe-protocol2.c:462
+#, c-format
+msgid "unexpected character %c following empty query response (\"I\" message)"
+msgstr ""
+
+#: fe-protocol2.c:517
+msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
+msgstr ""
+
+#: fe-protocol2.c:533
+msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
+msgstr ""
+
+#: fe-protocol2.c:548
+#: fe-protocol3.c:335
+#, c-format
+msgid "unexpected response from server; first received character was \"%c\"\n"
+msgstr "非預期的伺服器回應，收到的第一個字元是\"%c\"\n"
+
+#: fe-protocol2.c:760
+#: fe-protocol3.c:568
+msgid "out of memory for query result\n"
+msgstr "查詢結果用盡記憶體\n"
+
+#: fe-protocol2.c:1191
+#: fe-protocol3.c:1170
+#, c-format
+msgid "%s"
+msgstr ""
+
+#: fe-protocol2.c:1203
+msgid "lost synchronization with server, resetting connection"
+msgstr "無法與伺服器協調，重置連線"
+
+#: fe-protocol2.c:1338
+#: fe-protocol2.c:1370
+#: fe-protocol3.c:1373
+#, c-format
+msgid "protocol error: id=0x%x\n"
+msgstr "協定錯誤：id=0x%x\n"
+
+#: fe-protocol3.c:297
+msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
+msgstr ""
+
+#: fe-protocol3.c:356
+#, c-format
+msgid "Message contents do not agree with length in message type \"%c\"\n"
+msgstr "訊息類型\"%c\"中的長度和訊息中的內容不符\n"
+
+#: fe-protocol3.c:377
+#, c-format
+msgid "lost synchronization with server: got message type \"%c\", length %d\n"
+msgstr "無法與伺服器協調：收到訊息類型\"%c\"，長度 %d\n"
+
+#: fe-protocol3.c:513
+msgid "unexpected field count in D message\n"
+msgstr "D訊息中有預期外的欄位數\n"
+
+#  translator: %s represents a digit string
+#: fe-protocol3.c:642
+#: fe-protocol3.c:650
+#, c-format
+msgid " at character %s"
+msgstr "於字元 %s"
+
+#: fe-protocol3.c:659
+#, c-format
+msgid "DETAIL:  %s\n"
+msgstr ""
+
+#: fe-protocol3.c:662
+#, c-format
+msgid "HINT:  %s\n"
+msgstr ""
+
+#: fe-protocol3.c:665
+#, c-format
+msgid "QUERY:  %s\n"
+msgstr ""
+
+#: fe-protocol3.c:668
+#, c-format
+msgid "CONTEXT:  %s\n"
+msgstr ""
+
+#: fe-protocol3.c:680
+msgid "LOCATION:  "
+msgstr ""
+
+#: fe-protocol3.c:682
+#, c-format
+msgid "%s, "
+msgstr ""
+
+#: fe-protocol3.c:684
+#, c-format
+msgid "%s:%s"
+msgstr ""
+
+#: fe-protocol3.c:986
+msgid "PQgetline: not doing text COPY OUT\n"
+msgstr ""
+
+#: 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錯誤: 發現EOF\n"

-#: 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-secure.c:490
+#: fe-secure.c:494
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "詢問 socket 發生錯誤: %s\n"

-#: 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 "伺服器的common name \"%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 "伺服器的common name \"%s\" 無法解析成位址\n"

-#: fe-secure.c:749
+#: fe-secure.c:753
 msgid "could not get user information\n"
 msgstr "無法取得使用者的資訊\n"

-#: fe-secure.c:761
+#: fe-secure.c:765
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "無法開啟憑證(%s): %s\n"

-#: 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-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-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 context: %s\n"

-#: 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"