Translation updates

Source-Git-URL: https://git.postgresql.org/git/pgtranslation/messages.git
Source-Git-Hash: 80d8f54b3c5533ec036404bd3c3b24ff4825d037

1 files changed, 316 insertions, 338 deletions

diff --git a/src/bin/pg_resetwal/po/zh_CN.po b/src/bin/pg_resetwal/po/zh_CN.po
index c199ac9a1a..f5cec00c61 100644
--- a/src/bin/pg_resetwal/po/zh_CN.po
+++ b/src/bin/pg_resetwal/po/zh_CN.po
@@ -1,390 +1,434 @@
-# simplified Chinese translation file for pg_resetxlog and friends
-# Bao Wei <weibao@forevertek.com>, 2002.
+# LANGUAGE message translation file for pg_resetwal
+# Copyright (C) 2019 PostgreSQL Global Development Group
+# This file is distributed under the same license as the pg_resetwal (PostgreSQL) package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pg_resetxlog (PostgreSQL 9.0)\n"
-"Report-Msgid-Bugs-To: pgsql-bugs@postgresql.org\n"
-"POT-Creation-Date: 2016-04-18 04:44+0000\n"
-"PO-Revision-Date: 2016-05-19 20:41+0800\n"
-"Last-Translator: Yuwei Peng <ywpeng@whu.edu.cn>\n"
-"Language-Team: Chinese (Simplified) <ywpeng@whu.edu.cn>\n"
-"Language: zh_CN\n"
+"Project-Id-Version: pg_resetwal (PostgreSQL) 12\n"
+"Report-Msgid-Bugs-To: pgsql-bugs@lists.postgresql.org\n"
+"POT-Creation-Date: 2019-05-22 17:56+0800\n"
+"PO-Revision-Date: 2019-05-31 17:30+0800\n"
+"Last-Translator: Jie Zhang <zhangjie2@cn.fujitsu.com>\n"
+"Language-Team: Chinese (Simplified) <zhangjie2@cn.fujitsu.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 1.5.7\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: ../../../src/common/logging.c:188
+#, c-format
+msgid "fatal: "
+msgstr "致命的: "
+
+#: ../../../src/common/logging.c:195
+#, c-format
+msgid "error: "
+msgstr "错误: "
+
+#: ../../../src/common/logging.c:202
+#, c-format
+msgid "warning: "
+msgstr "警告: "
 
-#: ../../common/restricted_token.c:68
+#: ../../common/restricted_token.c:69
 #, c-format
-msgid "%s: WARNING: cannot create restricted tokens on this platform\n"
-msgstr "%s: WARNING: 无法为该平台创建受限制的令牌\n"
+msgid "cannot create restricted tokens on this platform"
+msgstr "无法为该平台创建受限制的令牌"
 
-#: ../../common/restricted_token.c:77
+#: ../../common/restricted_token.c:78
 #, c-format
-msgid "%s: could not open process token: error code %lu\n"
-msgstr "%s:无法打开进程令牌 (token): 错误码 %lu\n"
+msgid "could not open process token: error code %lu"
+msgstr "无法打开进程令牌 (token): 错误码 %lu"
 
-#: ../../common/restricted_token.c:90
+#: ../../common/restricted_token.c:91
 #, c-format
-msgid "%s: could not allocate SIDs: error code %lu\n"
-msgstr "%s: 无法分配SID: 错误码 %lu\n"
+msgid "could not allocate SIDs: error code %lu"
+msgstr "无法分配SID: 错误码 %lu"
 
 #: ../../common/restricted_token.c:110
 #, c-format
-msgid "%s: could not create restricted token: error code %lu\n"
-msgstr "%s: 无法创建受限令牌: 错误码为 %lu\n"
+msgid "could not create restricted token: error code %lu"
+msgstr "无法创建受限令牌: 错误码为 %lu"
 
-#: ../../common/restricted_token.c:132
+#: ../../common/restricted_token.c:131
 #, c-format
-msgid "%s: could not start process for command \"%s\": error code %lu\n"
-msgstr "%s: 无法为命令 \"%s\"创建进程: 错误码 %lu\n"
+msgid "could not start process for command \"%s\": error code %lu"
+msgstr "无法为命令 \"%s\"创建进程: 错误码 %lu"
 
-#: ../../common/restricted_token.c:170
+#: ../../common/restricted_token.c:169
 #, c-format
-msgid "%s: could not re-execute with restricted token: error code %lu\n"
-msgstr "%s: 无法使用受限令牌再次执行: 错误码 %lu\n"
+msgid "could not re-execute with restricted token: error code %lu"
+msgstr "无法使用受限令牌再次执行: 错误码 %lu"
 
-#: ../../common/restricted_token.c:186
+#: ../../common/restricted_token.c:185
 #, c-format
-msgid "%s: could not get exit code from subprocess: error code %lu\n"
-msgstr "%s: 无法从子进程得到退出码: 错误码 %lu\n"
+msgid "could not get exit code from subprocess: error code %lu"
+msgstr "无法从子进程得到退出码: 错误码 %lu"
 
 #. translator: the second %s is a command line argument (-e, etc)
