Translation updates

src/bin/initdb/po/zh_CN.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
+"Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-31 08:59+0000\n"
+"POT-Creation-Date: 2004-12-02 09:43+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"
@@ -14,42 +14,57 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: initdb.c:233 initdb.c:247
+#: initdb.c:250 initdb.c:264
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: 内存溢出\n"
 
-#: initdb.c:329 initdb.c:1298
+#: initdb.c:374 initdb.c:1403
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: 为了读取, 无法打开文件 \"%s\": %s\n"
 
-#: initdb.c:387
+#: initdb.c:435 initdb.c:1035 initdb.c:1062
 #, 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
+#: initdb.c:443 initdb.c:451 initdb.c:1042 initdb.c:1068
 #, c-format
-msgid "%s: failed\n"
+msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: 失败\n"
+msgstr "%s: 无法写文件 \"%s\": %s\n"
 
-#: initdb.c:521
+#: initdb.c:470
+#, c-format
+msgid "%s: could not execute command \"%s\": %s\n"
+msgstr "%s: 无法执行命令 \"%s\": %s\n"
+
+#: initdb.c:593
 #, c-format
 msgid "%s: removing data directory \"%s\"\n"
 msgstr "%s: 删除数据目录 \"%s\"\n"
 
-#: initdb.c:529
+#: initdb.c:596
+#, c-format
+msgid "%s: failed to remove data directory\n"
+msgstr "%s: 删除数据目录失败\n"
+
+#: initdb.c:602
 #, c-format
 msgid "%s: removing contents of data directory \"%s\"\n"
 msgstr "%s: 删除数据目录 \"%s\" 的内容\n"
 
-#: initdb.c:540
+#: initdb.c:605
+#, c-format
+msgid "%s: failed to remove contents of data directory\n"
+msgstr "%s: 删除数据目录内容失败\n"
+
+#: initdb.c:614
 #, c-format
 msgid "%s: data directory \"%s\" not removed at user's request\n"
 msgstr "%s: 在用户的要求下数据库目录 \"%s\" 不被删除\n"
 
-#: initdb.c:566
+#: initdb.c:640
 #, c-format
 msgid ""
 "%s: cannot be run as root\n"
@@ -60,17 +75,17 @@ msgstr ""
 "请以服务器进程所有者的用户 (无特权) 身份\n"
 "登陆 (使用, e.g., \"su\").\n"
 
-#: initdb.c:615
+#: initdb.c:689
 #, c-format
 msgid "%s: \"%s\" is not a valid server encoding name\n"
 msgstr "%s: \"%s\" 不是一个有效的服务器编码名字\n"
 
-#: initdb.c:770
+#: initdb.c:844
 #, c-format
 msgid "%s: warning: encoding mismatch\n"
 msgstr "%s: 警告: 编码不匹配\n"
 
-#: initdb.c:772
+#: initdb.c:846
 #, c-format
 msgid ""
 "The encoding you selected (%s) and the encoding that the selected\n"
@@ -85,7 +100,12 @@ msgstr ""
 "类型.\n"
 "\n"
 
-#: initdb.c:924
+#: initdb.c:976
+#, c-format
+msgid "%s: could not create directory \"%s\": %s\n"
+msgstr "%s: 无法创建目录 \"%s\": %s\n"
+
+#: initdb.c:1004
 #, c-format
 msgid ""
 "%s: file \"%s\" does not exist\n"
@@ -96,26 +116,26 @@ msgstr ""
 "这意味着您的安装发生了错误或\n"
 "使用 -L 选项指定了错误的路径.\n"
 
-#: initdb.c:989
+#: initdb.c:1086
 #, c-format
 msgid "selecting default max_connections ... "
 msgstr "选择默认最大联接数 (max_connections) ... "
 
-#: initdb.c:1025
+#: initdb.c:1122
 #, c-format
 msgid "selecting default shared_buffers ... "
 msgstr "选择默认共享缓冲区大小 (shared_buffers) ... "
 
-#: initdb.c:1058
+#: initdb.c:1155
 msgid "creating configuration files ... "
 msgstr "创建配置文件 ... "
 
-#: initdb.c:1145
+#: initdb.c:1251
 #, c-format
 msgid "creating template1 database in %s/base/1 ... "
 msgstr "在 %s/base/1 中创建 template1 数据库 ... "
 
-#: initdb.c:1161
+#: initdb.c:1267
 #, c-format
 msgid ""
 "%s: input file \"%s\" does not belong to PostgreSQL %s\n"
@@ -124,95 +144,95 @@ msgstr ""
 "%s: 输入文件 \"%s\" 不属于 PostgreSQL %s\n"
 "检查你的安装或使用 -L 选项指定正确的路径.\n"
 
-#: initdb.c:1237
+#: initdb.c:1342
 msgid "initializing pg_shadow ... "
 msgstr "初始化 pg_shadow ... "
 
-#: initdb.c:1273
+#: initdb.c:1378
 msgid "Enter new superuser password: "
 msgstr "输入新的超级用户口令: "
 
-#: initdb.c:1274
+#: initdb.c:1379
 msgid "Enter it again: "
 msgstr "再输入一遍: "
 
-#: initdb.c:1277
+#: initdb.c:1382
 #, c-format
 msgid "Passwords didn't match.\n"
 msgstr "口令不匹配.\n"
 
-#: initdb.c:1304
+#: initdb.c:1409
 #, c-format
 msgid "%s: could not read password from file \"%s\": %s\n"
 msgstr "%s: 无法从文件 \"%s\" 读取口令: %s\n"
 
-#: initdb.c:1317
+#: initdb.c:1422
 #, c-format
 msgid "setting password ... "
 msgstr "设置口令 ... "
 
-#: initdb.c:1341
+#: initdb.c:1443
 #, c-format
 msgid "%s: The password file was not generated. Please report this problem.\n"
 msgstr "%s: 口令文件没有生成. 请报告这个问题.\n"
 
-#: initdb.c:1371
+#: initdb.c:1471
 msgid "enabling unlimited row size for system tables ... "
 msgstr "启动不限制系统表行大小 ... "
 
-#: initdb.c:1444
+#: initdb.c:1544
 msgid "initializing pg_depend ... "
 msgstr "初始化 pg_depend ... "
 
-#: initdb.c:1472
+#: initdb.c:1572
 msgid "creating system views ... "
 msgstr "创建系统视图 ... "
 
-#: initdb.c:1509
+#: initdb.c:1608
 msgid "loading pg_description ... "
 msgstr "加载 pg_description ... "
 
-#: initdb.c:1557
+#: initdb.c:1647
 msgid "creating conversions ... "
 msgstr "创建字符集转换 ... "
 
-#: initdb.c:1613
+#: initdb.c:1701
 msgid "setting privileges on built-in objects ... "
 msgstr "对内建对象设置权限 ... "
 
-#: initdb.c:1671
+#: initdb.c:1759
 msgid "creating information schema ... "
 msgstr "创建信息模式 ... "
 
-#: initdb.c:1734
+#: initdb.c:1816
 msgid "vacuuming database template1 ... "
 msgstr "清理数据库 template1 ... "
 
-#: initdb.c:1790
+#: initdb.c:1870
 msgid "copying template1 to template0 ... "
 msgstr "拷贝 template1 到 template0 ... "
 
-#: initdb.c:1847
+#: initdb.c:1927
 #, c-format
 msgid "caught signal\n"
 msgstr "捕获信号\n"
 
-#: initdb.c:1852
+#: initdb.c:1933
 #, c-format
-msgid "could not write to child process\n"
+msgid "could not write to child process: %s\n"
-msgstr "无法写到子进程\n"
+msgstr "无法写到子进程: %s\n"
 
-#: initdb.c:1858
+#: initdb.c:1941
 #, c-format
 msgid "ok\n"
 msgstr "成功\n"
 
-#: initdb.c:1888
+#: initdb.c:1989
 #, c-format
 msgid "%s: invalid locale name \"%s\"\n"
 msgstr "%s: 无效的 locale 名字 \"%s\"\n"
 
-#: initdb.c:1955
+#: initdb.c:2056
 #, c-format
 msgid ""
 "%s initializes a PostgreSQL database cluster.\n"
@@ -221,17 +241,17 @@ msgstr ""
 "%s 初始化一个 PostgreSQL 数据库簇.\n"
 "\n"
 
-#: initdb.c:1956
+#: initdb.c:2057
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: initdb.c:1957
+#: initdb.c:2058
 #, c-format
 msgid "  %s [OPTION]... [DATADIR]\n"
 msgstr "  %s [选项]... [DATADIR]\n"
 
-#: initdb.c:1958
+#: initdb.c:2059
 #, c-format
 msgid ""
 "\n"
@@ -240,23 +260,23 @@ msgstr ""
 "\n"
 "选项:\n"
 
-#: initdb.c:1959
+#: initdb.c:2060
 #, c-format
 msgid " [-D, --pgdata=]DATADIR     location for this database cluster\n"
 msgstr "  -D, --pgdata=DATADIR      当前数据库簇的位置\n"
 
-#: initdb.c:1960
+#: initdb.c:2061
 #, c-format
 msgid "  -E, --encoding=ENCODING   set default encoding for new databases\n"
 msgstr "  -E, --encoding=ENCODING   为新数据库设置默认编码\n"
 
-#: initdb.c:1961
+#: initdb.c:2062
 #, c-format
 msgid ""
 "  --locale=LOCALE           initialize database cluster with given locale\n"
 msgstr "  --locale=LOCALE           初始化数据库簇的 locale\n"
 
-#: initdb.c:1962
+#: initdb.c:2063
 #, c-format
 msgid ""
 "  --lc-collate, --lc-ctype, --lc-messages=LOCALE\n"
@@ -271,46 +291,46 @@ msgstr ""
 "                            locale (默认使用环境变\n"
 "                            量)\n"
 
-#: initdb.c:1967
+#: initdb.c:2068
 #, c-format
 msgid "  --no-locale               equivalent to --locale=C\n"
 msgstr "  --no-locale               等同于 --locale=C\n"
 
-#: initdb.c:1968
+#: initdb.c:2069
 #, c-format
 msgid ""
-"  -A, --auth=method         default authentication method for local "
+"  -A, --auth=METHOD         default authentication method for local "
 "connections\n"
-msgstr "  -A, --auth=method         本地连接的默认认证方法\n"
+msgstr "  -A, --auth=METHOD         本地连接的默认认证方法\n"
 
-#: initdb.c:1969
+#: initdb.c:2070
 #, c-format
 msgid "  -U, --username=NAME       database superuser name\n"
 msgstr "  -U, --username=NAME       数据库超级用户名\n"
 
-#: initdb.c:1970
+#: initdb.c:2071
 #, c-format
 msgid ""
 "  -W, --pwprompt            prompt for a password for the new superuser\n"
 msgstr "  -W, --pwprompt            对于新的超级用户提示输入口令\n"
 
-#: initdb.c:1971
+#: initdb.c:2072
 #, c-format
 msgid ""
-"  --pwfile=filename         read password for the new superuser from file\n"
+"  --pwfile=FILE             read password for the new superuser from file\n"
 msgstr "  --pwfile=文件名           对于新的超级用户从文件读取口令\n"
 
-#: initdb.c:1972
+#: initdb.c:2073
 #, c-format
 msgid "  -?, --help                show this help, then exit\n"
 msgstr "  -?, --help                显示此帮助, 然后退出\n"
 
-#: initdb.c:1973
+#: initdb.c:2074
 #, c-format
 msgid "  -V, --version             output version information, then exit\n"
 msgstr "  -V, --version             输出版本信息, 然后退出\n"
 
-#: initdb.c:1974
+#: initdb.c:2075
 #, c-format
 msgid ""
 "\n"
@@ -319,27 +339,27 @@ msgstr ""
 "\n"
 "非普通使用选项:\n"
 
-#: initdb.c:1975
+#: initdb.c:2076
 #, c-format
 msgid "  -d, --debug               generate lots of debugging output\n"
 msgstr "  -d, --debug               产生大量的除错信息\n"
 
-#: initdb.c:1976
+#: initdb.c:2077
 #, c-format
 msgid "  -s, --show                show internal settings\n"
 msgstr "  -s, --show                显示内部设置\n"
 
