bash-5.0-rc1 releasebash-5.0-rc1bash-5.0-testing

1 files changed, 263 insertions, 265 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6a373cf0..716fae5c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,6 +8,7 @@
 # Mingcong Bai <jeffbai@aosc.xyz>, 2015.
 # liushuyu <liushuyu011@gmail.com>, 2016.
 # Mingye Wang <arthur200126@gmail.com>, 2015, 2016.
+# Boyuan Yang <073plan@gmail.com>, 2018.
 #
 # KNOWN DEFECTS (easy fixes, tedious work; sorted by priority):
 #  0. Translation coverage when upstream sends new strings.
@@ -36,11 +37,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bash 4.4\n"
+"Project-Id-Version: bash 5.0-beta2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-11-16 15:54-0500\n"
-"PO-Revision-Date: 2016-12-01 17:25-0500\n"
-"Last-Translator: Mingye Wang (Arthur2e5) <arthur200126@gmail.com>\n"
+"POT-Creation-Date: 2018-12-19 15:52-0500\n"
+"PO-Revision-Date: 2018-12-13 13:27-0500\n"
+"Last-Translator: Boyuan Yang <073plan@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -48,14 +49,14 @@ msgstr ""
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.2\n"
 
 #: arrayfunc.c:58
 msgid "bad array subscript"
 msgstr "数组下标不正确"
 
-#: arrayfunc.c:377 builtins/declare.def:638 variables.c:2233 variables.c:2259
-#: variables.c:3075
+#: arrayfunc.c:377 builtins/declare.def:638 variables.c:2254 variables.c:2280
+#: variables.c:3108
 #, c-format
 msgid "%s: removing nameref attribute"
 msgstr "%s：正在移除名称引用属性"
@@ -85,21 +86,21 @@ msgstr "%s：%s：为关联数组赋值时必须使用下标"
 msgid "%s: cannot create: %s"
 msgstr "%s：无法创建: %s"
 
-#: bashline.c:4143
+#: bashline.c:4144
 msgid "bash_execute_unix_command: cannot find keymap for command"
 msgstr "bash_execute_unix_command: 无法为命令找到键映射"
 
-#: bashline.c:4253
+#: bashline.c:4254
 #, c-format
 msgid "%s: first non-whitespace character is not `\"'"
 msgstr "%s：第一个非空字符不是“\"”"
 
-#: bashline.c:4282
+#: bashline.c:4283
 #, c-format
 msgid "no closing `%c' in %s"
 msgstr "%2$s 中没有闭合的“%1$c”"
 
-#: bashline.c:4316
+#: bashline.c:4317
 #, c-format
 msgid "%s: missing colon separator"
 msgstr "%s：缺少冒号分隔符"
@@ -110,16 +111,16 @@ msgid "brace expansion: cannot allocate memory for %s"
 msgstr "大括号展开：无法为 %s 分配内存"
 
 #: braces.c:429
-#, fuzzy, c-format
+#, c-format
 msgid "brace expansion: failed to allocate memory for %u elements"
-msgstr "大括号展开：为 %d 个元素分配内存失败"
+msgstr "大括号展开：为 %u 个元素分配内存失败"
 
 #: braces.c:474
 #, c-format
 msgid "brace expansion: failed to allocate memory for `%s'"
 msgstr "大括号展开：为“%s”分配内存失败"
 
-#: builtins/alias.def:131 variables.c:1821
+#: builtins/alias.def:131 variables.c:1842
 #, c-format
 msgid "`%s': invalid alias name"
 msgstr "“%s”: 无效的别名"
@@ -152,7 +153,7 @@ msgstr "%s 未与任何键绑定。\n"
 #: builtins/bind.def:316
 #, c-format
 msgid "%s can be invoked via "
-msgstr "%s 可以被调用，通过"
+msgstr "%s 可以被调用，通过 "
 
 #: builtins/bind.def:353 builtins/bind.def:368
 #, c-format
@@ -175,7 +176,7 @@ msgid ""
 msgstr ""
 "返回当前子例程调用的上下文\n"
 "    \n"
-"    不带 EXPR 时，返回"
+"    不带 EXPR 时，返回 "
 
 #: builtins/cd.def:326
 msgid "HOME not set"
@@ -233,7 +234,7 @@ msgstr "%s：无效选项"
 msgid "%s: invalid option name"
 msgstr "%s：无效的选项名"
 
-#: builtins/common.c:230 execute_cmd.c:2363 general.c:296 general.c:301
+#: builtins/common.c:230 execute_cmd.c:2372 general.c:352 general.c:357
 #, c-format
 msgid "`%s': not a valid identifier"
 msgstr "“%s”: 不是有效的标识符"
@@ -368,13 +369,13 @@ msgstr "只能在函数中使用"
 msgid "%s: reference variable cannot be an array"
 msgstr "%s：引用变量不能为数组"
 
-#: builtins/declare.def:380 variables.c:3325
+#: builtins/declare.def:380 variables.c:3363
 #, c-format
 msgid "%s: nameref variable self references not allowed"
 msgstr "%s：不允许名称引用变量引用自身"
 
-#: builtins/declare.def:385 variables.c:2063 variables.c:3236 variables.c:3248
-#: variables.c:3322
+#: builtins/declare.def:385 variables.c:2084 variables.c:3272 variables.c:3285
+#: variables.c:3360
 #, c-format
 msgid "%s: circular name reference"
 msgstr "%s：循环变量名引用"
@@ -388,7 +389,7 @@ msgstr "“%s”: 无效的名称引用变量名"
 msgid "cannot use `-f' to make functions"
 msgstr "无法用 `-f' 生成函数"
 
-#: builtins/declare.def:532 execute_cmd.c:5843
+#: builtins/declare.def:532 execute_cmd.c:5852
 #, c-format
 msgid "%s: readonly function"
 msgstr "%s：只读函数"
@@ -437,7 +438,7 @@ msgstr "%s：未以动态方式加载"
 msgid "%s: cannot delete: %s"
 msgstr "%s：无法删除: %s"
 
-#: builtins/evalfile.c:138 builtins/hash.def:184 execute_cmd.c:5675
+#: builtins/evalfile.c:138 builtins/hash.def:184 execute_cmd.c:5684
 #, c-format
 msgid "%s: is a directory"
 msgstr "%s：是一个目录"
@@ -837,21 +838,21 @@ msgstr "读错误: %d: %s"
 msgid "can only `return' from a function or sourced script"
 msgstr "只能从函数或者源脚本返回(`return')"
 
-#: builtins/set.def:834
+#: builtins/set.def:852
 msgid "cannot simultaneously unset a function and a variable"
 msgstr "无法同时取消设定一个函数和一个变量"
 
-#: builtins/set.def:886
+#: builtins/set.def:904
 #, c-format
 msgid "%s: cannot unset"
 msgstr "%s：无法取消设定"
 
-#: builtins/set.def:907 variables.c:3772
+#: builtins/set.def:925 variables.c:3813
 #, c-format
 msgid "%s: cannot unset: readonly %s"
 msgstr "%s：无法取消设定: 只读 %s"
 
-#: builtins/set.def:920
+#: builtins/set.def:938
 #, c-format
 msgid "%s: not an array variable"
 msgstr "%s：不是数组变量"
@@ -1025,61 +1026,61 @@ msgstr "无法从 /dev/null 重定向标准输入: %s"
 msgid "TIMEFORMAT: `%c': invalid format character"
 msgstr "时间格式: `%c': 无效的格式字符"
 
-#: execute_cmd.c:2352
+#: execute_cmd.c:2361
 #, c-format
 msgid "execute_coproc: coproc [%d:%s] still exists"
 msgstr "execute_coproc: 副进程 [%d:%s] 仍然存在"
 
-#: execute_cmd.c:2476
+#: execute_cmd.c:2485
 msgid "pipe error"
 msgstr "管道错误"
 
