NLS updates, most notably fixed zh_TW translations

13 files changed, 713 insertions, 674 deletions

diff --git a/src/backend/po/nls.mk b/src/backend/po/nls.mk
index 34a1a0f2bc..8760257efa 100644
--- a/src/backend/po/nls.mk
+++ b/src/backend/po/nls.mk
@@ -1,4 +1,4 @@
 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
diff --git a/src/backend/po/zh_TW.po b/src/backend/po/zh_TW.po
index e87b9c89d1..805c857684 100644
--- a/src/backend/po/zh_TW.po
+++ b/src/backend/po/zh_TW.po
@@ -5,15 +5,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.2\n"
-"POT-Creation-Date: 2001-10-01 09:32+0800\n"
-"PO-Revision-Date: 2001-10-24 01:00:00+0800\n"
+"POT-Creation-Date: 2001-11-29 00:52+1100\n"
+"PO-Revision-Date: 2001-11-29 01:00:00+1100\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=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../bootstrap/bootstrap.c:189
+#: ../bootstrap/bootstrap.c:190
 msgid ""
 "Usage:\n"
 "  postgres -boot [-d] [-D datadir] [-F] [-o file] [-x num] dbname\n"
@@ -31,8 +31,7 @@ msgstr ""
 "  -o file          ±N°£¿ù°T®§¿é¥X¨ì file ÀÉ®×\n"
 "  -x num           ¤º³¡¨Ï¥Î\n"
 
-
-#: ../bootstrap/bootstrap.c:296 ../postmaster/postmaster.c:278
+#: ../bootstrap/bootstrap.c:297 ../postmaster/postmaster.c:288
 #, c-format
 msgid ""
 "%s does not know where to find the database system data.\n"
@@ -46,12 +45,12 @@ msgstr ""
 "¥]§t¸ê®Æ®w¨t²Îªº¥Ø¿ý¡C\n"
 "\n"
 
-#: ../main/main.c:84
+#: ../main/main.c:85
 #, c-format
 msgid "%s: setsysinfo failed: %s\n"
 msgstr "%s: setsysinfo ¥¢±Ñ: %s\n"
 
-#: ../main/main.c:127
+#: ../main/main.c:155
 msgid ""
 "\"root\" execution of the PostgreSQL server is not permitted.\n"
 "\n"
@@ -60,24 +59,24 @@ msgid ""
 "more information on how to properly start the server.\n"
 "\n"
 msgstr ""
-"¤£¤¹³\\ \"root\" °õ¦æ PostgreSQL ¦øªA¾¹¡C\n"
+"¸T¤î¥H \"root\" °õ¦æ PostgreSQL ¦øªA¾¹¡C\n"
 "\n"
 "¦øªA¾¹¥²¶·¥H«D¯SÅv¨Ï¥ÎªÌ¨­¤À±Ò°Ê¥HÁקK\n"
-"¥i¯àªº¨t²Î¦w¥þ°ÝÃD¡A½Ð°Ñ¾\\¤å¥ó¥HÀò±o\n"
+"¥i¯àªº¨t²Î¦w¥þ°ÝÃD¡A½Ð°Ñ¦Ò»¡©ú¤å¥ó¥HÀò±o\n"
 "¦³Ãö¦p¦ó¥¿½T±Ò°Ê¦øªA¾¹ªº¸ê°T¡C\n"
 "\n"
 
-#: ../main/main.c:147
+#: ../main/main.c:175
 #, c-format
 msgid "%s: real and effective user ids must match\n"
 msgstr "%s: ¯u¹ê¨Ï¥ÎªÌ©M¦³®Ä¨Ï¥ÎªÌ¥N¸¹¥²¶·¬Û¦P\n"
 
-#: ../main/main.c:196
+#: ../main/main.c:224
 #, c-format
 msgid "%s: invalid current euid %d\n"
 msgstr "%s: «Dªkªº euid %d\n"
 
-#: ../postmaster/postmaster.c:292
+#: ../postmaster/postmaster.c:321
 #, c-format
 msgid ""
 "%s does not find the database system.\n"
@@ -90,61 +89,59 @@ msgstr ""
 "¦ý¬OµLªk¶}±ÒÀÉ®× \"%s\": %s\n"
 "\n"
 
-#: ../postmaster/postmaster.c:400 ../postmaster/postmaster.c:411
-#: ../postmaster/postmaster.c:549 ../postmaster/postmaster.c:588
+#: ../postmaster/postmaster.c:421 ../postmaster/postmaster.c:432
+#: ../postmaster/postmaster.c:574 ../postmaster/postmaster.c:630
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "¥Î '%s --help' Àò±o§ó¦h°T®§.\n"
+msgstr "¥Î '%s --help' Àò±o§ó¦h°T®§¡C\n"
 
-#: ../postmaster/postmaster.c:410
+#: ../postmaster/postmaster.c:431
 #, c-format
 msgid "invalid argument -- %s"
 msgstr "µL®Ä°Ñ¼Æ -- %s"
 
-#: ../postmaster/postmaster.c:434
+#: ../postmaster/postmaster.c:458
 msgid "Assert checking is not compiled in."
 msgstr "½sĶ®É¨S¦³§â assert Àˬd½s¤J¡C"
 
-#: ../postmaster/postmaster.c:564
+#: ../postmaster/postmaster.c:589
 msgid ""
 "The number of buffers (-B) must be at least twice the number of allowed "
 "connections (-N) and at least 16."
-msgstr ""
-"½w½Ä°Ïªº¼Æ¶q (-B) ¥²¶·¬O¤¹³\\³s±µ¼Æ (-N)"
-"ªº¨â­¿¨Ã¥B¦Ü¤Ö¬° 16."
+msgstr "½w½Ä°Ïªº¼Æ¶q (-B) ¥²¶·¬O³s±µ¼Æ (-N)ªº¨â­¿¨Ã¥B¦Ü¤Ö¬° 16¡C"
 
-#: ../postmaster/postmaster.c:587
+#: ../postmaster/postmaster.c:629
 msgid "For SSL, TCP/IP connections must be enabled."
 msgstr "¹ï SSL ¦Ó¨¥¡A¥²¶·¥´¶} TCP/IP ³s±µ¡C"
 
-#: ../postmaster/postmaster.c:633
+#: ../postmaster/postmaster.c:676
 msgid "cannot create INET stream port"
 msgstr "µLªk«Ø¥ß INET ¦ê¬y°ð"
 
-#: ../postmaster/postmaster.c:645
+#: ../postmaster/postmaster.c:688
 msgid "cannot create UNIX stream port"
 msgstr "µLªk«Ø¥ß UNIX ¦ê¬y°ð"
 
-#: ../postmaster/postmaster.c:732
+#: ../postmaster/postmaster.c:780
 #, c-format
 msgid "fork failed: %s"
 msgstr "fork ¥¢±Ñ: %s"
 
-#: ../postmaster/postmaster.c:750
+#: ../postmaster/postmaster.c:798
 #, c-format
 msgid "cannot disassociate from controlling TTY: %s"
 msgstr "µLªk¤ÀÂ÷±±¨î TTY: %s "
 
-#: ../postmaster/postmaster.c:770
+#: ../postmaster/postmaster.c:818
 #, c-format
 msgid ""
 "%s is the PostgreSQL server.\n"
 "\n"
 msgstr ""
-"%s ¬O PostgreSQL ¦øªA¾¹.\n"
+"%s ¬O PostgreSQL ¦øªA¾¹¡C\n"
 "\n"
 
-#: ../postmaster/postmaster.c:771
+#: ../postmaster/postmaster.c:819
 #, c-format
 msgid ""
 "Usage:\n"
@@ -155,72 +152,71 @@ msgstr ""
 "  %s [¿ï¶µ...]\n"
 "\n"
 
-#: ../postmaster/postmaster.c:772
+#: ../postmaster/postmaster.c:820
 msgid "Options:\n"
 msgstr "¿ï¶µ:\n"
 
-#: ../postmaster/postmaster.c:774
+#: ../postmaster/postmaster.c:822
 msgid "  -A 1|0          enable/disable run-time assert checking\n"
 msgstr "  -A 1|0          ¥´¶}/Ãö³¬°õ¦æ®É´Á assert Àˬd\n"
 
-#: ../postmaster/postmaster.c:776
+#: ../postmaster/postmaster.c:824
 #, c-format
 msgid "  -B NBUFFERS     number of shared buffers (default %d)\n"
 msgstr "  -B ½w½Ä°Ï¼Æ   ¦@¨É½w½Ä°Ïªº¼Æ¶q (¹w³]¬O %d)\n"
 
-#: ../postmaster/postmaster.c:777
+#: ../postmaster/postmaster.c:825
 msgid "  -c NAME=VALUE   set run-time parameter\n"
 msgstr "  -c ¦WºÙ=¼Æ­È   ³]©w°õ¦æ®É´Á°Ñ¼Æ\n"
 
-#: ../postmaster/postmaster.c:778
+#: ../postmaster/postmaster.c:826
 msgid "  -d 1-5          debugging level\n"
 msgstr "  -d 1-5         °£¿ùµ¥¯Å\n"
 
-#: ../postmaster/postmaster.c:779
+#: ../postmaster/postmaster.c:827
 msgid "  -D DATADIR      database directory\n"
 msgstr "  -D ¥Ø¿ý     ¸ê®Æ®w¥Ø¿ý\n"
 
-#: ../postmaster/postmaster.c:780
+#: ../postmaster/postmaster.c:828
 msgid "  -F              turn fsync off\n"
 msgstr "  -F              Ãö³¬ fsync\n"
 
-#: ../postmaster/postmaster.c:781
+#: ../postmaster/postmaster.c:829
 msgid "  -h HOSTNAME     host name or IP address to listen on\n"
 msgstr "  -h ¥D¾÷¦WºÙ     ¶ÉÅ¥ªº¥D¾÷¦WºÙ©Î IP ¦ì§}\n"
 
-#: ../postmaster/postmaster.c:782
+#: ../postmaster/postmaster.c:830
 msgid "  -i              enable TCP/IP connections\n"
 msgstr "  -i              ¥´¶} TCP/IP ³s±µ\n"
 
-#: ../postmaster/postmaster.c:783
+#: ../postmaster/postmaster.c:831
 msgid "  -k DIRECTORY    Unix-domain socket location\n"
 msgstr "  -k ¥Ø¿ý         Unix-domain socket ªº¦ì¸m\n"
 
-#: ../postmaster/postmaster.c:785
+#: ../postmaster/postmaster.c:833
 msgid "  -l              enable SSL connections\n"
 msgstr "  -l              ¥´¶} SSL ³s±µ\n"
 
-#: ../postmaster/postmaster.c:787
+#: ../postmaster/postmaster.c:835
 #, c-format
 msgid "  -N MAX-CONNECT  maximum number of allowed connections (default %d)\n"
-msgstr "  -N ³Ì¤j³s±µ¼Æ     ¤¹³\\ªº³Ì¤j³s±µ¼Æ¥Ø (¹w³]¬O %d)\n"
+msgstr "  -N ³Ì¤j³s±µ¼Æ     ¥i¨Ï¥Îªº³Ì¤j³s±µ¼Æ (¹w³]¬O %d)\n"
 
-#: ../postmaster/postmaster.c:789
+#: ../postmaster/postmaster.c:837
 msgid "  -o OPTIONS      pass 'OPTIONS' to each backend server\n"
 msgstr "  -o ¿ï¶µ         §â'¿ï¶µ'¶Ç»¼µ¹¨C¤@­Ó«áºÝ¦øªA¾¹\n"
 
-#: ../postmaster/postmaster.c:790
+#: ../postmaster/postmaster.c:838
 #, c-format
 msgid "  -p PORT         port number to listen on (default %d)\n"
 msgstr "  -p PORT         ¶ÉÅ¥ªº°ð¸¹ (¹w³]¬O %d)\n"
 
-#: ../postmaster/postmaster.c:791
+#: ../postmaster/postmaster.c:839
 msgid ""
 "  -S              silent mode (start in background without logging output)\n"
-msgstr ""
-"  -S              ¦wÀR¼Ò¦¡(«áºÝ±Ò°Ê¤§«á¤£¿é¥X°£¿ù°T®§)\n"
+msgstr "  -S              ¦wÀR¼Ò¦¡(«áºÝ±Ò°Ê¤§«á¤£¿é¥X°£¿ù°T®§)\n"
 
-#: ../postmaster/postmaster.c:793
+#: ../postmaster/postmaster.c:841
 msgid ""
 "\n"
 "Developer options:\n"
@@ -228,17 +224,16 @@ msgstr ""
 "\n"
 "¶}µo¤H­û¿ï¶µ:\n"
 
-#: ../postmaster/postmaster.c:794
+#: ../postmaster/postmaster.c:842
 msgid ""
 "  -n              do not reinitialize shared memory after abnormal exit\n"
-msgstr ""
-"  -n              ¦b²§±`°h¥X¤§«á¤£¦A­«·sªì©l¤Æ¦@¨É°O¾ÐÅé\n"
+msgstr "  -n              ¦b²§±`°h¥X¤§«á¤£¦A­«·sªì©l¤Æ¦@¨É°O¾ÐÅé\n"
 
-#: ../postmaster/postmaster.c:795
+#: ../postmaster/postmaster.c:843
 msgid "  -s              send SIGSTOP to all backend servers if one dies\n"
 msgstr "  -s              ¦pªG¤@­Ó«áºÝµ²§ô¡A¦V©Ò¦³«áºÝµo°e SIGSTOP\n"
 
-#: ../postmaster/postmaster.c:797
+#: ../postmaster/postmaster.c:845
 msgid ""
 "\n"
 "Please read the documentation for the complete list of run-time\n"
@@ -248,79 +243,97 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr ""
 "\n"
-"½Ð¾\\Ū¤å¥ó¨ú±o°õ¦æ®É´Á°t¸m³]©wªº§¹¾ã¦Cªí¥H¤Î¦p\n"
+"½Ð°Ñ¦Ò»¡©ú¤å¥ó¨ú±o°õ¦æ®É´Á°t¸m³]©wªº§¹¾ã¦Cªí¥H¤Î¦p\n"
 "¦ó¦b©R¥O¦C©ÎªÌ¦b°t¸m¤å¥ó¸Ì³]©w¥¦­Ìªº¸Ô²Ó°T®§¡C\n"
 "\n"
 "½Ð¦V <pgsql-bugs@postgresql.org> ¦^³ø¿ù»~¡C\n"
 
-#: ../postmaster/postmaster.c:2216
+#: ../postmaster/postmaster.c:1547
+msgid "statistics collector process"
+msgstr "²Î­p¸ê®Æ¦æµ{"
+
+#: ../postmaster/postmaster.c:1560
+msgid "shutdown process"
+msgstr "Ãö³¬¦æµ{"
+
+#: ../postmaster/postmaster.c:1571
+msgid "startup process"
+msgstr "±Ò°Ê¦æµ{"
+
+#: ../postmaster/postmaster.c:1653
+msgid "child process"
+msgstr "¤l¦æµ{"
+
+#: ../postmaster/postmaster.c:1698
+msgid "server process"
+msgstr "¦øªA¾¹¦æµ{"
+
+#: ../postmaster/postmaster.c:2396
 #, c-format
 msgid "failed to create SSL context: %s"
 msgstr "«Ø¥ß SSL Àô¹Ò¥¢±Ñ: %s"
 
-#: ../postmaster/postmaster.c:2223
+#: ../postmaster/postmaster.c:2403
 #, c-format
 msgid "failed to load server certificate (%s): %s"
 msgstr "¸ü¤J¦ø°È¾¹»{ÃÒ (%s) ¥¢±Ñ: %s"
 
-#: ../postmaster/postmaster.c:2230
+#: ../postmaster/postmaster.c:2410
 #, c-format
 msgid "failed to load private key file (%s): %s"
 msgstr "¸ü¤J¨pÆ_ÀÉ®× (%s) ¥¢±Ñ: %s"
 
-#: ../postmaster/postmaster.c:2236
+#: ../postmaster/postmaster.c:2416
 #, c-format
 msgid "check of private key failed: %s"
 msgstr "Àˬd¨pÆ_¥¢±Ñ: %s"
 