-#: initdb.c:1977
+#: initdb.c:2078
 #, c-format
 msgid "  -L DIRECTORY              where to find the input files\n"
 msgstr "  -L DIRECTORY              输入文件的位置\n"
 
-#: initdb.c:1978
+#: initdb.c:2079
 #, c-format
 msgid "  -n, --noclean             do not clean up after errors\n"
 msgstr "  -n, --noclean             出错后不清理\n"
 
-#: initdb.c:1979
+#: initdb.c:2080
 #, c-format
 msgid ""
 "\n"
@@ -349,7 +369,7 @@ msgstr ""
 "\n"
 "如果没有指定数据目录, 将使用环境变量 PGDATA\n"
 
-#: initdb.c:1981
+#: initdb.c:2082
 #, c-format
 msgid ""
 "\n"
@@ -358,36 +378,36 @@ msgstr ""
 "\n"
 "报告错误至 <pgql-bugs@postgresql.org>.\n"
 
-#: initdb.c:2072
+#: initdb.c:2175
 #, c-format
 msgid "Running in debug mode.\n"
 msgstr "运行在除错模式中. \n"
 
-#: initdb.c:2076
+#: initdb.c:2179
 #, c-format
 msgid "Running in noclean mode.  Mistakes will not be cleaned up.\n"
 msgstr "运行在 noclean 模式中. 错误将不被清理.\n"
 
-#: initdb.c:2112 initdb.c:2129 initdb.c:2341
+#: initdb.c:2216 initdb.c:2233 initdb.c:2453
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "请用 \"%s --help\" 获取更多的信息.\n"
 
-#: initdb.c:2127
+#: initdb.c:2231
 #, c-format
 msgid "%s: too many command-line arguments (first is \"%s\")\n"
 msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
 
-#: initdb.c:2135
+#: initdb.c:2239
 #, c-format
-msgid "%s: you cannot specify both password prompt and password file\n"
+msgid "%s: password prompt and password file may not be specified together\n"
-msgstr "%s: 你不能同时指定提示输入口令和口令文件\n"
+msgstr "%s: 口令提示和口令文件可以不用同时都指定\n"
 
-#: initdb.c:2141
+#: initdb.c:2245
 msgid ""
 "\n"
-"WARNING: enabling \"trust\" authentication for local connections.\n"
+"WARNING: enabling \"trust\" authentication for local connections\n"
-"You can change this by editing pg_hba.conf or using the -A flag the\n"
+"You can change this by editing pg_hba.conf or using the -A option the\n"
 "next time you run initdb.\n"
 msgstr ""
 "\n"
@@ -395,19 +415,18 @@ msgstr ""
 "你可以通过编辑 pg_hba.conf 更改或你下\n"
 "次运行 initdb 时使用 -A 选项.\n"
 
-#: initdb.c:2165
+#: initdb.c:2269
 #, c-format
-msgid "%s: unknown authentication method \"%s\".\n"
+msgid "%s: unrecognized authentication method \"%s\"\n"
 msgstr "%s: 未知认证方法 \"%s\".\n"
 
-#: initdb.c:2174
+#: initdb.c:2279
 #, c-format
 msgid ""
-"%s: you need to specify a password for the superuser to enable %s "
+"%s: must specify a password for the superuser to enable %s authentication\n"
-"authentication.\n"
+msgstr "%s: 为了启动 %s 认证, 你需要为超级用户指定一个口令\n"
-msgstr "%s: 为了启动 %s 认证, 你需要为超级用户指定一个口令.\n"
 
-#: initdb.c:2189
+#: initdb.c:2294
 #, c-format
 msgid ""
 "%s: no data directory specified\n"
@@ -420,37 +439,39 @@ msgstr ""
 "存在. 使用 -D 选项或者\n"
 "环境变量 PGDATA.\n"
 
-#: initdb.c:2215
+#: initdb.c:2326
 #, c-format
 msgid ""
-"The program \"postgres\" is needed by %s but was not found in the same "
+"The program \"postgres\" is needed by %s but was not found in the\n"
-"directory as \"%s\".\n"
+"same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
 "%s 需要程序 \"postgres\", 但是在同一个目录 \"%s\" 中没找到.\n"
+"\n"
 "检查您的安装.\n"
 
-#: initdb.c:2221
+#: initdb.c:2333
 #, c-format
 msgid ""
-"The program \"postgres\" was found by %s but was not the same version as \"%s"
+"The program \"postgres\" was found by \"%s\"\n"
-"\".\n"
+"but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
 "%s 找到程序 \"postgres\", 但是和版本 \"%s\" 不一致.\n"
+"\n"
 "检查您的安装.\n"
 
-#: initdb.c:2240
+#: initdb.c:2352
 #, c-format
 msgid "%s: input file location must be an absolute path\n"
 msgstr "%s: 输入文件位置必须为绝对路径\n"
 
-#: initdb.c:2248
+#: initdb.c:2360
 #, c-format
 msgid "%s: could not determine valid short version string\n"
 msgstr "%s: 无法确定有效的短版本字符串\n"
 
-#: initdb.c:2301
+#: initdb.c:2413
 #, c-format
 msgid ""
 "The files belonging to this database system will be owned by user \"%s\".\n"
@@ -460,12 +481,12 @@ msgstr ""
 "属于此数据库系统的文件宿主为用户 \"%s\".\n"
 "此用户也必须为服务器进程的宿主.\n"
 
-#: initdb.c:2311
+#: initdb.c:2423
 #, c-format
 msgid "The database cluster will be initialized with locale %s.\n"
 msgstr "数据库簇将带有 locale %s 初始化.\n"
 
-#: initdb.c:2314
+#: initdb.c:2426
 #, c-format
 msgid ""
 "The database cluster will be initialized with locales\n"
@@ -484,32 +505,37 @@ msgstr ""
 "  NUMERIC:  %s\n"
 "  TIME:     %s\n"
 
-#: initdb.c:2339
+#: initdb.c:2451
 #, c-format
 msgid "%s: could not find suitable encoding for locale \"%s\"\n"
 msgstr "%s: 无法为 locale \"%s\" 找到合适的编码\n"
 
-#: initdb.c:2340
+#: initdb.c:2452
 #, c-format
 msgid "Rerun %s with the -E option.\n"
 msgstr "带 -E 选项重新运行 %s.\n"
 
-#: initdb.c:2347
+#: initdb.c:2459
 #, c-format
 msgid "The default database encoding has accordingly been set to %s.\n"
 msgstr "默认的数据库编码已经相应的设置为 %s.\n"
 
-#: initdb.c:2388
+#: initdb.c:2500
 #, c-format
 msgid "creating directory %s ... "
 msgstr "创建目录 %s ... "
 
-#: initdb.c:2402
+#: initdb.c:2514
 #, c-format
 msgid "fixing permissions on existing directory %s ... "
 msgstr "修复已存在目录 %s 的权限 ... "
 
-#: initdb.c:2420
+#: initdb.c:2520
+#, c-format
+msgid "%s: could not change permissions of directory \"%s\": %s\n"
+msgstr "%s: 无法改变目录 \"%s\" 的权限: %s\n"
+
+#: initdb.c:2533
 #, c-format
 msgid ""
 "%s: directory \"%s\" exists but is not empty\n"
@@ -522,26 +548,66 @@ msgstr ""
 "目录 \"%s\" 或者运行带参数的 %s\n"
 "而不是 \"%s\".\n"
 
-#: initdb.c:2437
+#: initdb.c:2542
+#, c-format
+msgid "%s: could not access directory \"%s\": %s\n"
+msgstr "%s: 无法访问目录 \"%s\": %s\n"
+
+#: initdb.c:2551
 #, c-format
 msgid "creating directory %s/%s ... "
 msgstr "创建目录 %s/%s ... "
 
-#: initdb.c:2501
+#: initdb.c:2619
 #, c-format
 msgid ""
 "\n"
 "Success. You can now start the database server using:\n"
 "\n"
-"    %s%s%s/postmaster -D %s%s%s\n"
+"    %s%s%s%spostmaster -D %s%s%s\n"
 "or\n"
-"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"    %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
 "\n"
 msgstr ""
 "\n"
 "成功. 您现在可以用下面的命令运行数据库服务器:\n"
 "\n"
-"    %s%s%s/postmaster -D %s%s%s\n"
+"    %s%s%s%spostmaster -D %s%s%s\n"
 "或者\n"
-"    %s%s%s/pg_ctl -D %s%s%s -l logfile start\n"
+"    %s%s%s%spg_ctl -D %s%s%s -l logfile start\n"
 "\n"
+
+#: ../../port/dirmod.c:75 ../../port/dirmod.c:88 ../../port/dirmod.c:101
+#, c-format
+msgid "out of memory\n"
+msgstr "内存溢出\n"
+
+#: ../../port/exec.c:193 ../../port/exec.c:307 ../../port/exec.c:350
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "无法确认当前目录: %s"
+
+#: ../../port/exec.c:323 ../../port/exec.c:359
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "无法进入目录 \"%s\""
+
+#: ../../port/exec.c:338
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "无法读取符号链结 \"%s\""
+
+#: ../../port/exec.c:569
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "子进程已退出, 退出码为 %d"
+
+#: ../../port/exec.c:572
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "子进程被信号 %d 终止"
+
+#: ../../port/exec.c:575
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "子进程已退出, 未知状态 %d"

src/bin/pg_config/nls.mk

@@ -1,5 +1,5 @@
-# $PostgreSQL: pgsql/src/bin/pg_config/nls.mk,v 1.12 2004/11/27 22:44:12 petere Exp $
+# $PostgreSQL: pgsql/src/bin/pg_config/nls.mk,v 1.13 2004/12/11 19:09:02 petere Exp $
 CATALOG_NAME	:= pg_config
-AVAIL_LANGUAGES	:= cs de es fr pt_BR ro ru sl sv tr zh_TW
+AVAIL_LANGUAGES	:= cs de es fr pt_BR ro ru sl sv tr zh_CN zh_TW
 GETTEXT_FILES	:= pg_config.c ../../port/exec.c
 GETTEXT_TRIGGERS:= _

src/bin/pg_config/po/zh_CN.po

@@ -0,0 +1,162 @@
+# SOME DESCRIPTIVE TITLE.
+# This file is put in the public domain.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PostgreSQL 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-12-02 10:00+0000\n"
+"PO-Revision-Date: 2003-09-15 13:49:24+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"
+
+#: pg_config.c:36
+#, c-format
+msgid ""
+"\n"
+"%s provides information about the installed version of PostgreSQL.\n"
+"\n"
+msgstr ""
+"\n"
+"%s 提供 PostgreSQL 的安装信息.\n"
+"\n"
+
+#: pg_config.c:37
+#, c-format
+msgid "Usage:\n"
+msgstr "使用方法:\n"
+
+#: pg_config.c:38
+#, c-format
+msgid ""
+"  %s OPTION...\n"
+"\n"
+msgstr ""
+"  %s 选项...\n"
+"\n"
+
+#: pg_config.c:39
+#, c-format
+msgid "Options:\n"
+msgstr "选项:\n"
+
+#: pg_config.c:40
+#, c-format
+msgid "  --bindir              show location of user executables\n"
+msgstr "  --bindir              显示执行文件所在位置\n"
+
+#: pg_config.c:41
+#, c-format
+msgid ""
+"  --includedir          show location of C header files of the client\n"
+"                        interfaces\n"
+msgstr ""
+"  --includedir          显示客户端接口 C 头文件所在\n"
+"                        位置\n"
+
+#: pg_config.c:43
+#, c-format
+msgid ""
+"  --includedir-server   show location of C header files for the server\n"
+msgstr "  --includedir-server   显示服务端 C 头文件所在位置\n"
+
+#: pg_config.c:44
+#, c-format
+msgid "  --libdir              show location of object code libraries\n"
+msgstr "  --libdir              显示目标代码库文件所在位置\n"
+
+#: pg_config.c:45
+#, c-format
+msgid "  --pkglibdir           show location of dynamically loadable modules\n"
+msgstr "  --pkglibdir           显示动态加载库所在位置\n"
+
+#: pg_config.c:46
+#, c-format
+msgid "  --pgxs                show location of extension makefile\n"
+msgstr "  --pgxs                显示扩展 makefile 所在位置\n"
+
+#: pg_config.c:47
+#, c-format
+msgid ""
+"  --configure           show options given to \"configure\" script when\n"
+"                        PostgreSQL was built\n"
+msgstr ""
+"  --configure           显示编译 PostgreSQL 时 \"configure\"\n"
+"                        的选项\n"
+
+#: pg_config.c:49
+#, c-format
+msgid "  --version             show the PostgreSQL version, then exit\n"
+msgstr "  --version             显示 PostgreSQL 版本信息, 然后退出\n"
+
+#: pg_config.c:50
+#, c-format
+msgid ""
+"  --help                show this help, then exit\n"
+"\n"
+msgstr ""
+"  --help                显示此帮助信息, 然后退出\n"
+"\n"
+
+#: pg_config.c:51
+#, c-format
+msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr "臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_config.c:57
+#, c-format
+msgid ""
+"\n"
+"Try \"%s --help\" for more information\n"
+msgstr ""
+"\n"
+"试用 \"%s --help\" 获取更多的信息\n"
+
+#: pg_config.c:75
+#, c-format
+msgid "%s: argument required\n"
+msgstr "%s: 需要参数\n"
+
+#: pg_config.c:104
+#, c-format
+msgid "%s: invalid argument: %s\n"
+msgstr "%s: 无效参数: %s\n"
+
+#: pg_config.c:113
+#, c-format
+msgid "%s: could not find own executable\n"
+msgstr "%s: 找不到执行文件\n"
+
+#: ../../port/exec.c:193 ../../port/exec.c:307 ../../port/exec.c:350
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "无法确认当前目录: %s"
+
+#: ../../port/exec.c:323 ../../port/exec.c:359
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "无法进入目录 \"%s\""
+
+#: ../../port/exec.c:338
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "无法读取符号链结 \"%s\""
+
+#: ../../port/exec.c:569
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "子进程已退出, 退出码为 %d"
+
+#: ../../port/exec.c:572
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "子进程被信号 %d 终止"
+
+#: ../../port/exec.c:575
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "子进程已退出, 未知状态 %d"

