NLS updates, most notably fixed zh_TW translations

src/backend/po/nls.mk

 CATALOG_NAME	:= postgres
-AVAIL_LANGUAGES	:= de ru
+AVAIL_LANGUAGES	:= de ru zh_CN zh_TW
 GETTEXT_FILES	:= + gettext-files
 GETTEXT_TRIGGERS:= elog:2 postmaster_error

src/bin/pg_dump/nls.mk

-# $Header: /cvsroot/pgsql/src/bin/pg_dump/nls.mk,v 1.3 2001/09/16 23:10:16 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/nls.mk,v 1.4 2001/11/29 18:59:28 petere Exp $
 CATALOG_NAME	:= pg_dump
-AVAIL_LANGUAGES	:= de ru
+AVAIL_LANGUAGES	:= de ru zh_CN zh_TW
 GETTEXT_FILES	:= pg_dump.c common.c pg_backup_archiver.c pg_backup_custom.c \
                    pg_backup_db.c pg_backup_files.c pg_backup_null.c \
                    pg_backup_tar.c pg_restore.c

src/bin/pg_dump/zh_TW.po

@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-10-01 10:02+0800\n"
+"POT-Creation-Date: 2001-11-29 01:07+1100\n"
 "PO-Revision-Date: 2001-10-24 01:00:00+0800\n"
 "Last-Translator: Zhenbang Wei <forth@zbwei.net>\n"
 "Language-Team: Zhenbang Wei <forth@zbwei.net>\n"
@@ -24,7 +24,7 @@ msgstr ""
 
 #: pg_dump.c:137
 msgid "Usage:"
-msgstr "用法:"
+msgstr "使用法:"
 
 #: pg_dump.c:138
 #, c-format
@@ -42,7 +42,7 @@ msgstr "
 #: pg_dump.c:143
 msgid ""
 "  -a, --data-only          dump only the data, not the schema\n"
-"  -b, --blobs              include BLOB data in dump\n"
+"  -b, --blobs              include large objects in dump\n"
 "  -c, --clean              clean (drop) schema prior to create\n"
 "  -C, --create             include commands to create database in dump\n"
 "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
@@ -84,8 +84,8 @@ msgstr ""
 "  -F, --format {c|t|p}     輸出檔案格式(自定、tar、純文字)\n"
 "  -h, --host=主機名稱      資料庫伺服器主機名稱\n"
 "  -i, --ignore-version     即使伺服器版本和 pg_dump 版本不符合也繼續執行\n"
-"  -n, --no-quotes          抑制標示符號周圍的絕大部分引號\n"
-"  -N, --quotes             允許\標示符號周圍的絕大部分引號\n"
+"  -n, --no-quotes          抑制在標示符號周圍使用引號\n"
+"  -N, --quotes             可以在標示符號周圍使用引號\n"
 "  -o, --oids               在輸出中包括 oid\n"
 "  -O, --no-owner           在純文字格式中不要包括 \\connect 指令\n"
 "  -p, --port=埠號          資料庫伺服器埠號\n"
@@ -105,7 +105,7 @@ msgstr ""
 #: pg_dump.c:177
 msgid ""
 "  -a                       dump only the data, not the schema\n"
-"  -b                       include BLOB data in dump\n"
+"  -b                       include large objects in dump\n"
 "  -c                       clean (drop) schema prior to create\n"
 "  -C                       include commands to create database in dump\n"
 "  -d                       dump data as INSERT, rather than COPY, commands\n"
@@ -147,8 +147,8 @@ msgstr ""
 "  -F {c|t|p}               輸出檔案格式(自定、tar、純文字)\n"
 "  -h 主機名稱              資料庫伺服器主機名稱\n"
 "  -i                       即使伺服器版本和 pg_dump 版本不符合也繼續執行\n"
-"  -n                       抑制在大多數標示符號周圍的引號\n"
-"  -N                       允許\在大多數標示符號周圍的引號\n"
+"  -n                       抑制在標示符號周圍使用引號\n"
+"  -N                       可以在標示符號周圍使用引號\n"
 "  -o                       在輸出中包括 oid\n"
 "  -O                       在純文字格式中不輸出 \\connect 指令\n"
 "  -p 埠號                  資料庫伺服器埠號\n"
