Translation updates

src/bin/initdb/po/zh_TW.po

@@ -4,54 +4,54 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-08-01 19:17-0300\n"
+"POT-Creation-Date: 2004-10-19 01:08+0100\n"
-"PO-Revision-Date: 2004-08-02 08:52+0800\n"
+"PO-Revision-Date: 2004-10-19 10:09+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"
 
-#: initdb.c:233
+#: initdb.c:237
-#: initdb.c:247
+#: initdb.c:251
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: 記憶體用盡\n"
 
-#: initdb.c:329
+#: initdb.c:361
-#: initdb.c:1300
+#: initdb.c:1339
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: 無法開啟檔案\"%s\"讀取資料: %s\n"
 
-#: initdb.c:387
+#: initdb.c:419
 #, c-format
 msgid "%s: could not open file \"%s\" for writing: %s\n"
 msgstr "%s: 無法開啟檔案\"%s\"寫入資料: %s\n"
 
-#: initdb.c:515
+#: initdb.c:547
-#: initdb.c:524
+#: initdb.c:556
-#: initdb.c:532
+#: initdb.c:564
 #, c-format
 msgid "%s: failed\n"
 msgstr "%s: 失敗\n"
 
-#: initdb.c:521
+#: initdb.c:553
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: 刪除資料目錄 \"%s\"\n"
 
-#: initdb.c:529
+#: initdb.c:561
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: 刪除資料目錄\"%s\"的內容\n"
 
-#: initdb.c:540
+#: initdb.c:572
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: 無法依使用者的要求刪除資料目錄 \"%s\"\n"
 
-#: initdb.c:566
+#: initdb.c:598
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -61,17 +61,17 @@ msgstr ""
 "%s: 無法以root身份執行\n"
 "請以將會擁有伺服器行程的非特權使用者登入(例如用\"su\")。\n"
 
-#: initdb.c:617
+#: initdb.c:647
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" 不是有效的伺服器編碼名稱\n"
 
-#: initdb.c:772
+#: initdb.c:802
 #, c-format
 msgid "%s: warning: encoding mismatch\n"
 msgstr "%s: 警告：編碼不符\n"
 
-#: initdb.c:774
+#: initdb.c:804
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected\n"
@@ -84,7 +84,7 @@ msgstr ""
 "字處理函式出現異常行為，要修正這個問題，請重新執行 %s 且\n"
 "不指定使用的編碼或是指定正確的編碼組合。\n"
 
-#: initdb.c:926
+#: initdb.c:956
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -95,24 +95,24 @@ msgstr ""
 "這表示你的安裝可能發生錯誤，或是指定了錯誤的\n"
 "目錄給選項 -L。\n"
 
-#: initdb.c:991
+#: initdb.c:1021
 msgid "selecting default max_connections ... "
 msgstr "選擇預設的max_connections ..."
 
-#: initdb.c:1027
+#: initdb.c:1057
 msgid "selecting default shared_buffers ... "
 msgstr "選擇預設的shared_buffers ..."
 
-#: initdb.c:1060
+#: initdb.c:1090
 msgid "creating configuration files ... "
 msgstr "建立設定檔..."
 
-#: initdb.c:1147
+#: initdb.c:1186
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "建立 template1 資料庫於 %s/base/1 ... "
 
-#: initdb.c:1163
+#: initdb.c:1202
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -121,90 +121,90 @@ msgstr ""
 "%s: 輸入檔\"%s\"不屬於 PostgreSQL %s\n"
 "請檢查你的安裝或用 -L 選項指定正確的路徑。\n"
 
-#: initdb.c:1239
+#: initdb.c:1278
 msgid "initializing pg_shadow ... "
 msgstr "初始化pg_shadow..."
 
-#: initdb.c:1275
+#: initdb.c:1314
 msgid "Enter new superuser password: "
 msgstr "輸入新的管理者密碼："
 
-#: initdb.c:1276
+#: initdb.c:1315
 msgid "Enter it again: "
 msgstr "再輸入一次："
 
-#: initdb.c:1279
+#: initdb.c:1318
 msgid "Passwords didn't match.\n"
 msgstr "密碼不符。\n"
 
-#: initdb.c:1306
+#: initdb.c:1345
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: 無法從檔案\"%s\"讀取密碼：%s\n"
 
-#: initdb.c:1319
+#: initdb.c:1358
 msgid "setting password ... "
 msgstr "設定密碼..."
 
-#: initdb.c:1343
+#: initdb.c:1382
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr "%s: 無法產生密碼檔，請回報這個錯誤。\n"
 
-#: initdb.c:1373
+#: initdb.c:1412
 msgid "enabling unlimited row size for system tables ... "
 msgstr "啟用系統資料表的無資料筆數限制 ..."
 
-#: initdb.c:1446
+#: initdb.c:1485
 msgid "initializing pg_depend ... "
 msgstr "初始化pg_depend..."
 
-#: initdb.c:1474
+#: initdb.c:1513
 msgid "creating system views ... "
 msgstr "建立系統views..."
 
-#: initdb.c:1511
+#: initdb.c:1550
 msgid "loading pg_description ... "
 msgstr "載入pg_description..."
 
-#: initdb.c:1559
+#: initdb.c:1598
 msgid "creating conversions ... "
 msgstr "建立conversions ... "
 
-#: initdb.c:1615
+#: initdb.c:1654
 msgid "setting privileges on built-in objects ... "
 msgstr "設定內建物件的權限 ... "
 
-#: initdb.c:1673
+#: initdb.c:1712
 msgid "creating information schema ... "
 msgstr "建立information schema ... "
 
-#: initdb.c:1735
+#: initdb.c:1775
 msgid "vacuuming database template1 ... "
 msgstr "重整資料庫template1 ..."
 
-#: initdb.c:1791
+#: initdb.c:1831
 msgid "copying template1 to template0 ... "
 msgstr "複製template1到template0 ..."
 
-#: initdb.c:1848
+#: initdb.c:1888
 msgid "caught signal\n"
 msgstr "捕捉到信號\n"
 
-#: initdb.c:1853
+#: initdb.c:1893
 msgid "could not write to child process\n"
 msgstr "無法寫至子行程\n"
 
-#: initdb.c:1859
+#: initdb.c:1899
 msgid "ok\n"
 msgstr "成功\n"
 
-#: initdb.c:1889
+#: initdb.c:1946
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: 無效的locale名稱\"%s\"\n"
 
-#: initdb.c:1956
+#: initdb.c:2013
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -213,16 +213,16 @@ msgstr ""
 "%s 初始化PostgreSQL資料庫cluster。\n"
 "\n"
 
-#: initdb.c:1957
+#: initdb.c:2014
 msgid "Usage:\n"
 msgstr "使用方法：\n"
 
-#: initdb.c:1958
+#: initdb.c:2015
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [選項]... [資料目錄]\n"
 
-#: initdb.c:1959
+#: initdb.c:2016
 msgid ""
 "\n"
 "Options:\n"
@@ -230,19 +230,19 @@ msgstr ""
 "\n"
 "選項：\n"
 
-#: initdb.c:1960
+#: initdb.c:2017
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr " [-D, --pgdata=]DATADIR     資料庫cluster的目錄\n"
 
-#: initdb.c:1961
+#: initdb.c:2018
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   新資料庫的預設編碼\n"
 
-#: initdb.c:1962
+#: initdb.c:2019
 msgid "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr "  --locale=LOCALE           以指定的locale初始化資料庫cluster\n"
 
-#: initdb.c:1963
+#: initdb.c:2020
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
 "  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
@@ -255,35 +255,35 @@ msgstr ""
 "                            指定不同種類的locale以初始化資料庫cluster\n"
 "                            (預設從環境變數取得)\n"
 
-#: initdb.c:1968
+#: initdb.c:2025
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale               功能同 --locale=C\n"
 
-#: initdb.c:1969
+#: initdb.c:2026
-msgid "  -A, --auth=method         default authentication method for local connections\n"
+msgid "  -A, --auth=METHOD         default authentication method for local connections\n"
-msgstr "  -A, --auth=method        預設的local連線驗證方式\n"
+msgstr "  -A, --auth=METHOD         本地端預設的連線驗證方式\n"
 
-#: initdb.c:1970
+#: initdb.c:2027
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       資料庫管理者名稱\n"
 
-#: initdb.c:1971
+#: initdb.c:2028
 msgid "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            詢問新管理者的密碼\n"
 
-#: initdb.c:1972
+#: initdb.c:2029
-msgid "  --pwfile=filename         read password for the new superuser from file\n"
+msgid "  --pwfile=FILE             read password for the new superuser from file\n"
-msgstr "  --pwfile=filename         從檔案讀取新管理者的密碼\n"
+msgstr "  --pwfile=FILE             從檔案讀取新管理者的密碼\n"
 
-#: initdb.c:1973
+#: initdb.c:2030
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                顯示這份說明然後結束\n"
 
-#: initdb.c:1974
+#: initdb.c:2031
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             顯示版本資訊然後結束\n"
 
-#: initdb.c:1975
+#: initdb.c:2032
 msgid ""
 "\n"
 "Less commonly used options:\n"
@@ -291,23 +291,23 @@ msgstr ""
 "\n"
 "非常用選項:\n"
 
-#: initdb.c:1976
+#: initdb.c:2033
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               顯示除錯訊息\n"
 
-#: initdb.c:1977
+#: initdb.c:2034
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                顯示內部設定\n"
 
-#: initdb.c:1978
+#: initdb.c:2035
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              where to find the input files\n"
 
-#: initdb.c:1979
+#: initdb.c:2036
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             發生錯誤時不清除\n"
 
-#: initdb.c:1980
+#: initdb.c:2037
 msgid ""
 "\n"
 "If the data directory is not specified, the environment variable PGDATA\n"
@@ -316,7 +316,7 @@ msgstr ""
 "\n"
 "如果沒有指定資料目錄就會使用環境變數PGDATA。\n"
 
-#: initdb.c:1982
+#: initdb.c:2039
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -324,53 +324,53 @@ msgstr ""
 "\n"
 "回報錯誤給<pgsql-bugs@postgresql.org>。\n"
 
-#: initdb.c:2073
+#: initdb.c:2130
 msgid "Running in debug mode.\n"
 msgstr "以除錯模式執行。\n"
 
-#: initdb.c:2077
+#: initdb.c:2134
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "以noclean模式執行，發生錯誤時不會清理。\n"
 
-#: initdb.c:2113
+#: initdb.c:2170
-#: initdb.c:2130
+#: initdb.c:2187
-#: initdb.c:2335
+#: initdb.c:2405
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "執行\"%s --help\"取得更多資訊。\n"
 