src/bin/pg_controldata/po/zh_CN.po

@@ -3,9 +3,9 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
+"Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-31 08:57+0000\n"
+"POT-Creation-Date: 2004-11-15 14:24+0000\n"
 "PO-Revision-Date: 2004-01-10 13:45+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_controldata.c:28
+#: pg_controldata.c:26
 #, c-format
 msgid ""
 "%s displays control information of a PostgreSQL database cluster.\n"
@@ -22,88 +22,87 @@ msgstr ""
 "%s 显示 PostgreSQL 数据库簇控制信息.\n"
 "\n"
 
-#: pg_controldata.c:32
+#: pg_controldata.c:30
 #, c-format
 msgid ""
 "Usage:\n"
-"  %s [OPTION]\n"
+"  %s [OPTION] [DATADIR]\n"
 "\n"
 "Options:\n"
-"  DATADIR        show cluster control information for DATADIR\n"
 "  --help         show this help, then exit\n"
 "  --version      output version information, then exit\n"
 msgstr ""
-"用法:\n"
+"使用方法:\n"
-"  %s [选项]\n"
+"  %s [选项] [数据目录]\n"
 "\n"
 "选项:\n"
-"  DATADIR        显示 DATADIR 的簇控制信息\n"
 "  --help         显示此帮助信息, 然后退出\n"
 "  --version      显示 pg_controldata 的版本, 然后退出\n"
 
-#: pg_controldata.c:41
+#: pg_controldata.c:38
 #, c-format
 msgid ""
 "\n"
-"If no data directory is specified, the environment variable PGDATA\n"
+"If no data directory (DATADIR) is specified, the environment variable "
+"PGDATA\n"
 "is used.\n"
 "\n"
 msgstr ""
 "\n"
-"如果没有指定数据目录, 将使用\n"
+"如果没有指定数据目录 (DATADIR), 将使用\n"
 "环境变量PGDATA.\n"
 "\n"
 
-#: pg_controldata.c:42
+#: pg_controldata.c:40
 #, c-format
 msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
 msgstr "报告错误至 <pgsql-bugs@postgresql.org>.\n"
 
-#: pg_controldata.c:52
+#: pg_controldata.c:50
 msgid "starting up"
 msgstr "正在启动"
 
-#: pg_controldata.c:54
+#: pg_controldata.c:52
 msgid "shut down"
 msgstr "关闭"
 
-#: pg_controldata.c:56
+#: pg_controldata.c:54
 msgid "shutting down"
 msgstr "正在关闭"
 
-#: pg_controldata.c:58
+#: pg_controldata.c:56
 msgid "in recovery"
 msgstr "在恢复中"
 
-#: pg_controldata.c:60
+#: pg_controldata.c:58
 msgid "in production"
 msgstr "在运行中"
 
-#: pg_controldata.c:62
+#: pg_controldata.c:60
 msgid "unrecognized status code"
 msgstr "不被认可的状态码"
 
-#: pg_controldata.c:104
+#: pg_controldata.c:102
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: 没有指定数据目录\n"
 
-#: pg_controldata.c:105
+#: pg_controldata.c:103
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "用 \"%s --help\" 显示更多的信息.\n"
 
-#: pg_controldata.c:113
+#: pg_controldata.c:111
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
 
-#: pg_controldata.c:120
+#: pg_controldata.c:118
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: 无法读取文件 \"%s\": %s\n"
 
-#: pg_controldata.c:134
+#: pg_controldata.c:132
 #, c-format
 msgid ""
 "WARNING: Calculated CRC checksum does not match value stored in file.\n"
@@ -116,130 +115,130 @@ msgstr ""
 "下面的结果是不可靠的.\n"
 "\n"
 
-#: pg_controldata.c:154
+#: pg_controldata.c:152
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control 版本:                      %u\n"
 
-#: pg_controldata.c:155
+#: pg_controldata.c:153
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog 版本:                         %u\n"
 
-#: pg_controldata.c:156
+#: pg_controldata.c:154
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "数据库系统标识符:                     %s\n"
 
-#: pg_controldata.c:157
+#: pg_controldata.c:155
 #, c-format
 msgid "Database cluster state:               %s\n"
 msgstr "数据库簇状态:                         %s\n"
 
-#: pg_controldata.c:158
+#: pg_controldata.c:156
 #, c-format
 msgid "pg_control last modified:             %s\n"
 msgstr "pg_control 最后修改:                  %s\n"
 
-#: pg_controldata.c:159
+#: pg_controldata.c:157
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "当前日志文件ID:                       %u\n"
 
-#: pg_controldata.c:160
+#: pg_controldata.c:158
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "下一个日志文件段:                     %u\n"
 
-#: pg_controldata.c:161
+#: pg_controldata.c:159
 #, c-format
 msgid "Latest checkpoint location:           %X/%X\n"
 msgstr "最新检查点位置:                       %X/%X\n"
 
-#: pg_controldata.c:163
+#: pg_controldata.c:161
 #, c-format
 msgid "Prior checkpoint location:            %X/%X\n"
 msgstr "优先检查点位置:                       %X/%X\n"
 
-#: pg_controldata.c:165
+#: pg_controldata.c:163
 #, c-format
 msgid "Latest checkpoint's REDO location:    %X/%X\n"
 msgstr "最新检查点的 REDO 位置:               %X/%X\n"
 
-#: pg_controldata.c:167
+#: pg_controldata.c:165
 #, c-format
 msgid "Latest checkpoint's UNDO location:    %X/%X\n"
 msgstr "最新检查点的 UNDO 位置:               %X/%X\n"
 
-#: pg_controldata.c:169
+#: pg_controldata.c:167
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "最新检查点的 TimeLineID:              %u\n"
 
-#: pg_controldata.c:170
+#: pg_controldata.c:168
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "最新检查点的 NextXID:                 %u\n"
 
-#: pg_controldata.c:171
+#: pg_controldata.c:169
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "最新检查点的 NextOID:                 %u\n"
 
-#: pg_controldata.c:172
+#: pg_controldata.c:170
 #, c-format
 msgid "Time of latest checkpoint:            %s\n"
 msgstr "最新检查点的时间:                     %s\n"
 
-#: pg_controldata.c:173
+#: pg_controldata.c:171
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "数据库块大小:                         %u\n"
 
-#: pg_controldata.c:174
+#: pg_controldata.c:172
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "大关系的每段块数:                     %u\n"
 
-#: pg_controldata.c:175
+#: pg_controldata.c:173
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "每一个 WAL 段字节数:                  %u\n"
 
-#: pg_controldata.c:176
+#: pg_controldata.c:174
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "标识符的最大长度:                     %u\n"
 
-#: pg_controldata.c:177
+#: pg_controldata.c:175
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "函数参数的最大个数:                   %u\n"
 
-#: pg_controldata.c:178
+#: pg_controldata.c:176
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "日期/时间 类型存储:                   %s\n"
 
-#: pg_controldata.c:179
+#: pg_controldata.c:177
 msgid "64-bit integers"
 msgstr "64位整数"
 
-#: pg_controldata.c:179
+#: pg_controldata.c:177
 msgid "floating-point numbers"
 msgstr "浮点数"
 
-#: pg_controldata.c:180
+#: pg_controldata.c:178
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "本地名字的最大长度:                   %u\n"
 
-#: pg_controldata.c:181
+#: pg_controldata.c:179
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_controldata.c:182
+#: pg_controldata.c:180
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"

src/bin/pg_ctl/po/zh_CN.po

@@ -4,9 +4,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.5\n"
+"Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-31 08:57+0000\n"
+"POT-Creation-Date: 2004-12-02 09:53+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"
@@ -14,168 +14,160 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_ctl.c:193 pg_ctl.c:209 pg_ctl.c:1293
+#: pg_ctl.c:201 pg_ctl.c:216 pg_ctl.c:1342
 #, c-format
 msgid "%s: out of memory\n"
 msgstr "%s: 内存溢出\n"
 
-#: pg_ctl.c:452
+#: pg_ctl.c:250
+#, c-format
+msgid "%s: could not open PID file \"%s\": %s"
+msgstr "%s: 无法打开 PID 文件 \"%s\": %s"
+
+#: pg_ctl.c:469
 #, c-format
 msgid ""
-"%s: Another postmaster may be running. Trying to start postmaster anyway.\n"
+"%s: another postmaster may be running; trying to start postmaster anyway\n"
-msgstr "%s: 其他 postmaster 可能正在运行. 尝试启动 postmaster.\n"
+msgstr "%s: 其他 postmaster 可能正在运行. 尝试启动 postmaster\n"
 
-#: pg_ctl.c:470
+#: pg_ctl.c:487
 #, c-format
-msgid "%s: cannot read %s\n"
+msgid "%s: could not read file \"%s\"\n"
-msgstr "%s: 无法读取 %s\n"
+msgstr "%s: 无法读取文件 \"%s\"\n"
 
-#: pg_ctl.c:476
+#: pg_ctl.c:493
 #, c-format
-msgid "%s: option file %s must have exactly 1 line\n"
+msgid "%s: option file \"%s\" must have exactly one line\n"
-msgstr "%s: 选项文件 %s 只能有一行\n"
+msgstr "%s: 选项文件 \"%s\" 只能有一行\n"
 
-#: pg_ctl.c:522
+#: pg_ctl.c:544
 #, c-format
 msgid ""
-"The program \"postmaster\" is needed by %s but was not found in the same "
+"The program \"postmaster\" is needed by %s but was not found in the\n"
-"directory as \"%s\".\n"
+"same directory as \"%s\".\n"
 "Check your installation.\n"
 msgstr ""
 "程序 \"postmaster\" 是 %s 需要的, 但没有在同一个目录 \"%s\" 发现.\n"
+"\n"
 "检查您的安装.\n"
 
-#: pg_ctl.c:528
+#: pg_ctl.c:550
 #, c-format
 msgid ""
-"The program \"postmaster\" was found by %s but was not the same version as "
+"The program \"postmaster\" was found by \"%s\"\n"
-"\"%s\".\n"
+"but was not the same version as %s.\n"
 "Check your installation.\n"
 msgstr ""
 "%s 找到程序 \"postmaster\", 但版本和 \"%s\" 不一致.\n"
+"\n"
 "检查您的安装.\n"
 
-#: pg_ctl.c:539
+#: pg_ctl.c:562
-msgid "Unable to run the postmaster binary\n"
+#, c-format
-msgstr "无法运行 postmaster 二进制文件\n"
+msgid "%s: could not start postmaster: exit code was %d\n"
+msgstr "%s: 无法启动 postmaster: 退出码为 %d\n"
 