-#: pg_resetxlog.c:140 pg_resetxlog.c:155 pg_resetxlog.c:170 pg_resetxlog.c:177
-#: pg_resetxlog.c:201 pg_resetxlog.c:216 pg_resetxlog.c:224 pg_resetxlog.c:250
-#: pg_resetxlog.c:264
+#: pg_resetwal.c:160 pg_resetwal.c:175 pg_resetwal.c:190 pg_resetwal.c:197
+#: pg_resetwal.c:221 pg_resetwal.c:236 pg_resetwal.c:244 pg_resetwal.c:269
+#: pg_resetwal.c:283
 #, c-format
-msgid "%s: invalid argument for option %s\n"
-msgstr "%s:：选项%s的参数无效\n"
+msgid "invalid argument for option %s"
+msgstr "选项%s的参数无效"
 
-#: pg_resetxlog.c:141 pg_resetxlog.c:156 pg_resetxlog.c:171 pg_resetxlog.c:178
-#: pg_resetxlog.c:202 pg_resetxlog.c:217 pg_resetxlog.c:225 pg_resetxlog.c:251
-#: pg_resetxlog.c:265 pg_resetxlog.c:272 pg_resetxlog.c:285 pg_resetxlog.c:293
+#: pg_resetwal.c:161 pg_resetwal.c:176 pg_resetwal.c:191 pg_resetwal.c:198
+#: pg_resetwal.c:222 pg_resetwal.c:237 pg_resetwal.c:245 pg_resetwal.c:270
+#: pg_resetwal.c:284 pg_resetwal.c:310 pg_resetwal.c:323 pg_resetwal.c:331
 #, c-format
 msgid "Try \"%s --help\" for more information.\n"
-msgstr "输入 \"%s --help\" 获取更多的信息.\n"
+msgstr "请用 \"%s --help\" 获取更多的信息.\n"
 
-#: pg_resetxlog.c:146
+#: pg_resetwal.c:166
 #, c-format
-msgid "%s: transaction ID epoch (-e) must not be -1\n"
-msgstr "%s: 事务ID epoch(-e) 不能为 -1\n"
+msgid "transaction ID epoch (-e) must not be -1"
+msgstr "事务ID epoch（-e）不能为-1"
 
-#: pg_resetxlog.c:161
+#: pg_resetwal.c:181
 #, c-format
-msgid "%s: transaction ID (-x) must not be 0\n"
-msgstr "%s: 事务 ID (-x) 不能为 0\n"
+msgid "transaction ID (-x) must not be 0"
+msgstr "事务ID(-x)不能为0"
 
-#: pg_resetxlog.c:185 pg_resetxlog.c:192
+#: pg_resetwal.c:205 pg_resetwal.c:212
 #, c-format
-msgid ""
-"%s: transaction ID (-c) must be either 0 or greater than or equal to 2\n"
-msgstr "%s：事务ID (-c) 必须是0或者大于等于2\n"
+msgid "transaction ID (-c) must be either 0 or greater than or equal to 2"
+msgstr "事务ID(-c)必须为0或大于或等于2"
 
-#: pg_resetxlog.c:207
+#: pg_resetwal.c:227
 #, c-format
-msgid "%s: OID (-o) must not be 0\n"
-msgstr "%s: OID (-o) 不能为 0\n"
+msgid "OID (-o) must not be 0"
+msgstr "OID (-o)不能为0"
 
-#: pg_resetxlog.c:230
+#: pg_resetwal.c:250
 #, c-format
-msgid "%s: multitransaction ID (-m) must not be 0\n"
-msgstr "%s:  多事务 ID (-m) 不能为 0\n"
+msgid "multitransaction ID (-m) must not be 0"
+msgstr "多事务ID（-m）不能为0"
 
-#: pg_resetxlog.c:240
+#: pg_resetwal.c:260
 #, c-format
-msgid "%s: oldest multitransaction ID (-m) must not be 0\n"
-msgstr "%s:  最老的多事务 ID (-m) 不能为 0\n"
+msgid "oldest multitransaction ID (-m) must not be 0"
+msgstr "最早的多事务ID（-m）不能为0"
 
-#: pg_resetxlog.c:256
+#: pg_resetwal.c:275
 #, c-format
-msgid "%s: multitransaction offset (-O) must not be -1\n"
-msgstr "%s: 多事务 偏移 (-O) 不能为-1\n"
+msgid "multitransaction offset (-O) must not be -1"
+msgstr "多事务偏移量（-O）不能为-1"
 
-#: pg_resetxlog.c:283
+#: pg_resetwal.c:299
 #, c-format
-msgid "%s: too many command-line arguments (first is \"%s\")\n"
-msgstr "%s: 命令行参数太多 (第一个是 \"%s\")\n"
+msgid "argument of --wal-segsize must be a number"
+msgstr "--wal-segsize的参数必须是数字"
 
-#: pg_resetxlog.c:292
+#: pg_resetwal.c:304
 #, c-format
-msgid "%s: no data directory specified\n"
-msgstr "%s: 没有指定数据目录\n"
+msgid "argument of --wal-segsize must be a power of 2 between 1 and 1024"
+msgstr "--wal-segsize的参数必须是2的幂次方（在1和1024之间）"
 
-#: pg_resetxlog.c:306
+#: pg_resetwal.c:321
 #, c-format
-msgid "%s: cannot be executed by \"root\"\n"
-msgstr "%s:不能由\"root\"执行\n"
+msgid "too many command-line arguments (first is \"%s\")"
+msgstr "命令行参数太多 (第一个是 \"%s\")"
 