-#: initdb.c:2128
+#: initdb.c:2185
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: 命令列參數過多(第一個是 \"%s\")\n"
 
-#: initdb.c:2136
+#: initdb.c:2193
 #, c-format
-msgid "%s: you cannot specify both password prompt and password file\n"
+msgid "%s: password prompt and password file may not be specified together\n"
-msgstr "%s: 不能同時使用詢問密碼和指定密碼檔\n"
+msgstr "%s：不能同時使用詢問密碼和指定密碼檔\n"
 
-#: initdb.c:2142
+#: initdb.c:2199
 msgid ""
 "\n"
-"WARNING: enabling \"trust\" authentication for local connections.\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"
+"You can change this by editing pg_hba.conf or using the -A option the\n"
 "next time you run initdb.\n"
 msgstr ""
 "\n"
-"警告：對local連線使用\"trust\"驗證。\n"
+"警告：對本地端連線使用\"trust\"驗證\n"
 "你可以編輯pg_hba.conf改變設定，或在執行initdb時使用 -A 選項。\n"
 
-#: initdb.c:2164
+#: initdb.c:2223
 #, c-format
-msgid "%s: unknown authentication method \"%s\".\n"
+msgid "%s: unrecognized authentication method \"%s\"\n"
-msgstr "%s: 不明的驗證方式\"%s\"。\n"
+msgstr "%s：無法辨認的驗證方式\"%s\"\n"
 
-#: initdb.c:2173
+#: initdb.c:2232
 #, c-format
-msgid "%s: you need to specify a password for the superuser to enable %s authentication.\n"
+msgid "%s: must specify a password for the superuser to enable %s authentication\n"
-msgstr "%s: 你必須提供管理者的密碼才能使用 %s 驗證方式。\n"
+msgstr "%s：你必須提供管理者的密碼才能使用 %s 驗證方式。\n"
 
-#: initdb.c:2188
+#: initdb.c:2247
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -382,30 +382,37 @@ msgstr ""
 "你必須指定資料庫系統存放資料的目錄，你可以使用 -D 選項\n"
 "或是環境變數PGDATA。\n"
 
-#: initdb.c:2214
+#: initdb.c:2278
 #, c-format
 msgid ""
-"The program \"postgres\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"The program \"postgres\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
 "%s 需要程式 \"postgres\"，但是在與\"%s\"相同的目錄中找不到。\n"
 "請檢查你的安裝。\n"
 
-#: initdb.c:2220
+#: initdb.c:2285
 #, c-format
 msgid ""
-"The program \"postgres\" was found by %s but was not the same version as \"%s\".\n"
+"The program \"postgres\" was found by \"%s\"\n"
+"but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
-"%s 已找到程式\"postgres\"，但是與\"%s\"的版本不符。\n"
+"\"%s\"已找到程式\"postgres\"，但是與 %s 的版本不符。\n"
 "請檢查你的安裝。\n"
 
-#: initdb.c:2241
+#: initdb.c:2304
+#, c-format
+msgid "%s: input file location must be an absolute path\n"
+msgstr "%s：輸入檔位置必須是絕對路徑\n"
+
+#: initdb.c:2312
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s: 無法取得短版本字串\n"
 
-#: initdb.c:2294
+#: initdb.c:2365
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -415,12 +422,12 @@ msgstr ""
 "使用者\"%s\"將會成為資料庫系統檔案和伺服器行程的擁有者。\n"
 "\n"
 
-#: initdb.c:2305
+#: initdb.c:2375
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "資料庫cluster會以locale %s初始化。\n"
 
-#: initdb.c:2309
+#: initdb.c:2378
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -439,32 +446,32 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2333
+#: initdb.c:2403
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: 找不到適合的編碼給locale \"%s\"\n"
 
-#: initdb.c:2334
+#: initdb.c:2404
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "用 -E 選項重新執行 %s。\n"
 
-#: initdb.c:2341
+#: initdb.c:2411
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "預設資料庫編碼被設為 %s。\n"
 
-#: initdb.c:2382
+#: initdb.c:2452
 #, c-format
 msgid "creating directory %s ... "
 msgstr "建立目錄 %s ..."
 
-#: initdb.c:2396
+#: initdb.c:2466
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "修正現有目錄 %s 的權限..."
 
-#: initdb.c:2414
+#: initdb.c:2484
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -476,12 +483,12 @@ msgstr ""
 "如果你想建立新的資料庫系統，請將目錄\"%s\"刪除或清空，\n"
 "或是在執行 %s 時加上\"%s\"以外的參數。\n"
 
-#: initdb.c:2431
+#: initdb.c:2501
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "建立目錄 %s/%s ..."
 
-#: initdb.c:2492
+#: initdb.c:2565
 #, c-format
 msgid ""
 "\n"

src/bin/pg_config/po/zh_TW.po

@@ -3,8 +3,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-10-18 07:08+0100\n"
+"POT-Creation-Date: 2004-10-19 01:08+0100\n"
-"PO-Revision-Date: 2004-10-18 14:45+0800\n"
+"PO-Revision-Date: 2004-10-19 10:40+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr "  --pgxs                顯示外掛程式makefile位置\n"
 
 #: pg_config.c:47
 msgid ""
-"  --configure           show options given to 'configure' script when\n"
+"  --configure           show options given to \"configure\" script when\n"
 "                        PostgreSQL was built\n"
 msgstr ""
 "  --configure           顯示編譯PostgreSQL時'configure'命令搞\n"
@@ -98,13 +98,18 @@ msgstr ""
 "\n"
 "執行\"%s --help\"取得更多資訊\n"
 
-#: pg_config.c:73
+#: pg_config.c:75
 #, c-format
 msgid "%s: argument required\n"
 msgstr "%s：不能省略參數\n"
 
-#: pg_config.c:102
+#: pg_config.c:104
 #, c-format
 msgid "%s: invalid argument: %s\n"
 msgstr "%s：無效的參數：%s\n"
 
+#: pg_config.c:113
+#, c-format
+msgid "%s: could not find own executable\n"
+msgstr "%s：找不到執行檔\n"
+

src/bin/pg_ctl/po/zh_TW.po

@@ -4,141 +4,149 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-09-17 01:09+0100\n"
+"POT-Creation-Date: 2004-10-19 01:09+0100\n"
-"PO-Revision-Date: 2004-09-17 13:54+0800\n"
+"PO-Revision-Date: 2004-10-19 10:51+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:193
+#: pg_ctl.c:200
-#: pg_ctl.c:209
+#: pg_ctl.c:215
-#: pg_ctl.c:1293
+#: pg_ctl.c:1288
 #, c-format
 msgid "%s: out of memory\n"
-msgstr "%s: 記憶體用盡\n"
+msgstr "%s：記憶體用盡\n"
 
-#: pg_ctl.c:452
+#: pg_ctl.c:249
 #, c-format
-msgid "%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgid "%s: could not open PID file \"%s\": %s"
-msgstr "%s: 可能有另一個postmaster正在執行，嘗試強制啟動postmaster。\n"
+msgstr "%s：無法開啟PID檔\"%s\"：%s"
 
-#: pg_ctl.c:470
+#: pg_ctl.c:468
 #, c-format
-msgid "%s: cannot read %s\n"
+msgid "%s: another postmaster may be running; trying to start postmaster anyway\n"
-msgstr "%s: 無法讀取 %s\n"
+msgstr "%s：可能有另一個postmaster正在執行，嘗試強制啟動postmaster。\n"
 
-#: pg_ctl.c:476
+#: pg_ctl.c:486
 #, c-format
-msgid "%s: option file %s must have exactly 1 line\n"
+msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: 選項檔 %s 只能有一行資料\n"
+msgstr "%s：無法讀取檔案\"%s\"\n"
 
-#: pg_ctl.c:522
+#: pg_ctl.c:492
+#, c-format
+msgid "%s: option file \"%s\" must have exactly 1 line\n"
+msgstr "%s：選項檔\"%s\"只能有一行資料\n"
+
+#: pg_ctl.c:543
 #, c-format
 msgid ""
-"The program \"postmaster\" is needed by %s but was not found in the same directory as \"%s\".\n"
+"The program \"postmaster\" is needed by %s but was not found in the\n"
+"same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
 "%s 需要\"postmaster\"程式，但是在與\"%s\"相同的目錄中找不到。\n"
 "檢查你的安裝。\n"
 
-#: pg_ctl.c:528
-#, 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 已找到程式\"postmaster\"，但是與 \"%s\"版本不符。\n"
-"請檢查你的安裝。\n"
-
-#: pg_ctl.c:539
-msgid "Unable to run the postmaster binary\n"
-msgstr "無法執行postmaster執行檔\n"
-
 #: pg_ctl.c:549
 #, c-format
 msgid ""
-"%s: cannot start postmaster\n"
+"The program \"postmaster\" was found by \"%s\"\n"
-"Examine the log output\n"
+"but was not the same version as %s.\n"
+"Check your installation.\n"
 msgstr ""
-"%s: 無法啟動postmaster\n"
+"\"%s\"已找到程式\"postmaster\"，但是與 %s 版本不符。\n"
+"請檢查你的安裝。\n"
+
+#: pg_ctl.c:561
+#, c-format
+msgid "%s: could not start postmaster: exit code was %d\n"
+msgstr "%s：無法啟動postmaster：結束碼是 %d\n"
+
+#: pg_ctl.c:572
+#, c-format
+msgid ""
+"%s: could not start postmaster\n"
+"Examine the log output.\n"
+msgstr ""
+"%s：無法啟動postmaster\n"
 "請檢查log輸出\n"
 
-#: pg_ctl.c:560
+#: pg_ctl.c:581
 msgid "waiting for postmaster to start..."
 msgstr "等待postmaster啟動..."
 
-#: pg_ctl.c:565
+#: pg_ctl.c:584
 msgid "could not start postmaster\n"
 msgstr "無法啟動postmaster\n"
 
-#: pg_ctl.c:567
+#: pg_ctl.c:586
 msgid ""
-"done\n"
+" done\n"
 "postmaster started\n"
 msgstr ""
-"完成\n"
+" 完成\n"
 "postmaster已經啟動\n"
 
-#: pg_ctl.c:570
+#: pg_ctl.c:589
 msgid "postmaster starting\n"
 msgstr "postmaster正在啟動\n"
 
-#: pg_ctl.c:585
+#: pg_ctl.c:603
-#: pg_ctl.c:664
+#: pg_ctl.c:671
-#: pg_ctl.c:734
+#: pg_ctl.c:730
 #, c-format
-msgid "%s: could not find %s\n"
+msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: 找不到 %s\n"
+msgstr "%s：PID檔\"%s\"不存在\n"
 
-#: pg_ctl.c:586
+#: pg_ctl.c:604
-#: pg_ctl.c:735
+#: pg_ctl.c:731
 msgid "Is postmaster running?\n"
 msgstr "postmaster是否正在執行？\n"
 
-#: pg_ctl.c:592
+#: pg_ctl.c:610
 #, c-format
 msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
-msgstr "%s: 無法停止postmaster，postgres正在執行(PID: %ld)\n"
+msgstr "%s：無法停止postmaster，postgres正在執行(PID：%ld)\n"
 
-#: pg_ctl.c:600
+#: pg_ctl.c:618
-#: pg_ctl.c:681
+#: pg_ctl.c:688
 #, c-format
-msgid "stop signal failed (PID: %ld): %s\n"
+msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "stop信號失敗(PID: %ld): %s\n"
+msgstr "%s：無法傳送stop信號(PID：%ld)：%s\n"
 
-#: pg_ctl.c:608
+#: pg_ctl.c:625
 msgid "postmaster shutting down\n"
 msgstr "postmaster正在關閉\n"
 
-#: pg_ctl.c:615
+#: pg_ctl.c:630
-#: pg_ctl.c:688
+#: pg_ctl.c:693
 msgid "waiting for postmaster to shut down..."
 msgstr "等待postmaster關閉..."
 
-#: pg_ctl.c:637
+#: pg_ctl.c:645
-#: pg_ctl.c:712
+#: pg_ctl.c:710
 msgid " failed\n"
-msgstr "失敗\n"
+msgstr " 失敗\n"
 
-#: pg_ctl.c:639
+#: pg_ctl.c:647
-#: pg_ctl.c:714
+#: pg_ctl.c:712
 #, c-format
 msgid "%s: postmaster does not shut down\n"
-msgstr "%s: postmaster無法關閉\n"
+msgstr "%s：postmaster無法關閉\n"
 
-#: pg_ctl.c:643
+#: pg_ctl.c:650
-#: pg_ctl.c:719
+#: pg_ctl.c:716
-msgid "done\n"
+msgid " done\n"
-msgstr "完成\n"
+msgstr " 完成\n"
 
-#: pg_ctl.c:645
+#: pg_ctl.c:652
-#: pg_ctl.c:721
+#: pg_ctl.c:717
 msgid "postmaster stopped\n"
 msgstr "postmaster停止執行\n"
 
-#: pg_ctl.c:665
+#: pg_ctl.c:672
 msgid ""
 "Is postmaster running?\n"
 "starting postmaster anyway\n"
@@ -146,85 +154,87 @@ msgstr ""
 "postmaster是否正在執行？\n"
 "強制啟動postmaster\n"
 
-#: pg_ctl.c:672
+#: pg_ctl.c:679
 #, c-format
 msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
-msgstr "%s: 無法重新啟動postmaster，postgres正在執行(PID: %ld)\n"
+msgstr "%s：無法重新啟動postmaster，postgres正在執行(PID：%ld)\n"
 
-#: pg_ctl.c:675
+#: pg_ctl.c:682
-#: pg_ctl.c:744
+#: pg_ctl.c:740
 msgid "Please terminate postgres and try again.\n"
 msgstr "請結束postgres然後再試一次。\n"
 
-#: pg_ctl.c:741
+#: pg_ctl.c:737
 #, c-format
 msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
-msgstr "%s: 無法重新載入postmaster， postgres正在執行(PID: %ld)\n"
+msgstr "%s：無法重新載入postmaster， postgres正在執行(PID：%ld)\n"
 
-#: pg_ctl.c:750
+#: pg_ctl.c:746
 #, c-format
-msgid "reload signal failed (PID: %ld): %s\n"
+msgid "could not send reload signal (PID: %ld): %s\n"
-msgstr "reload信號失敗(PID: %ld): %s\n"
+msgstr "無法傳送reload信號(PID：%ld)：%s\n"
 
-#: pg_ctl.c:756
+#: pg_ctl.c:751
 msgid "postmaster signaled\n"
 msgstr "已通知postmaster\n"
 
-#: pg_ctl.c:771
+#: pg_ctl.c:766
 #, c-format
 msgid "%s: postmaster or postgres not running\n"
-msgstr "%s: postmaster或postgres尚未執行\n"
+msgstr "%s：postmaster或postgres尚未執行\n"
 
-#: pg_ctl.c:777
+#: pg_ctl.c:772
 #, c-format
 msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
-msgstr "%s: 一個獨立後端\"postgres\"正在執行(PID: %ld)\n"
+msgstr "%s：一個獨立後端\"postgres\"正在執行(PID：%ld)\n"
 
-#: pg_ctl.c:784
+#: pg_ctl.c:779
 #, c-format
 msgid "%s: postmaster is running (PID: %ld)\n"
-msgstr "%s: postmaster正在執行(PID: %ld)\n"
+msgstr "%s：postmaster正在執行(PID：%ld)\n"
 
-#: pg_ctl.c:800
+#: pg_ctl.c:795
 #, c-format
-msgid "signal %d failed (PID: %ld): %s\n"
+msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "信號 %d 失敗(PID: %ld): %s\n"
+msgstr "%s：無法傳送信號 %d(PID：%ld)：%s\n"
 
-#: pg_ctl.c:831
+#: pg_ctl.c:826
-msgid "Unable to find exe"
-msgstr "找不到執行檔"
-
-#: pg_ctl.c:878
-#: pg_ctl.c:910
-msgid "Unable to open service manager\n"
-msgstr "無法開啟服務管理員\n"
-
-#: pg_ctl.c:884
 #, c-format
-msgid "Service \"%s\" already registered\n"
+msgid "%s: could not find exe"
-msgstr "服務\"%s\"已經被註冊\n"
+msgstr "%s：找不到exe"
 
-#: pg_ctl.c:895
+#: pg_ctl.c:873
+#: pg_ctl.c:905
 #, c-format
-msgid "Unable to register service \"%s\" [%d]\n"
+msgid "%s: could not open service manager\n"
-msgstr "無法註冊服務\"%s\" [%d]\n"
+msgstr "%s：無法開啟服務管理員\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:879
 #, c-format
-msgid "Service \"%s\" not registered\n"
+msgid "%s: service \"%s\" already registered\n"
-msgstr "服務\"%s\"未被註冊\n"
+msgstr "%s：服務\"%s\"已經被註冊\n"
 
-#: pg_ctl.c:923
+#: pg_ctl.c:890
 #, c-format
-msgid "Unable to open service \"%s\" [%d]\n"
+msgid "%s: could not register service \"%s\" [%d]\n"
-msgstr "無法開啟服務\"%s\" [%d]\n"
+msgstr "%s：無法註冊服務\"%s\" [%d]\n"
 
-#: pg_ctl.c:930
+#: pg_ctl.c:911
 #, c-format
-msgid "Unable to unregister service \"%s\" [%d]\n"
+msgid "%s: service \"%s\" not registered\n"
-msgstr "無法移除服務\"%s\" [%d]\n"
+msgstr "%s：服務\"%s\"未被註冊\n"
 
-#: pg_ctl.c:1067
+#: pg_ctl.c:918
+#, c-format
+msgid "%s: could not open service \"%s\" [%d]\n"
+msgstr "%s：無法開啟服務\"%s\" [%d]\n"
+
+#: pg_ctl.c:925
+#, c-format
+msgid "%s: could not unregister service \"%s\" [%d]\n"
+msgstr "%s：無法移除服務\"%s\" [%d]\n"
+
+#: pg_ctl.c:1062
 #, c-format
 msgid ""
 "\n"
@@ -233,7 +243,7 @@ msgstr ""
 "\n"
 "執行\"%s --help\"以顯示更多資訊。\n"
 
-#: pg_ctl.c:1075
+#: pg_ctl.c:1070
 #, c-format
 msgid ""
 "%s is a utility to start, stop, restart, reload configuration files,\n"
@@ -244,91 +254,91 @@ msgstr ""
 "報告PostgreSQL伺服器狀態，或是殺掉PostgreSQL行程\n"
 "\n"
 
-#: pg_ctl.c:1077
+#: pg_ctl.c:1072
 msgid "Usage:\n"
-msgstr "使用方法:\n"
+msgstr "使用方法：\n"
 
-#: pg_ctl.c:1078
+#: pg_ctl.c:1073
 #, 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:1079
+#: pg_ctl.c:1074
 #, c-format
 msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-D 資料目錄] [-s] [-m 關閉模式]\n"
 