-#: execute_cmd.c:4662
+#: execute_cmd.c:4671
 #, c-format
 msgid "eval: maximum eval nesting level exceeded (%d)"
 msgstr "eval: 超出最大 eval 嵌套层数 (%d)"
 
-#: execute_cmd.c:4674
+#: execute_cmd.c:4683
 #, c-format
 msgid "%s: maximum source nesting level exceeded (%d)"
 msgstr "%s：超出最大 source 嵌套层数 (%d)"
 
-#: execute_cmd.c:4782
+#: execute_cmd.c:4791
 #, c-format
 msgid "%s: maximum function nesting level exceeded (%d)"
 msgstr "%s：超出最大函数嵌套层数 (%d)"
 
-#: execute_cmd.c:5331
+#: execute_cmd.c:5340
 #, c-format
 msgid "%s: restricted: cannot specify `/' in command names"
 msgstr "%s：受限的: 无法在命令名中使用 `/'"
 
-#: execute_cmd.c:5429
+#: execute_cmd.c:5438
 #, c-format
 msgid "%s: command not found"
 msgstr "%s：未找到命令"
 
-#: execute_cmd.c:5673
+#: execute_cmd.c:5682
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"
 
-#: execute_cmd.c:5711
+#: execute_cmd.c:5720
 #, c-format
 msgid "%s: %s: bad interpreter"
 msgstr "%s：%s：解释器错误"
 
-#: execute_cmd.c:5748
+#: execute_cmd.c:5757
 #, c-format
 msgid "%s: cannot execute binary file: %s"
 msgstr "%s：无法执行二进制文件: %s"
 
-#: execute_cmd.c:5834
+#: execute_cmd.c:5843
 #, c-format
 msgid "`%s': is a special builtin"
 msgstr "“%s”: 特殊内建"
 
-#: execute_cmd.c:5886
+#: execute_cmd.c:5895
 #, c-format
 msgid "cannot duplicate fd %d to fd %d"
 msgstr "无法复制文件描述符 %d 到文件描述符 %d"
@@ -1101,9 +1102,8 @@ msgid "attempted assignment to non-variable"
 msgstr "尝试给非变量赋值"
 
 #: expr.c:530
-#, fuzzy
 msgid "syntax error in variable assignment"
-msgstr "表达式中有语法错误"
+msgstr "变量赋值中有语法错误"
 
 #: expr.c:544 expr.c:910
 msgid "division by 0"
@@ -1159,7 +1159,7 @@ msgstr "%s：表达式错误\n"
 msgid "getcwd: cannot access parent directories"
 msgstr "getcwd: 无法访问父目录"
 
-#: input.c:99 subst.c:5906
+#: input.c:99 subst.c:5930
 #, c-format
 msgid "cannot reset nodelay mode for fd %d"
 msgstr "无法为文件描述符 %d 重置nodelay模式"
@@ -1174,153 +1174,152 @@ msgstr "无法从文件描述符 %d 为 bash 的输入获取一个新的文件�
 msgid "save_bash_input: buffer already exists for new fd %d"
 msgstr "save_bash_input: 已经存在新的文件描述符 %d 的缓冲区"
 
-#: jobs.c:527
+#: jobs.c:529
 msgid "start_pipeline: pgrp pipe"
 msgstr "start_pipeline: 进程组管道"
 
-#: jobs.c:1082
+#: jobs.c:1084
 #, c-format
 msgid "forked pid %d appears in running job %d"
 msgstr "叉分 (fork) 出的的进程号 %d 出现在运行中的任务 %d 中"
 
-#: jobs.c:1201
+#: jobs.c:1203
 #, c-format
 msgid "deleting stopped job %d with process group %ld"
 msgstr "删除进程组 %2$ld 中已停止的任务 %1$d"
 
-#: jobs.c:1305
+#: jobs.c:1307
 #, c-format
 msgid "add_process: process %5ld (%s) in the_pipeline"
 msgstr "add_process: 进程 %5ld(%s) 进入 the_pipeline"
 
-#: jobs.c:1308
+#: jobs.c:1310
 #, c-format
 msgid "add_process: pid %5ld (%s) marked as still alive"
 msgstr "add_process: 进程号 %5ld(%s) 标注为仍活着"
 
-#: jobs.c:1637
+#: jobs.c:1639
 #, c-format
 msgid "describe_pid: %ld: no such pid"
 msgstr "describe_pid: %ld: 无此进程号"
 
-#: jobs.c:1652
+#: jobs.c:1654
 #, c-format
 msgid "Signal %d"
 msgstr "信号 %d"
 
-#: jobs.c:1666 jobs.c:1692
+#: jobs.c:1668 jobs.c:1694
 msgid "Done"
 msgstr "已完成"
 
-#: jobs.c:1671 siglist.c:123
+#: jobs.c:1673 siglist.c:123
 msgid "Stopped"
 msgstr "已停止"
 
-#: jobs.c:1675
+#: jobs.c:1677
 #, c-format
 msgid "Stopped(%s)"
 msgstr "已停止(%s)"
 
-#: jobs.c:1679
+#: jobs.c:1681
 msgid "Running"
 msgstr "运行中"
 
-#: jobs.c:1696
+#: jobs.c:1698
 #, c-format
 msgid "Done(%d)"
 msgstr "已完成(%d)"
 
-#: jobs.c:1698
+#: jobs.c:1700
 #, c-format
 msgid "Exit %d"
 msgstr "退出 %d"
 
-#: jobs.c:1701
+#: jobs.c:1703
 msgid "Unknown status"
 msgstr "未知状态"
 
-#: jobs.c:1788
+#: jobs.c:1790
 #, c-format
 msgid "(core dumped) "
-msgstr "(核心已转储)"
+msgstr "（核心已转储）"
 
-#: jobs.c:1807
+#: jobs.c:1809
 #, c-format
 msgid "  (wd: %s)"
 msgstr "  (工作目录: %s)"
 
-#: jobs.c:2035
+#: jobs.c:2037
 #, c-format
 msgid "child setpgid (%ld to %ld)"
 msgstr "子进程 setpgid (%ld 到 %ld)"
 
-#: jobs.c:2397 nojobs.c:657
+#: jobs.c:2399 nojobs.c:657
 #, c-format
 msgid "wait: pid %ld is not a child of this shell"
 msgstr "wait: 进程号 %ld 不是当前 shell 的子进程"
 
-#: jobs.c:2693
+#: jobs.c:2695
 #, c-format
 msgid "wait_for: No record of process %ld"
 msgstr "wiat_for: 没有进程 %ld 的记录"
 
-#: jobs.c:3053
+#: jobs.c:3055
 #, c-format
 msgid "wait_for_job: job %d is stopped"
 msgstr "wait_for_job: 任务 %d 已停止"
 
-#: jobs.c:3360
+#: jobs.c:3362
 #, c-format
 msgid "%s: job has terminated"
 msgstr "%s：任务已经终止"
 
-#: jobs.c:3369
+#: jobs.c:3371
 #, c-format
 msgid "%s: job %d already in background"
 msgstr "%s：任务 %d 已在后台"
 
-#: jobs.c:3595
+#: jobs.c:3597
 msgid "waitchld: turning on WNOHANG to avoid indefinite block"
 msgstr "waitchld: 打开 WNOHANG 以避免无限阻塞"
 
-#: jobs.c:4118
+#: jobs.c:4120
 #, c-format
 msgid "%s: line %d: "
 msgstr "%s：行 %d: "
 
-#: jobs.c:4132 nojobs.c:900
+#: jobs.c:4134 nojobs.c:900
 #, c-format
 msgid " (core dumped)"
 msgstr " (核心已转储)"
 
-#: jobs.c:4144 jobs.c:4157
+#: jobs.c:4146 jobs.c:4159
 #, c-format
 msgid "(wd now: %s)\n"
 msgstr "(当前工作目录：%s)\n"
 
-#: jobs.c:4189
+#: jobs.c:4191
 msgid "initialize_job_control: getpgrp failed"
 msgstr "initialize_job_control: getpgrp 失败"
 