-#: ../postmaster/postmaster.c:2390
+#: ../postmaster/postmaster.c:2617
 #, c-format
 msgid "cannot create file %s: %s"
 msgstr "µLªk«Ø¥ßÀÉ®× %s: %s"
 
-#: ../postmaster/postmaster.c:2402
+#: ../postmaster/postmaster.c:2629
 #, c-format
 msgid "writing file %s failed"
 msgstr "¼g¤JÀÉ®× %s ¥¢±Ñ"
 
 #. translator: This string will be truncated at 31 characters.
-#: ../utils/error/elog.c:174
+#: ../utils/error/elog.c:176
 #, c-format
 msgid "copy: line %d, "
 msgstr "½Æ»s: ¦æ %d, "
 
 #. translator: This must fit in fmt_fixedbuf.
-#: ../utils/error/elog.c:197 ../utils/error/elog.c:293
+#: ../utils/error/elog.c:199 ../utils/error/elog.c:295
 msgid "elog: out of memory"
 msgstr "elog: °O¾ÐÅé¥ÎºÉ"
 
-#: ../utils/error/elog.c:725
+#: ../utils/error/elog.c:704
 msgid "Numerical result out of range"
 msgstr "¼Æ­Èµ²ªG¶W¥X½d³ò"
 
-#. translator: This string will be truncated at 47 characters expanded.
-#: ../utils/error/elog.c:736
+#: ../utils/error/elog.c:718
 #, c-format
 msgid "operating system error %d"
 msgstr "§@·~¨t²Î¿ù»~ %d"
 
-#: ../utils/error/elog.c:753
+#: ../utils/error/elog.c:735
 msgid "DEBUG:  "
 msgstr "°£¿ù:  "
 
-#: ../utils/error/elog.c:756
+#: ../utils/error/elog.c:738
 msgid "NOTICE:  "
 msgstr "ª`·N:  "
 
-#: ../utils/error/elog.c:759
+#: ../utils/error/elog.c:741
 msgid "ERROR:  "
 msgstr "¿ù»~:  "
 
-#: ../utils/error/elog.c:762
+#: ../utils/error/elog.c:744
 msgid "FATAL 1:  "
 msgstr "ÄY­«¿ù»~ 1:  "
 
-#: ../utils/error/elog.c:765
+#: ../utils/error/elog.c:747
 msgid "FATAL 2:  "
 msgstr "ÄY­«¿ù»~ 2:  "
-
diff --git a/src/bin/pg_dump/de.po b/src/bin/pg_dump/de.po
index 587bd15707..29784ddd7b 100644
--- a/src/bin/pg_dump/de.po
+++ b/src/bin/pg_dump/de.po
@@ -1,15 +1,15 @@
 # German message translation file for pg_dump and friends
 # Peter Eisentraut <peter_e@gmx.net>, 2001.
 #
-# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/de.po,v 1.4 2001/11/02 19:16:47 petere Exp $
+# $Header: /cvsroot/pgsql/src/bin/pg_dump/Attic/de.po,v 1.5 2001/11/29 18:59:28 petere Exp $
 #
 # Use these quotes: »%s«
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: pg_dump (PostgreSQL) 7.2\n"
-"POT-Creation-Date: 2001-10-31 22:30+0100\n"
-"PO-Revision-Date: 2001-10-31 23:24+0100\n"
+"POT-Creation-Date: 2001-11-29 17:47+0100\n"
+"PO-Revision-Date: 2001-11-29 19:30+0100\n"
 "Last-Translator: Peter Eisentraut <peter_e@gmx.net>\n"
 "Language-Team: German <peter_e@gmx.net>\n"
 "MIME-Version: 1.0\n"
@@ -80,9 +80,12 @@ msgstr ""
 "  -a, --data-only          nur Daten, nicht das Schema, ausgeben\n"
 "  -b, --blobs              Large Objects mit ausgeben\n"
 "  -c, --clean              Schema vor der Erstellung löschen\n"
-"  -C, --create             Anweisungen zum Erstellen der Datenbank in Ausgabe einfügen\n"
-"  -d, --inserts            Daten als INSERT-Anweisungen, statt COPY, ausgeben\n"
-"  -D, --column-inserts     Daten als INSERT-Anweisungen mit Spaltennamen ausgeben\n"
+"  -C, --create             Anweisungen zum Erstellen der Datenbank in "
+"Ausgabe einfügen\n"
+"  -d, --inserts            Daten als INSERT-Anweisungen, statt COPY, "
+"ausgeben\n"
+"  -D, --column-inserts     Daten als INSERT-Anweisungen mit Spaltennamen "
+"ausgeben\n"
 "  -f, --file=DATEINAME     Name der Ausgabedatei\n"
 "  -F, --format {c|t|p}     Ausgabeformat (custom, tar, plain text)\n"
 "  -h, --host=HOSTNAME      Hostname des Datenbankservers\n"
@@ -90,7 +93,8 @@ msgstr ""
 "  -n, --no-quotes          die meisten Anführungszeichen auslassen\n"
 "  -N, --quotes             Anführungszeichen um die meisten Namen stellen\n"
 "  -o, --oids               Oids mit ausgeben\n"
-"  -O, --no-owner           keine \\connect-Anweisungen im »plain text«-Format ausgeben\n"
+"  -O, --no-owner           keine \\connect-Anweisungen im »plain text«-"
+"Format ausgeben\n"
 "  -p, --port=PORT          Portnummer des Datenbankservers\n"
 "  -R, --no-reconnect       keine Wiederverbindungen mit der Datenbank im\n"
 "                           »plain text«-Format ermöglichen\n"
@@ -99,10 +103,12 @@ msgstr ""
 "  -t, --table=TABELLE      nur diese Tabelle ausgeben (* für alle)\n"
 "  -U, --username=NAME      Datenbankbenutzername\n"
 "  -v, --verbose            »Verbose«-Modus\n"
-"  -W, --password           nach Paßwort fragen (sollte automatisch geschehen)\n"
+"  -W, --password           nach Paßwort fragen (sollte automatisch "
+"geschehen)\n"
 "  -x, --no-privileges      Zugriffsrechte (grant/revoke) nicht ausgeben\n"
 "  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           SET SESSION AUTHORIZATION Anweisungen anstelle von\n"
+"                           SET SESSION AUTHORIZATION Anweisungen anstelle "
+"von\n"
 "                           »\\connect« ausgeben\n"
 "  -Z, --compress {0-9}     Komprimierungsniveau für komprimierte Formate\n"
 
@@ -144,9 +150,12 @@ msgstr ""
 "  -a                       nur Daten, nicht das Schema, ausgeben\n"
 "  -b                       Large Objects mit ausgeben\n"
 "  -c                       Schema vor der Erstellung löschen\n"
-"  -C                       Anweisungen zum Erstellen der Datenbank in Ausgabe einfügen\n"
-"  -d                       Daten als INSERT-Anweisungen, statt COPY, ausgeben\n"
-"  -D                       Daten als INSERT-Anweisungen mit Spaltennamen ausgeben\n"
+"  -C                       Anweisungen zum Erstellen der Datenbank in "
+"Ausgabe einfügen\n"
+"  -d                       Daten als INSERT-Anweisungen, statt COPY, "
+"ausgeben\n"
+"  -D                       Daten als INSERT-Anweisungen mit Spaltennamen "
+"ausgeben\n"
 "  -f DATEINAME             Name der Ausgabedatei\n"
 "  -F {c|t|p}               Ausgabeformat (custom, tar, plain text)\n"
 "  -h HOSTNAME              Hostname des Datenbankservers\n"
@@ -154,7 +163,8 @@ msgstr ""
 "  -n                       die meisten Anführungszeichen auslassen\n"
 "  -N                       Anführungszeichen um die meisten Namen stellen\n"
 "  -o                       Oids mit ausgeben\n"
-"  -O                       keine \\connect-Anweisungen im »plain text«-Format ausgeben\n"
+"  -O                       keine \\connect-Anweisungen im »plain text«-"
+"Format ausgeben\n"
 "  -p PORT                  Portnummer des Datenbankservers\n"
 "  -R                       keine Wiederverbindungen mit der Datenbank im\n"
 "                           »plain text«-Format ermöglichen\n"
@@ -163,10 +173,12 @@ msgstr ""
 "  -t TABELLE               nur diese Tabelle ausgeben (* für alle)\n"
 "  -U NAME                  Datenbankbenutzername\n"
 "  -v                       »Verbose«-Modus\n"
-"  -W                       nach Paßwort fragen (sollte automatisch geschehen)\n"
+"  -W                       nach Paßwort fragen (sollte automatisch "
+"geschehen)\n"
 "  -x                       Zugriffsrechte (grant/revoke) nicht ausgeben\n"
 "  -X use-set-session-authorization\n"
-"                           SET SESSION AUTHORIZATION Anweisungen anstelle von\n"
+"                           SET SESSION AUTHORIZATION Anweisungen anstelle "
+"von\n"
 "                           »\\connect« ausgeben\n"
 "  -Z {0-9}                 Komprimierungsniveau für komprimierte Formate\n"
 
@@ -182,7 +194,7 @@ msgstr ""
 "\n"
 "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>."
 
-#: pg_backup_archiver.c:1284 pg_dump.c:221
+#: pg_backup_archiver.c:1298 pg_dump.c:221
 msgid "*** aborted because of error\n"
 msgstr "*** abgebrochen wegen Fehler\n"
 
@@ -258,16 +270,16 @@ msgstr "Vorbereitung um Inhalt der Tabelle %s auszugeben\n"
 msgid "unable to parse version string \"%s\"\n"
 msgstr "kann Versionszeichenkette »%s« nicht entzifferen\n"
 
-#: pg_dump.c:874 pg_restore.c:260
+#: pg_dump.c:874 pg_restore.c:263
 msgid "User name: "
 msgstr "Benutzername: "
 
-#: pg_dump.c:906 pg_restore.c:285
+#: pg_dump.c:906 pg_restore.c:288
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: ungültige »-X«-Option -- %s\n"
 
-#: pg_dump.c:908 pg_dump.c:930 pg_restore.c:287 pg_restore.c:299
+#: 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 "Versuchen Sie »%s --help« für weitere Informationen.\n"
@@ -304,7 +316,9 @@ msgstr ""
 
 #: pg_dump.c:963
 msgid "Large object output is not supported for a single table.\n"
-msgstr "Large-Object-Unterstützung kann nicht mit einer einzigen Tabelle verwendet werden.\n"
+msgstr ""
+"Large-Object-Unterstützung kann nicht mit einer einzigen Tabelle verwendet "
+"werden.\n"
 
 #: pg_dump.c:964
 msgid "Use all tables or a full dump instead.\n"
@@ -530,9 +544,9 @@ msgstr ""
 "Abfrage nach Namen von Primary Key von Tabelle %s ergab nicht genau ein "
 "Resultat\n"
 
-#: pg_backup_archiver.c:642 pg_backup_archiver.c:1052
-#: pg_backup_archiver.c:1171 pg_backup_archiver.c:1458
-#: pg_backup_archiver.c:1598 pg_backup_archiver.c:1627 pg_backup_custom.c:149
+#: pg_backup_archiver.c:654 pg_backup_archiver.c:1064
+#: pg_backup_archiver.c:1183 pg_backup_archiver.c:1472
+#: pg_backup_archiver.c:1612 pg_backup_archiver.c:1641 pg_backup_custom.c:149
 #: pg_backup_custom.c:154 pg_backup_custom.c:169 pg_backup_custom.c:562
 #: pg_backup_db.c:336 pg_backup_db.c:430 pg_backup_tar.c:984 pg_dump.c:2361
 msgid "out of memory\n"
@@ -942,37 +956,37 @@ msgid "failed sanity check, table \"%s\" not found by flagInhAttrs\n"
 msgstr ""
 "Sanity-Check fehlgeschlagen, Tabelle »%s« von flagInhAttrs nicht gefunden\n"
 
-#: pg_backup_archiver.c:94
+#: pg_backup_archiver.c:106
 msgid "archiver"
 msgstr "Archivierer"
 
-#: pg_backup_archiver.c:149
+#: pg_backup_archiver.c:161
 msgid "could not close the output file in CloseArchive\n"
 msgstr "konnte Ausgabedatei in CloseArchive nicht schließen\n"
 
-#: pg_backup_archiver.c:175
+#: pg_backup_archiver.c:187
 msgid "-C and -R are incompatible options\n"
 msgstr "-C und -R sind inkompatible Optionen\n"
 
-#: pg_backup_archiver.c:178
+#: pg_backup_archiver.c:190
 msgid "-C and -c are incompatible options\n"
 msgstr "-C und -c sind inkompatible Optionen\n"
 
-#: pg_backup_archiver.c:185
+#: pg_backup_archiver.c:197
 msgid "connecting to database for restore\n"
 msgstr "verbinde mit der Datenbank zur Wiederherstellung\n"
 
-#: pg_backup_archiver.c:187
+#: pg_backup_archiver.c:199
 msgid "direct database connections are not supported in pre-1.3 archives\n"
 msgstr ""
 "direkte Datenbankverbindungen sind in Archiven vor Version 1.3 nicht "
 "unterstützt\n"
 
-#: pg_backup_archiver.c:234
+#: pg_backup_archiver.c:246
 msgid "implied data-only restore\n"
 msgstr "implizit werden nur Daten wiederhergestellt\n"
 
-#: pg_backup_archiver.c:239
+#: pg_backup_archiver.c:251
 msgid ""
 "WARNING:\n"
 "  Data restoration may fail because existing triggers cannot be disabled\n"
@@ -987,27 +1001,27 @@ msgstr ""
 "Trigger\n"
 "  enthält.\n"
 
-#: pg_backup_archiver.c:264
+#: pg_backup_archiver.c:276
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "entferne %s %s\n"
 
-#: pg_backup_archiver.c:288 pg_backup_archiver.c:290
+#: pg_backup_archiver.c:300 pg_backup_archiver.c:302
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "Warnung aus der ursprünglichen Ausgabedatei: %s\n"
 
-#: pg_backup_archiver.c:300
+#: pg_backup_archiver.c:312
 #, c-format
 msgid "creating %s %s\n"
 msgstr "erstelle %s %s\n"
 
-#: pg_backup_archiver.c:307
+#: pg_backup_archiver.c:319
 #, c-format
 msgid "connecting to new database %s as user %s\n"
 msgstr "verbinde mit neuer Datenbank %s als Benutzer %s\n"
 
-#: pg_backup_archiver.c:332
+#: pg_backup_archiver.c:344
 msgid ""
 "unable to restore from compressed archive (not configured for compression "
 "support)\n"
@@ -1015,210 +1029,210 @@ msgstr ""
 "kann komprimiertes Archiv nicht wiederherstellen (Unterstützung nicht "
 "konfiguriert)\n"
 
-#: pg_backup_archiver.c:351
+#: pg_backup_archiver.c:363
 msgid "WARNING: skipping large object restoration\n"
 msgstr "WARNUNG: Large-Object-Wiederherstellung übersprungen\n"
 
-#: pg_backup_archiver.c:365
+#: pg_backup_archiver.c:377
 #, c-format
 msgid "restoring data for table %s\n"
 msgstr "Wiederherstellung der Daten von Tabelle %s\n"
 
-#: pg_backup_archiver.c:390
+#: pg_backup_archiver.c:402
 #, c-format
 msgid "executing %s %s\n"
 msgstr "führe %s %s aus\n"
 
-#: pg_backup_archiver.c:414
+#: pg_backup_archiver.c:426
 #, c-format
 msgid "checking whether we loaded %s\n"
 msgstr "prüfe ob %s geladen wurde\n"
 
-#: pg_backup_archiver.c:420
+#: pg_backup_archiver.c:432
 #, c-format
 msgid "fixing up large object cross-reference for %s\n"
 msgstr "stelle Large-Object-Querverweise für %s ein\n"
 
-#: pg_backup_archiver.c:425
+#: pg_backup_archiver.c:437
 #, c-format
 msgid "ignoring large object cross-references for %s %s\n"
 msgstr "ignoriere Large-Object-Querverweis von %s %s\n"
 