-#: pg_ctl.c:1080
+#: pg_ctl.c:1075
 #, 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:1081
+#: pg_ctl.c:1076
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D 資料目錄] [-s]\n"
 
-#: pg_ctl.c:1082
+#: pg_ctl.c:1077
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D 資料目錄]\n"
 
-#: pg_ctl.c:1083
+#: pg_ctl.c:1078
 #, c-format
 msgid "  %s kill    SIGNALNAME PROCESSID\n"
 msgstr "  %s kill    信號名稱 行程ID\n"
 
-#: pg_ctl.c:1085
+#: pg_ctl.c:1080
 #, c-format
-msgid "  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-w] [-o \"OPTIONS\"]\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:1086
+#: pg_ctl.c:1081
 #, c-format
-msgid "  %s unregister [-N servicename]\n"
+msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N 服務名稱]\n"
 
-#: pg_ctl.c:1088
+#: pg_ctl.c:1083
 msgid "Common options:\n"
 msgstr "一般選項:\n"
 
-#: pg_ctl.c:1089
+#: pg_ctl.c:1084
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata 資料目錄  存放資料庫的目錄\n"
 
-#: pg_ctl.c:1090
+#: pg_ctl.c:1085
 msgid "  -s, --silent only print errors, no informational messages\n"
 msgstr "  -s, --silent 只顯示錯誤，不顯示其它訊息\n"
 
-#: pg_ctl.c:1092
+#: pg_ctl.c:1087
 msgid "  -N       service name with which to register PostgreSQL server\n"
 msgstr "  -N       用來註冊PostgreSQL伺服器的服務名稱\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1088
 msgid "  -P       password of account to register PostgreSQL server\n"
 msgstr "  -P       用來註冊PostgreSQL伺服器的密碼\n"
 
-#: pg_ctl.c:1094
+#: pg_ctl.c:1089
 msgid "  -U       user name of account to register PostgreSQL server\n"
 msgstr "  -U       用來註冊PostgreSQL伺服器的帳號\n"
 
-#: pg_ctl.c:1096
+#: pg_ctl.c:1091
 msgid "  -w           wait until operation completes\n"
 msgstr "  -w           等待操作完成\n"
 
-#: pg_ctl.c:1097
+#: pg_ctl.c:1092
 msgid "  -W           do not wait until operation completes\n"
 msgstr "  -W           不等待操作完成\n"
 
-#: pg_ctl.c:1098
+#: pg_ctl.c:1093
 msgid "  --help       show this help, then exit\n"
 msgstr "  --help       顯示這份說明然後結束\n"
 
-#: pg_ctl.c:1099
+#: pg_ctl.c:1094
 msgid "  --version    output version information, then exit\n"
 msgstr "  --version    顯示版本資訊然後結束\n"
 
-#: pg_ctl.c:1100
+#: pg_ctl.c:1095
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
 "\n"
@@ -336,7 +346,7 @@ msgstr ""
 "(預設是關閉時而非啟動或重新啟動時等待。)\n"
 "\n"
 
-#: pg_ctl.c:1101
+#: pg_ctl.c:1096
 msgid ""
 "If the -D option is omitted, the environment variable PGDATA is used.\n"
 "\n"
@@ -344,23 +354,23 @@ msgstr ""
 "選項 -D 已經取消，改用環境變數PGDATA。\n"
 "\n"
 
-#: pg_ctl.c:1102
+#: pg_ctl.c:1097
 msgid "Options for start or restart:\n"
 msgstr "啟動或重新啟動可用選項:\n"
 
-#: pg_ctl.c:1103
+#: pg_ctl.c:1098
 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:1105
+#: pg_ctl.c:1100
 msgid ""
 "  -o OPTIONS              command line options to pass to the postmaster\n"
 "                          (PostgreSQL server executable)\n"
 msgstr "  -o 選項                 傳給postmaster(PostgreSQL伺服器執行檔)的命令列選項\n"
 
-#: pg_ctl.c:1107
+#: pg_ctl.c:1102
 msgid ""
 "  -p PATH-TO-POSTMASTER   normally not necessary\n"
 "\n"
@@ -368,41 +378,41 @@ msgstr ""
 "  -p postmaster的路徑     通常不需要\n"
 "\n"
 
-#: pg_ctl.c:1108
+#: pg_ctl.c:1103
 msgid "Options for stop or restart:\n"
-msgstr "停止或重新啟動可用選項:\n"
+msgstr "停止或重新啟動可用選項：\n"
 
-#: pg_ctl.c:1109
+#: pg_ctl.c:1104
 msgid ""
-"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"
 "\n"
 msgstr ""
-"  -m 關閉模式        可以是'smart'、'fast'或'immediate'\n"
+"  -m 關閉模式        可以是\"smart\"、\"fast\"或\"immediate\"\n"
 "\n"
 
-#: pg_ctl.c:1110
+#: pg_ctl.c:1105
 msgid "Allowed signal names for kill:\n"
-msgstr "kill可以使用的信號名稱:\n"
+msgstr "kill可以使用的信號名稱：\n"
 
-#: pg_ctl.c:1111
+#: pg_ctl.c:1106
 msgid ""
 "  HUP INT QUIT ABRT TERM USR1 USR2\n"
 "\n"
 msgstr ""
 
-#: pg_ctl.c:1112
+#: pg_ctl.c:1107
 msgid "Shutdown modes are:\n"
-msgstr "關閉模式:\n"
+msgstr "關閉模式：\n"
 
-#: pg_ctl.c:1113
+#: pg_ctl.c:1108
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       在所有用戶端斷線後關閉\n"
 
-#: pg_ctl.c:1114
+#: pg_ctl.c:1109
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        直接正常關閉\n"
 
