Translation updates

diff --git a/src/bin/initdb/nls.mk b/src/bin/initdb/nls.mk
index 6b2b72a78574f9e1050eaf791dc2a3b54a95c0b3..dc6ae86867a7b8e9446c67850f1ac979c989fcd0 100644 (file)
--- a/src/bin/initdb/nls.mk
+++ b/src/bin/initdb/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.9 2004/08/02 15:17:16 petere Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/nls.mk,v 1.10 2004/08/10 19:06:18 petere Exp $
 CATALOG_NAME   := initdb
-AVAIL_LANGUAGES    := de fr it pt_BR ru sk sv zh_TW
+AVAIL_LANGUAGES    := de fr it pt_BR ru sk sv zh_CN zh_TW
 GETTEXT_FILES  := initdb.c
 GETTEXT_TRIGGERS:= _ simple_prompt

diff --git a/src/bin/initdb/po/zh_CN.po b/src/bin/initdb/po/zh_CN.po
new file mode 100644 (file)
index 0000000..70dd3b8
--- /dev/null
+++ b/src/bin/initdb/po/zh_CN.po
@@ -0,0 +1,544 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.4\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-05 14:27+0000\n"
+"PO-Revision-Date: 2003-09-15 13:48:19+0800\n"
+"Last-Translator: Bao Wei \n"
+"Language-Team: Weiping He \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: initdb.c:233 initdb.c:247
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: ÄÚ´æÒç³ö\n"
+
+#: initdb.c:329 initdb.c:1300
+#, c-format
+msgid "%s: could not open file \"%s\" for reading: %s\n"
+msgstr "%s: ΪÁ˶ÁÈ¡, ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"
+
+#: initdb.c:387
+#, c-format
+msgid "%s: could not open file \"%s\" for writing: %s\n"
+msgstr "%s: ΪÁËд, ÎÞ·¨´ò¿ªÎļþ \"%s\": %s\n"
+
+#: initdb.c:515 initdb.c:524 initdb.c:532
+#, c-format
+msgid "%s: failed\n"
+msgstr "%s: ʧ°Ü\n"
+
+#: initdb.c:521
+#, c-format
+msgid "%s: removing data directory \"%s\"\n"
+msgstr "%s: ɾ³ýÊý¾ÝĿ¼ \"%s\"\n"
+
+#: initdb.c:529
+#, c-format
+msgid "%s: removing contents of data directory \"%s\"\n"
+msgstr "%s: ɾ³ýÊý¾ÝĿ¼ \"%s\" µÄÄÚÈÝ\n"
+
+#: initdb.c:540
+#, c-format
+msgid "%s: data directory \"%s\" not removed at user's request\n"
+msgstr "%s: ÔÚÓû§µÄÒªÇóÏÂÊý¾Ý¿âĿ¼ \"%s\" ²»±»É¾³ý\n"
+
+#: initdb.c:566
+#, c-format
+msgid ""
+"%s: cannot be run as root\n"
+"Please log in (using, e.g., \"su\") as the (unprivileged) user that will\n"
+"own the server process.\n"
+msgstr ""
+"%s: ÎÞ·¨ÒÔ root Óû§ÔËÐÐ\n"
+"ÇëÒÔ·þÎñÆ÷½ø³ÌËùÓÐÕßµÄÓû§ (ÎÞÌØȨ) Éí·Ý\n"
+"µÇ½ (ʹÓÃ, e.g., \"su\").\n"
+
+#: initdb.c:617
+#, c-format
+msgid "%s: \"%s\" is not a valid server encoding name\n"
+msgstr "%s: \"%s\" ²»ÊÇÒ»¸öÓÐЧµÄ·þÎñÆ÷±àÂëÃû×Ö\n"
+
+#: initdb.c:772
+#, c-format
+msgid "%s: warning: encoding mismatch\n"
+msgstr "%s: ¾¯¸æ: ±àÂ벻ƥÅä\n"
+
+#: initdb.c:774
+#, c-format
+msgid ""
+"The encoding you selected (%s) and the encoding that the selected\n"
+"locale uses (%s) are not known to match.  This may lead to\n"
+"misbehavior in various character string processing functions.  To fix\n"
+"this situation, rerun %s and either do not specify an encoding\n"
+"explicitly, or choose a matching combination.\n"
+msgstr ""
+"ÄãÑ¡ÔñµÄ±àÂë (%s) ºÍÑ¡ÔñµÄ locale ʹÓõıàÂë (%s) ÊÇÃ÷ÏÔ²»Æ¥ÅäµÄ.\n"
+"ÕâÑù½«µ¼Ö´¦Àí²»Í¬×Ö·û´®µÄº¯Êý²úÉú´íÎó.\n"
+"ÒªÐÞ¸´´ÎÎÊÌâ, ÖØÐÂÔËÐÐ %s ²¢ÇÒ²»ÒªÃ÷È·Ö¸¶¨±àÂë, »òÕßÏÈÔòÒ»¸öÆ¥Åä\n"
+"ÀàÐÍ.\n"
+"\n"
+
+#: initdb.c:926
+#, c-format
+msgid ""
+"%s: file \"%s\" does not exist\n"
+"This means you have a corrupted installation or identified\n"
+"the wrong directory with the invocation option -L.\n"
+msgstr ""
+"%s: Îļþ \"%s\" ²»´æÔÚ\n"
+"ÕâÒâζ×ÅÄúµÄ°²×°·¢ÉúÁË´íÎó»ò\n"
+"ʹÓà -L Ñ¡ÏîÖ¸¶¨ÁË´íÎóµÄ·¾¶.\n"
+
+#: initdb.c:991
+#, c-format
+msgid "selecting default max_connections ... "
+msgstr "Ñ¡ÔñĬÈÏ×î´óÁª½ÓÊý (max_connections) ... "
+
+#: initdb.c:1027
+#, c-format
+msgid "selecting default shared_buffers ... "
+msgstr "Ñ¡ÔñĬÈϹ²Ïí»º³åÇø´óС (shared_buffers) ... "
+
+#: initdb.c:1060
+msgid "creating configuration files ... "
+msgstr "´´½¨ÅäÖÃÎļþ ... "
+
+#: initdb.c:1147
+#, c-format
+msgid "creating template1 database in %s/base/1 ... "
+msgstr "ÔÚ %s/base/1 Öд´½¨ template1 Êý¾Ý¿â ... "
+
+#: initdb.c:1163
+#, c-format
+msgid ""
+"%s: input file \"%s\" does not belong to PostgreSQL %s\n"
+"Check your installation or specify the correct path using the option -L.\n"
+msgstr ""
+"%s: ÊäÈëÎļþ \"%s\" ²»ÊôÓÚ PostgreSQL %s\n"
+"¼ì²éÄãµÄ°²×°»òʹÓà -L Ñ¡ÏîÖ¸¶¨ÕýÈ·µÄ·¾¶.\n"
+
+#: initdb.c:1239
+msgid "initializing pg_shadow ... "
+msgstr "³õʼ»¯ pg_shadow ... "
+
+#: initdb.c:1275
+msgid "Enter new superuser password: "
+msgstr "ÊäÈëеij¬¼¶Óû§¿ÚÁî: "
+
+#: initdb.c:1276
+msgid "Enter it again: "
+msgstr "ÔÙÊäÈëÒ»±é: "
+
+#: initdb.c:1279
+#, c-format
+msgid "Passwords didn't match.\n"
+msgstr "¿ÚÁƥÅä.\n"
+
+#: initdb.c:1306
+#, c-format
+msgid "%s: could not read password from file \"%s\": %s\n"
+msgstr "%s: ÎÞ·¨´ÓÎļþ \"%s\" ¶ÁÈ¡¿ÚÁî: %s\n"
+
+#: initdb.c:1319
+#, c-format
+msgid "setting password ... "
+msgstr "ÉèÖÿÚÁî ... "
+
+#: initdb.c:1343
+#, c-format
+msgid "%s: The password file was not generated. Please report this problem.\n"
+msgstr "%s: ¿ÚÁîÎļþûÓÐÉú³É. Ç뱨¸æÕâ¸öÎÊÌâ.\n"
+
+#: initdb.c:1373
+msgid "enabling unlimited row size for system tables ... "
+msgstr "Æô¶¯²»ÏÞÖÆϵͳ±íÐдóС ... "
+
+#: initdb.c:1446
+msgid "initializing pg_depend ... "
+msgstr "³õʼ»¯ pg_depend ... "
+
+#: initdb.c:1474
+msgid "creating system views ... "
+msgstr "´´½¨ÏµÍ³ÊÓͼ ... "
+
+#: initdb.c:1511
+msgid "loading pg_description ... "
+msgstr "¼ÓÔØ pg_description ... "
+
+#: initdb.c:1559
+msgid "creating conversions ... "
+msgstr "´´½¨×Ö·û¼¯×ª»» ... "
+
+#: initdb.c:1615
+msgid "setting privileges on built-in objects ... "
+msgstr "¶ÔÄÚ½¨¶ÔÏóÉèÖÃȨÏÞ ... "
+
+#: initdb.c:1673
+msgid "creating information schema ... "
+msgstr "´´½¨ÐÅϢģʽ ... "
+
+#: initdb.c:1735
+msgid "vacuuming database template1 ... "
+msgstr "ÇåÀíÊý¾Ý¿â template1 ... "
+
+#: initdb.c:1791
+msgid "copying template1 to template0 ... "
+msgstr "¿½±´ template1 µ½ template0 ... "
+
+#: initdb.c:1848
+#, c-format
+msgid "caught signal\n"
+msgstr "²¶»ñÐźÅ\n"
+
+#: initdb.c:1853
+#, c-format
+msgid "could not write to child process\n"
+msgstr "ÎÞ·¨Ð´µ½×Ó½ø³Ì\n"
+
+#: initdb.c:1859
+#, c-format
+msgid "ok\n"
+msgstr "³É¹¦\n"
+
+#: initdb.c:1889
+#, c-format
+msgid "%s: invalid locale name \"%s\"\n"
+msgstr "%s: ÎÞЧµÄ locale Ãû×Ö \"%s\"\n"
+
+#: initdb.c:1956
+#, c-format
+msgid ""
+"%s initializes a PostgreSQL database cluster.\n"
+"\n"
+msgstr ""
+"%s ³õʼ»¯Ò»¸ö PostgreSQL Êý¾Ý¿â´Ø.\n"
+"\n"
+
+#: initdb.c:1957
+#, c-format
+msgid "Usage:\n"
+msgstr "ʹÓ÷½·¨:\n"
+
+#: initdb.c:1958
+#, c-format
+msgid "  %s [OPTION]... [DATADIR]\n"
+msgstr "  %s [Ñ¡Ïî]... [DATADIR]\n"
+
+#: initdb.c:1959
+#, c-format
+msgid ""
+"\n"
+"Options:\n"
+msgstr ""
+"\n"
+"Ñ¡Ïî:\n"
+
+#: initdb.c:1960
+#, c-format
+msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
+msgstr "  -D, --pgdata=DATADIR      µ±Ç°Êý¾Ý¿â´ØµÄλÖÃ\n"
+
+#: initdb.c:1961
+#, c-format
+msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
+msgstr "  -E, --encoding=ENCODING   ΪÐÂÊý¾Ý¿âÉèÖÃĬÈϱàÂë\n"
+
+#: initdb.c:1962
+#, c-format
+msgid ""
+"  --locale=LOCALE           initialize database cluster with given locale\n"
+msgstr "  --locale=LOCALE           ³õʼ»¯Êý¾Ý¿â´ØµÄ locale\n"
+
+#: initdb.c:1963
+#, c-format
+msgid ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            initialize database cluster with given locale\n"
+"                            in the respective category (default taken from\n"
+"                            environment)\n"
+msgstr ""
+"  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
+"  --lc-monetary, --lc-numeric, --lc-time=LOCALE\n"
+"                            ³õʼ»¯Êý¾Ý¿â´Ø·Ö±ðÖ¸¶¨\n"
+"                            locale (ĬÈÏʹÓû·¾³±ä\n"
+"                            Á¿)\n"
+
+#: initdb.c:1968
+#, c-format
+msgid "  --no-locale               equivalent to --locale=C\n"
+msgstr "  --no-locale               µÈͬÓÚ --locale=C\n"
+
+#: initdb.c:1969
+#, c-format
+msgid ""
+"  -A, --auth=method         default authentication method for local "
+"connections\n"
+msgstr ""
+"  -A, --auth=method         ±¾µØÁ¬½ÓµÄĬÈÏÈÏÖ¤·½·¨\n"
+
+#: initdb.c:1970
+#, c-format
+msgid "  -U, --username=NAME       database superuser name\n"
+msgstr "  -U, --username=NAME       Êý¾Ý¿â³¬¼¶Óû§Ãû\n"
+
+#: initdb.c:1971
+#, c-format
+msgid ""
+"  -W, --pwprompt            prompt for a password for the new superuser\n"
+msgstr "  -W, --pwprompt            ¶ÔÓÚеij¬¼¶Óû§ÌáʾÊäÈë¿ÚÁî\n"
+
+#: initdb.c:1972
+#, c-format
+msgid ""
+"  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=ÎļþÃû           ¶ÔÓÚеij¬¼¶Óû§´ÓÎļþ¶ÁÈ¡¿ÚÁî\n"
+
+#: initdb.c:1973
+#, c-format
+msgid "  -?, --help                show this help, then exit\n"
+msgstr "  -?, --help                ÏÔʾ´Ë°ïÖú, È»ºóÍ˳ö\n"
+
+#: initdb.c:1974
+#, c-format
+msgid "  -V, --version             output version information, then exit\n"
+msgstr "  -V, --version             Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+
+#: initdb.c:1975
+#, c-format
+msgid ""
+"\n"
+"Less commonly used options:\n"
+msgstr ""
+"\n"
+"·ÇÆÕͨʹÓÃÑ¡Ïî:\n"
+
+#: initdb.c:1976
+#, c-format
+msgid "  -d, --debug               generate lots of debugging output\n"
+msgstr "  -d, --debug               ²úÉú´óÁ¿µÄ³ý´íÐÅÏ¢\n"
+
+#: initdb.c:1977
+#, c-format
+msgid "  -s, --show                show internal settings\n"
+msgstr "  -s, --show                ÏÔʾÄÚ²¿ÉèÖÃ\n"
+
+#: initdb.c:1978
+#, c-format
+msgid "  -L DIRECTORY              where to find the input files\n"
+msgstr "  -L DIRECTORY              ÊäÈëÎļþµÄλÖÃ\n"
+
+#: initdb.c:1979
+#, c-format
+msgid "  -n, --noclean             do not clean up after errors\n"
+msgstr "  -n, --noclean             ³ö´íºó²»ÇåÀí\n"
+
+#: initdb.c:1980
+#, c-format
+msgid ""
+"\n"
+"If the data directory is not specified, the environment variable PGDATA\n"
+"is used.\n"
+msgstr ""
+"\n"
+"Èç¹ûûÓÐÖ¸¶¨Êý¾ÝĿ¼, ½«Ê¹Óû·¾³±äÁ¿ PGDATA\n"
+
+#: initdb.c:1982
+#, c-format
+msgid ""
+"\n"
+"Report bugs to .\n"
+msgstr ""
+"\n"
+"±¨¸æ´íÎóÖÁ .\n"
+
+#: initdb.c:2073
+#, c-format
+msgid "Running in debug mode.\n"
+msgstr "ÔËÐÐÔÚ³ý´íģʽÖÐ. \n"
+
+#: initdb.c:2077
+#, c-format
+msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
+msgstr "ÔËÐÐÔÚ noclean ģʽÖÐ. ´íÎ󽫲»±»ÇåÀí.\n"
+
+#: initdb.c:2113 initdb.c:2130 initdb.c:2335
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
+
+#: initdb.c:2128
+#, c-format
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
+msgstr "%s: ÃüÁîÐвÎÊýÌ«¶à (µÚÒ»¸öÊÇ \"%s\")\n"
+
+#: initdb.c:2136
+#, c-format
+msgid "%s: you cannot specify both password prompt and password file\n"
+msgstr "%s: Äã²»ÄÜͬʱָ¶¨ÌáʾÊäÈë¿ÚÁîºÍ¿ÚÁîÎļþ\n"
+
+#: initdb.c:2142
+msgid ""
+"\n"
+"WARNING: enabling \"trust\" authentication for local connections.\n"
+"You can change this by editing pg_hba.conf or using the -A flag the\n"
+"next time you run initdb.\n"
+msgstr ""
+"\n"
+"¾¯¸æ: Ϊ±¾µØÁ¬½ÓÆô¶¯ÁË \"trust\" ÈÏÖ¤.\n"
+"Äã¿ÉÒÔͨ¹ý±à¼­ pg_hba.conf ¸ü¸Ä»òÄãÏÂ\n"
+"´ÎÔËÐÐ initdb ʱʹÓà -A Ñ¡Ïî.\n"
+
+#: initdb.c:2164
+#, c-format
+msgid "%s: unknown authentication method \"%s\".\n"
+msgstr "%s: δ֪ÈÏÖ¤·½·¨ \"%s\".\n"
+
+#: initdb.c:2173
+#, c-format
+msgid ""
+"%s: you need to specify a password for the superuser to enable %s "
+"authentication.\n"
+msgstr ""
+"%s: ΪÁËÆô¶¯ %s ÈÏÖ¤, ÄãÐèҪΪ³¬¼¶Óû§Ö¸¶¨Ò»¸ö¿ÚÁî.\n"
+
+#: initdb.c:2188
+#, c-format
+msgid ""
+"%s: no data directory specified\n"
+"You must identify the directory where the data for this database system\n"
+"will reside.  Do this with either the invocation option -D or the\n"
+"environment variable PGDATA.\n"
+msgstr ""
+"%s: ûÓÐÖ¸¶¨Êý¾ÝĿ¼\n"
+"Äú±ØÐëÈ·ÈÏ´ËÊý¾Ý¿âϵͳµÄÊý¾ÝËùÔÚĿ¼\n"
+"´æÔÚ. ʹÓà -D Ñ¡Ïî»òÕß\n"
+"»·¾³±äÁ¿ PGDATA.\n"
+
+#: initdb.c:2214
+#, c-format
+msgid ""
+"The program \"postgres\" is needed by %s but was not found in the same "
+"directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s ÐèÒª³ÌÐò \"postgres\", µ«ÊÇÔÚͬһ¸öĿ¼ \"%s\" ÖÐûÕÒµ½.\n"
+"¼ì²éÄúµÄ°²×°.\n"
+
+#: initdb.c:2220
+#, c-format
+msgid ""
+"The program \"postgres\" was found by %s but was not the same version as \"%s"
+"\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s ÕÒµ½³ÌÐò \"postgres\", µ«ÊǺͰ汾 \"%s\" ²»Ò»ÖÂ.\n"
+"¼ì²éÄúµÄ°²×°.\n"
+
+#: initdb.c:2241
+#, c-format
+msgid "%s: could not determine valid short version string\n"
+msgstr "%s: ÎÞ·¨È·¶¨ÓÐЧµÄ¶Ì°æ±¾×Ö·û´®\n"
+
+#: initdb.c:2294
+#, c-format
+msgid ""
+"The files belonging to this database system will be owned by user \"%s\".\n"
+"This user must also own the server process.\n"
+"\n"
+msgstr ""
+"ÊôÓÚ´ËÊý¾Ý¿âϵͳµÄÎļþËÞÖ÷ΪÓû§ \"%s\".\n"
+"´ËÓû§Ò²±ØÐëΪ·þÎñÆ÷½ø³ÌµÄËÞÖ÷.\n"
+
+#: initdb.c:2305
+#, c-format
+msgid "The database cluster will be initialized with locale %s.\n"
+msgstr "Êý¾Ý¿â´Ø½«´øÓÐ locale %s ³õʼ»¯.\n"
+
+#: initdb.c:2309
+#, c-format
+msgid ""
+"The database cluster will be initialized with locales\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+msgstr ""
+"Êý¾Ý¿â´Ø½«´øÓÐһϠlocales ³õʼ»¯\n"
+"  COLLATE:  %s\n"
+"  CTYPE:    %s\n"
+"  MESSAGES: %s\n"
+"  MONETARY: %s\n"
+"  NUMERIC:  %s\n"
+"  TIME:     %s\n"
+
+#: initdb.c:2333
+#, c-format
+msgid "%s: could not find suitable encoding for locale \"%s\"\n"
+msgstr "%s: ÎÞ·¨Îª locale \"%s\" ÕÒµ½ºÏÊʵıàÂë\n"
+
+#: initdb.c:2334
+#, c-format
+msgid "Rerun %s with the -E option.\n"
+msgstr "´ø -E Ñ¡ÏîÖØÐÂÔËÐÐ %s.\n"
+
+#: initdb.c:2341
+#, c-format
+msgid "The default database encoding has accordingly been set to %s.\n"
+msgstr "ĬÈϵÄÊý¾Ý¿â±àÂëÒѾ­ÏàÓ¦µÄÉèÖÃΪ %s.\n"
+
+#: initdb.c:2382
+#, c-format
+msgid "creating directory %s ... "
+msgstr "´´½¨Ä¿Â¼ %s ... "
+
+#: initdb.c:2396
+#, c-format
+msgid "fixing permissions on existing directory %s ... "
+msgstr "ÐÞ¸´ÒÑ´æÔÚĿ¼ %s µÄȨÏÞ ... "
+
+#: initdb.c:2414
+#, c-format
+msgid ""
+"%s: directory \"%s\" exists but is not empty\n"
+"If you want to create a new database system, either remove or empty\n"
+"the directory \"%s\" or run %s\n"
+"with an argument other than \"%s\".\n"
+msgstr ""
+"%s: Ŀ¼ \"%s\" ÒÑ´æÔÚ, µ«²»ÊÇ¿ÕµÄ\n"
+"Èç¹ûÄúÏë´´½¨Ò»¸öеÄÊý¾Ý¿âϵͳ, Çëɾ³ý»òÇå¿Õ\n"
+"Ŀ¼ \"%s\" »òÕßÔËÐдø²ÎÊýµÄ %s\n"
+"¶ø²»ÊÇ \"%s\".\n"
+
+#: initdb.c:2431
+#, c-format
+msgid "creating directory %s/%s ... "
+msgstr "´´½¨Ä¿Â¼ %s/%s ... "
+
+#: initdb.c:2492
+#, c-format
+msgid ""
+"\n"
+"Success. You can now start the database server using:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"or\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"
+msgstr ""
+"\n"
+"³É¹¦. ÄúÏÖÔÚ¿ÉÒÔÓÃÏÂÃæµÄÃüÁîÔËÐÐÊý¾Ý¿â·þÎñÆ÷:\n"
+"\n"
+"    %s%s%s/postmaster -D %s%s%s\n"
+"»òÕß\n"
+"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"\n"

diff --git a/src/bin/pg_ctl/nls.mk b/src/bin/pg_ctl/nls.mk
index b0aabb321e63221ffb1c611d953381bef91a1305..61a82b12055381847164a52de918a5f317ef665b 100644 (file)
--- a/src/bin/pg_ctl/nls.mk
+++ b/src/bin/pg_ctl/nls.mk
@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.4 2004/08/02 15:17:18 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_ctl/nls.mk,v 1.5 2004/08/10 19:06:20 petere Exp $
 CATALOG_NAME   := pg_ctl
-AVAIL_LANGUAGES    := ru sk sv zh_TW
+AVAIL_LANGUAGES    := ru sk sv zh_CN zh_TW
 GETTEXT_FILES  := pg_ctl.c
 GETTEXT_TRIGGERS:= _ simple_prompt

diff --git a/src/bin/pg_ctl/po/zh_CN.po b/src/bin/pg_ctl/po/zh_CN.po
new file mode 100644 (file)
index 0000000..3cc2a42
--- /dev/null
+++ b/src/bin/pg_ctl/po/zh_CN.po
@@ -0,0 +1,496 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR , YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 7.5\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-08-05 14:26+0000\n"
+"PO-Revision-Date: 2004-06-10 11:23+0000\n"
+"Last-Translator: Bao Wei\n"
+"Language-Team: Weiping He \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=GB2312\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: pg_ctl.c:184 pg_ctl.c:200 pg_ctl.c:1230
+#, c-format
+msgid "%s: out of memory\n"
+msgstr "%s: ÄÚ´æÒç³ö\n"
+
+#: pg_ctl.c:431
+#, c-format
+msgid ""
+"%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+msgstr "%s: ÆäËû postmaster ¿ÉÄÜÕýÔÚÔËÐÐ. ³¢ÊÔÆô¶¯ postmaster.\n"
+
+#: pg_ctl.c:449
+#, c-format
+msgid "%s: cannot read %s\n"
+msgstr "%s: ÎÞ·¨¶ÁÈ¡ %s\n"
+
+#: pg_ctl.c:455
+#, c-format
+msgid "%s: option file %s must have exactly 1 line\n"
+msgstr "%s: Ñ¡ÏîÎļþ %s Ö»ÄÜÓÐÒ»ÐÐ\n"
+
+#: pg_ctl.c:497
+#, c-format
+msgid ""
+"The program \"postmaster\" is needed by %s but was not found in the same "
+"directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"³ÌÐò \"postmaster\" ÊÇ %s ÐèÒªµÄ, µ«Ã»ÓÐÔÚͬһ¸öĿ¼ \"%s\" ·¢ÏÖ.\n"
+"¼ì²éÄúµÄ°²×°.\n"
+
+#: pg_ctl.c:503
+#, c-format
+msgid ""
+"The program \"postmaster\" was found by %s but was not the same version as "
+"\"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s ÕÒµ½³ÌÐò \"postmaster\", µ«°æ±¾ºÍ \"%s\" ²»Ò»ÖÂ.\n"
+"¼ì²éÄúµÄ°²×°.\n"
+
+#: pg_ctl.c:514
+msgid "Unable to run the postmaster binary\n"
+msgstr "ÎÞ·¨ÔËÐÐ postmaster ¶þ½øÖÆÎļþ\n"
+
+#: pg_ctl.c:524
+#, c-format
+msgid ""
+"%s: cannot start postmaster\n"
+"Examine the log output\n"
+msgstr ""
+"%s: ÎÞ·¨Æô¶¯ postmaster\n"
+"¼ì²éÈÕÖ¾Êä³ö\n"
+
+#: pg_ctl.c:535
+#, c-format
+msgid "waiting for postmaster to start..."
+msgstr "µÈ´ý postmaster Æô¶¯ ..."
+
+#: pg_ctl.c:540
+#, c-format
+msgid "could not start postmaster\n"
+msgstr "ÎÞ·¨Æô¶¯ postmaster\n"
+
+#: pg_ctl.c:542
+#, c-format
+msgid ""
+"done\n"
+"postmaster started\n"
+msgstr ""
+"Íê³É\n"
+"postmaster ÒѾ­Æô¶¯\n"
+
+#: pg_ctl.c:545
+#, c-format
+msgid "postmaster starting\n"
+msgstr "Æô¶¯ postmaster\n"
+
+#: pg_ctl.c:560 pg_ctl.c:639 pg_ctl.c:709
+#, c-format
+msgid "%s: could not find %s\n"
+msgstr "%s: ÎÞ·¨ÕÒµ½ %s\n"
+
+#: pg_ctl.c:561 pg_ctl.c:710
+msgid "Is postmaster running?\n"
+msgstr "ÊÇ·ñ postmaster ÕýÔÚÔËÐÐ?\n"
+
+#: pg_ctl.c:567
+#, c-format
+msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: ÎÞ·¨Í£Ö¹ postmaster; postgres ÕýÔÚÔËÐÐ (PID: %ld)\n"
+
+#: pg_ctl.c:575 pg_ctl.c:656
+#, c-format
+msgid "stop signal failed (PID: %ld): %s\n"
+msgstr "Í£Ö¹ÐźÅʧ°Ü (PID: %ld): %s\n"
+
+#: pg_ctl.c:583
+#, c-format
+msgid "postmaster shutting down\n"
+msgstr "¹Ø±Õ postmaster\n"
+
+#: pg_ctl.c:590 pg_ctl.c:663
+#, c-format
+msgid "waiting for postmaster to shut down..."
+msgstr "µÈ´ý postmaster ¹Ø±Õ ..."
+
+#: pg_ctl.c:612 pg_ctl.c:687
+#, c-format
+msgid " failed\n"
+msgstr " ʧ°Ü\n"
+
+#: pg_ctl.c:614 pg_ctl.c:689
+#, c-format
+msgid "%s: postmaster does not shut down\n"
+msgstr "%s: postmaster ûÓйرÕ\n"
+
+#: pg_ctl.c:618 pg_ctl.c:694
+#, c-format
+msgid "done\n"
+msgstr "Íê³É\n"
+
+#: pg_ctl.c:620 pg_ctl.c:696
+#, c-format
+msgid "postmaster stopped\n"
+msgstr "postmaster ÒѾ­¹Ø±Õ\n"
+
+#: pg_ctl.c:640
+msgid ""
+"Is postmaster running?\n"
+"starting postmaster anyway\n"
+msgstr ""
+"ÊÇ·ñ postmaster ÕýÔÚÔËÐÐ?\n"
+"³¢ÊÔÆô¶¯ postmaster\n"
+
+#: pg_ctl.c:647
+#, c-format
+msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: ÎÞ·¨ÖØÆô postmaster; postgres ÕýÔÚÔËÐÐ (PID: %ld)\n"
+
+#: pg_ctl.c:650 pg_ctl.c:719
+msgid "Please terminate postgres and try again.\n"
+msgstr "ÇëÖÕÖ¹ postgres ÔÙÖØÊÔ.\n"
+
+#: pg_ctl.c:716
+#, c-format
+msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
+msgstr "%s: ÎÞ·¨ÖØÔØ postmaser; postgres ÕýÔÚÔËÐÐ (PID: %ld)\n"
+
+#: pg_ctl.c:725
+#, c-format
+msgid "reload signal failed (PID: %ld): %s\n"
+msgstr "ÖØÔØÐźÅʧ°Ü (PID: %ld): %s\n"
+
+#: pg_ctl.c:731
+#, c-format
+msgid "postmaster signaled\n"
+msgstr "postmaster ·¢³öÐźÅ\n"
+
+#: pg_ctl.c:746
+#, c-format
+msgid "%s: postmaster or postgres not running\n"
+msgstr "%s: postmaster »òÕß postgres ûÓÐÔËÐÐ\n"
+
+#: pg_ctl.c:752
+#, c-format
+msgid "%s: a standalone backend \"postgres\" is running (PID: %ld)\n"
+msgstr "%s: Ò»¸ö¶ÀÁ¢µÄºó¶Ë \"postgres\" ÕýÔÚÔËÐÐ (PID: %ld)\n"
+
+#: pg_ctl.c:758
+#, c-format
+msgid "%s: postmaster is running (PID: %ld)\n"
+msgstr "%s: postmaster ÕýÔÚÔËÐÐ (PID: %ld)\n"
+
+#: pg_ctl.c:774
+#, c-format
+msgid "signal %d failed (PID: %ld): %s\n"
+msgstr "ÐźŠ%d ʧ°Ü (PID: %ld): %s\n"
+
+#: pg_ctl.c:801
+msgid "Unable to find exe"
+msgstr "ÎÞ·¨ÕÒµ½Ö´ÐÐÎļþ"
+
+#: pg_ctl.c:844 pg_ctl.c:875
+msgid "Unable to open service manager\n"
+msgstr "ÎÞ·¨´ò¿ª·þÎñ¹ÜÀíÆ÷\n"
+
+#: pg_ctl.c:850
+#, c-format
+msgid "Service \"%s\" already registered\n"
+msgstr "·þÎñ \"%s\" ÒѾ­×¢²áÁË\n"
+
+#: pg_ctl.c:861
+#, c-format
+msgid "Unable to register service \"%s\" [%d]\n"
+msgstr "ÎÞ·¨×¢²á·þÎñ \"%s\" [%d]\n"
+
+#: pg_ctl.c:881
+#, c-format
+msgid "Service \"%s\" not registered\n"
+msgstr "·þÎñ \"%s\" ûÓÐ×¢²á\n"
+
+#: pg_ctl.c:888
+#, c-format
+msgid "Unable to open service \"%s\" [%d]\n"
+msgstr "ÎÞ·¨´ò¿ª·þÎñ \"%s\" [%d]\n"
+
+#: pg_ctl.c:894
+#, c-format
+msgid "Unable to unregister service \"%s\" [%d]\n"
+msgstr "ÎÞ·¨È¡Ïû×¢²á·þÎñ \"%s\" [%d]\n"
+
+#: pg_ctl.c:1012
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information.\n"
+msgstr ""
+"\n"
+"ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
+
+#: pg_ctl.c:1020
+#, c-format
+msgid ""
+"%s is a utility to start, stop, restart, reload configuration files,\n"
+"report the status of a PostgreSQL server, or kill a PostgreSQL process\n"
+"\n"
+msgstr ""
+"%s ÊÇÒ»¸öÆô¶¯, Í£Ö¹, ÖØÆô, ÖØÔØÅäÖÃÎļþ, ±¨¸æ PostgreSQL ·þÎñÆ÷״̬,\n"
+"»òÕßɱµô PostgreSQL ½ø³ÌµÄ¹¤¾ß\n"
+"\n"
+
+#: pg_ctl.c:1022
+#, c-format
+msgid "Usage:\n"
+msgstr "ʹÓ÷½·¨:\n"
+
+#: pg_ctl.c:1023
+#, c-format
+msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
+msgstr "  %s start   [-w] [-D Êý¾ÝĿ¼] [-s] [-l ÎļþÃû] [-o \"Ñ¡Ïî\"]\n"
+
+#: pg_ctl.c:1024
+#, c-format
+msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
+msgstr "  %s stop    [-W] [-D Êý¾ÝĿ¼] [-s] [-m ¹Ø±Õģʽ]\n"
+
+#: pg_ctl.c:1025
+#, c-format
+msgid ""
+"  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
+msgstr "  %s restart [-w] [-D Êý¾ÝĿ¼] [-s] [-m ¹Ø±Õģʽ] [-o \"Ñ¡Ïî\"]\n"
+
+#: pg_ctl.c:1026
+#, c-format
+msgid "  %s reload  [-D DATADIR] [-s]\n"
+msgstr "  %s reload  [-D Êý¾ÝĿ¼] [-s]\n"
+
+#: pg_ctl.c:1027
+#, c-format
+msgid "  %s status  [-D DATADIR]\n"
+msgstr "  %s status  [-D Êý¾ÝĿ¼]\n"
+
+#: pg_ctl.c:1028
+#, c-format
+msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgstr "  %s kill    ÐźÅÃû³Æ ½ø³Ì ID\n"
+
+#: pg_ctl.c:1030
+#, c-format
+msgid ""
+"  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-"
+"o \"OPTIONS\"]\n"
+msgstr ""
+"  %s register   [-N ·þÎñÃû³Æ] [-U Óû§Ãû] [-P ¿ÚÁî] [-D DATADIR] [-o "
+"\"OPTIONS\"]\n"
+
+#: pg_ctl.c:1031
+#, c-format
+msgid "  %s unregister [-N servicename]\n"
+msgstr "  %s unregister [-N ·þÎñÃû³Æ]\n"
+
+#: pg_ctl.c:1033
+#, c-format
+msgid "Common options:\n"
+msgstr "ÆÕͨѡÏî:\n"
+
+#: pg_ctl.c:1034
+#, c-format
+msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
+msgstr "  -D, --pgdata Êý¾ÝĿ¼  Êý¾Ý´æ´¢µÄλÖÃ\n"
+
+#: pg_ctl.c:1035
+#, c-format
+msgid "  -s, --silent only print errors, no informational messages\n"
+msgstr "  -s, --silent Ö»´òÓ¡´íÎóÐÅÏ¢, ûÓÐÆäËûÐÅÏ¢\n"
+
+#: pg_ctl.c:1037
+#, c-format
+msgid "  -N       service name with which to register PostgreSQL server\n"
+msgstr "  -N       ×¢²áµ½ PostgreSQL ·þÎñÆ÷µÄ·þÎñÃû³Æ\n"
+
+#: pg_ctl.c:1038
+#, c-format
+msgid "  -P       password of account to register PostgreSQL server\n"
+msgstr "  -P       ×¢²áµ½ PostgreSQL ·þÎñÆ÷ÕÊ»§µÄ¿ÚÁî\n"
+
+#: pg_ctl.c:1039
+#, c-format
+msgid "  -U       user name of account to register PostgreSQL server\n"
+msgstr "  -U       ×¢²áµ½ PostgreSQL ·þÎñÆ÷ÕÊ»§µÄÓû§Ãû\n"
+
+#: pg_ctl.c:1041
+#, c-format
+msgid "  -w           wait until operation completes\n"
+msgstr "  -w           µÈ´ýÖ±µ½²Ù×÷Íê³É\n"
+
+#: pg_ctl.c:1042
+#, c-format
+msgid "  -W           do not wait until operation completes\n"
+msgstr "  -W           ²»Óõȴý²Ù×÷Íê³É\n"
+
+#: pg_ctl.c:1043
+#, c-format
+msgid "  --help       show this help, then exit\n"
+msgstr "  --help       ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
+
+#: pg_ctl.c:1044
+#, c-format
+msgid "  --version    output version information, then exit\n"
+msgstr "  --version    Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+
+#: pg_ctl.c:1045
+#, c-format
+msgid ""
+"(The default is to wait for shutdown, but not for start or restart.)\n"
+"\n"
+msgstr ""
+"(ĬÈÏΪ¹Ø±ÕµÈ´ý, µ«²»ÊÇÆô¶¯»òÖØÆô.)\n"
+"\n"
+
+#: pg_ctl.c:1046
+#, c-format
+msgid ""
+"If the -D option is omitted, the environment variable PGDATA is used.\n"
+"\n"
+msgstr ""
+"Èç¹ûÊ¡ÂÔÁË -D Ñ¡Ïî, ½«Ê¹Óà PGDATA »·¾³±äÁ¿.\n"
+"\n"
+
+#: pg_ctl.c:1047
+#, c-format
+msgid "Options for start or restart:\n"
+msgstr "Æô¶¯»òÖØÆôµÄÑ¡Ïî:\n"
+
+#: pg_ctl.c:1048
+#, c-format
+msgid ""
+"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
+"                          use of this option is highly recommended.\n"
+msgstr ""
+"  -l, --log FILENAME      дÈë (»ò×·¼Ó) ·þÎñÆ÷ÈÕÖ¾µ½Îļþ FILENAME.\n"
+"                          Ç¿ÁÒ½¨ÒéʹÓôËÑ¡Ïî.\n"
+
+#: pg_ctl.c:1050
+#, c-format
+msgid ""
+"  -o OPTIONS              command line options to pass to the postmaster\n"
+"                          (PostgreSQL server executable)\n"
+msgstr ""
+"  -o OPTIONS              ´«µÝ¸ø postmaster µÄÃüÁîÐÐÑ¡Ïî\n"
+"                          (PostgreSQL ·þÎñÆ÷Ö´ÐÐ)\n"
+
+#: pg_ctl.c:1052
+#, c-format
+msgid ""
+"  -p PATH-TO-POSTMASTER   normally not necessary\n"
+"\n"
+msgstr ""
+"  -p PATH-TO-POSTMASTER   Õý³£Çé¿ö²»ÐèÒª\n"
+"\n"
+
+#: pg_ctl.c:1053
+#, c-format
+msgid "Options for stop or restart:\n"
+msgstr "Í£Ö¹»òÖØÆôµÄÑ¡Ïî:\n"
+
+#: pg_ctl.c:1054
+#, c-format
+msgid ""
+"  -m SHUTDOWN-MODE   may be 'smart', 'fast', or 'immediate'\n"
+"\n"
+msgstr ""
+"  -m SHUTDOWN-MODE   ¿ÉÒÔÊÇ 'smart', 'fast', »òÕß 'immediate'\n"
+"\n"
+
+#: pg_ctl.c:1055
+#, c-format
+msgid "Allowed signal names for kill:\n"
+msgstr "ÔÊÐí¹Ø±ÕµÄÐźÅÃû³Æ:\n"
+
+#: pg_ctl.c:1056
+#, c-format
+msgid ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+msgstr ""
+"  HUP INT QUIT ABRT TERM USR1 USR2\n"
+"\n"
+
+#: pg_ctl.c:1057
+#, c-format
+msgid "Shutdown modes are:\n"
+msgstr "¹Ø±ÕģʽÓÐÈçϼ¸ÖÖ:\n"
+
+#: pg_ctl.c:1058
+#, c-format
+msgid "  smart       quit after all clients have disconnected\n"
+msgstr "  smart       ËùÓпͻ§¶Ë¶Ï¿ªÁ¬½ÓºóÍ˳ö\n"
+
+#: pg_ctl.c:1059
+#, c-format
+msgid "  fast        quit directly, with proper shutdown\n"
+msgstr "  fast        Ö±½ÓÍ˳ö, ÕýÈ·µÄ¹Ø±Õ\n"
+
+#: pg_ctl.c:1060
+#, c-format
+msgid ""
+"  immediate   quit without complete shutdown; will lead to recovery on "
+"restart\n"
+"\n"
+msgstr ""
+"  immediate   ²»ÍêÈ«µÄ¹Ø±ÕÍ˳ö; ÖØÆôºó»Ö¸´\n"
+"\n"
+
+#: pg_ctl.c:1061
+#, c-format
+msgid "Report bugs to .\n"
+msgstr "´íÎ󱨸æÖÁ .\n"
+
+#: pg_ctl.c:1086
+#, c-format
+msgid "%s: invalid shutdown mode %s\n"
+msgstr "%s: ÎÞЧµÄ¹Ø±Õģʽ %s\n"
+
+#: pg_ctl.c:1119
+#, c-format
+msgid "%s: invalid signal \"%s\"\n"
+msgstr "%s: ÎÞЧÐźŠ\"%s\"\n"
+
+#: pg_ctl.c:1246
+#, c-format
+msgid "%s: invalid option %s\n"
+msgstr "%s: ÎÞЧѡÏî %s\n"
+
+#: pg_ctl.c:1257
+#, c-format
+msgid "%s: extra operation mode %s\n"
+msgstr "%s: ¶îÍâµÄ²Ù×÷ģʽ %s\n"
+
+#: pg_ctl.c:1276
+#, c-format
+msgid "%s: invalid kill syntax\n"
+msgstr "%s: ÎÞЧµÄ kill Óï·¨\n"
+
+#: pg_ctl.c:1294
+#, c-format
+msgid "%s: invalid operation mode %s\n"
+msgstr "%s: ÎÞЧµÄ²Ù×÷ģʽ %s\n"
+
+#: pg_ctl.c:1304
+#, c-format
+msgid "%s: no operation specified\n"
+msgstr "%s: ûÓÐÖ¸¶¨²Ù×÷\n"
+
+#: pg_ctl.c:1320
+#, c-format
+msgid ""
+"%s: no database directory specified and environment variable PGDATA unset\n"
+msgstr "%s: ûÓÐÖ¸¶¨Êý¾ÝĿ¼, ²¢ÇÒûÓÐÉèÖà PGDATA »·¾³±äÁ¿\n"

diff --git a/src/bin/pg_dump/po/zh_CN.po b/src/bin/pg_dump/po/zh_CN.po
index e78055053bb1b6d8488fe4f99bb99fae0184fbd9..3b1c6f08407e04c443bc76d8f396e905adf90dd1 100644 (file)
--- a/src/bin/pg_dump/po/zh_CN.po
+++ b/src/bin/pg_dump/po/zh_CN.po
@@ -1,117 +1,97 @@
 # simplified Chinese translation file for pg_dump and friends
 # Weiping He , 2001.
-# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.4 2003/11/29 19:52:05 pgsql Exp $
+# $PostgreSQL: pgsql/src/bin/pg_dump/po/zh_CN.po,v 1.5 2004/08/10 19:06:21 petere Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-11 11:22+0000\n"
-"PO-Revision-Date: 2003-09-15 13:46:59+0800\n"
-"Last-Translator: Bao Wei <[email protected].cn>\n"
+"POT-Creation-Date: 2004-08-05 14:25+0000\n"
+"PO-Revision-Date: 2004-01-10 13:46:59+0800\n"
+"Last-Translator: Bao Wei <[email protected].cn>\n"
 "Language-Team: Weiping He \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_dump.c:344 pg_restore.c:244
+#: pg_dump.c:363 pg_restore.c:225
 msgid "User name: "
 msgstr "̞: "
 
-#: pg_dump.c:378 pg_restore.c:271
+#: pg_dump.c:399 pg_restore.c:252 pg_dumpall.c:238
 #, c-format
 msgid "%s: invalid -X option -- %s\n"
 msgstr "%s: ÎÞЧµÄ -X Ñ¡Ïî -- %s\n"
 
-#: pg_dump.c:380 pg_dump.c:394 pg_dump.c:403 pg_restore.c:273 pg_restore.c:283
-#: pg_dumpall.c:190 pg_dumpall.c:199
+#: pg_dump.c:401 pg_dump.c:415 pg_dump.c:424 pg_restore.c:254 pg_restore.c:264
+#: pg_restore.c:281 pg_dumpall.c:240 pg_dumpall.c:249 pg_dumpall.c:266
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÊäÈë \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: pg_dump.c:401 pg_dumpall.c:197
+#: pg_dump.c:422 pg_dumpall.c:264
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: ÃüÁîÐвÎÊýÌ«¶à (µÚÒ»¸öÊÇ \"%s\")\n"
 
-#: pg_dump.c:414
+#: pg_dump.c:435
 msgid ""
 "options \"schema only\" (-s) and \"data only\" (-a) cannot be used together\n"
-msgstr "Ñ¡Ïî \"ֻת´¢´ó¸Ù\" (-s) ºÍ \"ֻת´¢Êý¾Ý\" (-a) ²»ÄÜͬʱʹÓÃ.\n"
+msgstr "Ñ¡Ïî \"ֻת´¢ģʽ\" (-s) ºÍ \"ֻת´¢Êý¾Ý\" (-a) ²»ÄÜͬʱʹÓÃ.\n"
 
-#: pg_dump.c:420
+#: pg_dump.c:441
 msgid "options \"clean\" (-c) and \"data only\" (-a) cannot be used together\n"
 msgstr "Ñ¡Ïî \"Çå½à\" (-c) ºÍ \"ֻת´¢Êý¾Ý\" (-a) ²»ÄÜͬʱʹÓÃ.\n"
 
-#: pg_dump.c:426
+#: pg_dump.c:447
 msgid "large-object output not supported for a single table\n"
 msgstr "²»Ö§³Öµ¥¸ö±íµÄ´ó¶ÔÏóÊä³ö.\n"
 
-#: pg_dump.c:427 pg_dump.c:434
+#: pg_dump.c:448 pg_dump.c:455
 msgid "use a full dump instead\n"
 msgstr "ʹÓÃÍêÕûת´¢Ìæ´ú.\n"
 
-#: pg_dump.c:433
+#: pg_dump.c:454
 msgid "large-object output not supported for a single schema\n"
-msgstr "²»Ö§³Öµ¥¸ö´ó¸ÙµÄ´ó¶ÔÏóÊä³ö.\n"
+msgstr "²»Ö§³Öµ¥¸öģʽµÄ´ó¶ÔÏóÊä³ö.\n"
 
-#: pg_dump.c:440
+#: pg_dump.c:461
 msgid "INSERT (-d, -D) and OID (-o) options cannot be used together\n"
 msgstr "INSERT (-d, -D) ºÍ OID (-o) Ñ¡Ïî²»ÄÜͬʱʹÓÃ.\n"
 
-#: pg_dump.c:441
+#: pg_dump.c:462
 msgid "(The INSERT command cannot set OIDs.)\n"
 msgstr "(INSERT ÃüÁîÎÞ·¨ÉèÖöÔÏó±êʶ(oid).)\n"
 
-#: pg_dump.c:447
+#: pg_dump.c:468
 msgid "large-object output is not supported for plain-text dump files\n"
 msgstr "´¿Îı¾×ª´¢Îļþ²»Ö§³ÖÊä³ö´ó¶ÔÏó.\n"
 
-#: pg_dump.c:448
+#: pg_dump.c:469
 msgid "(Use a different output format.)\n"
 msgstr "(ʹÓò»Í¬µÄÊä³ö¸ñʽ.)\n"
 
-#: pg_dump.c:477
+#: pg_dump.c:498
 #, c-format
 msgid "invalid output format \"%s\" specified\n"
 msgstr "ÉùÃ÷ÁË·Ç·¨µÄÊä³ö¸ñʽ \"%s\"\n"
 
-#: pg_dump.c:483
+#: pg_dump.c:504
 #, c-format
 msgid "could not open output file \"%s\" for writing\n"
 msgstr "ÎÞ·¨´ò¿ªÊä³öÎļþ \"%s\" ÓÃÓÚд³ö\n"
 
-#: pg_dump.c:494 pg_backup_db.c:48
+#: pg_dump.c:515 pg_backup_db.c:48
 #, c-format
 msgid "could not parse version string \"%s\"\n"
 msgstr "ÎÞ·¨·ÖÎö°æ±¾×Ö´® \"%s\"\n"
 
-#: pg_dump.c:510
-#, c-format
-msgid "BEGIN command failed: %s"
-msgstr "BEGIN ÃüÁîʧ°Ü: %s"
-
-#: pg_dump.c:516
-#, c-format
-msgid "could not set transaction isolation level to serializable: %s"
-msgstr "ÎÞ·¨°ÑÊÂÎñ¸ôÀ뼶±ðÉèÖÃΪ¿É´®Ðл¯: %s"
-
-#: pg_dump.c:523
-#, c-format
-msgid "could not set datestyle to ISO: %s"
-msgstr "ÎÞ·¨ÉèÖà ISO ÈÕÆÚÀàÐÍ: %s"
-
-#: pg_dump.c:535
-#, c-format
-msgid "could not set extra_float_digits: %s"
-msgstr "ÎÞ·¨ÉèÖà extra_float_digits: %s"
-
-#: pg_dump.c:548
+#: pg_dump.c:551
 #, c-format
 msgid "last built-in OID is %u\n"
 msgstr "×îºóµÄÄÚÖà OID ÊÇ %u\n"
 
-#: pg_dump.c:636
+#: pg_dump.c:663
 #, c-format
 msgid ""
 "%s dumps a database as a text file or to other formats.\n"
@@ -120,16 +100,18 @@ msgstr ""
 "%s °ÑÒ»¸öÊý¾Ý¿âת´¢Îª´¿Îı¾Îļþ»òÕßÊÇÆäËü¸ñʽ.\n"
 "\n"
 
-#: pg_dump.c:637 pg_restore.c:365 pg_dumpall.c:235
+#: pg_dump.c:664 pg_restore.c:354 pg_dumpall.c:311
+#, c-format
 msgid "Usage:\n"
 msgstr "Ó÷¨:\n"
 
-#: pg_dump.c:638
+#: pg_dump.c:665
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû×Ö]\n"
 
-#: pg_dump.c:640 pg_restore.c:368
+#: pg_dump.c:667 pg_restore.c:357 pg_dumpall.c:314
+#, c-format
 msgid ""
 "\n"
 "General options:\n"
@@ -137,16 +119,19 @@ msgstr ""
 "\n"
 "Ò»°ãÑ¡Ïî:\n"
 
-#: pg_dump.c:641 pg_restore.c:370
+#: pg_dump.c:668 pg_restore.c:359
+#, c-format
 msgid "  -f, --file=FILENAME      output file name\n"
 msgstr "  -f, --file=ÎļþÃû        Êä³öÎļþÃû\n"
 
-#: pg_dump.c:642
+#: pg_dump.c:669
+#, c-format
 msgid ""
 "  -F, --format=c|t|p       output file format (custom, tar, plain text)\n"
 msgstr "  -F, --format=c|t|p       Êä³öÎļþ¸ñʽ (¶¨ÖÆ, tar, Ã÷ÎÄ)\n"
 
-#: pg_dump.c:643
+#: pg_dump.c:670
+#, c-format
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 "                           pg_dump version\n"
@@ -154,23 +139,28 @@ msgstr ""
 "  -i, --ignore-version     µ±·þÎñÆ÷µÄ°æ±¾ºÅÓë pg_dump µÄ°æ±¾ºÅ²»Æ¥Åäʱ\n"
 "                           ÈÔ¼ÌÐøÔËÐÐ\n"
 
-#: pg_dump.c:645 pg_restore.c:374 pg_dumpall.c:248
+#: pg_dump.c:672 pg_restore.c:363
+#, c-format
 msgid "  -v, --verbose            verbose mode\n"
 msgstr "  -v, --verbose            Ïêϸģʽ\n"
 
-#: pg_dump.c:646
+#: pg_dump.c:673
+#, c-format
 msgid "  -Z, --compress=0-9       compression level for compressed formats\n"
 msgstr "  -Z, --compress=0-9       ±»Ñ¹Ëõ¸ñʽµÄѹËõ¼¶±ð\n"
 
-#: pg_dump.c:647 pg_restore.c:375 pg_dumpall.c:250
+#: pg_dump.c:674 pg_restore.c:364 pg_dumpall.c:317
+#, c-format
 msgid "  --help                   show this help, then exit\n"
 msgstr "  --help                   ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_dump.c:648 pg_restore.c:376 pg_dumpall.c:251
+#: pg_dump.c:675 pg_restore.c:365 pg_dumpall.c:318
+#, c-format
 msgid "  --version                output version information, then exit\n"
 msgstr "  --version                Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: pg_dump.c:650 pg_restore.c:378
+#: pg_dump.c:677 pg_restore.c:367 pg_dumpall.c:319
+#, c-format
 msgid ""
 "\n"
 "Options controlling the output content:\n"
@@ -178,63 +168,66 @@ msgstr ""
 "\n"
 "¿ØÖÆÊä³öÄÚÈÝÑ¡Ïî:\n"
 
-#: pg_dump.c:651 pg_dumpall.c:239
+#: pg_dump.c:678 pg_dumpall.c:320
+#, c-format
 msgid "  -a, --data-only          dump only the data, not the schema\n"
-msgstr "  -a, --data-only          ֻת´¢Êý¾Ý,²»°üÀ¨´ó¸Ù\n"
+msgstr "  -a, --data-only          ֻת´¢Êý¾Ý,²»°üÀ¨ģʽ\n"
 
-#: pg_dump.c:652
+#: pg_dump.c:679
+#, c-format
 msgid "  -b, --blobs              include large objects in dump\n"
 msgstr "  -b, --blobs              ÔÚת´¢ÖаüÀ¨´ó¶ÔÏó\n"
 
-#: pg_dump.c:653 pg_restore.c:380
+#: pg_dump.c:680 pg_restore.c:369
+#, c-format
 msgid "  -c, --clean              clean (drop) schema prior to create\n"
-msgstr "  -c, --clean              ÏÈÇå³þ(ɾ³ý)Ô¤ÏȵĴó¸Ù,ÔÙ½¨Á¢\n"
+msgstr "  -c, --clean              ÏÈÇå³þ(ɾ³ý)Ô¤ÏȵÄģʽ,ÔÙ½¨Á¢\n"
 
-#: pg_dump.c:654
+#: pg_dump.c:681
+#, c-format
 msgid ""
 "  -C, --create             include commands to create database in dump\n"
 msgstr "  -C, --create             ÔÚת´¢ÖаüÀ¨ÃüÁî,ÒԱ㴴½¨Êý¾Ý¿â\n"
 
-#: pg_dump.c:655 pg_dumpall.c:241
+#: pg_dump.c:682 pg_dumpall.c:322
+#, c-format
 msgid ""
 "  -d, --inserts            dump data as INSERT, rather than COPY, commands\n"
 msgstr ""
 "  -d, --inserts            Ïó INSERT Ò»ÑùµÄת´¢Êý¾Ý, Ï൱ÓÚ COPY, ÃüÁî\n"
 
-#: pg_dump.c:656 pg_dumpall.c:242
+#: pg_dump.c:683 pg_dumpall.c:323
+#, c-format
 msgid ""
 "  -D, --column-inserts     dump data as INSERT commands with column names\n"
 msgstr "  -D, --column-inserts     Ïó INSERT ´ø×Ö¶ÎÃû×ÖÃüÁîÒ»Ñùת´¢Êý¾Ý\n"
 
-#: pg_dump.c:657
+#: pg_dump.c:684
+#, c-format
 msgid "  -n, --schema=SCHEMA      dump the named schema only\n"
-msgstr "  -n, --schema=SCHEMA      ֻת´¢Ö¸¶¨Ãû³ÆµÄ´ó¸Ù\n"
+msgstr "  -n, --schema=SCHEMA      ֻת´¢Ö¸¶¨Ãû³ÆµÄģʽ\n"
 
-#: pg_dump.c:658 pg_dumpall.c:247
+#: pg_dump.c:685 pg_dumpall.c:325
+#, c-format
 msgid "  -o, --oids               include OIDs in dump\n"
 msgstr "  -o, --oids               ÔÚת´¢ÖаüÀ¨ OID\n"
 
-#: pg_dump.c:659
-msgid ""
-"  -O, --no-owner           do not output \\connect commands in plain\n"
-"                           text format\n"
-msgstr ""
-"  -O, --no-owner           ÔÚÃ÷ÎĸñʽÖÐ, ²»ÏÔʾ \\connect ÃüÁî\n"
-"                           µÄÊä³ö\n"
-
-#: pg_dump.c:661
+#: pg_dump.c:686
+#, c-format
 msgid ""
-"  -R, --no-reconnect       disable ALL reconnections to the database in\n"
-"                           plain text format\n"
+"  -O, --no-owner           do not output commands to set object ownership\n"
+"                           in plain text format\n"
 msgstr ""
-"  -R, --no-reconnect       ÔÚÃ÷ÎĸñʽÖÐ, È¡ÏûËùÓÐÁª½ÓÊý¾Ý¿âµÄ\n"
-"                           ÖØÁª½Ó\n"
+"  -O, --no-owner           ÔÚÃ÷ÎĸñʽÖÐ, ÉèÖöÔÏóËùÊôÕßʱ²»Êä³ö\n"
+"                           Ã÷Áî\n"
 
-#: pg_dump.c:663 pg_dumpall.c:246
+#: pg_dump.c:688 pg_dumpall.c:327
+#, c-format
 msgid "  -s, --schema-only        dump only the schema, no data\n"
-msgstr "  -s, --schema-only        ֻת´¢´ó¸Ù, ²»°üÀ¨Êý¾Ý\n"
+msgstr "  -s, --schema-only        ֻת´¢ģʽ, ²»°üÀ¨Êý¾Ý\n"
 
-#: pg_dump.c:664
+#: pg_dump.c:689
+#, c-format
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use in\n"
 "                           plain text format\n"
@@ -242,25 +235,27 @@ msgstr ""
 "  -S, --superuser=NAME     ÔÚÃ÷ÎĸñʽÖÐ, ʹÓÃÖ¸¶¨µÄ³¬¼¶Óû§\n"
 "                           Ãû³Æ\n"
 
-#: pg_dump.c:666
+#: pg_dump.c:691
+#, c-format
 msgid "  -t, --table=TABLE        dump the named table only\n"
 msgstr "  -t, --table=TABLE        ֻת´¢Ö¸¶¨Ãû³ÆµÄ±í\n"
 
-#: pg_dump.c:667 pg_dumpall.c:249
+#: pg_dump.c:692 pg_dumpall.c:329
+#, c-format
 msgid "  -x, --no-privileges      do not dump privileges (grant/revoke)\n"
 msgstr "  -x, --no-privileges      ²»Òª×ª´¢È¨ÏÞ (grant/revoke)\n"
 
-#: pg_dump.c:668
+#: pg_dump.c:693 pg_dumpall.c:330
+#, c-format
 msgid ""
-"  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           output SET SESSION AUTHORIZATION commands rather\n"
-"                           than \\connect commands\n"
+"  -X disable-dollar-quoting, --disable-dollar-quoting\n"
+"                           disable dollar quoting, use SQL standard quoting\n"
 msgstr ""
-"  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           Êä³ö SET SESSION AUTHORIZATION ÃüÁî, Ï൱ÓÚ\n"
-"                           \\connect ÃüÁî\n"
+"  -X disable-dollar-quoting, --disable-dollar-quoting\n"
+"                           È¡ÏûÃÀÔª (·ûºÅ) ÒýºÅ, ʹÓà SQL ±ê×¼ÒýºÅ\n"
 
-#: pg_dump.c:671 pg_restore.c:402
+#: pg_dump.c:695 pg_restore.c:383 pg_dumpall.c:332
+#, c-format
 msgid ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           disable triggers during data-only restore\n"
@@ -268,7 +263,19 @@ msgstr ""
 "  -X disable-triggers, --disable-triggers\n"
 "                           ÔÚÖ»»Ö¸´Êý¾ÝµÄ¹ý³ÌÖÐÈ¡Ïû´¥·¢Æ÷\n"
 
-#: pg_dump.c:674 pg_restore.c:405 pg_dumpall.c:253
+#: pg_dump.c:697 pg_restore.c:385 pg_dumpall.c:334
+#, c-format
+msgid ""
+"  -X use-set-session-authorization, --use-set-session-authorization\n"
+"                           use SESSION AUTHORIZATION commands instead of\n"
+"                           OWNER TO commands\n"
+msgstr ""
+"  -X use-set-session-authorization, --use-set-session-authorization\n"
+"                           ʹÓà SESSION AUTHORIZATION ÃüÁî´úÌæ\n"
+"                           OWNER TO ÃüÁî\n"
+
+#: pg_dump.c:701 pg_restore.c:389 pg_dumpall.c:338
+#, c-format
 msgid ""
 "\n"
 "Connection options:\n"
@@ -276,25 +283,30 @@ msgstr ""
 "\n"
 "Áª½ÓÑ¡Ïî:\n"
 
-#: pg_dump.c:675 pg_restore.c:406 pg_dumpall.c:254
+#: pg_dump.c:702 pg_restore.c:390 pg_dumpall.c:339
+#, c-format
 msgid "  -h, --host=HOSTNAME      database server host or socket directory\n"
 msgstr "  -h, --host=Ö÷»úÃû        Êý¾Ý¿â·þÎñÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
 
-#: pg_dump.c:676 pg_restore.c:407 pg_dumpall.c:255
+#: pg_dump.c:703 pg_restore.c:391 pg_dumpall.c:340
+#, c-format
 msgid "  -p, --port=PORT          database server port number\n"
 msgstr "  -p, --port=¶Ë¿ÚºÅ        Êý¾Ý¿â·þÎñÆ÷µÄ¶Ë¿ÚºÅ\n"
 
-#: pg_dump.c:677 pg_restore.c:408 pg_dumpall.c:256
+#: pg_dump.c:704 pg_restore.c:392 pg_dumpall.c:341
+#, c-format
 msgid "  -U, --username=NAME      connect as specified database user\n"
 msgstr "  -U, --username=Ãû×Ö      ÒÔÖ¸¶¨µÄÊý¾Ý¿âÓû§Áª½Ó\n"
 
-#: pg_dump.c:678 pg_restore.c:409 pg_dumpall.c:257
+#: pg_dump.c:705 pg_restore.c:393 pg_dumpall.c:342
+#, c-format
 msgid ""
 "  -W, --password           force password prompt (should happen "
 "automatically)\n"
 msgstr "  -W, --password           Ç¿ÖÆ¿ÚÁîÌáʾ (×Ô¶¯)\n"
 
-#: pg_dump.c:680
+#: pg_dump.c:707
+#, c-format
 msgid ""
 "\n"
 "If no database name is supplied, then the PGDATABASE environment\n"
@@ -306,651 +318,413 @@ msgstr ""
 "µÄÊýÖµ.\n"
 "\n"
 
-#: pg_dump.c:682 pg_restore.c:412 pg_dumpall.c:260
+#: pg_dump.c:709 pg_restore.c:396 pg_dumpall.c:345
+#, c-format
 msgid "Report bugs to .\n"
 msgstr "±¨¸æ´íÎóÖÁ .\n"
 
-#: pg_dump.c:690 pg_backup_archiver.c:1298
+#: pg_dump.c:717 pg_backup_archiver.c:1195
 msgid "*** aborted because of error\n"
 msgstr "*** ÒòΪ´íÎóÍ˳ö\n"
 
-#: pg_dump.c:772
+#: pg_dump.c:799
 #, c-format
 msgid "dumping contents of table %s\n"
 msgstr "ÕýÔÚת´¢±í %s µÄÄÚÈÝ\n"
 
-#: pg_dump.c:811
+#: pg_dump.c:911
 #, c-format
-msgid "SQL command to dump the contents of table \"%s\" failed\n"
-msgstr "ת´¢±í \"%s\" µÄÄÚÈÝµÄ SQL ÃüÁîʧ°Ü\n"
+msgid ""
+"SQL command to dump the contents of table \"%s\" failed: PQendcopy() "
+"failed.\n"
+msgstr "ת´¢±í \"%s\" µÄÄÚÈÝµÄ SQL ÃüÁîʧ°Ü: PQendcopy() ʧ°Ü.\n"
 
-#: pg_dump.c:813 pg_dump.c:902 pg_dump.c:952 pg_dump.c:966 pg_dump.c:1070
-#: pg_dump.c:1189
+#: pg_dump.c:912 pg_dump.c:8057
 #, c-format
 msgid "Error message from server: %s"
 msgstr "À´×Ô·þÎñÆ÷µÄ´íÎóÐÅÏ¢: %s"
 
-#: pg_dump.c:814 pg_dump.c:823 pg_dump.c:903 pg_dump.c:953 pg_dump.c:1190
+#: pg_dump.c:913 pg_dump.c:8058
 #, c-format
 msgid "The command was: %s\n"
 msgstr "ÃüÁîÊÇ: %s\n"
 
-#: pg_dump.c:819
-#, c-format
-msgid "SQL command to dump the contents of table \"%s\" executed abnormally.\n"
-msgstr "ת´¢±í \"%s\" µÄÄÚÈÝµÄ SQL ÃüÁî·ÇÕý³£Ö´ÐÐ.\n"
-
-#: pg_dump.c:821
-#, c-format
-msgid "The server returned status %d when %d was expected.\n"
-msgstr "ÆÚÍû״̬ %2$d µÄʱºò·þÎñÆ÷·µ»Ø״̬ %1$d.\n"
-
-#: pg_dump.c:901
-#, c-format
-msgid ""
-"SQL command to dump the contents of table \"%s\" failed: PQendcopy() "
-"failed.\n"
-msgstr "ת´¢±í \"%s\" µÄÄÚÈÝµÄ SQL ÃüÁîʧ°Ü: PQendcopy() ʧ°Ü.\n"
-
-#: pg_dump.c:951 pg_dump.c:965 pg_dump.c:1069
-msgid "dumpClasses(): SQL command failed\n"
-msgstr "dumpClasses(): SQL ÃüÁîʧ°Ü\n"
-
-#: pg_dump.c:967
-msgid "The command was: FETCH 100 FROM _pg_dump_cursor\n"
-msgstr "ÃüÁîÊÇ: FETCH 100 FROM _pg_dump_cursor\n"
-
-#: pg_dump.c:1071
-msgid "The command was: CLOSE _pg_dump_cursor\n"
-msgstr "ÃüÁîÊÇ: CLOSE _pg_dump_cursor\n"
-
-#: pg_dump.c:1109
-#, c-format
-msgid "preparing to dump the contents of table %s\n"
-msgstr "×¼±¸×ª´¢±í %s µÄÄÚÈÝ\n"
-
-#: pg_dump.c:1172
+#: pg_dump.c:1182
 msgid "saving database definition\n"
 msgstr "±£´æÊý¾Ý¿â¶¨Òå\n"
 
-#: pg_dump.c:1188
-msgid "SQL command failed\n"
-msgstr "SQL ÃüÁîʧ°Ü\n"
-
-#: pg_dump.c:1198
+#: pg_dump.c:1228
 #, c-format
 msgid "missing pg_database entry for database \"%s\"\n"
 msgstr "ȱÉÙÓÃÓÚ \"%s\" µÄ pg_database ¼Ç¼\n"
 
-#: pg_dump.c:1205
+#: pg_dump.c:1235
 #, c-format
 msgid ""
 "query returned more than one (%d) pg_database entry for database \"%s\"\n"
 msgstr "²éѯΪÊý¾Ý¿â \"%2$s\" ·µ»ØÁ˳¬¹ýÒ»Ìõ (%1$d) pg_database ¼Ç¼\n"
 
-#: pg_dump.c:1278
+#: pg_dump.c:1343
+msgid "saving encoding\n"
+msgstr "±£´æ±àÂë\n"
+
+#: pg_dump.c:1393
 msgid "saving large objects\n"
 msgstr "±£´æ´ó¶ÔÏó\n"
 
-#: pg_dump.c:1292
-#, c-format
-msgid "dumpBlobs(): cursor declaration failed: %s"
-msgstr "dumpBlobs(): ÓαêÉùÃ÷ʧ°Ü: %s"
-
-#: pg_dump.c:1307
-#, c-format
-msgid "dumpBlobs(): fetch from cursor failed: %s"
-msgstr "dumpBlobs(): ´ÓÓαêץȡʧ°Ü: %s"
-
-#: pg_dump.c:1320
+#: pg_dump.c:1426
 #, c-format
 msgid "dumpBlobs(): could not open large object: %s"
 msgstr "dumpBlobs(): ÎÞ·¨´ò¿ª´ó¶ÔÏó: %s"
 
-#: pg_dump.c:1333
+#: pg_dump.c:1439
 #, c-format
 msgid "dumpBlobs(): error reading large object: %s"
 msgstr "dumpBlobs(): ¶ÁÈ¡´ó¶ÔÏó´íÎó: %s"
 
-#: pg_dump.c:1421
-#, c-format
-msgid "query to obtain list of schemas failed: %s"
-msgstr "»ñÈ¡´ó¸ÙÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:1445
+#: pg_dump.c:1573
 #, c-format
 msgid "WARNING: owner of schema \"%s\" appears to be invalid\n"
-msgstr "¾¯¸æ: ´ó¸Ù \"%s\" µÄËùÓÐÕß·Ç·¨\n"
+msgstr "¾¯¸æ: ģʽ \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:1462
+#: pg_dump.c:1590
 #, c-format
 msgid "specified schema \"%s\" does not exist\n"
-msgstr "Ö¸¶¨µÄ´ó¸Ù \"%s\" ²»´æÔÚ\n"
+msgstr "Ö¸¶¨µÄģʽ \"%s\" ²»´æÔÚ\n"
 
-#: pg_dump.c:1499
+#: pg_dump.c:1627
 #, c-format
-msgid "schema with OID %s does not exist\n"
-msgstr "OID Ϊ %s µÄ´ó¸Ù²»´æÔÚ\n"
+msgid "schema with OID %u does not exist\n"
+msgstr "OID %u µÄģʽ²»´æÔÚ\n"
 
-#: pg_dump.c:1579
-#, c-format
-msgid "query to obtain list of data types failed: %s"
-msgstr "»ñÈ¡Êý¾ÝÀàÐÍÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:1624
+#: pg_dump.c:1812
 #, c-format
 msgid "WARNING: owner of data type \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: Êý¾ÝÀàÐÍ \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:1687 pg_dump.c:4155
-#, c-format
-msgid "query to obtain list of operators failed: %s"
-msgstr "»ñÈ¡²Ù×÷·ûÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:1712
+#: pg_dump.c:1910
 #, c-format
 msgid "WARNING: owner of operator \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ²Ù×÷·û \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:1770
-#, c-format
-msgid "query to obtain list of operator classes failed: %s"
-msgstr "»ñÈ¡²Ù×÷·û±íÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:1795
+#: pg_dump.c:2075
 #, c-format
 msgid "WARNING: owner of operator class \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ²Ù×÷·û±í \"%s\" ÎÞЧ\n"
 
-#: pg_dump.c:1863 pg_dump.c:4775
-#, c-format
-msgid "query to obtain list of aggregate functions failed: %s"
-msgstr "»ñÈ¡¾Û¼¯º¯ÊýÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:1889
+#: pg_dump.c:2179
 #, c-format
 msgid "WARNING: owner of aggregate function \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: ¾Û¼¯º¯Êý \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:1963
-#, c-format
-msgid "query to obtain list of functions failed: %s"
-msgstr "»ñÈ¡º¯ÊýÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:2010
+#: pg_dump.c:2312
 #, c-format
 msgid "WARNING: owner of function \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: º¯Êý \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:2160
-#, c-format
-msgid "query to obtain list of tables failed: %s"
-msgstr "»ñÈ¡Êý¾Ý±íÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:2256
-#, c-format
-msgid "attempt to lock table \"%s\" failed: %s"
-msgstr "³¢ÊÔËøס±í \"%s\" ʧ°Ü: %s"
-
-#: pg_dump.c:2265
+#: pg_dump.c:2590
 #, c-format
 msgid "WARNING: owner of table \"%s\" appears to be invalid\n"
 msgstr "¾¯¸æ: Êý¾Ý±í \"%s\" µÄËùÓÐÕß·Ç·¨\n"
 
-#: pg_dump.c:2284
+#: pg_dump.c:2608
 #, c-format
 msgid "specified table \"%s\" does not exist\n"
 msgstr "Ö¸¶¨µÄ±í \"%s\" ²»´æÔÚ\n"
 
-#: pg_dump.c:2328
+#: pg_dump.c:2715
 #, c-format
-msgid "query to obtain inheritance relationships failed: %s"
-msgstr "»ñÈ¡¼Ì³Ð¹ØϵµÄ²éѯʧ°Ü: %s"
+msgid "reading indexes for table \"%s\"\n"
+msgstr "Ϊ±í \"%s\" ¶ÁÈ¡Ë÷Òý\n"
 
-#: pg_dump.c:2416
+#: pg_dump.c:2952
 #, c-format
-msgid "finding the columns and types of table \"%s\"\n"
-msgstr "ÕýÔÚ²éÕÒ±í \"%s\" µÄ×ֶκÍÀàÐÍ\n"
+msgid "reading foreign key constraints for table \"%s\"\n"
+msgstr "Ϊ±í \"%s\" ¶ÁÈ¡Íâ¼üÔ¼Êø\n"
 
-#: pg_dump.c:2468
+#: pg_dump.c:3227
 #, c-format
-msgid "query to get table columns failed: %s"
-msgstr "»ñÈ¡±í×ֶεIJéѯʧ°Ü: %s"
+msgid "reading triggers for table \"%s\"\n"
+msgstr "Ϊ±í \"%s\" ¶ÁÈ¡´¥·¢Æ÷\n"
 
-#: pg_dump.c:2507
+#: pg_dump.c:3299
 #, c-format
-msgid "invalid attribute numbering in table \"%s\"\n"
-msgstr "±í \"%s\" ÖеÄÎÞЧÊôÐÔ¼ÆËã\n"
+msgid "expected %d triggers on table \"%s\" but found %d\n"
+msgstr "Ô¤ÆÚÔÚ±í \"%2$s\" ÉÏÓд¥·¢Æ÷ %1$d , È´·¢ÏÖ %3$d\n"
 
-#: pg_dump.c:2537
+#: pg_dump.c:3344
 #, c-format
-msgid "finding default expressions of table \"%s\"\n"
-msgstr "ÕýÔÚ²éÕÒ±í \"%s\" µÄĬÈϱí´ïʽ\n"
+msgid ""
+"query produced null referenced table name for foreign key trigger \"%s\" on "
+"table \"%s\" (OID of table: %u)\n"
+msgstr ""
+"¶ÔÔÚ±í \"%2$s\" ÉϵÄÍâ¼ü´¥·¢Æ÷ \"%1$s\" ÉϵIJéѯÉú³ÉÁË NULL ¸öÒýÓñí(±íµÄ "
+"OID ÊÇ: %3$u)\n"
 
-#: pg_dump.c:2568
+#: pg_dump.c:3644
 #, c-format
-msgid "query to get column default values failed: %s"
-msgstr "»ñÈ¡×Ö¶ÎȱʡֵµÄ²éѯʧ°Ü: %s"
+msgid "finding the columns and types of table \"%s\"\n"
+msgstr "ÕýÔÚ²éÕÒ±í \"%s\" µÄ×ֶκÍÀàÐÍ\n"
 
-#: pg_dump.c:2580
+#: pg_dump.c:3730
 #, c-format
-msgid "invalid adnum value %d for table \"%s\"\n"
-msgstr "±í \"%2$s\" µÄÎÞЧ adnum Öµ %1$d\n"
+msgid "invalid column numbering in table \"%s\"\n"
+msgstr "ÔÚ±í \"%s\" ÖеÄ×ֶθöÊýÊÇÎÞЧµÄ\n"
 
-#: pg_dump.c:2697
+#: pg_dump.c:3764
 #, c-format
-msgid "query to get comment on OID %s failed: %s"
-msgstr "»ñÈ¡ OID Ϊ %s µÄ×¢Ê͵IJéѯʧ°Ü: %s"
+msgid "finding default expressions of table \"%s\"\n"
+msgstr "ÕýÔÚ²éÕÒ±í \"%s\" µÄĬÈϱí´ïʽ\n"
 
-#: pg_dump.c:2781
+#: pg_dump.c:3847
 #, c-format
-msgid "query to get comments on table %s failed: %s"
-msgstr "»ñÈ¡±íΪ %s µÄ×¢Ê͵IJéѯʧ°Ü: %s"
+msgid "invalid adnum value %d for table \"%s\"\n"
+msgstr "±í \"%2$s\" µÄÎÞЧ adnum Öµ %1$d\n"
 
-#: pg_dump.c:2864
+#: pg_dump.c:3865
 #, c-format
-msgid "query to get database OID failed: %s"
-msgstr "»ñÈ¡Êý¾Ý¿â OID µÄ²éѯʧ°Ü: %s"
+msgid "finding check constraints for table \"%s\"\n"
+msgstr "ÕýÔÚΪ±í \"%s\" ²éÕÒ¼ì²éÔ¼Êø\n"
 
-#: pg_dump.c:3061
+#: pg_dump.c:3929
 #, c-format
-msgid "query to obtain information on data type \"%s\" failed: %s"
-msgstr "»ñÈ¡Êý¾ÝÀàÐÍ \"%s\" µÄÐÅÏ¢²éѯʧ°Ü: %s"
+msgid "expected %d check constraints on table \"%s\" but found %d\n"
+msgstr "Ô¤¼ÆÓÐ %d ¸ö¼ì²éÔ¼ÊøÔÚ±í \"%s\" ÉÏ, µ«Ö»ÕÒµ½ %d ¸ö\n"
+
+#: pg_dump.c:3931
+msgid "(The system catalogs might be corrupted.)\n"
+msgstr "(ϵͳ±í¿ÉÄÜËð»µÁË.)\n"
 
-#: pg_dump.c:3070 pg_dump.c:3272 pg_dump.c:3819 pg_dump.c:4163 pg_dump.c:4476
-#: pg_dump.c:4784
+#: pg_dump.c:4617 pg_dump.c:4782 pg_dump.c:5188 pg_dump.c:5572 pg_dump.c:5869
+#: pg_dump.c:6069 pg_dump.c:6252
 #, c-format
 msgid "Got %d rows instead of one from: %s"
 msgstr "Òѵõ½ %d Ìõ¼Ç¼Ìæ´úÀ´×Ô %s µÄÒ»Ìõ"
 
-#: pg_dump.c:3264
-#, c-format
-msgid "query to obtain domain information failed: %s"
-msgstr "»ñÈ¡ÓòÐÅÏ¢µÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:3329
-#, c-format
-msgid "query to obtain domain constraint information failed: %s"
-msgstr "»ñÈ¡ÓòÐÅÏ¢µÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:3407
-#, c-format
-msgid "query to obtain data type information failed: %s"
-msgstr "»ñÈ¡Êý¾ÝÀàÐÍÐÅÏ¢µÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:3415
+#: pg_dump.c:4891
 #, c-format
 msgid "query yielded no rows: %s\n"
 msgstr "²éѯ·ÅÆú, ûÓмǼ: %s\n"
 
-#: pg_dump.c:3546
-#, c-format
-msgid "query to obtain list of procedural languages failed: %s"
-msgstr "»ñÈ¡¹ý³ÌÓïÑÔÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:3581
-#, c-format
-msgid "handler procedure for procedural language \"%s\" not found\n"
-msgstr "δÕÒµ½ÓÃÓÚ¹ý³ÌÓïÑÔ \"%s\" µÄ¾ä±ú¹ý³Ì\n"
-
-#: pg_dump.c:3591
-#, c-format
-msgid "validator procedure for procedural language \"%s\" not found\n"
-msgstr "δÕÒµ½ÓÃÓÚ¹ý³ÌÓïÑÔ \"%s\" µÄУÑé¹ý³Ì\n"
-
-#: pg_dump.c:3810
-#, c-format
-msgid "query to obtain information on function \"%s\" failed: %s"
-msgstr "»ñÈ¡º¯Êý \"%s\" µÄÐÅÏ¢²éѯʧ°Ü: %s"
+#: pg_dump.c:5243
+msgid "WARNING: could not parse proargnames array\n"
+msgstr "¾¯¸æ: ÎÞ·¨·ÖÎö proargnames Êý×é\n"
 
-#: pg_dump.c:3886
+#: pg_dump.c:5280
 #, c-format
 msgid "unrecognized provolatile value for function \"%s\"\n"
 msgstr "º¯Êý \"%s\" µÄÒâÍâÕýÏòÒ×ʧֵ\n"
 
-#: pg_dump.c:3952
-#, c-format
-msgid "query to obtain list of casts failed: %s"
-msgstr "»ñÈ¡ÀàÐÍת»»ÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:4384
+#: pg_dump.c:5794
 #, c-format
 msgid "WARNING: could not find operator with OID %s\n"
 msgstr "¾¯¸æ: δÕÒµ½ OID Ϊ %s µÄ²Ù×÷·û\n"
 
-#: pg_dump.c:4468
-#, c-format
-msgid "query to obtain operator class details failed: %s"
-msgstr "»ñÈ¡²Ù×÷·û±í²éѯʧ°Ü: %s"
-
-#: pg_dump.c:4538
-#, c-format
-msgid "query to obtain operator class operators failed: %s"
-msgstr "»ñÈ¡²Ù×÷·û±íµÄ²Ù×÷·û²éѯʧ°Ü: %s"
-
-#: pg_dump.c:4583
-#, c-format
-msgid "query to obtain operator class functions failed: %s"
-msgstr "»ñÈ¡²Ù×÷·û±íµÄº¯Êý²éѯʧ°Ü: %s"
-
-#: pg_dump.c:4812
+#: pg_dump.c:6280
 #, c-format
 msgid ""
 "WARNING: aggregate function %s could not be dumped correctly for this "
 "database version; ignored\n"
 msgstr "¾¯¸æ: ÎÞ·¨Îª´Ë°æ±¾µÄÊý¾Ý¿âÕýȷת´¢¾Û¼¯º¯Êý \"%s\"; ºöÂÔ\n"
 
-#: pg_dump.c:4946
+#: pg_dump.c:6412
 #, c-format
 msgid "could not parse ACL list (%s) for object \"%s\" (%s)\n"
 msgstr "ÎÞ·¨Îª¶ÔÏó \"%2$s\" ·ÖÎö ACL Áбí (%1$s) (%3$s)\n"
 
-#: pg_dump.c:5109
-#, c-format
-msgid "query to obtain definition of view \"%s\" failed: %s"
-msgstr "»ñÈ¡ÊÓͼ \"%s\" ¶¨ÒåµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:5117
+#: pg_dump.c:6505
 #, c-format
 msgid "query to obtain definition of view \"%s\" returned no data\n"
 msgstr "»ñÈ¡ÊÓͼ \"%s\" ¶¨ÒåµÄ²éѯûÓзµ»ØÊý¾Ý\n"
 
-#: pg_dump.c:5120
+#: pg_dump.c:6508
 #, c-format
 msgid ""
 "query to obtain definition of view \"%s\" returned more than one definition\n"
 msgstr "»ñÈ¡ÊÓͼ \"%s\" ¶¨ÒåµÄ²éѯ·µ»Ø³¬¹ýÒ»¸ö¶¨Òå\n"
 
-#: pg_dump.c:5127
-#, c-format
-msgid "query to obtain definition of view \"%s\" returned null OID\n"
-msgstr "»ñÈ¡ÊÓͼ \"%s\" ¶¨ÒåµÄ²éѯ·µ»Ø¿Õ OID\n"
-
-#: pg_dump.c:5136
+#: pg_dump.c:6517
 #, c-format
 msgid "definition of view \"%s\" appears to be empty (length zero)\n"
 msgstr "ÊÓͼ \"%s\" µÄ¶¨ÒåÊÇ¿ÕµÄ(Á㳤)\n"
 
-#: pg_dump.c:5274
-#, c-format
-msgid "finding check constraints for table \"%s\"\n"
-msgstr "ÕýÔÚΪ±í \"%s\" ²éÕÒ¼ì²éÔ¼Êø\n"
-
-#: pg_dump.c:5338
-#, c-format
-msgid "query to obtain check constraints failed: %s"
-msgstr "»ñÈ¡¼ì²éÔ¼ÊøµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:5344
-#, c-format
-msgid "expected %d check constraints on table \"%s\" but found %d\n"
-msgstr "Ô¤¼ÆÓÐ %d ¸ö¼ì²éÔ¼ÊøÔÚ±í \"%s\" ÉÏ, µ«Ö»ÕÒµ½ %d ¸ö\n"
-
-#: pg_dump.c:5346
-msgid "(The system catalogs might be corrupted.)\n"
-msgstr "(ϵͳ±í¿ÉÄÜËð»µÁË.)\n"
-
-#: pg_dump.c:5508
+#: pg_dump.c:6824
 #, c-format
 msgid "invalid column number %d for table \"%s\"\n"
 msgstr "¶ÔÓÚ±í \"%2$s\" ×ֶθöÊý %1$d ÊÇÎÞЧµÄ\n"
 
-#: pg_dump.c:5597
+#: pg_dump.c:6925
 #, c-format
-msgid "query to obtain list of indexes failed: %s"
-msgstr "»ñÈ¡Ë÷ÒýÁбíµÄ²éѯʧ°Ü: %s"
+msgid "missing index for constraint %s\n"
+msgstr "¶ÔÓÚÔ¼Êø %s ȱÉÙË÷Òý\n"
 
-#: pg_dump.c:5757
-#, c-format
-msgid "could not create pgdump_oid table: %s"
-msgstr "ÎÞ·¨´´½¨ pgdump_oid ±í: %s"
+#: pg_dump.c:7092
+msgid "unexpected constraint type\n"
+msgstr "ÒâÍâµÄÔ¼ÊøÀàÐÍ\n"
 
-#: pg_dump.c:5765
-#, c-format
-msgid "could not insert into pgdump_oid table: %s"
-msgstr "ÎÞ·¨²åÈëµ½ pgdump_oid ±í: %s"
-
-#: pg_dump.c:5771
+#: pg_dump.c:7134
 msgid "inserted invalid OID\n"
 msgstr "²åÈëÁË·Ç·¨ OID\n"
 
-#: pg_dump.c:5779
-#, c-format
-msgid "could not drop pgdump_oid table: %s"
-msgstr "ÎÞ·¨É¾³ý pgdump_oid ±í: %s"
-
-#: pg_dump.c:5784
+#: pg_dump.c:7140
 #, c-format
 msgid "maximum system OID is %u\n"
 msgstr "×î´óϵͳ OID ÊÇ %u\n"
 
-#: pg_dump.c:5821
-#, c-format
-msgid "error in finding the last system OID: %s"
-msgstr "²éÕÒ×îºóµÄϵͳ OID ʱ³ö´í: %s"
-
-#: pg_dump.c:5827
+#: pg_dump.c:7181
 msgid "missing pg_database entry for this database\n"
 msgstr "ȱÉÙ´ËÊý¾Ý¿âµÄ pg_database ¼Ç¼\n"
 
-#: pg_dump.c:5832
+#: pg_dump.c:7186
 msgid "found more than one pg_database entry for this database\n"
 msgstr "ÕÒµ½´ËÊý¾Ý¿âµÄ¶àÓÚÒ»ÌõµÄ pg_database ¼Ç¼\n"
 
-#: pg_dump.c:5860
-#, c-format
-msgid "error in finding the template1 database: %s"
-msgstr "²éÕÒ template1 Êý¾Ý¿â³ö´í: %s"
+#: pg_dump.c:7218
+msgid "could not find entry for pg_indexes in pg_class\n"
+msgstr "ÔÚ pg_class ÖÐÎÞ·¨Îª pg_indexes ÕÒµ½¼Ç¼\n"
 
-#: pg_dump.c:5866
-msgid "could not find entry for database template1 in table pg_database\n"
-msgstr "ÎÞ·¨ÔÚ pg_database ±íÖÐÕÒµ½ template1 Êý¾Ý¿â¼Ç¼\n"
+#: pg_dump.c:7223
+msgid "found more than one entry for pg_indexes in pg_class\n"
+msgstr "ÔÚ pg_class ±íÖÐÕÒµ½¶àÌõ pg_indexes µÄ¼Ç¼\n"
 
-#: pg_dump.c:5871
-msgid "found more than one entry for database template1 in table pg_database\n"
-msgstr "ÔÚ pg_database ±íÖÐÕÒµ½¶àÌõ template1 Êý¾Ý¿â¼Ç¼\n"
-
-#: pg_dump.c:5919
-#, c-format
-msgid "query to get data of sequence \"%s\" failed: %s"
-msgstr "»ñÈ¡ÐòÁÐ \"%s\" µÄÊý¾ÝµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:5925
+#: pg_dump.c:7272
 #, c-format
 msgid "query to get data of sequence \"%s\" returned %d rows (expected 1)\n"
 msgstr "»ñÈ¡ÐòÁÐ \"%s\" µÄÊý¾ÝµÄ²éѯ·µ»ØÁË %d ÐÐ (Ô¤ÆÚÊÇ 1)\n"
 
-#: pg_dump.c:5934
+#: pg_dump.c:7281
 #, c-format
 msgid "query to get data of sequence \"%s\" returned name \"%s\"\n"
 msgstr "»ñÈ¡ÐòÁÐ \"%s\" µÄÊý¾ÝµÄ²éѯ·µ»ØÁËÃû×Ö \"%s\"\n"
 
-#: pg_dump.c:6074
-#, c-format
-msgid "dumping foreign key constraints for table \"%s\"\n"
-msgstr "Ϊ±í \"%s\" ת´¢Íâ¼üÔ¼Êø\n"
-
-#: pg_dump.c:6095
-#, c-format
-msgid "query to obtain list of foreign key definitions failed: %s"
-msgstr "»ñÈ¡Íâ¼ü¶¨ÒåÁбíµÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:6185
-#, c-format
-msgid "dumping triggers for table \"%s\"\n"
-msgstr "Ϊ±í \"%s\" ת´¢´¥·¢Æ÷\n"
-
-#: pg_dump.c:6234
-#, c-format
-msgid "query to obtain list of triggers failed: %s"
-msgstr "»ñÈ¡´¥·¢Æ÷µÄ²éѯʧ°Ü: %s"
-
-#: pg_dump.c:6245
-#, c-format
-msgid "expected %d triggers on table \"%s\" but found %d\n"
-msgstr "Ô¤ÆÚÔÚ±í \"%2$s\" ÉÏÓд¥·¢Æ÷ %1$d , È´·¢ÏÖ %3$d\n"
-
-#: pg_dump.c:6355
-#, c-format
-msgid ""
-"query produced null referenced table name for foreign key trigger \"%s\" on "
-"table \"%s\" (OID of table: %s)\n"
-msgstr ""
-"¶ÔÔÚ±í \"%2$s\" ÉϵÄÍâ¼ü´¥·¢Æ÷ \"%1$s\" ÉϵIJéѯÉú³É NULL ¸öÒýÓñí(±íµÄ OID "
-"ÊÇ: %3$s)\n"
-
-#: pg_dump.c:6399
+#: pg_dump.c:7516
 #, c-format
 msgid "invalid argument string (%s) for trigger \"%s\" on table \"%s\"\n"
 msgstr "¸ø±í \"%3$s\" ÉϵĴ¥·¢Æ÷ \"%2$s\" µÄ´íÎó²ÎÊý (%1$s)\n"
 
-#: pg_dump.c:6469
-msgid "dumping out rules\n"
-msgstr "ת´¢¹æÔò\n"
-
-#: pg_dump.c:6522
-#, c-format
-msgid "query to get rules associated with table \"%s\" failed: %s"
-msgstr "»ñÈ¡Óë±í \"%s\" ¹ØÁªµÄ¹æÔòʧ°Ü: %s"
-
-#: pg_dump.c:6605
+#: pg_dump.c:7622
 #, c-format
-msgid "command to set search_path failed: %s"
-msgstr "ÉèÖà search_path µÄ²éѯʧ°Ü: %s"
+msgid ""
+"query to get rule \"%s\" for table \"%s\" failed: wrong number of rows "
+"returned"
+msgstr "»ñÈ¡±í \"%s\" µÄ¹æÔò \"%s\" ²éѯʧ°Ü: ·µ»ØÁË´íÎóµÄÐÐÊý"
 
-#: pg_dump.c:6667
-#, c-format
-msgid "query to obtain name of data type %s failed: %s"
-msgstr "»ñÈ¡Êý¾ÝÀàÐÍ %s µÄÃû×Ö²éѯʧ°Ü: %s"
+#: pg_dump.c:7689
+msgid "fetching dependency data\n"
+msgstr "È¡»Ø´ÓÊôÊý¾Ý\n"
 
-#: pg_dump.c:6676
+#: pg_dump.c:7865
 #, c-format
 msgid "query yielded %d rows instead of one: %s\n"
 msgstr "²éѯ·ÅÆú %d Ìõ¼Ç¼, ÓÉÒ»Ìõ¼Ç¼´úÌæ: %s\n"
 
-#: common.c:74
+#: pg_dump.c:8052
+msgid "SQL command failed\n"
+msgstr "SQL ÃüÁîʧ°Ü\n"
+
+#: common.c:99
 msgid "reading schemas\n"
-msgstr "¶ÁÈ¡´ó¸Ù\n"
+msgstr "¶Áȡģʽ\n"
+
+#: common.c:103
+msgid "reading user-defined functions\n"
+msgstr "¶ÁÈ¡Óû§¶¨Ò庯Êý\n"
 
-#: common.c:78
+#: common.c:108
 msgid "reading user-defined types\n"
 msgstr "¶ÁÈ¡Óû§¶¨ÒåÀàÐÍ\n"
 
-#: common.c:82
-msgid "reading user-defined functions\n"
-msgstr "¶ÁÈ¡Óû§¶¨Ò庯Êý\n"
+#: common.c:113
+msgid "reading procedural languages\n"
+msgstr "¶ÁÈ¡¹ý³ÌÓïÑÔ\n"
 
-#: common.c:86
+#: common.c:117
 msgid "reading user-defined aggregate functions\n"
 msgstr "¶ÁÈ¡Óû§¶¨Òå¾Û¼¯º¯Êý\n"
 
-#: common.c:90
+#: common.c:121
 msgid "reading user-defined operators\n"
 msgstr "¶ÁÈ¡Óû§¶¨Òå²Ù×÷·û\n"
 
-#: common.c:94
+#: common.c:125
 msgid "reading user-defined operator classes\n"
 msgstr "¶ÁÈ¡Óû§¶¨Òå²Ù×÷·û¼¯\n"
 
-#: common.c:98
+#: common.c:129
+msgid "reading user-defined conversions\n"
+msgstr "¶ÁÈ¡Óû§¶¨ÒåµÄ×Ö·û¼¯×ª»»\n"
+
+#: common.c:133
 msgid "reading user-defined tables\n"
 msgstr "¶ÁÈ¡Óû§¶¨Òå±í\n"
 
-#: common.c:102
+#: common.c:137
 msgid "reading table inheritance information\n"
 msgstr "¶ÁÈ¡±í¼Ì³ÐÐÅÏ¢\n"
 
-#: common.c:107
+#: common.c:141
+msgid "reading rewrite rules\n"
+msgstr "¶ÁÈ¡ÖØд¹æÔò\n"
+
+#: common.c:145
+msgid "reading type casts\n"
+msgstr "¶ÁÈ¡ÀàÐÍת»»\n"
+
+#: common.c:150
 msgid "finding inheritance relationships\n"
 msgstr "ÕýÔÚ²éÕÒ¹Øϵ¼Ì³Ð\n"
 
-#: common.c:111
+#: common.c:154
 msgid "reading column info for interesting tables\n"
 msgstr "ÕýÔÚ¶ÁÈ¡¸ÐÐËȤ±íµÄÁÐÐÅÏ¢\n"
 
-#: common.c:115
+#: common.c:158
 msgid "flagging inherited columns in subtables\n"
 msgstr "ÔÚ×Ó±íÀï±ê¼Ç¼Ì³Ð×Ö¶Î\n"
 
-#: common.c:121
-msgid "dumping out database comment\n"
-msgstr "ת´¢Êý¾Ý¿â×¢ÊÍ\n"
-
-#: common.c:128
-msgid "dumping out user-defined schemas\n"
-msgstr "ת´¢³öÓû§¶¨ÒåµÄ´ó¸Ù\n"
-
-#: common.c:135
-msgid "dumping out user-defined types\n"
-msgstr "ת´¢Óû§¶¨ÒåÀàÐÍ\n"
-
-#: common.c:140
-msgid "dumping out tables\n"
-msgstr "ת´¢±í\n"
-
-#: common.c:147
-msgid "dumping out indexes\n"
-msgstr "ת´¢Ë÷Òý\n"
-
-#: common.c:154
-msgid "dumping out user-defined procedural languages\n"
-msgstr "ת´¢Óû§¶¨Òå¹ý³ÌÓïÑÔ\n"
-
-#: common.c:161
-msgid "dumping out user-defined functions\n"
-msgstr "ת´¢Óû§¶¨Ò庯Êý\n"
-
-#: common.c:168
-msgid "dumping out user-defined aggregate functions\n"
-msgstr "ת´¢Óû§¶¨Òå¾Û¼¯º¯Êý\n"
-
-#: common.c:175
-msgid "dumping out user-defined operators\n"
-msgstr "ת´¢Óû§¶¨Òå²Ù×÷·û\n"
-
-#: common.c:182
-msgid "dumping out user-defined operator classes\n"
-msgstr "ת´¢Óû§¶¨Òå²Ù×÷·û¼¯\n"
-
-#: common.c:189
-msgid "dumping out user-defined casts\n"
-msgstr "ת´¢Óû§¶¨ÒåÀàÐÍת»»\n"
-
-#: common.c:450
-#, c-format
-msgid "failed sanity check, operator with OID %s not found\n"
-msgstr "½¡È«¼ì²éʧ°Ü, δÕÒµ½ OID Ϊ %s µÄ²Ù×÷·û\n"
-
-#: common.c:500
-#, c-format
-msgid "failed sanity check, parent OID %s of table \"%s\" (OID %s) not found\n"
-msgstr "½¡È«¼ì²éʧ°Ü, δÕÒµ½±í \"%2$s\" (OID %3$s) µÄ OID Ϊ %1$s µÄ¸¸±²\n"
+#: common.c:162
+msgid "reading indexes\n"
+msgstr "¶ÁÈ¡Ë÷Òý\n"
+
+#: common.c:166
+msgid "reading constraints\n"
+msgstr "¶ÁÈ¡Ô¼Êø\n"
+
+#: common.c:170
+msgid "reading triggers\n"
+msgstr "¶ÁÈ¡´¥·¢Æ÷\n"
+
+#: common.c:421 common.c:553 common.c:587 pg_backup_archiver.c:602
+#: pg_backup_archiver.c:946 pg_backup_archiver.c:1060
+#: pg_backup_archiver.c:1469 pg_backup_archiver.c:1619
+#: pg_backup_archiver.c:1652 pg_backup_custom.c:141 pg_backup_custom.c:146
+#: pg_backup_custom.c:152 pg_backup_custom.c:167 pg_backup_custom.c:544
+#: pg_backup_db.c:152 pg_backup_db.c:228 pg_backup_files.c:112
+#: pg_backup_tar.c:168 pg_backup_tar.c:960
+msgid "out of memory\n"
+msgstr "ÄÚ´æÓþ¡\n"
 
-#: common.c:505
+#: common.c:728
 #, c-format
-msgid "failed sanity check, parent OID %s of table (OID %s) not found\n"
-msgstr "½¡È«¼ì²éʧ°Ü, ±í (OID %2$s) µÄ OID Ϊ %1$s µÄ¸¸±²\n"
+msgid "failed sanity check, parent OID %u of table \"%s\" (OID %u) not found\n"
+msgstr "½¡È«¼ì²éʧ°Ü, δÕÒµ½±í \"%2$s\" (OID %3$u) µÄ OID Ϊ %1$u µÄ¸¸±²\n"
 
-#: common.c:543
+#: common.c:770
 msgid "could not parse numeric array: too many numbers\n"
 msgstr "ÎÞ·¨·ÖÎöÊý×é: Êý×ÖÌ«¶à\n"
 
-#: common.c:558
+#: common.c:785
 msgid "could not parse numeric array: invalid character in number\n"
 msgstr "ÎÞ·¨·ÖÎöÊý×é: Êý×ÖÖÐÓÐÎÞЧµÄ×Ö·û\n"
 
-#: pg_backup_archiver.c:67
+#: pg_backup_archiver.c:45
 msgid "archiver"
 msgstr "¹éµµ"
 
-#: pg_backup_archiver.c:122
+#: pg_backup_archiver.c:126
 msgid "could not close output archive file\n"
 msgstr "ÎÞ·¨¹Ø±ÕÊä³ö¹éµµÎļþ\n"
 
-#: pg_backup_archiver.c:149
-msgid "-C and -R are incompatible options\n"
-msgstr "-C ºÍ -R ÊÇ»¥²»¼æÈݵÄÑ¡Ïî\n"
-
 #: pg_backup_archiver.c:152
 msgid "-C and -c are incompatible options\n"
 msgstr "-C ºÍ -c ÊÇ»¥²»¼æÈݵÄÑ¡Ïî\n"
@@ -967,299 +741,275 @@ msgstr "1.3 
 msgid "implied data-only restore\n"
 msgstr "Òþº¬µÄÖ»»Ö¸´Êý¾Ý\n"
 
-#: pg_backup_archiver.c:222
+#: pg_backup_archiver.c:227
 #, c-format
 msgid "dropping %s %s\n"
 msgstr "ɾ³ý %s %s\n"
 
-#: pg_backup_archiver.c:246 pg_backup_archiver.c:248
+#: pg_backup_archiver.c:251 pg_backup_archiver.c:253
 #, c-format
 msgid "warning from original dump file: %s\n"
 msgstr "À´×Ôԭʼת´¢ÎļþµÄ¾¯¸æ: %s\n"
 
-#: pg_backup_archiver.c:255
+#: pg_backup_archiver.c:260
 #, c-format
 msgid "creating %s %s\n"
 msgstr "´´½¨ %s %s\n"
 
-#: pg_backup_archiver.c:262
+#: pg_backup_archiver.c:268
 #, c-format
 msgid "connecting to new database \"%s\" as user \"%s\"\n"
 msgstr "ÒÔÓû§ \"%2$s\" Éí·ÝÁª½Óµ½ÐÂÊý¾Ý¿â \"%1$s\"\n"
 
-#: pg_backup_archiver.c:287
+#: pg_backup_archiver.c:293
 msgid ""
 "cannot restore from compressed archive (not configured for compression "
 "support)\n"
 msgstr "ÎÞ·¨´ÓѹËõµÄ¹éµµÖлָ´ (δÅäÖÃѹËõÖ§³Ö)\n"
 
-#: pg_backup_archiver.c:307
+#: pg_backup_archiver.c:313
 msgid "WARNING: skipping large-object restoration\n"
 msgstr "¾¯¸æ: ºöÂÔ´ó¶ÔÏóµÄ»Ö¸´\n"
 
-#: pg_backup_archiver.c:320
+#: pg_backup_archiver.c:323
 #, c-format
 msgid "restoring data for table \"%s\"\n"
 msgstr "Ϊ±í \"%s\" »Ö¸´Êý¾Ý\n"
 
-#: pg_backup_archiver.c:345
-#, c-format
-msgid "executing %s %s\n"
-msgstr "Ö´ÐÐ %s %s\n"
-
-#: pg_backup_archiver.c:367
-#, c-format
-msgid "checking whether we loaded \"%s\"\n"
-msgstr "¼ì²éÎÒÃÇÊÇ·ñ×°ÔØÁË \"%s\"\n"
-
-#: pg_backup_archiver.c:373
+#: pg_backup_archiver.c:355 pg_backup_archiver.c:440
 #, c-format
 msgid "fixing up large-object cross-reference for \"%s\"\n"
 msgstr "Ϊ \"%s\" ÐÞ¸´´ó¶ÔÏóµÄ½»²æÒýÓÃ\n"
 
-#: pg_backup_archiver.c:378
+#: pg_backup_archiver.c:366
+#, c-format
+msgid "executing %s %s\n"
+msgstr "Ö´ÐÐ %s %s\n"
+
+#: pg_backup_archiver.c:386
 #, c-format
-msgid "ignoring large-object cross-references for %s %s\n"
-msgstr "Ϊ %s %s ºöÂÔ´ó¶ÔÏó½»²æÒýÓÃ\n"
+msgid "setting owner and acl for %s %s\n"
+msgstr "Ϊ %s %s ÉèÖÃÊôÖ÷ºÍȨÏÞ (acl)\n"
 
-#: pg_backup_archiver.c:471
+#: pg_backup_archiver.c:502
 msgid "disabling triggers\n"
 msgstr "¹Ø±Õ´¥·¢Æ÷\n"
 
-#: pg_backup_archiver.c:538
+#: pg_backup_archiver.c:541
 msgid "enabling triggers\n"
 msgstr "´ò¿ª´¥·¢Æ÷\n"
 
-#: pg_backup_archiver.c:587
+#: pg_backup_archiver.c:576
 msgid ""
 "internal error -- WriteData cannot be called outside the context of a "
 "DataDumper routine\n"
 msgstr "ÄÚ²¿´íÎó -- WriteData ²»ÄÜÔÚ DataDumper ¹ý³ÌµÄ»·¾³Ö®Íâµ÷ÓÃ\n"
 
-#: pg_backup_archiver.c:614 pg_backup_archiver.c:1044
-#: pg_backup_archiver.c:1163 pg_backup_archiver.c:1552
-#: pg_backup_archiver.c:1702 pg_backup_archiver.c:1735 pg_backup_custom.c:141
-#: pg_backup_custom.c:146 pg_backup_custom.c:152 pg_backup_custom.c:167
-#: pg_backup_custom.c:545 pg_backup_db.c:157 pg_backup_db.c:233
-#: pg_backup_files.c:112 pg_backup_tar.c:169 pg_backup_tar.c:961
-msgid "out of memory\n"
-msgstr "ÄÚ´æÓþ¡\n"
-
-#: pg_backup_archiver.c:711
+#: pg_backup_archiver.c:709
 msgid "large-object output not supported in chosen format\n"
 msgstr "Ñ¡¶¨µÄ¸ñʽ²»Ö§³Ö´ó¶ÔÏóÊä³ö\n"
 
-#: pg_backup_archiver.c:751 pg_backup_archiver.c:836
+#: pg_backup_archiver.c:749 pg_backup_archiver.c:837
 msgid "committing large-object transactions\n"
 msgstr "Ìá½»´ó¶ÔÏóÊÂÎñ\n"
 
-#: pg_backup_archiver.c:758
+#: pg_backup_archiver.c:759
 #, c-format
 msgid "restored %d large objects\n"
 msgstr "»Ö¸´ÁË %d ¸ö´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:775
+#: pg_backup_archiver.c:776
 msgid "cannot restore large objects without a database connection\n"
 msgstr "ûÓÐÊý¾Ý¿âÁª½ÓʱÎÞ·¨»Ö¸´´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:789
+#: pg_backup_archiver.c:790
 msgid "starting large-object transactions\n"
 msgstr "¿ªÊ¼´ó¶ÔÏóÊÂÎñ\n"
 
-#: pg_backup_archiver.c:797
+#: pg_backup_archiver.c:798
 msgid "could not create large object\n"
 msgstr "ÎÞ·¨´´½¨´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:799
+#: pg_backup_archiver.c:800
 #, c-format
 msgid "restoring large object with OID %u as %u\n"
 msgstr "°Ñ OID Ϊ %u µÄ´ó¶ÔÏó»Ö¸´Îª %u\n"
 
-#: pg_backup_archiver.c:805
+#: pg_backup_archiver.c:806
 msgid "could not open large object\n"
 msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó\n"
 
-#: pg_backup_archiver.c:820
+#: pg_backup_archiver.c:821
 #, c-format
 msgid "wrote remaining %lu bytes of large-object data (result = %lu)\n"
 msgstr "дʣÏÂÁË %lu ×ֽڵĴó¶ÔÏóÊý¾Ý (½á¹û = %lu)\n"
 
-#: pg_backup_archiver.c:823 pg_backup_archiver.c:1220
+#: pg_backup_archiver.c:824 pg_backup_archiver.c:1117
 #, c-format
 msgid "could not write to large object (result: %lu, expected: %lu)\n"
 msgstr "ÎÞ·¨Ð´Èë´ó¶ÔÏó (½á¹û: %lu, Ô¤ÆÚ: %lu)\n"
 
-#: pg_backup_archiver.c:960
+#: pg_backup_archiver.c:870
 msgid "could not open TOC file\n"
 msgstr "ÎÞ·¨´ò¿ª TOC Îļþ\n"
 
-#: pg_backup_archiver.c:981
+#: pg_backup_archiver.c:891
 #, c-format
 msgid "WARNING: line ignored: %s\n"
 msgstr "¾¯¸æ: ºöÂÔµÄÐÐ: %s\n"
 
-#: pg_backup_archiver.c:988
+#: pg_backup_archiver.c:898
 #, c-format
 msgid "could not find entry for ID %d\n"
 msgstr "ÎÞ·¨Îª ID %d ÕÒµ½¼Ç¼\n"
 
-#: pg_backup_archiver.c:997 pg_backup_files.c:156 pg_backup_files.c:438
+#: pg_backup_archiver.c:908 pg_backup_files.c:156 pg_backup_files.c:439
 #, c-format
 msgid "could not close TOC file: %s\n"
 msgstr "ÎÞ·¨¹Ø±Õ TOC Îļþ: %s\n"
 
-#: pg_backup_archiver.c:1112 pg_backup_files.c:130
+#: pg_backup_archiver.c:1008 pg_backup_files.c:130
 #, c-format
 msgid "could not open output file: %s\n"
 msgstr "ÎÞ·¨´ò¿ªÊä³öÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1128
+#: pg_backup_archiver.c:1024
 #, c-format
 msgid "could not close output file: %s\n"
 msgstr "ÎÞ·¨¹Ø±ÕÊä³öÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1216
+#: pg_backup_archiver.c:1113
 #, c-format
 msgid "wrote %lu bytes of large object data (result = %lu)\n"
 msgstr "дÁË %lu ×ֽڵĴó¶ÔÏóÊý¾Ý (½á¹û = %lu)\n"
 
-#: pg_backup_archiver.c:1238
+#: pg_backup_archiver.c:1135
 msgid "could not write to compressed archive\n"
 msgstr "ÎÞ·¨Ð´ÈëѹËõµÄ¹éµµ\n"
 
-#: pg_backup_archiver.c:1246
+#: pg_backup_archiver.c:1143
 msgid "could not write to custom output routine\n"
 msgstr "ÎÞ·¨Ð´³öµ½¿Í»§Êä³ö¹ý³Ì\n"
 
-#: pg_backup_archiver.c:1261
+#: pg_backup_archiver.c:1158
 #, c-format
 msgid "could not write to output file (%lu != %lu)\n"
 msgstr "ÎÞ·¨Ð´³öµ½Êä³öÎļþ (%lu != %lu)\n"
 
-#: pg_backup_archiver.c:1445
+#: pg_backup_archiver.c:1362
 #, c-format
 msgid "Unexpected data offset flag %d\n"
 msgstr "ÒâÍâµÄÊý¾ÝÆ«ÒƱêÖ¾ %d\n"
 
-#: pg_backup_archiver.c:1458
+#: pg_backup_archiver.c:1375
 msgid "file offset in dump file is too large\n"
 msgstr "ÔÚת´¢ÎļþÖеÄÎļþÆ«ÒÆÁ¿Ì«´ó\n"
 
-#: pg_backup_archiver.c:1570
+#: pg_backup_archiver.c:1487
 msgid "attempting to ascertain archive format\n"
 msgstr "ÊÔͼȷÈϹ鵵¸ñʽ\n"
 
-#: pg_backup_archiver.c:1590 pg_backup_files.c:148
+#: pg_backup_archiver.c:1507 pg_backup_files.c:148
 #, c-format
 msgid "could not open input file: %s\n"
 msgstr "ÎÞ·¨´ò¿ªÊäÈëÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1597
+#: pg_backup_archiver.c:1514
 #, c-format
 msgid "could not read input file: %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡ÊäÈëÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1599
+#: pg_backup_archiver.c:1516
 #, c-format
 msgid "input file is too short (read %lu, expected 5)\n"
 msgstr "ÊäÈëÎļþÌ«¶Ì (¶ÁÁË %lu, Ô¤ÆÚ 5)\n"
 
-#: pg_backup_archiver.c:1652
+#: pg_backup_archiver.c:1569
 msgid "input file does not appear to be a valid archive (too short?)\n"
 msgstr "ÊäÈëÎļþ¿´ÉÏÈ¥²»ÏóÓÐЧµÄ¹éµµ (Ì«¶Ì?)\n"
 
-#: pg_backup_archiver.c:1655
+#: pg_backup_archiver.c:1572
 msgid "input file does not appear to be a valid archive\n"
 msgstr "ÊäÈëÎļþ¿´ÉÏÈ¥²»ÏóÓÐЧµÄ¹éµµ\n"
 
-#: pg_backup_archiver.c:1673
+#: pg_backup_archiver.c:1590
 #, c-format
 msgid "read %lu bytes into lookahead buffer\n"
 msgstr "¶ÁÈ¡ %lu ×Ö½Úµ½Ô¤ÀÀ»º³åÇø\n"
 
-#: pg_backup_archiver.c:1680
+#: pg_backup_archiver.c:1597
 #, c-format
 msgid "could not close the input file after reading header: %s\n"
 msgstr "¶ÁÈ¡Í·Ö®ºóÎÞ·¨¹Ø±ÕÊäÈëÎļþ: %s\n"
 
-#: pg_backup_archiver.c:1697
+#: pg_backup_archiver.c:1614
 #, c-format
 msgid "allocating AH for %s, format %d\n"
 msgstr "Ϊ %s ·ÖÅä AH, ¸ñʽ %d\n"
 
-#: pg_backup_archiver.c:1751
+#: pg_backup_archiver.c:1668
 #, c-format
 msgid "archive format is %d\n"
 msgstr "¹éµµ¸ñʽÊÇ %d\n"
 
-#: pg_backup_archiver.c:1779
+#: pg_backup_archiver.c:1696
 #, c-format
 msgid "unrecognized file format \"%d\"\n"
 msgstr "²»¿Éʶ±ðµÄÎļþ¸ñʽ \"%d\"\n"
 
-#: pg_backup_archiver.c:1892
+#: pg_backup_archiver.c:1823
 #, c-format
 msgid "entry ID %d out of range -- perhaps a corrupt TOC\n"
 msgstr "¼Ç¼ ID %d ³¬³ö·¶Î§ - ¿ÉÄÜÊÇËð»µÁ赀 TOC\n"
 
-#: pg_backup_archiver.c:1927
-#, c-format
-msgid "read dependency for %s -> %s\n"
-msgstr "¶ÁÈ¡ %s -> %s µÄÒÀÀµÐÔ\n"
-
-#: pg_backup_archiver.c:1949
+#: pg_backup_archiver.c:1905
 #, c-format
 msgid "read TOC entry %d (ID %d) for %s %s\n"
 msgstr "Ϊ %3$s %4$s ¶ÁÈ¡ TOC ¼Ç¼ %1$d (ID %2$d)\n"
 
-#: pg_backup_archiver.c:2075
+#: pg_backup_archiver.c:2064
 #, c-format
 msgid "could not set session user to \"%s\": %s"
 msgstr "ÎÞ·¨ÉèÖûỰÓû§Îª \"%s\": %s"
 
-#: pg_backup_archiver.c:2189
-#, c-format
-msgid "could not set search_path to \"%s\": %s"
-msgstr "ÎÞ·¨ÉèÖòéÕÒ·¾¶Îª \"%s\": %s"
-
-#: pg_backup_archiver.c:2249
+#: pg_backup_archiver.c:2427
 msgid ""
 "WARNING: requested compression not available in this installation -- archive "
 "will be uncompressed\n"
 msgstr "¾¯¸æ: ËùÒªÇóµÄѹËõÎÞ·¨ÔÚ±¾´Î°²×°ÖлñÈ¡ - ¹éµµ½«²»±»Ñ¹Ëõ\n"
 
-#: pg_backup_archiver.c:2282
+#: pg_backup_archiver.c:2460
 msgid "did not find magic string in file header\n"
 msgstr "ÔÚÎļþÍ·ÖÐûÓÐÕÒµ½Ä§Êõ×Ö´®\n"
 
-#: pg_backup_archiver.c:2296
+#: pg_backup_archiver.c:2474
 #, c-format
 msgid "unsupported version (%d.%d) in file header\n"
 msgstr "ÔÚÎļþÍ·ÖÐÓв»Ö§³ÖµÄ°æ±¾ (%d.%d)\n"
 
-#: pg_backup_archiver.c:2301
+#: pg_backup_archiver.c:2479
 #, c-format
 msgid "sanity check on integer size (%lu) failed\n"
 msgstr "ÕûÊý³ß´ç (%lu) µÄ½¡È«¼ì²éʧ°Ü\n"
 
-#: pg_backup_archiver.c:2305
+#: pg_backup_archiver.c:2483
 msgid ""
 "WARNING: archive was made on a machine with larger integers, some operations "
 "may fail\n"
 msgstr "¾¯¸æ: ¹éµµÊÇÔÚһ̨ÓÐןü´óµÄÕûÊýµÄ»úÆ÷ÉÏÖÆ×÷µÄ, ÓÐЩ²Ù×÷¿ÉÄÜʧ°Ü\n"
 
-#: pg_backup_archiver.c:2315
+#: pg_backup_archiver.c:2493
 #, c-format
 msgid "expected format (%d) differs from format found in file (%d)\n"
 msgstr "Ô¤Æڵĸñʽ (%d) ºÍÔÚÎļþÀïÕÒµ½µÄ¸ñʽ (%d) ²»Í¬\n"
 
-#: pg_backup_archiver.c:2331
+#: pg_backup_archiver.c:2509
 msgid ""
 "WARNING: archive is compressed, but this installation does not support "
 "compression -- no data will be available\n"
 msgstr "¾¯¸æ: ¹éµµÊÇѹËõ¹ýµÄ, µ«Êǵ±Ç°°²×°²»Ö§³ÖѹËõ - Êý¾Ý½«²»¿ÉʹÓÃ\n"
 
-#: pg_backup_archiver.c:2349
+#: pg_backup_archiver.c:2527
 msgid "WARNING: invalid creation date in header\n"
 msgstr "¾¯¸æ: ÔÚÍ·ÖеĴ´½¨ÈÕÆÚÎÞЧ\n"
 
@@ -1272,11 +1022,11 @@ msgstr "
 msgid "could not open archive file \"%s\": %s\n"
 msgstr "ÎÞ·¨´ò¿ª¹éµµÎļþ \"%s\": %s\n"
 
-#: pg_backup_custom.c:388
+#: pg_backup_custom.c:389
 msgid "invalid OID for large object\n"
 msgstr "´ó¶ÔÏóµÄÎÞЧ OID\n"
 
-#: pg_backup_custom.c:446
+#: pg_backup_custom.c:447
 msgid ""
 "Dumping a specific TOC data block out of order is not supported without ID "
 "on this input stream (fseek required)\n"
@@ -1284,83 +1034,83 @@ msgstr ""
 "Èç¹ûÔÚ´ËÊäÈëÁ÷ÖÐûÓÐ ID (±êʶ) (fseek ÒªÇóµÄ), ÄÇôÊDz»Ö§³ÖÂÒÐòת´¢Ìض¨ TOC "
 "Êý¾Ý¿éµÄ\n"
 
-#: pg_backup_custom.c:461
+#: pg_backup_custom.c:462
 #, c-format
 msgid "unrecognized data block type (%d) while searching archive\n"
 msgstr "ËÑË÷¹éµµÊÇÅöµ½²»Ê¶±ðµÄÊý¾Ý¿éÀàÐÍ (%d)\n"
 
-#: pg_backup_custom.c:472
+#: pg_backup_custom.c:473
 #, c-format
 msgid "error during file seek: %s\n"
 msgstr "ÔÚÎļþÄÚ¶¨Î»Ê±³ö´í: %s\n"
 
-#: pg_backup_custom.c:479
+#: pg_backup_custom.c:480
 #, c-format
 msgid "found unexpected block ID (%d) when reading data -- expected %d\n"
 msgstr "¶ÁÈ¡Êý¾Ýʱ·¢ÏÖÒâÍâ¿é ID (%d) - Ô¤ÆÚÊÇ %d\n"
 
-#: pg_backup_custom.c:490
+#: pg_backup_custom.c:491
 msgid "large objects cannot be loaded without a database connection\n"
 msgstr "ûÓÐÊý¾Ý¿âÁª½ÓʱÎÞ·¨×°ÔØ´ó¶ÔÏó\n"
 
-#: pg_backup_custom.c:496
+#: pg_backup_custom.c:497
 #, c-format
 msgid "unrecognized data block type %d while restoring archive\n"
 msgstr "»Ö¸´¹éµµÊ±Åöµ½²»Ê¶±ðµÄÊý¾Ý¿éÀàÐÍ %d\n"
 
-#: pg_backup_custom.c:532 pg_backup_custom.c:894
+#: pg_backup_custom.c:531 pg_backup_custom.c:893
 #, c-format
 msgid "could not initialize compression library: %s\n"
 msgstr "ÎÞ·¨³õʼ»¯Ñ¹Ëõ¿â: %s\n"
 
-#: pg_backup_custom.c:554 pg_backup_custom.c:677
+#: pg_backup_custom.c:553 pg_backup_custom.c:676
 #, c-format
 msgid "could not read data block -- expected %lu, got %lu\n"
 msgstr "ÎÞ·¨¶ÁÈ¡Êý¾Ý¿é - Ô¤ÆÚ %lu, ʵ¼Ê %lu\n"
 
-#: pg_backup_custom.c:572 pg_backup_custom.c:602
+#: pg_backup_custom.c:571 pg_backup_custom.c:601
 #, c-format
 msgid "could not uncompress data: %s\n"
 msgstr "ÎÞ·¨½âѹËõÊý¾Ý: %s\n"
 
-#: pg_backup_custom.c:608
+#: pg_backup_custom.c:607
 #, c-format
 msgid "could not close compression library: %s\n"
 msgstr "ÎÞ·¨¹Ø±ÕѹËõ¿â: %s\n"
 
-#: pg_backup_custom.c:705
+#: pg_backup_custom.c:704
 #, c-format
 msgid "could not write byte: %s\n"
 msgstr "ÎÞ·¨Ð´×Ö½Ú: %s\n"
 
-#: pg_backup_custom.c:749 pg_backup_files.c:413
+#: pg_backup_custom.c:748 pg_backup_files.c:414
 #, c-format
 msgid "write error in _WriteBuf (%lu != %lu)\n"
 msgstr "ÔÚ _WriteBuf ÀïµÄд´íÎó (%lu != %lu)\n"
 
-#: pg_backup_custom.c:820
+#: pg_backup_custom.c:819
 #, c-format
 msgid "could not close archive file: %s\n"
 msgstr "ÎÞ·¨¹Ø±Õ¹éµµÎļþ: %s\n"
 
-#: pg_backup_custom.c:843
+#: pg_backup_custom.c:842
 msgid "WARNING: ftell mismatch with expected position -- ftell used\n"
 msgstr "¾¯¸æ: ftell ºÍÔ¤ÆÚλÖò»Æ¥Åä -- ʹÓà ftell\n"
 
-#: pg_backup_custom.c:926
+#: pg_backup_custom.c:925
 #, c-format
 msgid "could not compress data: %s\n"
 msgstr "ÎÞ·¨Ñ¹ËõÊý¾Ý: %s\n"
 
-#: pg_backup_custom.c:946
+#: pg_backup_custom.c:945
 msgid "could not write compressed chunk\n"
 msgstr "ÎÞ·¨Ð´ÈëѹËõµÄ¿é\n"
 
-#: pg_backup_custom.c:960
+#: pg_backup_custom.c:959
 msgid "could not write uncompressed chunk\n"
 msgstr "ÎÞ·¨Ð´ÈëδѹËõµÄ¿é\n"
 
-#: pg_backup_custom.c:1006
+#: pg_backup_custom.c:1005
 #, c-format
 msgid "could not close compression stream: %s\n"
 msgstr "ÎÞ·¨¹Ø±ÕѹËõÁ÷: %s\n"
@@ -1388,128 +1138,127 @@ msgid ""
 "anyway.)\n"
 msgstr "Òò°æ±¾²îÒìÍ˳ö (Óà -i Ñ¡ÏîºöÂÔ²îÒì¼ÌÐø´¦Àí.)\n"
 
-#: pg_backup_db.c:151
+#: pg_backup_db.c:146
 #, c-format
 msgid "connecting to database \"%s\" as user \"%s\"\n"
 msgstr "ÒÔÓû§ \"%2$s\" µÄÉí·ÝÁª½Óµ½Êý¾Ý¿â \"%1$s\"\n"
 
-#: pg_backup_db.c:155 pg_backup_db.c:188 pg_backup_db.c:231 pg_backup_db.c:260
-#: pg_dumpall.c:705 pg_dumpall.c:731
+#: pg_backup_db.c:150 pg_backup_db.c:183 pg_backup_db.c:226 pg_backup_db.c:255
+#: pg_dumpall.c:887 pg_dumpall.c:913
 msgid "Password: "
 msgstr "¿ÚÁî: "
 
-#: pg_backup_db.c:167
+#: pg_backup_db.c:162
 msgid "failed to reconnect to database\n"
 msgstr "ÓëÊý¾Ý¿âÖØÐÂÁª½Óʧ°Ü\n"
 
-#: pg_backup_db.c:191
+#: pg_backup_db.c:186
 #, c-format
 msgid "could not reconnect to database: %s"
 msgstr "ÎÞ·¨ÓëÊý¾Ý¿âÖØÐÂÁª½Ó: %s"
 
-#: pg_backup_db.c:227
+#: pg_backup_db.c:222
 msgid "already connected to a database\n"
 msgstr "ÒѾ­ÓëÒ»¸öÊý¾Ý¿âÁª½Ó\n"
 
-#: pg_backup_db.c:250
+#: pg_backup_db.c:245
 msgid "failed to connect to database\n"
 msgstr "ÓëÊý¾Ý¿âÁª½Óʧ°Ü\n"
 
-#: pg_backup_db.c:269
+#: pg_backup_db.c:264
 #, c-format
 msgid "connection to database \"%s\" failed: %s"
 msgstr "ÓëÊý¾Ý¿â \"%s\" Áª½Óʧ°Ü: %s"
 
-#: pg_backup_db.c:284
+#: pg_backup_db.c:279
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: pg_backup_db.c:312
+#: pg_backup_db.c:307
 #, c-format
 msgid "%s: no result from server\n"
 msgstr "%s: ûÓÐÀ´×Ô·þÎñÆ÷µÄ½á¹û\n"
 
-#: pg_backup_db.c:319
+#: pg_backup_db.c:314
 msgid "COPY command executed in non-primary connection\n"
 msgstr "COPY ÃüÁîÔÚûÓÐÖ÷Áª½ÓµÄ»·¾³ÏÂÖ´ÐÐ\n"
 
-#: pg_backup_db.c:324
-#, c-format
-msgid "%s: %s"
-msgstr "%s: %s"
-
-#: pg_backup_db.c:398
+#: pg_backup_db.c:393
 msgid "error returned by PQputline\n"
 msgstr "PQputline ·µ»Ø´íÎó\n"
 
-#: pg_backup_db.c:409
+#: pg_backup_db.c:404
 msgid "error returned by PQendcopy\n"
 msgstr "PQendcopy ·µ»Ø´íÎó\n"
 
-#: pg_backup_db.c:453
+#: pg_backup_db.c:448
 msgid "could not execute query"
 msgstr "ÎÞ·¨Ö´Ðвéѯ"
 
-#: pg_backup_db.c:588
+#: pg_backup_db.c:583
 #, c-format
 msgid "could not find OID columns of table \"%s\": %s"
 msgstr "ÎÞ·¨Ñ°ÕÒ±í \"%s\" µÄ OID ×Ö¶Î: %s"
 
-#: pg_backup_db.c:594
+#: pg_backup_db.c:589
 #, c-format
 msgid "no OID type columns in table %s\n"
 msgstr "±í %s ÖÐûÓÐ OID ÀàÐÍ×Ö¶Î\n"
 
-#: pg_backup_db.c:608
+#: pg_backup_db.c:603
 #, c-format
 msgid "fixing large object cross-references for %s.%s\n"
 msgstr "Ϊ %s.%s ÐÞ²¹´ó¶ÔÏó½»²æÒýÓÃ\n"
 
-#: pg_backup_db.c:647
+#: pg_backup_db.c:642
 #, c-format
 msgid "SQL: %s\n"
 msgstr "SQL: %s\n"
 
-#: pg_backup_db.c:652
+#: pg_backup_db.c:647
 #, c-format
 msgid "could not update column \"%s\" of table \"%s\": %s"
 msgstr "ÎÞ·¨¸üбí \"%2$s\" µÄ×ֶΠ\"%1$s\": %3$s"
 
-#: pg_backup_db.c:657
+#: pg_backup_db.c:652
 #, c-format
 msgid "error while updating column \"%s\" of table \"%s\": %s"
 msgstr "¸üбí \"%2$s\" µÄ×ֶΠ\"%1$s\" ʱ³ö´í: %3$s"
 
-#: pg_backup_db.c:680
+#: pg_backup_db.c:675
 msgid "creating table for large object cross-references\n"
 msgstr "Ϊ´ó¶ÔÏó½»²æÒýÓô´½¨±í\n"
 
-#: pg_backup_db.c:684
+#: pg_backup_db.c:678
 msgid "could not create large object cross-reference table"
 msgstr "ÎÞ·¨´´½¨´ó¶ÔÏó½»²æÒýÓñí"
 
-#: pg_backup_db.c:689
+#: pg_backup_db.c:688
+msgid "creating index for large object cross-references\n"
+msgstr "Ϊ´ó¶ÔÏó½»²æÒýÓô´½¨Ë÷Òý\n"
+
+#: pg_backup_db.c:692
 msgid "could not create index on large object cross-reference table"
 msgstr "ÎÞ·¨ÔÚ´ó¶ÔÏó½»²æÒýÓñíÉÏ´´½¨Ë÷Òý"
 
-#: pg_backup_db.c:703
+#: pg_backup_db.c:705
 msgid "could not create large object cross-reference entry"
 msgstr "ÎÞ·¨´´½¨´ó¶ÔÏó½»²æÒýÓüǼ"
 
-#: pg_backup_db.c:715
+#: pg_backup_db.c:717
 msgid "could not start database transaction"
 msgstr "ÎÞ·¨¿ªÊ¼Êý¾Ý¿âÊÂÎñ"
 
-#: pg_backup_db.c:729
+#: pg_backup_db.c:731
 msgid "could not start transaction for large object cross-references"
 msgstr "ÎÞ·¨Îª´ó¶ÔÏó½»²æÒýÓÃÆô¶¯ÊÂÎñ"
 
-#: pg_backup_db.c:742
+#: pg_backup_db.c:744
 msgid "could not commit database transaction"
 msgstr "ÎÞ·¨Ìá½»Êý¾Ý¿âÊÂÎñ"
 
-#: pg_backup_db.c:755
+#: pg_backup_db.c:757
 msgid "could not commit transaction for large object cross-references"
 msgstr "ÎÞ·¨Îª´ó¶ÔÏó½»²æÒýÓÃÌá½»ÊÂÎñ"
 
@@ -1527,118 +1276,118 @@ msgstr ""
 "  Õâ¸ö¸ñʽ½öÓÃÓÚÑÝʾ; ²¢·ÇÓÃÓÚÒ»°ãÓÃ;.\n"
 "  Îļþ½«Ð´È뵱ǰ¹¤×÷Ŀ¼.\n"
 
-#: pg_backup_files.c:245
+#: pg_backup_files.c:246
 msgid "could not open data file for output\n"
 msgstr "ÎÞ·¨ÎªÊä³ö´ò¿ªÊý¾ÝÎļþ\n"
 
-#: pg_backup_files.c:265
+#: pg_backup_files.c:266
 msgid "could not close data file\n"
 msgstr "ÎÞ·¨¹Ø±ÕÊý¾ÝÎļþ\n"
 
-#: pg_backup_files.c:289
+#: pg_backup_files.c:290
 msgid "could not open data file for input\n"
 msgstr "ÎÞ·¨ÎªÊäÈë´ò¿ªÊý¾ÝÎļþ\n"
 
-#: pg_backup_files.c:298
+#: pg_backup_files.c:299
 msgid "could not close data file after reading\n"
 msgstr "¶ÁÈ¡Ö®ºóÎÞ·¨¹Ø±ÕÊý¾ÝÎļþ\n"
 
-#: pg_backup_files.c:361
+#: pg_backup_files.c:362
 #, c-format
 msgid "could not open large object TOC for input: %s\n"
 msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó TOC ½øÐÐÊäÈë: %s\n"
 
-#: pg_backup_files.c:374 pg_backup_files.c:544
+#: pg_backup_files.c:375 pg_backup_files.c:545
 #, c-format
 msgid "could not close large object TOC file: %s\n"
 msgstr "ÎÞ·¨¹Ø±Õ´ó¶ÔÏó TOC Îļþ: %s\n"
 
-#: pg_backup_files.c:386
+#: pg_backup_files.c:387
 msgid "could not write byte\n"
 msgstr "ÎÞ·¨Ð´×Ö½Ú\n"
 
-#: pg_backup_files.c:472
+#: pg_backup_files.c:473
 #, c-format
 msgid "could not open large object TOC for output: %s\n"
 msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏó TOC ½øÐÐÊä³ö: %s\n"
 
-#: pg_backup_files.c:492 pg_backup_tar.c:885
+#: pg_backup_files.c:493 pg_backup_tar.c:884
 #, c-format
 msgid "invalid OID for large object (%u)\n"
 msgstr "ÓÃÓÚ´ó¶ÔÏóµÄ·Ç·¨ OID (%u)\n"
 
-#: pg_backup_files.c:511
+#: pg_backup_files.c:512
 msgid "could not open large object file\n"
 msgstr "ÎÞ·¨´ò¿ª´ó¶ÔÏóÎļþ\n"
 
-#: pg_backup_files.c:526
+#: pg_backup_files.c:527
 msgid "could not close large object file\n"
 msgstr "ÎÞ·¨¹Ø±Õ´ó¶ÔÏóÎļþ\n"
 
-#: pg_backup_null.c:57
+#: pg_backup_null.c:55
 msgid "this format cannot be read\n"
 msgstr "ÎÞ·¨¶ÁÈ¡Õâ¸ö¸ñʽ\n"
 
-#: pg_backup_tar.c:107
+#: pg_backup_tar.c:105
 msgid "tar archiver"
 msgstr "tar ¹éµµ"
 
-#: pg_backup_tar.c:184
+#: pg_backup_tar.c:183
 #, c-format
 msgid "could not open TOC file for output: %s\n"
 msgstr "ÎÞ·¨ÎªÊä³ö´ò¿ª TOC Îļþ: %s\n"
 
-#: pg_backup_tar.c:209
+#: pg_backup_tar.c:208
 msgid "compression not supported by tar output format\n"
 msgstr "tar Êä³ö¸ñʽ²»Ö§³ÖѹËõ\n"
 
-#: pg_backup_tar.c:221
+#: pg_backup_tar.c:220
 #, c-format
 msgid "could not open TOC file for input: %s\n"
 msgstr "ÎÞ·¨ÎªÊäÈë´ò¿ª TOC Îļþ: %s\n"
 
-#: pg_backup_tar.c:342
+#: pg_backup_tar.c:341
 #, c-format
 msgid "could not find file %s in archive\n"
 msgstr "ÎÞ·¨Ôڹ鵵ÖÐÕÒµ½Îļþ %s\n"
 
-#: pg_backup_tar.c:353
+#: pg_backup_tar.c:352
 msgid "compression support is disabled in this format\n"
 msgstr "ÔÚÕâ¸ö¸ñʽÀï, ѹËõÖ§³Öʱ±»¹Ø±ÕÁ˵Ä\n"
 
-#: pg_backup_tar.c:368
+#: pg_backup_tar.c:367
 #, c-format
 msgid "could not generate temporary file name: %s\n"
 msgstr "ÎÞ·¨Éú³ÉÁÙʱÎļþÃû: %s\n"
 
-#: pg_backup_tar.c:377
+#: pg_backup_tar.c:376
 msgid "could not open temporary file\n"
 msgstr "ÎÞ·¨´ò¿ªÁÙʱÎļþ\n"
 
-#: pg_backup_tar.c:407
+#: pg_backup_tar.c:406
 msgid "could not close tar member\n"
 msgstr "ÎÞ·¨¹Ø±Õ tar ³ÉÔ±\n"
 
-#: pg_backup_tar.c:507
+#: pg_backup_tar.c:506
 msgid "internal error -- neither th nor fh specified in tarReadRaw()\n"
 msgstr "ÄÚ²¿´íÎó -- ÔÚ tarReadRaw() Àï¼ÈδÉùÃ÷ th ҲδÉùÃ÷ fh\n"
 
-#: pg_backup_tar.c:511
+#: pg_backup_tar.c:510
 #, c-format
 msgid "requested %d bytes, got %d from lookahead and %d from file\n"
 msgstr "ÒªÇó %d ×Ö½Ú, ´ÓÔ¤ÀÀÖлñÈ¡ %d, ´ÓÎļþÖлñÈ¡ %d\n"
 
-#: pg_backup_tar.c:550
+#: pg_backup_tar.c:549
 #, c-format
 msgid "could not write to tar member (wrote %lu, attempted %lu)\n"
 msgstr "ÎÞ·¨Ð´Èë tar ³ÉÔ± (дÁË %lu, Æóͼд %lu)\n"
 
-#: pg_backup_tar.c:639
+#: pg_backup_tar.c:638
 #, c-format
 msgid "invalid COPY statement -- could not find \"copy\" in string \"%s\"\n"
 msgstr "COPY Óï¾ä´í -- ÎÞ·¨ÔÚ×Ö´® \"%s\" ÖÐÕÒµ½ \"copy\"\n"
 
-#: pg_backup_tar.c:657
+#: pg_backup_tar.c:656
 #, c-format
 msgid ""
 "invalid COPY statement -- could not find \"from stdin\" in string \"%s\" "
@@ -1647,59 +1396,59 @@ msgstr ""
 "COPY Óï¾ä´í -- ÎÞ·¨ÔÚ´Ó %2$lu λÖÿªÊ¼µÄ×Ö´® \"%1$s\" ÀïÕÒµ½ \"from stdin\" "
 "×ÖÑù\n"
 
-#: pg_backup_tar.c:693
+#: pg_backup_tar.c:692
 #, c-format
 msgid "restoring large object OID %u\n"
 msgstr "»Ö¸´ OID %u µÄ´ó¶ÔÏó\n"
 
-#: pg_backup_tar.c:830
+#: pg_backup_tar.c:829
 msgid "could not write null block at end of tar archive\n"
 msgstr "ÎÞ·¨ÔÚ tar ¹éµµÄ©Î²Ð´ null ¿é\n"
 
-#: pg_backup_tar.c:1024
+#: pg_backup_tar.c:1023
 msgid "archive member too large for tar format\n"
 msgstr "ÔÚ tar ¸ñʽÖй鵵³ÉԱ̫´ó\n"
 
-#: pg_backup_tar.c:1034
+#: pg_backup_tar.c:1033
 #, c-format
 msgid "write error appending to tar archive (wrote %lu, attempted %lu)\n"
 msgstr "Ïò tar ¹éµµ¸½¼Óʱд´íÎó (дÁË %lu, ÊÔͼд %lu)\n"
 
-#: pg_backup_tar.c:1040
+#: pg_backup_tar.c:1039
 #, c-format
 msgid "could not close tar member: %s\n"
 msgstr "ÎÞ·¨¹Ø±Õ tar ³ÉÔ±: %s\n"
 
-#: pg_backup_tar.c:1049
+#: pg_backup_tar.c:1048
 #, c-format
 msgid "actual file length (%s) does not match expected (%s)\n"
 msgstr "ʵ¼ÊÎļþ³¤¶È (%s) ²»Æ¥ÅäÔ¤Æڵij¤¶È (%s)\n"
 
-#: pg_backup_tar.c:1057
+#: pg_backup_tar.c:1056
 msgid "could not output padding at end of tar member\n"
 msgstr "ÎÞ·¨ÔÚ tar ³ÉԱβ²¿Êä³öÌî³äÄÚÈÝ\n"
 
-#: pg_backup_tar.c:1086
+#: pg_backup_tar.c:1085
 #, c-format
 msgid "moving from position %s to next member at file position %s\n"
 msgstr "´ÓλÖà %s Òƶ¯µ½ÎļþλÖà %s µÄÏÂÒ»¸ö³ÉÔ±\n"
 
-#: pg_backup_tar.c:1097
+#: pg_backup_tar.c:1096
 #, c-format
 msgid "now at file position %s\n"
 msgstr "ÏÖÔÚÔÚÎļþµÄλÖà %s\n"
 
-#: pg_backup_tar.c:1106 pg_backup_tar.c:1133
+#: pg_backup_tar.c:1105 pg_backup_tar.c:1132
 #, c-format
 msgid "could not find header for file %s in tar archive\n"
 msgstr "ÎÞ·¨ÔÚ tar ¹éµµÀïΪÎļþ %s ÕÒµ½Í·±ê\n"
 
-#: pg_backup_tar.c:1117
+#: pg_backup_tar.c:1116
 #, c-format
 msgid "skipping tar member %s\n"
 msgstr "ºöÂÔ tar ³ÉÔ± %s\n"
 
-#: pg_backup_tar.c:1121
+#: pg_backup_tar.c:1120
 #, c-format
 msgid ""
 "dumping data out of order is not supported in this archive format: %s is "
@@ -1707,33 +1456,43 @@ msgid ""
 msgstr ""
 "Õâ¸ö¹éµµ¸ñʽÀï²»Ö§³ÖÂÒÐòת´¢Êý¾Ý: ÒªÇó %s,µ«ËüÔڹ鵵ÎļþÀïλÓÚ %s Ç°Ãæ.\n"
 
-#: pg_backup_tar.c:1169
+#: pg_backup_tar.c:1168
 #, c-format
 msgid "mismatch in actual vs. predicted file position (%s vs. %s)\n"
 msgstr "ʵ¼ÊÎļþλÖúÍÔ¤ÆÚÎļþλÖò»Æ¥Åä (%s ¶Ô %s)\n"
 
-#: pg_backup_tar.c:1184
+#: pg_backup_tar.c:1183
 #, c-format
 msgid "incomplete tar header found (%lu bytes)\n"
 msgstr "·¢ÏÖ²»ÍêÕû tar Í· (%lu ×Ö½Ú)\n"
 
-#: pg_backup_tar.c:1219
+#: pg_backup_tar.c:1218
 #, c-format
 msgid "TOC Entry %s at %s (length %lu, checksum %d)\n"
 msgstr "ÔÚ %2$s µÄ TOC ¼Ç¼ %1$s (³¤¶È %3$lu, УÑéºÍ %4$d)\n"
 
-#: pg_backup_tar.c:1229
+#: pg_backup_tar.c:1228
 #, c-format
 msgid ""
 "corrupt tar header found in %s (expected %d, computed %d) file position %s\n"
 msgstr ""
 "ÔÚÎļþ %1$s µÄλÖà %4$s ·¢ÏÖ±ÀÀ£µÄ tar Í·(Ô¤¼ÆÔÚ %2$d, ¼ÆËã³öÀ´ÔÚ %3$d)\n"
 
-#: pg_backup_tar.c:1322
+#: pg_backup_tar.c:1321
 msgid "could not write tar header\n"
 msgstr "ÎÞ·¨Ð´ tar Í·\n"
 
-#: pg_restore.c:364
+#: pg_restore.c:279
+#, c-format
+msgid "%s: cannot specify both -d and -f output\n"
+msgstr "%s: ²»ÄÜͬʱָ¶¨ -d ºÍ -f Êä³ö\n"
+
+#: pg_restore.c:339
+#, c-format
+msgid "WARNING, errors ignored on restore: %d\n"
+msgstr "¾¯¸æ, »Ö¸´ÖкöÂÔ´íÎó: %d\n"
+
+#: pg_restore.c:353
 #, c-format
 msgid ""
 "%s restores a PostgreSQL database from an archive created by pg_dump.\n"
@@ -1742,41 +1501,49 @@ msgstr ""
 "%s ´ÓÒ»¸ö¹éµµÖлָ´Ò»¸öÓÉ pg_dump ´´½¨µÄ PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: pg_restore.c:366
+#: pg_restore.c:355
 #, c-format
 msgid "  %s [OPTION]... [FILE]\n"
 msgstr "  %s [Ñ¡Ïî]... [ÎļþÃû]\n"
 
-#: pg_restore.c:369
+#: pg_restore.c:358
+#, c-format
 msgid "  -d, --dbname=NAME        output database name\n"
-msgstr "  -d, --dbname=Ãû×Ö        Êä³öÊý¾Ý¿âÃû×Ö\n"
+msgstr "  -d, --dbname=Ãû×Ö        Êý¾Ý¿âÃû×Ö\n"
 
-#: pg_restore.c:371
+#: pg_restore.c:360
+#, c-format
 msgid "  -F, --format=c|t         specify backup file format\n"
 msgstr "  -F, --format=c|t         Ö¸¶¨±¸·ÝÎļþ¸ñʽ\n"
 
-#: pg_restore.c:372
+#: pg_restore.c:361
+#, c-format
 msgid ""
 "  -i, --ignore-version     proceed even when server version mismatches\n"
 msgstr "  -i, --ignore-version     µ±·þÎñÆ÷°æ±¾²»Æ¥Åäʱ¼ÌÐøÔËÐÐ\n"
 
-#: pg_restore.c:373
+#: pg_restore.c:362
+#, c-format
 msgid "  -l, --list               print summarized TOC of the archive\n"
 msgstr "  -l, --list               ´òÓ¡¹éµµÎļþµÄ TOC ¸ÅÊö\n"
 
-#: pg_restore.c:379
+#: pg_restore.c:368
+#, c-format
 msgid "  -a, --data-only          restore only the data, no schema\n"
-msgstr "  -a, --data-only          Ö»»Ö¸´Êý¾Ý, ²»°üÀ¨´ó¸Ù\n"
+msgstr "  -a, --data-only          Ö»»Ö¸´Êý¾Ý, ²»°üÀ¨ģʽ\n"
 
-#: pg_restore.c:381
+#: pg_restore.c:370
+#, c-format
 msgid "  -C, --create             issue commands to create the database\n"
 msgstr "  -C, --create             ÔËÐÐÃüÁî´´½¨Êý¾Ý¿â\n"
 
-#: pg_restore.c:382
+#: pg_restore.c:371
+#, c-format
 msgid "  -I, --index=NAME         restore named index\n"
 msgstr "  -I, --index=Ãû×Ö         »Ö¸´Ö¸¶¨Ãü×ÖµÄË÷Òý\n"
 
-#: pg_restore.c:383
+#: pg_restore.c:372
+#, c-format
 msgid ""
 "  -L, --use-list=FILENAME  use specified table of contents for ordering\n"
 "                           output from this file\n"
@@ -1784,23 +1551,16 @@ msgstr ""
 "  -L, --use-list=ÎļþÃû    ´ÓÕâ¸öÎļþÖÐʹÓÃÖ¸¶¨µÄÄÚÈݱíÅÅÐò\n"
 "                           Êä³ö\n"
 
-#: pg_restore.c:385
-msgid "  -N, --orig-order         restore in original dump order\n"
-msgstr "  -N, --orig-order         ÒÔԭʼµÄת´¢Ë³Ðò»Ö¸´\n"
-
-#: pg_restore.c:386
-msgid "  -o, --oid-order          restore in OID order\n"
-msgstr "  -o, --oid-order          ÒÔ OID ˳Ðò»Ö¸´\n"
-
-#: pg_restore.c:387
+#: pg_restore.c:374 pg_dumpall.c:326
+#, c-format
 msgid ""
-"  -O, --no-owner           do not reconnect to database to match\n"
-"                           object owner\n"
+"  -O, --no-owner           do not output commands to set object ownership\n"
 msgstr ""
-"  -O, --no-owner           Æ¥Åä¶ÔÏóËùÊôÕßʱ²»ÖØÐÂÁª½Ó\n"
-"                           Êý¾Ý¿â\n"
+"  -O, --no-owner           ÉèÖöÔÏóµÄËùÊôÕßʱ²»Êä³ö\n"
+"                           ÃüÁî\n"
 
-#: pg_restore.c:389
+#: pg_restore.c:375
+#, c-format
 msgid ""
 "  -P, --function=NAME(args)\n"
 "                           restore named function\n"
@@ -1808,20 +1568,13 @@ msgstr ""
 "  -P, --function=Ãû×Ö(²ÎÊý)\n"
 "                           »Ö¸´Ö¸¶¨Ãû×ֵĺ¯Êý\n"
 
-#: pg_restore.c:391
-msgid ""
-"  -r, --rearrange          rearrange output to put indexes etc. at end\n"
-msgstr "  -r, --rearrange          ÖØÐÂÅÅÁÐÊä³ö, °ÑË÷ÒýµÈÖÃÓÚĩβ\n"
-
-#: pg_restore.c:392
-msgid "  -R, --no-reconnect       disallow ALL reconnections to the database\n"
-msgstr "  -R, --no-reconnect       ²»ÔÊÐíËùÓеÄÊý¾Ý¿âÖØÁª½Ó\n"
-
-#: pg_restore.c:393
+#: pg_restore.c:377
+#, c-format
 msgid "  -s, --schema-only        restore only the schema, no data\n"
-msgstr "  -s, --schema-only        Ö»»Ö¸´´ó¸Ù, ²»°üÀ¨Êý¾Ý\n"
+msgstr "  -s, --schema-only        Ö»»Ö¸´ģʽ, ²»°üÀ¨Êý¾Ý\n"
 
-#: pg_restore.c:394
+#: pg_restore.c:378
+#, c-format
 msgid ""
 "  -S, --superuser=NAME     specify the superuser user name to use for\n"
 "                           disabling triggers\n"
@@ -1829,32 +1582,25 @@ msgstr ""
 "  -S, --superuser=NAME     ʹÓÃÖ¸¶¨µÄ³¬¼¶Óû§À´È¡Ïû\n"
 "                           ´¥·¢Æ÷\n"
 
-#: pg_restore.c:396
+#: pg_restore.c:380
+#, c-format
 msgid "  -t, --table=NAME         restore named table\n"
 msgstr "  -t, --table=NAME         »Ö¸´Ö¸¶¨Ãü×ֵıí\n"
 
-#: pg_restore.c:397
+#: pg_restore.c:381
+#, c-format
 msgid "  -T, --trigger=NAME       restore named trigger\n"
 msgstr "  -T, --trigger=NAME       »Ö¸´Ö¸¶¨Ãü×ֵĴ¥·¢Æ÷\n"
 
-#: pg_restore.c:398
+#: pg_restore.c:382
+#, c-format
 msgid ""
 "  -x, --no-privileges      skip restoration of access privileges (grant/"
 "revoke)\n"
 msgstr "  -x, --no-privileges      Ìø¹ý´¦ÀíȨÏ޵Ļָ´ (grant/revoke)\n"
 
-#: pg_restore.c:399
-msgid ""
-"  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           use SET SESSION AUTHORIZATION commands instead\n"
-"                           of reconnecting, if possible\n"
-msgstr ""
-"  -X use-set-session-authorization, --use-set-session-authorization\n"
-"                           Èç¹û¿ÉÄÜ, ʹÓà SET SESSION AUTHORIZATION ÃüÁîÌæ"
-"´ú\n"
-"                           ÖØÁª½Ó\n"
-
-#: pg_restore.c:411
+#: pg_restore.c:395
+#, c-format
 msgid ""
 "\n"
 "If no input file name is supplied, then standard input is used.\n"
@@ -1864,7 +1610,27 @@ msgstr ""
 "Èç¹ûûÓÐÌṩÊäÈëÎļþÃû, ÔòʹÓñê×¼ÊäÈë.\n"
 "\n"
 
-#: pg_dumpall.c:234
+#: pg_dumpall.c:143
+#, c-format
+msgid ""
+"The program \"pg_dump\" is needed by %s but was not found in the same "
+"directory as \"%s\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s ÐèÒª³ÌÐò \"pg_dump\", µ«ÊÇÔÚͬһ¸öĿ¼ \"%s\" ûÓÐÕÒµ½.\n"
+"¼ì²éÄúµÄ°²×°.\n"
+
+#: pg_dumpall.c:149
+#, c-format
+msgid ""
+"The program \"pg_dump\" was found by %s but was not the same version as \"%s"
+"\".\n"
+"Check your installation.\n"
+msgstr ""
+"%s ÕÒµ½³ÌÐò \"pg_dump\", µ«ÊǺͰ汾 \"%s\" ²»Ò»ÖÂ.\n"
+"¼ì²éÄúµÄ°²×°.\n"
+
+#: pg_dumpall.c:310
 #, c-format
 msgid ""
 "%s extracts a PostgreSQL database cluster into an SQL script file.\n"
@@ -1873,36 +1639,39 @@ msgstr ""
 "%s ³éÈ¡Ò»¸ö PostgreSQL Êý¾Ý¿â´Ø½øÒ»¸ö SQL ½Å±¾Îļþ.\n"
 "\n"
 
-#: pg_dumpall.c:236
+#: pg_dumpall.c:312
 #, c-format
 msgid "  %s [OPTION]...\n"
 msgstr "  %s [Ñ¡Ïî]...\n"
 
-#: pg_dumpall.c:238
+#: pg_dumpall.c:315
+#, c-format
 msgid ""
-"\n"
-"Options:\n"
+"  -i, --ignore-version     proceed even when server version mismatches\n"
+"                           pg_dumpall version\n"
 msgstr ""
-"\n"
-"Ñ¡Ïî:\n"
+"  -i, --ignore-version     µ±·þÎñÆ÷°æ±¾Óë pg_dumpall ²»Æ¥Åäʱ\n"
+"                           ¼ÌÐøÔËÐÐ\n"
 
-#: pg_dumpall.c:240
+#: pg_dumpall.c:321
+#, c-format
 msgid "  -c, --clean              clean (drop) databases prior to create\n"
 msgstr "  -c, --clean              Çå³ý (ɾ³ý) Ô¤ÏȵÄÊý¾Ý¿â, ÒÔ±ãÔÙ´´½¨\n"
 
-#: pg_dumpall.c:243
+#: pg_dumpall.c:324
+#, c-format
 msgid "  -g, --globals-only       dump only global objects, no databases\n"
 msgstr "  -g, --globals-only       ֻת´¢È«¾Ö¶ÔÏó, ²»°üÀ¨Êý¾Ý¿â\n"
 
-#: pg_dumpall.c:244
+#: pg_dumpall.c:328
+#, c-format
 msgid ""
-"  -i, --ignore-version     proceed even when server version mismatches\n"
-"                           pg_dumpall version\n"
-msgstr ""
-"  -i, --ignore-version     µ±·þÎñÆ÷°æ±¾Óë pg_dumpall ²»Æ¥Åäʱ\n"
-"                           ¼ÌÐøÔËÐÐ\n"
+"  -S, --superuser=NAME     specify the superuser user name to use in the "
+"dump\n"
+msgstr "  -S, --superuser=NAME     ÔÚת´¢ÖÐ, Ö¸¶¨µÄ³¬¼¶Óû§Ãû\n"
 
-#: pg_dumpall.c:259
+#: pg_dumpall.c:344
+#, c-format
 msgid ""
 "\n"
 "The SQL script will be written to the standard output.\n"
@@ -1912,66 +1681,91 @@ msgstr ""
 "½«°Ñ SQL ½Å±¾Ð´µ½±ê×¼Êä³öÉÏ.\n"
 "\n"
 
-#: pg_dumpall.c:495
+#: pg_dumpall.c:539
+#, c-format
+msgid "%s: could not parse ACL list (%s) for tablespace \"%s\"\n"
+msgstr "%1$s: ÎÞ·¨Îª±í¿Õ¼ä \"%3$s\" ·ÖÎö ACL Áбí (%2$s)\n"
+
+#: pg_dumpall.c:671
 #, c-format
 msgid "%s: could not parse ACL list (%s) for database \"%s\"\n"
 msgstr "%1$s: ÎÞ·¨ÎªÊý¾Ý¿â \"%3$s\" ·ÖÎö ACL Áбí (%2$s)\n"
 
-#: pg_dumpall.c:636
+#: pg_dumpall.c:817
 #, c-format
 msgid "%s: dumping database \"%s\"...\n"
 msgstr "%s: ÕýÔÚת´¢Êý¾Ý¿â \"%s\"...\n"
 
-#: pg_dumpall.c:642
+#: pg_dumpall.c:823
 #, c-format
 msgid "%s: pg_dump failed on database \"%s\", exiting\n"
 msgstr "%s: pg_dump ʧ°ÜÔÚÊý¾Ý¿â \"%s\", ÕýÔÚÍ˳ö\n"
 
-#: pg_dumpall.c:677
+#: pg_dumpall.c:859
 #, c-format
 msgid "%s: running \"%s\"\n"
 msgstr "%s: ÕýÔÚÔËÐÐ \"%s\"\n"
 
-#: pg_dumpall.c:718
+#: pg_dumpall.c:900
 #, c-format
 msgid "%s: could not connect to database \"%s\"\n"
 msgstr "%s: ÎÞ·¨ÓëÊý¾Ý¿â \"%s\" Áª½Ó\n"
 
-#: pg_dumpall.c:741
+#: pg_dumpall.c:923
 #, c-format
 msgid "%s: could not connect to database \"%s\": %s\n"
 msgstr "%s: ÎÞ·¨ÓëÊý¾Ý¿â \"%s\" Áª½Ó: %s\n"
 
-#: pg_dumpall.c:749
+#: pg_dumpall.c:931
 #, c-format
 msgid "%s: could not get server version\n"
 msgstr "%s: ÎÞ·¨´Ó·þÎñÆ÷»ñÈ¡°æ±¾\n"
 
-#: pg_dumpall.c:755
+#: pg_dumpall.c:937
 #, c-format
 msgid "%s: could not parse server version \"%s\"\n"
 msgstr "%s: ÎÞ·¨·ÖÎö°æ±¾×Ö´® \"%s\"\n"
 
-#: pg_dumpall.c:774
+#: pg_dumpall.c:956
 #, c-format
 msgid "%s: executing %s\n"
 msgstr "%s: Ö´ÐÐ %s\n"
 
-#: pg_dumpall.c:780
+#: pg_dumpall.c:962
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ²éѯʧ°Ü: %s"
 
-#: pg_dumpall.c:781
+#: pg_dumpall.c:963
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: ²éѯÊÇ: %s\n"
 
-#: pg_dumpall.c:827
-#, c-format
-msgid ""
-"%s: could not find pg_dump\n"
-"Make sure it is in the path or in the same directory as %s.\n"
-msgstr ""
-"%s: ûÕÒµ½ pg_dump\n"
-"È·¶¨ÔÚ·¾¶ÖлòÓë %s Ò»ÑùµÄĿ¼ÖÐ.\n"
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ñ¡Ïî:\n"
+
+#~ msgid ""
+#~ "%s: could not find pg_dump\n"
+#~ "Make sure it is in the path or in the same directory as %s.\n"
+#~ msgstr ""
+#~ "%s: ûÕÒµ½ pg_dump\n"
+#~ "È·¶¨ÔÚ·¾¶ÖлòÓë %s Ò»ÑùµÄĿ¼ÖÐ.\n"
+
+#~ msgid "could not set default_with_oids: %s"
+#~ msgstr "ÎÞ·¨ÉèÖà default_with_oids: %s"
+
+#~ msgid "could not set search_path to \"%s\": %s"
+#~ msgstr "ÎÞ·¨ÉèÖòéÕÒ·¾¶Îª \"%s\": %s"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid "checking whether we loaded \"%s\"\n"
+#~ msgstr "¼ì²éÎÒÃÇÊÇ·ñ×°ÔØÁË \"%s\"\n"
+
+#~ msgid "ignoring large-object cross-references for %s %s\n"
+#~ msgstr "Ϊ %s %s ºöÂÔ´ó¶ÔÏó½»²æÒýÓÃ\n"

diff --git a/src/bin/psql/po/zh_CN.po b/src/bin/psql/po/zh_CN.po
index 8bb1aa7aecb85c4b8c2f53047f8a5bf78ae4f19e..620049f4ef2f28a18db4dd89a73ddd07a9ee5ea2 100644 (file)
--- a/src/bin/psql/po/zh_CN.po
+++ b/src/bin/psql/po/zh_CN.po
@@ -1,286 +1,300 @@
 # simplified Chinese translation file for psql\r
 # Weiping He , 2002.\r
 # \r
-# $PostgreSQL: pgsql/src/bin/psql/po/zh_CN.po,v 1.4 2003/11/29 19:52:07 pgsql Exp $\r
+# $PostgreSQL: pgsql/src/bin/psql/po/zh_CN.po,v 1.5 2004/08/10 19:02:01 petere Exp $\r
 # \r
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:29+0000\n"
-"PO-Revision-Date: 2003-09-15 13:48:19+0800\n"
-"Last-Translator: Bao Wei <[email protected].cn>\n"
+"POT-Creation-Date: 2004-08-05 10:13+0000\n"
+"PO-Revision-Date: 2004-01-12 13:48:19+0800\n"
+"Last-Translator: Bao Wei <[email protected].cn>\n"
 "Language-Team: Weiping He \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: command.c:154
+#: command.c:112
 msgid "Warning: This syntax is deprecated.\n"
 msgstr "¾¯¸æ: ÕâÖÖÓï·¨ÒѾ­·ÏÆú.\n"
 
-#: command.c:161
+#: command.c:120
 #, c-format
 msgid "Invalid command \\%s. Try \\? for help.\n"
 msgstr "ÎÞЧµÄÃüÁî \\%s. Óà \\? »ñÈ¡°ïÖú.\n"
 
-#: command.c:163
+#: command.c:122
 #, c-format
 msgid "invalid command \\%s\n"
 msgstr "ÎÞЧµÄÃüÁî \\%s\n"
 
-#: command.c:290
+#: command.c:131
+#, c-format
+msgid "\\%s: extra argument \"%s\" ignored\n"
+msgstr "\\%s: ºöÂÔ¶àÓàµÄ²ÎÊý \"%s\"\n"
+
+#: command.c:240
 #, c-format
 msgid "could not get home directory: %s\n"
 msgstr "ÎÞ·¨»ñµÃ¼ÒĿ¼: %s\n"
 
-#: command.c:306
+#: command.c:256
 #, c-format
 msgid "\\%s: could not change directory to \"%s\": %s\n"
 msgstr "\\%s: ²»Äܸı䵽 \"%s\" Ŀ¼: %s\n"
 
-#: command.c:411 command.c:780
+#: command.c:370 command.c:759
 msgid "no query buffer\n"
 msgstr "ÎÞ²éѯ»º³åÇø\n"
 
-#: command.c:476
+#: command.c:432
 #, c-format
 msgid "%s: invalid encoding name or conversion procedure not found\n"
 msgstr "%s: ÎÞЧ±àÂëÃû×Ö»òûÓÐÕÒµ½×ª»»¹ý³Ì\n"
 
-#: command.c:538 command.c:569 command.c:580 command.c:594 command.c:636
-#: command.c:760 command.c:789
+#: command.c:500 command.c:534 command.c:548 command.c:565 command.c:611
+#: command.c:739 command.c:770
 #, c-format
 msgid "\\%s: missing required argument\n"
 msgstr "\\%s: ȱÉÙËùÐè²ÎÊý\n"
 
-#: command.c:624
+#: command.c:597
 msgid "Query buffer is empty."
 msgstr "²éѯ»º³åÇøΪ¿Õ."
 
-#: command.c:657
+#: command.c:631
 msgid "Query buffer reset (cleared)."
 msgstr "ÖØÖÃ(Çå¿Õ)²éѯ»º³åÇø."
 
-#: command.c:668
+#: command.c:645
 #, c-format
 msgid "Wrote history to file \"%s\".\n"
-msgstr "Ïò \"%s\" ÖÐд³öÀúÊ·.\n"
+msgstr "ÏòÎļþ \"%s\" ÖÐдÈëÀúÊ·.\n"
 
-#: command.c:700 command.c:1160 command.c:1257 command.c:1975 common.c:80
-#: copy.c:88 copy.c:116 mainloop.c:78 mainloop.c:341 describe.c:51
+#: command.c:680 common.c:86 common.c:100 mainloop.c:70
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
 
-#: command.c:715 command.c:765
+#: command.c:695 command.c:744
 #, c-format
 msgid "\\%s: error\n"
 msgstr "\\%s: ´íÎó\n"
 
-#: command.c:804 command.c:824 command.c:1022 command.c:1035 command.c:1046
-#: command.c:1617 command.c:1630 command.c:1642 command.c:1655 command.c:1669
-#: command.c:1691 command.c:1721 common.c:129 copy.c:378
+#: command.c:725
+msgid "Timing is on."
+msgstr "¿ªÊ¼¼Æʱ."
+
+#: command.c:727
+msgid "Timing is off."
+msgstr "½áÊø¼Æʱ."
+
+#: command.c:787 command.c:807 command.c:1163 command.c:1170 command.c:1180
+#: command.c:1192 command.c:1205 command.c:1219 command.c:1241 command.c:1272
+#: common.c:171 copy.c:539 copy.c:584
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s: %s\n"
 
-#: command.c:890
-#, c-format
-msgid "\\%s: extra argument \"%s\" ignored\n"
-msgstr "\\%s: ºöÂÔ¶àÓàµÄ²ÎÊý \"%s\"\n"
-
-#: command.c:983 command.c:1011 command.c:1133
-msgid "parse error at the end of line\n"
-msgstr "ÔÚÐÐβ·¢Éú·ÖÎö´í\n"
-
-#: command.c:1362 command.c:1386 startup.c:173 startup.c:191
+#: command.c:914 command.c:938 startup.c:184 startup.c:202
 msgid "Password: "
 msgstr "¿ÚÁî: "
 
-#: command.c:1400 common.c:175 common.c:345 common.c:396 common.c:611
+#: command.c:952 common.c:217 common.c:599 common.c:654 common.c:897
 #, c-format
 msgid "%s"
 msgstr "%s"
 
-#: command.c:1404
+#: command.c:956
 msgid "Previous connection kept\n"
 msgstr "±£ÁôÉÏÒ»´ÎÁª½Ó\n"
 
-#: command.c:1416
+#: command.c:968
 #, c-format
 msgid "\\connect: %s"
-msgstr "\\connect: %s"
+msgstr "\\Áª½Ó: %s"
 
-#: command.c:1428
+#: command.c:980
 #, c-format
 msgid "You are now connected to database \"%s\".\n"
 msgstr "ÄãÏÖÔÚÒѾ­Áª½Óµ½Êý¾Ý¿â \"%s\".\n"
 
-#: command.c:1430
+#: command.c:982
 #, c-format
 msgid "You are now connected as new user \"%s\".\n"
 msgstr "ÄãÏÖÔÚÊÇ×÷ΪÐÂÓû§ \"%s\" Áª½ÓµÄ.\n"
 
-#: command.c:1433
+#: command.c:985
 #, c-format
 msgid "You are now connected to database \"%s\" as user \"%s\".\n"
 msgstr "ÄãÏÖÔÚÊÇÒÔÓû§ \"%2$s\" µÄÉí·ÝÁª½Óµ½Êý¾Ý¿â \"%1$s\".\n"
 
-#: command.c:1555
+#: command.c:1102
 #, c-format
 msgid "could not start editor \"%s\"\n"
 msgstr "ÎÞ·¨ÔËÐб༭Æ÷ \"%s\"\n"
 
-#: command.c:1557
+#: command.c:1104
 msgid "could not start /bin/sh\n"
 msgstr "ÎÞ·¨ÔËÐÐ /bin/sh\n"
 
-#: command.c:1602
+#: command.c:1148
 #, c-format
 msgid "could not open temporary file \"%s\": %s\n"
 msgstr "ÎÞ·¨´ò¿ªÁÙʱÎļþ \"%s\": %s\n"
 
-#: command.c:1794
+#: command.c:1340
 msgid "\\pset: allowed formats are unaligned, aligned, html, latex\n"
 msgstr "\\pset: ÔÊÐíµÄ¸ñʽÊÇÎÞ¶ÔÆë, ¶ÔÆë, html, latex\n"
 
-#: command.c:1799
+#: command.c:1345
 #, c-format
 msgid "Output format is %s.\n"
 msgstr "Êä³ö¸ñʽÊÇ %s.\n"
 
-#: command.c:1809
+#: command.c:1355
 #, c-format
 msgid "Border style is %d.\n"
 msgstr "±ß½ç·ç¸ñÊÇ %d.\n"
 
-#: command.c:1818
+#: command.c:1364
+#, c-format
 msgid "Expanded display is on.\n"
 msgstr "À©Õ¹ÏÔʾÒÑ´ò¿ª.\n"
 
-#: command.c:1819
+#: command.c:1365
+#, c-format
 msgid "Expanded display is off.\n"
 msgstr "À©Õ¹ÏÔʾÒѹرÕ.\n"
 
-#: command.c:1831
+#: command.c:1377
 #, c-format
 msgid "Null display is \"%s\".\n"
 msgstr "Null ÏÔʾΪ \"%s\".\n"
 
-#: command.c:1843
+#: command.c:1389
 #, c-format
 msgid "Field separator is \"%s\".\n"
 msgstr "Óò·Ö¸ô·ûÊÇ \"%s\".\n"
 
-#: command.c:1857
+#: command.c:1403
+#, c-format
 msgid "Record separator is ."
 msgstr "¼Ç¼·Ö¸ô·ûÊÇ <ÐÂÐÐ>."
 
-#: command.c:1859
+#: command.c:1405
 #, c-format
 msgid "Record separator is \"%s\".\n"
 msgstr "¼Ç¼·Ö¸ô·ûÊÇ \"%s\".\n"
 
-#: command.c:1870
+#: command.c:1416
 msgid "Showing only tuples."
 msgstr "Ö»ÏÔʾԪ×é."
 
-#: command.c:1872
+#: command.c:1418
 msgid "Tuples only is off."
 msgstr "¹Ø±ÕÖ»ÏÔʾԪ×é."
 
-#: command.c:1888
+#: command.c:1434
 #, c-format
 msgid "Title is \"%s\".\n"
 msgstr "±êÌâÊÇ \"%s\".\n"
 
-#: command.c:1890
+#: command.c:1436
+#, c-format
 msgid "Title is unset.\n"
 msgstr "ÎÞ±êÌâ.\n"
 
-#: command.c:1906
+#: command.c:1452
 #, c-format
 msgid "Table attribute is \"%s\".\n"
 msgstr "±íÊôÐÔÊÇ \"%s\".\n"
 
-#: command.c:1908
+#: command.c:1454
+#, c-format
 msgid "Table attributes unset.\n"
 msgstr "δÉèÖñíÊôÐÔ.\n"
 
-#: command.c:1924
+#: command.c:1470
 msgid "Pager is used for long output."
 msgstr "·ÖÒ³Æ÷ÊÇΪ³¤Êä³öʹÓõÄ."
 
-#: command.c:1926
+#: command.c:1472
 msgid "Pager is always used."
 msgstr "×ÜÊÇʹÓ÷ÖÒ³Æ÷."
 
-#: command.c:1928
+#: command.c:1474
 msgid "Pager usage is off."
 msgstr "¹Ø±Õ·ÖÒ³Æ÷µÄʹÓÃ."
 
-#: command.c:1939
+#: command.c:1485
 msgid "Default footer is on."
 msgstr "´ò¿ªÈ±Ê¡½Å±ê."
 
-#: command.c:1941
+#: command.c:1487
 msgid "Default footer is off."
 msgstr "¹Ø±Õȱʡ½Å±ê."
 
-#: command.c:1947
+#: command.c:1493
 #, c-format
 msgid "\\pset: unknown option: %s\n"
 msgstr "\\pset: δ֪ѡÏî: %s\n"
 
-#: command.c:1994
+#: command.c:1532
 msgid "\\!: failed\n"
 msgstr "\\!: ʧ°Ü\n"
 
-#: common.c:73
+#: common.c:79
 #, c-format
 msgid "%s: xstrdup: cannot duplicate null pointer (internal error)\n"
 msgstr "%s: xstrdup: ÎÞ·¨¸´ÖÆ¿ÕÖ¸Õë(ÄÚ²¿´íÎó)\n"
 
-#: common.c:257
+#: common.c:124
+msgid "out of memory"
+msgstr "ÄÚ´æÓþ¡"
+
+#: common.c:299
 msgid "connection to server was lost\n"
 msgstr "ÓëÊý¾Ý¿âµÄÁª½Ó¶ªÊ§\n"
 
-#: common.c:261
+#: common.c:303
 msgid "The connection to the server was lost. Attempting reset: "
 msgstr "Óë·þÎñÆ÷µÄÁª½ÓÒѶªÊ§. ³¢ÊÔÖØÖÃ: "
 
-#: common.c:266
+#: common.c:308
 msgid "Failed.\n"
 msgstr "ʧ°Ü.\n"
 
-#: common.c:273
+#: common.c:315
 msgid "Succeeded.\n"
 msgstr "³É¹¦.\n"
 
-#: common.c:372 common.c:579
+#: common.c:383
+#, c-format
+msgid "INTERNAL ERROR: unexpected statement position \"%s\"\n"
+msgstr "ÄÚ²¿´íÎó: ÒâÍâµÄÓï¾äλÖà \"%s\"\n"
+
+#: common.c:519
+#, c-format
+msgid "LINE %d: "
+msgstr "µÚ %d ÐÐ: "
+
+#: common.c:538 common.c:547
+#, c-format
+msgid "%s\n"
+msgstr "%s\n"
+
+#: common.c:630 common.c:865
 msgid "You are currently not connected to a database.\n"
 msgstr "ÄãĿǰûÓÐÓëÊý¾Ý¿âÁª½Ó.\n"
 
-#: common.c:428
+#: common.c:685
 #, c-format
 msgid ""
 "Asynchronous notification \"%s\" received from server process with PID %d.\n"
 msgstr "½ÓÊÕµ½·þÎñÆ÷½ø³Ì PID %2$d µÄÒ첽֪ͨ \"%1$s\".\n"
 
-#: common.c:531
-msgid ""
-"Enter data to be copied followed by a newline.\n"
-"End with a backslash and a period on a line by itself."
-msgstr ""
-"ÊäÈëÒª¿½±´µÄÊý¾ÝÈ»ºóÊäÈëÒ»¸öÐÂÐÐ.\n"
-"ÔÚ¶ÀÁ¢µÄÒ»ÐÐÉÏÊäÈëÒ»¸ö·´Ð±¿¸ºÍÒ»¸ö¾äµã½áÊø."
-
-#: common.c:550
-#, c-format
-msgid "Time: %.2f ms\n"
-msgstr "ʱ¼ä: %.2f ms\n"
-
-#: common.c:587
+#: common.c:873
 #, c-format
 msgid ""
 "***(Single step mode: verify command)"
@@ -291,36 +305,49 @@ msgid ""
 msgstr ""
 "***(µ¥²½Ä£Ê½: ÑéÖ¤ÃüÁî)*******************************************\n"
 "%s\n"
-"***(Çûسµ¼ÌÐø»òÕßÇà x È»ºóÇûسµÈ¡Ïû)********************\n"
+"***(°´»Ø³µ¼ÌÐø»òÕßÊäÈë x È»ºó°´»Ø³µÈ¡Ïû)********************\n"
+
+#: common.c:924
+#, c-format
+msgid "Time: %.3f ms\n"
+msgstr "ʱ¼ä: %.3f ms\n"
 
-#: copy.c:110
+#: copy.c:122
 msgid "\\copy: arguments required\n"
 msgstr "\\copy: ÐèÒª²ÎÊý\n"
 
-#: copy.c:289
+#: copy.c:412
 #, c-format
 msgid "\\copy: parse error at \"%s\"\n"
 msgstr "\\copy: ÔÚ \"%s\" ·ÖÎö´íÎó\n"
 
-#: copy.c:291
+#: copy.c:414
 msgid "\\copy: parse error at end of line\n"
 msgstr "\\copy: ÔÚÐÐβ·ÖÎö´íÎó\n"
 
-#: copy.c:389
+#: copy.c:550
 #, c-format
 msgid "%s: cannot copy from/to a directory\n"
 msgstr "%s: ÎÞ·¨´ÓÒ»¸öĿ¼¿½±´, »ò¿½±´µ½Ò»¸öĿ¼\n"
 
-#: copy.c:410
+#: copy.c:571
 #, c-format
 msgid "\\copy: %s"
 msgstr "\\¿½±´: %s"
 
-#: copy.c:414
+#: copy.c:575
 #, c-format
 msgid "\\copy: unexpected response (%d)\n"
 msgstr "\\copy: ÒâÍâÏìÓ¦(%d)\n"
 
+#: copy.c:676
+msgid ""
+"Enter data to be copied followed by a newline.\n"
+"End with a backslash and a period on a line by itself."
+msgstr ""
+"ÊäÈëÒª¿½±´µÄÊý¾ÝÈ»ºóÊäÈëÒ»¸öÐÂÐÐ.\n"
+"ÔÚ¶ÀÁ¢µÄÒ»ÐÐÉÏÊäÈëÒ»¸ö·´Ð±¿¸ºÍÒ»¸ö¾äµã½áÊø."
+
 #: help.c:48
 msgid "on"
 msgstr "´ò¿ª"
@@ -523,6 +550,7 @@ msgstr ""
 "Ïò  »ã±¨³ô³æ."
 
 #: help.c:174
+#, c-format
 msgid "General\n"
 msgstr "Ò»°ãÑ¡Ïî\n"
 
@@ -533,39 +561,45 @@ msgid ""
 "                 connect to new database (currently \"%s\")\n"
 msgstr ""
 "  \\c[onnect] [Êý¾Ý¿âÃû|- [Óû§Ãû]]\n"
-"                    Áª½Óµ½ÐµÄÊý¾Ý¿â (µ±Ç°Îª \"%s\")\n"
+"                   Áª½Óµ½ÐµÄÊý¾Ý¿â (µ±Ç°Îª \"%s\")\n"
 
 #: help.c:178
+#, c-format
 msgid "  \\cd [DIR]      change the current working directory\n"
 msgstr "  \\cd [Ŀ¼Ãû]     ¸Ä±äµ±Ç°µÄ¹¤×÷Ŀ¼\n"
 
 #: help.c:179
+#, c-format
 msgid "  \\copyright     show PostgreSQL usage and distribution terms\n"
 msgstr "  \\copyright       ÏÔʾ PostgreSQL Ó÷¨ºÍ·¢²¼ÐÅÏ¢\n"
 
 #: help.c:180
+#, c-format
 msgid ""
 "  \\encoding [ENCODING]\n"
 "                 show or set client encoding\n"
 msgstr ""
 "  \\encoding [±àÂë]\n"
-"                 ÏÔʾ»òÉèÖÿͻ§¶Ë±àÂë\n"
+"                   ÏÔʾ»òÉèÖÿͻ§¶Ë±àÂë\n"
 
 #: help.c:182
+#, c-format
 msgid "  \\h [NAME]      help on syntax of SQL commands, * for all commands\n"
 msgstr "  \\h [Ãû×Ö]        SQL ÃüÁîµÄÓï·¨°ïÖú, Óà * ¿ÉÒÔ¿´ËùÓÐÃüÁîµÄ°ïÖú\n"
 
 #: help.c:183
+#, c-format
 msgid "  \\q             quit psql\n"
 msgstr "  \\q               Í˳ö psql\n"
 
 #: help.c:184
+#, c-format
 msgid ""
 "  \\set [NAME [VALUE]]\n"
 "                 set internal variable, or list all if no parameters\n"
 msgstr ""
 "  \\set [Ãû×Ö [Öµ]]\n"
-"                 ÉèÖÃÄÚ²¿±äÁ¿, Èç¹ûûÓвÎÊý¾ÍÁгöËùÓÐ\n"
+"                   ÉèÖÃÄÚ²¿±äÁ¿, Èç¹ûûÓвÎÊý¾ÍÁгöËùÓÐ\n"
 
 #: help.c:186
 #, c-format
@@ -573,23 +607,28 @@ msgid "  \\timing        toggle timing of commands (currently %s)\n"
 msgstr "  \\timing          ²éѯ¼Æʱ¿ª¹ØÇл» (Ä¿Ç°ÊÇ %s)\n"
 
 #: help.c:188
+#, c-format
 msgid "  \\unset NAME    unset (delete) internal variable\n"
 msgstr "  \\unset Ãû×Ö      È¡Ïû(ɾ³ý)ÄÚ²¿±äÁ¿\n"
 
 #: help.c:189
+#, c-format
 msgid "  \\! [COMMAND]   execute command in shell or start interactive shell\n"
 msgstr "  \\! [ÃüÁî]        ÔÚ shell ÀïÖ´ÐÐÃüÁî»òÕß¿ªÊ¼Ò»¸ö½»»¥µÄ shell\n"
 
 #: help.c:192
+#, c-format
 msgid "Query Buffer\n"
 msgstr "²éѯ»º³åÇøÑ¡Ïî\n"
 
 #: help.c:193
+#, c-format
 msgid ""
 "  \\e [FILE]      edit the query buffer (or file) with external editor\n"
 msgstr "  \\e [ÎļþÃû]      ÓÃÒ»¸öÍⲿ±à¼­Æ÷±à¼­µ±Ç°²éѯ»º³åÇø»òÕßÎļþ\n"
 
 #: help.c:194
+#, c-format
 msgid ""
 "  \\g [FILE]      send query buffer to server (and results to file or |"
 "pipe)\n"
@@ -597,191 +636,238 @@ msgstr ""
 "  \\g [ÎļþÃû]      Ïò·þÎñÆ÷·¢ËÍ SQL ÃüÁî (²¢ÇҰѽá¹ûдµ½Îļþ»òÕß |¹ÜµÀ)\n"
 
 #: help.c:195
+#, c-format
 msgid "  \\p             show the contents of the query buffer\n"
 msgstr "  \\p               ÏÔʾµ±Ç°²éѯ»º³åÇøµÄÄÚÈÝ\n"
 
 #: help.c:196
+#, c-format
 msgid "  \\r             reset (clear) the query buffer\n"
 msgstr "  \\r               ÖØÖà (ÇåÀí) ²éѯ»º³åÇø\n"
 
 #: help.c:197
+#, c-format
 msgid "  \\s [FILE]      display history or save it to file\n"
 msgstr "  \\s [ÎļþÃû]      ´òÓ¡ÀúÊ·»òÕß½«Æä±£´æµ½Îļþ\n"
 
 #: help.c:198
-msgid "  \\w [FILE]      write query buffer to file\n"
-msgstr "  \\w [ÎļþÃû]      ½«µ±Ç°²éѯ»º³åÇøд³öµ½Îļþ\n"
+#, c-format
+msgid "  \\w FILE        write query buffer to file\n"
+msgstr "  \\w [ÎļþÃû]      ½«²éѯ»º³åÇøд³öµ½Îļþ\n"
 
 #: help.c:201
+#, c-format
 msgid "Input/Output\n"
 msgstr "ÊäÈë/Êä³öÑ¡Ïî\n"
 
 #: help.c:202
+#, c-format
 msgid "  \\echo [STRING] write string to standard output\n"
 msgstr "  \\echo [×Ö´®]     Ïò±ê×¼Êä³öд³öÎı¾\n"
 
 #: help.c:203
+#, c-format
 msgid "  \\i FILE        execute commands from file\n"
 msgstr "  \\i ÎļþÃû        Ö´ÐÐÀ´×ÔÎļþµÄÃüÁî\n"
 
 #: help.c:204
+#, c-format
 msgid "  \\o [FILE]      send all query results to file or |pipe\n"
 msgstr "  \\o [ÎļþÃû]      ÏòÎļþ»òÕß |¹ÜµÀ ·¢ËÍËùÓвéѯ½á¹û\n"
 
 #: help.c:205
+#, c-format
 msgid ""
 "  \\qecho [STRING]\n"
 "                 write string to query output stream (see \\o)\n"
 msgstr ""
 "  \\qecho [×Ö´®]\n"
-"                 Ïò²éѯÊä³öÁ÷д³öÎı¾ (¼û \\o)\n"
+"                   Ïò²éѯÊä³öÁ÷д³öÎı¾ (¼û \\o)\n"
 
 #: help.c:209
+#, c-format
 msgid "Informational\n"
 msgstr "ÐÅϢѡÏî\n"
 
 #: help.c:210
+#, c-format
 msgid "  \\d [NAME]      describe table, index, sequence, or view\n"
 msgstr "  \\d [Ãû×Ö]        ÃèÊö±í, Ë÷Òý, ÐòÁÐ, »òÕßÊÓͼ\n"
 
 #: help.c:211
+#, c-format
 msgid ""
 "  \\d{t|i|s|v|S} [PATTERN] (add \"+\" for more detail)\n"
 "                 list tables/indexes/sequences/views/system tables\n"
 msgstr ""
 "  \\d{t|i|s|v|S} [ģʽ] (¼Ó \"+\" »ñÈ¡¸ü¶àÐÅÏ¢)\n"
-"                    Áгö±í/Ë÷Òý/ÐòÁÐ/ÊÓͼ/ϵͳ±í\n"
+"                   Áгö±í/Ë÷Òý/ÐòÁÐ/ÊÓͼ/ϵͳ±í\n"
 
 #: help.c:213
+#, c-format
 msgid "  \\da [PATTERN]  list aggregate functions\n"
 msgstr "  \\da [ģʽ]       Áгö¾Û¼¯º¯Êý\n"
 
 #: help.c:214
+#, c-format
+msgid "  \\db [PATTERN]  list tablespaces (add \"+\" for more detail)\n"
+msgstr "  \\db [ģʽ]       Áгö±í¿Õ¼ä (¼Ó \"+\" »ñÈ¡¸ü¶àµÄÐÅÏ¢)\n"
+
+#: help.c:215
+#, c-format
 msgid "  \\dc [PATTERN]  list conversions\n"
 msgstr "  \\dc [ģʽ]       Áгö±àÂëת»»\n"
 
-#: help.c:215
+#: help.c:216
+#, c-format
 msgid "  \\dC            list casts\n"
 msgstr "  \\dC              ÁгöÀàÐÍת»»\n"
 
-#: help.c:216
+#: help.c:217
+#, c-format
 msgid "  \\dd [PATTERN]  show comment for object\n"
 msgstr "  \\dd [ģʽ]       ÏÔʾĿ±êµÄ×¢ÊÍ\n"
 
-#: help.c:217
+#: help.c:218
+#, c-format
 msgid "  \\dD [PATTERN]  list domains\n"
 msgstr "  \\dD [ģʽ]       ÁгöÓò\n"
 
-#: help.c:218
+#: help.c:219
+#, c-format
 msgid "  \\df [PATTERN]  list functions (add \"+\" for more detail)\n"
 msgstr "  \\df [ģʽ]       Áгöº¯Êý (¼Ó \"+\" »ñÈ¡¸ü¶àµÄÐÅÏ¢)\n"
 
-#: help.c:219
-msgid "  \\dn [PATTERN]  list schemas\n"
-msgstr "  \\dn [ģʽ]       Áгö´ó¸Ù\n"
-
 #: help.c:220
+#, c-format
+msgid "  \\dg [PATTERN]  list groups\n"
+msgstr "  \\dg [ģʽ]       Áгö×é\n"
+
+#: help.c:221
+#, c-format
+msgid "  \\dn [PATTERN]  list schemas (add \"+\" for more detail)\n"
+msgstr "  \\dn [ģʽ]       Áгöģʽ (¼Ó \"+\" »ñÈ¡¸ü¶àµÄÐÅÏ¢)\n"
+
+#: help.c:222
+#, c-format
 msgid "  \\do [NAME]     list operators\n"
 msgstr "  \\do [Ãû×Ö]       Áгö²Ù×÷·û\n"
 
-#: help.c:221
+#: help.c:223
+#, c-format
 msgid "  \\dl            list large objects, same as \\lo_list\n"
 msgstr "  \\dl              Áгö´ó¶ÔÏó, ºÍ \\lo_list Ò»Ñù\n"
 
-#: help.c:222
-msgid "  \\dp [PATTERN]  list table access privileges\n"
-msgstr "  \\dp [ģʽ]       Áгö±í·ÃÎÊȨÏÞ\n"
+#: help.c:224
+#, c-format
+msgid "  \\dp [PATTERN]  list table, view and sequence access privileges\n"
+msgstr "  \\dp [ģʽ]       Áгö±í, ÊÓͼ, ÐòÁеķÃÎÊȨÏÞ\n"
 
-#: help.c:223
+#: help.c:225
+#, c-format
 msgid "  \\dT [PATTERN]  list data types (add \"+\" for more detail)\n"
 msgstr "  \\dT [ģʽ]       ÁгöÊý¾ÝÀàÐÍ (¼Ó \"+\" »ñÈ¡¸ü¶àµÄÐÅÏ¢)\n"
 
-#: help.c:224
+#: help.c:226
+#, c-format
 msgid "  \\du [PATTERN]  list users\n"
 msgstr "  \\du [ģʽ]       ÁгöÓû§\n"
 
-#: help.c:225
+#: help.c:227
+#, c-format
 msgid "  \\l             list all databases (add \"+\" for more detail)\n"
 msgstr "  \\l               ÁгöËùÓÐÊý¾Ý¿â (¼Ó \"+\" »ñÈ¡¸ü¶àµÄÐÅÏ¢)\n"
 
-#: help.c:226
-msgid "  \\z [PATTERN]   list table access privileges (same as \\dp)\n"
-msgstr "  \\z [ģʽ]        Áгö±í·ÃÎÊȨÏÞ (ºÍ \\dp Ò»Ñù)\n"
+#: help.c:228
+#, c-format
+msgid ""
+"  \\z [PATTERN]   list table, view and sequence access privileges (same as "
+"\\dp)\n"
+msgstr "  \\z [ģʽ]        Áгö±í, ÊÓͼ, ÐòÁеķÃÎÊȨÏÞ (ºÍ \\dp Ò»Ñù)\n"
 
-#: help.c:229
+#: help.c:231
+#, c-format
 msgid "Formatting\n"
 msgstr "¸ñʽѡÏî\n"
 
-#: help.c:230
+#: help.c:232
+#, c-format
 msgid "  \\a             toggle between unaligned and aligned output mode\n"
 msgstr "  \\a               ÔڷǶÔÆëºÍ¶ÔÆëµÄÊä³öģʽ֮¼äÇл»\n"
 
-#: help.c:231
+#: help.c:233
+#, c-format
 msgid "  \\C [STRING]    set table title, or unset if none\n"
 msgstr "  \\C [×Ö´®]        ÉèÖñí±êÌâ, Èç¹û²ÎÊý¿ÕÔòÈ¡Ïû±êÌâ\n"
 
-#: help.c:232
+#: help.c:234
+#, c-format
 msgid ""
 "  \\f [STRING]    show or set field separator for unaligned query output\n"
 msgstr " \\f [×Ö´®]         Ϊ·Ç¶ÔÆë²éѯÊä³öÏÔʾ»òÉèÖÃÓò·Ö¸ô·û\n"
 
-#: help.c:233
+#: help.c:235
 #, c-format
 msgid "  \\H             toggle HTML output mode (currently %s)\n"
 msgstr "  \\H               ÔÚ HTML Êä³öģʽ֮¼äÇл» (µ±Ç°ÊÇ %s)\n"
 
-#: help.c:235
+#: help.c:237
+#, c-format
 msgid ""
 "  \\pset NAME [VALUE]\n"
 "                 set table output option\n"
-"                 (NAME := {format|border|expanded|fieldsep|null|recordsep|\n"
-"                 tuples_only|title|tableattr|pager})\n"
+"                 (NAME := {format|border|expanded|fieldsep|footer|null|\n"
+"                 recordsep|tuples_only|title|tableattr|pager})\n"
 msgstr ""
 "  \\pset ±äÁ¿ [Öµ]\n"
-"                    ÉèÖñíµÄÊä³öÑ¡Ïî\n"
-"                    (±äÁ¿ := {foramt|border|expanded|fieldsep|null|\n"
-"                    recordsep|tuples_only|title|tableattr|pager})\n"
+"                   ÉèÖñíµÄÊä³öÑ¡Ïî\n"
+"                   (±äÁ¿ := {foramt|border|expanded|fieldsep|null|\n"
+"                   recordsep|tuples_only|title|tableattr|pager})\n"
 
-#: help.c:239
+#: help.c:241
 #, c-format
 msgid "  \\t             show only rows (currently %s)\n"
 msgstr "  \\t               Ö»ÏÔʾÐÐ (µ±Ç°ÊÇ %s)\n"
 
-#: help.c:241
+#: help.c:243
+#, c-format
 msgid "  \\T [STRING]    set HTML  tag attributes, or unset if none\n" msgstr "  \\T [×Ö´®]        ÉèÖà HTML <±í> ±ê¼ÇÊôÐÔ, Èç¹ûûÓвÎÊý¾ÍÈ¡ÏûÉèÖÃ\n" -#: help.c:242+#: help.c:244 #, c-format msgid "  \\x             toggle expanded output (currently %s)\n" msgstr "  \\x               ÔÚÀ©Õ¹Êä³öÖ®¼äÇл» (Ä¿Ç°ÊÇ %s)\n" -#: help.c:246+#: help.c:248+#, c-format msgid "Copy, Large Object\n" msgstr "¿½±´, ´ó¶ÔÏóÑ¡Ïî\n" -#: help.c:247+#: help.c:249+#, c-format msgid "" "  \\copy ...      perform SQL COPY with data stream to the client host\n" msgstr "  \\copy ...        Ö´ÐÐ SQL COPY, Êý¾ÝÁ÷Ö¸Ïò¿Í»§¶ËÖ÷»ú\n" -#: help.c:248+#: help.c:250+#, c-format msgid ""-"  \\lo_export\n"-"  \\lo_import\n"+"  \\lo_export LOBOID FILE\n"+"  \\lo_import FILE [COMMENT] \n" "  \\lo_list\n"-"  \\lo_unlink     large object operations\n"+"  \\lo_unlink LOBOID    large object operations\n" msgstr ""-"  \\lo_export\n"-"  \\lo_import\n"+"  \\lo_export LOBOID FILE\n"+"  \\lo_import FILE [COMMENT]\n" "  \\lo_list\n"-"  \\lo_unlink       ´ó¶ÔÏó²Ù×÷\n"+"  \\lo_unlink LOBOID    ´ó¶ÔÏó²Ù×÷\n" -#: help.c:281+#: help.c:283 msgid "Available help:\n" msgstr "¿ÉÓðïÖú:\n" -#: help.c:319+#: help.c:342 #, c-format msgid "" "Command:     %s\n"@@ -796,127 +882,129 @@ msgstr "" "%s\n" "\n" -#: help.c:330+#: help.c:355 #, c-format msgid "" "No help available for \"%-.*s\".\n" "Try \\h with no arguments to see available help.\n" msgstr ""-"»¹Ã»ÓÐ \"%-.*s\" µÄ¿ÉÓðïÖú.\n"+"ûÓÐ \"%-.*s\" µÄ¿ÉÓðïÖú.\n" "Óò»´ø²ÎÊýµÄ \\h »ñÈ¡¿ÉÓðïÖú.\n" -#: input.c:226+#: input.c:215 #, c-format msgid "could not save history to file \"%s\": %s\n" msgstr "ÎÞ·¨½«ÀúÊ·±£´æµ½Îļþ \"%s\": %s\n" -#: large_obj.c:39+#: large_obj.c:36 #, c-format msgid "%s: not connected to a database\n" msgstr "%s: δÓëÊý¾Ý¿âÁª½Ó\n" -#: large_obj.c:58+#: large_obj.c:55 #, c-format msgid "%s: current transaction is aborted\n" msgstr "%s: µ±Ç°ÊÂÎñ±»ÖÕÖ¹\n" -#: large_obj.c:61+#: large_obj.c:58 #, c-format msgid "%s: unknown transaction status\n" msgstr "%s: δ֪ÊÂÎñ״̬\n" -#: large_obj.c:278 describe.c:106 describe.c:157 describe.c:230 describe.c:292-#: describe.c:339 describe.c:438 describe.c:718 describe.c:1343+#: large_obj.c:255 describe.c:83 describe.c:180 describe.c:253 describe.c:315+#: describe.c:362 describe.c:462 describe.c:749 describe.c:1472+#: describe.c:1719 msgid "Description" msgstr "ÃèÊö" -#: large_obj.c:286+#: large_obj.c:263 msgid "Large objects" msgstr "´ó¶ÔÏó" -#: mainloop.c:206+#: mainloop.c:173 #, c-format msgid "Use \"\\q\" to leave %s.\n" msgstr "ʹÓà \"\\q\" À뿪 %s.\n" -#: print.c:421+#: print.c:424 msgid "(No rows)\n" msgstr "(ûÓÐÐÐ)\n" -#: print.c:1186+#: print.c:1193+#, c-format msgid "(1 row)" msgstr "(1 ÐÐ)" -#: print.c:1188+#: print.c:1195 #, c-format msgid "(%d rows)" msgstr "(%d ÐÐ)" -#: startup.c:128 startup.c:567+#: startup.c:133 #, c-format msgid "%s: out of memory\n" msgstr "%s: ÄÚ´æÓþ¡\n" -#: startup.c:167+#: startup.c:178 msgid "User name: " msgstr "Óû§Ãû:" -#: startup.c:263+#: startup.c:283 #, c-format msgid "" "Welcome to %s %s, the PostgreSQL interactive terminal.\n" "\n" "Type:  \\copyright for distribution terms\n" "       \\h for help with SQL commands\n"-"       \\? for help on internal slash commands\n"+"       \\? for help with psql commands\n" "       \\g or terminate with semicolon to execute query\n" "       \\q to quit\n" "\n" msgstr ""-"»¶Ó­À´µ½ %s %s, PostgreSQL µÄ½»»¥ÖÕ¶Ë.\n"+"»¶Ó­Ê¹Óà %s %s, PostgreSQL µÄ½»»¥ÖÕ¶Ë.\n" "\n"-"¼üÈë:  \\copyright »ñÈ¡·¢²¼ÐÅÏ¢\n"+"ÊäÈë:  \\copyright »ñÈ¡·¢²¼ÐÅÏ¢\n" "       \\h         »ñÈ¡ SQL ÃüÁîµÄ°ïÖú\n"-"       \\?         »ñÈ¡ÄÚ²¿·´Ð±¿¸ÃüÁîµÄ°ïÖú\n"-"       \\g         »òÕßÒԷֺŽáβִÐвéѯ\n"+"       \\?         »ñÈ¡ psql ÃüÁîµÄ°ïÖú\n"+"       \\g         »òÕßÒÔ·ÖºÅ×÷ΪִÐвéѯµÄ½áβ\n" "       \\q         Í˳ö\n" "\n" -#: startup.c:421+#: startup.c:444 #, c-format msgid "%s: couldn't set printing parameter \"%s\"\n" msgstr "%s: ÎÞ·¨ÉèÖôòÓ¡²ÎÊý \"%s\"\n" -#: startup.c:467+#: startup.c:490 #, c-format msgid "%s: could not delete variable \"%s\"\n" msgstr "%s: ÎÞ·¨É¾³ý±äÁ¿ \"%s\"\n" -#: startup.c:477+#: startup.c:500 #, c-format msgid "%s: could not set variable \"%s\"\n" msgstr "%s: ÎÞ·¨ÉèÖñäÁ¿ \"%s\"\n" -#: startup.c:508 startup.c:514+#: startup.c:531 startup.c:537 #, c-format msgid "Try \"%s --help\" for more information.\n" msgstr "Óà \"%s --help\" »ñÈ¡¸ü¶àÐÅÏ¢.\n" -#: startup.c:532+#: startup.c:555 #, c-format msgid "%s: warning: extra command-line argument \"%s\" ignored\n" msgstr "%s: ¾¯¸æ: ºöÂÔ¶îÍâµÄÃüÁîÐвÎÊý \"%s\"\n" -#: startup.c:539+#: startup.c:562 #, c-format msgid "%s: Warning: The -u option is deprecated. Use -U.\n" msgstr "%s: ¾¯¸æ: -u Ñ¡ÏîÒѾ­·ÏÆú. ÇëÓà -U.\n" -#: startup.c:596+#: startup.c:626 msgid "contains support for command-line editing" msgstr "°üÀ¨ÃüÁîÐб༭µÄÖ§³Ö" -#: startup.c:619+#: startup.c:649 #, c-format msgid "" "SSL connection (cipher: %s, bits: %i)\n"@@ -925,226 +1013,240 @@ msgstr "" "SSL Áª½Ó (¼ÓÃÜ: %s, λ: %i)\n" "\n" -#: describe.c:105 describe.c:147 describe.c:217 describe.c:290 describe.c:384-#: describe.c:438 describe.c:1336 describe.c:1442 describe.c:1490+#: describe.c:82 describe.c:170 describe.c:240 describe.c:313 describe.c:408+#: describe.c:462 describe.c:1465 describe.c:1571 describe.c:1619 msgid "Schema" msgstr "ģʽ" -#: describe.c:105 describe.c:147 describe.c:217 describe.c:290 describe.c:332-#: describe.c:438 describe.c:1336 describe.c:1443 describe.c:1491-#: describe.c:1586+#: describe.c:82 describe.c:121 describe.c:170 describe.c:240 describe.c:313+#: describe.c:355 describe.c:408 describe.c:462 describe.c:1465+#: describe.c:1572 describe.c:1620 describe.c:1713 msgid "Name" msgstr "Ãû×Ö" -#: describe.c:105+#: describe.c:82 msgid "(all types)" msgstr "(ËùÓÐÀàÐÍ)" -#: describe.c:106+#: describe.c:83 msgid "Data type" msgstr "Êý¾ÝÀàÐÍ" -#: describe.c:120+#: describe.c:97 msgid "List of aggregate functions" msgstr "¾Û¼¯º¯ÊýÁбí" -#: describe.c:147+#: describe.c:121 describe.c:179 describe.c:355 describe.c:1467+#: describe.c:1713+msgid "Owner"+msgstr "ËùÓÐÕß"++#: describe.c:121+msgid "Location"+msgstr "λÖÃ"++#: describe.c:126 describe.c:408 describe.c:1719+msgid "Access privileges"+msgstr "·ÃÎÊȨÏÞ"++#: describe.c:143+msgid "List of tablespaces"+msgstr "±í¿Õ¼äÁбí"++#: describe.c:170 msgid "Result data type" msgstr "½á¹ûÊý¾ÝÀàÐÍ" -#: describe.c:148+#: describe.c:171 msgid "Argument data types" msgstr "²ÎÊýÊý¾ÝÀàÐÍ" -#: describe.c:156 describe.c:332 describe.c:1338 describe.c:1587-msgid "Owner"-msgstr "ËùÓÐÕß"--#: describe.c:156+#: describe.c:179 msgid "Language" msgstr "ÓïÑÔ" -#: describe.c:157+#: describe.c:180 msgid "Source code" msgstr "Ô´´úÂë" -#: describe.c:191+#: describe.c:214 msgid "List of functions" msgstr "º¯ÊýÁбí" -#: describe.c:227+#: describe.c:250 msgid "Internal name" msgstr "ÄÚ²¿Ãû³Æ" -#: describe.c:227+#: describe.c:250 msgid "Size" msgstr "´óС" -#: describe.c:259+#: describe.c:282 msgid "List of data types" msgstr "Êý¾ÝÀàÐÍÁбí" -#: describe.c:291+#: describe.c:314 msgid "Left arg type" msgstr "×ó²ÎÊýÀàÐÍ" -#: describe.c:291+#: describe.c:314 msgid "Right arg type" msgstr "ÓÒ²ÎÊýÀàÐÍ" -#: describe.c:292+#: describe.c:315 msgid "Result type" msgstr "½á¹ûÀàÐÍ" -#: describe.c:306+#: describe.c:329 msgid "List of operators" msgstr "²Ù×÷·ûÁбí" -#: describe.c:335+#: describe.c:358 msgid "Encoding" msgstr "±àÂë" -#: describe.c:351+#: describe.c:374 msgid "List of databases" msgstr "Êý¾Ý¿âÁбí" -#: describe.c:384 describe.c:1353-msgid "Table"+#: describe.c:408 describe.c:536 describe.c:1466+msgid "table" msgstr "±í" -#: describe.c:384-msgid "Access privileges"-msgstr "·ÃÎÊȨÏÞ"+#: describe.c:408 describe.c:536 describe.c:1466+msgid "view"+msgstr "ÊÓͼ"++#: describe.c:408 describe.c:536 describe.c:1466+msgid "sequence"+msgstr "ÐòÁÐ" -#: describe.c:406+#: describe.c:408 describe.c:736 describe.c:1467 describe.c:1573+msgid "Type"+msgstr "ÀàÐÍ"++#: describe.c:430 #, c-format msgid "Access privileges for database \"%s\"" msgstr "Êý¾Ý¿â \"%s\" µÄ·ÃÎÊȨÏÞ" -#: describe.c:438+#: describe.c:462 msgid "Object" msgstr "¶ÔÏó" -#: describe.c:449+#: describe.c:473 msgid "aggregate" msgstr "¾Û¼¯" -#: describe.c:467+#: describe.c:491 msgid "function" msgstr "º¯Êý" -#: describe.c:481+#: describe.c:505 msgid "operator" msgstr "²Ù×÷·û" -#: describe.c:495+#: describe.c:519 msgid "data type" msgstr "Êý¾ÝÀàÐÍ" -#: describe.c:512 describe.c:1337-msgid "table"-msgstr "±í"--#: describe.c:512 describe.c:1337-msgid "view"-msgstr "ÊÓͼ"--#: describe.c:512 describe.c:1337+#: describe.c:536 describe.c:1466 msgid "index" msgstr "Ë÷Òý" -#: describe.c:512 describe.c:1337-msgid "sequence"-msgstr "ÐòÁÐ"--#: describe.c:528+#: describe.c:552 msgid "rule" msgstr "¹æÔò" -#: describe.c:544+#: describe.c:568 msgid "trigger" msgstr "´¥·¢Æ÷" -#: describe.c:562+#: describe.c:586 msgid "Object descriptions" msgstr "¶ÔÏóÃèÊö" -#: describe.c:608+#: describe.c:634 #, c-format msgid "Did not find any relation named \"%s\".\n" msgstr "ûÓÐÕÒµ½ÈκÎÃûΪ \"%s\" µÄ¹Øϵ.\n" -#: describe.c:691+#: describe.c:720 #, c-format msgid "Did not find any relation with OID %s.\n" msgstr "ûÓÐÕÒµ½ÈκΠOID Ϊ %s µÄ¹Øϵ.\n" -#: describe.c:704+#: describe.c:735 msgid "Column"-msgstr "ÁÐ"+msgstr "×Ö¶ÎÃû" -#: describe.c:705 describe.c:1338 describe.c:1444-msgid "Type"-msgstr "ÀàÐÍ"--#: describe.c:712+#: describe.c:743 msgid "Modifiers" msgstr "ÐÞÊδÊ" -#: describe.c:819+#: describe.c:850 #, c-format msgid "Table \"%s.%s\"" msgstr "±í \"%s.%s\"" -#: describe.c:823+#: describe.c:854 #, c-format msgid "View \"%s.%s\"" msgstr "ÊÓͼ \"%s.%s\"" -#: describe.c:827+#: describe.c:858 #, c-format msgid "Sequence \"%s.%s\"" msgstr "ÐòÁÐ \"%s.%s\"" -#: describe.c:831+#: describe.c:862 #, c-format msgid "Index \"%s.%s\"" msgstr "Ë÷Òý \"%s.%s\"" -#: describe.c:835+#: describe.c:866 #, c-format msgid "Special relation \"%s.%s\"" msgstr "ÌØÊâ¹Øϵ \"%s.%s\"" -#: describe.c:839+#: describe.c:870 #, c-format msgid "TOAST table \"%s.%s\"" msgstr "TOAST ±í \"%s.%s\"" -#: describe.c:843+#: describe.c:874 #, c-format msgid "Composite type \"%s.%s\"" msgstr "¸´ºÏÀàÐÍ \"%s.%s\"" -#: describe.c:847+#: describe.c:878 #, c-format msgid "?%c? \"%s.%s\"" msgstr "?%c? \"%s.%s\"" -#: describe.c:883-msgid "primary key, "-msgstr "Ö÷¼ü, "+#: describe.c:916+msgid "PRIMARY KEY, "+msgstr " PRIMARY KEY, " -#: describe.c:885-msgid "unique, "-msgstr "Ψһ, "+#: describe.c:918+msgid "UNIQUE, "+msgstr " UNIQUE, " -#: describe.c:891+#: describe.c:924 #, c-format msgid "for table \"%s.%s\"" msgstr "¸ø±í \"%s.%s\"" -#: describe.c:929+#: describe.c:928+#, c-format+msgid ", predicate (%s)"+msgstr ", ÊõÓï (%s)"++#: describe.c:931+msgid ", CLUSTER"+msgstr ", CLUSTER"++#: describe.c:968 #, c-format msgid "" "View definition:\n"@@ -1153,268 +1255,1866 @@ msgstr "" "ÊÓͼ¶¨Òå:\n" "%s" -#: describe.c:935-msgid "Rules"-msgstr "¹æÔò"+#: describe.c:974 describe.c:1195+msgid "Rules:"+msgstr "¹æÔò:" -#: describe.c:1084+#: describe.c:1129 msgid "Indexes:" msgstr "Ë÷Òý:" -#: describe.c:1092+#: describe.c:1137 #, c-format msgid "    \"%s\"" msgstr "    \"%s\"" -#: describe.c:1098-msgid " primary key,"-msgstr " Ö÷¼ü,"+#: describe.c:1143+msgid " PRIMARY KEY,"+msgstr " PRIMARY KEY," -#: describe.c:1100-msgid " unique,"-msgstr " Ψһ,"+#: describe.c:1145+msgid " UNIQUE,"+msgstr " UNIQUE," -#: describe.c:1118+#: describe.c:1156+msgid " CLUSTER"+msgstr " CLUSTER"++#: describe.c:1165 msgid "Check constraints:" msgstr "¼ì²éÔ¼Êø:" -#: describe.c:1122-#, c-format-msgid "    \"%s\" CHECK %s"-msgstr "    \"%s\" CHECK %s"--#: describe.c:1133-msgid "Foreign-key constraints:"-msgstr "Íâ¼üÔ¼Êø:"--#: describe.c:1137+#: describe.c:1169 describe.c:1184 #, c-format msgid "    \"%s\" %s" msgstr "    \"%s\" %s" -#: describe.c:1148-msgid "Rules:"-msgstr "¹æÔò:"+#: describe.c:1180+msgid "Foreign-key constraints:"+msgstr "Íâ¼üÔ¼Êø:" -#: describe.c:1167+#: describe.c:1214 msgid "Triggers:" msgstr "´¥·¢Æ÷:" -#: describe.c:1189+#: describe.c:1236 msgid "Inherits" msgstr "¼Ì³Ð" -#: describe.c:1275+#: describe.c:1250+msgid "Contains OIDs"+msgstr "Contains OIDs"++#: describe.c:1252 describe.c:1623 describe.c:1680+msgid "yes"+msgstr "yes"++#: describe.c:1252 describe.c:1624 describe.c:1678+msgid "no"+msgstr "no"++#: describe.c:1331+#, c-format+msgid "Tablespace: \"%s\""+msgstr "±í¿Õ¼ä: \"%s\""++#: describe.c:1364 msgid "User name" msgstr "Óû§Ãû" -#: describe.c:1275+#: describe.c:1364 msgid "User ID" msgstr "Óû§ ID" -#: describe.c:1276+#: describe.c:1365 msgid "superuser, create database" msgstr "³¬¼¶Óû§, ´´½¨Êý¾Ý¿â" -#: describe.c:1277+#: describe.c:1366 msgid "superuser" msgstr "³¬¼¶Óû§" -#: describe.c:1277+#: describe.c:1366 msgid "create database" msgstr "´´½¨Êý¾Ý¿â" -#: describe.c:1278+#: describe.c:1367 msgid "Attributes" msgstr "ÊôÐÔ" -#: describe.c:1291+#: describe.c:1367+msgid "Groups"+msgstr "×é"++#: describe.c:1380 msgid "List of database users" msgstr "Êý¾Ý¿âÓû§Áбí" -#: describe.c:1338+#: describe.c:1407+msgid "Group name"+msgstr "×éÃû"++#: describe.c:1407+msgid "Group ID"+msgstr "×é ID"++#: describe.c:1420+msgid "List of database groups"+msgstr "Êý¾Ý¿â×éÁбí"++#: describe.c:1467 msgid "special" msgstr "ÌØÊâ" -#: describe.c:1399+#: describe.c:1482+msgid "Table"+msgstr "±í"++#: describe.c:1528+#, c-format msgid "No matching relations found.\n" msgstr "ûÓÐÕÒµ½Æ¥ÅäµÄ¹Øϵ.\n" -#: describe.c:1401+#: describe.c:1530+#, c-format msgid "No relations found.\n" msgstr "ûÓÐÕÒµ½¹Øϵ.\n" -#: describe.c:1406+#: describe.c:1535 msgid "List of relations" msgstr "¹ØϵÁбí" -#: describe.c:1445+#: describe.c:1574 msgid "Modifier" msgstr "ÐÞ¸ÄÕß" -#: describe.c:1459+#: describe.c:1588 msgid "List of domains" msgstr "ÓòÁбí" -#: describe.c:1492+#: describe.c:1621 msgid "Source" msgstr "Source" -#: describe.c:1493+#: describe.c:1622 msgid "Destination" msgstr "Destination" -#: describe.c:1494 describe.c:1551-msgid "yes"-msgstr "yes"--#: describe.c:1495 describe.c:1549-msgid "no"-msgstr "no"--#: describe.c:1496+#: describe.c:1625 msgid "Default?" msgstr "Default?" -#: describe.c:1510+#: describe.c:1639 msgid "List of conversions" msgstr "ת»»Áбí" -#: describe.c:1545+#: describe.c:1674 msgid "Source type" msgstr "Ô´ÀàÐÍ" -#: describe.c:1546+#: describe.c:1675 msgid "Target type" msgstr "Ä¿±êÀàÐÍ" -#: describe.c:1547+#: describe.c:1676 msgid "(binary compatible)" msgstr "(¶þ½øÖƼæÈÝ)" -#: describe.c:1548+#: describe.c:1677 msgid "Function" msgstr "º¯Êý" -#: describe.c:1550+#: describe.c:1679 msgid "in assignment" msgstr "in assignment" -#: describe.c:1552+#: describe.c:1681 msgid "Implicit?" msgstr "Òþº¬µÄ?" -#: describe.c:1560+#: describe.c:1689 msgid "List of casts" msgstr "ÀàÐÍת»»Áбí" -#: describe.c:1601+#: describe.c:1739 msgid "List of schemas"-msgstr "´ó¸ÙÁбí"--#~ msgid "Asynchronous NOTIFY '%s' from backend with pid %d received.\n"-#~ msgstr "ÊÕµ½À´×Ô½ø³ÌºÅΪ %2$d µÄºó¶ËµÄÒì²½ NOTIFY (֪ͨ) '%1$s'.\n"+msgstr "ģʽÁбí" -#~ msgid "\n"-#~ msgstr "\n"+#: sql_help.h:25 sql_help.h:369+msgid "abort the current transaction"+msgstr "ÖÕÖ¹µ±Ç°ÊÂÎñ" -#~ msgid "  \\lo_export\n"-#~ msgstr "  \\lo_export\n"+#: sql_help.h:26+msgid "ABORT [ WORK | TRANSACTION ]"+msgstr "ABORT [ WORK | TRANSACTION ]" -#~ msgid "  \\lo_import\n"-#~ msgstr "  \\lo_import\n"+#: sql_help.h:29+msgid "change the definition of an aggregate function"+msgstr "¸Ä±äÒ»¸ö¾Û¼¯º¯ÊýµÄ¶¨Òå" -#~ msgid "  \\lo_list\n"-#~ msgstr "  \\lo_list\n"+#: sql_help.h:30+msgid ""+"ALTER AGGREGATE name ( type ) RENAME TO newname\n"+"ALTER AGGREGATE name ( type ) OWNER TO newowner"+msgstr ""+"ALTER AGGREGATE Ãû×Ö ( ÀàÐÍ ) RENAME TO ÐÂÃû×Ö\n"+"ALTER AGGREGATE Ãû×Ö ( ÀàÐÍ ) OWNER TO ÐÂÊôÖ÷" -#~ msgid " PRIMARY KEY"-#~ msgstr " PRIMARY KEY"+#: sql_help.h:33+msgid "change the definition of a conversion"+msgstr "¸Ä±äÒ»¸öת»»µÄ¶¨Òå" -#~ msgid " UNIQUE"-#~ msgstr " UNIQUE"+#: sql_help.h:34+msgid ""+"ALTER CONVERSION name RENAME TO newname\n"+"ALTER CONVERSION name OWNER TO newowner"+msgstr ""+"ALTER CONVERSION Ãû×Ö RENAME TO ÐÂÃû×Ö\n"+"ALTER CONVERSION Ãû×Ö OWNER TO ÐÂÊôÖ÷" -#~ msgid "BINARY"-#~ msgstr "BINARY"+#: sql_help.h:37+msgid "change a database"+msgstr "¸Ä±äÒ»¸öÊý¾Ý¿â" -#~ msgid "Warning: Your transaction in progress has been committed."-#~ msgstr "¾¯¸æ: ÄãµÄÕýÔÚ´¦ÀíµÄÊÂÎñÒѾ­Ìá½»."+#: sql_help.h:38+msgid ""+"ALTER DATABASE name SET parameter { TO | = } { value | DEFAULT }\n"+"ALTER DATABASE name RESET parameter\n"+"\n"+"ALTER DATABASE name RENAME TO newname\n"+"\n"+"ALTER DATABASE name OWNER TO new_owner"+msgstr ""+"ALTER DATABASE Ãû×Ö SET ²ÎÊý { TO | = } { Öµ | DEFAULT }\n"+"ALTER DATABASE Ãû×Ö RESET ²ÎÊý\n"+"\n"+"ALTER DATABASE Ãû×Ö RENAME TO ÐÂÃû×Ö\n"+"\n"+"ALTER DATABASE Ãû×Ö OWNER TO ÐÂÊôÖ÷" -#~ msgid "Warning: Your transaction in progress has been rolled back."-#~ msgstr "¾¯¸æ: ÄãµÄÕýÔÚ´¦ÀíµÄÊÂÎñÒѾ­»Ø¾í."+#: sql_help.h:41+msgid "change the definition of a domain"+msgstr "¸Ä±äÒ»¸öÓòµÄ¶¨Òå" -#~ msgid "\\lo_import: not connected to a database\n"-#~ msgstr "\\lo_import: δÓëÊý¾Ý¿âÁª½Ó\n"+#: sql_help.h:42+msgid ""+"ALTER DOMAIN name\n"+"    { SET DEFAULT expression | DROP DEFAULT }\n"+"ALTER DOMAIN name\n"+"    { SET | DROP } NOT NULL\n"+"ALTER DOMAIN name\n"+"    ADD domain_constraint\n"+"ALTER DOMAIN name\n"+"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"+"ALTER DOMAIN name\n"+"    OWNER TO new_owner"+msgstr ""+"ALTER DOMAIN Ãû×Ö\n"+"    { SET DEFAULT ˵Ã÷ | DROP DEFAULT }\n"+"ALTER DOMAIN Ãû×Ö\n"+"    { SET | DROP } NOT NULL\n"+"ALTER DOMAIN Ãû×Ö\n"+"    ADD ÓòÔ¼Êø\n"+"ALTER DOMAIN Ãû×Ö\n"+"    DROP CONSTRAINT Ô¼ÊøÃû×Ö [ RESTRICT | CASCADE ]\n"+"ALTER DOMAIN Ãû×Ö\n"+"    OWNER TO ÐÂËÞÖ÷"++#: sql_help.h:45+msgid "change the definition of a function"+msgstr "¸Ä±äÒ»¸öº¯ÊýµÄ¶¨Òå"++#: sql_help.h:46+msgid ""+"ALTER FUNCTION name ( [ type [, ...] ] ) RENAME TO newname\n"+"ALTER FUNCTION name ( [ type [, ...] ] ) OWNER TO newowner"+msgstr ""+"ALTER FUNCTION Ãû×Ö ( [ ÀàÐÍ [, ...] ] ) RENAME TO ÐÂÃû×Ö\n"+"ALTER FUNCTION Ãû×Ö ( [ ÀàÐÍ [, ...] ] ) OWNER TO ÐÂÊôÖ÷" -#~ msgid "\\lo_unlink: not connected to a database\n"-#~ msgstr "\\lo_unlink: δÓëÊý¾Ý¿âÁª½Ó\n"+#: sql_help.h:49+msgid "change a user group"+msgstr "¸Ä±äÒ»¸öÓû§×é" -#~ msgid "%s: \"%s\" %s"-#~ msgstr "%s: \"%s\" %s"+#: sql_help.h:50+msgid ""+"ALTER GROUP groupname ADD USER username [, ... ]\n"+"ALTER GROUP groupname DROP USER username [, ... ]\n"+"\n"+"ALTER GROUP groupname RENAME TO newname"+msgstr ""+"ALTER GROUP ×éÃû ADD USER Óû§Ãû [, ... ]\n"+"ALTER GROUP ×éÃû DROP USER Óû§Ãû [, ... ]\n"+"\n"+"ALTER GROUP ×éÃû RENAME TO ÐÂÃû×Ö" -#~ msgid "%s: %s %s"-#~ msgstr "%s: %s %s"+#: sql_help.h:53+msgid "change the definition of a procedural language"+msgstr "¸Ä±äÒ»¸ö¹ý³ÌÓïÑԵĶ¨Òå" -#~ msgid "%*s  %s %s"-#~ msgstr "%*s  %s %s"+#: sql_help.h:54+msgid "ALTER LANGUAGE name RENAME TO newname"+msgstr "ALTER LANGUAGE Ãû×Ö RENAME TO ÐÂÃû×Ö" -#~ msgid "Timing is on."-#~ msgstr "¿ªÊ¼¼Æʱ."+#: sql_help.h:57+msgid "change the definition of an operator class"+msgstr "¸Ä±äÒ»¸ö²Ù×÷·û±íµÄ¶¨Òå" -#~ msgid "Timing is off."-#~ msgstr "½áÊø¼Æʱ."+#: sql_help.h:58+msgid ""+"ALTER OPERATOR CLASS name USING index_method RENAME TO newname\n"+"ALTER OPERATOR CLASS name USING index_method OWNER TO newowner"+msgstr ""+"ALTER OPERATOR CLASS Ãû×Ö USING Ë÷Òý·½·¨ RENAME TO ÐÂÃû×Ö\n"+"ALTER OPERATOR CLASS Ãû×Ö USING Ë÷Òý·½·¨ OWNER TO ÐÂÊôÖ÷" -#~ msgid "Using pager is on."-#~ msgstr "´ò¿ª·ÖÒ³Æ÷µÄʹÓÃ."+#: sql_help.h:61+msgid "change the definition of an operator"+msgstr "¸Ä±äÒ»¸ö²Ù×÷·ûµÄ¶¨Òå" -#~ msgid "Options:"-#~ msgstr "Ñ¡Ïî:"+#: sql_help.h:62+msgid ""+"ALTER OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) OWNER TO "+"newowner"+msgstr ""+"ALTER OPERATOR Ãû×Ö ( { ×ó±ßÀàÐÍ | NONE } , { ÓÒ±ßÀàÐÍ | NONE } ) OWNER TO ÐÂ"+"ÊôÖ÷" -#~ msgid ""-#~ "%s was compiled without support for long options.\n"-#~ "Use --help for help on invocation options.\n"-#~ msgstr ""-#~ "%s ûÓдø×ų¤Ñ¡ÏîÖ§³Ö±àÒë.\n"-#~ "Óà --help »ñÈ¡¹ØÓÚµ÷ÓÃÑ¡ÏîµÄ°ïÖú.\n"+#: sql_help.h:65+msgid "change the definition of a schema"+msgstr "¸Ä±äÒ»¸öģʽµÄ¶¨Òå" -#~ msgid ""-#~ "Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group\n"-#~ "Portions Copyright (c) 1996, Regents of the University of California\n"-#~ "Read the file COPYRIGHT or use the command \\copyright to see the\n"-#~ "usage and distribution terms."-#~ msgstr ""-#~ "²¿·Ö°æȨ (c) 1996-2002, PostgreSQL È«Çò¿ª·¢×é\n"-#~ "²¿·Ö°æȨ (c) 1996, University of California ÀíÊÂ\n"-#~ "ÔĶÁ COPYRIGHT »òÕßʹÓà \\copyright ÃüÁî²é¿´\n"-#~ "Ó÷¨ºÍ·¢²¼Ìõ¿î."+#: sql_help.h:66+msgid ""+"ALTER SCHEMA name RENAME TO newname\n"+"ALTER SCHEMA name OWNER TO newowner"+msgstr ""+"ALTER SCHEMA Ãû×Ö RENAME TO ÐÂÃû×Ö\n"+"ALTER SCHEMA Ãû×Ö OWNER TO ÐÂÊôÖ÷" -#~ msgid "  psql [options] [dbname [username]]\n"-#~ msgstr " psql [Ñ¡Ïî] [Êý¾Ý¿âÃû [Óû§Ãû]]\n"+#: sql_help.h:69+msgid "alter the definition of a sequence generator"+msgstr "¸Ä±äÒ»¸öÐòÁеĶ¨Òå" -#~ msgid " \\d{t|i|s|v|S} [PATTERN] (add '+' for more detail)\n"-#~ msgstr " \\d{t|i|s|v|S} [ģʽ] (¼Ó '+' »ñÈ¡¸ü¶àµÄÐÅÏ¢)\n"+#: sql_help.h:70+msgid ""+"ALTER SEQUENCE name [ INCREMENT [ BY ] increment ]\n"+"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"+"    [ RESTART [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]"+msgstr ""+"ALTER SEQUENCE Ãû×Ö [ INCREMENT [ BY ] µÝÔö ]\n"+"    [ MINVALUE ×îСֵ | NO MINVALUE ] [ MAXVALUE ×î´óÖµ | NO MAXVALUE ]\n"+"    [ RESTART [ WITH ] ¿ªÊ¼ ] [ CACHE »º´æ ] [ [ NO ] CYCLE ]" -#~ msgid "\\%s: multibyte support is not enabled\n"-#~ msgstr "\\%s: ¶à×Ö½ÚÖ§³Öδ´ò¿ª\n"+#: sql_help.h:73+msgid "change the definition of a table"+msgstr "¸Ä±äÒ»¸ö±íµÄ¶¨Òå" -#~ msgid ""-#~ " \\d{p|S|l}      list access privileges, system tables, or large objects\n"-#~ msgstr " \\d{p|S|l}      Áгö·ÃÎÊȨÏÞ, ϵͳ±í, »òÕß´ó¶ÔÏó\n"+#: sql_help.h:74+msgid ""+"ALTER TABLE [ ONLY ] name [ * ]\n"+"    action [, ... ]\n"+"ALTER TABLE [ ONLY ] name [ * ]\n"+"    RENAME [ COLUMN ] column TO new_column\n"+"ALTER TABLE name\n"+"    RENAME TO new_name\n"+"\n"+"where action is one of:\n"+"\n"+"    ADD [ COLUMN ] column type [ column_constraint [ ... ] ]\n"+"    DROP [ COLUMN ] column [ RESTRICT | CASCADE ]\n"+"    ALTER [ COLUMN ] column TYPE type [ USING expression ]\n"+"    ALTER [ COLUMN ] column SET DEFAULT expression\n"+"    ALTER [ COLUMN ] column DROP DEFAULT\n"+"    ALTER [ COLUMN ] column { SET | DROP } NOT NULL\n"+"    ALTER [ COLUMN ] column SET STATISTICS integer\n"+"    ALTER [ COLUMN ] column SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "+"MAIN }\n"+"    ADD table_constraint\n"+"    DROP CONSTRAINT constraint_name [ RESTRICT | CASCADE ]\n"+"    CLUSTER ON index_name\n"+"    SET WITHOUT CLUSTER\n"+"    SET WITHOUT OIDS\n"+"    OWNER TO new_owner\n"+"    SET TABLESPACE tablespace_name"+msgstr ""+"ALTER TABLE [ ONLY ] ±íÃû [ * ]\n"+"    action [, ... ]\n"+"ALTER TABLE [ ONLY ] ±íÃû [ * ]\n"+"    RENAME [ COLUMN ] ×Ö¶ÎÃû TO ÐÂ×Ö¶ÎÃû\n"+"ALTER TABLE ±íÃû\n"+"    RENAME TO бíÃû\n"+"\n"+"action ΪÏÂÃæµÄÒ»ÖÖ:\n"+"\n"+"    ADD [ COLUMN ] ×Ö¶ÎÃû ÀàÐÍ [ ×Ö¶ÎÔ¼Êø [ ... ] ]\n"+"    DROP [ COLUMN ] ×Ö¶ÎÃû [ RESTRICT | CASCADE ]\n"+"    ALTER [ COLUMN ] ×Ö¶ÎÃû TYPE ÀàÐÍ [ USING ±í´ïʽ ]\n"+"    ALTER [ COLUMN ] ×Ö¶ÎÃû SET DEFAULT ±í´ïʽ\n"+"    ALTER [ COLUMN ] ×Ö¶ÎÃû DROP DEFAULT\n"+"    ALTER [ COLUMN ] ×Ö¶ÎÃû { SET | DROP } NOT NULL\n"+"    ALTER [ COLUMN ] ×Ö¶ÎÃû SET STATISTICS integer\n"+"    ALTER [ COLUMN ] ×Ö¶ÎÃû SET STORAGE { PLAIN | EXTERNAL | EXTENDED | "+"MAIN }\n"+"    ADD ±íÔ¼Êø\n"+"    DROP CONSTRAINT Ô¼ÊøÃû×Ö [ RESTRICT | CASCADE ]\n"+"    CLUSTER ON Ë÷ÒýÃû³Æ\n"+"    SET WITHOUT CLUSTER\n"+"    SET WITHOUT OIDS\n"+"    OWNER TO ÐÂÊôÖ÷\n"+"    SET TABLESPACE ±í¿Õ¼äÃû×Ö"++#: sql_help.h:77+msgid "change the definition of a tablespace"+msgstr "¸Ä±äÒ»¸ö±í¿Õ¼äµÄ¶¨Òå"++#: sql_help.h:78+msgid ""+"ALTER TABLESPACE name RENAME TO newname\n"+"ALTER TABLESPACE name OWNER TO newowner"+msgstr ""+"ALTER TABLESPACE Ãû×Ö RENAME TO ÐÂÃû×Ö\n"+"ALTER TABLESPACE Ãû×Ö OWNER TO ÐÂÊôÖ÷" -#~ msgid ""-#~ " \\dd NAME       show comment for table, type, function, or operator\n"-#~ msgstr " \\dd Ãû×Ö      ÏÔʾ±í, ÀàÐÍ, º¯Êý, »òÕß²Ù×÷·ûµÄ×¢ÊÍ\n"+#: sql_help.h:81+msgid "change the definition of a trigger"+msgstr "¸Ä±äÒ»¸ö´¥·¢Æ÷µÄ¶¨Òå" -#~ msgid " \\dT            list data types\n"-#~ msgstr " \\dT           ÁгöÊý¾ÝÀàÐÍ\n"+#: sql_help.h:82+msgid "ALTER TRIGGER name ON table RENAME TO newname"+msgstr "ALTER TRIGGER Ãû×Ö ON ±í RENAME TO ÐÂÃû×Ö" -#~ msgid "history"-#~ msgstr "ÀúÊ·"+#: sql_help.h:85+msgid "change the definition of a type"+msgstr "¸Ä±äÒ»¸öÀàÐ͵Ķ¨Òå" -#~ msgid "multibyte"-#~ msgstr "¶à×Ö½Ú"+#: sql_help.h:86+msgid "ALTER TYPE name OWNER TO new_owner"+msgstr "ALTER TYPE Ãû×Ö OWNER TO ÐÂÊôÖ÷" -#~ msgid "Index predicate: %s"-#~ msgstr "Ë÷Òýν´Ê: %s"+#: sql_help.h:89+msgid "change a database user account"+msgstr "¸Ä±äÒ»¸öÊý¾Ý¿âÓû§" -#~ msgid "Unique keys"-#~ msgstr "Ψһ¼ü×Ö"+#: sql_help.h:90+msgid ""+"ALTER USER name [ [ WITH ] option [ ... ] ]\n"+"\n"+"where option can be:\n"+"\n"+"    [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password' \n"+"    | CREATEDB | NOCREATEDB\n"+"    | CREATEUSER | NOCREATEUSER \n"+"    | VALID UNTIL 'abstime'\n"+"\n"+"ALTER USER name RENAME TO newname\n"+"\n"+"ALTER USER name SET parameter { TO | = } { value | DEFAULT }\n"+"ALTER USER name RESET parameter"+msgstr ""+"ALTER USER Ãû×Ö [ [ WITH ] Ñ¡Ïî [ ... ] ]\n"+"\n"+"Ñ¡Ïî¿ÉÒÔÊÇ:\n"+"\n"+"    [ ENCRYPTED | UNENCRYPTED ] PASSWORD '¿ÚÁî' \n"+"    | CREATEDB | NOCREATEDB\n"+"    | CREATEUSER | NOCREATEUSER \n"+"    | VALID UNTIL 'ʱ¼ä'\n"+"\n"+"ALTER USER Ãû×Ö RENAME TO ÐÂÃû×Ö\n"+"\n"+"ALTER USER Ãû×Ö SET ²ÎÊý { TO | = } { Öµ | DEFAULT }\n"+"ALTER USER Ãû×Ö RESET ²ÎÊý"++#: sql_help.h:93+msgid "collect statistics about a database"+msgstr "ÊÕ¼¯¹ØÓÚÊý¾Ý¿âµÄͳ¼ÆÊý×Ö"++#: sql_help.h:94+msgid "ANALYZE [ VERBOSE ] [ table [ (column [, ...] ) ] ]"+msgstr "ANALYZE [ VERBOSE ] [ ±í [ (×ֶΠ[, ...] ) ] ]"++#: sql_help.h:97 sql_help.h:409+msgid "start a transaction block"+msgstr "¿ªÊ¼Ò»¸öÊÂÎñ¿é"++#: sql_help.h:98+msgid ""+"BEGIN [ WORK | TRANSACTION ]\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]"+msgstr ""+"BEGIN [ WORK | TRANSACTION ]\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]"++#: sql_help.h:101+msgid "force a transaction log checkpoint"+msgstr "Ç¿Ðн»Ò×ÈÕÖ¾¼ì²é"++#: sql_help.h:102+msgid "CHECKPOINT"+msgstr "CHECKPOINT"++#: sql_help.h:105+msgid "close a cursor"+msgstr "¹Ø±ÕÒ»¸öÓαê"++#: sql_help.h:106+msgid "CLOSE name"+msgstr "CLOSE Ãû×Ö"++#: sql_help.h:109+msgid "cluster a table according to an index"+msgstr "¸ù¾ÝÒ»¸öË÷Òý½¨±í´Ø"++#: sql_help.h:110+msgid ""+"CLUSTER indexname ON tablename\n"+"CLUSTER tablename\n"+"CLUSTER"+msgstr ""+"CLUSTER Ë÷ÒýÃû×Ö ON ±íÃû\n"+"CLUSTER ±íÃû\n"+"CLUSTER"++#: sql_help.h:113+msgid "define or change the comment of an object"+msgstr "¶¨Òå»ò¸Ä±äÒ»¸ö¶ÔÏóµÄÆÀ×¢"++#: sql_help.h:114+msgid ""+"COMMENT ON\n"+"{\n"+"  TABLE object_name |\n"+"  COLUMN table_name.column_name |\n"+"  AGGREGATE agg_name (agg_type) |\n"+"  CAST (sourcetype AS targettype) |\n"+"  CONSTRAINT constraint_name ON table_name |\n"+"  CONVERSION object_name |\n"+"  DATABASE object_name |\n"+"  DOMAIN object_name |\n"+"  FUNCTION func_name (arg1_type, arg2_type, ...) |\n"+"  INDEX object_name |\n"+"  LARGE OBJECT large_object_oid |\n"+"  OPERATOR op (leftoperand_type, rightoperand_type) |\n"+"  OPERATOR CLASS object_name USING index_method |\n"+"  [ PROCEDURAL ] LANGUAGE object_name |\n"+"  RULE rule_name ON table_name |\n"+"  SCHEMA object_name |\n"+"  SEQUENCE object_name |\n"+"  TRIGGER trigger_name ON table_name |\n"+"  TYPE object_name |\n"+"  VIEW object_name\n"+"} IS 'text'"+msgstr ""+"COMMENT ON\n"+"{\n"+"  TABLE object_name |\n"+"  COLUMN table_name.column_name |\n"+"  AGGREGATE agg_name (agg_type) |\n"+"  CAST (sourcetype AS targettype) |\n"+"  CONSTRAINT constraint_name ON table_name |\n"+"  CONVERSION object_name |\n"+"  DATABASE object_name |\n"+"  DOMAIN object_name |\n"+"  FUNCTION func_name (arg1_type, arg2_type, ...) |\n"+"  INDEX object_name |\n"+"  LARGE OBJECT large_object_oid |\n"+"  OPERATOR op (leftoperand_type, rightoperand_type) |\n"+"  OPERATOR CLASS object_name USING index_method |\n"+"  [ PROCEDURAL ] LANGUAGE object_name |\n"+"  RULE rule_name ON table_name |\n"+"  SCHEMA object_name |\n"+"  SEQUENCE object_name |\n"+"  TRIGGER trigger_name ON table_name |\n"+"  TYPE object_name |\n"+"  VIEW object_name\n"+"} IS 'text'"++#: sql_help.h:117 sql_help.h:305+msgid "commit the current transaction"+msgstr "Ìá½»µ±Ç°ÊÂÎñ"++#: sql_help.h:118+msgid "COMMIT [ WORK | TRANSACTION ]"+msgstr "COMMIT [ WORK | TRANSACTION ]"++#: sql_help.h:121+msgid "copy data between a file and a table"+msgstr "ÔÚÒ»¸öÎļþºÍÒ»¸ö±íÖ®¼ä¿½±´Êý¾Ý"++#: sql_help.h:122+msgid ""+"COPY tablename [ ( column [, ...] ) ]\n"+"    FROM { 'filename' | STDIN }\n"+"    [ [ WITH ] \n"+"          [ BINARY ] \n"+"          [ OIDS ]\n"+"          [ DELIMITER [ AS ] 'delimiter' ]\n"+"          [ NULL [ AS ] 'null string' ]\n"+"          [ CSV [ QUOTE [ AS ] 'quote' ] \n"+"                [ ESCAPE [ AS ] 'escape' ]\n"+"                [ FORCE NOT NULL column [, ...] ]\n"+"\n"+"COPY tablename [ ( column [, ...] ) ]\n"+"    TO { 'filename' | STDOUT }\n"+"    [ [ WITH ] \n"+"          [ BINARY ]\n"+"          [ OIDS ]\n"+"          [ DELIMITER [ AS ] 'delimiter' ]\n"+"          [ NULL [ AS ] 'null string' ]\n"+"          [ CSV [ QUOTE [ AS ] 'quote' ] \n"+"                [ ESCAPE [ AS ] 'escape' ]\n"+"                [ FORCE QUOTE column [, ...] ]"+msgstr ""+"COPY ±íÃû [ ( ×ֶΠ[, ...] ) ]\n"+"    FROM { 'ÎļþÃû' | STDIN }\n"+"    [ [ WITH ] \n"+"          [ BINARY ] \n"+"          [ OIDS ]\n"+"          [ DELIMITER [ AS ] 'delimiter' ]\n"+"          [ NULL [ AS ] 'null string' ]\n"+"          [ CSV [ QUOTE [ AS ] 'quote' ] \n"+"                [ ESCAPE [ AS ] 'escape' ]\n"+"                [ FORCE NOT NULL column [, ...] ]\n"+"\n"+"COPY ±íÃû [ ( ×ֶΠ[, ...] ) ]\n"+"    TO { 'ÎļþÃû' | STDOUT }\n"+"    [ [ WITH ] \n"+"          [ BINARY ]\n"+"          [ OIDS ]\n"+"          [ DELIMITER [ AS ] 'delimiter' ]\n"+"          [ NULL [ AS ] 'null string' ]\n"+"          [ CSV [ QUOTE [ AS ] 'quote' ] \n"+"                [ ESCAPE [ AS ] 'escape' ]\n"+"                [ FORCE QUOTE column [, ...] ]"++#: sql_help.h:125+msgid "define a new aggregate function"+msgstr "¶¨ÒåÒ»¸öеľۼ¯º¯Êý"++#: sql_help.h:126+msgid ""+"CREATE AGGREGATE name (\n"+"    BASETYPE = input_data_type,\n"+"    SFUNC = sfunc,\n"+"    STYPE = state_data_type\n"+"    [ , FINALFUNC = ffunc ]\n"+"    [ , INITCOND = initial_condition ]\n"+")"+msgstr ""+"CREATE AGGREGATE name (\n"+"    BASETYPE = input_data_type,\n"+"    SFUNC = sfunc,\n"+"    STYPE = state_data_type\n"+"    [ , FINALFUNC = ffunc ]\n"+"    [ , INITCOND = initial_condition ]\n"+")"++#: sql_help.h:129+msgid "define a new cast"+msgstr "¶¨ÒåÒ»¸öеÄÀàÐÍת»»"++#: sql_help.h:130+msgid ""+"CREATE CAST (sourcetype AS targettype)\n"+"    WITH FUNCTION funcname (argtypes)\n"+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"+"\n"+"CREATE CAST (sourcetype AS targettype)\n"+"    WITHOUT FUNCTION\n"+"    [ AS ASSIGNMENT | AS IMPLICIT ]"+msgstr ""+"CREATE CAST (Ô´ÀàÐÍ AS Ä¿±êÀàÐÍ)\n"+"    WITH FUNCTION º¯ÊýÃû (²ÎÊýÀàÐÍ)\n"+"    [ AS ASSIGNMENT | AS IMPLICIT ]\n"+"\n"+"CREATE CAST (Ô´ÀàÐÍ AS Ä¿±êÀàÐÍ)\n"+"    WITHOUT FUNCTION\n"+"    [ AS ASSIGNMENT | AS IMPLICIT ]"++#: sql_help.h:133+msgid "define a new constraint trigger"+msgstr "¶¨ÒåÒ»¸öеÄÔ¼Êø´¥·¢Æ÷"++#: sql_help.h:134+msgid ""+"CREATE CONSTRAINT TRIGGER name\n"+"    AFTER events ON\n"+"    tablename constraint attributes\n"+"    FOR EACH ROW EXECUTE PROCEDURE funcname ( args )"+msgstr ""+"CREATE CONSTRAINT TRIGGER name\n"+"    AFTER events ON\n"+"    tablename constraint attributes\n"+"    FOR EACH ROW EXECUTE PROCEDURE funcname ( args )"++#: sql_help.h:137+msgid "define a new conversion"+msgstr "¶¨ÒåÒ»¸öеÄת»»"++#: sql_help.h:138+msgid ""+"CREATE [DEFAULT] CONVERSION name\n"+"    FOR source_encoding TO dest_encoding FROM funcname"+msgstr ""+"CREATE [DEFAULT] CONVERSION Ãû×Ö\n"+"    FOR Ô´±àÂë TO Ä¿±ê±àÂë FROM º¯ÊýÃû"++#: sql_help.h:141+msgid "create a new database"+msgstr "´´½¨Ò»¸öеÄÊý¾Ý¿â"++#: sql_help.h:142+msgid ""+"CREATE DATABASE name\n"+"    [ [ WITH ] [ OWNER [=] dbowner ]\n"+"           [ TEMPLATE [=] template ]\n"+"           [ ENCODING [=] encoding ]\n"+"           [ TABLESPACE [=] tablespace ] ]"+msgstr ""+"CREATE DATABASE Êý¾Ý¿âÃû³Æ\n"+"    [ [ WITH ] [ OWNER [=] Êý¾Ý¿âÊôÖ÷ ]\n"+"           [ TEMPLATE [=] Ä£°å ]\n"+"           [ ENCODING [=] ±àÂë ]\n"+"           [ TABLESPACE [=] ±í¿Õ¼ä ] ]"++#: sql_help.h:145+msgid "define a new domain"+msgstr "¶¨ÒåÒ»¸öеÄÓò"++#: sql_help.h:146+msgid ""+"CREATE DOMAIN name [AS] data_type\n"+"    [ DEFAULT expression ]\n"+"    [ constraint [ ... ] ]\n"+"\n"+"where constraint is:\n"+"\n"+"[ CONSTRAINT constraint_name ]\n"+"{ NOT NULL | NULL | CHECK (expression) }"+msgstr ""+"CREATE DOMAIN name [AS] data_type\n"+"    [ DEFAULT expression ]\n"+"    [ constraint [ ... ] ]\n"+"\n"+"constraint ÊÇ:\n"+"\n"+"[ CONSTRAINT constraint_name ]\n"+"{ NOT NULL | NULL | CHECK (expression) }"++#: sql_help.h:149+msgid "define a new function"+msgstr "¶¨ÒåÒ»¸öеĺ¯Êý"++#: sql_help.h:150+msgid ""+"CREATE [ OR REPLACE ] FUNCTION name ( [ [ argname ] argtype [, ...] ] )\n"+"    RETURNS rettype\n"+"  { LANGUAGE langname\n"+"    | IMMUTABLE | STABLE | VOLATILE\n"+"    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"+"    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"+"    | AS 'definition'\n"+"    | AS 'obj_file', 'link_symbol'\n"+"  } ...\n"+"    [ WITH ( attribute [, ...] ) ]"+msgstr ""+"CREATE [ OR REPLACE ] FUNCTION Ãû×Ö ( [ [ ²ÎÊýÃû×Ö ] ²ÎÊýÀàÐÍ [, ...] ] )\n"+"    RETURNS ·µ»ØÀàÐÍ\n"+"  { LANGUAGE ÓïÑÔÃû³Æ\n"+"    | IMMUTABLE | STABLE | VOLATILE\n"+"    | CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT\n"+"    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER\n"+"    | AS 'definition'\n"+"    | AS 'obj_file', 'link_symbol'\n"+"  } ...\n"+"    [ WITH ( attribute [, ...] ) ]"++#: sql_help.h:153+msgid "define a new user group"+msgstr "¶¨ÒåÒ»¸öеÄÓû§×é"++#: sql_help.h:154+msgid ""+"CREATE GROUP name [ [ WITH ] option [ ... ] ]\n"+"\n"+"where option can be:\n"+"\n"+"     SYSID gid\n"+"   | USER  username [, ...]"+msgstr ""+"CREATE GROUP ×éÃû [ [ WITH ] option [ ... ] ]\n"+"\n"+"option ¿ÉÒÔΪ:\n"+"\n"+"     SYSID gid\n"+"   | USER  username [, ...]"++#: sql_help.h:157+msgid "define a new index"+msgstr "¶¨ÒåÒ»¸öеÄË÷Òý"++#: sql_help.h:158+msgid ""+"CREATE [ UNIQUE ] INDEX name ON table [ USING method ]\n"+"    ( { column | ( expression ) } [ opclass ] [, ...] )\n"+"    [ TABLESPACE tablespace ]\n"+"    [ WHERE predicate ]"+msgstr ""+"CREATE [ UNIQUE ] INDEX Ë÷ÒýÃû³Æ ON ±íÃû [ USING method ]\n"+"    ( { column | ( expression ) } [ opclass ] [, ...] )\n"+"    [ TABLESPACE tablespace ]\n"+"    [ WHERE predicate ]"++#: sql_help.h:161+msgid "define a new procedural language"+msgstr "¶¨ÒåÒ»¸öеĹý³ÌÓïÑÔ"++#: sql_help.h:162+msgid ""+"CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"+"    HANDLER call_handler [ VALIDATOR valfunction ]"+msgstr ""+"CREATE [ TRUSTED ] [ PROCEDURAL ] LANGUAGE name\n"+"    HANDLER call_handler [ VALIDATOR valfunction ]"++#: sql_help.h:165+msgid "define a new operator class"+msgstr "¶¨ÒåÒ»¸öеIJÙ×÷·ûÀà"++#: sql_help.h:166+msgid ""+"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type USING index_method "+"AS\n"+"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ] "+"[ RECHECK ]\n"+"   | FUNCTION support_number funcname ( argument_type [, ...] )\n"+"   | STORAGE storage_type\n"+"  } [, ... ]"+msgstr ""+"CREATE OPERATOR CLASS name [ DEFAULT ] FOR TYPE data_type USING index_method "+"AS\n"+"  {  OPERATOR strategy_number operator_name [ ( op_type, op_type ) ] "+"[ RECHECK ]\n"+"   | FUNCTION support_number funcname ( argument_type [, ...] )\n"+"   | STORAGE storage_type\n"+"  } [, ... ]"++#: sql_help.h:169+msgid "define a new operator"+msgstr "¶¨ÒåÒ»¸öеIJÙ×÷·û"++#: sql_help.h:170+msgid ""+"CREATE OPERATOR name (\n"+"    PROCEDURE = funcname\n"+"    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"+"    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"+"    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"+"    [, HASHES ] [, MERGES ]\n"+"    [, SORT1 = left_sort_op ] [, SORT2 = right_sort_op ]\n"+"    [, LTCMP = less_than_op ] [, GTCMP = greater_than_op ]\n"+")"+msgstr ""+"CREATE OPERATOR name (\n"+"    PROCEDURE = funcname\n"+"    [, LEFTARG = lefttype ] [, RIGHTARG = righttype ]\n"+"    [, COMMUTATOR = com_op ] [, NEGATOR = neg_op ]\n"+"    [, RESTRICT = res_proc ] [, JOIN = join_proc ]\n"+"    [, HASHES ] [, MERGES ]\n"+"    [, SORT1 = left_sort_op ] [, SORT2 = right_sort_op ]\n"+"    [, LTCMP = less_than_op ] [, GTCMP = greater_than_op ]\n"+")"++#: sql_help.h:173+msgid "define a new rewrite rule"+msgstr "¶¨ÒåÒ»¸öеÄÖØд¹æÔò"++#: sql_help.h:174+msgid ""+"CREATE [ OR REPLACE ] RULE name AS ON event\n"+"    TO table [ WHERE condition ]\n"+"    DO [ ALSO | INSTEAD ] { NOTHING | command | ( command ; command ... ) }"+msgstr ""+"CREATE [ OR REPLACE ] RULE Ãû×Ö AS ON ʼþ\n"+"    TO ±í [ WHERE Ìõ¼þ ]\n"+"    DO [ ALSO | INSTEAD ] { NOTHING | ÃüÁî | ( ÃüÁî ; ÃüÁî ... ) }"++#: sql_help.h:177+msgid "define a new schema"+msgstr "¶¨ÒåÒ»¸öеÄģʽ"++#: sql_help.h:178+msgid ""+"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ TABLESPACE "+"tablespace ] [ schema_element [ ... ] ]\n"+"CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] "+"[ schema_element [ ... ] ]"+msgstr ""+"CREATE SCHEMA schemaname [ AUTHORIZATION username ] [ TABLESPACE "+"tablespace ] [ schema_element [ ... ] ]\n"+"CREATE SCHEMA AUTHORIZATION username [ TABLESPACE tablespace ] "+"[ schema_element [ ... ] ]"++#: sql_help.h:181+msgid "define a new sequence generator"+msgstr "¶¨ÒåÒ»¸öеÄÐòÁÐÉú³ÉÆ÷"++#: sql_help.h:182+msgid ""+"CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"+"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"+"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]"+msgstr ""+"CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"+"    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO MAXVALUE ]\n"+"    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]"++#: sql_help.h:185+msgid "define a new table"+msgstr "¶¨ÒåÒ»¸öеıí"++#: sql_help.h:186+msgid ""+"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (\n"+"  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "+"[ ... ] ]\n"+"    | table_constraint\n"+"    | LIKE parent_table [ { INCLUDING | EXCLUDING } DEFAULTS ] }  [, ... ]\n"+")\n"+"[ INHERITS ( parent_table [, ... ] ) ]\n"+"[ WITH OIDS | WITHOUT OIDS ]\n"+"[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"+"[ TABLESPACE tablespace ]\n"+"\n"+"where column_constraint is:\n"+"\n"+"[ CONSTRAINT constraint_name ]\n"+"{ NOT NULL | \n"+"  NULL | \n"+"  UNIQUE [ USING INDEX TABLESPACE tablespace ] |\n"+"  PRIMARY KEY [ USING INDEX TABLESPACE tablespace ] |\n"+"  CHECK (expression) |\n"+"  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH "+"SIMPLE ]\n"+"    [ ON DELETE action ] [ ON UPDATE action ] }\n"+"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "+"IMMEDIATE ]\n"+"\n"+"and table_constraint is:\n"+"\n"+"[ CONSTRAINT constraint_name ]\n"+"{ UNIQUE ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] |\n"+"  PRIMARY KEY ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] "+"|\n"+"  CHECK ( expression ) |\n"+"  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "+"[, ... ] ) ]\n"+"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON "+"UPDATE action ] }\n"+"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]"+msgstr ""+"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name (\n"+"  { column_name data_type [ DEFAULT default_expr ] [ column_constraint "+"[ ... ] ]\n"+"    | table_constraint\n"+"    | LIKE parent_table [ { INCLUDING | EXCLUDING } DEFAULTS ] }  [, ... ]\n"+")\n"+"[ INHERITS ( parent_table [, ... ] ) ]\n"+"[ WITH OIDS | WITHOUT OIDS ]\n"+"[ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]\n"+"[ TABLESPACE tablespace ]\n"+"\n"+"where column_constraint is:\n"+"\n"+"[ CONSTRAINT constraint_name ]\n"+"{ NOT NULL | \n"+"  NULL | \n"+"  UNIQUE [ USING INDEX TABLESPACE tablespace ] |\n"+"  PRIMARY KEY [ USING INDEX TABLESPACE tablespace ] |\n"+"  CHECK (expression) |\n"+"  REFERENCES reftable [ ( refcolumn ) ] [ MATCH FULL | MATCH PARTIAL | MATCH "+"SIMPLE ]\n"+"    [ ON DELETE action ] [ ON UPDATE action ] }\n"+"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY "+"IMMEDIATE ]\n"+"\n"+"and table_constraint is:\n"+"\n"+"[ CONSTRAINT constraint_name ]\n"+"{ UNIQUE ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] |\n"+"  PRIMARY KEY ( column_name [, ... ] ) [ USING INDEX TABLESPACE tablespace ] "+"|\n"+"  CHECK ( expression ) |\n"+"  FOREIGN KEY ( column_name [, ... ] ) REFERENCES reftable [ ( refcolumn "+"[, ... ] ) ]\n"+"    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE action ] [ ON "+"UPDATE action ] }\n"+"[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]"++#: sql_help.h:189 sql_help.h:385+msgid "create a new table from the results of a query"+msgstr "ÒÔÒ»¸ö²éѯµÄ½á¹û´´½¨Ò»¸öеıí"++#: sql_help.h:190+msgid ""+"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE table_name "+"[ (column_name [, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]\n"+"    AS query"+msgstr ""+"CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } ] TABLE ±íÃû×Ö [ (×Ö¶ÎÃû×Ö "+"[, ...] ) ] [ [ WITH | WITHOUT ] OIDS ]\n"+"    AS query"++#: sql_help.h:193+msgid "define a new tablespace"+msgstr "¶¨ÒåÒ»¸öеıí¿Õ¼ä"++#: sql_help.h:194+msgid ""+"CREATE TABLESPACE tablespacename [ OWNER username ] LOCATION 'directory'"+msgstr "CREATE TABLESPACE ±í¿Õ¼äÃû³Æ [ OWNER Óû§Ãû ] LOCATION 'Ŀ¼'"++#: sql_help.h:197+msgid "define a new trigger"+msgstr "¶¨ÒåÒ»¸öеĴ¥·¢Æ÷"++#: sql_help.h:198+msgid ""+"CREATE TRIGGER name { BEFORE | AFTER } { event [ OR ... ] }\n"+"    ON table [ FOR [ EACH ] { ROW | STATEMENT } ]\n"+"    EXECUTE PROCEDURE funcname ( arguments )"+msgstr ""+"CREATE TRIGGER Ãû×Ö { BEFORE | AFTER } { ʼþ [ OR ... ] }\n"+"    ON ±í [ FOR [ EACH ] { ROW | STATEMENT } ]\n"+"    EXECUTE PROCEDURE º¯ÊýÃû ( ²ÎÊý )"++#: sql_help.h:201+msgid "define a new data type"+msgstr "¶¨ÒåÒ»¸öеÄÊý¾ÝÀàÐÍ"++#: sql_help.h:202+msgid ""+"CREATE TYPE name AS\n"+"    ( attribute_name data_type [, ... ] )\n"+"\n"+"CREATE TYPE name (\n"+"    INPUT = input_function,\n"+"    OUTPUT = output_function\n"+"    [ , RECEIVE = receive_function ]\n"+"    [ , SEND = send_function ]\n"+"    [ , ANALYZE = analyze_function ]\n"+"    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"+"    [ , PASSEDBYVALUE ]\n"+"    [ , ALIGNMENT = alignment ]\n"+"    [ , STORAGE = storage ]\n"+"    [ , DEFAULT = default ]\n"+"    [ , ELEMENT = element ]\n"+"    [ , DELIMITER = delimiter ]\n"+")"+msgstr ""+"CREATE TYPE name AS\n"+"    ( attribute_name data_type [, ... ] )\n"+"\n"+"CREATE TYPE name (\n"+"    INPUT = input_function,\n"+"    OUTPUT = output_function\n"+"    [ , RECEIVE = receive_function ]\n"+"    [ , SEND = send_function ]\n"+"    [ , ANALYZE = analyze_function ]\n"+"    [ , INTERNALLENGTH = { internallength | VARIABLE } ]\n"+"    [ , PASSEDBYVALUE ]\n"+"    [ , ALIGNMENT = alignment ]\n"+"    [ , STORAGE = storage ]\n"+"    [ , DEFAULT = default ]\n"+"    [ , ELEMENT = element ]\n"+"    [ , DELIMITER = delimiter ]\n"+")"++#: sql_help.h:205+msgid "define a new database user account"+msgstr "¶¨ÒåÒ»¸öеÄÊý¾Ý¿âÓû§ÕÊ»§"++#: sql_help.h:206+msgid ""+"CREATE USER name [ [ WITH ] option [ ... ] ]\n"+"\n"+"where option can be:\n"+"    \n"+"      SYSID uid \n"+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"+"    | CREATEDB | NOCREATEDB\n"+"    | CREATEUSER | NOCREATEUSER\n"+"    | IN GROUP groupname [, ...]\n"+"    | VALID UNTIL 'abstime'"+msgstr ""+"CREATE USER name [ [ WITH ] option [ ... ] ]\n"+"\n"+"option ¿ÉÒÔΪ:\n"+"    \n"+"      SYSID uid \n"+"    | [ ENCRYPTED | UNENCRYPTED ] PASSWORD 'password'\n"+"    | CREATEDB | NOCREATEDB\n"+"    | CREATEUSER | NOCREATEUSER\n"+"    | IN GROUP groupname [, ...]\n"+"    | VALID UNTIL 'abstime'"++#: sql_help.h:209+msgid "define a new view"+msgstr "¶¨ÒåÒ»¸öеÄÊÓͼ"++#: sql_help.h:210+msgid "CREATE [ OR REPLACE ] VIEW name [ ( column_name [, ...] ) ] AS query"+msgstr "CREATE [ OR REPLACE ] VIEW Ãû×Ö [ ( ×Ö¶ÎÃû [, ...] ) ] AS query"++#: sql_help.h:213+msgid "deallocate a prepared statement"+msgstr "½â³ýÒ»¸ö×¼±¸ºÃµÄÓï¾ä"++#: sql_help.h:214+msgid "DEALLOCATE [ PREPARE ] plan_name"+msgstr "DEALLOCATE [ PREPARE ] ¹æ»®Ãû³Æ"++#: sql_help.h:217+msgid "define a cursor"+msgstr "¶¨ÒåÒ»¸öÓαê"++#: sql_help.h:218+msgid ""+"DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"+"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query\n"+"    [ FOR { READ ONLY | UPDATE [ OF column [, ...] ] } ]"+msgstr ""+"DECLARE name [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ]\n"+"    CURSOR [ { WITH | WITHOUT } HOLD ] FOR query\n"+"    [ FOR { READ ONLY | UPDATE [ OF column [, ...] ] } ]"++#: sql_help.h:221+msgid "delete rows of a table"+msgstr "ɾ³ýÒ»¸ö±íµÄ¼Ç¼"++#: sql_help.h:222+msgid "DELETE FROM [ ONLY ] table [ WHERE condition ]"+msgstr "DELETE FROM [ ONLY ] ±í [ WHERE Ìõ¼þ ]"++#: sql_help.h:225+msgid "remove an aggregate function"+msgstr "ɾ³ýÒ»¸ö¾Û¼¯º¯Êý"++#: sql_help.h:226+msgid "DROP AGGREGATE name ( type ) [ CASCADE | RESTRICT ]"+msgstr "DROP AGGREGATE Ãû×Ö ( ÀàÐÍ ) [ CASCADE | RESTRICT ]"++#: sql_help.h:229+msgid "remove a cast"+msgstr "ɾ³ýÒ»¸öÀàÐÍת»»"++#: sql_help.h:230+msgid "DROP CAST (sourcetype AS targettype) [ CASCADE | RESTRICT ]"+msgstr "DROP CAST (Ô´ÀàÐÍ AS Ä¿±êÀàÐÍ) [ CASCADE | RESTRICT ]"++#: sql_help.h:233+msgid "remove a conversion"+msgstr "ɾ³ýÒ»¸öת»»"++#: sql_help.h:234+msgid "DROP CONVERSION name [ CASCADE | RESTRICT ]"+msgstr "DROP CONVERSION Ãû×Ö [ CASCADE | RESTRICT ]"++#: sql_help.h:237+msgid "remove a database"+msgstr "ɾ³ýÒ»¸öÊý¾Ý¿â"++#: sql_help.h:238+msgid "DROP DATABASE name"+msgstr "DROP DATABASE Ãû×Ö"++#: sql_help.h:241+msgid "remove a domain"+msgstr "ɾ³ýÒ»¸öÓò"++#: sql_help.h:242+msgid "DROP DOMAIN name [, ...]  [ CASCADE | RESTRICT ]"+msgstr "DROP DOMAIN Ãû×Ö [, ...]  [ CASCADE | RESTRICT ]"++#: sql_help.h:245+msgid "remove a function"+msgstr "ɾ³ýÒ»¸öº¯Êý"++#: sql_help.h:246+msgid "DROP FUNCTION name ( [ type [, ...] ] ) [ CASCADE | RESTRICT ]"+msgstr "DROP FUNCTION Ãû×Ö ( [ ÀàÐÍ [, ...] ] ) [ CASCADE | RESTRICT ]"++#: sql_help.h:249+msgid "remove a user group"+msgstr "ɾ³ýÒ»¸öÓû§×é"++#: sql_help.h:250+msgid "DROP GROUP name"+msgstr "DROP GROUP Ãû×Ö"++#: sql_help.h:253+msgid "remove an index"+msgstr "ɾ³ýÒ»¸öË÷Òý"++#: sql_help.h:254+msgid "DROP INDEX name [, ...] [ CASCADE | RESTRICT ]"+msgstr "DROP INDEX Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"++#: sql_help.h:257+msgid "remove a procedural language"+msgstr "ɾ³ýÒ»¸ö¹ý³ÌÓïÑÔ"++#: sql_help.h:258+msgid "DROP [ PROCEDURAL ] LANGUAGE name [ CASCADE | RESTRICT ]"+msgstr "DROP [ PROCEDURAL ] LANGUAGE Ãû×Ö [ CASCADE | RESTRICT ]"++#: sql_help.h:261+msgid "remove an operator class"+msgstr "ɾ³ýÒ»¸ö²Ù×÷·ûÀà"++#: sql_help.h:262+msgid "DROP OPERATOR CLASS name USING index_method [ CASCADE | RESTRICT ]"+msgstr "DROP OPERATOR CLASS name USING index_method [ CASCADE | RESTRICT ]"++#: sql_help.h:265+msgid "remove an operator"+msgstr "ɾ³ýÒ»¸ö²Ù×÷·û"++#: sql_help.h:266+msgid ""+"DROP OPERATOR name ( { lefttype | NONE } , { righttype | NONE } ) [ CASCADE "+"| RESTRICT ]"+msgstr ""+"DROP OPERATOR Ãû×Ö ( { ×ó±ßÀàÐÍ | NONE } , { ÓÒ±ßÀàÐÍ | NONE } ) [ CASCADE | "+"RESTRICT ]"++#: sql_help.h:269+msgid "remove a rewrite rule"+msgstr "ɾ³ýÒ»¸öÖØд¹æÔò"++#: sql_help.h:270+msgid "DROP RULE name ON relation [ CASCADE | RESTRICT ]"+msgstr "DROP RULE Ãû×Ö ON ¹Øϵ [ CASCADE | RESTRICT ]"++#: sql_help.h:273+msgid "remove a schema"+msgstr "ɾ³ýÒ»¸öģʽ"++#: sql_help.h:274+msgid "DROP SCHEMA name [, ...] [ CASCADE | RESTRICT ]"+msgstr "DROP SCHEMA Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"++#: sql_help.h:277+msgid "remove a sequence"+msgstr "ɾ³ýÒ»¸öÐòÁÐ"++#: sql_help.h:278+msgid "DROP SEQUENCE name [, ...] [ CASCADE | RESTRICT ]"+msgstr "DROP SEQUENCE Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"++#: sql_help.h:281+msgid "remove a table"+msgstr "ɾ³ýÒ»¸ö±í"++#: sql_help.h:282+msgid "DROP TABLE name [, ...] [ CASCADE | RESTRICT ]"+msgstr "DROP TABLE Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"++#: sql_help.h:285+msgid "remove a tablespace"+msgstr "ɾ³ýÒ»¸ö±í¿Õ¼ä"++#: sql_help.h:286+msgid "DROP TABLESPACE tablespacename"+msgstr "DROP TABLESPACE ±í¿Õ¼äÃû×Ö"++#: sql_help.h:289+msgid "remove a trigger"+msgstr "ɾ³ýÒ»¸ö´¥·¢Æ÷"++#: sql_help.h:290+msgid "DROP TRIGGER name ON table [ CASCADE | RESTRICT ]"+msgstr "DROP TRIGGER Ãû×Ö ON ±í [ CASCADE | RESTRICT ]"++#: sql_help.h:293+msgid "remove a data type"+msgstr "ɾ³ýÒ»¸öÊý¾ÝÀàÐÍ"++#: sql_help.h:294+msgid "DROP TYPE name [, ...] [ CASCADE | RESTRICT ]"+msgstr "DROP TYPE Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"++#: sql_help.h:297+msgid "remove a database user account"+msgstr "ɾ³ýÒ»¸öÊý¾Ý¿âÓû§ÕÊ»§"++#: sql_help.h:298+msgid "DROP USER name"+msgstr "DROP USER Ãû×Ö"++#: sql_help.h:301+msgid "remove a view"+msgstr "ɾ³ýÒ»¸öÊÓͼ"++#: sql_help.h:302+msgid "DROP VIEW name [, ...] [ CASCADE | RESTRICT ]"+msgstr "DROP VIEW Ãû×Ö [, ...] [ CASCADE | RESTRICT ]"++#: sql_help.h:306+msgid "END [ WORK | TRANSACTION ]"+msgstr "END [ WORK | TRANSACTION ]"++#: sql_help.h:309+msgid "execute a prepared statement"+msgstr "Ö´ÐÐÒ»¸ö×¼±¸ºÃµÄÓï¾ä"++#: sql_help.h:310+msgid "EXECUTE plan_name [ (parameter [, ...] ) ]"+msgstr "EXECUTE ¹æ»®Ãû³Æ [ (²ÎÊý [, ...] ) ]"++#: sql_help.h:313+msgid "show the execution plan of a statement"+msgstr "ÏÔʾÓï¾äµÄÖ´Ðй滮"++#: sql_help.h:314+msgid "EXPLAIN [ ANALYZE ] [ VERBOSE ] statement"+msgstr "EXPLAIN [ ANALYZE ] [ VERBOSE ] Óï¾ä"++#: sql_help.h:317+msgid "retrieve rows from a query using a cursor"+msgstr "»Ö¸´À´×ÔÒ»¸öʹÓÃÓαê²éѯµÄÐÐ"++#: sql_help.h:318+msgid ""+"FETCH [ direction { FROM | IN } ] cursorname\n"+"\n"+"where direction can be empty or one of:\n"+"\n"+"    NEXT\n"+"    PRIOR\n"+"    FIRST\n"+"    LAST\n"+"    ABSOLUTE count\n"+"    RELATIVE count\n"+"    count\n"+"    ALL\n"+"    FORWARD\n"+"    FORWARD count\n"+"    FORWARD ALL\n"+"    BACKWARD\n"+"    BACKWARD count\n"+"    BACKWARD ALL"+msgstr ""+"FETCH [ direction { FROM | IN } ] cursorname\n"+"\n"+"direction ¿ÉÒÔΪ¿Õ»òÏÂÃæµÄÒ»ÖÖ:\n"+"\n"+"    NEXT\n"+"    PRIOR\n"+"    FIRST\n"+"    LAST\n"+"    ABSOLUTE count\n"+"    RELATIVE count\n"+"    count\n"+"    ALL\n"+"    FORWARD\n"+"    FORWARD count\n"+"    FORWARD ALL\n"+"    BACKWARD\n"+"    BACKWARD count\n"+"    BACKWARD ALL"++#: sql_help.h:321+msgid "define access privileges"+msgstr "¶¨Òå·ÃÎÊȨÏÞ"++#: sql_help.h:322+msgid ""+"GRANT { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"+"    [,...] | ALL [ PRIVILEGES ] }\n"+"    ON [ TABLE ] tablename [, ...]\n"+"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "+"OPTION ]\n"+"\n"+"GRANT { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON DATABASE dbname [, ...]\n"+"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "+"OPTION ]\n"+"\n"+"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"+"    ON TABLESPACE tablespacename [, ...]\n"+"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "+"OPTION ]\n"+"\n"+"GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"+"    ON FUNCTION funcname ([type, ...]) [, ...]\n"+"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "+"OPTION ]\n"+"\n"+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"+"    ON LANGUAGE langname [, ...]\n"+"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT "+"OPTION ]\n"+"\n"+"GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON SCHEMA schemaname [, ...]\n"+"    TO { username | GROUP groupname | PUBLIC } [, ...] [ WITH GRANT OPTION ]"+msgstr ""+"GRANT { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"+"    [,...] | ALL [ PRIVILEGES ] }\n"+"    ON [ TABLE ] ±íÃû³Æ [, ...]\n"+"    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"+"\n"+"GRANT { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON DATABASE Êý¾Ý¿âÃû³Æ [, ...]\n"+"    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"+"\n"+"GRANT { CREATE | ALL [ PRIVILEGES ] }\n"+"    ON TABLESPACE ±í¿Õ¼äÃû³Æ [, ...]\n"+"    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"+"\n"+"GRANT { EXECUTE | ALL [ PRIVILEGES ] }\n"+"    ON FUNCTION º¯ÊýÃû³Æ ([ÀàÐÍ, ...]) [, ...]\n"+"    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"+"\n"+"GRANT { USAGE | ALL [ PRIVILEGES ] }\n"+"    ON LANGUAGE ÓïÑÔÃû³Æ [, ...]\n"+"    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]\n"+"\n"+"GRANT { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON SCHEMA ģʽÃû³Æ [, ...]\n"+"    TO { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...] [ WITH GRANT OPTION ]"++#: sql_help.h:325+msgid "create new rows in a table"+msgstr "ÔÚÒ»¸ö±íÖд´½¨ÐÂÐÐ"++#: sql_help.h:326+msgid ""+"INSERT INTO table [ ( column [, ...] ) ]\n"+"    { DEFAULT VALUES | VALUES ( { expression | DEFAULT } [, ...] ) | query }"+msgstr ""+"INSERT INTO ±íÃû [ ( ×ֶΠ[, ...] ) ]\n"+"    { DEFAULT VALUES | VALUES ( { ±í´ïʽ | DEFAULT } [, ...] ) | ×Ó²éѯ }"++#: sql_help.h:329+msgid "listen for a notification"+msgstr "¼àÌýÒ»¸ö֪ͨ"++#: sql_help.h:330+msgid "LISTEN name"+msgstr "LISTEN Ãû×Ö"++#: sql_help.h:333+msgid "load or reload a shared library file"+msgstr "ÌáÈ¡»òÖØÔØÒ»¸ö¹²Ïí¿âÎļþ"++#: sql_help.h:334+msgid "LOAD 'filename'"+msgstr "LOAD 'ÎļþÃû'"++#: sql_help.h:337+msgid "lock a table"+msgstr "Ëø¶¨Ò»¸ö±í"++#: sql_help.h:338+msgid ""+"LOCK [ TABLE ] name [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"+"\n"+"where lockmode is one of:\n"+"\n"+"    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"+"    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"+msgstr ""+"LOCK [ TABLE ] Ãû×Ö [, ...] [ IN lockmode MODE ] [ NOWAIT ]\n"+"\n"+"lockmode ¿ÉÒÔÊÇÏÂÃæµÄÒ»ÖÖ:\n"+"\n"+"    ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE\n"+"    | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE"++#: sql_help.h:341+msgid "position a cursor"+msgstr "¶¨Î»Ò»¸öÓαê"++#: sql_help.h:342+msgid "MOVE [ direction { FROM | IN } ] cursorname"+msgstr "MOVE [ direction { FROM | IN } ] cursorname"++#: sql_help.h:345+msgid "generate a notification"+msgstr "Éú³ÉÒ»¸ö֪ͨ"++#: sql_help.h:346+msgid "NOTIFY name"+msgstr "NOTIFY Ãû×Ö"++#: sql_help.h:349+msgid "prepare a statement for execution"+msgstr "ΪִÐÐ×¼±¸Ò»ÌõÓï¾ä"++#: sql_help.h:350+msgid "PREPARE plan_name [ (datatype [, ...] ) ] AS statement"+msgstr "PREPARE ¹æ»®Ãû³Æ [ (Êý¾ÝÀàÐÍ [, ...] ) ] AS Óï¾ä"++#: sql_help.h:353+msgid "rebuild indexes"+msgstr "Öؽ¨Ë÷Òý"++#: sql_help.h:354+msgid "REINDEX { DATABASE | TABLE | INDEX } name [ FORCE ]"+msgstr "REINDEX { DATABASE | TABLE | INDEX } Ãû×Ö [ FORCE ]"++#: sql_help.h:357+msgid "destroy a previously defined savepoint"+msgstr "ɾ³ýÒ»¸öÒÔÇ°¶¨ÒåµÄ savepoint"++#: sql_help.h:358+msgid "RELEASE savepoint_name"+msgstr "RELEASE savepoint_name"++#: sql_help.h:361+msgid "restore the value of a run-time parameter to the default value"+msgstr "»Ö¸´ÔËÐÐʱ²ÎÊýֵΪĬÈÏÖµ"++#: sql_help.h:362+msgid ""+"RESET name\n"+"RESET ALL"+msgstr ""+"RESET Ãû×Ö\n"+"RESET ALL"++#: sql_help.h:365+msgid "remove access privileges"+msgstr "ɾ³ý·ÃÎÊȨÏÞ"++#: sql_help.h:366+msgid ""+"REVOKE [ GRANT OPTION FOR ]\n"+"    { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"+"    [,...] | ALL [ PRIVILEGES ] }\n"+"    ON [ TABLE ] tablename [, ...]\n"+"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON DATABASE dbname [, ...]\n"+"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { CREATE | ALL [ PRIVILEGES ] }\n"+"    ON TABLESPACE tablespacename [, ...]\n"+"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { EXECUTE | ALL [ PRIVILEGES ] }\n"+"    ON FUNCTION funcname ([type, ...]) [, ...]\n"+"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { USAGE | ALL [ PRIVILEGES ] }\n"+"    ON LANGUAGE langname [, ...]\n"+"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON SCHEMA schemaname [, ...]\n"+"    FROM { username | GROUP groupname | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]"+msgstr ""+"REVOKE [ GRANT OPTION FOR ]\n"+"    { { SELECT | INSERT | UPDATE | DELETE | RULE | REFERENCES | TRIGGER }\n"+"    [,...] | ALL [ PRIVILEGES ] }\n"+"    ON [ TABLE ] ±íÃû³Æ [, ...]\n"+"    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { { CREATE | TEMPORARY | TEMP } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON DATABASE Êý¾Ý¿âÃû³Æ [, ...]\n"+"    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { CREATE | ALL [ PRIVILEGES ] }\n"+"    ON TABLESPACE ±í¿Õ¼äÃû³Æ [, ...]\n"+"    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { EXECUTE | ALL [ PRIVILEGES ] }\n"+"    ON FUNCTION º¯ÊýÃû³Æ ([ÀàÐÍ, ...]) [, ...]\n"+"    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { USAGE | ALL [ PRIVILEGES ] }\n"+"    ON LANGUAGE ÓïÑÔÃû³Æ [, ...]\n"+"    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]\n"+"\n"+"REVOKE [ GRANT OPTION FOR ]\n"+"    { { CREATE | USAGE } [,...] | ALL [ PRIVILEGES ] }\n"+"    ON SCHEMA ģʽÃû³Æ [, ...]\n"+"    FROM { Óû§Ãû | GROUP ×éÃû | PUBLIC } [, ...]\n"+"    [ CASCADE | RESTRICT ]"++#: sql_help.h:370+msgid "ROLLBACK [ WORK | TRANSACTION ]"+msgstr "ROLLBACK [ WORK | TRANSACTION ]"++#: sql_help.h:373+msgid "roll back to a savepoint"+msgstr "»Ø¹öµ½Ò»¸ö savepoint"++#: sql_help.h:374+msgid "ROLLBACK TO savepoint_name"+msgstr "ROLLBACK TO savepoint_name"++#: sql_help.h:377+msgid "define a new savepoint within the current transaction"+msgstr "ÔÚµ±Ç°ÊÂÎïÖж¨ÒåÒ»¸öÐ嵀 savepoint"++#: sql_help.h:378+msgid "SAVEPOINT savepoint_name"+msgstr "SAVEPOINT savepoint_name"++#: sql_help.h:381+msgid "retrieve rows from a table or view"+msgstr "»Ö¸´Ò»¸ö±í»òÊÓͼµÄÐÐ"++#: sql_help.h:382+msgid ""+"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"+"    * | expression [ AS output_name ] [, ...]\n"+"    [ FROM from_item [, ...] ]\n"+"    [ WHERE condition ]\n"+"    [ GROUP BY expression [, ...] ]\n"+"    [ HAVING condition [, ...] ]\n"+"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [, ...] ]\n"+"    [ LIMIT { count | ALL } ]\n"+"    [ OFFSET start ]\n"+"    [ FOR UPDATE [ OF table_name [, ...] ] ]\n"+"\n"+"where from_item can be one of:\n"+"\n"+"    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"+"    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"+"    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "+"[, ...] | column_definition [, ...] ) ]\n"+"    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"+"    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "+"( join_column [, ...] ) ]"+msgstr ""+"SELECT [ ALL | DISTINCT [ ON ( ±í´ïʽ [, ...] ) ] ]\n"+"    * | ±í´ïʽ [ AS output_name ] [, ...]\n"+"    [ FROM from_item [, ...] ]\n"+"    [ WHERE Ìõ¼þ ]\n"+"    [ GROUP BY ±í´ïʽ [, ...] ]\n"+"    [ HAVING Ìõ¼þ [, ...] ]\n"+"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [, ...] ]\n"+"    [ LIMIT { count | ALL } ]\n"+"    [ OFFSET start ]\n"+"    [ FOR UPDATE [ OF ±íÃû [, ...] ] ]\n"+"\n"+"from_item ¿ÉÒÔÊÇÏÂÃæµÄÒ»ÖÖ:\n"+"\n"+"    [ ONLY ] table_name [ * ] [ [ AS ] alias [ ( column_alias [, ...] ) ] ]\n"+"    ( select ) [ AS ] alias [ ( column_alias [, ...] ) ]\n"+"    function_name ( [ argument [, ...] ] ) [ AS ] alias [ ( column_alias "+"[, ...] | column_definition [, ...] ) ]\n"+"    function_name ( [ argument [, ...] ] ) AS ( column_definition [, ...] )\n"+"    from_item [ NATURAL ] join_type from_item [ ON join_condition | USING "+"( join_column [, ...] ) ]"++#: sql_help.h:386+msgid ""+"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"+"    * | expression [ AS output_name ] [, ...]\n"+"    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"+"    [ FROM from_item [, ...] ]\n"+"    [ WHERE condition ]\n"+"    [ GROUP BY expression [, ...] ]\n"+"    [ HAVING condition [, ...] ]\n"+"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [, ...] ]\n"+"    [ LIMIT { count | ALL } ]\n"+"    [ OFFSET start ]\n"+"    [ FOR UPDATE [ OF tablename [, ...] ] ]"+msgstr ""+"SELECT [ ALL | DISTINCT [ ON ( expression [, ...] ) ] ]\n"+"    * | expression [ AS output_name ] [, ...]\n"+"    INTO [ TEMPORARY | TEMP ] [ TABLE ] new_table\n"+"    [ FROM from_item [, ...] ]\n"+"    [ WHERE condition ]\n"+"    [ GROUP BY expression [, ...] ]\n"+"    [ HAVING condition [, ...] ]\n"+"    [ { UNION | INTERSECT | EXCEPT } [ ALL ] select ]\n"+"    [ ORDER BY expression [ ASC | DESC | USING operator ] [, ...] ]\n"+"    [ LIMIT { count | ALL } ]\n"+"    [ OFFSET start ]\n"+"    [ FOR UPDATE [ OF tablename [, ...] ] ]"++#: sql_help.h:389+msgid "change a run-time parameter"+msgstr "¸Ä±äÒ»¸öÔËÐÐʱ²ÎÊý"++#: sql_help.h:390+msgid ""+"SET [ SESSION | LOCAL ] name { TO | = } { value | 'value' | DEFAULT }\n"+"SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"+msgstr ""+"SET [ SESSION | LOCAL ] Ãû×Ö { TO | = } { Öµ | 'Öµ' | DEFAULT }\n"+"SET [ SESSION | LOCAL ] TIME ZONE { timezone | LOCAL | DEFAULT }"++#: sql_help.h:393+msgid "set the constraint mode of the current transaction"+msgstr "ÉèÖõ±Ç°½»Ò×µÄÔ¼Êøģʽ"++#: sql_help.h:394+msgid "SET CONSTRAINTS { ALL | name [, ...] } { DEFERRED | IMMEDIATE }"+msgstr "SET CONSTRAINTS { ALL | Ãû×Ö [, ...] } { DEFERRED | IMMEDIATE }"++#: sql_help.h:397+msgid ""+"set the session user identifier and the current user identifier of the "+"current session"+msgstr "ÉèÖõ±Ç°»á»°µÄ»á»°Óû§È·ÈϺ͵±Ç°Óû§È·ÈÏ"++#: sql_help.h:398+msgid ""+"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION username\n"+"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"+"RESET SESSION AUTHORIZATION"+msgstr ""+"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION Óû§Ãû\n"+"SET [ SESSION | LOCAL ] SESSION AUTHORIZATION DEFAULT\n"+"RESET SESSION AUTHORIZATION"++#: sql_help.h:401+msgid "set the characteristics of the current transaction"+msgstr "ÉèÖõ±Ç°½»Ò×µÄÊôÐÔ"++#: sql_help.h:402+msgid ""+"SET TRANSACTION\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]\n"+"\n"+"SET SESSION CHARACTERISTICS AS TRANSACTION\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]"+msgstr ""+"SET TRANSACTION\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]\n"+"\n"+"SET SESSION CHARACTERISTICS AS TRANSACTION\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]"++#: sql_help.h:405+msgid "show the value of a run-time parameter"+msgstr "ÏÔʾÔËÐÐʱ²ÎÊýÖµ"++#: sql_help.h:406+msgid ""+"SHOW name\n"+"SHOW ALL"+msgstr ""+"SHOW Ãû×Ö\n"+"SHOW ALL"++#: sql_help.h:410+msgid ""+"START TRANSACTION\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]"+msgstr ""+"START TRANSACTION\n"+"    [ ISOLATION LEVEL { READ UNCOMMITTED | READ COMMITTED | REPEATABLE READ "+"| SERIALIZABLE } ]\n"+"    [ READ WRITE | READ ONLY ]"++#: sql_help.h:413+msgid "empty a table"+msgstr "Çå¿ÕÒ»¸ö±í"++#: sql_help.h:414+msgid "TRUNCATE [ TABLE ] name"+msgstr "TRUNCATE [ TABLE ] Ãû×Ö"++#: sql_help.h:417+msgid "stop listening for a notification"+msgstr "Í£Ö¹¼àÌý֪ͨ"++#: sql_help.h:418+msgid "UNLISTEN { name | * }"+msgstr "UNLISTEN { Ãû×Ö | * }"++#: sql_help.h:421+msgid "update rows of a table"+msgstr "¸üÐÂÒ»¸ö±íµÄ¼Ç¼"++#: sql_help.h:422+msgid ""+"UPDATE [ ONLY ] table SET column = { expression | DEFAULT } [, ...]\n"+"    [ FROM fromlist ]\n"+"    [ WHERE condition ]"+msgstr ""+"UPDATE [ ONLY ] ±íÃû SET ×ֶΠ= { ±í´ïʽ | DEFAULT } [, ...]\n"+"    [ FROM fromlist ]\n"+"    [ WHERE Ìõ¼þ ]"++#: sql_help.h:425+msgid "garbage-collect and optionally analyze a database"+msgstr "À¬»ø»ØÊպͿÉÑ¡Ôñ·ÖÎöÒ»¸öÊý¾Ý¿â"++#: sql_help.h:426+msgid ""+"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ table ]\n"+"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ table [ (column "+"[, ...] ) ] ]"+msgstr ""+"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ±í ]\n"+"VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ ±í [ (ÁÐ [, ...] ) ] ]"++#~ msgid "  \\db [PATTERN]  list tablespaces\n"+#~ msgstr "  \\db [ģʽ]       Áгö±í¿Õ¼ä\n"++#~ msgid "  \\dn [PATTERN]  list schemas\n"+#~ msgstr "  \\dn [ģʽ]       Áгöģʽ\n"++#~ msgid ""+#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"+#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "+#~ "MAXVALUE ]\n"+#~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"+#~ "    [ TABLESPACE tablespace ]"+#~ msgstr ""+#~ "CREATE [ TEMPORARY | TEMP ] SEQUENCE name [ INCREMENT [ BY ] increment ]\n"+#~ "    [ MINVALUE minvalue | NO MINVALUE ] [ MAXVALUE maxvalue | NO "+#~ "MAXVALUE ]\n"+#~ "    [ START [ WITH ] start ] [ CACHE cache ] [ [ NO ] CYCLE ]\n"+#~ "    [ TABLESPACE tablespace ]"++#~ msgid "parse error at the end of line\n"+#~ msgstr "ÔÚÐÐβ·¢Éú·ÖÎö´í\n"
diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po

index 85e69c5e05089e94409cbe036941581553bb6074..1785518173c5203e4ffb23b62828d88d1bbe1efd 100644 (file)

--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,44 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-05 22:14+0000\n"
+"POT-Creation-Date: 2004-06-26 10:44+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
-"Last-Translator: Bao Wei <[email protected].cn>\n"
+"Last-Translator: Bao Wei <[email protected].cn>\n"
 "Language-Team: Weiping He \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: createdb.c:101 createdb.c:120 createlang.c:94 createlang.c:115
-#: createlang.c:157 createuser.c:116 createuser.c:131 dropdb.c:83 dropdb.c:92
-#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:151 dropuser.c:83
-#: dropuser.c:98 clusterdb.c:96 clusterdb.c:111 vacuumdb.c:112 vacuumdb.c:127
+#: createdb.c:102 createdb.c:121 createlang.c:97 createlang.c:118
+#: createlang.c:160 createuser.c:117 createuser.c:132 dropdb.c:84 dropdb.c:93
+#: dropdb.c:101 droplang.c:94 droplang.c:115 droplang.c:157 dropuser.c:84
+#: dropuser.c:99 clusterdb.c:97 clusterdb.c:112 vacuumdb.c:114 vacuumdb.c:129
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: createdb.c:118 createlang.c:113 createuser.c:129 dropdb.c:98 droplang.c:107
-#: dropuser.c:96 clusterdb.c:109 vacuumdb.c:125
+#: createdb.c:119 createlang.c:116 createuser.c:130 dropdb.c:99 droplang.c:113
+#: dropuser.c:97 clusterdb.c:110 vacuumdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: Ì«¶àµÄÃüÁîÐвÎÊý (µÚÒ»¸öÊÇ \"%s\")\n"
 
-#: createdb.c:128
+#: createdb.c:129
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
 msgstr "%s: \"%s\" ²»ÊÇÒ»¸öÓÐЧµÄ±àÂëÃû³Æ\n"
 
-#: createdb.c:170
+#: createdb.c:168
 #, c-format
 msgid "%s: database creation failed: %s"
 msgstr "%s: ´´½¨Êý¾Ý¿âʧ°Ü: %s"
 
-#: createdb.c:195
+#: createdb.c:196
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: ´´½¨×¢ÊÍʧ°Ü (Êý¾Ý¿âÒÑ´´½¨): %s"
 
-#: createdb.c:213
+#: createdb.c:217
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -52,18 +52,20 @@ msgstr ""
 "%s ´´½¨Ò»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: createdb.c:214 createlang.c:272 createuser.c:236 dropdb.c:143
-#: droplang.c:242 dropuser.c:143 clusterdb.c:232 vacuumdb.c:256
+#: createdb.c:218 createlang.c:299 createuser.c:240 dropdb.c:147
+#: droplang.c:280 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
+#, c-format
 msgid "Usage:\n"
 msgstr "ʹÓ÷½·¨:\n"
 
-#: createdb.c:215
+#: createdb.c:219
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû³Æ] [ÃèÊö]\n"
 
-#: createdb.c:216 createlang.c:274 createuser.c:238 dropdb.c:145
-#: droplang.c:244 dropuser.c:145 clusterdb.c:234 vacuumdb.c:258
+#: createdb.c:220 createlang.c:301 createuser.c:242 dropdb.c:149
+#: droplang.c:282 dropuser.c:149 clusterdb.c:238 vacuumdb.c:264
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -71,44 +73,49 @@ msgstr ""
 "\n"
 "Ñ¡Ïî:\n"
 
-#: createdb.c:217
-msgid "  -D, --location=PATH       alternative place to store the database\n"
-msgstr "  -D, --location=PATH       Ñ¡ÔñÒ»¸öµØ·½´æ·ÅÊý¾Ý¿â\n"
+#: createdb.c:221
+#, c-format
+msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
+msgstr "  -D, --tablespace=TABLESPACE  Êý¾Ý¿âĬÈϱí¿Õ¼ä\n"
 
-#: createdb.c:218
-msgid "  -E, --encoding=ENCODING   encoding for the database\n"
-msgstr "  -E, --encoding=ENCODING   Êý¾Ý¿â±àÂë\n"
+#: createdb.c:222
+#, c-format
+msgid "  -E, --encoding=ENCODING      encoding for the database\n"
+msgstr "  -E, --encoding=ENCODING      Êý¾Ý¿â±àÂë\n"
 
-#: createdb.c:219
-msgid "  -O, --owner=OWNER         database user to own the new database\n"
-msgstr "  -O, --owner=OWNER         ÐÂÊý¾Ý¿âµÄËùÊôÓû§\n"
+#: createdb.c:223
+#, c-format
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr "  -O, --owner=OWNER            ÐÂÊý¾Ý¿âµÄËùÊôÓû§\n"
 
-#: createdb.c:220
-msgid "  -T, --template=TEMPLATE   template database to copy\n"
-msgstr "  -T, --template=TEMPLATE   Òª¿½±´µÄÊý¾Ý¿âÄ£°å\n"
+#: createdb.c:224
+#, c-format
+msgid "  -T, --template=TEMPLATE      template database to copy\n"
+msgstr "  -T, --template=TEMPLATE      Òª¿½±´µÄÊý¾Ý¿âÄ£°å\n"
 
-#: createdb.c:221 createlang.c:276 createuser.c:247 dropdb.c:146
-#: droplang.c:246 dropuser.c:146 clusterdb.c:238
+#: createdb.c:225
+#, c-format
 msgid ""
-"  -e, --echo                show the commands being sent to the server\n"
-msgstr ""
-"  -e, --echo                ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr "  -e, --echo                   ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
 
-#: createdb.c:222 createuser.c:248 dropdb.c:148 dropuser.c:148 clusterdb.c:239
-msgid "  -q, --quiet               don't write any messages\n"
-msgstr "  -q, --quiet               ²»Ð´ÈκÎÐÅÏ¢\n"
+#: createdb.c:226
+#, c-format
+msgid "  -q, --quiet                  don't write any messages\n"
+msgstr "  -q, --quiet                  ²»Ð´ÈκÎÐÅÏ¢\n"
 
-#: createdb.c:223 createlang.c:283 createuser.c:249 dropdb.c:153
-#: droplang.c:252 dropuser.c:153 clusterdb.c:240
-msgid "  --help                    show this help, then exit\n"
-msgstr "  --help                    ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
+#: createdb.c:227
+#, c-format
+msgid "  --help                       show this help, then exit\n"
+msgstr "  --help                       ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createdb.c:224 createlang.c:284 createuser.c:250 dropdb.c:154
-#: droplang.c:253 dropuser.c:154 clusterdb.c:241
-msgid "  --version                 output version information, then exit\n"
-msgstr "  --version                 Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+#: createdb.c:228
+#, c-format
+msgid "  --version                    output version information, then exit\n"
+msgstr "  --versoin                    Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createdb.c:225 createuser.c:251 clusterdb.c:242 vacuumdb.c:269
+#: createdb.c:229 createuser.c:255 clusterdb.c:246 vacuumdb.c:275
+#, c-format
 msgid ""
 "\n"
 "Connection options:\n"
@@ -116,27 +123,30 @@ msgstr ""
 "\n"
 "Áª½ÓÑ¡Ïî:\n"
 
-#: createdb.c:226 createlang.c:279 createuser.c:252 dropdb.c:149
-#: droplang.c:248 dropuser.c:149 clusterdb.c:243 vacuumdb.c:270
-msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr "  -h, --host=HOSTNAM        Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
+#: createdb.c:230
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME          Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
 
-#: createdb.c:227 createlang.c:280 createuser.c:253 dropdb.c:150
-#: droplang.c:249 dropuser.c:150 clusterdb.c:244 vacuumdb.c:271
-msgid "  -p, --port=PORT           database server port\n"
-msgstr "  -p, --port=PORT           Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
+#: createdb.c:231
+#, c-format
+msgid "  -p, --port=PORT              database server port\n"
+msgstr "  -p, --port=PORT              Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
 
-#: createdb.c:228 createlang.c:281 dropdb.c:151 droplang.c:250 clusterdb.c:245
-#: vacuumdb.c:272
-msgid "  -U, --username=USERNAME   user name to connect as\n"
-msgstr "  -U, --username=USERNAME   Áª½ÓµÄÓû§Ãû\n"
+#: createdb.c:232
+#, c-format
+msgid "  -U, --username=USERNAME      user name to connect as\n"
+msgstr "  -U, --username=USERNAME      Áª½ÓµÄÓû§Ãû\n"
 
-#: createdb.c:229 createlang.c:282 dropdb.c:152 droplang.c:251 clusterdb.c:246
-#: vacuumdb.c:273
-msgid "  -W, --password            prompt for password\n"
-msgstr "  -W, --password            ÌáʾÊäÈë¿ÚÁî\n"
+#: createdb.c:233
+#, c-format
+msgid "  -W, --password               prompt for password\n"
+msgstr "  -W, --password               ÌáʾÊäÈë¿ÚÁî\n"
 
-#: createdb.c:230
+#: createdb.c:234
+#, c-format
 msgid ""
 "\n"
 "By default, a database with the same name as the current user is created.\n"
@@ -144,8 +154,9 @@ msgstr ""
 "\n"
 "ĬÈÏÇé¿öÏÂ, ÒÔµ±Ç°Óû§µÄÓû§Ãû´´½¨Êý¾Ý¿â.\n"
 
-#: createdb.c:231 createlang.c:285 createuser.c:258 dropdb.c:155
-#: droplang.c:254 dropuser.c:155 clusterdb.c:248 vacuumdb.c:275
+#: createdb.c:235 createlang.c:312 createuser.c:262 dropdb.c:159
+#: droplang.c:292 dropuser.c:159 clusterdb.c:252 vacuumdb.c:281
+#, c-format
 msgid ""
 "\n"
 "Report bugs to .\n"
@@ -153,115 +164,162 @@ msgstr ""
 "\n"
 "³ô³æ±¨¸æÖÁ .\n"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "Name"
 msgstr "Ãû×Ö"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "yes"
 msgstr "yes"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "no"
 msgstr "no"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "Trusted?"
 msgstr "ÊÇ·ñÐÅÈÎ?"
 
-#: createlang.c:147 droplang.c:141
+#: createlang.c:150 droplang.c:147
 msgid "Procedural Languages"
 msgstr "¹ý³ÌÓïÑÔ"
 
-#: createlang.c:156 droplang.c:150
+#: createlang.c:159 droplang.c:156
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: ȱÉÙÒªÇóµÄÓïÑÔÃû³Æ²ÎÊý\n"
 
-#: createlang.c:206
+#: createlang.c:210
 #, c-format
 msgid "%s: unsupported language \"%s\"\n"
 msgstr "%s: ²»Ö§³ÖÓïÑÔ \"%s\"\n"
 
-#: createlang.c:207
+#: createlang.c:211
+#, c-format
 msgid ""
 "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
 "plpythonu.\n"
-msgstr "ÒÑÖ§³ÖµÄÓïÑÔÓÐ plpgsql, pltcl, pltclu, plperl, plperlu, ºÍ plpythonu.\n"
+msgstr ""
+"ÒÑÖ§³ÖµÄÓïÑÔÓÐ plpgsql, pltcl, pltclu, plperl, plperlu, ºÍ plpythonu.\n"
 
-#: createlang.c:222
+#: createlang.c:226
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%1$s: Êý¾Ý¿â \"%3$s\" ÖÐÒѾ­°²×°ÁËÓïÑÔ \"%2$s\"\n"
 
-#: createlang.c:256
+#: createlang.c:283
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: ÓïÑÔ°²×°Ê§°Ü: %s"
 
-#: createlang.c:271
+#: createlang.c:298
 #, c-format
 msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
-msgstr "%s °²×°Ò»¸ö¹ý³ÌÓïÑÔ½ø PostgreSQL Êý¾Ý¿â.\n\n"
+msgstr ""
+"%s °²×°Ò»¸ö¹ý³ÌÓïÑÔ½ø PostgreSQL Êý¾Ý¿â.\n"
+"\n"
 
-#: createlang.c:273 droplang.c:243
+#: createlang.c:300 droplang.c:281
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... ÓïÑÔÃû³Æ [Êý¾Ý¿âÃû]\n"
 
-#: createlang.c:275
+#: createlang.c:302
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAME       Òª°²×°ÓïÑÔµÄÊý¾Ý¿â\n"
 
-#: createlang.c:277 droplang.c:247
+#: createlang.c:303 createuser.c:251 dropdb.c:150 droplang.c:284
+#: dropuser.c:150 clusterdb.c:242
+#, c-format
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr "  -e, --echo                ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
+
+#: createlang.c:304 droplang.c:285
+#, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
-msgstr ""
-"  -l, --list                ÏÔʾµ±Ç°ÒѾ­°²×°Á˵ÄÓïÑÔÁбí\n"
+msgstr "  -l, --list                ÏÔʾµ±Ç°ÒѾ­°²×°Á˵ÄÓïÑÔÁбí\n"
 
-#: createlang.c:278
+#: createlang.c:305
+#, c-format
 msgid ""
 "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-msgstr ""
-"  -L, --pglib=DIRECTORY     ÔÚ DIRECTORY Ŀ¼ÖвéÕÒÓïÑÔ·­ÒëÎļþ\n"
+msgstr "  -L, --pglib=DIRECTORY     ÔÚ DIRECTORY Ŀ¼ÖвéÕÒÓïÑÔ·­ÒëÎļþ\n"
+
+#: createlang.c:306 createuser.c:256 dropdb.c:153 droplang.c:286
+#: dropuser.c:153 clusterdb.c:247 vacuumdb.c:276
+#, c-format
+msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
+msgstr "  -h, --host=HOSTNAM        Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
+
+#: createlang.c:307 createuser.c:257 dropdb.c:154 droplang.c:287
+#: dropuser.c:154 clusterdb.c:248 vacuumdb.c:277
+#, c-format
+msgid "  -p, --port=PORT           database server port\n"
+msgstr "  -p, --port=PORT           Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
+
+#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:249 vacuumdb.c:278
+#, c-format
+msgid "  -U, --username=USERNAME   user name to connect as\n"
+msgstr "  -U, --username=USERNAME   Áª½ÓµÄÓû§Ãû\n"
+
+#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:250 vacuumdb.c:279
+#, c-format
+msgid "  -W, --password            prompt for password\n"
+msgstr "  -W, --password            ÌáʾÊäÈë¿ÚÁî\n"
+
+#: createlang.c:310 createuser.c:253 dropdb.c:157 droplang.c:290
+#: dropuser.c:157 clusterdb.c:244
+#, c-format
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createuser.c:141
+#: createlang.c:311 createuser.c:254 dropdb.c:158 droplang.c:291
+#: dropuser.c:158 clusterdb.c:245
+#, c-format
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+
+#: createuser.c:142
 #, c-format
 msgid "%s: user ID must be a positive number\n"
 msgstr "%s: Óû§ ID ±ØÐèΪһ¸öÕýÊý\n"
 
-#: createuser.c:147
+#: createuser.c:148
 msgid "Enter name of user to add: "
 msgstr "ÊäÈëÒªÔö¼ÓµÄÓû§Ãû: "
 
-#: createuser.c:154
+#: createuser.c:155
 msgid "Enter password for new user: "
 msgstr "ÊäÈëÐÂÓû§µÄ¿ÚÁî: "
 
-#: createuser.c:155
+#: createuser.c:156
 msgid "Enter it again: "
 msgstr "ÔÙÊäÈëÒ»±é: "
 
-#: createuser.c:158
+#: createuser.c:159
+#, c-format
 msgid "Passwords didn't match.\n"
 msgstr "¿ÚÁƥÅä.\n"
 
-#: createuser.c:169
+#: createuser.c:170
 msgid "Shall the new user be allowed to create databases? (y/n) "
 msgstr "ÐÂÓû§ÔÊÐí´´½¨Êý¾Ý¿âÂð? (y/n) "
 
-#: createuser.c:180
+#: createuser.c:181
 msgid "Shall the new user be allowed to create more new users? (y/n) "
 msgstr "ÐÂÓû§ÔÊÐí´´½¨Óû§Âð? (y/n) "
 
-#: createuser.c:219
+#: createuser.c:220
 #, c-format
 msgid "%s: creation of new user failed: %s"
 msgstr "%s: ´´½¨ÐÂÓû§Ê§°Ü: %s"
 
-#: createuser.c:235
+#: createuser.c:239
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL user.\n"
@@ -270,54 +328,69 @@ msgstr ""
 "%s ´´½¨Ò»¸öÐ嵀 PostgreSQL Óû§.\n"
 "\n"
 
-#: createuser.c:237 dropuser.c:144
+#: createuser.c:241 dropuser.c:148
 #, c-format
 msgid "  %s [OPTION]... [USERNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Óû§Ãû]\n"
 
-#: createuser.c:239
+#: createuser.c:243
+#, c-format
 msgid "  -a, --adduser             user can add new users\n"
 msgstr "  -a, --adduser             ´ËÓû§¿ÉÒÔ´´½¨ÆäËûÐÂÓû§\n"
 
-#: createuser.c:240
+#: createuser.c:244
+#, c-format
 msgid "  -A, --no-adduser          user cannot add new users\n"
 msgstr "  -A, --no-adduser          ´ËÓû§²»¿ÉÒÔ´´½¨ÆäËûÐÂÓû§\n"
 
-#: createuser.c:241
+#: createuser.c:245
+#, c-format
 msgid "  -d, --createdb            user can create new databases\n"
 msgstr "  -d, --createdb            ´ËÓû§¿ÉÒÔ´´½¨ÐÂÊý¾Ý¿â\n"
 
-#: createuser.c:242
+#: createuser.c:246
+#, c-format
 msgid "  -D, --no-createdb         user cannot create databases\n"
 msgstr "  -D, --no-createdb         ´ËÓû§²»¿ÉÒÔ´´½¨ÐÂÊý¾Ý¿â\n"
 
-#: createuser.c:243
+#: createuser.c:247
+#, c-format
 msgid "  -P, --pwprompt            assign a password to new user\n"
 msgstr "  -P, --pwprompt            ¸øÐÂÓû§Ö¸¶¨¿ÚÁî\n"
 
-#: createuser.c:244
+#: createuser.c:248
+#, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
 msgstr "  -E, --encrypted           ¿ÚÁî¼ÓÃÜ´æ´¢\n"
 
-#: createuser.c:245
+#: createuser.c:249
+#, c-format
 msgid "  -N, --unencrypted         do no encrypt stored password\n"
 msgstr "  -N, --unencrypted         ¿ÚÁî²»¼ÓÃÜ´æ´¢\n"
 
-#: createuser.c:246
+#: createuser.c:250
+#, c-format
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
 msgstr "  -i, --sysid=SYSID         Ñ¡ÔñÒ»¸ö sysid ¸øÐÂÓû§\n"
 
-#: createuser.c:254
+#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:243
+#, c-format
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               ²»Ð´ÈκÎÐÅÏ¢\n"
+
+#: createuser.c:258
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
-msgstr ""
-"  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇÒª´´½¨µÄÓû§Ãû)\n"
+msgstr "  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇÒª´´½¨µÄÓû§Ãû)\n"
 
-#: createuser.c:255 dropuser.c:152
+#: createuser.c:259 dropuser.c:156
+#, c-format
 msgid "  -W, --password            prompt for password to connect\n"
 msgstr "  -W, --password            Áª½ÓÌáʾ¿ÚÁîÊäÈë\n"
 
-#: createuser.c:256
+#: createuser.c:260
+#, c-format
 msgid ""
 "\n"
 "If one of -a, -A, -d, -D, and USERNAME is not specified, you will\n"
@@ -327,26 +400,26 @@ msgstr ""
 "Èç¹û -a, -A, -d, -D, ºÍ USERNAME Ò»¸ö¶¼Ã»ÓÐÖ¸¶¨,½«Ê¹Óý»»¥Ê½Ìáʾ\n"
 "Äã.\n"
 
-#: dropdb.c:91
+#: dropdb.c:92
 #, c-format
 msgid "%s: missing required argument database name\n"
 msgstr "%s: ȱÉÙÐèÒªµÄÊý¾Ý¿âÃû²ÎÊý\n"
 
-#: dropdb.c:108
+#: dropdb.c:109
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
 msgstr "Êý¾Ý¿â \"%s\" ½«±»ÓÀ¾ÃµÄɾ³ý.\n"
 
-#: dropdb.c:109 dropuser.c:110
+#: dropdb.c:110 dropuser.c:111
 msgid "Are you sure? (y/n) "
 msgstr "ÄãÈ·¶¨Âð? (y/n) "
 
-#: dropdb.c:126
+#: dropdb.c:127
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: Êý¾Ý¿âɾ³ýʧ°Ü: %s"
 
-#: dropdb.c:142
+#: dropdb.c:146
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -355,32 +428,33 @@ msgstr ""
 "%s ɾ³ýÒ»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: dropdb.c:144
+#: dropdb.c:148
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [Ñ¡Ïî]... Êý¾Ý¿âÃû\n"
 
-#: dropdb.c:147 dropuser.c:147
+#: dropdb.c:151 dropuser.c:151
+#, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         ɾ³ýÈκζ«Î÷֮ǰ¸øÓèÌáʾ\n"
 
-#: droplang.c:170
+#: droplang.c:176
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%1$s: Êý¾Ý¿â \"%3$s\" ÖÐ, ûÓа²×°ÓïÑÔ \"%2$s\"\n"
 
-#: droplang.c:186
+#: droplang.c:193
 #, c-format
 msgid ""
 "%s: still %s functions declared in language \"%s\"; language not removed\n"
 msgstr "%s: º¯Êý %s ÊÇÓÃÓïÑÔ \"%s\" ÉùÃ÷µÄ; ÓïÑÔδ±»É¾³ý\n"
 
-#: droplang.c:227
+#: droplang.c:265
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: ÓïÑÔɾ³ýʧ°Ü: %s"
 
-#: droplang.c:241
+#: droplang.c:279
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
@@ -389,27 +463,27 @@ msgstr ""
 "%s ´ÓÊý¾Ý¿âÖÐɾ³ýÒ»¸ö¹ý³ÌÓïÑÔ.\n"
 "\n"
 
-#: droplang.c:245
+#: droplang.c:283
+#, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr ""
-"  -d, --dbname=DBNAME       Ҫɾ³ýÓïÑÔµÄÊý¾Ý¿â\n"
+msgstr "  -d, --dbname=DBNAME       Ҫɾ³ýÓïÑÔµÄÊý¾Ý¿â\n"
 
-#: dropuser.c:103
+#: dropuser.c:104
 msgid "Enter name of user to drop: "
 msgstr "ÊäÈëҪɾ³ýµÄÓû§Ãû: "
 
-#: dropuser.c:109
+#: dropuser.c:110
 #, c-format
 msgid "User \"%s\" will be permanently removed.\n"
 msgstr "Óû§ \"%s\" ½«±»ÓÀ¾Ãɾ³ý.\n"
 
-#: dropuser.c:126
+#: dropuser.c:127
 #, c-format
 msgid "%s: removal of user \"%s\" failed: %s"
 msgstr "%s: ɾ³ýÓû§ \"%s\" ʧ°Ü: %s"
 
-#: dropuser.c:142
+#: dropuser.c:146
 #, c-format
 msgid ""
 "%s removes a PostgreSQL user.\n"
@@ -418,38 +492,38 @@ msgstr ""
 "%s ɾ³ýÒ»¸ö PostgreSQL Óû§.\n"
 "\n"
 
-#: dropuser.c:151
+#: dropuser.c:155
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
-msgstr ""
-"  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇҪɾ³ýµÄÓû§Ãû)\n"
+msgstr "  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇҪɾ³ýµÄÓû§Ãû)\n"
 
-#: clusterdb.c:119
+#: clusterdb.c:120
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr "%s: ÎÞ·¨¶ÔËùÓÐÊý¾Ý¿âºÍÒ»¸öÖ¸¶¨µÄÊý¾Ý¿âͬʱ½¨´Ø\n"
 
-#: clusterdb.c:125
+#: clusterdb.c:126
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr "%s: ÎÞ·¨ÔÚËùÓÐÊý¾Ý¿âÖжÔÒ»¸öÖ¸¶¨µÄ±í½øÐн¨´Ø\n"
 
-#: clusterdb.c:181
+#: clusterdb.c:182
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: ÔÚÊý¾Ý¿â \"%3$s\" Öеıí \"%2$s\" ½¨´Øʧ°Ü: %4$s"
 
-#: clusterdb.c:184
+#: clusterdb.c:185
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: Êý¾Ý¿â \"%s\" ½¨´Øʧ°Ü: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:221
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: ¶ÔÊý¾Ý¿â \"%s\" ½øÐн¨´Ø\n"
 
-#: clusterdb.c:231
+#: clusterdb.c:235
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -458,24 +532,28 @@ msgstr ""
 "%s ¶ÔÒ»¸öÊý¾Ý¿âÖÐÏÈÇ°ÒѾ­½¨¹ý´ØµÄ±í½øÐн¨´Ø.\n"
 "\n"
 
-#: clusterdb.c:233 vacuumdb.c:257
+#: clusterdb.c:237 vacuumdb.c:263
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû]\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:239
+#, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 ¶ÔËùÓÐÊý¾Ý¿â½¨´Ø\n"
 
-#: clusterdb.c:236
+#: clusterdb.c:240
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       ¶ÔÊý¾Ý¿â DBNAME ½¨´Ø\n"
 
-#: clusterdb.c:237
+#: clusterdb.c:241
+#, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         Ö»¶ÔÖ¸¶¨µÄ±í TABLE ½¨´Ø\n"
 
-#: clusterdb.c:247
+#: clusterdb.c:251
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
@@ -483,32 +561,32 @@ msgstr ""
 "\n"
 "ÔĶÁ SQL ÃüÁî CLUSTER µÄÃèÊöÐÅÏ¢, ÒÔ±ã»ñµÃ¸üÏêϸµÄÐÅÏ¢.\n"
 
-#: vacuumdb.c:135
+#: vacuumdb.c:137
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr "%s: ÎÞ·¨¶ÔËùÓÐÊý¾Ý¿âºÍÒ»¸öÖ¸¶¨µÄÊý¾Ý¿âͬʱÇåÀí\n"
 
-#: vacuumdb.c:141
+#: vacuumdb.c:143
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: ÎÞ·¨ÔÚËùÓÐÊý¾Ý¿âÖжÔÒ»¸öÖ¸¶¨µÄ±í½øÐÐÇåÀí\n"
 
-#: vacuumdb.c:204
+#: vacuumdb.c:207
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: ÔÚÊý¾Ý¿â \"%3$s\" Öеıí \"%2$s\" ÇåÀíʧ°Ü: %4$s"
 
-#: vacuumdb.c:207
+#: vacuumdb.c:210
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: Êý¾Ý¿â \"%s\" ÇåÀíʧ°Ü: %s"
 
-#: vacuumdb.c:241
+#: vacuumdb.c:247
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: ÇåÀíÊý¾Ý¿â \"%s\"\n"
 
-#: vacuumdb.c:255
+#: vacuumdb.c:261
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -517,52 +595,61 @@ msgstr ""
 "%s ÇåÀí²¢ÇÒÓÅ»¯Ò»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: vacuumdb.c:259
+#: vacuumdb.c:265
+#, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       ÇåÀíËùÓеÄÊý¾Ý¿â\n"
 
-#: vacuumdb.c:260
+#: vacuumdb.c:266
+#, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             ÇåÀíÊý¾Ý¿â DBNAME\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:267
+#, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr "  -t, --table='TABLE[(COLUMNS)]'  Ö»ÇåÀíÖ¸¶¨µÄ±í TABLE\n"
 
-#: vacuumdb.c:262
+#: vacuumdb.c:268
+#, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      ÍêÈ«ÇåÀí\n"
 
-#: vacuumdb.c:263
+#: vacuumdb.c:269
+#, c-format
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr "  -z, --anaylze                   ¸üÐÂÓÅ»¯Æ÷ÐÅÏ¢\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:270
+#, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
-msgstr ""
-"  -e, --echo                      ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
+msgstr "  -e, --echo                      ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:271
+#, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     ²»Ð´ÈκÎÐÅÏ¢\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:272
+#, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   д´óÁ¿µÄÊä³ö\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:273
+#, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:274
+#, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
-msgstr ""
-"  --versoin                       Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+msgstr "  --versoin                       Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:280
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
@@ -570,36 +657,40 @@ msgstr ""
 "\n"
 "ÔĶÁ SQL ÃüÁî VACUUM µÄÃèÊöÐÅÏ¢, ÒÔ±ã»ñµÃ¸üÏêϸµÄÐÅÏ¢.\n"
 
-#: common.c:88 common.c:114
+#: common.c:86 common.c:112
 msgid "Password: "
 msgstr "¿ÚÁî: "
 
-#: common.c:101
+#: common.c:99
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: ÎÞ·¨Áª½Óµ½Êý¾Ý¿â %s\n"
 
-#: common.c:124
+#: common.c:122
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: ÎÞ·¨Áª½Óµ½Êý¾Ý¿â %s: %s"
 
-#: common.c:148
+#: common.c:146
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ²éѯʧ°Ü: %s"
 
-#: common.c:149
+#: common.c:147
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: ²éѯÊÇ: %s\n"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:163
+#: common.c:161
 msgid "y"
 msgstr "y"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:165
+#: common.c:163
 msgid "n"
 msgstr "n"
+
+#~ msgid ""
+#~ "  -D, --location=PATH       alternative place to store the database\n"
+#~ msgstr "  -D, --location=PATH       Ñ¡ÔñÒ»¸öµØ·½´æ·ÅÊý¾Ý¿â\n"

diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po

index 85312779a9d9f7079cbeeee54ffd471036f92b65..61554aea1e6c35381b3015499e3a4d3ede2e09d0 100644 (file)

--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,15 +1,15 @@
 # simplified Chinese translation file for libpq\r
 # Bao Wei , 2002\r
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.4 2003/11/29 19:52:12 pgsql Exp $\r
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.5 2004/08/10 19:02:03 petere Exp $\r
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:45+0000\n"
+"POT-Creation-Date: 2004-07-22 09:41+0000\n"
 "PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
-"Last-Translator: Bao Wei <[email protected].cn>\n"
+"Last-Translator: Bao Wei <[email protected].cn>\n"
 "Language-Team: Weiping He \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
@@ -40,7 +40,7 @@ msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "ÎÞ·¨ÔÚÌ×½Ó×Ö: %s Éϻָ´·Ç×èÈûģʽ\n"
 
 # fe-auth.c:503\r
-#: fe-auth.c:509
+#: fe-auth.c:508
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "²»Ö§³Ö SCM_CRED ÈÏÖ¤·½Ê½\n"
 
@@ -50,47 +50,47 @@ msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 ÈÏ֤ʧ°Ü\n"
 
 # fe-auth.c:595\r
-#: fe-auth.c:606
+#: fe-auth.c:608
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "²»Ö§³Ö Kerberos 4 ÈÏÖ¤\n"
 
 # fe-auth.c:606\r
-#: fe-auth.c:616
+#: fe-auth.c:619
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 ÈÏ֤ʧ°Ü\n"
 
 # fe-auth.c:612\r
-#: fe-auth.c:622
+#: fe-auth.c:627
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "²»Ö§³Ö Kerberos 5 ÈÏÖ¤\n"
 
 # fe-auth.c:640\r
-#: fe-auth.c:650
+#: fe-auth.c:655
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "²»Ö§³Ö %u ÈÏÖ¤·½Ê½\n"
 
 # fe-auth.c:677\r
-#: fe-auth.c:687
+#: fe-auth.c:692
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "ºöÂÔ·Ç·¨ÈÏÖ¤·þÎñÃû \"%s\"\n"
 
 # fe-auth.c:734\r
-#: fe-auth.c:758
+#: fe-auth.c:764
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ÎÞЧµÄÈÏ֤ϵͳ: %d\n"
 
 #: fe-connect.c:452
 #, c-format
-msgid "unrecognized sslmode: \"%s\"\n"
-msgstr "²»±»ÈÏ¿ÉµÄ sslmode: \"%s\"\n"
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "ÎÞЧµÄ sslmode Öµ: \"%s\"\n"
 
 #: fe-connect.c:472
 #, c-format
-msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "ÎÞЧµÄ sslmode \"%s\", µ±Ã»ÓÐ°Ñ SSL Ö§³Ö±àÒë½øÀ´Ê±\n"
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "ÎÞЧµÄ sslmode ֵ \"%s\" µ±Ã»ÓÐ°Ñ SSL Ö§³Ö±àÒë½øÀ´Ê±\n"
 
 # fe-connect.c:708\r
 #: fe-connect.c:783
@@ -129,117 +129,117 @@ msgstr ""
 "%s É쵀 TCP/IP Áª½Ó?\n"
 
 # fe-misc.c:702\r
-#: fe-connect.c:937
+#: fe-connect.c:945
 #, c-format
-msgid "could not translate hostname \"%s\" to address: %s\n"
+msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "ÎÞ·¨½âÊÍÖ÷»úÃû \"%s\" µ½µØÖ·: %s\n"
 
 # fe-misc.c:702\r
-#: fe-connect.c:941
+#: fe-connect.c:949
 #, c-format
-msgid "could not translate local service to address: %s\n"
-msgstr "ÎÞ·¨½âÊͱ¾µØ·þÎñµ½µØÖ·: %s\n"
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "ÎÞ·¨½âÊÍ Unix-domian Ì×½Ó×Ö·¾¶ \"%s\" µ½µØÖ·: %s\n"
 
 # fe-connect.c:1232\r
-#: fe-connect.c:1144
+#: fe-connect.c:1153
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:891\r
-#: fe-connect.c:1187
+#: fe-connect.c:1196
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "ÎÞ·¨´´½¨Ì×½Ó×Ö: %s\n"
 
 # fe-connect.c:1263\r
-#: fe-connect.c:1298
+#: fe-connect.c:1307
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "ÎÞ·¨»ñÈ¡Ì×½Ó×Ö´íÎó״̬: %s\n"
 
 # fe-connect.c:1283\r
-#: fe-connect.c:1337
+#: fe-connect.c:1346
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "ÎÞ·¨´ÓÌ×½Ó×Ö»ñÈ¡¿Í»§¶ËµØÖ·: %s\n"
 
 # fe-connect.c:959\r
-#: fe-connect.c:1382
+#: fe-connect.c:1391
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍ SSL ÎÕÊÖ°ü: %s\n"
 
 # fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284\r
 # fe-lobj.c:536\r
-#: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
-#: fe-lobj.c:540
+#: fe-connect.c:1413 fe-connect.c:2536 fe-connect.c:2545 fe-connect.c:3112
+#: fe-lobj.c:548
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
 
 # fe-connect.c:1322\r
-#: fe-connect.c:1417
+#: fe-connect.c:1426
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍÆô¶¯°ü: %s\n"
 
 # fe-connect.c:972\r
-#: fe-connect.c:1457
+#: fe-connect.c:1466
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "ÎÞ·¨ÊÕµ½·þÎñÆ÷¶Ô SSL ÎÕÊÖ°üµÄÏìÓ¦: %s\n"
 
 # fe-connect.c:1010\r
-#: fe-connect.c:1476 fe-connect.c:1493
+#: fe-connect.c:1485 fe-connect.c:1502
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "·þÎñÆ÷²»Ö§³Ö SSL, µ«ÊÇÒªÇóʹÓà SSL\n"
 
 # fe-connect.c:1001\r
-#: fe-connect.c:1509
+#: fe-connect.c:1518
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ÊÕµ½¶Ô SSL ÎÕÊÖµÄÎÞЧÏìÓ¦: %c\n"
 
 # fe-connect.c:1378\r
-#: fe-connect.c:1566 fe-connect.c:1598
+#: fe-connect.c:1575 fe-connect.c:1607
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ÆÚ´ýÀ´×Ô·þÎñÆ÷µÄÈÏÖ¤ÇëÇó, È´ÊÕµ½ %c\n"
 
 # fe-connect.c:1490\r
-#: fe-connect.c:1834
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "Æô¶¯¹ý³ÌÖÐÊÕµ½À´×Ô·þÎñÆ÷µÄ·ÇÔ¤ÆÚÐÅÏ¢\n"
 
 # fe-connect.c:1549\r
-#: fe-connect.c:1904
+#: fe-connect.c:1913
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:2475\r
-#: fe-connect.c:2559
+#: fe-connect.c:2584
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "ÔÚÁª½ÓÐÅÏ¢×Ö´®ÀïµÄ \"%s\" ºóÃæȱÉÙ \"=\"\n"
 
 # fe-connect.c:2524\r
-#: fe-connect.c:2608
+#: fe-connect.c:2633
 msgid "unterminated quoted string in connection info string\n"
 msgstr "Áª½ÓÐÅÏ¢×Ö´®ÖÐδ½áÊøµÄÒýºÅ×Ö´®\n"
 
 # fe-connect.c:2558\r
-#: fe-connect.c:2642
+#: fe-connect.c:2667
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "·Ç·¨Áª½ÓÑ¡Ïî \"%s\"\n"
 
 # fe-connect.c:2744\r
-#: fe-connect.c:2854
+#: fe-connect.c:2879
 msgid "connection pointer is NULL\n"
 msgstr "Áª½ÓÖ¸ÕëÊÇ NULL\n"
 
 # fe-connect.c:2953\r
-#: fe-connect.c:3105
+#: fe-connect.c:3130
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -251,78 +251,78 @@ msgid "NOTICE"
 msgstr "×¢Òâ"
 
 # fe-exec.c:737\r
-#: fe-exec.c:637 fe-exec.c:689
+#: fe-exec.c:653 fe-exec.c:705
 msgid "command string is a null pointer\n"
 msgstr "ÃüÁî×Ö´®ÊÇÒ»¸ö¿ÕÖ¸Õë\n"
 
 # fe-exec.c:737\r
-#: fe-exec.c:724
+#: fe-exec.c:740
 msgid "statement name is a null pointer\n"
 msgstr "ÉùÃ÷Ãû×ÖÊÇÒ»¸ö¿ÕÖ¸Õë\n"
 
 # fe-exec.c:745\r
-#: fe-exec.c:755
+#: fe-exec.c:771
 msgid "no connection to the server\n"
 msgstr "ûÓе½·þÎñÆ÷µÄÁª½Ó\n"
 
 # fe-exec.c:752\r
-#: fe-exec.c:762
+#: fe-exec.c:778
 msgid "another command is already in progress\n"
 msgstr "ÒѾ­ÓÐÁíÍâÒ»ÌõÃüÁîÔÚ´¦Àí\n"
 
-#: fe-exec.c:798 fe-exec.c:1432
-msgid "function requires at least 3.0 protocol\n"
+#: fe-exec.c:814 fe-exec.c:1465
+msgid "function requires at least protocol version 3.0\n"
 msgstr "º¯ÊýÖÁÉÙÐèÒª 3.0 °æ±¾µÄЭÒé\n"
 
 # fe-exec.c:1371\r
-#: fe-exec.c:1100
+#: fe-exec.c:1116
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "ÒâÍâµÄ asyncStatus(Ò첽״̬): %d\n"
 
-#: fe-exec.c:1205
+#: fe-exec.c:1221
 msgid "COPY terminated by new PQexec"
 msgstr "COPY ±»Ò»¸öÐ嵀 PQexec ÖÕÖ¹"
 
 # fe-exec.c:1421\r
-#: fe-exec.c:1213
+#: fe-exec.c:1229
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN ״̬±ØÐëÏȽáÊø\n"
 
 # fe-exec.c:1421\r
-#: fe-exec.c:1233
+#: fe-exec.c:1249
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT ״̬±ØÐëÏȽáÊø\n"
 
 # fe-exec.c:1780\r
-#: fe-exec.c:1336 fe-exec.c:1390 fe-exec.c:1474
+#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1507
 msgid "no COPY in progress\n"
 msgstr "ûÓÐÕýÔÚ´¦ÀíµÄ COPY\n"
 
 # fe-exec.c:1884\r
-#: fe-exec.c:1666
+#: fe-exec.c:1699
 msgid "connection in wrong state\n"
 msgstr "Áª½Ó´¦ÓÚ´íÎó״̬\n"
 
 # fe-exec.c:2055\r
-#: fe-exec.c:1697
+#: fe-exec.c:1730
 msgid "invalid ExecStatusType code"
 msgstr "·Ç·¨ ExecStatusType ´úÂë"
 
 # fe-exec.c:2108 fe-exec.c:2141\r
-#: fe-exec.c:1761 fe-exec.c:1784
+#: fe-exec.c:1794 fe-exec.c:1817
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "ÁкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
 
 # fe-exec.c:2130\r
-#: fe-exec.c:1777
+#: fe-exec.c:1810
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "ÐкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
 
 # fe-exec.c:2325\r
-#: fe-exec.c:2014
+#: fe-exec.c:2094
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "ÎÞ·¨½âÊÍÀ´×Ô·þÎñÆ÷µÄ½á¹û: %s"
@@ -352,53 +352,53 @@ msgid "error while reading file \"%s\"\n"
 msgstr "¶ÁÈ¡Îļþ \"%s\" ʱ³ö´í\n"
 
 # fe-lobj.c:498\r
-#: fe-lobj.c:502
+#: fe-lobj.c:502 fe-lobj.c:515
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "дÈëÎļþ \"%s\" ʱ³ö´í\n"
 
 # fe-lobj.c:564\r
-#: fe-lobj.c:568
+#: fe-lobj.c:593
 msgid "query to initialize large object functions did not return data\n"
 msgstr "³õʼ»¯´ó¶ÔÏóº¯ÊýµÄ²éѯûÓзµ»ØÊý¾Ý\n"
 
 # fe-lobj.c:602\r
-#: fe-lobj.c:606
+#: fe-lobj.c:631
 msgid "cannot determine OID of function lo_open\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_open µÄ OID\n"
 
 # fe-lobj.c:609\r
-#: fe-lobj.c:613
+#: fe-lobj.c:638
 msgid "cannot determine OID of function lo_close\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_close µÄ OID\n"
 
 # fe-lobj.c:616\r
-#: fe-lobj.c:620
+#: fe-lobj.c:645
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_creat µÄ OID\n"
 
 # fe-lobj.c:623\r
-#: fe-lobj.c:627
+#: fe-lobj.c:652
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_unlink µÄ OID\n"
 
 # fe-lobj.c:630\r
-#: fe-lobj.c:634
+#: fe-lobj.c:659
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_lseek µÄ OID\n"
 
 # fe-lobj.c:637\r
-#: fe-lobj.c:641
+#: fe-lobj.c:666
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_tell µÄ OID\n"
 
 # fe-lobj.c:644\r
-#: fe-lobj.c:648
+#: fe-lobj.c:673
 msgid "cannot determine OID of function loread\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý loread µÄ OID\n"
 
 # fe-lobj.c:651\r
-#: fe-lobj.c:655
+#: fe-lobj.c:680
 msgid "cannot determine OID of function lowrite\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lowrite µÄ OID\n"
 
@@ -442,141 +442,145 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "ÎÞ·¨Ïò·þÎñÆ÷·¢ËÍÊý¾Ý: %s\n"
 
-#: fe-misc.c:905
+#: fe-misc.c:922
 msgid "timeout expired\n"
 msgstr "³¬Ê±Âú\n"
 
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798\r
-#: fe-misc.c:950
+#: fe-misc.c:967
 msgid "socket not open\n"
 msgstr "Ì×½Ó×Öδ´ò¿ª\n"
 
 # fe-misc.c:389 fe-misc.c:423 fe-misc.c:838\r
-#: fe-misc.c:973
+#: fe-misc.c:990
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() ʧ°Ü: %s\n"
 
-#: fe-secure.c:246
+#: fe-secure.c:260
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "ÎÞ·¨½¨Á¢ SSL Áª½Ó: %s\n"
 
-#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:894
+#: fe-secure.c:323 fe-secure.c:403 fe-secure.c:1022
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL ´íÎó: %s\n"
 
-#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:898
+#: fe-secure.c:328 fe-secure.c:408 fe-secure.c:1026
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL ´íÎó: ·¢ÏÖ½áÊø·û\n"
 
 # fe-auth.c:232\r
-#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
+#: fe-secure.c:339 fe-secure.c:418 fe-secure.c:1034
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL ´íÎó: %s\n"
 
-#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:910
-msgid "Unknown SSL error code\n"
+#: fe-secure.c:349 fe-secure.c:428 fe-secure.c:1042
+msgid "unrecognized SSL error code\n"
 msgstr "δ֪µÄ SSL ´íÎóÂë\n"
 
 # fe-lobj.c:498\r
-#: fe-secure.c:459
+#: fe-secure.c:490
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "²éѯÌ×½Ó×Ö´íÎó: %s\n"
 
 # fe-connect.c:1263\r
-#: fe-secure.c:481
+#: fe-secure.c:518
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "ÎÞ·¨»ñÈ¡¹ØÓÚÖ÷»ú (%s) µÄÐÅÏ¢: %s\n"
 
-#: fe-secure.c:500
+#: fe-secure.c:537
 msgid "unsupported protocol\n"
 msgstr "²»Ö§³ÖµÄЭÒé\n"
 
-#: fe-secure.c:522
+#: fe-secure.c:559
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½ %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:529
+#: fe-secure.c:566
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½¶Ô¶ËµØÖ·\n"
 
 # fe-connect.c:1263\r
-#: fe-secure.c:704
+#: fe-secure.c:749
 msgid "could not get user information\n"
 msgstr "ÎÞ·¨»ñÈ¡Óû§ÐÅÏ¢\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:716
+#: fe-secure.c:761
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "ÎÞ·¨´ò¿ªÖ¤Êé (%s): %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:723
+#: fe-secure.c:769
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡Ö¤Êé (%s): %s\n"
 
-#: fe-secure.c:736
+#: fe-secure.c:783
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "ÓÐÖ¤Êé, µ«²»ÊÇ˽Կ (%s)\n"
 
-#: fe-secure.c:745
+#: fe-secure.c:792
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "˽Կ (%s) ÓдíÎóµÄÐí¿É\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:752
+#: fe-secure.c:799
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "ÎÞ·¨´ò¿ªË½Ô¿Îļþ (%s): %s\n"
 
-#: fe-secure.c:761
+#: fe-secure.c:808
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "ÔÚÖ´Ðйý³ÌÖÐ˽Կ (%s) ¸Ä±äÁË\n"
 
 # fe-connect.c:891\r
-#: fe-secure.c:768
+#: fe-secure.c:816
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "ÎÞ·¨¶Áȡ˽Կ (%s): %s\n"
 
-#: fe-secure.c:780
+#: fe-secure.c:830
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "Ö¤Êé/˽Կ²»Æ¥Åä (%s): %s\n"
 
-#: fe-secure.c:810
+#: fe-secure.c:909
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "ÎÞ·¨´´½¨ SSL »·¾³: %s\n"
 
 # fe-connect.c:891\r
-#: fe-secure.c:828 fe-secure.c:836
+#: fe-secure.c:953 fe-secure.c:962
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡¸ùÖ¤ÊéÁбí (%s): %s\n"
 
-#: fe-secure.c:929
+#: fe-secure.c:1061
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "ÎÞ·¨ÑéÖ¤Ö¤Êé: %s\n"
 
-#: fe-secure.c:941
+#: fe-secure.c:1074
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "ÎÞ·¨»ñµÃÖ¤Êé: %s\n"
 
+# fe-misc.c:702\r
+#~ msgid "could not translate local service to address: %s\n"
+#~ msgstr "ÎÞ·¨½âÊͱ¾µØ·þÎñµ½µØÖ·: %s\n"
+
 # fe-connect.c:1010\r
 #~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
 #~ msgstr "·þÎñÆ÷²»Ö§³Ö SSL, ²¢ÇÒÏÈÇ°·Ç SSL ³¢ÊÔʧ°Ü\n"

This is the main PostgreSQL git repository.
RSS
Atom















































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































































window.onload = function () {
	var tz_cookie = { name: 'gitweb_tz', expires: 14, path: '/' };
	onloadTZSetup('local', tz_cookie, 'datetime');
};

diff --git a/src/bin/scripts/po/zh_CN.po b/src/bin/scripts/po/zh_CN.po
index 85e69c5e05089e94409cbe036941581553bb6074..1785518173c5203e4ffb23b62828d88d1bbe1efd 100644 (file)
--- a/src/bin/scripts/po/zh_CN.po
+++ b/src/bin/scripts/po/zh_CN.po
@@ -6,44 +6,44 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-05 22:14+0000\n"
+"POT-Creation-Date: 2004-06-26 10:44+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
-"Last-Translator: Bao Wei <[email protected].cn>\n"
+"Last-Translator: Bao Wei <[email protected].cn>\n"
 "Language-Team: Weiping He \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: createdb.c:101 createdb.c:120 createlang.c:94 createlang.c:115
-#: createlang.c:157 createuser.c:116 createuser.c:131 dropdb.c:83 dropdb.c:92
-#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:151 dropuser.c:83
-#: dropuser.c:98 clusterdb.c:96 clusterdb.c:111 vacuumdb.c:112 vacuumdb.c:127
+#: createdb.c:102 createdb.c:121 createlang.c:97 createlang.c:118
+#: createlang.c:160 createuser.c:117 createuser.c:132 dropdb.c:84 dropdb.c:93
+#: dropdb.c:101 droplang.c:94 droplang.c:115 droplang.c:157 dropuser.c:84
+#: dropuser.c:99 clusterdb.c:97 clusterdb.c:112 vacuumdb.c:114 vacuumdb.c:129
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "ÇëÓà \"%s --help\" »ñÈ¡¸ü¶àµÄÐÅÏ¢.\n"
 
-#: createdb.c:118 createlang.c:113 createuser.c:129 dropdb.c:98 droplang.c:107
-#: dropuser.c:96 clusterdb.c:109 vacuumdb.c:125
+#: createdb.c:119 createlang.c:116 createuser.c:130 dropdb.c:99 droplang.c:113
+#: dropuser.c:97 clusterdb.c:110 vacuumdb.c:127
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: Ì«¶àµÄÃüÁîÐвÎÊý (µÚÒ»¸öÊÇ \"%s\")\n"
 
-#: createdb.c:128
+#: createdb.c:129
 #, c-format
 msgid "%s: \"%s\" is not a valid encoding name\n"
 msgstr "%s: \"%s\" ²»ÊÇÒ»¸öÓÐЧµÄ±àÂëÃû³Æ\n"
 
-#: createdb.c:170
+#: createdb.c:168
 #, c-format
 msgid "%s: database creation failed: %s"
 msgstr "%s: ´´½¨Êý¾Ý¿âʧ°Ü: %s"
 
-#: createdb.c:195
+#: createdb.c:196
 #, c-format
 msgid "%s: comment creation failed (database was created): %s"
 msgstr "%s: ´´½¨×¢ÊÍʧ°Ü (Êý¾Ý¿âÒÑ´´½¨): %s"
 
-#: createdb.c:213
+#: createdb.c:217
 #, c-format
 msgid ""
 "%s creates a PostgreSQL database.\n"
@@ -52,18 +52,20 @@ msgstr ""
 "%s ´´½¨Ò»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: createdb.c:214 createlang.c:272 createuser.c:236 dropdb.c:143
-#: droplang.c:242 dropuser.c:143 clusterdb.c:232 vacuumdb.c:256
+#: createdb.c:218 createlang.c:299 createuser.c:240 dropdb.c:147
+#: droplang.c:280 dropuser.c:147 clusterdb.c:236 vacuumdb.c:262
+#, c-format
 msgid "Usage:\n"
 msgstr "ʹÓ÷½·¨:\n"
 
-#: createdb.c:215
+#: createdb.c:219
 #, c-format
 msgid "  %s [OPTION]... [DBNAME] [DESCRIPTION]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû³Æ] [ÃèÊö]\n"
 
-#: createdb.c:216 createlang.c:274 createuser.c:238 dropdb.c:145
-#: droplang.c:244 dropuser.c:145 clusterdb.c:234 vacuumdb.c:258
+#: createdb.c:220 createlang.c:301 createuser.c:242 dropdb.c:149
+#: droplang.c:282 dropuser.c:149 clusterdb.c:238 vacuumdb.c:264
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
@@ -71,44 +73,49 @@ msgstr ""
 "\n"
 "Ñ¡Ïî:\n"
 
-#: createdb.c:217
-msgid "  -D, --location=PATH       alternative place to store the database\n"
-msgstr "  -D, --location=PATH       Ñ¡ÔñÒ»¸öµØ·½´æ·ÅÊý¾Ý¿â\n"
+#: createdb.c:221
+#, c-format
+msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
+msgstr "  -D, --tablespace=TABLESPACE  Êý¾Ý¿âĬÈϱí¿Õ¼ä\n"
 
-#: createdb.c:218
-msgid "  -E, --encoding=ENCODING   encoding for the database\n"
-msgstr "  -E, --encoding=ENCODING   Êý¾Ý¿â±àÂë\n"
+#: createdb.c:222
+#, c-format
+msgid "  -E, --encoding=ENCODING      encoding for the database\n"
+msgstr "  -E, --encoding=ENCODING      Êý¾Ý¿â±àÂë\n"
 
-#: createdb.c:219
-msgid "  -O, --owner=OWNER         database user to own the new database\n"
-msgstr "  -O, --owner=OWNER         ÐÂÊý¾Ý¿âµÄËùÊôÓû§\n"
+#: createdb.c:223
+#, c-format
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr "  -O, --owner=OWNER            ÐÂÊý¾Ý¿âµÄËùÊôÓû§\n"
 
-#: createdb.c:220
-msgid "  -T, --template=TEMPLATE   template database to copy\n"
-msgstr "  -T, --template=TEMPLATE   Òª¿½±´µÄÊý¾Ý¿âÄ£°å\n"
+#: createdb.c:224
+#, c-format
+msgid "  -T, --template=TEMPLATE      template database to copy\n"
+msgstr "  -T, --template=TEMPLATE      Òª¿½±´µÄÊý¾Ý¿âÄ£°å\n"
 
-#: createdb.c:221 createlang.c:276 createuser.c:247 dropdb.c:146
-#: droplang.c:246 dropuser.c:146 clusterdb.c:238
+#: createdb.c:225
+#, c-format
 msgid ""
-"  -e, --echo                show the commands being sent to the server\n"
-msgstr ""
-"  -e, --echo                ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
+"  -e, --echo                   show the commands being sent to the server\n"
+msgstr "  -e, --echo                   ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
 
-#: createdb.c:222 createuser.c:248 dropdb.c:148 dropuser.c:148 clusterdb.c:239
-msgid "  -q, --quiet               don't write any messages\n"
-msgstr "  -q, --quiet               ²»Ð´ÈκÎÐÅÏ¢\n"
+#: createdb.c:226
+#, c-format
+msgid "  -q, --quiet                  don't write any messages\n"
+msgstr "  -q, --quiet                  ²»Ð´ÈκÎÐÅÏ¢\n"
 
-#: createdb.c:223 createlang.c:283 createuser.c:249 dropdb.c:153
-#: droplang.c:252 dropuser.c:153 clusterdb.c:240
-msgid "  --help                    show this help, then exit\n"
-msgstr "  --help                    ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
+#: createdb.c:227
+#, c-format
+msgid "  --help                       show this help, then exit\n"
+msgstr "  --help                       ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createdb.c:224 createlang.c:284 createuser.c:250 dropdb.c:154
-#: droplang.c:253 dropuser.c:154 clusterdb.c:241
-msgid "  --version                 output version information, then exit\n"
-msgstr "  --version                 Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+#: createdb.c:228
+#, c-format
+msgid "  --version                    output version information, then exit\n"
+msgstr "  --versoin                    Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createdb.c:225 createuser.c:251 clusterdb.c:242 vacuumdb.c:269
+#: createdb.c:229 createuser.c:255 clusterdb.c:246 vacuumdb.c:275
+#, c-format
 msgid ""
 "\n"
 "Connection options:\n"
@@ -116,27 +123,30 @@ msgstr ""
 "\n"
 "Áª½ÓÑ¡Ïî:\n"
 
-#: createdb.c:226 createlang.c:279 createuser.c:252 dropdb.c:149
-#: droplang.c:248 dropuser.c:149 clusterdb.c:243 vacuumdb.c:270
-msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
-msgstr "  -h, --host=HOSTNAM        Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
+#: createdb.c:230
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME          Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
 
-#: createdb.c:227 createlang.c:280 createuser.c:253 dropdb.c:150
-#: droplang.c:249 dropuser.c:150 clusterdb.c:244 vacuumdb.c:271
-msgid "  -p, --port=PORT           database server port\n"
-msgstr "  -p, --port=PORT           Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
+#: createdb.c:231
+#, c-format
+msgid "  -p, --port=PORT              database server port\n"
+msgstr "  -p, --port=PORT              Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
 
-#: createdb.c:228 createlang.c:281 dropdb.c:151 droplang.c:250 clusterdb.c:245
-#: vacuumdb.c:272
-msgid "  -U, --username=USERNAME   user name to connect as\n"
-msgstr "  -U, --username=USERNAME   Áª½ÓµÄÓû§Ãû\n"
+#: createdb.c:232
+#, c-format
+msgid "  -U, --username=USERNAME      user name to connect as\n"
+msgstr "  -U, --username=USERNAME      Áª½ÓµÄÓû§Ãû\n"
 
-#: createdb.c:229 createlang.c:282 dropdb.c:152 droplang.c:251 clusterdb.c:246
-#: vacuumdb.c:273
-msgid "  -W, --password            prompt for password\n"
-msgstr "  -W, --password            ÌáʾÊäÈë¿ÚÁî\n"
+#: createdb.c:233
+#, c-format
+msgid "  -W, --password               prompt for password\n"
+msgstr "  -W, --password               ÌáʾÊäÈë¿ÚÁî\n"
 
-#: createdb.c:230
+#: createdb.c:234
+#, c-format
 msgid ""
 "\n"
 "By default, a database with the same name as the current user is created.\n"
@@ -144,8 +154,9 @@ msgstr ""
 "\n"
 "ĬÈÏÇé¿öÏÂ, ÒÔµ±Ç°Óû§µÄÓû§Ãû´´½¨Êý¾Ý¿â.\n"
 
-#: createdb.c:231 createlang.c:285 createuser.c:258 dropdb.c:155
-#: droplang.c:254 dropuser.c:155 clusterdb.c:248 vacuumdb.c:275
+#: createdb.c:235 createlang.c:312 createuser.c:262 dropdb.c:159
+#: droplang.c:292 dropuser.c:159 clusterdb.c:252 vacuumdb.c:281
+#, c-format
 msgid ""
 "\n"
 "Report bugs to .\n"
@@ -153,115 +164,162 @@ msgstr ""
 "\n"
 "³ô³æ±¨¸æÖÁ .\n"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "Name"
 msgstr "Ãû×Ö"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "yes"
 msgstr "yes"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "no"
 msgstr "no"
 
-#: createlang.c:140 droplang.c:134
+#: createlang.c:143 droplang.c:140
 msgid "Trusted?"
 msgstr "ÊÇ·ñÐÅÈÎ?"
 
-#: createlang.c:147 droplang.c:141
+#: createlang.c:150 droplang.c:147
 msgid "Procedural Languages"
 msgstr "¹ý³ÌÓïÑÔ"
 
-#: createlang.c:156 droplang.c:150
+#: createlang.c:159 droplang.c:156
 #, c-format
 msgid "%s: missing required argument language name\n"
 msgstr "%s: ȱÉÙÒªÇóµÄÓïÑÔÃû³Æ²ÎÊý\n"
 
-#: createlang.c:206
+#: createlang.c:210
 #, c-format
 msgid "%s: unsupported language \"%s\"\n"
 msgstr "%s: ²»Ö§³ÖÓïÑÔ \"%s\"\n"
 
-#: createlang.c:207
+#: createlang.c:211
+#, c-format
 msgid ""
 "Supported languages are plpgsql, pltcl, pltclu, plperl, plperlu, and "
 "plpythonu.\n"
-msgstr "ÒÑÖ§³ÖµÄÓïÑÔÓÐ plpgsql, pltcl, pltclu, plperl, plperlu, ºÍ plpythonu.\n"
+msgstr ""
+"ÒÑÖ§³ÖµÄÓïÑÔÓÐ plpgsql, pltcl, pltclu, plperl, plperlu, ºÍ plpythonu.\n"
 
-#: createlang.c:222
+#: createlang.c:226
 #, c-format
 msgid "%s: language \"%s\" is already installed in database \"%s\"\n"
 msgstr "%1$s: Êý¾Ý¿â \"%3$s\" ÖÐÒѾ­°²×°ÁËÓïÑÔ \"%2$s\"\n"
 
-#: createlang.c:256
+#: createlang.c:283
 #, c-format
 msgid "%s: language installation failed: %s"
 msgstr "%s: ÓïÑÔ°²×°Ê§°Ü: %s"
 
-#: createlang.c:271
+#: createlang.c:298
 #, c-format
 msgid ""
 "%s installs a procedural language into a PostgreSQL database.\n"
 "\n"
-msgstr "%s °²×°Ò»¸ö¹ý³ÌÓïÑÔ½ø PostgreSQL Êý¾Ý¿â.\n\n"
+msgstr ""
+"%s °²×°Ò»¸ö¹ý³ÌÓïÑÔ½ø PostgreSQL Êý¾Ý¿â.\n"
+"\n"
 
-#: createlang.c:273 droplang.c:243
+#: createlang.c:300 droplang.c:281
 #, c-format
 msgid "  %s [OPTION]... LANGNAME [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... ÓïÑÔÃû³Æ [Êý¾Ý¿âÃû]\n"
 
-#: createlang.c:275
+#: createlang.c:302
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to install language in\n"
 msgstr "  -d, --dbname=DBNAME       Òª°²×°ÓïÑÔµÄÊý¾Ý¿â\n"
 
-#: createlang.c:277 droplang.c:247
+#: createlang.c:303 createuser.c:251 dropdb.c:150 droplang.c:284
+#: dropuser.c:150 clusterdb.c:242
+#, c-format
+msgid ""
+"  -e, --echo                show the commands being sent to the server\n"
+msgstr "  -e, --echo                ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
+
+#: createlang.c:304 droplang.c:285
+#, c-format
 msgid ""
 "  -l, --list                show a list of currently installed languages\n"
-msgstr ""
-"  -l, --list                ÏÔʾµ±Ç°ÒѾ­°²×°Á˵ÄÓïÑÔÁбí\n"
+msgstr "  -l, --list                ÏÔʾµ±Ç°ÒѾ­°²×°Á˵ÄÓïÑÔÁбí\n"
 
-#: createlang.c:278
+#: createlang.c:305
+#, c-format
 msgid ""
 "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-msgstr ""
-"  -L, --pglib=DIRECTORY     ÔÚ DIRECTORY Ŀ¼ÖвéÕÒÓïÑÔ·­ÒëÎļþ\n"
+msgstr "  -L, --pglib=DIRECTORY     ÔÚ DIRECTORY Ŀ¼ÖвéÕÒÓïÑÔ·­ÒëÎļþ\n"
+
+#: createlang.c:306 createuser.c:256 dropdb.c:153 droplang.c:286
+#: dropuser.c:153 clusterdb.c:247 vacuumdb.c:276
+#, c-format
+msgid "  -h, --host=HOSTNAME       database server host or socket directory\n"
+msgstr "  -h, --host=HOSTNAM        Êý¾Ý¿â·þÎñÆ÷ËùÔÚ»úÆ÷µÄÖ÷»úÃû»òÌ×½Ó×ÖĿ¼\n"
+
+#: createlang.c:307 createuser.c:257 dropdb.c:154 droplang.c:287
+#: dropuser.c:154 clusterdb.c:248 vacuumdb.c:277
+#, c-format
+msgid "  -p, --port=PORT           database server port\n"
+msgstr "  -p, --port=PORT           Êý¾Ý¿â·þÎñÆ÷¶Ë¿ÚºÅ\n"
+
+#: createlang.c:308 dropdb.c:155 droplang.c:288 clusterdb.c:249 vacuumdb.c:278
+#, c-format
+msgid "  -U, --username=USERNAME   user name to connect as\n"
+msgstr "  -U, --username=USERNAME   Áª½ÓµÄÓû§Ãû\n"
+
+#: createlang.c:309 dropdb.c:156 droplang.c:289 clusterdb.c:250 vacuumdb.c:279
+#, c-format
+msgid "  -W, --password            prompt for password\n"
+msgstr "  -W, --password            ÌáʾÊäÈë¿ÚÁî\n"
+
+#: createlang.c:310 createuser.c:253 dropdb.c:157 droplang.c:290
+#: dropuser.c:157 clusterdb.c:244
+#, c-format
+msgid "  --help                    show this help, then exit\n"
+msgstr "  --help                    ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: createuser.c:141
+#: createlang.c:311 createuser.c:254 dropdb.c:158 droplang.c:291
+#: dropuser.c:158 clusterdb.c:245
+#, c-format
+msgid "  --version                 output version information, then exit\n"
+msgstr "  --version                 Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+
+#: createuser.c:142
 #, c-format
 msgid "%s: user ID must be a positive number\n"
 msgstr "%s: Óû§ ID ±ØÐèΪһ¸öÕýÊý\n"
 
-#: createuser.c:147
+#: createuser.c:148
 msgid "Enter name of user to add: "
 msgstr "ÊäÈëÒªÔö¼ÓµÄÓû§Ãû: "
 
-#: createuser.c:154
+#: createuser.c:155
 msgid "Enter password for new user: "
 msgstr "ÊäÈëÐÂÓû§µÄ¿ÚÁî: "
 
-#: createuser.c:155
+#: createuser.c:156
 msgid "Enter it again: "
 msgstr "ÔÙÊäÈëÒ»±é: "
 
-#: createuser.c:158
+#: createuser.c:159
+#, c-format
 msgid "Passwords didn't match.\n"
 msgstr "¿ÚÁƥÅä.\n"
 
-#: createuser.c:169
+#: createuser.c:170
 msgid "Shall the new user be allowed to create databases? (y/n) "
 msgstr "ÐÂÓû§ÔÊÐí´´½¨Êý¾Ý¿âÂð? (y/n) "
 
-#: createuser.c:180
+#: createuser.c:181
 msgid "Shall the new user be allowed to create more new users? (y/n) "
 msgstr "ÐÂÓû§ÔÊÐí´´½¨Óû§Âð? (y/n) "
 
-#: createuser.c:219
+#: createuser.c:220
 #, c-format
 msgid "%s: creation of new user failed: %s"
 msgstr "%s: ´´½¨ÐÂÓû§Ê§°Ü: %s"
 
-#: createuser.c:235
+#: createuser.c:239
 #, c-format
 msgid ""
 "%s creates a new PostgreSQL user.\n"
@@ -270,54 +328,69 @@ msgstr ""
 "%s ´´½¨Ò»¸öÐ嵀 PostgreSQL Óû§.\n"
 "\n"
 
-#: createuser.c:237 dropuser.c:144
+#: createuser.c:241 dropuser.c:148
 #, c-format
 msgid "  %s [OPTION]... [USERNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Óû§Ãû]\n"
 
-#: createuser.c:239
+#: createuser.c:243
+#, c-format
 msgid "  -a, --adduser             user can add new users\n"
 msgstr "  -a, --adduser             ´ËÓû§¿ÉÒÔ´´½¨ÆäËûÐÂÓû§\n"
 
-#: createuser.c:240
+#: createuser.c:244
+#, c-format
 msgid "  -A, --no-adduser          user cannot add new users\n"
 msgstr "  -A, --no-adduser          ´ËÓû§²»¿ÉÒÔ´´½¨ÆäËûÐÂÓû§\n"
 
-#: createuser.c:241
+#: createuser.c:245
+#, c-format
 msgid "  -d, --createdb            user can create new databases\n"
 msgstr "  -d, --createdb            ´ËÓû§¿ÉÒÔ´´½¨ÐÂÊý¾Ý¿â\n"
 
-#: createuser.c:242
+#: createuser.c:246
+#, c-format
 msgid "  -D, --no-createdb         user cannot create databases\n"
 msgstr "  -D, --no-createdb         ´ËÓû§²»¿ÉÒÔ´´½¨ÐÂÊý¾Ý¿â\n"
 
-#: createuser.c:243
+#: createuser.c:247
+#, c-format
 msgid "  -P, --pwprompt            assign a password to new user\n"
 msgstr "  -P, --pwprompt            ¸øÐÂÓû§Ö¸¶¨¿ÚÁî\n"
 
-#: createuser.c:244
+#: createuser.c:248
+#, c-format
 msgid "  -E, --encrypted           encrypt stored password\n"
 msgstr "  -E, --encrypted           ¿ÚÁî¼ÓÃÜ´æ´¢\n"
 
-#: createuser.c:245
+#: createuser.c:249
+#, c-format
 msgid "  -N, --unencrypted         do no encrypt stored password\n"
 msgstr "  -N, --unencrypted         ¿ÚÁî²»¼ÓÃÜ´æ´¢\n"
 
-#: createuser.c:246
+#: createuser.c:250
+#, c-format
 msgid "  -i, --sysid=SYSID         select sysid for new user\n"
 msgstr "  -i, --sysid=SYSID         Ñ¡ÔñÒ»¸ö sysid ¸øÐÂÓû§\n"
 
-#: createuser.c:254
+#: createuser.c:252 dropdb.c:152 dropuser.c:152 clusterdb.c:243
+#, c-format
+msgid "  -q, --quiet               don't write any messages\n"
+msgstr "  -q, --quiet               ²»Ð´ÈκÎÐÅÏ¢\n"
+
+#: createuser.c:258
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to create)\n"
-msgstr ""
-"  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇÒª´´½¨µÄÓû§Ãû)\n"
+msgstr "  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇÒª´´½¨µÄÓû§Ãû)\n"
 
-#: createuser.c:255 dropuser.c:152
+#: createuser.c:259 dropuser.c:156
+#, c-format
 msgid "  -W, --password            prompt for password to connect\n"
 msgstr "  -W, --password            Áª½ÓÌáʾ¿ÚÁîÊäÈë\n"
 
-#: createuser.c:256
+#: createuser.c:260
+#, c-format
 msgid ""
 "\n"
 "If one of -a, -A, -d, -D, and USERNAME is not specified, you will\n"
@@ -327,26 +400,26 @@ msgstr ""
 "Èç¹û -a, -A, -d, -D, ºÍ USERNAME Ò»¸ö¶¼Ã»ÓÐÖ¸¶¨,½«Ê¹Óý»»¥Ê½Ìáʾ\n"
 "Äã.\n"
 
-#: dropdb.c:91
+#: dropdb.c:92
 #, c-format
 msgid "%s: missing required argument database name\n"
 msgstr "%s: ȱÉÙÐèÒªµÄÊý¾Ý¿âÃû²ÎÊý\n"
 
-#: dropdb.c:108
+#: dropdb.c:109
 #, c-format
 msgid "Database \"%s\" will be permanently removed.\n"
 msgstr "Êý¾Ý¿â \"%s\" ½«±»ÓÀ¾ÃµÄɾ³ý.\n"
 
-#: dropdb.c:109 dropuser.c:110
+#: dropdb.c:110 dropuser.c:111
 msgid "Are you sure? (y/n) "
 msgstr "ÄãÈ·¶¨Âð? (y/n) "
 
-#: dropdb.c:126
+#: dropdb.c:127
 #, c-format
 msgid "%s: database removal failed: %s"
 msgstr "%s: Êý¾Ý¿âɾ³ýʧ°Ü: %s"
 
-#: dropdb.c:142
+#: dropdb.c:146
 #, c-format
 msgid ""
 "%s removes a PostgreSQL database.\n"
@@ -355,32 +428,33 @@ msgstr ""
 "%s ɾ³ýÒ»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: dropdb.c:144
+#: dropdb.c:148
 #, c-format
 msgid "  %s [OPTION]... DBNAME\n"
 msgstr "  %s [Ñ¡Ïî]... Êý¾Ý¿âÃû\n"
 
-#: dropdb.c:147 dropuser.c:147
+#: dropdb.c:151 dropuser.c:151
+#, c-format
 msgid "  -i, --interactive         prompt before deleting anything\n"
 msgstr "  -i, --interactive         ɾ³ýÈκζ«Î÷֮ǰ¸øÓèÌáʾ\n"
 
-#: droplang.c:170
+#: droplang.c:176
 #, c-format
 msgid "%s: language \"%s\" is not installed in database \"%s\"\n"
 msgstr "%1$s: Êý¾Ý¿â \"%3$s\" ÖÐ, ûÓа²×°ÓïÑÔ \"%2$s\"\n"
 
-#: droplang.c:186
+#: droplang.c:193
 #, c-format
 msgid ""
 "%s: still %s functions declared in language \"%s\"; language not removed\n"
 msgstr "%s: º¯Êý %s ÊÇÓÃÓïÑÔ \"%s\" ÉùÃ÷µÄ; ÓïÑÔδ±»É¾³ý\n"
 
-#: droplang.c:227
+#: droplang.c:265
 #, c-format
 msgid "%s: language removal failed: %s"
 msgstr "%s: ÓïÑÔɾ³ýʧ°Ü: %s"
 
-#: droplang.c:241
+#: droplang.c:279
 #, c-format
 msgid ""
 "%s removes a procedural language from a database.\n"
@@ -389,27 +463,27 @@ msgstr ""
 "%s ´ÓÊý¾Ý¿âÖÐɾ³ýÒ»¸ö¹ý³ÌÓïÑÔ.\n"
 "\n"
 
-#: droplang.c:245
+#: droplang.c:283
+#, c-format
 msgid ""
 "  -d, --dbname=DBNAME       database from which to remove the language\n"
-msgstr ""
-"  -d, --dbname=DBNAME       Ҫɾ³ýÓïÑÔµÄÊý¾Ý¿â\n"
+msgstr "  -d, --dbname=DBNAME       Ҫɾ³ýÓïÑÔµÄÊý¾Ý¿â\n"
 
-#: dropuser.c:103
+#: dropuser.c:104
 msgid "Enter name of user to drop: "
 msgstr "ÊäÈëҪɾ³ýµÄÓû§Ãû: "
 
-#: dropuser.c:109
+#: dropuser.c:110
 #, c-format
 msgid "User \"%s\" will be permanently removed.\n"
 msgstr "Óû§ \"%s\" ½«±»ÓÀ¾Ãɾ³ý.\n"
 
-#: dropuser.c:126
+#: dropuser.c:127
 #, c-format
 msgid "%s: removal of user \"%s\" failed: %s"
 msgstr "%s: ɾ³ýÓû§ \"%s\" ʧ°Ü: %s"
 
-#: dropuser.c:142
+#: dropuser.c:146
 #, c-format
 msgid ""
 "%s removes a PostgreSQL user.\n"
@@ -418,38 +492,38 @@ msgstr ""
 "%s ɾ³ýÒ»¸ö PostgreSQL Óû§.\n"
 "\n"
 
-#: dropuser.c:151
+#: dropuser.c:155
+#, c-format
 msgid ""
 "  -U, --username=USERNAME   user name to connect as (not the one to drop)\n"
-msgstr ""
-"  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇҪɾ³ýµÄÓû§Ãû)\n"
+msgstr "  -U, --username=USERNAME   Áª½ÓÓû§ (²»ÊÇҪɾ³ýµÄÓû§Ãû)\n"
 
-#: clusterdb.c:119
+#: clusterdb.c:120
 #, c-format
 msgid "%s: cannot cluster all databases and a specific one at the same time\n"
 msgstr "%s: ÎÞ·¨¶ÔËùÓÐÊý¾Ý¿âºÍÒ»¸öÖ¸¶¨µÄÊý¾Ý¿âͬʱ½¨´Ø\n"
 
-#: clusterdb.c:125
+#: clusterdb.c:126
 #, c-format
 msgid "%s: cannot cluster a specific table in all databases\n"
 msgstr "%s: ÎÞ·¨ÔÚËùÓÐÊý¾Ý¿âÖжÔÒ»¸öÖ¸¶¨µÄ±í½øÐн¨´Ø\n"
 
-#: clusterdb.c:181
+#: clusterdb.c:182
 #, c-format
 msgid "%s: clustering of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: ÔÚÊý¾Ý¿â \"%3$s\" Öеıí \"%2$s\" ½¨´Øʧ°Ü: %4$s"
 
-#: clusterdb.c:184
+#: clusterdb.c:185
 #, c-format
 msgid "%s: clustering of database \"%s\" failed: %s"
 msgstr "%s: Êý¾Ý¿â \"%s\" ½¨´Øʧ°Ü: %s"
 
-#: clusterdb.c:217
+#: clusterdb.c:221
 #, c-format
 msgid "%s: clustering database \"%s\"\n"
 msgstr "%s: ¶ÔÊý¾Ý¿â \"%s\" ½øÐн¨´Ø\n"
 
-#: clusterdb.c:231
+#: clusterdb.c:235
 #, c-format
 msgid ""
 "%s clusters all previously clustered tables in a database.\n"
@@ -458,24 +532,28 @@ msgstr ""
 "%s ¶ÔÒ»¸öÊý¾Ý¿âÖÐÏÈÇ°ÒѾ­½¨¹ý´ØµÄ±í½øÐн¨´Ø.\n"
 "\n"
 
-#: clusterdb.c:233 vacuumdb.c:257
+#: clusterdb.c:237 vacuumdb.c:263
 #, c-format
 msgid "  %s [OPTION]... [DBNAME]\n"
 msgstr "  %s [Ñ¡Ïî]... [Êý¾Ý¿âÃû]\n"
 
-#: clusterdb.c:235
+#: clusterdb.c:239
+#, c-format
 msgid "  -a, --all                 cluster all databases\n"
 msgstr "  -a, --all                 ¶ÔËùÓÐÊý¾Ý¿â½¨´Ø\n"
 
-#: clusterdb.c:236
+#: clusterdb.c:240
+#, c-format
 msgid "  -d, --dbname=DBNAME       database to cluster\n"
 msgstr "  -d, --dbname=DBNAME       ¶ÔÊý¾Ý¿â DBNAME ½¨´Ø\n"
 
-#: clusterdb.c:237
+#: clusterdb.c:241
+#, c-format
 msgid "  -t, --table=TABLE         cluster specific table only\n"
 msgstr "  -t, --table=TABLE         Ö»¶ÔÖ¸¶¨µÄ±í TABLE ½¨´Ø\n"
 
-#: clusterdb.c:247
+#: clusterdb.c:251
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command CLUSTER for details.\n"
@@ -483,32 +561,32 @@ msgstr ""
 "\n"
 "ÔĶÁ SQL ÃüÁî CLUSTER µÄÃèÊöÐÅÏ¢, ÒÔ±ã»ñµÃ¸üÏêϸµÄÐÅÏ¢.\n"
 
-#: vacuumdb.c:135
+#: vacuumdb.c:137
 #, c-format
 msgid "%s: cannot vacuum all databases and a specific one at the same time\n"
 msgstr "%s: ÎÞ·¨¶ÔËùÓÐÊý¾Ý¿âºÍÒ»¸öÖ¸¶¨µÄÊý¾Ý¿âͬʱÇåÀí\n"
 
-#: vacuumdb.c:141
+#: vacuumdb.c:143
 #, c-format
 msgid "%s: cannot vacuum a specific table in all databases\n"
 msgstr "%s: ÎÞ·¨ÔÚËùÓÐÊý¾Ý¿âÖжÔÒ»¸öÖ¸¶¨µÄ±í½øÐÐÇåÀí\n"
 
-#: vacuumdb.c:204
+#: vacuumdb.c:207
 #, c-format
 msgid "%s: vacuuming of table \"%s\" in database \"%s\" failed: %s"
 msgstr "%1$s: ÔÚÊý¾Ý¿â \"%3$s\" Öеıí \"%2$s\" ÇåÀíʧ°Ü: %4$s"
 
-#: vacuumdb.c:207
+#: vacuumdb.c:210
 #, c-format
 msgid "%s: vacuuming of database \"%s\" failed: %s"
 msgstr "%s: Êý¾Ý¿â \"%s\" ÇåÀíʧ°Ü: %s"
 
-#: vacuumdb.c:241
+#: vacuumdb.c:247
 #, c-format
 msgid "%s: vacuuming database \"%s\"\n"
 msgstr "%s: ÇåÀíÊý¾Ý¿â \"%s\"\n"
 
-#: vacuumdb.c:255
+#: vacuumdb.c:261
 #, c-format
 msgid ""
 "%s cleans and analyzes a PostgreSQL database.\n"
@@ -517,52 +595,61 @@ msgstr ""
 "%s ÇåÀí²¢ÇÒÓÅ»¯Ò»¸ö PostgreSQL Êý¾Ý¿â.\n"
 "\n"
 
-#: vacuumdb.c:259
+#: vacuumdb.c:265
+#, c-format
 msgid "  -a, --all                       vacuum all databases\n"
 msgstr "  -a, --all                       ÇåÀíËùÓеÄÊý¾Ý¿â\n"
 
-#: vacuumdb.c:260
+#: vacuumdb.c:266
+#, c-format
 msgid "  -d, --dbname=DBNAME             database to vacuum\n"
 msgstr "  -d, --dbname=DBNAME             ÇåÀíÊý¾Ý¿â DBNAME\n"
 
-#: vacuumdb.c:261
+#: vacuumdb.c:267
+#, c-format
 msgid "  -t, --table='TABLE[(COLUMNS)]'  vacuum specific table only\n"
 msgstr "  -t, --table='TABLE[(COLUMNS)]'  Ö»ÇåÀíÖ¸¶¨µÄ±í TABLE\n"
 
-#: vacuumdb.c:262
+#: vacuumdb.c:268
+#, c-format
 msgid "  -f, --full                      do full vacuuming\n"
 msgstr "  -f, --full                      ÍêÈ«ÇåÀí\n"
 
-#: vacuumdb.c:263
+#: vacuumdb.c:269
+#, c-format
 msgid "  -z, --analyze                   update optimizer hints\n"
 msgstr "  -z, --anaylze                   ¸üÐÂÓÅ»¯Æ÷ÐÅÏ¢\n"
 
-#: vacuumdb.c:264
+#: vacuumdb.c:270
+#, c-format
 msgid ""
 "  -e, --echo                      show the commands being sent to the "
 "server\n"
-msgstr ""
-"  -e, --echo                      ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
+msgstr "  -e, --echo                      ÏÔʾ·¢Ë͵½·þÎñ¶ËµÄÃüÁî\n"
 
-#: vacuumdb.c:265
+#: vacuumdb.c:271
+#, c-format
 msgid "  -q, --quiet                     don't write any messages\n"
 msgstr "  -q, --quiet                     ²»Ð´ÈκÎÐÅÏ¢\n"
 
-#: vacuumdb.c:266
+#: vacuumdb.c:272
+#, c-format
 msgid "  -v, --verbose                   write a lot of output\n"
 msgstr "  -v, --verbose                   д´óÁ¿µÄÊä³ö\n"
 
-#: vacuumdb.c:267
+#: vacuumdb.c:273
+#, c-format
 msgid "  --help                          show this help, then exit\n"
 msgstr "  --help                          ÏÔʾ´Ë°ïÖúÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: vacuumdb.c:268
+#: vacuumdb.c:274
+#, c-format
 msgid ""
 "  --version                       output version information, then exit\n"
-msgstr ""
-"  --versoin                       Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
+msgstr "  --versoin                       Êä³ö°æ±¾ÐÅÏ¢, È»ºóÍ˳ö\n"
 
-#: vacuumdb.c:274
+#: vacuumdb.c:280
+#, c-format
 msgid ""
 "\n"
 "Read the description of the SQL command VACUUM for details.\n"
@@ -570,36 +657,40 @@ msgstr ""
 "\n"
 "ÔĶÁ SQL ÃüÁî VACUUM µÄÃèÊöÐÅÏ¢, ÒÔ±ã»ñµÃ¸üÏêϸµÄÐÅÏ¢.\n"
 
-#: common.c:88 common.c:114
+#: common.c:86 common.c:112
 msgid "Password: "
 msgstr "¿ÚÁî: "
 
-#: common.c:101
+#: common.c:99
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: ÎÞ·¨Áª½Óµ½Êý¾Ý¿â %s\n"
 
-#: common.c:124
+#: common.c:122
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: ÎÞ·¨Áª½Óµ½Êý¾Ý¿â %s: %s"
 
-#: common.c:148
+#: common.c:146
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: ²éѯʧ°Ü: %s"
 
-#: common.c:149
+#: common.c:147
 #, c-format
 msgid "%s: query was: %s\n"
 msgstr "%s: ²éѯÊÇ: %s\n"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:163
+#: common.c:161
 msgid "y"
 msgstr "y"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:165
+#: common.c:163
 msgid "n"
 msgstr "n"
+
+#~ msgid ""
+#~ "  -D, --location=PATH       alternative place to store the database\n"
+#~ msgstr "  -D, --location=PATH       Ñ¡ÔñÒ»¸öµØ·½´æ·ÅÊý¾Ý¿â\n"

diff --git a/src/interfaces/libpq/po/zh_CN.po b/src/interfaces/libpq/po/zh_CN.po
index 85312779a9d9f7079cbeeee54ffd471036f92b65..61554aea1e6c35381b3015499e3a4d3ede2e09d0 100644 (file)
--- a/src/interfaces/libpq/po/zh_CN.po
+++ b/src/interfaces/libpq/po/zh_CN.po
@@ -1,15 +1,15 @@
 # simplified Chinese translation file for libpq\r
 # Bao Wei , 2002\r
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.4 2003/11/29 19:52:12 pgsql Exp $\r
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.5 2004/08/10 19:02:03 petere Exp $\r
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2003-08-26 10:45+0000\n"
+"POT-Creation-Date: 2004-07-22 09:41+0000\n"
 "PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
-"Last-Translator: Bao Wei <[email protected].cn>\n"
+"Last-Translator: Bao Wei <[email protected].cn>\n"
 "Language-Team: Weiping He \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=GB2312\n"
@@ -40,7 +40,7 @@ msgid "could not restore non-blocking mode on socket: %s\n"
 msgstr "ÎÞ·¨ÔÚÌ×½Ó×Ö: %s Éϻָ´·Ç×èÈûģʽ\n"
 
 # fe-auth.c:503\r
-#: fe-auth.c:509
+#: fe-auth.c:508
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "²»Ö§³Ö SCM_CRED ÈÏÖ¤·½Ê½\n"
 
@@ -50,47 +50,47 @@ msgid "Kerberos 4 authentication failed\n"
 msgstr "Kerberos 4 ÈÏ֤ʧ°Ü\n"
 
 # fe-auth.c:595\r
-#: fe-auth.c:606
+#: fe-auth.c:608
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "²»Ö§³Ö Kerberos 4 ÈÏÖ¤\n"
 
 # fe-auth.c:606\r
-#: fe-auth.c:616
+#: fe-auth.c:619
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 ÈÏ֤ʧ°Ü\n"
 
 # fe-auth.c:612\r
-#: fe-auth.c:622
+#: fe-auth.c:627
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "²»Ö§³Ö Kerberos 5 ÈÏÖ¤\n"
 
 # fe-auth.c:640\r
-#: fe-auth.c:650
+#: fe-auth.c:655
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "²»Ö§³Ö %u ÈÏÖ¤·½Ê½\n"
 
 # fe-auth.c:677\r
-#: fe-auth.c:687
+#: fe-auth.c:692
 #, c-format
 msgid "invalid authentication service name \"%s\", ignored\n"
 msgstr "ºöÂÔ·Ç·¨ÈÏÖ¤·þÎñÃû \"%s\"\n"
 
 # fe-auth.c:734\r
-#: fe-auth.c:758
+#: fe-auth.c:764
 #, c-format
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: ÎÞЧµÄÈÏ֤ϵͳ: %d\n"
 
 #: fe-connect.c:452
 #, c-format
-msgid "unrecognized sslmode: \"%s\"\n"
-msgstr "²»±»ÈÏ¿ÉµÄ sslmode: \"%s\"\n"
+msgid "invalid sslmode value: \"%s\"\n"
+msgstr "ÎÞЧµÄ sslmode Öµ: \"%s\"\n"
 
 #: fe-connect.c:472
 #, c-format
-msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "ÎÞЧµÄ sslmode \"%s\", µ±Ã»ÓÐ°Ñ SSL Ö§³Ö±àÒë½øÀ´Ê±\n"
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
+msgstr "ÎÞЧµÄ sslmode ֵ \"%s\" µ±Ã»ÓÐ°Ñ SSL Ö§³Ö±àÒë½øÀ´Ê±\n"
 
 # fe-connect.c:708\r
 #: fe-connect.c:783
@@ -129,117 +129,117 @@ msgstr ""
 "%s É쵀 TCP/IP Áª½Ó?\n"
 
 # fe-misc.c:702\r
-#: fe-connect.c:937
+#: fe-connect.c:945
 #, c-format
-msgid "could not translate hostname \"%s\" to address: %s\n"
+msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "ÎÞ·¨½âÊÍÖ÷»úÃû \"%s\" µ½µØÖ·: %s\n"
 
 # fe-misc.c:702\r
-#: fe-connect.c:941
+#: fe-connect.c:949
 #, c-format
-msgid "could not translate local service to address: %s\n"
-msgstr "ÎÞ·¨½âÊͱ¾µØ·þÎñµ½µØÖ·: %s\n"
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
+msgstr "ÎÞ·¨½âÊÍ Unix-domian Ì×½Ó×Ö·¾¶ \"%s\" µ½µØÖ·: %s\n"
 
 # fe-connect.c:1232\r
-#: fe-connect.c:1144
+#: fe-connect.c:1153
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:891\r
-#: fe-connect.c:1187
+#: fe-connect.c:1196
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "ÎÞ·¨´´½¨Ì×½Ó×Ö: %s\n"
 
 # fe-connect.c:1263\r
-#: fe-connect.c:1298
+#: fe-connect.c:1307
 #, c-format
 msgid "could not get socket error status: %s\n"
 msgstr "ÎÞ·¨»ñÈ¡Ì×½Ó×Ö´íÎó״̬: %s\n"
 
 # fe-connect.c:1283\r
-#: fe-connect.c:1337
+#: fe-connect.c:1346
 #, c-format
 msgid "could not get client address from socket: %s\n"
 msgstr "ÎÞ·¨´ÓÌ×½Ó×Ö»ñÈ¡¿Í»§¶ËµØÖ·: %s\n"
 
 # fe-connect.c:959\r
-#: fe-connect.c:1382
+#: fe-connect.c:1391
 #, c-format
 msgid "could not send SSL negotiation packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍ SSL ÎÕÊÖ°ü: %s\n"
 
 # fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284\r
 # fe-lobj.c:536\r
-#: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
-#: fe-lobj.c:540
+#: fe-connect.c:1413 fe-connect.c:2536 fe-connect.c:2545 fe-connect.c:3112
+#: fe-lobj.c:548
 msgid "out of memory\n"
 msgstr "ÄÚ´æÓþ¡\n"
 
 # fe-connect.c:1322\r
-#: fe-connect.c:1417
+#: fe-connect.c:1426
 #, c-format
 msgid "could not send startup packet: %s\n"
 msgstr "ÎÞ·¨·¢ËÍÆô¶¯°ü: %s\n"
 
 # fe-connect.c:972\r
-#: fe-connect.c:1457
+#: fe-connect.c:1466
 #, c-format
 msgid "could not receive server response to SSL negotiation packet: %s\n"
 msgstr "ÎÞ·¨ÊÕµ½·þÎñÆ÷¶Ô SSL ÎÕÊÖ°üµÄÏìÓ¦: %s\n"
 
 # fe-connect.c:1010\r
-#: fe-connect.c:1476 fe-connect.c:1493
+#: fe-connect.c:1485 fe-connect.c:1502
 msgid "server does not support SSL, but SSL was required\n"
 msgstr "·þÎñÆ÷²»Ö§³Ö SSL, µ«ÊÇÒªÇóʹÓà SSL\n"
 
 # fe-connect.c:1001\r
-#: fe-connect.c:1509
+#: fe-connect.c:1518
 #, c-format
 msgid "received invalid response to SSL negotiation: %c\n"
 msgstr "ÊÕµ½¶Ô SSL ÎÕÊÖµÄÎÞЧÏìÓ¦: %c\n"
 
 # fe-connect.c:1378\r
-#: fe-connect.c:1566 fe-connect.c:1598
+#: fe-connect.c:1575 fe-connect.c:1607
 #, c-format
 msgid "expected authentication request from server, but received %c\n"
 msgstr "ÆÚ´ýÀ´×Ô·þÎñÆ÷µÄÈÏÖ¤ÇëÇó, È´ÊÕµ½ %c\n"
 
 # fe-connect.c:1490\r
-#: fe-connect.c:1834
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "Æô¶¯¹ý³ÌÖÐÊÕµ½À´×Ô·þÎñÆ÷µÄ·ÇÔ¤ÆÚÐÅÏ¢\n"
 
 # fe-connect.c:1549\r
-#: fe-connect.c:1904
+#: fe-connect.c:1913
 #, c-format
 msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "ÎÞЧµÄÁª½Ó״̬ %c, ¿ÉÄÜÊÇ´æ´¢Æ÷Êý¾Ý±»ÆÆ»µµÄ±êÖ¾\n"
 
 # fe-connect.c:2475\r
-#: fe-connect.c:2559
+#: fe-connect.c:2584
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "ÔÚÁª½ÓÐÅÏ¢×Ö´®ÀïµÄ \"%s\" ºóÃæȱÉÙ \"=\"\n"
 
 # fe-connect.c:2524\r
-#: fe-connect.c:2608
+#: fe-connect.c:2633
 msgid "unterminated quoted string in connection info string\n"
 msgstr "Áª½ÓÐÅÏ¢×Ö´®ÖÐδ½áÊøµÄÒýºÅ×Ö´®\n"
 
 # fe-connect.c:2558\r
-#: fe-connect.c:2642
+#: fe-connect.c:2667
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "·Ç·¨Áª½ÓÑ¡Ïî \"%s\"\n"
 
 # fe-connect.c:2744\r
-#: fe-connect.c:2854
+#: fe-connect.c:2879
 msgid "connection pointer is NULL\n"
 msgstr "Áª½ÓÖ¸ÕëÊÇ NULL\n"
 
 # fe-connect.c:2953\r
-#: fe-connect.c:3105
+#: fe-connect.c:3130
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
@@ -251,78 +251,78 @@ msgid "NOTICE"
 msgstr "×¢Òâ"
 
 # fe-exec.c:737\r
-#: fe-exec.c:637 fe-exec.c:689
+#: fe-exec.c:653 fe-exec.c:705
 msgid "command string is a null pointer\n"
 msgstr "ÃüÁî×Ö´®ÊÇÒ»¸ö¿ÕÖ¸Õë\n"
 
 # fe-exec.c:737\r
-#: fe-exec.c:724
+#: fe-exec.c:740
 msgid "statement name is a null pointer\n"
 msgstr "ÉùÃ÷Ãû×ÖÊÇÒ»¸ö¿ÕÖ¸Õë\n"
 
 # fe-exec.c:745\r
-#: fe-exec.c:755
+#: fe-exec.c:771
 msgid "no connection to the server\n"
 msgstr "ûÓе½·þÎñÆ÷µÄÁª½Ó\n"
 
 # fe-exec.c:752\r
-#: fe-exec.c:762
+#: fe-exec.c:778
 msgid "another command is already in progress\n"
 msgstr "ÒѾ­ÓÐÁíÍâÒ»ÌõÃüÁîÔÚ´¦Àí\n"
 
-#: fe-exec.c:798 fe-exec.c:1432
-msgid "function requires at least 3.0 protocol\n"
+#: fe-exec.c:814 fe-exec.c:1465
+msgid "function requires at least protocol version 3.0\n"
 msgstr "º¯ÊýÖÁÉÙÐèÒª 3.0 °æ±¾µÄЭÒé\n"
 
 # fe-exec.c:1371\r
-#: fe-exec.c:1100
+#: fe-exec.c:1116
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "ÒâÍâµÄ asyncStatus(Ò첽״̬): %d\n"
 
-#: fe-exec.c:1205
+#: fe-exec.c:1221
 msgid "COPY terminated by new PQexec"
 msgstr "COPY ±»Ò»¸öÐ嵀 PQexec ÖÕÖ¹"
 
 # fe-exec.c:1421\r
-#: fe-exec.c:1213
+#: fe-exec.c:1229
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN ״̬±ØÐëÏȽáÊø\n"
 
 # fe-exec.c:1421\r
-#: fe-exec.c:1233
+#: fe-exec.c:1249
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT ״̬±ØÐëÏȽáÊø\n"
 
 # fe-exec.c:1780\r
-#: fe-exec.c:1336 fe-exec.c:1390 fe-exec.c:1474
+#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1507
 msgid "no COPY in progress\n"
 msgstr "ûÓÐÕýÔÚ´¦ÀíµÄ COPY\n"
 
 # fe-exec.c:1884\r
-#: fe-exec.c:1666
+#: fe-exec.c:1699
 msgid "connection in wrong state\n"
 msgstr "Áª½Ó´¦ÓÚ´íÎó״̬\n"
 
 # fe-exec.c:2055\r
-#: fe-exec.c:1697
+#: fe-exec.c:1730
 msgid "invalid ExecStatusType code"
 msgstr "·Ç·¨ ExecStatusType ´úÂë"
 
 # fe-exec.c:2108 fe-exec.c:2141\r
-#: fe-exec.c:1761 fe-exec.c:1784
+#: fe-exec.c:1794 fe-exec.c:1817
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "ÁкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
 
 # fe-exec.c:2130\r
-#: fe-exec.c:1777
+#: fe-exec.c:1810
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "ÐкÅÂë %d ³¬³öÁË·¶Î§ 0..%d"
 
 # fe-exec.c:2325\r
-#: fe-exec.c:2014
+#: fe-exec.c:2094
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "ÎÞ·¨½âÊÍÀ´×Ô·þÎñÆ÷µÄ½á¹û: %s"
@@ -352,53 +352,53 @@ msgid "error while reading file \"%s\"\n"
 msgstr "¶ÁÈ¡Îļþ \"%s\" ʱ³ö´í\n"
 
 # fe-lobj.c:498\r
-#: fe-lobj.c:502
+#: fe-lobj.c:502 fe-lobj.c:515
 #, c-format
 msgid "error while writing to file \"%s\"\n"
 msgstr "дÈëÎļþ \"%s\" ʱ³ö´í\n"
 
 # fe-lobj.c:564\r
-#: fe-lobj.c:568
+#: fe-lobj.c:593
 msgid "query to initialize large object functions did not return data\n"
 msgstr "³õʼ»¯´ó¶ÔÏóº¯ÊýµÄ²éѯûÓзµ»ØÊý¾Ý\n"
 
 # fe-lobj.c:602\r
-#: fe-lobj.c:606
+#: fe-lobj.c:631
 msgid "cannot determine OID of function lo_open\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_open µÄ OID\n"
 
 # fe-lobj.c:609\r
-#: fe-lobj.c:613
+#: fe-lobj.c:638
 msgid "cannot determine OID of function lo_close\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_close µÄ OID\n"
 
 # fe-lobj.c:616\r
-#: fe-lobj.c:620
+#: fe-lobj.c:645
 msgid "cannot determine OID of function lo_creat\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_creat µÄ OID\n"
 
 # fe-lobj.c:623\r
-#: fe-lobj.c:627
+#: fe-lobj.c:652
 msgid "cannot determine OID of function lo_unlink\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_unlink µÄ OID\n"
 
 # fe-lobj.c:630\r
-#: fe-lobj.c:634
+#: fe-lobj.c:659
 msgid "cannot determine OID of function lo_lseek\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_lseek µÄ OID\n"
 
 # fe-lobj.c:637\r
-#: fe-lobj.c:641
+#: fe-lobj.c:666
 msgid "cannot determine OID of function lo_tell\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lo_tell µÄ OID\n"
 
 # fe-lobj.c:644\r
-#: fe-lobj.c:648
+#: fe-lobj.c:673
 msgid "cannot determine OID of function loread\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý loread µÄ OID\n"
 
 # fe-lobj.c:651\r
-#: fe-lobj.c:655
+#: fe-lobj.c:680
 msgid "cannot determine OID of function lowrite\n"
 msgstr "ÎÞ·¨ÅжϺ¯Êý lowrite µÄ OID\n"
 
@@ -442,141 +442,145 @@ msgstr ""
 msgid "could not send data to server: %s\n"
 msgstr "ÎÞ·¨Ïò·þÎñÆ÷·¢ËÍÊý¾Ý: %s\n"
 
-#: fe-misc.c:905
+#: fe-misc.c:922
 msgid "timeout expired\n"
 msgstr "³¬Ê±Âú\n"
 
 # fe-misc.c:450 fe-misc.c:642 fe-misc.c:798\r
-#: fe-misc.c:950
+#: fe-misc.c:967
 msgid "socket not open\n"
 msgstr "Ì×½Ó×Öδ´ò¿ª\n"
 
 # fe-misc.c:389 fe-misc.c:423 fe-misc.c:838\r
-#: fe-misc.c:973
+#: fe-misc.c:990
 #, c-format
 msgid "select() failed: %s\n"
 msgstr "select() ʧ°Ü: %s\n"
 
-#: fe-secure.c:246
+#: fe-secure.c:260
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "ÎÞ·¨½¨Á¢ SSL Áª½Ó: %s\n"
 
-#: fe-secure.c:308 fe-secure.c:380 fe-secure.c:894
+#: fe-secure.c:323 fe-secure.c:403 fe-secure.c:1022
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL ´íÎó: %s\n"
 
-#: fe-secure.c:313 fe-secure.c:385 fe-secure.c:898
+#: fe-secure.c:328 fe-secure.c:408 fe-secure.c:1026
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL ´íÎó: ·¢ÏÖ½áÊø·û\n"
 
 # fe-auth.c:232\r
-#: fe-secure.c:322 fe-secure.c:393 fe-secure.c:904
+#: fe-secure.c:339 fe-secure.c:418 fe-secure.c:1034
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL ´íÎó: %s\n"
 
-#: fe-secure.c:330 fe-secure.c:401 fe-secure.c:910
-msgid "Unknown SSL error code\n"
+#: fe-secure.c:349 fe-secure.c:428 fe-secure.c:1042
+msgid "unrecognized SSL error code\n"
 msgstr "δ֪µÄ SSL ´íÎóÂë\n"
 
 # fe-lobj.c:498\r
-#: fe-secure.c:459
+#: fe-secure.c:490
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "²éѯÌ×½Ó×Ö´íÎó: %s\n"
 
 # fe-connect.c:1263\r
-#: fe-secure.c:481
+#: fe-secure.c:518
 #, c-format
 msgid "could not get information about host (%s): %s\n"
 msgstr "ÎÞ·¨»ñÈ¡¹ØÓÚÖ÷»ú (%s) µÄÐÅÏ¢: %s\n"
 
-#: fe-secure.c:500
+#: fe-secure.c:537
 msgid "unsupported protocol\n"
 msgstr "²»Ö§³ÖµÄЭÒé\n"
 
-#: fe-secure.c:522
+#: fe-secure.c:559
 #, c-format
 msgid "server common name \"%s\" does not resolve to %ld.%ld.%ld.%ld\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½ %ld.%ld.%ld.%ld\n"
 
-#: fe-secure.c:529
+#: fe-secure.c:566
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "·þÎñÆ÷Ãû×Ö \"%s\" ²»ÄܽâÎöµ½¶Ô¶ËµØÖ·\n"
 
 # fe-connect.c:1263\r
-#: fe-secure.c:704
+#: fe-secure.c:749
 msgid "could not get user information\n"
 msgstr "ÎÞ·¨»ñÈ¡Óû§ÐÅÏ¢\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:716
+#: fe-secure.c:761
 #, c-format
 msgid "could not open certificate (%s): %s\n"
 msgstr "ÎÞ·¨´ò¿ªÖ¤Êé (%s): %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:723
+#: fe-secure.c:769
 #, c-format
 msgid "could not read certificate (%s): %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡Ö¤Êé (%s): %s\n"
 
-#: fe-secure.c:736
+#: fe-secure.c:783
 #, c-format
 msgid "certificate present, but not private key (%s)\n"
 msgstr "ÓÐÖ¤Êé, µ«²»ÊÇ˽Կ (%s)\n"
 
-#: fe-secure.c:745
+#: fe-secure.c:792
 #, c-format
 msgid "private key (%s) has wrong permissions\n"
 msgstr "˽Կ (%s) ÓдíÎóµÄÐí¿É\n"
 
 # fe-lobj.c:400 fe-lobj.c:483\r
-#: fe-secure.c:752
+#: fe-secure.c:799
 #, c-format
 msgid "could not open private key file (%s): %s\n"
 msgstr "ÎÞ·¨´ò¿ªË½Ô¿Îļþ (%s): %s\n"
 
-#: fe-secure.c:761
+#: fe-secure.c:808
 #, c-format
 msgid "private key (%s) changed during execution\n"
 msgstr "ÔÚÖ´Ðйý³ÌÖÐ˽Կ (%s) ¸Ä±äÁË\n"
 
 # fe-connect.c:891\r
-#: fe-secure.c:768
+#: fe-secure.c:816
 #, c-format
 msgid "could not read private key (%s): %s\n"
 msgstr "ÎÞ·¨¶Áȡ˽Կ (%s): %s\n"
 
-#: fe-secure.c:780
+#: fe-secure.c:830
 #, c-format
 msgid "certificate/private key mismatch (%s): %s\n"
 msgstr "Ö¤Êé/˽Կ²»Æ¥Åä (%s): %s\n"
 
-#: fe-secure.c:810
+#: fe-secure.c:909
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "ÎÞ·¨´´½¨ SSL »·¾³: %s\n"
 
 # fe-connect.c:891\r
-#: fe-secure.c:828 fe-secure.c:836
+#: fe-secure.c:953 fe-secure.c:962
 #, c-format
 msgid "could not read root certificate list (%s): %s\n"
 msgstr "ÎÞ·¨¶ÁÈ¡¸ùÖ¤ÊéÁбí (%s): %s\n"
 
-#: fe-secure.c:929
+#: fe-secure.c:1061
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "ÎÞ·¨ÑéÖ¤Ö¤Êé: %s\n"
 
-#: fe-secure.c:941
+#: fe-secure.c:1074
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "ÎÞ·¨»ñµÃÖ¤Êé: %s\n"
 
+# fe-misc.c:702\r
+#~ msgid "could not translate local service to address: %s\n"
+#~ msgstr "ÎÞ·¨½âÊͱ¾µØ·þÎñµ½µØÖ·: %s\n"
+
 # fe-connect.c:1010\r
 #~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
 #~ msgstr "·þÎñÆ÷²»Ö§³Ö SSL, ²¢ÇÒÏÈÇ°·Ç SSL ³¢ÊÔʧ°Ü\n"