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"