-#: pg_resetxlog.c:308
+#: pg_resetwal.c:330
 #, c-format
-msgid "You must run %s as the PostgreSQL superuser.\n"
-msgstr "您现在作为PostgreSQL超级用户运行%s.\n"
+msgid "no data directory specified"
+msgstr "没有指定数据目录"
 
-# command.c:256
-#: pg_resetxlog.c:318
+#: pg_resetwal.c:344
+#, fc-format
+msgid "cannot be executed by \"root\""
+msgstr "不能由\"root\"执行"
+
+#: pg_resetwal.c:345
 #, c-format
-msgid "%s: could not change directory to \"%s\": %s\n"
-msgstr "%s: 无法切换目录至 \"%s\": %s\n"
+msgid "You must run %s as the PostgreSQL superuser."
+msgstr "您现在作为PostgreSQL超级用户运行%s."
 
-#: pg_resetxlog.c:331 pg_resetxlog.c:477
+#: pg_resetwal.c:356
 #, c-format
-msgid "%s: could not open file \"%s\" for reading: %s\n"
-msgstr "%s: 无法打开文件 \"%s\" 读取信息: %s\n"
+msgid "could not read permissions of directory \"%s\": %m"
+msgstr "没有读取目录 \"%s\" 的权限: %m"
 
-#: pg_resetxlog.c:338
+#: pg_resetwal.c:365
 #, c-format
-msgid ""
-"%s: lock file \"%s\" exists\n"
-"Is a server running?  If not, delete the lock file and try again.\n"
-msgstr ""
-"%s: 锁文件 \"%s\" 已经存在\n"
-"是否有一个服务正在运行? 如果没有, 删除那个锁文件然后再试一次.\n"
+msgid "could not change directory to \"%s\": %m"
+msgstr "无法跳转到目录 \"%s\" 中: %m"
+
+#: pg_resetwal.c:381 pg_resetwal.c:545 pg_resetwal.c:602
+#, c-format
+msgid "could not open file \"%s\" for reading: %m"
+msgstr "为了读取, 无法打开文件 \"%s\": %m"
 
-#: pg_resetxlog.c:425
+#: pg_resetwal.c:388
+#, c-format
+msgid "lock file \"%s\" exists"
+msgstr "锁文件 \"%s\" 存在"
+
+#: pg_resetwal.c:389
+#, c-format
+msgid "Is a server running?  If not, delete the lock file and try again."
+msgstr "服务器是否正在运行？如果没有，请删除锁文件并重试."
+
+#: pg_resetwal.c:492
 #, c-format
 msgid ""
 "\n"
 "If these values seem acceptable, use -f to force reset.\n"
 msgstr ""
 "\n"
-"如果这些值可接受, 用 -f 强制重置.\n"
+"如果这些值似乎可以接受，则使用-f强制重置.\n"
 
-#: pg_resetxlog.c:437
+#: pg_resetwal.c:504
 #, c-format
 msgid ""
 "The database server was not shut down cleanly.\n"
-"Resetting the transaction log might cause data to be lost.\n"
+"Resetting the write-ahead log might cause data to be lost.\n"
 "If you want to proceed anyway, use -f to force reset.\n"
 msgstr ""
-"数据库服务器没有彻底关闭.\n"
-"重置事务日志有可能会引起丢失数据.\n"
-"如果你仍想继续, 用 -f 强制重置.\n"
+"数据库服务器未完全关闭 .\n"
+"重置预写日志可能会导致数据丢失.\n"
+"如果仍要继续，请使用-f强制重置.\n"
+
+#: pg_resetwal.c:518
+#, c-format
+msgid "Write-ahead log reset\n"
+msgstr "重置预写日志\n"
+
+#: pg_resetwal.c:554
+#, c-format
+msgid "unexpected empty file \"%s\""
+msgstr "意外的空文件\"%s\""
+
+#: pg_resetwal.c:556 pg_resetwal.c:618
+#, c-format
+msgid "could not read file \"%s\": %m"
+msgstr "无法读取文件 \"%s\": %m"
 
-#: pg_resetxlog.c:451
+#: pg_resetwal.c:571
 #, c-format
-msgid "Transaction log reset\n"
-msgstr "事务日志重置\n"
+msgid "data directory is of wrong version"
+msgstr "数据目录版本错误"
 
-#: pg_resetxlog.c:480
+#: pg_resetwal.c:572
+#, c-format
+msgid "File \"%s\" contains \"%s\", which is not compatible with this program's version \"%s\"."
+msgstr "文件\"%s\"包含\"%s\",与此程序的版本\"%s\"不兼容."
+
+#: pg_resetwal.c:605
 #, c-format
 msgid ""
 "If you are sure the data directory path is correct, execute\n"
 "  touch %s\n"
-"and try again.\n"
+"and try again."
 msgstr ""
-"如果你确定数据目录路径是正确的, 运行\n"
+"如果确定数据目录路径正确，请执行\n"
 "  touch %s\n"
-"然后再试一次.\n"
+"请再试一次"
 
-#: pg_resetxlog.c:493
+#: pg_resetwal.c:636
 #, c-format
-msgid "%s: could not read file \"%s\": %s\n"
-msgstr "%s: 无法读取文件 \"%s\": %s\n"
+msgid "pg_control exists but has invalid CRC; proceed with caution"
+msgstr "pg_control存在，但具有无效的CRC；请小心继续"
 