@@ -176,21 +176,21 @@ msgstr ""
 "\n"
 "向 <pgsql-bugs@postgresql.org> 報告臭蟲."
 
-#: pg_dump.c:874 pg_restore.c:258
+#: pg_dump.c:874 pg_restore.c:263
 msgid "User name: "
 msgstr "使用者名稱: "
 
-#: pg_dump.c:907 pg_restore.c:283
+#: pg_dump.c:906 pg_restore.c:288
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: 無效的 -X 選項 -- %s\n"
 
-#: pg_dump.c:909 pg_dump.c:931 pg_restore.c:285 pg_restore.c:297
+#: pg_dump.c:908 pg_dump.c:930 pg_restore.c:290 pg_restore.c:302
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "輸入 '%s --help' 以顯示更多訊息。\n"
 
-#: pg_dump.c:920
+#: pg_dump.c:919
 #, c-format
 msgid ""
 "%s was compiled without support for long options.\n"
@@ -199,7 +199,7 @@ msgstr ""
 "%s 編譯時未加入長選項支援。\n"
 "用 --help 顯示選項的說明。\n"
 
-#: pg_dump.c:939
+#: pg_dump.c:938
 #, c-format
 msgid ""
 "%s: too many command line options (first is '%s')\n"
@@ -208,7 +208,7 @@ msgstr ""
 "%s: 指令參數過多 (第一個是 '%s')\n"
 "輸入 '%s --help' 顯示更多訊息。\n"
 
-#: pg_backup_archiver.c:94
+#: pg_backup_archiver.c:106
 msgid "archiver"
 msgstr "歸檔"
 
@@ -220,7 +220,7 @@ msgstr "
 msgid "archiver (db)"
 msgstr "歸檔 (db)"
 
-#: pg_backup_db.c:299 pg_backup_db.c:332 pg_backup_db.c:393 pg_backup_db.c:422
+#: pg_backup_db.c:334 pg_backup_db.c:367 pg_backup_db.c:428 pg_backup_db.c:457
 msgid "Password: "
 msgstr "密碼: "
 
@@ -228,11 +228,11 @@ msgstr "
 msgid "file archiver"
 msgstr "檔案歸檔"
 
-#: pg_backup_tar.c:104
+#: pg_backup_tar.c:103
 msgid "tar archiver"
 msgstr "tar 歸檔"
 
-#: pg_restore.c:378
+#: pg_restore.c:383
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -249,21 +249,21 @@ msgstr ""
 "\n"
 "選項:\n"
 
-#: pg_restore.c:384
+#: pg_restore.c:389
 msgid ""
 "  -a, --data-only          restore only the data, no schema\n"
 "  -c, --clean              clean (drop) schema prior to create\n"
 "  -C, --create             issue commands to create the database\n"
-"  -d, --dbname=NAME        specify database name\n"
-"  -f, --file=FILENAME      TOC output file name (see -l)\n"
+"  -d, --dbname=NAME        output database name\n"
+"  -f, --file=FILENAME      output file name\n"
 "  -F, --format={c|t}       specify backup file format\n"
 "  -h, --host=HOSTNAME      server host name\n"
 "  -i, --index=NAME         restore named index\n"
-"  -l, --list               dump summarized TOC for of the archive\n"
+"  -l, --list               print summarized TOC of the archive\n"
 "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
 "                           output from this file\n"
 "  -N, --orig-order         restore in original dump order\n"
-"  -o, --oid-order          restore in oid order\n"
+"  -o, --oid-order          restore in OID order\n"
 "  -O, --no-owner           do not reconnect to database to match\n"
 "                           object owner\n"
 "  -p, --port=PORT          server port number\n"
@@ -314,22 +314,22 @@ msgstr ""
 "                           儘可能用 SET SESSION AUTHORIZATION 指令而不是\n"
 "                           重新連接\n"
 
-#: pg_restore.c:420
+#: pg_restore.c:425
 msgid ""
 "  -a                       restore only the data, no schema\n"
 "  -c                       clean (drop) schema prior to create\n"
 "  -C                       issue commands to create the database\n"