-#: pg_ctl.c:1115
+#: pg_ctl.c:1110
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on restart\n"
 "\n"
@@ -410,47 +420,47 @@ msgstr ""
 "  immediate   立即關閉，會導致下次啟動時需要復原程序\n"
 "\n"
 
-#: pg_ctl.c:1116
+#: pg_ctl.c:1111
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "回報錯誤至 <pgsql-bugs@postgresql.org>。\n"
 
-#: pg_ctl.c:1141
+#: pg_ctl.c:1136
 #, c-format
-msgid "%s: invalid shutdown mode %s\n"
+msgid "%s: unrecognized shutdown mode \"%s\"\n"
-msgstr "%s: 無效的關閉模式 %s\n"
+msgstr "%s：無效的關閉模式\"%s\"\n"
 
-#: pg_ctl.c:1174
+#: pg_ctl.c:1169
 #, c-format
-msgid "%s: invalid signal \"%s\"\n"
+msgid "%s: unrecognized signal name \"%s\"\n"
-msgstr "%s: 無效的信號\"%s\"\n"
+msgstr "%s：無效的信號名稱\"%s\"\n"
 
-#: pg_ctl.c:1309
+#: pg_ctl.c:1304
 #, c-format
 msgid "%s: invalid option %s\n"
-msgstr "%s: 無效的選項 %s\n"
+msgstr "%s：無效的選項 %s\n"
 
-#: pg_ctl.c:1320
+#: pg_ctl.c:1315
 #, c-format
-msgid "%s: extra operation mode %s\n"
+msgid "%s: extra operation mode \"%s\"\n"
-msgstr "%s: 多餘的操作模式 %s\n"
+msgstr "%s：多餘的操作模式\"%s\"\n"
 
-#: pg_ctl.c:1339
+#: pg_ctl.c:1334
 #, c-format
 msgid "%s: invalid kill syntax\n"
-msgstr "%s: 無效的kill語法\n"
+msgstr "%s：無效的kill語法\n"
 
-#: pg_ctl.c:1357
+#: pg_ctl.c:1352
 #, c-format
-msgid "%s: invalid operation mode %s\n"
+msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: 無效的操作模式 %s\n"
+msgstr "%s：無效的操作模式\"%s\"\n"
 
-#: pg_ctl.c:1367
+#: pg_ctl.c:1362
 #, c-format
 msgid "%s: no operation specified\n"
-msgstr "%s: 未指定操作方式\n"
+msgstr "%s：未指定操作方式\n"
 
-#: pg_ctl.c:1383
+#: pg_ctl.c:1378
 #, c-format
 msgid "%s: no database directory specified and environment variable PGDATA unset\n"
-msgstr "%s: 未指定資料目錄和設定環境變數PGDATA\n"
+msgstr "%s：未指定資料目錄和設定環境變數PGDATA\n"
 

src/bin/psql/po/zh_TW.po

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 8.0\n"
-"POT-Creation-Date: 2004-09-17 01:11+0100\n"
+"POT-Creation-Date: 2004-10-19 01:09+0100\n"
-"PO-Revision-Date: 2004-09-17 14:02+0800\n"
+"PO-Revision-Date: 2004-10-19 10:37+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -98,14 +98,14 @@ msgstr "停止計時功能"
 
 #: command.c:788
 #: command.c:808
-#: command.c:1164
+#: command.c:1163
-#: command.c:1171
+#: command.c:1170
-#: command.c:1181
+#: command.c:1180
-#: command.c:1193
+#: command.c:1192
-#: command.c:1206
+#: command.c:1205
-#: command.c:1220
+#: command.c:1219
-#: command.c:1242
+#: command.c:1241
-#: command.c:1273
+#: command.c:1272
 #: common.c:170
 #: copy.c:530
 #: copy.c:575
@@ -115,8 +115,8 @@ msgstr ""
 
 #: command.c:915
 #: command.c:939
-#: startup.c:184
+#: startup.c:187
-#: startup.c:202
+#: startup.c:205
 msgid "Password: "
 msgstr "密碼: "
 
@@ -162,104 +162,104 @@ msgstr "無法執行編輯器\"%s\"\n"
 msgid "could not start /bin/sh\n"
 msgstr "無法執行 /bin/sh\n"
 
-#: command.c:1149
+#: command.c:1148
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "無法開啟暫存檔\"%s\": %s\n"
 
-#: command.c:1341
+#: command.c:1340
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: 可以使用的格式有unaligned、aligned、html、latex\n"
 
-#: command.c:1346
+#: command.c:1345
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "輸出格式是 %s。\n"
 
-#: command.c:1356
+#: command.c:1355
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "邊界風格是 %d。\n"
 
-#: command.c:1365
+#: command.c:1364
 msgid "Expanded display is on.\n"
 msgstr "擴展顯示已打開。\n"
 
-#: command.c:1366
+#: command.c:1365
 msgid "Expanded display is off.\n"
 msgstr "擴展顯示已關閉。\n"
 
-#: command.c:1378
+#: command.c:1377
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr ""
 
-#: command.c:1390
+#: command.c:1389
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "欄位分隔符號是\"%s\"。\n"
 
-#: command.c:1404
+#: command.c:1403
 msgid "Record separator is <newline>."
 msgstr "記錄分隔符號是<newline>。"
 
-#: command.c:1406
+#: command.c:1405
 #, c-format
 msgid "Record separator is \"%s\".\n"
-msgstr "記錄分隔符號是\"%s\"。\n"
+msgstr "記茄分隔符號是\"%s\"。\n"
 
-#: command.c:1417
+#: command.c:1416
 msgid "Showing only tuples."
 msgstr "只顯示tuples。"
 
-#: command.c:1419
+#: command.c:1418
 msgid "Tuples only is off."
 msgstr "關閉只顯示tuples。"
 
-#: command.c:1435
+#: command.c:1434
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "標題是 \"%s\"。\n"
 
-#: command.c:1437
+#: command.c:1436
 msgid "Title is unset.\n"
 msgstr "無標題。\n"
 
-#: command.c:1453
+#: command.c:1452
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "資料表屬性是 \"%s\"。\n"
 
-#: command.c:1455
+#: command.c:1454
 msgid "Table attributes unset.\n"
 msgstr "未設置資料表屬性。\n"
 
-#: command.c:1471
+#: command.c:1470
 msgid "Pager is used for long output."
 msgstr "顯示大量資料時使用分頁器。"
 
-#: command.c:1473
+#: command.c:1472
 msgid "Pager is always used."
 msgstr "永遠使用分頁器。"
 
-#: command.c:1475
+#: command.c:1474
 msgid "Pager usage is off."
 msgstr "不使用分頁器。"
 
-#: command.c:1486
+#: command.c:1485
 msgid "Default footer is on."
 msgstr "打開預設footer。"
 
-#: command.c:1488
+#: command.c:1487
 msgid "Default footer is off."
 msgstr "關閉預設footer。"
 
-#: command.c:1494
+#: command.c:1493
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: 不明選項: %s\n"
 
-#: command.c:1533
+#: command.c:1532
 msgid "\\!: failed\n"
 msgstr "\\!: 失敗\n"
 
@@ -291,7 +291,7 @@ msgstr "完成。\n"
 #: common.c:391
 #, c-format
 msgid "INTERNAL ERROR: unexpected statement position \"%s\"\n"
-msgstr ""
+msgstr "內部錯誤：非預期的敘述位置\"%s\"\n"
 
 #: common.c:527
 #, c-format
@@ -312,7 +312,7 @@ msgstr "你目前沒有與資料庫連線。\n"
 #: common.c:691
 #, c-format
 msgid "Asynchronous notification \"%s\" received from server process with PID %d.\n"
-msgstr ""
+msgstr "從PID為%2$d的伺服器收到非同步通知\"%1$s\"。\n"
 
 #: common.c:879
 #, c-format
@@ -413,7 +413,7 @@ msgstr "  -f 檔案名稱     執行檔案中的命令然後結束"
 
 #: help.c:96
 msgid "  -l              list available databases, then exit"
-msgstr "  -l              列出所有可用資料庫然後結束"
+msgstr "  -l              列出所有可用?料庫然?結束"
 
 #: help.c:97
 msgid "  -v NAME=VALUE   set psql variable NAME to VALUE"
@@ -636,31 +636,31 @@ msgstr "  \\p             顯示查詢暫存區的內容\n"
 msgid "  \\r             reset (clear) the query buffer\n"
 msgstr "  \\r             重置(清理)查詢暫存區\n"
 
-#: help.c:197
-msgid "  \\s [FILE]      display history or save it to file\n"
-msgstr "  \\s [檔案]      顯示歷史記錄或儲存到檔案\n"
-
 #: help.c:198
+msgid "  \\s [FILE]      display history or save it to file\n"
+msgstr "  \\s [檔案]      顯示歷史記錄?儲存?檔案\n"
+
+#: help.c:200
 msgid "  \\w FILE        write query buffer to file\n"
 msgstr "  \\w 檔案        將查詢暫存區寫入檔案\n"
 
-#: help.c:201
+#: help.c:203
 msgid "Input/Output\n"
 msgstr "輸入/輸出\n"
 
-#: help.c:202
+#: help.c:204
 msgid "  \\echo [STRING] write string to standard output\n"
 msgstr "  \\echo [STRING] 將字串寫至標準輸出\n"
 
-#: help.c:203
+#: help.c:205
 msgid "  \\i FILE        execute commands from file\n"
 msgstr " \\i 檔案名稱    執行檔案中的命令\n"
 
-#: help.c:204
+#: help.c:206
 msgid "  \\o [FILE]      send all query results to file or |pipe\n"
 msgstr "  \\o [檔案]      將查詢結果寫入檔案或 |管道\n"
 
-#: help.c:205
+#: help.c:207
 msgid ""
 "  \\qecho [STRING]\n"
 "                 write string to query output stream (see \\o)\n"
@@ -668,15 +668,15 @@ msgstr ""
 "  \\qecho [STRING]\n"
 "                 將文字寫入查詢輸出串流(參見\\o)\n"
 
-#: help.c:209
+#: help.c:211
 msgid "Informational\n"
 msgstr ""
 
-#: help.c:210
+#: help.c:212
 msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
 msgstr "  \\d [NAME]      為資料表、索引、sequence或view加上註解\n"
 
-#: help.c:211
+#: help.c:213
 msgid ""
 "  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 "                 list tables/indexes/sequences/views/system tables\n"
@@ -684,92 +684,92 @@ msgstr ""
 "  \\d{t|i|s|v|S} [PATTERN] (加上\"+\"取得更多資訊)\n"
 "                 列出資料表/索引/sequences/views/系統資料表\n"
 
-#: help.c:213
+#: help.c:215
 msgid "  \\da [PATTERN]  list aggregate functions\n"
 msgstr "  \\da [PATTERN]  列出aggregate functions\n"
 
-#: help.c:214
+#: help.c:216
 msgid "  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"
 msgstr "  \\db [PATTERN]  列出tablespaces(加上\"+\"取得更多資訊)\n"
 
-#: help.c:215
+#: help.c:217
 msgid "  \\dc [PATTERN]  list conversions\n"
 msgstr "  \\dc [PATTERN]  列出conversions\n"
 
-#: help.c:216
+#: help.c:218
 msgid "  \\dC            list casts\n"
 msgstr "  \\dC            列出casts\n"
 
-#: help.c:217
+#: help.c:219
 msgid "  \\dd [PATTERN]  show comment for object\n"
 msgstr "  \\dd [PATTERN]  顯示物件註解t\n"
 
-#: help.c:218
+#: help.c:220
 msgid "  \\dD [PATTERN]  list domains\n"
 msgstr "  \\dD [PATTERN]  列出domains\n"
 
-#: help.c:219
+#: help.c:221
 msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 msgstr "  \\df [PATTERN]  列出函式(加上\"+\"取得更多資訊)\n"
 