-#: pg_resetxlog.c:516
+#: pg_resetwal.c:645
 #, c-format
-msgid "%s: pg_control exists but has invalid CRC; proceed with caution\n"
-msgstr "%s: pg_control 已经存在, 但有无效的CRC; 带有警告的继续运行\n"
+msgid "pg_control specifies invalid WAL segment size (%d byte); proceed with caution"
+msgid_plural "pg_control specifies invalid WAL segment size (%d bytes); proceed with caution"
+msgstr[0] "pg_control指定的WAL段大小(%d 字节)无效; 请小心继续"
+msgstr[1] "pg_control指定的WAL段大小(%d 字节)无效; 请小心继续"
 
-#: pg_resetxlog.c:525
+#: pg_resetwal.c:656
 #, c-format
-msgid "%s: pg_control exists but is broken or unknown version; ignoring it\n"
-msgstr "%s: pg_control 已经存在, 但已破坏或无效版本; 忽略它\n"
+msgid "pg_control exists but is broken or wrong version; ignoring it"
+msgstr "pg_control存在，但已损坏或版本错误；忽略它"
 
-#: pg_resetxlog.c:628
+#: pg_resetwal.c:754
 #, c-format
 msgid ""
 "Guessed pg_control values:\n"
 "\n"
 msgstr ""
-"猜测的 pg_control 值:\n"
+"猜测的pg_control的值:\n"
 "\n"
 
-#: pg_resetxlog.c:630
+#: pg_resetwal.c:756
 #, c-format
 msgid ""
 "Current pg_control values:\n"
 "\n"
 msgstr ""
-"当前的 pg_control 值:\n"
+"当前的pg_control的值:\n"
 "\n"
 
-#: pg_resetxlog.c:639
+#: pg_resetwal.c:765
 #, c-format
 msgid "pg_control version number:            %u\n"
 msgstr "pg_control 版本:                      %u\n"
 
-#: pg_resetxlog.c:641
+#: pg_resetwal.c:767
 #, c-format
 msgid "Catalog version number:               %u\n"
 msgstr "Catalog 版本:                         %u\n"
 
-#: pg_resetxlog.c:643
+#: pg_resetwal.c:769
 #, c-format
 msgid "Database system identifier:           %s\n"
 msgstr "数据库系统标识符:                     %s\n"
 
-#: pg_resetxlog.c:645
+#: pg_resetwal.c:771
 #, c-format
 msgid "Latest checkpoint's TimeLineID:       %u\n"
 msgstr "最新检查点的 TimeLineID:              %u\n"
 
-#: pg_resetxlog.c:647
+#: pg_resetwal.c:773
 #, c-format
 msgid "Latest checkpoint's full_page_writes: %s\n"
 msgstr "最新检查点的full_page_writes: %s\n"
 
-# help.c:48
-#: pg_resetxlog.c:648
+#: pg_resetwal.c:774
 msgid "off"
 msgstr "关闭"
 
-# help.c:48
-#: pg_resetxlog.c:648
+#: pg_resetwal.c:774
 msgid "on"
 msgstr "开启"
 
-#: pg_resetxlog.c:649
+#: pg_resetwal.c:775
 #, c-format
-#| msgid "Latest checkpoint's NextXID:          %u/%u\n"
 msgid "Latest checkpoint's NextXID:          %u:%u\n"
 msgstr "最新检查点的NextXID:          %u:%u\n"
 
-#: pg_resetxlog.c:652
+#: pg_resetwal.c:778
 #, c-format
 msgid "Latest checkpoint's NextOID:          %u\n"
 msgstr "最新检查点的 NextOID:                 %u\n"
 
-#: pg_resetxlog.c:654
+#: pg_resetwal.c:780
 #, c-format
 msgid "Latest checkpoint's NextMultiXactId:  %u\n"
-msgstr "最新检查点的 NextMultiXactId:         %u\n"
+msgstr "最新检查点的NextMultiXactId: %u\n"
 
-#: pg_resetxlog.c:656
+#: pg_resetwal.c:782
 #, c-format
 msgid "Latest checkpoint's NextMultiOffset:  %u\n"
-msgstr "最新检查点的 NextMultiOffset:          %u\n"
+msgstr "最新检查点的NextMultiOffsetD: %u\n"
 
-#: pg_resetxlog.c:658
+#: pg_resetwal.c:784
 #, c-format
 msgid "Latest checkpoint's oldestXID:        %u\n"
-msgstr "最新检查点的oldestXID:             %u\n"
+msgstr "最新检查点的oldestXID:            %u\n"
 
-#: pg_resetxlog.c:660
+#: pg_resetwal.c:786
 #, c-format
 msgid "Latest checkpoint's oldestXID's DB:   %u\n"
-msgstr "最新检查点的oldestXID所在的数据库: %u\n"
+msgstr "最新检查点的oldestXID所在的数据库：%u\n"
 
-#: pg_resetxlog.c:662
+#: pg_resetwal.c:788
 #, c-format
 msgid "Latest checkpoint's oldestActiveXID:  %u\n"
-msgstr "最新检查点的oldestActiveXID:      %u\n"
+msgstr "最新检查点的oldestActiveXID:  %u\n"
 
-#: pg_resetxlog.c:664
+#: pg_resetwal.c:790
 #, c-format
 msgid "Latest checkpoint's oldestMultiXid:   %u\n"