-"  -d NAME                  specify database name\n"
-"  -f FILENAME              TOC output file name (see -l)\n"
+"  -d NAME                  output database name\n"
+"  -f FILENAME              output file name\n"
 "  -F {c|t}                 specify backup file format\n"
 "  -h HOSTNAME              server host name\n"
 "  -i NAME                  restore named index\n"
-"  -l                       dump summarized TOC for this file\n"
+"  -l                       print summarized TOC of the archive\n"
 "  -L FILENAME              use specified table of contents for ordering\n"
 "                           output from this file\n"
 "  -N                       restore in original dump order\n"
-"  -o                       restore in oid order\n"
-"  -O                       do not output reconnect to database to match\n"
+"  -o                       restore in OID order\n"
+"  -O                       do not reconnect to database to match\n"
 "                           object owner\n"
 "  -p PORT                  server port number\n"
 "  -P NAME                  restore named function\n"
@@ -376,14 +376,15 @@ msgstr ""
 "  -W                       強制密碼詢問 (應該自動詢問)\n"
 "  -x                       忽略存取權限 (grant/reovke) 的還原\n"
 "  -X use-set-session-authorization\n"
-"                           儘可能使用 SET SESSION AUTHORIZATION 指令, 而不是\n"
+"                           儘可能使用 SET SESSION AUTHORIZATION "
+"指令，而不是\n"
 "                           重新連接\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:458
 msgid "If no input file name is supplied, then standard input is used.\n"
 msgstr "如果沒有提供檔案名稱則使用標準輸入。\n"
 
-#: pg_restore.c:454
+#: pg_restore.c:459
 msgid "Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr "向 <pgsql-bugs@postgresql.org> 回報錯誤。"
 

src/bin/psql/nls.mk

-# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.6 2001/09/06 11:10:46 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/psql/nls.mk,v 1.7 2001/11/29 18:59:28 petere Exp $
 CATALOG_NAME	:= psql
-AVAIL_LANGUAGES	:= cs de fr ru sv
+AVAIL_LANGUAGES	:= cs de fr ru sv zh_CN zh_TW
 GETTEXT_FILES	:= command.c common.c copy.c help.c input.c large_obj.c \
                    mainloop.c print.c startup.c describe.c
 GETTEXT_TRIGGERS:= _ psql_error simple_prompt

src/interfaces/libpq/de.po

 # German message translation file for libpq
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/de.po,v 1.3 2001/11/02 19:16:47 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/de.po,v 1.4 2001/11/29 18:59:28 petere Exp $
 #
 # Use these quotes: %s
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-10-31 23:25+0100\n"
+"POT-Creation-Date: 2001-11-29 17:47+0100\n"
 "PO-Revision-Date: 2001-10-31 23:26+0100\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
@@ -34,7 +34,9 @@ msgstr "Authentifizierung mit Kerberos 5 abgelehnt: %*s\n"
 #: fe-auth.c:427
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
-msgstr "konnte den nicht blockierenden Modus auf dem Socket nicht wieder herstellen: %s\n"
+msgstr ""
+"konnte den nicht blockierenden Modus auf dem Socket nicht wieder herstellen: "
+"%s\n"
 
 #: fe-auth.c:490
 msgid "SCM_CRED authentication method not supported\n"
@@ -71,21 +73,21 @@ msgstr "ung
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ungltiges Authentifizierungssystem: %d\n"
 
-#: fe-connect.c:480
+#: fe-connect.c:483
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr "konnte den zu verwendenden PostgreSQL-Benutzernamen nicht bestimmen\n"
 
-#: fe-connect.c:700
+#: fe-connect.c:703
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "konnte Socket nicht auf nicht-blockierenden Modus umstellen: %s\n"
 
-#: fe-connect.c:724
+#: fe-connect.c:727
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "konnte Socket nicht auf TCP No Delay-Modus umstellen: %s\n"
 
-#: fe-connect.c:744
+#: fe-connect.c:747
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -96,7 +98,7 @@ msgstr ""
 "\tLuft der Server lokal und akzeptiert er Verbindungen\n"
 "\tauf dem Unix-Domain-Socket %s?\n"
 