-#: jobs.c:4245
-#, fuzzy
+#: jobs.c:4247
 msgid "initialize_job_control: no job control in background"
-msgstr "initialize_job_control: 行规则"
+msgstr "initialize_job_control: 后台无任务控制"
 
-#: jobs.c:4261
+#: jobs.c:4263
 msgid "initialize_job_control: line discipline"
 msgstr "initialize_job_control: 行规则"
 
-#: jobs.c:4271
+#: jobs.c:4273
 msgid "initialize_job_control: setpgid"
 msgstr "initialize_job_control: setpgid"
 
-#: jobs.c:4292 jobs.c:4301
+#: jobs.c:4294 jobs.c:4303
 #, c-format
 msgid "cannot set terminal process group (%d)"
 msgstr "无法设定终端进程组(%d)"
 
-#: jobs.c:4306
+#: jobs.c:4308
 msgid "no job control in this shell"
 msgstr "此 shell 中无任务控制"
 
@@ -1473,110 +1472,110 @@ msgstr "立即文档在第 %d 行被文件结束符分隔 (需要“%s”)"
 msgid "make_redirection: redirection instruction `%d' out of range"
 msgstr "make_redirection：重定向指令“%d”越界"
 
-#: parse.y:2369
+#: parse.y:2380
 #, c-format
 msgid ""
 "shell_getc: shell_input_line_size (%zu) exceeds SIZE_MAX (%lu): line "
 "truncated"
 msgstr "shell_getc：shell_input_line_size (%zu) 超过 SIZE_MAX (%lu)：行被截断"
 
-#: parse.y:2775
+#: parse.y:2786
 msgid "maximum here-document count exceeded"
 msgstr "超出最大立即文档数量"
 
-#: parse.y:3521 parse.y:3891
+#: parse.y:3536 parse.y:3906
 #, c-format
 msgid "unexpected EOF while looking for matching `%c'"
 msgstr "寻找匹配的“%c”时遇到了未预期的文件结束符"
 
-#: parse.y:4591
+#: parse.y:4606
 msgid "unexpected EOF while looking for `]]'"
 msgstr "寻找“]]”时遇到了未预期的文件结束符"
 
-#: parse.y:4596
+#: parse.y:4611
 #, c-format
 msgid "syntax error in conditional expression: unexpected token `%s'"
 msgstr "条件表达式中有语法错误：未预期的符号“%s”"
 
-#: parse.y:4600
+#: parse.y:4615
 msgid "syntax error in conditional expression"
 msgstr "条件表达式中有语法错误"
 
-#: parse.y:4678
+#: parse.y:4693
 #, c-format
 msgid "unexpected token `%s', expected `)'"
 msgstr "未预期的符号“%s” ，需要“)”"
 
-#: parse.y:4682
+#: parse.y:4697
 msgid "expected `)'"
 msgstr "需要“)”"
 
-#: parse.y:4710
+#: parse.y:4725
 #, c-format
 msgid "unexpected argument `%s' to conditional unary operator"
 msgstr "一元条件运算符使用了未预期的参数“%s”"
 
-#: parse.y:4714
+#: parse.y:4729
 msgid "unexpected argument to conditional unary operator"
 msgstr "一元条件运算符使用了未预期的参数"
 
-#: parse.y:4760
+#: parse.y:4775
 #, c-format
 msgid "unexpected token `%s', conditional binary operator expected"
 msgstr "未预期的符号“%s”，需要二元条件运算符"
 
-#: parse.y:4764
+#: parse.y:4779
 msgid "conditional binary operator expected"
 msgstr "需要二元条件运算符"
 
-#: parse.y:4786
+#: parse.y:4801
 #, c-format
 msgid "unexpected argument `%s' to conditional binary operator"
 msgstr "二元条件运算符使用了未预期的参数“%s”"
 
-#: parse.y:4790
+#: parse.y:4805
 msgid "unexpected argument to conditional binary operator"
 msgstr "二元条件运算符使用了未预期的参数"
 
-#: parse.y:4801
+#: parse.y:4816
 #, c-format
 msgid "unexpected token `%c' in conditional command"
 msgstr "条件命令中有未预期的符号“%c”"
 
-#: parse.y:4804
+#: parse.y:4819
 #, c-format
 msgid "unexpected token `%s' in conditional command"
 msgstr "条件命令中有未预期的符号“%s”"
 
-#: parse.y:4808
+#: parse.y:4823
 #, c-format
 msgid "unexpected token %d in conditional command"
 msgstr "条件命令中有未预期的符号 %d"
 
-#: parse.y:6230
+#: parse.y:6245
 #, c-format
 msgid "syntax error near unexpected token `%s'"
 msgstr "未预期的符号“%s”附近有语法错误"
 
-#: parse.y:6248
+#: parse.y:6263
 #, c-format
 msgid "syntax error near `%s'"
 msgstr "“%s”附近有语法错误"
 
-#: parse.y:6258
+#: parse.y:6273
 msgid "syntax error: unexpected end of file"
 msgstr "语法错误: 未预期的文件结尾"
 
-#: parse.y:6258
+#: parse.y:6273
 msgid "syntax error"
 msgstr "语法错误"
 
-#: parse.y:6320
+#: parse.y:6335
 #, c-format
 msgid "Use \"%s\" to leave the shell.\n"
 msgstr "使用 \"%s\" 退出 shell 。\n"
 
-#: parse.y:6482
+#: parse.y:6497
 msgid "unexpected EOF while looking for matching `)'"
 msgstr "寻找匹配的“)”时遇到了未预期的文件结束符"
 
@@ -1595,26 +1594,26 @@ msgstr "programmable_completion: %s：疑似重试循环"
 msgid "progcomp_insert: %s: NULL COMPSPEC"
 msgstr "progcomp_insert: %s：空的补全声明"
 
-#: print_cmd.c:300
+#: print_cmd.c:302
 #, c-format
 msgid "print_command: bad connector `%d'"
 msgstr "print_command: 错误的条件连接符 `%d'"
 
-#: print_cmd.c:373
+#: print_cmd.c:375
 #, c-format
 msgid "xtrace_set: %d: invalid file descriptor"
 msgstr "xtrace_set: %d: 无效的文件描述符"
 
-#: print_cmd.c:378
+#: print_cmd.c:380
 msgid "xtrace_set: NULL file pointer"
 msgstr "xtrace_set: 空的文件指针"
 
-#: print_cmd.c:382
+#: print_cmd.c:384
 #, c-format
 msgid "xtrace fd (%d) != fileno xtrace fp (%d)"
 msgstr "xtrace fd (%d) != fileno xtrace fp (%d)"
 
-#: print_cmd.c:1538
+#: print_cmd.c:1540
 #, c-format
 msgid "cprintf: `%c': invalid format character"
 msgstr "cprintf: `%c': 无效的格式字符"
@@ -1652,13 +1651,13 @@ msgstr "%s：无法将文件描述符赋值给变量"
 msgid "/dev/(tcp|udp)/host/port not supported without networking"
 msgstr "没有网络时不支持 /dev/(tcp|udp)/host/port"
 
-#: redir.c:873 redir.c:988 redir.c:1049 redir.c:1217
+#: redir.c:875 redir.c:990 redir.c:1051 redir.c:1221
 msgid "redirection error: cannot duplicate fd"
 msgstr "重定向错误: 无法复制文件描述符"
 
 #: shell.c:343
 msgid "could not find /tmp, please create!"
-msgstr "无法找到 /tmp ，请创建"
+msgstr "无法找到 /tmp ，请创建！"
 
 #: shell.c:347
 msgid "/tmp must be a valid directory name"
@@ -1666,7 +1665,7 @@ msgstr "/tmp 必须为有效的目录名"
 
 #: shell.c:798
 msgid "pretty-printing mode ignored in interactive shells"
-msgstr ""
+msgstr "在交互式 shell 中将忽略美化输出模式"
 
 #: shell.c:940
 #, c-format