-#: pg_backup_archiver.c:515
+#: pg_backup_archiver.c:527
 msgid "disabling triggers\n"
 msgstr "schalte Trigger aus\n"
 
-#: pg_backup_archiver.c:574
+#: pg_backup_archiver.c:586
 msgid "enabling triggers\n"
 msgstr "schalte Trigger ein\n"
 
-#: pg_backup_archiver.c:617
+#: pg_backup_archiver.c:629
 msgid ""
 "WriteData cannot be called outside the context of a DataDumper routine\n"
 msgstr ""
 "WriteData kann nicht außerhalb des Kontexts einer DataDumper-Routine "
 "aufgerufen werden\n"
 
-#: pg_backup_archiver.c:737
+#: pg_backup_archiver.c:749
 msgid "large object output not supported in chosen format\n"
 msgstr "Large-Object-Ausgabe im gewählten Format nicht unterstützt\n"
 
-#: pg_backup_archiver.c:777 pg_backup_archiver.c:844
+#: pg_backup_archiver.c:789 pg_backup_archiver.c:856
 msgid "committing large object transactions\n"
 msgstr "schließe Large-Object-Transaktionen ab\n"
 
-#: pg_backup_archiver.c:784
+#: pg_backup_archiver.c:796
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "%d Large Objects wiederhergestellt\n"
 
-#: pg_backup_archiver.c:801
+#: pg_backup_archiver.c:813
 msgid "cannot restore large objects without a database connection\n"
 msgstr "kann Large Objects ohne Datenbankverbindung nicht wiederherstellen\n"
 
-#: pg_backup_archiver.c:812
+#: pg_backup_archiver.c:824
 msgid "starting large object transactions\n"
 msgstr "starte Transaktion für Large Objects\n"
 
-#: pg_backup_archiver.c:820
+#: pg_backup_archiver.c:832
 msgid "could not create large object\n"
 msgstr "konnte Large Object nicht erstellen\n"
 
-#: pg_backup_archiver.c:822
+#: pg_backup_archiver.c:834
 #, c-format
 msgid "restoring large object with oid %u as %u\n"
 msgstr "Wiederherstellung von Large Object Oid %u als %u\n"
 
-#: pg_backup_archiver.c:828
+#: pg_backup_archiver.c:840
 msgid "could not open large object\n"
 msgstr "konnte Large Object nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:968
+#: pg_backup_archiver.c:980
 msgid "could not open TOC file\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht öffnen\n"
 
-#: pg_backup_archiver.c:989
+#: pg_backup_archiver.c:1001
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "WARNUNG: Zeile ignoriert: %s\n"
 
-#: pg_backup_archiver.c:996
+#: pg_backup_archiver.c:1008
 #, c-format
 msgid "could not find entry for id %d\n"
 msgstr "konnte Eintrag für ID %d nicht finden\n"
 
-#: pg_backup_archiver.c:1005 pg_backup_files.c:158 pg_backup_files.c:443
+#: pg_backup_archiver.c:1017 pg_backup_files.c:158 pg_backup_files.c:443
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "konnte Inhaltsverzeichnisdatei nicht finden: %s\n"
 
-#: pg_backup_archiver.c:1120 pg_backup_files.c:132
+#: pg_backup_archiver.c:1132 pg_backup_files.c:132
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "konnte Ausgabedatei nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1136
+#: pg_backup_archiver.c:1148
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "konnte Ausgabedatei nicht schließen: %s\n"
 
-#: pg_backup_archiver.c:1217
+#: pg_backup_archiver.c:1229
 #, c-format
 msgid "wrote %d bytes of large object data (result = %d)\n"
 msgstr "%d Bytes Large-Object-Daten geschrieben (Ergebnis = %d)\n"
 
-#: pg_backup_archiver.c:1219
+#: pg_backup_archiver.c:1232
 #, c-format
 msgid "could not write to large object (result: %d, expected: %d)\n"
 msgstr "konnte Large Object nicht schreiben (Ergebis: %d, erwartet: %d)\n"
 
-#: pg_backup_archiver.c:1228
+#: pg_backup_archiver.c:1241
 msgid "could not write to compressed archive\n"
 msgstr "konnte nicht in komprimiertes Archiv schreiben\n"
 
-#: pg_backup_archiver.c:1236
+#: pg_backup_archiver.c:1249
 msgid "could not write to custom output routine\n"
 msgstr "konnte nicht zur Custom-Ausgaberoutine schreiben\n"
 
-#: pg_backup_archiver.c:1251
+#: pg_backup_archiver.c:1264
 #, c-format
 msgid "could not write to output file (%d != %d)\n"
 msgstr "konnte nicht in Ausgabedatei schreiben (%d != %d)\n"
 
-#: pg_backup_archiver.c:1476
+#: pg_backup_archiver.c:1490
 msgid "attempting to ascertain archive format\n"
 msgstr "versuche Archivformat zu ermitteln\n"
 
-#: pg_backup_archiver.c:1496 pg_backup_files.c:150
+#: pg_backup_archiver.c:1510 pg_backup_files.c:150
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "konnte Eingabedatei nicht öffnen: %s\n"
 
-#: pg_backup_archiver.c:1503
+#: pg_backup_archiver.c:1517
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "konnte nicht aus Eingabedatei lesen: %s\n"
 
-#: pg_backup_archiver.c:1505
+#: pg_backup_archiver.c:1519
 #, c-format
 msgid "input file is too short (read %d, expected 5)\n"
 msgstr "Eingabedatei ist zu kurz (gelesen: %d, erwartet: 5)\n"
 
-#: pg_backup_archiver.c:1549
+#: pg_backup_archiver.c:1563
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "Eingabedatei scheint kein gültiges Archiv zu sein (zu kurz?)\n"
 
-#: pg_backup_archiver.c:1552
+#: pg_backup_archiver.c:1566
 msgid "input file does not appear to be a valid archive\n"
 msgstr "Eingabedatei scheint kein gültiges Archiv zu sein\n"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1584
 #, c-format
 msgid "read %d bytes into lookahead buffer\n"
 msgstr "%d Bytes in Puffer gelesen\n"
 
-#: pg_backup_archiver.c:1576
+#: pg_backup_archiver.c:1590
 #, c-format
 msgid "could not close the input file after reading header: %s\n"
 msgstr "konnte Ausgabedatei nach dem Lesen des Kopfes nicht schließen: %s\n"
 
-#: pg_backup_archiver.c:1593
+#: pg_backup_archiver.c:1607
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "erstelle AH für %s, Format %d\n"
 
-#: pg_backup_archiver.c:1643
+#: pg_backup_archiver.c:1657
 #, c-format
 msgid "archive format is %d\n"
 msgstr "Archivformat ist %d\n"
 
-#: pg_backup_archiver.c:1671
+#: pg_backup_archiver.c:1685
 #, c-format
 msgid "unrecognized file format '%d'\n"
 msgstr "unerkanntes Dateiformat »%d«\n"
 
-#: pg_backup_archiver.c:1783
+#: pg_backup_archiver.c:1797
 msgid "entry id out of range - perhaps a corrupt TOC\n"
 msgstr ""
 "ID des Eintrags außerhalb des gültigen Bereichs - vielleicht ein "
 "verfälschtes Inhaltsverzeichnis\n"
 
-#: pg_backup_archiver.c:1815
+#: pg_backup_archiver.c:1829
 #, c-format
 msgid "read dependency for %s -> %s\n"
 msgstr "Abhängigkeit %s -> %s gelesen\n"
 
-#: pg_backup_archiver.c:1834
+#: pg_backup_archiver.c:1848
 #, c-format
 msgid "read TOC entry %d (id %d) for %s %s\n"
 msgstr "Inhaltsverzeichniseintrag %d (Id %d) von %s %s gelesen\n"
 
-#: pg_backup_archiver.c:1946
+#: pg_backup_archiver.c:1972
 #, c-format
 msgid "could not set session user to %s: %s"
 msgstr "konnte Session-Benutzer nicht auf %s setzen: %s"
 
-#: pg_backup_archiver.c:2028
+#: pg_backup_archiver.c:2054
 msgid ""
 "WARNING: requested compression not available in this installation - archive "
 "will be uncompressed\n"
@@ -1226,21 +1240,21 @@ msgstr ""
 "WARNUNG: Komprimierung ist in dieser Installation nicht verfügbar; Archiv "
 "wird nicht komprimiert\n"
 
-#: pg_backup_archiver.c:2061
+#: pg_backup_archiver.c:2087
 msgid "did not find magic string in file header\n"
 msgstr "magische Zeichenkette im Dateikopf nicht gefunden\n"
 
-#: pg_backup_archiver.c:2075
+#: pg_backup_archiver.c:2101
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "nicht unterstützte Version (%d.%d) im Dateikopf\n"
 
-#: pg_backup_archiver.c:2080
+#: pg_backup_archiver.c:2106
 #, c-format
 msgid "sanity check on integer size (%d) failed\n"
 msgstr "Prüfung der Integer-Größe (%d) fehlgeschlagen\n"
 
-#: pg_backup_archiver.c:2083
+#: pg_backup_archiver.c:2109
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "may fail\n"
@@ -1248,14 +1262,14 @@ msgstr ""
 "WARNUNG: Archiv wurde auf einer Maschine mit größeren Integers erstellt; "
 "einige Operationen könnten fehlschlagen\n"
 
-#: pg_backup_archiver.c:2088
+#: pg_backup_archiver.c:2114
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr ""
 "erwartetes Format (%d) ist nicht das gleiche wie das in der Datei gefundene "
 "(%d)\n"
 
-#: pg_backup_archiver.c:2104
+#: pg_backup_archiver.c:2130
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression - no data will be available\n"
@@ -1263,7 +1277,7 @@ msgstr ""
 "WARNUNG: Archiv ist komprimiert, aber diese Installation unterstützt keine "
 "Komprimierung - keine Daten verfügbar\n"
 
-#: pg_backup_archiver.c:2122
+#: pg_backup_archiver.c:2148
 msgid "WARNING: invalid creation date in header\n"
 msgstr "WARNUNG: ungültiges Erstellungsdatum im Kopf\n"
 
@@ -1314,12 +1328,12 @@ msgid "unrecognized data block type %d while restoring archive\n"
 msgstr ""
 "unerkannter Datenblocktyp %d beim Wiederherstellen des Archivs gefunden\n"
 
-#: pg_backup_custom.c:549 pg_backup_custom.c:905
+#: pg_backup_custom.c:549 pg_backup_custom.c:907
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "konnte Komprimierungsbibliothek nicht initialisieren: %s\n"
 
-#: pg_backup_custom.c:570 pg_backup_custom.c:694
+#: pg_backup_custom.c:570 pg_backup_custom.c:696
 #, c-format
 msgid "could not read data block - expected %d, got %d\n"
 msgstr "konnte Datenblock nicht lesen - %d Bytes erwartet, %d erhalten\n"
@@ -1329,41 +1343,46 @@ msgstr "konnte Datenblock nicht lesen - %d Bytes erwartet, %d erhalten\n"
 msgid "unable to uncompress data: %s\n"
 msgstr "konnte Daten nicht komprimieren: %s\n"
 
-#: pg_backup_custom.c:722
+#: pg_backup_custom.c:626
+#, c-format
+msgid "could not close compression library: %s\n"
+msgstr "konnte Komprimierungsbibliothek nicht schließen: %s\n"
+
+#: pg_backup_custom.c:724
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "konnte Byte nicht schreiben: %s\n"
 
-#: pg_backup_custom.c:765 pg_backup_files.c:418
+#: pg_backup_custom.c:767 pg_backup_files.c:418
 #, c-format
 msgid "write error in _WriteBuf (%d != %d)\n"
 msgstr "Schreibfehler in _WriteBuf (%d != %d)\n"
 
-#: pg_backup_custom.c:835
+#: pg_backup_custom.c:837
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "konnte Archivdatei nicht schließen: %s\n"
 
-#: pg_backup_custom.c:858
+#: pg_backup_custom.c:860
 msgid "WARNING: ftell mismatch with expected position -- ftell ignored\n"
 msgstr ""
 "WARNUNG: erwartete Dateiposition stimmt nicht mit ftell überein -- ftell "
 "ignoriert\n"
 
-#: pg_backup_custom.c:937
+#: pg_backup_custom.c:939
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "konnte Daten nicht komprimieren: %s\n"
 
-#: pg_backup_custom.c:957
+#: pg_backup_custom.c:959
 msgid "could not write compressed chunk\n"
 msgstr "konnte komprimiertes Stück nicht schreiben\n"
 
-#: pg_backup_custom.c:971
+#: pg_backup_custom.c:973
 msgid "could not write uncompressed chunk\n"
 msgstr "konnte unkomprimiertes Stück nicht schreiben\n"
 
-#: pg_backup_custom.c:1020
+#: pg_backup_custom.c:1022
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "konnte Komprimierungsstrom nicht schließen: %s\n"
@@ -1755,7 +1774,7 @@ msgstr ""
 msgid "unable to write tar header\n"
 msgstr "kann Tar-Kopf nicht schreiben\n"
 
-#: pg_restore.c:380
+#: pg_restore.c:383
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1773,21 +1792,21 @@ msgstr ""
 "\n"
 "Optionen:\n"
 
-#: pg_restore.c:386
+#: 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"
@@ -1813,11 +1832,11 @@ msgstr ""
 "  -c, --clean              Schema vor der Erstellung löschen\n"
 "  -C, --create             Anweisungen zum Erstellen der Datenbank ausgeben\n"
 "  -d, --dbname=NAME        Name der Datenbank zur Wiederherstellung\n"
-"  -f, --file=DATEINAME     Dateiname für Inhaltsverzeichnis (siehe -l)\n"
+"  -f, --file=DATEINAME     Ausgabedatei\n"
 "  -F, --format={c|f}       Format der Backup-Datei\n"
 "  -h, --host=HOSTNAME      Hostname des Datenbankservers\n"
 "  -i, --index=NAME         benannten Index wiederherstellen\n"
-"  -l, --list               Inhaltsverzeichnis für dieses Archiv ausgeben\n"
+"  -l, --list               Inhaltsverzeichnis für dieses Archiv anzeigen\n"
 "  -L, --use-list=DATEINAME benanntes Inhaltsverzeichnis zur Ordnung der Ausgabe\n"
 "                           aus dem Archiv verwenden\n"
 "  -N, --orig-order         in der Originalreihenfolge wiederherstellen\n"
@@ -1840,22 +1859,22 @@ msgstr ""
 "                           Wenn möglich, SET SESSION AUTHORIZATION Anweisung\n"
 "                           verwenden anstelle neu zu verbinden\n"
 
-#: pg_restore.c:422
+#: 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"
@@ -1880,11 +1899,11 @@ msgstr ""
 "  -c                       Schema vor der Erstellung löschen\n"
 "  -C                       Anweisungen zum Erstellen der Datenbank ausgeben\n"
 "  -d NAME                  Name der Datenbank zur Wiederherstellung\n"
-"  -f DATEINAME             Dateiname für Inhaltsverzeichnis (siehe -l)\n"
+"  -f DATEINAME             Ausgabedatei\n"
 "  -F {c|f}                 Format der Backup-Datei\n"
 "  -h HOSTNAME              Hostname des Datenbankservers\n"
 "  -i NAME                  benannten Index wiederherstellen\n"
-"  -l                       Inhaltsverzeichnis für dieses Archiv ausgeben\n"
+"  -l                       Inhaltsverzeichnis für dieses Archiv anzeigen\n"
 "  -L DATEINAME             benanntes Inhaltsverzeichnis zur Ordnung der Ausgabe\n"
 "                           aus dem Archiv verwenden\n"
 "  -N                       in der Originalreihenfolge wiederherstellen\n"
@@ -1907,11 +1926,11 @@ msgstr ""
 "                           Wenn möglich, SET SESSION AUTHORIZATION Anweisung\n"
 "                           verwenden anstelle neu zu verbinden\n"
 
-#: pg_restore.c:455
+#: pg_restore.c:458
 msgid "If no input file name is supplied, then standard input is used.\n"
 msgstr ""
 "Wenn keine Eingabedatei angegeben ist, wird die Standardeingabe verwendet.\n"
 