-#: pg_ctl.c:549
+#: pg_ctl.c:573
 #, c-format
 msgid ""
-"%s: cannot start postmaster\n"
+"%s: could not start postmaster\n"
-"Examine the log output\n"
+"Examine the log output.\n"
 msgstr ""
 "%s: 无法启动 postmaster\n"
-"检查日志输出\n"
+"检查日志输出.\n"
 
-#: pg_ctl.c:560
+#: pg_ctl.c:582
-#, c-format
 msgid "waiting for postmaster to start..."
 msgstr "等待 postmaster 启动 ..."
 
-#: pg_ctl.c:565
+#: pg_ctl.c:585
 #, c-format
 msgid "could not start postmaster\n"
 msgstr "无法启动 postmaster\n"
 
-#: pg_ctl.c:567
+#: pg_ctl.c:588 pg_ctl.c:654 pg_ctl.c:721
-#, c-format
+msgid " done\n"
-msgid ""
+msgstr " 完成\n"
-"done\n"
-"postmaster started\n"
-msgstr ""
-"完成\n"
-"postmaster 已经启动\n"
 
-#: pg_ctl.c:570
+#: pg_ctl.c:589
-#, c-format
+msgid "postmaster started\n"
+msgstr "postmaster 已经启动\n"
+
+#: pg_ctl.c:593
 msgid "postmaster starting\n"
 msgstr "启动 postmaster\n"
 
-#: pg_ctl.c:585 pg_ctl.c:664 pg_ctl.c:734
+#: pg_ctl.c:607 pg_ctl.c:675 pg_ctl.c:735
 #, c-format
-msgid "%s: could not find %s\n"
+msgid "%s: PID file \"%s\" does not exist\n"
-msgstr "%s: 无法找到 %s\n"
+msgstr "%s: PID 文件 \"%s\" 不存在\n"
 
-#: pg_ctl.c:586 pg_ctl.c:735
+#: pg_ctl.c:608 pg_ctl.c:676 pg_ctl.c:736
 msgid "Is postmaster running?\n"
 msgstr "是否 postmaster 正在运行?\n"
 
-#: pg_ctl.c:592
+#: pg_ctl.c:614
 #, c-format
 msgid "%s: cannot stop postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: 无法停止 postmaster; postgres 正在运行 (PID: %ld)\n"
 
-#: pg_ctl.c:600 pg_ctl.c:681
+#: pg_ctl.c:622 pg_ctl.c:693
 #, c-format
-msgid "stop signal failed (PID: %ld): %s\n"
+msgid "%s: could not send stop signal (PID: %ld): %s\n"
-msgstr "停止信号失败 (PID: %ld): %s\n"
+msgstr "%s: 无法发送停止信号 (PID: %ld): %s\n"
 
-#: pg_ctl.c:608
+#: pg_ctl.c:629
-#, c-format
 msgid "postmaster shutting down\n"
 msgstr "关闭 postmaster\n"
 
-#: pg_ctl.c:615 pg_ctl.c:688
+#: pg_ctl.c:634 pg_ctl.c:698
-#, c-format
 msgid "waiting for postmaster to shut down..."
 msgstr "等待 postmaster 关闭 ..."
 
-#: pg_ctl.c:637 pg_ctl.c:712
+#: pg_ctl.c:649 pg_ctl.c:715
-#, c-format
 msgid " failed\n"
 msgstr " 失败\n"
 
-#: pg_ctl.c:639 pg_ctl.c:714
+#: pg_ctl.c:651 pg_ctl.c:717
 #, c-format
 msgid "%s: postmaster does not shut down\n"
 msgstr "%s: postmaster 没有关闭\n"
 
-#: pg_ctl.c:643 pg_ctl.c:719
+#: pg_ctl.c:656 pg_ctl.c:722
-#, c-format
-msgid "done\n"
-msgstr "完成\n"
-
-#: pg_ctl.c:645 pg_ctl.c:721
 #, c-format
 msgid "postmaster stopped\n"
 msgstr "postmaster 已经关闭\n"
 
-#: pg_ctl.c:665
+#: pg_ctl.c:677
-msgid ""
+msgid "starting postmaster anyway\n"
-"Is postmaster running?\n"
+msgstr "正在尝试启动 postmaster\n"
-"starting postmaster anyway\n"
-msgstr ""
-"是否 postmaster 正在运行?\n"
-"尝试启动 postmaster\n"
 
-#: pg_ctl.c:672
+#: pg_ctl.c:684
 #, c-format
 msgid "%s: cannot restart postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: 无法重启 postmaster; postgres 正在运行 (PID: %ld)\n"
 
-#: pg_ctl.c:675 pg_ctl.c:744
+#: pg_ctl.c:687 pg_ctl.c:745
 msgid "Please terminate postgres and try again.\n"
 msgstr "请终止 postgres 再重试.\n"
 
-#: pg_ctl.c:741
+#: pg_ctl.c:742
 #, c-format
 msgid "%s: cannot reload postmaster; postgres is running (PID: %ld)\n"
 msgstr "%s: 无法重载 postmaser; postgres 正在运行 (PID: %ld)\n"
 
-#: pg_ctl.c:750
+#: pg_ctl.c:751
 #, c-format
-msgid "reload signal failed (PID: %ld): %s\n"
+msgid "%s: could not send reload signal (PID: %ld): %s\n"
-msgstr "重载信号失败 (PID: %ld): %s\n"
+msgstr "%s: 无法发送重载信号 (PID: %ld): %s\n"
 
 #: pg_ctl.c:756
-#, c-format
 msgid "postmaster signaled\n"
 msgstr "postmaster 发出信号\n"
 
 #: pg_ctl.c:771
 #, c-format
-msgid "%s: postmaster or postgres not running\n"
+msgid "%s: neither postmaster nor postgres running\n"
 msgstr "%s: postmaster 或者 postgres 没有运行\n"
 
 #: pg_ctl.c:777
@@ -190,163 +182,155 @@ msgstr "%s: postmaster
 
 #: pg_ctl.c:800
 #, c-format
-msgid "signal %d failed (PID: %ld): %s\n"
+msgid "%s: could not send signal %d (PID: %ld): %s\n"
-msgstr "信号 %d 失败 (PID: %ld): %s\n"
+msgstr "%s: 无法发送信号 %d (PID: %ld): %s\n"
 
-#: pg_ctl.c:831
+#: pg_ctl.c:833
-msgid "Unable to find exe"
-msgstr "无法找到执行文件"
-
-#: pg_ctl.c:878 pg_ctl.c:910
-msgid "Unable to open service manager\n"
-msgstr "无法打开服务管理器\n"
-
-#: pg_ctl.c:884
 #, c-format
-msgid "Service \"%s\" already registered\n"
+msgid "%s: could not find own program executable\n"
-msgstr "服务 \"%s\" 已经注册了\n"
+msgstr "%s: 无法找到执行文件\n"
 
-#: pg_ctl.c:895
+#: pg_ctl.c:842
 #, c-format
-msgid "Unable to register service \"%s\" [%d]\n"
+msgid "%s: could not find postmaster program executable\n"
-msgstr "无法注册服务 \"%s\" [%d]\n"
+msgstr "%s: 无法找到 postmaster 程序的执行文件\n"
 
-#: pg_ctl.c:916
+#: pg_ctl.c:896 pg_ctl.c:928
 #, c-format
-msgid "Service \"%s\" not registered\n"
+msgid "%s: could not open service manager\n"
-msgstr "服务 \"%s\" 没有注册\n"
+msgstr "%s: 无法打开服务管理器\n"
 
-#: pg_ctl.c:923
+#: pg_ctl.c:902
 #, c-format
-msgid "Unable to open service \"%s\" [%d]\n"
+msgid "%s: service \"%s\" already registered\n"
-msgstr "无法打开服务 \"%s\" [%d]\n"
+msgstr "%s: 服务 \"%s\" 已经注册了\n"
 
-#: pg_ctl.c:930
+#: pg_ctl.c:913
 #, c-format
-msgid "Unable to unregister service \"%s\" [%d]\n"
+msgid "%s: could not register service \"%s\": error code %d\n"
-msgstr "无法取消注册服务 \"%s\" [%d]\n"
+msgstr "%s: 无法注册服务 \"%s\": 错误码 %d\n"
 
-#: pg_ctl.c:1067
+#: pg_ctl.c:934
 #, c-format
-msgid ""
+msgid "%s: service \"%s\" not registered\n"
-"\n"
+msgstr "%s: 服务 \"%s\" 没有注册\n"
-"Try \"%s --help\" for more information.\n"
-msgstr ""
-"\n"
-"请用 \"%s --help\" 获取更多的信息.\n"
 
-#: pg_ctl.c:1075
+#: pg_ctl.c:941
+#, c-format
+msgid "%s: could not open service \"%s\": error code %d\n"
+msgstr "%s: 无法打开服务 \"%s\": 错误码 %d\n"
+
+#: pg_ctl.c:948
+#, c-format
+msgid "%s: could not unregister service \"%s\": error code %d\n"
+msgstr "%s: 无法注销服务 \"%s\": 错误码 %d\n"
+
+#: pg_ctl.c:1085
+#, c-format
+msgid "Try \"%s --help\" for more information.\n"
+msgstr "试用 \"%s --help\" 获取更多的信息.\n"
+
+#: pg_ctl.c:1093
 #, 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"
+"report the status of a PostgreSQL server, or signal a PostgreSQL process.\n"
 "\n"
 msgstr ""
 "%s 是一个启动, 停止, 重启, 重载配置文件, 报告 PostgreSQL 服务器状态,\n"
 "或者杀掉 PostgreSQL 进程的工具\n"
 "\n"
 
-#: pg_ctl.c:1077
+#: pg_ctl.c:1095
 #, c-format
 msgid "Usage:\n"
 msgstr "使用方法:\n"
 
-#: pg_ctl.c:1078
+#: pg_ctl.c:1096
 #, c-format
 msgid "  %s start   [-w] [-D DATADIR] [-s] [-l FILENAME] [-o \"OPTIONS\"]\n"
 msgstr "  %s start   [-w] [-D 数据目录] [-s] [-l 文件名] [-o \"选项\"]\n"
 
-#: pg_ctl.c:1079
+#: pg_ctl.c:1097
 #, c-format
 msgid "  %s stop    [-W] [-D DATADIR] [-s] [-m SHUTDOWN-MODE]\n"
 msgstr "  %s stop    [-W] [-D 数据目录] [-s] [-m 关闭模式]\n"
 
-#: pg_ctl.c:1080
+#: pg_ctl.c:1098
 #, c-format
 msgid ""
 "  %s restart [-w] [-D DATADIR] [-s] [-m SHUTDOWN-MODE] [-o \"OPTIONS\"]\n"
 msgstr "  %s restart [-w] [-D 数据目录] [-s] [-m 关闭模式] [-o \"选项\"]\n"
 
-#: pg_ctl.c:1081
+#: pg_ctl.c:1099
 #, c-format
 msgid "  %s reload  [-D DATADIR] [-s]\n"
 msgstr "  %s reload  [-D 数据目录] [-s]\n"
 
-#: pg_ctl.c:1082
+#: pg_ctl.c:1100
 #, c-format
 msgid "  %s status  [-D DATADIR]\n"
 msgstr "  %s status  [-D 数据目录]\n"
 
-#: pg_ctl.c:1083
+#: pg_ctl.c:1101
 #, c-format
-msgid "  %s kill    SIGNALNAME PROCESSID\n"
+msgid "  %s kill    SIGNALNAME PID\n"
-msgstr "  %s kill    信号名称 进程 ID\n"
+msgstr "  %s kill    信号名称 进程号\n"
 
-#: pg_ctl.c:1085
+#: pg_ctl.c:1103
 #, c-format
 msgid ""
-"  %s register   [-N servicename] [-U username] [-P password] [-D DATADIR] [-"
+"  %s register   [-N SERVICENAME] [-U USERNAME] [-P PASSWORD] [-D DATADIR]\n"
-"w] [-o \"OPTIONS\"]\n"
+"                    [-w] [-o \"OPTIONS\"]\n"
 msgstr ""