@@ -1931,107 +1930,107 @@ msgstr "未知信号 #"
 msgid "Unknown Signal #%d"
 msgstr "未知信号 #%d"
 
-#: subst.c:1452 subst.c:1642
+#: subst.c:1454 subst.c:1644
 #, c-format
 msgid "bad substitution: no closing `%s' in %s"
 msgstr "错误的替换: 在 %2$s 中没有闭合的 `%1$s'"
 
-#: subst.c:3229
+#: subst.c:3231
 #, c-format
 msgid "%s: cannot assign list to array member"
 msgstr "%s：无法将链表赋值给数组成员"
 
-#: subst.c:5765 subst.c:5781
+#: subst.c:5789 subst.c:5805
 msgid "cannot make pipe for process substitution"
 msgstr "无法为进程替换创建管道"
 
-#: subst.c:5827
+#: subst.c:5851
 msgid "cannot make child for process substitution"
 msgstr "无法为进程替换创建子进程"
 
-#: subst.c:5896
+#: subst.c:5920
 #, c-format
 msgid "cannot open named pipe %s for reading"
-msgstr "无法打开命名管道 %s 进readline-"
+msgstr "无法打开命名管道 %s 以读取"
 
-#: subst.c:5898
+#: subst.c:5922
 #, c-format
 msgid "cannot open named pipe %s for writing"
 msgstr "无法打开命名管道 %s 进行写入"
 
-#: subst.c:5921
+#: subst.c:5945
 #, c-format
 msgid "cannot duplicate named pipe %s as fd %d"
 msgstr "无法将命名管道 %s 作为文件描述符 %d 复制"
 
-#: subst.c:6038
+#: subst.c:6062
 msgid "command substitution: ignored null byte in input"
 msgstr "命令替换：忽略输入中的 null 字节"
 
-#: subst.c:6166
+#: subst.c:6190
 msgid "cannot make pipe for command substitution"
 msgstr "无法为命令替换创建管道"
 
-#: subst.c:6209
+#: subst.c:6233
 msgid "cannot make child for command substitution"
 msgstr "无法为命令替换创建子进程"
 
-#: subst.c:6235
+#: subst.c:6259
 msgid "command_substitute: cannot duplicate pipe as fd 1"
 msgstr "command_substitute: 无法将管道复制为文件描述符 1"
 
-#: subst.c:6685 subst.c:9597
+#: subst.c:6710 subst.c:9623
 #, c-format
 msgid "%s: invalid variable name for name reference"
 msgstr "%s：无效的引用变量名"
 
-#: subst.c:6781 subst.c:6799 subst.c:6954
+#: subst.c:6806 subst.c:6824 subst.c:6979
 #, c-format
 msgid "%s: invalid indirect expansion"
 msgstr "%s：无效的间接展开"
 
-#: subst.c:6815 subst.c:6962
+#: subst.c:6840 subst.c:6987
 #, c-format
 msgid "%s: invalid variable name"
 msgstr "%s：无效的变量名"
 
-#: subst.c:7031
-#, fuzzy, c-format
+#: subst.c:7056
+#, c-format
 msgid "%s: parameter not set"
-msgstr "%s：参数为空或未设置"
+msgstr "%s：参数未设置"
 
-#: subst.c:7033
+#: subst.c:7058
 #, c-format
 msgid "%s: parameter null or not set"
 msgstr "%s：参数为空或未设置"
 
-#: subst.c:7270 subst.c:7285
+#: subst.c:7295 subst.c:7310
 #, c-format
 msgid "%s: substring expression < 0"
 msgstr "%s：子串表达式 < 0"
 
-#: subst.c:8948 subst.c:8969
+#: subst.c:8973 subst.c:8994
 #, c-format
 msgid "%s: bad substitution"
 msgstr "%s：错误的替换"
 
-#: subst.c:9057
+#: subst.c:9082
 #, c-format
 msgid "$%s: cannot assign in this way"
 msgstr "$%s：无法这样赋值"
 
-#: subst.c:9460
+#: subst.c:9485
 msgid ""
 "future versions of the shell will force evaluation as an arithmetic "
 "substitution"
 msgstr "未来版本的 shell 会强制估值为算术替换"
 
-#: subst.c:10017
+#: subst.c:10043
 #, c-format
 msgid "bad substitution: no closing \"`\" in %s"
 msgstr "错误的替换: 在 %s 中没有闭合的 \"`\""
 
-#: subst.c:11044
+#: subst.c:11070
 #, c-format
 msgid "no match: %s"
 msgstr "无匹配: %s"
@@ -2073,9 +2072,9 @@ msgid "invalid signal number"
 msgstr "无效的信号数"
 
 #: trap.c:320
-#, fuzzy, c-format
+#, c-format
 msgid "trap handler: maximum trap handler level exceeded (%d)"
-msgstr "eval: 超出最大 eval 嵌套层数 (%d)"
+msgstr "trap handler: 超出最大的 trap handler 层次 (%d)"
 
 #: trap.c:408
 #, c-format
@@ -2093,81 +2092,80 @@ msgstr "run_pending_traps: 信号处理器是 SIG_DFL，重新发送 %d (%s) 给
 msgid "trap_handler: bad signal %d"
 msgstr "trap_handler: 错误的信号 %d"
 
-#: variables.c:411
+#: variables.c:412
 #, c-format
 msgid "error importing function definition for `%s'"
 msgstr "“%s”函数定义导入错误"
 
-#: variables.c:820
+#: variables.c:821
 #, c-format
 msgid "shell level (%d) too high, resetting to 1"
 msgstr "shell 层次 (%d) 太高，重置为 1"
 
-#: variables.c:2623
+#: variables.c:2655
 msgid "make_local_variable: no function context at current scope"
 msgstr "make_local_variable: 当前作用域中没有函数上下文"
 
-#: variables.c:2642
+#: variables.c:2674
 #, c-format
 msgid "%s: variable may not be assigned value"
 msgstr "%s：变量不可赋值"
 
-#: variables.c:3415
+#: variables.c:3453
 #, c-format
 msgid "%s: assigning integer to name reference"
 msgstr "%s：将整数赋值给名称引用"
 
-#: variables.c:4324
+#: variables.c:4365
 msgid "all_local_variables: no function context at current scope"
 msgstr "all_local_variables: 当前作用域中没有函数上下文"
 
-#: variables.c:4657
+#: variables.c:4698
 #, c-format
 msgid "%s has null exportstr"
 msgstr "%s 的 exportstr 为空"
 
-#: variables.c:4662 variables.c:4671
+#: variables.c:4703 variables.c:4712
 #, c-format
 msgid "invalid character %d in exportstr for %s"
 msgstr "%2$s 的 exportstr 中有无效的字符 %1$d"
 
-#: variables.c:4677
+#: variables.c:4718
 #, c-format
 msgid "no `=' in exportstr for %s"
 msgstr "%s 的 exportstr 中没有“=”"
 
-#: variables.c:5202
+#: variables.c:5243
 msgid "pop_var_context: head of shell_variables not a function context"
 msgstr "pop_var_context: shell_variables 的头部不是函数上下文"
 
-#: variables.c:5215
+#: variables.c:5256
 msgid "pop_var_context: no global_variables context"
 msgstr "pop_var_context: 没有 global_variables 上下文"
 
-#: variables.c:5295
+#: variables.c:5336
 msgid "pop_scope: head of shell_variables not a temporary environment scope"
 msgstr "pop_scope: shell_variables 的头部不是临时环境作用域"
 
-#: variables.c:6231
+#: variables.c:6272
 #, c-format
 msgid "%s: %s: cannot open as FILE"
 msgstr "%s：%s：无法作为文件打开"
 
-#: variables.c:6236
+#: variables.c:6277
 #, c-format
 msgid "%s: %s: invalid value for trace file descriptor"
 msgstr "%s：%s：追踪文件描述符的值无效"
 