-#: help.c:220
+#: help.c:222
 msgid "  \\dg [PATTERN]  list groups\n"
 msgstr "  \\dg [PATTERN]  列出群組\n"
 
-#: help.c:221
+#: help.c:223
 msgid "  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"
 msgstr "  \\dn [PATTERN]  列出schemas(加上\"+\"取得更多資訊)\n"
 
-#: help.c:222
+#: help.c:224
 msgid "  \\do [NAME]     list operators\n"
 msgstr "  \\do [NAME]     列出operators\n"
 
-#: help.c:223
+#: help.c:225
 msgid "  \\dl            list large objects, same as \\lo_list\n"
 msgstr "  \\dl            列出large objects，同\\lo_list\n"
 
-#: help.c:224
+#: help.c:226
-msgid "  \\dp [PATTERN]  list table, view and sequence access privileges\n"
+msgid "  \\dp [PATTERN]  list table, view, and sequence access privileges\n"
 msgstr "  \\dp [PATTERN]  列出資料表、view和sequence的存取權限\n"
 
-#: help.c:225
+#: help.c:227
 msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
 msgstr "  \\dT [PATTERN]  列出資料型別(加上\"+\"取得更多資訊)\n"
 
-#: help.c:226
+#: help.c:228
 msgid "  \\du [PATTERN]  list users\n"
 msgstr "  \\du [PATTERN]  列出使用者\n"
 
-#: help.c:227
+#: help.c:229
 msgid "  \\l             list all databases (add \"+\" for more detail)\n"
 msgstr "  \\l             列出所有資料庫(加上\"+\"取得更多資訊)\n"
 
-#: help.c:228
+#: help.c:230
-msgid "  \\z [PATTERN]   list table, view and sequence access privileges (same as \\dp)\n"
+msgid "  \\z [PATTERN]   list table, view, and sequence access privileges (same as \\dp)\n"
 msgstr "  \\z [PATTERN]   列出資料表、view和sequence存取權限(同\\dp)\n"
 
-#: help.c:231
+#: help.c:233
 msgid "Formatting\n"
 msgstr ""
 
-#: help.c:232
+#: help.c:234
 msgid "  \\a             toggle between unaligned and aligned output mode\n"
 msgstr " \\a             切換非對齊模式和對齊模式\n"
 
-#: help.c:233
+#: help.c:235
 msgid "  \\C [STRING]    set table title, or unset if none\n"
 msgstr "  \\C [STRING]    設定表格標題\n"
 
-#: help.c:234
+#: help.c:236
 msgid "  \\f [STRING]    show or set field separator for unaligned query output\n"
 msgstr "  \\f [STRING]    顯示或設定非對齊模式的欄位分隔符號\n"
 
-#: help.c:235
+#: help.c:237
 #, c-format
 msgid "  \\H             toggle HTML output mode (currently %s)\n"
 msgstr " \\H             切換HTML輸出模式(目前是 %s)\n"
 
-#: help.c:237
+#: help.c:239
 msgid ""
 "  \\pset NAME [VALUE]\n"
 "                 set table output option\n"
@@ -781,29 +781,29 @@ msgstr ""
 "                 (NAME := {format|border|expanded|fieldsep|footer|null|\n"
 "                 recordsep|tuples_only|title|tableattr|pager})\n"
 
-#: help.c:241
+#: help.c:243
 #, c-format
 msgid "  \\t             show only rows (currently %s)\n"
 msgstr " \\t             只顯示列(目前是 %s)\n"
 
-#: help.c:243
+#: help.c:245
 msgid "  \\T [STRING]    set HTML <table> tag attributes, or unset if none\n"
 msgstr "  \\T [STRING]    設定HTML表格標籤屬性\n"
 
-#: help.c:244
+#: help.c:246
 #, c-format
 msgid "  \\x             toggle expanded output (currently %s)\n"
 msgstr " \\x             切換擴展輸出模式(目前是 %s)\n"
 
-#: help.c:248
+#: help.c:250
 msgid "Copy, Large Object\n"
 msgstr ""
 
-#: help.c:249
+#: help.c:251
 msgid "  \\copy ...      perform SQL COPY with data stream to the client host\n"
 msgstr " \\copy ...      執行SQL COPY，資料流指向用戶端主機\n"
 
-#: help.c:250
+#: help.c:252
 msgid ""
 "  \\lo_export LOBOID FILE\n"
 "  \\lo_import FILE [COMMENT] \n"
@@ -815,11 +815,11 @@ msgstr ""
 "  \\lo_list\n"
 "  \\lo_unlink LOBOID    large object操作\n"
 
-#: help.c:283
+#: help.c:285
 msgid "Available help:\n"
 msgstr "可用說明:\n"
 
-#: help.c:342
+#: help.c:344
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -834,7 +834,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:355
+#: help.c:357
 #, c-format
 msgid ""
 "No help available for \"%-.*s\".\n"
@@ -843,11 +843,15 @@ msgstr ""
 "沒有\"%-.*s\"的說明。\n"
 "用不帶參數的 \\h 顯示目前擁有的說明。\n"
 
-#: input.c:214
+#: input.c:210
 #, c-format
 msgid "could not save history to file \"%s\": %s\n"
 msgstr "無法將歷史記錄儲存到\"%s\": %s\n"
 
+#: input.c:213
+msgid "history is not supported by this installation\n"
+msgstr "這個安裝不支援命令記錄\n"
+
 #: large_obj.c:36
 #, c-format
 msgid "%s: not connected to a database\n"
@@ -898,16 +902,16 @@ msgstr "(1 行)"
 msgid "(%d rows)"
 msgstr "(%d 行)"
 
-#: startup.c:133
+#: startup.c:132
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: 記憶體用盡\n"
 
-#: startup.c:178
+#: startup.c:181
 msgid "User name: "
 msgstr "使用者名稱:"
 
-#: startup.c:286
+#: startup.c:292
 #, c-format
 msgid ""
 "Welcome to %s %s, the PostgreSQL interactive terminal.\n"
@@ -928,42 +932,42 @@ msgstr ""
 "       \\q 退出\n"
 "\n"
 
-#: startup.c:447
+#: startup.c:446
 #, c-format
 msgid "%s: couldn't set printing parameter \"%s\"\n"
 msgstr "%s: 無法設定列印參數\"%s\"\n"
 
-#: startup.c:493
+#: startup.c:492
 #, c-format
 msgid "%s: could not delete variable \"%s\"\n"
 msgstr "%s: 無法刪除變數\"%s\"\n"
 
-#: startup.c:503
+#: startup.c:502
 #, c-format
 msgid "%s: could not set variable \"%s\"\n"
 msgstr "%s: 無法設定變數\"%s\"\n"
 
-#: startup.c:534
+#: startup.c:533
-#: startup.c:540
+#: startup.c:539
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "執行\"%s --help\"以顯示更多資訊。\n"
 
-#: startup.c:558
+#: startup.c:557
 #, c-format
 msgid "%s: warning: extra command-line argument \"%s\" ignored\n"
 msgstr "%s: 警告：忽略多餘的命令列參數\"%s\"\n"
 
-#: startup.c:565
+#: startup.c:564
 #, c-format
 msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: 警告：-u 選項已經廢棄，請改用 -U。\n"
 
-#: startup.c:630
+#: startup.c:629
 msgid "contains support for command-line editing"
 msgstr "包含命令列編輯支援"
 
-#: startup.c:653
+#: startup.c:652
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -1013,7 +1017,7 @@ msgstr "aggregate functions列表"
 
 #: describe.c:117
 #, c-format
-msgid "This server version (%d) does not support tablespaces.\n"
+msgid "The server version (%d) does not support tablespaces.\n"
 msgstr "伺服器版本(%d)不支援tablespace。\n"
 
 #: describe.c:128
@@ -1220,11 +1224,11 @@ msgid "?%c? \"%s.%s\""
 msgstr ""
 
 #: describe.c:925
-msgid "PRIMARY KEY, "
+msgid "primary key, "
 msgstr ""
 
 #: describe.c:927
-msgid "UNIQUE, "
+msgid "unique, "
 msgstr ""
 
 #: describe.c:933
@@ -1238,7 +1242,7 @@ msgid ", predicate (%s)"
 msgstr ""
 
 #: describe.c:940
-msgid ", CLUSTER"
+msgid ", clustered"
 msgstr ""
 
 #: describe.c:977
@@ -1299,7 +1303,7 @@ msgid "Inherits"
 msgstr ""
 
 #: describe.c:1259
-msgid "Contains OIDs"
+msgid "Has OIDs"
 msgstr ""
 
 #: describe.c:1262
@@ -1457,6 +1461,8 @@ msgid ""
 "ALTER AGGREGATE name ( type ) RENAME TO newname\n"
 "ALTER AGGREGATE name ( type ) OWNER TO newowner"
 msgstr ""
+"ALTER AGGREGATE 名稱 ( 資料型別 ) RENAME TO 新名稱\n"
+"ALTER AGGREGATE 名稱 ( 資料型別 ) OWNER TO 新擁有者"
 
 #: sql_help.h:33
 msgid "change the definition of a conversion"
@@ -1467,6 +1473,8 @@ msgid ""
 "ALTER CONVERSION name RENAME TO newname\n"
 "ALTER CONVERSION name OWNER TO newowner"
 msgstr ""
+"ALTER CONVERSION 名稱 RENAME TO 新名稱\n"
+"ALTER CONVERSION 名稱 OWNER TO 新擁有者"
 
 #: sql_help.h:37
 msgid "change a database"
@@ -1481,6 +1489,12 @@ msgid ""
 "\n"
 "ALTER DATABASE name OWNER TO new_owner"
 msgstr ""
+"ALTER DATABASE 名稱 SET 參數 { TO | = } { 值 | DEFAULT }\n"
+"ALTER DATABASE 名稱 RESET 參數\n"
+"\n"
+"ALTER DATABASE 名稱 RENAME TO 新名稱\n"
+"\n"
+"ALTER DATABASE 名稱 OWNER TO 新擁有者"
 
 #: sql_help.h:41
 msgid "change the definition of a domain"
@@ -1545,7 +1559,7 @@ msgstr "修改程序語言的定義"
 
 #: sql_help.h:58
 msgid "ALTER LANGUAGE name RENAME TO newname"
-msgstr ""
+msgstr "ALTER LANGUAGE 名稱 RENAME TO 新名稱"
 
 #: sql_help.h:61
 msgid "change the definition of an operator class"
@@ -1574,6 +1588,8 @@ msgid ""
 "ALTER SCHEMA name RENAME TO newname\n"
 "ALTER SCHEMA name OWNER TO newowner"
 msgstr ""
+"ALTER SCHEMA 名稱 RENAME TO 新名稱\n"
+"ALTER SCHEMA 名稱 OWNER TO 新擁有者"
 
 #: sql_help.h:73
 msgid "change the definition of a sequence generator"
@@ -1634,7 +1650,7 @@ msgstr "修改trigger的定義"
 
 #: sql_help.h:86
 msgid "ALTER TRIGGER name ON table RENAME TO newname"
-msgstr ""
+msgstr "ALTER TRIGGER 名稱 ON 資料表 RENAME TO 新名稱"
 
 #: sql_help.h:89
 msgid "change the definition of a type"
@@ -1671,7 +1687,7 @@ msgstr "計算資料庫執行參數"
 
 #: sql_help.h:98
 msgid "ANALYZE [ VERBOSE ] [ table [ (column [, ...] ) ] ]"
-msgstr ""
+msgstr "ANALYZE [ VERBOSE ] [ 資料表 [ (欄位 [, ...] ) ] ]"
 
 #: sql_help.h:101
 #: sql_help.h:413