-#: pg_restore.c:456
+#: pg_restore.c:459
 msgid "Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr "Berichten Sie Fehler an <pgsql-bugs@postgresql.org>."
diff --git a/src/bin/pg_dump/nls.mk b/src/bin/pg_dump/nls.mk
index 437599f33f..350f8d3b6b 100644
--- a/src/bin/pg_dump/nls.mk
+++ b/src/bin/pg_dump/nls.mk
@@ -1,6 +1,6 @@
-# $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
diff --git a/src/bin/pg_dump/zh_TW.po b/src/bin/pg_dump/zh_TW.po
index 4a3ffe07bb..c7b664fe53 100644
--- a/src/bin/pg_dump/zh_TW.po
+++ b/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 "¥Îªk:"
+msgstr "¨Ï¥Îªk:"
 
 #: 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}     ¿é¥XÀɮ׮榡(¦Û©w¡Btar¡B¯Â¤å¦r)\n"
 "  -h, --host=¥D¾÷¦WºÙ      ¸ê®Æ®w¦øªA¾¹¥D¾÷¦WºÙ\n"
 "  -i, --ignore-version     §Y¨Ï¦øªA¾¹ª©¥»©M pg_dump ª©¥»¤£²Å¦X¤]Ä~Äò°õ¦æ\n"
-"  -n, --no-quotes          §í¨î¼Ð¥Ü²Å¸¹©P³òªºµ´¤j³¡¤À¤Þ¸¹\n"
-"  -N, --quotes             ¤¹³\\¼Ð¥Ü²Å¸¹©P³òªºµ´¤j³¡¤À¤Þ¸¹\n"
+"  -n, --no-quotes          §í¨î¦b¼Ð¥Ü²Å¸¹©P³ò¨Ï¥Î¤Þ¸¹\n"
+"  -N, --quotes             ¥i¥H¦b¼Ð¥Ü²Å¸¹©P³ò¨Ï¥Î¤Þ¸¹\n"
 "  -o, --oids               ¦b¿é¥X¤¤¥]¬A oid\n"
 "  -O, --no-owner           ¦b¯Â¤å¦r®æ¦¡¤¤¤£­n¥]¬A \\connect «ü¥O\n"
 "  -p, --port=°ð¸¹          ¸ê®Æ®w¦øªA¾¹°ð¸¹\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}               ¿é¥XÀɮ׮榡(¦Û©w¡Btar¡B¯Â¤å¦r)\n"
 "  -h ¥D¾÷¦WºÙ              ¸ê®Æ®w¦øªA¾¹¥D¾÷¦WºÙ\n"
 "  -i                       §Y¨Ï¦øªA¾¹ª©¥»©M pg_dump ª©¥»¤£²Å¦X¤]Ä~Äò°õ¦æ\n"
-"  -n                       §í¨î¦b¤j¦h¼Æ¼Ð¥Ü²Å¸¹©P³òªº¤Þ¸¹\n"
-"  -N                       ¤¹³\\¦b¤j¦h¼Æ¼Ð¥Ü²Å¸¹©P³òªº¤Þ¸¹\n"
+"  -n                       §í¨î¦b¼Ð¥Ü²Å¸¹©P³ò¨Ï¥Î¤Þ¸¹\n"
+"  -N                       ¥i¥H¦b¼Ð¥Ü²Å¸¹©P³ò¨Ï¥Î¤Þ¸¹\n"
 "  -o                       ¦b¿é¥X¤¤¥]¬A oid\n"
 "  -O                       ¦b¯Â¤å¦r®æ¦¡¤¤¤£¿é¥X \\connect «ü¥O\n"
 "  -p °ð¸¹                  ¸ê®Æ®w¦øªA¾¹°ð¸¹\n"
@@ -176,21 +176,21 @@ msgstr ""
 "\n"
 "¦V <pgsql-bugs@postgresql.org> ³ø§i¯äÂÎ."
 
-#: pg_dump.c:874 pg_restore.c:258
+#: pg_dump.c:874 pg_restore.c:263
 msgid "User name: "
 msgstr "¨Ï¥ÎªÌ¦WºÙ: "
 
-#: 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: µL®Äªº -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 "¿é¤J '%s --help' ¥HÅã¥Ü§ó¦h°T®§¡C\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 ½sĶ®É¥¼¥[¤Jªø¿ï¶µ¤ä´©¡C\n"
 "¥Î --help Åã¥Ü¿ï¶µªº»¡©ú¡C\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: «ü¥O°Ñ¼Æ¹L¦h (²Ä¤@­Ó¬O '%s')\n"
 "¿é¤J '%s --help' Åã¥Ü§ó¦h°T®§¡C\n"
 
-#: pg_backup_archiver.c:94
+#: pg_backup_archiver.c:106
 msgid "archiver"
 msgstr "ÂkÀÉ"
 
@@ -220,7 +220,7 @@ msgstr "¦Û©wÂkÀÉ"
 msgid "archiver (db)"
 msgstr "ÂkÀÉ (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 "±K½X: "
 
@@ -228,11 +228,11 @@ msgstr "±K½X: "
 msgid "file archiver"
 msgstr "ÀÉ®×ÂkÀÉ"
 
-#: pg_backup_tar.c:104
+#: pg_backup_tar.c:103
 msgid "tar archiver"
 msgstr "tar ÂkÀÉ"
 
-#: 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 ""
 "                           ¾¨¥i¯à¥Î SET SESSION AUTHORIZATION «ü¥O¦Ó¤£¬O\n"
 "                           ­«·s³s±µ\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                       ±j¨î±K½X¸ß°Ý (À³¸Ó¦Û°Ê¸ß°Ý)\n"
 "  -x                       ©¿²¤¦s¨úÅv­­ (grant/reovke) ªºÁÙ­ì\n"
 "  -X use-set-session-authorization\n"
-"                           ¾¨¥i¯à¨Ï¥Î SET SESSION AUTHORIZATION «ü¥O, ¦Ó¤£¬O\n"
+"                           ¾¨¥i¯à¨Ï¥Î SET SESSION AUTHORIZATION "
+"«ü¥O¡A¦Ó¤£¬O\n"
 "                           ­«·s³s±µ\n"
 
-#: pg_restore.c:453
+#: pg_restore.c:458
 msgid "If no input file name is supplied, then standard input is used.\n"
 msgstr "¦pªG¨S¦³´£¨ÑÀɮצWºÙ«h¨Ï¥Î¼Ð·Ç¿é¤J¡C\n"
 
-#: pg_restore.c:454
+#: pg_restore.c:459
 msgid "Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr "¦V <pgsql-bugs@postgresql.org> ¦^³ø¿ù»~¡C"
 
diff --git a/src/bin/psql/nls.mk b/src/bin/psql/nls.mk
index b62af82607..fe7b95d781 100644
--- a/src/bin/psql/nls.mk
+++ b/src/bin/psql/nls.mk
@@ -1,6 +1,6 @@
-# $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
diff --git a/src/bin/psql/zh_TW.po b/src/bin/psql/zh_TW.po
index ac4d723ef7..e9ca1156a4 100644
--- a/src/bin/psql/zh_TW.po
+++ b/src/bin/psql/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:18+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"
@@ -13,225 +13,225 @@ msgstr ""
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: command.c:152
+#: command.c:154
 msgid "Warning: This syntax is deprecated.\n"
 msgstr "ĵ§i: ³oºØ»yªk¤w¸g¼o±ó¡C\n"
 
-#: command.c:159
+#: command.c:161
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "µL®Äªº«ü¥O \\%s. ¥Î \\? ¨ú±o»¡©ú¡C\n"
 
-#: command.c:161
+#: command.c:163
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "µL®Äªº«ü¥O \\%s\n"
 
-#: command.c:278
+#: command.c:280
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "µLªk¨ú±o home ¥Ø¿ý: %s\n"
 
-#: command.c:292
+#: command.c:296
 #, c-format
 msgid "\\%s: could not change directory to '%s': %s\n"
 msgstr "\\%s: ¤£¯à¤Á´«¨ì '%s' ¥Ø¿ý: %s\n"
 
-#: command.c:380 command.c:726
+#: command.c:385 command.c:730
 msgid "no query buffer\n"
 msgstr "¨S¦³¬d¸ß½w½Ä°Ï\n"
 
-#: command.c:436
+#: command.c:441
 #, c-format
 msgid "%s: invalid encoding name\n"
 msgstr "%s: µL®Äªº½s½X¦WºÙ\n"
 
-#: command.c:445
+#: command.c:450
 #, c-format
 msgid "\\%s: multibyte support is not enabled\n"
 msgstr "\\%s: ¥¼±Ò°Ê¦h¦ì¤¸²Õ¦r¤¸¤ä´©\n"
 
-#: command.c:499 command.c:530 command.c:541 command.c:555 command.c:597
-#: command.c:706 command.c:735
+#: command.c:504 command.c:535 command.c:546 command.c:560 command.c:602
+#: command.c:710 command.c:739
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: ¯Ê¤Ö©Ò»Ý°Ñ¼Æ\n"
 
-#: command.c:585
+#: command.c:590
 msgid "Query buffer is empty."
 msgstr "¬d¸ß½w½Ä°Ï¬°ªÅ¡C"
 
-#: command.c:616
+#: command.c:621
 msgid "Query buffer reset (cleared)."
 msgstr "­«¸m(²MªÅ)¬d¸ß½w½Ä°Ï¡C"
 
-#: command.c:627
+#: command.c:632
 #, c-format
 msgid "Wrote history to %s.\n"
 msgstr "±N¾ú¥v°O¿ý¼g¤J %s ¡C\n"
 
-#: command.c:668 command.c:900 command.c:1114 command.c:1160 command.c:1844
-#: common.c:57 copy.c:87 describe.c:449 mainloop.c:80 mainloop.c:384
+#: command.c:672 command.c:903 command.c:1118 command.c:1174 command.c:1857
+#: common.c:57 copy.c:87 describe.c:448 mainloop.c:80 mainloop.c:384
 msgid "out of memory\n"
 msgstr "°O¾ÐÅé¥ÎºÉ\n"
 
-#: command.c:677 command.c:711
+#: command.c:681 command.c:715
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: ¿ù»~\n"
 
-#: command.c:750 command.c:770 command.c:1005 command.c:1018 command.c:1028
-#: command.c:1501 command.c:1514 command.c:1526 command.c:1539 command.c:1553
-#: command.c:1567 command.c:1597 common.c:106 copy.c:290
+#: command.c:754 command.c:774 command.c:1009 command.c:1022 command.c:1032
+#: command.c:1514 command.c:1527 command.c:1539 command.c:1552 command.c:1566
+#: command.c:1580 command.c:1610 common.c:106 copy.c:290
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:835
+#: command.c:839
 #, c-format
 msgid "\\%s: extra argument '%s' ignored\n"
 msgstr "\\%s: ©¿²¤¦h¾lªº°Ñ¼Æ '%s'\n"
 
-#: command.c:892 command.c:966 command.c:994
+#: command.c:895 command.c:970 command.c:998
 msgid "parse error at the end of line\n"
 msgstr "¦b¦æ§Àµo¥Í¤ÀªR¿ù»~\n"
 
-#: command.c:1275 command.c:1299 startup.c:183 startup.c:201
+#: command.c:1289 command.c:1314 startup.c:181 startup.c:199
 msgid "Password: "
 msgstr "±K½X: "
 
-#: command.c:1313 common.c:155 common.c:331 common.c:496
+#: command.c:1328 common.c:155 common.c:358 common.c:523
 #, c-format
 msgid "%s"
-msgstr ""
+msgstr "%s"
 
-#: command.c:1317
+#: command.c:1332
 msgid "Previous connection kept\n"
 msgstr "«O¯d¤W¤@¦¸³s±µ\n"
 
-#: command.c:1330
+#: command.c:1344
 #, c-format
 msgid "\\connect: %s"
-msgstr ""
+msgstr "\\connect: %s"
 
-#: command.c:1342
+#: command.c:1356
 #, c-format
 msgid "You are now connected to database %s.\n"
 msgstr "±z²{¦b¤w¸g³s±µ¨ì¸ê®Æ®w %s¡C\n"
 
-#: command.c:1344
+#: command.c:1358
 #, c-format
 msgid "You are now connected as new user %s.\n"
 msgstr "±z²{¦b¬O¥H·s¨Ï¥ÎªÌ %s ªº¨­¤À³s±µ¡C\n"
 
-#: command.c:1347
+#: command.c:1361
 #, c-format
 msgid "You are now connected to database %s as user %s.\n"
 msgstr "±z²{¦b¬O¥H¨Ï¥ÎªÌ %s ªº¨­¤À³s±µ¨ì¸ê®Æ®w %s¡C\n"
 
-#: command.c:1438
+#: command.c:1452
 #, c-format
 msgid "could not start editor %s\n"
 msgstr "µLªk°õ¦æ½s¿è¾¹ %s\n"
 
-#: command.c:1440
+#: command.c:1454
 msgid "could not start /bin/sh\n"
 msgstr "µLªk°õ¦æ /bin/sh\n"
 
-#: command.c:1486
+#: command.c:1499
 #, c-format
 msgid "could not open temporary file %s: %s\n"
 msgstr "µLªk¶}±ÒÁ{®ÉÀÉ®× %s: %s\n"
 
-#: command.c:1670
+#: command.c:1683
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
-msgstr "\\pset: ¤¹³\\ªº®æ¦¡¬O unaligned¡Baligned¡Bhtml¡Blatex\n"
+msgstr "\\pset: ¥i¥H¨Ï¥Îªº®æ¦¡¬O unaligned¡Baligned¡Bhtml¡Blatex\n"
 
-#: command.c:1675
+#: command.c:1688
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "¿é¥X®æ¦¡¬O %s¡C\n"
 
-#: command.c:1685
+#: command.c:1698
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "Ãä¬É­·®æ¬O %d¡C\n"
 
-#: command.c:1694
+#: command.c:1707
 msgid "Expanded display is on.\n"
 msgstr "ÂX®iÅã¥Ü¤w¥´¶}¡C\n"
 
-#: command.c:1695
+#: command.c:1708
 msgid "Expanded display is off.\n"
 msgstr "ÂX®iÅã¥Ü¤wÃö³¬¡C\n"
 
-#: command.c:1707
+#: command.c:1720
 #, c-format
 msgid "Null display is '%s'.\n"
 msgstr "Null Åã¥Ü¬° '%s'¡C\n"
 
-#: command.c:1719
+#: command.c:1732
 #, c-format
 msgid "Field separator is '%s'.\n"
 msgstr "Äæ¦ì¤À¹j²Å¸¹¬O '%s'¡C\n"
 
-#: command.c:1733
+#: command.c:1746
 msgid "Record separator is <newline>."
 msgstr "°O¿ý¤À¹j²Å¸¹¬O <newline>¡C"
 
-#: command.c:1735
+#: command.c:1748
 #, c-format
 msgid "Record separator is '%s'.\n"
 msgstr "°O¿ý¤À¹j²Å¸¹¬O '%s'¡C\n"
 
-#: command.c:1746
+#: command.c:1759
 msgid "Showing only tuples."
 msgstr "¥uÅã¥Ü¤¸²Õ¡C"
 
-#: command.c:1748
+#: command.c:1761
 msgid "Tuples only is off."
 msgstr "Ãö³¬¥uÅã¥Ü¤¸²Õ¡C"
 
-#: command.c:1764
+#: command.c:1777
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "¼ÐÃD¬O \"%s\"¡C\n"
 
-#: command.c:1766
+#: command.c:1779
 msgid "Title is unset.\n"
 msgstr "µL¼ÐÃD¡C\n"
 
-#: command.c:1782
+#: command.c:1795
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "¸ê®ÆªíÄݩʬO \"%s\"¡C\n"
 
-#: command.c:1784
+#: command.c:1797
 msgid "Table attributes unset.\n"
 msgstr "¥¼³]¸m¸ê®ÆªíÄÝ©Ê¡C\n"
 
-#: command.c:1795
+#: command.c:1808
 msgid "Using pager is on."
 msgstr "¨Ï¥Î¤À­¶¾¹¡C"
 