-"  %s register   [-N 服务名称] [-U 用户名] [-P 口令] [-D DATADIR] [-"
+"  %s register   [-N 服务名称] [-U 用户名] [-P 口令] [-D 数据目录]\n"
-"w] [-o \"选项\"]\n"
+"                    [-w] [-o \"选项\"]\n"
 
-#: pg_ctl.c:1086
+#: pg_ctl.c:1105
 #, c-format
-msgid "  %s unregister [-N servicename]\n"
+msgid "  %s unregister [-N SERVICENAME]\n"
 msgstr "  %s unregister [-N 服务名称]\n"
 
-#: pg_ctl.c:1088
+#: pg_ctl.c:1108
 #, c-format
-msgid "Common options:\n"
+msgid ""
-msgstr "普通选项:\n"
+"\n"
+"Common options:\n"
+msgstr ""
+"\n"
+"普通选项:\n"
 
-#: pg_ctl.c:1089
+#: pg_ctl.c:1109
 #, c-format
 msgid "  -D, --pgdata DATADIR   location of the database storage area\n"
 msgstr "  -D, --pgdata 数据目录  数据存储的位置\n"
 
-#: pg_ctl.c:1090
+#: pg_ctl.c:1110
 #, c-format
-msgid "  -s, --silent only print errors, no informational messages\n"
+msgid "  -s, --silent           only print errors, no informational messages\n"
-msgstr "  -s, --silent 只打印错误信息, 没有其他信息\n"
+msgstr "  -s, --silent           只打印错误信息, 没有其他信息\n"
 
-#: pg_ctl.c:1092
+#: pg_ctl.c:1111
 #, c-format
-msgid "  -N       service name with which to register PostgreSQL server\n"
+msgid "  -w                     wait until operation completes\n"
-msgstr "  -N       注册到 PostgreSQL 服务器的服务名称\n"
+msgstr "  -w                     等待直到操作完成\n"
 
-#: pg_ctl.c:1093
+#: pg_ctl.c:1112
 #, c-format
-msgid "  -P       password of account to register PostgreSQL server\n"
+msgid "  -W                     do not wait until operation completes\n"
-msgstr "  -P       注册到 PostgreSQL 服务器帐户的口令\n"
+msgstr "  -W                     不用等待操作完成\n"
 
-#: pg_ctl.c:1094
+#: pg_ctl.c:1113
 #, c-format
-msgid "  -U       user name of account to register PostgreSQL server\n"
+msgid "  --help                 show this help, then exit\n"
-msgstr "  -U       注册到 PostgreSQL 服务器帐户的用户名\n"
+msgstr "  --help                 显示此帮助信息, 然后退出\n"
 
-#: pg_ctl.c:1096
+#: pg_ctl.c:1114
 #, c-format
-msgid "  -w           wait until operation completes\n"
+msgid "  --version              output version information, then exit\n"
-msgstr "  -w           等待直到操作完成\n"
+msgstr "  --version              显示版本信息, 然后退出\n"
 
-#: pg_ctl.c:1097
+#: pg_ctl.c:1115
-#, c-format
-msgid "  -W           do not wait until operation completes\n"
-msgstr "  -W           不用等待操作完成\n"
-
-#: pg_ctl.c:1098
-#, c-format
-msgid "  --help       show this help, then exit\n"
-msgstr "  --help       显示此帮助信息, 然后退出\n"
-
-#: pg_ctl.c:1099
-#, c-format
-msgid "  --version    output version information, then exit\n"
-msgstr "  --version    输出版本信息, 然后退出\n"
-
-#: pg_ctl.c:1100
 #, c-format
 msgid ""
 "(The default is to wait for shutdown, but not for start or restart.)\n"
@@ -355,142 +339,200 @@ msgstr ""
 "(默认为关闭等待, 但不是启动或重启.)\n"
 "\n"
 
-#: pg_ctl.c:1101
+#: pg_ctl.c:1116
+#, c-format
+msgid "If the -D option is omitted, the environment variable PGDATA is used.\n"
+msgstr "如果省略了 -D 选项, 将使用 PGDATA 环境变量.\n"
+
+#: pg_ctl.c:1118
 #, c-format
 msgid ""
-"If the -D option is omitted, the environment variable PGDATA is used.\n"
 "\n"
+"Options for start or restart:\n"
 msgstr ""
-"如果省略了 -D 选项, 将使用 PGDATA 环境变量.\n"
 "\n"
+"启动或重启的选项:\n"
 
-#: pg_ctl.c:1102
+#: pg_ctl.c:1119
 #, c-format
-msgid "Options for start or restart:\n"
+msgid "  -l, --log FILENAME     write (or append) server log to FILENAME\n"
-msgstr "启动或重启的选项:\n"
+msgstr "  -l, --log FILENAME     写入 (或追加) 服务器日志到文件 FILENAME\n"
 
-#: pg_ctl.c:1103
+#: pg_ctl.c:1120
 #, c-format
 msgid ""
-"  -l, --log FILENAME      write (or append) server log to FILENAME.  The\n"
+"  -o OPTIONS             command line options to pass to the postmaster\n"
-"                          use of this option is highly recommended.\n"
+"                         (PostgreSQL server executable)\n"
 msgstr ""
-"  -l, --log FILENAME      写入 (或追加) 服务器日志到文件 FILENAME.\n"
+"  -o OPTIONS             传递给 postmaster 的命令行选项\n"
-"                          强烈建议使用此选项.\n"
+"                         (PostgreSQL 服务器执行文件)\n"
 
-#: pg_ctl.c:1105
+#: pg_ctl.c:1122
+#, c-format
+msgid "  -p PATH-TO-POSTMASTER  normally not necessary\n"
+msgstr "  -p PATH-TO-POSTMASTER  正常情况不需要\n"
+
+#: pg_ctl.c:1124
 #, c-format
 msgid ""
-"  -o OPTIONS              command line options to pass to the postmaster\n"
+"\n"
-"                          (PostgreSQL server executable)\n"
+"Options for stop or restart:\n"
 msgstr ""
-"  -o OPTIONS              传递给 postmaster 的命令行选项\n"
+"\n"
-"                          (PostgreSQL 服务器执行)\n"
+"停止或重启的选项:\n"
 
-#: pg_ctl.c:1107
+#: pg_ctl.c:1125
+#, c-format
+msgid "  -m SHUTDOWN-MODE   may be \"smart\", \"fast\", or \"immediate\"\n"
+msgstr "  -m SHUTDOWN-MODE   可以是 \"smart\", \"fast\", 或者 \"immediate\"\n"
+
+#: pg_ctl.c:1127
 #, c-format
 msgid ""
-"  -p PATH-TO-POSTMASTER   normally not necessary\n"
 "\n"
+"Shutdown modes are:\n"
 msgstr ""
-"  -p PATH-TO-POSTMASTER   正常情况不需要\n"
 "\n"
+"关闭模式有如下几种:\n"
 
-#: pg_ctl.c:1108
+#: pg_ctl.c:1128
-#, c-format
-msgid "Options for stop or restart:\n"
-msgstr "停止或重启的选项:\n"
-
-#: pg_ctl.c:1109
-#, 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:1110
-#, c-format
-msgid "Allowed signal names for kill:\n"
-msgstr "允许关闭的信号名称:\n"
-
-#: pg_ctl.c:1111
-#, 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:1112
-#, c-format
-msgid "Shutdown modes are:\n"
-msgstr "关闭模式有如下几种:\n"
-
-#: pg_ctl.c:1113
 #, c-format
 msgid "  smart       quit after all clients have disconnected\n"
 msgstr "  smart       所有客户端断开连接后退出\n"
 
-#: pg_ctl.c:1114
+#: pg_ctl.c:1129
 #, c-format
 msgid "  fast        quit directly, with proper shutdown\n"
 msgstr "  fast        直接退出, 正确的关闭\n"
 
-#: pg_ctl.c:1115
+#: pg_ctl.c:1130
 #, c-format
 msgid ""
 "  immediate   quit without complete shutdown; will lead to recovery on "
 "restart\n"
+msgstr "  immediate   不完全的关闭退出; 重启后恢复\n"
+
+#: pg_ctl.c:1132
+#, c-format
+msgid ""
 "\n"
+"Allowed signal names for kill:\n"
 msgstr ""
-"  immediate   不完全的关闭退出; 重启后恢复\n"
+"\n"
+"允许关闭的信号名称:\n"
+
+#: pg_ctl.c:1136
+#, c-format
+msgid ""
+"\n"
+"Options for register and unregister:\n"
+msgstr ""
+"\n"
+"注册或注销的选项:\n"
+
+#: pg_ctl.c:1137
+#, c-format
+msgid ""
+"  -N SERVICENAME  service name with which to register PostgreSQL server\n"
+msgstr "  -N 服务名称     注册到 PostgreSQL 服务器的服务名称\n"
+
+#: pg_ctl.c:1138
+#, c-format
+msgid "  -P PASSWORD     password of account to register PostgreSQL server\n"
+msgstr "  -P 口令         注册到 PostgreSQL 服务器帐户的口令\n"
+
+#: pg_ctl.c:1139
+#, c-format
+msgid "  -U USERNAME     user name of account to register PostgreSQL server\n"
+msgstr "  -U 用户名       注册到 PostgreSQL 服务器帐户的用户名\n"
+
+#: pg_ctl.c:1142
+#, c-format
+msgid ""
+"\n"
+"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+msgstr ""
+"\n"
+"臭虫报告至 <pgsql-bugs@postgresql.org>.\n"
+
+#: pg_ctl.c:1167
+#, c-format
+msgid "%s: unrecognized shutdown mode \"%s\"\n"
+msgstr "%s: 无效的关闭模式 \"%s\"\n"
+
+#: pg_ctl.c:1200
+#, c-format
+msgid "%s: unrecognized signal name \"%s\"\n"
+msgstr "%s: 无效信号名称 \"%s\"\n"
+
+#: pg_ctl.c:1265
+#, 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"
+"请以服务器进程所属用户 (非特权用户) 登录 (或使用 \"su\")\n"
 "\n"
 
-#: pg_ctl.c:1116
+#: pg_ctl.c:1358
-#, c-format
-msgid "Report bugs to <pgsql-bugs@postgresql.org>.\n"
-msgstr "错误报告至 <pgsql-bugs@postgresql.org>.\n"
-
-#: pg_ctl.c:1141
-#, c-format
-msgid "%s: invalid shutdown mode %s\n"
-msgstr "%s: 无效的关闭模式 %s\n"
-
-#: pg_ctl.c:1174
-#, c-format
-msgid "%s: invalid signal \"%s\"\n"
-msgstr "%s: 无效信号 \"%s\"\n"
-
-#: pg_ctl.c:1309
 #, c-format
 msgid "%s: invalid option %s\n"
 msgstr "%s: 无效选项 %s\n"
 
-#: pg_ctl.c:1320
+#: pg_ctl.c:1369
 #, c-format
-msgid "%s: extra operation mode %s\n"
+msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: 额外的操作模式 %s\n"
+msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
 
-#: pg_ctl.c:1339
+#: pg_ctl.c:1388
 #, c-format
-msgid "%s: invalid kill syntax\n"
+msgid "%s: missing arguments for kill mode\n"
-msgstr "%s: 无效的 kill 语法\n"
+msgstr "%s: 缺少 kill 模式参数\n"
 
-#: pg_ctl.c:1357
+#: pg_ctl.c:1406
 #, c-format
-msgid "%s: invalid operation mode %s\n"
+msgid "%s: unrecognized operation mode \"%s\"\n"
-msgstr "%s: 无效的操作模式 %s\n"
+msgstr "%s: 无效的操作模式 \"%s\"\n"
 
-#: pg_ctl.c:1367
+#: pg_ctl.c:1416
 #, c-format
 msgid "%s: no operation specified\n"
 msgstr "%s: 没有指定操作\n"
 
-#: pg_ctl.c:1383
+#: pg_ctl.c:1432
 #, c-format
 msgid ""
 "%s: no database directory specified and environment variable PGDATA unset\n"
 msgstr "%s: 没有指定数据目录, 并且没有设置 PGDATA 环境变量\n"