@@ -1702,7 +1718,7 @@ msgstr "關閉cursor"
 
 #: sql_help.h:110
 msgid "CLOSE name"
-msgstr ""
+msgstr "CLOSE 名稱"
 
 #: sql_help.h:113
 msgid "cluster a table according to an index"
@@ -1714,6 +1730,9 @@ msgid ""
 "CLUSTER tablename\n"
 "CLUSTER"
 msgstr ""
+"CLUSTER 索引名稱 ON 資料表\n"
+"CLUSTER 資料表\n"
+"CLUSTER"
 
 #: sql_help.h:117
 msgid "define or change the comment of an object"
@@ -2126,7 +2145,7 @@ msgstr "刪除資料表中的資料"
 
 #: sql_help.h:226
 msgid "DELETE FROM [ ONLY ] table [ WHERE condition ]"
-msgstr ""
+msgstr "DELETE FROM [ ONLY ] 資料表 [ WHERE 條件 ]"
 
 #: sql_help.h:229
 msgid "remove an aggregate function"
@@ -2134,7 +2153,7 @@ msgstr "刪除aggregate function"
 
 #: sql_help.h:230
 msgid "DROP AGGREGATE name ( type ) [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP AGGREGATE 名稱 ( 資料型別 ) [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:233
 msgid "remove a cast"
@@ -2142,7 +2161,7 @@ msgstr "刪除一個cast"
 
 #: sql_help.h:234
 msgid "DROP CAST (sourcetype AS targettype) [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP CAST (來源資料型別 AS 目的資料型別) [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:237
 msgid "remove a conversion"
@@ -2150,7 +2169,7 @@ msgstr "刪除一個conversion"
 
 #: sql_help.h:238
 msgid "DROP CONVERSION name [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP CONVERSION 名稱 [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:241
 msgid "remove a database"
@@ -2158,7 +2177,7 @@ msgstr "刪除資料庫"
 
 #: sql_help.h:242
 msgid "DROP DATABASE name"
-msgstr ""
+msgstr "DROP DATABASE 名稱"
 
 #: sql_help.h:245
 msgid "remove a domain"
@@ -2166,7 +2185,7 @@ msgstr "刪除一個domain"
 
 #: sql_help.h:246
 msgid "DROP DOMAIN name [, ...]  [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP DOMAIN 名稱 [, ...]  [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:249
 msgid "remove a function"
@@ -2174,7 +2193,7 @@ msgstr "刪除函式"
 
 #: sql_help.h:250
 msgid "DROP FUNCTION name ( [ type [, ...] ] ) [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP FUNCTION 名稱 ( [ 資料型別 [, ...] ] ) [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:253
 msgid "remove a user group"
@@ -2182,7 +2201,7 @@ msgstr "刪除一個群組"
 
 #: sql_help.h:254
 msgid "DROP GROUP name"
-msgstr ""
+msgstr "DROP GROUP 名稱"
 
 #: sql_help.h:257
 msgid "remove an index"
@@ -2190,7 +2209,7 @@ msgstr "刪除一個索引"
 
 #: sql_help.h:258
 msgid "DROP INDEX name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP INDEX 名稱 [, ...] [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:261
 msgid "remove a procedural language"
@@ -2198,7 +2217,7 @@ msgstr "刪除一個程序語言"
 
 #: sql_help.h:262
 msgid "DROP [ PROCEDURAL ] LANGUAGE name [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP [ PROCEDURAL ] LANGUAGE 名稱 [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:265
 msgid "remove an operator class"
@@ -2206,7 +2225,7 @@ msgstr "刪除一個operator class"
 
 #: sql_help.h:266
 msgid "DROP OPERATOR CLASS name USING index_method [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP OPERATOR CLASS 名稱 USING 索引方式 [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:269
 msgid "remove an operator"
@@ -2214,7 +2233,7 @@ msgstr "刪除operator"
 
 #: sql_help.h:270
 msgid "DROP OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP OPERATOR 名稱 ( { 左側資料型別 | NONE } , { 右側資料型別 | NONE } ) [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:273
 msgid "remove a rewrite rule"
@@ -2230,7 +2249,7 @@ msgstr "刪除一個schema"
 
 #: sql_help.h:278
 msgid "DROP SCHEMA name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP SCHEMA 名稱 [, ...] [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:281
 msgid "remove a sequence"
@@ -2238,7 +2257,7 @@ msgstr "刪除sequence"
 
 #: sql_help.h:282
 msgid "DROP SEQUENCE name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP SEQUENCE 名稱 [, ...] [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:285
 msgid "remove a table"
@@ -2246,7 +2265,7 @@ msgstr "刪除資料表"
 
 #: sql_help.h:286
 msgid "DROP TABLE name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP TABLE 名稱 [, ...] [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:289
 msgid "remove a tablespace"
@@ -2254,7 +2273,7 @@ msgstr "刪除一個tablespace"
 
 #: sql_help.h:290
 msgid "DROP TABLESPACE tablespacename"
-msgstr ""
+msgstr "DROP TABLESPACE tablespace名稱"
 
 #: sql_help.h:293
 msgid "remove a trigger"
@@ -2262,7 +2281,7 @@ msgstr "刪除trigger"
 
 #: sql_help.h:294
 msgid "DROP TRIGGER name ON table [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP TRIGGER 名稱 ON 資料表 [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:297
 msgid "remove a data type"
@@ -2270,7 +2289,7 @@ msgstr "刪除資料型別"
 
 #: sql_help.h:298
 msgid "DROP TYPE name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP TYPE 名稱 [, ...] [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:301
 msgid "remove a database user account"
@@ -2278,7 +2297,7 @@ msgstr "刪除一個資料庫使用者"
 
 #: sql_help.h:302
 msgid "DROP USER name"
-msgstr ""
+msgstr "DROP USER 名稱"
 
 #: sql_help.h:305
 msgid "remove a view"
@@ -2286,7 +2305,7 @@ msgstr "刪除一個view"
 
 #: sql_help.h:306
 msgid "DROP VIEW name [, ...] [ CASCADE | RESTRICT ]"
-msgstr ""
+msgstr "DROP VIEW 名稱 [, ...] [ CASCADE | RESTRICT ]"
 
 #: sql_help.h:310
 msgid "END [ WORK | TRANSACTION ]"
@@ -2306,7 +2325,7 @@ msgstr "顯示statement的執行計畫"
 
 #: sql_help.h:318
 msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"
-msgstr ""
+msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] 敘述"
 
 #: sql_help.h:321
 msgid "retrieve rows from a query using a cursor"
@@ -2382,7 +2401,7 @@ msgstr "等待通知"
 
 #: sql_help.h:334
 msgid "LISTEN name"
-msgstr ""
+msgstr "LISTEN 名稱"
 
 #: sql_help.h:337
 msgid "load or reload a shared library file"
@@ -2390,7 +2409,7 @@ msgstr "載入或重新載入共享程式庫"
 
 #: sql_help.h:338
 msgid "LOAD 'filename'"
-msgstr ""
+msgstr "LOAD '檔名'"
 
 #: sql_help.h:341
 msgid "lock a table"
@@ -2405,6 +2424,12 @@ msgid ""
 "    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
 "    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 msgstr ""
+"LOCK [ TABLE ] 名稱 [, ...] [ IN 鎖定模式 MODE ] [ NOWAIT ]\n"
+"\n"
+"鎖定模式可以是下列其中之一：\n"
+"\n"
+"    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"
+"    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"
 
 #: sql_help.h:345
 msgid "position a cursor"
@@ -2420,7 +2445,7 @@ msgstr "產生通知"
 
 #: sql_help.h:350
 msgid "NOTIFY name"
-msgstr ""
+msgstr "NOTIFY 名稱"
 
 #: sql_help.h:353
 msgid "prepare a statement for execution"
@@ -2436,7 +2461,7 @@ msgstr "重新建立索引"
 
 #: sql_help.h:358
 msgid "REINDEX { DATABASE | TABLE | INDEX } name [ FORCE ]"
-msgstr ""
+msgstr "REINDEX { DATABASE | TABLE | INDEX } 名稱 [ FORCE ]"
 
 #: sql_help.h:361
 msgid "destroy a previously defined savepoint"
@@ -2444,7 +2469,7 @@ msgstr "刪除先前建立的savepoint"
 
 #: sql_help.h:362
 msgid "RELEASE [ SAVEPOINT ] savepoint_name"
-msgstr ""
+msgstr "RELEASE [ SAVEPOINT ] 儲存點名稱"
 
 #: sql_help.h:365
 msgid "restore the value of a run-time parameter to the default value"
@@ -2455,6 +2480,8 @@ msgid ""
 "RESET name\n"
 "RESET ALL"
 msgstr ""
+"RESET 名稱\n"
+"RESET ALL"
 
 #: sql_help.h:369
 msgid "remove access privileges"
@@ -2510,7 +2537,7 @@ msgstr "還原至一個savepoint"
 
 #: sql_help.h:378
 msgid "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] savepoint_name"
-msgstr ""
+msgstr "ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] 儲存點名稱"
 
 #: sql_help.h:381
 msgid "define a new savepoint within the current transaction"
@@ -2518,7 +2545,7 @@ msgstr "在目前的交易中建立新的savepoint"
 
 #: sql_help.h:382
 msgid "SAVEPOINT savepoint_name"
-msgstr ""
+msgstr "SAVEPOINT 儲存點名稱"
 
 #: sql_help.h:385
 msgid "retrieve rows from a table or view"
@@ -2579,7 +2606,7 @@ msgstr "設定目前交易的constraint檢查模式"
 
 #: sql_help.h:398
 msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"
-msgstr ""
+msgstr "SET CONSTRAINTS { ALL | 名稱 [, ...] } { DEFERRED | IMMEDIATE }"
 
 #: sql_help.h:401
 msgid "set the session user identifier and the current user identifier of the current session"
@@ -2616,6 +2643,8 @@ msgid ""
 "SHOW name\n"
 "SHOW ALL"
 msgstr ""
+"SHOW 名稱\n"
+"SHOW ALL"
 
 #: sql_help.h:414
 msgid ""
@@ -2633,7 +2662,7 @@ msgstr "清空資料表"
 
 #: sql_help.h:418
 msgid "TRUNCATE [ TABLE ] name"
-msgstr ""
+msgstr "TRUNCATE [ TABLE ] 名稱"
 
 #: sql_help.h:421
 msgid "stop listening for a notification"
@@ -2641,7 +2670,7 @@ msgstr "停止等待通知"
 
 #: sql_help.h:422
 msgid "UNLISTEN { name | * }"
-msgstr ""
+msgstr "UNLISTEN { 名稱 | * }"
 
 #: sql_help.h:425
 msgid "update rows of a table"
@@ -2663,4 +2692,5 @@ msgid ""
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"
 "VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column [, ...] ) ] ]"
 msgstr ""
-
+"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ 資料表 ]\n"
+"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ 資料表 [ (欄位 [, ...] ) ] ]"

src/interfaces/libpq/po/zh_TW.po

@@ -4,8 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.5\n"
-"POT-Creation-Date: 2004-09-17 01:13+0100\n"
+"POT-Creation-Date: 2004-10-19 01:10+0100\n"
-"PO-Revision-Date: 2004-09-17 13:49+0800\n"
+"PO-Revision-Date: 2004-10-19 11:08+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
 "MIME-Version: 1.0\n"
@@ -15,23 +15,23 @@ msgstr ""
 #: fe-auth.c:232
 #, c-format
 msgid "Kerberos 4 error: %s\n"