-#: command.c:1797
+#: command.c:1810
 msgid "Using pager is off."
 msgstr "¤£¨Ï¥Î¤À­¶¾¹¡C"
 
-#: command.c:1808
+#: command.c:1821
 msgid "Default footer is on."
 msgstr "¥´¶}¹w³]¨¬¼Ð¡C"
 
-#: command.c:1810
+#: command.c:1823
 msgid "Default footer is off."
 msgstr "Ãö³¬¹w³]¨¬¼Ð¡C"
 
-#: command.c:1816
+#: command.c:1829
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: ¤£©ú¿ï¶µ: %s\n"
 
-#: command.c:1859
+#: command.c:1872
 msgid "\\!: failed\n"
 msgstr "\\!: ¥¢±Ñ\n"
 
@@ -240,27 +240,27 @@ msgstr "\\!: ¥¢±Ñ\n"
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: µLªk½Æ»sªÅ«ü¼Ð(¤º³¡¿ù»~)\n"
 
-#: common.c:299 common.c:385
+#: common.c:326 common.c:412
 msgid "You are currently not connected to a database.\n"
 msgstr "±z¥Ø«e¨S¦³»P¸ê®Æ®w³s±µ¡C\n"
 
-#: common.c:338 common.c:506
+#: common.c:365 common.c:533
 msgid "connection to server was lost\n"
 msgstr "»P¸ê®Æ®wªº³s±µ¤¤Â_\n"
 
-#: common.c:341 common.c:509
+#: common.c:368 common.c:536
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "»P¦øªA¾¹ªº³s±µ¤w¤¤Â_¡A¹Á¸Õ­«¸m: "
 
-#: common.c:345 common.c:513
+#: common.c:372 common.c:540
 msgid "Failed.\n"
 msgstr "¥¢±Ñ¡C\n"
 
-#: common.c:355 common.c:525
+#: common.c:382 common.c:552
 msgid "Succeeded.\n"
-msgstr "¦¨¥\\¡C\n"
+msgstr "¦¨¥\¡C\n"
 
-#: common.c:393
+#: common.c:420
 #, c-format
 msgid ""
 "***(Single step mode: Verify "
@@ -269,13 +269,11 @@ msgid ""
 "***(press return to proceed or enter x and return to "
 "cancel)********************\n"
 msgstr ""
-"***(³æ¨B¼Ò¦¡: Åçµý "
-"¬d¸ß)**********************************************\n"
+"***(³æ¨B¼Ò¦¡: Åçµý ¬d¸ß)**********************************************\n"
 "%s\n"
-"***(«ö Enter ÁäÄ~Äò©Î¿é¤J x µM«á«ö Enter Áä"
-"¨ú®ø)**********************\n"
+"***(«ö Enter ÁäÄ~Äò©Î¿é¤J x µM«á«ö Enter Áä¨ú®ø)**********************\n"
 
-#: common.c:485
+#: common.c:512
 msgid ""
 "Enter data to be copied followed by a newline.\n"
 "End with a backslash and a period on a line by itself."
@@ -283,7 +281,7 @@ msgstr ""
 "¿é¤J­n½Æ»sªº¸ê®Æ¨Ã¥B´«¦æ¡C\n"
 "¦b¿W¥ßªº¤@¦æ¤W¿é¤J¤@­Ó¤Ï±×½u©M¤@­Ó¥yÂIµ²§ô¡C"
 
-#: common.c:531
+#: common.c:558
 #, c-format
 msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"
 msgstr "¦¬¨ì«D¦P¨B NOTIFY '%s'¡A³o¬O¥Ñ¦æµ{½s¸¹¬° %d ªº«áºÝ©Ò¶Ç°eªº¡C\n"
@@ -304,162 +302,158 @@ msgstr "\\copy: ¦b¦æ§À¤ÀªR¿ù»~\n"
 #: copy.c:310
 #, c-format
 msgid "\\copy: %s"
-msgstr ""
+msgstr "\\copy: %s"
 
 #: copy.c:314
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: ·N¥~¦^À³(%d)\n"
 
-#: help.c:70
+#: help.c:69
 #, c-format
 msgid "could not get current user name: %s\n"
 msgstr "µLªk¨ú±o¥Ø«eªº¨Ï¥ÎªÌ¦WºÙ: %s\n"
 
-#: help.c:79
+#: help.c:78
 msgid "This is psql, the PostgreSQL interactive terminal.\n"
 msgstr "³o¬O psql¡APostgreSQL ªº¤å¦r¼Ò¦¡¤¶­±¡C\n"
 
-#: help.c:80
+#: help.c:79
 msgid "Usage:"
-msgstr "¥Îªk:"
+msgstr "¨Ï¥Îªk:"
 
-#: help.c:81
+#: help.c:80
 msgid "  psql [options] [dbname [username]]\n"
-msgstr " psql [¿ï¶µ] [¸ê®Æ®w¦WºÙ [¨Ï¥ÎªÌ¦WºÙ]]\n"
+msgstr "  psql [¿ï¶µ] [¸ê®Æ®w¦WºÙ [¨Ï¥ÎªÌ¦WºÙ]]\n"
 
-#: help.c:82
+#: help.c:81
 msgid "Options:"
 msgstr "¿ï¶µ:"
 
-#: help.c:83
+#: help.c:82
 msgid "  -a              Echo all input from script"
 msgstr " -a               Åã¥Ü©Ò¦³¨Ó¦Û¸}¥»ªº¿é¤J"
 
-#: help.c:84
+#: help.c:83
 msgid "  -A              Unaligned table output mode (-P format=unaligned)"
-msgstr " -A               «D¹ï»ôªºªí®æ¿é¥X¼Ò¦¡(-P format=unaligned)"
+msgstr "  -A              «D¹ï»ôªºªí®æ¿é¥X¼Ò¦¡(-P format=unaligned)"
 
-#: help.c:85
+#: help.c:84
 msgid "  -c COMMAND      Run only single command (SQL or internal) and exit"
-msgstr " -c «ü¥O          ¥u°õ¦æ¤@±ø«ü¥O(SQL©Î¤º³¡«ü¥O)µM«áµ²§ô"
+msgstr "  -c «ü¥O         ¥u°õ¦æ¤@±ø«ü¥O(SQL©Î¤º³¡«ü¥O)µM«áµ²§ô"
 
-#: help.c:91
+#: help.c:90
 #, c-format
 msgid "  -d DBNAME       Specify database name to connect to (default: %s)\n"
-msgstr " -d ¸ê®Æ®w¦WºÙ    «ü©w­n³s±µªº¸ê®Æ®w¦WºÙ(¹w³]: %s)\n"
+msgstr "  -d ¸ê®Æ®w¦WºÙ   «ü©w­n³s±µªº¸ê®Æ®w¦WºÙ(¹w³]: %s)\n"
 
-#: help.c:93
+#: help.c:92
 msgid "  -e              Echo commands sent to server"
-msgstr " -e               Åã¥Ü¶Ç°eµ¹¦øªA¾¹ªº«ü¥O"
+msgstr "  -e              Åã¥Ü¶Ç°eµ¹¦øªA¾¹ªº«ü¥O"
 
-#: help.c:94
+#: help.c:93
 msgid "  -E              Display queries that internal commands generate"
 msgstr "  -E              Åã¥Ü¤º³¡«ü¥O²£¥Íªº¬d¸ß"
 
-#: help.c:95
+#: help.c:94
 msgid "  -f FILENAME     Execute commands from file, then exit"
 msgstr "  -f ÀɮצWºÙ     °õ¦æÀɮפ¤ªº«ü¥OµM«áµ²§ô"
 
-#: help.c:96
+#: help.c:95
 #, c-format
 msgid ""
 "  -F STRING       Set field separator (default: \"%s\") (-P fieldsep=)\n"
-msgstr ""
-"  -F ¦r¦ê         ³]©wÄæ¦ì¤À¹j²Å¸¹ (¹w³]: \"%s\") (-P fieldsep=)\n"
+msgstr "  -F ¦r¦ê         ³]©wÄæ¦ì¤À¹j²Å¸¹ (¹w³]: \"%s\") (-P fieldsep=)\n"
 
-#: help.c:101
+#: help.c:100
 #, c-format
 msgid "  -h HOSTNAME     Specify database server host (default: %s)\n"
 msgstr "  -h ¥D¾÷¦WºÙ     «ü©w¸ê®Æ®w¦øªA¾¹¥D¾÷ (¹w³]: %s)\n"
 
-#: help.c:102
+#: help.c:101
 msgid "local socket"
-msgstr ""
+msgstr "local socket"
 
-#: help.c:104
+#: help.c:103
 msgid "  -H              HTML table output mode (-P format=html)"
 msgstr "  -H              HTML ªí®æ¿é¥X¼Ò¦¡ (-P format=html)"
 
-#: help.c:105
+#: help.c:104
 msgid "  -l              List available databases, then exit"
 msgstr "  -l              ¦C¥X©Ò¦³¥i¥Î¸ê®Æ®w¡AµM«á°h¥X"
 
-#: help.c:106
+#: help.c:105
 msgid "  -n              Disable enhanced command line editing (readline)"
-msgstr "  -n              Ãö³¬¼W±jªº«ü¥O¦C½s¿è¥\\¯à (readline)"
+msgstr "  -n              Ãö³¬¼W±jªº«ü¥O¦C½s¿è¥\¯à (readline)"
 
-#: help.c:107
+#: help.c:106
 msgid "  -o FILENAME     Send query results to file (or |pipe)"
-msgstr " -o ÀɮצWºÙ      ±N¬d¸ßµ²ªG¶Ç°e¦ÜÀÉ®×(©ÎªÌ | ºÞ¹D)"
+msgstr "  -o ÀɮצWºÙ     ±N¬d¸ßµ²ªG¶Ç°e¦ÜÀÉ®×(©ÎªÌ | ºÞ¹D)"
 
-#: help.c:111
+#: help.c:110
 #, c-format
 msgid "  -p PORT         Specify database server port (default: %s)\n"
-msgstr " -p PORT          «ü©w¸ê®Æ®w¦øªA¾¹°ð¸¹ (¹w³]: %s)\n"
+msgstr "  -p PORT         «ü©w¸ê®Æ®w¦øªA¾¹°ð¸¹ (¹w³]: %s)\n"
 
-#: help.c:114
+#: help.c:113
 msgid ""
 "  -P VAR[=ARG]    Set printing option 'VAR' to 'ARG' (see \\pset command)"
-msgstr ""
-"  -P VAR[=ARG]    §â¥´¦L¿ï¶µ 'VAR' ³]¸m¬° 'ARG' (¨£ \\pset «ü¥O)"
+msgstr "  -P VAR[=ARG]    §â¥´¦L¿ï¶µ 'VAR' ³]¸m¬° 'ARG' (¨£ \\pset «ü¥O)"
 
-#: help.c:115
+#: help.c:114
 msgid "  -q              Run quietly (no messages, only query output)"
 msgstr "  -q              ¦wÀR°õ¦æ (¨S¦³°T®§¡A¥u¦³¬d¸ß¿é¥X)"
 
-#: help.c:116
+#: help.c:115
 msgid ""
 "  -R STRING       Set record separator (default: newline) (-P recordsep=)"
-msgstr ""
-"  -R ¦r¦ê         ³]©w°O¿ý¤À¹j²Å¸¹ (¹w³]: ·s¦æ) (-P recordsep=)"
+msgstr "  -R ¦r¦ê         ³]©w°O¿ý¤À¹j²Å¸¹ (¹w³]: ·s¦æ) (-P recordsep=)"
 
-#: help.c:117
+#: help.c:116
 msgid "  -s              Single step mode (confirm each query)"
 msgstr "  -s              ³æ¨B¼Ò¦¡ (½T»{¨C­Ó¬d¸ß)"
 
-#: help.c:118
+#: help.c:117
 msgid "  -S              Single line mode (end of line terminates SQL command)"
 msgstr "  -S              ³æ¦æ¼Ò¦¡ (¤@¦æµ²§ô¦P®É¤]ªí¥ÜµÛ SQL «ü¥Oµ²§ô)"
 
-#: help.c:119
+#: help.c:118
 msgid "  -t              Print rows only (-P tuples_only)"
 msgstr "  -t              ¥u¦C¦L¦æ (-P tuples_onle)"
 
-#: help.c:120
+#: help.c:119
 msgid ""
 "  -T TEXT         Set HTML table tag attributes (width, border) (-P "
 "tableattr=)"
 msgstr ""
-"  -T ¤å¥»         ³]©w HTML ªí®æ¼Ð°OÄÝ©Ê (width, border) (-P "
-"tableattr=)"
+"  -T ¤å¥»         ³]©w HTML ªí®æ¼Ð°OÄÝ©Ê (width, border) (-P tableattr=)"
 
-#: help.c:126
+#: help.c:125
 #, c-format
 msgid "  -U NAME         Specify database user name (default: %s)\n"
 msgstr "  -U ¨Ï¥ÎªÌ¦WºÙ   «ü©w¸ê®Æ®w¨Ï¥ÎªÌ (¹w³]: %s)\n"
 
-#: help.c:128
+#: help.c:127
 msgid "  -v NAME=VALUE   Set psql variable 'NAME' to 'VALUE'"
 msgstr "  -v ¦WºÙ=¼Æ­È    ³]©w psql ÅÜ¼Æ '¦WºÙ' ¬° '¼Æ­È'"
 
-#: help.c:129
+#: help.c:128
 msgid "  -V              Show version information and exit"
 msgstr "  -V              Åã¥Üª©¥»¸ê°TµM«áµ²§ô"
 
-#: help.c:130
+#: help.c:129
 msgid "  -W              Prompt for password (should happen automatically)"
 msgstr "  -W              ´£¥Ü¿é¤J±K½X (À³¸Ó¦Û°Ê¸ß°Ý)"
 
-#: help.c:131
+#: help.c:130
 msgid "  -x              Turn on expanded table output (-P expanded)"
 msgstr "  -x              ¥´¶}ÂX®iªí®æ¿é¥X (-P expended)"
 
-#: help.c:132
+#: help.c:131
 msgid "  -X              Do not read startup file (~/.psqlrc)"
 msgstr "  -X              ¤£­nŪ¨ú±Ò°ÊÀÉ®× (~/.psqlrc)"
 
-#: help.c:135
+#: help.c:134
 msgid ""
 "\n"
 "For more information, type \"\\?\" (for internal commands) or \"\\help\"\n"
@@ -469,16 +463,17 @@ msgid ""
 "Report bugs to <pgsql-bugs@postgresql.org>."
 msgstr ""
 "\n"
-"¦b psql ¸ÌÁä¤J \"\\?\" (¥Î©ó¤º³¡«ü¥O) ©ÎªÌ \"\\help\"\n (¥Î©ó SQL «ü¥O)¡A"
-"©ÎªÌ°Ñ¦Ò PostgreSQL ¤å¥ó¸Ìªº psql ³¹¸`¡A¥H¨ú±o§ó¦h¬ÛÃö¸ê°T¡C\n"
+"¦b psql ¸ÌÁä¤J \"\\?\" (¥Î©ó¤º³¡«ü¥O) ©ÎªÌ \"\\help\"\n"
+" (¥Î©ó SQL «ü¥O)¡A©ÎªÌ°Ñ¦Ò PostgreSQL ¤å¥ó¸Ìªº psql "
+"³¹¸`¡A¥H¨ú±o§ó¦h¬ÛÃö¸ê°T¡C\n"
 "\n"
 "¦V <pgsql-bugs@postgresql.org> ¦^³ø¿ù»~¡C"
 
-#: help.c:194
+#: help.c:192
 msgid " \\a             toggle between unaligned and aligned output mode\n"
 msgstr " \\a             ¦b«D¹ï»ô©M¹ï»ôªº¿é¥X¼Ò¦¡¤§¶¡¤Á´«\n"
 
-#: help.c:195
+#: help.c:193
 #, c-format
 msgid ""
 " \\c[onnect] [DBNAME|- [USER]]\n"
@@ -487,100 +482,96 @@ msgstr ""
 " \\c[onnect] [¸ê®Æ®w¦WºÙ|- [¨Ï¥ÎªÌ¦WºÙ]]\n"
 "                ³s±µ¨ì·sªº¸ê®Æ®w (¥Ø«e¬O \"%s\")\n"
 