-msgstr "最新检查点的oldestMultiXid:   %u\n"
+msgstr "最新检查点的oldestMultiXid:  %u\n"
 
-#: pg_resetxlog.c:666
+#: pg_resetwal.c:792
 #, c-format
 msgid "Latest checkpoint's oldestMulti's DB: %u\n"
-msgstr "最新检查点的oldestMulti所在的数据库: %u\n"
+msgstr "最新检查点的oldestMulti所在的数据库：%u\n"
 
-#: pg_resetxlog.c:668
+#: pg_resetwal.c:794
 #, c-format
-#| msgid "Latest checkpoint's oldestCommitTs:   %u\n"
 msgid "Latest checkpoint's oldestCommitTsXid:%u\n"
 msgstr "最新检查点的oldestCommitTsXid:%u\n"
 
-#: pg_resetxlog.c:670
+#: pg_resetwal.c:796
 #, c-format
-#| msgid "Latest checkpoint's newestCommitTs:   %u\n"
 msgid "Latest checkpoint's newestCommitTsXid:%u\n"
 msgstr "最新检查点的newestCommitTsXid:%u\n"
 
-#: pg_resetxlog.c:672
+#: pg_resetwal.c:798
 #, c-format
 msgid "Maximum data alignment:               %u\n"
-msgstr "最大的数据校准:                     %u\n"
+msgstr "最大数据校准:     %u\n"
 
-#: pg_resetxlog.c:675
+#: pg_resetwal.c:801
 #, c-format
 msgid "Database block size:                  %u\n"
 msgstr "数据库块大小:                         %u\n"
 
-#: pg_resetxlog.c:677
+#: pg_resetwal.c:803
 #, c-format
 msgid "Blocks per segment of large relation: %u\n"
 msgstr "大关系的每段块数:                     %u\n"
 
-#: pg_resetxlog.c:679
+#: pg_resetwal.c:805
 #, c-format
 msgid "WAL block size:                       %u\n"
-msgstr "WAL块大小:                         %u\n"
+msgstr "WAL的块大小:    %u\n"
 
-#: pg_resetxlog.c:681
+#: pg_resetwal.c:807 pg_resetwal.c:895
 #, c-format
 msgid "Bytes per WAL segment:                %u\n"
 msgstr "每一个 WAL 段字节数:                  %u\n"
 
-#: pg_resetxlog.c:683
+#: pg_resetwal.c:809
 #, c-format
 msgid "Maximum length of identifiers:        %u\n"
-msgstr "标示符的最大长度:                     %u\n"
+msgstr "标识符的最大长度:                     %u\n"
 
-#: pg_resetxlog.c:685
+#: pg_resetwal.c:811
 #, c-format
 msgid "Maximum columns in an index:          %u\n"
-msgstr "在索引中最多可用的列数:                   %u\n"
+msgstr "在索引中可允许使用最大的列数:    %u\n"
 
-#: pg_resetxlog.c:687
+#: pg_resetwal.c:813
 #, c-format
 msgid "Maximum size of a TOAST chunk:        %u\n"
-msgstr "一个TOAST区块的最大空间:                   %u\n"
+msgstr "TOAST区块的最大长度:                %u\n"
 
-#: pg_resetxlog.c:689
+#: pg_resetwal.c:815
 #, c-format
 msgid "Size of a large-object chunk:         %u\n"
-msgstr "一个大对象区块的大小:     %u\n"
+msgstr "大对象区块的大小:         %u\n"
 
-#: pg_resetxlog.c:691
+#: pg_resetwal.c:818
 #, c-format
 msgid "Date/time type storage:               %s\n"
-msgstr "日期/时间类型存储:                    %s\n"
+msgstr "日期/时间 类型存储:                   %s\n"
 
-#: pg_resetxlog.c:692
+#: pg_resetwal.c:819
 msgid "64-bit integers"
-msgstr "64位整型"
-
-#: pg_resetxlog.c:692
-msgid "floating-point numbers"
-msgstr "浮点数"
+msgstr "64位整数"
 
-#: pg_resetxlog.c:693
+#: pg_resetwal.c:820
 #, c-format
 msgid "Float4 argument passing:              %s\n"
-msgstr "正在传递Float4类型的参数:                    %s\n"
+msgstr "正在传递Flloat4类型的参数:           %s\n"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetwal.c:821 pg_resetwal.c:823
 msgid "by reference"
 msgstr "由引用"
 
-#: pg_resetxlog.c:694 pg_resetxlog.c:696
+#: pg_resetwal.c:821 pg_resetwal.c:823
 msgid "by value"
 msgstr "由值"
 
-#: pg_resetxlog.c:695
+#: pg_resetwal.c:822
 #, c-format
 msgid "Float8 argument passing:              %s\n"
-msgstr "正在传递Float8类型的参数:                    %s\n"
+msgstr "正在传递Flloat8类型的参数:                   %s\n"
 
-#: pg_resetxlog.c:697
+#: pg_resetwal.c:824
 #, c-format
 msgid "Data page checksum version:           %u\n"
-msgstr "数据页检验和版本:        %u\n"
+msgstr "数据页校验和版本:  %u\n"
 
-#: pg_resetxlog.c:711
+#: pg_resetwal.c:838
 #, c-format
 msgid ""
 "\n"
@@ -394,268 +438,202 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"将被改变的值:\n"
-"\n"
+"要更改的值:\n"
 