+
+#: ../../port/exec.c:193 ../../port/exec.c:307 ../../port/exec.c:350
+#, c-format
+msgid "could not identify current directory: %s"
+msgstr "无法确认当前目录: %s"
+
+#: ../../port/exec.c:323 ../../port/exec.c:359
+#, c-format
+msgid "could not change directory to \"%s\""
+msgstr "无法进入目录 \"%s\""
+
+#: ../../port/exec.c:338
+#, c-format
+msgid "could not read symbolic link \"%s\""
+msgstr "无法读取符号链结 \"%s\""
+
+#: ../../port/exec.c:569
+#, c-format
+msgid "child process exited with exit code %d"
+msgstr "子进程已退出, 退出码为 %d"
+
+#: ../../port/exec.c:572
+#, c-format
+msgid "child process was terminated by signal %d"
+msgstr "子进程被信号 %d 终止"
+
+#: ../../port/exec.c:575
+#, c-format
+msgid "child process exited with unrecognized status %d"
+msgstr "子进程已退出, 未知状态 %d"

src/bin/pg_resetxlog/po/zh_CN.po

@@ -3,9 +3,9 @@
 # 
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
+"Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-31 08:57+0000\n"
+"POT-Creation-Date: 2004-12-02 09:58+0000\n"
 "PO-Revision-Date: 2004-01-10 13:47+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -13,48 +13,48 @@ msgstr ""
 "Content-Type: text/plain; charset=GB2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: pg_resetxlog.c:120
+#: pg_resetxlog.c:123
 #, c-format
 msgid "%s: invalid argument for option -x\n"
 msgstr "%s: 为 -x 选项的无效参数\n"
 
-#: pg_resetxlog.c:121 pg_resetxlog.c:136 pg_resetxlog.c:151 pg_resetxlog.c:158
+#: pg_resetxlog.c:124 pg_resetxlog.c:139 pg_resetxlog.c:154 pg_resetxlog.c:161
-#: pg_resetxlog.c:164 pg_resetxlog.c:172
+#: pg_resetxlog.c:167 pg_resetxlog.c:175
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
 msgstr "输入 \"%s --help\" 获取更多的信息.\n"
 
-#: pg_resetxlog.c:126
+#: pg_resetxlog.c:129
 #, c-format
 msgid "%s: transaction ID (-x) must not be 0\n"
 msgstr "%s: 事务 ID (-x) 不能为 0\n"
 
-#: pg_resetxlog.c:135
+#: pg_resetxlog.c:138
 #, c-format
 msgid "%s: invalid argument for option -o\n"
 msgstr "%s: 为 -o 选项的无效参数\n"
 
-#: pg_resetxlog.c:141
+#: pg_resetxlog.c:144
 #, c-format
 msgid "%s: OID (-o) must not be 0\n"
 msgstr "%s: OID (-o) 不能为 0\n"
 
-#: pg_resetxlog.c:150 pg_resetxlog.c:157
+#: pg_resetxlog.c:153 pg_resetxlog.c:160
 #, c-format
 msgid "%s: invalid argument for option -l\n"
 msgstr "%s: 为 -l 选项的无效参数\n"
 
-#: pg_resetxlog.c:171
+#: pg_resetxlog.c:174
 #, c-format
 msgid "%s: no data directory specified\n"
 msgstr "%s: 没有指定数据目录\n"
 
-#: pg_resetxlog.c:191 pg_resetxlog.c:287
+#: pg_resetxlog.c:194 pg_resetxlog.c:290
 #, c-format
 msgid "%s: could not open file \"%s\" for reading: %s\n"
 msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
 
-#: pg_resetxlog.c:197
+#: pg_resetxlog.c:200
 #, c-format
 msgid ""
 "%s: lock file \"%s\" exists\n"
@@ -63,7 +63,7 @@ msgstr ""
 "%s: 锁文件 \"%s\" 已经存在\n"
 "是否有一个服务正在运行? 如果没有, 删除那个锁文件然后再试一次.\n"
 
-#: pg_resetxlog.c:236
+#: pg_resetxlog.c:239
 #, c-format
 msgid ""
 "\n"
@@ -72,7 +72,7 @@ msgstr ""
 "\n"
 "如果这些值可接受, 用 -f 强制重置.\n"
 
-#: pg_resetxlog.c:248
+#: pg_resetxlog.c:251
 #, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
@@ -83,12 +83,12 @@ msgstr ""
 "重置事务日志有可能会引起丢失数据.\n"
 "如果你仍想继续, 用 -f 强制重置.\n"
 
-#: pg_resetxlog.c:261
+#: pg_resetxlog.c:264
 #, c-format
 msgid "Transaction log reset\n"
 msgstr "事务日志重置\n"
 
-#: pg_resetxlog.c:290
+#: pg_resetxlog.c:293
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
@@ -99,32 +99,32 @@ msgstr ""
 "  touch %s\n"
 "然后再试一次.\n"
 
-#: pg_resetxlog.c:303
+#: pg_resetxlog.c:306
 #, c-format
 msgid "%s: could not read file \"%s\": %s\n"
 msgstr "%s: 无法读取文件 \"%s\": %s\n"
 
-#: pg_resetxlog.c:326
+#: pg_resetxlog.c:329
 #, c-format
 msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
 msgstr "%s: pg_control 已经存在, 但有无效的CRC; 带有警告的继续运行\n"
 
-#: pg_resetxlog.c:335
+#: pg_resetxlog.c:338
 #, c-format
 msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
 msgstr "%s: pg_control 已经存在, 但已破坏或无效版本; 忽略它\n"
 
-#: pg_resetxlog.c:399
+#: pg_resetxlog.c:402
 #, c-format
 msgid "%s: invalid LC_COLLATE setting\n"
 msgstr "%s: 无效的 LC_COLLATE 设置\n"
 
-#: pg_resetxlog.c:406
+#: pg_resetxlog.c:409
 #, c-format
 msgid "%s: invalid LC_CTYPE setting\n"
 msgstr "%s: 无效的 LC_CTYPE 设置\n"
 
-#: pg_resetxlog.c:430
+#: pg_resetxlog.c:433
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
@@ -133,7 +133,7 @@ msgstr ""
 "猜测的 pg_control 值:\n"
 "\n"
 
-#: pg_resetxlog.c:432
+#: pg_resetxlog.c:435
 #, c-format
 msgid ""
 "pg_control values:\n"
@@ -142,141 +142,141 @@ msgstr ""
 "pg_control 值:\n"
 "\n"
 
-#: pg_resetxlog.c:441
+#: pg_resetxlog.c:444
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control 版本:                      %u\n"
 
-#: pg_resetxlog.c:442
+#: pg_resetxlog.c:445
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog 版本:                         %u\n"
 
-#: pg_resetxlog.c:443
+#: pg_resetxlog.c:446
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "数据库系统标识符:                     %s\n"
 
-#: pg_resetxlog.c:444
+#: pg_resetxlog.c:447
 #, c-format
 msgid "Current log file ID:                  %u\n"
 msgstr "当前日志文件ID:                       %u\n"
 
-#: pg_resetxlog.c:445
+#: pg_resetxlog.c:448
 #, c-format
 msgid "Next log file segment:                %u\n"
 msgstr "下一个日志文件段:                     %u\n"
 
-#: pg_resetxlog.c:446
+#: pg_resetxlog.c:449
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "最新检查点的 TimeLineID:              %u\n"
 
-#: pg_resetxlog.c:447
+#: pg_resetxlog.c:450
 #, c-format
 msgid "Latest checkpoint's NextXID:          %u\n"
 msgstr "最新检查点的 NextXID:                 %u\n"
 
-#: pg_resetxlog.c:448
+#: pg_resetxlog.c:451
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "最新检查点的 NextOID:                 %u\n"
 
-#: pg_resetxlog.c:449
+#: pg_resetxlog.c:452
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "数据库块大小:                         %u\n"
 
-#: pg_resetxlog.c:450
+#: pg_resetxlog.c:453
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "大关系的每段块数:                     %u\n"
 
-#: pg_resetxlog.c:451
+#: pg_resetxlog.c:454
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
 msgstr "标示符的最大长度:                     %u\n"
 
-#: pg_resetxlog.c:452
+#: pg_resetxlog.c:455
 #, c-format
 msgid "Maximum number of function arguments: %u\n"
 msgstr "函数参数的最大个数:                   %u\n"
 
-#: pg_resetxlog.c:453
+#: pg_resetxlog.c:456
 #, c-format
 msgid "Date/time type storage:               %s\n"
 msgstr "日期/时间类型存储:                    %s\n"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:457
 msgid "64-bit integers"
 msgstr "64位整型"
 
-#: pg_resetxlog.c:454
+#: pg_resetxlog.c:457
 msgid "floating-point numbers"
 msgstr "浮点数"
 
-#: pg_resetxlog.c:455
+#: pg_resetxlog.c:458
 #, c-format
 msgid "Maximum length of locale name:        %u\n"
 msgstr "本地名字的最大长度:                   %u\n"
 
-#: pg_resetxlog.c:456
+#: pg_resetxlog.c:459
 #, c-format
 msgid "LC_COLLATE:                           %s\n"
 msgstr "LC_COLLATE:                           %s\n"
 
-#: pg_resetxlog.c:457
+#: pg_resetxlog.c:460
 #, c-format
 msgid "LC_CTYPE:                             %s\n"
 msgstr "LC_CTYPE:                             %s\n"
 
-#: pg_resetxlog.c:518
+#: pg_resetxlog.c:521
 #, c-format
 msgid ""
 "%s: internal error -- sizeof(ControlFileData) is too large ... fix xlog.c\n"
 msgstr "%s: 内部错误 -- sizeof(ControlFileData) 太大 ... 修复 xlog.c\n"
 
-#: pg_resetxlog.c:531
+#: pg_resetxlog.c:534
 #, c-format
 msgid "%s: could not create pg_control file: %s\n"
 msgstr "%s: 无法创建 pg_control 文件: %s\n"
 
-#: pg_resetxlog.c:542
+#: pg_resetxlog.c:545
 #, c-format
 msgid "%s: could not write pg_control file: %s\n"
 msgstr "%s: 无法写 pg_control 文件: %s\n"
 
-#: pg_resetxlog.c:549 pg_resetxlog.c:705
+#: pg_resetxlog.c:552 pg_resetxlog.c:708
 #, c-format
 msgid "%s: fsync error: %s\n"
 msgstr "%s: fsync 错误: %s\n"
 
-#: pg_resetxlog.c:570
+#: pg_resetxlog.c:573
 #, c-format
 msgid "%s: could not open directory \"%s\": %s\n"
 msgstr "%s: 无法打开目录 \"%s\": %s\n"
 
-#: pg_resetxlog.c:584
+#: pg_resetxlog.c:587
 #, c-format
 msgid "%s: could not delete file \"%s\": %s\n"
 msgstr "%s: 无法删除文件 \"%s\": %s\n"
 
-#: pg_resetxlog.c:603
+#: pg_resetxlog.c:606
 #, c-format
 msgid "%s: could not read from directory \"%s\": %s\n"
 msgstr "%s: 无法从目录 \"%s\" 中读取: %s\n"
 
-#: pg_resetxlog.c:672
+#: pg_resetxlog.c:675
 #, c-format
 msgid "%s: could not open file \"%s\": %s\n"
 msgstr "%s: 无法打开文件 \"%s\": %s\n"
 
-#: pg_resetxlog.c:683 pg_resetxlog.c:697
+#: pg_resetxlog.c:686 pg_resetxlog.c:700
 #, c-format
 msgid "%s: could not write file \"%s\": %s\n"
 msgstr "%s: 无法写文件 \"%s\": %s\n"
 
-#: pg_resetxlog.c:716
+#: pg_resetxlog.c:719
 #, c-format
 msgid ""
 "%s resets the PostgreSQL transaction log.\n"
@@ -285,7 +285,7 @@ msgstr ""
 "%s 重置 PostgreSQL 事务日志.\n"
 "\n"
 
-#: pg_resetxlog.c:717
+#: pg_resetxlog.c:720
 #, c-format
 msgid ""
 "Usage:\n"
@@ -296,51 +296,51 @@ msgstr ""
 "  %s [选项]... 数据目录\n"
 "\n"
 
-#: pg_resetxlog.c:718
+#: pg_resetxlog.c:721
 #, c-format
 msgid "Options:\n"
 msgstr "选项:\n"
 
-#: pg_resetxlog.c:719
+#: pg_resetxlog.c:722
 #, c-format
 msgid "  -f              force update to be done\n"
 msgstr "  -f                强制更新\n"
 