-#: help.c:198
+#: help.c:196
 msgid " \\C TITLE       set table title\n"
 msgstr " \\C ¼ÐÃD        ³]©wªí®æ¼ÐÃD\n"
 
-#: help.c:199
+#: help.c:197
 msgid " \\cd [DIRNAME]  change the current working directory\n"
 msgstr " \\cd [¥Ø¿ý¦W]   §ïÅܥثeªº¤u§@¥Ø¿ý\n"
 
-#: help.c:200
+#: help.c:198
 msgid " \\copy ...      perform SQL COPY with data stream to the client host\n"
 msgstr " \\copy ...      °õ¦æ SQL COPY¡A¸ê®Æ¬y«ü¦V«È¤áºÝ¥D¾÷\n"
 
-#: help.c:201
+#: help.c:199
 msgid " \\copyright     show PostgreSQL usage and distribution terms\n"
 msgstr " \\copyright     Åã¥Ü PostgreSQL ¨Ï¥Î©Mµo¦æ±ø´Ú\n"
 
-#: help.c:202
+#: help.c:200
 msgid " \\d TABLE       describe table (or view, index, sequence)\n"
 msgstr " \\d ¸ê®Æªí      ´y­z¸ê®Æªí (©Î·§Æ[¡B¯Á¤Þ¡B§Ç¦C)\n"
 
-#: help.c:203
+#: help.c:201
 msgid " \\d{t|i|s|v}... list tables/indexes/sequences/views\n"
 msgstr " \\d{t|i|s|v}... ¦C¥X¸ê®Æªí/¯Á¤Þ/§Ç¦C/·§Æ[\n"
 
-#: help.c:204
+#: help.c:202
 msgid ""
 " \\d{p|S|l}      list access privileges, system tables, or large objects\n"
-msgstr ""
-" \\d{p|S|l}      ¦C¥X¦s¨úÅv­­¡B¨t²Î¸ê®Æªí©Î¤j«¬ª«¥ó\n"
+msgstr " \\d{p|S|l}      ¦C¥X¦s¨úÅv­­¡B¨t²Î¸ê®Æªí©Î¤j«¬ª«¥ó\n"
 
-#: help.c:205
+#: help.c:203
 msgid " \\da            list aggregate functions\n"
 msgstr " \\da            ¦C¥X»E¶°¨ç¼Æ\n"
 
-#: help.c:206
+#: help.c:204
 msgid " \\dd NAME       show comment for table, type, function, or operator\n"
 msgstr " \\dd ¦W¦r       Åã¥Ü¸ê®Æªí¡B«¬§O¡B¨ç¦¡©Î¹Bºâ¤lªºª`ÄÀ\n"
 
-#: help.c:207
+#: help.c:205
 msgid " \\df            list functions\n"
 msgstr " \\df            ¦C¥X¨ç¦¡\n"
 
-#: help.c:208
+#: help.c:206
 msgid " \\do            list operators\n"
 msgstr " \\do            ¦C¥X¹Bºâ¤l\n"
 
-#: help.c:209
+#: help.c:207
 msgid " \\dT            list data types\n"
 msgstr " \\dT            ¦C¥X¸ê®Æ«¬§O\n"
 
-#: help.c:210
+#: help.c:208
 msgid ""
 " \\e FILENAME    edit the current query buffer or file with external editor\n"
-msgstr ""
-" \\e ¤å¥ó¦W      ¨Ï¥Î¥~³¡½s¿è¾¹½s¿è¥Ø«eªº¬d¸ß½w½Ä°Ï©ÎÀÉ®×\n"
+msgstr " \\e ¤å¥ó¦W      ¨Ï¥Î¥~³¡½s¿è¾¹½s¿è¥Ø«eªº¬d¸ß½w½Ä°Ï©ÎÀÉ®×\n"
 
-#: help.c:211
+#: help.c:209
 msgid " \\echo TEXT     write text to standard output\n"
 msgstr " \\echo ¤å¦r     ±N¤å¦r¼g¦Ü¼Ð·Ç¿é¥X\n"
 
-#: help.c:212
+#: help.c:210
 msgid " \\encoding ENCODING  set client encoding\n"
 msgstr " \\encoding ½s½X      ³]©w«È¤áºÝ½s½X\n"
 
-#: help.c:213
+#: help.c:211
 msgid " \\f STRING      set field separator\n"
 msgstr " \\f ¦r¦ê        ³]©wÄæ¦ì¤À¹j²Å¸¹\n"
 
-#: help.c:214
+#: help.c:212
 msgid ""
 " \\g FILENAME    send SQL command to server (and write results to file or "
 "|pipe)\n"
-msgstr ""
-" \\g ÀɮצWºÙ    ¦V¦øªA¾¹µo°e SQL «ü¥O (¨Ã¥B§âµ²ªG¼g¤JÀɮשΠ"
-"|ºÞ¹D)\n"
+msgstr " \\g ÀɮצWºÙ    ¦V¦øªA¾¹µo°e SQL «ü¥O (¨Ã¥B§âµ²ªG¼g¤JÀɮשΠ|ºÞ¹D)\n"
 
-#: help.c:215
+#: help.c:213
 msgid " \\h NAME        help on syntax of SQL commands, * for all commands\n"
 msgstr " \\h ¦WºÙ        SQL «ü¥Oªº»yªk»¡©ú¡A¥Î * ¥i¥H¬Ý©Ò¦³«ü¥Oªº»¡©ú\n"
 
-#: help.c:216
+#: help.c:214
 #, c-format
 msgid " \\H             toggle HTML output mode (currently %s)\n"
 msgstr " \\H             ¦b HTML ¿é¥X¼Ò¦¡¤§¶¡¤Á´« (¥Ø«e¬O %s)\n"
 
-#: help.c:218
+#: help.c:216
 msgid " \\i FILENAME    execute commands from file\n"
 msgstr " \\i ÀɮצWºÙ    °õ¦æÀɮפ¤ªº«ü¥O\n"
 
-#: help.c:219
+#: help.c:217
 msgid " \\l             list all databases\n"
 msgstr " \\l             ¦C¥X©Ò¦³¸ê®Æ®w\n"
 
-#: help.c:220
+#: help.c:218
 msgid ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                large object operations\n"
@@ -588,15 +579,15 @@ msgstr ""
 " \\lo_export, \\lo_import, \\lo_list, \\lo_unlink\n"
 "                ¤j«¬ª«¥ó¾Þ§@\n"
 
-#: help.c:222
+#: help.c:220
 msgid " \\o FILENAME    send all query results to file or |pipe\n"
 msgstr " \\o ÀɮצWºÙ    ±N¬d¸ßµ²ªG¶Ç°e¦ÜÀɮשΠ|ºÞ¹D\n"
 
-#: help.c:223
+#: help.c:221
 msgid " \\p             show the content of the current query buffer\n"
 msgstr " \\p             Åã¥Ü¥Ø«e¬d¸ß½w½Ä°Ïªº¤º®e\n"
 
-#: help.c:224
+#: help.c:222
 msgid ""
 " \\pset VAR      set table output option (VAR := {format|border|expanded|\n"
 "                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
@@ -604,61 +595,61 @@ msgstr ""
 " \\pset VAR      ³]©w¸ê®Æªíªº¿é¥X¿ï¶µ (VAR := {foramt|border|expaned|\n"
 "                fieldsep|null|recordsep|tuples_only|title|tableattr|pager})\n"
 
-#: help.c:226
+#: help.c:224
 msgid " \\q             quit psql\n"
 msgstr " \\q             °h¥X psql\n"
 
-#: help.c:227
+#: help.c:225
 msgid " \\qecho TEXT    write text to query output stream (see \\o)\n"
 msgstr " \\qecho ¤å¦r    ±N¤å¦r¼g¤J¬d¸ß¿é¥X¦ê¬y (°Ñ¨£ \\o)\n"
 
-#: help.c:228
+#: help.c:226
 msgid " \\r             reset (clear) the query buffer\n"
 msgstr " \\r             ­«¸m (²M²z) ¬d¸ß½w½Ä°Ï\n"
 
-#: help.c:229
+#: help.c:227
 msgid " \\s FILENAME    print history or save it to file\n"
 msgstr " \\s ÀɮצWºÙ    ¦C¦L¾ú¥v°O¿ý©ÎµÛ±N¨äÀx¦s¨ìÀÉ®×\n"
 
-#: help.c:230
+#: help.c:228
 msgid " \\set NAME VALUE  set internal variable\n"
 msgstr " \\set ¦WºÙ ¼Æ­È   ³]©w¤º³¡ÅܼÆ\n"
 
-#: help.c:231
+#: help.c:229
 #, c-format
 msgid " \\t             show only rows (currently %s)\n"
 msgstr " \\t             ¥uÅã¥Ü¦C (¥Ø«e¬O %s)\n"
 
-#: help.c:233
+#: help.c:231
 msgid " \\T TEXT        set HTML table tag attributes\n"
 msgstr " \\T ¤å¥»        ³]©w HTML ªí®æ¼ÐÅÒÄÝ©Ê\n"
 
-#: help.c:234
+#: help.c:232
 msgid " \\unset NAME    unset (delete) internal variable\n"
 msgstr " \\unset ¦WºÙ    §R°£¤º³¡ÅܼÆ\n"
 
-#: help.c:235
+#: help.c:233
 msgid " \\w FILENAME    write current query buffer to file\n"
 msgstr " \\w ÀɮצWºÙ    ±N¥Ø«e¬d¸ß½w½Ä°Ï¼g¤JÀÉ®×\n"
 
-#: help.c:236
+#: help.c:234
 #, c-format
 msgid " \\x             toggle expanded output (currently %s)\n"
 msgstr " \\x             ¦bÂX®i¿é¥X¤§¶¡¤Á´« (¥Ø«e¬O %s)\n"
 
-#: help.c:238
+#: help.c:236
 msgid " \\z             list table access privileges\n"
 msgstr " \\z             ¦C¥X¸ê®Æªí¦s¨úÅv­­\n"
 
-#: help.c:239
+#: help.c:237
 msgid " \\! [COMMAND]   execute command in shell or start interactive shell\n"
 msgstr " \\! [«ü¥O]      ¦b shell ¸Ì°õ¦æ«ü¥O©Î¶}±Ò¤@­Ó shell\n"
 
-#: help.c:266
+#: help.c:264
 msgid "Available help:"
 msgstr "¥i¥Î»¡©ú:"
 
-#: help.c:297
+#: help.c:295
 #, c-format
 msgid ""
 "Command:     %s\n"
@@ -673,7 +664,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: help.c:308
+#: help.c:306
 #, c-format
 msgid ""
 "No help available for '%-.*s'.\n"
@@ -682,37 +673,37 @@ msgstr ""
 "¨S¦³ '%-.*s' ªº»¡©ú¡C\n"
 "¥Î¤£±a°Ñ¼Æªº \\h Åã¥Ü¥Ø«e¾Ö¦³ªº»¡©ú¡C\n"
 
-#: input.c:178
+#: input.c:176
 #, c-format
 msgid "could not save history to %s: %s\n"
 msgstr "µLªk±N¾ú¥v°O¿ýÀx¦s¨ì %s: %s\n"
 
-#: large_obj.c:66
+#: large_obj.c:69
 msgid "Warning: Your transaction in progress has been committed."
 msgstr "ĵ§i: ±zªº¥æ©ö¤w¸g½T»{¡C"
 
-#: large_obj.c:68
+#: large_obj.c:71
 msgid "Warning: Your transaction in progress has been rolled back."
 msgstr "ĵ§i: ±zªº¥æ©ö¤w¸g¨ú®ø¡C"
 
-#: large_obj.c:95
+#: large_obj.c:98
 msgid "\\lo_export: not connected to a database\n"
 msgstr "\\lo_export: ¥¼»P¸ê®Æ®w³s±µ\n"
 
-#: large_obj.c:162
+#: large_obj.c:165
 msgid "\\lo_import: not connected to a database\n"
 msgstr "\\lo_import: ¥¼»P¸ê®Æ®w³s±µ\n"
 
-#: large_obj.c:276
+#: large_obj.c:281
 msgid "\\lo_unlink: not connected to a database\n"
 msgstr "\\lo_unlink: ¥¼»P¸ê®Æ®w³s±µ\n"
 
-#: describe.c:57 describe.c:110 describe.c:169 describe.c:221 describe.c:269
-#: describe.c:401 describe.c:530 describe.c:1034 large_obj.c:353
+#: describe.c:57 describe.c:110 describe.c:169 describe.c:220 describe.c:268
+#: describe.c:400 describe.c:529 describe.c:1033 large_obj.c:362
 msgid "Description"
 msgstr "´y­z"
 
-#: large_obj.c:361
+#: large_obj.c:370
 msgid "Large objects"
 msgstr "¤j«¬ª«¥ó"
 
@@ -721,29 +712,29 @@ msgstr "¤j«¬ª«¥ó"
 msgid "Use \"\\q\" to leave %s.\n"
 msgstr "¨Ï¥Î \"\\q\" Â÷¶} %s.\n"
 
-#: print.c:370
+#: print.c:447
 msgid "(No rows)\n"
 msgstr "(¨S¦³¸ê®Æ)\n"
 
-#: print.c:1075
+#: print.c:1221
 msgid "(1 row)"
 msgstr "(1 ¦C)"
 
-#: print.c:1077
+#: print.c:1223
 #, c-format
 msgid "(%d rows)"
 msgstr "(%d ¦C)"
 
-#: startup.c:141 startup.c:615
+#: startup.c:140 startup.c:611
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: °O¾ÐÅé¥ÎºÉ\n"
 
-#: startup.c:177
+#: startup.c:175
 msgid "User name: "
 msgstr "¨Ï¥ÎªÌ¦WºÙ:"
 
-#: startup.c:286
+#: startup.c:284
 #, c-format
 msgid ""
 "Welcome to %s, the PostgreSQL interactive terminal.\n"
@@ -764,27 +755,27 @@ msgstr ""
 "       \\q °h¥X\n"
 "\n"
 
-#: startup.c:461
+#: startup.c:457
 #, c-format
 msgid "%s: couldn't set printing parameter %s\n"
 msgstr "%s: µLªk³]©w¦C¦L°Ñ¼Æ %s\n"
 
-#: startup.c:507
+#: startup.c:503
 #, c-format
 msgid "%s: could not delete variable %s\n"
 msgstr "%s: µLªk§R°£ÅÜ¼Æ %s\n"
 
-#: startup.c:517
+#: startup.c:513
 #, c-format
 msgid "%s: could not set variable %s\n"
 msgstr "%s: µLªk³]©wÅÜ¼Æ %s\n"
 
-#: startup.c:548 startup.c:563
+#: startup.c:544 startup.c:559
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr "¥Î '%s --help' Àò±o§ó¦h°T®§¡C\n"
 
-#: startup.c:556
+#: startup.c:552
 #, c-format
 msgid ""
 "%s was compiled without support for long options.\n"
@@ -793,33 +784,33 @@ msgstr ""
 "%s ½sĶ®É¥¼¥[¤Jªø¿ï¶µ¤ä´©¡C\n"
 "¥Î --help Åã¥Ü¿ï¶µªº»¡©ú¡C\n"
 
-#: startup.c:581
+#: startup.c:577
 #, c-format
 msgid "%s: warning: extra option %s ignored\n"
 msgstr "%s: ĵ§i: ©¿²¤ÃB¥~ªº¿ï¶µ %s\n"
 
-#: startup.c:588
+#: startup.c:584
 #, c-format
 msgid "%s: Warning: The -u option is deprecated. Use -U.\n"
 msgstr "%s: ĵ§i: -u ¿ï¶µ¤w¸g¼o±ó¡A½Ð¥Î -U¡C\n"
 
-#: startup.c:644
+#: startup.c:640
 msgid "contains support for: "
 msgstr "¥Ø«e¤ä´©:"
 
-#: startup.c:647
+#: startup.c:643
 msgid "readline"
-msgstr ""
+msgstr "readline"
 
-#: startup.c:657
+#: startup.c:653
 msgid "history"
 msgstr "¾ú¥v°O¿ý"
 