-#: variables.c:6281
+#: variables.c:6322
 #, c-format
 msgid "%s: %s: compatibility value out of range"
 msgstr "%s：%s：兼容版本数值越界"
 
 #  Inc. 的 . 是个缩写
 #: version.c:46 version2.c:46
-#, fuzzy
 msgid "Copyright (C) 2018 Free Software Foundation, Inc."
-msgstr "版权所有 (C) 2016 自由软件基金会"
+msgstr "版权所有 (C) 2018 自由软件基金会"
 
 #: version.c:47 version2.c:47
 msgid ""
@@ -2415,9 +2413,8 @@ msgid "umask [-p] [-S] [mode]"
 msgstr "umask [-p] [-S] [模式]"
 
 #: builtins.c:177
-#, fuzzy
 msgid "wait [-fn] [id ...]"
-msgstr "wait [-n] [编号 ...]"
+msgstr "wait [-fn] [编号 ...]"
 
 #: builtins.c:181
 msgid "wait [pid ...]"
@@ -2506,14 +2503,13 @@ msgid "printf [-v var] format [arguments]"
 msgstr "printf [-v var] 格式 [参数]"
 
 #: builtins.c:231
-#, fuzzy
 msgid ""
 "complete [-abcdefgjksuv] [-pr] [-DEI] [-o option] [-A action] [-G globpat] [-"
 "W wordlist]  [-F function] [-C command] [-X filterpat] [-P prefix] [-S "
 "suffix] [name ...]"
 msgstr ""
-"complete [-abcdefgjksuv] [-pr] [-DE] [-o 选项] [-A 动作] [-G 全局模式] [-W 词"
-"语列表]  [-F 函数] [-C 命令] [-X 过滤模式] [-P 前缀] [-S 后缀] [名称 ...]"
+"complete [-abcdefgjksuv] [-pr] [-DEI] [-o 选项] [-A 动作] [-G 全局模式] [-W "
+"词语列表]  [-F 函数] [-C 命令] [-X 过滤模式] [-P 前缀] [-S 后缀] [名称 ...]"
 
 #: builtins.c:235
 msgid ""
@@ -2524,9 +2520,8 @@ msgstr ""
 "F 函数] [-C 命令] [-X 过滤模式] [-P 前缀] [-S 后缀] [词语]"
 
 #: builtins.c:239
-#, fuzzy
 msgid "compopt [-o|+o option] [-DEI] [name ...]"
-msgstr "compopt [-o|+o 选项] [-DE] [名称 ...]"
+msgstr "compopt [-o|+o 选项] [-DEI] [名称 ...]"
 
 #: builtins.c:242
 msgid ""
@@ -2537,13 +2532,12 @@ msgstr ""
 "[-c 量子] [数组]"
 
 #: builtins.c:244
-#, fuzzy
 msgid ""
 "readarray [-d delim] [-n count] [-O origin] [-s count] [-t] [-u fd] [-C "
 "callback] [-c quantum] [array]"
 msgstr ""
-"readarray [-n 计数] [-O 起始序号] [-s 计数] [-t] [-u fd] [-C 回调] [-c 量子] "
-"[数组]"
+"readarray [-d 定界符] [-n 计数] [-O 起始序号] [-s 计数] [-t] [-u fd] [-C 回"
+"调] [-c 量子] [数组]"
 
 #: builtins.c:256
 msgid ""
@@ -2591,9 +2585,9 @@ msgstr ""
 "从别名定义列表中删除每一个“名字”。\n"
 "    \n"
 "    选项：\n"
-"      -a\t删除所有的别名定义。\n"
+"      -a\t删除所有的别名定义\n"
 "    \n"
-"    返回成功，除非“名字“不是一个已存在的别名。"
+"    返回成功，除非“名字”不是一个已存在的别名。"
 
 #: builtins.c:291
 msgid ""
@@ -2703,7 +2697,6 @@ msgstr ""
 "    退出状态为 0 除非 N 不大于或等于1。"
 
 #: builtins.c:354
-#, fuzzy
 msgid ""
 "Execute shell builtins.\n"
 "    \n"
@@ -2723,9 +2716,8 @@ msgstr ""
 "    并且希望在函数之内执行该 shell 内建的情况下有用处。\n"
 "    \n"
 "    退出状态：\n"
-"    以 SHELL-BUILTIN 内建的退出状态为准，或者如果 SHELL-BUILTIN不是一个 "
-"shell 内建时\n"
-"    为假。."
+"    以 SHELL-BUILTIN 内建的退出状态为准，或者如果 SHELL-BUILTIN 不是一个\n"
+"    shell 内建时为假。"
 
 #: builtins.c:369
 msgid ""
@@ -2881,7 +2873,7 @@ msgstr ""
 "返回一个成功结果。\n"
 "    \n"
 "    退出状态：\n"
-"    总是成功"
+"    总是成功。"
 
 #: builtins.c:462
 msgid ""
@@ -2928,7 +2920,6 @@ msgstr ""
 "    返回 COMMAND 命令的返回状态，或者当找不到 COMMAND 命令时失败。"
 
 #: builtins.c:490
-#, fuzzy
 msgid ""
 "Set variable values and attributes.\n"
 "    \n"
@@ -2969,12 +2960,12 @@ msgid ""
 msgstr ""
 "设定变量值和属性。\n"
 "    \n"
-"    声明变量并且赋予它们属性。如果没用给定名称，\n"
+"    声明变量并且赋予它们属性。如果没有给定名称，\n"
 "    则显示所有变量的属性和值。\n"
 "    \n"
 "    选项：\n"
-"      -f\t限制动作或显示为只函数名称和定义\n"
-"      -F\t限制仅显示函数名称 (以及行号和源文件名，当调试时)\n"
+"      -f\t限制动作或显示为仅函数名称和定义\n"
+"      -F\t限制仅显示函数名称 (以及调试时显示行号和源文件名)\n"
 "      -g\t当用于 shell 函数内时创建全局变量; 否则忽略\n"
 "      -p\t显示每个 NAME 变量的属性和值\n"
 "    \n"
@@ -2986,7 +2977,7 @@ msgstr ""
 "      -n\t使 NAME 成为指向一个以其值为名称的变量的引用\n"
 "      -r\t将 NAME 变为只读\n"
 "      -t\t使 NAME 带有 `trace' (追踪)属性\n"
-"      -u\t将 NAME 在赋值时转为大写\n"
+"      -u\t将每个 NAME 在赋值时转为大写\n"
 "      -x\t将 NAME 导出\n"
 "    \n"
 "    用 `+' 代替 `-' 会关闭指定选项。\n"
@@ -2998,7 +2989,7 @@ msgstr ""
 "    命令一致。`-g' 选项抑制此行为。\n"
 "    \n"
 "    退出状态：\n"
-"    返回成功除非使用了无效选项或者发生错误。"
+"    返回成功，除非提供了无效选项或者发生变量赋值错误。"
 
 #: builtins.c:530
 msgid ""
@@ -3037,6 +3028,7 @@ msgstr ""
 "数。"
 
 #: builtins.c:555
+#, fuzzy
 msgid ""
 "Write arguments to the standard output.\n"
 "    \n"
@@ -3065,6 +3057,12 @@ msgid ""
 "    \t\t0 to 3 octal digits\n"
 "      \\xHH\tthe eight-bit character whose value is HH (hexadecimal).  HH\n"
 "    \t\tcan be one or two hex digits\n"
+"      \\uHHHH\tthe Unicode character whose value is the hexadecimal value "
+"HHHH.\n"
+"    \t\tHHHH can be one to four hex digits.\n"
+"      \\UHHHHHHHH the Unicode character whose value is the hexadecimal "
+"value\n"
+"    \t\tHHHHHHHH. HHHHHHHH can be one to eight hex digits.\n"
 "    \n"
 "    Exit Status:\n"
 "    Returns success unless a write error occurs."
@@ -3096,7 +3094,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功除非有写错误发生。"
 