-#: pg_resetxlog.c:714
+#: pg_resetwal.c:842
 #, c-format
 msgid "First log segment after reset:        %s\n"
-msgstr "重置后的第一个日志段:        %s\n"
+msgstr "First log segment after reset:        %s\n"
 
-#: pg_resetxlog.c:718
+#: pg_resetwal.c:846
 #, c-format
 msgid "NextMultiXactId:                      %u\n"
-msgstr "下一个MultiXactId值NextMultiXactId:         %u\n"
+msgstr "NextMultiXactId:                      %u\n"
 
-#: pg_resetxlog.c:720
+#: pg_resetwal.c:848
 #, c-format
 msgid "OldestMultiXid:                       %u\n"
-msgstr "最老的MultiXid值OldestMultiXid:          %u\n"
+msgstr "OldestMultiXid:                       %u\n"
 
-#: pg_resetxlog.c:722
+#: pg_resetwal.c:850
 #, c-format
 msgid "OldestMulti's DB:                     %u\n"
-msgstr "最老的MultiXid对应的DB:     %u\n"
+msgstr "OldestMulti's DB:                     %u\n"
 
-#: pg_resetxlog.c:728
+#: pg_resetwal.c:856
 #, c-format
 msgid "NextMultiOffset:                      %u\n"
-msgstr "下一个偏移NextMultiOffset:           %u\n"
+msgstr "NextMultiOffset:                      %u\n"
 
-#: pg_resetxlog.c:734
+#: pg_resetwal.c:862
 #, c-format
 msgid "NextOID:                              %u\n"
-msgstr "NextOID:                             %u\n"
+msgstr "NextOID:                              %u\n"
 
-#: pg_resetxlog.c:740
+#: pg_resetwal.c:868
 #, c-format
 msgid "NextXID:                              %u\n"
 msgstr "NextXID:                              %u\n"
 
-#: pg_resetxlog.c:742
+#: pg_resetwal.c:870
 #, c-format
 msgid "OldestXID:                            %u\n"
 msgstr "OldestXID:                            %u\n"
 
-#: pg_resetxlog.c:744
+#: pg_resetwal.c:872
 #, c-format
 msgid "OldestXID's DB:                       %u\n"
 msgstr "OldestXID's DB:                       %u\n"
 
-#: pg_resetxlog.c:750
+#: pg_resetwal.c:878
 #, c-format
 msgid "NextXID epoch:                        %u\n"
-msgstr "NextXID 末端:                        %u\n"
+msgstr "NextXID epoch:                        %u\n"
 
-#: pg_resetxlog.c:756
+#: pg_resetwal.c:884
 #, c-format
-#| msgid "oldestCommitTs:                       %u\n"
 msgid "oldestCommitTsXid:                    %u\n"
-msgstr "oldestCommitTsXid：          %u\n"
+msgstr "oldestCommitTsXid:                    %u\n"
 
-#: pg_resetxlog.c:761
+#: pg_resetwal.c:889
 #, c-format
-#| msgid "newestCommitTs:                       %u\n"
 msgid "newestCommitTsXid:                    %u\n"
-msgstr "newestCommitTsXid：          %u\n"
+msgstr "newestCommitTsXid:                    %u\n"
 
-#: pg_resetxlog.c:827
+#: pg_resetwal.c:975 pg_resetwal.c:1043 pg_resetwal.c:1090
 #, c-format
-msgid ""
-"%s: internal error -- sizeof(ControlFileData) is too large ... fix "
-"PG_CONTROL_SIZE\n"
-msgstr "%s: 内部错误 -- sizeof(ControlFileData) 太大 ... 修复 xlog.c\n"
-
-#: pg_resetxlog.c:842
-#, c-format
-msgid "%s: could not create pg_control file: %s\n"
-msgstr "%s: 无法创建 pg_control 文件: %s\n"
-
-#: pg_resetxlog.c:853
-#, c-format
-msgid "%s: could not write pg_control file: %s\n"
-msgstr "%s: 无法写 pg_control 文件: %s\n"
-
-#: pg_resetxlog.c:860 pg_resetxlog.c:1156
-#, c-format
-msgid "%s: fsync error: %s\n"
-msgstr "%s: fsync 错误: %s\n"
+msgid "could not open directory \"%s\": %m"
+msgstr "无法打开目录 \"%s\": %m"
 
-#: pg_resetxlog.c:900 pg_resetxlog.c:971 pg_resetxlog.c:1022
+#: pg_resetwal.c:1010 pg_resetwal.c:1063 pg_resetwal.c:1113
 #, c-format
-msgid "%s: could not open directory \"%s\": %s\n"
-msgstr "%s: 无法打开目录 \"%s\": %s\n"
+msgid "could not read directory \"%s\": %m"
+msgstr "无法读取目录 \"%s\": %m"
 
-#: pg_resetxlog.c:936 pg_resetxlog.c:993 pg_resetxlog.c:1047
+#: pg_resetwal.c:1016 pg_resetwal.c:1069 pg_resetwal.c:1119
 #, c-format
-msgid "%s: could not read directory \"%s\": %s\n"
-msgstr "%s: 无法读取目录 \"%s\": %s\n"
+msgid "could not close directory \"%s\": %m"
+msgstr "无法关闭目录 \"%s\": %m"
 
