diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2004-12-11 19:09:08 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2004-12-11 19:09:08 +0000 |
| commit | 10e960fb3974027cbf1ed9fb9cfe5234d1a45287 (patch) | |
| tree | 04333e4ddbd0e1eedc20ff4c655e1021661418aa /src/backend | |
| parent | 022a00b5f39f6b51b29c43c8bce91b7b8ddb70ed (diff) | |
| download | postgresql-10e960fb3974027cbf1ed9fb9cfe5234d1a45287.tar.gz | |
Translation updates
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/po/zh_CN.po | 3797 |
1 files changed, 2008 insertions, 1789 deletions
diff --git a/src/backend/po/zh_CN.po b/src/backend/po/zh_CN.po index 289030b785..17578ba8e2 100644 --- a/src/backend/po/zh_CN.po +++ b/src/backend/po/zh_CN.po @@ -1,13 +1,13 @@ # simplified Chinese translation file for PostgreSQL server # Weiping He <laser@zhengmai.com.cn>, 2001. # -# $PostgreSQL: pgsql/src/backend/po/zh_CN.po,v 1.8 2004/09/13 20:53:10 petere Exp $ +# $PostgreSQL: pgsql/src/backend/po/zh_CN.po,v 1.9 2004/12/11 19:08:56 petere Exp $ # 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-09-13 11:21+0000\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" @@ -16,38 +16,37 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: lib/dllist.c:43 lib/dllist.c:88 libpq/auth.c:637 -#: utils/adt/oracle_compat.c:73 utils/adt/oracle_compat.c:124 -#: utils/adt/ri_triggers.c:3459 utils/adt/cash.c:297 utils/adt/cash.c:312 -#: utils/adt/regexp.c:191 utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:521 -#: utils/fmgr/fmgr.c:532 utils/init/miscinit.c:186 utils/init/miscinit.c:207 -#: utils/init/miscinit.c:217 utils/misc/guc.c:1868 utils/misc/guc.c:1881 -#: utils/misc/guc.c:1894 utils/mmgr/aset.c:335 utils/mmgr/aset.c:501 -#: utils/mmgr/aset.c:698 utils/mmgr/aset.c:891 utils/mmgr/portalmem.c:75 +#: utils/adt/oracle_compat.c:73 utils/adt/oracle_compat.c:125 +#: utils/adt/ri_triggers.c:3472 utils/adt/cash.c:297 utils/adt/cash.c:312 +#: utils/adt/regexp.c:200 utils/fmgr/dfmgr.c:127 utils/fmgr/fmgr.c:528 +#: utils/hash/dynahash.c:178 utils/hash/dynahash.c:248 +#: utils/init/miscinit.c:213 utils/init/miscinit.c:234 +#: utils/init/miscinit.c:244 utils/misc/guc.c:1909 utils/misc/guc.c:1922 +#: utils/misc/guc.c:1935 utils/mmgr/aset.c:337 utils/mmgr/aset.c:503 +#: utils/mmgr/aset.c:700 utils/mmgr/aset.c:893 utils/mmgr/portalmem.c:78 #: utils/cache/typcache.c:165 utils/cache/typcache.c:487 -#: utils/cache/relcache.c:164 utils/cache/relcache.c:178 -#: utils/cache/relcache.c:1130 storage/ipc/sinval.c:774 storage/file/fd.c:587 -#: storage/file/fd.c:620 storage/file/fd.c:766 storage/lmgr/lock.c:497 -#: storage/smgr/md.c:138 storage/smgr/md.c:848 storage/smgr/smgr.c:213 -#: storage/buffer/localbuf.c:139 commands/sequence.c:800 -#: executor/execGrouping.c:328 executor/execGrouping.c:388 -#: executor/nodeIndexscan.c:1051 postmaster/postmaster.c:808 -#: postmaster/postmaster.c:1696 postmaster/postmaster.c:2415 -#: postmaster/pgstat.c:1006 postmaster/pgstat.c:1023 postmaster/pgstat.c:2452 -#: postmaster/pgstat.c:2527 postmaster/pgstat.c:2572 postmaster/pgstat.c:2623 +#: utils/cache/relcache.c:169 utils/cache/relcache.c:183 +#: utils/cache/relcache.c:1135 storage/ipc/sinval.c:789 storage/file/fd.c:587 +#: storage/file/fd.c:620 storage/file/fd.c:766 storage/lmgr/lock.c:494 +#: storage/smgr/md.c:844 storage/smgr/smgr.c:213 storage/buffer/localbuf.c:139 +#: commands/sequence.c:794 executor/execGrouping.c:384 +#: postmaster/postmaster.c:809 postmaster/postmaster.c:1679 +#: postmaster/postmaster.c:2398 postmaster/pgstat.c:2432 +#: postmaster/pgstat.c:2499 msgid "out of memory" msgstr "内存用尽" -#: main/main.c:94 +#: main/main.c:99 #, c-format msgid "%s: setsysinfo failed: %s\n" msgstr "%s: setsysinfo 失败: %s\n" -#: main/main.c:112 +#: main/main.c:117 #, c-format msgid "%s: WSAStartup failed: %d\n" msgstr "%s: WSAStartup 失败: %d\n" -#: main/main.c:215 +#: main/main.c:217 msgid "" "\"root\" execution of the PostgreSQL server is not permitted.\n" "The server must be started under an unprivileged user ID to prevent\n" @@ -59,41 +58,45 @@ msgstr "" "可能的系统安全性问题. 参阅文档获取更多\n" "有关如何正确启动服务器的信息.\n" -#: main/main.c:234 +#: main/main.c:236 #, c-format msgid "%s: real and effective user IDs must match\n" msgstr "%s: 真实和有效用户标识必须相互匹配\n" -#: main/main.c:241 +#: main/main.c:243 msgid "" -"execution of PostgreSQL by a user with administrative permissions is not " +"Execution of PostgreSQL by a user with administrative permissions is not\n" "permitted.\n" "The server must be started under an unprivileged user ID to prevent\n" -"possible system security compromise. See the documentation for\n" +"possible system security compromises. See the documentation for\n" "more information on how to properly start the server.\n" msgstr "" +"不允许管理员权限的用户运行 PostgreSQL 服务器.\n" +"服务器必须以一个非特权的用户身份启动以避免\n" +"可能的系统安全性问题. 参阅文档获取更多\n" +"有关如何正确启动服务器的信息.\n" -#: main/main.c:301 +#: main/main.c:314 #, c-format msgid "%s: invalid effective UID: %d\n" msgstr "%s: 无效 UID: %d\n" -#: main/main.c:314 +#: main/main.c:327 #, c-format msgid "%s: could not determine user name (GetUserName failed)\n" msgstr "%s: 无法确定用户名称 (GetUserName 失败)\n" -#: port/pg_shmem.c:94 port/sysv_shmem.c:94 +#: port/pg_shmem.c:101 port/sysv_shmem.c:101 #, c-format msgid "could not create shared memory segment: %m" msgstr "无法创建共享内存段: %m" -#: port/pg_shmem.c:95 port/sysv_shmem.c:95 +#: port/pg_shmem.c:102 port/sysv_shmem.c:102 #, c-format msgid "Failed system call was shmget(key=%lu, size=%u, 0%o)." msgstr "shmget(key=%lu, size=%u, 0%o) 系统调用失败." -#: port/pg_shmem.c:99 port/sysv_shmem.c:99 +#: port/pg_shmem.c:106 port/sysv_shmem.c:106 #, c-format msgid "" "This error usually means that PostgreSQL's request for a shared memory " @@ -109,7 +112,7 @@ msgid "" "configuration." msgstr "" -#: port/pg_shmem.c:112 port/sysv_shmem.c:112 +#: port/pg_shmem.c:119 port/sysv_shmem.c:119 #, c-format msgid "" "This error usually means that PostgreSQL's request for a shared memory " @@ -120,7 +123,7 @@ msgid "" "configuration." msgstr "" -#: port/pg_shmem.c:121 port/sysv_shmem.c:121 +#: port/pg_shmem.c:128 port/sysv_shmem.c:128 #, c-format msgid "" "This error does *not* mean that you have run out of disk space. It occurs " @@ -134,44 +137,40 @@ msgid "" "configuration." msgstr "" -#: port/win32/signal.c:227 +#: port/pg_shmem.c:408 port/sysv_shmem.c:408 #, c-format -msgid "failed to create signal listener pipe: %d. Retrying.\n" -msgstr "" +msgid "could not stat data directory \"%s\": %m" +msgstr "无法取目录 \"%s\" 状态: %m" -#: port/win32/signal.c:239 +#: port/win32/signal.c:173 #, c-format -msgid "failed to create signal dispatch thread: %d\n" -msgstr "创建杀死线程的信号失败: %d\n" +msgid "could not create signal listener pipe for pid %d: error code %d" +msgstr "无法为进程 (pid) %d 创建信号监听管道: 错误码为 %d" -#: port/win32/security.c:39 +#: port/win32/signal.c:253 #, c-format -msgid "failed to open process token: %d\n" -msgstr "打开进程令牌 (token) 失败: %d\n" - -#: port/win32/security.c:46 -msgid "failed to get token information - got zero size!\n" -msgstr "获取令牌 (token) 信息失败 - 获得的大小为零!\n" +msgid "could not create signal listener pipe: error code %d; retrying\n" +msgstr "无法创建信号监听管道: 错误码 %d; 重试\n" -#: port/win32/security.c:52 port/win32/security.c:69 +#: port/win32/signal.c:266 #, c-format -msgid "failed to get token information: %d\n" -msgstr "获取令牌 (token) 信息失败: %d\n" +msgid "could not create signal dispatch thread: error code %d\n" +msgstr "无法创建信号发送线程: 错误码 %d\n" -#: port/win32/security.c:60 +#: port/win32/security.c:43 #, c-format -msgid "failed to allocate %i bytes for token information!\n" -msgstr "为令牌 (token) 信息分配 %i 字节失败!\n" +msgid "could not open process token: error code %d\n" +msgstr "无法打开进程令牌 (token): 错误码 %d\n" -#: port/win32/security.c:80 +#: port/win32/security.c:63 #, c-format -msgid "failed to get SID for Administrators group: %d\n" -msgstr "获取管理员组的 SID 失败: %d\n" +msgid "could not get SID for Administrators group: error code %d\n" +msgstr "无法获取管理员组的 SID: 错误码 %d\n" -#: port/win32/security.c:89 +#: port/win32/security.c:72 #, c-format -msgid "failed to get SID for PowerUsers group: %d\n" -msgstr "获取超级用户组的 SID 失败: %d\n" +msgid "could not get SID for PowerUsers group: error code %d\n" +msgstr "无法获取超级用户组的 SID: 错误码 %d\n" #: port/sysv_sema.c:117 port/pg_sema.c:117 #, c-format @@ -204,12 +203,12 @@ msgid "" msgstr "" "你可能需要增加内核的 SEMVMX 值至少为 %d. 详细信息请查找 PostgreSQL 文档." -#: tcop/fastpath.c:106 tcop/fastpath.c:449 tcop/fastpath.c:572 +#: tcop/fastpath.c:106 tcop/fastpath.c:444 tcop/fastpath.c:567 #, c-format msgid "invalid argument size %d in function call message" -msgstr "" +msgstr "在函数调用信息中, 参数大小 %d 是无效的" -#: tcop/fastpath.c:186 tcop/fastpath.c:516 tcop/postgres.c:1480 +#: tcop/fastpath.c:186 tcop/fastpath.c:511 tcop/postgres.c:1490 #: access/common/printtup.c:296 #, c-format msgid "unsupported format code: %d" @@ -220,113 +219,113 @@ msgstr "不支持的格式代码: %d" msgid "function with OID %u does not exist" msgstr "OID 为 %u 的函数不存在" -#: tcop/fastpath.c:291 tcop/postgres.c:284 tcop/postgres.c:307 +#: tcop/fastpath.c:291 tcop/postgres.c:287 tcop/postgres.c:310 #: commands/copy.c:403 commands/copy.c:421 commands/copy.c:425 #: commands/copy.c:486 commands/copy.c:535 msgid "unexpected EOF on client connection" msgstr "在客户端联接上的意外 EOF" -#: tcop/fastpath.c:304 tcop/postgres.c:845 tcop/postgres.c:1166 -#: tcop/postgres.c:1650 +#: tcop/fastpath.c:304 tcop/postgres.c:854 tcop/postgres.c:1176 +#: tcop/postgres.c:1660 msgid "" "current transaction is aborted, commands ignored until end of transaction " "block" msgstr "当前事务被终止, 事务块结束之前的查询被忽略" -#: tcop/fastpath.c:419 tcop/fastpath.c:542 +#: tcop/fastpath.c:414 tcop/fastpath.c:537 #, c-format msgid "function call message contains %d arguments but function requires %d" msgstr "函数调用信息包含 %d 个参数, 但函数需要 %d 个" -#: tcop/fastpath.c:427 +#: tcop/fastpath.c:422 #, c-format msgid "function call message contains %d argument formats but %d arguments" msgstr "函数调用信息为包含 %d 个参数的格式, 但给定了 %d 个参数" -#: tcop/fastpath.c:510 tcop/fastpath.c:595 +#: tcop/fastpath.c:505 tcop/fastpath.c:590 #, c-format msgid "incorrect binary data format in function argument %d" msgstr "函数参数 %d 为不正确的二进制数据格式" -#: tcop/pquery.c:409 +#: tcop/pquery.c:448 #, c-format msgid "bind message has %d result formats but query has %d columns" msgstr "" -#: tcop/pquery.c:481 tcop/pquery.c:1021 commands/portalcmds.c:337 +#: tcop/pquery.c:523 tcop/pquery.c:1096 commands/portalcmds.c:346 #, c-format msgid "portal \"%s\" cannot be run" msgstr "入口 \"%s\" 不可以运行" -#: tcop/pquery.c:698 +#: tcop/pquery.c:771 msgid "cursor can only scan forward" msgstr "游标能够只向前扫描" -#: tcop/pquery.c:699 +#: tcop/pquery.c:772 msgid "Declare it with SCROLL option to enable backward scan." msgstr "带 SCROLL 选项声明允许向后扫描" -#: tcop/postgres.c:334 tcop/postgres.c:346 tcop/postgres.c:357 -#: tcop/postgres.c:369 tcop/postgres.c:3175 +#: tcop/postgres.c:337 tcop/postgres.c:349 tcop/postgres.c:360 +#: tcop/postgres.c:372 tcop/postgres.c:3218 #, c-format msgid "invalid frontend message type %d" msgstr "无效前端信息类型 %d" -#: tcop/postgres.c:468 tcop/postgres.c:503 tcop/postgres.c:514 +#: tcop/postgres.c:473 tcop/postgres.c:510 tcop/postgres.c:522 #, c-format msgid "statement: %s" msgstr "语句: %s" -#: tcop/postgres.c:1008 +#: tcop/postgres.c:1018 #, c-format msgid "duration: %ld.%03ld ms" msgstr "执行时间: %ld.%03ld ms" -#: tcop/postgres.c:1021 +#: tcop/postgres.c:1031 #, c-format msgid "duration: %ld.%03ld ms statement: %s" msgstr "执行时间: %ld.%03ld ms 语句: %s" -#: tcop/postgres.c:1129 +#: tcop/postgres.c:1139 msgid "cannot insert multiple commands into a prepared statement" msgstr "无法插入多条命令到一个准备好的语句中" -#: tcop/postgres.c:1194 parser/analyze.c:3141 +#: tcop/postgres.c:1204 parser/analyze.c:3149 #, c-format msgid "could not determine data type of parameter $%d" msgstr "无法确定参数 $%d 的数据类型" -#: tcop/postgres.c:1332 +#: tcop/postgres.c:1342 #, c-format msgid "bind message has %d parameter formats but %d parameters" msgstr "" -#: tcop/postgres.c:1345 tcop/postgres.c:1727 +#: tcop/postgres.c:1355 tcop/postgres.c:1737 msgid "unnamed prepared statement does not exist" msgstr "未命名的准备语句不存在" -#: tcop/postgres.c:1351 +#: tcop/postgres.c:1361 #, c-format msgid "" "bind message supplies %d parameters, but prepared statement \"%s\" requires %" "d" msgstr "" -#: tcop/postgres.c:1473 +#: tcop/postgres.c:1483 #, c-format msgid "incorrect binary data format in bind parameter %d" msgstr "" -#: tcop/postgres.c:1581 tcop/postgres.c:1780 +#: tcop/postgres.c:1591 tcop/postgres.c:1790 #, c-format msgid "portal \"%s\" does not exist" msgstr "入口 \"%s\" 不存在" -#: tcop/postgres.c:1874 +#: tcop/postgres.c:1884 msgid "terminating connection because of crash of another server process" msgstr "中断联接, 因为其它服务器进程崩溃" -#: tcop/postgres.c:1875 +#: tcop/postgres.c:1885 msgid "" "The postmaster has commanded this server process to roll back the current " "transaction and exit, because another server process exited abnormally and " @@ -335,39 +334,39 @@ msgstr "" "Postmaster 命令此服务器进程回滚当前事物并退出, 因为其它服务器进程不正常的退出" "可能毁坏了共享内存." -#: tcop/postgres.c:1879 +#: tcop/postgres.c:1889 msgid "" "In a moment you should be able to reconnect to the database and repeat your " "command." msgstr "一会儿你将可以重联接数据库并且重复你的命令." -#: tcop/postgres.c:1995 +#: tcop/postgres.c:2005 msgid "floating-point exception" msgstr "浮点异常" -#: tcop/postgres.c:1996 +#: tcop/postgres.c:2006 msgid "" "An invalid floating-point operation was signaled. This probably means an out-" "of-range result or an invalid operation, such as division by zero." msgstr "" -#: tcop/postgres.c:2032 +#: tcop/postgres.c:2042 msgid "terminating connection due to administrator command" msgstr "由于管理员命令中断联接" -#: tcop/postgres.c:2042 +#: tcop/postgres.c:2052 msgid "canceling query due to user request" msgstr "由于用户请求取消查询" -#: tcop/postgres.c:2093 +#: tcop/postgres.c:2103 msgid "stack depth limit exceeded" msgstr "" -#: tcop/postgres.c:2094 +#: tcop/postgres.c:2104 msgid "Increase the configuration parameter \"max_stack_depth\"." msgstr "增加配置参数 \"max_stack_depth\"." -#: tcop/postgres.c:2112 +#: tcop/postgres.c:2122 #, c-format msgid "" "%s is the PostgreSQL stand-alone backend. It is not\n" @@ -378,7 +377,7 @@ msgstr "" " 不是普通用户有意使用的.\n" "\n" -#: tcop/postgres.c:2114 +#: tcop/postgres.c:2124 #, c-format msgid "" "Usage:\n" @@ -389,92 +388,92 @@ msgstr "" " %s [选项]... [数据库名]\n" "\n" -#: tcop/postgres.c:2115 postmaster/postmaster.c:1088 +#: tcop/postgres.c:2125 postmaster/postmaster.c:1071 #, c-format msgid "Options:\n" msgstr "选项:\n" -#: tcop/postgres.c:2117 postmaster/postmaster.c:1090 +#: tcop/postgres.c:2127 postmaster/postmaster.c:1073 #, c-format msgid " -A 1|0 enable/disable run-time assert checking\n" msgstr " -A 1|0 打开/关闭运行时断言检查\n" -#: tcop/postgres.c:2119 postmaster/postmaster.c:1092 +#: tcop/postgres.c:2129 postmaster/postmaster.c:1075 #, c-format msgid " -B NBUFFERS number of shared buffers\n" msgstr " -B NBUFFERS 共享缓冲区的数量\n" -#: tcop/postgres.c:2120 postmaster/postmaster.c:1093 +#: tcop/postgres.c:2130 postmaster/postmaster.c:1076 #, c-format msgid " -c NAME=VALUE set run-time parameter\n" msgstr " -c 名字=数值 设置运行时参数\n" -#: tcop/postgres.c:2121 +#: tcop/postgres.c:2131 #, c-format msgid " -d 0-5 debugging level (0 is off)\n" msgstr " -d 0-5 调试级别 (0 关闭)\n" -#: tcop/postgres.c:2122 postmaster/postmaster.c:1095 +#: tcop/postgres.c:2132 postmaster/postmaster.c:1078 #, c-format msgid " -D DATADIR database directory\n" msgstr " -D 数据目录 数据库目录\n" -#: tcop/postgres.c:2123 +#: tcop/postgres.c:2133 #, c-format msgid " -e use European date input format (DMY)\n" msgstr " -e 使用欧洲日期输入格式 (DMY)\n" -#: tcop/postgres.c:2124 +#: tcop/postgres.c:2134 #, c-format msgid " -E echo query before execution\n" msgstr " -E 执行前显示查询\n" -#: tcop/postgres.c:2125 postmaster/postmaster.c:1096 +#: tcop/postgres.c:2135 postmaster/postmaster.c:1079 #, c-format msgid " -F turn fsync off\n" msgstr " -F 关闭 fsync\n" -#: tcop/postgres.c:2126 +#: tcop/postgres.c:2136 #, c-format msgid " -N do not use newline as interactive query delimiter\n" msgstr " -N 不使用新行作为交互查询的分隔符\n" -#: tcop/postgres.c:2127 +#: tcop/postgres.c:2137 #, c-format msgid " -o FILENAME send stdout and stderr to given file\n" msgstr " -o FILENAME 把标准输出和标准错误发送到指定的文件中\n" -#: tcop/postgres.c:2128 +#: tcop/postgres.c:2138 #, c-format msgid " -P disable system indexes\n" msgstr " -P 关闭系统索引\n" -#: tcop/postgres.c:2129 +#: tcop/postgres.c:2139 #, c-format msgid " -s show statistics after each query\n" msgstr " -s 每个查询后显示统计信息\n" -#: tcop/postgres.c:2130 +#: tcop/postgres.c:2140 #, c-format -msgid " -S WORK-MEM set amount of memory for sorts (in kbytes)\n" -msgstr " -S WORK-MEM 设置排序内存数量 (单位为 kbytes)\n" +msgid " -S WORK-MEM set amount of memory for sorts (in kB)\n" +msgstr " -S WORK-MEM 设置排序内存数量 (单位为 kB)\n" -#: tcop/postgres.c:2131 +#: tcop/postgres.c:2141 #, c-format msgid " --describe-config describe configuration parameters, then exit\n" msgstr " --describe-config 描述配置参数, 然后退出\n" -#: tcop/postgres.c:2132 postmaster/postmaster.c:1107 +#: tcop/postgres.c:2142 postmaster/postmaster.c:1090 #, c-format msgid " --help show this help, then exit\n" msgstr " --help 显示此帮助信息, 然后退出\n" -#: tcop/postgres.c:2133 postmaster/postmaster.c:1108 +#: tcop/postgres.c:2143 postmaster/postmaster.c:1091 #, c-format msgid " --version output version information, then exit\n" msgstr " --version 输出版本信息, 然后退出\n" -#: tcop/postgres.c:2134 postmaster/postmaster.c:1110 +#: tcop/postgres.c:2144 postmaster/postmaster.c:1093 #, c-format msgid "" "\n" @@ -483,32 +482,32 @@ msgstr "" "\n" "开发人员选项:\n" -#: tcop/postgres.c:2135 +#: tcop/postgres.c:2145 #, c-format msgid " -f s|i|n|m|h forbid use of some plan types\n" msgstr " -f s|i|n|m|h 禁止一些规划类型的使用\n" -#: tcop/postgres.c:2136 +#: tcop/postgres.c:2146 #, c-format msgid " -i do not execute queries\n" msgstr " -i 不执行查询\n" -#: tcop/postgres.c:2137 +#: tcop/postgres.c:2147 #, c-format msgid " -O allow system table structure changes\n" msgstr " -O 允许改变系统表结构\n" -#: tcop/postgres.c:2138 +#: tcop/postgres.c:2148 #, c-format msgid " -t pa|pl|ex show timings after each query\n" msgstr " -t pa|pl|ex 每个查询后显示计时\n" -#: tcop/postgres.c:2139 +#: tcop/postgres.c:2149 #, c-format msgid " -W NUM wait NUM seconds to allow attach from a debugger\n" msgstr " -W NUM 等待 NUM 秒, 以便允许调试器加入调试\n" -#: tcop/postgres.c:2140 +#: tcop/postgres.c:2150 #, c-format msgid "" "\n" @@ -517,72 +516,59 @@ msgstr "" "\n" "错误报告至 <pgsql-bugs@postgresql.org>.\n" -#: tcop/postgres.c:2265 +#: tcop/postgres.c:2314 msgid "assert checking is not compiled in" msgstr "没有把断言 (assert) 检查编译进来" -#: tcop/postgres.c:2505 postmaster/postmaster.c:498 bootstrap/bootstrap.c:302 +#: tcop/postgres.c:2533 postmaster/postmaster.c:549 bootstrap/bootstrap.c:299 #, c-format msgid "--%s requires a value" msgstr "--%s 需要一个值" -#: tcop/postgres.c:2510 postmaster/postmaster.c:503 bootstrap/bootstrap.c:307 +#: tcop/postgres.c:2538 postmaster/postmaster.c:554 bootstrap/bootstrap.c:304 #, c-format msgid "-c %s requires a value" msgstr "-c %s 需要一个值" -#: tcop/postgres.c:2578 postmaster/postmaster.c:950 bootstrap/bootstrap.c:335 -#, c-format -msgid "" -"%s does not know where to find the database system data.\n" -"You must specify the directory that contains the database system\n" -"either by specifying the -D invocation option or by setting the\n" -"PGDATA environment variable.\n" -msgstr "" -"%s 不知道在哪里可以找到数据库系统数据.\n" -"你必须通过 -D 选项指定或者通过设置\n" -"PGDATA 环境变量声明包含数据库系统的目录.\n" -"\n" - -#: tcop/postgres.c:2655 +#: tcop/postgres.c:2652 msgid "invalid command-line arguments for server process" msgstr "服务器进程的无效命令行参数" -#: tcop/postgres.c:2656 tcop/postgres.c:2672 +#: tcop/postgres.c:2653 tcop/postgres.c:2669 #, c-format msgid "Try \"%s --help\" for more information." msgstr "请用 \"%s --help\" 获取更多的信息." -#: tcop/postgres.c:2670 +#: tcop/postgres.c:2667 #, c-format msgid "%s: invalid command-line arguments" msgstr "%s: 无效的命令行参数" -#: tcop/postgres.c:2680 +#: tcop/postgres.c:2677 #, c-format msgid "%s: no database nor user name specified" msgstr "%s: 没有指定数据库, 也没有指定用户名" -#: tcop/postgres.c:3088 +#: tcop/postgres.c:3131 #, c-format msgid "invalid CLOSE message subtype %d" msgstr "无效的 CLOSE 信息子类型 %d" -#: tcop/postgres.c:3118 +#: tcop/postgres.c:3161 #, c-format msgid "invalid DESCRIBE message subtype %d" msgstr "无效的 DESCRIBE 信息子类型 %d" -#: tcop/postgres.c:3298 nodes/print.c:86 storage/lmgr/deadlock.c:888 -#: commands/vacuumlazy.c:489 commands/vacuumlazy.c:770 commands/vacuum.c:2258 +#: tcop/postgres.c:3341 nodes/print.c:86 storage/lmgr/deadlock.c:888 +#: commands/vacuumlazy.c:517 commands/vacuumlazy.c:820 commands/vacuum.c:2257 #, c-format msgid "%s" -msgstr "" +msgstr "%s" -#: tcop/postgres.c:3359 +#: tcop/postgres.c:3402 #, c-format msgid "disconnection: session time: %s%s%s%s%s" -msgstr "" +msgstr "联接断开: 会话时间: %s%s%s%s%s" #: tcop/utility.c:77 #, c-format @@ -590,8 +576,8 @@ msgid "table \"%s\" does not exist" msgstr "表 \"%s\" 不存在" #: tcop/utility.c:78 commands/trigger.c:141 commands/trigger.c:546 -#: commands/comment.c:341 commands/indexcmds.c:136 commands/indexcmds.c:937 -#: commands/tablecmds.c:539 commands/tablecmds.c:2592 commands/lockcmds.c:68 +#: commands/comment.c:341 commands/indexcmds.c:137 commands/indexcmds.c:951 +#: commands/tablecmds.c:544 commands/tablecmds.c:2624 commands/lockcmds.c:68 #, c-format msgid "\"%s\" is not a table" msgstr "\"%s\" 不是一个表" @@ -605,7 +591,7 @@ msgstr "请使用 DROP TABLE 删除一个表." msgid "sequence \"%s\" does not exist" msgstr "序列 \"%s\" 不存在" -#: tcop/utility.c:83 commands/comment.c:334 commands/sequence.c:780 +#: tcop/utility.c:83 commands/comment.c:334 commands/sequence.c:767 #, c-format msgid "\"%s\" is not a sequence" msgstr "\"%s\" 不是一个序列" @@ -633,9 +619,9 @@ msgstr "请使用 DROP VIEW 删除一个视图." msgid "index \"%s\" does not exist" msgstr "索引 \"%s\" 不存在" -#: tcop/utility.c:93 access/index/indexam.c:134 access/index/indexam.c:159 -#: access/index/indexam.c:184 commands/comment.c:327 commands/indexcmds.c:873 -#: commands/indexcmds.c:903 +#: tcop/utility.c:93 access/index/indexam.c:139 access/index/indexam.c:164 +#: access/index/indexam.c:189 commands/comment.c:327 commands/indexcmds.c:887 +#: commands/indexcmds.c:917 #, c-format msgid "\"%s\" is not an index" msgstr "\"%s\" 不是一个索引" @@ -647,7 +633,7 @@ msgstr "请使用 DROP INDEX 删除一个索引." #: tcop/utility.c:97 utils/adt/regproc.c:1003 commands/functioncmds.c:110 #: commands/typecmds.c:423 commands/typecmds.c:809 commands/typecmds.c:1167 #: commands/typecmds.c:1288 commands/typecmds.c:1400 commands/typecmds.c:1487 -#: commands/typecmds.c:2072 commands/tablecmds.c:4586 parser/parse_func.c:1401 +#: commands/typecmds.c:2072 commands/tablecmds.c:4632 parser/parse_func.c:1401 #: parser/parse_type.c:201 parser/parse_type.c:227 catalog/pg_type.c:517 #, c-format msgid "type \"%s\" does not exist" @@ -663,18 +649,18 @@ msgid "Use DROP TYPE to remove a type." msgstr "请使用 DROP TYPE 删除一个类型." #: tcop/utility.c:182 tcop/utility.c:217 commands/trigger.c:147 -#: commands/trigger.c:552 commands/tablecmds.c:550 commands/tablecmds.c:1242 -#: commands/tablecmds.c:1448 commands/tablecmds.c:2604 -#: commands/tablecmds.c:3766 commands/tablecmds.c:5302 +#: commands/trigger.c:552 commands/tablecmds.c:555 commands/tablecmds.c:1274 +#: commands/tablecmds.c:1480 commands/tablecmds.c:2636 +#: commands/tablecmds.c:3798 commands/tablecmds.c:5427 #, c-format msgid "permission denied: \"%s\" is a system catalog" msgstr "权限不够: \"%s\" 是一个系统表" -#: tcop/utility.c:283 commands/copy.c:905 executor/execMain.c:468 +#: tcop/utility.c:323 commands/copy.c:905 executor/execMain.c:443 msgid "transaction is read-only" msgstr "事务是只读" -#: tcop/utility.c:934 +#: tcop/utility.c:973 msgid "must be superuser to do CHECKPOINT" msgstr "只有超级用户可以做 CHECKPOINT" @@ -683,7 +669,7 @@ msgid "conditional utility statements are not implemented" msgstr "条件工具语句没有实现" #: rewrite/rewriteManip.c:749 rewrite/rewriteManip.c:805 -#: rewrite/rewriteHandler.c:177 parser/analyze.c:1687 parser/analyze.c:1759 +#: rewrite/rewriteHandler.c:177 parser/analyze.c:1699 parser/analyze.c:1771 msgid "conditional UNION/INTERSECT/EXCEPT statements are not implemented" msgstr "条件工具语句 UNION/INTERSECT/EXCEPT 没有实现" @@ -797,48 +783,48 @@ msgstr "无法把表 \"%s\" 转换为视图, 因为它有子表" msgid "rule \"%s\" for relation \"%s\" does not exist" msgstr "关系 \"%2$s\" 的 \"%1$s\" 规则不存在" -#: rewrite/rewriteHandler.c:491 rewrite/rewriteHandler.c:510 +#: rewrite/rewriteHandler.c:492 rewrite/rewriteHandler.c:511 #, c-format msgid "multiple assignments to same column \"%s\"" msgstr "" -#: rewrite/rewriteHandler.c:646 catalog/heap.c:1827 +#: rewrite/rewriteHandler.c:647 catalog/heap.c:1812 #, c-format msgid "column \"%s\" is of type %s but default expression is of type %s" msgstr "字段 \"%s\" 类型是 %s, 但默认表达式类型是 %s" -#: rewrite/rewriteHandler.c:651 parser/analyze.c:2693 parser/parse_node.c:247 -#: parser/parse_target.c:363 parser/parse_target.c:571 -#: parser/parse_target.c:580 catalog/heap.c:1832 +#: rewrite/rewriteHandler.c:652 parser/analyze.c:2701 parser/parse_node.c:247 +#: parser/parse_target.c:362 parser/parse_target.c:572 +#: parser/parse_target.c:581 catalog/heap.c:1817 msgid "You will need to rewrite or cast the expression." msgstr "你需要重写或转换表达式" -#: rewrite/rewriteHandler.c:967 rewrite/rewriteHandler.c:1252 +#: rewrite/rewriteHandler.c:968 rewrite/rewriteHandler.c:1253 #, c-format msgid "infinite recursion detected in rules for relation \"%s\"" msgstr "在关系 \"%s\" 的规则中发现无限循环" -#: rewrite/rewriteHandler.c:1362 +#: rewrite/rewriteHandler.c:1365 msgid "cannot insert into a view" msgstr "无法插入到一个视图" -#: rewrite/rewriteHandler.c:1363 +#: rewrite/rewriteHandler.c:1366 msgid "You need an unconditional ON INSERT DO INSTEAD rule." msgstr "你需要一个无条件的 ON INSERT DO INSTEAD 规则." -#: rewrite/rewriteHandler.c:1368 +#: rewrite/rewriteHandler.c:1371 msgid "cannot update a view" msgstr "无法更新一个视图" -#: rewrite/rewriteHandler.c:1369 +#: rewrite/rewriteHandler.c:1372 msgid "You need an unconditional ON UPDATE DO INSTEAD rule." msgstr "你需要一个无条件的 ON UPDATE DO INSTEAD 规则." -#: rewrite/rewriteHandler.c:1374 +#: rewrite/rewriteHandler.c:1377 msgid "cannot delete from a view" msgstr "无法从一个视图中删除" -#: rewrite/rewriteHandler.c:1375 +#: rewrite/rewriteHandler.c:1378 msgid "You need an unconditional ON DELETE DO INSTEAD rule." msgstr "你需要一个无条件的 ON DELETE DO INSTEAD 规则." @@ -847,121 +833,118 @@ msgid "" "cannot use authentication method \"crypt\" because password is MD5-encrypted" msgstr "无法使用 \"crypt\" 认证方式, 因为口令是用 MD5 加密的" -#: libpq/hba.c:162 +#: libpq/hba.c:156 #, c-format msgid "authentication file token too long, skipping: \"%s\"" msgstr "认证文件标记 (token) 太长, 忽略: \"%s\"" -#: libpq/hba.c:328 +#: libpq/hba.c:324 #, c-format msgid "could not open secondary authentication file \"@%s\" as \"%s\": %m" msgstr "无法打开次认证文件 \"@%s\" 为 \"%s\": %m" #: libpq/hba.c:741 #, c-format -msgid "invalid IP address \"%s\" in pg_hba.conf file line %d: %s" -msgstr "在 pg_hba.conf 文件的第 %2$d 行为无效 IP 地址 \"%1$s\": %3$s" +msgid "invalid IP address \"%s\" in file \"%s\" line %d: %s" +msgstr "在 \"%2$s\" 文件的第 %3$d 行为无效 IP 地址 \"%1$s\": %4$s" -#: libpq/hba.c:775 +#: libpq/hba.c:776 #, c-format -msgid "invalid IP mask \"%s\" in pg_hba.conf file line %d: %s" -msgstr "在 pg_hba.conf 文件的第 %2$d 行为无效 IP 掩码 \"%1$s\": %3$s" +msgid "invalid IP mask \"%s\" in file \"%s\" line %d: %s" +msgstr "在 \"%2$s\" 文件的第 %3$d 行为无效 IP 掩码 \"%1$s\": %4$s" -#: libpq/hba.c:789 +#: libpq/hba.c:791 #, c-format -msgid "IP address and mask do not match in pg_hba.conf file line %d" -msgstr "在 pg_hba.conf 文件的第 %d 行 IP 地址与掩码无法匹配" +msgid "IP address and mask do not match in file \"%s\" line %d" +msgstr "在 \"%s\" 文件的第 %d 行 IP 地址与掩码无法匹配" -#: libpq/hba.c:847 +#: libpq/hba.c:849 libpq/hba.c:1105 #, c-format -msgid "invalid entry in pg_hba.conf file at line %d, token \"%s\"" -msgstr "在 pg_hba.conf 文件的第 %d 行为无效记录, 标记 \"%s\"" +msgid "invalid entry in file \"%s\" at line %d, token \"%s\"" +msgstr "在 \"%s\" 文件的第 %d 行为无效记录, 标记 \"%s\"" -#: libpq/hba.c:852 +#: libpq/hba.c:855 #, c-format -msgid "missing field in pg_hba.conf file at end of line %d" -msgstr "在 pg_hba.conf 文件的第 %d 行末尾缺少字段" +msgid "missing field in file \"%s\" at end of line %d" +msgstr "在 \"%s\" 文件的第 %d 行末尾缺少字段" -#: libpq/hba.c:909 libpq/hba.c:933 utils/init/miscinit.c:734 -#: utils/init/miscinit.c:840 utils/misc/database.c:68 utils/error/elog.c:1118 +#: libpq/hba.c:912 libpq/hba.c:936 utils/init/miscinit.c:783 +#: utils/init/miscinit.c:889 utils/misc/database.c:68 utils/error/elog.c:1118 #: access/transam/slru.c:638 access/transam/xlog.c:1632 +#: access/transam/xlog.c:2753 access/transam/xlog.c:2843 +#: access/transam/xlog.c:2941 #, c-format msgid "could not open file \"%s\": %m" msgstr "无法打开文件 \"%s\": %m" -#: libpq/hba.c:1058 guc-file.l:188 +#: libpq/hba.c:1045 guc-file.l:152 #, c-format msgid "could not open configuration file \"%s\": %m" msgstr "无法打开配置文件 \"%s\": %m" -#: libpq/hba.c:1119 +#: libpq/hba.c:1111 #, c-format -msgid "invalid entry in pg_ident.conf file at line %d, token \"%s\"" -msgstr "在 pg_ident.conf 文件的第 %d 行为无效记录, 标记 \"%s\"" +msgid "missing entry in file \"%s\" at end of line %d" +msgstr "在 \"%s\" 文件的第 %d 行末尾缺少记录" -#: libpq/hba.c:1124 -#, c-format -msgid "missing entry in pg_ident.conf file at end of line %d" -msgstr "在 pg_ident.conf 文件的第 %d 行末尾缺少记录" - -#: libpq/hba.c:1155 +#: libpq/hba.c:1142 msgid "cannot use Ident authentication without usermap field" msgstr "没有用户映射, 无法使用 Ident 认证" -#: libpq/hba.c:1213 +#: libpq/hba.c:1187 #, c-format msgid "could not open Ident usermap file \"%s\": %m" msgstr "无法打开 Ident 用户映射文件 \"%s\": %m" -#: libpq/hba.c:1392 +#: libpq/hba.c:1365 #, c-format msgid "could not create socket for Ident connection: %m" msgstr "无法为 Ident 联接创建套接字: %m" -#: libpq/hba.c:1408 +#: libpq/hba.c:1381 #, c-format msgid "could not bind to local address \"%s\": %m" msgstr "无法绑定到本地地址 \"%s\": %m" -#: libpq/hba.c:1420 +#: libpq/hba.c:1393 #, c-format msgid "could not connect to Ident server at address \"%s\", port %s: %m" msgstr "无法联接到地址为 \"%s\", 端口为 %s 的 Ident 服务器: %m" -#: libpq/hba.c:1440 +#: libpq/hba.c:1413 #, c-format msgid "could not send query to Ident server at address \"%s\", port %s: %m" msgstr "无法发送查询到地址为 \"%s\", 端口为 %s 的 Ident 服务器: %m" -#: libpq/hba.c:1455 +#: libpq/hba.c:1428 #, c-format msgid "" "could not receive response from Ident server at address \"%s\", port %s: %m" msgstr "无法从地址为 \"%s\", 端口为 %s 的 Ident 服务器接收应答: %m" -#: libpq/hba.c:1465 +#: libpq/hba.c:1438 #, c-format msgid "invalidly formatted response from Ident server: \"%s\"" msgstr "从 Ident 服务器接收的无效格式应答: \"%s\"" -#: libpq/hba.c:1500 libpq/hba.c:1531 libpq/hba.c:1599 +#: libpq/hba.c:1473 libpq/hba.c:1504 libpq/hba.c:1572 #, c-format msgid "could not get peer credentials: %m" msgstr "无法获得同等 (peer) 证书: %m" -#: libpq/hba.c:1509 libpq/hba.c:1540 libpq/hba.c:1610 +#: libpq/hba.c:1482 libpq/hba.c:1513 libpq/hba.c:1583 #, c-format msgid "local user with ID %d does not exist" msgstr "ID 为 %d 的本地用户不存在" -#: libpq/hba.c:1622 +#: libpq/hba.c:1595 msgid "" "Ident authentication is not supported on local connections on this platform" msgstr "在此平台上不支持本地联接的 Ident 认证" -#: libpq/hba.c:1665 +#: libpq/hba.c:1638 #, c-format -msgid "IDENT code identifies remote user as \"%s\"" +msgid "Ident protocol identifies remote user as \"%s\"" msgstr "" #: libpq/be-fsstubs.c:132 libpq/be-fsstubs.c:170 libpq/be-fsstubs.c:194 @@ -1006,84 +989,103 @@ msgstr "无法创建服务器文件 \"%s\": %m" msgid "could not write server file \"%s\": %m" msgstr "无法写入服务器文件 \"%s\": %m" -#: libpq/be-secure.c:274 libpq/be-secure.c:359 +#: libpq/be-secure.c:281 libpq/be-secure.c:374 #, c-format msgid "SSL SYSCALL error: %m" msgstr "SSL SYSCALL 错误: %m" -#: libpq/be-secure.c:279 libpq/be-secure.c:364 +#: libpq/be-secure.c:286 libpq/be-secure.c:379 msgid "SSL SYSCALL error: EOF detected" msgstr "SSL SYSCALL 错误: 发现 EOF" -#: libpq/be-secure.c:287 libpq/be-secure.c:372 +#: libpq/be-secure.c:294 libpq/be-secure.c:387 #, c-format msgid "SSL error: %s" msgstr "SSL 错误: %s" -#: libpq/be-secure.c:296 libpq/be-secure.c:381 +#: libpq/be-secure.c:303 libpq/be-secure.c:396 libpq/be-secure.c:813 #, c-format -msgid "unrecognized SSL error code %d" -msgstr "未知的 SSL 错误代码 %d" +msgid "unrecognized SSL error code: %d" +msgstr "未知的 SSL 错误码: %d" -#: libpq/be-secure.c:327 libpq/be-secure.c:331 libpq/be-secure.c:341 +#: libpq/be-secure.c:336 libpq/be-secure.c:340 libpq/be-secure.c:350 msgid "SSL renegotiation failure" msgstr "SSL 协商失败" -#: libpq/be-secure.c:335 +#: libpq/be-secure.c:344 msgid "SSL failed to send renegotiation request" msgstr "发送 SSL 协商响应失败" -#: libpq/be-secure.c:634 +#: libpq/be-secure.c:649 #, c-format msgid "could not create SSL context: %s" msgstr "无法创建 SSL 环境: %s" -#: libpq/be-secure.c:644 +#: libpq/be-secure.c:659 #, c-format msgid "could not load server certificate file \"%s\": %s" msgstr "无法装载服务器认证文件 \"%s\": %s" -#: libpq/be-secure.c:651 +#: libpq/be-secure.c:666 #, c-format msgid "could not access private key file \"%s\": %m" msgstr "无法处理私钥文件 \"%s\": %m" -#: libpq/be-secure.c:667 +#: libpq/be-secure.c:682 #, c-format msgid "unsafe permissions on private key file \"%s\"" msgstr "私钥文件 \"%s\" 权限不安全" -#: libpq/be-secure.c:669 +#: libpq/be-secure.c:684 msgid "" "File must be owned by the database user and must have no permissions for " "\"group\" or \"other\"." msgstr "文件的属主必须是数据库用户, 并且对 \"组\" 或 \"其它用户\" 没有权限." -#: libpq/be-secure.c:674 +#: libpq/be-secure.c:689 #, c-format msgid "could not load private key file \"%s\": %s" msgstr "无法装载私钥文件 \"%s\": %s" -#: libpq/be-secure.c:679 +#: libpq/be-secure.c:694 #, c-format msgid "check of private key failed: %s" msgstr "检查私钥失败: %s" -#: libpq/be-secure.c:697 +#: libpq/be-secure.c:714 #, c-format msgid "could not load root certificate file \"%s\": %s" msgstr "无法装载根 (root) 认证文件 \"%s\": %s" -#: libpq/be-secure.c:699 +#: libpq/be-secure.c:716 msgid "Will not verify client certificates." msgstr "将不检验客户端的认证证书." -#: libpq/be-secure.c:737 +#: libpq/be-secure.c:759 #, c-format msgid "could not initialize SSL connection: %s" msgstr "无法初始化 SSL 联接: %s" -#: libpq/be-secure.c:761 +#: libpq/be-secure.c:768 +#, c-format +msgid "could not set SSL socket: %s" +msgstr "无法创建 SSL 套接字: %s" + +#: libpq/be-secure.c:793 +#, c-format +msgid "could not accept SSL connection: %m" +msgstr "无法访问 SSL 联接: %m" + +#: libpq/be-secure.c:797 libpq/be-secure.c:808 +msgid "could not accept SSL connection: EOF detected" +msgstr "无法访问 SSL 联接: 发现 EOF" + +#: libpq/be-secure.c:802 +#, c-format +msgid "could not accept SSL connection: %s" +msgstr "无法访问 SSL 联接: %s" + +#: libpq/be-secure.c:840 #, c-format msgid "SSL connection from \"%s\"" msgstr "来自 \"%s\" 的 SSL 联接" @@ -1144,33 +1146,33 @@ msgstr "Kerberos 5 在此服务器上没有实现" #: libpq/auth.c:366 #, c-format -msgid "Rejected host: authentication failed for user \"%s\"" -msgstr "拒绝: 用户 \"%s\" 认证失败" +msgid "authentication failed for user \"%s\": host rejected" +msgstr "用户 \"%s\" 认证失败: 主机拒绝" #: libpq/auth.c:369 #, c-format -msgid "Kerberos4 authentication failed for user \"%s\"" -msgstr "用户 \"%s\" 认证 Kerberos4 失败" +msgid "Kerberos 4 authentication failed for user \"%s\"" +msgstr "用户 \"%s\" Kerberos4 认证失败" #: libpq/auth.c:372 #, c-format -msgid "Kerberos5 authentication failed for user \"%s\"" -msgstr "为用户 \"%s\" 认证 Kerberos5 失败" +msgid "Kerberos 5 authentication failed for user \"%s\"" +msgstr "用户 \"%s\" Kerberos5 认证失败" #: libpq/auth.c:375 #, c-format -msgid "Trusted authentication failed for user \"%s\"" -msgstr "用户 \"%s\" 认证 Trusted 失败" +msgid "\"trust\" authentication failed for user \"%s\"" +msgstr "用户 \"%s\" \"trust\" 认证失败" #: libpq/auth.c:378 #, c-format -msgid "IDENT authentication failed for user \"%s\"" -msgstr "用户 \"%s\" 认证 IDENT 失败" +msgid "Ident authentication failed for user \"%s\"" +msgstr "用户 \"%s\" Ident 认证失败" #: libpq/auth.c:383 #, c-format -msgid "Password authentication failed for user \"%s\"" -msgstr "用户 \"%s\" 认证 Password 失败" +msgid "password authentication failed for user \"%s\"" +msgstr "用户 \"%s\" Password 认证失败" #: libpq/auth.c:387 #, c-format @@ -1179,8 +1181,8 @@ msgstr "用户 \"%s\" 认证 PAM 失败" #: libpq/auth.c:391 #, c-format -msgid "Unknown auth method: authentication failed for user \"%s\"" -msgstr "未知认证方法: 用户 \"%s\" 认证失败" +msgid "authentication failed for user \"%s\": invalid authentication method" +msgstr "用户 \"%s\" 认证失败: 无效的认证方式" #: libpq/auth.c:420 msgid "missing or erroneous pg_hba.conf file" @@ -1275,56 +1277,56 @@ msgstr "无效的口令包尺寸" msgid "received password packet" msgstr "接收到口令包" -#: libpq/pqcomm.c:248 +#: libpq/pqcomm.c:271 #, c-format msgid "could not translate host name \"%s\", service \"%s\" to address: %s" msgstr "无法解析主机名 \"%s\", 服务 \"%s\" 到地址: %s" -#: libpq/pqcomm.c:252 +#: libpq/pqcomm.c:275 #, c-format msgid "could not translate service \"%s\" to address: %s" msgstr "无法解析服务 \"%s\" 到地址: %s" -#: libpq/pqcomm.c:286 +#: libpq/pqcomm.c:309 msgid "IPv4" msgstr "IPv4" -#: libpq/pqcomm.c:290 +#: libpq/pqcomm.c:313 msgid "IPv6" msgstr "IPv6" -#: libpq/pqcomm.c:295 +#: libpq/pqcomm.c:318 msgid "Unix" msgstr "Unix" -#: libpq/pqcomm.c:300 +#: libpq/pqcomm.c:323 #, c-format msgid "unrecognized address family %d" msgstr "不认可的地址族 %d" #. translator: %s is IPv4, IPv6, or Unix -#: libpq/pqcomm.c:311 +#: libpq/pqcomm.c:334 #, c-format msgid "could not create %s socket: %m" msgstr "无法创建 %s 套接字: %m" -#: libpq/pqcomm.c:323 +#: libpq/pqcomm.c:346 #, c-format msgid "setsockopt(SO_REUSEADDR) failed: %m" msgstr "setsockopt(SO_REUSEADDR) 失败: %m" -#: libpq/pqcomm.c:337 +#: libpq/pqcomm.c:360 #, c-format msgid "setsockopt(IPV6_V6ONLY) failed: %m" msgstr "setsockopt(IPV6_V6ONLY) 失败: %m" #. translator: %s is IPv4, IPv6, or Unix -#: libpq/pqcomm.c:356 +#: libpq/pqcomm.c:379 #, c-format msgid "could not bind %s socket: %m" msgstr "无法绑定 %s 套接字: %m" -#: libpq/pqcomm.c:359 +#: libpq/pqcomm.c:382 #, c-format msgid "" "Is another postmaster already running on port %d? If not, remove socket file " @@ -1333,7 +1335,7 @@ msgstr "" "是否有其它 postmaster 已经在端口 %d 上运行了? 如果没有, 删除套接字文件 \"%s" "\" 然后再重试." -#: libpq/pqcomm.c:362 +#: libpq/pqcomm.c:385 #, c-format msgid "" "Is another postmaster already running on port %d? If not, wait a few seconds " @@ -1343,50 +1345,50 @@ msgstr "" "重试." #. translator: %s is IPv4, IPv6, or Unix -#: libpq/pqcomm.c:396 +#: libpq/pqcomm.c:419 #, c-format msgid "could not listen on %s socket: %m" msgstr "无法在 %s 套接字上监听: %m" -#: libpq/pqcomm.c:476 commands/user.c:1532 commands/user.c:1769 -#: commands/user.c:1804 catalog/aclchk.c:1229 +#: libpq/pqcomm.c:499 commands/user.c:1535 commands/user.c:1772 +#: commands/user.c:1807 catalog/aclchk.c:1229 #, c-format msgid "group \"%s\" does not exist" msgstr "组 \"%s\" 不存在" -#: libpq/pqcomm.c:486 +#: libpq/pqcomm.c:509 #, c-format msgid "could not set group of file \"%s\": %m" msgstr "无法设置文件 \"%s\" 的组: %m" -#: libpq/pqcomm.c:497 +#: libpq/pqcomm.c:520 #, c-format msgid "could not set permissions of file \"%s\": %m" msgstr "无法设置文件 \"%s\" 的权限: %m" -#: libpq/pqcomm.c:527 +#: libpq/pqcomm.c:550 #, c-format msgid "could not accept new connection: %m" msgstr "无法访问新联接: %m" -#: libpq/pqcomm.c:679 +#: libpq/pqcomm.c:702 #, c-format msgid "could not receive data from client: %m" msgstr "无法从客户端获得数据: %m" -#: libpq/pqcomm.c:842 +#: libpq/pqcomm.c:895 msgid "unexpected EOF within message length word" msgstr "在信息长度字里有意外的 EOF" -#: libpq/pqcomm.c:854 +#: libpq/pqcomm.c:906 msgid "invalid message length" msgstr "无效的信息长度" -#: libpq/pqcomm.c:868 +#: libpq/pqcomm.c:928 libpq/pqcomm.c:938 msgid "incomplete message from client" msgstr "从客户端过来的不完整信息" -#: libpq/pqcomm.c:947 +#: libpq/pqcomm.c:1048 #, c-format msgid "could not send data to client: %m" msgstr "无法发送数据给客户端: %m" @@ -1396,7 +1398,7 @@ msgid "no data left in message" msgstr "信息中已经没有数据了" #: libpq/pqformat.c:591 libpq/pqformat.c:609 libpq/pqformat.c:630 -#: utils/adt/arrayfuncs.c:1258 utils/adt/rowtypes.c:523 +#: utils/adt/arrayfuncs.c:1277 utils/adt/rowtypes.c:523 msgid "insufficient data left in message" msgstr "信息中剩下的数据不够" @@ -1418,7 +1420,7 @@ msgstr "没有找到参数 \"%s\" 的值" msgid "no value found for parameter %d" msgstr "没有找到参数 %d 的值" -#: utils/mb/mbutils.c:188 commands/variable.c:591 +#: utils/mb/mbutils.c:188 commands/variable.c:593 #, c-format msgid "conversion between %s and %s is not supported" msgstr "不支持 %s 和 %s 之间的编码转换" @@ -1491,19 +1493,44 @@ msgstr "下限不能等于上限" msgid "invalid argument for power function" msgstr "power 函数的无效参数" -#: utils/adt/numeric.c:1761 utils/adt/numeric.c:1829 utils/adt/numeric.c:1877 +#: utils/adt/numeric.c:1761 msgid "cannot convert NaN to integer" msgstr "无法转化 NaN 为整数" -#: utils/adt/numeric.c:1785 utils/adt/numeric.c:1794 utils/adt/numeric.c:1838 -#: utils/adt/numeric.c:1886 utils/adt/numeric.c:1897 utils/adt/int.c:294 -#: utils/adt/float.c:1131 utils/adt/float.c:1150 utils/adt/float.c:1197 -#: utils/adt/float.c:1216 utils/adt/int8.c:111 utils/adt/int8.c:777 -#: utils/adt/int8.c:802 utils/adt/int8.c:840 utils/adt/int8.c:879 -#: utils/adt/varbit.c:1234 utils/adt/varbit.c:1313 +#: utils/adt/numeric.c:1785 utils/adt/numeric.c:1794 utils/adt/int.c:614 +#: utils/adt/int.c:642 utils/adt/int.c:662 utils/adt/int.c:691 +#: utils/adt/int.c:716 utils/adt/int.c:731 utils/adt/int.c:861 +#: utils/adt/int.c:881 utils/adt/int.c:907 utils/adt/int.c:941 +#: utils/adt/int.c:961 utils/adt/int.c:987 utils/adt/int.c:1012 +#: utils/adt/int.c:1091 utils/adt/float.c:1131 utils/adt/float.c:1197 +#: utils/adt/int8.c:947 utils/adt/varbit.c:1234 msgid "integer out of range" msgstr "整数超出范围" +#: utils/adt/numeric.c:1829 +msgid "cannot convert NaN to bigint" +msgstr "无法转换 NaN 为 bigint" + +#: utils/adt/numeric.c:1838 utils/adt/int8.c:506 utils/adt/int8.c:534 +#: utils/adt/int8.c:554 utils/adt/int8.c:583 utils/adt/int8.c:608 +#: utils/adt/int8.c:626 utils/adt/int8.c:660 utils/adt/int8.c:705 +#: utils/adt/int8.c:725 utils/adt/int8.c:751 utils/adt/int8.c:776 +#: utils/adt/int8.c:796 utils/adt/int8.c:816 utils/adt/int8.c:842 +#: utils/adt/int8.c:1010 utils/adt/int8.c:1049 utils/adt/varbit.c:1313 +msgid "bigint out of range" +msgstr "bigint 超出范围" + +#: utils/adt/numeric.c:1877 +msgid "cannot convert NaN to smallint" +msgstr "无法转换 NaN 为 smallint" + +#: utils/adt/numeric.c:1886 utils/adt/numeric.c:1897 utils/adt/int.c:297 +#: utils/adt/int.c:747 utils/adt/int.c:775 utils/adt/int.c:795 +#: utils/adt/int.c:815 utils/adt/int.c:841 utils/adt/int.c:1106 +#: utils/adt/float.c:1150 utils/adt/float.c:1216 utils/adt/int8.c:972 +msgid "smallint out of range" +msgstr "smallint 超出范围" + #: utils/adt/numeric.c:2720 utils/adt/numeric.c:2743 utils/adt/numeric.c:2767 #: utils/adt/numeric.c:2774 utils/adt/numeric.c:2788 #, c-format @@ -1531,14 +1558,14 @@ msgstr "" msgid "invalid input syntax for type double precision: \"%s\"" msgstr "无效的双精度类型输入语法: \"%s\"" -#: utils/adt/numeric.c:3820 utils/adt/timestamp.c:2197 utils/adt/int.c:652 -#: utils/adt/int.c:717 utils/adt/int.c:758 utils/adt/int.c:799 -#: utils/adt/int.c:813 utils/adt/int.c:827 utils/adt/int.c:841 -#: utils/adt/int.c:855 utils/adt/float.c:795 utils/adt/float.c:859 +#: utils/adt/numeric.c:3820 utils/adt/timestamp.c:2196 utils/adt/int.c:705 +#: utils/adt/int.c:830 utils/adt/int.c:920 utils/adt/int.c:1001 +#: utils/adt/int.c:1025 utils/adt/int.c:1040 utils/adt/int.c:1055 +#: utils/adt/int.c:1070 utils/adt/float.c:795 utils/adt/float.c:859 #: utils/adt/float.c:2117 utils/adt/float.c:2179 utils/adt/cash.c:496 #: utils/adt/cash.c:548 utils/adt/cash.c:601 utils/adt/cash.c:653 -#: utils/adt/char.c:186 utils/adt/int8.c:537 utils/adt/int8.c:566 -#: utils/adt/int8.c:644 utils/adt/int8.c:685 utils/adt/geo_ops.c:3832 +#: utils/adt/int8.c:597 utils/adt/int8.c:642 utils/adt/int8.c:765 +#: utils/adt/int8.c:855 utils/adt/geo_ops.c:3832 msgid "division by zero" msgstr "除以零" @@ -1566,114 +1593,114 @@ msgstr "" msgid "invalid Datum pointer" msgstr "无效的 Datum 指针" -#: utils/adt/timestamp.c:98 utils/adt/timestamp.c:339 +#: utils/adt/timestamp.c:97 utils/adt/timestamp.c:338 #, c-format msgid "timestamp out of range: \"%s\"" msgstr "时间戳超出范围: \"%s\"" -#: utils/adt/timestamp.c:116 utils/adt/timestamp.c:357 -#: utils/adt/timestamp.c:536 +#: utils/adt/timestamp.c:115 utils/adt/timestamp.c:356 +#: utils/adt/timestamp.c:535 #, c-format msgid "date/time value \"%s\" is no longer supported" msgstr "日期/时间值 \"%s\" 不再被支持" -#: utils/adt/timestamp.c:153 utils/adt/timestamp.c:187 -#: utils/adt/timestamp.c:395 utils/adt/timestamp.c:431 -#: utils/adt/timestamp.c:1929 utils/adt/timestamp.c:1950 -#: utils/adt/timestamp.c:2008 utils/adt/timestamp.c:2031 -#: utils/adt/timestamp.c:2413 utils/adt/timestamp.c:2524 -#: utils/adt/timestamp.c:2746 utils/adt/timestamp.c:2819 -#: utils/adt/timestamp.c:2865 utils/adt/timestamp.c:2949 -#: utils/adt/timestamp.c:3232 utils/adt/timestamp.c:3365 -#: utils/adt/timestamp.c:3372 utils/adt/timestamp.c:3385 -#: utils/adt/timestamp.c:3393 utils/adt/timestamp.c:3456 -#: utils/adt/timestamp.c:3587 utils/adt/timestamp.c:3595 -#: utils/adt/timestamp.c:3862 utils/adt/timestamp.c:3869 -#: utils/adt/timestamp.c:3897 utils/adt/timestamp.c:3901 +#: utils/adt/timestamp.c:152 utils/adt/timestamp.c:186 +#: utils/adt/timestamp.c:394 utils/adt/timestamp.c:430 +#: utils/adt/timestamp.c:1928 utils/adt/timestamp.c:1949 +#: utils/adt/timestamp.c:2007 utils/adt/timestamp.c:2030 +#: utils/adt/timestamp.c:2412 utils/adt/timestamp.c:2530 +#: utils/adt/timestamp.c:2752 utils/adt/timestamp.c:2825 +#: utils/adt/timestamp.c:2872 utils/adt/timestamp.c:2968 +#: utils/adt/timestamp.c:3251 utils/adt/timestamp.c:3384 +#: utils/adt/timestamp.c:3391 utils/adt/timestamp.c:3404 +#: utils/adt/timestamp.c:3412 utils/adt/timestamp.c:3475 +#: utils/adt/timestamp.c:3610 utils/adt/timestamp.c:3618 +#: utils/adt/timestamp.c:3885 utils/adt/timestamp.c:3892 +#: utils/adt/timestamp.c:3920 utils/adt/timestamp.c:3924 #: utils/adt/nabstime.c:570 utils/adt/nabstime.c:613 utils/adt/nabstime.c:643 #: utils/adt/nabstime.c:686 utils/adt/date.c:732 utils/adt/date.c:775 #: utils/adt/date.c:1337 utils/adt/date.c:1374 utils/adt/date.c:2252 -#: utils/adt/formatting.c:2892 utils/adt/formatting.c:2917 -#: utils/adt/formatting.c:2976 +#: utils/adt/formatting.c:2895 utils/adt/formatting.c:2920 +#: utils/adt/formatting.c:2979 msgid "timestamp out of range" msgstr "时间戳超出范围" -#: utils/adt/timestamp.c:271 +#: utils/adt/timestamp.c:270 #, c-format msgid "timestamp(%d) precision must be between %d and %d" msgstr "timestamp(%d) 的精确度必需在 %d 到 %d 之间" -#: utils/adt/timestamp.c:529 utils/adt/timestamp.c:2408 -#: utils/adt/timestamp.c:2519 utils/adt/timestamp.c:3041 +#: utils/adt/timestamp.c:528 utils/adt/timestamp.c:2407 +#: utils/adt/timestamp.c:2525 utils/adt/timestamp.c:3060 msgid "interval out of range" msgstr "interval 超出范围" -#: utils/adt/timestamp.c:882 +#: utils/adt/timestamp.c:881 #, c-format msgid "interval(%d) precision must be between %d and %d" msgstr "interval(%d) 的精确度必需在 %d 到 %d 之间" -#: utils/adt/timestamp.c:1882 +#: utils/adt/timestamp.c:1881 msgid "cannot subtract infinite timestamps" msgstr "" -#: utils/adt/timestamp.c:2579 +#: utils/adt/timestamp.c:2585 #, c-format msgid "invalid input syntax for type timestamp: \"%s\"" msgstr "无效的 timestamp 类型输入语法: \"%s\"" -#: utils/adt/timestamp.c:2639 +#: utils/adt/timestamp.c:2645 #, c-format msgid "invalid input syntax for type timestamp with time zone: \"%s\"" msgstr "无效的带时区的 timestamp 类型输入语法: \"%s\"" -#: utils/adt/timestamp.c:2700 +#: utils/adt/timestamp.c:2706 #, c-format msgid "invalid input syntax for type interval: \"%s\"" msgstr "无效的 interval 类型输入语法: \"%s\"" -#: utils/adt/timestamp.c:2811 utils/adt/timestamp.c:3344 -#: utils/adt/timestamp.c:3401 +#: utils/adt/timestamp.c:2817 utils/adt/timestamp.c:3363 +#: utils/adt/timestamp.c:3420 #, c-format msgid "timestamp units \"%s\" not supported" msgstr "不支持时间戳单位 \"%s\"" -#: utils/adt/timestamp.c:2825 utils/adt/timestamp.c:3411 +#: utils/adt/timestamp.c:2831 utils/adt/timestamp.c:3430 #, c-format msgid "timestamp units \"%s\" not recognized" msgstr "时间戳单位 \"%s\" 不被认可" -#: utils/adt/timestamp.c:2939 utils/adt/timestamp.c:3565 -#: utils/adt/timestamp.c:3603 +#: utils/adt/timestamp.c:2957 utils/adt/timestamp.c:3588 +#: utils/adt/timestamp.c:3626 #, c-format msgid "timestamp with time zone units \"%s\" not supported" msgstr "不支持带时区的时间戳单位 \"%s\"" -#: utils/adt/timestamp.c:2955 utils/adt/timestamp.c:3612 +#: utils/adt/timestamp.c:2974 utils/adt/timestamp.c:3635 #, c-format msgid "timestamp with time zone units \"%s\" not recognized" msgstr "带时区的时间戳单位 \"%s\" 不被认可" -#: utils/adt/timestamp.c:3034 utils/adt/timestamp.c:3718 +#: utils/adt/timestamp.c:3053 utils/adt/timestamp.c:3741 #, c-format msgid "interval units \"%s\" not supported" msgstr "不支持 \"%s\" 的 interval 单位" -#: utils/adt/timestamp.c:3050 utils/adt/timestamp.c:3748 +#: utils/adt/timestamp.c:3069 utils/adt/timestamp.c:3771 #, c-format msgid "interval units \"%s\" not recognized" msgstr "interval 单位 \"%s\" 不被认可" -#: utils/adt/timestamp.c:3074 +#: utils/adt/timestamp.c:3093 msgid "cannot calculate week number without year information" msgstr "没有年份信息, 无法计算星期个数" -#: utils/adt/timestamp.c:3793 utils/adt/timestamp.c:3942 utils/adt/date.c:2510 +#: utils/adt/timestamp.c:3816 utils/adt/timestamp.c:3965 utils/adt/date.c:2510 #, c-format msgid "time zone \"%s\" not recognized" msgstr "时区 \"%s\" 不被认可" -#: utils/adt/timestamp.c:3819 utils/adt/timestamp.c:3968 +#: utils/adt/timestamp.c:3842 utils/adt/timestamp.c:3991 #, c-format msgid "interval time zone \"%s\" must not specify month" msgstr "时区 \"%s\" 间隔不可以指定月份" @@ -1793,9 +1820,9 @@ msgstr "不能同时指定用户 (user) 和组 (group)" msgid "unrecognized privilege type: \"%s\"" msgstr "未知的权限类型: \"%s\"" -#: utils/adt/acl.c:1661 utils/init/postinit.c:264 utils/init/postinit.c:276 -#: commands/comment.c:458 commands/dbcommands.c:521 commands/dbcommands.c:645 -#: commands/dbcommands.c:740 commands/dbcommands.c:814 catalog/aclchk.c:451 +#: utils/adt/acl.c:1661 utils/init/postinit.c:271 utils/init/postinit.c:283 +#: commands/comment.c:458 commands/dbcommands.c:550 commands/dbcommands.c:679 +#: commands/dbcommands.c:779 commands/dbcommands.c:866 catalog/aclchk.c:451 #, c-format msgid "database \"%s\" does not exist" msgstr "数据库 \"%s\" 不存在" @@ -1812,35 +1839,35 @@ msgstr "函数 \"%s\" 不存在" msgid "language \"%s\" does not exist" msgstr "语言 \"%s\" 不存在" -#: utils/adt/acl.c:2283 commands/comment.c:509 commands/schemacmds.c:210 -#: commands/schemacmds.c:272 commands/schemacmds.c:327 catalog/aclchk.c:921 +#: utils/adt/acl.c:2283 commands/comment.c:509 commands/schemacmds.c:181 +#: commands/schemacmds.c:243 commands/schemacmds.c:298 catalog/aclchk.c:921 #: catalog/namespace.c:255 catalog/namespace.c:1229 catalog/namespace.c:1267 #: catalog/namespace.c:1866 #, c-format msgid "schema \"%s\" does not exist" msgstr "模式 \"%s\" 不存在" -#: utils/adt/acl.c:2489 commands/tablespace.c:429 commands/tablespace.c:823 -#: commands/tablespace.c:890 commands/dbcommands.c:276 -#: commands/indexcmds.c:169 commands/tablecmds.c:325 commands/tablecmds.c:5310 -#: commands/schemacmds.c:117 catalog/aclchk.c:1080 +#: utils/adt/acl.c:2489 commands/tablespace.c:425 commands/tablespace.c:750 +#: commands/tablespace.c:817 commands/tablespace.c:896 +#: commands/dbcommands.c:277 commands/indexcmds.c:171 commands/tablecmds.c:324 +#: commands/tablecmds.c:5435 catalog/aclchk.c:1080 #, c-format msgid "tablespace \"%s\" does not exist" msgstr "表空间 \"%s\" 不存在" -#: utils/adt/like_match.c:291 utils/adt/like.c:453 utils/adt/regexp.c:461 +#: utils/adt/like_match.c:291 utils/adt/like.c:453 utils/adt/regexp.c:480 msgid "invalid escape string" msgstr "无效的逃逸字符串" -#: utils/adt/like_match.c:292 utils/adt/like.c:454 utils/adt/regexp.c:462 +#: utils/adt/like_match.c:292 utils/adt/like.c:454 utils/adt/regexp.c:481 msgid "Escape string must be empty or one character." msgstr "逃逸字符串必须为空或者一个字符." -#: utils/adt/int.c:134 +#: utils/adt/int.c:137 msgid "int2vector has too many elements" msgstr "int2vector 有太多的元素" -#: utils/adt/int.c:1063 utils/adt/int8.c:981 +#: utils/adt/int.c:1294 utils/adt/int8.c:1151 msgid "step size may not equal zero" msgstr "" @@ -1864,7 +1891,7 @@ msgstr "无效的 oid 类型输入语法: \"\"" #: utils/adt/oid.c:46 utils/adt/float.c:281 utils/adt/float.c:458 msgid "This input will be rejected in a future release of PostgreSQL." -msgstr "" +msgstr "此输入在将来的 PostgreSQL 发型版本中废除." #: utils/adt/oid.c:60 utils/adt/oid.c:66 utils/adt/oid.c:87 #, c-format @@ -1885,122 +1912,128 @@ msgstr "oidvector 有太多元素" msgid "invalid input syntax for type tid: \"%s\"" msgstr "无效的 tid 类型输入语法: \"%s\"" -#: utils/adt/oracle_compat.c:99 utils/adt/oracle_compat.c:138 +#: utils/adt/oracle_compat.c:99 utils/adt/oracle_compat.c:139 msgid "invalid multibyte character for locale" msgstr "无效的多字节字符, 对于 locale" -#: utils/adt/oracle_compat.c:410 utils/adt/oracle_compat.c:507 -#: utils/adt/oracle_compat.c:1131 +#: utils/adt/oracle_compat.c:100 +msgid "" +"The server's LC_CTYPE locale is probably incompatible with the database " +"encoding." +msgstr "服务器本地 LC_CTYPE 可能与数据库编码不兼容." + +#: utils/adt/oracle_compat.c:411 utils/adt/oracle_compat.c:508 +#: utils/adt/oracle_compat.c:1132 msgid "requested length too large" msgstr "请求长度太大" -#: utils/adt/ri_triggers.c:301 utils/adt/ri_triggers.c:363 -#: utils/adt/ri_triggers.c:542 utils/adt/ri_triggers.c:781 -#: utils/adt/ri_triggers.c:972 utils/adt/ri_triggers.c:1133 -#: utils/adt/ri_triggers.c:1317 utils/adt/ri_triggers.c:1486 -#: utils/adt/ri_triggers.c:1667 utils/adt/ri_triggers.c:1837 -#: utils/adt/ri_triggers.c:2055 utils/adt/ri_triggers.c:2235 -#: utils/adt/ri_triggers.c:2440 utils/adt/ri_triggers.c:2536 -#: utils/adt/ri_triggers.c:2659 gram.y:1887 +#: utils/adt/ri_triggers.c:302 utils/adt/ri_triggers.c:364 +#: utils/adt/ri_triggers.c:543 utils/adt/ri_triggers.c:782 +#: utils/adt/ri_triggers.c:973 utils/adt/ri_triggers.c:1134 +#: utils/adt/ri_triggers.c:1318 utils/adt/ri_triggers.c:1487 +#: utils/adt/ri_triggers.c:1668 utils/adt/ri_triggers.c:1838 +#: utils/adt/ri_triggers.c:2056 utils/adt/ri_triggers.c:2236 +#: utils/adt/ri_triggers.c:2441 utils/adt/ri_triggers.c:2537 +#: utils/adt/ri_triggers.c:2660 gram.y:1886 msgid "MATCH PARTIAL not yet implemented" msgstr "MATCH PARTIAL 仍未实现" -#: utils/adt/ri_triggers.c:337 utils/adt/ri_triggers.c:2739 -#: utils/adt/ri_triggers.c:3236 utils/adt/ri_triggers.c:3273 +#: utils/adt/ri_triggers.c:338 utils/adt/ri_triggers.c:2744 +#: utils/adt/ri_triggers.c:3249 utils/adt/ri_triggers.c:3286 #, c-format msgid "insert or update on table \"%s\" violates foreign key constraint \"%s\"" msgstr "插入或更新表 \"%s\" 违反外键约束 \"%s\"" -#: utils/adt/ri_triggers.c:340 utils/adt/ri_triggers.c:2742 +#: utils/adt/ri_triggers.c:341 utils/adt/ri_triggers.c:2747 msgid "MATCH FULL does not allow mixing of null and nonnull key values." msgstr "MATCH FULL 不允许空和非空键值的混合." -#: utils/adt/ri_triggers.c:2482 utils/adt/ri_triggers.c:2967 +#: utils/adt/ri_triggers.c:2483 utils/adt/ri_triggers.c:2972 #, c-format msgid "function \"%s\" called with wrong number of trigger arguments" msgstr "函数 \"%s\" 调用了错误的触发器参数个数" -#: utils/adt/ri_triggers.c:2500 utils/adt/ri_triggers.c:2977 +#: utils/adt/ri_triggers.c:2501 utils/adt/ri_triggers.c:2982 #, c-format msgid "no target table given for trigger \"%s\" on table \"%s\"" msgstr "没有为表 \"%2$s\" 上的触发器 \"%1$s\" 提供目标表" -#: utils/adt/ri_triggers.c:2503 utils/adt/ri_triggers.c:2980 +#: utils/adt/ri_triggers.c:2504 utils/adt/ri_triggers.c:2985 msgid "" "Remove this referential integrity trigger and its mates, then do ALTER TABLE " "ADD CONSTRAINT." msgstr "" -#: utils/adt/ri_triggers.c:2887 utils/adt/ri_triggers.c:2897 -#: utils/adt/ri_triggers.c:3335 +#: utils/adt/ri_triggers.c:2892 utils/adt/ri_triggers.c:2902 +#: utils/adt/ri_triggers.c:3348 #, c-format msgid "" "table \"%s\" does not have column \"%s\" referenced by constraint \"%s\"" msgstr "表 \"%1$s\" 没有通过约束 \"%3$s\" 的字段 \"%2$s\" 关联" -#: utils/adt/ri_triggers.c:2917 +#: utils/adt/ri_triggers.c:2922 #, c-format msgid "function \"%s\" was not called by trigger manager" msgstr "函数 \"%s\" 没有被触发器管理器调用" -#: utils/adt/ri_triggers.c:2926 +#: utils/adt/ri_triggers.c:2931 #, c-format msgid "function \"%s\" must be fired AFTER ROW" msgstr "" -#: utils/adt/ri_triggers.c:2934 +#: utils/adt/ri_triggers.c:2939 #, c-format msgid "function \"%s\" must be fired for INSERT" msgstr "" -#: utils/adt/ri_triggers.c:2940 +#: utils/adt/ri_triggers.c:2945 #, c-format msgid "function \"%s\" must be fired for UPDATE" msgstr "" -#: utils/adt/ri_triggers.c:2947 +#: utils/adt/ri_triggers.c:2952 #, c-format msgid "function \"%s\" must be fired for INSERT or UPDATE" msgstr "" -#: utils/adt/ri_triggers.c:2954 +#: utils/adt/ri_triggers.c:2959 #, c-format msgid "function \"%s\" must be fired for DELETE" msgstr "" -#: utils/adt/ri_triggers.c:3203 +#: utils/adt/ri_triggers.c:3216 #, c-format msgid "" "referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave " "unexpected result" msgstr "" -#: utils/adt/ri_triggers.c:3207 +#: utils/adt/ri_triggers.c:3220 msgid "This is most likely due to a rule having rewritten the query." msgstr "" -#: utils/adt/ri_triggers.c:3238 +#: utils/adt/ri_triggers.c:3251 #, c-format msgid "No rows were found in \"%s\"." msgstr "在 \"%s\" 没有发现行." -#: utils/adt/ri_triggers.c:3275 +#: utils/adt/ri_triggers.c:3288 #, c-format msgid "Key (%s)=(%s) is not present in table \"%s\"." msgstr "" -#: utils/adt/ri_triggers.c:3281 +#: utils/adt/ri_triggers.c:3294 #, c-format msgid "" "update or delete on \"%s\" violates foreign key constraint \"%s\" on \"%s\"" msgstr "在 \"%1$s\" 上更新或删除违反了在 \"%3$s\" 上的外键约束 \"%2$s\"" -#: utils/adt/ri_triggers.c:3284 +#: utils/adt/ri_triggers.c:3297 #, c-format msgid "Key (%s)=(%s) is still referenced from table \"%s\"." msgstr "" -#: utils/adt/ri_triggers.c:3629 utils/adt/arrayfuncs.c:2562 +#: utils/adt/ri_triggers.c:3642 utils/adt/arrayfuncs.c:2581 #: parser/parse_oper.c:185 #, c-format msgid "could not identify an equality operator for type %s" @@ -2016,18 +2049,18 @@ msgstr "" msgid "value too long for type character varying(%d)" msgstr "" -#: utils/adt/ruleutils.c:1300 commands/comment.c:404 commands/tablecmds.c:3068 -#: commands/tablecmds.c:3161 commands/tablecmds.c:3213 -#: commands/tablecmds.c:3309 commands/tablecmds.c:3370 -#: commands/tablecmds.c:3436 commands/tablecmds.c:4562 -#: commands/tablecmds.c:4699 parser/parse_relation.c:1647 -#: parser/parse_relation.c:1705 parser/parse_relation.c:1919 +#: utils/adt/ruleutils.c:1257 commands/comment.c:404 commands/tablecmds.c:3100 +#: commands/tablecmds.c:3193 commands/tablecmds.c:3245 +#: commands/tablecmds.c:3341 commands/tablecmds.c:3402 +#: commands/tablecmds.c:3468 commands/tablecmds.c:4608 +#: commands/tablecmds.c:4745 parser/parse_relation.c:1641 +#: parser/parse_relation.c:1700 parser/parse_relation.c:1913 #: parser/parse_type.c:94 #, c-format msgid "column \"%s\" of relation \"%s\" does not exist" msgstr "关系 \"%2$s\" 的 \"%1$s\" 字段不存在" -#: utils/adt/ruleutils.c:1719 +#: utils/adt/ruleutils.c:1615 #, c-format msgid "rule \"%s\" has unsupported event type %d" msgstr "规则 \"%s\" 不支持事件类型 %d" @@ -2063,42 +2096,43 @@ msgstr "无效的结束顺序" msgid "invalid input syntax for type bytea" msgstr "无效的 bytea 类型输入语法" -#: utils/adt/datetime.c:1313 utils/adt/datetime.c:2088 utils/adt/date.c:87 +#: utils/adt/datetime.c:1313 utils/adt/datetime.c:2078 utils/adt/date.c:87 msgid "date/time value \"current\" is no longer supported" msgstr "日期/时间值 \"current\" 不再被支持了" -#: utils/adt/datetime.c:1495 utils/adt/datetime.c:2370 -#: utils/adt/formatting.c:3178 +#: utils/adt/datetime.c:1495 utils/adt/datetime.c:2360 +#: utils/adt/formatting.c:3181 #, c-format msgid "inconsistent use of year %04d and \"BC\"" msgstr "" -#: utils/adt/datetime.c:3315 utils/adt/datetime.c:3322 +#: utils/adt/datetime.c:3305 utils/adt/datetime.c:3312 #, c-format msgid "date/time field value out of range: \"%s\"" msgstr "日期/时间值超出范围: \"%s\"" -#: utils/adt/datetime.c:3324 +#: utils/adt/datetime.c:3314 msgid "Perhaps you need a different \"datestyle\" setting." msgstr "也许你需要不同的 \"datesytle\" 设置." -#: utils/adt/datetime.c:3329 +#: utils/adt/datetime.c:3319 #, c-format msgid "interval field value out of range: \"%s\"" msgstr "" -#: utils/adt/datetime.c:3335 +#: utils/adt/datetime.c:3325 #, c-format msgid "time zone displacement out of range: \"%s\"" msgstr "" #. translator: first %s is inet or cidr -#: utils/adt/datetime.c:3342 utils/adt/network.c:93 +#: utils/adt/datetime.c:3332 utils/adt/network.c:93 #, c-format msgid "invalid input syntax for type %s: \"%s\"" msgstr "无效的类型 %s 输入语法: \"%s\"" #: utils/adt/numutils.c:74 utils/adt/numutils.c:84 utils/adt/numutils.c:97 +#: utils/adt/int8.c:101 utils/adt/int8.c:136 #, c-format msgid "invalid input syntax for integer: \"%s\"" msgstr "无效的整数类型输入语法: \"%s\"" @@ -2110,8 +2144,8 @@ msgstr "值 \"%s\" 超出整数类型范围" #: utils/adt/numutils.c:117 #, c-format -msgid "value \"%s\" is out of range for type shortint" -msgstr "值 \"%s\" 超出短整数类型范围" +msgid "value \"%s\" is out of range for type smallint" +msgstr "值 \"%s\" 超出 smallint 类型范围" #: utils/adt/numutils.c:123 #, c-format @@ -2195,6 +2229,10 @@ msgstr "无效的货币类型输入语法: \"%s\"" msgid "invalid input syntax for type boolean: \"%s\"" msgstr "无效的布尔类型输入语法: \"%s\"" +#: utils/adt/char.c:177 +msgid "\"char\" out of range" +msgstr "\"char\" 超出范围" + #: utils/adt/date.c:802 msgid "cannot convert reserved abstime value to date" msgstr "不能转换保留 abstime 值为 date" @@ -2229,12 +2267,12 @@ msgstr "\"time with time zone\" 单位 \"%s\" 不被认可" msgid "\"interval\" time zone \"%s\" not valid" msgstr "" -#: utils/adt/int8.c:96 utils/adt/int8.c:127 +#: utils/adt/int8.c:117 #, c-format -msgid "invalid input syntax for type bigint: \"%s\"" -msgstr "无效的 bigint 类型输入语法: \"%s\"" +msgid "value \"%s\" is out of range for type bigint" +msgstr "值 \"%s\" 超出 bigint 类型范围" -#: utils/adt/int8.c:896 +#: utils/adt/int8.c:1066 msgid "OID out of range" msgstr "OID 超出范围" @@ -2409,16 +2447,16 @@ msgstr "无法发送信号到进程 %d: %m" msgid "global tablespace never has databases" msgstr "全局表空间没有数据库" -#: utils/adt/misc.c:174 access/transam/slru.c:930 commands/tablespace.c:529 -#: commands/tablespace.c:694 +#: utils/adt/misc.c:174 access/transam/slru.c:930 commands/tablespace.c:525 +#: commands/tablespace.c:692 ../port/copydir.c:55 #, c-format msgid "could not open directory \"%s\": %m" msgstr "无法打开目录 \"%s\": %m" #: utils/adt/misc.c:177 #, c-format -msgid "%u is not a tablespace oid" -msgstr "%u 不是一个表空间 oid" +msgid "%u is not a tablespace OID" +msgstr "%u 不是一个表空间 OID" #: utils/adt/network.c:105 #, c-format @@ -2460,11 +2498,11 @@ msgstr "无效的外部 \"cidr\" 值" msgid "invalid mask length: %d" msgstr "无效掩码长度: %d" -#: utils/adt/selfuncs.c:3369 utils/adt/selfuncs.c:3756 +#: utils/adt/selfuncs.c:3370 utils/adt/selfuncs.c:3757 msgid "case insensitive matching not supported on type bytea" msgstr "" -#: utils/adt/selfuncs.c:3474 utils/adt/selfuncs.c:3917 +#: utils/adt/selfuncs.c:3475 utils/adt/selfuncs.c:3918 msgid "regular-expression matching not supported on type bytea" msgstr "在 bytea 类型上不支持正则表达式匹配" @@ -2473,77 +2511,77 @@ msgstr "在 bytea 类型上不支持正则表达式匹配" msgid "encoding conversion from %s to ASCII not supported" msgstr "编码转换不支持从 %s 到 ASCII 的转换" -#: utils/adt/formatting.c:983 +#: utils/adt/formatting.c:986 msgid "\"9\" must be ahead of \"PR\"" msgstr "\"9\" 必须在 \"PR\" 之前" -#: utils/adt/formatting.c:1002 +#: utils/adt/formatting.c:1005 msgid "\"0\" must be ahead of \"PR\"" msgstr "\"0\" 必须在 \"PR\" 之前" -#: utils/adt/formatting.c:1031 +#: utils/adt/formatting.c:1034 msgid "multiple decimal points" msgstr "多个小数点" -#: utils/adt/formatting.c:1038 utils/adt/formatting.c:1143 +#: utils/adt/formatting.c:1041 utils/adt/formatting.c:1146 msgid "cannot use \"V\" and decimal point together" msgstr "不能 \"V\" 和小数点一起使用" -#: utils/adt/formatting.c:1053 +#: utils/adt/formatting.c:1056 msgid "not unique \"S\"" msgstr "不是唯一的 \"S\"" -#: utils/adt/formatting.c:1060 +#: utils/adt/formatting.c:1063 msgid "cannot use \"S\" and \"PL\"/\"MI\"/\"SG\"/\"PR\" together" msgstr "\"S\" 不可以和 \"PL\"/\"MI\"/\"SG\"/\"PR\" 一起使用" -#: utils/adt/formatting.c:1084 +#: utils/adt/formatting.c:1087 msgid "cannot use \"S\" and \"MI\" together" msgstr "\"S\" 不可以和 \"MI\" 一起使用" -#: utils/adt/formatting.c:1097 +#: utils/adt/formatting.c:1100 msgid "cannot use \"S\" and \"PL\" together" msgstr "\"S\" 不可以和 \"PL\" 一起使用" -#: utils/adt/formatting.c:1110 +#: utils/adt/formatting.c:1113 msgid "cannot use \"S\" and \"SG\" together" msgstr "\"S\" 不可以和 \"SG\" 一起使用" -#: utils/adt/formatting.c:1122 +#: utils/adt/formatting.c:1125 msgid "cannot use \"PR\" and \"S\"/\"PL\"/\"MI\"/\"SG\" together" msgstr "\"PR\" 不可以和 \"S\"/\"PL\"/\"MI\"/\"SG\" 一起使用" -#: utils/adt/formatting.c:1152 +#: utils/adt/formatting.c:1155 msgid "\"E\" is not supported" msgstr "不支持 \"E\"" -#: utils/adt/formatting.c:1423 +#: utils/adt/formatting.c:1426 #, c-format msgid "\"%s\" is not a number" msgstr "\"%s\" 不是一个数字" -#: utils/adt/formatting.c:1686 +#: utils/adt/formatting.c:1689 msgid "invalid AM/PM string" msgstr "无效的 AM/PM 字符串" -#: utils/adt/formatting.c:2032 +#: utils/adt/formatting.c:2035 msgid "\"TZ\"/\"tz\" not supported" msgstr "不支持 \"TZ\"/\"tz\"" -#: utils/adt/formatting.c:2042 +#: utils/adt/formatting.c:2045 #, c-format msgid "invalid value for %s" msgstr "%s 的无效数值" -#: utils/adt/formatting.c:3139 +#: utils/adt/formatting.c:3142 msgid "AM/PM hour must be between 1 and 12" msgstr "AM/PM 小时必需在 1 到 12 之间" -#: utils/adt/formatting.c:3213 +#: utils/adt/formatting.c:3216 msgid "cannot calculate day of year without year information" msgstr "没有年份信息无法计算年的天数" -#: utils/adt/formatting.c:3992 +#: utils/adt/formatting.c:4082 msgid "\"RN\" not supported" msgstr "不支持 \"RN\"" @@ -2591,130 +2629,130 @@ msgstr "" msgid "invalid array element type OID: %u" msgstr "无效的数组元素类型 OID: %u" -#: utils/adt/array_userfuncs.c:358 utils/adt/arrayfuncs.c:1130 -#: utils/adt/arrayfuncs.c:2398 +#: utils/adt/array_userfuncs.c:358 utils/adt/arrayfuncs.c:1149 +#: utils/adt/arrayfuncs.c:2417 #, c-format msgid "invalid number of dimensions: %d" msgstr "无效的大小值: %d" -#: utils/adt/array_userfuncs.c:362 utils/adt/arrayfuncs.c:215 -#: utils/adt/arrayfuncs.c:470 utils/adt/arrayfuncs.c:1134 -#: utils/adt/arrayfuncs.c:2402 executor/execQual.c:257 executor/execQual.c:285 -#: executor/execQual.c:2030 +#: utils/adt/array_userfuncs.c:362 utils/adt/arrayfuncs.c:216 +#: utils/adt/arrayfuncs.c:472 utils/adt/arrayfuncs.c:1153 +#: utils/adt/arrayfuncs.c:2421 executor/execQual.c:257 executor/execQual.c:285 +#: executor/execQual.c:2065 #, c-format msgid "number of array dimensions (%d) exceeds the maximum allowed (%d)" msgstr "" -#: utils/adt/arrayfuncs.c:222 utils/adt/arrayfuncs.c:234 +#: utils/adt/arrayfuncs.c:223 utils/adt/arrayfuncs.c:235 msgid "missing dimension value" msgstr "缺少大小值" -#: utils/adt/arrayfuncs.c:244 +#: utils/adt/arrayfuncs.c:245 msgid "missing \"]\" in array dimensions" msgstr "数组声明缺少 ']'" -#: utils/adt/arrayfuncs.c:252 +#: utils/adt/arrayfuncs.c:253 msgid "upper bound cannot be less than lower bound" msgstr "上限不能小于底限" -#: utils/adt/arrayfuncs.c:264 utils/adt/arrayfuncs.c:290 +#: utils/adt/arrayfuncs.c:265 utils/adt/arrayfuncs.c:291 msgid "array value must start with \"{\" or dimension information" msgstr "数组值必须以 \"{\" 开始或者维数信息" -#: utils/adt/arrayfuncs.c:278 +#: utils/adt/arrayfuncs.c:279 msgid "missing assignment operator" msgstr "缺少指定的操作符" -#: utils/adt/arrayfuncs.c:295 utils/adt/arrayfuncs.c:301 +#: utils/adt/arrayfuncs.c:296 utils/adt/arrayfuncs.c:302 msgid "array dimensions incompatible with array literal" msgstr "" -#: utils/adt/arrayfuncs.c:327 +#: utils/adt/arrayfuncs.c:328 msgid "missing left brace" msgstr "缺少左边的大括号" -#: utils/adt/arrayfuncs.c:407 utils/adt/arrayfuncs.c:422 -#: utils/adt/arrayfuncs.c:431 utils/adt/arrayfuncs.c:445 -#: utils/adt/arrayfuncs.c:465 utils/adt/arrayfuncs.c:493 -#: utils/adt/arrayfuncs.c:498 utils/adt/arrayfuncs.c:538 -#: utils/adt/arrayfuncs.c:559 utils/adt/arrayfuncs.c:578 -#: utils/adt/arrayfuncs.c:657 utils/adt/arrayfuncs.c:669 -#: utils/adt/arrayfuncs.c:698 utils/adt/arrayfuncs.c:713 -#: utils/adt/arrayfuncs.c:751 +#: utils/adt/arrayfuncs.c:409 utils/adt/arrayfuncs.c:424 +#: utils/adt/arrayfuncs.c:433 utils/adt/arrayfuncs.c:447 +#: utils/adt/arrayfuncs.c:467 utils/adt/arrayfuncs.c:495 +#: utils/adt/arrayfuncs.c:500 utils/adt/arrayfuncs.c:540 +#: utils/adt/arrayfuncs.c:561 utils/adt/arrayfuncs.c:580 +#: utils/adt/arrayfuncs.c:673 utils/adt/arrayfuncs.c:682 +#: utils/adt/arrayfuncs.c:710 utils/adt/arrayfuncs.c:725 +#: utils/adt/arrayfuncs.c:778 #, c-format msgid "malformed array literal: \"%s\"" msgstr "" -#: utils/adt/arrayfuncs.c:505 executor/execQual.c:2050 +#: utils/adt/arrayfuncs.c:507 executor/execQual.c:2085 msgid "" "multidimensional arrays must have array expressions with matching dimensions" msgstr "" -#: utils/adt/arrayfuncs.c:1141 +#: utils/adt/arrayfuncs.c:1160 msgid "invalid array flags" msgstr "无效的数组标记" -#: utils/adt/arrayfuncs.c:1149 +#: utils/adt/arrayfuncs.c:1168 msgid "wrong element type" msgstr "错误的元素类型" -#: utils/adt/arrayfuncs.c:1192 utils/cache/lsyscache.c:1756 +#: utils/adt/arrayfuncs.c:1211 utils/cache/lsyscache.c:1764 #, c-format msgid "no binary input function available for type %s" msgstr "没有类型 %s 的有效二进制输入函数" -#: utils/adt/arrayfuncs.c:1285 +#: utils/adt/arrayfuncs.c:1304 #, c-format msgid "improper binary format in array element %d" msgstr "数组元素 %d 为不正确的二进制格式" -#: utils/adt/arrayfuncs.c:1364 utils/cache/lsyscache.c:1792 +#: utils/adt/arrayfuncs.c:1383 utils/cache/lsyscache.c:1800 #, c-format msgid "no binary output function available for type %s" msgstr "没有类型 %s 的有效二进制输出函数" -#: utils/adt/arrayfuncs.c:1638 +#: utils/adt/arrayfuncs.c:1657 msgid "slices of fixed-length arrays not implemented" msgstr "" -#: utils/adt/arrayfuncs.c:1776 utils/adt/arrayfuncs.c:1781 -#: utils/adt/arrayfuncs.c:1821 utils/adt/arrayfuncs.c:1843 -#: utils/adt/arrayfuncs.c:1855 utils/adt/arrayfuncs.c:2016 -#: utils/adt/arrayfuncs.c:2033 utils/adt/arrayfuncs.c:2044 -#: utils/adt/arrayfuncs.c:2053 utils/adt/arrayfuncs.c:2064 +#: utils/adt/arrayfuncs.c:1795 utils/adt/arrayfuncs.c:1800 +#: utils/adt/arrayfuncs.c:1840 utils/adt/arrayfuncs.c:1862 +#: utils/adt/arrayfuncs.c:1874 utils/adt/arrayfuncs.c:2035 +#: utils/adt/arrayfuncs.c:2052 utils/adt/arrayfuncs.c:2063 +#: utils/adt/arrayfuncs.c:2072 utils/adt/arrayfuncs.c:2083 msgid "invalid array subscripts" msgstr "无效的数组下标" -#: utils/adt/arrayfuncs.c:1972 +#: utils/adt/arrayfuncs.c:1991 msgid "updates on slices of fixed-length arrays not implemented" msgstr "" -#: utils/adt/arrayfuncs.c:2007 utils/adt/arrayfuncs.c:2076 +#: utils/adt/arrayfuncs.c:2026 utils/adt/arrayfuncs.c:2095 msgid "source array too small" msgstr "源数组太小" -#: utils/adt/arrayfuncs.c:2300 utils/adt/arrayfuncs.c:3302 +#: utils/adt/arrayfuncs.c:2319 utils/adt/arrayfuncs.c:3321 msgid "null array elements not supported" msgstr "不支持空数组元素" -#: utils/adt/arrayfuncs.c:2540 utils/adt/arrayfuncs.c:2695 +#: utils/adt/arrayfuncs.c:2559 utils/adt/arrayfuncs.c:2714 msgid "cannot compare arrays of different element types" msgstr "无法比较不同元素类型的数组" -#: utils/adt/arrayfuncs.c:2712 +#: utils/adt/arrayfuncs.c:2731 #, c-format msgid "could not identify a comparison function for type %s" msgstr "无法为类型 %s 确认一个比对函数" -#: utils/adt/arrayfuncs.c:3111 +#: utils/adt/arrayfuncs.c:3130 msgid "could not determine target array type" msgstr "无法确定目标数组类型" -#: utils/adt/arrayfuncs.c:3117 +#: utils/adt/arrayfuncs.c:3136 msgid "target type is not an array" msgstr "目标类型不是一个数组" -#: utils/adt/arrayfuncs.c:3129 +#: utils/adt/arrayfuncs.c:3148 msgid "array coercion to domain type elements not currently supported" msgstr "" @@ -2799,13 +2837,12 @@ msgstr "错误的数据类型: %u, 期望为 %u" msgid "improper binary format in record column %d" msgstr "在记录字段 %d 为不正确的二进制格式" -#: utils/adt/pgstatfuncs.c:191 utils/fmgr/funcapi.c:39 executor/execQual.c:866 -#: executor/execQual.c:910 executor/execQual.c:1086 executor/execQual.c:1184 -#: executor/execQual.c:3410 executor/functions.c:565 executor/functions.c:604 -msgid "set-valued function called in context that cannot accept a set" -msgstr "" +#: utils/adt/regexp.c:155 utils/adt/regexp.c:241 +#, c-format +msgid "regular expression failed: %s" +msgstr "正则表达式失败: %s" -#: utils/adt/regexp.c:178 +#: utils/adt/regexp.c:187 #, c-format msgid "invalid regular expression: %s" msgstr "无效的正则表达式: %s" @@ -2826,11 +2863,11 @@ msgstr "操作符不存在: %s" msgid "more than one operator named %s" msgstr "多个操作符名为 %s" -#: utils/adt/regproc.c:639 gram.y:3502 +#: utils/adt/regproc.c:639 gram.y:3491 msgid "missing argument" msgstr "缺少参数" -#: utils/adt/regproc.c:640 gram.y:3503 +#: utils/adt/regproc.c:640 gram.y:3492 msgid "Use NONE to denote the missing argument of a unary operator." msgstr "使用 NONE 表示一元操作符缺少的参数." @@ -2901,63 +2938,79 @@ msgstr "内部函数 \"%s\" 不在内部查找表中" msgid "unrecognized API version %d reported by info function \"%s\"" msgstr "" -#: utils/fmgr/fmgr.c:764 utils/fmgr/fmgr.c:1628 +#: utils/fmgr/fmgr.c:760 utils/fmgr/fmgr.c:1635 #, c-format msgid "function %u has too many arguments (%d, maximum is %d)" msgstr "函数 %u 参数太多 (%d, 最大个数为 %d)" -#: utils/init/miscinit.c:309 utils/cache/lsyscache.c:2064 -#: commands/variable.c:662 commands/user.c:896 commands/user.c:1009 -#: commands/user.c:1101 commands/user.c:1230 +#: utils/fmgr/funcapi.c:39 executor/execQual.c:866 executor/execQual.c:910 +#: executor/execQual.c:1086 executor/execQual.c:1211 executor/execQual.c:3445 +#: executor/functions.c:666 executor/functions.c:705 +msgid "set-valued function called in context that cannot accept a set" +msgstr "" + +#: utils/init/miscinit.c:335 utils/cache/lsyscache.c:2044 +#: commands/variable.c:664 commands/user.c:899 commands/user.c:1012 +#: commands/user.c:1104 commands/user.c:1233 #, c-format msgid "user \"%s\" does not exist" msgstr "用户 \"%s\" 不存在" -#: utils/init/miscinit.c:377 +#: utils/init/miscinit.c:403 msgid "permission denied to set session authorization" msgstr "设置会话认证权限不允许" -#: utils/init/miscinit.c:403 +#: utils/init/miscinit.c:429 #, c-format msgid "invalid user ID: %d" msgstr "非法用户 ID: %d" -#: utils/init/miscinit.c:493 +#: utils/init/miscinit.c:519 #, c-format msgid "could not create lock file \"%s\": %m" msgstr "无法创建锁文件 \"%s\": %m" -#: utils/init/miscinit.c:507 +#: utils/init/miscinit.c:533 #, c-format msgid "could not open lock file \"%s\": %m" msgstr "无法打开锁文件 \"%s\": %m" -#: utils/init/miscinit.c:513 +#: utils/init/miscinit.c:539 #, c-format msgid "could not read lock file \"%s\": %m" msgstr "无法读取锁文件 \"%s\": %m" -#: utils/init/miscinit.c:544 +#: utils/init/miscinit.c:589 #, c-format msgid "lock file \"%s\" already exists" msgstr "锁文件 \"%s\" 已经存在" -#: utils/init/miscinit.c:547 +#: utils/init/miscinit.c:593 +#, c-format +msgid "Is another postgres (PID %d) running in data directory \"%s\"?" +msgstr "是否其它 postgres (PID %d) 运行在数据目录 \"%s\"?" + +#: utils/init/miscinit.c:595 #, c-format -msgid "Is another %s (PID %d) running in data directory \"%s\"?" -msgstr "是否其它 %s (PID %d) 运行在数据目录 \"%s\"?" +msgid "Is another postmaster (PID %d) running in data directory \"%s\"?" +msgstr "是否其它 postmaster (PID %d) 运行在数据目录 \"%s\"?" -#: utils/init/miscinit.c:550 +#: utils/init/miscinit.c:598 #, c-format -msgid "Is another %s (PID %d) using socket file \"%s\"?" -msgstr "是否其它 %s (PID %d) 使用套接字文件 \"%s\"?" +msgid "Is another postgres (PID %d) using socket file \"%s\"?" +msgstr "是否其它 postgres (PID %d) 使用套接字文件 \"%s\"?" -#: utils/init/miscinit.c:579 +#: utils/init/miscinit.c:600 +#, c-format +msgid "Is another postmaster (PID %d) using socket file \"%s\"?" +msgstr "是否其它 postmaster (PID %d) 使用套接字文件 \"%s\"?" + +#: utils/init/miscinit.c:628 #, c-format msgid "pre-existing shared memory block (key %lu, ID %lu) is still in use" msgstr "先前存在的共享内存块 (key %lu, ID %lu) 仍在使用中" -#: utils/init/miscinit.c:582 +#: utils/init/miscinit.c:631 #, c-format msgid "" "If you're sure there are no old server processes still running, remove the " @@ -2967,81 +3020,81 @@ msgstr "" "如果你确认没有旧的服务器进程在运行, 用命令 \"ipcrm\" 删除共享内存块,或者只删" "除文件 \"%s\"." -#: utils/init/miscinit.c:599 +#: utils/init/miscinit.c:648 #, c-format msgid "could not remove old lock file \"%s\": %m" msgstr "无法删除旧的锁文件 \"%s\": %m" -#: utils/init/miscinit.c:601 +#: utils/init/miscinit.c:650 msgid "" "The file seems accidentally left over, but it could not be removed. Please " "remove the file by hand and try again." msgstr "文件像是意外留下的, 但是不能删除它. 请手工删除此文件, 然后再重试一次." -#: utils/init/miscinit.c:623 utils/init/miscinit.c:633 +#: utils/init/miscinit.c:672 utils/init/miscinit.c:682 #, c-format msgid "could not write lock file \"%s\": %m" msgstr "无法写入锁文件 \"%s\": %m" -#: utils/init/miscinit.c:743 utils/misc/guc.c:4891 +#: utils/init/miscinit.c:792 utils/misc/guc.c:4938 #, c-format msgid "could not read from file \"%s\": %m" msgstr "无法读取文件 \"%s\": %m" -#: utils/init/miscinit.c:783 utils/init/miscinit.c:792 utils/misc/guc.c:4751 -#: utils/misc/guc.c:4815 access/transam/xlog.c:1556 access/transam/xlog.c:1681 -#: access/transam/xlog.c:2967 access/transam/xlog.c:3005 -#: commands/tablespace.c:668 commands/tablespace.c:674 commands/copy.c:1117 -#: postmaster/postmaster.c:3495 +#: utils/init/miscinit.c:832 utils/init/miscinit.c:841 utils/misc/guc.c:4798 +#: utils/misc/guc.c:4862 access/transam/xlog.c:1556 access/transam/xlog.c:1680 +#: access/transam/xlog.c:2975 access/transam/xlog.c:3013 +#: commands/tablespace.c:664 commands/tablespace.c:670 commands/copy.c:1117 +#: postmaster/postmaster.c:2917 postmaster/postmaster.c:2927 #, c-format msgid "could not write to file \"%s\": %m" msgstr "无法写入文件 \"%s\": %m" -#: utils/init/miscinit.c:834 utils/init/miscinit.c:847 +#: utils/init/miscinit.c:883 utils/init/miscinit.c:896 #, c-format msgid "\"%s\" is not a valid data directory" msgstr "\"%s\" 不是一个有效的数据目录" -#: utils/init/miscinit.c:836 +#: utils/init/miscinit.c:885 #, c-format msgid "File \"%s\" is missing." msgstr "文件 \"%s\" 丢失." -#: utils/init/miscinit.c:849 +#: utils/init/miscinit.c:898 #, c-format msgid "File \"%s\" does not contain valid data." msgstr "文件 \"%s\" 没有包含有效数据." -#: utils/init/miscinit.c:851 +#: utils/init/miscinit.c:900 msgid "You may need to initdb." msgstr "你需要初始化数据库 (initdb)." -#: utils/init/miscinit.c:858 access/transam/xlog.c:3191 -#: access/transam/xlog.c:3221 access/transam/xlog.c:3228 -#: access/transam/xlog.c:3235 access/transam/xlog.c:3242 -#: access/transam/xlog.c:3249 access/transam/xlog.c:3256 -#: access/transam/xlog.c:3265 access/transam/xlog.c:3272 -#: access/transam/xlog.c:3280 +#: utils/init/miscinit.c:907 access/transam/xlog.c:3199 +#: access/transam/xlog.c:3229 access/transam/xlog.c:3236 +#: access/transam/xlog.c:3243 access/transam/xlog.c:3250 +#: access/transam/xlog.c:3257 access/transam/xlog.c:3264 +#: access/transam/xlog.c:3273 access/transam/xlog.c:3280 +#: access/transam/xlog.c:3288 msgid "database files are incompatible with server" msgstr "数据库文件和服务器不兼容" -#: utils/init/miscinit.c:859 +#: utils/init/miscinit.c:908 #, c-format msgid "" "The data directory was initialized by PostgreSQL version %ld.%ld, which is " "not compatible with this version %s." msgstr "数据目录是以 PostgreSQL 版本 %ld.%ld 初始化的, 它于当前版本 %s 不兼容." -#: utils/init/miscinit.c:901 +#: utils/init/miscinit.c:950 msgid "invalid list syntax for parameter \"preload_libraries\"" msgstr "" -#: utils/init/miscinit.c:947 +#: utils/init/miscinit.c:996 #, c-format msgid "preloaded library \"%s\" with initialization function \"%s\"" msgstr "预装入带初始化函数 \"%s\" 库 \"%s\"" -#: utils/init/miscinit.c:951 +#: utils/init/miscinit.c:1000 #, c-format msgid "preloaded library \"%s\"" msgstr "预装入库 \"%s\"" @@ -3056,235 +3109,238 @@ msgstr "数据库 \"%s\", OID %u, 从 pg_database 消失了" msgid "database \"%s\" is not currently accepting connections" msgstr "数据库 \"%s\" 当前不接受联接" -#: utils/init/postinit.c:278 +#: utils/init/postinit.c:285 #, c-format msgid "The database subdirectory \"%s\" is missing." msgstr "数据库子目录 \"%s\" 丢失." -#: utils/init/postinit.c:283 +#: utils/init/postinit.c:290 #, c-format msgid "could not access directory \"%s\": %m" msgstr "无法访问目录 \"%s\": %m" -#: utils/init/postinit.c:292 +#: utils/init/postinit.c:299 #, c-format msgid "could not change directory to \"%s\": %m" msgstr "无法跳转到目录 \"%s\" 中: %m" -#: utils/init/postinit.c:375 +#: utils/init/postinit.c:382 msgid "no users are defined in this database system" msgstr "当前数据库系统中没有定义用户" -#: utils/init/postinit.c:376 +#: utils/init/postinit.c:383 #, c-format msgid "" "You should immediately run CREATE USER \"%s\" WITH SYSID %d CREATEUSER;." msgstr "你应该立即运行 CREATE USER \"%s\" WITH SYSID %d CREATEUSER;." -#: utils/init/postinit.c:412 +#: utils/init/postinit.c:423 msgid "connection limit exceeded for non-superusers" msgstr "超过了非超级用户的联接限制" -#: guc-file.l:162 -#, c-format -msgid "could not access configuration file \"%s\": %m" -msgstr "无法处理配置文件 \"%s\": %m" - -#: guc-file.l:306 +#: guc-file.l:272 #, c-format msgid "syntax error in file \"%s\" line %u, near end of line" msgstr "在文件 \"%s\" 第 %u 行, 行尾附近语法错误" -#: guc-file.l:311 +#: guc-file.l:277 #, c-format msgid "syntax error in file \"%s\" line %u, near token \"%s\"" msgstr "在文件 \"%s\" 第 %u 行, 记号 \"%s\" 附近语法错误" -#: utils/misc/guc.c:233 +#: utils/misc/guc.c:234 msgid "Ungrouped" msgstr "取消组" -#: utils/misc/guc.c:235 +#: utils/misc/guc.c:236 +msgid "File Locations" +msgstr "" + +#: utils/misc/guc.c:238 msgid "Connections and Authentication" msgstr "联接和认证" -#: utils/misc/guc.c:237 +#: utils/misc/guc.c:240 msgid "Connections and Authentication / Connection Settings" msgstr "联接和认证 / 联接设置" -#: utils/misc/guc.c:239 +#: utils/misc/guc.c:242 msgid "Connections and Authentication / Security and Authentication" msgstr "联接和认证 / 安全和认证" -#: utils/misc/guc.c:241 +#: utils/misc/guc.c:244 msgid "Resource Usage" msgstr "资源使用" -#: utils/misc/guc.c:243 +#: utils/misc/guc.c:246 msgid "Resource Usage / Memory" msgstr "资源使用 / 内存" -#: utils/misc/guc.c:245 +#: utils/misc/guc.c:248 msgid "Resource Usage / Free Space Map" msgstr "资源使用 / 空闲空间" -#: utils/misc/guc.c:247 +#: utils/misc/guc.c:250 msgid "Resource Usage / Kernel Resources" msgstr "资源使用 / 内核资源" -#: utils/misc/guc.c:249 +#: utils/misc/guc.c:252 msgid "Write-Ahead Log" msgstr "Write-Ahead 日志" -#: utils/misc/guc.c:251 +#: utils/misc/guc.c:254 msgid "Write-Ahead Log / Settings" msgstr "Write-Ahead 日志 / 设置" -#: utils/misc/guc.c:253 +#: utils/misc/guc.c:256 msgid "Write-Ahead Log / Checkpoints" msgstr "Write-Ahead 日志 / Checkpoints" -#: utils/misc/guc.c:255 +#: utils/misc/guc.c:258 msgid "Query Tuning" msgstr "查询调整" -#: utils/misc/guc.c:257 +#: utils/misc/guc.c:260 msgid "Query Tuning / Planner Method Configuration" msgstr "查询调整 / 规划器方法配置" -#: utils/misc/guc.c:259 +#: utils/misc/guc.c:262 msgid "Query Tuning / Planner Cost Constants" msgstr "查询调整 / Planner Cost Constants" -#: utils/misc/guc.c:261 +#: utils/misc/guc.c:264 msgid "Query Tuning / Genetic Query Optimizer" msgstr "查询调整 / 基因查询优化" -#: utils/misc/guc.c:263 +#: utils/misc/guc.c:266 msgid "Query Tuning / Other Planner Options" msgstr "查询调整 / 其它规划器选项" -#: utils/misc/guc.c:265 +#: utils/misc/guc.c:268 msgid "Reporting and Logging" msgstr "报告和日志" -#: utils/misc/guc.c:267 +#: utils/misc/guc.c:270 msgid "Reporting and Logging / Where to Log" msgstr "报告和日志 / 日志位置" -#: utils/misc/guc.c:269 +#: utils/misc/guc.c:272 msgid "Reporting and Logging / When to Log" msgstr "报告和日志 / 日志时间" -#: utils/misc/guc.c:271 +#: utils/misc/guc.c:274 msgid "Reporting and Logging / What to Log" msgstr "报告和日志 / 日志内容" -#: utils/misc/guc.c:273 +#: utils/misc/guc.c:276 msgid "Statistics" msgstr "统计信息" -#: utils/misc/guc.c:275 +#: utils/misc/guc.c:278 msgid "Statistics / Monitoring" msgstr "统计信息 / 监控" -#: utils/misc/guc.c:277 +#: utils/misc/guc.c:280 msgid "Statistics / Query and Index Statistics Collector" msgstr "统计信息 / 查询和索引统计收集器" -#: utils/misc/guc.c:279 +#: utils/misc/guc.c:282 msgid "Client Connection Defaults" msgstr "客户端联接默认" -#: utils/misc/guc.c:281 +#: utils/misc/guc.c:284 msgid "Client Connection Defaults / Statement Behavior" msgstr "客户端联接默认 / 语句动作" -#: utils/misc/guc.c:283 +#: utils/misc/guc.c:286 msgid "Client Connection Defaults / Locale and Formatting" msgstr "客户端联接默认 / 本地化和格式化" -#: utils/misc/guc.c:285 +#: utils/misc/guc.c:288 msgid "Client Connection Defaults / Other Defaults" msgstr "客户端联接默认 / 其它默认" -#: utils/misc/guc.c:287 +#: utils/misc/guc.c:290 msgid "Lock Management" msgstr "锁管理" -#: utils/misc/guc.c:289 +#: utils/misc/guc.c:292 msgid "Version and Platform Compatibility" msgstr "版本和平台兼容性" -#: utils/misc/guc.c:291 +#: utils/misc/guc.c:294 msgid "Version and Platform Compatibility / Previous PostgreSQL Versions" msgstr "版本和平台兼容性 / 上一个 PostgreSQL 版本" -#: utils/misc/guc.c:293 +#: utils/misc/guc.c:296 msgid "Version and Platform Compatibility / Other Platforms and Clients" msgstr "版本和平台兼容性 / 其它平台和客户端" -#: utils/misc/guc.c:295 +#: utils/misc/guc.c:298 +msgid "Preset Options" +msgstr "预置选项" + +#: utils/misc/guc.c:300 +msgid "Customized Options" +msgstr "定制选项" + +#: utils/misc/guc.c:302 msgid "Developer Options" msgstr "开发人员选项" -#: utils/misc/guc.c:297 -msgid "Compiled-in Options" -msgstr "已编译进的选项" - -#: utils/misc/guc.c:352 +#: utils/misc/guc.c:357 msgid "Enables the planner's use of sequential-scan plans." msgstr "" -#: utils/misc/guc.c:360 +#: utils/misc/guc.c:365 msgid "Enables the planner's use of index-scan plans." msgstr "" -#: utils/misc/guc.c:368 +#: utils/misc/guc.c:373 msgid "Enables the planner's use of TID scan plans." msgstr "" -#: utils/misc/guc.c:376 +#: utils/misc/guc.c:381 msgid "Enables the planner's use of explicit sort steps." msgstr "" -#: utils/misc/guc.c:384 +#: utils/misc/guc.c:389 msgid "Enables the planner's use of hashed aggregation plans." msgstr "" -#: utils/misc/guc.c:392 +#: utils/misc/guc.c:397 msgid "Enables the planner's use of nested-loop join plans." msgstr "" -#: utils/misc/guc.c:400 +#: utils/misc/guc.c:405 msgid "Enables the planner's use of merge join plans." msgstr "" -#: utils/misc/guc.c:408 +#: utils/misc/guc.c:413 msgid "Enables the planner's use of hash join plans." msgstr "" -#: utils/misc/guc.c:416 +#: utils/misc/guc.c:421 msgid "Enables genetic query optimization." msgstr "启用基因查询优化." -#: utils/misc/guc.c:417 +#: utils/misc/guc.c:422 msgid "This algorithm attempts to do planning without exhaustive searching." msgstr "" -#: utils/misc/guc.c:426 +#: utils/misc/guc.c:431 msgid "Shows whether the current user is a superuser." msgstr "显示当前用户是否是超级用户." -#: utils/misc/guc.c:435 +#: utils/misc/guc.c:440 msgid "Enables SSL connections." msgstr "启用 SSL 联接." -#: utils/misc/guc.c:443 +#: utils/misc/guc.c:448 msgid "Forces synchronization of updates to disk." msgstr "强制和磁盘同步更新" -#: utils/misc/guc.c:444 +#: utils/misc/guc.c:449 msgid "" "The server will use the fsync() system call in several places to make sure " "that updates are physically written to disk. This insures that a database " @@ -3292,11 +3348,11 @@ msgid "" "hardware crash." msgstr "" -#: utils/misc/guc.c:454 +#: utils/misc/guc.c:459 msgid "Continues processing past damaged page headers." msgstr "" -#: utils/misc/guc.c:455 +#: utils/misc/guc.c:460 msgid "" "Detection of a damaged page header normally causes PostgreSQL to report an " "error, aborting the current transaction. Setting zero_damaged_pages to true " @@ -3305,113 +3361,113 @@ msgid "" "rows on the damaged page." msgstr "" -#: utils/misc/guc.c:467 +#: utils/misc/guc.c:472 msgid "Runs the server silently." msgstr "以安静模式 (silently) 运行服务器." -#: utils/misc/guc.c:468 +#: utils/misc/guc.c:473 msgid "" "If this parameter is set, the server will automatically run in the " "background and any controlling terminals are dissociated." msgstr "如果此参数设置了, 服务器将自动运行在后台, 与任何控制终端脱离." -#: utils/misc/guc.c:476 +#: utils/misc/guc.c:481 msgid "Logs each successful connection." msgstr "记录每一个成功的联接." -#: utils/misc/guc.c:484 -msgid "Logs end of a session, including duration" +#: utils/misc/guc.c:489 +msgid "Logs end of a session, including duration." msgstr "" -#: utils/misc/guc.c:494 +#: utils/misc/guc.c:499 msgid "Turns on various assertion checks." msgstr "打开各种判断检查." -#: utils/misc/guc.c:495 +#: utils/misc/guc.c:500 msgid "This is a debugging aid." msgstr "这是一个出错帮助." -#: utils/misc/guc.c:506 utils/misc/guc.c:588 utils/misc/guc.c:661 -#: utils/misc/guc.c:670 utils/misc/guc.c:679 utils/misc/guc.c:688 -#: utils/misc/guc.c:1073 utils/misc/guc.c:1082 utils/misc/guc.c:1142 +#: utils/misc/guc.c:511 utils/misc/guc.c:593 utils/misc/guc.c:666 +#: utils/misc/guc.c:675 utils/misc/guc.c:684 utils/misc/guc.c:693 +#: utils/misc/guc.c:1078 utils/misc/guc.c:1087 utils/misc/guc.c:1145 msgid "no description available" msgstr "没有有用的描述" -#: utils/misc/guc.c:515 -msgid "Logs the duration each completed SQL statement." +#: utils/misc/guc.c:520 +msgid "Logs the duration of each completed SQL statement." msgstr "记录每一条完成了的 SQL 语句过程." -#: utils/misc/guc.c:523 +#: utils/misc/guc.c:528 msgid "Prints the parse tree to the server log." msgstr "打印分析树到服务器日志." -#: utils/misc/guc.c:531 +#: utils/misc/guc.c:536 msgid "Prints the parse tree after rewriting to server log." msgstr "重写服务器日志后打印分析树." -#: utils/misc/guc.c:539 +#: utils/misc/guc.c:544 msgid "Prints the execution plan to server log." msgstr "打印执行规划到服务器日志." -#: utils/misc/guc.c:547 +#: utils/misc/guc.c:552 msgid "Indents parse and plan tree displays." msgstr "" -#: utils/misc/guc.c:555 +#: utils/misc/guc.c:560 msgid "Writes parser performance statistics to the server log." msgstr "把分析器性能统计信息写入到服务器日志中." -#: utils/misc/guc.c:563 +#: utils/misc/guc.c:568 msgid "Writes planner performance statistics to the server log." msgstr "把规划器性能统计信息写入到服务器日志中." -#: utils/misc/guc.c:571 +#: utils/misc/guc.c:576 msgid "Writes executor performance statistics to the server log." msgstr "把执行器 (executor) 性能统计信息写入到服务器日志中." -#: utils/misc/guc.c:579 +#: utils/misc/guc.c:584 msgid "Writes cumulative performance statistics to the server log." msgstr "把 cumulative 性能统计信息写入到服务器日志中." -#: utils/misc/guc.c:599 +#: utils/misc/guc.c:604 msgid "Uses the indented output format for EXPLAIN VERBOSE." msgstr "EXPLAIN VERBOSE 使用缩进输出格式." -#: utils/misc/guc.c:607 +#: utils/misc/guc.c:612 msgid "Starts the server statistics-collection subprocess." msgstr "启动服务器统计收集器子进程." -#: utils/misc/guc.c:615 +#: utils/misc/guc.c:620 msgid "Zeroes collected statistics on server restart." msgstr "当服务器重启, 清空已收集的统计信息." -#: utils/misc/guc.c:623 +#: utils/misc/guc.c:628 msgid "Collects statistics about executing commands." msgstr "收集执行命令的统计信息." -#: utils/misc/guc.c:624 +#: utils/misc/guc.c:629 msgid "" "Enables the collection of statistics on the currently executing command of " "each session, along with the time at which that command began execution." msgstr "" -#: utils/misc/guc.c:633 +#: utils/misc/guc.c:638 msgid "Collects row-level statistics on database activity." msgstr "在使用中的数据库上收集行级别 (row-level) 统计信息." -#: utils/misc/guc.c:641 +#: utils/misc/guc.c:646 msgid "Collects block-level statistics on database activity." msgstr "在使用中的数据库上收集块级别 (block-level) 统计信息." -#: utils/misc/guc.c:650 +#: utils/misc/guc.c:655 msgid "Generates debugging output for LISTEN and NOTIFY." msgstr "为 LISTEN 和 NOTIFY 生成出错信息." -#: utils/misc/guc.c:699 +#: utils/misc/guc.c:704 msgid "Logs the host name in the connection logs." msgstr "在联接日志中记录主机名." -#: utils/misc/guc.c:700 +#: utils/misc/guc.c:705 msgid "" "By default, connection logs only show the IP address of the connecting host. " "If you want them to show the host name you can turn this on, but depending " @@ -3419,25 +3475,25 @@ msgid "" "performance penalty." msgstr "" -#: utils/misc/guc.c:710 +#: utils/misc/guc.c:715 msgid "Causes subtables to be included by default in various commands." msgstr "" -#: utils/misc/guc.c:718 +#: utils/misc/guc.c:723 msgid "Interprets ACST, CST, EST, and SAT as Australian time zones." msgstr "" -#: utils/misc/guc.c:719 +#: utils/misc/guc.c:724 msgid "" "Otherwise they are interpreted as North/South American time zones and " "Saturday." msgstr "" -#: utils/misc/guc.c:727 +#: utils/misc/guc.c:732 msgid "Encrypt passwords." msgstr "加密口令." -#: utils/misc/guc.c:728 +#: utils/misc/guc.c:733 msgid "" "When a password is specified in CREATE USER or ALTER USER without writing " "either ENCRYPTED or UNENCRYPTED, this parameter determines whether the " @@ -3446,11 +3502,11 @@ msgstr "" "当在 CREATE USER 或者 ALTER USER 语句中指定的口令没有用 ENCRYPTED 或者 " "UNENCRYPTED, 此参数确定口令是否加密." -#: utils/misc/guc.c:737 +#: utils/misc/guc.c:742 msgid "Treats \"expr=NULL\" as \"expr IS NULL\"." msgstr "\"expr=NULL\" 看作为 \"expr IS NULL\"." -#: utils/misc/guc.c:738 +#: utils/misc/guc.c:743 msgid "" "When turned on, expressions of the form expr = NULL (or NULL = expr) are " "treated as expr IS NULL, that is, they return true if expr evaluates to the " @@ -3458,131 +3514,131 @@ msgid "" "always return null (unknown)." msgstr "" -#: utils/misc/guc.c:749 +#: utils/misc/guc.c:754 msgid "Enables per-database user names." msgstr "" -#: utils/misc/guc.c:758 +#: utils/misc/guc.c:763 msgid "This parameter doesn't do anything." msgstr "这个参数不做任何事情." -#: utils/misc/guc.c:759 +#: utils/misc/guc.c:764 msgid "" "It's just here so that we won't choke on SET AUTOCOMMIT TO ON from 7.3-" "vintage clients." msgstr "" -#: utils/misc/guc.c:767 +#: utils/misc/guc.c:772 msgid "Sets the default read-only status of new transactions." msgstr "为新事物设置默认的只读状态." -#: utils/misc/guc.c:775 +#: utils/misc/guc.c:780 msgid "Sets the current transaction's read-only status." msgstr "设置当前事务的只读状态." -#: utils/misc/guc.c:784 +#: utils/misc/guc.c:789 msgid "Automatically adds missing table references to FROM clauses." msgstr "" -#: utils/misc/guc.c:792 +#: utils/misc/guc.c:797 msgid "Check function bodies during CREATE FUNCTION." msgstr "在创建函数过程中检查函数体." -#: utils/misc/guc.c:800 -msgid "By default, newly-created tables should have OIDs" -msgstr "默认情况下, 新创建的表将有 OID" +#: utils/misc/guc.c:805 +msgid "By default, newly-created tables should have OIDs." +msgstr "默认情况下, 新创建的表将有 OID." -#: utils/misc/guc.c:808 -msgid "Start a subprocess to capture stderr output into log files" -msgstr "" +#: utils/misc/guc.c:813 +msgid "Start a subprocess to capture stderr output into log files." +msgstr "启动一个子进程用来捕获 stderr 输出到日志文件中." -#: utils/misc/guc.c:816 -msgid "Truncate existing log files of same name during log rotation" +#: utils/misc/guc.c:821 +msgid "Truncate existing log files of same name during log rotation." msgstr "" -#: utils/misc/guc.c:826 +#: utils/misc/guc.c:831 msgid "Emit WAL-related debugging output." msgstr "" -#: utils/misc/guc.c:837 +#: utils/misc/guc.c:842 msgid "Datetimes are integer based" msgstr "" -#: utils/misc/guc.c:860 +#: utils/misc/guc.c:865 msgid "Sets the default statistics target." msgstr "设置默认统计对象." -#: utils/misc/guc.c:861 +#: utils/misc/guc.c:866 msgid "" "This applies to table columns that have not had a column-specific target set " "via ALTER TABLE SET STATISTICS." msgstr "" -#: utils/misc/guc.c:869 +#: utils/misc/guc.c:874 msgid "Sets the FROM-list size beyond which subqueries are not collapsed." msgstr "" -#: utils/misc/guc.c:871 +#: utils/misc/guc.c:876 msgid "" "The planner will merge subqueries into upper queries if the resulting FROM " "list would have no more than this many items." msgstr "" -#: utils/misc/guc.c:880 +#: utils/misc/guc.c:885 msgid "Sets the FROM-list size beyond which JOIN constructs are not flattened." msgstr "" -#: utils/misc/guc.c:882 +#: utils/misc/guc.c:887 msgid "" "The planner will flatten explicit inner JOIN constructs into lists of FROM " "items whenever a list of no more than this many items would result." msgstr "" -#: utils/misc/guc.c:891 +#: utils/misc/guc.c:896 msgid "Sets the threshold of FROM items beyond which GEQO is used." msgstr "" -#: utils/misc/guc.c:899 +#: utils/misc/guc.c:904 msgid "GEQO: effort is used to set the default for other GEQO parameters." msgstr "" -#: utils/misc/guc.c:907 +#: utils/misc/guc.c:912 msgid "GEQO: number of individuals in the population." msgstr "GEQO: 人群 (population) 个体 (individual) 数" -#: utils/misc/guc.c:908 utils/misc/guc.c:916 +#: utils/misc/guc.c:913 utils/misc/guc.c:921 msgid "Zero selects a suitable default value." msgstr "" -#: utils/misc/guc.c:915 +#: utils/misc/guc.c:920 msgid "GEQO: number of iterations of the algorithm." msgstr "GEQO: 算法的迭代次数" -#: utils/misc/guc.c:924 +#: utils/misc/guc.c:929 msgid "The time in milliseconds to wait on lock before checking for deadlock." msgstr "" -#: utils/misc/guc.c:940 +#: utils/misc/guc.c:945 msgid "Sets the maximum number of concurrent connections." msgstr "设置并发联接的最大个数." -#: utils/misc/guc.c:949 +#: utils/misc/guc.c:954 msgid "Sets the number of connection slots reserved for superusers." msgstr "设置为超级用户保留的联接数." -#: utils/misc/guc.c:958 +#: utils/misc/guc.c:963 msgid "Sets the number of shared memory buffers used by the server." msgstr "设置服务器使用的共享内存缓冲区的数量." -#: utils/misc/guc.c:967 +#: utils/misc/guc.c:972 msgid "Sets the TCP port the server listens on." msgstr "设置服务器监听的 TCP 端口号." -#: utils/misc/guc.c:976 +#: utils/misc/guc.c:981 msgid "Sets the access permissions of the Unix-domain socket." msgstr "设置 Unix-domain 套接字的访问权限." -#: utils/misc/guc.c:977 +#: utils/misc/guc.c:982 msgid "" "Unix-domain sockets use the usual Unix file system permission set. The " "parameter value is expected to be an numeric mode specification in the form " @@ -3590,317 +3646,325 @@ msgid "" "format the number must start with a 0 (zero).)" msgstr "" -#: utils/misc/guc.c:989 +#: utils/misc/guc.c:994 msgid "Sets the maximum memory to be used for query workspaces." msgstr "设置查询工作空间使用的最大内存数." -#: utils/misc/guc.c:990 +#: utils/misc/guc.c:995 msgid "" "This much memory may be used by each internal sort operation and hash table " "before switching to temporary disk files." msgstr "这些内存将可能用于内部排序操作和转化到临时磁盘文件之前的散列表" -#: utils/misc/guc.c:1000 +#: utils/misc/guc.c:1005 msgid "Sets the maximum memory to be used for maintenance operations." msgstr "设置维护操作使用的最大内存数." -#: utils/misc/guc.c:1001 +#: utils/misc/guc.c:1006 msgid "This includes operations such as VACUUM and CREATE INDEX." msgstr "" -#: utils/misc/guc.c:1009 +#: utils/misc/guc.c:1014 msgid "Sets the maximum stack depth, in kilobytes." msgstr "" -#: utils/misc/guc.c:1018 +#: utils/misc/guc.c:1023 msgid "Vacuum cost for a page found in the buffer cache." msgstr "" -#: utils/misc/guc.c:1027 +#: utils/misc/guc.c:1032 msgid "Vacuum cost for a page not found in the buffer cache." msgstr "" -#: utils/misc/guc.c:1036 +#: utils/misc/guc.c:1041 msgid "Vacuum cost for a page dirtied by vacuum." msgstr "" -#: utils/misc/guc.c:1045 +#: utils/misc/guc.c:1050 msgid "Vacuum cost amount available before napping." msgstr "" -#: utils/misc/guc.c:1054 +#: utils/misc/guc.c:1059 msgid "Vacuum cost delay in milliseconds." msgstr "" -#: utils/misc/guc.c:1063 +#: utils/misc/guc.c:1068 msgid "" "Sets the maximum number of simultaneously open files for each server process." msgstr "设置每一个服务器进程同时打开文件的最大个数." -#: utils/misc/guc.c:1093 +#: utils/misc/guc.c:1098 msgid "Sets the maximum allowed duration (in milliseconds) of any statement." msgstr "设置任何语句执行时间的最大值 (单位毫秒)." -#: utils/misc/guc.c:1094 +#: utils/misc/guc.c:1099 msgid "A value of 0 turns off the timeout." msgstr "值为 0 的时候关闭超时." -#: utils/misc/guc.c:1102 +#: utils/misc/guc.c:1107 msgid "" "Sets the maximum number of tables and indexes for which free space is " "tracked." msgstr "" -#: utils/misc/guc.c:1111 +#: utils/misc/guc.c:1115 msgid "Sets the maximum number of disk pages for which free space is tracked." msgstr "" -#: utils/misc/guc.c:1121 +#: utils/misc/guc.c:1124 msgid "Sets the maximum number of locks per transaction." msgstr "设置每一个事物锁的最大个数." -#: utils/misc/guc.c:1122 +#: utils/misc/guc.c:1125 msgid "" "The shared lock table is sized on the assumption that at most " "max_locks_per_transaction * max_connections distinct objects will need to be " "locked at any one time." msgstr "" -#: utils/misc/guc.c:1132 +#: utils/misc/guc.c:1135 msgid "Sets the maximum time in seconds to complete client authentication." msgstr "设置完成客户端认证的最大秒数." -#: utils/misc/guc.c:1152 +#: utils/misc/guc.c:1155 msgid "" "Sets the maximum distance in log segments between automatic WAL checkpoints." msgstr "" -#: utils/misc/guc.c:1161 +#: utils/misc/guc.c:1164 msgid "Sets the maximum time in seconds between automatic WAL checkpoints." msgstr "" -#: utils/misc/guc.c:1170 +#: utils/misc/guc.c:1173 msgid "" "Logs if filling of checkpoint segments happens more frequently than this (in " "seconds)." msgstr "" -#: utils/misc/guc.c:1172 +#: utils/misc/guc.c:1175 msgid "" "Write a message to the server log if checkpoints caused by the filling of " "checkpoint segment files happens more frequently than this number of " "seconds. Zero turns off the warning." msgstr "" -#: utils/misc/guc.c:1182 +#: utils/misc/guc.c:1185 msgid "Sets the number of disk-page buffers in shared memory for WAL." msgstr "" -#: utils/misc/guc.c:1191 +#: utils/misc/guc.c:1194 msgid "" "Sets the delay in microseconds between transaction commit and flushing WAL " "to disk." msgstr "" -#: utils/misc/guc.c:1201 +#: utils/misc/guc.c:1204 msgid "" "Sets the minimum concurrent open transactions before performing commit_delay." msgstr "" -#: utils/misc/guc.c:1211 +#: utils/misc/guc.c:1214 msgid "Sets the number of digits displayed for floating-point values." msgstr "设置浮点数显示的位数." -#: utils/misc/guc.c:1212 +#: utils/misc/guc.c:1215 msgid "" "This affects real, double precision, and geometric data types. The parameter " "value is added to the standard number of digits (FLT_DIG or DBL_DIG as " "appropriate)." msgstr "" -#: utils/misc/guc.c:1222 +#: utils/misc/guc.c:1225 msgid "" "Sets the minimum execution time in milliseconds above which statements will " "be logged." msgstr "" -#: utils/misc/guc.c:1224 +#: utils/misc/guc.c:1227 msgid "Zero prints all queries. The default is -1 (turning this feature off)." msgstr "零打印所有查询. 默认值为 -1 (关闭此功能)." -#: utils/misc/guc.c:1232 +#: utils/misc/guc.c:1235 msgid "Interval to report shared buffer status in seconds" msgstr "" -#: utils/misc/guc.c:1241 +#: utils/misc/guc.c:1244 msgid "Background writer sleep time between rounds in milliseconds" msgstr "后台写入器 (Background writer) 两次之间的休眠时间, 毫秒级" -#: utils/misc/guc.c:1250 +#: utils/misc/guc.c:1253 msgid "Background writer percentage of dirty buffers to flush per round" msgstr "后台写入器 (Background writer) 每次刷新的脏缓冲区比率" -#: utils/misc/guc.c:1259 +#: utils/misc/guc.c:1262 msgid "Background writer maximum number of pages to flush per round" msgstr "后台写入器 (Background writer) 每次最大刷新页数" -#: utils/misc/guc.c:1268 -msgid "Automatic logfile rotation will occur after N minutes" +#: utils/misc/guc.c:1271 +msgid "Automatic log file rotation will occur after N minutes" msgstr "" -#: utils/misc/guc.c:1277 -msgid "Automatic logfile rotation will occur after N kilobytes" +#: utils/misc/guc.c:1280 +msgid "Automatic log file rotation will occur after N kilobytes" msgstr "" -#: utils/misc/guc.c:1286 -msgid "Shows the maximum number of function arguments" -msgstr "显示函数参数的最大个数" +#: utils/misc/guc.c:1289 +msgid "Shows the maximum number of function arguments." +msgstr "显示函数参数的最大个数." -#: utils/misc/guc.c:1296 -msgid "Shows the maximum number of index keys" -msgstr "显示索引键值的最大个数" +#: utils/misc/guc.c:1299 +msgid "Shows the maximum number of index keys." +msgstr "显示索引键值的最大个数." -#: utils/misc/guc.c:1306 +#: utils/misc/guc.c:1309 msgid "Shows the maximum identifier length" msgstr "显示标识符最大长度" -#: utils/misc/guc.c:1316 +#: utils/misc/guc.c:1319 msgid "Shows size of a disk block" msgstr "显示一个磁盘块的尺寸" -#: utils/misc/guc.c:1335 +#: utils/misc/guc.c:1338 msgid "Sets the planner's assumption about size of the disk cache." msgstr "" -#: utils/misc/guc.c:1336 +#: utils/misc/guc.c:1339 msgid "" "That is, the portion of the kernel's disk cache that will be used for " "PostgreSQL data files. This is measured in disk pages, which are normally 8 " "kB each." msgstr "" -#: utils/misc/guc.c:1345 +#: utils/misc/guc.c:1348 msgid "" "Sets the planner's estimate of the cost of a nonsequentially fetched disk " "page." msgstr "" -#: utils/misc/guc.c:1347 +#: utils/misc/guc.c:1350 msgid "" "This is measured as a multiple of the cost of a sequential page fetch. A " "higher value makes it more likely a sequential scan will be used, a lower " "value makes it more likely an index scan will be used." msgstr "" -#: utils/misc/guc.c:1357 +#: utils/misc/guc.c:1360 msgid "Sets the planner's estimate of the cost of processing each tuple (row)." msgstr "" -#: utils/misc/guc.c:1358 utils/misc/guc.c:1368 utils/misc/guc.c:1377 +#: utils/misc/guc.c:1361 utils/misc/guc.c:1371 utils/misc/guc.c:1380 msgid "This is measured as a fraction of the cost of a sequential page fetch." msgstr "" -#: utils/misc/guc.c:1366 +#: utils/misc/guc.c:1369 msgid "" "Sets the planner's estimate of processing cost for each index tuple (row) " "during index scan." msgstr "" -#: utils/misc/guc.c:1376 +#: utils/misc/guc.c:1379 msgid "" "Sets the planner's estimate of processing cost of each operator in WHERE." msgstr "" -#: utils/misc/guc.c:1386 +#: utils/misc/guc.c:1389 msgid "GEQO: selective pressure within the population." msgstr "" -#: utils/misc/guc.c:1396 +#: utils/misc/guc.c:1399 msgid "Sets the seed for random-number generation." msgstr "设置生成随机数的种子." -#: utils/misc/guc.c:1415 +#: utils/misc/guc.c:1418 msgid "WAL archiving command." msgstr "" -#: utils/misc/guc.c:1416 +#: utils/misc/guc.c:1419 msgid "The shell command that will be called to archive a WAL file." msgstr "" -#: utils/misc/guc.c:1424 +#: utils/misc/guc.c:1427 msgid "Sets the client's character set encoding." msgstr "设置客户端编码" -#: utils/misc/guc.c:1434 +#: utils/misc/guc.c:1437 msgid "Sets the message levels that are sent to the client." msgstr "设置发送到客户端的信息级别." -#: utils/misc/guc.c:1435 +#: utils/misc/guc.c:1438 msgid "" "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, LOG, NOTICE, " "WARNING, and ERROR. Each level includes all the levels that follow it. The " "later the level, the fewer messages are sent." msgstr "" -#: utils/misc/guc.c:1446 +#: utils/misc/guc.c:1449 msgid "Sets the message levels that are logged." msgstr "设置日志记录的信息级别." -#: utils/misc/guc.c:1447 +#: utils/misc/guc.c:1450 msgid "" "Valid values are DEBUG5, DEBUG4, DEBUG3, DEBUG2, DEBUG1, INFO, NOTICE, " "WARNING, ERROR, LOG, FATAL, and PANIC. Each level includes all the levels " "that follow it." msgstr "" -#: utils/misc/guc.c:1457 +#: utils/misc/guc.c:1460 msgid "Sets the verbosity of logged messages." msgstr "设置日志信息的冗长." -#: utils/misc/guc.c:1458 +#: utils/misc/guc.c:1461 msgid "Valid values are \"terse\", \"default\", and \"verbose\"." msgstr "有效值为 \"terse\", \"default\", 和 \"verbose\"." -#: utils/misc/guc.c:1465 +#: utils/misc/guc.c:1468 msgid "Sets the type of statements logged." msgstr "设置记录语句的类型." -#: utils/misc/guc.c:1466 -msgid "Valid values are \"none\", \"mod\", \"ddl\", and \"all\"." -msgstr "有效值为 \"none\", \"mod\", \"ddl\", 和 \"all\"." +#: utils/misc/guc.c:1469 +msgid "Valid values are \"none\", \"ddl\", \"mod\", and \"all\"." +msgstr "有效值为 \"none\", \"ddl\", \"mod\", 和 \"all\"." -#: utils/misc/guc.c:1474 +#: utils/misc/guc.c:1477 msgid "" "Causes all statements generating error at or above this level to be logged." msgstr "" -#: utils/misc/guc.c:1475 +#: utils/misc/guc.c:1478 msgid "" "All SQL statements that cause an error of the specified level or a higher " "level are logged." msgstr "" -#: utils/misc/guc.c:1484 +#: utils/misc/guc.c:1487 msgid "Controls information prefixed to each log line" msgstr "" -#: utils/misc/guc.c:1485 +#: utils/misc/guc.c:1488 msgid "if blank no prefix is used" msgstr "" -#: utils/misc/guc.c:1494 +#: utils/misc/guc.c:1497 msgid "Sets the display format for date and time values." msgstr "设置日期和时间值的显示格式." -#: utils/misc/guc.c:1495 +#: utils/misc/guc.c:1498 msgid "Also controls interpretation of ambiguous date inputs." msgstr "" -#: utils/misc/guc.c:1505 +#: utils/misc/guc.c:1508 +msgid "Sets the default tablespace to create tables and indexes in." +msgstr "" + +#: utils/misc/guc.c:1509 +msgid "An empty string selects the database's default tablespace." +msgstr "" + +#: utils/misc/guc.c:1517 msgid "Sets the transaction isolation level of each new transaction." msgstr "设置每一个新事物的隔离 (isolation) 级别." -#: utils/misc/guc.c:1506 +#: utils/misc/guc.c:1518 msgid "" "Each SQL transaction has an isolation level, which can be either \"read " "uncommitted\", \"read committed\", \"repeatable read\", or \"serializable\"." @@ -3908,11 +3972,11 @@ msgstr "" "每一个 SQL 事物都有一个隔离级别, 级别可以是 \"read uncommitted\", \"read " "committed\", \"repeatable read\", 或者 \"serializable\"." -#: utils/misc/guc.c:1515 +#: utils/misc/guc.c:1527 msgid "Sets the path for dynamically loadable modules." msgstr "设置动态加载摸组的路径." -#: utils/misc/guc.c:1516 +#: utils/misc/guc.c:1528 msgid "" "If a dynamically loadable module needs to be opened and the specified name " "does not have a directory component (i.e., the name does not contain a " @@ -3921,286 +3985,330 @@ msgstr "" "如果一个动态加载模块需要打开并且指定名字没有路径 (例如, 名字中没包含斜杠), 系" "统将在此路径中查找指定的文件." -#: utils/misc/guc.c:1527 +#: utils/misc/guc.c:1540 msgid "Sets the location of the Kerberos server key file." msgstr "设置 Kerberos 服务器密钥文件位置." -#: utils/misc/guc.c:1536 +#: utils/misc/guc.c:1550 msgid "Sets the Rendezvous broadcast service name." msgstr "" -#: utils/misc/guc.c:1547 +#: utils/misc/guc.c:1561 msgid "Shows the collation order locale." msgstr "" -#: utils/misc/guc.c:1557 +#: utils/misc/guc.c:1571 msgid "Shows the character classification and case conversion locale." msgstr "" -#: utils/misc/guc.c:1567 +#: utils/misc/guc.c:1581 msgid "Sets the language in which messages are displayed." msgstr "设置信息显示语言." -#: utils/misc/guc.c:1576 +#: utils/misc/guc.c:1590 msgid "Sets the locale for formatting monetary amounts." msgstr "为货币数量格式设置 locale." -#: utils/misc/guc.c:1585 +#: utils/misc/guc.c:1599 msgid "Sets the locale for formatting numbers." msgstr "为数字格式设置 locale" -#: utils/misc/guc.c:1594 +#: utils/misc/guc.c:1608 msgid "Sets the locale for formatting date and time values." msgstr "为日期和时间值格式设置 locale" -#: utils/misc/guc.c:1603 +#: utils/misc/guc.c:1617 msgid "Lists shared libraries to preload into server." msgstr "列出预装入服务器的共享库." -#: utils/misc/guc.c:1613 +#: utils/misc/guc.c:1627 msgid "Sets the regular expression \"flavor\"." msgstr "设置正则表达式 \"flavor\"." -#: utils/misc/guc.c:1614 +#: utils/misc/guc.c:1628 msgid "This can be set to advanced, extended, or basic." msgstr "这个可以设置为 advanced, extended, 或者 basic." -#: utils/misc/guc.c:1622 +#: utils/misc/guc.c:1636 msgid "Sets the schema search order for names that are not schema-qualified." msgstr "" -#: utils/misc/guc.c:1633 +#: utils/misc/guc.c:1647 msgid "Sets the server (database) character set encoding." msgstr "设置服务器 (数据库) 字符编码." -#: utils/misc/guc.c:1644 +#: utils/misc/guc.c:1658 msgid "Shows the server version." msgstr "显示服务器版本信息." -#: utils/misc/guc.c:1655 +#: utils/misc/guc.c:1669 msgid "Sets the session user name." msgstr "设置会话用户名称." -#: utils/misc/guc.c:1665 +#: utils/misc/guc.c:1679 msgid "Sets the destination for server log output." msgstr "设置服务器日志输出目标." -#: utils/misc/guc.c:1666 +#: utils/misc/guc.c:1680 msgid "" -"Valid values are combinations of stderr, syslog and eventlog, depending on " -"platform." -msgstr "有效值为 stderr, syslog 和 eventlog 的组合, 依赖不同平台." +"Valid values are combinations of \"stderr\", \"syslog\", and \"eventlog\", " +"depending on the platform." +msgstr "有效值为 \"stderr\", \"syslog\" 和 \"eventlog\" 的组合, 依赖不同平台." -#: utils/misc/guc.c:1675 +#: utils/misc/guc.c:1689 msgid "Sets the destination directory for log files." msgstr "设置日志文件目的目录." -#: utils/misc/guc.c:1676 -msgid "" -"May be specified as relative to the cluster directory or as absolute path." +#: utils/misc/guc.c:1690 +msgid "May be specified as relative to the data directory or as absolute path." msgstr "" -#: utils/misc/guc.c:1684 +#: utils/misc/guc.c:1699 msgid "Sets the file name pattern for log files." msgstr "设置日志文件的文件名字模式." -#: utils/misc/guc.c:1694 +#: utils/misc/guc.c:1710 msgid "Sets the syslog \"facility\" to be used when syslog enabled." msgstr "当启用系统日志 (syslog), 设置系统日志使用 \"facility\"." -#: utils/misc/guc.c:1695 +#: utils/misc/guc.c:1711 msgid "" "Valid values are LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, " "LOCAL7." msgstr "" "有效值为 LOCAL0, LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7." -#: utils/misc/guc.c:1703 +#: utils/misc/guc.c:1719 msgid "Sets the program name used to identify PostgreSQL messages in syslog." msgstr "设置在系统日志 (syslog) 中确认 PostgreSQL 信息的程序名." -#: utils/misc/guc.c:1714 +#: utils/misc/guc.c:1730 msgid "Sets the time zone for displaying and interpreting time stamps." msgstr "设置显示和解释时间戳的时区." -#: utils/misc/guc.c:1723 +#: utils/misc/guc.c:1739 msgid "Sets the current transaction's isolation level." msgstr "设置当前事物的隔离级别." -#: utils/misc/guc.c:1733 +#: utils/misc/guc.c:1749 msgid "Sets the owning group of the Unix-domain socket." msgstr "设置 Unix-domain 套接字的属组." -#: utils/misc/guc.c:1734 +#: utils/misc/guc.c:1750 msgid "" "(The owning user of the socket is always the user that starts the server.)" msgstr "(套接字的属主用户通常也是起动服务的用户.)" -#: utils/misc/guc.c:1743 +#: utils/misc/guc.c:1759 msgid "Sets the directory where the Unix-domain socket will be created." msgstr "设置创建 Unix-domain 套接字的目录." -#: utils/misc/guc.c:1752 +#: utils/misc/guc.c:1769 msgid "Sets the host name or IP address(es) to listen to." msgstr "设置监听的主机名或 IP 地址." -#: utils/misc/guc.c:1762 +#: utils/misc/guc.c:1779 msgid "Selects the method used for forcing WAL updates out to disk." msgstr "" -#: utils/misc/guc.c:1771 -msgid "Sets the list of known custom variable classes" +#: utils/misc/guc.c:1788 +msgid "Sets the list of known custom variable classes." msgstr "" -#: utils/misc/guc.c:1780 -msgid "Sets the location of the data directory" -msgstr "设置数据目录的位置" +#: utils/misc/guc.c:1798 +msgid "Sets the server's data directory." +msgstr "设置服务器的数据目录" + +#: utils/misc/guc.c:1808 +msgid "Sets the server's main configuration file." +msgstr "设置服务器的主配置文件" -#: utils/misc/guc.c:1786 -msgid "Sets the location of the \"hba\" configuration file" -msgstr "设置 \"hba\" 配置文件位置" +#: utils/misc/guc.c:1818 +msgid "Sets the server's \"hba\" configuration file" +msgstr "设置服务器的 \"hba\" 配置文件" -#: utils/misc/guc.c:1792 -msgid "Sets the location of the \"ident\" configuration file" -msgstr "设置 \"ident\" 配置文件位置" +#: utils/misc/guc.c:1828 +msgid "Sets the server's \"ident\" configuration file" +msgstr "设置服务器的 \"ident\" 配置文件" -#: utils/misc/guc.c:1798 -msgid "Writes the postmaster PID to the specified file" -msgstr "把 postmaster PID 写到指定文件" +#: utils/misc/guc.c:1838 +msgid "Writes the postmaster PID to the specified file." +msgstr "把 postmaster PID 写到指定文件." + +#: utils/misc/guc.c:2477 +#, c-format +msgid "" +"%s does not know where to find the server configuration file.\n" +"You must specify the --config-file or -D invocation option or set the PGDATA " +"environment variable.\n" +msgstr "" +"%s 不知道在哪里可以找到数据库系统配置文件.\n" +"你必须通过 --config-file 或 -D 选项指定或者通过设置 PGDATA 环境变量.\n" + +#: utils/misc/guc.c:2502 +#, c-format +msgid "%s cannot access the server configuration file \"%s\": %s\n" +msgstr "%s 无法处理服务器的配置文件 \"%s\": %s\n" + +#: utils/misc/guc.c:2522 +#, c-format +msgid "" +"%s does not know where to find the database system data.\n" +"This can be specified as \"data_directory\" in \"%s\", or by the -D " +"invocation option, or by the PGDATA environment variable.\n" +msgstr "" +"%s 不知道在哪里可以找到数据库系统数据.\n" +"可以在 \"%s\" 中指定 \"data_directory\", 或者通过 -D 选项指定或者通过设置 " +"PGDATA 环境变量.\n" + +#: utils/misc/guc.c:2545 +#, c-format +msgid "" +"%s does not know where to find the \"hba\" configuration file.\n" +"This can be specified as \"hba_file\" in \"%s\", or by the -D invocation " +"option, or by the PGDATA environment variable.\n" +msgstr "" +"%s 不知道在哪里可以找到 \"hba\" 配置文件.\n" +"可以在 \"%s\" 中指定 \"hba_file\", 或者通过 -D 选项指定或者通过设置PGDATA 环" +"境变量.\n" + +#: utils/misc/guc.c:2568 +#, c-format +msgid "" +"%s does not know where to find the \"ident\" configuration file.\n" +"This can be specified as \"ident_file\" in \"%s\", or by the -D invocation " +"option, or by the PGDATA environment variable.\n" +msgstr "" +"%s 不知道在哪里可以找到 \"ident\" 配置文件.\n" +"可以在 \"%s\" 中指定 \"ident_file\", 或者通过 -D 选项指定或者通过设置PGDATA " +"环境变量.\n" -#: utils/misc/guc.c:3098 utils/misc/guc.c:3787 utils/misc/guc.c:3823 -#: utils/misc/guc.c:3879 utils/misc/guc.c:4216 utils/misc/guc.c:4365 +#: utils/misc/guc.c:3274 utils/misc/guc.c:3800 utils/misc/guc.c:3840 +#: utils/misc/guc.c:3915 utils/misc/guc.c:4251 utils/misc/guc.c:4402 #, c-format msgid "unrecognized configuration parameter \"%s\"" msgstr "未认可的配置参数 \"%s\"" -#: utils/misc/guc.c:3117 +#: utils/misc/guc.c:3293 #, c-format msgid "parameter \"%s\" cannot be changed" msgstr "参数 \"%s\" 不可以改变" -#: utils/misc/guc.c:3129 +#: utils/misc/guc.c:3305 #, c-format msgid "parameter \"%s\" cannot be changed after server start" msgstr "服务器启动后, 参数 \"%s\" 不能改变" -#: utils/misc/guc.c:3139 +#: utils/misc/guc.c:3315 #, c-format msgid "parameter \"%s\" cannot be changed now" msgstr "参数 \"%s\" 现在不能改变" -#: utils/misc/guc.c:3169 +#: utils/misc/guc.c:3345 #, c-format msgid "parameter \"%s\" cannot be set after connection start" msgstr "联接启动后, 参数 \"%s\" 不能设置" -#: utils/misc/guc.c:3179 utils/misc/guc.c:3713 +#: utils/misc/guc.c:3355 #, c-format msgid "permission denied to set parameter \"%s\"" msgstr "设置参数 \"%s\" 权限不允许" -#: utils/misc/guc.c:3236 +#: utils/misc/guc.c:3406 #, c-format msgid "parameter \"%s\" requires a Boolean value" msgstr "参数 \"%s\" 需要一个布尔值" -#: utils/misc/guc.c:3268 utils/misc/guc.c:3376 +#: utils/misc/guc.c:3422 utils/misc/guc.c:3506 #, c-format msgid "invalid value for parameter \"%s\": %d" msgstr "参数 \"%s\" 的值无效: %d" -#: utils/misc/guc.c:3328 +#: utils/misc/guc.c:3482 #, c-format msgid "parameter \"%s\" requires an integer value" msgstr "参数 \"%s\" 需要一个整数值" -#: utils/misc/guc.c:3336 +#: utils/misc/guc.c:3490 #, c-format msgid "%d is outside the valid range for parameter \"%s\" (%d .. %d)" msgstr "%d 超出了参数 \"%s\" (%d .. %d) 的有效范围" -#: utils/misc/guc.c:3436 +#: utils/misc/guc.c:3566 #, c-format msgid "parameter \"%s\" requires a numeric value" msgstr "参数 \"%s\" 需要一个数字值" -#: utils/misc/guc.c:3444 +#: utils/misc/guc.c:3574 #, c-format msgid "%g is outside the valid range for parameter \"%s\" (%g .. %g)" msgstr "%g 超出了参数 \"%s\" (%g .. %g) 的有效范围" -#: utils/misc/guc.c:3477 +#: utils/misc/guc.c:3590 #, c-format msgid "invalid value for parameter \"%s\": %g" msgstr "参数 \"%s\" 的值无效: %g" -#: utils/misc/guc.c:3609 +#: utils/misc/guc.c:3688 #, c-format msgid "invalid value for parameter \"%s\": \"%s\"" msgstr "参数 \"%s\" 的值无效: \"%s\"" -#: utils/misc/guc.c:3716 -msgid "Must be superuser to change this value to false." -msgstr "必须为超级用户才可以改变此值为 false" - -#: utils/misc/guc.c:3718 -msgid "Must be superuser to increase this value or turn it off." -msgstr "只有超级用户能增加此值或关闭它." - -#: utils/misc/guc.c:3719 -msgid "Must be superuser to increase this value." -msgstr "只有超级用户能增加这个值." +#: utils/misc/guc.c:3804 utils/misc/guc.c:3844 utils/misc/guc.c:4406 +#, c-format +msgid "must be superuser to examine \"%s\"" +msgstr "检查 \"%s\" 必须为超级用户" -#: utils/misc/guc.c:3888 +#: utils/misc/guc.c:3924 #, c-format msgid "SET %s takes only one argument" msgstr "SET %s 只能带一个参数" -#: utils/misc/guc.c:3992 +#: utils/misc/guc.c:4028 msgid "SET requires parameter name" msgstr "SET 需要参数名字" -#: utils/misc/guc.c:4056 +#: utils/misc/guc.c:4092 #, c-format msgid "attempt to redefine parameter \"%s\"" msgstr "尝试重新定义参数 \"%s\"" -#: utils/misc/guc.c:5002 +#: utils/misc/guc.c:5049 #, c-format msgid "could not parse setting for parameter \"%s\"" msgstr "无法分析参数 \"%s\" 的设置" -#: utils/misc/guc.c:5200 +#: utils/misc/guc.c:5247 msgid "invalid list syntax for parameter \"log_destination\"" msgstr "无效的 \"log_destination\" 参数列表语法" -#: utils/misc/guc.c:5223 +#: utils/misc/guc.c:5270 #, c-format -msgid "unrecognised \"log_destination\" key word: \"%s\"" +msgid "unrecognized \"log_destination\" key word: \"%s\"" msgstr "不认可的 \"log_destination\" 关键字: \"%s\"" -#: utils/misc/guc.c:5457 +#: utils/misc/guc.c:5498 msgid "SET AUTOCOMMIT TO OFF is no longer supported" msgstr "SET AUTOCOMMIT TO OFF 不再被支持" -#: utils/misc/guc.c:5505 +#: utils/misc/guc.c:5546 #, c-format -msgid "invalid syntax for custom_variable_classes: \"%s\"" -msgstr "不合法的 custom_variable_classes 语法: \"%s\"" +msgid "invalid syntax for \"custom_variable_classes\": \"%s\"" +msgstr "不合法的 \"custom_variable_classes\" 语法: \"%s\"" -#: utils/misc/guc.c:5534 +#: utils/misc/guc.c:5575 msgid "cannot enable parameter when \"log_statement_stats\" is true" msgstr "当 \"log_statement_stats\" 为 true 时, 不能启动参数." -#: utils/misc/guc.c:5550 +#: utils/misc/guc.c:5592 msgid "" "cannot enable \"log_statement_stats\" when \"log_parser_stats\", " "\"log_planner_stats\", or \"log_executor_stats\" is true" msgstr "" -"当 \"log_parser_stats\", \"log_planner_stats\", 或者 " -"\"log_executor_stats\" 为 true 时, 不能启动 \"log_statement_stats\"." +"当 \"log_parser_stats\", \"log_planner_stats\", 或者 \"log_executor_stats\" " +"为 true 时, 不能启动 \"log_statement_stats\"." -#: utils/misc/guc.c:5568 +#: utils/misc/guc.c:5611 msgid "cannot set transaction read-write mode inside a read-only transaction" msgstr "不能在一个只读事物里面设置读写模式" @@ -4208,22 +4316,22 @@ msgstr "不能在一个只读事物里面设置读写模式" msgid "internal error: unrecognized run-time parameter type\n" msgstr "内部错误: 未知的运行时参数类型\n" -#: utils/mmgr/aset.c:336 +#: utils/mmgr/aset.c:338 #, c-format msgid "Failed while creating memory context \"%s\"." msgstr "创建内存上下文 \"%s\" 失败." -#: utils/mmgr/aset.c:502 utils/mmgr/aset.c:699 utils/mmgr/aset.c:892 +#: utils/mmgr/aset.c:504 utils/mmgr/aset.c:701 utils/mmgr/aset.c:894 #, c-format msgid "Failed on request of size %lu." msgstr "分配内存 %lu 大小失败." -#: utils/mmgr/portalmem.c:170 +#: utils/mmgr/portalmem.c:173 #, c-format msgid "cursor \"%s\" already exists" msgstr "游标 \"%s\" 已经存在" -#: utils/mmgr/portalmem.c:174 +#: utils/mmgr/portalmem.c:177 #, c-format msgid "closing existing cursor \"%s\"" msgstr "关闭已存在的游标 \"%s\"" @@ -4255,7 +4363,7 @@ msgstr "无法读取临时文件块 %ld: %m" msgid "type \"%s\" is only a shell" msgstr "类型 \"%s\" 只是一个 shell" -#: utils/cache/typcache.c:369 commands/indexcmds.c:680 +#: utils/cache/typcache.c:369 commands/indexcmds.c:694 #, c-format msgid "there are multiple default operator classes for data type %s" msgstr "数据类型 %s 有多个默认的操作符表" @@ -4269,28 +4377,28 @@ msgstr "类型 %s 不是复合类型" msgid "record type has not been registered" msgstr "记录类型没有注册" -#: utils/cache/lsyscache.c:1679 utils/cache/lsyscache.c:1715 -#: utils/cache/lsyscache.c:1751 utils/cache/lsyscache.c:1787 +#: utils/cache/lsyscache.c:1687 utils/cache/lsyscache.c:1723 +#: utils/cache/lsyscache.c:1759 utils/cache/lsyscache.c:1795 #, c-format msgid "type %s is only a shell" msgstr "类型 %s 只是一个 shell" -#: utils/cache/lsyscache.c:1684 +#: utils/cache/lsyscache.c:1692 #, c-format msgid "no input function available for type %s" msgstr "没有有效的 %s 类型输入函数" -#: utils/cache/lsyscache.c:1720 +#: utils/cache/lsyscache.c:1728 #, c-format msgid "no output function available for type %s" msgstr "没有有效的 %s 类型输出函数" -#: utils/cache/relcache.c:3264 +#: utils/cache/relcache.c:3293 #, c-format msgid "could not create relation-cache initialization file \"%s\": %m" msgstr "无法创建 relation-cache 初始化文件 \"%s\": %m" -#: utils/cache/relcache.c:3266 +#: utils/cache/relcache.c:3295 msgid "Continuing anyway, but there's something wrong." msgstr "仍继续, 但肯定有些错误存在." @@ -4308,80 +4416,80 @@ msgstr "无法作为标准输出重新打开文件 \"%s\": %m" msgid "[unknown]" msgstr "[未知]" -#: utils/error/elog.c:1474 utils/error/elog.c:1667 utils/error/elog.c:1743 +#: utils/error/elog.c:1488 utils/error/elog.c:1681 utils/error/elog.c:1757 msgid "missing error text" msgstr "缺少错误信息" -#: utils/error/elog.c:1477 utils/error/elog.c:1480 utils/error/elog.c:1746 -#: utils/error/elog.c:1749 +#: utils/error/elog.c:1491 utils/error/elog.c:1494 utils/error/elog.c:1760 +#: utils/error/elog.c:1763 #, c-format msgid " at character %d" msgstr " 第 %d 个字符处" -#: utils/error/elog.c:1490 +#: utils/error/elog.c:1504 msgid "DETAIL: " msgstr "详细信息: " -#: utils/error/elog.c:1497 +#: utils/error/elog.c:1511 msgid "HINT: " msgstr "提示: " -#: utils/error/elog.c:1504 +#: utils/error/elog.c:1518 msgid "QUERY: " msgstr "查询: " -#: utils/error/elog.c:1511 +#: utils/error/elog.c:1525 msgid "CONTEXT: " msgstr "上下文: " -#: utils/error/elog.c:1521 +#: utils/error/elog.c:1535 #, c-format msgid "LOCATION: %s, %s:%d\n" msgstr "位置: %s, %s:%d\n" -#: utils/error/elog.c:1528 +#: utils/error/elog.c:1542 #, c-format msgid "LOCATION: %s:%d\n" msgstr "位置: %s:%d\n" -#: utils/error/elog.c:1541 +#: utils/error/elog.c:1555 msgid "STATEMENT: " msgstr "语句: " -#: utils/error/elog.c:1859 +#: utils/error/elog.c:1873 #, c-format msgid "operating system error %d" msgstr "操作系统错误 %d" -#: utils/error/elog.c:1882 +#: utils/error/elog.c:1896 msgid "DEBUG" msgstr "调试" -#: utils/error/elog.c:1886 +#: utils/error/elog.c:1900 msgid "LOG" msgstr "日志" -#: utils/error/elog.c:1889 +#: utils/error/elog.c:1903 msgid "INFO" msgstr "信息" -#: utils/error/elog.c:1892 +#: utils/error/elog.c:1906 msgid "NOTICE" msgstr "注意" -#: utils/error/elog.c:1895 +#: utils/error/elog.c:1909 msgid "WARNING" msgstr "警告" -#: utils/error/elog.c:1898 +#: utils/error/elog.c:1912 msgid "ERROR" msgstr "错误" -#: utils/error/elog.c:1901 +#: utils/error/elog.c:1915 msgid "FATAL" msgstr "致命错误" -#: utils/error/elog.c:1904 +#: utils/error/elog.c:1918 msgid "PANIC" msgstr "比致命错误还过分的错误" @@ -4431,18 +4539,23 @@ msgstr "索引列大小 %lu 超过散列最大值 %lu" msgid "row is too big: size %lu, maximum size %lu" msgstr "行太大: 尺寸 %lu, 最大值 %lu" -#: access/heap/heapam.c:608 access/heap/heapam.c:643 access/heap/heapam.c:678 +#: access/heap/heapam.c:487 +#, c-format +msgid "could not obtain lock on relation \"%s\"" +msgstr "无法在关系 \"%s\" 上获得锁" + +#: access/heap/heapam.c:610 access/heap/heapam.c:645 access/heap/heapam.c:680 #: catalog/aclchk.c:286 #, c-format msgid "\"%s\" is an index" msgstr "\"%s\" 是一个索引" -#: access/heap/heapam.c:613 access/heap/heapam.c:648 access/heap/heapam.c:683 +#: access/heap/heapam.c:615 access/heap/heapam.c:650 access/heap/heapam.c:685 #, c-format msgid "\"%s\" is a special relation" msgstr "\"%s\" 为特别关系" -#: access/heap/heapam.c:618 access/heap/heapam.c:653 access/heap/heapam.c:688 +#: access/heap/heapam.c:620 access/heap/heapam.c:655 access/heap/heapam.c:690 #: catalog/aclchk.c:293 #, c-format msgid "\"%s\" is a composite type" @@ -4503,9 +4616,9 @@ msgid "could not access status of transaction %u" msgstr "无法处理事物 %u 的状态" #: access/transam/slru.c:645 access/transam/xlog.c:1527 -#: access/transam/xlog.c:1648 access/transam/xlog.c:2914 -#: access/transam/xlog.c:5311 access/transam/xlog.c:5429 -#: postmaster/postmaster.c:3431 +#: access/transam/xlog.c:1647 access/transam/xlog.c:2922 +#: access/transam/xlog.c:5340 access/transam/xlog.c:5458 +#: postmaster/postmaster.c:2907 #, c-format msgid "could not create file \"%s\": %m" msgstr "无法创建文件 \"%s\": %m" @@ -4526,13 +4639,13 @@ msgid "could not write to file \"%s\" at offset %u: %m" msgstr "无法往文件 \"%s\" 偏移量 %u 写入: %m" #: access/transam/slru.c:673 access/transam/xlog.c:1563 -#: access/transam/xlog.c:1688 access/transam/xlog.c:3011 +#: access/transam/xlog.c:1687 access/transam/xlog.c:3019 #, c-format msgid "could not fsync file \"%s\": %m" msgstr "无法 fsync 文件 \"%s\": %m" #: access/transam/slru.c:680 access/transam/xlog.c:1568 -#: access/transam/xlog.c:1693 access/transam/xlog.c:3016 +#: access/transam/xlog.c:1692 access/transam/xlog.c:3024 #, c-format msgid "could not close file \"%s\": %m" msgstr "无法关闭文件 \"%s\": %m" @@ -4547,250 +4660,254 @@ msgstr "" msgid "removing file \"%s\"" msgstr "删除文件 \"%s\"" -#: access/transam/slru.c:967 commands/tablespace.c:577 -#: commands/tablespace.c:721 +#: access/transam/slru.c:967 commands/tablespace.c:573 +#: commands/tablespace.c:719 #, c-format msgid "could not read directory \"%s\": %m" msgstr "无法读取目录 \"%s\": %m" -#: access/transam/xact.c:402 +#: access/transam/xact.c:510 msgid "cannot have more than 2^32-1 commands in a transaction" msgstr "在一个事物中不可以超过 2^32-1 个命令" #. translator: %s represents an SQL statement name -#: access/transam/xact.c:1996 +#: access/transam/xact.c:2178 #, c-format msgid "%s cannot run inside a transaction block" msgstr "%s 无法在事物块中运行" #. translator: %s represents an SQL statement name -#: access/transam/xact.c:2006 +#: access/transam/xact.c:2188 #, c-format msgid "%s cannot run inside a subtransaction" msgstr "%s 无法在一个子事物中运行" #. translator: %s represents an SQL statement name -#: access/transam/xact.c:2018 +#: access/transam/xact.c:2200 #, c-format msgid "%s cannot be executed from a function" msgstr "来自一个函数的 %s 不能被执行" #. translator: %s represents an SQL statement name -#: access/transam/xact.c:2069 +#: access/transam/xact.c:2251 #, c-format msgid "%s may only be used in transaction blocks" msgstr "%s 只可以在事物块中使用" -#: access/transam/xact.c:2197 +#: access/transam/xact.c:2434 msgid "there is already a transaction in progress" msgstr "已经有一个事物在运行中" -#: access/transam/xact.c:2290 access/transam/xact.c:2377 +#: access/transam/xact.c:2549 access/transam/xact.c:2640 msgid "there is no transaction in progress" msgstr "没有事物在运行中" -#: access/transam/xact.c:2467 access/transam/xact.c:2514 -#: access/transam/xact.c:2520 access/transam/xact.c:2562 -#: access/transam/xact.c:2613 access/transam/xact.c:2619 +#: access/transam/xact.c:2732 access/transam/xact.c:2781 +#: access/transam/xact.c:2787 access/transam/xact.c:2831 +#: access/transam/xact.c:2878 access/transam/xact.c:2884 msgid "no such savepoint" msgstr "" -#: access/transam/xlog.c:906 +#: access/transam/xact.c:3522 +msgid "cannot have more than 2^32-1 subtransactions in a transaction" +msgstr "在一个事物中不可以超过有 2^32-1 个子事物" + +#: access/transam/xlog.c:907 #, c-format msgid "could not create archive status file \"%s\": %m" msgstr "无法创建归档状态文件 \"%s\": %m" -#: access/transam/xlog.c:914 +#: access/transam/xlog.c:915 #, c-format msgid "could not write archive status file \"%s\": %m" msgstr "无法写入归档状态文件 \"%s\": %m" -#: access/transam/xlog.c:1179 access/transam/xlog.c:1303 -#: access/transam/xlog.c:5171 +#: access/transam/xlog.c:1180 access/transam/xlog.c:1304 +#: access/transam/xlog.c:5192 #, c-format msgid "could not close log file %u, segment %u: %m" msgstr "无法关闭日志文件 %u, 段 %u: %m" -#: access/transam/xlog.c:1237 access/transam/xlog.c:2407 +#: access/transam/xlog.c:1238 access/transam/xlog.c:2416 #, c-format msgid "could not seek in log file %u, segment %u to offset %u: %m" msgstr "无法在日志文件 %u 中查找, 段 %u 偏移量 %u: %m" -#: access/transam/xlog.c:1251 +#: access/transam/xlog.c:1252 #, c-format msgid "could not write to log file %u, segment %u at offset %u: %m" msgstr "无法写入日志文件 %u, 段 %u 偏移量 %u: %m" -#: access/transam/xlog.c:1503 access/transam/xlog.c:1595 -#: access/transam/xlog.c:1809 access/transam/xlog.c:1863 -#: access/transam/xlog.c:1872 +#: access/transam/xlog.c:1504 access/transam/xlog.c:1595 +#: access/transam/xlog.c:1808 access/transam/xlog.c:1862 +#: access/transam/xlog.c:1871 #, c-format msgid "could not open file \"%s\" (log file %u, segment %u): %m" msgstr "无法打开文件 \"%s\" (日志文件 %u, 段 %u): %m" -#: access/transam/xlog.c:1661 access/transam/xlog.c:2945 -#: access/transam/xlog.c:5400 access/transam/xlog.c:5451 -#: access/transam/xlog.c:5523 access/transam/xlog.c:5548 -#: access/transam/xlog.c:5586 +#: access/transam/xlog.c:1660 access/transam/xlog.c:2953 +#: access/transam/xlog.c:5429 access/transam/xlog.c:5480 +#: access/transam/xlog.c:5552 access/transam/xlog.c:5577 +#: access/transam/xlog.c:5615 #, c-format msgid "could not read file \"%s\": %m" msgstr "无法读取文件 \"%s\": %m" -#: access/transam/xlog.c:1664 +#: access/transam/xlog.c:1663 #, c-format -msgid "insufficient data in file \"%s\"" +msgid "not enough data in file \"%s\"" msgstr "文件 \"%s\" 中的数据不足" -#: access/transam/xlog.c:1776 +#: access/transam/xlog.c:1775 #, c-format msgid "" "could not link file \"%s\" to \"%s\" (initialization of log file %u, segment " "%u): %m" msgstr "无法链接文件 \"%s\" 到 \"%s\" (日志文件 %u 的初始化, 段 %u): %m" -#: access/transam/xlog.c:1783 +#: access/transam/xlog.c:1782 #, c-format msgid "" "could not rename file \"%s\" to \"%s\" (initialization of log file %u, " "segment %u): %m" msgstr "无法重命名文件 \"%s\" 为 \"%s\" (日志文件 %u 的初始化, 段 %u): %m" -#: access/transam/xlog.c:1938 access/transam/xlog.c:2040 -#: access/transam/xlog.c:5294 +#: access/transam/xlog.c:1937 access/transam/xlog.c:2039 +#: access/transam/xlog.c:5323 #, c-format -msgid "could not stat \"%s\": %m" -msgstr "无法取 \"%s\" 的状态: %m" +msgid "could not stat file \"%s\": %m" +msgstr "无法取文件 \"%s\" 的状态: %m" -#: access/transam/xlog.c:1946 access/transam/xlog.c:5456 -#: access/transam/xlog.c:5610 postmaster/postmaster.c:3569 +#: access/transam/xlog.c:1945 access/transam/xlog.c:5485 +#: access/transam/xlog.c:5639 commands/tablespace.c:589 #, c-format msgid "could not remove file \"%s\": %m" msgstr "无法删除文件 \"%s\": %m" -#: access/transam/xlog.c:2021 +#: access/transam/xlog.c:2020 #, c-format msgid "archive file \"%s\" has wrong size: %lu instead of %lu" msgstr "" -#: access/transam/xlog.c:2028 +#: access/transam/xlog.c:2027 #, c-format msgid "restored log file \"%s\" from archive" msgstr "从归档中恢复日志文件 \"%s\"" -#: access/transam/xlog.c:2053 +#: access/transam/xlog.c:2052 #, c-format -msgid "could not restore \"%s\" from archive: return code %d" -msgstr "无法从归档中恢复 \"%s\": 返回码为 %d" +msgid "could not restore file \"%s\" from archive: return code %d" +msgstr "无法从归档中恢复文件 \"%s\": 返回码为 %d" -#: access/transam/xlog.c:2113 +#: access/transam/xlog.c:2120 #, c-format msgid "could not open transaction log directory \"%s\": %m" msgstr "无法打开事务日志目录 \"%s\": %m" -#: access/transam/xlog.c:2158 +#: access/transam/xlog.c:2165 #, c-format msgid "recycled transaction log file \"%s\"" msgstr "回收事务日志文件 \"%s\"" -#: access/transam/xlog.c:2165 +#: access/transam/xlog.c:2173 #, c-format msgid "removing transaction log file \"%s\"" msgstr "删除事务日志文件 \"%s\"" -#: access/transam/xlog.c:2187 +#: access/transam/xlog.c:2196 #, c-format msgid "could not read transaction log directory \"%s\": %m" msgstr "无法读取事务日志目录 \"%s\": %m" -#: access/transam/xlog.c:2271 +#: access/transam/xlog.c:2280 #, c-format msgid "incorrect resource manager data checksum in record at %X/%X" msgstr "在记录的 %X/%X 中的不正确资源管理数据校验值" -#: access/transam/xlog.c:2294 +#: access/transam/xlog.c:2303 #, c-format msgid "incorrect checksum of backup block %d in record at %X/%X" msgstr "记录位置 %2$X/%3$X 的备份 (backup) 块 %1$d 校验值不正确" -#: access/transam/xlog.c:2367 access/transam/xlog.c:2437 +#: access/transam/xlog.c:2376 access/transam/xlog.c:2446 #, c-format msgid "invalid record offset at %X/%X" msgstr "无效的记录偏移量 %X/%X" -#: access/transam/xlog.c:2415 +#: access/transam/xlog.c:2424 #, c-format msgid "could not read from log file %u, segment %u at offset %u: %m" msgstr "无法从日志文件 %u 读取, 段 %u 偏移量 %u: %m" -#: access/transam/xlog.c:2445 +#: access/transam/xlog.c:2454 #, c-format msgid "contrecord is requested by %X/%X" msgstr "%X/%X 需要 contrecord" -#: access/transam/xlog.c:2460 +#: access/transam/xlog.c:2469 #, c-format msgid "record with zero length at %X/%X" msgstr "在 %X/%X 位置有零长度的记录" -#: access/transam/xlog.c:2467 +#: access/transam/xlog.c:2476 #, c-format msgid "invalid resource manager ID %u at %X/%X" msgstr "在 %2$X/%3$X 位置, 为无效的资源管理 ID %1$u" -#: access/transam/xlog.c:2505 +#: access/transam/xlog.c:2514 #, c-format msgid "record length %u at %X/%X too long" msgstr "在 %2$X/%3$X, 记录长度 %1$u 太长" -#: access/transam/xlog.c:2541 +#: access/transam/xlog.c:2550 #, c-format msgid "could not read from log file %u, segment %u, offset %u: %m" msgstr "无法从日志文件 %u 读取, 段 %u, 偏移量 %u: %m" -#: access/transam/xlog.c:2550 +#: access/transam/xlog.c:2559 #, c-format msgid "there is no contrecord flag in log file %u, segment %u, offset %u" msgstr "日志文件 %u, 段 %u, 偏移量 %u 中没有 contrecord 标志" -#: access/transam/xlog.c:2560 +#: access/transam/xlog.c:2569 #, c-format msgid "invalid contrecord length %u in log file %u, segment %u, offset %u" msgstr "日志文件 %2$u 中无效的 contrecord 长度 %1$u, 段 %3$u, 偏移量 %4$u" -#: access/transam/xlog.c:2627 +#: access/transam/xlog.c:2636 #, c-format msgid "invalid magic number %04X in log file %u, segment %u, offset %u" msgstr "日志文件 %2$u, 段 %3$u, 偏移量 %4$u 中无效的 magic 数字 %1$04X" -#: access/transam/xlog.c:2634 +#: access/transam/xlog.c:2643 #, c-format msgid "invalid info bits %04X in log file %u, segment %u, offset %u" msgstr "日志文件 %2$u 中无效的信息 (info) 位 %1$04X, 段 %3$u, 偏移量 %4$u" -#: access/transam/xlog.c:2656 access/transam/xlog.c:2664 +#: access/transam/xlog.c:2665 access/transam/xlog.c:2673 msgid "WAL file is from different system" msgstr "WAL 文件来自不同的系统" -#: access/transam/xlog.c:2657 +#: access/transam/xlog.c:2666 #, c-format msgid "WAL file SYSID is %s, pg_control SYSID is %s" msgstr "WAL 文件的 SYSID 是 %s, pg_control 的 SYSID 是 %s" -#: access/transam/xlog.c:2665 +#: access/transam/xlog.c:2674 msgid "Incorrect XLOG_SEG_SIZE in page header." msgstr "页头中不正确的 XLOG_SEG_SIZE." -#: access/transam/xlog.c:2674 +#: access/transam/xlog.c:2683 #, c-format msgid "unexpected pageaddr %X/%X in log file %u, segment %u, offset %u" msgstr "日志文件 %3$u 中意外的页地址 %1$X/%2$X, 段 %4$u, 偏移量 %5$u" -#: access/transam/xlog.c:2686 +#: access/transam/xlog.c:2695 #, c-format msgid "unexpected timeline ID %u in log file %u, segment %u, offset %u" msgstr "日志文件 %2$u 中意外的 timeline ID %1$u, 段 %3$u, 偏移量 %4$u" -#: access/transam/xlog.c:2704 +#: access/transam/xlog.c:2713 #, c-format msgid "" "out-of-sequence timeline ID %u (after %u) in log file %u, segment %u, offset " @@ -4798,94 +4915,88 @@ msgid "" msgstr "" "日志文件 %3$u 中超出序列的 timeline ID %1$u (%2$u 之后), 段 %4$u, 偏移量 %5$u" -#: access/transam/xlog.c:2744 access/transam/xlog.c:2834 -#: access/transam/xlog.c:2933 -#, c-format -msgid "could not open \"%s\": %m" -msgstr "无法打开 \"%s\": %m" - -#: access/transam/xlog.c:2773 +#: access/transam/xlog.c:2782 #, c-format msgid "syntax error in history file: %s" msgstr "历史文件中的语法错误: %s" -#: access/transam/xlog.c:2774 +#: access/transam/xlog.c:2783 msgid "Expected a numeric timeline ID." msgstr "期望一个数字 timeline ID." -#: access/transam/xlog.c:2779 +#: access/transam/xlog.c:2788 #, c-format msgid "invalid data in history file: %s" msgstr "历史文件中的无效数据: %s" -#: access/transam/xlog.c:2780 +#: access/transam/xlog.c:2789 msgid "Timeline IDs must be in increasing sequence." msgstr "TimeLine ID 必须为递增序列." -#: access/transam/xlog.c:2793 +#: access/transam/xlog.c:2802 #, c-format msgid "invalid data in history file \"%s\"" msgstr "历史文件 \"%s\" 中存在无效数据" -#: access/transam/xlog.c:2794 +#: access/transam/xlog.c:2803 msgid "Timeline IDs must be less than child timeline's ID." msgstr "Timeline ID 必须小于子 timeline 的 ID." -#: access/transam/xlog.c:3033 +#: access/transam/xlog.c:3041 #, c-format msgid "could not link file \"%s\" to \"%s\": %m" msgstr "无法把文件 \"%s\" 链接到 \"%s\": %m" -#: access/transam/xlog.c:3040 access/transam/xlog.c:3822 -#: access/transam/xlog.c:3865 commands/user.c:280 commands/user.c:410 -#: postmaster/pgarch.c:597 +#: access/transam/xlog.c:3048 access/transam/xlog.c:3830 +#: access/transam/xlog.c:3873 commands/user.c:282 commands/user.c:412 +#: postmaster/pgarch.c:596 #, c-format msgid "could not rename file \"%s\" to \"%s\": %m" msgstr "无法把文件 \"%s\" 重命名为 \"%s\": %m" -#: access/transam/xlog.c:3101 +#: access/transam/xlog.c:3109 msgid "invalid LC_COLLATE setting" msgstr "无效的 LC_COLLATE 设置" -#: access/transam/xlog.c:3106 +#: access/transam/xlog.c:3114 msgid "invalid LC_CTYPE setting" msgstr "无效的 LC_CTYPE 设置" -#: access/transam/xlog.c:3125 +#: access/transam/xlog.c:3133 msgid "sizeof(ControlFileData) is larger than BLCKSZ; fix either one" msgstr "sizeof(ControlFileData) 比 BLCKSZ 大; 修复其中一个" -#: access/transam/xlog.c:3135 +#: access/transam/xlog.c:3143 #, c-format msgid "could not create control file \"%s\": %m" msgstr "无法创建控制文件 \"%s\": %m" -#: access/transam/xlog.c:3146 access/transam/xlog.c:3333 +#: access/transam/xlog.c:3154 access/transam/xlog.c:3341 #, c-format msgid "could not write to control file: %m" msgstr "无法写入控制文件: %m" -#: access/transam/xlog.c:3152 access/transam/xlog.c:3339 +#: access/transam/xlog.c:3160 access/transam/xlog.c:3347 #, c-format msgid "could not fsync control file: %m" msgstr "无法 fsync 控制文件: %m" -#: access/transam/xlog.c:3157 access/transam/xlog.c:3344 +#: access/transam/xlog.c:3165 access/transam/xlog.c:3352 #, c-format msgid "could not close control file: %m" msgstr "无法关闭控制文件: %m" -#: access/transam/xlog.c:3173 access/transam/xlog.c:3322 +#: access/transam/xlog.c:3181 access/transam/xlog.c:3330 #, c-format msgid "could not open control file \"%s\": %m" msgstr "无法打开控制文件 \"%s\": %m" -#: access/transam/xlog.c:3179 +#: access/transam/xlog.c:3187 #, c-format msgid "could not read from control file: %m" msgstr "无法读取控制文件: %m" -#: access/transam/xlog.c:3192 +#: access/transam/xlog.c:3200 #, c-format msgid "" "The database cluster was initialized with PG_CONTROL_VERSION %d, but the " @@ -4894,15 +5005,15 @@ msgstr "" "数据库簇是以 PG_CONTROL_VERSION %d 初始化的, 但是 服务器是以 " "PG_CONTROL_VERSION %d 编译的." -#: access/transam/xlog.c:3195 access/transam/xlog.c:3225 +#: access/transam/xlog.c:3203 access/transam/xlog.c:3233 msgid "It looks like you need to initdb." msgstr "看上去, 你需要初始化数据库." -#: access/transam/xlog.c:3205 +#: access/transam/xlog.c:3213 msgid "incorrect checksum in control file" msgstr "控制文件的校验值不正确" -#: access/transam/xlog.c:3222 +#: access/transam/xlog.c:3230 #, c-format msgid "" "The database cluster was initialized with CATALOG_VERSION_NO %d, but the " @@ -4911,21 +5022,21 @@ msgstr "" "数据库簇是以 CATALOG_VERSION_NO %d 初始化的, 但是 服务器是以 " "CATALOG_VERSION_NO %d 编译的." -#: access/transam/xlog.c:3229 +#: access/transam/xlog.c:3237 #, c-format msgid "" "The database cluster was initialized with BLCKSZ %d, but the server was " "compiled with BLCKSZ %d." msgstr "数据库簇是以 BLCKSZ %d 初始化的, 但是 服务器是以 BLCKSZ %d 编译的." -#: access/transam/xlog.c:3232 access/transam/xlog.c:3239 -#: access/transam/xlog.c:3246 access/transam/xlog.c:3253 -#: access/transam/xlog.c:3260 access/transam/xlog.c:3268 -#: access/transam/xlog.c:3275 access/transam/xlog.c:3284 +#: access/transam/xlog.c:3240 access/transam/xlog.c:3247 +#: access/transam/xlog.c:3254 access/transam/xlog.c:3261 +#: access/transam/xlog.c:3268 access/transam/xlog.c:3276 +#: access/transam/xlog.c:3283 access/transam/xlog.c:3292 msgid "It looks like you need to recompile or initdb." msgstr "看上去, 你需要重新编译或初始化数据库." -#: access/transam/xlog.c:3236 +#: access/transam/xlog.c:3244 #, c-format msgid "" "The database cluster was initialized with RELSEG_SIZE %d, but the server was " @@ -4933,7 +5044,7 @@ msgid "" msgstr "" "数据库簇是以 RELSEG_SIZE %d 初始化的, 但是 服务器是以 RELSEG_SIZE %d 编译的." -#: access/transam/xlog.c:3243 +#: access/transam/xlog.c:3251 #, c-format msgid "" "The database cluster was initialized with XLOG_SEG_SIZE %d, but the server " @@ -4942,7 +5053,7 @@ msgstr "" "数据库簇是以 XLOG_SEG_SIZE %d 初始化的, 但是 服务器是以 XLOG_SEG_SIZE %d 编译" "的." -#: access/transam/xlog.c:3250 +#: access/transam/xlog.c:3258 #, c-format msgid "" "The database cluster was initialized with NAMEDATALEN %d, but the server was " @@ -4950,7 +5061,7 @@ msgid "" msgstr "" "数据库簇是以 NAMEDATALEN %d 初始化的, 但是 服务器是以 NAMEDATALEN %d 编译的." -#: access/transam/xlog.c:3257 +#: access/transam/xlog.c:3265 #, c-format msgid "" "The database cluster was initialized with FUNC_MAX_ARGS %d, but the server " @@ -4959,7 +5070,7 @@ msgstr "" "数据库簇是以 FUNC_MAX_ARGS %d 初始化的, 但是 服务器是以 FUNC_MAX_ARGS %d 编译" "的." -#: access/transam/xlog.c:3266 +#: access/transam/xlog.c:3274 msgid "" "The database cluster was initialized without HAVE_INT64_TIMESTAMP but the " "server was compiled with HAVE_INT64_TIMESTAMP." @@ -4967,7 +5078,7 @@ msgstr "" "数据库簇初始化时没有定义 HAVE_INT64_TIMESTAMP, 但是 服务器编译时定义了 " "HAVE_INT64_TIMESTAMP." -#: access/transam/xlog.c:3273 +#: access/transam/xlog.c:3281 msgid "" "The database cluster was initialized with HAVE_INT64_TIMESTAMP but the " "server was compiled without HAVE_INT64_TIMESTAMP." @@ -4975,7 +5086,7 @@ msgstr "" "数据库簇初始化时定义了 HAVE_INT64_TIMESTAMP, 但是 服务器编译时没有定义 " "HAVE_INT64_TIMESTAMP." -#: access/transam/xlog.c:3281 +#: access/transam/xlog.c:3289 #, c-format msgid "" "The database cluster was initialized with LOCALE_NAME_BUFLEN %d, but the " @@ -4984,11 +5095,11 @@ msgstr "" "数据库簇初始化时定义 LOCALE_NAME_BUFLEN 为 %d, 但是 服务器编译时定义 " "LOCALE_NAME_BUFLEN 为 %d." -#: access/transam/xlog.c:3287 access/transam/xlog.c:3294 +#: access/transam/xlog.c:3295 access/transam/xlog.c:3302 msgid "database files are incompatible with operating system" msgstr "数据库文件和操作系统不兼容" -#: access/transam/xlog.c:3288 +#: access/transam/xlog.c:3296 #, c-format msgid "" "The database cluster was initialized with LC_COLLATE \"%s\", which is not " @@ -4997,11 +5108,11 @@ msgstr "" "数据库簇是带 LC_COLLATE \"%s\" 初始化的, 但此 LC_COLLATE 是不被 setlocale() " "认可的." -#: access/transam/xlog.c:3291 access/transam/xlog.c:3298 +#: access/transam/xlog.c:3299 access/transam/xlog.c:3306 msgid "It looks like you need to initdb or install locale support." msgstr "看上去, 你好像需要初始化数据库 (initdb) 或者安装本地化 (locale) 支持." -#: access/transam/xlog.c:3295 +#: access/transam/xlog.c:3303 #, c-format msgid "" "The database cluster was initialized with LC_CTYPE \"%s\", which is not " @@ -5010,371 +5121,393 @@ msgstr "" "数据库簇是带 LC_CTYPE \"%s\" 初始化的, 但此 LC_CTYPE 是不被 setlocale() 认可" "的." -#: access/transam/xlog.c:3521 +#: access/transam/xlog.c:3529 #, c-format msgid "could not write bootstrap transaction log file: %m" msgstr "无法写入 bootstrap 事务日志文件: %m" -#: access/transam/xlog.c:3527 +#: access/transam/xlog.c:3535 #, c-format msgid "could not fsync bootstrap transaction log file: %m" msgstr "无法同步 (fsync) 事务日志文件: %m" -#: access/transam/xlog.c:3532 +#: access/transam/xlog.c:3540 #, c-format msgid "could not close bootstrap transaction log file: %m" msgstr "无法关闭 bootstrap 事务日志文件: %m" -#: access/transam/xlog.c:3594 +#: access/transam/xlog.c:3602 #, c-format msgid "could not open recovery command file \"%s\": %m" msgstr "无法打开恢复命令文件 \"%s\": %m" -#: access/transam/xlog.c:3599 +#: access/transam/xlog.c:3607 msgid "starting archive recovery" msgstr "开始归档恢复" -#: access/transam/xlog.c:3644 +#: access/transam/xlog.c:3652 #, c-format msgid "restore_command = \"%s\"" msgstr "restore_command = \"%s\"" -#: access/transam/xlog.c:3658 +#: access/transam/xlog.c:3666 #, c-format msgid "recovery_target_timeline is not a valid number: \"%s\"" msgstr "recovery_target_timeline 不是一个有效的数字: \"%s\"" -#: access/transam/xlog.c:3663 +#: access/transam/xlog.c:3671 #, c-format msgid "recovery_target_timeline = %u" msgstr "recovery_target_timeline = %u" -#: access/transam/xlog.c:3666 +#: access/transam/xlog.c:3674 msgid "recovery_target_timeline = latest" msgstr "recovery_target_timeline = latest" -#: access/transam/xlog.c:3674 +#: access/transam/xlog.c:3682 #, c-format msgid "recovery_target_xid is not a valid number: \"%s\"" msgstr "recovery_target_xid 不是一个有效的数字: \"%s\"" -#: access/transam/xlog.c:3677 +#: access/transam/xlog.c:3685 #, c-format msgid "recovery_target_xid = %u" msgstr "recovery_target_xid = %u" -#: access/transam/xlog.c:3702 +#: access/transam/xlog.c:3710 #, c-format msgid "recovery_target_time = %s" msgstr "recovery_target_time = %s" -#: access/transam/xlog.c:3719 +#: access/transam/xlog.c:3727 #, c-format msgid "recovery_target_inclusive = %s" msgstr "recovery_target_inclusive = %s" -#: access/transam/xlog.c:3723 +#: access/transam/xlog.c:3731 #, c-format msgid "unrecognized recovery parameter \"%s\"" msgstr "未认可的恢复参数 \"%s\"" -#: access/transam/xlog.c:3731 +#: access/transam/xlog.c:3739 #, c-format msgid "syntax error in recovery command file: %s" msgstr "恢复命令文件语法错误: %s" -#: access/transam/xlog.c:3733 +#: access/transam/xlog.c:3741 msgid "Lines should have the format parameter = 'value'." msgstr "行格式为 参数 = '值'." -#: access/transam/xlog.c:3738 +#: access/transam/xlog.c:3746 #, c-format msgid "recovery command file \"%s\" did not specify restore_command" msgstr "恢复命令文件 \"%s\" 没有指定 restore_command" -#: access/transam/xlog.c:3757 +#: access/transam/xlog.c:3765 #, c-format msgid "recovery_target_timeline %u does not exist" msgstr "recovery_target_timeline %u 不存在" -#: access/transam/xlog.c:3869 +#: access/transam/xlog.c:3877 msgid "archive recovery complete" msgstr "归档恢复完毕" -#: access/transam/xlog.c:3953 +#: access/transam/xlog.c:3961 #, c-format msgid "recovery stopping after commit of transaction %u, time %s" msgstr "恢复停止在事物 %u 提交之后, 时间 %s" -#: access/transam/xlog.c:3957 +#: access/transam/xlog.c:3965 #, c-format msgid "recovery stopping before commit of transaction %u, time %s" msgstr "恢复停止在事物 %u 提交之前, 时间 %s" -#: access/transam/xlog.c:3964 +#: access/transam/xlog.c:3972 #, c-format msgid "recovery stopping after abort of transaction %u, time %s" msgstr "恢复停止在事物 %u 中断之后, 时间 %s" -#: access/transam/xlog.c:3968 +#: access/transam/xlog.c:3976 #, c-format msgid "recovery stopping before abort of transaction %u, time %s" msgstr "恢复停止在事物 %u 中断之前, 时间 %s" -#: access/transam/xlog.c:4010 +#: access/transam/xlog.c:4018 msgid "control file contains invalid data" msgstr "控制文件包含无效的数据" -#: access/transam/xlog.c:4014 +#: access/transam/xlog.c:4022 #, c-format msgid "database system was shut down at %s" msgstr "数据库上次关闭时间为 %s" -#: access/transam/xlog.c:4018 +#: access/transam/xlog.c:4026 #, c-format msgid "database system shutdown was interrupted at %s" msgstr "数据库系统在 %s 被中断关闭" -#: access/transam/xlog.c:4022 +#: access/transam/xlog.c:4030 #, c-format msgid "database system was interrupted while in recovery at %s" msgstr "恢复时, 数据库系统在 %s 被中断" -#: access/transam/xlog.c:4024 +#: access/transam/xlog.c:4032 msgid "" "This probably means that some data is corrupted and you will have to use the " "last backup for recovery." msgstr "这意味着一些数据被毁坏, 你将不得不使用最新的备份恢复." -#: access/transam/xlog.c:4028 +#: access/transam/xlog.c:4036 #, c-format msgid "database system was interrupted at %s" msgstr "数据库系统在 %s 被中断" -#: access/transam/xlog.c:4060 +#: access/transam/xlog.c:4068 #, c-format msgid "requested timeline %u is not a child of database system timeline %u" msgstr "" -#: access/transam/xlog.c:4075 access/transam/xlog.c:4097 +#: access/transam/xlog.c:4083 access/transam/xlog.c:4105 #, c-format msgid "checkpoint record is at %X/%X" msgstr "checkpoint 记录位置在 %X/%X" -#: access/transam/xlog.c:4082 +#: access/transam/xlog.c:4090 msgid "could not locate required checkpoint record" msgstr "无法找到需要的 checkpoint 记录" -#: access/transam/xlog.c:4083 +#: access/transam/xlog.c:4091 +#, c-format msgid "" -"If you are not restoring from a backup, try removing $PGDATA/backup_label." -msgstr "如果你不是从备份恢复, 请删除 $PGDATA/backup_label." +"If you are not restoring from a backup, try removing the file \"%s/" +"backup_label\"." +msgstr "如果你不是从备份恢复, 请删除 \"%s/backup_label\"." -#: access/transam/xlog.c:4107 +#: access/transam/xlog.c:4115 #, c-format msgid "using previous checkpoint record at %X/%X" msgstr "使用在 %X/%X 的前一个 checkpoint 记录" -#: access/transam/xlog.c:4114 +#: access/transam/xlog.c:4122 msgid "could not locate a valid checkpoint record" msgstr "无法找到一个有效的 checkpoint 记录" -#: access/transam/xlog.c:4123 +#: access/transam/xlog.c:4131 #, c-format msgid "redo record is at %X/%X; undo record is at %X/%X; shutdown %s" msgstr "" -#: access/transam/xlog.c:4128 +#: access/transam/xlog.c:4136 #, c-format msgid "next transaction ID: %u; next OID: %u" msgstr "下一个事物 ID: %u; 下一个 OID: %u" -#: access/transam/xlog.c:4132 +#: access/transam/xlog.c:4140 msgid "invalid next transaction ID" msgstr "无效的下一个事务 ID" -#: access/transam/xlog.c:4149 +#: access/transam/xlog.c:4157 msgid "invalid redo in checkpoint record" msgstr "" -#: access/transam/xlog.c:4163 +#: access/transam/xlog.c:4171 msgid "invalid redo/undo record in shutdown checkpoint" msgstr "" -#: access/transam/xlog.c:4181 +#: access/transam/xlog.c:4189 msgid "automatic recovery in progress" msgstr "" -#: access/transam/xlog.c:4184 +#: access/transam/xlog.c:4192 msgid "" "database system was not properly shut down; automatic recovery in progress" msgstr "数据库系统没有正确的关闭; 自动恢复" -#: access/transam/xlog.c:4221 +#: access/transam/xlog.c:4229 #, c-format msgid "redo starts at %X/%X" msgstr "redo 在 %X/%X 开始" -#: access/transam/xlog.c:4279 +#: access/transam/xlog.c:4287 #, c-format msgid "redo done at %X/%X" msgstr "redo 在 %X/%X 完成" -#: access/transam/xlog.c:4287 +#: access/transam/xlog.c:4295 msgid "redo is not required" msgstr "不需要 redo" -#: access/transam/xlog.c:4307 +#: access/transam/xlog.c:4315 msgid "requested recovery stop point is before end time of backup dump" msgstr "" -#: access/transam/xlog.c:4311 +#: access/transam/xlog.c:4319 msgid "WAL ends before end time of backup dump" msgstr "" -#: access/transam/xlog.c:4326 +#: access/transam/xlog.c:4334 #, c-format msgid "selected new timeline ID: %u" msgstr "" -#: access/transam/xlog.c:4408 +#: access/transam/xlog.c:4416 #, c-format msgid "undo starts at %X/%X" msgstr "undo 在 %X/%X 开始" -#: access/transam/xlog.c:4419 +#: access/transam/xlog.c:4427 #, c-format msgid "undo done at %X/%X" msgstr "undo 在 %X/%X 完成" -#: access/transam/xlog.c:4424 +#: access/transam/xlog.c:4432 msgid "undo is not required" msgstr "不需要 undo" -#: access/transam/xlog.c:4492 +#: access/transam/xlog.c:4500 msgid "database system is ready" msgstr "数据库系统准备就绪" -#: access/transam/xlog.c:4531 +#: access/transam/xlog.c:4539 msgid "invalid primary checkpoint link in control file" msgstr "在控制文件中无效的主 checkpoint 链接" -#: access/transam/xlog.c:4535 +#: access/transam/xlog.c:4543 msgid "invalid secondary checkpoint link in control file" msgstr "在控制文件中无效的次 checkpoint 链接" -#: access/transam/xlog.c:4539 +#: access/transam/xlog.c:4547 msgid "invalid checkpoint link in backup_label file" msgstr "在 backup_label 文件中无效的 checkpoint 链接" -#: access/transam/xlog.c:4553 +#: access/transam/xlog.c:4561 msgid "invalid primary checkpoint record" msgstr "无效的主 checkpoint 记录" -#: access/transam/xlog.c:4557 +#: access/transam/xlog.c:4565 msgid "invalid secondary checkpoint record" msgstr "无效的次 checkpoint 记录" -#: access/transam/xlog.c:4561 +#: access/transam/xlog.c:4569 msgid "invalid checkpoint record" msgstr "无效的 checkpoint 记录" -#: access/transam/xlog.c:4572 +#: access/transam/xlog.c:4580 msgid "invalid resource manager ID in primary checkpoint record" msgstr "在主 checkpoint 记录中的无效资源管理器 ID" -#: access/transam/xlog.c:4576 +#: access/transam/xlog.c:4584 msgid "invalid resource manager ID in secondary checkpoint record" msgstr "在次 checkpoint 记录中的无效资源管理器 ID" -#: access/transam/xlog.c:4580 +#: access/transam/xlog.c:4588 msgid "invalid resource manager ID in checkpoint record" msgstr "在 checkpoint 记录中的无效资源管理器 ID" -#: access/transam/xlog.c:4592 +#: access/transam/xlog.c:4600 msgid "invalid xl_info in primary checkpoint record" msgstr "在主 checkpoint 记录中无效的 xl_info" -#: access/transam/xlog.c:4596 +#: access/transam/xlog.c:4604 msgid "invalid xl_info in secondary checkpoint record" msgstr "在次 checkpoint 记录中无效的 xl_info" -#: access/transam/xlog.c:4600 +#: access/transam/xlog.c:4608 msgid "invalid xl_info in checkpoint record" msgstr "在 checkpoint 记录中无效的 xl_info" -#: access/transam/xlog.c:4611 +#: access/transam/xlog.c:4619 msgid "invalid length of primary checkpoint record" msgstr "无效的主 checkpoint 记录长度" -#: access/transam/xlog.c:4615 +#: access/transam/xlog.c:4623 msgid "invalid length of secondary checkpoint record" msgstr "无效的次 checkpoint 记录长度" -#: access/transam/xlog.c:4619 +#: access/transam/xlog.c:4627 msgid "invalid length of checkpoint record" msgstr "无效的 checkpoint 记录长度" -#: access/transam/xlog.c:4672 +#: access/transam/xlog.c:4680 msgid "shutting down" msgstr "正在关闭" -#: access/transam/xlog.c:4681 +#: access/transam/xlog.c:4689 msgid "database system is shut down" msgstr "数据库系统已关闭" -#: access/transam/xlog.c:4894 +#: access/transam/xlog.c:4880 +msgid "checkpoint starting" +msgstr "检查点开始" + +#: access/transam/xlog.c:4909 msgid "" "concurrent transaction log activity while database system is shutting down" msgstr "当数据库正在关闭时, 仍有活跃的并发事物日志" -#: access/transam/xlog.c:5020 +#: access/transam/xlog.c:4981 +#, c-format +msgid "" +"checkpoint complete; %d transaction log file(s) added, %d removed, %d " +"recycled" +msgstr "" + +#: access/transam/xlog.c:5041 #, c-format msgid "unexpected timeline ID %u (after %u) in checkpoint record" msgstr "" -#: access/transam/xlog.c:5043 +#: access/transam/xlog.c:5064 #, c-format msgid "unexpected timeline ID %u (should be %u) in checkpoint record" msgstr "" -#: access/transam/xlog.c:5164 access/transam/xlog.c:5196 +#: access/transam/xlog.c:5185 access/transam/xlog.c:5217 #, c-format msgid "could not fsync log file %u, segment %u: %m" msgstr "无法同步 (fsync) 日志文件 %u, 段 %u: %m" -#: access/transam/xlog.c:5204 +#: access/transam/xlog.c:5225 #, c-format msgid "could not fdatasync log file %u, segment %u: %m" msgstr "无法同步 (fdatasync) 日志文件 %u, 段 %u: %m" -#: access/transam/xlog.c:5247 access/transam/xlog.c:5366 +#: access/transam/xlog.c:5268 access/transam/xlog.c:5395 msgid "must be superuser to run a backup" msgstr "运行备份必须为超级用户" -#: access/transam/xlog.c:5300 +#: access/transam/xlog.c:5273 +msgid "WAL archiving is not active" +msgstr "" + +#: access/transam/xlog.c:5274 +msgid "" +"archive_command must be defined before online backups can be made safely." +msgstr "" + +#: access/transam/xlog.c:5329 msgid "a backup is already in progress" msgstr "一个备份已经在运行中" -#: access/transam/xlog.c:5301 +#: access/transam/xlog.c:5330 #, c-format msgid "" "If you're sure there is no backup in progress, remove file \"%s\" and try " "again." msgstr "如果你确认没有其他备份进程在运行, 删除文件 \"%s\", 然后重试." -#: access/transam/xlog.c:5322 access/transam/xlog.c:5442 +#: access/transam/xlog.c:5351 access/transam/xlog.c:5471 #, c-format msgid "could not write file \"%s\": %m" msgstr "无法写入文件 \"%s\": %m" -#: access/transam/xlog.c:5404 +#: access/transam/xlog.c:5433 msgid "a backup is not in progress" msgstr "没有备份在运行中" -#: access/transam/xlog.c:5417 access/transam/xlog.c:5538 -#: access/transam/xlog.c:5544 access/transam/xlog.c:5575 -#: access/transam/xlog.c:5581 +#: access/transam/xlog.c:5446 access/transam/xlog.c:5567 +#: access/transam/xlog.c:5573 access/transam/xlog.c:5604 +#: access/transam/xlog.c:5610 #, c-format msgid "invalid data in file \"%s\"" msgstr "文件 \"%s\" 中存在无效数据" @@ -5384,7 +5517,7 @@ msgstr "文件 \"%s\" 中存在无效数据" msgid "duplicate key violates unique constraint \"%s\"" msgstr "重复键违反唯一约束 \"%s\"" -#: access/nbtree/nbtinsert.c:404 access/nbtree/nbtsort.c:499 +#: access/nbtree/nbtinsert.c:398 access/nbtree/nbtsort.c:499 #, c-format msgid "index row size %lu exceeds btree maximum, %lu" msgstr "索引行大小 %lu 超出 btree 的最大值, %lu" @@ -5399,18 +5532,18 @@ msgstr "索引 \"%s\" 不是一个 btree" msgid "version mismatch in index \"%s\": file version %d, code version %d" msgstr "在索引 \"%s\" 中版本不匹配: 文件版本 %d, 代码版本 %d" -#: storage/ipc/sinval.c:105 storage/lmgr/proc.c:231 -#: postmaster/postmaster.c:1581 +#: storage/ipc/sinval.c:105 storage/lmgr/proc.c:246 +#: postmaster/postmaster.c:1564 msgid "sorry, too many clients already" msgstr "对不起, 已经有太多的客户" -#: storage/ipc/shmem.c:185 storage/ipc/shmem.c:246 storage/ipc/shmem.c:377 -#: storage/lmgr/lock.c:561 storage/lmgr/lock.c:624 storage/lmgr/proc.c:166 +#: storage/ipc/shmem.c:185 storage/ipc/shmem.c:246 storage/ipc/shmem.c:386 +#: storage/lmgr/lock.c:558 storage/lmgr/lock.c:621 storage/lmgr/proc.c:179 #: storage/buffer/buf_table.c:93 storage/freespace/freespace.c:1014 msgid "out of shared memory" msgstr "共享内存用尽" -#: storage/ipc/shmem.c:411 +#: storage/ipc/shmem.c:420 #, c-format msgid "could not allocate shared memory segment \"%s\"" msgstr "无法分配共享内存段 \"%s\"" @@ -5429,7 +5562,7 @@ msgstr "系统允许 %d, 我们至少需要 %d." msgid "out of file descriptors: %m; release and retry" msgstr "超出文件描述符: %m; 释放再重试" -#: storage/lmgr/lock.c:562 storage/lmgr/lock.c:625 +#: storage/lmgr/lock.c:559 storage/lmgr/lock.c:622 msgid "You may need to increase max_locks_per_transaction." msgstr "你也许需要增加 max_locks_per_transaction." @@ -5469,17 +5602,17 @@ msgstr "" msgid "corrupted item pointer: offset = %u, size = %u" msgstr "" -#: storage/smgr/md.c:367 +#: storage/smgr/md.c:363 #, c-format msgid "could not open relation %u/%u/%u: %m" msgstr "无法打开关系 %u/%u/%u: %m" -#: storage/smgr/md.c:769 +#: storage/smgr/md.c:765 #, c-format msgid "could not fsync segment %u of relation %u/%u/%u: %m" msgstr "无法同步关系 %2$u/%3$u/%4$u 的 %1$u 段: %m" -#: storage/smgr/md.c:959 +#: storage/smgr/md.c:955 #, c-format msgid "could not open segment %u of relation %u/%u/%u (target block %u): %m" msgstr "无法打开关系 %2$u/%3$u/%4$u 的 %1$u 段 (目标块 %5$u): %m" @@ -5496,8 +5629,8 @@ msgstr "无法创建关系 %u/%u/%u: %m" #: storage/smgr/smgr.c:457 #, c-format -msgid "could not unlink relation %u/%u/%u: %m" -msgstr "无法删除 (unlink) 关系 %u/%u/%u: %m" +msgid "could not remove relation %u/%u/%u: %m" +msgstr "无法删除关系 %u/%u/%u: %m" #: storage/smgr/smgr.c:478 #, c-format @@ -5537,26 +5670,26 @@ msgstr "无法同步关系 %u/%u/%u: %m" msgid "no empty local buffer available" msgstr "" -#: storage/buffer/bufmgr.c:210 +#: storage/buffer/bufmgr.c:217 #, c-format msgid "invalid page header in block %u of relation \"%s\"; zeroing out page" msgstr "" -#: storage/buffer/bufmgr.c:217 +#: storage/buffer/bufmgr.c:224 #, c-format msgid "invalid page header in block %u of relation \"%s\"" msgstr "关系 \"%2$s\" 中的块 %1$u 无效的页头" -#: storage/buffer/bufmgr.c:1958 +#: storage/buffer/bufmgr.c:1991 #, c-format msgid "could not write block %u of %u/%u/%u" msgstr "无法写入 %2$u/%3$u/%4$u 的块 %1$u" -#: storage/buffer/bufmgr.c:1963 +#: storage/buffer/bufmgr.c:1996 msgid "Multiple failures --- write error may be permanent." msgstr "" -#: storage/buffer/bufmgr.c:1981 +#: storage/buffer/bufmgr.c:2014 #, c-format msgid "writing block %u of relation %u/%u/%u" msgstr "写入关系 %2$u/%3$u/%4$u 的块 %1$u" @@ -5591,138 +5724,133 @@ msgstr "分配 FSM 大小: %d 个关系 + %d 页 = %.0f kB 共享内存." msgid "large object %u does not exist" msgstr "大对象 %u 不存在" -#: commands/tablespace.c:154 commands/tablespace.c:162 -#: commands/tablespace.c:168 +#: commands/tablespace.c:150 commands/tablespace.c:158 +#: commands/tablespace.c:164 ../port/copydir.c:47 #, c-format msgid "could not create directory \"%s\": %m" msgstr "无法创建目录 \"%s\": %m" -#: commands/tablespace.c:181 +#: commands/tablespace.c:177 #, c-format msgid "could not stat directory \"%s\": %m" msgstr "无法取目录 \"%s\" 状态: %m" -#: commands/tablespace.c:190 +#: commands/tablespace.c:186 #, c-format msgid "\"%s\" exists but is not a directory" msgstr "\"%s\" 存在, 但不是一个目录" -#: commands/tablespace.c:227 +#: commands/tablespace.c:223 #, c-format msgid "permission denied to create tablespace \"%s\"" msgstr "创建表空间 \"%s\" 权限不够" -#: commands/tablespace.c:229 +#: commands/tablespace.c:225 msgid "Must be superuser to create a tablespace." msgstr "只有超级用户能创建表空间" -#: commands/tablespace.c:248 +#: commands/tablespace.c:244 msgid "tablespace location may not contain single quotes" msgstr "表空间路径不能包含单引号" -#: commands/tablespace.c:258 +#: commands/tablespace.c:254 msgid "tablespace location must be an absolute path" msgstr "表空间路径必须为绝对路径" -#: commands/tablespace.c:268 +#: commands/tablespace.c:264 #, c-format msgid "tablespace location \"%s\" is too long" msgstr "表空间路径 \"%s\" 太长" -#: commands/tablespace.c:278 commands/tablespace.c:839 +#: commands/tablespace.c:274 commands/tablespace.c:766 #, c-format msgid "unacceptable tablespace name \"%s\"" msgstr "不可访问的表空间名字 \"%s\"" -#: commands/tablespace.c:280 commands/tablespace.c:840 +#: commands/tablespace.c:276 commands/tablespace.c:767 msgid "The prefix \"pg_\" is reserved for system tablespaces." msgstr "前缀 \"pg_\" 是保留给系统表空间的." -#: commands/tablespace.c:290 commands/tablespace.c:852 +#: commands/tablespace.c:286 commands/tablespace.c:779 #, c-format msgid "tablespace \"%s\" already exists" msgstr "表空间 \"%s\" 已经存在" -#: commands/tablespace.c:325 commands/tablespace.c:969 +#: commands/tablespace.c:321 commands/tablespace.c:1033 #, c-format msgid "could not set permissions on directory \"%s\": %m" msgstr "无法为目录 \"%s\" 的设置权限: %m" -#: commands/tablespace.c:334 +#: commands/tablespace.c:330 #, c-format msgid "directory \"%s\" is not empty" msgstr "目录 \"%s\" 不是空的" -#: commands/tablespace.c:355 commands/tablespace.c:984 +#: commands/tablespace.c:351 commands/tablespace.c:1048 #, c-format msgid "could not create symbolic link \"%s\": %m" msgstr "无法创建符号链接 \"%s\": %m" -#: commands/tablespace.c:386 commands/tablespace.c:483 +#: commands/tablespace.c:382 commands/tablespace.c:479 msgid "tablespaces are not supported on this platform" msgstr "在此平台上不支持表空间" -#: commands/tablespace.c:460 +#: commands/tablespace.c:456 #, c-format msgid "tablespace \"%s\" is not empty" msgstr "表空间 \"%s\" 不是空的" -#: commands/tablespace.c:559 +#: commands/tablespace.c:555 #, c-format msgid "could not delete directory \"%s\": %m" msgstr "无法删除目录 \"%s\": %m" -#: commands/tablespace.c:593 -#, c-format -msgid "could not unlink file \"%s\": %m" -msgstr "无法删除 (unlink) 文件 \"%s\": %m" - -#: commands/tablespace.c:610 +#: commands/tablespace.c:606 #, c-format msgid "could not remove directory \"%s\": %m" msgstr "无法删除目录 \"%s\": %m" -#: commands/tablespace.c:618 +#: commands/tablespace.c:614 #, c-format -msgid "could not unlink symbolic link \"%s\": %m" -msgstr "无法删除 (unlink) 符号链接 \"%s\": %m" +msgid "could not remove symbolic link \"%s\": %m" +msgstr "无法删除符号链接 \"%s\": %m" -#: commands/tablespace.c:912 commands/functioncmds.c:773 -#: commands/dbcommands.c:838 commands/conversioncmds.c:213 +#: commands/tablespace.c:839 commands/functioncmds.c:773 +#: commands/dbcommands.c:890 commands/conversioncmds.c:213 #: commands/typecmds.c:2103 commands/opclasscmds.c:954 -#: commands/operatorcmds.c:303 commands/tablecmds.c:5173 -#: commands/aggregatecmds.c:335 commands/schemacmds.c:348 +#: commands/operatorcmds.c:303 commands/tablecmds.c:5228 +#: commands/aggregatecmds.c:335 commands/schemacmds.c:319 msgid "must be superuser to change owner" msgstr "只有超级用户可以更改属主" -#: commands/tablespace.c:997 +#: commands/tablespace.c:1061 #, c-format msgid "tablespace %u is not empty" msgstr "表空间 %u 不是空的" -#: commands/portalcmds.c:54 commands/portalcmds.c:174 -#: commands/portalcmds.c:219 +#: commands/portalcmds.c:54 commands/portalcmds.c:183 +#: commands/portalcmds.c:228 msgid "invalid cursor name: must not be empty" msgstr "无效的游标名称: 不能为空" -#: commands/portalcmds.c:80 +#: commands/portalcmds.c:89 msgid "DECLARE CURSOR may not specify INTO" msgstr "DECLARE CURSOR 也许没有指定 INTO" -#: commands/portalcmds.c:84 +#: commands/portalcmds.c:93 msgid "DECLARE CURSOR ... FOR UPDATE is not supported" msgstr "DECLARE CURSOR ... FOR UPDATE 不被支持" -#: commands/portalcmds.c:85 +#: commands/portalcmds.c:94 msgid "Cursors must be READ ONLY." msgstr "游标必须为只读." -#: commands/portalcmds.c:182 commands/portalcmds.c:229 +#: commands/portalcmds.c:191 commands/portalcmds.c:238 #, c-format msgid "cursor \"%s\" does not exist" msgstr "游标 \"%s\" 不存在" -#: commands/portalcmds.c:395 +#: commands/portalcmds.c:404 msgid "could not reposition held cursor" msgstr "无法定位游标" @@ -5761,7 +5889,7 @@ msgstr "PostgreSQL 不支持闰秒" msgid "SET TRANSACTION ISOLATION LEVEL must be called before any query" msgstr "SET TRANSACTION ISOLATION LEVEL 必须在任何查询之前调用" -#: commands/variable.c:492 +#: commands/variable.c:493 msgid "SET TRANSACTION ISOLATION LEVEL must not be called in a subtransaction" msgstr "SET TRANSACTION ISOLATION LEVEL 不能在子事物中调用" @@ -5807,25 +5935,25 @@ msgstr "表 \"%2$s\" 的 \"%1$s\" 触发器不存在" msgid "trigger function %u returned null value" msgstr "触发器函数 %u 返回了空值" -#: commands/trigger.c:1212 commands/trigger.c:1325 commands/trigger.c:1454 +#: commands/trigger.c:1214 commands/trigger.c:1331 commands/trigger.c:1464 msgid "BEFORE STATEMENT trigger cannot return a value" msgstr "BEFORE STATEMENT 触发器不能返回一个值" -#: commands/trigger.c:1581 executor/execMain.c:1176 executor/execMain.c:1477 -#: executor/execMain.c:1613 +#: commands/trigger.c:1593 executor/execMain.c:1151 executor/execMain.c:1457 +#: executor/execMain.c:1598 msgid "could not serialize access due to concurrent update" msgstr "" -#: commands/trigger.c:2708 +#: commands/trigger.c:2723 msgid "unnamed constraints cannot be set explicitly" msgstr "" -#: commands/trigger.c:2741 +#: commands/trigger.c:2762 #, c-format msgid "constraint \"%s\" is not deferrable" msgstr "约束 \"%s\" 不可展缓" -#: commands/trigger.c:2756 commands/tablecmds.c:4528 +#: commands/trigger.c:2777 commands/tablecmds.c:4574 #, c-format msgid "constraint \"%s\" does not exist" msgstr "约束 \"%s\" 不存在" @@ -5838,7 +5966,7 @@ msgstr "数据库名称也许不符合条件" msgid "database comments may only be applied to the current database" msgstr "数据库注释只能适用当前数据库" -#: commands/comment.c:500 commands/schemacmds.c:201 +#: commands/comment.c:500 commands/schemacmds.c:172 msgid "schema name may not be qualified" msgstr "模式名称也许不符合条件" @@ -5883,7 +6011,7 @@ msgstr "必须成为超级用户才被允许注释过程语言" #: commands/comment.c:1048 commands/opclasscmds.c:108 #: commands/opclasscmds.c:648 commands/opclasscmds.c:800 -#: commands/opclasscmds.c:900 commands/indexcmds.c:216 +#: commands/opclasscmds.c:900 commands/indexcmds.c:230 #, c-format msgid "access method \"%s\" does not exist" msgstr "访问方式 \"%s\" 不存在" @@ -5891,8 +6019,8 @@ msgstr "访问方式 \"%s\" 不存在" #: commands/comment.c:1077 commands/comment.c:1087 commands/opclasscmds.c:677 #: commands/opclasscmds.c:687 commands/opclasscmds.c:822 #: commands/opclasscmds.c:833 commands/opclasscmds.c:922 -#: commands/opclasscmds.c:932 commands/indexcmds.c:600 -#: commands/indexcmds.c:610 +#: commands/opclasscmds.c:932 commands/indexcmds.c:614 +#: commands/indexcmds.c:624 #, c-format msgid "operator class \"%s\" does not exist for access method \"%s\"" msgstr "处理方法 \"%s\" 的操作符类 \"%s\" 不存在" @@ -5939,7 +6067,7 @@ msgstr "类型 \"%s\" 仍没被定义" msgid "Creating a shell type definition." msgstr "创建一个 shell 类型定义." -#: commands/functioncmds.c:154 parser/parse_func.c:1388 catalog/pg_proc.c:103 +#: commands/functioncmds.c:154 parser/parse_func.c:1388 catalog/pg_proc.c:100 #, c-format msgid "functions cannot have more than %d arguments" msgstr "函数不能超过 %d 个参数" @@ -5965,18 +6093,18 @@ msgstr "函数不能接收设定参数" #: commands/functioncmds.c:228 commands/functioncmds.c:236 #: commands/functioncmds.c:244 commands/functioncmds.c:252 -#: commands/functioncmds.c:260 commands/dbcommands.c:107 -#: commands/dbcommands.c:115 commands/dbcommands.c:123 -#: commands/dbcommands.c:131 commands/copy.c:720 commands/copy.c:728 +#: commands/functioncmds.c:260 commands/dbcommands.c:108 +#: commands/dbcommands.c:116 commands/dbcommands.c:124 +#: commands/dbcommands.c:132 commands/copy.c:720 commands/copy.c:728 #: commands/copy.c:736 commands/copy.c:744 commands/copy.c:752 #: commands/copy.c:760 commands/copy.c:768 commands/copy.c:776 -#: commands/copy.c:784 commands/user.c:573 commands/user.c:585 -#: commands/user.c:593 commands/user.c:601 commands/user.c:609 -#: commands/user.c:617 commands/user.c:823 commands/user.c:835 -#: commands/user.c:843 commands/user.c:851 commands/user.c:1353 -#: commands/user.c:1361 commands/sequence.c:877 commands/sequence.c:890 -#: commands/sequence.c:898 commands/sequence.c:906 commands/sequence.c:914 -#: commands/sequence.c:922 +#: commands/copy.c:784 commands/user.c:576 commands/user.c:588 +#: commands/user.c:596 commands/user.c:604 commands/user.c:612 +#: commands/user.c:620 commands/user.c:826 commands/user.c:838 +#: commands/user.c:846 commands/user.c:854 commands/user.c:1356 +#: commands/user.c:1364 commands/sequence.c:896 commands/sequence.c:909 +#: commands/sequence.c:917 commands/sequence.c:925 commands/sequence.c:933 +#: commands/sequence.c:941 msgid "conflicting or redundant options" msgstr "选项冲突或过多" @@ -6099,101 +6227,113 @@ msgstr "源数据类型和目标数据类型相同" msgid "cast from type %s to type %s already exists" msgstr "类型 %s 到 %s 的转换已经存在" -#: commands/dbcommands.c:138 +#: commands/dbcommands.c:139 msgid "LOCATION is not supported anymore" msgstr "不再支持 LOCATION" -#: commands/dbcommands.c:139 +#: commands/dbcommands.c:140 msgid "Consider using tablespaces instead." msgstr "考虑使用表空间代替." -#: commands/dbcommands.c:162 +#: commands/dbcommands.c:163 #, c-format msgid "%d is not a valid encoding code" msgstr "%d 是一个无效编码" -#: commands/dbcommands.c:171 +#: commands/dbcommands.c:172 #, c-format msgid "%s is not a valid encoding name" msgstr "%s 是一个无效编码名字" -#: commands/dbcommands.c:192 +#: commands/dbcommands.c:193 msgid "permission denied to create database" msgstr "创建数据库权限不够" -#: commands/dbcommands.c:201 +#: commands/dbcommands.c:202 msgid "must be superuser to create database for another user" msgstr "其他用户必须成为超级用户才能创建数据库" -#: commands/dbcommands.c:215 commands/dbcommands.c:429 -#: commands/dbcommands.c:678 +#: commands/dbcommands.c:216 commands/dbcommands.c:458 +#: commands/dbcommands.c:712 #, c-format msgid "database \"%s\" already exists" msgstr "数据库 \"%s\" 已经存在" -#: commands/dbcommands.c:228 +#: commands/dbcommands.c:229 #, c-format msgid "template database \"%s\" does not exist" msgstr "template 数据库 \"%s\" 不存在" -#: commands/dbcommands.c:239 +#: commands/dbcommands.c:240 #, c-format msgid "permission denied to copy database \"%s\"" msgstr "拷贝数据库 \"%s\" 权限不够" -#: commands/dbcommands.c:252 +#: commands/dbcommands.c:253 #, c-format msgid "source database \"%s\" is being accessed by other users" msgstr "其他用户正在使用源数据库 \"%s\"" -#: commands/dbcommands.c:263 +#: commands/dbcommands.c:264 #, c-format msgid "invalid server encoding %d" msgstr "无效服务器编码 %d" -#: commands/dbcommands.c:354 commands/dbcommands.c:375 -#: commands/dbcommands.c:385 commands/dbcommands.c:1161 -#: commands/dbcommands.c:1169 +#: commands/dbcommands.c:310 +#, c-format +msgid "cannot assign new default tablespace \"%s\"" +msgstr "无法分配新的默认表空间 \"%s\"" + +#: commands/dbcommands.c:312 +#, c-format +msgid "" +"There is a conflict because database \"%s\" already has some tables in this " +"tablespace." +msgstr "此处有冲突, 因为数据库 \"%s\" 已经有一些表在此表空间中." + +#: commands/dbcommands.c:382 commands/dbcommands.c:404 +#: commands/dbcommands.c:414 commands/dbcommands.c:1226 +#: commands/dbcommands.c:1234 msgid "could not initialize database directory" msgstr "无法初始化数据库目录" -#: commands/dbcommands.c:355 +#: commands/dbcommands.c:383 #, c-format msgid "Directory \"%s\" already exists." msgstr "目录 \"%s\" 已经存在" -#: commands/dbcommands.c:376 commands/dbcommands.c:1162 +#: commands/dbcommands.c:405 commands/dbcommands.c:1227 #, c-format msgid "Failing system command was: %s" msgstr "失败, 系统命令是: %s" -#: commands/dbcommands.c:377 commands/dbcommands.c:1163 +#: commands/dbcommands.c:406 commands/dbcommands.c:1228 msgid "Look in the postmaster's stderr log for more information." msgstr "获得更多信息请查看 postmaster 的标准错误上的日志" -#: commands/dbcommands.c:504 +#: commands/dbcommands.c:533 msgid "cannot drop the currently open database" msgstr "无法删除当前使用的数据库" -#: commands/dbcommands.c:535 +#: commands/dbcommands.c:564 msgid "cannot drop a template database" msgstr "无法删除模板数据库" -#: commands/dbcommands.c:543 commands/dbcommands.c:665 +#: commands/dbcommands.c:572 commands/dbcommands.c:699 #, c-format msgid "database \"%s\" is being accessed by other users" msgstr "其他用户正在使用数据库 \"%s\"" -#: commands/dbcommands.c:656 +#: commands/dbcommands.c:690 msgid "current database may not be renamed" msgstr "当前数据库也许没有被重命名" -#: commands/dbcommands.c:690 +#: commands/dbcommands.c:724 msgid "permission denied to rename database" msgstr "重命名数据库权限不够" -#: commands/dbcommands.c:998 commands/dbcommands.c:1135 -#: commands/dbcommands.c:1185 +#: commands/dbcommands.c:1063 commands/dbcommands.c:1200 +#: commands/dbcommands.c:1250 #, c-format msgid "could not remove database directory \"%s\"" msgstr "无法删除数据库目录 \"%s\"" @@ -6221,16 +6361,16 @@ msgstr "无效的语句名称: 不能为空" msgid "utility statements cannot be prepared" msgstr "不能准备好工具语句" -#: commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:538 +#: commands/prepare.c:168 commands/prepare.c:173 commands/prepare.c:535 msgid "prepared statement is not a SELECT" msgstr "准备好的语句不是一个 SELECT" -#: commands/prepare.c:310 +#: commands/prepare.c:307 #, c-format msgid "prepared statement \"%s\" already exists" msgstr "准备好的语句 \"%s\" 已经存在" -#: commands/prepare.c:390 +#: commands/prepare.c:387 #, c-format msgid "prepared statement \"%s\" does not exist" msgstr "准备好的语句 \"%s\" 不存在" @@ -6391,130 +6531,130 @@ msgstr "COPY 到文件不允许相对路径" msgid "could not open file \"%s\" for writing: %m" msgstr "为了写入, 无法打开文件 \"%s\": %m" -#: commands/copy.c:1389 +#: commands/copy.c:1386 #, c-format msgid "COPY %s, line %d, column %s" msgstr "COPY %s, 行 %d, 列 %s" -#: commands/copy.c:1392 +#: commands/copy.c:1389 commands/copy.c:1422 #, c-format msgid "COPY %s, line %d" msgstr "COPY %s, 行 %d" -#: commands/copy.c:1400 +#: commands/copy.c:1397 #, c-format msgid "COPY %s, line %d, column %s: \"%s\"" msgstr "COPY %s, 行 %d, 列 %s: \"%s\"" -#: commands/copy.c:1427 +#: commands/copy.c:1408 #, c-format msgid "COPY %s, line %d: \"%s\"" msgstr "COPY %s, 行 %d: \"%s\"" -#: commands/copy.c:1640 +#: commands/copy.c:1634 msgid "COPY file signature not recognized" msgstr "文件签字不被认可" -#: commands/copy.c:1646 +#: commands/copy.c:1640 msgid "invalid COPY file header (missing flags)" msgstr "无效的 COPY 文件头 (缺少标志)" -#: commands/copy.c:1652 +#: commands/copy.c:1646 msgid "unrecognized critical flags in COPY file header" msgstr "在 COPY 文件头有不认可的危险标志" -#: commands/copy.c:1658 +#: commands/copy.c:1652 msgid "invalid COPY file header (missing length)" msgstr "无效的 COPY 文件头 (缺少长度)" -#: commands/copy.c:1666 +#: commands/copy.c:1660 msgid "invalid COPY file header (wrong length)" msgstr "无效的 COPY 文件头 (错误长度)" -#: commands/copy.c:1745 +#: commands/copy.c:1739 msgid "null OID in COPY data" msgstr "在 COPY 数据中没有 OID" -#: commands/copy.c:1754 commands/copy.c:1851 +#: commands/copy.c:1748 commands/copy.c:1845 msgid "invalid OID in COPY data" msgstr "在 COPY 数据中无效的 OID" -#: commands/copy.c:1774 +#: commands/copy.c:1768 #, c-format msgid "missing data for column \"%s\"" msgstr "字段 \"%s\" 缺少数据" -#: commands/copy.c:1784 +#: commands/copy.c:1778 msgid "unterminated CSV quoted field" msgstr "CSV 引号域没有结束" -#: commands/copy.c:1819 +#: commands/copy.c:1813 msgid "extra data after last expected column" msgstr "最后期望字段后有额外数据" -#: commands/copy.c:1837 +#: commands/copy.c:1831 #, c-format msgid "row field count is %d, expected %d" msgstr "元组字段计数是 %d, 期望计数是 %d" -#: commands/copy.c:2059 commands/copy.c:2077 +#: commands/copy.c:2053 commands/copy.c:2071 msgid "literal carriage return found in data" msgstr "" -#: commands/copy.c:2060 commands/copy.c:2078 +#: commands/copy.c:2054 commands/copy.c:2072 msgid "Use \"\\r\" to represent carriage return." msgstr "" -#: commands/copy.c:2095 +#: commands/copy.c:2089 msgid "literal newline found in data" msgstr "" -#: commands/copy.c:2096 +#: commands/copy.c:2090 msgid "Use \"\\n\" to represent newline." msgstr "使用 \"\\n\" 表示新行." -#: commands/copy.c:2116 commands/copy.c:2132 +#: commands/copy.c:2110 commands/copy.c:2126 msgid "end-of-copy marker does not match previous newline style" msgstr "" -#: commands/copy.c:2120 commands/copy.c:2126 +#: commands/copy.c:2114 commands/copy.c:2120 msgid "end-of-copy marker corrupt" msgstr "" -#: commands/copy.c:2497 commands/copy.c:2519 +#: commands/copy.c:2485 commands/copy.c:2507 msgid "unexpected EOF in COPY data" msgstr "在 COPY 数据中意外的 EOF" -#: commands/copy.c:2506 +#: commands/copy.c:2494 msgid "invalid field size" msgstr "无效字段尺寸" -#: commands/copy.c:2533 +#: commands/copy.c:2521 msgid "incorrect binary data format" msgstr "不正确的二进制数据格式" -#: commands/copy.c:2719 parser/parse_target.c:649 parser/parse_target.c:659 +#: commands/copy.c:2707 parser/parse_target.c:650 parser/parse_target.c:660 #, c-format msgid "column \"%s\" specified more than once" msgstr "字段 \"%s\" 被指定多次" -#: commands/vacuumlazy.c:205 commands/vacuum.c:1160 +#: commands/vacuumlazy.c:221 commands/vacuum.c:1160 #, c-format msgid "vacuuming \"%s.%s\"" msgstr "正在清理 (vacuum) \"%s.%s\"" -#: commands/vacuumlazy.c:263 commands/vacuum.c:1202 +#: commands/vacuumlazy.c:293 commands/vacuum.c:1208 #, c-format msgid "relation \"%s\" page %u is uninitialized --- fixing" msgstr "关系 \"%s\" 页 %u 没有初始化 --- 修复" -#: commands/vacuumlazy.c:428 commands/vacuum.c:1499 +#: commands/vacuumlazy.c:456 commands/vacuum.c:1498 #, c-format msgid "" "\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages" msgstr "" -#: commands/vacuumlazy.c:431 +#: commands/vacuumlazy.c:459 #, c-format msgid "" "%.0f dead row versions cannot be removed yet.\n" @@ -6523,25 +6663,25 @@ msgid "" "%s" msgstr "" -#: commands/vacuumlazy.c:486 +#: commands/vacuumlazy.c:514 #, c-format msgid "\"%s\": removed %d row versions in %d pages" msgstr "" -#: commands/vacuumlazy.c:597 commands/vacuumlazy.c:657 commands/vacuum.c:2860 -#: commands/vacuum.c:2927 +#: commands/vacuumlazy.c:630 commands/vacuumlazy.c:705 commands/vacuum.c:2859 +#: commands/vacuum.c:2926 #, c-format msgid "index \"%s\" now contains %.0f row versions in %u pages" msgstr "" -#: commands/vacuumlazy.c:601 commands/vacuum.c:2864 +#: commands/vacuumlazy.c:634 commands/vacuum.c:2863 #, c-format msgid "" "%u index pages have been deleted, %u are currently reusable.\n" "%s" msgstr "" -#: commands/vacuumlazy.c:661 commands/vacuum.c:2931 +#: commands/vacuumlazy.c:709 commands/vacuum.c:2930 #, c-format msgid "" "%.0f index row versions were removed.\n" @@ -6549,7 +6689,7 @@ msgid "" "%s" msgstr "" -#: commands/vacuumlazy.c:767 commands/vacuum.c:2770 +#: commands/vacuumlazy.c:817 commands/vacuum.c:2769 #, c-format msgid "\"%s\": truncated %u to %u pages" msgstr "" @@ -6739,7 +6879,7 @@ msgstr "域 \"%2$s\" 的约束 \"%1$s\" 已经存在" msgid "cannot use table references in domain check constraint" msgstr "在域检查约束中不可以使用表关联" -#: commands/typecmds.c:1872 catalog/heap.c:1610 +#: commands/typecmds.c:1872 catalog/heap.c:1595 msgid "cannot use subquery in check constraint" msgstr "在检查约束中不可以使用子查询" @@ -6850,7 +6990,7 @@ msgstr "必须指定操作符过程" msgid "there is no previously clustered index for table \"%s\"" msgstr "在表 \"%s\" 中未找到先前建簇的索引" -#: commands/cluster.c:147 commands/tablecmds.c:5252 +#: commands/cluster.c:147 commands/tablecmds.c:5377 #, c-format msgid "index \"%s\" for table \"%s\" does not exist" msgstr "表 \"%2$s\" 的 \"%1$s\" 索引不存在" @@ -6888,449 +7028,450 @@ msgstr "\"%s\" 是一个系统表" msgid "cannot cluster temporary tables of other sessions" msgstr "无法为其它会话的临时表建簇" -#: commands/indexcmds.c:119 +#: commands/indexcmds.c:120 msgid "must specify at least one column" msgstr "必需至少指定一个字段" -#: commands/indexcmds.c:123 +#: commands/indexcmds.c:124 #, c-format msgid "cannot use more than %d columns in an index" msgstr "在一个索引中不能使用超过 %d 个字段" -#: commands/indexcmds.c:224 +#: commands/indexcmds.c:238 #, c-format msgid "access method \"%s\" does not support unique indexes" msgstr "存取方法 \"%s\" 不支持唯一索引" -#: commands/indexcmds.c:229 +#: commands/indexcmds.c:243 #, c-format msgid "access method \"%s\" does not support multicolumn indexes" msgstr "存取方法 \"%s\" 不支持多字段索引" -#: commands/indexcmds.c:243 +#: commands/indexcmds.c:257 msgid "" "index expressions and predicates may refer only to the table being indexed" msgstr "索引表达式和声明只能指向要建索引的表" -#: commands/indexcmds.c:271 parser/analyze.c:1185 +#: commands/indexcmds.c:285 parser/analyze.c:1197 #, c-format msgid "multiple primary keys for table \"%s\" are not allowed" msgstr "对表 \"%s\" 指定多个主键是不允许的" -#: commands/indexcmds.c:288 +#: commands/indexcmds.c:302 msgid "primary keys cannot be expressions" msgstr "主键不能是表达式" -#: commands/indexcmds.c:318 commands/indexcmds.c:456 parser/analyze.c:1299 +#: commands/indexcmds.c:332 commands/indexcmds.c:470 parser/analyze.c:1311 #, c-format msgid "column \"%s\" named in key does not exist" msgstr "在键字中命名的字段 \"%s\" 不存在" -#: commands/indexcmds.c:363 +#: commands/indexcmds.c:377 #, c-format msgid "%s %s will create implicit index \"%s\" for table \"%s\"" msgstr "%1$s %2$s 将要为表 \"%4$s\" 创建隐含索引 \"%3$s\"" -#: commands/indexcmds.c:406 +#: commands/indexcmds.c:420 msgid "cannot use subquery in index predicate" msgstr "索引声明中不能使用子查询" -#: commands/indexcmds.c:410 +#: commands/indexcmds.c:424 msgid "cannot use aggregate in index predicate" msgstr "索引声明中不能使用聚集函数" -#: commands/indexcmds.c:419 +#: commands/indexcmds.c:433 msgid "functions in index predicate must be marked IMMUTABLE" msgstr "索引声明中函数必需标记为 IMMUTABLE" -#: commands/indexcmds.c:461 commands/tablecmds.c:1297 parser/parse_expr.c:1084 +#: commands/indexcmds.c:475 commands/tablecmds.c:1329 parser/parse_expr.c:1084 #, c-format msgid "column \"%s\" does not exist" msgstr "字段 \"%s\" 不存在" -#: commands/indexcmds.c:494 +#: commands/indexcmds.c:508 msgid "cannot use subquery in index expression" msgstr "索引表达式中不能使用子查询" -#: commands/indexcmds.c:498 +#: commands/indexcmds.c:512 msgid "cannot use aggregate function in index expression" msgstr "索引表达式中不能使用聚集函数" -#: commands/indexcmds.c:509 +#: commands/indexcmds.c:523 msgid "functions in index expression must be marked IMMUTABLE" msgstr "索引表达式中函数必需标记为 IMMUTABLE" -#: commands/indexcmds.c:568 +#: commands/indexcmds.c:582 #, c-format msgid "data type %s has no default operator class for access method \"%s\"" msgstr "对访问方法 \"%2$s\" 数据类型 %1$s 没有默认的操作符表" -#: commands/indexcmds.c:570 +#: commands/indexcmds.c:584 msgid "" "You must specify an operator class for the index or define a default " "operator class for the data type." msgstr "你必须指定一个操作符表给索引或定义一个默认的操作符表给数据类型." -#: commands/indexcmds.c:623 +#: commands/indexcmds.c:637 #, c-format msgid "operator class \"%s\" does not accept data type %s" msgstr "操作符表 \"%s\" 不能处理数据类型 %s" -#: commands/indexcmds.c:949 +#: commands/indexcmds.c:963 #, c-format msgid "shared table \"%s\" can only be reindexed in stand-alone mode" msgstr "共享表 \"%s\" 只能在独立运行模式中重建索引" -#: commands/indexcmds.c:956 +#: commands/indexcmds.c:970 #, c-format msgid "table \"%s\" has no indexes" msgstr "表 \"%s\" 没有索引" -#: commands/indexcmds.c:984 +#: commands/indexcmds.c:998 msgid "can only reindex the currently open database" msgstr "只能在当前打开的数据库上重建索引" -#: commands/indexcmds.c:1067 +#: commands/indexcmds.c:1081 #, c-format msgid "table \"%s\" was reindexed" msgstr "表 \"%s\" 已被重新索引" -#: commands/tablecmds.c:292 +#: commands/tablecmds.c:294 msgid "ON COMMIT can only be used on temporary tables" msgstr "ON COMMIT 只能被用于临时表" -#: commands/tablecmds.c:394 +#: commands/tablecmds.c:399 #, c-format msgid "duplicate check constraint name \"%s\"" msgstr "有多个名为 \"%s\" 的约束" -#: commands/tablecmds.c:561 +#: commands/tablecmds.c:566 #, c-format msgid "cannot truncate system relation \"%s\"" msgstr "不能截断系统关系 \"%s\"" -#: commands/tablecmds.c:571 +#: commands/tablecmds.c:576 msgid "cannot truncate temporary tables of other sessions" msgstr "不能缩短其他会话的临时表" -#: commands/tablecmds.c:697 +#: commands/tablecmds.c:697 commands/tablecmds.c:1007 +#: commands/tablecmds.c:2927 catalog/heap.c:382 +#, c-format +msgid "tables can have at most %d columns" +msgstr "表最多可以有 %d 个字段" + +#: commands/tablecmds.c:719 #, c-format msgid "column \"%s\" duplicated" msgstr "属性 \"%s\" 被复制" -#: commands/tablecmds.c:722 parser/analyze.c:1055 parser/analyze.c:1261 +#: commands/tablecmds.c:744 parser/analyze.c:1067 parser/analyze.c:1273 #, c-format msgid "inherited relation \"%s\" is not a table" msgstr "继承关系 \"%s\" 不是一个表" -#: commands/tablecmds.c:728 +#: commands/tablecmds.c:750 #, c-format msgid "cannot inherit from temporary relation \"%s\"" msgstr "不能从临时关系 \"%s\" 继承" -#: commands/tablecmds.c:745 +#: commands/tablecmds.c:767 #, c-format msgid "inherited relation \"%s\" duplicated" msgstr "继承关系 \"%s\" 被复制" -#: commands/tablecmds.c:799 +#: commands/tablecmds.c:821 #, c-format msgid "merging multiple inherited definitions of column \"%s\"" msgstr "合并属性 \"%s\" 的多个继承定义" -#: commands/tablecmds.c:806 +#: commands/tablecmds.c:828 #, c-format msgid "inherited column \"%s\" has a type conflict" msgstr "继承属性 \"%s\" 类型冲突" -#: commands/tablecmds.c:808 commands/tablecmds.c:953 parser/parse_coerce.c:239 -#: parser/parse_coerce.c:1110 parser/parse_coerce.c:1127 -#: parser/parse_coerce.c:1173 +#: commands/tablecmds.c:830 commands/tablecmds.c:975 parser/parse_coerce.c:239 +#: parser/parse_coerce.c:1125 parser/parse_coerce.c:1142 +#: parser/parse_coerce.c:1188 #, c-format msgid "%s versus %s" msgstr "%s 对 %s" -#: commands/tablecmds.c:944 +#: commands/tablecmds.c:966 #, c-format msgid "merging column \"%s\" with inherited definition" msgstr "合并属性 \"%s\" 连同继承定义" -#: commands/tablecmds.c:951 +#: commands/tablecmds.c:973 #, c-format msgid "column \"%s\" has a type conflict" msgstr "属性 \"%s\" 类型冲突" -#: commands/tablecmds.c:992 +#: commands/tablecmds.c:1024 #, c-format msgid "column \"%s\" inherits conflicting default values" msgstr "属性 \"%s\" 继承与默认值冲突" -#: commands/tablecmds.c:994 +#: commands/tablecmds.c:1026 msgid "To resolve the conflict, specify a default explicitly." msgstr "要解决冲突, 指定明确的默认值" -#: commands/tablecmds.c:1287 +#: commands/tablecmds.c:1319 #, c-format msgid "inherited column \"%s\" must be renamed in child tables too" msgstr "在子表中继承属性 \"%s\" 也必需重命名" -#: commands/tablecmds.c:1305 +#: commands/tablecmds.c:1337 #, c-format msgid "cannot rename system column \"%s\"" msgstr "不能对系统字段 \"%s\" 重命名" -#: commands/tablecmds.c:1315 +#: commands/tablecmds.c:1347 #, c-format msgid "cannot rename inherited column \"%s\"" msgstr "不能对继承字段 \"%s\" 重命名" -#: commands/tablecmds.c:1326 commands/tablecmds.c:2887 +#: commands/tablecmds.c:1358 commands/tablecmds.c:2919 #, c-format msgid "column \"%s\" of relation \"%s\" already exists" msgstr "关系 \"%s\" 的属性 \"%s\" 已经存在" -#: commands/tablecmds.c:1469 catalog/heap.c:747 catalog/index.c:527 +#: commands/tablecmds.c:1501 catalog/heap.c:732 catalog/index.c:514 #, c-format msgid "relation \"%s\" already exists" msgstr "关系 \"%s\" 已经存在" -#: commands/tablecmds.c:2187 +#: commands/tablecmds.c:2219 #, c-format msgid "cannot rewrite system relation \"%s\"" msgstr "不能改写系统关系 \"%s\"" -#: commands/tablecmds.c:2197 +#: commands/tablecmds.c:2229 msgid "cannot rewrite temporary tables of other sessions" msgstr "不能改写其他会话的临时表" -#: commands/tablecmds.c:2488 +#: commands/tablecmds.c:2520 #, c-format msgid "check constraint \"%s\" is violated by some row" msgstr "一些行违反了检查约束 \"%s\"" -#: commands/tablecmds.c:2501 +#: commands/tablecmds.c:2533 #, c-format msgid "column \"%s\" contains null values" msgstr "字段 \"%s\" 包含空值" -#: commands/tablecmds.c:2586 +#: commands/tablecmds.c:2618 #, c-format msgid "\"%s\" is not a table or view" msgstr "\"%s\" 不是一个视图或视图" -#: commands/tablecmds.c:2739 +#: commands/tablecmds.c:2771 #, c-format msgid "cannot alter table \"%s\" because column \"%s\".\"%s\" uses its rowtype" msgstr "" -#: commands/tablecmds.c:2805 +#: commands/tablecmds.c:2837 msgid "column must be added to child tables too" msgstr "属性也必需加入到子表中" -#: commands/tablecmds.c:2848 +#: commands/tablecmds.c:2880 #, c-format msgid "child table \"%s\" has different type for column \"%s\"" msgstr "子表 \"%s\" 的字段 \"%s\" 有不同的类型" -#: commands/tablecmds.c:2860 +#: commands/tablecmds.c:2892 #, c-format msgid "merging definition of column \"%s\" for child \"%s\"" msgstr "合并子表 \"%2$s\" 的字段 \"%1$s\" 定义" -#: commands/tablecmds.c:2895 catalog/heap.c:382 -#, c-format -msgid "tables can have at most %d columns" -msgstr "表最多可以有 %d 个字段" - -#: commands/tablecmds.c:3077 commands/tablecmds.c:3170 -#: commands/tablecmds.c:3220 commands/tablecmds.c:3316 -#: commands/tablecmds.c:3377 commands/tablecmds.c:4571 +#: commands/tablecmds.c:3109 commands/tablecmds.c:3202 +#: commands/tablecmds.c:3252 commands/tablecmds.c:3348 +#: commands/tablecmds.c:3409 commands/tablecmds.c:4617 #, c-format msgid "cannot alter system column \"%s\"" msgstr "不能更改系统字段 \"%s\"" -#: commands/tablecmds.c:3113 +#: commands/tablecmds.c:3145 #, c-format msgid "column \"%s\" is in a primary key" msgstr "字段 \"%s\" 是一个主键" -#: commands/tablecmds.c:3263 commands/tablecmds.c:5291 +#: commands/tablecmds.c:3295 commands/tablecmds.c:5416 #, c-format msgid "\"%s\" is not a table or index" msgstr "\"%s\" 不是一个表或索引" -#: commands/tablecmds.c:3290 +#: commands/tablecmds.c:3322 #, c-format msgid "statistics target %d is too low" msgstr "目标统计 %d 太低" -#: commands/tablecmds.c:3298 +#: commands/tablecmds.c:3330 #, c-format msgid "lowering statistics target to %d" msgstr "降低目标统计到 %d" -#: commands/tablecmds.c:3358 +#: commands/tablecmds.c:3390 #, c-format msgid "invalid storage type \"%s\"" msgstr "无效存储类型 \"%s\"" -#: commands/tablecmds.c:3389 +#: commands/tablecmds.c:3421 #, c-format msgid "column data type %s can only have storage PLAIN" msgstr "字段数据类型 %s 只能存储为明文 (PLAIN)" -#: commands/tablecmds.c:3446 +#: commands/tablecmds.c:3478 #, c-format msgid "cannot drop system column \"%s\"" msgstr "不能删除系统字段 \"%s\"" -#: commands/tablecmds.c:3453 +#: commands/tablecmds.c:3485 #, c-format msgid "cannot drop inherited column \"%s\"" msgstr "不能删除继承字段 \"%s\"" -#: commands/tablecmds.c:3690 catalog/heap.c:1631 +#: commands/tablecmds.c:3722 catalog/heap.c:1616 #, c-format msgid "constraint \"%s\" for relation \"%s\" already exists" msgstr "关系 \"%2$s\" 的约束 \"%1$s\" 已经存在" -#: commands/tablecmds.c:3754 +#: commands/tablecmds.c:3786 #, c-format msgid "referenced relation \"%s\" is not a table" msgstr "关联的关系 \"%s\" 不是一个表" -#: commands/tablecmds.c:3788 +#: commands/tablecmds.c:3820 msgid "cannot reference temporary table from permanent table constraint" msgstr "不可以从固定表约束关联临时表" -#: commands/tablecmds.c:3795 +#: commands/tablecmds.c:3827 msgid "cannot reference permanent table from temporary table constraint" msgstr "不可以从临时表约束关联固定表" -#: commands/tablecmds.c:3840 commands/tablecmds.c:4328 +#: commands/tablecmds.c:3872 commands/tablecmds.c:4362 msgid "number of referencing and referenced columns for foreign key disagree" msgstr "外键的关联数和关联字段不一致" -#: commands/tablecmds.c:3861 +#: commands/tablecmds.c:3893 #, c-format msgid "foreign key constraint \"%s\" cannot be implemented" msgstr "无法实现外键约束 \"%s\"" -#: commands/tablecmds.c:3864 +#: commands/tablecmds.c:3896 #, c-format msgid "Key columns \"%s\" and \"%s\" are of incompatible types: %s and %s." msgstr "关键字段 \"%s\" 和 \"%s\" 为混和类型: %s 和 %s." -#: commands/tablecmds.c:3878 +#: commands/tablecmds.c:3910 #, c-format msgid "foreign key constraint \"%s\" will require costly sequential scans" msgstr "" -#: commands/tablecmds.c:3881 +#: commands/tablecmds.c:3913 #, c-format msgid "Key columns \"%s\" and \"%s\" are of different types: %s and %s." msgstr "关键字段 \"%s\" 和 \"%s\" 为不同的类型: %s 和 %s." -#: commands/tablecmds.c:3966 +#: commands/tablecmds.c:3998 #, c-format msgid "column \"%s\" referenced in foreign key constraint does not exist" msgstr "在外键约束中的关联字段 \"%s\" 不存在" -#: commands/tablecmds.c:3971 +#: commands/tablecmds.c:4003 #, c-format msgid "cannot have more than %d keys in a foreign key" msgstr "在一个外键中不能超过 %d 个键" -#: commands/tablecmds.c:4040 +#: commands/tablecmds.c:4072 #, c-format msgid "there is no primary key for referenced table \"%s\"" msgstr "关联表 \"%s\" 没有主键" -#: commands/tablecmds.c:4158 +#: commands/tablecmds.c:4190 #, c-format msgid "" "there is no unique constraint matching given keys for referenced table \"%s\"" msgstr "没有唯一约束与关联表 \"%s\" 给定的键值匹配" -#: commands/tablecmds.c:4533 +#: commands/tablecmds.c:4579 #, c-format msgid "multiple constraints named \"%s\" were dropped" msgstr "有多个名为 \"%s\" 的约束被删除了" -#: commands/tablecmds.c:4578 +#: commands/tablecmds.c:4624 #, c-format msgid "cannot alter inherited column \"%s\"" msgstr "不能修改继承字段 \"%s\"" -#: commands/tablecmds.c:4618 +#: commands/tablecmds.c:4664 msgid "transform expression must not return a set" msgstr "转换表达式不能返回一个组合" -#: commands/tablecmds.c:4624 +#: commands/tablecmds.c:4670 msgid "cannot use subquery in transform expression" msgstr "在转换表达式中不能使用子查询" -#: commands/tablecmds.c:4628 +#: commands/tablecmds.c:4674 msgid "cannot use aggregate function in transform expression" msgstr "转换表达式中不能使用聚集函数" -#: commands/tablecmds.c:4645 +#: commands/tablecmds.c:4691 #, c-format msgid "column \"%s\" cannot be cast to type \"%s\"" msgstr "字段 \"%s\" 不能转换成类型 \"%s\"" -#: commands/tablecmds.c:4671 +#: commands/tablecmds.c:4717 #, c-format msgid "type of inherited column \"%s\" must be changed in child tables too" msgstr "在子表中继承字段 \"%s\" 的类型也必需改变" -#: commands/tablecmds.c:4709 +#: commands/tablecmds.c:4755 #, c-format msgid "cannot alter type of column \"%s\" twice" msgstr "不能更改字段 \"%s\" 的类型两遍" -#: commands/tablecmds.c:4736 +#: commands/tablecmds.c:4789 #, c-format msgid "default for column \"%s\" cannot be cast to type \"%s\"" msgstr "字段 \"%s\" 的默认值不能转换成类型 \"%s\"" -#: commands/tablecmds.c:4836 +#: commands/tablecmds.c:4889 msgid "cannot alter type of a column used by a view or rule" msgstr "不能使用视图或规则改变一个字段的类型" -#: commands/tablecmds.c:4837 +#: commands/tablecmds.c:4890 #, c-format msgid "%s depends on column \"%s\"" msgstr "%s 倚赖于字段 \"%s\"" -#: commands/tablecmds.c:5151 +#: commands/tablecmds.c:5206 #, c-format msgid "\"%s\" is not a table, TOAST table, index, view, or sequence" msgstr "\"%s\" 不是一个表, TOAST 表, 索引, 视图, 或者序列" -#: commands/tablecmds.c:5321 -msgid "multiple SET TABLESPACE subcommands are not valid" +#: commands/tablecmds.c:5446 +msgid "cannot have multiple SET TABLESPACE subcommands" msgstr "" -#: commands/tablecmds.c:5351 +#: commands/tablecmds.c:5476 #, c-format msgid "cannot move system relation \"%s\"" msgstr "不能删除系统关系 \"%s\"" -#: commands/tablecmds.c:5361 +#: commands/tablecmds.c:5486 msgid "cannot move temporary tables of other sessions" msgstr "不能在其他会话中删除临时表" -#: commands/tablecmds.c:5571 +#: commands/tablecmds.c:5696 msgid "shared tables cannot be toasted after initdb" msgstr "在 initdb 之后, 不可以 toasted 共享表" -#: commands/tablecmds.c:5586 +#: commands/tablecmds.c:5711 #, c-format msgid "table \"%s\" already has a TOAST table" msgstr "表 \"%s\" 已经是一个 TOAST 表" -#: commands/tablecmds.c:5603 +#: commands/tablecmds.c:5728 #, c-format msgid "table \"%s\" does not need a TOAST table" msgstr "表 \"%s\" 不需要一个 TOAST 表" @@ -7351,152 +7492,152 @@ msgstr "忽略 \"%s\" --- 无法分析索引, 视图或特殊的系统表" msgid "analyzing \"%s.%s\"" msgstr "正在分析 \"%s.%s\"" -#: commands/analyze.c:916 +#: commands/analyze.c:912 #, c-format msgid "" "\"%s\": scanned %d of %u pages, containing %.0f live rows and %.0f dead " "rows; %d rows in sample, %.0f estimated total rows" msgstr "" -#: commands/user.c:172 commands/user.c:270 commands/user.c:319 -#: commands/user.c:400 +#: commands/user.c:174 commands/user.c:272 commands/user.c:321 +#: commands/user.c:402 #, c-format msgid "could not write to temporary file \"%s\": %m" msgstr "无法往临时文件 \"%s\" 写入: %m" -#: commands/user.c:207 +#: commands/user.c:209 #, c-format msgid "invalid group name \"%s\"" msgstr "无效组名 \"%s\"" -#: commands/user.c:238 commands/user.c:369 +#: commands/user.c:240 commands/user.c:371 #, c-format msgid "invalid user name \"%s\"" msgstr "无效用户名 \"%s\"" -#: commands/user.c:376 +#: commands/user.c:378 #, c-format msgid "invalid user password \"%s\"" msgstr "无效用户口令 \"%s\"" -#: commands/user.c:635 +#: commands/user.c:638 msgid "user ID must be positive" msgstr "用户 ID 必需为正数" -#: commands/user.c:652 +#: commands/user.c:655 msgid "must be superuser to create users" msgstr "只有超级用户能创建用户" -#: commands/user.c:657 +#: commands/user.c:660 #, c-format msgid "user name \"%s\" is reserved" msgstr "用户名 \"%s\" 被保留了" -#: commands/user.c:694 commands/user.c:1249 +#: commands/user.c:697 commands/user.c:1252 #, c-format msgid "user \"%s\" already exists" msgstr "用户 \"%s\" 已经存在" -#: commands/user.c:699 +#: commands/user.c:702 #, c-format msgid "user ID %d is already assigned" msgstr "用户 ID %d 已经被赋值" -#: commands/user.c:880 commands/user.c:1015 commands/schemacmds.c:86 +#: commands/user.c:883 commands/user.c:1018 commands/schemacmds.c:84 msgid "permission denied" msgstr "权限不够" -#: commands/user.c:1074 +#: commands/user.c:1077 msgid "must be superuser to drop users" msgstr "只有超级用户可以删除用户" -#: commands/user.c:1108 +#: commands/user.c:1111 msgid "current user cannot be dropped" msgstr "当前用户不能被删除" -#: commands/user.c:1112 +#: commands/user.c:1115 msgid "session user cannot be dropped" msgstr "会话用户不能被删除" -#: commands/user.c:1139 +#: commands/user.c:1142 #, c-format msgid "user \"%s\" cannot be dropped" msgstr "用户 \"%s\" 不能被删除" -#: commands/user.c:1140 +#: commands/user.c:1143 #, c-format msgid "The user owns database \"%s\"." msgstr "用户是数据库 \"%s\" 的属主." -#: commands/user.c:1241 +#: commands/user.c:1244 msgid "session user may not be renamed" msgstr "会话用户不能被重命名" -#: commands/user.c:1255 +#: commands/user.c:1258 msgid "must be superuser to rename users" msgstr "只有超级用户可以对用户重命名" -#: commands/user.c:1274 +#: commands/user.c:1277 msgid "MD5 password cleared because of user rename" msgstr "由于用户重命名, 清除 MD5 口令" -#: commands/user.c:1308 +#: commands/user.c:1311 #, c-format msgid "before using passwords you must revoke privileges on %s" msgstr "" -#: commands/user.c:1310 +#: commands/user.c:1313 msgid "" "This restriction is to prevent unprivileged users from reading the passwords." msgstr "" -#: commands/user.c:1311 +#: commands/user.c:1314 #, c-format msgid "Try REVOKE ALL ON \"%s\" FROM PUBLIC." msgstr "试试 REVOKE ALL ON \"%s\" FROM PUBLIC." -#: commands/user.c:1375 +#: commands/user.c:1378 msgid "group ID must be positive" msgstr "组 ID 必需为正数" -#: commands/user.c:1388 +#: commands/user.c:1391 msgid "must be superuser to create groups" msgstr "只有超级用户能创建组" -#: commands/user.c:1393 +#: commands/user.c:1396 #, c-format msgid "group name \"%s\" is reserved" msgstr "组名 \"%s\" 被保留了" -#: commands/user.c:1430 commands/user.c:1812 +#: commands/user.c:1433 commands/user.c:1815 #, c-format msgid "group \"%s\" already exists" msgstr "组 \"%s\" 已经存在" -#: commands/user.c:1435 +#: commands/user.c:1438 #, c-format msgid "group ID %d is already assigned" msgstr "组 ID %d 已经被赋值" -#: commands/user.c:1515 +#: commands/user.c:1518 msgid "must be superuser to alter groups" msgstr "只有超级用户可以更改组" -#: commands/user.c:1594 +#: commands/user.c:1597 #, c-format msgid "group \"%s\" does not have any members" msgstr "组 \"%s\" 没有任何成员" -#: commands/user.c:1622 +#: commands/user.c:1625 #, c-format msgid "user \"%s\" is not in group \"%s\"" msgstr "用户 \"%s\" 不在组 \"%s\" 中" -#: commands/user.c:1754 +#: commands/user.c:1757 msgid "must be superuser to drop groups" msgstr "只有超级用户可以删除组" -#: commands/user.c:1818 +#: commands/user.c:1821 msgid "must be superuser to rename groups" msgstr "只有超级用户对组重命名" @@ -7593,21 +7734,21 @@ msgid "" "skipping \"%s\" --- cannot vacuum indexes, views, or special system tables" msgstr "忽略 \"%s\" --- 无法清理 (vacuum) 索引, 视图或特殊的系统表" -#: commands/vacuum.c:1328 +#: commands/vacuum.c:1331 #, c-format msgid "" "relation \"%s\" TID %u/%u: InsertTransactionInProgress %u --- can't shrink " "relation" msgstr "" -#: commands/vacuum.c:1341 +#: commands/vacuum.c:1344 #, c-format msgid "" "relation \"%s\" TID %u/%u: DeleteTransactionInProgress %u --- can't shrink " "relation" msgstr "" -#: commands/vacuum.c:1502 +#: commands/vacuum.c:1501 #, c-format msgid "" "%.0f dead row versions cannot be removed yet.\n" @@ -7619,66 +7760,66 @@ msgid "" "%s" msgstr "" -#: commands/vacuum.c:2255 +#: commands/vacuum.c:2254 #, c-format msgid "\"%s\": moved %u row versions, truncated %u to %u pages" msgstr "" -#: commands/vacuum.c:2878 commands/vacuum.c:2947 +#: commands/vacuum.c:2877 commands/vacuum.c:2946 #, c-format msgid "" "index \"%s\" contains %.0f row versions, but table contains %.0f row versions" msgstr "" -#: commands/vacuum.c:2881 commands/vacuum.c:2950 +#: commands/vacuum.c:2880 commands/vacuum.c:2949 msgid "Rebuild the index with REINDEX." msgstr "使用 REINDEX 重建索引." -#: commands/sequence.c:401 commands/sequence.c:593 commands/sequence.c:636 +#: commands/sequence.c:399 commands/sequence.c:591 commands/sequence.c:634 #, c-format msgid "permission denied for sequence %s" msgstr "对于序列 %s, 权限不够" -#: commands/sequence.c:478 +#: commands/sequence.c:476 #, c-format msgid "nextval: reached maximum value of sequence \"%s\" (%s)" msgstr "nextval: 达到序列 \"%s\" 的最大值了 (%s)" -#: commands/sequence.c:501 +#: commands/sequence.c:499 #, c-format msgid "nextval: reached minimum value of sequence \"%s\" (%s)" msgstr "nextval: 达到序列 \"%s\" 的最小值了 (%s)" -#: commands/sequence.c:599 +#: commands/sequence.c:597 #, c-format msgid "currval of sequence \"%s\" is not yet defined in this session" msgstr "在此会话中序列 \"%s\" 的 currval 仍没被定义" -#: commands/sequence.c:653 +#: commands/sequence.c:651 #, c-format msgid "setval: value %s is out of bounds for sequence \"%s\" (%s..%s)" msgstr "setval: 值 %s 超出序列 \"%s\" 的范围 (%s..%s)" -#: commands/sequence.c:937 +#: commands/sequence.c:956 msgid "INCREMENT must not be zero" msgstr "INCREMENT 不必为零" -#: commands/sequence.c:983 +#: commands/sequence.c:1002 #, c-format msgid "MINVALUE (%s) must be less than MAXVALUE (%s)" msgstr "MINVALUE (%s) 必需小于 MAXVALUE (%s)" -#: commands/sequence.c:1014 +#: commands/sequence.c:1033 #, c-format msgid "START value (%s) can't be less than MINVALUE (%s)" msgstr "START 值 (%s) 不能小于 MINVALUE (%s)" -#: commands/sequence.c:1026 +#: commands/sequence.c:1045 #, c-format msgid "START value (%s) can't be greater than MAXVALUE (%s)" msgstr "START 值 (%s) 不能大于 MAXVALUE (%s)" -#: commands/sequence.c:1041 +#: commands/sequence.c:1060 #, c-format msgid "CACHE (%s) must be greater than zero" msgstr "CACHE (%s) 必须大于零" @@ -7710,21 +7851,21 @@ msgstr "聚集转换数据类型不能为 %s" msgid "function %s(*) already exists in schema \"%s\"" msgstr "在模式 \"%2$s\" 中函数 %1$s(*) 已经存在" -#: commands/schemacmds.c:87 +#: commands/schemacmds.c:85 #, c-format msgid "\"%s\" is not a superuser, so cannot create a schema for \"%s\"" msgstr "\"%s\" 不是超级用户, 因此不能为 \"%s\" 创建模式" -#: commands/schemacmds.c:102 commands/schemacmds.c:297 +#: commands/schemacmds.c:100 commands/schemacmds.c:268 #, c-format msgid "unacceptable schema name \"%s\"" msgstr "不可访问的模式名字 \"%s\"" -#: commands/schemacmds.c:103 commands/schemacmds.c:298 +#: commands/schemacmds.c:101 commands/schemacmds.c:269 msgid "The prefix \"pg_\" is reserved for system schemas." msgstr "前缀 \"pg_\" 是保留给系统模式的." -#: commands/schemacmds.c:281 catalog/pg_namespace.c:51 +#: commands/schemacmds.c:252 catalog/pg_namespace.c:51 #, c-format msgid "schema \"%s\" already exists" msgstr "模式 \"%s\" 已经存在" @@ -7734,7 +7875,7 @@ msgstr "模式 \"%s\" 已经存在" msgid "JOIN/ON clause refers to \"%s\", which is not part of JOIN" msgstr "" -#: parser/parse_clause.c:423 gram.y:5172 +#: parser/parse_clause.c:423 gram.y:5161 msgid "subquery in FROM must have an alias" msgstr "FROM 中的子查询必须有一个别名" @@ -7746,90 +7887,90 @@ msgstr "FROM 中的子查询不可以有 SELECT INTO" msgid "subquery in FROM may not refer to other relations of same query level" msgstr "" -#: parser/parse_clause.c:523 +#: parser/parse_clause.c:527 msgid "" "function expression in FROM may not refer to other relations of same query " "level" msgstr "" -#: parser/parse_clause.c:535 +#: parser/parse_clause.c:539 msgid "cannot use aggregate function in function expression in FROM" msgstr "不能在 FROM 中的函数表达式中使用聚集函数" -#: parser/parse_clause.c:755 +#: parser/parse_clause.c:759 #, c-format msgid "column name \"%s\" appears more than once in USING clause" msgstr "在 USING 子句中字段名 \"%s\" 出现多次" -#: parser/parse_clause.c:770 +#: parser/parse_clause.c:774 #, c-format msgid "common column name \"%s\" appears more than once in left table" msgstr "共同的字段名 \"%s\" 在左边的表中出现了多次" -#: parser/parse_clause.c:779 +#: parser/parse_clause.c:783 #, c-format msgid "column \"%s\" specified in USING clause does not exist in left table" msgstr "USING 子句中指定的字段 \"%s\" 在左边的表中不存在" -#: parser/parse_clause.c:793 +#: parser/parse_clause.c:797 #, c-format msgid "common column name \"%s\" appears more than once in right table" msgstr "共同的字段名 \"%s\" 在右边的表中出现了多次" -#: parser/parse_clause.c:802 +#: parser/parse_clause.c:806 #, c-format msgid "column \"%s\" specified in USING clause does not exist in right table" msgstr "USING 子句中指定的字段 \"%s\" 在右边的表中不存在" -#: parser/parse_clause.c:854 +#: parser/parse_clause.c:858 #, c-format msgid "column alias list for \"%s\" has too many entries" msgstr "\"%s\" 的字段别名列表有太多记录" #. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_clause.c:1047 +#: parser/parse_clause.c:1051 #, c-format msgid "argument of %s must not contain variables" msgstr "%s 的参数不能包含变量" #. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_clause.c:1055 +#: parser/parse_clause.c:1059 #, c-format msgid "argument of %s must not contain aggregates" msgstr "%s 的参数一定不能包含聚集函数" #. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_clause.c:1063 +#: parser/parse_clause.c:1067 #, c-format msgid "argument of %s must not contain subqueries" msgstr "%s 的参数一定不能包含子查询" -#: parser/parse_clause.c:1175 +#: parser/parse_clause.c:1179 #, c-format msgid "%s \"%s\" is ambiguous" msgstr "%s \"%s\" 是不明确的" #. translator: %s is name of a SQL construct, eg ORDER BY -#: parser/parse_clause.c:1197 +#: parser/parse_clause.c:1201 #, c-format msgid "non-integer constant in %s" msgstr "在 %s 中的非整数常量" #. translator: %s is name of a SQL construct, eg ORDER BY -#: parser/parse_clause.c:1214 +#: parser/parse_clause.c:1218 #, c-format msgid "%s position %d is not in select list" msgstr "" -#: parser/parse_clause.c:1407 +#: parser/parse_clause.c:1411 msgid "for SELECT DISTINCT, ORDER BY expressions must appear in select list" msgstr "" -#: parser/parse_clause.c:1447 +#: parser/parse_clause.c:1451 msgid "SELECT DISTINCT ON expressions must match initial ORDER BY expressions" msgstr "" -#: parser/parse_agg.c:74 optimizer/util/clauses.c:426 executor/execQual.c:2769 +#: parser/parse_agg.c:74 optimizer/util/clauses.c:428 executor/execQual.c:2804 msgid "aggregate function calls may not be nested" msgstr "聚集函数调用不允许嵌套" @@ -7896,41 +8037,37 @@ msgstr "一个字段定义列表只允许返回 \"record\" 的函数" msgid "a column definition list is required for functions returning \"record\"" msgstr "一个字段定义列表需要返回 \"record\" 的函数" -#: parser/parse_relation.c:1052 +#: parser/parse_relation.c:1047 #, c-format msgid "too many column aliases specified for function %s" msgstr "为函数 %s 指定了太多的字段别名" -#: parser/parse_relation.c:1076 +#: parser/parse_relation.c:1071 #, c-format -msgid "function \"%s\" in FROM has unsupported return type" -msgstr "FROM 中的函数 \"%s\" 不支持返回类型" - -#: parser/parse_relation.c:1394 parser/parse_relation.c:1730 -msgid "function in FROM has unsupported return type" -msgstr "FROM 中的函数不支持返回类型" +msgid "function \"%s\" in FROM has unsupported return type %s" +msgstr "FROM 中的函数 \"%s\" 不支持返回类型 %s" -#: parser/parse_relation.c:2009 +#: parser/parse_relation.c:2003 #, c-format msgid "missing FROM-clause entry in subquery for table \"%s\"" msgstr "" -#: parser/parse_relation.c:2014 +#: parser/parse_relation.c:2008 #, c-format msgid "missing FROM-clause entry for table \"%s\"" msgstr "" -#: parser/parse_relation.c:2033 +#: parser/parse_relation.c:2027 #, c-format msgid "adding missing FROM-clause entry in subquery for table \"%s\"" msgstr "" -#: parser/parse_relation.c:2038 +#: parser/parse_relation.c:2032 #, c-format msgid "adding missing FROM-clause entry for table \"%s\"" msgstr "" -#: parser/parse_coerce.c:221 parser/analyze.c:3136 parser/parse_expr.c:116 +#: parser/parse_coerce.c:221 parser/analyze.c:3144 parser/parse_expr.c:116 #: parser/parse_expr.c:122 #, c-format msgid "there is no parameter $%d" @@ -7941,296 +8078,296 @@ msgstr "没有参数 $%d" msgid "inconsistent types deduced for parameter $%d" msgstr "" -#: parser/parse_coerce.c:676 parser/parse_coerce.c:703 -#: parser/parse_coerce.c:719 parser/parse_coerce.c:733 +#: parser/parse_coerce.c:691 parser/parse_coerce.c:718 +#: parser/parse_coerce.c:734 parser/parse_coerce.c:748 #: parser/parse_expr.c:1654 #, c-format msgid "cannot cast type %s to %s" msgstr "无法把类型 %s 转换为 %s" -#: parser/parse_coerce.c:706 +#: parser/parse_coerce.c:721 msgid "Input has too few columns." msgstr "输入字段太少" -#: parser/parse_coerce.c:722 +#: parser/parse_coerce.c:737 #, c-format msgid "Cannot cast type %s to %s in column %d." msgstr "不能把第 %3$d 个字段的类型 %1$s 转换为 %2$s." -#: parser/parse_coerce.c:736 +#: parser/parse_coerce.c:751 msgid "Input has too many columns." msgstr "输入字段太多" #. translator: first %s is name of a SQL construct, eg WHERE -#: parser/parse_coerce.c:770 +#: parser/parse_coerce.c:785 #, c-format msgid "argument of %s must be type boolean, not type %s" msgstr "%s 的参数必需是布尔类型, 而不是 %s 类型" #. translator: %s is name of a SQL construct, eg WHERE #. translator: %s is name of a SQL construct, eg LIMIT -#: parser/parse_coerce.c:778 parser/parse_coerce.c:817 +#: parser/parse_coerce.c:793 parser/parse_coerce.c:832 #, c-format msgid "argument of %s must not return a set" msgstr "%s 的参数不能返回一个组合" #. translator: first %s is name of a SQL construct, eg LIMIT -#: parser/parse_coerce.c:809 +#: parser/parse_coerce.c:824 #, c-format msgid "argument of %s must be type integer, not type %s" msgstr "%s 的参数必需是整数类型, 而不是 %s 类型" -#: parser/parse_coerce.c:871 +#: parser/parse_coerce.c:886 #, c-format msgid "%s types %s and %s cannot be matched" msgstr "%s 的类型 %s 和 %s 不匹配" #. translator: first %s is name of a SQL construct, eg CASE -#: parser/parse_coerce.c:933 +#: parser/parse_coerce.c:948 #, c-format msgid "%s could not convert type %s to %s" msgstr "%s 无法转换类型 %s 为 %s" -#: parser/parse_coerce.c:1109 +#: parser/parse_coerce.c:1124 msgid "arguments declared \"anyelement\" are not all alike" msgstr "参数声明的 \"anyelement\" 不全相同" -#: parser/parse_coerce.c:1126 +#: parser/parse_coerce.c:1141 msgid "arguments declared \"anyarray\" are not all alike" msgstr "参数声明的 \"anyarray\" 不全相同" -#: parser/parse_coerce.c:1155 parser/parse_coerce.c:1267 -#: parser/parse_coerce.c:1294 +#: parser/parse_coerce.c:1170 parser/parse_coerce.c:1282 +#: parser/parse_coerce.c:1309 #, c-format msgid "argument declared \"anyarray\" is not an array but type %s" msgstr "参数声明的 \"anyarray\" 不是一个数组, 但是类型为 %s" -#: parser/parse_coerce.c:1172 +#: parser/parse_coerce.c:1187 msgid "" "argument declared \"anyarray\" is not consistent with argument declared " "\"anyelement\"" msgstr "参数声明的 \"anyarray\" 和参数声明的 \"anyelement\" 不一致" -#: parser/parse_coerce.c:1183 +#: parser/parse_coerce.c:1198 msgid "" "could not determine anyarray/anyelement type because input has type \"unknown" "\"" msgstr "无法确定 anyarray/anyelement 类型, 因为输入类型为 \"unknown\"" -#: parser/parse_coerce.c:1208 parser/parse_coerce.c:1225 -#: parser/parse_coerce.c:1279 parser/parse_expr.c:794 parser/parse_expr.c:1350 +#: parser/parse_coerce.c:1223 parser/parse_coerce.c:1240 +#: parser/parse_coerce.c:1294 parser/parse_expr.c:794 parser/parse_expr.c:1350 #: parser/parse_expr.c:1389 parser/parse_oper.c:920 #, c-format msgid "could not find array type for data type %s" msgstr "无法为数据类型 %s 找到数组类型" -#: y.tab.c:9592 +#: y.tab.c:9501 msgid "syntax error: cannot back up" msgstr "语法错误: 无法支持/倒退" -#: gram.y:990 gram.y:1016 +#: gram.y:989 gram.y:1015 msgid "time zone interval must be HOUR or HOUR TO MINUTE" msgstr "时区间隔必须为 HOUR 或者 HOUR TO MINUTE" -#: gram.y:1001 gram.y:5497 gram.y:7560 +#: gram.y:1000 gram.y:5469 gram.y:7540 #, c-format msgid "INTERVAL(%d) precision must not be negative" msgstr "INTERVAL(%d) 的精确度不能为负数" -#: gram.y:1007 gram.y:5503 gram.y:7566 +#: gram.y:1006 gram.y:5475 gram.y:7546 #, c-format msgid "INTERVAL(%d) precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:1977 +#: gram.y:1976 msgid "CREATE TABLE AS may not specify INTO" msgstr "CREATE TABLE AS 不可以指定 INTO" -#: gram.y:2369 gram.y:2384 parser/analyze.c:2898 parser/analyze.c:2922 +#: gram.y:2368 gram.y:2383 parser/analyze.c:2906 parser/analyze.c:2930 msgid "constraint declared INITIALLY DEFERRED must be DEFERRABLE" msgstr "约束声明 INITIALLY DEFERRED 必须为 DEFERRABLE" -#: gram.y:2436 +#: gram.y:2435 msgid "CREATE ASSERTION is not yet implemented" msgstr "CREATE ASSERTION 仍未实现" -#: gram.y:2452 +#: gram.y:2451 msgid "DROP ASSERTION is not yet implemented" msgstr "DROP ASSERTION 仍未实现" -#: gram.y:2516 gram.y:7445 parser/parse_expr.c:1183 parser/parse_target.c:735 +#: gram.y:2515 gram.y:7425 parser/parse_expr.c:1183 parser/parse_target.c:736 #: catalog/namespace.c:1201 #, c-format msgid "improper qualified name (too many dotted names): %s" msgstr "不合适的条件名称 (名字中太多的点符号): %s" -#: gram.y:3334 +#: gram.y:3323 msgid "CREATE FUNCTION / OUT parameters are not implemented" msgstr "CREATE FUNCTION / OUT 参数未实现" -#: gram.y:3341 +#: gram.y:3330 msgid "CREATE FUNCTION / INOUT parameters are not implemented" msgstr "CREATE FUNCTION / INOUT 参数未实现" -#: gram.y:4551 +#: gram.y:4540 msgid "column name list not allowed in CREATE TABLE / AS EXECUTE" msgstr "字段名列表不允许在 CREATE TABLE / AS EXECUTE 中" -#: gram.y:5022 +#: gram.y:5011 msgid "LIMIT #,# syntax is not supported" msgstr "不支持 LIMIT #,# 语法" -#: gram.y:5023 +#: gram.y:5012 msgid "Use separate LIMIT and OFFSET clauses." msgstr "" -#: gram.y:5173 +#: gram.y:5162 msgid "For example, FROM (SELECT ...) [AS] foo." msgstr "例如, FROM (SELECT ...) [AS] foo." -#: gram.y:5600 +#: gram.y:5572 msgid "precision for type float must be at least 1 bit" msgstr "浮点类型的精确度必须至少 1 位" -#: gram.y:5608 +#: gram.y:5580 msgid "precision for type float must be less than 54 bits" msgstr "浮点类型的精确度必须小于 54 位" -#: gram.y:5622 gram.y:5637 +#: gram.y:5594 gram.y:5609 #, c-format msgid "NUMERIC precision %d must be between 1 and %d" msgstr "NUMERIC %d 的精度必须在 1 和 %d 之间" -#: gram.y:5627 +#: gram.y:5599 #, c-format msgid "NUMERIC scale %d must be between 0 and precision %d" msgstr "NUMERIC 数值范围 %d 必须在 0 和精度 %d 之间" -#: gram.y:5655 gram.y:5670 +#: gram.y:5627 gram.y:5642 #, c-format msgid "DECIMAL precision %d must be between 1 and %d" msgstr "DECIMAL %d 的精度必须在 1 和 %d 之间" -#: gram.y:5660 +#: gram.y:5632 #, c-format msgid "DECIMAL scale %d must be between 0 and precision %d" msgstr "DECIMAL 数值范围 %d 必须在 0 和精度 %d 之间" -#: gram.y:5720 gram.y:5798 +#: gram.y:5692 gram.y:5770 #, c-format msgid "length for type %s must be at least 1" msgstr "类型 %s 的长度至少为 1" -#: gram.y:5725 gram.y:5803 +#: gram.y:5697 gram.y:5775 #, c-format msgid "length for type %s cannot exceed %d" msgstr "类型 %s 的长度不能超过 %d" -#: gram.y:5876 +#: gram.y:5848 #, c-format msgid "TIMESTAMP(%d)%s precision must not be negative" msgstr "TIMESTAMP(%d)%s 精确度不能为负数" -#: gram.y:5882 +#: gram.y:5854 #, c-format msgid "TIMESTAMP(%d)%s precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:5917 +#: gram.y:5889 #, c-format msgid "TIME(%d)%s precision must not be negative" msgstr "TIME(%d)%s 精确度不能为负数" -#: gram.y:5923 +#: gram.y:5895 #, c-format msgid "TIME(%d)%s precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:6377 +#: gram.y:6349 msgid "UNIQUE predicate is not yet implemented" msgstr "" -#: gram.y:6612 +#: gram.y:6632 #, c-format msgid "CURRENT_TIME(%d) precision must not be negative" msgstr "CURRENT_TIME(%d) 精确度不能为负数" -#: gram.y:6618 +#: gram.y:6638 #, c-format msgid "CURRENT_TIME(%d) precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:6666 +#: gram.y:6686 #, c-format msgid "CURRENT_TIMESTAMP(%d) precision must not be negative" msgstr "CURRENT_TIMESTAMP(%d) 精确度不能为负数" -#: gram.y:6672 +#: gram.y:6692 #, c-format msgid "CURRENT_TIMESTAMP(%d) precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:6719 +#: gram.y:6739 #, c-format msgid "LOCALTIME(%d) precision must not be negative" msgstr "LOCALTIME(%d) 精确度不能为负数" -#: gram.y:6725 +#: gram.y:6745 #, c-format msgid "LOCALTIME(%d) precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:6773 +#: gram.y:6793 #, c-format msgid "LOCALTIMESTAMP(%d) precision must not be negative" msgstr "LOCALTIMESTAMP(%d) 精确度不能为负数" -#: gram.y:6779 +#: gram.y:6799 #, c-format msgid "LOCALTIMESTAMP(%d) precision reduced to maximum allowed, %d" msgstr "" -#: gram.y:8007 +#: gram.y:7987 msgid "OLD used in query that is not in a rule" msgstr "查询中使用的 OLD 不在一个规则中" -#: gram.y:8016 +#: gram.y:7996 msgid "NEW used in query that is not in a rule" msgstr "查询中使用的 NEW 不在一个规则中" -#: y.tab.c:19192 +#: y.tab.c:19080 msgid "syntax error; also virtual memory exhausted" msgstr "语法错误; 并且虚拟内存耗尽" -#: y.tab.c:19196 gram.y:8241 gram.y:8243 +#: y.tab.c:19084 gram.y:8221 gram.y:8223 gram.y:8240 gram.y:8242 msgid "syntax error" msgstr "语法错误" -#: y.tab.c:19295 +#: y.tab.c:19183 msgid "parser stack overflow" msgstr "语法分析器栈溢出" -#: gram.y:8215 +#: gram.y:8195 msgid "wrong number of parameters on left side of OVERLAPS expression" msgstr "OVERLAPS 表达式左边的参数个数不对" -#: gram.y:8221 +#: gram.y:8201 msgid "wrong number of parameters on right side of OVERLAPS expression" msgstr "OVERLAPS 表达式右边的参数个数不对" -#: gram.y:8300 +#: gram.y:8299 msgid "multiple ORDER BY clauses not allowed" msgstr "不允许多个 ORDER BY 子句" -#: gram.y:8308 +#: gram.y:8307 msgid "multiple FOR UPDATE clauses not allowed" msgstr "不允许多个 FOR UPDATE 子句" -#: gram.y:8316 +#: gram.y:8315 msgid "multiple OFFSET clauses not allowed" msgstr "不允许多个 OFFSET 子句" -#: gram.y:8324 +#: gram.y:8323 msgid "multiple LIMIT clauses not allowed" msgstr "不允许多个 LIMIT 子句" @@ -8274,193 +8411,198 @@ msgstr "%s 在输入的末尾" msgid "%s at or near \"%s\"" msgstr "%s 在 \"%s\" 或附近的" -#: parser/analyze.c:446 +#: parser/analyze.c:408 +#, c-format +msgid "target lists can have at most %d entries" +msgstr "目标列表最多可以有 %d 个字段" + +#: parser/analyze.c:458 msgid "CREATE VIEW specifies more column names than columns" msgstr "CREATE VIEW 指定的字段名比实际字段多" -#: parser/analyze.c:583 +#: parser/analyze.c:595 msgid "INSERT ... SELECT may not specify INTO" msgstr "INSERT ... SELECT 不必指定 INTO" -#: parser/analyze.c:671 +#: parser/analyze.c:683 msgid "INSERT has more expressions than target columns" msgstr "INSERT 的表达式多于指定的字段数" -#: parser/analyze.c:692 +#: parser/analyze.c:704 msgid "INSERT has more target columns than expressions" msgstr "INSERT 的指定字段数多于表达式" -#: parser/analyze.c:865 +#: parser/analyze.c:877 #, c-format msgid "%s will create implicit sequence \"%s\" for serial column \"%s.%s\"" msgstr "%1$s 将为 serial 字段 \"%3$s.%4$s\" 创建隐含序列 \"%2$s\"" -#: parser/analyze.c:948 parser/analyze.c:958 +#: parser/analyze.c:960 parser/analyze.c:970 #, c-format msgid "" "conflicting NULL/NOT NULL declarations for column \"%s\" of table \"%s\"" msgstr "表 \"%2$s\" 的字段 \"%1$s\" 声明 NULL/NOT NULL 冲突" -#: parser/analyze.c:968 +#: parser/analyze.c:980 #, c-format msgid "multiple default values specified for column \"%s\" of table \"%s\"" msgstr "对表 \"%2$s\" 的字段 \"%1$s\" 指定了多遍默认值" -#: parser/analyze.c:1311 +#: parser/analyze.c:1323 #, c-format msgid "column \"%s\" appears twice in primary key constraint" msgstr "在主键约束中字段 \"%s\" 出现了两次" -#: parser/analyze.c:1316 +#: parser/analyze.c:1328 #, c-format msgid "column \"%s\" appears twice in unique constraint" msgstr "字段 \"%s\" 在唯一约束中出现两次" -#: parser/analyze.c:1499 +#: parser/analyze.c:1511 msgid "index expression may not return a set" msgstr "索引表达式不能返回一个组合" -#: parser/analyze.c:1591 +#: parser/analyze.c:1603 msgid "rule WHERE condition may not contain references to other relations" msgstr "规则 WHERE 条件不能包含其它关系的关联" -#: parser/analyze.c:1597 +#: parser/analyze.c:1609 msgid "rule WHERE condition may not contain aggregate functions" msgstr "规则 WHERE 条件不能包含聚集函数" -#: parser/analyze.c:1668 +#: parser/analyze.c:1680 msgid "" "rules with WHERE conditions may only have SELECT, INSERT, UPDATE, or DELETE " "actions" msgstr "带 WHERE 条件的规则只允许有 SELECT, INSERT, UPDATE, 或者 DELETE 动作" -#: parser/analyze.c:1705 +#: parser/analyze.c:1717 msgid "ON SELECT rule may not use OLD" msgstr "ON SELECT 规则不可以使用 OLD" -#: parser/analyze.c:1709 +#: parser/analyze.c:1721 msgid "ON SELECT rule may not use NEW" msgstr "ON SELECT 规则不可以使用 NEW" -#: parser/analyze.c:1718 +#: parser/analyze.c:1730 msgid "ON INSERT rule may not use OLD" msgstr "ON INSERT 规则不可以使用 OLD" -#: parser/analyze.c:1724 +#: parser/analyze.c:1736 msgid "ON DELETE rule may not use NEW" msgstr "ON DELETE 规则不可以使用 NEW" -#: parser/analyze.c:1933 parser/analyze.c:2099 parser/analyze.c:2710 -#: optimizer/plan/planner.c:625 +#: parser/analyze.c:1945 parser/analyze.c:2111 parser/analyze.c:2718 +#: optimizer/plan/planner.c:641 msgid "SELECT FOR UPDATE is not allowed with UNION/INTERSECT/EXCEPT" msgstr "SELECT FOR UPDATE 不允许带 UNION/INTERSECT/EXCEPT" -#: parser/analyze.c:2056 +#: parser/analyze.c:2068 msgid "" "ORDER BY on a UNION/INTERSECT/EXCEPT result must be on one of the result " "columns" msgstr "在 UNION/INTERSECT/EXCEPT 结果上的 ORDER BY 必须是结果中的一个字段" -#: parser/analyze.c:2094 +#: parser/analyze.c:2106 msgid "INTO is only allowed on first SELECT of UNION/INTERSECT/EXCEPT" msgstr "INTO 只允许在 UNION/INTERSECT/EXCEPT 的第一个 SELECT 上使用" -#: parser/analyze.c:2155 +#: parser/analyze.c:2167 msgid "" "UNION/INTERSECT/EXCEPT member statement may not refer to other relations of " "same query level" msgstr "" -#: parser/analyze.c:2210 +#: parser/analyze.c:2222 #, c-format msgid "each %s query must have the same number of columns" msgstr "每一个 %s 查询必须有相同的字段个数" -#: parser/analyze.c:2282 +#: parser/analyze.c:2294 msgid "CREATE TABLE AS specifies too many column names" msgstr "CREATE TABLE AS 指定了太多的字段名字" -#: parser/analyze.c:2569 +#: parser/analyze.c:2577 msgid "cannot specify both SCROLL and NO SCROLL" msgstr "不可同时指定 SCROLL 和 NO SCROLL" -#: parser/analyze.c:2656 +#: parser/analyze.c:2664 #, c-format msgid "wrong number of parameters for prepared statement \"%s\"" msgstr "准备好的语句 \"%s\" 参数个数错误" -#: parser/analyze.c:2658 +#: parser/analyze.c:2666 #, c-format msgid "Expected %d parameters but got %d." msgstr "预计 %d 个参数, 但得到了 %d 个." -#: parser/analyze.c:2673 +#: parser/analyze.c:2681 msgid "cannot use subquery in EXECUTE parameter" msgstr "在 EXECUTE 参数中不可以使用子查询" -#: parser/analyze.c:2677 +#: parser/analyze.c:2685 msgid "cannot use aggregate function in EXECUTE parameter" msgstr "在 EXECUTE 参数中不可以使用聚集函数" -#: parser/analyze.c:2689 +#: parser/analyze.c:2697 #, c-format msgid "parameter $%d of type %s cannot be coerced to the expected type %s" msgstr "类型 %2$s 的参数 $%1$d 不能强制到预计 (expected) 类型 %3$s" -#: parser/analyze.c:2714 +#: parser/analyze.c:2722 msgid "SELECT FOR UPDATE is not allowed with DISTINCT clause" msgstr "SELECT FOR UPDATE 不允许带 DISTINCT 子句" -#: parser/analyze.c:2718 +#: parser/analyze.c:2726 msgid "SELECT FOR UPDATE is not allowed with GROUP BY clause" msgstr "SELECT FOR UPDATE 不允许带 GROUP BY 子句" -#: parser/analyze.c:2722 +#: parser/analyze.c:2730 msgid "SELECT FOR UPDATE is not allowed with aggregate functions" msgstr "SELECT FOR UPDATE 不允许带聚集函数" -#: parser/analyze.c:2804 +#: parser/analyze.c:2812 msgid "SELECT FOR UPDATE cannot be applied to a join" msgstr "SELECT FOR UPDATE 不能适用于一个联合 (join)" -#: parser/analyze.c:2809 +#: parser/analyze.c:2817 msgid "SELECT FOR UPDATE cannot be applied to NEW or OLD" msgstr "SELECT FOR UPDATE 不适用于 NEW 或 OLD" -#: parser/analyze.c:2814 +#: parser/analyze.c:2822 msgid "SELECT FOR UPDATE cannot be applied to a function" msgstr "SELECT FOR UPDATE 不适用于一个函数" -#: parser/analyze.c:2827 +#: parser/analyze.c:2835 #, c-format msgid "relation \"%s\" in FOR UPDATE clause not found in FROM clause" -msgstr "" +msgstr "在 FROM 子句中的 FOR UPDATE 子句中没有找到关系 \"%s\"" -#: parser/analyze.c:2874 +#: parser/analyze.c:2882 msgid "misplaced DEFERRABLE clause" msgstr "DEFERRABLE 子句位置错误" -#: parser/analyze.c:2878 parser/analyze.c:2891 +#: parser/analyze.c:2886 parser/analyze.c:2899 msgid "multiple DEFERRABLE/NOT DEFERRABLE clauses not allowed" msgstr "不允许多个 DEFERRABLE/NOT DEFERRABLE 子句" -#: parser/analyze.c:2887 +#: parser/analyze.c:2895 msgid "misplaced NOT DEFERRABLE clause" msgstr "NOT DEFERRABLE 子句位置错误" -#: parser/analyze.c:2905 +#: parser/analyze.c:2913 msgid "misplaced INITIALLY DEFERRED clause" msgstr "INITIALLY DEFERRED 子句位置错误" -#: parser/analyze.c:2909 parser/analyze.c:2933 +#: parser/analyze.c:2917 parser/analyze.c:2941 msgid "multiple INITIALLY IMMEDIATE/DEFERRED clauses not allowed" msgstr "不允许多个 INITIALLY IMMEDIATE/DEFERRED 子句" -#: parser/analyze.c:2929 +#: parser/analyze.c:2937 msgid "misplaced INITIALLY IMMEDIATE clause" msgstr "INITIALLY IMMEDIATE 子句位置错误" -#: parser/analyze.c:2982 +#: parser/analyze.c:2990 #, c-format msgid "" "CREATE specifies a schema (%s) different from the one being created (%s)" @@ -8506,7 +8648,7 @@ msgstr "操作符 %s 不能返回一个组合" msgid "subquery has too few columns" msgstr "子查询字段太少" -#: parser/parse_expr.c:1157 parser/parse_target.c:726 catalog/namespace.c:1195 +#: parser/parse_expr.c:1157 parser/parse_target.c:727 catalog/namespace.c:1195 #, c-format msgid "cross-database references are not implemented: %s" msgstr "未实现跨数据库关联: %s" @@ -8565,7 +8707,7 @@ msgstr "聚集函数可以不返回组合" msgid "column %s.%s does not exist" msgstr "字段 %s.%s 不存在" -#: parser/parse_func.c:1219 parser/parse_target.c:497 +#: parser/parse_func.c:1219 #, c-format msgid "column \"%s\" not found in data type %s" msgstr "在数据类型 %2$s 中未找到字段 \"%1$s\"" @@ -8652,41 +8794,51 @@ msgstr "" msgid "op ANY/ALL (array) requires operator not to return a set" msgstr "" -#: parser/parse_target.c:269 parser/parse_target.c:502 +#: parser/parse_target.c:268 parser/parse_target.c:503 #, c-format msgid "cannot assign to system column \"%s\"" msgstr "不能指定系统字段名 \"%s\"" -#: parser/parse_target.c:293 +#: parser/parse_target.c:292 msgid "cannot set an array element to DEFAULT" msgstr "不能设置一个数组元素为 DEFAULT" -#: parser/parse_target.c:297 +#: parser/parse_target.c:296 msgid "cannot set a subfield to DEFAULT" msgstr "不能设置子字段为 DEFAULT" -#: parser/parse_target.c:358 +#: parser/parse_target.c:357 #, c-format msgid "column \"%s\" is of type %s but expression is of type %s" msgstr "字段 \"%s\" 的类型为 %s, 但表达式的类型为 %s" -#: parser/parse_target.c:490 +#: parser/parse_target.c:489 +#, c-format +msgid "" +"cannot assign to field \"%s\" of column \"%s\" because its type %s is not a " +"composite type" +msgstr "" +"无法指定列 \"%2$s\" 的字段 \"%1$s\", 因为它的类型 %3$s 不是一个复合类型" + +#: parser/parse_target.c:497 #, c-format -msgid "cannot assign to a column of type %s because it is not a composite type" -msgstr "无法指定字段类型 %s, 因为它不是一个复合类型" +msgid "" +"cannot assign to field \"%s\" of column \"%s\" because there is no such " +"column in data type %s" +msgstr "无法给字段 \"%2$s\" 的数据域 \"%1$s\" 赋值, 因为在数据类型 %3$s 中没有此列" -#: parser/parse_target.c:566 +#: parser/parse_target.c:567 #, c-format msgid "" "array assignment to \"%s\" requires type %s but expression is of type %s" msgstr "" -#: parser/parse_target.c:575 +#: parser/parse_target.c:576 #, c-format msgid "subfield \"%s\" is of type %s but expression is of type %s" msgstr "子字段 \"%s\" 的类型为 %s, 但表达式的类型为 %s" -#: parser/parse_target.c:804 +#: parser/parse_target.c:805 msgid "SELECT * with no tables specified is not valid" msgstr "SELECT * 没有指定表是无效的" @@ -8710,7 +8862,7 @@ msgstr "类型关联 %s 转换为 %s" msgid "invalid type name \"%s\"" msgstr "无效的类型名字 \"%s\"" -#: optimizer/path/allpaths.c:224 +#: optimizer/path/allpaths.c:223 msgid "SELECT FOR UPDATE is not supported for inheritance queries" msgstr "SELECT FOR UPDATE 不支持继承查询" @@ -8738,148 +8890,210 @@ msgid "" "equality operator for types %s and %s should be merge-joinable, but isn't" msgstr "类型 %s 和 %s 的等号操作符应该为可合并联合的, 但这个不是" -#: optimizer/plan/planner.c:682 +#: optimizer/plan/planner.c:698 msgid "SELECT FOR UPDATE is not allowed in subqueries" msgstr "SELECT FOR UPDATE 不允许在子查询中" -#: optimizer/util/clauses.c:2295 +#: optimizer/util/clauses.c:2348 #, c-format msgid "SQL function \"%s\" during inlining" -msgstr "" +msgstr "SQL 函数 \"%s\" 在内联 (inlining) 期间" #: executor/execQual.c:811 msgid "functions and operators can take at most one set argument" msgstr "函数和操作符最多带一组参数" -#: executor/execQual.c:1288 -msgid "function returning row cannot return null value" -msgstr "函数返回行不能返回空值" +#: executor/execQual.c:1293 +msgid "function returning set of rows cannot return null value" +msgstr "函数返回值为多列时不能返回空值" -#: executor/execQual.c:1371 +#: executor/execQual.c:1377 msgid "table-function protocol for materialize mode was not followed" msgstr "" -#: executor/execQual.c:1378 +#: executor/execQual.c:1384 #, c-format msgid "unrecognized table-function returnMode: %d" msgstr "未认可的表函数返回模式 (returnMode): %d" -#: executor/execQual.c:1495 +#: executor/execQual.c:1530 msgid "IS DISTINCT FROM does not support set arguments" msgstr "IS DISTINCT FROM 不支持一组参数" -#: executor/execQual.c:1569 +#: executor/execQual.c:1604 msgid "op ANY/ALL (array) does not support set arguments" -msgstr "" +msgstr "操作符 ANY/ALL (数组) 不支持设置参数" -#: executor/execQual.c:2016 +#: executor/execQual.c:2051 msgid "cannot merge incompatible arrays" msgstr "无法合并不兼容的排列" -#: executor/execQual.c:2017 +#: executor/execQual.c:2052 #, c-format msgid "" "Array with element type %s cannot be included in ARRAY construct with " "element type %s." -msgstr "" +msgstr "元素类型为 %s 的 ARRAY 结构中不能包含带有元素类型为 %s 的数组." -#: executor/execQual.c:2216 +#: executor/execQual.c:2251 msgid "NULLIF does not support set arguments" msgstr "NULLIF 不支持一组参数" -#: executor/execQual.c:2397 +#: executor/execQual.c:2432 #, c-format msgid "domain %s does not allow null values" msgstr "域 %s 不允许空值" -#: executor/execQual.c:2427 +#: executor/execQual.c:2462 #, c-format msgid "value for domain %s violates check constraint \"%s\"" msgstr "域 %s 的值违反了检查约束 \"%s\"" -#: executor/execQual.c:3031 +#: executor/execQual.c:3066 #, c-format msgid "ROW() column has type %s instead of type %s" -msgstr "" +msgstr "ROW() 列类型 %s 替换为 %s" -#: executor/nodeHashjoin.c:562 executor/nodeHashjoin.c:572 +#: executor/nodeHashjoin.c:571 executor/nodeHashjoin.c:581 #, c-format msgid "could not read from hash-join temporary file: %m" msgstr "无法从散列联接 (hash-join) 临时文件读取: %m" -#: executor/nodeHashjoin.c:630 executor/nodeHashjoin.c:637 +#: executor/nodeHashjoin.c:641 executor/nodeHashjoin.c:648 #, c-format msgid "could not rewind hash-join temporary file: %m" msgstr "无法卷回 (rewind) 散列联接 (hash-join) 临时文件: %m" -#: executor/nodeHashjoin.c:688 executor/nodeHashjoin.c:693 +#: executor/nodeHashjoin.c:699 executor/nodeHashjoin.c:704 #, c-format msgid "could not write to hash-join temporary file: %m" msgstr "无法写入散列联接 (hash-join) 临时文件: %m" -#: executor/spi.c:185 +#: executor/spi.c:190 msgid "transaction left non-empty SPI stack" msgstr "事物剩下非空的 SPI 栈" -#: executor/spi.c:186 executor/spi.c:237 -msgid "Check for missing \"SPI_finish\" calls" -msgstr "" +#: executor/spi.c:191 executor/spi.c:255 +msgid "Check for missing \"SPI_finish\" calls." +msgstr "检查是否缺少 \"SPI_finish\" 调用." -#: executor/spi.c:236 +#: executor/spi.c:254 msgid "subtransaction left non-empty SPI stack" msgstr "子事物剩下非空的 SPI 栈" -#: executor/spi.c:775 +#: executor/spi.c:839 msgid "cannot open multi-query plan as cursor" msgstr "无法作为游标打开多条查询规划" -#: executor/spi.c:782 +#: executor/spi.c:846 msgid "cannot open non-SELECT query as cursor" msgstr "无法作为游标打开非 SELECT 查询" -#: executor/spi.c:786 +#: executor/spi.c:850 msgid "cannot open SELECT INTO query as cursor" msgstr "无法作为游标打开 SELECT INTO 查询" -#: executor/spi.c:1503 +#. translator: %s is a SQL statement name +#: executor/spi.c:1404 executor/functions.c:124 #, c-format -msgid "SQL query \"%s\"" -msgstr "SQL 查询 \"%s\"" +msgid "%s is not allowed in a non-volatile function" +msgstr "%s 在一个 non-valatile 函数中是不允许的" -#: executor/functions.c:169 +#: executor/spi.c:1582 +#, c-format +msgid "SQL statement \"%s\"" +msgstr "SQL 语句 \"%s\"" + +#. translator: %s is a SQL statement name +#: executor/functions.c:117 +#, c-format +msgid "%s is not allowed in a SQL function" +msgstr "%s 不允许在一个 SQL 函数中" + +#: executor/functions.c:190 #, c-format msgid "" "could not determine actual result type for function declared to return type %" "s" msgstr "无法确定实际结果类型为函数声明返回类型 %s" -#: executor/functions.c:219 +#: executor/functions.c:244 #, c-format msgid "could not determine actual type of argument declared %s" -msgstr "" - -#: executor/functions.c:296 -msgid "cannot begin/end transactions in SQL functions" -msgstr "" +msgstr "无法确定声明为 %s 的参数的实际类型" -#: executor/functions.c:689 +#: executor/functions.c:790 #, c-format msgid "SQL function \"%s\" statement %d" msgstr "SQL 函数 \"%s\" 语句 %d" -#: executor/functions.c:702 catalog/pg_proc.c:813 +#: executor/functions.c:803 catalog/pg_proc.c:574 #, c-format msgid "SQL function \"%s\"" msgstr "SQL 函数 \"%s\"" -#: executor/functions.c:708 +#: executor/functions.c:809 #, c-format msgid "SQL function \"%s\" during startup" msgstr "SQL 函数 \"%s\" 在启动的时候" +#: executor/functions.c:889 executor/functions.c:910 executor/functions.c:920 +#: executor/functions.c:944 executor/functions.c:952 executor/functions.c:1004 +#: executor/functions.c:1016 executor/functions.c:1036 +#, c-format +msgid "return type mismatch in function declared to return %s" +msgstr "函数返回类型和声明类型 %s 不匹配" + +#: executor/functions.c:891 executor/functions.c:922 +msgid "Function's final statement must be a SELECT." +msgstr "函数的最后语句必须是一个 SELECT" + +#: executor/functions.c:912 +msgid "Function's final statement must not be a SELECT." +msgstr "函数的最后语句必须不是一个 SELECT" + +#: executor/functions.c:946 +msgid "Final SELECT must return exactly one column." +msgstr "最后 SELECT 必须返回一列." + +#: executor/functions.c:954 +#, c-format +msgid "Actual return type is %s." +msgstr "实际返回类型是 %s." + +#: executor/functions.c:1006 +msgid "Final SELECT returns too many columns." +msgstr "最后 SELECT 返回了太多列." + +#: executor/functions.c:1018 +#, c-format +msgid "Final SELECT returns %s instead of %s at column %d." +msgstr "最后 SELECT 在字段 %3$d 返回 %1$s 替代 %2$s" + +#: executor/functions.c:1038 +msgid "Final SELECT returns too few columns." +msgstr "最后 SELECT 返回了太少列." + +#: executor/functions.c:1082 catalog/pg_aggregate.c:165 catalog/pg_proc.c:124 +msgid "cannot determine result data type" +msgstr "无法确定结构数据类型" + +#: executor/functions.c:1083 catalog/pg_proc.c:125 +msgid "" +"A function returning \"anyarray\" or \"anyelement\" must have at least one " +"argument of either type." +msgstr "" +"返回 \"anyarray\" 或者 \"anyelement\" 的函数必须至少有一个参数的类型是以上两" +"种" + +#: executor/functions.c:1088 +#, c-format +msgid "return type %s is not supported for SQL functions" +msgstr "SQL 函数不支持返回类型 %s" + #: executor/nodeMergejoin.c:1474 msgid "RIGHT JOIN is only supported with merge-joinable join conditions" -msgstr "" +msgstr "RIGHT JOIN 只支持可合并联结条件" #: executor/nodeFunctionscan.c:93 msgid "query-specified return row and actual function return row do not match" @@ -8888,29 +9102,29 @@ msgstr "指定查询返回行和实际函数返回行不匹配" #: executor/nodeSubplan.c:294 executor/nodeSubplan.c:336 #: executor/nodeSubplan.c:972 msgid "more than one row returned by a subquery used as an expression" -msgstr "" +msgstr "作为一个表达式使用的子查询返回了多列" -#: executor/execMain.c:839 +#: executor/execMain.c:814 #, c-format msgid "cannot change sequence \"%s\"" msgstr "不可以改变序列 \"%s\"" -#: executor/execMain.c:845 +#: executor/execMain.c:820 #, c-format msgid "cannot change TOAST relation \"%s\"" msgstr "不可以改变 TOAST 关系 \"%s\"" -#: executor/execMain.c:851 +#: executor/execMain.c:826 #, c-format msgid "cannot change view \"%s\"" msgstr "不可以改变视图 \"%s\"" -#: executor/execMain.c:1746 +#: executor/execMain.c:1731 #, c-format msgid "null value in column \"%s\" violates not-null constraint" msgstr "在字段 \"%s\" 中空值违反了非空约束" -#: executor/execMain.c:1758 +#: executor/execMain.c:1743 #, c-format msgid "new row for relation \"%s\" violates check constraint \"%s\"" msgstr "关系 \"%s\" 的新列违反了检查约束 \"%s\"" @@ -8941,7 +9155,7 @@ msgstr "必须至少指定一个左参数 (leftarg) 或右参数 (rightarg)" #: catalog/pg_operator.c:420 msgid "only binary operators can have commutators" -msgstr "" +msgstr "只有二进制操作符能有交换 (commutators)" #: catalog/pg_operator.c:424 msgid "only binary operators can have join selectivity" @@ -8962,7 +9176,7 @@ msgstr "操作符 %s 已经存在" #: catalog/pg_operator.c:726 msgid "operator cannot be its own negator or sort operator" -msgstr "" +msgstr "操作符不能否定自己或者排序分类操作符" #: catalog/dependency.c:152 #, c-format @@ -8996,7 +9210,7 @@ msgstr "你也许可以删除 %s 代替." #: catalog/dependency.c:521 catalog/dependency.c:674 catalog/dependency.c:702 #, c-format msgid "drop auto-cascades to %s" -msgstr "" +msgstr "自动递归删除 %s" #: catalog/dependency.c:526 catalog/dependency.c:679 #, c-format @@ -9060,8 +9274,8 @@ msgstr "操作符 %s" #: catalog/dependency.c:1626 #, c-format -msgid "operator class %s for %s" -msgstr "%2$s 的操作符类 %1$s" +msgid "operator class %s for access method %s" +msgstr "处理方法 %s 的操作符类 %s" #: catalog/dependency.c:1662 #, c-format @@ -9106,7 +9320,7 @@ msgstr "未归类的表 %s" #: catalog/dependency.c:1778 #, c-format msgid "toast table %s" -msgstr "" +msgstr "toast 表 %s" #: catalog/dependency.c:1782 #, c-format @@ -9174,7 +9388,7 @@ msgstr "语言 \"%s\" 不可信" #: catalog/aclchk.c:765 msgid "Only superusers may use untrusted languages." -msgstr "" +msgstr "只有超级用户可以使用非信任语言." #: catalog/aclchk.c:889 #, c-format @@ -9369,41 +9583,41 @@ msgstr "继续关系的创建." msgid "column \"%s\" has pseudo-type %s" msgstr "字段 \"%s\" 有伪类型 %s" -#: catalog/heap.c:1601 +#: catalog/heap.c:1586 #, c-format msgid "only table \"%s\" can be referenced in check constraint" msgstr "在检查约束中只有表 \"%s\" 能被关联的" -#: catalog/heap.c:1614 +#: catalog/heap.c:1599 msgid "cannot use aggregate function in check constraint" msgstr "在检查约束中不能使用聚集函数" -#: catalog/heap.c:1640 +#: catalog/heap.c:1625 #, c-format msgid "check constraint \"%s\" already exists" msgstr "检查约束 \"%s\" 已经存在" -#: catalog/heap.c:1789 +#: catalog/heap.c:1774 msgid "cannot use column references in default expression" msgstr "在默认的表达式中不能使用字段关联" -#: catalog/heap.c:1797 +#: catalog/heap.c:1782 msgid "default expression must not return a set" msgstr "默认表达式不能返回一个组合" -#: catalog/heap.c:1805 +#: catalog/heap.c:1790 msgid "cannot use subquery in default expression" msgstr "在默认的表达式中不能使用子查询" -#: catalog/heap.c:1809 +#: catalog/heap.c:1794 msgid "cannot use aggregate function in default expression" msgstr "在默认的表达式中不能使用聚集函数" -#: catalog/heap.c:2093 +#: catalog/heap.c:2078 msgid "cannot truncate a table referenced in a foreign key constraint" msgstr "在一个外键约束中无法删除 (truncate) 一个表的关联" -#: catalog/heap.c:2094 +#: catalog/heap.c:2079 #, c-format msgid "Table \"%s\" references \"%s\" via foreign key constraint \"%s\"." msgstr "通过外键约束 \"%3$s\", 表 \"%1$s\" 关联 \"%2$s\"." @@ -9431,10 +9645,6 @@ msgid "" "transition type is not compatible with input type" msgstr "" -#: catalog/pg_aggregate.c:165 catalog/pg_proc.c:127 catalog/pg_proc.c:576 -msgid "cannot determine result data type" -msgstr "无法确定结构数据类型" - #: catalog/pg_aggregate.c:166 msgid "" "An aggregate returning \"anyarray\" or \"anyelement\" must have one of them " @@ -9480,108 +9690,58 @@ msgstr "不合适的关系名称 (名字中太多的点符号): %s" msgid "permission denied to create temporary tables in database \"%s\"" msgstr "不允许在数据库 \"%s\" 中创建临时表" -#: catalog/pg_proc.c:128 catalog/pg_proc.c:577 -msgid "" -"A function returning \"anyarray\" or \"anyelement\" must have at least one " -"argument of either type." -msgstr "" -"返回 \"anyarray\" 或者 \"anyelement\" 的函数必须至少有一个参数的类型是以上两" -"种" - -#: catalog/pg_proc.c:148 +#: catalog/pg_proc.c:145 #, c-format msgid "\"%s\" is already an attribute of type %s" msgstr "\"%s\" 已经是类型 %s 的一个属性" -#: catalog/pg_proc.c:203 +#: catalog/pg_proc.c:200 #, c-format msgid "function \"%s\" already exists with same argument types" msgstr "带相同参数类型的函数 \"%s\" 已经存在" -#: catalog/pg_proc.c:217 +#: catalog/pg_proc.c:214 msgid "cannot change return type of existing function" msgstr "不能改变已经存在的函数的返回值类型" -#: catalog/pg_proc.c:218 +#: catalog/pg_proc.c:215 msgid "Use DROP FUNCTION first." msgstr "请先使用 DROP FUNCTION." -#: catalog/pg_proc.c:226 +#: catalog/pg_proc.c:223 #, c-format msgid "function \"%s\" is an aggregate" msgstr "函数 \"%s\" 是一个聚集函数" -#: catalog/pg_proc.c:231 +#: catalog/pg_proc.c:228 #, c-format msgid "function \"%s\" is not an aggregate" msgstr "函数 \"%s\" 不是一个聚集函数" -#: catalog/pg_proc.c:392 catalog/pg_proc.c:413 catalog/pg_proc.c:423 -#: catalog/pg_proc.c:447 catalog/pg_proc.c:455 catalog/pg_proc.c:507 -#: catalog/pg_proc.c:519 catalog/pg_proc.c:539 -#, c-format -msgid "return type mismatch in function declared to return %s" -msgstr "函数返回类型和声明类型 %s 不匹配" - -#: catalog/pg_proc.c:394 catalog/pg_proc.c:425 -msgid "Function's final statement must be a SELECT." -msgstr "函数的最后语句必须是一个 SELECT" - -#: catalog/pg_proc.c:415 -msgid "Function's final statement must not be a SELECT." -msgstr "函数的最后语句必须不是一个 SELECT" - -#: catalog/pg_proc.c:449 -msgid "Final SELECT must return exactly one column." -msgstr "最后 SELECT 必须返回一列." - -#: catalog/pg_proc.c:457 -#, c-format -msgid "Actual return type is %s." -msgstr "实际返回类型是 %s." - -#: catalog/pg_proc.c:509 -msgid "Final SELECT returns too many columns." -msgstr "最后 SELECT 返回了太多列." - -#: catalog/pg_proc.c:521 -#, c-format -msgid "Final SELECT returns %s instead of %s at column %d." -msgstr "最后 SELECT 在字段 %3$d 返回 %1$s 替代 %2$s" - -#: catalog/pg_proc.c:541 -msgid "Final SELECT returns too few columns." -msgstr "最后 SELECT 返回了太少列." - -#: catalog/pg_proc.c:582 -#, c-format -msgid "return type %s is not supported for SQL functions" -msgstr "SQL 函数不支持返回类型 %s" - -#: catalog/pg_proc.c:626 +#: catalog/pg_proc.c:387 #, c-format msgid "there is no built-in function named \"%s\"" msgstr "没有名为 \"%s\" 的内建函数" -#: catalog/pg_proc.c:726 +#: catalog/pg_proc.c:487 #, c-format msgid "SQL functions cannot return type %s" msgstr "SQL 函数无法返回 %s 类型" -#: catalog/pg_proc.c:742 +#: catalog/pg_proc.c:503 #, c-format msgid "SQL functions cannot have arguments of type %s" msgstr "SQL 函数不能有 %s 类型的参数" -#: catalog/index.c:508 +#: catalog/index.c:495 msgid "user-defined indexes on system catalog tables are not supported" msgstr "在系统表上用户定义的索引是不被支持的" -#: catalog/index.c:522 +#: catalog/index.c:509 msgid "shared indexes cannot be created after initdb" msgstr "在 initdb 之后, 不能创建共享索引" -#: catalog/index.c:1692 +#: catalog/index.c:1638 #, c-format msgid "shared index \"%s\" can only be reindexed in stand-alone mode" msgstr "共享索引 \"%s\" 只能在独立运行模式中重建索引" @@ -9594,7 +9754,7 @@ msgstr "无效类型内部大小 %d" #: catalog/pg_type.c:204 #, c-format msgid "internal size %d is invalid for passed-by-value type" -msgstr "" +msgstr "internal 大小 %d 对于 passed-by-value 类型是无效的" #: catalog/pg_type.c:211 msgid "fixed-size types must have storage PLAIN" @@ -9608,119 +9768,112 @@ msgstr "类型 \"%s\" 已经存在" #: postmaster/pgarch.c:164 #, c-format msgid "could not fork archiver: %m" -msgstr "" +msgstr "无法 fork archiver: %m" -#: postmaster/pgarch.c:392 +#: postmaster/pgarch.c:391 #, c-format -msgid "transaction log file \"%s\" could not be archived" -msgstr "事务日志文件 \"%s\" 不能被归档" +msgid "transaction log file \"%s\" could not be archived: too many failures" +msgstr "事务日志文件 \"%s\" 不能被归档: 太多的失败" -#: postmaster/pgarch.c:475 +#: postmaster/pgarch.c:474 #, c-format msgid "archive command \"%s\" failed: return code %d" msgstr "归档命令 \"%s\" 失败: 返回码为 %d" -#: postmaster/pgarch.c:480 +#: postmaster/pgarch.c:479 #, c-format msgid "archived transaction log file \"%s\"" msgstr "归档事务日志文件 \"%s\"" -#: postmaster/pgarch.c:526 +#: postmaster/pgarch.c:525 #, c-format msgid "could not open archive status directory \"%s\": %m" msgstr "无法打开归档状态目录 \"%s\": %m" -#: postmaster/pgarch.c:565 +#: postmaster/pgarch.c:564 #, c-format msgid "could not read archive status directory \"%s\": %m" msgstr "无法读取归档状态目录 \"%s\": %m" -#: postmaster/postmaster.c:390 +#: postmaster/postmaster.c:450 #, c-format msgid "%s: assert checking is not compiled in\n" msgstr "%s: 没有把断言 (assert) 检查编译进来\n" -#: postmaster/postmaster.c:515 postmaster/postmaster.c:528 +#: postmaster/postmaster.c:566 postmaster/postmaster.c:579 #, c-format msgid "Try \"%s --help\" for more information.\n" msgstr "请用 \"%s --help\" 获取更多的信息.\n" -#: postmaster/postmaster.c:526 +#: postmaster/postmaster.c:577 #, c-format msgid "%s: invalid argument: \"%s\"\n" msgstr "%s: 无效参数: \"%s\"\n" -#: postmaster/postmaster.c:550 -#, c-format -msgid "" -"%s does not know where to find the database system data.\n" -"This should be specified as \"pgdata\" in %s%s.\n" -msgstr "" - -#: postmaster/postmaster.c:582 -#, c-format -msgid "%s could not write to external pid file %s\n" -msgstr "" - -#: postmaster/postmaster.c:603 +#: postmaster/postmaster.c:604 #, c-format msgid "" "%s: the number of buffers (-B) must be at least twice the number of allowed " "connections (-N) and at least 16\n" msgstr "%s: 缓冲区的数量 (-B) 必须至少是允许联接数的两倍 (-N)并且至少为 16\n" -#: postmaster/postmaster.c:609 +#: postmaster/postmaster.c:610 #, c-format msgid "%s: superuser_reserved_connections must be less than max_connections\n" msgstr "%s: 超级用户保留联接数必须小于最大联接数\n" -#: postmaster/postmaster.c:618 +#: postmaster/postmaster.c:619 #, c-format msgid "%s: invalid datetoken tables, please fix\n" msgstr "%s: 无效的 datetoken 表, 请修复\n" -#: postmaster/postmaster.c:652 +#: postmaster/postmaster.c:653 #, c-format msgid "%s: could not locate matching postgres executable" -msgstr "" +msgstr "%s: 无法找到匹配的 postgres 执行文件" -#: postmaster/postmaster.c:719 +#: postmaster/postmaster.c:720 msgid "invalid list syntax for \"listen_addresses\"" -msgstr "" +msgstr "无效的 \"listen_addresses\" 语法" -#: postmaster/postmaster.c:738 +#: postmaster/postmaster.c:739 #, c-format msgid "could not create listen socket for \"%s\"" msgstr "无法为 \"%s\" 创建监听套接字" -#: postmaster/postmaster.c:767 +#: postmaster/postmaster.c:768 msgid "could not create Unix-domain socket" msgstr "无法创建 Unix-domain 套接字" -#: postmaster/postmaster.c:775 +#: postmaster/postmaster.c:776 msgid "no socket created for listening" msgstr "没有为监听创建套接字" -#: postmaster/postmaster.c:963 +#: postmaster/postmaster.c:853 +#, c-format +msgid "%s: could not write external PID file \"%s\": %s\n" +msgstr "%s: 无法写入外部 PID 文件 \"%s\": %s\n" + +#: postmaster/postmaster.c:946 #, c-format msgid "data directory \"%s\" does not exist" msgstr "数据目录 \"%s\" 不存在" -#: postmaster/postmaster.c:968 +#: postmaster/postmaster.c:951 #, c-format msgid "could not read permissions of directory \"%s\": %m" msgstr "没有读取目录 \"%s\" 的权限: %m" -#: postmaster/postmaster.c:983 +#: postmaster/postmaster.c:966 #, c-format msgid "data directory \"%s\" has group or world access" msgstr "组或其他用户都可以访问数据目录 \"%s\"" -#: postmaster/postmaster.c:985 +#: postmaster/postmaster.c:968 msgid "Permissions should be u=rwx (0700)." msgstr "权限应该为 u=rwx (0700)." -#: postmaster/postmaster.c:996 +#: postmaster/postmaster.c:979 #, c-format msgid "" "%s: could not find the database system\n" @@ -9731,17 +9884,17 @@ msgstr "" "预期在目录 \"%s\" 找到,\n" "但是无法打开文件 \"%s\": %s\n" -#: postmaster/postmaster.c:1041 +#: postmaster/postmaster.c:1024 #, c-format msgid "%s: could not fork background process: %s\n" msgstr "%s: 无法 fork 后台进程: %s\n" -#: postmaster/postmaster.c:1063 +#: postmaster/postmaster.c:1046 #, c-format msgid "%s: could not dissociate from controlling TTY: %s\n" msgstr "%s: 无法与控制 TTY 断开联系: %s\n" -#: postmaster/postmaster.c:1086 +#: postmaster/postmaster.c:1069 #, c-format msgid "" "%s is the PostgreSQL server.\n" @@ -9750,7 +9903,7 @@ msgstr "" "%s 是 PostgreSQL 服务器.\n" "\n" -#: postmaster/postmaster.c:1087 +#: postmaster/postmaster.c:1070 #, c-format msgid "" "Usage:\n" @@ -9761,64 +9914,64 @@ msgstr "" " %s [选项]...\n" "\n" -#: postmaster/postmaster.c:1094 +#: postmaster/postmaster.c:1077 #, c-format msgid " -d 1-5 debugging level\n" msgstr " -d 1-5 调试级别\n" -#: postmaster/postmaster.c:1097 +#: postmaster/postmaster.c:1080 #, c-format msgid " -h HOSTNAME host name or IP address to listen on\n" msgstr " -h 主机名 侦听的主机名或者 IP 地址\n" -#: postmaster/postmaster.c:1098 +#: postmaster/postmaster.c:1081 #, c-format msgid " -i enable TCP/IP connections\n" msgstr " -i 打开 TCP/IP 联接\n" -#: postmaster/postmaster.c:1099 +#: postmaster/postmaster.c:1082 #, c-format msgid " -k DIRECTORY Unix-domain socket location\n" msgstr " -k 目录 Unix 域套接字的位置\n" -#: postmaster/postmaster.c:1101 +#: postmaster/postmaster.c:1084 #, c-format msgid " -l enable SSL connections\n" msgstr " -l 打开 SSL 联接\n" -#: postmaster/postmaster.c:1103 +#: postmaster/postmaster.c:1086 #, c-format msgid " -N MAX-CONNECT maximum number of allowed connections\n" msgstr " -N MAX-CONNECT 允许建立的最大联接数目\n" -#: postmaster/postmaster.c:1104 +#: postmaster/postmaster.c:1087 #, c-format msgid " -o OPTIONS pass \"OPTIONS\" to each server process\n" msgstr " -o OPTIONS 把 \"OPTIONS\" 传递给每一个后端服务器进程\n" -#: postmaster/postmaster.c:1105 +#: postmaster/postmaster.c:1088 #, c-format msgid " -p PORT port number to listen on\n" msgstr " -p PORT 监听的端口号\n" -#: postmaster/postmaster.c:1106 +#: postmaster/postmaster.c:1089 #, c-format msgid "" " -S silent mode (start in background without logging output)\n" msgstr " -S 安静模式(后端启动之后不再记录日志输出)\n" -#: postmaster/postmaster.c:1111 +#: postmaster/postmaster.c:1094 #, c-format msgid "" " -n do not reinitialize shared memory after abnormal exit\n" msgstr " -n 在异常退出之后不再重新初始化共享内存\n" -#: postmaster/postmaster.c:1112 +#: postmaster/postmaster.c:1095 #, c-format msgid " -s send SIGSTOP to all backend servers if one dies\n" msgstr " -s 如果一个后端退出, 那么向所有后端发送 SIGSTOP\n" -#: postmaster/postmaster.c:1114 +#: postmaster/postmaster.c:1097 #, c-format msgid "" "\n" @@ -9834,390 +9987,417 @@ msgstr "" "\n" "请向 <pgsql-bugs@postgresql.org> 报告臭虫.\n" -#: postmaster/postmaster.c:1176 +#: postmaster/postmaster.c:1159 #, c-format msgid "select() failed in postmaster: %m" msgstr "postmaster select() 失败: %m" -#: postmaster/postmaster.c:1327 postmaster/postmaster.c:1358 +#: postmaster/postmaster.c:1310 postmaster/postmaster.c:1341 msgid "incomplete startup packet" msgstr "不完整的启动包" -#: postmaster/postmaster.c:1339 +#: postmaster/postmaster.c:1322 msgid "invalid length of startup packet" msgstr "无效的启动包长度" -#: postmaster/postmaster.c:1391 +#: postmaster/postmaster.c:1374 #, c-format msgid "failed to send SSL negotiation response: %m" msgstr "发送 SSL 协商响应失败: %m" -#: postmaster/postmaster.c:1420 +#: postmaster/postmaster.c:1403 #, c-format msgid "unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u" msgstr "不支持的前端协议 %u.%u: 服务端支持 %u.0 到 %u.%u" -#: postmaster/postmaster.c:1484 +#: postmaster/postmaster.c:1467 msgid "invalid startup packet layout: expected terminator as last byte" msgstr "无效的启动包格式: 预计结束符为最后一个字节" -#: postmaster/postmaster.c:1513 +#: postmaster/postmaster.c:1496 msgid "no PostgreSQL user name specified in startup packet" msgstr "在启动包中没有指定 PostgreSQL 用户名" -#: postmaster/postmaster.c:1566 +#: postmaster/postmaster.c:1549 msgid "the database system is starting up" msgstr "数据库系统启动中" -#: postmaster/postmaster.c:1571 +#: postmaster/postmaster.c:1554 msgid "the database system is shutting down" msgstr "数据库系统停止中" -#: postmaster/postmaster.c:1576 +#: postmaster/postmaster.c:1559 msgid "the database system is in recovery mode" msgstr "数据库系统在恢复模式中" -#: postmaster/postmaster.c:1808 +#: postmaster/postmaster.c:1791 msgid "received SIGHUP, reloading configuration files" msgstr "接收到 SIGHUP, 重载配置文件" -#: postmaster/postmaster.c:1860 +#: postmaster/postmaster.c:1843 msgid "received smart shutdown request" msgstr "接到到智能 (smart) 停止请求" -#: postmaster/postmaster.c:1896 +#: postmaster/postmaster.c:1879 msgid "received fast shutdown request" msgstr "接收到快速 (fast) 停止请求" -#: postmaster/postmaster.c:1903 +#: postmaster/postmaster.c:1886 msgid "aborting any active transactions" msgstr "中断任何激活事务" -#: postmaster/postmaster.c:1941 +#: postmaster/postmaster.c:1924 msgid "received immediate shutdown request" msgstr "接收到立即 (immediate) 停止请求" -#: postmaster/postmaster.c:2014 +#: postmaster/postmaster.c:1997 msgid "startup process" msgstr "启动进程" -#: postmaster/postmaster.c:2017 +#: postmaster/postmaster.c:2000 msgid "aborting startup due to startup process failure" msgstr "由于启动进程失败, 终止启动" -#: postmaster/postmaster.c:2080 +#: postmaster/postmaster.c:2063 msgid "background writer process" msgstr "后台写入进程" -#: postmaster/postmaster.c:2093 +#: postmaster/postmaster.c:2076 msgid "archiver process" msgstr "归档进程" -#: postmaster/postmaster.c:2110 +#: postmaster/postmaster.c:2093 msgid "statistics collector process" msgstr "统计收集器进程" -#: postmaster/postmaster.c:2124 +#: postmaster/postmaster.c:2107 msgid "system logger process" msgstr "系统日志进程" -#: postmaster/postmaster.c:2145 +#: postmaster/postmaster.c:2128 msgid "all server processes terminated; reinitializing" msgstr "所有的服务器进程被中止; 重新初始化" -#: postmaster/postmaster.c:2191 postmaster/postmaster.c:2201 +#: postmaster/postmaster.c:2174 postmaster/postmaster.c:2184 msgid "server process" msgstr "服务器进程" -#: postmaster/postmaster.c:2246 +#: postmaster/postmaster.c:2229 msgid "terminating any other active server processes" msgstr "中断任何其它已激活的服务器进程" -#: postmaster/postmaster.c:2343 +#: postmaster/postmaster.c:2326 #, c-format msgid "%s (PID %d) exited with exit code %d" msgstr "%s (PID %d) 已退出, 退出代码 %d" -#: postmaster/postmaster.c:2352 +#: postmaster/postmaster.c:2335 #, c-format msgid "%s (PID %d) was terminated by signal %d" msgstr "%s (PID %d) 被信号 %d 中断" -#: postmaster/postmaster.c:2361 +#: postmaster/postmaster.c:2344 #, c-format msgid "%s (PID %d) exited with unexpected status %d" msgstr "%s (PID %d) 已退出, 意外状态 %d" -#: postmaster/postmaster.c:2486 +#: postmaster/postmaster.c:2469 #, c-format msgid "could not fork new process for connection: %m" msgstr "无法为联接派生新进程: %m" -#: postmaster/postmaster.c:2525 +#: postmaster/postmaster.c:2508 msgid "could not fork new process for connection: " msgstr "无法为联接派生新进程: " -#: postmaster/postmaster.c:2667 +#: postmaster/postmaster.c:2647 #, c-format msgid "getnameinfo_all() failed: %s" msgstr "getnameinfo_all() 失败: %s" -#: postmaster/postmaster.c:2676 +#: postmaster/postmaster.c:2656 #, c-format msgid "connection received: host=%s port=%s" msgstr "联接接收到: 主机=%s 端口=%s" -#: postmaster/postmaster.c:2748 +#: postmaster/postmaster.c:2728 #, c-format msgid "connection authorized: user=%s database=%s" msgstr "联接认证: 主机=%s 数据库=%s" -#: postmaster/postmaster.c:2924 +#: postmaster/postmaster.c:2946 #, c-format -msgid "could not exec backend process \"%s\": %m" -msgstr "无法执行后台进程 \"%s\": %m" +msgid "could not execute server process \"%s\": %m" +msgstr "无法执行服务器进程 \"%s\": %m" -#: postmaster/postmaster.c:3321 +#: postmaster/postmaster.c:3540 #, c-format msgid "could not fork startup process: %m" msgstr "无法派生启动进程: %m" -#: postmaster/postmaster.c:3325 +#: postmaster/postmaster.c:3544 #, c-format msgid "could not fork background writer process: %m" msgstr "无法 fork 后台写入进程: %m" -#: postmaster/postmaster.c:3329 +#: postmaster/postmaster.c:3548 #, c-format msgid "could not fork process: %m" msgstr "无法派生进程: %m" -#: postmaster/postmaster.c:3513 +#: postmaster/postmaster.c:3722 +#, c-format +msgid "could not duplicate socket %d for use in backend: error code %d" +msgstr "无法为后端使用复制套接字 %d: 错误码为 %d" + +#: postmaster/postmaster.c:3751 +#, c-format +msgid "could not create inherited socket: error code %d\n" +msgstr "无法创建继承套接字: 错误码为 %d\n" + +#: postmaster/postmaster.c:3779 postmaster/postmaster.c:3786 #, c-format -msgid "could not read from backend variables file \"%s\": %m" -msgstr "无法从后端可变 (variables) 文件 \"%s\" 读取: %m" +msgid "could not read from backend variables file \"%s\": %s\n" +msgstr "无法从后端可变 (variables) 文件 \"%s\" 读取: %s\n" -#: postmaster/postmaster.c:3827 +#: postmaster/postmaster.c:3795 #, c-format -msgid "ERROR: failed to wait on child process handle: %d\n" -msgstr "错误: 等待子进程失败: %d\n" +msgid "could not remove file \"%s\": %s\n" +msgstr "无法删除文件 \"%s\": %s\n" -#: postmaster/pgstat.c:257 +#: postmaster/postmaster.c:3810 +#, c-format +msgid "could not map view of backend variables: error code %d\n" +msgstr "无法 map 后端变量视图: 错误码为 %d\n" + +#: postmaster/postmaster.c:3819 +#, c-format +msgid "could not unmap view of backend variables: error code %d\n" +msgstr "无法 unmap 后端变量视图: 错误码为 %d\n" + +#: postmaster/postmaster.c:3826 +#, c-format +msgid "could not close handle to backend parameter variables: error code %d\n" +msgstr "无法关闭后端参数变量的句柄: 错误码为 %d\n" + +#: postmaster/postmaster.c:4065 +#, c-format +msgid "could not wait on child process handle: error code %d\n" +msgstr "无法等待子进程: 错误码 %d\n" + +#: postmaster/pgstat.c:259 #, c-format msgid "could not resolve \"localhost\": %s" msgstr "无法解析 \"localhost\": %s" -#: postmaster/pgstat.c:285 +#: postmaster/pgstat.c:287 #, c-format msgid "could not create socket for statistics collector: %m" msgstr "无法为统计收集器创建套接字: %m" -#: postmaster/pgstat.c:297 +#: postmaster/pgstat.c:299 #, c-format msgid "could not bind socket for statistics collector: %m" msgstr "无法绑定统计收集器的套接字: %m" -#: postmaster/pgstat.c:308 +#: postmaster/pgstat.c:310 #, c-format msgid "could not get address of socket for statistics collector: %m" msgstr "无法获得统计收集器的套接字地址: %m" -#: postmaster/pgstat.c:324 +#: postmaster/pgstat.c:326 #, c-format msgid "could not connect socket for statistics collector: %m" msgstr "无法联接统计收集器的套接字: %m" -#: postmaster/pgstat.c:341 +#: postmaster/pgstat.c:343 #, c-format msgid "could not send test message on socket for statistics collector: %m" msgstr "无法为统计收集器在套接字上发送测试信息: %m" -#: postmaster/pgstat.c:366 postmaster/pgstat.c:1610 +#: postmaster/pgstat.c:368 postmaster/pgstat.c:1567 #, c-format msgid "select() failed in statistics collector: %m" msgstr "在统计收集器中 select() 失败: %m" -#: postmaster/pgstat.c:381 +#: postmaster/pgstat.c:383 msgid "test message did not get through on socket for statistics collector" msgstr "统计收集器的测试信息没有通过套接字: %m" -#: postmaster/pgstat.c:393 +#: postmaster/pgstat.c:395 #, c-format msgid "could not receive test message on socket for statistics collector: %m" msgstr "无法为统计收集器在套接字上接收测试信息: %m" -#: postmaster/pgstat.c:403 +#: postmaster/pgstat.c:405 msgid "incorrect test message transmission on socket for statistics collector" msgstr "统计收集器在套接字上不正确的测试信息 transmission: %m" -#: postmaster/pgstat.c:418 +#: postmaster/pgstat.c:420 msgid "disabling statistics collector for lack of working socket" msgstr "当缺乏可用套接字时取消统计收集器" -#: postmaster/pgstat.c:432 +#: postmaster/pgstat.c:434 #, c-format msgid "could not set statistics collector socket to nonblocking mode: %m" msgstr "无法把统计收集器的套接字设置为非阻塞模式: %m" -#: postmaster/pgstat.c:571 +#: postmaster/pgstat.c:567 msgid "statistics collector startup skipped" msgstr "忽略统计收集器启动" -#: postmaster/pgstat.c:605 +#: postmaster/pgstat.c:601 #, c-format msgid "could not fork statistics buffer: %m" msgstr "无法派生 (fork) 统计信息缓冲区: %m" -#: postmaster/pgstat.c:963 +#: postmaster/pgstat.c:959 msgid "must be superuser to reset statistics counters" msgstr "必须为超级用户才可以重置统计计数器" -#: postmaster/pgstat.c:1411 +#: postmaster/pgstat.c:1381 #, c-format msgid "could not create pipe for statistics buffer: %m" msgstr "无法为统计缓冲区创建管道: %m" -#: postmaster/pgstat.c:1424 +#: postmaster/pgstat.c:1393 #, c-format msgid "could not fork statistics collector: %m" msgstr "无法派生 (fork) 统计收集器: %m" -#: postmaster/pgstat.c:1537 postmaster/pgstat.c:1550 postmaster/pgstat.c:1833 -#: postmaster/pgstat.c:2099 postmaster/pgstat.c:2131 postmaster/pgstat.c:2185 -#: postmaster/pgstat.c:2446 postmaster/pgstat.c:2519 postmaster/pgstat.c:2565 -#: postmaster/pgstat.c:2616 postmaster/pgstat.c:2866 postmaster/pgstat.c:3048 -msgid "out of memory in statistics collector --- abort" -msgstr "在统计收集器中内存溢出 --- 终止" - -#: postmaster/pgstat.c:1652 +#: postmaster/pgstat.c:1608 #, c-format msgid "could not read from statistics collector pipe: %m" msgstr "无法从统计收集器管道读取: %m" -#: postmaster/pgstat.c:1674 +#: postmaster/pgstat.c:1629 msgid "invalid statistics message length" msgstr "无效的统计信息长度" -#: postmaster/pgstat.c:1821 +#: postmaster/pgstat.c:1774 #, c-format msgid "could not set statistics collector pipe to nonblocking mode: %m" msgstr "无法把统计收集器管道设置为非阻塞模式: %m" -#: postmaster/pgstat.c:1861 +#: postmaster/pgstat.c:1805 msgid "statistics buffer is full" msgstr "统计信息缓冲区已满" -#: postmaster/pgstat.c:1892 +#: postmaster/pgstat.c:1836 #, c-format msgid "select() failed in statistics buffer: %m" msgstr "在统计缓冲区中 select() 失败: %m" -#: postmaster/pgstat.c:1908 +#: postmaster/pgstat.c:1850 #, c-format msgid "could not read statistics message: %m" msgstr "无法读取统计信息: %m" -#: postmaster/pgstat.c:1973 +#: postmaster/pgstat.c:1913 #, c-format msgid "could not write to statistics collector pipe: %m" msgstr "无法写入统计收集器管道: %m" -#: postmaster/pgstat.c:2039 +#: postmaster/pgstat.c:1988 #, c-format msgid "invalid server process ID %d" msgstr "无效的服务器进程 ID %d" -#: postmaster/pgstat.c:2234 +#: postmaster/pgstat.c:2047 postmaster/pgstat.c:2122 postmaster/pgstat.c:2720 +msgid "out of memory in statistics collector --- abort" +msgstr "在统计收集器中内存溢出 --- 终止" + +#: postmaster/pgstat.c:2170 #, c-format msgid "could not open temporary statistics file \"%s\": %m" msgstr "无法打开临时统计文件 \"%s\": %m" -#: postmaster/pgstat.c:2261 +#: postmaster/pgstat.c:2196 msgid "database hash table corrupted during cleanup --- abort" msgstr "清理过程中数据库散列表毁坏 --- 终止" -#: postmaster/pgstat.c:2298 +#: postmaster/pgstat.c:2231 #, c-format msgid "tables hash table for database %u corrupted during cleanup --- abort" msgstr "清理过程中数据库 %u 的表散列表毁坏 --- 终止" -#: postmaster/pgstat.c:2347 +#: postmaster/pgstat.c:2279 #, c-format msgid "could not close temporary statistics file \"%s\": %m" msgstr "无法关闭临时统计文件 \"%s\": %m" -#: postmaster/pgstat.c:2356 +#: postmaster/pgstat.c:2288 #, c-format msgid "could not rename temporary statistics file \"%s\" to \"%s\": %m" msgstr "无法把临时统计文件 \"%s\" 重命名为 \"%s\": %m" -#: postmaster/pgstat.c:2378 +#: postmaster/pgstat.c:2310 msgid "dead-server-process hash table corrupted during cleanup --- abort" msgstr "清理过程中死服务器进程 (dead-server-process) 散列表毁坏 --- 终止" -#: postmaster/pgstat.c:2501 postmaster/pgstat.c:2533 postmaster/pgstat.c:2596 -#: postmaster/pgstat.c:2629 postmaster/pgstat.c:2650 postmaster/pgstat.c:2696 -#: postmaster/pgstat.c:2729 +#: postmaster/pgstat.c:2417 postmaster/pgstat.c:2437 postmaster/pgstat.c:2483 +#: postmaster/pgstat.c:2504 postmaster/pgstat.c:2521 postmaster/pgstat.c:2555 +#: postmaster/pgstat.c:2584 msgid "corrupted pgstat.stat file" msgstr "损坏的 pgstat.stat 文件" -#: postmaster/syslogger.c:315 +#: postmaster/syslogger.c:317 #, c-format msgid "select() failed in logger process: %m" msgstr "日志进程中的 select() 失败: %m" -#: postmaster/syslogger.c:327 postmaster/syslogger.c:732 +#: postmaster/syslogger.c:329 postmaster/syslogger.c:734 #, c-format msgid "could not read from logger pipe: %m" msgstr "无法从日志管道读取: %m" -#: postmaster/syslogger.c:359 +#: postmaster/syslogger.c:361 msgid "logger shutting down" msgstr "日志正在关闭" -#: postmaster/syslogger.c:403 postmaster/syslogger.c:417 +#: postmaster/syslogger.c:405 postmaster/syslogger.c:419 #, c-format -msgid "could not create pipe for syslogging: %m" -msgstr "无法为统计日志 (syslogging) 创建管道: %m" +msgid "could not create pipe for syslog: %m" +msgstr "无法为统计日志 (syslog) 创建管道: %m" -#: postmaster/syslogger.c:445 +#: postmaster/syslogger.c:447 #, c-format -msgid "could not create logfile \"%s\": %m" +msgid "could not create log file \"%s\": %m" msgstr "无法创建日志文件 \"%s\": %m" -#: postmaster/syslogger.c:475 +#: postmaster/syslogger.c:477 #, c-format msgid "could not fork system logger: %m" msgstr "无法派生 (fork) 系统日志: %m" -#: postmaster/syslogger.c:507 +#: postmaster/syslogger.c:509 #, c-format msgid "could not redirect stdout: %m" msgstr "无法重定向到标准输出 (stdout) : %m" -#: postmaster/syslogger.c:512 postmaster/syslogger.c:525 +#: postmaster/syslogger.c:514 postmaster/syslogger.c:527 #, c-format msgid "could not redirect stderr: %m" msgstr "无法重定向到标准错误 (stderr) : %m" -#: postmaster/syslogger.c:701 +#: postmaster/syslogger.c:703 #, c-format -msgid "could not write to logfile: %m" +msgid "could not write to log file: %m" msgstr "无法写入日志文件: %m" -#: postmaster/syslogger.c:775 +#: postmaster/syslogger.c:790 #, c-format -msgid "could not open new logfile \"%s\": %m" +msgid "could not open new log file \"%s\": %m" msgstr "无法打开新的日志文件 \"%s\": %m" -#: postmaster/syslogger.c:787 -msgid "disabling auto rotation (use SIGHUP to reenable)" -msgstr "" +#: postmaster/syslogger.c:802 +msgid "disabling automatic rotation (use SIGHUP to reenable)" +msgstr "取消自动轮寻 (使用 SIGHUP reenable)" #: postmaster/bgwriter.c:336 #, c-format msgid "checkpoints are occurring too frequently (%d seconds apart)" -msgstr "" +msgstr "检查点发生太频繁 (%d 秒间隔)" #: postmaster/bgwriter.c:338 msgid "" @@ -10225,18 +10405,18 @@ msgid "" msgstr "认为增加配置参数 \"checkpoint_segments\"." #: postmaster/bgwriter.c:490 -msgid "insufficient shared memory for bgwriter" +msgid "not enough shared memory for background writer" msgstr "没有足够的共享内存给后台写入进程" #: postmaster/bgwriter.c:555 msgid "checkpoint request failed" -msgstr "" +msgstr "检查点请求失败" #: postmaster/bgwriter.c:556 -msgid "Consult the postmaster log for details." +msgid "Consult the server log for details." msgstr "详细信息请参考服务器日志." -#: bootstrap/bootstrap.c:500 +#: bootstrap/bootstrap.c:481 msgid "" "Usage:\n" " postgres -boot [OPTION]... DBNAME\n" @@ -10256,8 +10436,47 @@ msgstr "" " -o file 把调试信息输出到文件 file\n" " -x num 内部使用\n" -#~ msgid "could not remove junction dir \"%s\": %m" -#~ msgstr "无法删除连接 (junction) 目录 \"%s\": %m" +#: ../port/dirmod.c:75 ../port/dirmod.c:88 ../port/dirmod.c:101 +#, c-format +msgid "out of memory\n" +msgstr "内存溢出\n" + +#: ../port/dirmod.c:283 +#, c-format +msgid "Error setting junction for %s: %s" +msgstr "为 %s 设置接合点错误: %s" + +#: ../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" -#~ msgid "Input has wrong number of columns." -#~ msgstr "错误的输入字段个数" +#: ../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" + +#: ../port/copydir.c:67 +#, c-format +msgid "could not copy file \"%s\": %m" +msgstr "无法拷贝文件 \"%s\": %m" |