-#: builtins.c:591
+#: builtins.c:595
 msgid ""
 "Write arguments to the standard output.\n"
 "    \n"
@@ -3118,7 +3116,7 @@ msgstr ""
 "    退出状态：\n"
 "    除非写错误发生，否则返回成功。"
 
-#: builtins.c:606
+#: builtins.c:610
 msgid ""
 "Enable and disable shell builtins.\n"
 "    \n"
@@ -3168,7 +3166,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非 NAME 不是一个 shell 内建或者有错误发生。"
 
-#: builtins.c:634
+#: builtins.c:638
 msgid ""
 "Execute arguments as a shell command.\n"
 "    \n"
@@ -3187,7 +3185,7 @@ msgstr ""
 "    退出状态：\n"
 "    以命令的状态退出，或者在命令为空的情况下返回成功。"
 
-#: builtins.c:646
+#: builtins.c:650
 msgid ""
 "Parse option arguments.\n"
 "    \n"
@@ -3265,7 +3263,7 @@ msgstr ""
 "    如果一个选项被找到则返回成功；如果遇到了选项的结尾或者\n"
 "    有错误发生则返回失败。"
 
-#: builtins.c:688
+#: builtins.c:692
 msgid ""
 "Replace the shell with the given command.\n"
 "    \n"
@@ -3304,7 +3302,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功除非 COMMAND 命令没有找到或者出现一个重定向错误。"
 
-#: builtins.c:709
+#: builtins.c:713
 msgid ""
 "Exit the shell.\n"
 "    \n"
@@ -3316,7 +3314,7 @@ msgstr ""
 "    以状态 N 退出 shell。  如果 N 被省略，则退出状态\n"
 "    为最后一个执行的命令的退出状态。"
 
-#: builtins.c:718
+#: builtins.c:722
 msgid ""
 "Exit a login shell.\n"
 "    \n"
@@ -3329,7 +3327,7 @@ msgstr ""
 "    以状态 N 退出一个登录 shell。如果不在登录 shell 中执行，则\n"
 "    返回一个错误。"
 
-#: builtins.c:728
+#: builtins.c:732
 msgid ""
 "Display or execute commands from the history list.\n"
 "    \n"
@@ -3382,7 +3380,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，或者执行的命令的状态；如果错误发生则返回非零。"
 
-#: builtins.c:758
+#: builtins.c:762
 msgid ""
 "Move job to the foreground.\n"
 "    \n"
@@ -3402,7 +3400,7 @@ msgstr ""
 "    退出状态：\n"
 "    放至前台的命令状态，或者当错误发生时为失败。"
 
-#: builtins.c:773
+#: builtins.c:777
 msgid ""
 "Move jobs to the background.\n"
 "    \n"
@@ -3424,7 +3422,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功除非任务管理没有启用或者错误发生。"
 
-#: builtins.c:787
+#: builtins.c:791
 msgid ""
 "Remember or display program locations.\n"
 "    \n"
@@ -3468,8 +3466,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非 NAME 命令没有找到或者使用了无效的选项。"
 
-#: builtins.c:812
-#, fuzzy
+#: builtins.c:816
 msgid ""
 "Display information about builtin commands.\n"
 "    \n"
@@ -3503,13 +3500,12 @@ msgstr ""
 "    \t简介\n"
 "    \n"
 "    参数：\n"
-"      PATTERN\tPattern 模式指定一个帮助主题\n"
+"      PATTERN\t指定帮助主题的模式\n"
 "    \n"
 "    退出状态：\n"
-"    返回成功，除非 PATTERN 模式没有找到或者使用了无效选项。"
+"    返回成功，除非未找到 PATTERN 模式没有找到或者使用了无效选项。"
 
-#: builtins.c:836
-#, fuzzy
+#: builtins.c:840
 msgid ""
 "Display or manipulate the history list.\n"
 "    \n"
@@ -3550,13 +3546,14 @@ msgstr ""
 "    \n"
 "    选项：\n"
 "      -c\t删除所有条目从而清空历史列表。\n"
-"      -d 偏移量\t从指定位置删除历史列表。\n"
+"      -d 偏移量\t从指定位置删除历史列表。负偏移量将从历史条目末尾\n"
+"    \t\t开始计数\n"
 "    \n"
 "      -a\t将当前会话的历史行追加到历史文件中\n"
 "      -n\t从历史文件中读取所有未被读取的行\n"
-"    \t\t并且将它们加入到历史列表\n"
+"    \t\t并且将它们附加到历史列表\n"
 "      -r\t读取历史文件并将内容追加到历史列表中\n"
-"      -w\t将当前历史写入到历史文件中，并追加到历史列表中\n"
+"      -w\t将当前历史写入到历史文件中\n"
 "    \n"
 "      -p\t对每一个 ARG 参数展开历史并显示结果，而不存储到历史列表中\n"
 "      -s\t以单条记录追加 ARG 到历史列表中\n"
@@ -3565,13 +3562,13 @@ msgstr ""
 "    如果 $HISTFILE 变量有值的话使用之，不然使用 ~/.bash_history 文件。\n"
 "    \n"
 "    如果 $HISTTIMEFORMAT 变量被设定并且不为空，它的值会被用于\n"
-"    strftime(3) 的格式字符串来打印与每一个显示的历史条目想关联的时\n"
-"    间戳，否则不打印时间戳。\n"
+"    strftime(3) 的格式字符串来打印与每一个显示的历史条目想关联的\n"
+"    时间戳，否则不打印时间戳。\n"
 "    \n"
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者发生错误。"
 
-#: builtins.c:873
+#: builtins.c:877
 msgid ""
 "Display status of jobs.\n"
 "    \n"
@@ -3613,7 +3610,7 @@ msgstr ""
 "    返回成功，除非使用了无效的选项或者有错误发生。\n"
 "    如果使用 -x 选项，则返回 COMMAND 命令的退出状态。"
 
-#: builtins.c:900
+#: builtins.c:904
 msgid ""
 "Remove jobs from current shell.\n"
 "    \n"
@@ -3643,7 +3640,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功除非使用了无效的选项或者 JOBSPEC 声明。"
 
-#: builtins.c:919
+#: builtins.c:923
 msgid ""
 "Send a signal to a job.\n"
 "    \n"
@@ -3683,7 +3680,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者有错误发生。"
 
-#: builtins.c:943
+#: builtins.c:947
 msgid ""
 "Evaluate arithmetic expressions.\n"
 "    \n"
@@ -3765,8 +3762,7 @@ msgstr ""
 "    退出状态：\n"
 "    如果最后一个 ARG 参数估值为 0，则 let 返回 1； 否则 let 返回 0。"
 
-#: builtins.c:988
-#, fuzzy
+#: builtins.c:992
 msgid ""
 "Read a line from the standard input and split it into fields.\n"
 "    \n"
@@ -3830,9 +3826,9 @@ msgstr ""
 "    如果没有提供 NAME 变量，则读取的行被存放在 REPLY 变量中。\n"
 "    \n"
 "    选项：\n"
-"      -a array\t将词语赋值给 ARRAY 数组变量的序列下标成员，从零开始。\n"
+"      -a array\t将词语赋值给 ARRAY 数组变量的序列下标成员，从零开始\n"
 "      -d delim\t持续读取直到读入 DELIM 变量中的第一个字符，而不是换行符\n"
-"      -e\t在一个交互式 shell 中使用 Readline 获取行\n"
+"      -e\t使用 Readline 获取行\n"
 "      -i text\t使用 TEXT 文本作为 Readline 的初始文字\n"
 "      -n nchars\t读取 nchars 个字符之后返回，而不是等到读取换行符。\n"
 "    \t\t但是分隔符仍然有效，如果遇到分隔符之前读取了不足 nchars 个字符。\n"
@@ -3842,20 +3838,20 @@ msgstr ""
 "      -p prompt\t在尝试读取之前输出 PROMPT 提示符并且不带\n"
 "    \t\t换行符\n"
 "      -r\t不允许反斜杠转义任何字符\n"