-#: pg_resetxlog.c:943 pg_resetxlog.c:1000 pg_resetxlog.c:1054
+#: pg_resetwal.c:1055 pg_resetwal.c:1105
 #, c-format
-msgid "%s: could not close directory \"%s\": %s\n"
-msgstr "%s: 无法关闭目录 \"%s\": %s\n"
+msgid "could not delete file \"%s\": %m"
+msgstr "无法删除文件 \"%s\": %m"
 
-#: pg_resetxlog.c:984 pg_resetxlog.c:1038
+#: pg_resetwal.c:1186
 #, c-format
-msgid "%s: could not delete file \"%s\": %s\n"
-msgstr "%s: 无法删除文件 \"%s\": %s\n"
+msgid "could not open file \"%s\": %m"
+msgstr "无法打开文件 \"%s\": %m"
 
-#: pg_resetxlog.c:1123
+#: pg_resetwal.c:1196 pg_resetwal.c:1209
 #, c-format
-msgid "%s: could not open file \"%s\": %s\n"
-msgstr "%s: 无法打开文件 \"%s\": %s\n"
+msgid "could not write file \"%s\": %m"
+msgstr "无法写入文件 \"%s\": %m"
 
-#: pg_resetxlog.c:1134 pg_resetxlog.c:1148
+#: pg_resetwal.c:1216
 #, c-format
-msgid "%s: could not write file \"%s\": %s\n"
-msgstr "%s: 无法写文件 \"%s\": %s\n"
+msgid "fsync error: %m"
+msgstr "fsync 错误: %m"
 
-#: pg_resetxlog.c:1167
+#: pg_resetwal.c:1227
 #, c-format
 msgid ""
-"%s resets the PostgreSQL transaction log.\n"
-"\n"
-msgstr ""
-"%s 重置 PostgreSQL 事务日志.\n"
+"%s resets the PostgreSQL write-ahead log.\n"
 "\n"
+msgstr "%s 重置一个PostgreSQL数据库集簇的预写式日志.\n"
 
-#: pg_resetxlog.c:1168
+#: pg_resetwal.c:1228
 #, c-format
 msgid ""
 "Usage:\n"
 "  %s [OPTION]... DATADIR\n"
 "\n"
 msgstr ""
-"使用方法:\n"
+"用法:\n"
 "  %s [选项]... 数据目录\n"
-"\n"
 
-#: pg_resetxlog.c:1169
+#: pg_resetwal.c:1229
 #, c-format
 msgid "Options:\n"
 msgstr "选项:\n"
 
-#: pg_resetxlog.c:1170
+#: pg_resetwal.c:1230
 #, c-format
 msgid ""
-"  -c XID,XID       set oldest and newest transactions bearing commit "
-"timestamp\n"
-msgstr "  -c XID,XID       设置承受提交时间戳的最旧和最新事务\n"
+"  -c, --commit-timestamp-ids=XID,XID\n"
+"                                 set oldest and newest transactions bearing\n"
+"                                 commit timestamp (zero means no change)\n"
+msgstr ""
+"  -c, --commit-timestamp-ids=XID,XID\n"
+"                                 设置提交时间可以检索到的最老的和最新的事务ID\n"
+"                                 (0意味着没有变化)\n"
 
-#: pg_resetxlog.c:1171
+#: pg_resetwal.c:1233
 #, c-format
-msgid "                   (zero in either value means no change)\n"
-msgstr "                   （任一值中的零表示没有改变）\n"
+msgid " [-D, --pgdata=]DATADIR          data directory\n"
+msgstr " [-D, --pgdata=]DATADIR          数据目录\n"
 
-#: pg_resetxlog.c:1172
+#: pg_resetwal.c:1234
 #, c-format
-msgid " [-D] DATADIR      data directory\n"
-msgstr " [-D] DATADIR      数据目录\n"
+msgid "  -e, --epoch=XIDEPOCH           set next transaction ID epoch\n"
+msgstr "  -e, --epoch=XIDEPOCH           设置下一个事务ID的epoch\n"
 
-#: pg_resetxlog.c:1173
+#: pg_resetwal.c:1235
 #, c-format
-msgid "  -e XIDEPOCH      set next transaction ID epoch\n"
-msgstr "  -e XIDEPOCH      设置下一个事务ID时间单元（epoch）\n"
+msgid "  -f, --force                    force update to be done\n"
+msgstr "  -f, --force                    强制更新完成\n"
 
-#: pg_resetxlog.c:1174
+#: pg_resetwal.c:1236
 #, c-format
-msgid "  -f               force update to be done\n"
-msgstr "  -f               强制更新\n"
+msgid "  -l, --next-wal-file=WALFILE    set minimum starting location for new WAL\n"
+msgstr "  -l, --next-wal-file=WALFILE    设置新的WAL最小起始位置\n"
 
-#: pg_resetxlog.c:1175
+#: pg_resetwal.c:1237
 #, c-format
-msgid ""
-"  -l XLOGFILE      force minimum WAL starting location for new transaction "
-"log\n"
-msgstr "  -l XLOGFILE      为新的事务日志强制使用最小WAL日志起始位置\n"
+msgid "  -m, --multixact-ids=MXID,MXID  set next and oldest multitransaction ID\n"
+msgstr "  -m, --multixact-ids=MXID,MXID  设置下一个和最旧的多事务ID\n"
 
-#: pg_resetxlog.c:1176
+#: pg_resetwal.c:1238
 #, c-format