-#: fe-connect.c:753
+#: fe-connect.c:756
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -107,121 +109,121 @@ msgstr ""
 "\tLuft der Server auf dem Host %s und akzeptiert er\n"
 "\tTCP/IP-Verbindungen auf Port %s?\n"
 
-#: fe-connect.c:817
+#: fe-connect.c:820
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "ungltige Hostadresse: %s\n"
 
-#: fe-connect.c:836
+#: fe-connect.c:839
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "unbekannter Hostname: %s\n"
 
-#: fe-connect.c:878
+#: fe-connect.c:881
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "konnte Socket nicht erzeugen: %s\n"
 
-#: fe-connect.c:941
+#: fe-connect.c:944
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "konnte Paket zur SSL-Verhandlung nicht senden: %s\n"
 
-#: fe-connect.c:949
+#: fe-connect.c:952
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "konnte Serverantwort auf SSL-Verhandlungspaket nicht empfangen: %s\n"
 
-#: fe-connect.c:963
+#: fe-connect.c:966
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "konnte SSL-Kontext nicht erzeugen: %s\n"
 
-#: fe-connect.c:973
+#: fe-connect.c:976
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "konnte SSL-Verbindung nicht aufbauen: %s\n"
 
-#: fe-connect.c:991
+#: fe-connect.c:999
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ungltige Antwort auf SSL-Verhandlungspaket empfangen: %c\n"
 
-#: fe-connect.c:1000
+#: fe-connect.c:1008
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "Server untersttzt kein SSL, aber SSL wurde verlangt\n"
 
-#: fe-connect.c:1166
+#: fe-connect.c:1174
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ungltiger Verbindungszustand, mglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1197
+#: fe-connect.c:1205
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "konnte Socket-Fehlerstatus nicht ermitteln: %s\n"
 
-#: fe-connect.c:1217
+#: fe-connect.c:1225
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "konnte Client-Adresse vom Socket nicht ermitteln: %s\n"
 
-#: fe-connect.c:1256
+#: fe-connect.c:1264
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "konnte Startpaket nicht senden: %s\n"
 
-#: fe-connect.c:1312
+#: fe-connect.c:1320
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr ""
 "Authentifizierungsanfrage wurde vom Server erwartet, aber %c wurde "
 "empfangen\n"
 
-#: fe-connect.c:1424
+#: fe-connect.c:1432
 msgid "unexpected message from server during startup\n"
 msgstr "unerwartete Nachricht vom Server beim Start\n"
 
-#: fe-connect.c:1483
+#: fe-connect.c:1491
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ungltiger Verbindungszustand %c, mglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1582
+#: fe-connect.c:1590
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "ungltiger setenv-Zustand %c, mglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1622
+#: fe-connect.c:1630
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "ungltiger Kodierungsname in PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1747
+#: fe-connect.c:1755
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "ungltiger Zustand %c, mglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:2366 fe-connect.c:2375 fe-exec.c:1184 fe-lobj.c:536
+#: fe-connect.c:2374 fe-connect.c:2383 fe-exec.c:1184 fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "Speicher aufgebraucht\n"
 
-#: fe-connect.c:2414
+#: fe-connect.c:2422
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "fehlendes = nach %s in der Zeichenkette der Verbindungsdaten\n"
 
-#: fe-connect.c:2463
+#: fe-connect.c:2471
 msgid "unterminated quoted string in connection info string\n"
 msgstr ""
 "fehlendes schlieendes Anfhrungszeichen (\") in der Zeichenkette der "
 "Verbindugsdaten\n"
 
-#: fe-connect.c:2497
+#: fe-connect.c:2505
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "ungltige Verbindungsoption %s\n"
 
-#: fe-connect.c:2682
+#: fe-connect.c:2720
 msgid "connection pointer is NULL\n"
 msgstr "Verbindung ist ein NULL-Zeiger\n"
 
@@ -382,38 +384,38 @@ msgstr "kann OID der Funktion loread nicht ermitteln\n"
 msgid "cannot determine OID of function lowrite\n"
 msgstr "kann OID der Funktion lowrite nicht ermitteln\n"
 
-#: fe-misc.c:130
+#: fe-misc.c:132
 #, c-format
 msgid "could not flush enough data (space available: %d, space needed %d)\n"
 msgstr ""
 "konnte nicht genug Daten flushen (verfgbarer Platz: %d, bentigter Platz: %"
 "d)\n"
 