-"      -s\t不显示终端的任何输入\n"
+"      -s\t不回显终端的任何输入\n"
 "      -t timeout\t如果在 TIMEOUT 秒内没有读取一个完整的行则超时并且返回失"
 "败。\n"
-"    \t\tTMOUT 变量的值是默认的超时时间。\n"
-"    \t\tTIMEOUT 可以是小数。如果 TIMEOUT 是 0，那么仅当在指定的文件描述符上\n"
-"    \t\t输入有效的时候，read 才返回成功。\n"
+"    \t\tTMOUT 变量的值是默认的超时时间。TIMEOUT 可以是小数。\n"
+"    \t\t如果 TIMEOUT 是 0，那么仅当在指定的文件描述符上输入有效的时候，\n"
+"    \t\tread 才返回成功；否则它将立刻返回而不尝试读取任何数据。\n"
 "    \t\t如果超过了超时时间，则返回状态码大于 128\n"
 "      -u fd\t从文件描述符 FD 中读取，而不是标准输入\n"
 "    \n"
 "    退出状态：\n"
-"    返回码为零，除非遇到了文件结束符，读超时，或者无效的文\n"
-"    件描述符作为参数传递给了 -u 选项。"
+"    返回码为零，除非遇到了文件结束符、读超时（且返回码不大于128）、\n"
+"    出现了变量赋值错误或者无效的文件描述符作为参数传递给了 -u 选项。"
 
-#: builtins.c:1035
+#: builtins.c:1039
 msgid ""
 "Return from a shell function.\n"
 "    \n"
@@ -3875,7 +3871,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回 N，或者如果 shell 不在执行一个函数或引用脚本时，失败。"
 
-#: builtins.c:1048
+#: builtins.c:1052
 msgid ""
 "Set or unset values of shell options and positional parameters.\n"
 "    \n"
@@ -4039,7 +4035,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功除非使用了无效的参数。"
 
-#: builtins.c:1133
+#: builtins.c:1137
 msgid ""
 "Unset values and attributes of shell variables and functions.\n"
 "    \n"
@@ -4077,7 +4073,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者 NAME 名称为只读。"
 
-#: builtins.c:1155
+#: builtins.c:1159
 msgid ""
 "Set export attribute for shell variables.\n"
 "    \n"
@@ -4110,7 +4106,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者 NAME 名称。"
 
-#: builtins.c:1174
+#: builtins.c:1178
 msgid ""
 "Mark shell variables as unchangeable.\n"
 "    \n"
@@ -4146,7 +4142,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者 NAME 名称。"
 
-#: builtins.c:1196
+#: builtins.c:1200
 msgid ""
 "Shift positional parameters.\n"
 "    \n"
@@ -4164,7 +4160,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非 N 为负或者大于 $#。"
 
-#: builtins.c:1208 builtins.c:1223
+#: builtins.c:1212 builtins.c:1227
 msgid ""
 "Execute commands from a file in the current shell.\n"
 "    \n"
@@ -4186,7 +4182,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回 FILENAME 文件中最后一个命令的状态；如果 FILENAME 文件不可读则失败。"
 
-#: builtins.c:1239
+#: builtins.c:1243
 msgid ""
 "Suspend shell execution.\n"
 "    \n"
@@ -4210,7 +4206,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非没有启用任务控制或者有错误发生。"
 
-#: builtins.c:1255
+#: builtins.c:1259
 msgid ""
 "Evaluate conditional expression.\n"
 "    \n"
@@ -4364,7 +4360,7 @@ msgstr ""
 "    如果 EXPR 表达式估值为真则返回成功；如果 EXPR 表达式估值\n"
 "    为假或者使用了无效的参数则返回失败。"
 
-#: builtins.c:1337
+#: builtins.c:1341
 msgid ""
 "Evaluate conditional expression.\n"
 "    \n"
@@ -4376,7 +4372,7 @@ msgstr ""
 "    是内建命令 \"test\" 的同义词，但是最后一个参数必须是\n"
 "    字符 `]'，以匹配起始的 `['。"
 
-#: builtins.c:1346
+#: builtins.c:1350
 msgid ""
 "Display process times.\n"
 "    \n"
@@ -4397,7 +4393,7 @@ msgstr ""
 
 # EXIT and DEBUG should be as-is. Use before you translate, please.
 # The -signal is only an example; Read carefully.
-#: builtins.c:1358
+#: builtins.c:1362
 msgid ""
 "Trap signals and other events.\n"
 "    \n"
@@ -4468,7 +4464,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者 SIGSPEC。"
 
-#: builtins.c:1394
+#: builtins.c:1398
 msgid ""
 "Display information about command type.\n"
 "    \n"
@@ -4520,7 +4516,7 @@ msgstr ""
 "    退出状态：\n"
 "    如果所有的 NAME 命令都找到则返回成功；任何一个找不到则失败。"
 
-#: builtins.c:1425
+#: builtins.c:1429
 msgid ""
 "Modify shell resource limits.\n"
 "    \n"
@@ -4610,7 +4606,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者错误发生。"
 
-#: builtins.c:1475
+#: builtins.c:1479
 msgid ""
 "Display or set file mode mask.\n"
 "    \n"
@@ -4642,8 +4638,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的 MODE 模式或者选项。"
 
-#: builtins.c:1495
-#, fuzzy
+#: builtins.c:1499
 msgid ""
 "Wait for job completion and return exit status.\n"
 "    \n"
@@ -4666,17 +4661,19 @@ msgid ""
 msgstr ""
 "等待任务完成并返回退出状态。\n"
 "    \n"
-"    等待以 ID 编号识别的进程，其中ID 可以是进程编号或者任务声明，\n"
+"    等待以 ID 编号识别的进程，其中 ID 可以是进程编号或者任务声明，\n"
 "    并报告它的终止状态。如果 ID 没有给出，则等待所有的当前活跃子\n"
 "    进程，并且返回状态为零。如果 ID 是任务声明，等待任务管道中的\n"
 "    所有进程。\n"
 "    \n"
 "    若给定了 -n 选项，等待下一个任务完成并返回其状态。\n"
 "    \n"
+"    若给定了 -f 选项，且已启用了任务控制，则等待指定的 ID 终止\n"
+"    而非等待它改变状态。\n"
 "    退出状态：\n"
 "    返回最后一个 ID 进程的状态；如果使用了无效的 ID 或者选项则失败。"
 
-#: builtins.c:1519
+#: builtins.c:1523
 msgid ""
 "Wait for process completion and return exit status.\n"
 "    \n"
@@ -4698,7 +4695,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回进程 ID 的状态；如果 PID 是无效的进程号或者指定了无效的选项则失败。"
 
-#: builtins.c:1534
+#: builtins.c:1538
 msgid ""
 "Execute commands for each member in a list.\n"
 "    \n"
@@ -4719,7 +4716,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后执行的命令的状态。"
 
-#: builtins.c:1548
+#: builtins.c:1552
 msgid ""
 "Arithmetic for loop.\n"
 "    \n"
@@ -4749,7 +4746,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后执行的命令的状态。"
 
-#: builtins.c:1566
+#: builtins.c:1570
 msgid ""
 "Select words from a list and execute commands.\n"
 "    \n"
@@ -4782,7 +4779,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后一个执行的命令的状态。"
 
-#: builtins.c:1587
+#: builtins.c:1591
 msgid ""
 "Report time consumed by pipeline's execution.\n"
 "    \n"
@@ -4810,7 +4807,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回状态即PIPELINE 的返回状态。"
 
-#: builtins.c:1604
+#: builtins.c:1608
 msgid ""
 "Execute commands based on pattern matching.\n"
 "    \n"
@@ -4828,7 +4825,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后一个执行的命令的状态。"
 
-#: builtins.c:1616
+#: builtins.c:1620
 msgid ""
 "Execute commands based on conditional.\n"
 "    \n"