-#: pg_resetxlog.c:720
+#: pg_resetxlog.c:723
 #, c-format
 msgid ""
 "  -l FILEID,SEG   force minimum WAL starting location for new transaction "
 "log\n"
 msgstr "  -l FILEID,SEG     在新的事务日志中强制最小 WAL 起始位置\n"
 
-#: pg_resetxlog.c:721
+#: pg_resetxlog.c:724
 #, c-format
 msgid ""
 "  -n              no update, just show extracted control values (for "
 "testing)\n"
 msgstr "  -n                未更新, 只显示抽取的控制值 (测试用途)\n"
 
-#: pg_resetxlog.c:722
+#: pg_resetxlog.c:725
 #, c-format
 msgid "  -o OID          set next OID\n"
 msgstr "  -o OID            设置下一个 OID\n"
 
-#: pg_resetxlog.c:723
+#: pg_resetxlog.c:726
 #, c-format
 msgid "  -x XID          set next transaction ID\n"
 msgstr "  -x XID            设置下一个事务 ID\n"
 
-#: pg_resetxlog.c:724
+#: pg_resetxlog.c:727
 #, c-format
 msgid "  --help          show this help, then exit\n"
 msgstr "  --help            显示此帮助信息, 然后退出\n"
 
-#: pg_resetxlog.c:725
+#: pg_resetxlog.c:728
 #, c-format
 msgid "  --version       output version information, then exit\n"
 msgstr "  --version         输出版本信息, 然后退出\n"
 
-#: pg_resetxlog.c:726
+#: pg_resetxlog.c:729
 #, c-format
 msgid ""
 "\n"

src/bin/scripts/po/zh_CN.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PostgreSQL 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-31 08:56+0000\n"
+"POT-Creation-Date: 2004-11-15 14:20+0000\n"
 "PO-Revision-Date: 2003-09-15 21:03+0000\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -657,37 +657,47 @@ msgstr ""
 "\n"
 "阅读 SQL 命令 VACUUM 的描述信息, 以便获得更详细的信息.\n"
 
-#: common.c:86 common.c:112
+#: common.c:33
+#, c-format
+msgid "%s: could not obtain information about current user: %s"
+msgstr "%s: 无法获得当前用户的信息: %s"
+
+#: common.c:44
+#, c-format
+msgid "%s: could not get current user name: %s"
+msgstr "%s: 无法获取当前用户名称: %s"
+
+#: common.c:89 common.c:115
 msgid "Password: "
 msgstr "口令: "
 
-#: common.c:99
+#: common.c:102
 #, c-format
 msgid "%s: could not connect to database %s\n"
 msgstr "%s: 无法联接到数据库 %s\n"
 
-#: common.c:122
+#: common.c:125
 #, c-format
 msgid "%s: could not connect to database %s: %s"
 msgstr "%s: 无法联接到数据库 %s: %s"
 
-#: common.c:146
+#: common.c:149
 #, c-format
 msgid "%s: query failed: %s"
 msgstr "%s: 查询失败: %s"
 
-#: common.c:147
+#: common.c:150
 #, 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:161
+#: common.c:164
 msgid "y"
 msgstr "y"
 
 #. translator: Make sure the (y/n) prompts match the translation of this.
-#: common.c:163
+#: common.c:166
 msgid "n"
 msgstr "n"
 

src/interfaces/libpq/po/zh_CN.po

@@ -1,13 +1,13 @@
 # simplified Chinese translation file for libpq
 # Bao Wei <weibao@forevertek.com>, 2002
 #
-# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.6 2004/09/13 12:35:18 petere Exp $
+# $PostgreSQL: pgsql/src/interfaces/libpq/po/zh_CN.po,v 1.7 2004/12/11 19:09:08 petere Exp $
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: PostgreSQL 7.4\n"
+"Project-Id-Version: PostgreSQL 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-08-31 08:59+0000\n"
+"POT-Creation-Date: 2004-12-02 10:00+0000\n"
 "PO-Revision-Date: 2003-09-15 13:47:06+0800\n"
 "Last-Translator: Bao Wei <weibao@qmail.zhengmai.net.cn>\n"
 "Language-Team: Weiping He <laser@zhengmai.com.cn>\n"
@@ -44,6 +44,13 @@ msgstr "
 msgid "SCM_CRED authentication method not supported\n"
 msgstr "不支持 SCM_CRED 认证方式\n"
 
+# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+# fe-lobj.c:536
+#: fe-auth.c:530 fe-connect.c:1414 fe-connect.c:2629 fe-connect.c:2638
+#: fe-connect.c:3217 fe-lobj.c:556 fe-protocol2.c:1007 fe-protocol3.c:958
+msgid "out of memory\n"
+msgstr "内存用尽\n"
+
 # fe-auth.c:589
 #: fe-auth.c:600
 msgid "Kerberos 4 authentication failed\n"
@@ -82,30 +89,24 @@ msgstr "
 msgid "fe_getauthname: invalid authentication system: %d\n"
 msgstr "fe_getauthname: 无效的认证系统: %d\n"
 
-#: fe-connect.c:452
+#: fe-connect.c:458
 #, c-format
 msgid "invalid sslmode value: \"%s\"\n"
 msgstr "无效的 sslmode 值: \"%s\"\n"
 
-#: fe-connect.c:472
+#: fe-connect.c:478
 #, c-format
 msgid "sslmode value \"%s\" invalid when SSL support is not compiled in\n"
 msgstr "无效的 sslmode 值 \"%s\" 当没有把 SSL 支持编译进来时\n"
 
-# fe-connect.c:708
-#: fe-connect.c:783
-#, c-format
-msgid "could not set socket to non-blocking mode: %s\n"
-msgstr "无法将套接字设置为非阻塞模式: %s\n"
-
 # fe-connect.c:732
-#: fe-connect.c:810
+#: fe-connect.c:794
 #, c-format
 msgid "could not set socket to TCP no delay mode: %s\n"
 msgstr "无法将套接字设置为 TCP 无延迟模式: %s\n"
 
 # fe-connect.c:752
-#: fe-connect.c:841
+#: fe-connect.c:825
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -117,7 +118,7 @@ msgstr ""
 "\t\"%s\"上准备接受联接?\n"
 
 # fe-connect.c:761
-#: fe-connect.c:853
+#: fe-connect.c:837
 #, c-format
 msgid ""
 "could not connect to server: %s\n"
@@ -129,28 +130,40 @@ msgstr ""
 "%s 上的 TCP/IP 联接?\n"
 
 # fe-misc.c:702
-#: fe-connect.c:946
+#: fe-connect.c:930
 #, c-format
 msgid "could not translate host name \"%s\" to address: %s\n"
 msgstr "无法解释主机名 \"%s\" 到地址: %s\n"
 
 # fe-misc.c:702
-#: fe-connect.c:950
+#: fe-connect.c:934
 #, c-format
 msgid "could not translate Unix-domain socket path \"%s\" to address: %s\n"
 msgstr "无法解释 Unix-domian 套接字路径 \"%s\" 到地址: %s\n"
 
 # fe-connect.c:1232
-#: fe-connect.c:1154
+#: fe-connect.c:1138
 msgid "invalid connection state, probably indicative of memory corruption\n"
 msgstr "无效的联接状态, 可能是存储器数据被破坏的标志\n"
 
 # fe-connect.c:891
-#: fe-connect.c:1197
+#: fe-connect.c:1181
 #, c-format
 msgid "could not create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
+# fe-connect.c:708
+#: fe-connect.c:1204
+#, c-format
+msgid "could not set socket to non-blocking mode: %s\n"
+msgstr "无法将套接字设置为非阻塞模式: %s\n"
+
+# fe-auth.c:395
+#: fe-connect.c:1216
+#, c-format
+msgid "could not set socket to close-on-exec mode: %s\n"
+msgstr "无法将套接字设置为执行时关闭 (close-on-exec) 模式: %s\n"
+
 # fe-connect.c:1263
 #: fe-connect.c:1308
 #, c-format
@@ -169,13 +182,6 @@ msgstr "
 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:1414 fe-connect.c:2538 fe-connect.c:2547 fe-connect.c:3126
-#: fe-lobj.c:556
-msgid "out of memory\n"
-msgstr "内存用尽\n"
-
 # fe-connect.c:1322
 #: fe-connect.c:1427
 #, c-format
@@ -217,112 +223,113 @@ msgid "invalid connection state %c, probably indicative of memory corruption\n"
 msgstr "无效的联接状态 %c, 可能是存储器数据被破坏的标志\n"
 
 # fe-connect.c:2475
-#: fe-connect.c:2586
+#: fe-connect.c:2677
 #, c-format
 msgid "missing \"=\" after \"%s\" in connection info string\n"
 msgstr "在联接信息字串里的 \"%s\" 后面缺少 \"=\"\n"
 
 # fe-connect.c:2524
-#: fe-connect.c:2635
+#: fe-connect.c:2726
 msgid "unterminated quoted string in connection info string\n"
 msgstr "联接信息字串中未结束的引号字串\n"
 
 # fe-connect.c:2558
-#: fe-connect.c:2669
+#: fe-connect.c:2760
 #, c-format
 msgid "invalid connection option \"%s\"\n"
 msgstr "非法联接选项 \"%s\"\n"
 
 # fe-connect.c:2744
-#: fe-connect.c:2891
+#: fe-connect.c:2982
 msgid "connection pointer is NULL\n"
 msgstr "联接指针是 NULL\n"
 
 # fe-connect.c:2953
-#: fe-connect.c:3148
+#: fe-connect.c:3239
 #, c-format
 msgid ""
 "WARNING: Password file %s has world or group read access; permission should "
 "be u=rw (0600)\n"
 msgstr "警告: 口令文件 %s 权限设置不对; 权限应设置 为 u=rw (0600)\n"
 
-#: fe-exec.c:484
+#: fe-exec.c:479
 msgid "NOTICE"
 msgstr "注意"
 
 # fe-exec.c:737
-#: fe-exec.c:653 fe-exec.c:705
+#: fe-exec.c:648 fe-exec.c:700 fe-exec.c:740
 msgid "command string is a null pointer\n"
 msgstr "命令字串是一个空指针\n"
 
 # fe-exec.c:737
-#: fe-exec.c:740
+#: fe-exec.c:733 fe-exec.c:823
 msgid "statement name is a null pointer\n"
 msgstr "声明名字是一个空指针\n"
 
+#: fe-exec.c:748 fe-exec.c:897 fe-exec.c:1572
+msgid "function requires at least protocol version 3.0\n"
+msgstr "函数至少需要 3.0 版本的协议\n"
+
 # fe-exec.c:745
-#: fe-exec.c:771
+#: fe-exec.c:854
 msgid "no connection to the server\n"
 msgstr "没有到服务器的联接\n"
 
 # fe-exec.c:752
-#: fe-exec.c:778
+#: fe-exec.c:861
 msgid "another command is already in progress\n"
 msgstr "已经有另外一条命令在处理\n"
 
-#: fe-exec.c:814 fe-exec.c:1466
-msgid "function requires at least protocol version 3.0\n"
-msgstr "函数至少需要 3.0 版本的协议\n"
-
 # fe-exec.c:1371
-#: fe-exec.c:1116
+#: fe-exec.c:1199
 #, c-format
 msgid "unexpected asyncStatus: %d\n"
 msgstr "意外的 asyncStatus(异步状态): %d\n"
 
-#: fe-exec.c:1221
+#: fe-exec.c:1326
 msgid "COPY terminated by new PQexec"
 msgstr "COPY 被一个新的 PQexec 终止"
 
 # fe-exec.c:1421
-#: fe-exec.c:1229
+#: fe-exec.c:1334
 msgid "COPY IN state must be terminated first\n"
 msgstr "COPY IN 状态必须先结束\n"
 
 # fe-exec.c:1421
-#: fe-exec.c:1249
+#: fe-exec.c:1354
 msgid "COPY OUT state must be terminated first\n"
 msgstr "COPY OUT 状态必须先结束\n"
 
 # fe-exec.c:1780
-#: fe-exec.c:1358 fe-exec.c:1423 fe-exec.c:1508
+#: fe-exec.c:1464 fe-exec.c:1529 fe-exec.c:1614 fe-protocol2.c:1153
+#: fe-protocol3.c:1115
 msgid "no COPY in progress\n"
 msgstr "没有正在处理的 COPY\n"
 
 # fe-exec.c:1884