-#: fe-misc.c:278
+#: fe-misc.c:281
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt\n"
 msgstr "Integer der Gre %lu wird nicht von pqGetInt untersttzt\n"
 
-#: fe-misc.c:316
+#: fe-misc.c:319
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "Integer der Gre %lu wird nicht von pqPutInt untersttzt\n"
 
-#: fe-misc.c:354 fe-misc.c:388 fe-misc.c:776
+#: fe-misc.c:357 fe-misc.c:391 fe-misc.c:779
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() fehlgeschlagen: %s\n"
 
-#: fe-misc.c:415 fe-misc.c:615 fe-misc.c:755
+#: fe-misc.c:418 fe-misc.c:618 fe-misc.c:758
 msgid "connection not open\n"
 msgstr "Verbindung nicht offen\n"
 
-#: fe-misc.c:486 fe-misc.c:572
+#: fe-misc.c:489 fe-misc.c:575
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "konnte keine Daten vom Server empfangen: %s\n"
 
-#: fe-misc.c:589 fe-misc.c:673
+#: fe-misc.c:592 fe-misc.c:676
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -423,7 +425,7 @@ msgstr ""
 "\tDas heit wahrscheinlich, da der Server abnormal beendete\n"
 "\tbevor oder whrend die Anweisung bearbeitet wurde.\n"
 
-#: fe-misc.c:689
+#: fe-misc.c:692
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "konnte keine Daten an den Server senden: %s\n"

src/interfaces/libpq/nls.mk

-# $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.2 2001/08/07 11:41:17 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/nls.mk,v 1.3 2001/11/29 18:59:28 petere Exp $
 CATALOG_NAME	:= libpq
-AVAIL_LANGUAGES	:= de ru
+AVAIL_LANGUAGES	:= de ru zh_CN zh_TW
 GETTEXT_FILES	:= fe-auth.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c
 GETTEXT_TRIGGERS:= libpq_gettext

src/interfaces/libpq/ru.po

@@ -5,13 +5,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-07-15 15:49+0200\n"
+"POT-Creation-Date: 2001-11-29 17:47+0100\n"
 "PO-Revision-Date: 2001-11-04 21:57-0500\n"
 "Last-Translator: Serguei A. Mokhov <stgunya@yahoo.com>\n"
 "Language-Team: Serguei A. Mokhov <stgunya@yahoo.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
+
 #: fe-auth.c:228
 #, c-format
 msgid "Kerberos 4 error: %s\n"
@@ -67,21 +68,22 @@ msgstr "
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname:   : %d\n"
 
-#: fe-connect.c:480
+#: fe-connect.c:483
 msgid "could not determine the PostgreSQL user name to use\n"
-msgstr "      PostgreSQL \n"
+msgstr ""
+"      PostgreSQL \n"
 
-#: fe-connect.c:700
+#: fe-connect.c:703
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "       : %s\n"
 
-#: fe-connect.c:724
+#: fe-connect.c:727
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "      TCP : %s\n"
 
-#: fe-connect.c:744
+#: fe-connect.c:747
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -92,7 +94,7 @@ msgstr ""
 "\t     \n"
 "\t   Unix'  \"%s\"?\n"
 
-#: fe-connect.c:753
+#: fe-connect.c:756
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -103,117 +105,125 @@ msgstr ""
 "\t     %s  \n"
 "\t  TCP/IP    %s?\n"
 
-#: fe-connect.c:817
+#: fe-connect.c:820
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "  : %s\n"
 
-#: fe-connect.c:836
+#: fe-connect.c:839
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "  : %s\n"
 
-#: fe-connect.c:878
+#: fe-connect.c:881
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "   : %s\n"
 
-#: fe-connect.c:941
+#: fe-connect.c:944
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "     SSL: %s\n"
 
-#: fe-connect.c:949
+#: fe-connect.c:952
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "        SSL: %s\n"
 
-#: fe-connect.c:963
+#: fe-connect.c:966
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "    SSL: %s\n"
 
-#: fe-connect.c:973
+#: fe-connect.c:976
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "      SSL: %s\n"
 