@@ -4859,7 +4856,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后一个执行的命令的状态。"
 
-#: builtins.c:1633
+#: builtins.c:1637
 msgid ""
 "Execute commands as long as a test succeeds.\n"
 "    \n"
@@ -4877,7 +4874,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后一个执行的命令的状态。"
 
-#: builtins.c:1645
+#: builtins.c:1649
 msgid ""
 "Execute commands as long as a test does not succeed.\n"
 "    \n"
@@ -4895,7 +4892,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后一个执行的命令的状态。"
 
-#: builtins.c:1657
+#: builtins.c:1661
 msgid ""
 "Create a coprocess named NAME.\n"
 "    \n"
@@ -4917,7 +4914,7 @@ msgstr ""
 "    退出状态：\n"
 "    副进程会返回退出状态 0。"
 
-#: builtins.c:1671
+#: builtins.c:1675
 msgid ""
 "Define shell function.\n"
 "    \n"
@@ -4940,7 +4937,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功除非 NAME 为只读。"
 
-#: builtins.c:1685
+#: builtins.c:1689
 msgid ""
 "Group commands as a unit.\n"
 "    \n"
@@ -4958,7 +4955,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回最后一个执行的命令的状态。"
 
-#: builtins.c:1697
+#: builtins.c:1701
 msgid ""
 "Resume job in foreground.\n"
 "    \n"
@@ -4982,7 +4979,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回被继续的任务的状态。"
 
-#: builtins.c:1712
+#: builtins.c:1716
 msgid ""
 "Evaluate arithmetic expression.\n"
 "    \n"
@@ -5000,7 +4997,7 @@ msgstr ""
 "    退出状态\n"
 "    如果表达式估值为0则返回 1；否则返回0。"
 
-#: builtins.c:1724
+#: builtins.c:1728
 msgid ""
 "Execute conditional command.\n"
 "    \n"
@@ -5048,7 +5045,7 @@ msgstr ""
 "    退出状态：\n"
 "    根据 EXPRESSION 的值为0或1。"
 
-#: builtins.c:1750
+#: builtins.c:1754
 msgid ""
 "Common shell variable names and usage.\n"
 "    \n"
@@ -5143,7 +5140,7 @@ msgstr ""
 "    HISTIGNORE\t用于决定哪些命令被存入历史文件的模式\n"
 "    \t\t列表，以冒号分隔。\n"
 
-#: builtins.c:1807
+#: builtins.c:1811
 msgid ""
 "Add directories to stack.\n"
 "    \n"
@@ -5196,7 +5193,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的参数或者目录转换失败。"
 
-#: builtins.c:1841
+#: builtins.c:1845
 msgid ""
 "Remove directories from stack.\n"
 "    \n"
@@ -5243,7 +5240,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的参数或者目录变换失败。"
 
-#: builtins.c:1871
+#: builtins.c:1875
 msgid ""
 "Display directory stack.\n"
 "    \n"
@@ -5292,8 +5289,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者发生错误。"
 
-#: builtins.c:1902
-#, fuzzy
+#: builtins.c:1906
 msgid ""
 "Set and unset shell options.\n"
 "    \n"
@@ -5314,9 +5310,9 @@ msgid ""
 msgstr ""
 "设定和取消设定 shell 选项。\n"
 "    \n"
-"    改变每个 shell 选项 OPTNAME的设定。不带参数\n"
-"    时，列出所有 shell 选项并标注每一个选项是否被\n"
-"    设定。\n"
+"    改变每个 shell 选项 OPTNAME 的设定。不带参数时，\n"
+"    列出每个提供的 OPTNAME，否则列出所有 shell 选项；\n"
+"    同时标注每一个选项是否被设定。\n"
 "    \n"
 "    选项：\n"
 "      -o\t限制 OPTNAME 为定义用于`set -o' 的选项\n"
@@ -5327,9 +5323,9 @@ msgstr ""
 "    \n"
 "    退出状态：\n"
 "    如果 OPTNAME 选项被启用则返回成功；如果是\n"
-"    无效的选项或OPTNAME 被禁用则失败。"
+"    无效的选项或 OPTNAME 被禁用则失败。"
 
-#: builtins.c:1923
+#: builtins.c:1927
 msgid ""
 "Formats and prints ARGUMENTS under control of the FORMAT.\n"
 "    \n"
@@ -5385,7 +5381,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者写或赋值错误发生。"
 
-#: builtins.c:1957
+#: builtins.c:1961
 #, fuzzy
 msgid ""
 "Specify how arguments are to be completed by Readline.\n"
@@ -5404,7 +5400,7 @@ msgid ""
 "    \t\twithout any specific completion defined\n"
 "      -E\tapply the completions and actions to \"empty\" commands --\n"
 "    \t\tcompletion attempted on a blank line\n"
-"      -I\tapply the completions and actions to the intial (usually the\n"
+"      -I\tapply the completions and actions to the initial (usually the\n"
 "    \t\tcommand) word\n"
 "    \n"
 "    When completion is attempted, the actions are applied in the order the\n"
@@ -5416,9 +5412,9 @@ msgid ""
 "    Exit Status:\n"
 "    Returns success unless an invalid option is supplied or an error occurs."
 msgstr ""
-"声明 readline 如何完成读取参数。\n"
+"指定 Readline 如何补全参数。\n"
 "    \n"
-"    声明对于每一个 NAME 名称如何完成读取参数。如果不带选项，\n"
+"    声明对于每一个 NAME 名称如何补全参数。如果不带选项，\n"
 "    现有的补全声明会以可以重用为输入的格式打印出来。\n"
 "    \n"
 "    选项：\n"
@@ -5427,14 +5423,16 @@ msgstr ""
 "    \t名称，删除所有的补全声明。\n"
 "      -D\t对于没有补全声明定义的命令，设定默认的补全动作\n"
 "      -E\t对于 \"empty\" 命令设定补全动作，—— 对于空行的补全。\n"
+"      -I\t将补全和动作应用在首单词（通常是所给命令）上\n"
 "    \n"
-"    尝试补全时，按照上述大写字母选项的顺序进行动作。-D 选项优先\n"
-"    级高于 -E 选项。\n"
+"    尝试补全时，按照上述大写字母选项的顺序进行动作。\n"
+"    如果给出了多个选项，-D 选项优先级高于 -E 选项，且\n"
+"    这两个选项优先级均高于 -I。\n"
 "    \n"
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者错误发生。"
 
-#: builtins.c:1987
+#: builtins.c:1991
 msgid ""
 "Display possible completions depending on the options.\n"
 "    \n"
@@ -5455,8 +5453,7 @@ msgstr ""
 "    退出状态：\n"
 "    除非使用了无效选项或者错误发生，否则返回成功。"
 
-#: builtins.c:2002
-#, fuzzy
+#: builtins.c:2006
 msgid ""
 "Modify or display completion options.\n"
 "    \n"
@@ -5497,6 +5494,7 @@ msgstr ""
 "    \t-o option\t为每个 NAME 名称设定补全选项 option\n"
 "    \t-D\t\t为 \"default\" 命令补全改变选项\n"
 "    \t-E\t\t为 \"empty\" 命令补全改变选项\n"
+"    \t-I\t\t为首单词的补全改变选项\n"
 "    \n"
 "    使用 `+o' 而不是 `-o' 可以关闭指定的选项。\n"
 "    \n"
@@ -5509,7 +5507,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项或者 NAME 名称没有定义补全声明。"
 
-#: builtins.c:2033
+#: builtins.c:2037
 msgid ""
 "Read lines from the standard input into an indexed array variable.\n"
 "    \n"
@@ -5576,7 +5574,7 @@ msgstr ""
 "    退出状态：\n"
 "    返回成功，除非使用了无效的选项，或者 ARRAY 变量只读或不是下标数组。"
 
-#: builtins.c:2069
+#: builtins.c:2073
 msgid ""
 "Read lines from a file into an array variable.\n"
 "    \n"