-msgstr "Kerberos 4 錯誤: %s\n"
+msgstr "Kerberos 4錯誤：%s\n"
 
 #: fe-auth.c:394
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
-msgstr "無法將 socket 設為阻擋模式: %s\n"
+msgstr "無法將socket設為阻擋模式：%s\n"
 
 #: fe-auth.c:411
 #: fe-auth.c:415
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
-msgstr "kerberos 5 認證被拒絕: %*s\n"
+msgstr "kerberos 5認證被拒絕：%*s\n"
 
 #: fe-auth.c:441
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "無法將 socket 還原為非阻擋模式: %s\n"
+msgstr "無法將socket還原為非阻擋模式：%s\n"
 
 #: fe-auth.c:508
 msgid "SCM_CRED authentication method not supported\n"
@@ -39,19 +39,19 @@ msgstr "不支援 SCM_CRED 認證方式\n"
 
 #: fe-auth.c:600
 msgid "Kerberos 4 authentication failed\n"
-msgstr "Kerberos 4 認證失敗\n"
+msgstr "Kerberos 4認證失敗\n"
 
 #: fe-auth.c:608
 msgid "Kerberos 4 authentication not supported\n"
-msgstr "不支援 Kerberos 4 認證方式\n"
+msgstr "不支援Kerberos 4認證方式\n"
 
 #: fe-auth.c:619
 msgid "Kerberos 5 authentication failed\n"
-msgstr "Kerberos 5 認證失敗\n"
+msgstr "Kerberos 5認證失敗\n"
 
 #: fe-auth.c:627
 msgid "Kerberos 5 authentication not supported\n"
-msgstr "不支援 Kerberos 5 認證方式\n"
+msgstr "不支援Kerberos 5認證方式\n"
 
 #: fe-auth.c:655
 #, c-format
@@ -61,17 +61,17 @@ msgstr "不支援 %u 認證方式\n"
 #: fe-auth.c:692
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
-msgstr "忽略非法的認證服務名稱 \"%s\"\n"
+msgstr "忽略非法的認證服務名稱\"%s\"\n"
 
 #: fe-auth.c:764
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
-msgstr "fe_getauthname: 無效的認證系統: %d\n"
+msgstr "fe_getauthname：無效的認證系統：%d\n"
 
 #: fe-connect.c:452
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
-msgstr "無效的 sslmode: \"%s\"\n"
+msgstr "無效的sslmode：\"%s\"\n"
 
 #: fe-connect.c:472
 #, c-format
@@ -81,12 +81,12 @@ msgstr "編譯時未加入SSL支援，無效的sllmode值\"%s\"\n"
 #: fe-connect.c:783
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "無法將 socket 設定為非阻擋模式: %s\n"
+msgstr "無法將socket設定為非阻擋模式：%s\n"
 
 #: fe-connect.c:810
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
-msgstr "無法將 socket 設定為 TCP 無延遲模式: %s\n"
+msgstr "無法將socket設定為TCP無延遲模式：%s\n"
 
 #: fe-connect.c:841
 #, c-format
@@ -108,17 +108,17 @@ msgid ""
 msgstr ""
 "無法連線到伺服器：%s\n"
 "\t伺服器是否在主機\"%s\"上執行並且準備接受在\n"
-"\t埠號 %s 上的 TCP/IP 連線？\n"
+"\t埠號 %s 上的TCP/IP連線？\n"
 
 #: fe-connect.c:946
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
-msgstr "無法將主機名稱\"%s\"轉換成位址: %s\n"
+msgstr "無法將主機名稱\"%s\"轉換成位址：%s\n"
 
 #: 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"
+msgstr "無法將Unix-domain socket路徑\"%s\"轉換成位址：%s\n"
 
 #: fe-connect.c:1154
 msgid "invalid connection state, probably indicative of memory corruption\n"
@@ -127,37 +127,37 @@ msgstr "無效的連線狀態，可能是記憶體中的資料被破壞\n"
 #: fe-connect.c:1197
 #, c-format
 msgid "could not create socket: %s\n"
-msgstr "無法建立 socket: %s\n"
+msgstr "無法建立socket：%s\n"
 
 #: fe-connect.c:1308
 #, c-format
 msgid "could not get socket error status: %s\n"
-msgstr "無法取得 socket 的錯誤狀態: %s\n"
+msgstr "無法取得socket的錯誤狀態：%s\n"
 
 #: fe-connect.c:1347
 #, c-format
 msgid "could not get client address from socket: %s\n"
-msgstr "無法從 socket 取得客戶端位址: %s\n"
+msgstr "無法從socket取得客戶端位址：%s\n"
 
 #: fe-connect.c:1392
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
-msgstr "無法傳送 SSL 交談封包: %s\n"
+msgstr "無法傳送SSL交談封包：%s\n"
 
 #: fe-connect.c:1414
-#: fe-connect.c:2538
+#: fe-connect.c:2544
-#: fe-connect.c:2547
+#: fe-connect.c:2553
-#: fe-connect.c:3126
+#: fe-connect.c:3132
 #: fe-lobj.c:556
-#: fe-protocol2.c:1002
+#: fe-protocol2.c:1007
-#: fe-protocol3.c:944
+#: fe-protocol3.c:958
 msgid "out of memory\n"
 msgstr "記憶體用盡\n"
 
 #: fe-connect.c:1427
 #, c-format
 msgid "could not send startup packet: %s\n"
-msgstr "無法傳送啟動封包: %s\n"
+msgstr "無法傳送啟動封包：%s\n"
 
 #: fe-connect.c:1467
 #, c-format
@@ -172,7 +172,7 @@ msgstr "伺服器不支援 SSL，但是被要求使用 SSL\n"
 #: fe-connect.c:1519
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
-msgstr "收到無效的 SSL 交談回應: %c\n"
+msgstr "收到無效的 SSL 交談回應：%c\n"
 
 #: fe-connect.c:1576
 #: fe-connect.c:1608
@@ -189,25 +189,25 @@ msgstr "啟動過程中收到來自伺服器的非預期訊息\n"
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "無效的連線狀態 %c，可能是記憶體中的資料被破壞\n"
 
-#: fe-connect.c:2586
+#: fe-connect.c:2592
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "在連線資訊字串裡的 \"%s\" 後面缺少 \"=\"\n"
 
-#: fe-connect.c:2635
+#: fe-connect.c:2641
 msgid "unterminated quoted string in connection info string\n"
 msgstr "連線資訊字串中有未結束的引號\n"
 
-#: fe-connect.c:2669
+#: fe-connect.c:2675
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "無效的連線選項 \"%s\"\n"
 
-#: fe-connect.c:2891
+#: fe-connect.c:2897
 msgid "connection pointer is NULL\n"
 msgstr "連線指標是 NULL\n"
 
-#: fe-connect.c:3148
+#: fe-connect.c:3154
 #, 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"
@@ -218,80 +218,83 @@ msgstr "注意"
 
 #: fe-exec.c:653
 #: fe-exec.c:705
+#: fe-exec.c:745
 msgid "command string is a null pointer\n"
 msgstr "命令字串是一個空指標\n"
 
-#: fe-exec.c:740
+#: fe-exec.c:738
+#: fe-exec.c:828
 msgid "statement name is a null pointer\n"
 msgstr "敘述名稱是一個空指標\n"
 
-#: fe-exec.c:771
+#: fe-exec.c:753
-msgid "no connection to the server\n"
+#: fe-exec.c:902
-msgstr "沒有連線到伺服器\n"
+#: fe-exec.c:1577
-
-#: fe-exec.c:778
-msgid "another command is already in progress\n"
-msgstr "另外一條命令正在執行中\n"
-
-#: fe-exec.c:814
-#: fe-exec.c:1466
 msgid "function requires at least protocol version 3.0\n"
 msgstr "函式需要3.0版以上的協定\n"
 
-#: fe-exec.c:1116
+#: fe-exec.c:859
+msgid "no connection to the server\n"
+msgstr "沒有連線到伺服器\n"
+
+#: fe-exec.c:866
+msgid "another command is already in progress\n"
+msgstr "另外一條命令正在執行中\n"
+
+#: fe-exec.c:1204
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
-msgstr "非預期的 asyncStatus: %d\n"
+msgstr "非預期的asyncStatus：%d\n"
 
-#: fe-exec.c:1221
+#: fe-exec.c:1331
 msgid "COPY terminated by new PQexec"
 msgstr "COPY被新的PQexec中斷"
 
-#: fe-exec.c:1229
+#: fe-exec.c:1339
 msgid "COPY IN state must be terminated first\n"
 msgstr "必須先結束 COPY IN 狀態\n"
 
-#: fe-exec.c:1249
+#: fe-exec.c:1359
 msgid "COPY OUT state must be terminated first\n"
 msgstr "必須先結束 COPY OUT 狀態\n"
 
-#: fe-exec.c:1358
+#: fe-exec.c:1469
-#: fe-exec.c:1423
+#: fe-exec.c:1534
-#: fe-exec.c:1508
+#: fe-exec.c:1619
-#: fe-protocol2.c:1148
+#: fe-protocol2.c:1153
-#: fe-protocol3.c:1101
+#: fe-protocol3.c:1115
 msgid "no COPY in progress\n"
 msgstr "沒有執行中的 COPY 命令\n"
 
-#: fe-exec.c:1700
+#: fe-exec.c:1811
 msgid "connection in wrong state\n"
 msgstr "連線處於錯誤的狀態\n"
 
-#: fe-exec.c:1731
+#: fe-exec.c:1842
 msgid "invalid ExecStatusType code"
 msgstr "無效的 ExecStatusType 代碼"
 
-#: fe-exec.c:1795
+#: fe-exec.c:1906
-#: fe-exec.c:1818
+#: fe-exec.c:1929
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "列號 %d 超出了範圍 0..%d"
 
-#: fe-exec.c:1811
+#: fe-exec.c:1922
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "行號 %d 超出了範圍 0..%d"
 
-#: fe-exec.c:2093
+#: fe-exec.c:2204
 #, c-format
 msgid "could not interpret result from server: %s"
-msgstr "無法解讀來自伺服器的結果: %s"
+msgstr "無法解讀來自伺服器的結果：%s"
 
 #: fe-lobj.c:410
 #: fe-lobj.c:495
 #, c-format
 msgid "could not open file \"%s\": %s\n"
-msgstr "無法開啟檔案 \"%s\": %s\n"
+msgstr "無法開啟檔案 \"%s\"：%s\n"
 
 #: fe-lobj.c:422
 #, c-format
@@ -341,7 +344,7 @@ msgstr "無法判斷函式 lo_lseek 的 OID\n"
 
 #: fe-lobj.c:674
 msgid "cannot determine OID of function lo_tell\n"
-msgstr "無法判斷函式 lo_tell 的 OID\n"
+msgstr "無法判斷懽式 lo_tell 的 OID\n"
 
 #: fe-lobj.c:681
 msgid "cannot determine OID of function loread\n"
@@ -354,12 +357,12 @@ msgstr "無法判斷函式 lowrite 的 OID\n"
 #: fe-misc.c:228
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt"
-msgstr "pgGetInt 不支援大小為 %lu 的整數 "
+msgstr "pgGetInt不支援大小為 %lu 的整數 "
 
 #: fe-misc.c:264
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt"
-msgstr "pgPutInt 不支援大小為 %lu 的整數"
+msgstr "pgPutInt不支援大小為 %lu 的整數"
 
 #: fe-misc.c:544
 #: fe-misc.c:748
@@ -370,7 +373,7 @@ msgstr "連接未開啟\n"
 #: fe-misc.c:701
 #, c-format
 msgid "could not receive data from server: %s\n"
-msgstr "無法從伺服器接收資料: %s\n"
+msgstr "無法從伺服器接收資料：%s\n"
 
 #: fe-misc.c:718
 #: fe-misc.c:786
@@ -386,7 +389,7 @@ msgstr ""
 #: fe-misc.c:803
 #, c-format
 msgid "could not send data to server: %s\n"
-msgstr "無法向伺服器傳送資料: %s\n"
+msgstr "無法向伺服器傳送資料：%s\n"
 
 #: fe-misc.c:923
 msgid "timeout expired\n"