-#: fe-exec.c:1700
+#: fe-exec.c:1806
 msgid "connection in wrong state\n"
 msgstr "联接处于错误状态\n"
 
 # fe-exec.c:2055
-#: fe-exec.c:1731
+#: fe-exec.c:1837
 msgid "invalid ExecStatusType code"
 msgstr "非法 ExecStatusType 代码"
 
 # fe-exec.c:2108 fe-exec.c:2141
-#: fe-exec.c:1795 fe-exec.c:1818
+#: fe-exec.c:1901 fe-exec.c:1924
 #, c-format
 msgid "column number %d is out of range 0..%d"
 msgstr "列号码 %d 超出了范围 0..%d"
 
 # fe-exec.c:2130
-#: fe-exec.c:1811
+#: fe-exec.c:1917
 #, c-format
 msgid "row number %d is out of range 0..%d"
 msgstr "行号码 %d 超出了范围 0..%d"
 
 # fe-exec.c:2325
-#: fe-exec.c:2093
+#: fe-exec.c:2199
 #, c-format
 msgid "could not interpret result from server: %s"
 msgstr "无法解释来自服务器的结果: %s"
@@ -457,126 +464,260 @@ msgstr "
 msgid "select() failed: %s\n"
 msgstr "select() 失败: %s\n"
 
-#: fe-secure.c:262
+# fe-connect.c:1549
+#: fe-protocol2.c:91
+#, c-format
+msgid "invalid setenv state %c, probably indicative of memory corruption\n"
+msgstr "无效的 setenv 状态 %c, 可能是内存被破坏\n"
+
+# fe-connect.c:1549
+#: fe-protocol2.c:333
+#, c-format
+msgid "invalid state %c, probably indicative of memory corruption\n"
+msgstr "无效状态 %c, 可能是内存被破坏\n"
+
+#: fe-protocol2.c:423 fe-protocol3.c:183
+#, c-format
+msgid "message type 0x%02x arrived from server while idle"
+msgstr "当空闲时收到服务起发送过来的消息类型 0x%02x"
+
+#: fe-protocol2.c:462
+#, c-format
+msgid "unexpected character %c following empty query response (\"I\" message)"
+msgstr "unexpected character %c following empty query response (\"I\" message)"
+
+#: fe-protocol2.c:517
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)"
+msgstr ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)"
+
+#: fe-protocol2.c:533
+msgid ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)"
+msgstr ""
+"server sent binary data (\"B\" message) without prior row description (\"T\" "
+"message)"
+
+# fe-connect.c:1378
+#: fe-protocol2.c:548 fe-protocol3.c:344
+#, c-format
+msgid "unexpected response from server; first received character was \"%c\"\n"
+msgstr "来自服务器意外的回执, 第一个收到的字符是 \"%c\"\n"
+
+# fe-connect.c:2427 fe-connect.c:2436 fe-connect.c:2933 fe-exec.c:1284
+# fe-lobj.c:536
+#: fe-protocol2.c:760 fe-protocol3.c:577
+msgid "out of memory for query result\n"
+msgstr "为查询结果内存用尽\n"
+
+#: fe-protocol2.c:1196 fe-protocol3.c:1184
+#, c-format
+msgid "%s"
+msgstr "%s"
+
+#: fe-protocol2.c:1208
+msgid "lost synchronization with server, resetting connection"
+msgstr "失去与服务器同步, 重置连接"
+
+#: fe-protocol2.c:1343 fe-protocol2.c:1375 fe-protocol3.c:1387
+#, c-format
+msgid "protocol error: id=0x%x\n"
+msgstr "协议错误: id=0x%x\n"
+
+#: fe-protocol3.c:306
+msgid ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
+msgstr ""
+"server sent data (\"D\" message) without prior row description (\"T\" "
+"message)\n"
+
+#: fe-protocol3.c:365
+#, c-format
+msgid "message contents do not agree with length in message type \"%c\"\n"
+msgstr "在消息类型 \"%c\" 中, 消息内容与长度不匹配\n"
+
+#: fe-protocol3.c:386
+#, c-format
+msgid "lost synchronization with server: got message type \"%c\", length %d\n"
+msgstr "失去与服务器同步: 获取到消息类型 \"%c\", 长度 %d\n"
+
+#: fe-protocol3.c:522
+msgid "unexpected field count in \"D\" message\n"
+msgstr "在 \"D\" 消息中, 意外的字段数\n"
+
+#. translator: %s represents a digit string
+#: fe-protocol3.c:651 fe-protocol3.c:659
+#, c-format
+msgid " at character %s"
+msgstr " 在字符 %s"
+
+#: fe-protocol3.c:668
+#, c-format
+msgid "DETAIL:  %s\n"
+msgstr "描述:  %s\n"
+
+#: fe-protocol3.c:671
+#, c-format
+msgid "HINT:  %s\n"
+msgstr "提示:  %s\n"
+
+#: fe-protocol3.c:674
+#, c-format
+msgid "QUERY:  %s\n"
+msgstr "查询:  %s\n"
+
+#: fe-protocol3.c:677
+#, c-format
+msgid "CONTEXT:  %s\n"
+msgstr "背景:  %s\n"
+
+#: fe-protocol3.c:689
+msgid "LOCATION:  "
+msgstr "位置:  "
+
+#: fe-protocol3.c:691
+#, c-format
+msgid "%s, "
+msgstr "%s, "
+
+#: fe-protocol3.c:693
+#, c-format
+msgid "%s:%s"
+msgstr "%s:%s"
+
+#: fe-protocol3.c:1000
+msgid "PQgetline: not doing text COPY OUT\n"
+msgstr "PQgetline: not doing text COPY OUT\n"
+
+#: fe-secure.c:264
 #, c-format
 msgid "could not establish SSL connection: %s\n"
 msgstr "无法建立 SSL 联接: %s\n"
 
-#: fe-secure.c:325 fe-secure.c:406 fe-secure.c:1036
+#: fe-secure.c:335 fe-secure.c:420 fe-secure.c:1033
 #, c-format
 msgid "SSL SYSCALL error: %s\n"
 msgstr "SSL SYSCALL 错误: %s\n"
 
-#: fe-secure.c:330 fe-secure.c:411 fe-secure.c:1040
+#: fe-secure.c:340 fe-secure.c:425 fe-secure.c:1037
 msgid "SSL SYSCALL error: EOF detected\n"
 msgstr "SSL SYSCALL 错误: 发现结束符\n"
 
 # fe-auth.c:232
-#: fe-secure.c:342 fe-secure.c:422 fe-secure.c:1049
+#: fe-secure.c:352 fe-secure.c:436 fe-secure.c:1056
 #, c-format
 msgid "SSL error: %s\n"
 msgstr "SSL 错误: %s\n"
 
-#: fe-secure.c:352 fe-secure.c:432 fe-secure.c:1057
+#: fe-secure.c:362 fe-secure.c:446 fe-secure.c:1066
-msgid "unrecognized SSL error code\n"
+#, c-format
-msgstr "未知的 SSL 错误码\n"
+msgid "unrecognized SSL error code: %d\n"
+msgstr "未知的 SSL 错误码: %d\n"
 
 # fe-lobj.c:498
-#: fe-secure.c:494
+#: fe-secure.c:509
 #, c-format
 msgid "error querying socket: %s\n"
 msgstr "查询套接字错误: %s\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:522
+#: fe-secure.c:537
 #, c-format
-msgid "could not get information about host (%s): %s\n"
+msgid "could not get information about host \"%s\": %s\n"
-msgstr "无法获取关于主机 (%s) 的信息: %s\n"
+msgstr "无法获取关于主机 \"%s\" 的信息: %s\n"
 
-#: fe-secure.c:541
+#: fe-secure.c:556
 msgid "unsupported protocol\n"
 msgstr "不支持的协议\n"
 
-#: fe-secure.c:563
+#: fe-secure.c:578
 #, 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:570
+#: fe-secure.c:585
 #, c-format
 msgid "server common name \"%s\" does not resolve to peer address\n"
 msgstr "服务器名字 \"%s\" 不能解析到对端地址\n"
 
 # fe-connect.c:1263
-#: fe-secure.c:753
+#: fe-secure.c:767
 msgid "could not get user information\n"
 msgstr "无法获取用户信息\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:765
+#: fe-secure.c:777
 #, c-format
-msgid "could not open certificate (%s): %s\n"
+msgid "could not open certificate file \"%s\": %s\n"
-msgstr "无法打开证书 (%s): %s\n"
+msgstr "无法打开证书文件 \"%s\": %s\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:774
+#: fe-secure.c:786
 #, c-format
-msgid "could not read certificate (%s): %s\n"
+msgid "could not read certificate file \"%s\": %s\n"
-msgstr "无法读取证书 (%s): %s\n"
+msgstr "无法读取证书文件 \"%s\": %s\n"
 
-#: fe-secure.c:788
+#: fe-secure.c:800
 #, c-format
-msgid "certificate present, but not private key (%s)\n"
+msgid "certificate present, but not private key file \"%s\"\n"
-msgstr "有证书, 但不是私钥 (%s)\n"
+msgstr "有证书, 但不是私钥文件 \"%s\"\n"
 
-#: fe-secure.c:797
+#: fe-secure.c:808
 #, c-format
-msgid "private key (%s) has wrong permissions\n"
+msgid "private key file \"%s\" has wrong permissions\n"
-msgstr "私钥 (%s) 有错误的许可\n"
+msgstr "私钥文件 \"%s\" 有错误的许可\n"
 
 # fe-lobj.c:400 fe-lobj.c:483
-#: fe-secure.c:804
+#: fe-secure.c:815
 #, c-format
-msgid "could not open private key file (%s): %s\n"
+msgid "could not open private key file \"%s\": %s\n"
-msgstr "无法打开私钥文件 (%s): %s\n"
+msgstr "无法打开私钥文件 \"%s\": %s\n"
 
-#: fe-secure.c:813
+#: fe-secure.c:823
 #, c-format
-msgid "private key (%s) changed during execution\n"
+msgid "private key file \"%s\" changed during execution\n"
-msgstr "在执行过程中私钥 (%s) 改变了\n"
+msgstr "在执行过程中私钥文件 \"%s\" 改变了\n"
 
 # fe-connect.c:891
-#: fe-secure.c:822
+#: fe-secure.c:831
 #, c-format
-msgid "could not read private key (%s): %s\n"
+msgid "could not read private key file \"%s\": %s\n"
-msgstr "无法读取私钥 (%s): %s\n"
+msgstr "无法读取私钥文件 \"%s\": %s\n"
 
-#: fe-secure.c:837
+#: fe-secure.c:845
 #, c-format
-msgid "certificate/private key mismatch (%s): %s\n"
+msgid "certificate does not match private key file \"%s\": %s\n"
-msgstr "证书/私钥不匹配 (%s): %s\n"
+msgstr "证书不匹配私钥文件 \"%s\": %s\n"
 
-#: fe-secure.c:921
+#: fe-secure.c:927
 #, c-format
 msgid "could not create SSL context: %s\n"
 msgstr "无法创建 SSL 环境: %s\n"
 
 # fe-connect.c:891
-#: fe-secure.c:966 fe-secure.c:976
+#: fe-secure.c:972
 #, c-format
-msgid "could not read root certificate list (%s): %s\n"
+msgid "could not read root certificate file \"%s\": %s\n"
-msgstr "无法读取根证书列表 (%s): %s\n"
+msgstr "无法读取根证书文件 \"%s\": %s\n"
 
-#: fe-secure.c:1076
+#: fe-secure.c:1086
 #, c-format
 msgid "certificate could not be validated: %s\n"
 msgstr "无法验证证书: %s\n"
 
-#: fe-secure.c:1090
+#: fe-secure.c:1100
 #, c-format
 msgid "certificate could not be obtained: %s\n"
 msgstr "无法获得证书: %s\n"
 
+#~ msgid "certificate/private key mismatch (%s): %s\n"
+#~ msgstr "证书/私钥不匹配 (%s): %s\n"
+
 # fe-misc.c:702
 #~ msgid "could not translate local service to address: %s\n"
 #~ msgstr "无法解释本地服务到地址: %s\n"