-#: startup.c:666
+#: startup.c:662
 msgid "multibyte"
 msgstr "¦h¦ì¤¸²Õ¦r¤¸"
 
-#: startup.c:674
+#: startup.c:670
 msgid ""
 "Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group\n"
 "Portions Copyright (c) 1996, Regents of the University of California\n"
@@ -828,10 +819,10 @@ msgid ""
 msgstr ""
 "Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group\n"
 "Portions Copyright (c) 1996, Regents of the University of California\n"
-"¾\\Ū COPYRIGHT ÀɮשΨϥΠ\\copyright «ü¥O¬d¬Ý\n"
+"¾\Ū COPYRIGHT ÀɮשΨϥΠ\\copyright «ü¥O¬d¬Ý\n"
 "¨Ï¥Î©Mµo¦æ±ø´Ú¡C"
 
-#: startup.c:699
+#: startup.c:695
 #, c-format
 msgid ""
 "SSL connection (cipher: %s, bits: %i)\n"
@@ -840,8 +831,8 @@ msgstr ""
 "SSL ³s±µ (¥[±K: %s, ¦ì¤¸: %i)\n"
 "\n"
 
-#: describe.c:56 describe.c:100 describe.c:158 describe.c:220 describe.c:260
-#: describe.c:401 describe.c:1028
+#: describe.c:56 describe.c:100 describe.c:158 describe.c:219 describe.c:259
+#: describe.c:400 describe.c:1027
 msgid "Name"
 msgstr "¦WºÙ"
 
@@ -865,7 +856,7 @@ msgstr "µ²ªG¸ê®Æ«¬§O"
 msgid "Argument data types"
 msgstr "°Ñ¼Æ¸ê®Æ«¬§O"
 
-#: describe.c:109 describe.c:260 describe.c:1029
+#: describe.c:109 describe.c:259 describe.c:1028
 msgid "Owner"
 msgstr "¾Ö¦³ªÌ"
 
@@ -893,235 +884,236 @@ msgstr "¤j¤p"
 msgid "List of data types"
 msgstr "¸ê®Æ«¬§O¦Cªí"
 
-#: describe.c:220
+#: describe.c:219
 msgid "Left arg type"
 msgstr "¥ª°Ñ¼Æ«¬§O"
 
-#: describe.c:220
+#: describe.c:219
 msgid "Right arg type"
 msgstr "¥k°Ñ¼Æ«¬§O"
 
-#: describe.c:221
+#: describe.c:220
 msgid "Result type"
 msgstr "µ²ªG«¬§O"
 
-#: describe.c:236
+#: describe.c:235
 msgid "List of operators"
 msgstr "¹Bºâ¤l¦Cªí"
 
-#: describe.c:264
+#: describe.c:263
 msgid "Encoding"
 msgstr "½s½X"
 
-#: describe.c:279
+#: describe.c:278
 msgid "List of databases"
 msgstr "¸ê®Æ®w¦Cªí"
 
-#: describe.c:306
+#: describe.c:305
 msgid "Table"
 msgstr "¸ê®Æªí"
 
-#: describe.c:306
+#: describe.c:305
 msgid "Access privileges"
 msgstr "¦s¨úÅv­­"
 
-#: describe.c:320
+#: describe.c:319
 #, c-format
 msgid "Access privileges for database \"%s\""
 msgstr "¸ê®Æ®w \"%s\" ªº¦s¨úÅv­­"
 
-#: describe.c:401
+#: describe.c:400
 msgid "Object"
 msgstr "ª«¥ó"
 
-#: describe.c:402
+#: describe.c:401
 msgid "aggregate"
 msgstr "»E¶°"
 
-#: describe.c:402
+#: describe.c:401
 msgid "function"
 msgstr "¨ç¦¡"
 
-#: describe.c:402
+#: describe.c:401
 msgid "operator"
 msgstr "¹Bºâ¤l"
 
-#: describe.c:403
+#: describe.c:402
 msgid "data type"
 msgstr "¸ê®Æ«¬§O"
 
-#: describe.c:403 describe.c:1028
+#: describe.c:402 describe.c:1027
 msgid "table"
 msgstr "¸ê®Æªí"
 
-#: describe.c:403 describe.c:1028
+#: describe.c:402 describe.c:1027
 msgid "view"
 msgstr "᤮["
 
-#: describe.c:404 describe.c:1028
+#: describe.c:403 describe.c:1027
 msgid "index"
 msgstr "¯Á¤Þ"
 
-#: describe.c:404 describe.c:1028
+#: describe.c:403 describe.c:1027
 msgid "sequence"
 msgstr "§Ç¦C"
 
-#: describe.c:404
+#: describe.c:403
 msgid "rule"
 msgstr "³W«h"
 
-#: describe.c:405
+#: describe.c:404
 msgid "trigger"
 msgstr "IJµo"
 
-#: describe.c:422
+#: describe.c:421
 msgid "Object descriptions"
 msgstr "ª«¥ó´y­z"
 
-#: describe.c:503
+#: describe.c:502
 #, c-format
 msgid "Did not find any relation named \"%s\".\n"
 msgstr "¨S¦³§ä¨ì¥ô¦ó¦WºÙ¬° \"%s\" ªºÃöÁp¡C\n"
 
-#: describe.c:517
+#: describe.c:516
 msgid "Column"
 msgstr "¦C"
 
-#: describe.c:518 describe.c:1029
+#: describe.c:517 describe.c:1028
 msgid "Type"
 msgstr "«¬§O"
 
-#: describe.c:524
+#: describe.c:523
 msgid "Modifiers"
 msgstr "­×¹¢µü"
 
-#: describe.c:628
+#: describe.c:627
 #, c-format
 msgid "Table \"%s\""
 msgstr "¸ê®Æªí \"%s\""
 
-#: describe.c:631
+#: describe.c:630
 #, c-format
 msgid "View \"%s\""
 msgstr "᤮[ \"%s\""
 
-#: describe.c:634
+#: describe.c:633
 #, c-format
 msgid "Sequence \"%s\""
 msgstr "§Ç¦C \"%s\""
 
-#: describe.c:637
+#: describe.c:636
 #, c-format
 msgid "Index \"%s\""
 msgstr "¯Á¤Þ \"%s\""
 
-#: describe.c:640
+#: describe.c:639
 #, c-format
 msgid "Special relation \"%s\""
 msgstr "¯S®íÃöÁp \"%s\""
 
-#: describe.c:643
+#: describe.c:642
 #, c-format
 msgid "TOAST table \"%s\""
 msgstr "TOAST ¸ê®Æªí \"%s\""
 
-#: describe.c:646
+#: describe.c:645
 #, c-format
 msgid "?%c? \"%s\""
-msgstr ""
+msgstr "?%c? \"%s\""
 
-#: describe.c:676
+#: describe.c:675
 msgid "unique "
 msgstr "°ß¤@ "
 
-#: describe.c:681
+#: describe.c:680
 msgid " (primary key)"
 msgstr " (¥DÁä)"
 
-#: describe.c:686
+#: describe.c:685
 #, c-format
 msgid "Index predicate: %s"
 msgstr "¯Á¤Þ­zµü: %s"
 
-#: describe.c:701
+#: describe.c:700
 #, c-format
 msgid "View definition: %s"
 msgstr "·§Æ[©w¸q: %s"
 
-#: describe.c:817
+#: describe.c:816
 msgid "Indexes"
 msgstr "¯Á¤Þ"
 
-#: describe.c:832
+#: describe.c:831
 msgid "Primary key"
 msgstr "¥DÁä"
 
-#: describe.c:847
+#: describe.c:846
 msgid "Unique keys"
 msgstr "°ß¤@Áä­È"
 
-#: describe.c:862
+#: describe.c:861
 msgid "Check constraints"
 msgstr "Àˬd­­¨î"
 
-#: describe.c:865
+#: describe.c:864
 #, c-format
 msgid "%s: \"%s\" %s"
-msgstr ""
+msgstr "%s:  \"%s\" %s"
 
-#: describe.c:868
+#: describe.c:867
 #, c-format
 msgid "%*s  \"%s\" %s"
-msgstr ""
+msgstr "%*s  \"%s\" %s"
 
-#: describe.c:876
+#: describe.c:875
 msgid "Rules"
 msgstr "³W«h"
 
-#: describe.c:891
+#: describe.c:890
 msgid "Triggers"
 msgstr "IJµo"
 
-#: describe.c:962
+#: describe.c:961
 msgid "User name"
 msgstr "¨Ï¥ÎªÌ¦WºÙ"
 
-#: describe.c:962
+#: describe.c:961
 msgid "User ID"
 msgstr "¨Ï¥ÎªÌ ID"
 
-#: describe.c:963
+#: describe.c:962
 msgid "superuser, create database"
 msgstr "¶W¯Å¨Ï¥ÎªÌ¡A«Ø¥ß¸ê®Æ®w"
 
-#: describe.c:964
+#: describe.c:963
 msgid "superuser"
 msgstr "¶W¯Å¨Ï¥ÎªÌ"
 
-#: describe.c:964
+#: describe.c:963
 msgid "create database"
 msgstr "«Ø¥ß¸ê®Æ®w"
 
-#: describe.c:965
+#: describe.c:964
 msgid "Attributes"
 msgstr "ÄÝ©Ê"
 
-#: describe.c:979
+#: describe.c:978
 msgid "List of database users"
-msgstr "¸ê®Æ®w¨Ï¥ÎªÌ¦Cªí" 
+msgstr "¸ê®Æ®w¨Ï¥ÎªÌ¦Cªí"
 
-#: describe.c:1029
+#: describe.c:1028
 msgid "special"
 msgstr "¯S®í"
 
-#: describe.c:1072
+#: describe.c:1071
 msgid "No matching relations found.\n"
 msgstr "¨S¦³§ä¨ì¤Ç°tªºÃöÁp¡C\n"
 
-#: describe.c:1074
+#: describe.c:1073
 msgid "No relations found.\n"
 msgstr "§ä¤£¨ìÃöÁp¡C\n"
 
-#: describe.c:1079
+#: describe.c:1078
 msgid "List of relations"
 msgstr "ÃöÁp¦Cªí"
+
diff --git a/src/interfaces/libpq/de.po b/src/interfaces/libpq/de.po
index 44a4084496..2455aef28c 100644
--- a/src/interfaces/libpq/de.po
+++ b/src/interfaces/libpq/de.po
@@ -1,14 +1,14 @@
 # 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ültiger Authentifizierungsdienstname »%s«, ignoriert\n"
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ungültiges 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 ""
 "\tLäuft 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 ""
 "\tLäuft 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 "ungültige 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 "ungültige 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 unterstützt 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 "ungültiger Verbindungszustand, möglicherweise 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 "ungültiger Verbindungszustand %c, möglicherweise 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 "ungültiger »setenv«-Zustand %c, möglicherweise ein Speicherproblem\n"
 
