Translation updates

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

src/bin/initdb/po/zh_CN.po

@@ -0,0 +1,544 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 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 <weibao@qmail.zhengmai.net.cn>\n"
+"Language-Team: Weiping He <laser@zhengmai.com.cn>\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 "输入新的超级用户口令: "
+
+#: 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            对于新的超级用户提示输入口令\n"
+
+#: initdb.c:1972
+#, c-format
+msgid ""
+"  --pwfile=filename         read password for the new superuser from file\n"
+msgstr "  --pwfile=文件名           对于新的超级用户从文件读取口令\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 <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"报告错误至 <pgql-bugs@postgresql.org>.\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"

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

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 <EMAIL@ADDRESS>, 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<weibao@imsi.cn>\n"
+"Language-Team: Weiping He <laser@imsi.cn>\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 <pgsql-bugs@postgresql.org>.\n"
+msgstr "错误报告至 <pgsql-bugs@postgresql.org>.\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"

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 <bao_paul@yahoo.com.cn>\n"
+"Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\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
+#: createdb.c:102 createdb.c:121 createlang.c:97 createlang.c:118
-#: createlang.c:157 createuser.c:116 createuser.c:131 dropdb.c:83 dropdb.c:92
+#: createlang.c:160 createuser.c:117 createuser.c:132 dropdb.c:84 dropdb.c:93
-#: dropdb.c:100 droplang.c:88 droplang.c:109 droplang.c:151 dropuser.c:83
+#: dropdb.c:101 droplang.c:94 droplang.c:115 droplang.c:157 dropuser.c:84
-#: dropuser.c:98 clusterdb.c:96 clusterdb.c:111 vacuumdb.c:112 vacuumdb.c:127
+#: 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
+#: createdb.c:119 createlang.c:116 createuser.c:130 dropdb.c:99 droplang.c:113
-#: dropuser.c:96 clusterdb.c:109 vacuumdb.c:125
+#: 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
+#: createdb.c:218 createlang.c:299 createuser.c:240 dropdb.c:147
-#: droplang.c:242 dropuser.c:143 clusterdb.c:232 vacuumdb.c:256
+#: 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
+#: createdb.c:220 createlang.c:301 createuser.c:242 dropdb.c:149
-#: droplang.c:244 dropuser.c:145 clusterdb.c:234 vacuumdb.c:258
+#: 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
+#: createdb.c:221
-msgid "  -D, --location=PATH       alternative place to store the database\n"
+#, c-format
-msgstr "  -D, --location=PATH       选择一个地方存放数据库\n"
+msgid "  -D, --tablespace=TABLESPACE  default tablespace for the database\n"
+msgstr "  -D, --tablespace=TABLESPACE  数据库默认表空间\n"
 
-#: createdb.c:218
+#: createdb.c:222
-msgid "  -E, --encoding=ENCODING   encoding for the database\n"
+#, c-format
-msgstr "  -E, --encoding=ENCODING   数据库编码\n"
+msgid "  -E, --encoding=ENCODING      encoding for the database\n"
+msgstr "  -E, --encoding=ENCODING      数据库编码\n"
 
-#: createdb.c:219
+#: createdb.c:223
-msgid "  -O, --owner=OWNER         database user to own the new database\n"
+#, c-format
-msgstr "  -O, --owner=OWNER         新数据库的所属用户\n"
+msgid "  -O, --owner=OWNER            database user to own the new database\n"
+msgstr "  -O, --owner=OWNER            新数据库的所属用户\n"
 
-#: createdb.c:220
+#: createdb.c:224
-msgid "  -T, --template=TEMPLATE   template database to copy\n"
+#, c-format
-msgstr "  -T, --template=TEMPLATE   要拷贝的数据库模板\n"
+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
+#: createdb.c:225
-#: droplang.c:246 dropuser.c:146 clusterdb.c:238
+#, c-format
 msgid ""
-"  -e, --echo                show the commands being sent to the server\n"
+"  -e, --echo                   show the commands being sent to the server\n"
-msgstr ""
+msgstr "  -e, --echo                   显示发送到服务端的命令\n"
-"  -e, --echo                显示发送到服务端的命令\n"
 
-#: createdb.c:222 createuser.c:248 dropdb.c:148 dropuser.c:148 clusterdb.c:239
+#: createdb.c:226
-msgid "  -q, --quiet               don't write any messages\n"
+#, c-format
-msgstr "  -q, --quiet               不写任何信息\n"
+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
+#: createdb.c:227
-#: droplang.c:252 dropuser.c:153 clusterdb.c:240
+#, c-format
-msgid "  --help                    show this help, then exit\n"
+msgid "  --help                       show this help, then exit\n"
-msgstr "  --help                    显示此帮助信息, 然后退出\n"
+msgstr "  --help                       显示此帮助信息, 然后退出\n"
 