-msgid "  -m MXID,MXID     set next and oldest multitransaction ID\n"
-msgstr "  -m MXID,MXID    　设置下一个事务和最老的事务ID\n"
+msgid "  -n, --dry-run                  no update, just show what would be done\n"
+msgstr "  -n, --dry-run                  不更新，只显示将要执行的操作\n"
 
-#: pg_resetxlog.c:1177
+#: pg_resetwal.c:1239
 #, c-format
-msgid ""
-"  -n               no update, just show what would be done (for testing)\n"
-msgstr "  -n               未更新, 只显示将要做什么 (测试用途)\n"
+msgid "  -o, --next-oid=OID             set next OID\n"
+msgstr "  -o, --next-oid=OID             设置下一个OID\n"
 
-#: pg_resetxlog.c:1178
+#: pg_resetwal.c:1240
 #, c-format
-msgid "  -o OID           set next OID\n"
-msgstr "  -o OID           设置下一个 OID\n"
+msgid "  -O, --multixact-offset=OFFSET  set next multitransaction offset\n"
+msgstr "  -O, --multixact-offset=OFFSET  设置下一个多事务偏移量\n"
 
-#: pg_resetxlog.c:1179
+#: pg_resetwal.c:1241
 #, c-format
-msgid "  -O OFFSET        set next multitransaction offset\n"
-msgstr "  -O OFFSET        设置下一个多事务（multitransaction）偏移\n"
+msgid "  -V, --version                  output version information, then exit\n"
+msgstr "  -V, --version                  输出版本信息，然后退出\n"
 
-#: pg_resetxlog.c:1180
+#: pg_resetwal.c:1242
 #, c-format
-msgid "  -V, --version    output version information, then exit\n"
-msgstr "  -V, --version    输出版本信息，然后退出\n"
+msgid "  -x, --next-transaction-id=XID  set next transaction ID\n"
+msgstr "  -x, --next-transaction-id=XID  设置下一个事务ID\n"
 
-#: pg_resetxlog.c:1181
+#: pg_resetwal.c:1243
 #, c-format
-msgid "  -x XID           set next transaction ID\n"
-msgstr "  -x XID           设置下一个事务 ID\n"
+msgid "      --wal-segsize=SIZE         size of WAL segments, in megabytes\n"
+msgstr "      --wal-segsize=SIZE         WAL段的大小（兆字节）\n"
 
-#: pg_resetxlog.c:1182
+#: pg_resetwal.c:1244
 #, c-format
-msgid "  -?, --help       show this help, then exit\n"
-msgstr "  -?, --help       显示帮助信息，然后退出\n"
+msgid "  -?, --help                     show this help, then exit\n"
+msgstr "  -?, --help                     显示本帮助，然后退出\n"
 
-#: pg_resetxlog.c:1183
+#: pg_resetwal.c:1245
 #, c-format
 msgid ""
 "\n"
-"Report bugs to <pgsql-bugs@postgresql.org>.\n"
+"Report bugs to <pgsql-bugs@lists.postgresql.org>.\n"
 msgstr ""
 "\n"
-"报告错误至 <pgsql-bugs@postgresql.org>.\n"
-
-#~ msgid "%s: invalid argument for option -x\n"
-#~ msgstr "%s: 为 -x 选项的无效参数\n"
-
-#~ msgid "%s: invalid argument for option -o\n"
-#~ msgstr "%s: 为 -o 选项的无效参数\n"
-
-#~ msgid "%s: invalid argument for option -m\n"
-#~ msgstr "%s: 对于选项-m 参数无效\n"
-
-#~ msgid "%s: invalid argument for option -O\n"
-#~ msgstr "%s: 对于选项-O 参数无效\n"
-
-#~ msgid "%s: invalid argument for option -l\n"
-#~ msgstr "%s: 为 -l 选项的无效参数\n"
-
-#~ msgid "First log file ID after reset:        %u\n"
-#~ msgstr "重置后的第一个日志文件ID:               %u\n"
-
-#~ msgid "%s: invalid argument for -o option\n"
-#~ msgstr "%s: 为 -o 选项的无效参数\n"
-
-#~ msgid "%s: invalid argument for -x option\n"
-#~ msgstr "%s: 为 -x 选项的无效参数\n"
-
-#~ msgid "Latest checkpoint's StartUpID:        %u\n"
-#~ msgstr "最新检查点的 StartUpID:               %u\n"
-
-#~ msgid "Maximum number of function arguments: %u\n"
-#~ msgstr "函数参数的最大个数:                   %u\n"
-
-#~ msgid "%s: invalid LC_CTYPE setting\n"
-#~ msgstr "%s: 无效的 LC_CTYPE 设置\n"
-
-#~ msgid "%s: invalid LC_COLLATE setting\n"
-#~ msgstr "%s: 无效的 LC_COLLATE 设置\n"
-
-#~ msgid "  --version       output version information, then exit\n"
-#~ msgstr "  --version         输出版本信息, 然后退出\n"
-
-#~ msgid "  --help          show this help, then exit\n"
-#~ msgstr "  --help            显示此帮助信息, 然后退出\n"
+"报告错误至 <pgsql-bugs@lists.postgresql.org>.\n"
 
-#~ msgid "%s: could not read from directory \"%s\": %s\n"
-#~ msgstr "%s: 无法从目录 \"%s\" 中读取: %s\n"