-#: fe-connect.c:1622
+#: fe-connect.c:1630
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "ungültiger 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 "ungültiger Zustand %c, möglicherweise 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 schließendes Anführungszeichen (\") in der Zeichenkette der "
 "Verbindugsdaten\n"
 
-#: fe-connect.c:2497
+#: fe-connect.c:2505
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "ungültige 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 (verfügbarer Platz: %d, benötigter 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 Größe %lu wird nicht von pqGetInt unterstützt\n"
 
-#: fe-misc.c:316
+#: fe-misc.c:319
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "Integer der Größe %lu wird nicht von pqPutInt unterstützt\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 heißt wahrscheinlich, daß der Server abnormal beendete\n"
 "\tbevor oder während 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"
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index 224d7cb8b5..7ca91b821c 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,5 +1,5 @@
-# $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
diff --git a/src/interfaces/libpq/ru.po b/src/interfaces/libpq/ru.po
index 0e6bdfcbd2..4c0173e8ca 100644
--- a/src/interfaces/libpq/ru.po
+++ b/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 "ÎÅÐÒÁ×ÉÌØÎÏÅ ÉÍÑ ÓÅÒ×ÉÓÁ ÁÕÔÅÎÔÉÆÉËÁÃÉÉ \"%s\", ÉÇÎÏÒÉÒÕÅÔÓÑ\n"
 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 "ÐÒÉÛÌÏ ÓÏÏÂÝÅÎÉÅ ÏÔ ÓÅÒ×ÅÒÁ ÔÉÐÁ 0x%02x ÐÒÉ ÈÏÌÏÓÔÏÍ ÈÏÄÕ\n"
 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 "ÏÛÉÂËÁ ÐÒÉ ÚÁÐÉÓÉ × ÆÁÊÌ \"%s\"\n"
 
 #: 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 "ÎÅ × ÓÏÓÔÏÑÎÉÉ ÏÐÒÅÄÅÌÉÔØ OID ÆÕÎËÃÉÉ loread\n"
 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"
diff --git a/src/interfaces/libpq/zh_CN.po b/src/interfaces/libpq/zh_CN.po
index 3aa1f0959e..78c2efafc8 100644
--- a/src/interfaces/libpq/zh_CN.po
+++ b/src/interfaces/libpq/zh_CN.po
@@ -1,12 +1,12 @@
 # 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 "ÎÞ·¨ÅжϺ¯Êý loread µÄ OID\n"
 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"
diff --git a/src/interfaces/libpq/zh_TW.po b/src/interfaces/libpq/zh_TW.po
index 27639b9c74..4d718d29ba 100644
--- a/src/interfaces/libpq/zh_TW.po
+++ b/src/interfaces/libpq/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 17:47+0100\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"
@@ -13,57 +13,57 @@ msgstr ""
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: fe-auth.c:229
+#: fe-auth.c:228
 #, c-format
 msgid "Kerberos 4 error: %s\n"
 msgstr "Kerberos 4 ¿ù»~: %s\n"
 
-#: fe-auth.c:393
+#: fe-auth.c:391
 #, c-format
 msgid "could not set socket to blocking mode: %s\n"
 msgstr "µLªk±N socket ³]¬°ªýÂ_¼Ò¦¡: %s\n"
 
-#: fe-auth.c:409
+#: fe-auth.c:407
 #, c-format
 msgid "Kerberos 5 authentication rejected: %*s\n"
 msgstr "kerberos 5 »{ÃÒ©Úµ´: %*s\n"
 
-#: fe-auth.c:429
+#: fe-auth.c:427
 #, c-format
 msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "µLªk±N socket Á٭쬰«DªýÂ_¼Ò¦¡: %s\n"
 
-#: fe-auth.c:573
+#: fe-auth.c:490
+msgid "SCM_CRED authentication method not supported\n"
+msgstr "¤£¤ä´© SCM_CRED »{ÃҤ覡\n"
+
+#: fe-auth.c:576
 msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 »{ÃÒ¥¢±Ñ\n"
 
-#: fe-auth.c:579
+#: fe-auth.c:582
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "¤£¤ä´© Kerberos 4 »{ÃҤ覡\n"
 
-#: fe-auth.c:590
+#: fe-auth.c:593
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 »{ÃÒ¥¢±Ñ\n"
 
-#: fe-auth.c:596
+#: fe-auth.c:599
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "¤£¤ä´© Kerberos 5 »{ÃҤ覡\n"
 
-#: fe-auth.c:623
-msgid "SCM_CRED authentication method not supported\n"
-msgstr "¤£¤ä´© SCM_CRED »{ÃҤ覡\n"
-
-#: fe-auth.c:630
+#: fe-auth.c:627
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "¤£¤ä´© %u »{ÃҤ覡\n"
 
-#: fe-auth.c:667
+#: fe-auth.c:664
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "©¿²¤«Dªkªº»{ÃÒªA°È¦WºÙ \"%s\"\n"
 
-#: fe-auth.c:724
+#: fe-auth.c:721
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: µL®Äªº»{ÃÒ¨t²Î: %d\n"
@@ -72,17 +72,17 @@ msgstr "fe_getauthname: µL®Äªº»{ÃÒ¨t²Î: %d\n"
 msgid "could not determine the PostgreSQL user name to use\n"
 msgstr "µLªk§PÂ_­n¨Ï¥Îªº PostgreSQL ¨Ï¥ÎªÌ¦WºÙ\n"
 
-#: fe-connect.c:705
+#: fe-connect.c:703
 #, c-format
 msgid "could not set socket to non-blocking mode: %s\n"
 msgstr "µLªk±N socket ³]©w¬°«DªýÂ_¼Ò¦¡: %s\n"
 
-#: fe-connect.c:729
+#: fe-connect.c:727
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "µLªk±N socket ³]©w¬° TCP µL©µ¿ð¼Ò¦¡: %s\n"
 
-#: fe-connect.c:749
+#: fe-connect.c:747
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -93,7 +93,7 @@ msgstr ""
 "\t¦øªA¾¹¬O§_¦b¥»¦a°õ¦æ¨Ã¥B¦b Unix domain socket\n"
 "\t\"%s\"¤W·Ç³Æ±µ¨ü³s±µ?\n"
 
-#: fe-connect.c:758
+#: fe-connect.c:756
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -104,47 +104,47 @@ msgstr ""
 "\t¦øªA¾¹¬O§_¦b¥D¾÷ %s ¤W°õ¦æ¨Ã¥B·Ç³Æ±µ¨ü¦b°ð¸¹\n"
 "\t%s ¤Wªº TCP/IP ³s±µ?\n"
 
-#: fe-connect.c:823
+#: fe-connect.c:820
 #, c-format
 msgid "invalid host address: %s\n"
 msgstr "µL®Äªº¥D¾÷¦ì§}: %s\n"
 
-#: fe-connect.c:842
+#: fe-connect.c:839
 #, c-format
 msgid "unknown host name: %s\n"
 msgstr "¤£©úªº¥D¾÷¦WºÙ: %s\n"
 
-#: fe-connect.c:884
+#: fe-connect.c:881
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "µLªk«Ø¥ß socket: %s\n"
 
-#: fe-connect.c:947
+#: fe-connect.c:944
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "µLªk¶Ç°e SSL ´¤¤â«Ê¥]: %s\n"
 
-#: fe-connect.c:955
+#: fe-connect.c:952
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "¦¬¤£¨ì¦øªA¾¹¹ï SSL ´¤¤â«Ê¥]ªº¦^À³: %s\n"
 
-#: fe-connect.c:969
+#: fe-connect.c:966
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "µLªk«Ø¥ß SSL Àô¹Ò: %s\n"
 
-#: fe-connect.c:979
+#: fe-connect.c:976
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "µLªk«Ø¥ß SSL ³s±µ: %s\n"
 
-#: fe-connect.c:997
+#: fe-connect.c:999
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "¦¬¨ìµL®Äªº SSL ´¤¤â¦^À³: %c\n"
 
-#: fe-connect.c:1006
+#: fe-connect.c:1008
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "¦øªA¾¹¤£¤ä´© SSL¡A¦ý¬O­n¨D¨Ï¥Î SSL\n"
 
@@ -172,235 +172,233 @@ msgstr "µLªk¶Ç°e±Ò°Ê«Ê¥]: %s\n"
 msgid "expected authentication request from server, but received %c\n"
 msgstr "´Á«Ý¨Ó¦Û¦øªA¾¹ªº»{ÃҽШD¡A¦ý¬O¦¬¨ì %c\n"
 
-#: fe-connect.c:1433
+#: fe-connect.c:1432
 msgid "unexpected message from server during startup\n"
 msgstr "±Ò°Ê¹Lµ{¤¤¦¬¨ì¨Ó¦Û¦øªA¾¹ªº«D¹w´Á°T®§\n"
 
-#: fe-connect.c:1492
+#: fe-connect.c:1491
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "µL®Äªº³s±µª¬ºA %c¡A¥i¯à¬O°O¾ÐÅ餤ªº¸ê®Æ³Q¯}Ãa\n"
 
-#: fe-connect.c:1592
+#: fe-connect.c:1590
 #, c-format
 msgid "invalid setenv state %c, probably indicative of memory corruption\n"
 msgstr "µL®Äªº setenv ª¬ºA  %c¡A¥i¯à¬O°O¾ÐÅ餤ªº¸ê®Æ³Q¯}Ãa\n"
 
-#: fe-connect.c:1633
+#: fe-connect.c:1630
 #, c-format
 msgid "invalid encoding name in PGCLIENTENCODING: %s\n"
 msgstr "PGCLIENTENCODING ³]©wªº½s½X¦WºÙ¤£¥¿½T: %s\n"
 
-#: fe-connect.c:1758
+#: fe-connect.c:1755
 #, c-format
 msgid "invalid state %c, probably indicative of memory corruption\n"
 msgstr "µL®Äª¬ºA %c¡A¥i¯à¬O°O¾ÐÅ餤ªº¸ê®Æ³Q¯}Ãa\n"
 
-#: fe-connect.c:2379 fe-connect.c:2388 fe-exec.c:1128 fe-lobj.c:527
+#: fe-connect.c:2374 fe-connect.c:2383 fe-exec.c:1184 fe-lobj.c:536
 msgid "out of memory\n"
 msgstr "°O¾ÐÅé¥ÎºÉ\n"
 
-#: fe-connect.c:2427
+#: fe-connect.c:2422
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "¦b³s±µ°T®§¦r¦ê¸Ìªº \"%s\" «á­±¯Ê¤Ö \"=\"\n"
 
-#: fe-connect.c:2476
+#: fe-connect.c:2471
 msgid "unterminated quoted string in connection info string\n"
 msgstr "³s±µ°T®§¦r¦ê¤¤¥¼µ²§ôªº¤Þ¸¹¦r¦ê\n"
 
-#: fe-connect.c:2510
+#: fe-connect.c:2505
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "«Dªk³s±µ¿ï¶µ \"%s\"\n"
 
-#: fe-connect.c:2695
+#: fe-connect.c:2720
 msgid "connection pointer is NULL\n"
 msgstr "³s±µ«ü¼Ð¬O NULL\n"
 
-#: fe-exec.c:570
+#: fe-exec.c:633
 msgid "command string is a null pointer\n"
 msgstr "©R¥O¦r¦ê¬O¤@­ÓªÅ«ü¼Ð\n"
 
-#: fe-exec.c:578
+#: fe-exec.c:641
 msgid "no connection to the server\n"
 msgstr "¨S¦³³s±µ¨ì¦øªA¾¹\n"
 
-#: fe-exec.c:585
+#: fe-exec.c:648
 msgid "another command is already in progress\n"
 msgstr "¤w¸g¦³¥t¥~¤@±ø©R¥O¦b³B²z\n"
 
-#: fe-exec.c:788
+#: fe-exec.c:846
 #, c-format
 msgid "message type 0x%02x arrived from server while idle\n"
 msgstr "¶¢¸m®É±q¦øªA¾¹¶Ç¦^¤F«¬§O¬° 0x%02x ªº°T®§\n"
 
-#: fe-exec.c:831
+#: fe-exec.c:888
 #, c-format
 msgid ""
 "unexpected character %c following empty query response (\"I\" message)\n"
-msgstr ""
-"¦bªÅªº¬d¸ß¦^À³«á­±¸òµÛ«D¹w´Áªº¦r¤¸ %c (\"I\" °T®§)\n"
+msgstr "¦bªÅªº¬d¸ß¦^À³«á­±¸òµÛ«D¹w´Áªº¦r¤¸ %c (\"I\" °T®§)\n"
 
-#: fe-exec.c:889
+#: fe-exec.c:945
 msgid ""
 "server sent data (\"D\" message) without prior row description (\"T\" "
 "message)\n"
-msgstr ""
-"¦øªA¾¹¦b¨S¦³°e¥X¸ê®Æ´y­z (\"T\" °T®§)ªºª¬ªp¤U¶Ç°e¸ê®Æ (\"D\" °T®§)\n"
+msgstr "¦øªA¾¹¦b¨S¦³°e¥X¸ê®Æ´y­z (\"T\" °T®§)ªºª¬ªp¤U¶Ç°e¸ê®Æ (\"D\" °T®§)\n"
 
-#: fe-exec.c:906
+#: fe-exec.c:962
 msgid ""
 "server sent binary data (\"B\" message) without prior row description (\"T\" "
 "message)\n"
 msgstr ""
 "¦øªA¾¹¦b¨S¦³°e¥X¸ê®Æ´y­z (\"T\" °T®§)ªºª¬ªp¤U¶Ç°e¤G¶i¦ì¸ê®Æ (\"B\" °T®§)\n"
 
-#: fe-exec.c:922
+#: fe-exec.c:978
 #, c-format
 msgid "unexpected response from server; first received character was \"%c\"\n"
 msgstr "¨Ó¦Û¦øªA¾¹ªº·N¥~¦^À³¡A¦¬¨ìªº²Ä¤@­Ó¦r¤¸¬O \"%c\"\n"
 
-#: fe-exec.c:1216
+#: fe-exec.c:1271
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "·N¥~ªº asyncStatus(«D¦P¨Bª¬ºA): %d\n"
 
-#: fe-exec.c:1266
+#: fe-exec.c:1321
 msgid "COPY state must be terminated first\n"
 msgstr "COPY ª¬ºA¥²¶·¥ýµ²§ô\n"
 
-#: fe-exec.c:1617
+#: fe-exec.c:1672
 msgid "no COPY in progress\n"
 msgstr "¨S¦³¥¿¦b³B²zªº COPY ©R¥O\n"
 
-#: fe-exec.c:1656
+#: fe-exec.c:1711
 msgid "lost synchronization with server, resetting connection\n"
 msgstr "¥¢¥h»P¦øªA¾¹ªº¦P¨B¡A­«¸m³s±µ\n"
 
-#: fe-exec.c:1721
+#: fe-exec.c:1776
 msgid "connection in wrong state\n"
 msgstr "³s±µ³B©ó¿ù»~ª¬ºA\n"
 
-#: fe-exec.c:1823 fe-exec.c:1857
+#: fe-exec.c:1878 fe-exec.c:1912
 #, c-format
 msgid "protocol error: id=0x%x\n"
 msgstr "³q°T¨ó©w¿ù»~: id=0x%x\n"
 
-#: fe-exec.c:1892
+#: fe-exec.c:1947
 msgid "invalid ExecStatusType code"
 msgstr "«Dªk ExecStatusType ¥N½X"
 
-#: fe-exec.c:1945 fe-exec.c:1978
+#: fe-exec.c:2000 fe-exec.c:2033
 #, c-format
 msgid "column number %d is out of range 0..%d\n"
 msgstr "¦C¸¹ %d ¶W¥X¤F½d³ò 0..%d\n"
 
-#: fe-exec.c:1967
+#: fe-exec.c:2022
 #, c-format
 msgid "row number %d is out of range 0..%d\n"
 msgstr "¦æ¸¹ %d ¶W¥X¤F½d³ò 0..%d\n"
 
-#: fe-exec.c:2163
+#: fe-exec.c:2217
 #, c-format
 msgid "could not interpret result from server: %s\n"
 msgstr "µLªk¸ÑŪ¨Ó¦Û¦øªA¾¹ªºµ²ªG: %s\n"
 
-#: fe-exec.c:2179
+#: fe-exec.c:2233
 msgid "no row count available\n"
 msgstr "µLªk¨ú±o¸ê®Æµ§¼Æ\n"
 
-#: fe-lobj.c:398 fe-lobj.c:477
+#: fe-lobj.c:400 fe-lobj.c:483
 #, c-format
 msgid "could not open file \"%s\": %s\n"
 msgstr "µLªk¶}±ÒÀÉ®× \"%s\": %s\n"
 
-#: fe-lobj.c:410
+#: fe-lobj.c:412
 #, c-format
 msgid "could not create large object for file \"%s\"\n"
 msgstr "µLªk¬°ÀÉ®× \"%s\" «Ø¥ß¤j«¬ª«¥ó\n"
 
-#: fe-lobj.c:419 fe-lobj.c:466
+#: fe-lobj.c:422 fe-lobj.c:472
 #, c-format
 msgid "could not open large object %u\n"
 msgstr "µLªk¶}±Ò¤j«¬ª«¥ó %u\n"
 
-#: fe-lobj.c:433
+#: fe-lobj.c:437
 #, c-format
 msgid "error while reading file \"%s\"\n"
 msgstr "Ū¨úÀÉ®× \"%s\" ®Éµo¥Í¿ù»~\n"
 
-#: fe-lobj.c:491
+#: fe-lobj.c:498
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "¼g¤JÀÉ®× \"%s\" ®Éµo¥Í¿ù»~\n"
 
-#: fe-lobj.c:555
+#: fe-lobj.c:564
 msgid "query to initialize large object functions did not return data\n"
 msgstr "ªì©l¤Æ¤j«¬ª«¥ó¨ç¦¡ªº¬d¸ß¨S¦³ªð¦^¸ê®Æ\n"
 
-#: fe-lobj.c:593
+#: fe-lobj.c:602
 msgid "cannot determine OID of function lo_open\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lo_open ªº OID\n"
 
-#: fe-lobj.c:600
+#: fe-lobj.c:609
 msgid "cannot determine OID of function lo_close\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lo_close ªº OID\n"
 
-#: fe-lobj.c:607
+#: fe-lobj.c:616
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lo_creat ªº OID\n"
 
-#: fe-lobj.c:614
+#: fe-lobj.c:623
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lo_unlink ªº OID\n"
 
-#: fe-lobj.c:621
+#: fe-lobj.c:630
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lo_lseek ªº OID\n"
 
-#: fe-lobj.c:628
+#: fe-lobj.c:637
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lo_tell ªº OID\n"
 
-#: fe-lobj.c:635
+#: fe-lobj.c:644
 msgid "cannot determine OID of function loread\n"
 msgstr "µLªk§PÂ_¨ç¦¡ loread ªº OID\n"
 
-#: fe-lobj.c:642
+#: fe-lobj.c:651
 msgid "cannot determine OID of function lowrite\n"
 msgstr "µLªk§PÂ_¨ç¦¡ lowrite ªº OID\n"
 
-#: fe-misc.c:131
+#: fe-misc.c:132
 #, c-format
 msgid "could not flush enough data (space available: %d, space needed %d)\n"
 msgstr "µLªkflush¨¬°÷ªº¸ê®Æ (¥i¥ÎªÅ¶¡: %d¡A»Ý­nªÅ¶¡ %d)\n"
 
-#: fe-misc.c:279
+#: fe-misc.c:281
 #, c-format
 msgid "integer of size %lu not supported by pqGetInt\n"
 msgstr "pgGetInt ¤£¤ä´©¤j¤p¬° %lu ªº¾ã¼Æ\n"
 
-#: fe-misc.c:317
+#: fe-misc.c:319
 #, c-format
 msgid "integer of size %lu not supported by pqPutInt\n"
 msgstr "pgPutInt ¤£¤ä´©¤j¤p¬° %lu ªº¾ã¼Æ\n"
 
-#: fe-misc.c:355 fe-misc.c:389 fe-misc.c:778
+#: 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:757
+#: fe-misc.c:418 fe-misc.c:618 fe-misc.c:758
 msgid "connection not open\n"
 msgstr "³s±µ¥¼¶}±Ò\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 "µLªk±q¦øªA¾¹±µ¦¬¸ê®Æ: %s\n"
 
-#: fe-misc.c:590 fe-misc.c:675
+#: fe-misc.c:592 fe-misc.c:676
 msgid ""
 "server closed the connection unexpectedly\n"
 "\tThis probably means the server terminated abnormally\n"
@@ -410,7 +408,7 @@ msgstr ""
 "\t³oºØ²{¶H³q±`·N¨ýµÛ¦øªA¾¹¦b³B²z½Ð¨D¤§«e\n"
 "\t©ÎªÌ¥¿¦b³B²z½Ð¨Dªº®É­Ô¤£¥¿±`¤¤¤î\n"
 
-#: fe-misc.c:691
+#: fe-misc.c:692
 #, c-format
 msgid "could not send data to server: %s\n"
 msgstr "µLªk¦V¦øªA¾¹¶Ç°e¸ê®Æ: %s\n"
diff --git a/src/nls-global.mk b/src/nls-global.mk
index e61cf88aeb..d78ec847aa 100644
--- a/src/nls-global.mk
+++ b/src/nls-global.mk
@@ -1,4 +1,4 @@
-# $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 \