-#: fe-connect.c:991
+#: fe-connect.c:999
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "       SSL: %c\n"
 
-#: fe-connect.c:1000
+#: fe-connect.c:1008
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "   SSL,   SSL  \n"
 
-#: fe-connect.c:1166
+#: fe-connect.c:1174
 msgid "invalid connection state, probably indicative of memory corruption\n"
-msgstr "  ,      \n"
+msgstr ""
+"  ,     "
+" \n"
 
-#: fe-connect.c:1197
+#: fe-connect.c:1205
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "     : %s\n"
 
-#: fe-connect.c:1217
+#: fe-connect.c:1225
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "      : %s\n"
 
-#: fe-connect.c:1256
+#: fe-connect.c:1264
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "    : %s\n"
 
-#: fe-connect.c:1312
+#: fe-connect.c:1320
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "    ,   : %c\n"
 
-#: fe-connect.c:1424
+#: fe-connect.c:1432
 msgid "unexpected message from server during startup\n"
 msgstr "     \n"
 
-#: fe-connect.c:1483
+#: fe-connect.c:1491
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
-msgstr "   %c,      \n"
+msgstr ""
+"   %c,     "
+" \n"
 
-#: fe-connect.c:1582
+#: fe-connect.c:1590
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
-msgstr "  setenv %c,     \n"
+msgstr ""
+"  setenv %c,     "
+"\n"
 
-#: fe-connect.c:1622
+#: fe-connect.c:1630
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "    PGCLIENTENCODING: %s\n"
 
-#: fe-connect.c:1747
+#: fe-connect.c:1755
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
-msgstr "  %c,     \n"
+msgstr ""
+"  %c,     "
+"\n"
 
-#: fe-connect.c:2366 fe-connect.c:2375 fe-exec.c:1184 fe-lobj.c:536
+#: fe-connect.c:2374 fe-connect.c:2383 fe-exec.c:1184 fe-lobj.c:536
 msgid "out of memory\n"
 msgstr " \n"
 
-#: fe-connect.c:2414
+#: fe-connect.c:2422
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr " \"=\"  \"%s\"   \n"
 
-#: fe-connect.c:2463
+#: fe-connect.c:2471
 msgid "unterminated quoted string in connection info string\n"
 msgstr "  (  )   \n"
 
-#: fe-connect.c:2497
+#: fe-connect.c:2505
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "   \"%s\"\n"
 
-#: fe-connect.c:2682
+#: fe-connect.c:2720
 msgid "connection pointer is NULL\n"
 msgstr "   NULL'\n"
 
@@ -239,7 +249,8 @@ msgstr "
 msgid ""
 "unexpected character %c following empty query response (\"I\" message)\n"
 msgstr ""
-"  %c       ( \"I\")\n"
+"  %c       ( \"I"
+"\")\n"
 
 #: fe-exec.c:945
 msgid ""
@@ -254,8 +265,8 @@ msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)\n"
 msgstr ""
-"    ( \"B\")     "
-"( \"T\")\n"
+"    ( \"B\")   "
+"  ( \"T\")\n"
 
 #: fe-exec.c:978
 #, c-format
@@ -338,7 +349,9 @@ msgstr "
 
 #: fe-lobj.c:564
 msgid "query to initialize large object functions did not return data\n"
-msgstr "       (LOs)   \n"
+msgstr ""
+"       (LOs)   "
+"\n"
 
 #: fe-lobj.c:602
 msgid "cannot determine OID of function lo_open\n"
@@ -372,36 +385,38 @@ msgstr "
 msgid "cannot determine OID of function lowrite\n"
 msgstr "    OID  lowrite\n"
 
-#: fe-misc.c:130
+#: fe-misc.c:132
 #, c-format
 msgid "could not flush enough data (space available: %d, space needed %d)\n"
-msgstr "      ( : %d,  : %d)\n"
+msgstr ""
+"      ( : %d, "
+" : %d)\n"
 
-#: fe-misc.c:278
+#: fe-misc.c:281
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt\n"
 msgstr " integer  %lu     pqGetInt\n"
 
-#: fe-misc.c:316
+#: fe-misc.c:319
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr " integer  %lu     pqPutInt\n"
 