-#: createdb.c:224 createlang.c:284 createuser.c:250 dropdb.c:154
+#: createdb.c:228
-#: droplang.c:253 dropuser.c:154 clusterdb.c:241
+#, c-format
-msgid "  --version                 output version information, then exit\n"
+msgid "  --version                    output version information, then exit\n"
-msgstr "  --version                 输出版本信息, 然后退出\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: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: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: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:230
+#, c-format
+msgid ""
+"  -h, --host=HOSTNAME          database server host or socket directory\n"
+msgstr ""
+"  -h, --host=HOSTNAME          数据库服务器所在机器的主机名或套接字目录\n"
+
+#: createdb.c:231
+#, c-format
+msgid "  -p, --port=PORT              database server port\n"
+msgstr "  -p, --port=PORT              数据库服务器端口号\n"
+
+#: createdb.c:232
+#, c-format
+msgid "  -U, --username=USERNAME      user name to connect as\n"
+msgstr "  -U, --username=USERNAME      联接的用户名\n"
+
+#: createdb.c:233
+#, c-format
+msgid "  -W, --password               prompt for password\n"
+msgstr "  -W, --password               提示输入口令\n"
+
+#: 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
+#: createdb.c:235 createlang.c:312 createuser.c:262 dropdb.c:159
-#: droplang.c:254 dropuser.c:155 clusterdb.c:248 vacuumdb.c:275
+#: droplang.c:292 dropuser.c:159 clusterdb.c:252 vacuumdb.c:281
+#, c-format
 msgid ""
 "\n"
 "Report bugs to <pgsql-bugs@postgresql.org>.\n"
@@ -153,115 +164,162 @@ msgstr ""
 "\n"
 "臭虫报告至 <pgsql-bugs@postgresql.org>.\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 ""
+msgstr "  -l, --list                显示当前已经安装了的语言列表\n"
-"  -l, --list                显示当前已经安装了的语言列表\n"
 
-#: createlang.c:278
+#: createlang.c:305
+#, c-format
 msgid ""
 "  -L, --pglib=DIRECTORY     find language interpreter file in DIRECTORY\n"
-msgstr ""
+msgstr "  -L, --pglib=DIRECTORY     在 DIRECTORY 目录中查找语言翻译文件\n"
-"  -L, --pglib=DIRECTORY     在 DIRECTORY 目录中查找语言翻译文件\n"
 
-#: createuser.c:141
+#: 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"
+
+#: 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 ""
+msgstr "  -U, --username=USERNAME   联接用户 (不是要创建的用户名)\n"
-"  -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 ""
+msgstr "  -d, --dbname=DBNAME       要删除语言的数据库\n"
-"  -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 ""
+msgstr "  -U, --username=USERNAME   联接用户 (不是要删除的用户名)\n"
-"  -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 ""
+msgstr "  -e, --echo                      显示发送到服务端的命令\n"
-"  -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 ""
+msgstr "  --versoin                       输出版本信息, 然后退出\n"
-"  --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"

src/interfaces/libpq/po/zh_CN.po

@@ -1,15 +1,15 @@
 # simplified Chinese translation file for libpq
 # Bao Wei <weibao@forevertek.com>, 2002
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.4 2003/11/29 19:52:12 pgsql Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.5 2004/08/10 19:02:03 petere Exp $
 #
 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 <bao_paul@yahoo.com.cn>\n"
+"Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\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
-#: 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
-#: fe-auth.c:606
+#: fe-auth.c:608
 msgid "Kerberos 4 authentication not supported\n"
 msgstr "不支持 Kerberos 4 认证\n"
 
 # fe-auth.c:606
-#: fe-auth.c:616
+#: fe-auth.c:619
 msgid "Kerberos 5 authentication failed\n"
 msgstr "Kerberos 5 认证失败\n"
 
 # fe-auth.c:612
-#: fe-auth.c:622
+#: fe-auth.c:627
 msgid "Kerberos 5 authentication not supported\n"
 msgstr "不支持 Kerberos 5 认证\n"
 
 # fe-auth.c:640
-#: fe-auth.c:650
+#: fe-auth.c:655
 #, c-format
 msgid "authentication method %u not supported\n"
 msgstr "不支持 %u 认证方式\n"
 
 # fe-auth.c:677
-#: 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
-#: 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"
+msgid "invalid sslmode value: \"%s\"\n"
-msgstr "不被认可的 sslmode: \"%s\"\n"
+msgstr "无效的 sslmode 值: \"%s\"\n"
 
 #: fe-connect.c:472
 #, c-format