@@ -399,7 +402,7 @@ msgstr "socket 未開啟\n"
 #: fe-misc.c:991
 #, c-format
 msgid "select() failed: %s\n"
-msgstr "select() 失敗: %s\n"
+msgstr "select()失敗：%s\n"
 
 #: fe-protocol2.c:91
 #, c-format
@@ -415,229 +418,229 @@ msgstr "無效的狀態 %c，可能是記憶體中的資料被破壞\n"
 #: fe-protocol3.c:183
 #, c-format
 msgid "message type 0x%02x arrived from server while idle"
-msgstr "idle時收到伺服器送來類型為0x%02x的訊息"
+msgstr "閒置時收到伺服器送來類型為0x%02x的訊息"
 
 #: fe-protocol2.c:462
 #, c-format
 msgid "unexpected character %c following empty query response (\"I\" message)"
-msgstr ""
+msgstr "空的查詢回應(\"I\"訊息)後跟隨非預期字元 %c"
 
 #: fe-protocol2.c:517
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)"
-msgstr ""
+msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)"
 
 #: fe-protocol2.c:533
 msgid "server sent binary data (\"B\" message) without prior row description (\"T\" message)"
-msgstr ""
+msgstr "伺服器傳送二元資料(\"B\"訊息)而未提供資料行描述(\"T\"訊息)"
 
 #: fe-protocol2.c:548
-#: fe-protocol3.c:335
+#: fe-protocol3.c:344
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "非預期的伺服器回應，收到的第一個字元是\"%c\"\n"
 
 #: fe-protocol2.c:760
-#: fe-protocol3.c:568
+#: fe-protocol3.c:577
 msgid "out of memory for query result\n"
 msgstr "查詢結果用盡記憶體\n"
 
-#: fe-protocol2.c:1191
+#: fe-protocol2.c:1196
-#: fe-protocol3.c:1170
+#: fe-protocol3.c:1184
 #, c-format
 msgid "%s"
 msgstr ""
 
-#: fe-protocol2.c:1203
+#: fe-protocol2.c:1208
 msgid "lost synchronization with server, resetting connection"
 msgstr "無法與伺服器協調，重置連線"
 
-#: fe-protocol2.c:1338
+#: fe-protocol2.c:1343
-#: fe-protocol2.c:1370
+#: fe-protocol2.c:1375
-#: fe-protocol3.c:1373
+#: fe-protocol3.c:1387
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "協定錯誤：id=0x%x\n"
 
-#: fe-protocol3.c:297
+#: fe-protocol3.c:306
 msgid "server sent data (\"D\" message) without prior row description (\"T\" message)\n"
-msgstr ""
+msgstr "伺服器傳送資料(\"D\"訊息)而未提供資料行描述(\"T\"訊息)\n"
 
-#: fe-protocol3.c:356
+#: fe-protocol3.c:365
 #, c-format
-msgid "Message contents do not agree with length in message type \"%c\"\n"
+msgid "message contents do not agree with length in message type \"%c\"\n"
-msgstr "訊息類型\"%c\"中的長度和訊息中的內容不符\n"
+msgstr "訊息類型\"%c\"的長度與訊息內容不符\n"
 
-#: fe-protocol3.c:377
+#: fe-protocol3.c:386
 #, c-format
 msgid "lost synchronization with server: got message type \"%c\", length %d\n"
 msgstr "無法與伺服器協調：收到訊息類型\"%c\"，長度 %d\n"
 
-#: fe-protocol3.c:513
+#: fe-protocol3.c:522
-msgid "unexpected field count in D message\n"
+msgid "unexpected field count in \"D\" message\n"
-msgstr "D訊息中有預期外的欄位數\n"
+msgstr "非預期的\"D\"訊息欄位數\n"
 
 #  translator: %s represents a digit string
-#: fe-protocol3.c:642
+#  translator: %s represents a digit string
-#: fe-protocol3.c:650
+#: fe-protocol3.c:651
+#: fe-protocol3.c:659
 #, c-format
 msgid " at character %s"
 msgstr "於字元 %s"
 
-#: fe-protocol3.c:659
+#: fe-protocol3.c:668
 #, c-format
 msgid "DETAIL:  %s\n"
 msgstr ""
 
-#: fe-protocol3.c:662
+#: fe-protocol3.c:671
 #, c-format
 msgid "HINT:  %s\n"
 msgstr ""
 
-#: fe-protocol3.c:665
+#: fe-protocol3.c:674
 #, c-format
 msgid "QUERY:  %s\n"
 msgstr ""
 
-#: fe-protocol3.c:668
+#: fe-protocol3.c:677
 #, c-format
 msgid "CONTEXT:  %s\n"
 msgstr ""
 
-#: fe-protocol3.c:680
+#: fe-protocol3.c:689
 msgid "LOCATION:  "
 msgstr ""
 
-#: fe-protocol3.c:682
+#: fe-protocol3.c:691
 #, c-format
 msgid "%s, "
 msgstr ""
 
-#: fe-protocol3.c:684
+#: fe-protocol3.c:693
 #, c-format
 msgid "%s:%s"
 msgstr ""
 
-#: fe-protocol3.c:986
+#: fe-protocol3.c:1000
 msgid "PQgetline: not doing text COPY OUT\n"
 msgstr ""
 
-#: fe-secure.c:262
+#: fe-secure.c:264
 #, c-format
 msgid "could not establish SSL connection: %s\n"
-msgstr "無法建立 SSL 連線: %s\n"
+msgstr "無法建立 SSL 連線?%s\n"
-
-#: 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:330
-#: fe-secure.c:411
+#: fe-secure.c:415
-#: fe-secure.c:1040
+#: fe-secure.c:1038
-msgid "SSL SYSCALL error: EOF detected\n"
+#, c-format
-msgstr "SSL SYSCALL錯誤: 發現EOF\n"
+msgid "SSL SYSCALL error: %s\n"
+msgstr "SSL SYSCALL錯誤：%s\n"
 
-#: fe-secure.c:342
+#: fe-secure.c:335
-#: fe-secure.c:422
+#: fe-secure.c:420
-#: fe-secure.c:1049
+#: fe-secure.c:1042
+msgid "SSL SYSCALL error: EOF detected\n"
+msgstr "SSL SYSCALL錯誤：發現EOF\n"
+
+#: fe-secure.c:347
+#: fe-secure.c:431
+#: fe-secure.c:1051
 #, c-format
 msgid "SSL error: %s\n"
-msgstr "SSL 錯誤: %s\n"
+msgstr "SSL 錯誤：%s\n"
 
-#: fe-secure.c:352
+#: fe-secure.c:357
-#: fe-secure.c:432
+#: fe-secure.c:441
-#: fe-secure.c:1057
+#: fe-secure.c:1059
-msgid "unrecognized SSL error code\n"
+#, c-format
-msgstr "無法識別的SSL錯誤碼\n"
+msgid "unrecognized SSL error code: %d\n"
+msgstr "無法識別的SSL錯誤碼：%d\n"
 
-#: fe-secure.c:494
+#: fe-secure.c:504
 #, c-format
 msgid "error querying socket: %s\n"
-msgstr "詢問 socket 發生錯誤: %s\n"
+msgstr "詢問socket發生錯誤：%s\n"
 
-#: fe-secure.c:522
+#: fe-secure.c:532
 #, c-format
-msgid "could not get information about host (%s): %s\n"
+msgid "could not get information about host \"%s\": %s\n"
-msgstr "無法取得關於主機(%s)的資訊: %s\n"
+msgstr "無法取得關於主機\"%s\"的資訊：%s\n"
 
-#: fe-secure.c:541
+#: fe-secure.c:551
 msgid "unsupported protocol\n"
 msgstr "不被支援的協定\n"
 
-#: fe-secure.c:563
+#: fe-secure.c:573
 #, 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:570
+#: fe-secure.c:580
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "伺服器的common name \"%s\" 無法解析成位址\n"
 
-#: fe-secure.c:753
+#: fe-secure.c:763
 msgid "could not get user information\n"
 msgstr "無法取得使用者的資訊\n"
 
-#: fe-secure.c:765
+#: fe-secure.c:775
 #, c-format
-msgid "could not open certificate (%s): %s\n"
+msgid "could not open certificate file \"%s\": %s\n"
-msgstr "無法開啟憑證(%s): %s\n"
+msgstr "無法開啟憑證檔\"%s\"：%s\n"
 
-#: fe-secure.c:774
+#: fe-secure.c:784
 #, c-format
-msgid "could not read certificate (%s): %s\n"
+msgid "could not read certificate file \"%s\": %s\n"
-msgstr "無法讀取憑證(%s): %s\n"
+msgstr "無法讀取憑證檔\"%s\"：%s\n"
 
-#: fe-secure.c:788
+#: fe-secure.c:798
 #, c-format
-msgid "certificate present, but not private key (%s)\n"
+msgid "certificate present, but not private key file \"%s\"\n"
-msgstr "只有憑證，沒有私鑰(%s)\n"
+msgstr "發現憑證，但是沒有私鑰檔\"%s\"\n"
 
-#: fe-secure.c:797
+#: fe-secure.c:807
 #, c-format
-msgid "private key (%s) has wrong permissions\n"
+msgid "private key file \"%s\" has wrong permissions\n"
-msgstr "私鑰(%s)權限錯誤\n"
+msgstr "私鑰檔\"%s\"權限錯誤\n"
 
-#: fe-secure.c:804
+#: fe-secure.c:815
 #, c-format
-msgid "could not open private key file (%s): %s\n"
+msgid "could not open private key file \"%s\": %s\n"
-msgstr "無法開啟私鑰檔案(%s): %s\n"
+msgstr "無法開啟私鑰檔\"%s\"：%s\n"
 
-#: fe-secure.c:813
+#: fe-secure.c:824
 #, c-format
-msgid "private key (%s) changed during execution\n"
+msgid "private key file \"%s\" changed during execution\n"
-msgstr "私鑰(%s)在執行過程被改變\n"
+msgstr "私鑰檔\"%s\"在執行過程中被改變\n"
 
-#: fe-secure.c:822
+#: fe-secure.c:833
 #, c-format
-msgid "could not read private key (%s): %s\n"
+msgid "could not read private key file \"%s\": %s\n"
-msgstr "無法讀取私鑰(%s): %s\n"
+msgstr "無法讀取私鑰檔\"%s\"：%s\n"
 
-#: fe-secure.c:837
+#: fe-secure.c:848
 #, c-format
-msgid "certificate/private key mismatch (%s): %s\n"
+msgid "certificate does not match private key file \"%s\": %s\n"
-msgstr "憑證/私鑰不符(%s): %s\n"
+msgstr "憑證與私?檔\"%s\"不符：%s\n"
 
-#: fe-secure.c:921
+#: fe-secure.c:932
 #, c-format
 msgid "could not create SSL context: %s\n"
-msgstr "無法建立 SSL context: %s\n"
+msgstr "無法建立SSL context：%s\n"
 
-#: fe-secure.c:966
+#: fe-secure.c:977
-#: fe-secure.c:976
 #, c-format
-msgid "could not read root certificate list (%s): %s\n"
+msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "無法讀取根憑證清單(%s): %s\n"
+msgstr "無法讀取根憑證檔\"%s\"：%s\n"
 
-#: fe-secure.c:1076
+#: fe-secure.c:1079
 #, c-format
 msgid "certificate could not be validated: %s\n"
-msgstr "無法驗證憑證: %s\n"
+msgstr "無法驗證憑證：%s\n"
 
-#: fe-secure.c:1090
+#: fe-secure.c:1093
 #, c-format
 msgid "certificate could not be obtained: %s\n"
-msgstr "無法取得憑證: %s\n"
+msgstr "無法取得憑證：%s\n"
-