-#: fe-misc.c:354 fe-misc.c:388 fe-misc.c:776
+#: fe-misc.c:357 fe-misc.c:391 fe-misc.c:779
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select()  : %s\n"
 
-#: fe-misc.c:415 fe-misc.c:615 fe-misc.c:755
+#: fe-misc.c:418 fe-misc.c:618 fe-misc.c:758
 msgid "connection not open\n"
 msgstr "  \n"
 
-#: fe-misc.c:486 fe-misc.c:572
+#: fe-misc.c:489 fe-misc.c:575
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "    %s  \n"
 
-#: fe-misc.c:589 fe-misc.c:673
+#: fe-misc.c:592 fe-misc.c:676
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -411,7 +426,7 @@ msgstr ""
 "\t         \n"
 "\t     .\n"
 
-#: fe-misc.c:683
+#: fe-misc.c:692
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "    : %s\n"

src/interfaces/libpq/zh_CN.po

 # simplified Chinese translation file for libpq
 # Weiping He <laser@zhengmai.com.cn>, 2001
 #
-# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/zh_CN.po,v 1.2 2001/11/27 17:51:54 momjian Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/libpq/Attic/zh_CN.po,v 1.3 2001/11/29 18:59:28 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-11-27 20:20+0800\n"
+"POT-Creation-Date: 2001-11-29 17:47+0100\n"
 "PO-Revision-Date: 2001-11-27 20:22:06+0800\n"
 "Last-Translator: Weiping He <laser@zhengmai.com.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -369,36 +369,36 @@ msgstr "
 msgid "cannot determine OID of function lowrite\n"
 msgstr "无法判断函数 lowrite 的 OID\n"
 
-#: fe-misc.c:130
+#: fe-misc.c:132
 #, c-format
 msgid "could not flush enough data (space available: %d, space needed %d)\n"
 msgstr "无法冲刷足够的数据 (可用空间: %d, 需要空间 %d)\n"
 
-#: fe-misc.c:279
+#: fe-misc.c:281
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt\n"
 msgstr "pgGetInt 不支持大小为 %lu 的整数\n"
 
-#: fe-misc.c:317
+#: fe-misc.c:319
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "pgPutInt 不支持大小为 %lu 的整数\n"
 
-#: fe-misc.c:355 fe-misc.c:389 fe-misc.c:777
+#: fe-misc.c:357 fe-misc.c:391 fe-misc.c:779
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() 失败: %s\n"
 
-#: fe-misc.c:416 fe-misc.c:616 fe-misc.c:756
+#: fe-misc.c:418 fe-misc.c:618 fe-misc.c:758
 msgid "connection not open\n"
 msgstr "联接未打开\n"
 
-#: fe-misc.c:487 fe-misc.c:573
+#: fe-misc.c:489 fe-misc.c:575
 #, c-format
 msgid "could not receive data from server: %s\n"
 msgstr "无法从服务器接收数据: %s\n"
 
-#: fe-misc.c:590 fe-misc.c:674
+#: fe-misc.c:592 fe-misc.c:676
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -408,7 +408,7 @@ msgstr ""
 "\t这种现象通常意味着服务器在处理请求之前\n"
 "或者正在处理请求的时候意外中止\n"
 
-#: fe-misc.c:690
+#: fe-misc.c:692
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "无法向服务器发送数据: %s\n"

src/nls-global.mk

-# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.3 2001/07/15 11:43:55 petere Exp $
+# $Header: /cvsroot/pgsql/src/nls-global.mk,v 1.4 2001/11/29 18:59:28 petere Exp $
 
 # Common rules for Native Language Support (NLS)
 #
@@ -94,8 +94,7 @@ init-po: $(srcdir)/$(CATALOG_NAME).pot
 
 update-po: $(srcdir)/$(CATALOG_NAME).pot
 ifdef MSGMERGE
-#	XXX  should be $(LANGUAGES)?
-	@for lang in $(AVAIL_LANGUAGES); do \
+	@for lang in $(LANGUAGES); do \
 	  echo "merging $$lang:"; \
 	  if $(MSGMERGE) $(srcdir)/$$lang.po $< -o $$lang.po.new; \
 	  then \