-msgid "sslmode \"%s\" invalid when SSL support is not compiled in\n"
+msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
-msgstr "无效的 sslmode \"%s\", 当没有把 SSL 支持编译进来时\n"
+msgstr "无效的 sslmode 值 \"%s\" 当没有把 SSL 支持编译进来时\n"
 
 # fe-connect.c:708
 #: fe-connect.c:783
@@ -129,117 +129,117 @@ msgstr ""
 "%s 上的 TCP/IP 联接?\n"
 
 # fe-misc.c:702
-#: 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
-#: fe-connect.c:941
+#: fe-connect.c:949
 #, c-format
-msgid "could not translate local service to address: %s\n"
+msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
-msgstr "无法解释本地服务到地址: %s\n"
+msgstr "无法解释 Unix-domian 套接字路径 \"%s\" 到地址: %s\n"
 
 # fe-connect.c:1232
-#: fe-connect.c:1144
+#: fe-connect.c:1153
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "无效的联接状态, 可能是存储器数据被破坏的标志\n"
 
 # fe-connect.c:891
-#: fe-connect.c:1187
+#: fe-connect.c:1196
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
 # fe-connect.c:1263
-#: 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
-#: 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
-#: 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
 # fe-lobj.c:536
-#: fe-connect.c:1404 fe-connect.c:2511 fe-connect.c:2520 fe-connect.c:3087
+#: fe-connect.c:1413 fe-connect.c:2536 fe-connect.c:2545 fe-connect.c:3112
-#: fe-lobj.c:540
+#: fe-lobj.c:548
 msgid "out of memory\n"
 msgstr "内存用尽\n"
 
 # fe-connect.c:1322
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: fe-connect.c:1834
+#: fe-connect.c:1843
 msgid "unexpected message from server during startup\n"
 msgstr "启动过程中收到来自服务器的非预期信息\n"
 
 # fe-connect.c:1549
-#: 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
-#: 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
-#: fe-connect.c:2608
+#: fe-connect.c:2633
 msgid "unterminated quoted string in connection info string\n"
 msgstr "联接信息字串中未结束的引号字串\n"
 
 # fe-connect.c:2558
-#: fe-connect.c:2642
+#: fe-connect.c:2667
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "非法联接选项 \"%s\"\n"
 
 # fe-connect.c:2744
-#: fe-connect.c:2854
+#: fe-connect.c:2879
 msgid "connection pointer is NULL\n"
 msgstr "联接指针是 NULL\n"
 
 # fe-connect.c:2953
-#: 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
-#: 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
-#: fe-exec.c:724
+#: fe-exec.c:740
 msgid "statement name is a null pointer\n"
 msgstr "声明名字是一个空指针\n"
 
 # fe-exec.c:745
-#: fe-exec.c:755
+#: fe-exec.c:771
 msgid "no connection to the server\n"
 msgstr "没有到服务器的联接\n"
 
 # fe-exec.c:752
-#: 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
+#: fe-exec.c:814 fe-exec.c:1465
-msgid "function requires at least 3.0 protocol\n"
+msgid "function requires at least protocol version 3.0\n"
 msgstr "函数至少需要 3.0 版本的协议\n"
 
 # fe-exec.c:1371
-#: 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
-#: 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
-#: 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
-#: 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
-#: fe-exec.c:1666
+#: fe-exec.c:1699
 msgid "connection in wrong state\n"
 msgstr "联接处于错误状态\n"
 
 # fe-exec.c:2055
-#: fe-exec.c:1697
+#: fe-exec.c:1730
 msgid "invalid ExecStatusType code"
 msgstr "非法 ExecStatusType 代码"
 
 # fe-exec.c:2108 fe-exec.c:2141
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: fe-lobj.c:648
+#: fe-lobj.c:673
 msgid "cannot determine OID of function loread\n"
 msgstr "无法判断函数 loread 的 OID\n"
 
 # fe-lobj.c:651
-#: 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
-#: 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
-#: 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
-#: 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
+#: fe-secure.c:349 fe-secure.c:428 fe-secure.c:1042
-msgid "Unknown SSL error code\n"
+msgid "unrecognized SSL error code\n"
 msgstr "未知的 SSL 错误码\n"
 
 # fe-lobj.c:498
-#: fe-secure.c:459
+#: fe-secure.c:490
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "查询套接字错误: %s\n"
 
 # fe-connect.c:1263
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
-#: 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
+#~ msgid "could not translate local service to address: %s\n"
+#~ msgstr "无法解释本地服务到地址: %s\n"
+
 # fe-connect.c:1010
 #~ msgid "server does not support SSL, and previous non-SSL attempt failed\n"
 #~ msgstr "服务器不支持 SSL, 并且先前非 SSL 尝试失败\n"