diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apparmor-parser.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apparmor-parser.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apparmor-parser.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apparmor-parser.po	2020-07-08 13:53:56.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:40+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../parser_include.c:113 ../parser_include.c:111
 msgid "Error: Out of memory.\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apparmor-utils.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apparmor-utils.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apparmor-utils.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apparmor-utils.po	2020-07-08 13:53:54.000000000 +0000
@@ -0,0 +1,1129 @@
+# Chinese (Simplified) translation for apparmor
+# Copyright (c) 2019 Rosetta Contributors and Canonical Ltd 2019
+# This file is distributed under the same license as the apparmor package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: apparmor\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2014-09-14 19:29+0530\n"
+"PO-Revision-Date: 2019-12-24 02:58+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:27+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
+
+#: ../aa-genprof:56
+msgid "Generate profile for the given program"
+msgstr "生成给定程序的配置文件"
+
+#: ../aa-genprof:57 ../aa-logprof:25 ../aa-cleanprof:24 ../aa-mergeprof:34
+#: ../aa-autodep:25 ../aa-audit:25 ../aa-complain:24 ../aa-enforce:24
+#: ../aa-disable:24
+msgid "path to profiles"
+msgstr "配置文件的路径"
+
+#: ../aa-genprof:58 ../aa-logprof:26
+msgid "path to logfile"
+msgstr "日志文件的路径"
+
+#: ../aa-genprof:59
+msgid "name of program to profile"
+msgstr ""
+
+#: ../aa-genprof:69 ../aa-logprof:37
+#, python-format
+msgid "The logfile %s does not exist. Please check the path"
+msgstr ""
+
+#: ../aa-genprof:75 ../aa-logprof:43 ../aa-unconfined:36
+msgid ""
+"It seems AppArmor was not started. Please enable AppArmor and try again."
+msgstr "看起来 AppArmor 不在运行，请启用 AppArmor 后再试一次。"
+
+#: ../aa-genprof:80 ../aa-mergeprof:47
+#, python-format
+msgid "%s is not a directory."
+msgstr "%s 不是一个目录。"
+
+#: ../aa-genprof:94
+#, python-format
+msgid ""
+"Can't find %(profiling)s in the system path list. If the name of the "
+"application\n"
+"is correct, please run 'which %(profiling)s' as a user with correct PATH\n"
+"environment set up in order to find the fully-qualified path and\n"
+"use the full path as parameter."
+msgstr ""
+
+#: ../aa-genprof:96
+#, python-format
+msgid "%s does not exists, please double-check the path."
+msgstr "%s 不存在，请确认路径正确。"
+
+#: ../aa-genprof:124
+msgid ""
+"\n"
+"Before you begin, you may wish to check if a\n"
+"profile already exists for the application you\n"
+"wish to confine. See the following wiki page for\n"
+"more information:"
+msgstr ""
+
+#: ../aa-genprof:126
+msgid ""
+"Please start the application to be profiled in\n"
+"another window and exercise its functionality now.\n"
+"\n"
+"Once completed, select the \"Scan\" option below in \n"
+"order to scan the system logs for AppArmor events. \n"
+"\n"
+"For each AppArmor event, you will be given the \n"
+"opportunity to choose whether the access should be \n"
+"allowed or denied."
+msgstr ""
+
+#: ../aa-genprof:147
+msgid "Profiling"
+msgstr ""
+
+#: ../aa-genprof:165
+msgid ""
+"\n"
+"Reloaded AppArmor profiles in enforce mode."
+msgstr ""
+
+#: ../aa-genprof:166
+msgid ""
+"\n"
+"Please consider contributing your new profile!\n"
+"See the following wiki page for more information:"
+msgstr ""
+"\n"
+"请考虑贡献您的新配置文件！\n"
+"参阅以下 wiki 页面获取更多信息："
+
+#: ../aa-genprof:167
+#, python-format
+msgid "Finished generating profile for %s."
+msgstr "已完成为 %s 生成配置文件。"
+
+#: ../aa-logprof:24
+msgid "Process log entries to generate profiles"
+msgstr ""
+
+#: ../aa-logprof:27
+msgid "mark in the log to start processing after"
+msgstr ""
+
+#: ../aa-cleanprof:23
+msgid "Cleanup the profiles for the given programs"
+msgstr ""
+
+#: ../aa-cleanprof:25 ../aa-autodep:26 ../aa-audit:27 ../aa-complain:25
+#: ../aa-enforce:25 ../aa-disable:25
+msgid "name of program"
+msgstr ""
+
+#: ../aa-cleanprof:26
+msgid "Silently overwrite with a clean profile"
+msgstr ""
+
+#: ../aa-mergeprof:29
+msgid "Perform a 2-way or 3-way merge on the given profiles"
+msgstr ""
+
+#: ../aa-mergeprof:31
+msgid "your profile"
+msgstr "您的配置文件"
+
+#: ../aa-mergeprof:32
+msgid "base profile"
+msgstr ""
+
+#: ../aa-mergeprof:33
+msgid "other profile"
+msgstr "其他配置文件"
+
+#: ../aa-mergeprof:67 ../apparmor/aa.py:2345
+msgid ""
+"The following local profiles were changed. Would you like to save them?"
+msgstr ""
+
+#: ../aa-mergeprof:148 ../aa-mergeprof:430 ../apparmor/aa.py:1767
+msgid "Path"
+msgstr "路径"
+
+#: ../aa-mergeprof:149
+msgid "Select the appropriate mode"
+msgstr "选择合适的模式"
+
+#: ../aa-mergeprof:166
+msgid "Unknown selection"
+msgstr ""
+
+#: ../aa-mergeprof:183 ../aa-mergeprof:209
+msgid "File includes"
+msgstr ""
+
+#: ../aa-mergeprof:183 ../aa-mergeprof:209
+msgid "Select the ones you wish to add"
+msgstr ""
+
+#: ../aa-mergeprof:195 ../aa-mergeprof:222
+#, python-format
+msgid "Adding %s to the file."
+msgstr ""
+
+#: ../aa-mergeprof:199 ../apparmor/aa.py:2258
+msgid "unknown"
+msgstr ""
+
+#: ../aa-mergeprof:224 ../aa-mergeprof:275 ../aa-mergeprof:516
+#: ../aa-mergeprof:558 ../aa-mergeprof:675 ../apparmor/aa.py:1620
+#: ../apparmor/aa.py:1859 ../apparmor/aa.py:1899 ../apparmor/aa.py:2012
+#, python-format
+msgid "Deleted %s previous matching profile entries."
+msgstr ""
+
+#: ../aa-mergeprof:244 ../aa-mergeprof:429 ../aa-mergeprof:629
+#: ../aa-mergeprof:656 ../apparmor/aa.py:992 ../apparmor/aa.py:1252
+#: ../apparmor/aa.py:1562 ../apparmor/aa.py:1603 ../apparmor/aa.py:1766
+#: ../apparmor/aa.py:1958 ../apparmor/aa.py:1994
+msgid "Profile"
+msgstr "配置文件"
+
+#: ../aa-mergeprof:245 ../apparmor/aa.py:1563 ../apparmor/aa.py:1604
+msgid "Capability"
+msgstr ""
+
+#: ../aa-mergeprof:246 ../aa-mergeprof:480 ../apparmor/aa.py:1258
+#: ../apparmor/aa.py:1564 ../apparmor/aa.py:1605 ../apparmor/aa.py:1817
+msgid "Severity"
+msgstr ""
+
+#: ../aa-mergeprof:273 ../aa-mergeprof:514 ../apparmor/aa.py:1618
+#: ../apparmor/aa.py:1857
+#, python-format
+msgid "Adding %s to profile."
+msgstr ""
+
+#: ../aa-mergeprof:282 ../apparmor/aa.py:1627
+#, python-format
+msgid "Adding capability %s to profile."
+msgstr ""
+
+#: ../aa-mergeprof:289 ../apparmor/aa.py:1634
+#, python-format
+msgid "Denying capability %s to profile."
+msgstr ""
+
+#: ../aa-mergeprof:439 ../aa-mergeprof:470 ../apparmor/aa.py:1776
+#: ../apparmor/aa.py:1807
+msgid "(owner permissions off)"
+msgstr ""
+
+#: ../aa-mergeprof:444 ../apparmor/aa.py:1781
+msgid "(force new perms to owner)"
+msgstr ""
+
+#: ../aa-mergeprof:447 ../apparmor/aa.py:1784
+msgid "(force all rule perms to owner)"
+msgstr ""
+
+#: ../aa-mergeprof:459 ../apparmor/aa.py:1796
+msgid "Old Mode"
+msgstr ""
+
+#: ../aa-mergeprof:460 ../apparmor/aa.py:1797
+msgid "New Mode"
+msgstr ""
+
+#: ../aa-mergeprof:475 ../apparmor/aa.py:1812
+msgid "(force perms to owner)"
+msgstr ""
+
+#: ../aa-mergeprof:478 ../apparmor/aa.py:1815
+msgid "Mode"
+msgstr ""
+
+#: ../aa-mergeprof:556
+#, python-format
+msgid "Adding %(path)s %(mod)s to profile"
+msgstr ""
+
+#: ../aa-mergeprof:574 ../apparmor/aa.py:1915
+msgid "Enter new path: "
+msgstr ""
+
+#: ../aa-mergeprof:630 ../aa-mergeprof:657 ../apparmor/aa.py:1959
+#: ../apparmor/aa.py:1995
+msgid "Network Family"
+msgstr ""
+
+#: ../aa-mergeprof:631 ../aa-mergeprof:658 ../apparmor/aa.py:1960
+#: ../apparmor/aa.py:1996
+msgid "Socket Type"
+msgstr ""
+
+#: ../aa-mergeprof:673 ../apparmor/aa.py:2010
+#, python-format
+msgid "Adding %s to profile"
+msgstr "将 %s 添加到配置文件"
+
+#: ../aa-mergeprof:683 ../apparmor/aa.py:2020
+#, python-format
+msgid "Adding network access %(family)s %(type)s to profile."
+msgstr ""
+
+#: ../aa-mergeprof:689 ../apparmor/aa.py:2026
+#, python-format
+msgid "Denying network access %(family)s %(type)s to profile"
+msgstr ""
+
+#: ../aa-autodep:23
+msgid "Generate a basic AppArmor profile by guessing requirements"
+msgstr ""
+
+#: ../aa-autodep:24
+msgid "overwrite existing profile"
+msgstr "覆盖现存配置"
+
+#: ../aa-audit:24
+msgid "Switch the given programs to audit mode"
+msgstr "将给定程序切换到审计模式"
+
+#: ../aa-audit:26
+msgid "remove audit mode"
+msgstr "移除审计模式"
+
+#: ../aa-audit:28
+msgid "Show full trace"
+msgstr ""
+
+#: ../aa-complain:23
+msgid "Switch the given program to complain mode"
+msgstr ""
+
+#: ../aa-enforce:23
+msgid "Switch the given program to enforce mode"
+msgstr "将给定程序切换到强制模式"
+
+#: ../aa-disable:23
+msgid "Disable the profile for the given programs"
+msgstr "禁用给定程序的配置文件"
+
+#: ../aa-unconfined:28
+msgid "Lists unconfined processes having tcp or udp ports"
+msgstr ""
+
+#: ../aa-unconfined:29
+msgid "scan all processes from /proc"
+msgstr "从 /proc 中扫描所有进程"
+
+#: ../aa-unconfined:81
+#, python-format
+msgid "%(pid)s %(program)s (%(commandline)s) not confined"
+msgstr ""
+
+#: ../aa-unconfined:85
+#, python-format
+msgid "%(pid)s %(program)s%(pname)s not confined"
+msgstr ""
+
+#: ../aa-unconfined:90
+#, python-format
+msgid "%(pid)s %(program)s (%(commandline)s) confined by '%(attribute)s'"
+msgstr ""
+
+#: ../aa-unconfined:94
+#, python-format
+msgid "%(pid)s %(program)s%(pname)s confined by '%(attribute)s'"
+msgstr ""
+
+#: ../apparmor/aa.py:196
+#, python-format
+msgid "Followed too many links while resolving %s"
+msgstr ""
+
+#: ../apparmor/aa.py:252 ../apparmor/aa.py:259
+#, python-format
+msgid "Can't find %s"
+msgstr "找不到 %s"
+
+#: ../apparmor/aa.py:264 ../apparmor/aa.py:548
+#, python-format
+msgid "Setting %s to complain mode."
+msgstr ""
+
+#: ../apparmor/aa.py:271
+#, python-format
+msgid "Setting %s to enforce mode."
+msgstr ""
+
+#: ../apparmor/aa.py:286
+#, python-format
+msgid "Unable to find basename for %s."
+msgstr ""
+
+#: ../apparmor/aa.py:301
+#, python-format
+msgid "Could not create %(link)s symlink to %(filename)s."
+msgstr ""
+
+#: ../apparmor/aa.py:314
+#, python-format
+msgid "Unable to read first line from %s: File Not Found"
+msgstr ""
+
+#: ../apparmor/aa.py:328
+#, python-format
+msgid ""
+"Unable to fork: %(program)s\n"
+"\t%(error)s"
+msgstr ""
+
+#: ../apparmor/aa.py:449 ../apparmor/ui.py:303
+msgid ""
+"Are you sure you want to abandon this set of profile changes and exit?"
+msgstr ""
+
+#: ../apparmor/aa.py:451 ../apparmor/ui.py:305
+msgid "Abandoning all changes."
+msgstr ""
+
+#: ../apparmor/aa.py:464
+msgid "Connecting to repository..."
+msgstr ""
+
+#: ../apparmor/aa.py:470
+msgid "WARNING: Error fetching profiles from the repository"
+msgstr ""
+
+#: ../apparmor/aa.py:550
+#, python-format
+msgid "Error activating profiles: %s"
+msgstr ""
+
+#: ../apparmor/aa.py:605
+#, python-format
+msgid "%s contains no profile"
+msgstr ""
+
+#: ../apparmor/aa.py:706
+#, python-format
+msgid ""
+"WARNING: Error synchronizing profiles with the repository:\n"
+"%s\n"
+msgstr ""
+
+#: ../apparmor/aa.py:744
+#, python-format
+msgid ""
+"WARNING: Error synchronizing profiles with the repository\n"
+"%s"
+msgstr ""
+
+#: ../apparmor/aa.py:832 ../apparmor/aa.py:883
+#, python-format
+msgid ""
+"WARNING: An error occurred while uploading the profile %(profile)s\n"
+"%(ret)s"
+msgstr ""
+
+#: ../apparmor/aa.py:833
+msgid "Uploaded changes to repository."
+msgstr ""
+
+#: ../apparmor/aa.py:865
+msgid "Changelog Entry: "
+msgstr ""
+
+#: ../apparmor/aa.py:885
+msgid ""
+"Repository Error\n"
+"Registration or Signin was unsuccessful. User login\n"
+"information is required to upload profiles to the repository.\n"
+"These changes could not be sent."
+msgstr ""
+
+#: ../apparmor/aa.py:995
+msgid "Default Hat"
+msgstr ""
+
+#: ../apparmor/aa.py:997
+msgid "Requested Hat"
+msgstr ""
+
+#: ../apparmor/aa.py:1218
+#, python-format
+msgid "%s has transition name but not transition mode"
+msgstr ""
+
+#: ../apparmor/aa.py:1232
+#, python-format
+msgid "Target profile exists: %s\n"
+msgstr ""
+
+#: ../apparmor/aa.py:1254
+msgid "Program"
+msgstr ""
+
+#: ../apparmor/aa.py:1257
+msgid "Execute"
+msgstr ""
+
+#: ../apparmor/aa.py:1287
+msgid "Are you specifying a transition to a local profile?"
+msgstr ""
+
+#: ../apparmor/aa.py:1299
+msgid "Enter profile name to transition to: "
+msgstr ""
+
+#: ../apparmor/aa.py:1308
+msgid ""
+"Should AppArmor sanitise the environment when\n"
+"switching profiles?\n"
+"\n"
+"Sanitising environment is more secure,\n"
+"but some applications depend on the presence\n"
+"of LD_PRELOAD or LD_LIBRARY_PATH."
+msgstr ""
+
+#: ../apparmor/aa.py:1310
+msgid ""
+"Should AppArmor sanitise the environment when\n"
+"switching profiles?\n"
+"\n"
+"Sanitising environment is more secure,\n"
+"but this application appears to be using LD_PRELOAD\n"
+"or LD_LIBRARY_PATH and sanitising the environment\n"
+"could cause functionality problems."
+msgstr ""
+
+#: ../apparmor/aa.py:1318
+#, python-format
+msgid ""
+"Launching processes in an unconfined state is a very\n"
+"dangerous operation and can cause serious security holes.\n"
+"\n"
+"Are you absolutely certain you wish to remove all\n"
+"AppArmor protection when executing %s ?"
+msgstr ""
+
+#: ../apparmor/aa.py:1320
+msgid ""
+"Should AppArmor sanitise the environment when\n"
+"running this program unconfined?\n"
+"\n"
+"Not sanitising the environment when unconfining\n"
+"a program opens up significant security holes\n"
+"and should be avoided if at all possible."
+msgstr ""
+
+#: ../apparmor/aa.py:1396 ../apparmor/aa.py:1414
+#, python-format
+msgid ""
+"A profile for %s does not exist.\n"
+"Do you want to create one?"
+msgstr ""
+
+#: ../apparmor/aa.py:1523
+msgid "Complain-mode changes:"
+msgstr ""
+
+#: ../apparmor/aa.py:1525
+msgid "Enforce-mode changes:"
+msgstr ""
+
+#: ../apparmor/aa.py:1528
+#, python-format
+msgid "Invalid mode found: %s"
+msgstr ""
+
+#: ../apparmor/aa.py:1897
+#, python-format
+msgid "Adding %(path)s %(mode)s to profile"
+msgstr ""
+
+#: ../apparmor/aa.py:1918
+#, python-format
+msgid ""
+"The specified path does not match this log entry:\n"
+"\n"
+"  Log Entry: %(path)s\n"
+"  Entered Path:  %(ans)s\n"
+"Do you really want to use this path?"
+msgstr ""
+
+#: ../apparmor/aa.py:2251
+#, python-format
+msgid "Reading log entries from %s."
+msgstr ""
+
+#: ../apparmor/aa.py:2254
+#, python-format
+msgid "Updating AppArmor profiles in %s."
+msgstr ""
+
+#: ../apparmor/aa.py:2323
+msgid ""
+"Select which profile changes you would like to save to the\n"
+"local profile set."
+msgstr ""
+
+#: ../apparmor/aa.py:2324
+msgid "Local profile changes"
+msgstr ""
+
+#: ../apparmor/aa.py:2418
+msgid "Profile Changes"
+msgstr ""
+
+#: ../apparmor/aa.py:2428
+#, python-format
+msgid "Can't find existing profile %s to compare changes."
+msgstr ""
+
+#: ../apparmor/aa.py:2566 ../apparmor/aa.py:2581
+#, python-format
+msgid "Can't read AppArmor profiles in %s"
+msgstr ""
+
+#: ../apparmor/aa.py:2677
+#, python-format
+msgid ""
+"%(profile)s profile in %(file)s contains syntax errors in line: %(line)s."
+msgstr ""
+
+#: ../apparmor/aa.py:2734
+#, python-format
+msgid ""
+"Syntax Error: Unexpected End of Profile reached in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2749
+#, python-format
+msgid ""
+"Syntax Error: Unexpected capability entry found in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2770
+#, python-format
+msgid ""
+"Syntax Error: Unexpected link entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2798
+#, python-format
+msgid ""
+"Syntax Error: Unexpected change profile entry found in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2820
+#, python-format
+msgid ""
+"Syntax Error: Unexpected rlimit entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2831
+#, python-format
+msgid ""
+"Syntax Error: Unexpected boolean definition found in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2871
+#, python-format
+msgid ""
+"Syntax Error: Unexpected bare file rule found in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2894
+#, python-format
+msgid ""
+"Syntax Error: Unexpected path entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2922
+#, python-format
+msgid "Syntax Error: Invalid Regex %(path)s in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2925
+#, python-format
+msgid "Invalid mode %(mode)s in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:2977
+#, python-format
+msgid ""
+"Syntax Error: Unexpected network entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3007
+#, python-format
+msgid ""
+"Syntax Error: Unexpected dbus entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3030
+#, python-format
+msgid ""
+"Syntax Error: Unexpected mount entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3052
+#, python-format
+msgid ""
+"Syntax Error: Unexpected signal entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3074
+#, python-format
+msgid ""
+"Syntax Error: Unexpected ptrace entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3096
+#, python-format
+msgid ""
+"Syntax Error: Unexpected pivot_root entry found in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3118
+#, python-format
+msgid ""
+"Syntax Error: Unexpected unix entry found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3140
+#, python-format
+msgid ""
+"Syntax Error: Unexpected change hat declaration found in file: %(file)s "
+"line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3152
+#, python-format
+msgid ""
+"Syntax Error: Unexpected hat definition found in file: %(file)s line: "
+"%(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3168
+#, python-format
+msgid "Error: Multiple definitions for hat %(hat)s in profile %(profile)s."
+msgstr ""
+
+#: ../apparmor/aa.py:3185
+#, python-format
+msgid "Warning: invalid \"REPOSITORY:\" line in %s, ignoring."
+msgstr ""
+
+#: ../apparmor/aa.py:3198
+#, python-format
+msgid "Syntax Error: Unknown line found in file: %(file)s line: %(line)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3211
+#, python-format
+msgid ""
+"Syntax Error: Missing '}' or ','. Reached end of file %(file)s while inside "
+"profile %(profile)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3277
+#, python-format
+msgid "Redefining existing variable %(variable)s: %(value)s in %(file)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3282
+#, python-format
+msgid ""
+"Values added to a non-existing variable %(variable)s: %(value)s in %(file)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3284
+#, python-format
+msgid ""
+"Unknown variable operation %(operation)s for variable %(variable)s in "
+"%(file)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3343
+#, python-format
+msgid "Invalid allow string: %(allow)s"
+msgstr ""
+
+#: ../apparmor/aa.py:3778
+msgid "Can't find existing profile to modify"
+msgstr ""
+
+#: ../apparmor/aa.py:4347
+#, python-format
+msgid "Writing updated profile for %s."
+msgstr ""
+
+#: ../apparmor/aa.py:4481
+#, python-format
+msgid "File Not Found: %s"
+msgstr ""
+
+#: ../apparmor/aa.py:4591
+#, python-format
+msgid ""
+"%s is currently marked as a program that should not have its own\n"
+"profile.  Usually, programs are marked this way if creating a profile for \n"
+"them is likely to break the rest of the system.  If you know what you're\n"
+"doing and are certain you want to create a profile for this program, edit\n"
+"the corresponding entry in the [qualifiers] section in "
+"/etc/apparmor/logprof.conf."
+msgstr ""
+
+#: ../apparmor/logparser.py:127 ../apparmor/logparser.py:132
+#, python-format
+msgid "Log contains unknown mode %s"
+msgstr ""
+
+#: ../apparmor/tools.py:84 ../apparmor/tools.py:126
+#, python-format
+msgid ""
+"Can't find %(program)s in the system path list. If the name of the "
+"application\n"
+"is correct, please run 'which %(program)s' as a user with correct PATH\n"
+"environment set up in order to find the fully-qualified path and\n"
+"use the full path as parameter."
+msgstr ""
+
+#: ../apparmor/tools.py:86 ../apparmor/tools.py:102 ../apparmor/tools.py:128
+#, python-format
+msgid "%s does not exist, please double-check the path."
+msgstr ""
+
+#: ../apparmor/tools.py:100
+msgid ""
+"The given program cannot be found, please try with the fully qualified path "
+"name of the program: "
+msgstr ""
+
+#: ../apparmor/tools.py:113 ../apparmor/tools.py:137 ../apparmor/tools.py:157
+#: ../apparmor/tools.py:175 ../apparmor/tools.py:193
+#, python-format
+msgid "Profile for %s not found, skipping"
+msgstr ""
+
+#: ../apparmor/tools.py:140
+#, python-format
+msgid "Disabling %s."
+msgstr ""
+
+#: ../apparmor/tools.py:198
+#, python-format
+msgid "Setting %s to audit mode."
+msgstr ""
+
+#: ../apparmor/tools.py:200
+#, python-format
+msgid "Removing audit mode from %s."
+msgstr ""
+
+#: ../apparmor/tools.py:212
+#, python-format
+msgid ""
+"Please pass an application to generate a profile for, not a profile itself - "
+"skipping %s."
+msgstr ""
+
+#: ../apparmor/tools.py:220
+#, python-format
+msgid "Profile for %s already exists - skipping."
+msgstr ""
+
+#: ../apparmor/tools.py:232
+#, python-format
+msgid ""
+"\n"
+"Deleted %s rules."
+msgstr ""
+
+#: ../apparmor/tools.py:240
+#, python-format
+msgid ""
+"The local profile for %(program)s in file %(file)s was changed. Would you "
+"like to save it?"
+msgstr ""
+
+#: ../apparmor/tools.py:260
+#, python-format
+msgid "The profile for %s does not exists. Nothing to clean."
+msgstr ""
+
+#: ../apparmor/ui.py:61
+msgid "Invalid hotkey for"
+msgstr ""
+
+#: ../apparmor/ui.py:77 ../apparmor/ui.py:121 ../apparmor/ui.py:275
+msgid "(Y)es"
+msgstr ""
+
+#: ../apparmor/ui.py:78 ../apparmor/ui.py:122 ../apparmor/ui.py:276
+msgid "(N)o"
+msgstr ""
+
+#: ../apparmor/ui.py:123
+msgid "(C)ancel"
+msgstr ""
+
+#: ../apparmor/ui.py:223
+msgid "(A)llow"
+msgstr ""
+
+#: ../apparmor/ui.py:224
+msgid "(M)ore"
+msgstr ""
+
+#: ../apparmor/ui.py:225
+msgid "Audi(t)"
+msgstr ""
+
+#: ../apparmor/ui.py:226
+msgid "Audi(t) off"
+msgstr ""
+
+#: ../apparmor/ui.py:227
+msgid "Audit (A)ll"
+msgstr ""
+
+#: ../apparmor/ui.py:229
+msgid "(O)wner permissions on"
+msgstr ""
+
+#: ../apparmor/ui.py:230
+msgid "(O)wner permissions off"
+msgstr ""
+
+#: ../apparmor/ui.py:231
+msgid "(D)eny"
+msgstr ""
+
+#: ../apparmor/ui.py:232
+msgid "Abo(r)t"
+msgstr ""
+
+#: ../apparmor/ui.py:233
+msgid "(F)inish"
+msgstr ""
+
+#: ../apparmor/ui.py:234
+msgid "(I)nherit"
+msgstr ""
+
+#: ../apparmor/ui.py:235
+msgid "(P)rofile"
+msgstr ""
+
+#: ../apparmor/ui.py:236
+msgid "(P)rofile Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:237
+msgid "(C)hild"
+msgstr ""
+
+#: ../apparmor/ui.py:238
+msgid "(C)hild Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:239
+msgid "(N)amed"
+msgstr ""
+
+#: ../apparmor/ui.py:240
+msgid "(N)amed Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:241
+msgid "(U)nconfined"
+msgstr ""
+
+#: ../apparmor/ui.py:242
+msgid "(U)nconfined Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:243
+msgid "(P)rofile Inherit"
+msgstr ""
+
+#: ../apparmor/ui.py:244
+msgid "(P)rofile Inherit Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:245
+msgid "(C)hild Inherit"
+msgstr ""
+
+#: ../apparmor/ui.py:246
+msgid "(C)hild Inherit Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:247
+msgid "(N)amed Inherit"
+msgstr ""
+
+#: ../apparmor/ui.py:248
+msgid "(N)amed Inherit Clean Exec"
+msgstr ""
+
+#: ../apparmor/ui.py:249
+msgid "(X) ix On"
+msgstr ""
+
+#: ../apparmor/ui.py:250
+msgid "(X) ix Off"
+msgstr ""
+
+#: ../apparmor/ui.py:251 ../apparmor/ui.py:265
+msgid "(S)ave Changes"
+msgstr ""
+
+#: ../apparmor/ui.py:252
+msgid "(C)ontinue Profiling"
+msgstr ""
+
+#: ../apparmor/ui.py:253
+msgid "(N)ew"
+msgstr ""
+
+#: ../apparmor/ui.py:254
+msgid "(G)lob"
+msgstr ""
+
+#: ../apparmor/ui.py:255
+msgid "Glob with (E)xtension"
+msgstr ""
+
+#: ../apparmor/ui.py:256
+msgid "(A)dd Requested Hat"
+msgstr ""
+
+#: ../apparmor/ui.py:257
+msgid "(U)se Default Hat"
+msgstr ""
+
+#: ../apparmor/ui.py:258
+msgid "(S)can system log for AppArmor events"
+msgstr ""
+
+#: ../apparmor/ui.py:259
+msgid "(H)elp"
+msgstr ""
+
+#: ../apparmor/ui.py:260
+msgid "(V)iew Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:261
+msgid "(U)se Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:262
+msgid "(C)reate New Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:263
+msgid "(U)pdate Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:264
+msgid "(I)gnore Update"
+msgstr ""
+
+#: ../apparmor/ui.py:266
+msgid "Save Selec(t)ed Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:267
+msgid "(U)pload Changes"
+msgstr ""
+
+#: ../apparmor/ui.py:268
+msgid "(V)iew Changes"
+msgstr ""
+
+#: ../apparmor/ui.py:269
+msgid "View Changes b/w (C)lean profiles"
+msgstr ""
+
+#: ../apparmor/ui.py:270
+msgid "(V)iew"
+msgstr ""
+
+#: ../apparmor/ui.py:271
+msgid "(E)nable Repository"
+msgstr ""
+
+#: ../apparmor/ui.py:272
+msgid "(D)isable Repository"
+msgstr ""
+
+#: ../apparmor/ui.py:273
+msgid "(N)ever Ask Again"
+msgstr ""
+
+#: ../apparmor/ui.py:274
+msgid "Ask Me (L)ater"
+msgstr ""
+
+#: ../apparmor/ui.py:277
+msgid "Allow All (N)etwork"
+msgstr ""
+
+#: ../apparmor/ui.py:278
+msgid "Allow Network Fa(m)ily"
+msgstr ""
+
+#: ../apparmor/ui.py:279
+msgid "(O)verwrite Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:280
+msgid "(K)eep Profile"
+msgstr ""
+
+#: ../apparmor/ui.py:281
+msgid "(C)ontinue"
+msgstr ""
+
+#: ../apparmor/ui.py:282
+msgid "(I)gnore"
+msgstr ""
+
+#: ../apparmor/ui.py:344
+#, python-format
+msgid "PromptUser: Unknown command %s"
+msgstr ""
+
+#: ../apparmor/ui.py:351
+#, python-format
+msgid "PromptUser: Duplicate hotkey for %(command)s: %(menutext)s "
+msgstr ""
+
+#: ../apparmor/ui.py:363
+msgid "PromptUser: Invalid hotkey in default item"
+msgstr ""
+
+#: ../apparmor/ui.py:368
+#, python-format
+msgid "PromptUser: Invalid default %s"
+msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apport.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apport.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apport.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apport.po	2020-07-08 13:53:59.000000000 +0000
@@ -7,667 +7,504 @@
 msgstr ""
 "Project-Id-Version: apport\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-19 19:02+0000\n"
+"POT-Creation-Date: 2020-05-21 13:29+0000\n"
 "PO-Revision-Date: 2018-03-26 08:29+0000\n"
 "Last-Translator: xcffl <xcffl@outlook.com>\n"
 "Language-Team: Chinese (China) <zh_CN@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:18+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:144
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:144
-#: ../apport/ui.py:144
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144
-msgid "This package does not seem to be installed correctly"
-msgstr "该软件包似乎没有被正确安装"
+#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
+#: ../kde/apport-kde-mime.desktop.in.h:1
+msgid "Report a problem..."
+msgstr "提交一份问题报告…"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:149
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:149
-#: ../apport/ui.py:149
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:149
-#, python-format
+#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
+#: ../kde/apport-kde-mime.desktop.in.h:2
+msgid "Report a malfunction to the developers"
+msgstr "向开发者报告一个故障"
+
+#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29
+msgid "Your system might become unstable now and might need to be restarted."
+msgstr "您的系统现在可能变得不稳定，可能需要重新启动。"
+
+#: ../kde/apport-kde-mimelnk.desktop.in.h:1
+msgid "Apport crash file"
+msgstr "Apport 崩溃文件"
+
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67
+#: ../data/apportcheckresume.py:67
 msgid ""
-"This is not an official %s package. Please remove any third party package "
-"and try again."
-msgstr "这不是官方的 %s 软件包。请删除所有第三方软件包，然后重试。"
+"This occurred during a previous suspend, and prevented the system from "
+"resuming properly."
+msgstr "发生于之前的挂起时，并且使系统午饭正常恢复。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:166
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:166
-#: ../apport/ui.py:166
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:166
-#, python-format
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69
+#: ../data/apportcheckresume.py:69
 msgid ""
-"You have some obsolete package versions installed. Please upgrade the "
-"following packages and check if the problem still occurs:\n"
-"\n"
-"%s"
-msgstr ""
-"您安装了一些陈旧的软件包。请升级以下软件包后再查看问题是否依然发生:\n"
-"\n"
-"%s"
+"This occurred during a previous hibernation, and prevented the system from "
+"resuming properly."
+msgstr "发生于之前的休眠时，并且使系统午饭正常恢复。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:303
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:303
-#: ../apport/ui.py:303
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303
-msgid "unknown program"
-msgstr "未知程序"
+#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74
+#: ../data/apportcheckresume.py:74
+msgid ""
+"The resume processing hung very near the end and will have appeared to have "
+"completed normally."
+msgstr "这个恢复过程已经非常接近尾声，将正常结束。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:304
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:304
-#: ../apport/ui.py:304
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304
-#, python-format
-msgid "Sorry, the program \"%s\" closed unexpectedly"
-msgstr "对不起，%s 程序异常退出"
+#: ../debian/tmp/usr/bin/apport-retrace.py:34 ../bin/apport-retrace.py:34
+msgid "Do not put the new traces into the report, but write them to stdout."
+msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:306
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1427
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:306
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1427
-#: ../apport/ui.py:306 ../apport/ui.py:1427
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:306
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1427
-#, python-format
-msgid "Problem in %s"
-msgstr "%s 中的问题"
+#: ../debian/tmp/usr/bin/apport-retrace.py:36 ../bin/apport-retrace.py:36
+msgid ""
+"Start an interactive gdb session with the report's core dump (-o ignored; "
+"does not rewrite report)"
+msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:307
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:307
-#: ../apport/ui.py:307
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:307
+#: ../debian/tmp/usr/bin/apport-retrace.py:38 ../bin/apport-retrace.py:38
 msgid ""
-"Your computer does not have enough free memory to automatically analyze the "
-"problem and send a report to the developers."
-msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。"
+"Write modified report to given file instead of changing the original report"
+msgstr "将更改过的报告写入指定文件而非改变原始报告"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:362
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:370
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:513
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:516
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:721
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1233
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1399
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1403
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:362
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:370
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:513
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:516
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:721
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1233
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1399
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1403
-#: ../apport/ui.py:362 ../apport/ui.py:370 ../apport/ui.py:513
-#: ../apport/ui.py:516 ../apport/ui.py:721 ../apport/ui.py:1233
-#: ../apport/ui.py:1399 ../apport/ui.py:1403
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:362
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:370
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:516
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1233
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1399
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1403
-msgid "Invalid problem report"
-msgstr "无效的问题报告"
+#: ../debian/tmp/usr/bin/apport-retrace.py:41 ../bin/apport-retrace.py:41
+msgid "Remove the core dump from the report after stack trace regeneration"
+msgstr "生成栈回溯后将内核转储从报告中删除"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:363
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:363
-#: ../apport/ui.py:363
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363
-msgid "You are not allowed to access this problem report."
-msgstr "您没有访问这个问题报告的权限。"
+#: ../debian/tmp/usr/bin/apport-retrace.py:43 ../bin/apport-retrace.py:43
+msgid "Override report's CoreFile"
+msgstr "覆盖报告核心文件"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:366
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:366
-#: ../apport/ui.py:366
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:366
-msgid "Error"
-msgstr "错误"
+#: ../debian/tmp/usr/bin/apport-retrace.py:45 ../bin/apport-retrace.py:45
+msgid "Override report's ExecutablePath"
+msgstr "覆盖报告执行路径"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:367
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:367
-#: ../apport/ui.py:367
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367
-msgid "There is not enough disk space available to process this report."
-msgstr "没有足够的磁盘空间来处理报告。"
+#: ../debian/tmp/usr/bin/apport-retrace.py:47 ../bin/apport-retrace.py:47
+msgid "Override report's ProcMaps"
+msgstr "覆盖报告的进程表"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:461
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:461
-#: ../apport/ui.py:461
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:461
-msgid "No package specified"
-msgstr "没有指定软件包"
+#: ../debian/tmp/usr/bin/apport-retrace.py:49 ../bin/apport-retrace.py:49
+msgid "Rebuild report's Package information"
+msgstr "重建报告的包信息"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:462
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:462
-#: ../apport/ui.py:462
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:462
+#: ../debian/tmp/usr/bin/apport-retrace.py:51 ../bin/apport-retrace.py:51
 msgid ""
-"You need to specify a package or a PID. See --help for more information."
-msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。"
+"Build a temporary sandbox and download/install the necessary packages and "
+"debug symbols in there; without this option it assumes that the necessary "
+"packages and debug symbols are already installed in the system. The argument "
+"points to the packaging system configuration base directory; if you specify "
+"\"system\", it will use the system configuration files, but will then only "
+"be able to retrace crashes that happened on the currently running release."
+msgstr ""
+"构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指"
+"定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:491
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:491
-#: ../apport/ui.py:491
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491
-msgid "Permission denied"
-msgstr "拒绝访问"
+#: ../debian/tmp/usr/bin/apport-retrace.py:53 ../bin/apport-retrace.py:53
+msgid ""
+"Build another temporary sandbox for installing gdb and its dependencies "
+"using the same release as the report rather than whatever version of gdb you "
+"have installed."
+msgstr "生成另一个临时沙盒，在其中安装报告所述版本的 gdb 和它的依赖项，而不使用您现有版本的 gdb。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:492
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:492
-#: ../apport/ui.py:492
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492
+#: ../debian/tmp/usr/bin/apport-retrace.py:55 ../bin/apport-retrace.py:55
 msgid ""
-"The specified process does not belong to you. Please run this program as the "
-"process owner or as root."
-msgstr "指定的进程只能以进程的所有者或 root 身份运行。"
+"Report download/install progress when installing packages into sandbox"
+msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:405
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:494
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:405
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:494
-#: ../apport/ui.py:405 ../apport/ui.py:494
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:405
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:494
-msgid "Invalid PID"
-msgstr "无效的 PID"
+#: ../debian/tmp/usr/bin/apport-retrace.py:57 ../bin/apport-retrace.py:57
+msgid "Prepend timestamps to log messages, for batch operation"
+msgstr "为进行批量操作，请预先设置时间戳，以记录消息"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:495
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:495
-#: ../apport/ui.py:495
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:495
-msgid "The specified process ID does not belong to a program."
-msgstr "指定的进程 ID 不属于一个程序。"
+#: ../debian/tmp/usr/bin/apport-retrace.py:59 ../bin/apport-retrace.py:59
+msgid ""
+"Create and use third-party repositories from origins specified in reports"
+msgstr "根据报告中指定的来源创建并使用第三方软件仓库"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:514
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:514
-#: ../apport/ui.py:514
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514
-#, python-format
-msgid "Symptom script %s did not determine an affected package"
-msgstr "症状脚本 %s 没有划定受影响的包"
+#: ../debian/tmp/usr/bin/apport-retrace.py:61 ../bin/apport-retrace.py:61
+msgid "Cache directory for packages downloaded in the sandbox"
+msgstr "下载到沙盒中软件包的缓存目录"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:517
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:517
-#: ../apport/ui.py:517
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:517
-#, python-format
-msgid "Package %s does not exist"
-msgstr "软件包 %s 不存在"
+#: ../debian/tmp/usr/bin/apport-retrace.py:63 ../bin/apport-retrace.py:63
+msgid ""
+"Directory for unpacked packages. Future runs will assume that any already "
+"downloaded package is also extracted to this sandbox."
+msgstr "用于解压包目录。以后运行将假设任何已下载的包被提取到这个沙盒。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:546
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:733
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:738
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:546
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:733
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:738
-#: ../apport/ui.py:546 ../apport/ui.py:733 ../apport/ui.py:738
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:546
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:733
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:738
-msgid "Cannot create report"
-msgstr "无法创建报告"
+#: ../bin/apport-valgrind.py:66 ../debian/tmp/usr/bin/apport-retrace.py:65
+#: ../debian/tmp/usr/bin/apport-valgrind.py:66 ../bin/apport-retrace.py:65
+msgid ""
+"Install an extra package into the sandbox (can be specified multiple times)"
+msgstr "将其他软件包安装到沙盒(可多次加以指定)中"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:561
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:607
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:623
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:561
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:607
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:623
-#: ../apport/ui.py:561 ../apport/ui.py:607 ../apport/ui.py:623
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:561
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:607
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:623
-msgid "Updating problem report"
-msgstr "更新问题报告"
+#: ../debian/tmp/usr/bin/apport-retrace.py:67 ../bin/apport-retrace.py:67
+msgid ""
+"Path to a file with the crash database authentication information. This is "
+"used when specifying a crash ID to upload the retraced stack traces (only if "
+"neither -g, -o, nor -s are specified)"
+msgstr "包含崩溃数据库访问信息文件之路径。此项将用于为特定崩溃代码上传堆栈的回溯调试信息(除非用户指定 -g, -o 或 -s)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:562
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:562
-#: ../apport/ui.py:562
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:562
+#: ../debian/tmp/usr/bin/apport-retrace.py:69 ../bin/apport-retrace.py:69
 msgid ""
-"You are not the reporter or subscriber of this problem report, or the report "
-"is a duplicate or already closed.\n"
-"\n"
-"Please create a new report using \"apport-bug\"."
-msgstr ""
-"您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n"
-"请使用 apport-bug 新建一份报告。"
+"Display retraced stack traces and ask for confirmation before sending them "
+"to the crash database."
+msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:571
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:571
-#: ../apport/ui.py:571
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:571
+#: ../debian/tmp/usr/bin/apport-retrace.py:71 ../bin/apport-retrace.py:71
 msgid ""
-"You are not the reporter of this problem report. It is much easier to mark a "
-"bug as a duplicate of another than to move your comments and attachments to "
-"a new bug.\n"
-"\n"
-"Subsequently, we recommend that you file a new bug report using \"apport-"
-"bug\" and make a comment in this bug about the one you file.\n"
-"\n"
-"Do you really want to proceed?"
-msgstr ""
-"您并不是这个问题报告的报告者。相对而言，标记一个重复的错误远比迁移您的评论和附件到新的错误报告容易得多。\n"
-"因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n"
-"您确定要继续么？"
+"Path to the duplicate sqlite database (default: no duplicate checking)"
+msgstr "SQLite 数据库路径重复(默认：不重复检查)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:608
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:624
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:608
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:624
-#: ../apport/ui.py:608 ../apport/ui.py:624
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:608
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:624
-msgid "No additional information collected."
-msgstr "未收集更多信息。"
+#: ../debian/tmp/usr/bin/apport-retrace.py:73 ../bin/apport-retrace.py:73
+msgid "Do not add StacktraceSource to the report."
+msgstr "不要将 StacktraceSource 附加到报告中。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:675
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:675
-#: ../apport/ui.py:675
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:675
-msgid "What kind of problem do you want to report?"
-msgstr "您想报告什么类型的问题？"
+#: ../debian/tmp/usr/bin/apport-retrace.py:82 ../bin/apport-retrace.py:82
+msgid "You cannot use -C without -S. Stopping."
+msgstr "您不能在未指定 -S 选项的情况下使用 -C 选项，停止。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:692
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:692
-#: ../apport/ui.py:692
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:692
-msgid "Unknown symptom"
-msgstr "未知症状"
+#. translators: don't translate y/n, apport currently only checks for "y"
+#: ../debian/tmp/usr/bin/apport-retrace.py:115 ../bin/apport-retrace.py:115
+msgid "OK to send these as attachments? [y/n]"
+msgstr "确定以附件形式发送这些？[y/n]"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:693
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:693
-#: ../apport/ui.py:693
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:693
-#, python-format
-msgid "The symptom \"%s\" is not known."
-msgstr "症状 %s 未知。"
+#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
+msgid "See man page for details."
+msgstr "更多细节请查看 man 手册。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:724
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:724
-#: ../apport/ui.py:724
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:724
-msgid ""
-"After closing this message please click on an application window to report a "
-"problem about it."
-msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。"
+#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
+msgid "specify the log file name produced by valgrind"
+msgstr "请指定 valgrind 生成的日志文件名"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:734
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:739
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:734
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:739
-#: ../apport/ui.py:734 ../apport/ui.py:739
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:734
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:739
-msgid "xprop failed to determine process ID of the window"
-msgstr "xprop 无法确定窗口的进程 ID"
+#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
+msgid ""
+"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
+"create it"
+msgstr "重复使用以前创建的缓存目录 (SDIR) ，或者，如果它不存在，则创建它"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:753
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:753
-#: ../apport/ui.py:753
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:753
-msgid "%prog <report number>"
-msgstr "%prog <报告号>"
+#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
+msgid ""
+"do  not  create  or reuse a sandbox directory for additional debug symbols "
+"but rely only on installed debug symbols."
+msgstr "不创建或重用额外的调试符号的沙箱目录，仅依靠安装调试符号。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:755
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:755
-#: ../apport/ui.py:755
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:755
-msgid "Specify package name."
-msgstr "请指定包的名称。"
+#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
+msgid ""
+"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
+"it"
+msgstr "重复使用以前创建的缓存目录(CDIR)，或者，如果它不存在，则创建它"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:808
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:808
-#: ../apport/ui.py:757 ../apport/ui.py:808
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:757
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:808
-msgid "Add an extra tag to the report. Can be specified multiple times."
-msgstr "向报告中添加额外的标记，可多次指定。"
+#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+msgid ""
+"report download/install progress when installing packages into sandbox"
+msgstr "安装包进入沙盒时报告下载/安装进度"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:787
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:787
-#: ../apport/ui.py:787
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787
+#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
 msgid ""
-"%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
-msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]"
+"the executable that is run under valgrind's memcheck tool  for memory leak "
+"detection"
+msgstr "该可执行文件运行 Valgrind MemCheck 工具下的内存泄漏检测"
+
+#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
+#, python-format
+msgid "Error: %s is not an executable. Stopping."
+msgstr "错误：%s 不是可执行文件，停止。"
+
+#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
+#, python-format
+msgid "Usage: %s <report> <target directory>"
+msgstr "用法：%s <报告> <目标目录>"
+
+#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42
+msgid "Destination directory exists and is not empty."
+msgstr "目标目录存在且不为空。"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:80 ../bin/apport-cli.py:80
+msgid "Press any key to continue..."
+msgstr "按任意键继续…"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:790
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:790
-#: ../apport/ui.py:790
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:790
+#: ../debian/tmp/usr/bin/apport-cli.py:87 ../bin/apport-cli.py:87
+msgid "What would you like to do? Your options are:"
+msgstr "您想做什么？您的选择是："
+
+#: ../debian/tmp/usr/bin/apport-cli.py:100 ../bin/apport-cli.py:100
+#, python-format
+msgid "Please choose (%s):"
+msgstr "请选择(%s)："
+
+#: ../debian/tmp/usr/bin/apport-cli.py:164 ../bin/apport-cli.py:164
+#, python-format
+msgid "(%i bytes)"
+msgstr "(%i 字节)"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:363
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:146
+#: ../debian/tmp/usr/bin/apport-cli.py:166 ../kde/apport-kde.py:363
+#: ../gtk/apport-gtk.py:146 ../bin/apport-cli.py:166
+msgid "(binary data)"
+msgstr "(二进制数据)"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:186
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:181
+#: ../debian/tmp/usr/bin/apport-cli.py:194 ../kde/apport-kde.py:186
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
+#: ../gtk/apport-gtk.py:181 ../bin/apport-cli.py:194
+msgid "Send problem report to the developers?"
+msgstr "向开发者发送问题报告？"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:195 ../bin/apport-cli.py:195
 msgid ""
-"Start in bug filing mode. Requires --package and an optional --pid, or just "
-"a --pid. If neither is given, display a list of known symptoms. (Implied if "
-"a single argument is given.)"
+"After the problem report has been sent, please fill out the form in the\n"
+"automatically opened web browser."
 msgstr ""
-"以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。"
+"当问题报告被发出之后，请填写\n"
+"自动弹出窗口的表格。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:792
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:792
-#: ../apport/ui.py:792
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:792
-msgid "Click a window as a target for filing a problem report."
-msgstr "点击一个窗口作为提交问题报告的目标。"
+#: ../debian/tmp/usr/bin/apport-cli.py:198 ../bin/apport-cli.py:198
+#, python-format
+msgid "&Send report (%s)"
+msgstr "发送报告(&S)(%s)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:794
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:794
-#: ../apport/ui.py:794
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:794
-msgid "Start in bug updating mode. Can take an optional --package."
-msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。"
+#: ../debian/tmp/usr/bin/apport-cli.py:202 ../bin/apport-cli.py:202
+msgid "&Examine locally"
+msgstr "本地检查(&E)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:796
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:796
-#: ../apport/ui.py:796
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:796
-msgid ""
-"File a bug report about a symptom. (Implied if symptom name is given as only "
-"argument.)"
-msgstr "针对某个症状报告 bug。"
+#: ../debian/tmp/usr/bin/apport-cli.py:206 ../bin/apport-cli.py:206
+msgid "&View report"
+msgstr "查看报告(&V)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:798
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:798
-#: ../apport/ui.py:798
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:798
-msgid ""
-"Specify package name in --file-bug mode. This is optional if a --pid is "
-"specified. (Implied if package name is given as only argument.)"
-msgstr "--file-bug 模式中指定软件包名。如果指定了 --pid，则是可选的。(如果只给定软件包名这一个参数则为必需。)"
+#: ../debian/tmp/usr/bin/apport-cli.py:207 ../bin/apport-cli.py:207
+msgid "&Keep report file for sending later or copying to somewhere else"
+msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:208 ../bin/apport-cli.py:208
+msgid "Cancel and &ignore future crashes of this program version"
+msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:800
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:800
-#: ../apport/ui.py:800
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:800
+#: ../debian/tmp/usr/bin/apport-cli.py:210
+#: ../debian/tmp/usr/bin/apport-cli.py:287
+#: ../debian/tmp/usr/bin/apport-cli.py:319
+#: ../debian/tmp/usr/bin/apport-cli.py:340 ../bin/apport-cli.py:210
+#: ../bin/apport-cli.py:287 ../bin/apport-cli.py:319 ../bin/apport-cli.py:340
+msgid "&Cancel"
+msgstr "取消(&C)"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:238 ../bin/apport-cli.py:238
+msgid "Problem report file:"
+msgstr "问题报告文件："
+
+#: ../debian/tmp/usr/bin/apport-cli.py:244
+#: ../debian/tmp/usr/bin/apport-cli.py:249 ../bin/apport-cli.py:244
+#: ../bin/apport-cli.py:249
+msgid "&Confirm"
+msgstr "确认(&C)"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:248 ../bin/apport-cli.py:248
+#, python-format
+msgid "Error: %s"
+msgstr "错误：%s"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:407
+#: ../debian/tmp/usr/bin/apport-cli.py:254 ../kde/apport-kde.py:407
+#: ../bin/apport-cli.py:254
+msgid "Collecting problem information"
+msgstr "正在收集问题信息"
+
+#: ../debian/tmp/usr/bin/apport-cli.py:255 ../bin/apport-cli.py:255
 msgid ""
-"Specify a running program in --file-bug mode. If this is specified, the bug "
-"report will contain more information.  (Implied if pid is given as only "
-"argument.)"
-msgstr "在 --file-bug 模式中指定运行的程序。如果指定，该问题报告将包含更多的信息。(默认指定 pid 作为唯一参数。)"
+"The collected information can be sent to the developers to improve the\n"
+"application. This might take a few minutes."
+msgstr ""
+"收集到的信息将会传送到开发人员处以改进软件。\n"
+"这可能会花费几分钟时间，"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:802
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:802
-#: ../apport/ui.py:802
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:802
-msgid "The provided pid is a hanging application."
-msgstr "此进程号的程序是挂起的。"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:435
+#: ../debian/tmp/usr/bin/apport-cli.py:267 ../kde/apport-kde.py:435
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17
+#: ../bin/apport-cli.py:267
+msgid "Uploading problem information"
+msgstr "上传问题信息"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:804
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:804
-#: ../apport/ui.py:804
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:804
-#, python-format
+#: ../debian/tmp/usr/bin/apport-cli.py:268 ../bin/apport-cli.py:268
 msgid ""
-"Report the crash from given .apport or .crash file instead of the pending "
-"ones in %s. (Implied if file is given as only argument.)"
-msgstr "从给定的 .apport 或者  .crash 文件，而不是从正在处理的 %s 中汇报崩溃。(如果文件只给定了参数时实现。)"
+"The collected information is being sent to the bug tracking system.\n"
+"This might take a few minutes."
+msgstr ""
+"收集到的信息正在被发送到错误跟踪系统。\n"
+"这可能要花费几分钟时间。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:806
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:806
-#: ../apport/ui.py:806
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:806
-msgid ""
-"In bug filing mode, save the collected information into a file instead of "
-"reporting it. This file can then be reported later on from a different "
-"machine."
-msgstr "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。"
+#: ../debian/tmp/usr/bin/apport-cli.py:318 ../bin/apport-cli.py:318
+msgid "&Done"
+msgstr "完成(&D)"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:810
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:810
-#: ../apport/ui.py:810
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:810
-msgid "Print the Apport version number."
-msgstr "输出 Apport 版本号"
+#: ../debian/tmp/usr/bin/apport-cli.py:324 ../bin/apport-cli.py:324
+msgid "none"
+msgstr "无"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:961
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:961
-#: ../apport/ui.py:961
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:961
-msgid ""
-"This will launch apport-retrace in a terminal window to examine the crash."
-msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。"
+#: ../debian/tmp/usr/bin/apport-cli.py:325 ../bin/apport-cli.py:325
+#, python-format
+msgid "Selected: %s. Multiple choices:"
+msgstr "已选择：%s。 多重选择："
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:962
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:962
-#: ../apport/ui.py:962
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962
-msgid "Run gdb session"
-msgstr "运行 gdb 会话"
+#: ../debian/tmp/usr/bin/apport-cli.py:341 ../bin/apport-cli.py:341
+msgid "Choices:"
+msgstr "选择："
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:963
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:963
-#: ../apport/ui.py:963
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:963
-msgid "Run gdb session without downloading debug symbols"
-msgstr "不下载调试符号的情况下运行 gdb 会话"
+#: ../debian/tmp/usr/bin/apport-cli.py:355 ../bin/apport-cli.py:355
+msgid "Path to file (Enter to cancel):"
+msgstr "文件的路径(回车取消)："
 
-#. TRANSLATORS: %s contains the crash report file name
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:965
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:965
-#: ../apport/ui.py:965
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:965
-#, python-format
-msgid "Update %s with fully symbolic stack trace"
-msgstr "利用全符号的堆栈跟踪更新 %s"
+#: ../debian/tmp/usr/bin/apport-cli.py:361 ../bin/apport-cli.py:361
+msgid "File does not exist."
+msgstr "文件不存在。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1001
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1001
-#: ../apport/ui.py:1001
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1001
-msgid "Can't remember send report status settings"
-msgstr ""
+#: ../debian/tmp/usr/bin/apport-cli.py:363 ../bin/apport-cli.py:363
+msgid "This is a directory."
+msgstr "这是一个目录。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1002
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1002
-#: ../apport/ui.py:1002
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1002
-msgid ""
-"Saving crash reporting state failed. Can't set auto or never reporting mode."
-msgstr ""
+#: ../debian/tmp/usr/bin/apport-cli.py:369 ../bin/apport-cli.py:369
+msgid "To continue, you must visit the following URL:"
+msgstr "要继续，您必须访问下面这个网址："
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1061
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1071
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1061
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1071
-#: ../apport/ui.py:1061 ../apport/ui.py:1071
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1061
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1071
+#: ../debian/tmp/usr/bin/apport-cli.py:371 ../bin/apport-cli.py:371
 msgid ""
-"This problem report applies to a program which is not installed any more."
-msgstr "这一问题报告适用于不再安装的程序。"
+"You can launch a browser now, or copy this URL into a browser on another "
+"computer."
+msgstr "您现在可以启动一个浏览器，或者复制这个网址到另外一个电脑的浏览器。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1086
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1086
-#: ../apport/ui.py:1086
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1086
-#, python-format
-msgid ""
-"The problem happened with the program %s which changed since the crash "
-"occurred."
-msgstr "自崩溃发生起已更改的程序 %s 出现问题。"
+#: ../debian/tmp/usr/bin/apport-cli.py:373 ../bin/apport-cli.py:373
+msgid "Launch a browser now"
+msgstr "现在启动一个浏览器"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1190
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1405
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1190
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1405
-#: ../apport/ui.py:1133 ../apport/ui.py:1190 ../apport/ui.py:1405
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1133
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1190
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1405
-msgid "This problem report is damaged and cannot be processed."
-msgstr "该问题报告已损坏，无法处理。"
+#: ../debian/tmp/usr/bin/apport-cli.py:388 ../bin/apport-cli.py:388
+msgid "No pending crash reports. Try --help for more information."
+msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1141
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1141
-#: ../apport/ui.py:1141
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161
 #, python-format
-msgid ""
-"This report is about a snap published by %s. Contact them via %s for help."
-msgstr ""
+msgid "Sorry, the application %s has stopped unexpectedly."
+msgstr "对不起，应用程序 %s 意外停止。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1144
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1144
-#: ../apport/ui.py:1144
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164
 #, python-format
-msgid ""
-"This report is about a snap published by %s. No contact address has been "
-"provided; visit the forum at https://forum.snapcraft.io/ for help."
-msgstr ""
+msgid "Sorry, %s has closed unexpectedly."
+msgstr "对不起，%s 已意外关闭。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1148
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1148
-#: ../apport/ui.py:1148
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1148
-msgid "This report is about a package that is not installed."
-msgstr ""
+#: ../debian/tmp/usr/share/apport/apport-kde.py:200
+#: ../debian/tmp/usr/share/apport/apport-kde.py:238
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../kde/apport-kde.py:200
+#: ../kde/apport-kde.py:238 ../gtk/apport-gtk.py:169
+#, python-format
+msgid "Sorry, %s has experienced an internal error."
+msgstr "对不起，%s 出现了内部错误。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1152
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1152
-#: ../apport/ui.py:1152
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1152
-msgid "An error occurred while attempting to process this problem report:"
-msgstr "尝试处理此问题报告时出现错误："
+#: ../debian/tmp/usr/share/apport/apport-kde.py:194
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../kde/apport-kde.py:194
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
+#: ../gtk/apport-gtk.py:188
+msgid "Send"
+msgstr "发送"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1159
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1159
-#: ../apport/ui.py:1159
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159
+#: ../debian/tmp/usr/share/apport/apport-kde.py:292
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../kde/apport-kde.py:292
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
+#: ../gtk/apport-gtk.py:204 ../gtk/apport-gtk.py:575
+msgid "Show Details"
+msgstr "显示详细信息"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:231
+#: ../debian/tmp/usr/share/apport/apport-kde.py:244
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../kde/apport-kde.py:231
+#: ../kde/apport-kde.py:244 ../gtk/apport-gtk.py:216
+msgid "Continue"
+msgstr "继续"
+
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239
 #, python-format
-msgid ""
-"You are about to report a bug against the deb package, but you also a have "
-"snap published by %s installed. You can contact them via %s for help. Do you "
-"want to continue with the bug report against the deb?"
-msgstr ""
+msgid "The application %s has stopped responding."
+msgstr "应用程序 %s 停止响应。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1161
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1161
-#: ../apport/ui.py:1161
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243
 #, python-format
-msgid ""
-"You are about to report a bug against the deb package, but you also a have "
-"snap published by %s installed. For the snap, no contact address has been "
-"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you "
-"want to continue with the bug report against the deb?"
-msgstr ""
+msgid "The program \"%s\" has stopped responding."
+msgstr "程序 %s 停止响应。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1234
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1234
-#: ../apport/ui.py:1234
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1234
-msgid "Could not determine the package or source package name."
-msgstr "无法检测包或者源码包的名称。"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:208
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../kde/apport-kde.py:208
+#: ../gtk/apport-gtk.py:259
+#, python-format
+msgid "Package: %s"
+msgstr "软件包：%s"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1252
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1252
-#: ../apport/ui.py:1252
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1252
-msgid "Unable to start web browser"
-msgstr "无法打开浏览器"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:214
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../kde/apport-kde.py:214
+#: ../gtk/apport-gtk.py:265
+msgid "Sorry, a problem occurred while installing software."
+msgstr "对不起，安装软件时出现问题。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1253
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1253
-#: ../apport/ui.py:1253
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1253
+#: ../debian/tmp/usr/share/apport/apport-kde.py:220
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:274
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../kde/apport-kde.py:220
+#: ../gtk/apport-gtk.py:274 ../gtk/apport-gtk.py:289
 #, python-format
-msgid "Unable to start web browser to open %s."
-msgstr "无法使用浏览器打开网页 %s"
+msgid "The application %s has experienced an internal error."
+msgstr "应用程序 %s 发生内部错误。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1353
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1353
-#: ../apport/ui.py:1353
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1353
+#: ../debian/tmp/usr/share/apport/apport-kde.py:223
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../kde/apport-kde.py:223
+#: ../gtk/apport-gtk.py:277
 #, python-format
-msgid "Please enter your account information for the %s bug tracking system"
-msgstr "请为 %s 错误追踪系统输入您的帐户信息"
+msgid "The application %s has closed unexpectedly."
+msgstr "应用程序 %s 已意外关闭。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1365
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1365
-#: ../apport/ui.py:1365
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1365
-msgid "Network problem"
-msgstr "网络问题"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:241
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../kde/apport-kde.py:241
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7
+#: ../gtk/apport-gtk.py:297
+msgid "If you notice further problems, try restarting the computer."
+msgstr "如果您注意到更多问题，请尝试重新启动计算机。"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1367
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1367
-#: ../apport/ui.py:1367
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1367
-msgid ""
-"Cannot connect to crash database, please check your Internet connection."
-msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:245
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../kde/apport-kde.py:245
+#: ../gtk/apport-gtk.py:299
+msgid "Ignore future problems of this type"
+msgstr "以后忽略此类错误"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1394
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1394
-#: ../apport/ui.py:1394
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1394
-msgid "Memory exhaustion"
-msgstr "内存耗尽"
+#: ../debian/tmp/usr/share/apport/apport-kde.py:289
+#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../kde/apport-kde.py:289
+#: ../gtk/apport-gtk.py:579
+msgid "Hide Details"
+msgstr "隐藏详细信息"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1395
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1395
-#: ../apport/ui.py:1395
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1395
-msgid "Your system does not have enough memory to process this crash report."
-msgstr "您的系统没有足够的内存来处理此崩溃报告。"
+#: ../apport/com.ubuntu.apport.policy.in.h:1
+msgid "Collect system information"
+msgstr "收集系统信息"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1430
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1430
-#: ../apport/ui.py:1430
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1430
-#, python-format
+#: ../apport/com.ubuntu.apport.policy.in.h:2
 msgid ""
-"The problem cannot be reported:\n"
-"\n"
-"%s"
-msgstr ""
-"无法报告问题：\n"
-"\n"
-"%s"
+"Authentication is required to collect system information for this problem "
+"report"
+msgstr "为此问题报告收集系统信息需要授权"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1486
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1493
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1486
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1493
-#: ../apport/ui.py:1486 ../apport/ui.py:1493
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1486
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1493
-msgid "Problem already known"
-msgstr "该问题为已知问题"
+#: ../apport/com.ubuntu.apport.policy.in.h:3
+msgid "System problem reports"
+msgstr "系统问题报告"
 
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1487
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1487
-#: ../apport/ui.py:1487
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1487
+#: ../apport/com.ubuntu.apport.policy.in.h:4
 msgid ""
-"This problem was already reported in the bug report displayed in the web "
-"browser. Please check if you can add any further information that might be "
-"helpful for the developers."
-msgstr "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？"
-
-#: ../debian/tmp/usr/lib/python3.7/dist-packages/apport/ui.py:1494
-#: ../debian/tmp/usr/lib/python3/dist-packages/apport/ui.py:1494
-#: ../apport/ui.py:1494
-#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1494
-msgid "This problem was already reported to developers. Thank you!"
-msgstr "已将此问题报告给开发人员。谢谢！"
+"Please enter your password to access problem reports of system programs"
+msgstr "请输入您的密码以查看系统程序问题报告。"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1
-#: ../kde/apport-kde.py:469 ../kde/apport-kde.py:504 ../kde/apport-kde.py:524
 #: ../debian/tmp/usr/share/apport/apport-kde.py:469
 #: ../debian/tmp/usr/share/apport/apport-kde.py:504
-#: ../debian/tmp/usr/share/apport/apport-kde.py:524
+#: ../debian/tmp/usr/share/apport/apport-kde.py:524 ../kde/apport-kde.py:469
+#: ../kde/apport-kde.py:504 ../kde/apport-kde.py:524
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:1 ../gtk/apport-gtk.ui.h:1
 msgid "Apport"
 msgstr "Apport"
 
@@ -687,20 +524,6 @@
 msgid "<big><b>Sorry, an internal error happened.</b></big>"
 msgstr "<big><b>对不起，发生内部错误。</b></big>"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:6 ../gtk/apport-gtk.ui.h:6
-#: ../bin/apport-cli.py:194 ../kde/apport-kde.py:186
-#: ../debian/tmp/usr/share/apport/apport-kde.py:186
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:181
-#: ../debian/tmp/usr/bin/apport-cli.py:194 ../gtk/apport-gtk.py:181
-msgid "Send problem report to the developers?"
-msgstr "向开发者发送问题报告？"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:7 ../gtk/apport-gtk.ui.h:7
-#: ../kde/apport-kde.py:241 ../debian/tmp/usr/share/apport/apport-kde.py:241
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:297 ../gtk/apport-gtk.py:297
-msgid "If you notice further problems, try restarting the computer."
-msgstr "如果您注意到更多问题，请尝试重新启动计算机。"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:8 ../gtk/apport-gtk.ui.h:8
 msgid "Remember this in future"
 msgstr ""
@@ -713,14 +536,6 @@
 msgid "Relaunch this application"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:11 ../gtk/apport-gtk.ui.h:11
-#: ../kde/apport-kde.py:292 ../debian/tmp/usr/share/apport/apport-kde.py:292
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:204
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:575 ../gtk/apport-gtk.py:204
-#: ../gtk/apport-gtk.py:575
-msgid "Show Details"
-msgstr "显示详细信息"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:12 ../gtk/apport-gtk.ui.h:12
 msgid "_Examine locally"
 msgstr "本地检查(_E)"
@@ -729,514 +544,538 @@
 msgid "Don't send"
 msgstr ""
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:14 ../gtk/apport-gtk.ui.h:14
-#: ../kde/apport-kde.py:194 ../debian/tmp/usr/share/apport/apport-kde.py:194
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:188 ../gtk/apport-gtk.py:188
-msgid "Send"
-msgstr "发送"
-
 #: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:15 ../gtk/apport-gtk.ui.h:15
-msgid "<big><b>Collecting problem information</b></big>"
-msgstr "<big><b>正在收集问题信息</b></big>"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16
-msgid ""
-"Information is being collected that may help the developers fix the problem "
-"you report."
-msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:17 ../gtk/apport-gtk.ui.h:17
-#: ../bin/apport-cli.py:267 ../kde/apport-kde.py:435
-#: ../debian/tmp/usr/share/apport/apport-kde.py:435
-#: ../debian/tmp/usr/bin/apport-cli.py:267
-msgid "Uploading problem information"
-msgstr "上传问题信息"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18
-msgid "<big><b>Uploading problem information</b></big>"
-msgstr "<big><b>正在上传问题信息</b></big>"
-
-#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19
-#: ../kde/apport-kde.py:436 ../debian/tmp/usr/share/apport/apport-kde.py:436
-msgid ""
-"The collected information is being sent to the bug tracking system. This "
-"might take a few minutes."
-msgstr "所收集的信息正在发送到缺陷跟踪系统。这可能需要几分钟。"
-
-#: ../kde/apport-kde.py:200 ../kde/apport-kde.py:238
-#: ../debian/tmp/usr/share/apport/apport-kde.py:200
-#: ../debian/tmp/usr/share/apport/apport-kde.py:238
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:169 ../gtk/apport-gtk.py:169
-#, python-format
-msgid "Sorry, %s has experienced an internal error."
-msgstr "对不起，%s 出现了内部错误。"
-
-#: ../kde/apport-kde.py:208 ../debian/tmp/usr/share/apport/apport-kde.py:208
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:259 ../gtk/apport-gtk.py:259
-#, python-format
-msgid "Package: %s"
-msgstr "软件包：%s"
-
-#: ../kde/apport-kde.py:214 ../debian/tmp/usr/share/apport/apport-kde.py:214
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:265 ../gtk/apport-gtk.py:265
-msgid "Sorry, a problem occurred while installing software."
-msgstr "对不起，安装软件时出现问题。"
-
-#: ../kde/apport-kde.py:220 ../debian/tmp/usr/share/apport/apport-kde.py:220
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:274
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:289 ../gtk/apport-gtk.py:274
-#: ../gtk/apport-gtk.py:289
-#, python-format
-msgid "The application %s has experienced an internal error."
-msgstr "应用程序 %s 发生内部错误。"
+msgid "<big><b>Collecting problem information</b></big>"
+msgstr "<big><b>正在收集问题信息</b></big>"
 
-#: ../kde/apport-kde.py:223 ../debian/tmp/usr/share/apport/apport-kde.py:223
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:277 ../gtk/apport-gtk.py:277
-#, python-format
-msgid "The application %s has closed unexpectedly."
-msgstr "应用程序 %s 已意外关闭。"
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:16 ../gtk/apport-gtk.ui.h:16
+msgid ""
+"Information is being collected that may help the developers fix the problem "
+"you report."
+msgstr "正在收集信息，这些信息将会帮助开发人员修复您报告的问题。"
 
-#: ../kde/apport-kde.py:231 ../kde/apport-kde.py:244
-#: ../debian/tmp/usr/share/apport/apport-kde.py:231
-#: ../debian/tmp/usr/share/apport/apport-kde.py:244
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:216 ../gtk/apport-gtk.py:216
-msgid "Continue"
-msgstr "继续"
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:18 ../gtk/apport-gtk.ui.h:18
+msgid "<big><b>Uploading problem information</b></big>"
+msgstr "<big><b>正在上传问题信息</b></big>"
+
+#: ../debian/tmp/usr/share/apport/apport-kde.py:436 ../kde/apport-kde.py:436
+#: ../debian/tmp/usr/share/apport/apport-gtk.ui.h:19 ../gtk/apport-gtk.ui.h:19
+msgid ""
+"The collected information is being sent to the bug tracking system. This "
+"might take a few minutes."
+msgstr "所收集的信息正在发送到缺陷跟踪系统。这可能需要几分钟。"
 
-#: ../kde/apport-kde.py:234 ../debian/tmp/usr/share/apport/apport-kde.py:234
+#: ../debian/tmp/usr/share/apport/apport-kde.py:234 ../kde/apport-kde.py:234
 msgid "Leave Closed"
 msgstr "保持关闭状态"
 
-#: ../kde/apport-kde.py:235 ../kde/apport-kde.py:381
 #: ../debian/tmp/usr/share/apport/apport-kde.py:235
-#: ../debian/tmp/usr/share/apport/apport-kde.py:381
+#: ../debian/tmp/usr/share/apport/apport-kde.py:381 ../kde/apport-kde.py:235
+#: ../kde/apport-kde.py:381
 msgid "Relaunch"
 msgstr "重新启动程序"
 
-#: ../kde/apport-kde.py:245 ../debian/tmp/usr/share/apport/apport-kde.py:245
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:299 ../gtk/apport-gtk.py:299
-msgid "Ignore future problems of this type"
-msgstr "以后忽略此类错误"
-
-#: ../kde/apport-kde.py:289 ../debian/tmp/usr/share/apport/apport-kde.py:289
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:579 ../gtk/apport-gtk.py:579
-msgid "Hide Details"
-msgstr "隐藏详细信息"
-
-#: ../kde/apport-kde.py:315 ../debian/tmp/usr/share/apport/apport-kde.py:315
+#: ../debian/tmp/usr/share/apport/apport-kde.py:315 ../kde/apport-kde.py:315
 msgid "Username:"
 msgstr "用户名："
 
-#: ../kde/apport-kde.py:316 ../debian/tmp/usr/share/apport/apport-kde.py:316
+#: ../debian/tmp/usr/share/apport/apport-kde.py:316 ../kde/apport-kde.py:316
 msgid "Password:"
 msgstr "密码："
 
-#: ../bin/apport-cli.py:166 ../kde/apport-kde.py:363
-#: ../debian/tmp/usr/share/apport/apport-kde.py:363
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:146
-#: ../debian/tmp/usr/bin/apport-cli.py:166 ../gtk/apport-gtk.py:146
-msgid "(binary data)"
-msgstr "(二进制数据)"
-
-#: ../kde/apport-kde.py:406 ../debian/tmp/usr/share/apport/apport-kde.py:406
+#: ../debian/tmp/usr/share/apport/apport-kde.py:406 ../kde/apport-kde.py:406
 msgid "Collecting Problem Information"
 msgstr "正在收集问题信息"
 
-#: ../bin/apport-cli.py:254 ../kde/apport-kde.py:407
-#: ../debian/tmp/usr/share/apport/apport-kde.py:407
-#: ../debian/tmp/usr/bin/apport-cli.py:254
-msgid "Collecting problem information"
-msgstr "正在收集问题信息"
-
-#: ../kde/apport-kde.py:408 ../debian/tmp/usr/share/apport/apport-kde.py:408
+#: ../debian/tmp/usr/share/apport/apport-kde.py:408 ../kde/apport-kde.py:408
 msgid ""
 "The collected information can be sent to the developers to improve the "
 "application. This might take a few minutes."
 msgstr "收集到的信息可以发送给开发者来改进程序。这可能要花费几分钟的时间。"
 
-#: ../kde/apport-kde.py:434 ../debian/tmp/usr/share/apport/apport-kde.py:434
+#: ../debian/tmp/usr/share/apport/apport-kde.py:434 ../kde/apport-kde.py:434
 msgid "Uploading Problem Information"
 msgstr "上传问题信息"
 
-#: ../debian/tmp/usr/share/apport/kernel_oops.py:29 ../data/kernel_oops.py:29
-msgid "Your system might become unstable now and might need to be restarted."
-msgstr "您的系统现在可能变得不稳定，可能需要重新启动。"
-
-#: ../bin/apport-cli.py:80 ../debian/tmp/usr/bin/apport-cli.py:80
-msgid "Press any key to continue..."
-msgstr "按任意键继续…"
-
-#: ../bin/apport-cli.py:87 ../debian/tmp/usr/bin/apport-cli.py:87
-msgid "What would you like to do? Your options are:"
-msgstr "您想做什么？您的选择是："
+#: ../apport/ui.py:139
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:139
+msgid "This package does not seem to be installed correctly"
+msgstr "该软件包似乎没有被正确安装"
 
-#: ../bin/apport-cli.py:100 ../debian/tmp/usr/bin/apport-cli.py:100
+#: ../apport/ui.py:144
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:144
 #, python-format
-msgid "Please choose (%s):"
-msgstr "请选择(%s)："
+msgid ""
+"This is not an official %s package. Please remove any third party package "
+"and try again."
+msgstr "这不是官方的 %s 软件包。请删除所有第三方软件包，然后重试。"
 
-#: ../bin/apport-cli.py:164 ../debian/tmp/usr/bin/apport-cli.py:164
+#: ../apport/ui.py:163
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:163
 #, python-format
-msgid "(%i bytes)"
-msgstr "(%i 字节)"
-
-#: ../bin/apport-cli.py:195 ../debian/tmp/usr/bin/apport-cli.py:195
 msgid ""
-"After the problem report has been sent, please fill out the form in the\n"
-"automatically opened web browser."
+"You have some obsolete package versions installed. Please upgrade the "
+"following packages and check if the problem still occurs:\n"
+"\n"
+"%s"
 msgstr ""
-"当问题报告被发出之后，请填写\n"
-"自动弹出窗口的表格。"
+"您安装了一些陈旧的软件包。请升级以下软件包后再查看问题是否依然发生:\n"
+"\n"
+"%s"
 
-#: ../bin/apport-cli.py:198 ../debian/tmp/usr/bin/apport-cli.py:198
-#, python-format
-msgid "&Send report (%s)"
-msgstr "发送报告(&S)(%s)"
+#: ../apport/ui.py:300
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:300
+msgid "unknown program"
+msgstr "未知程序"
 
-#: ../bin/apport-cli.py:202 ../debian/tmp/usr/bin/apport-cli.py:202
-msgid "&Examine locally"
-msgstr "本地检查(&E)"
+#: ../apport/ui.py:301
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:301
+#, python-format
+msgid "Sorry, the program \"%s\" closed unexpectedly"
+msgstr "对不起，%s 程序异常退出"
 
-#: ../bin/apport-cli.py:206 ../debian/tmp/usr/bin/apport-cli.py:206
-msgid "&View report"
-msgstr "查看报告(&V)"
+#: ../apport/ui.py:303 ../apport/ui.py:1448
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:303
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1448
+#, python-format
+msgid "Problem in %s"
+msgstr "%s 中的问题"
 
-#: ../bin/apport-cli.py:207 ../debian/tmp/usr/bin/apport-cli.py:207
-msgid "&Keep report file for sending later or copying to somewhere else"
-msgstr "保存报告文件以便稍后发送或者复制到其他地方(&K)"
+#: ../apport/ui.py:304
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:304
+msgid ""
+"Your computer does not have enough free memory to automatically analyze the "
+"problem and send a report to the developers."
+msgstr "您的计算机剩余空间不足，程序无法自动诊断问题并向开发者发送问题报告。"
 
-#: ../bin/apport-cli.py:208 ../debian/tmp/usr/bin/apport-cli.py:208
-msgid "Cancel and &ignore future crashes of this program version"
-msgstr "终止并忽略这个版本软件以后出现的崩溃(&I)"
+#: ../apport/ui.py:359 ../apport/ui.py:367 ../apport/ui.py:510
+#: ../apport/ui.py:513 ../apport/ui.py:718 ../apport/ui.py:1254
+#: ../apport/ui.py:1420 ../apport/ui.py:1424
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:359
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:367
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:510
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:513
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:718
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1254
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1420
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1424
+msgid "Invalid problem report"
+msgstr "无效的问题报告"
 
-#: ../bin/apport-cli.py:210 ../bin/apport-cli.py:287 ../bin/apport-cli.py:319
-#: ../bin/apport-cli.py:340 ../debian/tmp/usr/bin/apport-cli.py:210
-#: ../debian/tmp/usr/bin/apport-cli.py:287
-#: ../debian/tmp/usr/bin/apport-cli.py:319
-#: ../debian/tmp/usr/bin/apport-cli.py:340
-msgid "&Cancel"
-msgstr "取消(&C)"
+#: ../apport/ui.py:360
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:360
+msgid "You are not allowed to access this problem report."
+msgstr "您没有访问这个问题报告的权限。"
 
-#: ../bin/apport-cli.py:238 ../debian/tmp/usr/bin/apport-cli.py:238
-msgid "Problem report file:"
-msgstr "问题报告文件："
+#: ../apport/ui.py:363
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:363
+msgid "Error"
+msgstr "错误"
 
-#: ../bin/apport-cli.py:244 ../bin/apport-cli.py:249
-#: ../debian/tmp/usr/bin/apport-cli.py:244
-#: ../debian/tmp/usr/bin/apport-cli.py:249
-msgid "&Confirm"
-msgstr "确认(&C)"
+#: ../apport/ui.py:364
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:364
+msgid "There is not enough disk space available to process this report."
+msgstr "没有足够的磁盘空间来处理报告。"
 
-#: ../bin/apport-cli.py:248 ../debian/tmp/usr/bin/apport-cli.py:248
-#, python-format
-msgid "Error: %s"
-msgstr "错误：%s"
+#: ../apport/ui.py:458
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:458
+msgid "No package specified"
+msgstr "没有指定软件包"
 
-#: ../bin/apport-cli.py:255 ../debian/tmp/usr/bin/apport-cli.py:255
+#: ../apport/ui.py:459
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:459
 msgid ""
-"The collected information can be sent to the developers to improve the\n"
-"application. This might take a few minutes."
-msgstr ""
-"收集到的信息将会传送到开发人员处以改进软件。\n"
-"这可能会花费几分钟时间，"
+"You need to specify a package or a PID. See --help for more information."
+msgstr "您需要指定一个软件包或者 PID。使用 --help 选项来获取更多信息。"
+
+#: ../apport/ui.py:488
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:488
+msgid "Permission denied"
+msgstr "拒绝访问"
 
-#: ../bin/apport-cli.py:268 ../debian/tmp/usr/bin/apport-cli.py:268
+#: ../apport/ui.py:489
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:489
 msgid ""
-"The collected information is being sent to the bug tracking system.\n"
-"This might take a few minutes."
-msgstr ""
-"收集到的信息正在被发送到错误跟踪系统。\n"
-"这可能要花费几分钟时间。"
+"The specified process does not belong to you. Please run this program as the "
+"process owner or as root."
+msgstr "指定的进程只能以进程的所有者或 root 身份运行。"
 
-#: ../bin/apport-cli.py:318 ../debian/tmp/usr/bin/apport-cli.py:318
-msgid "&Done"
-msgstr "完成(&D)"
+#: ../apport/ui.py:402 ../apport/ui.py:491
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:402
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:491
+msgid "Invalid PID"
+msgstr "无效的 PID"
 
-#: ../bin/apport-cli.py:324 ../debian/tmp/usr/bin/apport-cli.py:324
-msgid "none"
-msgstr "无"
+#: ../apport/ui.py:492
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:492
+msgid "The specified process ID does not belong to a program."
+msgstr "指定的进程 ID 不属于一个程序。"
 
-#: ../bin/apport-cli.py:325 ../debian/tmp/usr/bin/apport-cli.py:325
+#: ../apport/ui.py:511
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:511
 #, python-format
-msgid "Selected: %s. Multiple choices:"
-msgstr "已选择：%s。 多重选择："
-
-#: ../bin/apport-cli.py:341 ../debian/tmp/usr/bin/apport-cli.py:341
-msgid "Choices:"
-msgstr "选择："
+msgid "Symptom script %s did not determine an affected package"
+msgstr "症状脚本 %s 没有划定受影响的包"
 
-#: ../bin/apport-cli.py:355 ../debian/tmp/usr/bin/apport-cli.py:355
-msgid "Path to file (Enter to cancel):"
-msgstr "文件的路径(回车取消)："
+#: ../apport/ui.py:514
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:514
+#, python-format
+msgid "Package %s does not exist"
+msgstr "软件包 %s 不存在"
 
-#: ../bin/apport-cli.py:361 ../debian/tmp/usr/bin/apport-cli.py:361
-msgid "File does not exist."
-msgstr "文件不存在。"
+#: ../apport/ui.py:543 ../apport/ui.py:730 ../apport/ui.py:735
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:543
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:730
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:735
+msgid "Cannot create report"
+msgstr "无法创建报告"
 
-#: ../bin/apport-cli.py:363 ../debian/tmp/usr/bin/apport-cli.py:363
-msgid "This is a directory."
-msgstr "这是一个目录。"
+#: ../apport/ui.py:558 ../apport/ui.py:604 ../apport/ui.py:620
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:558
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:604
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:620
+msgid "Updating problem report"
+msgstr "更新问题报告"
 
-#: ../bin/apport-cli.py:369 ../debian/tmp/usr/bin/apport-cli.py:369
-msgid "To continue, you must visit the following URL:"
-msgstr "要继续，您必须访问下面这个网址："
+#: ../apport/ui.py:559
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:559
+msgid ""
+"You are not the reporter or subscriber of this problem report, or the report "
+"is a duplicate or already closed.\n"
+"\n"
+"Please create a new report using \"apport-bug\"."
+msgstr ""
+"您不是该问题报告的报告者或订阅者，或者该报告被视为重复或已经关闭。\n"
+"请使用 apport-bug 新建一份报告。"
 
-#: ../bin/apport-cli.py:371 ../debian/tmp/usr/bin/apport-cli.py:371
+#: ../apport/ui.py:568
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:568
 msgid ""
-"You can launch a browser now, or copy this URL into a browser on another "
-"computer."
-msgstr "您现在可以启动一个浏览器，或者复制这个网址到另外一个电脑的浏览器。"
+"You are not the reporter of this problem report. It is much easier to mark a "
+"bug as a duplicate of another than to move your comments and attachments to "
+"a new bug.\n"
+"\n"
+"Subsequently, we recommend that you file a new bug report using \"apport-"
+"bug\" and make a comment in this bug about the one you file.\n"
+"\n"
+"Do you really want to proceed?"
+msgstr ""
+"您并不是这个问题报告的报告者。相对而言，标记一个重复的错误远比迁移您的评论和附件到新的错误报告容易得多。\n"
+"因此，我们建议您使用 apport-bug 来提交新的错误报告，并在当前报告中对您新提交的报告进行评论。\n"
+"您确定要继续么？"
 
-#: ../bin/apport-cli.py:373 ../debian/tmp/usr/bin/apport-cli.py:373
-msgid "Launch a browser now"
-msgstr "现在启动一个浏览器"
+#: ../apport/ui.py:605 ../apport/ui.py:621
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:605
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:621
+msgid "No additional information collected."
+msgstr "未收集更多信息。"
 
-#: ../bin/apport-cli.py:388 ../debian/tmp/usr/bin/apport-cli.py:388
-msgid "No pending crash reports. Try --help for more information."
-msgstr "没有已知的崩溃报告，尝试 --help 以获得更多信息。"
+#: ../apport/ui.py:672
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:672
+msgid "What kind of problem do you want to report?"
+msgstr "您想报告什么类型的问题？"
 
-#: ../gtk/apport-gtk.desktop.in.h:1 ../kde/apport-kde.desktop.in.h:1
-#: ../kde/apport-kde-mime.desktop.in.h:1
-msgid "Report a problem..."
-msgstr "提交一份问题报告…"
+#: ../apport/ui.py:689
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:689
+msgid "Unknown symptom"
+msgstr "未知症状"
 
-#: ../gtk/apport-gtk.desktop.in.h:2 ../kde/apport-kde.desktop.in.h:2
-#: ../kde/apport-kde-mime.desktop.in.h:2
-msgid "Report a malfunction to the developers"
-msgstr "向开发者报告一个故障"
+#: ../apport/ui.py:690
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:690
+#, python-format
+msgid "The symptom \"%s\" is not known."
+msgstr "症状 %s 未知。"
 
-#: ../data/apportcheckresume.py:67
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:67
+#: ../apport/ui.py:721
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:721
 msgid ""
-"This occurred during a previous suspend, and prevented the system from "
-"resuming properly."
-msgstr "发生于之前的挂起时，并且使系统午饭正常恢复。"
+"After closing this message please click on an application window to report a "
+"problem about it."
+msgstr "在关闭这个消息只后，请点击要报告问题的程序窗口。"
 
-#: ../data/apportcheckresume.py:69
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:69
-msgid ""
-"This occurred during a previous hibernation, and prevented the system from "
-"resuming properly."
-msgstr "发生于之前的休眠时，并且使系统午饭正常恢复。"
+#: ../apport/ui.py:731 ../apport/ui.py:736
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:731
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:736
+msgid "xprop failed to determine process ID of the window"
+msgstr "xprop 无法确定窗口的进程 ID"
 
-#: ../data/apportcheckresume.py:74
-#: ../debian/tmp/usr/share/apport/apportcheckresume.py:74
-msgid ""
-"The resume processing hung very near the end and will have appeared to have "
-"completed normally."
-msgstr "这个恢复过程已经非常接近尾声，将正常结束。"
+#: ../apport/ui.py:750
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:750
+msgid "%prog <report number>"
+msgstr "%prog <报告号>"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:161 ../gtk/apport-gtk.py:161
-#, python-format
-msgid "Sorry, the application %s has stopped unexpectedly."
-msgstr "对不起，应用程序 %s 意外停止。"
+#: ../apport/ui.py:752
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:752
+msgid "Specify package name."
+msgstr "请指定包的名称。"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:164 ../gtk/apport-gtk.py:164
-#, python-format
-msgid "Sorry, %s has closed unexpectedly."
-msgstr "对不起，%s 已意外关闭。"
+#: ../apport/ui.py:754 ../apport/ui.py:805
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:754
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:805
+msgid "Add an extra tag to the report. Can be specified multiple times."
+msgstr "向报告中添加额外的标记，可多次指定。"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:239 ../gtk/apport-gtk.py:239
-#, python-format
-msgid "The application %s has stopped responding."
-msgstr "应用程序 %s 停止响应。"
+#: ../apport/ui.py:784
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:784
+msgid ""
+"%prog [options] [symptom|pid|package|program path|.apport/.crash file]"
+msgstr "%prog [选项] [症状|PID|软件包|程序目录|.apport/.crash file]"
 
-#: ../debian/tmp/usr/share/apport/apport-gtk.py:243 ../gtk/apport-gtk.py:243
-#, python-format
-msgid "The program \"%s\" has stopped responding."
-msgstr "程序 %s 停止响应。"
+#: ../apport/ui.py:787
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:787
+msgid ""
+"Start in bug filing mode. Requires --package and an optional --pid, or just "
+"a --pid. If neither is given, display a list of known symptoms. (Implied if "
+"a single argument is given.)"
+msgstr ""
+"以填写 bug 模式启动。需要 --package 和可选的 --pid 参数，或单独使用 --pid 参数。如果二者均未给出，将显示一系列症状供选择。"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:1
-msgid "Collect system information"
-msgstr "收集系统信息"
+#: ../apport/ui.py:789
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:789
+msgid "Click a window as a target for filing a problem report."
+msgstr "点击一个窗口作为提交问题报告的目标。"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:2
+#: ../apport/ui.py:791
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:791
+msgid "Start in bug updating mode. Can take an optional --package."
+msgstr "启动错误更新模式。可以使用选项 --package 来指定软件包。"
+
+#: ../apport/ui.py:793
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:793
 msgid ""
-"Authentication is required to collect system information for this problem "
-"report"
-msgstr "为此问题报告收集系统信息需要授权"
+"File a bug report about a symptom. (Implied if symptom name is given as only "
+"argument.)"
+msgstr "针对某个症状报告 bug。"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:3
-msgid "System problem reports"
-msgstr "系统问题报告"
+#: ../apport/ui.py:795
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:795
+msgid ""
+"Specify package name in --file-bug mode. This is optional if a --pid is "
+"specified. (Implied if package name is given as only argument.)"
+msgstr "--file-bug 模式中指定软件包名。如果指定了 --pid，则是可选的。(如果只给定软件包名这一个参数则为必需。)"
 
-#: ../apport/com.ubuntu.apport.policy.in.h:4
+#: ../apport/ui.py:797
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:797
 msgid ""
-"Please enter your password to access problem reports of system programs"
-msgstr "请输入您的密码以查看系统程序问题报告。"
+"Specify a running program in --file-bug mode. If this is specified, the bug "
+"report will contain more information.  (Implied if pid is given as only "
+"argument.)"
+msgstr "在 --file-bug 模式中指定运行的程序。如果指定，该问题报告将包含更多的信息。(默认指定 pid 作为唯一参数。)"
 
-#: ../bin/apport-retrace.py:34 ../debian/tmp/usr/bin/apport-retrace.py:34
-msgid "Do not put the new traces into the report, but write them to stdout."
-msgstr "不把新的痕迹写入到报告，但是把它们写入到标准输出。"
+#: ../apport/ui.py:799
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:799
+msgid "The provided pid is a hanging application."
+msgstr "此进程号的程序是挂起的。"
 
-#: ../bin/apport-retrace.py:36 ../debian/tmp/usr/bin/apport-retrace.py:36
+#: ../apport/ui.py:801
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:801
+#, python-format
 msgid ""
-"Start an interactive gdb session with the report's core dump (-o ignored; "
-"does not rewrite report)"
-msgstr "启动一个交互式的 gdb 进程并载入提交的崩溃信息 (-o 不重新生成报告)"
+"Report the crash from given .apport or .crash file instead of the pending "
+"ones in %s. (Implied if file is given as only argument.)"
+msgstr "从给定的 .apport 或者  .crash 文件，而不是从正在处理的 %s 中汇报崩溃。(如果文件只给定了参数时实现。)"
 
-#: ../bin/apport-retrace.py:38 ../debian/tmp/usr/bin/apport-retrace.py:38
+#: ../apport/ui.py:803
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:803
 msgid ""
-"Write modified report to given file instead of changing the original report"
-msgstr "将更改过的报告写入指定文件而非改变原始报告"
+"In bug filing mode, save the collected information into a file instead of "
+"reporting it. This file can then be reported later on from a different "
+"machine."
+msgstr "在提交报告过程中，将收集到的信息保存到要报告的文件中。该文件可用于稍后在另一台机器上提交。"
 
-#: ../bin/apport-retrace.py:41 ../debian/tmp/usr/bin/apport-retrace.py:41
-msgid "Remove the core dump from the report after stack trace regeneration"
-msgstr "生成栈回溯后将内核转储从报告中删除"
+#: ../apport/ui.py:807
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:807
+msgid "Print the Apport version number."
+msgstr "输出 Apport 版本号"
 
-#: ../bin/apport-retrace.py:43 ../debian/tmp/usr/bin/apport-retrace.py:43
-msgid "Override report's CoreFile"
-msgstr "覆盖报告核心文件"
+#: ../apport/ui.py:958
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:958
+msgid ""
+"This will launch apport-retrace in a terminal window to examine the crash."
+msgstr "这将在终端窗口中启动 apport-retrace，以检查此崩溃。"
 
-#: ../bin/apport-retrace.py:45 ../debian/tmp/usr/bin/apport-retrace.py:45
-msgid "Override report's ExecutablePath"
-msgstr "覆盖报告执行路径"
+#: ../apport/ui.py:959
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:959
+msgid "Run gdb session"
+msgstr "运行 gdb 会话"
 
-#: ../bin/apport-retrace.py:47 ../debian/tmp/usr/bin/apport-retrace.py:47
-msgid "Override report's ProcMaps"
-msgstr "覆盖报告的进程表"
+#: ../apport/ui.py:960
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:960
+msgid "Run gdb session without downloading debug symbols"
+msgstr "不下载调试符号的情况下运行 gdb 会话"
 
-#: ../bin/apport-retrace.py:49 ../debian/tmp/usr/bin/apport-retrace.py:49
-msgid "Rebuild report's Package information"
-msgstr "重建报告的包信息"
+#. TRANSLATORS: %s contains the crash report file name
+#: ../apport/ui.py:962
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:962
+#, python-format
+msgid "Update %s with fully symbolic stack trace"
+msgstr "利用全符号的堆栈跟踪更新 %s"
 
-#: ../bin/apport-retrace.py:51 ../debian/tmp/usr/bin/apport-retrace.py:51
-msgid ""
-"Build a temporary sandbox and download/install the necessary packages and "
-"debug symbols in there; without this option it assumes that the necessary "
-"packages and debug symbols are already installed in the system. The argument "
-"points to the packaging system configuration base directory; if you specify "
-"\"system\", it will use the system configuration files, but will then only "
-"be able to retrace crashes that happened on the currently running release."
+#: ../apport/ui.py:998
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:998
+msgid "Can't remember send report status settings"
 msgstr ""
-"构建临时沙盒，以及下载/安装必要的软件包和调试符号；如果没有该选项，则会假设该系统中已安装了必要的软件包和调试符号。此参数指向该打包系统配置库目录；如果指"
-"定 \"system\"，则其将使用系统配置文件，但之后，其将只能够追溯当前正在运行的版本上发生的崩溃。"
 
-#: ../bin/apport-retrace.py:53 ../debian/tmp/usr/bin/apport-retrace.py:53
+#: ../apport/ui.py:999
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:999
 msgid ""
-"Build another temporary sandbox for installing gdb and its dependencies "
-"using the same release as the report rather than whatever version of gdb you "
-"have installed."
-msgstr "生成另一个临时沙盒，在其中安装报告所述版本的 gdb 和它的依赖项，而不使用您现有版本的 gdb。"
+"Saving crash reporting state failed. Can't set auto or never reporting mode."
+msgstr ""
 
-#: ../bin/apport-retrace.py:55 ../debian/tmp/usr/bin/apport-retrace.py:55
+#: ../apport/ui.py:1058 ../apport/ui.py:1068
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1058
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1068
 msgid ""
-"Report download/install progress when installing packages into sandbox"
-msgstr "在将软件包安装到沙盒中时，报告下载和安装的进度"
-
-#: ../bin/apport-retrace.py:57 ../debian/tmp/usr/bin/apport-retrace.py:57
-msgid "Prepend timestamps to log messages, for batch operation"
-msgstr "为进行批量操作，请预先设置时间戳，以记录消息"
+"This problem report applies to a program which is not installed any more."
+msgstr "这一问题报告适用于不再安装的程序。"
 
-#: ../bin/apport-retrace.py:59 ../debian/tmp/usr/bin/apport-retrace.py:59
+#: ../apport/ui.py:1083
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1083
+#, python-format
 msgid ""
-"Create and use third-party repositories from origins specified in reports"
-msgstr "根据报告中指定的来源创建并使用第三方软件仓库"
+"The problem happened with the program %s which changed since the crash "
+"occurred."
+msgstr "自崩溃发生起已更改的程序 %s 出现问题。"
 
-#: ../bin/apport-retrace.py:61 ../debian/tmp/usr/bin/apport-retrace.py:61
-msgid "Cache directory for packages downloaded in the sandbox"
-msgstr "下载到沙盒中软件包的缓存目录"
+#: ../apport/ui.py:1130 ../apport/ui.py:1211 ../apport/ui.py:1426
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1130
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1211
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1426
+msgid "This problem report is damaged and cannot be processed."
+msgstr "该问题报告已损坏，无法处理。"
 
-#: ../bin/apport-retrace.py:63 ../debian/tmp/usr/bin/apport-retrace.py:63
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1141
+#: ../apport/ui.py:1141
+#, python-format
 msgid ""
-"Directory for unpacked packages. Future runs will assume that any already "
-"downloaded package is also extracted to this sandbox."
-msgstr "用于解压包目录。以后运行将假设任何已下载的包被提取到这个沙盒。"
+"This report is about a snap published by %s. Contact them via %s for help."
+msgstr ""
 
-#: ../bin/apport-retrace.py:65 ../bin/apport-valgrind.py:66
-#: ../debian/tmp/usr/bin/apport-retrace.py:65
-#: ../debian/tmp/usr/bin/apport-valgrind.py:66
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1144
+#: ../apport/ui.py:1144
+#, python-format
 msgid ""
-"Install an extra package into the sandbox (can be specified multiple times)"
-msgstr "将其他软件包安装到沙盒(可多次加以指定)中"
+"This report is about a snap published by %s. No contact address has been "
+"provided; visit the forum at https://forum.snapcraft.io/ for help."
+msgstr ""
 
-#: ../bin/apport-retrace.py:67 ../debian/tmp/usr/bin/apport-retrace.py:67
-msgid ""
-"Path to a file with the crash database authentication information. This is "
-"used when specifying a crash ID to upload the retraced stack traces (only if "
-"neither -g, -o, nor -s are specified)"
-msgstr "包含崩溃数据库访问信息文件之路径。此项将用于为特定崩溃代码上传堆栈的回溯调试信息(除非用户指定 -g, -o 或 -s)"
+#: ../apport/ui.py:1135
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1135
+msgid "This report is about a package that is not installed."
+msgstr ""
+
+#: ../apport/ui.py:1139
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1139
+msgid "An error occurred while attempting to process this problem report:"
+msgstr "尝试处理此问题报告时出现错误："
 
-#: ../bin/apport-retrace.py:69 ../debian/tmp/usr/bin/apport-retrace.py:69
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1159
+#: ../apport/ui.py:1159
+#, python-format
 msgid ""
-"Display retraced stack traces and ask for confirmation before sending them "
-"to the crash database."
-msgstr "显示返回的堆栈信息，并询求确认是否将其发送至崩溃数据库。"
+"You are about to report a bug against the deb package, but you also a have "
+"snap published by %s installed. You can contact them via %s for help. Do you "
+"want to continue with the bug report against the deb?"
+msgstr ""
 
-#: ../bin/apport-retrace.py:71 ../debian/tmp/usr/bin/apport-retrace.py:71
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1161
+#: ../apport/ui.py:1161
+#, python-format
 msgid ""
-"Path to the duplicate sqlite database (default: no duplicate checking)"
-msgstr "SQLite 数据库路径重复(默认：不重复检查)"
+"You are about to report a bug against the deb package, but you also a have "
+"snap published by %s installed. For the snap, no contact address has been "
+"provided; visit the forum at https://forum.snapcraft.io/ for help. Do you "
+"want to continue with the bug report against the deb?"
+msgstr ""
 
-#: ../bin/apport-retrace.py:73 ../debian/tmp/usr/bin/apport-retrace.py:73
-msgid "Do not add StacktraceSource to the report."
-msgstr "不要将 StacktraceSource 附加到报告中。"
+#: ../apport/ui.py:1255
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1255
+msgid "Could not determine the package or source package name."
+msgstr "无法检测包或者源码包的名称。"
 
-#: ../bin/apport-retrace.py:82 ../debian/tmp/usr/bin/apport-retrace.py:82
-msgid "You cannot use -C without -S. Stopping."
-msgstr "您不能在未指定 -S 选项的情况下使用 -C 选项，停止。"
+#: ../apport/ui.py:1273
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1273
+msgid "Unable to start web browser"
+msgstr "无法打开浏览器"
 
-#. translators: don't translate y/n, apport currently only checks for "y"
-#: ../bin/apport-retrace.py:115 ../debian/tmp/usr/bin/apport-retrace.py:115
-msgid "OK to send these as attachments? [y/n]"
-msgstr "确定以附件形式发送这些？[y/n]"
+#: ../apport/ui.py:1274
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1274
+#, python-format
+msgid "Unable to start web browser to open %s."
+msgstr "无法使用浏览器打开网页 %s"
 
-#: ../bin/apport-valgrind.py:37 ../debian/tmp/usr/bin/apport-valgrind.py:37
-msgid "See man page for details."
-msgstr "更多细节请查看 man 手册。"
+#: ../apport/ui.py:1374
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1374
+#, python-format
+msgid "Please enter your account information for the %s bug tracking system"
+msgstr "请为 %s 错误追踪系统输入您的帐户信息"
 
-#: ../bin/apport-valgrind.py:43 ../debian/tmp/usr/bin/apport-valgrind.py:43
-msgid "specify the log file name produced by valgrind"
-msgstr "请指定 valgrind 生成的日志文件名"
+#: ../apport/ui.py:1386
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1386
+msgid "Network problem"
+msgstr "网络问题"
 
-#: ../bin/apport-valgrind.py:46 ../debian/tmp/usr/bin/apport-valgrind.py:46
+#: ../apport/ui.py:1388
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1388
 msgid ""
-"reuse a previously created sandbox dir (SDIR) or, if it does not exist, "
-"create it"
-msgstr "重复使用以前创建的缓存目录 (SDIR) ，或者，如果它不存在，则创建它"
+"Cannot connect to crash database, please check your Internet connection."
+msgstr "无法连接到崩溃数据库，请检查您的 Internet 连接。"
 
-#: ../bin/apport-valgrind.py:50 ../debian/tmp/usr/bin/apport-valgrind.py:50
-msgid ""
-"do  not  create  or reuse a sandbox directory for additional debug symbols "
-"but rely only on installed debug symbols."
-msgstr "不创建或重用额外的调试符号的沙箱目录，仅依靠安装调试符号。"
+#: ../apport/ui.py:1415
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1415
+msgid "Memory exhaustion"
+msgstr "内存耗尽"
 
-#: ../bin/apport-valgrind.py:54 ../debian/tmp/usr/bin/apport-valgrind.py:54
-msgid ""
-"reuse a previously created cache dir (CDIR) or, if it does not exist, create "
-"it"
-msgstr "重复使用以前创建的缓存目录(CDIR)，或者，如果它不存在，则创建它"
+#: ../apport/ui.py:1416
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1416
+msgid "Your system does not have enough memory to process this crash report."
+msgstr "您的系统没有足够的内存来处理此崩溃报告。"
 
-#: ../bin/apport-valgrind.py:58 ../debian/tmp/usr/bin/apport-valgrind.py:58
+#: ../apport/ui.py:1451
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1451
+#, python-format
 msgid ""
-"report download/install progress when installing packages into sandbox"
-msgstr "安装包进入沙盒时报告下载/安装进度"
+"The problem cannot be reported:\n"
+"\n"
+"%s"
+msgstr ""
+"无法报告问题：\n"
+"\n"
+"%s"
 
-#: ../bin/apport-valgrind.py:62 ../debian/tmp/usr/bin/apport-valgrind.py:62
+#: ../apport/ui.py:1507 ../apport/ui.py:1514
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1507
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1514
+msgid "Problem already known"
+msgstr "该问题为已知问题"
+
+#: ../apport/ui.py:1508
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1508
 msgid ""
-"the executable that is run under valgrind's memcheck tool  for memory leak "
-"detection"
-msgstr "该可执行文件运行 Valgrind MemCheck 工具下的内存泄漏检测"
+"This problem was already reported in the bug report displayed in the web "
+"browser. Please check if you can add any further information that might be "
+"helpful for the developers."
+msgstr "关于这个问题，之前已经有如网页所示的报告。您是否有所补充？"
 
-#: ../bin/apport-valgrind.py:97 ../debian/tmp/usr/bin/apport-valgrind.py:97
-#, python-format
-msgid "Error: %s is not an executable. Stopping."
-msgstr "错误：%s 不是可执行文件，停止。"
+#: ../apport/ui.py:1515
+#: ../debian/tmp/usr/lib/python3.8/dist-packages/apport/ui.py:1515
+msgid "This problem was already reported to developers. Thank you!"
+msgstr "已将此问题报告给开发人员。谢谢！"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:186
-#: ../data/general-hooks/ubuntu.py:186
+#: ../data/general-hooks/ubuntu.py:195
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:195
 msgid ""
 "An Ubuntu package has a file conflict with a package that is not a genuine "
 "Ubuntu package."
 msgstr "一个 Ubuntu 软件包和另外一个非真正的 Ubuntu 软件包有文件冲突。"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:194
-#: ../data/general-hooks/ubuntu.py:194
+#: ../data/general-hooks/ubuntu.py:203
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:203
 msgid "You have already encountered this package installation failure."
 msgstr "您遭遇到了该软件包安装失败。"
 
-#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:210
-#: ../data/general-hooks/ubuntu.py:210
+#: ../data/general-hooks/ubuntu.py:219
+#: ../debian/tmp/usr/share/apport/general-hooks/ubuntu.py:219
 msgid ""
 "Your system was initially configured with grub version 2, but you have "
 "removed it from your system in favor of grub 1 without configuring it.  To "
@@ -1248,16 +1087,3 @@
 "系统最初使用 grub2 配置，但是您已经在系统中将其删除，而没有配置grub 1。当一个新内核可用时，为了确保您的引导配置被更新，打开终端并运行：\n"
 "\n"
 "      sudo apt-get install grub-pc\n"
-
-#: ../debian/tmp/usr/bin/apport-unpack.py:22 ../bin/apport-unpack.py:22
-#, python-format
-msgid "Usage: %s <report> <target directory>"
-msgstr "用法：%s <报告> <目标目录>"
-
-#: ../debian/tmp/usr/bin/apport-unpack.py:42 ../bin/apport-unpack.py:42
-msgid "Destination directory exists and is not empty."
-msgstr "目标目录存在且不为空。"
-
-#: ../kde/apport-kde-mimelnk.desktop.in.h:1
-msgid "Apport crash file"
-msgstr "Apport 崩溃文件"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/appstream.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/appstream.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/appstream.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/appstream.po	2020-07-08 13:53:54.000000000 +0000
@@ -20,8 +20,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:11+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:50+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: tools/appstream-cli.c:157
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apt.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apt.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apt.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apt.po	2020-07-08 13:53:58.000000000 +0000
@@ -11,16 +11,16 @@
 msgstr ""
 "Project-Id-Version: apt 1.7.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
-"PO-Revision-Date: 2019-09-06 00:55+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
+"PO-Revision-Date: 2020-05-14 19:42+0000\n"
 "Last-Translator: Mo Zhou <Unknown>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:30+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #. TRANSLATOR: Very short word to be displayed before unchanged files in 'apt-get update'
@@ -212,7 +212,7 @@
 msgid "This APT helper has Super Meep Powers."
 msgstr "本 APT 助手具有超级喵力。"
 
-#: apt-private/private-cmndline.cc:549
+#: apt-private/private-cmndline.cc:554
 msgid ""
 "--force-yes is deprecated, use one of the options starting with --allow "
 "instead."
@@ -221,7 +221,7 @@
 #: apt-private/private-depends.cc:35 apt-private/private-download.cc:251
 #: apt-private/private-show.cc:408 apt-private/private-show.cc:410
 #: apt-private/private-show.cc:465 cmdline/apt-mark.cc:56
-#: cmdline/apt-mark.cc:102 cmdline/apt-mark.cc:298
+#: cmdline/apt-mark.cc:114 cmdline/apt-mark.cc:310
 msgid "No packages found"
 msgstr "没有发现匹配的软件包"
 
@@ -386,7 +386,7 @@
 msgid "Abort."
 msgstr "中止。"
 
-#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:239
+#: apt-private/private-install.cc:303 cmdline/apt-mark.cc:251
 msgid "Do you want to continue?"
 msgstr "您希望继续执行吗？"
 
@@ -492,7 +492,7 @@
 msgstr "%s 已经是最新版 (%s)。\n"
 
 #: apt-private/private-install.cc:1010 cmdline/apt-get.cc:121
-#: cmdline/apt-mark.cc:78
+#: cmdline/apt-mark.cc:94
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s 已设置为手动安装。\n"
@@ -507,11 +507,11 @@
 msgid "Selected version '%s' (%s) for '%s' because of '%s'\n"
 msgstr "由于 %4$s，为 %3$s 选定了版本 %1$s (%2$s)\n"
 
-#: apt-private/private-list.cc:129
+#: apt-private/private-list.cc:130
 msgid "Listing"
 msgstr "正在列表"
 
-#: apt-private/private-list.cc:159
+#: apt-private/private-list.cc:160
 #, c-format
 msgid "There is %i additional version. Please use the '-a' switch to see it"
 msgid_plural ""
@@ -911,26 +911,26 @@
 msgid "Package %s version %s has an unmet dep:\n"
 msgstr "版本为 %2$s 的软件包 %1$s 有未满足的依赖关系：\n"
 
-#: apt-private/private-update.cc:33
+#: apt-private/private-update.cc:34
 msgid "The update command takes no arguments"
 msgstr "update 命令不需要参数"
 
 #. TRANSLATOR: the first two are manpage references, the last the URI from a sources.list
-#: apt-private/private-update.cc:116
+#: apt-private/private-update.cc:117
 #, c-format
 msgid ""
 "Usage of %s should be preferred over embedding login information directly in "
 "the %s entry for '%s'"
 msgstr "您应当优先考虑使用 %s 而非直接把账户信息直接写在 %s 的条目 '%s' 中"
 
-#: apt-private/private-update.cc:134
+#: apt-private/private-update.cc:135
 #, c-format
 msgid "%i package can be upgraded. Run 'apt list --upgradable' to see it.\n"
 msgid_plural ""
 "%i packages can be upgraded. Run 'apt list --upgradable' to see them.\n"
 msgstr[0] "有 %i 个软件包可以升级。请执行 ‘apt list --upgradable’ 来查看它们。\n"
 
-#: apt-private/private-update.cc:138
+#: apt-private/private-update.cc:139
 msgid "All packages are up to date."
 msgstr "所有软件包均为最新。"
 
@@ -1124,12 +1124,12 @@
 msgid "Couldn't find package %s"
 msgstr "找不到软件包 %s"
 
-#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:80
+#: cmdline/apt-get.cc:123 cmdline/apt-mark.cc:96
 #, c-format
 msgid "%s set to automatically installed.\n"
 msgstr "%s 已设置为自动安装。\n"
 
-#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:123
+#: cmdline/apt-get.cc:131 cmdline/apt-mark.cc:135
 msgid ""
 "This command is deprecated. Please use 'apt-mark auto' and 'apt-mark manual' "
 "instead."
@@ -1171,7 +1171,7 @@
 
 #: cmdline/apt-get.cc:404
 msgid "Install new packages (pkg is libc6 not libc6.deb)"
-msgstr "安装新的软件包(注：软件包名称是 libc6 而非 libc6.deb)"
+msgstr "安装新的软件包（注：软件包名称应当类似 libc6 而非 libc6.deb）"
 
 #: cmdline/apt-get.cc:406
 msgid "Remove packages"
@@ -1221,24 +1221,24 @@
 msgid "Download and display the changelog for the given package"
 msgstr "下载指定软件包，并显示其变更日志（changelog）"
 
-#: cmdline/apt-helper.cc:43
+#: cmdline/apt-helper.cc:44
 msgid "Need one URL as argument"
 msgstr "需要一个 URL 作为参数"
 
-#: cmdline/apt-helper.cc:57
+#: cmdline/apt-helper.cc:58
 msgid "Must specify at least one pair url/filename"
 msgstr "必须指定至少一对URL或文件名"
 
-#: cmdline/apt-helper.cc:100 cmdline/apt-helper.cc:104
+#: cmdline/apt-helper.cc:101 cmdline/apt-helper.cc:105
 msgid "Download Failed"
 msgstr "下载失败"
 
-#: cmdline/apt-helper.cc:125 cmdline/apt-helper.cc:128
+#: cmdline/apt-helper.cc:126 cmdline/apt-helper.cc:129
 #, c-format
 msgid "GetSrvRec failed for %s"
 msgstr "GetSrvRec 失败，因为 %s"
 
-#: cmdline/apt-helper.cc:263
+#: cmdline/apt-helper.cc:293
 msgid ""
 "Usage: apt-helper [options] command\n"
 "       apt-helper [options] cat-file file ...\n"
@@ -1253,85 +1253,85 @@
 "apt-helper 汇集了各种各样的功能来供shell脚本调用，比如\n"
 "使用与APT相同的代理设置，或者相同的捕获系统。\n"
 
-#: cmdline/apt-helper.cc:275
+#: cmdline/apt-helper.cc:305
 msgid "download the given uri to the target-path"
 msgstr "将 URI 指定的文件下载到目标路径"
 
-#: cmdline/apt-helper.cc:276
+#: cmdline/apt-helper.cc:306
 msgid "lookup a SRV record (e.g. _http._tcp.ftp.debian.org)"
 msgstr "查询一个 SRV 记录 (如： _http._tcp.ftp.debian.org)"
 
-#: cmdline/apt-helper.cc:277
+#: cmdline/apt-helper.cc:307
 msgid "concatenate files, with automatic decompression"
 msgstr "自动解压并连接文件"
 
-#: cmdline/apt-helper.cc:278
+#: cmdline/apt-helper.cc:308
 msgid "detect proxy using apt.conf"
 msgstr "用 apt.conf 检测代理设置"
 
-#: cmdline/apt-helper.cc:279
+#: cmdline/apt-helper.cc:309
 msgid "wait for system to be online"
 msgstr "等待系统上线"
 
-#: cmdline/apt-helper.cc:280
+#: cmdline/apt-helper.cc:310
 msgid "drop privileges before running given command"
 msgstr "运行给定命令前先降低权限"
 
-#: cmdline/apt-mark.cc:65
+#: cmdline/apt-mark.cc:66
 #, c-format
 msgid "%s can not be marked as it is not installed.\n"
 msgstr "%s 还没有安装，因此无法标记。\n"
 
-#: cmdline/apt-mark.cc:71
+#: cmdline/apt-mark.cc:72
 #, c-format
 msgid "%s was already set to manually installed.\n"
 msgstr "%s 已经被设置为手动安装。\n"
 
-#: cmdline/apt-mark.cc:73
+#: cmdline/apt-mark.cc:74
 #, c-format
 msgid "%s was already set to automatically installed.\n"
 msgstr "%s 已经被设置为自动安装。\n"
 
-#: cmdline/apt-mark.cc:311
+#: cmdline/apt-mark.cc:323
 #, c-format
 msgid "%s was already set on hold.\n"
 msgstr "%s 已经设置为保留。\n"
 
-#: cmdline/apt-mark.cc:313
+#: cmdline/apt-mark.cc:325
 #, c-format
 msgid "%s was already not hold.\n"
 msgstr "%s 已经设置为不保留。\n"
 
-#: cmdline/apt-mark.cc:340
+#: cmdline/apt-mark.cc:352
 msgid "Executing dpkg failed. Are you root?"
 msgstr "执行 dpkg 失败。您是 root 吗？"
 
-#: cmdline/apt-mark.cc:343
+#: cmdline/apt-mark.cc:355
 #, c-format
 msgid "%s set on hold.\n"
 msgstr "%s 设置为保留。\n"
 
-#: cmdline/apt-mark.cc:345
+#: cmdline/apt-mark.cc:357
 #, c-format
 msgid "Canceled hold on %s.\n"
 msgstr "取消保留 %s 的设置。\n"
 
-#: cmdline/apt-mark.cc:347
+#: cmdline/apt-mark.cc:359
 #, c-format
 msgid "Selected %s for purge.\n"
 msgstr "选中 %s 以待彻底卸载。\n"
 
-#: cmdline/apt-mark.cc:349
+#: cmdline/apt-mark.cc:361
 #, c-format
 msgid "Selected %s for removal.\n"
 msgstr "选中 %s 以待卸载。\n"
 
-#: cmdline/apt-mark.cc:351
+#: cmdline/apt-mark.cc:363
 #, c-format
 msgid "Selected %s for installation.\n"
 msgstr "选中 %s 以待安装。\n"
 
-#: cmdline/apt-mark.cc:403
+#: cmdline/apt-mark.cc:415
 msgid ""
 "Usage: apt-mark [options] {auto|manual} pkg1 [pkg2 ...]\n"
 "\n"
@@ -1345,27 +1345,27 @@
 "apt-mark 可以对软件包进行 手动/自动 安装标记，也可以用来处理软件\n"
 "包的 dpkg(1) 选中状态，以及列出或过滤拥有某个标记的软件包。\n"
 
-#: cmdline/apt-mark.cc:415
+#: cmdline/apt-mark.cc:427
 msgid "Mark the given packages as automatically installed"
 msgstr "标记指定软件包为自动安装"
 
-#: cmdline/apt-mark.cc:416
+#: cmdline/apt-mark.cc:428
 msgid "Mark the given packages as manually installed"
 msgstr "标记指定软件包为手动安装"
 
-#: cmdline/apt-mark.cc:418
+#: cmdline/apt-mark.cc:430
 msgid "Mark a package as held back"
 msgstr "标记指定软件包为保留(held back)"
 
-#: cmdline/apt-mark.cc:419
+#: cmdline/apt-mark.cc:431
 msgid "Unset a package set as held back"
 msgstr "取消指定软件包的保留(held back)标记"
 
-#: cmdline/apt-mark.cc:424
+#: cmdline/apt-mark.cc:436
 msgid "Print the list of automatically installed packages"
 msgstr "列出所有自动安装的软件包"
 
-#: cmdline/apt-mark.cc:425
+#: cmdline/apt-mark.cc:437
 msgid "Print the list of manually installed packages"
 msgstr "列出所有手动安装的软件包"
 
@@ -1499,8 +1499,8 @@
 msgid "Connection failed"
 msgstr "连接失败"
 
-#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:615
-#: methods/http.cc:874
+#: methods/basehttp.cc:708 methods/ftp.cc:970 methods/http.cc:619
+#: methods/http.cc:878
 #, c-format
 msgid "File has unexpected size (%llu != %llu). Mirror sync in progress?"
 msgstr "文件尺寸不符(%llu != %llu)。您使用的镜像正在同步中？"
@@ -1516,31 +1516,31 @@
 msgid "Internal error"
 msgstr "内部错误"
 
-#: methods/cdrom.cc:204
+#: methods/cdrom.cc:203
 #, c-format
 msgid "Unable to read the cdrom database %s"
 msgstr "无法读取盘片数据库 %s"
 
-#: methods/cdrom.cc:213
+#: methods/cdrom.cc:212
 msgid ""
 "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update "
 "cannot be used to add new CD-ROMs"
 msgstr "请使用 apt-cdrom，通过它可以让 APT 识别该盘片。apt-get upgdate 不能被用来加入新的盘片。"
 
-#: methods/cdrom.cc:223
+#: methods/cdrom.cc:222
 msgid "Wrong CD-ROM"
 msgstr "错误的 CD-ROM"
 
-#: methods/cdrom.cc:250
+#: methods/cdrom.cc:249
 #, c-format
 msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
 msgstr "无法卸载挂载于 %s 的 CD-ROM，它可能正被使用。"
 
-#: methods/cdrom.cc:255
+#: methods/cdrom.cc:254
 msgid "Disk not found."
 msgstr "找不到盘片。"
 
-#: methods/cdrom.cc:263 methods/file.cc:123 methods/rsh.cc:296
+#: methods/cdrom.cc:262 methods/file.cc:123 methods/rsh.cc:296
 msgid "File not found"
 msgstr "无法找到文件"
 
@@ -1565,7 +1565,7 @@
 msgid "Connected to %s (%s)"
 msgstr "已连接到 %s (%s)"
 
-#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:317
+#: methods/connect.cc:167 methods/connect.cc:576 methods/http.cc:321
 #, c-format
 msgid "Connecting to %s (%s)"
 msgstr "正在连接 %s (%s)"
@@ -1752,7 +1752,7 @@
 msgid "Unable to accept connection"
 msgstr "无法接受连接"
 
-#: methods/ftp.cc:918 methods/http.cc:1015 methods/rsh.cc:334
+#: methods/ftp.cc:918 methods/http.cc:1033 methods/rsh.cc:334
 msgid "Problem hashing file"
 msgstr "把文件加入哈希表时出错"
 
@@ -1827,31 +1827,31 @@
 "available:\n"
 msgstr "由于没有公钥，无法验证下列签名：\n"
 
-#: methods/http.cc:711
+#: methods/http.cc:715
 msgid "Error writing to the file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:728
+#: methods/http.cc:732
 msgid "Error reading from server. Remote end closed connection"
 msgstr "从服务器读取数据时出错，对方关闭了连接"
 
-#: methods/http.cc:732
+#: methods/http.cc:736
 msgid "Error reading from server"
 msgstr "从服务器读取数据出错"
 
-#: methods/http.cc:769
+#: methods/http.cc:773
 msgid "Error writing to file"
 msgstr "写入文件出错"
 
-#: methods/http.cc:836
+#: methods/http.cc:840
 msgid "Select failed"
 msgstr "select 调用出错"
 
-#: methods/http.cc:842
+#: methods/http.cc:846
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: methods/http.cc:866
+#: methods/http.cc:870
 msgid "Error writing to output file"
 msgstr "写输出文件时出错"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apturl.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apturl.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apturl.po	2020-01-23 16:51:57.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apturl.po	2020-07-08 13:53:58.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:45+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:30+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../apturl-gtk:49 ../apturl-kde:52
 msgid "User requested interrupt."
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apt-utils.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apt-utils.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/apt-utils.po	2020-01-23 16:51:57.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/apt-utils.po	2020-07-08 13:53:58.000000000 +0000
@@ -11,15 +11,15 @@
 msgstr ""
 "Project-Id-Version: apt 1.7.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
-"PO-Revision-Date: 2019-09-12 15:57+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
+"PO-Revision-Date: 2020-05-14 19:43+0000\n"
 "Last-Translator: Mo Zhou <Unknown>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: cmdline/apt-dump-solver.cc:37
@@ -110,31 +110,31 @@
 "它默认对二进制包信息排序，但是 -s 选项可以将其切换为\n"
 "对源码包排序。\n"
 
-#: ftparchive/apt-ftparchive.cc:199 ftparchive/apt-ftparchive.cc:376
+#: ftparchive/apt-ftparchive.cc:208 ftparchive/apt-ftparchive.cc:375
 msgid "Package extension list is too long"
 msgstr "软件包的扩展列表太长"
 
-#: ftparchive/apt-ftparchive.cc:201 ftparchive/apt-ftparchive.cc:213
-#: ftparchive/apt-ftparchive.cc:236 ftparchive/apt-ftparchive.cc:290
-#: ftparchive/apt-ftparchive.cc:300 ftparchive/apt-ftparchive.cc:322
+#: ftparchive/apt-ftparchive.cc:210 ftparchive/apt-ftparchive.cc:222
+#: ftparchive/apt-ftparchive.cc:245 ftparchive/apt-ftparchive.cc:294
+#: ftparchive/apt-ftparchive.cc:304 ftparchive/apt-ftparchive.cc:326
 #, c-format
 msgid "Error processing directory %s"
 msgstr "处理目录 %s 时出错"
 
-#: ftparchive/apt-ftparchive.cc:288
+#: ftparchive/apt-ftparchive.cc:292
 msgid "Source extension list is too long"
 msgstr "源扩展列表太长"
 
-#: ftparchive/apt-ftparchive.cc:402
+#: ftparchive/apt-ftparchive.cc:401
 msgid "Error writing header to contents file"
 msgstr "将头写入到目录文件时出错"
 
-#: ftparchive/apt-ftparchive.cc:432
+#: ftparchive/apt-ftparchive.cc:431
 #, c-format
 msgid "Error processing contents %s"
 msgstr "处理目录 %s 时出错"
 
-#: ftparchive/apt-ftparchive.cc:627
+#: ftparchive/apt-ftparchive.cc:621
 msgid ""
 "Usage: apt-ftparchive [options] command\n"
 "Commands: packages binarypath [overridefile [pathprefix]]\n"
@@ -214,11 +214,11 @@
 "  -c=?  读取指定配置文件\n"
 "  -o=?  设置任意指定的配置选项"
 
-#: ftparchive/apt-ftparchive.cc:823
+#: ftparchive/apt-ftparchive.cc:817
 msgid "No selections matched"
 msgstr "没有任何选定项是匹配的"
 
-#: ftparchive/apt-ftparchive.cc:903
+#: ftparchive/apt-ftparchive.cc:897
 #, c-format
 msgid "Some files are missing in the package file group `%s'"
 msgstr "软件包文件组“%s”中缺少一些文件"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/aspell.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/aspell.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/aspell.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/aspell.po	2020-07-08 13:53:56.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:32+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: common/info.cpp:232
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/bash.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/bash.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/bash.po	2020-01-23 16:51:56.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/bash.po	2020-07-08 13:53:56.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:33+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: arrayfunc.c:58
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/bfd.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/bfd.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/bfd.po	2020-01-23 16:51:57.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/bfd.po	2020-07-08 13:53:58.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:54+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:47+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/binutils.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/binutils.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/binutils.po	2020-01-23 16:51:52.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/binutils.po	2020-07-08 13:53:53.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:35+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:33+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
@@ -422,7 +422,7 @@
 msgid "Cannot convert existing thin library %s to normal format"
 msgstr ""
 
-#: ar.c:1033 ar.c:1130 ar.c:1446 objcopy.c:3549
+#: ar.c:1033 ar.c:1130 ar.c:1446 objcopy.c:3551
 #, c-format
 msgid "internal stat error on %s"
 msgstr "在 %s 内部状态错误"
@@ -432,7 +432,7 @@
 msgid "%s is not a valid archive"
 msgstr "%s 不是有效的归档文件"
 
-#: objcopy.c:3511
+#: objcopy.c:3513
 #, c-format
 msgid "illegal pathname found in archive member: %s"
 msgstr ""
@@ -1795,7 +1795,7 @@
 msgid "Encoded size of 0 is too small to read\n"
 msgstr ""
 
-#: dwarf.c:387 dwarf.c:401
+#: dwarf.c:369 dwarf.c:383
 #, c-format
 msgid ""
 "Internal error: %s:%d: LEB value (%s) too large for containing variable\n"
@@ -1831,7 +1831,7 @@
 "序列结束\n"
 "\n"
 
-#: dwarf.c:563
+#: dwarf.c:539
 #, c-format
 msgid "Length (%d) of DW_LNE_set_address op is too long\n"
 msgstr ""
@@ -2022,15 +2022,15 @@
 msgid "(Unknown location op 0x%x)"
 msgstr ""
 
-#: dwarf.c:1721
+#: dwarf.c:1696
 msgid "<following link not possible>"
 msgstr ""
 
-#: dwarf.c:1724
+#: dwarf.c:1699
 msgid "<could not load separate string section>"
 msgstr ""
 
-#: dwarf.c:1732
+#: dwarf.c:1707
 #, c-format
 msgid "DW_FORM_GNU_strp_alt offset too big: %s\n"
 msgstr ""
@@ -2237,12 +2237,12 @@
 msgid "(out of class)"
 msgstr ""
 
-#: dwarf.c:2582
+#: dwarf.c:2538
 #, c-format
 msgid "(label)"
 msgstr ""
 
-#: dwarf.c:2583
+#: dwarf.c:2539
 #, c-format
 msgid "(range)"
 msgstr ""
@@ -2479,24 +2479,24 @@
 msgid "Line length %s extends beyond end of section\n"
 msgstr ""
 
-#: dwarf.c:3443
+#: dwarf.c:3418
 #, c-format
 msgid "Corrupt %s format table entry\n"
 msgstr ""
 
-#: dwarf.c:3452
+#: dwarf.c:3427
 #, c-format
 msgid "Corrupt %s list\n"
 msgstr ""
 
-#: dwarf.c:3458
+#: dwarf.c:3433
 #, c-format
 msgid ""
 "\n"
 " The %s Table is empty.\n"
 msgstr ""
 
-#: dwarf.c:3462
+#: dwarf.c:3437
 #, c-format
 msgid ""
 "\n"
@@ -2538,7 +2538,7 @@
 msgid "\t(Unknown format content type %s)"
 msgstr ""
 
-#: dwarf.c:3531
+#: dwarf.c:3506
 #, c-format
 msgid "Corrupt %s entries list\n"
 msgstr ""
@@ -2623,11 +2623,11 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: dwarf.c:3639
+#: dwarf.c:3614
 msgid "Directory"
 msgstr ""
 
-#: dwarf.c:3641
+#: dwarf.c:3616
 msgid "File name"
 msgstr ""
 
@@ -2826,14 +2826,14 @@
 msgid "CU: %s/%s:\n"
 msgstr ""
 
-#: dwarf.c:4325
+#: dwarf.c:4300
 #, c-format
 msgid ""
 "File name                            Line number    Starting address    "
 "View\n"
 msgstr ""
 
-#: dwarf.c:4900
+#: dwarf.c:4416
 #, c-format
 msgid "UNKNOWN (%u): length %d\n"
 msgstr "未知 (%u): 长度 %d\n"
@@ -3487,7 +3487,7 @@
 msgid "Probably corrupt segment size: %d - using 4 instead\n"
 msgstr ""
 
-#: dwarf.c:7751
+#: dwarf.c:7642
 #, c-format
 msgid "Corrupt augmentation data length: 0x%s\n"
 msgstr ""
@@ -3801,36 +3801,36 @@
 msgid "Section %s is too small to contain a CU/TU header\n"
 msgstr ""
 
-#: dwarf.c:9224
+#: dwarf.c:9085
 #, c-format
 msgid "Section %s is too small for %d slot\n"
 msgid_plural "Section %s is too small for %d slots\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: dwarf.c:9235
+#: dwarf.c:9096
 #, c-format
 msgid "  Version:                 %d\n"
 msgstr ""
 
-#: dwarf.c:9237
+#: dwarf.c:9098
 #, c-format
 msgid "  Number of columns:       %d\n"
 msgstr ""
 
-#: dwarf.c:9238
+#: dwarf.c:9099
 #, c-format
 msgid "  Number of used entries:  %d\n"
 msgstr ""
 
-#: dwarf.c:9239
+#: dwarf.c:9100
 #, c-format
 msgid ""
 "  Number of slots:         %d\n"
 "\n"
 msgstr ""
 
-#: dwarf.c:9244
+#: dwarf.c:9105
 #, c-format
 msgid "Section %s too small for %d hash table entries\n"
 msgstr ""
@@ -3849,7 +3849,7 @@
 msgid "Section %s too small for shndx pool\n"
 msgstr ""
 
-#: dwarf.c:9320
+#: dwarf.c:9181
 #, c-format
 msgid "Overlarge number of columns: %x\n"
 msgstr ""
@@ -3989,7 +3989,7 @@
 "\n"
 msgstr ""
 
-#: dwarf.c:10024
+#: dwarf.c:9869
 #, c-format
 msgid "The %s section contains a link to a dwo file:\n"
 msgstr ""
@@ -5001,7 +5001,7 @@
 "                                   Disable -D behavior (default)\n"
 msgstr ""
 
-#: objcopy.c:559
+#: objcopy.c:551
 #, c-format
 msgid ""
 "  -j --only-section <name>         Only copy section <name> into the output\n"
@@ -5166,7 +5166,7 @@
 "output\n"
 msgstr ""
 
-#: objcopy.c:708
+#: objcopy.c:686
 #, c-format
 msgid ""
 "  -R --remove-section=<name>       Also remove section <name> from the "
@@ -5232,7 +5232,7 @@
 msgid "cannot open '%s': %s"
 msgstr "无法打开 '%s'：%s"
 
-#: objcopy.c:1093 objcopy.c:4971
+#: objcopy.c:1093 objcopy.c:4973
 #, c-format
 msgid "%s: fread failed"
 msgstr "%s：fread 失败"
@@ -5307,390 +5307,390 @@
 msgid "copy from `%s' [unknown] to `%s' [unknown]\n"
 msgstr ""
 
-#: objcopy.c:2178
+#: objcopy.c:2180
 msgid "corrupt GNU build attribute note: wrong note type"
 msgstr ""
 
-#: objcopy.c:2184
+#: objcopy.c:2186
 msgid "corrupt GNU build attribute note: note too big"
 msgstr ""
 
-#: objcopy.c:2190
+#: objcopy.c:2192
 msgid "corrupt GNU build attribute note: name too small"
 msgstr ""
 
-#: objcopy.c:2213
+#: objcopy.c:2215
 msgid "corrupt GNU build attribute note: unsupported version"
 msgstr ""
 
-#: objcopy.c:2262
+#: objcopy.c:2264
 msgid "corrupt GNU build attribute note: bad description size"
 msgstr ""
 
-#: objcopy.c:2293
+#: objcopy.c:2295
 msgid "corrupt GNU build attribute note: name not NUL terminated"
 msgstr ""
 
-#: objcopy.c:2305
+#: objcopy.c:2307
 msgid "corrupt GNU build attribute notes: excess data at end"
 msgstr ""
 
-#: objcopy.c:2312
+#: objcopy.c:2314
 msgid "bad GNU build attribute notes: no known versions detected"
 msgstr ""
 
-#: objcopy.c:2326
+#: objcopy.c:2328
 msgid "bad GNU build attribute notes: multiple different versions"
 msgstr ""
 
-#: objcopy.c:2180
+#: objcopy.c:2167
 msgid "bad GNU build attribute notes: first note not version note"
 msgstr ""
 
 #. PR 17636: Call non-fatal so that we return to our parent who
 #. may need to tidy temporary files.
-#: objcopy.c:2581
+#: objcopy.c:2583
 msgid "Unable to change endianness of input file(s)"
 msgstr ""
 
-#: objcopy.c:2593
+#: objcopy.c:2595
 #, c-format
 msgid "error: the input file '%s' has no sections"
 msgstr ""
 
-#: objcopy.c:2603
+#: objcopy.c:2605
 #, c-format
 msgid ""
 "--compress-debug-sections=[zlib|zlib-gnu|zlib-gabi] is unsupported on `%s'"
 msgstr ""
 
-#: objcopy.c:2610
+#: objcopy.c:2612
 #, c-format
 msgid "--elf-stt-common=[yes|no] is unsupported on `%s'"
 msgstr ""
 
-#: objcopy.c:2617
+#: objcopy.c:2619
 #, c-format
 msgid "copy from `%s' [%s] to `%s' [%s]\n"
 msgstr ""
 
-#: objcopy.c:2665
+#: objcopy.c:2667
 #, c-format
 msgid "Input file `%s' ignores binary architecture parameter."
 msgstr ""
 
-#: objcopy.c:2681
+#: objcopy.c:2683
 #, c-format
 msgid "Unable to recognise the format of the input file `%s'"
 msgstr ""
 
-#: objcopy.c:2684
+#: objcopy.c:2686
 #, c-format
 msgid "Output file cannot represent architecture `%s'"
 msgstr ""
 
-#: objcopy.c:2747
+#: objcopy.c:2749
 #, c-format
 msgid "warning: file alignment (0x%s) > section alignment (0x%s)"
 msgstr ""
 
-#: objcopy.c:2813
+#: objcopy.c:2815
 #, c-format
 msgid "can't add section '%s'"
 msgstr ""
 
-#: objcopy.c:2827
+#: objcopy.c:2829
 #, c-format
 msgid "can't create section `%s'"
 msgstr ""
 
-#: objcopy.c:2875
+#: objcopy.c:2877
 #, c-format
 msgid "error: %s not found, can't be updated"
 msgstr ""
 
-#: objcopy.c:2908
+#: objcopy.c:2910
 msgid "warning: note section is empty"
 msgstr ""
 
-#: objcopy.c:2917
+#: objcopy.c:2919
 msgid "warning: could not load note section"
 msgstr ""
 
-#: objcopy.c:2933
+#: objcopy.c:2935
 msgid "warning: failed to set merged notes size"
 msgstr ""
 
-#: objcopy.c:2956
+#: objcopy.c:2958
 #, c-format
 msgid "can't dump section '%s' - it does not exist"
 msgstr ""
 
-#: objcopy.c:2964
+#: objcopy.c:2966
 msgid "can't dump section - it has no contents"
 msgstr ""
 
-#: objcopy.c:2972
+#: objcopy.c:2974
 msgid "can't dump section - it is empty"
 msgstr ""
 
-#: objcopy.c:2981
+#: objcopy.c:2983
 msgid "could not open section dump file"
 msgstr ""
 
-#: objcopy.c:2990
+#: objcopy.c:2992
 #, c-format
 msgid "error writing section contents to %s (error: %s)"
 msgstr ""
 
-#: objcopy.c:3000
+#: objcopy.c:3002
 msgid "could not retrieve section contents"
 msgstr ""
 
-#: objcopy.c:3014
+#: objcopy.c:3016
 #, c-format
 msgid "%s: debuglink section already exists"
 msgstr ""
 
-#: objcopy.c:3026
+#: objcopy.c:3028
 #, c-format
 msgid "cannot create debug link section `%s'"
 msgstr ""
 
-#: objcopy.c:3118
+#: objcopy.c:3120
 msgid "Can't fill gap after section"
 msgstr ""
 
-#: objcopy.c:3141
+#: objcopy.c:3143
 msgid "can't add padding"
 msgstr ""
 
-#: objcopy.c:3314
+#: objcopy.c:3316
 msgid "error: failed to copy merged notes into output"
 msgstr ""
 
-#: objcopy.c:3170
+#: objcopy.c:3095
 msgid "could not find any mergeable note sections"
 msgstr ""
 
-#: objcopy.c:3340
+#: objcopy.c:3342
 #, c-format
 msgid "cannot fill debug link section `%s'"
 msgstr ""
 
-#: objcopy.c:3402
+#: objcopy.c:3404
 msgid "error copying private BFD data"
 msgstr ""
 
-#: objcopy.c:3413
+#: objcopy.c:3415
 #, c-format
 msgid "this target does not support %lu alternative machine codes"
 msgstr ""
 
-#: objcopy.c:3417
+#: objcopy.c:3419
 msgid "treating that number as an absolute e_machine value instead"
 msgstr ""
 
-#: objcopy.c:3421
+#: objcopy.c:3423
 msgid "ignoring the alternative value"
 msgstr ""
 
-#: objcopy.c:3474 objcopy.c:3529
+#: objcopy.c:3476 objcopy.c:3531
 #, c-format
 msgid "cannot create tempdir for archive copying (error: %s)"
 msgstr ""
 
-#: objcopy.c:3562
+#: objcopy.c:3564
 msgid "Unable to recognise the format of file"
 msgstr ""
 
-#: objcopy.c:3695
+#: objcopy.c:3697
 #, c-format
 msgid "error: the input file '%s' is empty"
 msgstr ""
 
-#: objcopy.c:3871
+#: objcopy.c:3873
 #, c-format
 msgid "Multiple renames of section %s"
 msgstr "多次改名节 %s"
 
-#: objcopy.c:3917
+#: objcopy.c:3919
 msgid "error in private header data"
 msgstr ""
 
-#: objcopy.c:4001
+#: objcopy.c:4003
 msgid "failed to create output section"
 msgstr "未能创建输出部分"
 
-#: objcopy.c:4016
+#: objcopy.c:4018
 msgid "failed to set size"
 msgstr ""
 
-#: objcopy.c:4035
+#: objcopy.c:4037
 msgid "failed to set vma"
 msgstr ""
 
-#: objcopy.c:4065
+#: objcopy.c:4067
 msgid "failed to set alignment"
 msgstr ""
 
-#: objcopy.c:4097
+#: objcopy.c:4099
 msgid "failed to copy private data"
 msgstr ""
 
-#: objcopy.c:4254
+#: objcopy.c:4256
 msgid "relocation count is negative"
 msgstr ""
 
 #. User must pad the section up in order to do this.
-#: objcopy.c:4351
+#: objcopy.c:4353
 #, c-format
 msgid ""
 "cannot reverse bytes: length of section %s must be evenly divisible by %d"
 msgstr ""
 
-#: objcopy.c:4560
+#: objcopy.c:4562
 msgid "can't create debugging section"
 msgstr ""
 
-#: objcopy.c:4574
+#: objcopy.c:4576
 msgid "can't set debugging section contents"
 msgstr ""
 
-#: objcopy.c:4583
+#: objcopy.c:4585
 #, c-format
 msgid "don't know how to write debugging information for %s"
 msgstr ""
 
-#: objcopy.c:4768
+#: objcopy.c:4770
 msgid "could not create temporary file to hold stripped copy"
 msgstr ""
 
-#: objcopy.c:4840
+#: objcopy.c:4842
 #, c-format
 msgid "%s: bad version in PE subsystem"
 msgstr ""
 
-#: objcopy.c:4870
+#: objcopy.c:4872
 #, c-format
 msgid "unknown PE subsystem: %s"
 msgstr ""
 
-#: objcopy.c:4924 objcopy.c:5194 objcopy.c:5274 objcopy.c:5415 objcopy.c:5447
-#: objcopy.c:5510 objcopy.c:5514 objcopy.c:5534
+#: objcopy.c:4926 objcopy.c:5196 objcopy.c:5276 objcopy.c:5417 objcopy.c:5449
+#: objcopy.c:5512 objcopy.c:5516 objcopy.c:5536
 #, c-format
 msgid "bad format for %s"
 msgstr "%s 格式错误"
 
-#: objcopy.c:4953
+#: objcopy.c:4955
 #, c-format
 msgid "cannot open: %s: %s"
 msgstr "无法打开：%s：%s"
 
-#: objcopy.c:5006
+#: objcopy.c:5008
 msgid "byte number must be non-negative"
 msgstr "字节编号必须是非负数"
 
-#: objcopy.c:5012
+#: objcopy.c:5014
 #, c-format
 msgid "architecture %s unknown"
 msgstr "未知的体系结构 %s"
 
-#: objcopy.c:5020
+#: objcopy.c:5022
 msgid "interleave must be positive"
 msgstr ""
 
-#: objcopy.c:5029
+#: objcopy.c:5031
 msgid "interleave width must be positive"
 msgstr ""
 
-#: objcopy.c:5347
+#: objcopy.c:5349
 #, c-format
 msgid "unrecognized --compress-debug-sections type `%s'"
 msgstr ""
 
-#: objcopy.c:5368
+#: objcopy.c:5370
 #, c-format
 msgid "unrecognized --elf-stt-common= option `%s'"
 msgstr ""
 
-#: objcopy.c:5384
+#: objcopy.c:5386
 #, c-format
 msgid "Warning: truncating gap-fill from 0x%s to 0x%x"
 msgstr "警告：将间隙填充由 0x%s 截短到 0x%x"
 
-#: objcopy.c:5589
+#: objcopy.c:5591
 #, c-format
 msgid "unknown long section names option '%s'"
 msgstr ""
 
-#: objcopy.c:5612
+#: objcopy.c:5614
 msgid "unable to parse alternative machine code"
 msgstr ""
 
-#: objcopy.c:5661
+#: objcopy.c:5663
 msgid "number of bytes to reverse must be positive and even"
 msgstr ""
 
-#: objcopy.c:5664
+#: objcopy.c:5666
 #, c-format
 msgid "Warning: ignoring previous --reverse-bytes value of %d"
 msgstr ""
 
-#: objcopy.c:5679
+#: objcopy.c:5681
 #, c-format
 msgid "%s: invalid reserve value for --heap"
 msgstr ""
 
-#: objcopy.c:5685
+#: objcopy.c:5687
 #, c-format
 msgid "%s: invalid commit value for --heap"
 msgstr ""
 
-#: objcopy.c:5710
+#: objcopy.c:5712
 #, c-format
 msgid "%s: invalid reserve value for --stack"
 msgstr ""
 
-#: objcopy.c:5716
+#: objcopy.c:5718
 #, c-format
 msgid "%s: invalid commit value for --stack"
 msgstr ""
 
-#: objcopy.c:5754
+#: objcopy.c:5756
 msgid "interleave start byte must be set with --byte"
 msgstr ""
 
-#: objcopy.c:5757
+#: objcopy.c:5759
 msgid "byte number must be less than interleave"
 msgstr ""
 
-#: objcopy.c:5760
+#: objcopy.c:5762
 msgid "interleave width must be less than or equal to interleave - byte`"
 msgstr ""
 
-#: objcopy.c:5789
+#: objcopy.c:5791
 #, c-format
 msgid "unknown input EFI target: %s"
 msgstr ""
 
-#: objcopy.c:5820
+#: objcopy.c:5822
 #, c-format
 msgid "unknown output EFI target: %s"
 msgstr ""
 
-#: objcopy.c:5833
+#: objcopy.c:5835
 #, c-format
 msgid "warning: could not locate '%s'.  System error message: %s"
 msgstr ""
 
-#: objcopy.c:5845
+#: objcopy.c:5847
 #, c-format
 msgid ""
 "warning: could not create temporary file whilst copying '%s', (error: %s)"
 msgstr ""
 
-#: objcopy.c:5878 objcopy.c:5892
+#: objcopy.c:5880 objcopy.c:5894
 #, c-format
 msgid "%s %s%c0x%s never used"
 msgstr ""
@@ -5801,7 +5801,7 @@
 "      --prefix-strip=LEVEL       Strip initial directory names for -S\n"
 msgstr ""
 
-#: objdump.c:271
+#: objdump.c:264
 #, c-format
 msgid ""
 "      --dwarf-depth=N        Do not display DIEs at depth N or greater\n"
@@ -7172,12 +7172,12 @@
 msgid "  Data:                              %s\n"
 msgstr "  数据:                              %s\n"
 
-#: readelf.c:4761
+#: readelf.c:4697
 #, c-format
 msgid "  Version:                           %d %s\n"
 msgstr "  版本:                              %d %s\n"
 
-#: readelf.c:4766
+#: readelf.c:4702
 #, c-format
 msgid "<unknown: %lx>"
 msgstr "<未知: %lx>"
@@ -7238,32 +7238,32 @@
 msgid "  Flags:                             0x%lx%s\n"
 msgstr "  标志：             0x%lx%s\n"
 
-#: readelf.c:4790
+#: readelf.c:4726
 #, c-format
 msgid "  Size of this header:               %ld (bytes)\n"
 msgstr "  本头的大小：       %ld (字节)\n"
 
-#: readelf.c:4792
+#: readelf.c:4728
 #, c-format
 msgid "  Size of program headers:           %ld (bytes)\n"
 msgstr "  程序头大小：       %ld (字节)\n"
 
-#: readelf.c:4794
+#: readelf.c:4730
 #, c-format
 msgid "  Number of program headers:         %ld"
 msgstr ""
 
-#: readelf.c:4801
+#: readelf.c:4737
 #, c-format
 msgid "  Size of section headers:           %ld (bytes)\n"
 msgstr "  节头大小：         %ld (字节)\n"
 
-#: readelf.c:4803
+#: readelf.c:4739
 #, c-format
 msgid "  Number of section headers:         %ld"
 msgstr "  节头数量：         %ld"
 
-#: readelf.c:4808
+#: readelf.c:4744
 #, c-format
 msgid "  Section header string table index: %ld"
 msgstr "  字符串表索引节头： %ld"
@@ -7496,7 +7496,7 @@
 msgid "symbols"
 msgstr "符号"
 
-#: readelf.c:5488 readelf.c:5601
+#: readelf.c:5424 readelf.c:5537
 msgid "symbol table section indicies"
 msgstr ""
 
@@ -7799,7 +7799,7 @@
 msgid "section [%5u] in group section [%5u] > maximum section [%5u]\n"
 msgstr ""
 
-#: readelf.c:6846
+#: readelf.c:6782
 msgid ""
 "Further error messages about overlarge group section indicies suppressed\n"
 msgstr ""
@@ -7984,7 +7984,7 @@
 msgid " at offset 0x%lx contains %lu entries:\n"
 msgstr " 位于偏移量 0x%lx 含有 %lu 个条目：\n"
 
-#: readelf.c:8030
+#: readelf.c:7966
 #, c-format
 msgid "Skipping unexpected relocation type %s\n"
 msgstr "跳过意外的重定位类型 %s\n"
@@ -8360,7 +8360,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: readelf.c:10449
+#: readelf.c:10277
 #, c-format
 msgid "  Addr: 0x"
 msgstr "  地址：0x"
@@ -8512,7 +8512,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: readelf.c:10741
+#: readelf.c:10569
 #, c-format
 msgid " Addr: "
 msgstr " 地址： "
@@ -8675,7 +8675,7 @@
 msgid "histogram chain is corrupt\n"
 msgstr ""
 
-#: readelf.c:11743
+#: readelf.c:11552
 #, c-format
 msgid ""
 "\n"
@@ -8746,7 +8746,7 @@
 msgid "Out of memory allocating space for histogram counts\n"
 msgstr ""
 
-#: readelf.c:11980
+#: readelf.c:11789
 #, c-format
 msgid ""
 "\n"
@@ -8895,7 +8895,7 @@
 msgid "section '%s' has unsupported compress type: %d\n"
 msgstr ""
 
-#: readelf.c:13341 readelf.c:13488 readelf.c:13663
+#: readelf.c:13183 readelf.c:13330 readelf.c:13505
 #, c-format
 msgid "compressed section '%s' is corrupted\n"
 msgstr ""
@@ -9736,7 +9736,7 @@
 msgid "NT_PPC_TM_CVMX (ppc checkpointed Altivec registers)"
 msgstr ""
 
-#: readelf.c:16683
+#: readelf.c:16521
 msgid "NT_PPC_TM_VSX (ppc checkpointed VSX registers)"
 msgstr ""
 
@@ -10255,12 +10255,12 @@
 msgid "    Module version : %s\n"
 msgstr ""
 
-#: readelf.c:17946
+#: readelf.c:17363
 #, c-format
 msgid "    Invalid size\n"
 msgstr ""
 
-#: readelf.c:17949
+#: readelf.c:17366
 #, c-format
 msgid "   Language: %s\n"
 msgstr ""
@@ -10302,27 +10302,27 @@
 msgid "   Header flags: 0x%08x\n"
 msgstr ""
 
-#: readelf.c:17981
+#: readelf.c:17398
 #, c-format
 msgid "   Image id    : %s\n"
 msgstr ""
 
-#: readelf.c:17985
+#: readelf.c:17402
 #, c-format
 msgid "    Image name: %s\n"
 msgstr ""
 
-#: readelf.c:17988
+#: readelf.c:17405
 #, c-format
 msgid "    Global symbol table name: %s\n"
 msgstr ""
 
-#: readelf.c:17991
+#: readelf.c:17408
 #, c-format
 msgid "    Image id: %s\n"
 msgstr ""
 
-#: readelf.c:17994
+#: readelf.c:17411
 #, c-format
 msgid "    Linker id: %s\n"
 msgstr ""
@@ -10470,7 +10470,7 @@
 msgid "Corrupt note: alignment %ld, expecting 4 or 8\n"
 msgstr ""
 
-#: readelf.c:18656
+#: readelf.c:18040
 #, c-format
 msgid "  %-20s %10s\tDescription\n"
 msgstr ""
@@ -11223,7 +11223,7 @@
 msgid "const/volatile indicator missing"
 msgstr "遗漏 const/volatile 指示符"
 
-#: stabs.c:3043
+#: stabs.c:2938
 #, c-format
 msgid "No mangling for \"%s\"\n"
 msgstr "\"%s\" 未被修饰\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cinder.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cinder.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cinder.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cinder.po	2020-07-08 13:53:59.000000000 +0000
@@ -26,8 +26,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:10+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:49+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh-CN\n"
 "Generated-By: Babel 2.0\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cpio.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cpio.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cpio.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cpio.po	2020-07-08 13:53:54.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:41+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: gnu/argmatch.c:134
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cpplib.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cpplib.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cpplib.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cpplib.po	2020-07-08 13:54:02.000000000 +0000
@@ -8,14 +8,14 @@
 "Project-Id-Version: cpplib 4.6.0\n"
 "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n"
 "POT-Creation-Date: 2017-05-01 22:24+0000\n"
-"PO-Revision-Date: 2019-12-10 15:59+0000\n"
+"PO-Revision-Date: 2020-03-10 12:56+0000\n"
 "Last-Translator: Meng Jie <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:16+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:54+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "X-Poedit-Country: CHINA\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cryptsetup.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cryptsetup.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cryptsetup.po	2020-01-23 16:51:56.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cryptsetup.po	2020-07-08 13:53:57.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:15+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: lib/libdevmapper.c:331
 msgid "Cannot initialize device-mapper, running as non-root user.\n"
@@ -55,14 +55,14 @@
 msgid "Requested sector_size option is not supported.\n"
 msgstr ""
 
-#: lib/random.c:80
+#: lib/random.c:75
 msgid ""
 "System is out of entropy while generating volume key.\n"
 "Please move mouse or type some text in another window to gather some random "
 "events.\n"
 msgstr ""
 
-#: lib/random.c:84
+#: lib/random.c:79
 #, c-format
 msgid "Generating key (%d%% done).\n"
 msgstr ""
@@ -158,7 +158,7 @@
 msgid "UUID is not supported for this crypt type.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3787
+#: src/cryptsetup.c:3866
 msgid "Unsupported encryption sector size.\n"
 msgstr ""
 
@@ -259,7 +259,7 @@
 msgid "Device %s size is not aligned to requested sector size (%u bytes).\n"
 msgstr ""
 
-#: lib/setup.c:2817
+#: lib/setup.c:2882
 msgid "Do you really want to change UUID of device?"
 msgstr ""
 
@@ -410,7 +410,7 @@
 msgid "Kernel keyring is not supported by the kernel.\n"
 msgstr ""
 
-#: lib/setup.c:5767 lib/luks2/luks2_reencrypt.c:2933
+#: lib/setup.c:5992 lib/luks2/luks2_reencrypt.c:2952
 #, c-format
 msgid "Failed to read passphrase from keyring (error %d)."
 msgstr ""
@@ -557,7 +557,7 @@
 "missing).\n"
 msgstr ""
 
-#: lib/utils_device_locking.c:110
+#: lib/utils_device_locking.c:109
 #, c-format
 msgid "WARNING: Locking directory %s/%s is missing!\n"
 msgstr ""
@@ -660,24 +660,24 @@
 "Data offset or key size differs on device and backup, restore failed.\n"
 msgstr ""
 
-#: lib/luks1/keymanage.c:326
+#: lib/luks1/keymanage.c:325
 #, c-format
 msgid "Device %s %s%s"
 msgstr ""
 
-#: lib/luks1/keymanage.c:327
+#: lib/luks1/keymanage.c:326
 msgid ""
 "does not contain LUKS header. Replacing header can destroy data on that "
 "device."
 msgstr ""
 
-#: lib/luks1/keymanage.c:328
+#: lib/luks1/keymanage.c:327
 msgid ""
 "already contains LUKS header. Replacing header will destroy existing "
 "keyslots."
 msgstr ""
 
-#: lib/luks1/keymanage.c:329 lib/luks2/luks2_json_metadata.c:1225
+#: lib/luks1/keymanage.c:328 lib/luks2/luks2_json_metadata.c:1224
 msgid ""
 "\n"
 "WARNING: real device header has different UUID than backup!"
@@ -866,7 +866,7 @@
 msgid "Kernel doesn't support TCRYPT compatible mapping.\n"
 msgstr ""
 
-#: lib/tcrypt/tcrypt.c:1084
+#: lib/tcrypt/tcrypt.c:1093
 msgid "This function is not supported without TCRYPT header load."
 msgstr ""
 
@@ -1023,31 +1023,31 @@
 "failed.\n"
 msgstr ""
 
-#: lib/luks2/luks2_json_metadata.c:1222
+#: lib/luks2/luks2_json_metadata.c:1221
 #, c-format
 msgid "Device %s %s%s%s%s"
 msgstr ""
 
-#: lib/luks2/luks2_json_metadata.c:1223
+#: lib/luks2/luks2_json_metadata.c:1222
 msgid ""
 "does not contain LUKS2 header. Replacing header can destroy data on that "
 "device."
 msgstr ""
 
-#: lib/luks2/luks2_json_metadata.c:1224
+#: lib/luks2/luks2_json_metadata.c:1223
 msgid ""
 "already contains LUKS2 header. Replacing header will destroy existing "
 "keyslots."
 msgstr ""
 
-#: lib/luks2/luks2_json_metadata.c:1226
+#: lib/luks2/luks2_json_metadata.c:1225
 msgid ""
 "\n"
 "WARNING: unknown LUKS2 requirements detected in real device header!\n"
 "Replacing header with backup may corrupt the data on that device!"
 msgstr ""
 
-#: lib/luks2/luks2_json_metadata.c:1228
+#: lib/luks2/luks2_json_metadata.c:1227
 msgid ""
 "\n"
 "WARNING: Unfinished offline reencryption detected on the device!\n"
@@ -1121,13 +1121,13 @@
 msgid "No known cipher specification pattern detected.\n"
 msgstr ""
 
-#: src/cryptsetup.c:253
+#: src/cryptsetup.c:259
 msgid ""
 "WARNING: The --hash parameter is being ignored in plain mode with keyfile "
 "specified.\n"
 msgstr ""
 
-#: src/cryptsetup.c:261
+#: src/cryptsetup.c:267
 msgid ""
 "WARNING: The --keyfile-size option is being ignored, the read size is the "
 "same as the encryption key size.\n"
@@ -1137,7 +1137,7 @@
 msgid "Option --key-file is required.\n"
 msgstr ""
 
-#: src/cryptsetup.c:428
+#: src/cryptsetup.c:434
 msgid "Enter VeraCrypt PIM: "
 msgstr ""
 
@@ -1157,14 +1157,14 @@
 msgid "No device header detected with this passphrase.\n"
 msgstr ""
 
-#: src/cryptsetup.c:528 src/cryptsetup.c:1940
+#: src/cryptsetup.c:576
 msgid ""
 "Header dump with volume key is sensitive information\n"
 "which allows access to encrypted partition without passphrase.\n"
 "This dump should be always stored encrypted on safe place."
 msgstr ""
 
-#: src/cryptsetup.c:607
+#: src/cryptsetup.c:673
 #, c-format
 msgid "Device %s is still active and scheduled for deferred removal.\n"
 msgstr ""
@@ -1179,7 +1179,7 @@
 msgid "Result of benchmark is not reliable.\n"
 msgstr ""
 
-#: src/cryptsetup.c:885
+#: src/cryptsetup.c:951
 msgid "# Tests are approximate using memory only (no storage IO).\n"
 msgstr ""
 
@@ -1192,7 +1192,7 @@
 msgid "Cipher %s is not available.\n"
 msgstr ""
 
-#: src/cryptsetup.c:952
+#: src/cryptsetup.c:1003
 msgid "N/A"
 msgstr ""
 
@@ -1206,17 +1206,17 @@
 msgid "Cannot read %d bytes from keyfile %s.\n"
 msgstr ""
 
-#: src/cryptsetup.c:1089
+#: src/cryptsetup.c:1141
 msgid "Really try to repair LUKS device header?"
 msgstr ""
 
-#: src/cryptsetup.c:307 src/cryptsetup.c:1038 src/cryptsetup.c:1090
-#: src/cryptsetup.c:1189 src/cryptsetup.c:1262 src/cryptsetup.c:1913
-#: src/cryptsetup.c:2545 src/cryptsetup.c:2668 src/integritysetup.c:232
+#: src/cryptsetup.c:313 src/cryptsetup.c:1090 src/cryptsetup.c:1142
+#: src/cryptsetup.c:1246 src/cryptsetup.c:1319 src/cryptsetup.c:1974
+#: src/cryptsetup.c:2682 src/cryptsetup.c:2805 src/integritysetup.c:233
 msgid "Operation aborted.\n"
 msgstr ""
 
-#: src/cryptsetup.c:1108 src/integritysetup.c:145
+#: src/cryptsetup.c:1160 src/integritysetup.c:146
 msgid ""
 "Wiping device to initialize integrity checksum.\n"
 "You can interrupt this by pressing CTRL+c (rest of not wiped device will "
@@ -1233,7 +1233,7 @@
 msgid "Cannot create header file %s.\n"
 msgstr ""
 
-#: src/cryptsetup.c:1256 src/integritysetup.c:226
+#: src/cryptsetup.c:1313 src/integritysetup.c:227
 #, c-format
 msgid "This will overwrite data on %s irrevocably."
 msgstr "这将不能取消地在 %s 上覆盖数据"
@@ -1279,20 +1279,20 @@
 msgid "Keyslot %d is not active.\n"
 msgstr ""
 
-#: src/cryptsetup.c:1520 src/cryptsetup.c:1581
+#: src/cryptsetup.c:1581 src/cryptsetup.c:1642
 msgid ""
 "This is the last keyslot. Device will become unusable after purging this key."
 msgstr "这是最后的 keyslot. 设备将不可用在清除这个密钥后."
 
-#: src/cryptsetup.c:1521
+#: src/cryptsetup.c:1582
 msgid "Enter any remaining passphrase: "
 msgstr ""
 
-#: src/cryptsetup.c:1522 src/cryptsetup.c:1583
+#: src/cryptsetup.c:1583 src/cryptsetup.c:1644
 msgid "Operation aborted, the keyslot was NOT wiped.\n"
 msgstr ""
 
-#: src/cryptsetup.c:1560
+#: src/cryptsetup.c:1621
 msgid "Enter passphrase to be deleted: "
 msgstr ""
 
@@ -1301,20 +1301,20 @@
 msgid "Key slot %d selected for deletion.\n"
 msgstr ""
 
-#: src/cryptsetup.c:1641 src/cryptsetup.c:1715 src/cryptsetup.c:1749
+#: src/cryptsetup.c:1702 src/cryptsetup.c:1776 src/cryptsetup.c:1810
 msgid "Enter new passphrase for key slot: "
 msgstr ""
 
-#: src/cryptsetup.c:1732 src/cryptsetup_reencrypt.c:1327
+#: src/cryptsetup.c:1793 src/cryptsetup_reencrypt.c:1343
 #, c-format
 msgid "Enter any existing passphrase: "
 msgstr ""
 
-#: src/cryptsetup.c:1800
+#: src/cryptsetup.c:1861
 msgid "Enter passphrase to be changed: "
 msgstr ""
 
-#: src/cryptsetup.c:1816 src/cryptsetup_reencrypt.c:1313
+#: src/cryptsetup.c:1877 src/cryptsetup_reencrypt.c:1329
 msgid "Enter new passphrase: "
 msgstr ""
 
@@ -1335,14 +1335,14 @@
 msgid "Command requires device and mapped name as arguments.\n"
 msgstr ""
 
-#: src/cryptsetup.c:2199
+#: src/cryptsetup.c:2336
 #, c-format
 msgid ""
 "This operation will erase all keyslots on device %s.\n"
 "Device will become unusable after this operation."
 msgstr ""
 
-#: src/cryptsetup.c:2206
+#: src/cryptsetup.c:2343
 msgid "Operation aborted, keyslots were NOT wiped.\n"
 msgstr ""
 
@@ -1355,12 +1355,12 @@
 msgid "Device is already %s type.\n"
 msgstr ""
 
-#: src/cryptsetup.c:2266
+#: src/cryptsetup.c:2403
 #, c-format
 msgid "This operation will convert %s to %s format.\n"
 msgstr ""
 
-#: src/cryptsetup.c:2272
+#: src/cryptsetup.c:2409
 msgid "Operation aborted, device was NOT converted.\n"
 msgstr ""
 
@@ -1406,7 +1406,7 @@
 msgid "Failed to remove token %d.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3209
+#: src/cryptsetup.c:3346
 msgid "<device> [--type <type>] [<name>]"
 msgstr ""
 
@@ -1414,101 +1414,101 @@
 msgid "open device as mapping <name>"
 msgstr ""
 
-#: src/cryptsetup.c:3210 src/cryptsetup.c:3211 src/cryptsetup.c:3212
-#: src/veritysetup.c:359 src/veritysetup.c:360 src/integritysetup.c:471
-#: src/integritysetup.c:472
+#: src/cryptsetup.c:3347 src/cryptsetup.c:3348 src/cryptsetup.c:3349
+#: src/veritysetup.c:395 src/veritysetup.c:396 src/integritysetup.c:481
+#: src/integritysetup.c:482
 msgid "<name>"
 msgstr "<名称>"
 
-#: src/cryptsetup.c:3210 src/veritysetup.c:359 src/integritysetup.c:471
+#: src/cryptsetup.c:3347 src/veritysetup.c:395 src/integritysetup.c:481
 msgid "close device (remove mapping)"
 msgstr ""
 
-#: src/cryptsetup.c:3211
+#: src/cryptsetup.c:3348
 msgid "resize active device"
 msgstr "改变激活分区大小"
 
-#: src/cryptsetup.c:3212
+#: src/cryptsetup.c:3349
 msgid "show device status"
 msgstr "显示设备状态"
 
-#: src/cryptsetup.c:3213
+#: src/cryptsetup.c:3350
 msgid "[--cipher <cipher>]"
 msgstr ""
 
-#: src/cryptsetup.c:3213
+#: src/cryptsetup.c:3350
 msgid "benchmark cipher"
 msgstr ""
 
-#: src/cryptsetup.c:3214 src/cryptsetup.c:3215 src/cryptsetup.c:3216
-#: src/cryptsetup.c:3217 src/cryptsetup.c:3218 src/cryptsetup.c:3225
-#: src/cryptsetup.c:3226 src/cryptsetup.c:3227 src/cryptsetup.c:3228
-#: src/cryptsetup.c:3229 src/cryptsetup.c:3230 src/cryptsetup.c:3231
-#: src/cryptsetup.c:3232
+#: src/cryptsetup.c:3351 src/cryptsetup.c:3352 src/cryptsetup.c:3353
+#: src/cryptsetup.c:3354 src/cryptsetup.c:3355 src/cryptsetup.c:3362
+#: src/cryptsetup.c:3363 src/cryptsetup.c:3364 src/cryptsetup.c:3365
+#: src/cryptsetup.c:3366 src/cryptsetup.c:3367 src/cryptsetup.c:3368
+#: src/cryptsetup.c:3369 src/cryptsetup.c:3370
 msgid "<device>"
 msgstr "<设备>"
 
-#: src/cryptsetup.c:3214
+#: src/cryptsetup.c:3351
 msgid "try to repair on-disk metadata"
 msgstr ""
 
-#: src/cryptsetup.c:3216
+#: src/cryptsetup.c:3353
 msgid "erase all keyslots (remove encryption key)"
 msgstr ""
 
-#: src/cryptsetup.c:3217
+#: src/cryptsetup.c:3354
 msgid "convert LUKS from/to LUKS2 format"
 msgstr ""
 
-#: src/cryptsetup.c:3218
+#: src/cryptsetup.c:3355
 msgid "set permanent configuration options for LUKS2"
 msgstr ""
 
-#: src/cryptsetup.c:3219 src/cryptsetup.c:3220
+#: src/cryptsetup.c:3356 src/cryptsetup.c:3357
 msgid "<device> [<new key file>]"
 msgstr "<设备> [<新密钥文件>]"
 
-#: src/cryptsetup.c:3219
+#: src/cryptsetup.c:3356
 msgid "formats a LUKS device"
 msgstr "格式化成一个LUKS设备"
 
-#: src/cryptsetup.c:3220
+#: src/cryptsetup.c:3357
 msgid "add key to LUKS device"
 msgstr "添加密钥到LUKS设备"
 
-#: src/cryptsetup.c:3221 src/cryptsetup.c:3222 src/cryptsetup.c:3223
+#: src/cryptsetup.c:3358 src/cryptsetup.c:3359 src/cryptsetup.c:3360
 msgid "<device> [<key file>]"
 msgstr ""
 
-#: src/cryptsetup.c:3221
+#: src/cryptsetup.c:3358
 msgid "removes supplied key or key file from LUKS device"
 msgstr ""
 
-#: src/cryptsetup.c:3222
+#: src/cryptsetup.c:3359
 msgid "changes supplied key or key file of LUKS device"
 msgstr ""
 
-#: src/cryptsetup.c:3224
+#: src/cryptsetup.c:3361
 msgid "<device> <key slot>"
 msgstr "<设备> <key slot>"
 
-#: src/cryptsetup.c:3224
+#: src/cryptsetup.c:3361
 msgid "wipes key with number <key slot> from LUKS device"
 msgstr "从LUKS 设备用数字<key slot>清除密钥"
 
-#: src/cryptsetup.c:3225
+#: src/cryptsetup.c:3362
 msgid "print UUID of LUKS device"
 msgstr "显示LUKS设备的UUID"
 
-#: src/cryptsetup.c:3226
+#: src/cryptsetup.c:3363
 msgid "tests <device> for LUKS partition header"
 msgstr "为LUKS分区头检测<设备>"
 
-#: src/cryptsetup.c:3227
+#: src/cryptsetup.c:3364
 msgid "dump LUKS partition information"
 msgstr "复制LUKS分区信息"
 
-#: src/cryptsetup.c:3228
+#: src/cryptsetup.c:3365
 msgid "dump TCRYPT device information"
 msgstr ""
 
@@ -1520,11 +1520,11 @@
 msgid "Resume suspended LUKS device."
 msgstr ""
 
-#: src/cryptsetup.c:3231
+#: src/cryptsetup.c:3369
 msgid "Backup LUKS device header and keyslots"
 msgstr ""
 
-#: src/cryptsetup.c:3232
+#: src/cryptsetup.c:3370
 msgid "Restore LUKS device header and keyslots"
 msgstr ""
 
@@ -1536,7 +1536,7 @@
 msgid "Add or remove keyring token"
 msgstr ""
 
-#: src/cryptsetup.c:3251 src/veritysetup.c:376 src/integritysetup.c:488
+#: src/cryptsetup.c:3389 src/veritysetup.c:412 src/integritysetup.c:498
 msgid ""
 "\n"
 "<action> is one of:\n"
@@ -1552,7 +1552,7 @@
 "\tclose: remove (plainClose), luksClose, loopaesClose, tcryptClose\n"
 msgstr ""
 
-#: src/cryptsetup.c:3261
+#: src/cryptsetup.c:3399
 #, c-format
 msgid ""
 "\n"
@@ -1589,50 +1589,50 @@
 "\tLUKS1: %s, Key: %d bits, LUKS header hashing: %s, RNG: %s\n"
 msgstr ""
 
-#: src/cryptsetup.c:3309 src/veritysetup.c:532 src/integritysetup.c:630
+#: src/cryptsetup.c:3447 src/veritysetup.c:569 src/integritysetup.c:642
 #, c-format
 msgid "%s: requires %s as arguments"
 msgstr "%s: requires %s 作为参数"
 
-#: src/cryptsetup.c:3347 src/veritysetup.c:421 src/integritysetup.c:527
-#: src/cryptsetup_reencrypt.c:1591
+#: src/cryptsetup.c:3480 src/veritysetup.c:457 src/integritysetup.c:536
+#: src/cryptsetup_reencrypt.c:1607
 msgid "Show this help message"
 msgstr "显示该帮助信息"
 
-#: src/cryptsetup.c:3348 src/veritysetup.c:422 src/integritysetup.c:528
-#: src/cryptsetup_reencrypt.c:1592
+#: src/cryptsetup.c:3481 src/veritysetup.c:458 src/integritysetup.c:537
+#: src/cryptsetup_reencrypt.c:1608
 msgid "Display brief usage"
 msgstr "显示简短用法"
 
-#: src/cryptsetup.c:3353 src/veritysetup.c:427 src/integritysetup.c:533
-#: src/cryptsetup_reencrypt.c:1597
+#: src/cryptsetup.c:3486 src/veritysetup.c:463 src/integritysetup.c:542
+#: src/cryptsetup_reencrypt.c:1613
 msgid "Help options:"
 msgstr "帮助选项"
 
-#: src/cryptsetup.c:3349 src/veritysetup.c:423 src/integritysetup.c:529
-#: src/cryptsetup_reencrypt.c:1593
+#: src/cryptsetup.c:3482 src/veritysetup.c:459 src/integritysetup.c:538
+#: src/cryptsetup_reencrypt.c:1609
 msgid "Print package version"
 msgstr "显示包版本"
 
-#: src/cryptsetup.c:3354 src/veritysetup.c:428 src/integritysetup.c:534
-#: src/cryptsetup_reencrypt.c:1598
+#: src/cryptsetup.c:3487 src/veritysetup.c:464 src/integritysetup.c:543
+#: src/cryptsetup_reencrypt.c:1614
 msgid "Shows more detailed error messages"
 msgstr "显示更多的详细错误信息"
 
-#: src/cryptsetup.c:3355 src/veritysetup.c:429 src/integritysetup.c:535
-#: src/cryptsetup_reencrypt.c:1599
+#: src/cryptsetup.c:3488 src/veritysetup.c:465 src/integritysetup.c:544
+#: src/cryptsetup_reencrypt.c:1615
 msgid "Show debug messages"
 msgstr ""
 
-#: src/cryptsetup.c:3357 src/cryptsetup_reencrypt.c:1601
+#: src/cryptsetup.c:3490 src/cryptsetup_reencrypt.c:1617
 msgid "The cipher used to encrypt the disk (see /proc/crypto)"
 msgstr "这个密码用于加密这个磁盘(参看 /proc/crypto)"
 
-#: src/cryptsetup.c:3358 src/cryptsetup_reencrypt.c:1603
+#: src/cryptsetup.c:3491 src/cryptsetup_reencrypt.c:1619
 msgid "The hash used to create the encryption key from the passphrase"
 msgstr "hash用于从密钥中创建加密密钥"
 
-#: src/cryptsetup.c:3359
+#: src/cryptsetup.c:3492
 msgid "Verifies the passphrase by asking for it twice"
 msgstr "通过两次来校验密钥"
 
@@ -1640,7 +1640,7 @@
 msgid "Read the key from a file."
 msgstr ""
 
-#: src/cryptsetup.c:3361
+#: src/cryptsetup.c:3494
 msgid "Read the volume (master) key from file."
 msgstr ""
 
@@ -1648,92 +1648,92 @@
 msgid "Dump volume (master) key instead of keyslots info."
 msgstr ""
 
-#: src/cryptsetup.c:3363 src/cryptsetup_reencrypt.c:1602
+#: src/cryptsetup.c:3496 src/cryptsetup_reencrypt.c:1618
 msgid "The size of the encryption key"
 msgstr "加密密码的长度"
 
-#: src/cryptsetup.c:3363 src/cryptsetup.c:3422 src/integritysetup.c:553
-#: src/integritysetup.c:557 src/integritysetup.c:561
-#: src/cryptsetup_reencrypt.c:1602
+#: src/cryptsetup.c:3496 src/cryptsetup.c:3557 src/integritysetup.c:562
+#: src/integritysetup.c:566 src/integritysetup.c:570
+#: src/cryptsetup_reencrypt.c:1618
 msgid "BITS"
 msgstr "位数"
 
-#: src/cryptsetup.c:3364 src/cryptsetup_reencrypt.c:1618
+#: src/cryptsetup.c:3497 src/cryptsetup_reencrypt.c:1634
 msgid "Limits the read from keyfile"
 msgstr ""
 
-#: src/cryptsetup.c:3364 src/cryptsetup.c:3365 src/cryptsetup.c:3366
-#: src/cryptsetup.c:3367 src/cryptsetup.c:3370 src/cryptsetup.c:3419
-#: src/cryptsetup.c:3420 src/cryptsetup.c:3428 src/cryptsetup.c:3429
-#: src/veritysetup.c:432 src/veritysetup.c:433 src/veritysetup.c:434
-#: src/veritysetup.c:437 src/veritysetup.c:438 src/integritysetup.c:542
-#: src/integritysetup.c:548 src/integritysetup.c:549
-#: src/cryptsetup_reencrypt.c:1617 src/cryptsetup_reencrypt.c:1618
-#: src/cryptsetup_reencrypt.c:1619 src/cryptsetup_reencrypt.c:1620
+#: src/cryptsetup.c:3497 src/cryptsetup.c:3498 src/cryptsetup.c:3499
+#: src/cryptsetup.c:3500 src/cryptsetup.c:3503 src/cryptsetup.c:3554
+#: src/cryptsetup.c:3555 src/cryptsetup.c:3563 src/cryptsetup.c:3564
+#: src/veritysetup.c:468 src/veritysetup.c:469 src/veritysetup.c:470
+#: src/veritysetup.c:473 src/veritysetup.c:474 src/integritysetup.c:551
+#: src/integritysetup.c:557 src/integritysetup.c:558
+#: src/cryptsetup_reencrypt.c:1633 src/cryptsetup_reencrypt.c:1634
+#: src/cryptsetup_reencrypt.c:1635 src/cryptsetup_reencrypt.c:1636
 msgid "bytes"
 msgstr ""
 
-#: src/cryptsetup.c:3365 src/cryptsetup_reencrypt.c:1617
+#: src/cryptsetup.c:3498 src/cryptsetup_reencrypt.c:1633
 msgid "Number of bytes to skip in keyfile"
 msgstr ""
 
-#: src/cryptsetup.c:3366
+#: src/cryptsetup.c:3499
 msgid "Limits the read from newly added keyfile"
 msgstr ""
 
-#: src/cryptsetup.c:3367
+#: src/cryptsetup.c:3500
 msgid "Number of bytes to skip in newly added keyfile"
 msgstr ""
 
-#: src/cryptsetup.c:3368
+#: src/cryptsetup.c:3501
 msgid "Slot number for new key (default is first free)"
 msgstr ""
 
-#: src/cryptsetup.c:3369
+#: src/cryptsetup.c:3502
 msgid "The size of the device"
 msgstr "设备尺寸"
 
-#: src/cryptsetup.c:3369 src/cryptsetup.c:3371 src/cryptsetup.c:3372
-#: src/cryptsetup.c:3378 src/integritysetup.c:543 src/integritysetup.c:550
+#: src/cryptsetup.c:3502 src/cryptsetup.c:3504 src/cryptsetup.c:3505
+#: src/cryptsetup.c:3511 src/integritysetup.c:552 src/integritysetup.c:559
 msgid "SECTORS"
 msgstr "扇区数"
 
-#: src/cryptsetup.c:3371
+#: src/cryptsetup.c:3504
 msgid "The start offset in the backend device"
 msgstr "在后台设备中的开始偏移量"
 
-#: src/cryptsetup.c:3372
+#: src/cryptsetup.c:3505
 msgid "How many sectors of the encrypted data to skip at the beginning"
 msgstr "加密数据在开始跳过多少扇区"
 
-#: src/cryptsetup.c:3373
+#: src/cryptsetup.c:3506
 msgid "Create a readonly mapping"
 msgstr "创建一个只读映射"
 
-#: src/cryptsetup.c:3374 src/integritysetup.c:536
-#: src/cryptsetup_reencrypt.c:1608
+#: src/cryptsetup.c:3507 src/integritysetup.c:545
+#: src/cryptsetup_reencrypt.c:1624
 msgid "Do not ask for confirmation"
 msgstr "不询问确认"
 
-#: src/cryptsetup.c:3375
+#: src/cryptsetup.c:3508
 msgid "Timeout for interactive passphrase prompt (in seconds)"
 msgstr "交互密钥提示的时间限制(秒数)"
 
-#: src/cryptsetup.c:3375 src/cryptsetup.c:3376 src/integritysetup.c:537
-#: src/cryptsetup_reencrypt.c:1609
+#: src/cryptsetup.c:3508 src/cryptsetup.c:3509 src/integritysetup.c:546
+#: src/cryptsetup_reencrypt.c:1625
 msgid "secs"
 msgstr "秒"
 
-#: src/cryptsetup.c:3376 src/integritysetup.c:537
-#: src/cryptsetup_reencrypt.c:1609
+#: src/cryptsetup.c:3509 src/integritysetup.c:546
+#: src/cryptsetup_reencrypt.c:1625
 msgid "Progress line update (in seconds)"
 msgstr ""
 
-#: src/cryptsetup.c:3377 src/cryptsetup_reencrypt.c:1610
+#: src/cryptsetup.c:3510 src/cryptsetup_reencrypt.c:1626
 msgid "How often the input of the passphrase can be retried"
 msgstr "多久能重试再输入密钥"
 
-#: src/cryptsetup.c:3378
+#: src/cryptsetup.c:3511
 msgid "Align payload at <n> sector boundaries - for luksFormat"
 msgstr "为luksFormat排列有效负荷在<n>扇区边界"
 
@@ -1813,11 +1813,11 @@
 msgid "Device removal is deferred until the last user closes it."
 msgstr ""
 
-#: src/cryptsetup.c:3399
+#: src/cryptsetup.c:3532
 msgid "PBKDF iteration time for LUKS (in ms)"
 msgstr ""
 
-#: src/cryptsetup.c:3399 src/cryptsetup_reencrypt.c:1607
+#: src/cryptsetup.c:3532 src/cryptsetup_reencrypt.c:1623
 msgid "msecs"
 msgstr "毫秒"
 
@@ -1825,11 +1825,11 @@
 msgid "PBKDF algorithm (for LUKS2) (argon2i/argon2id/pbkdf2)."
 msgstr ""
 
-#: src/cryptsetup.c:3401 src/cryptsetup_reencrypt.c:1626
+#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642
 msgid "PBKDF memory cost limit"
 msgstr ""
 
-#: src/cryptsetup.c:3401 src/cryptsetup_reencrypt.c:1626
+#: src/cryptsetup.c:3534 src/cryptsetup_reencrypt.c:1642
 msgid "kilobytes"
 msgstr ""
 
@@ -1837,11 +1837,11 @@
 msgid "PBKDF parallel cost "
 msgstr ""
 
-#: src/cryptsetup.c:3402 src/cryptsetup_reencrypt.c:1627
+#: src/cryptsetup.c:3535 src/cryptsetup_reencrypt.c:1643
 msgid "threads"
 msgstr ""
 
-#: src/cryptsetup.c:3403 src/cryptsetup_reencrypt.c:1628
+#: src/cryptsetup.c:3536 src/cryptsetup_reencrypt.c:1644
 msgid "PBKDF iterations cost (forced, disables benchmark)"
 msgstr ""
 
@@ -1849,15 +1849,15 @@
 msgid "Keyslot priority (ignore/normal/prefer)"
 msgstr ""
 
-#: src/cryptsetup.c:3405
+#: src/cryptsetup.c:3538
 msgid "Disable locking of on-disk metadata"
 msgstr ""
 
-#: src/cryptsetup.c:3406
+#: src/cryptsetup.c:3539
 msgid "Disable loading volume keys via kernel keyring"
 msgstr ""
 
-#: src/cryptsetup.c:3407
+#: src/cryptsetup.c:3540
 msgid "Data integrity algorithm (LUKS2 only)"
 msgstr ""
 
@@ -1865,23 +1865,23 @@
 msgid "Disable journal for integrity device."
 msgstr ""
 
-#: src/cryptsetup.c:3409 src/integritysetup.c:538
+#: src/cryptsetup.c:3542 src/integritysetup.c:547
 msgid "Do not wipe device after format"
 msgstr ""
 
-#: src/cryptsetup.c:3410
+#: src/cryptsetup.c:3544
 msgid "Do not ask for passphrase if activation by token fails"
 msgstr ""
 
-#: src/cryptsetup.c:3411
+#: src/cryptsetup.c:3545
 msgid "Token number (default: any)"
 msgstr ""
 
-#: src/cryptsetup.c:3412
+#: src/cryptsetup.c:3546
 msgid "Key description"
 msgstr ""
 
-#: src/cryptsetup.c:3413
+#: src/cryptsetup.c:3547
 msgid "Encryption sector size (default: 512 bytes)"
 msgstr ""
 
@@ -1897,35 +1897,35 @@
 msgid "Set subsystem label for the LUKS2 device."
 msgstr ""
 
-#: src/cryptsetup.c:3448 src/veritysetup.c:462 src/integritysetup.c:583
+#: src/cryptsetup.c:3583 src/veritysetup.c:499 src/integritysetup.c:595
 msgid "[OPTION...] <action> <action-specific>"
 msgstr ""
 
-#: src/cryptsetup.c:3499 src/veritysetup.c:496 src/integritysetup.c:594
+#: src/cryptsetup.c:3634 src/veritysetup.c:533 src/integritysetup.c:606
 msgid "Argument <action> missing."
 msgstr "缺少<action>参数."
 
-#: src/cryptsetup.c:3562 src/veritysetup.c:527 src/integritysetup.c:625
+#: src/cryptsetup.c:3703 src/veritysetup.c:564 src/integritysetup.c:637
 msgid "Unknown action."
 msgstr "未知参数"
 
-#: src/cryptsetup.c:3582
+#: src/cryptsetup.c:3661
 msgid "Option --deferred is allowed only for close command.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3587
+#: src/cryptsetup.c:3666
 msgid "Option --shared is allowed only for open of plain device.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3592
+#: src/cryptsetup.c:3671
 msgid "Option --allow-discards is allowed only for open operation.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3597
+#: src/cryptsetup.c:3676
 msgid "Option --persistent is allowed only for open operation.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3607
+#: src/cryptsetup.c:3686
 msgid "Option --persistent is not allowed with --test-passphrase.\n"
 msgstr ""
 
@@ -1935,17 +1935,17 @@
 "To limit read from keyfile use --keyfile-size=(bytes)."
 msgstr ""
 
-#: src/cryptsetup.c:3623
+#: src/cryptsetup.c:3702
 msgid "Option --integrity is allowed only for luksFormat (LUKS2).\n"
 msgstr ""
 
-#: src/cryptsetup.c:3628
+#: src/cryptsetup.c:3707
 msgid ""
 "Option --integrity-no-wipe can be used only for format action with integrity "
 "extension.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3634
+#: src/cryptsetup.c:3713
 msgid ""
 "Options --label and --subsystem are allowed only for luksFormat and config "
 "LUKS2 operations.\n"
@@ -1957,12 +1957,12 @@
 "devices.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3645 src/cryptsetup_reencrypt.c:1692
+#: src/cryptsetup.c:3781 src/cryptsetup_reencrypt.c:1708
 msgid "Key size must be a multiple of 8 bits"
 msgstr "密码长度必须是8的倍数"
 
-#: src/cryptsetup.c:3651 src/cryptsetup_reencrypt.c:1378
-#: src/cryptsetup_reencrypt.c:1697
+#: src/cryptsetup.c:3787 src/cryptsetup_reencrypt.c:1394
+#: src/cryptsetup_reencrypt.c:1713
 msgid "Key slot is invalid."
 msgstr ""
 
@@ -1971,33 +1971,33 @@
 "Option --key-file takes precedence over specified key file argument.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3665 src/veritysetup.c:539 src/integritysetup.c:649
-#: src/cryptsetup_reencrypt.c:1671
+#: src/cryptsetup.c:3801 src/veritysetup.c:576 src/integritysetup.c:663
+#: src/cryptsetup_reencrypt.c:1687
 msgid "Negative number for option not permitted."
 msgstr ""
 
-#: src/cryptsetup.c:3669
+#: src/cryptsetup.c:3805
 msgid "Only one --key-file argument is allowed."
 msgstr ""
 
-#: src/cryptsetup.c:3673 src/cryptsetup_reencrypt.c:1663
-#: src/cryptsetup_reencrypt.c:1701
+#: src/cryptsetup.c:3809 src/cryptsetup_reencrypt.c:1679
+#: src/cryptsetup_reencrypt.c:1717
 msgid "Only one of --use-[u]random options is allowed."
 msgstr ""
 
-#: src/cryptsetup.c:3677
+#: src/cryptsetup.c:3813
 msgid "Option --use-[u]random is allowed only for luksFormat."
 msgstr ""
 
-#: src/cryptsetup.c:3681
+#: src/cryptsetup.c:3817
 msgid "Option --uuid is allowed only for luksFormat and luksUUID."
 msgstr ""
 
-#: src/cryptsetup.c:3685
+#: src/cryptsetup.c:3821
 msgid "Option --align-payload is allowed only for luksFormat."
 msgstr ""
 
-#: src/cryptsetup.c:3708
+#: src/cryptsetup.c:3787
 msgid ""
 "Option --skip is supported only for open of plain and loopaes devices.\n"
 msgstr ""
@@ -2007,65 +2007,65 @@
 "Option --offset is supported only for open of plain and loopaes devices.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3721
+#: src/cryptsetup.c:3800
 msgid ""
 "Option --tcrypt-hidden, --tcrypt-system or --tcrypt-backup is supported only "
 "for TCRYPT device.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3726
+#: src/cryptsetup.c:3805
 msgid "Option --tcrypt-hidden cannot be combined with --allow-discards.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3731
+#: src/cryptsetup.c:3810
 msgid "Option --veracrypt is supported only for TCRYPT device type.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3737
+#: src/cryptsetup.c:3816
 msgid "Invalid argument for parameter --veracrypt-pim supplied.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3741
+#: src/cryptsetup.c:3820
 msgid ""
 "Option --veracrypt-pim is supported only for VeraCrypt compatible devices.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3749
+#: src/cryptsetup.c:3828
 msgid ""
 "Option --veracrypt-query-pim is supported only for VeraCrypt compatible "
 "devices.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3753
+#: src/cryptsetup.c:3832
 msgid ""
 "The options --veracrypt-pim and --veracrypt-query-pim are mutually "
 "exclusive.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3760
+#: src/cryptsetup.c:3839
 msgid "Option --priority can be only ignore/normal/prefer.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3765
+#: src/cryptsetup.c:3844
 msgid "Keyslot specification is required.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3770 src/cryptsetup_reencrypt.c:1677
+#: src/cryptsetup.c:3849 src/cryptsetup_reencrypt.c:1686
 msgid ""
 "Password-based key derivation function (PBKDF) can be only pbkdf2 or "
 "argon2i/argon2id.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3775 src/cryptsetup_reencrypt.c:1682
+#: src/cryptsetup.c:3854 src/cryptsetup_reencrypt.c:1691
 msgid ""
 "PBKDF forced iterations cannot be combined with iteration time option.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3781
+#: src/cryptsetup.c:3860
 msgid "Sector size option is not supported for this command.\n"
 msgstr ""
 
-#: src/cryptsetup.c:3813
+#: src/cryptsetup.c:3892
 msgid "Cannot disable metadata locking.\n"
 msgstr ""
 
@@ -2087,27 +2087,27 @@
 msgid "Invalid root hash string specified.\n"
 msgstr ""
 
-#: src/veritysetup.c:356
+#: src/veritysetup.c:392
 msgid "<data_device> <hash_device>"
 msgstr ""
 
-#: src/veritysetup.c:356 src/integritysetup.c:469
+#: src/veritysetup.c:392 src/integritysetup.c:479
 msgid "format device"
 msgstr ""
 
-#: src/veritysetup.c:357
+#: src/veritysetup.c:393
 msgid "<data_device> <hash_device> <root_hash>"
 msgstr ""
 
-#: src/veritysetup.c:357
+#: src/veritysetup.c:393
 msgid "verify device"
 msgstr ""
 
-#: src/veritysetup.c:358
+#: src/veritysetup.c:394
 msgid "<data_device> <name> <hash_device> <root_hash>"
 msgstr ""
 
-#: src/cryptsetup.c:3209 src/veritysetup.c:358 src/integritysetup.c:470
+#: src/cryptsetup.c:3346 src/veritysetup.c:394 src/integritysetup.c:480
 msgid "open device as <name>"
 msgstr ""
 
@@ -2115,19 +2115,19 @@
 msgid "close device (deactivate and remove mapping)"
 msgstr ""
 
-#: src/veritysetup.c:360 src/integritysetup.c:472
+#: src/veritysetup.c:396 src/integritysetup.c:482
 msgid "show active device status"
 msgstr ""
 
-#: src/veritysetup.c:361
+#: src/veritysetup.c:397
 msgid "<hash_device>"
 msgstr ""
 
-#: src/veritysetup.c:361 src/integritysetup.c:473
+#: src/veritysetup.c:397 src/integritysetup.c:483
 msgid "show on-disk information"
 msgstr ""
 
-#: src/veritysetup.c:380
+#: src/veritysetup.c:416
 #, c-format
 msgid ""
 "\n"
@@ -2137,7 +2137,7 @@
 "<root_hash> hash of the root node on <hash_device>\n"
 msgstr ""
 
-#: src/veritysetup.c:387
+#: src/veritysetup.c:423
 #, c-format
 msgid ""
 "\n"
@@ -2146,108 +2146,108 @@
 "Hash format: %u\n"
 msgstr ""
 
-#: src/veritysetup.c:430
+#: src/veritysetup.c:466
 msgid "Do not use verity superblock"
 msgstr ""
 
-#: src/veritysetup.c:431
+#: src/veritysetup.c:467
 msgid "Format type (1 - normal, 0 - original Chrome OS)"
 msgstr ""
 
-#: src/veritysetup.c:431
+#: src/veritysetup.c:467
 msgid "number"
 msgstr ""
 
-#: src/veritysetup.c:432
+#: src/veritysetup.c:468
 msgid "Block size on the data device"
 msgstr ""
 
-#: src/veritysetup.c:433
+#: src/veritysetup.c:469
 msgid "Block size on the hash device"
 msgstr ""
 
-#: src/veritysetup.c:434
+#: src/veritysetup.c:470
 msgid "FEC parity bytes"
 msgstr ""
 
-#: src/veritysetup.c:435
+#: src/veritysetup.c:471
 msgid "The number of blocks in the data file"
 msgstr ""
 
-#: src/veritysetup.c:435
+#: src/veritysetup.c:471
 msgid "blocks"
 msgstr ""
 
-#: src/veritysetup.c:436
+#: src/veritysetup.c:472
 msgid "Path to device with error correction data"
 msgstr ""
 
-#: src/veritysetup.c:436 src/integritysetup.c:540
+#: src/veritysetup.c:472 src/integritysetup.c:549
 msgid "path"
 msgstr ""
 
-#: src/veritysetup.c:437
+#: src/veritysetup.c:473
 msgid "Starting offset on the hash device"
 msgstr ""
 
-#: src/veritysetup.c:438
+#: src/veritysetup.c:474
 msgid "Starting offset on the FEC device"
 msgstr ""
 
-#: src/veritysetup.c:439
+#: src/veritysetup.c:475
 msgid "Hash algorithm"
 msgstr ""
 
-#: src/veritysetup.c:439
+#: src/veritysetup.c:475
 msgid "string"
 msgstr ""
 
-#: src/veritysetup.c:440
+#: src/veritysetup.c:476
 msgid "Salt"
 msgstr ""
 
-#: src/veritysetup.c:440
+#: src/veritysetup.c:476
 msgid "hex string"
 msgstr ""
 
-#: src/veritysetup.c:442
+#: src/veritysetup.c:479
 msgid "Restart kernel if corruption is detected"
 msgstr ""
 
-#: src/veritysetup.c:443
+#: src/veritysetup.c:480
 msgid "Ignore corruption, log it only"
 msgstr ""
 
-#: src/veritysetup.c:444
+#: src/veritysetup.c:481
 msgid "Do not verify zeroed blocks"
 msgstr ""
 
-#: src/veritysetup.c:545
+#: src/veritysetup.c:582
 msgid ""
 "Option --ignore-corruption, --restart-on-corruption or --ignore-zero-blocks "
 "is allowed only for open operation.\n"
 msgstr ""
 
-#: src/veritysetup.c:550
+#: src/veritysetup.c:592
 msgid ""
 "Option --ignore-corruption and --restart-on-corruption cannot be used "
 "together.\n"
 msgstr ""
 
-#: src/integritysetup.c:250
+#: src/integritysetup.c:254
 #, c-format
 msgid "Formatted with tag size %u, internal integrity %s.\n"
 msgstr ""
 
-#: src/integritysetup.c:469 src/integritysetup.c:473
+#: src/integritysetup.c:479 src/integritysetup.c:483
 msgid "<integrity_device>"
 msgstr ""
 
-#: src/integritysetup.c:470
+#: src/integritysetup.c:480
 msgid "<integrity_device> <name>"
 msgstr ""
 
-#: src/integritysetup.c:492
+#: src/integritysetup.c:502
 #, c-format
 msgid ""
 "\n"
@@ -2263,27 +2263,27 @@
 "\tTag size: %u bytes, Checksum algorithm: %s\n"
 msgstr ""
 
-#: src/integritysetup.c:542
+#: src/integritysetup.c:551
 msgid "Journal size"
 msgstr ""
 
-#: src/integritysetup.c:543
+#: src/integritysetup.c:552
 msgid "Interleave sectors"
 msgstr ""
 
-#: src/integritysetup.c:544
+#: src/integritysetup.c:553
 msgid "Journal watermark"
 msgstr ""
 
-#: src/integritysetup.c:544
+#: src/integritysetup.c:553
 msgid "percent"
 msgstr ""
 
-#: src/integritysetup.c:545
+#: src/integritysetup.c:554
 msgid "Journal commit time"
 msgstr ""
 
-#: src/integritysetup.c:545 src/integritysetup.c:547
+#: src/integritysetup.c:554 src/integritysetup.c:556
 msgid "ms"
 msgstr ""
 
@@ -2291,11 +2291,11 @@
 msgid "Tag size per-sector"
 msgstr ""
 
-#: src/integritysetup.c:549
+#: src/integritysetup.c:558
 msgid "Sector size"
 msgstr ""
 
-#: src/integritysetup.c:550
+#: src/integritysetup.c:559
 msgid "Buffers size"
 msgstr ""
 
@@ -2303,7 +2303,7 @@
 msgid "Data integrity algorithm (default "
 msgstr ""
 
-#: src/integritysetup.c:553
+#: src/integritysetup.c:562
 msgid "The size of the data integrity key"
 msgstr ""
 
@@ -2311,11 +2311,11 @@
 msgid "Read the integrity key from a file."
 msgstr ""
 
-#: src/integritysetup.c:556
+#: src/integritysetup.c:565
 msgid "Journal integrity algorithm"
 msgstr ""
 
-#: src/integritysetup.c:557
+#: src/integritysetup.c:566
 msgid "The size of the journal integrity key"
 msgstr ""
 
@@ -2323,11 +2323,11 @@
 msgid "Read the journal integrity key from a file."
 msgstr ""
 
-#: src/integritysetup.c:560
+#: src/integritysetup.c:569
 msgid "Journal encryption algorithm"
 msgstr ""
 
-#: src/integritysetup.c:561
+#: src/integritysetup.c:570
 msgid "The size of the journal encryption key"
 msgstr ""
 
@@ -2339,41 +2339,41 @@
 msgid "Recovery mode (no journal, no tag checking)."
 msgstr ""
 
-#: src/integritysetup.c:655
+#: src/integritysetup.c:656
 msgid ""
 "Options --journal-size, --interleave-sectors, --sector-size, --tag-size and -"
 "-no-wipe can be used only for format action.\n"
 msgstr ""
 
-#: src/integritysetup.c:661
+#: src/integritysetup.c:675
 msgid "Invalid journal size specification."
 msgstr ""
 
-#: src/integritysetup.c:666
+#: src/integritysetup.c:680
 msgid "Both key file and key size options must be specified."
 msgstr ""
 
-#: src/integritysetup.c:669
+#: src/integritysetup.c:683
 msgid "Integrity algorithm must be specified if integrity key is used."
 msgstr ""
 
-#: src/integritysetup.c:674
+#: src/integritysetup.c:688
 msgid ""
 "Both journal integrity key file and key size options must be specified."
 msgstr ""
 
-#: src/integritysetup.c:677
+#: src/integritysetup.c:691
 msgid ""
 "Journal integrity algorithm must be specified if journal integrity key is "
 "used."
 msgstr ""
 
-#: src/integritysetup.c:682
+#: src/integritysetup.c:696
 msgid ""
 "Both journal encryption key file and key size options must be specified."
 msgstr ""
 
-#: src/integritysetup.c:685
+#: src/integritysetup.c:699
 msgid ""
 "Journal encryption algorithm must be specified if journal encryption key is "
 "used."
@@ -2424,7 +2424,7 @@
 msgid "Cannot read reencryption log file.\n"
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:396
+#: src/cryptsetup_reencrypt.c:403
 #, c-format
 msgid "Log file %s exists, resuming reencryption.\n"
 msgstr ""
@@ -2523,7 +2523,7 @@
 "active.\n"
 msgstr ""
 
-#: src/cryptsetup.c:2959
+#: src/cryptsetup.c:3096
 #, c-format
 msgid "Enter passphrase for key slot %u: "
 msgstr ""
@@ -2547,11 +2547,11 @@
 msgid "Changed pbkdf parameters in keyslot %i.\n"
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1600
+#: src/cryptsetup_reencrypt.c:1616
 msgid "Reencryption block size"
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1600
+#: src/cryptsetup_reencrypt.c:1616
 msgid "MiB"
 msgstr ""
 
@@ -2559,7 +2559,7 @@
 msgid "Do not change key, no data area reencryption."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1607
+#: src/cryptsetup_reencrypt.c:1623
 msgid "PBKDF2 iteration time for LUKS (in ms)"
 msgstr "用于LUKS的PBKDF2 重复时间 (毫秒内)"
 
@@ -2579,11 +2579,11 @@
 msgid "Use only this slot (others will be disabled)."
 msgstr ""
 
-#: src/cryptsetup.c:3428 src/cryptsetup_reencrypt.c:1619
+#: src/cryptsetup.c:3563 src/cryptsetup_reencrypt.c:1635
 msgid "Reduce data device size (move data offset). DANGEROUS!"
 msgstr ""
 
-#: src/cryptsetup.c:3370 src/cryptsetup_reencrypt.c:1620
+#: src/cryptsetup.c:3503 src/cryptsetup_reencrypt.c:1636
 msgid "Use only specified device size (ignore rest of device). DANGEROUS!"
 msgstr ""
 
@@ -2603,7 +2603,7 @@
 msgid "Type of LUKS metadata (luks1 or luks2)."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1643
+#: src/cryptsetup_reencrypt.c:1659
 msgid "[OPTION...] <device>"
 msgstr ""
 
@@ -2612,37 +2612,37 @@
 msgid "Reencryption will change: %s%s%s%s%s%s.\n"
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1652
+#: src/cryptsetup_reencrypt.c:1668
 msgid "volume key"
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1654
+#: src/cryptsetup_reencrypt.c:1670
 msgid "set hash to "
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1655
+#: src/cryptsetup_reencrypt.c:1671
 msgid ", set cipher to "
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1659
+#: src/cryptsetup_reencrypt.c:1675
 msgid "Argument required."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1687
+#: src/cryptsetup_reencrypt.c:1703
 msgid ""
 "Only values between 1 MiB and 64 MiB allowed for reencryption block size."
 msgstr ""
 
-#: src/cryptsetup.c:3831 src/cryptsetup_reencrypt.c:1706
-#: src/cryptsetup_reencrypt.c:1711
+#: src/cryptsetup.c:3978 src/cryptsetup_reencrypt.c:1722
+#: src/cryptsetup_reencrypt.c:1727
 msgid "Invalid device size specification."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1714
+#: src/cryptsetup_reencrypt.c:1730
 msgid "Maximum device reduce size is 64 MiB."
 msgstr ""
 
-#: src/cryptsetup.c:3837 src/cryptsetup_reencrypt.c:1717
+#: src/cryptsetup.c:3984 src/cryptsetup_reencrypt.c:1733
 msgid "Reduce size must be multiple of 512 bytes sector."
 msgstr ""
 
@@ -2650,25 +2650,25 @@
 msgid "Option --new must be used together with --reduce-device-size."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1725
+#: src/cryptsetup_reencrypt.c:1741
 msgid ""
 "Option --keep-key can be used only with --hash, --iter-time or --pbkdf-force-"
 "iterations."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1729
+#: src/cryptsetup_reencrypt.c:1745
 msgid "Option --new cannot be used together with --decrypt."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1733
+#: src/cryptsetup_reencrypt.c:1749
 msgid "Option --decrypt is incompatible with specified parameters."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1737
+#: src/cryptsetup_reencrypt.c:1753
 msgid "Option --uuid is allowed only together with --decrypt."
 msgstr ""
 
-#: src/cryptsetup_reencrypt.c:1741
+#: src/cryptsetup_reencrypt.c:1757
 msgid "Invalid luks type. Use one of these: 'luks', 'luks1' or 'luks2'."
 msgstr ""
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cups.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cups.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/cups.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/cups.po	2020-07-08 13:53:54.000000000 +0000
@@ -9,8 +9,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:53+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:37+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: \n"
 
 #: systemv/lpstat.c:1871 systemv/lpstat.c:1990
@@ -954,31 +954,31 @@
 msgid "    Warning: obsolete DSC version %.1f in file."
 msgstr ""
 
-#: test/ippfind.c:2845
+#: test/ippfind.c:2794
 msgid "  ! expression            Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2844
+#: test/ippfind.c:2793
 msgid "  ( expressions )         Group expressions."
 msgstr ""
 
-#: systemv/cupsctl.c:244
+#: systemv/cupsctl.c:203
 msgid "  --[no-]debug-logging    Turn debug logging on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:246
+#: systemv/cupsctl.c:205
 msgid "  --[no-]remote-admin     Turn remote administration on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:248
+#: systemv/cupsctl.c:207
 msgid "  --[no-]remote-any       Allow/prevent access from the Internet."
 msgstr ""
 
-#: systemv/cupsctl.c:250
+#: systemv/cupsctl.c:209
 msgid "  --[no-]share-printers   Turn printer sharing on/off."
 msgstr ""
 
-#: systemv/cupsctl.c:252
+#: systemv/cupsctl.c:211
 msgid "  --[no-]user-cancel-any  Allow/prevent users to cancel any job."
 msgstr ""
 
@@ -990,17 +990,17 @@
 msgid "  --crlf                  End lines with CR + LF (Windows)."
 msgstr ""
 
-#: test/ippfind.c:2826
+#: test/ippfind.c:2775
 msgid "  --domain regex          Match domain to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2827
+#: test/ippfind.c:2776
 msgid ""
 "  --exec utility [argument ...] ;\n"
 "                          Execute program if true."
 msgstr ""
 
-#: test/ippfind.c:2847
+#: test/ippfind.c:2796
 msgid "  --false                 Always false."
 msgstr ""
 
@@ -1008,11 +1008,11 @@
 msgid "  --help                  Show help."
 msgstr ""
 
-#: test/ippfind.c:2809
+#: test/ippfind.c:2758
 msgid "  --help                  Show this help."
 msgstr ""
 
-#: test/ippfind.c:2829
+#: test/ippfind.c:2778
 msgid "  --host regex            Match hostname to regular expression."
 msgstr ""
 
@@ -1024,43 +1024,43 @@
 msgid "  --list-filters          List filters that will be used."
 msgstr ""
 
-#: test/ippfind.c:2831
+#: test/ippfind.c:2780
 msgid "  --local                 True if service is local."
 msgstr ""
 
-#: test/ippfind.c:2830
+#: test/ippfind.c:2779
 msgid "  --ls                    List attributes."
 msgstr ""
 
-#: test/ippfind.c:2832
+#: test/ippfind.c:2781
 msgid "  --name regex            Match service name to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2846
+#: test/ippfind.c:2795
 msgid "  --not expression        Unary NOT of expression."
 msgstr ""
 
-#: test/ippfind.c:2833
+#: test/ippfind.c:2782
 msgid "  --path regex            Match resource path to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2834
+#: test/ippfind.c:2783
 msgid "  --port number[-number]  Match port to number or range."
 msgstr ""
 
-#: test/ippfind.c:2835
+#: test/ippfind.c:2784
 msgid "  --print                 Print URI if true."
 msgstr ""
 
-#: test/ippfind.c:2836
+#: test/ippfind.c:2785
 msgid "  --print-name            Print service name if true."
 msgstr ""
 
-#: test/ippfind.c:2837
+#: test/ippfind.c:2786
 msgid "  --quiet                 Quietly report match via exit code."
 msgstr ""
 
-#: test/ippfind.c:2838
+#: test/ippfind.c:2787
 msgid "  --remote                True if service is remote."
 msgstr ""
 
@@ -1070,23 +1070,23 @@
 "                          Stop tests after a failed INCLUDE."
 msgstr ""
 
-#: test/ippfind.c:2848
+#: test/ippfind.c:2797
 msgid "  --true                  Always true."
 msgstr ""
 
-#: test/ippfind.c:2839
+#: test/ippfind.c:2788
 msgid "  --txt key               True if the TXT record contains the key."
 msgstr ""
 
-#: test/ippfind.c:2840
+#: test/ippfind.c:2789
 msgid "  --txt-* regex           Match TXT record key to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2841
+#: test/ippfind.c:2790
 msgid "  --uri regex             Match URI to regular expression."
 msgstr ""
 
-#: test/ippfind.c:2810
+#: test/ippfind.c:2759
 msgid "  --version               Show program version."
 msgstr ""
 
@@ -1094,11 +1094,11 @@
 msgid "  --version               Show version."
 msgstr ""
 
-#: test/ippfind.c:2803 test/ipptool.c:5068
+#: test/ippfind.c:2752 test/ipptool.c:5068
 msgid "  -4                      Connect using IPv4."
 msgstr ""
 
-#: test/ippfind.c:2804 test/ipptool.c:5069
+#: test/ippfind.c:2753 test/ipptool.c:5069
 msgid "  -6                      Connect using IPv6."
 msgstr ""
 
@@ -1114,7 +1114,7 @@
 msgid "  -D name=value           Set named variable to value."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:239
+#: systemv/cupsaddsmb.c:277 systemv/cupsctl.c:198
 msgid "  -E                      Encrypt the connection."
 msgstr ""
 
@@ -1123,7 +1123,7 @@
 "  -E                      Test with encryption using HTTP Upgrade to TLS."
 msgstr ""
 
-#: scheduler/main.c:2100
+#: scheduler/main.c:2104
 msgid ""
 "  -F                      Run in the foreground but detach from console."
 msgstr ""
@@ -1158,7 +1158,7 @@
 msgid "  -P filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippfind.c:2813
+#: test/ippfind.c:2762
 msgid "  -P number[-number]      Match port to number or range."
 msgstr ""
 
@@ -1170,7 +1170,7 @@
 msgid "  -S                      Test with encryption using HTTPS."
 msgstr ""
 
-#: test/ippfind.c:2805
+#: test/ippfind.c:2754
 msgid "  -T seconds              Set the browse timeout in seconds."
 msgstr ""
 
@@ -1182,7 +1182,7 @@
 msgid "  -U username             Specify username."
 msgstr ""
 
-#: test/ippfind.c:2807 test/ipptool.c:5078
+#: test/ippfind.c:2756 test/ipptool.c:5078
 msgid "  -V version              Set default IPP version."
 msgstr ""
 
@@ -1212,7 +1212,7 @@
 msgid "  -c cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
-#: scheduler/main.c:2098
+#: scheduler/main.c:2102
 msgid "  -c cupsd.conf           Set cupsd.conf file to use."
 msgstr ""
 
@@ -1228,7 +1228,7 @@
 msgid "  -d printer              Use the named printer."
 msgstr ""
 
-#: test/ippfind.c:2814
+#: test/ippfind.c:2763
 msgid "  -d regex                Match domain to regular expression."
 msgstr ""
 
@@ -1236,7 +1236,7 @@
 msgid "  -e                      Use every filter from the PPD file."
 msgstr ""
 
-#: scheduler/main.c:2099
+#: scheduler/main.c:2103
 msgid "  -f                      Run in the foreground."
 msgstr ""
 
@@ -1244,7 +1244,7 @@
 msgid "  -f filename             Set default request filename."
 msgstr ""
 
-#: scheduler/main.c:2101
+#: scheduler/main.c:2105
 msgid "  -h                      Show this usage message."
 msgstr ""
 
@@ -1252,11 +1252,11 @@
 msgid "  -h                      Validate HTTP response headers."
 msgstr ""
 
-#: test/ippfind.c:2815
+#: test/ippfind.c:2764
 msgid "  -h regex                Match hostname to regular expression."
 msgstr ""
 
-#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:241
+#: systemv/cupsaddsmb.c:282 systemv/cupsctl.c:200
 msgid "  -h server[:port]        Specify server address."
 msgstr ""
 
@@ -1275,7 +1275,7 @@
 "file 1)."
 msgstr ""
 
-#: test/ippfind.c:2816
+#: test/ippfind.c:2765
 msgid "  -l                      List attributes."
 msgstr ""
 
@@ -1283,7 +1283,7 @@
 msgid "  -l                      Produce plain text output."
 msgstr ""
 
-#: scheduler/main.c:2103
+#: scheduler/main.c:2107
 msgid "  -l                      Run cupsd on demand."
 msgstr ""
 
@@ -1309,7 +1309,7 @@
 "  -n count                Repeat the last file the given number of times."
 msgstr ""
 
-#: test/ippfind.c:2817
+#: test/ippfind.c:2766
 msgid "  -n regex                Match service name to regular expression."
 msgstr ""
 
@@ -1326,7 +1326,7 @@
 msgid "  -o name=value           Set option(s)."
 msgstr ""
 
-#: test/ippfind.c:2818
+#: test/ippfind.c:2767
 msgid "  -p                      Print URI if true."
 msgstr ""
 
@@ -1334,7 +1334,7 @@
 msgid "  -p filename.ppd         Set PPD file."
 msgstr ""
 
-#: test/ippfind.c:2819
+#: test/ippfind.c:2768
 msgid "  -q                      Quietly report match via exit code."
 msgstr ""
 
@@ -1342,7 +1342,7 @@
 msgid "  -q                      Run silently."
 msgstr ""
 
-#: test/ippfind.c:2820
+#: test/ippfind.c:2769
 msgid "  -r                      True if service is remote."
 msgstr ""
 
@@ -1350,11 +1350,11 @@
 msgid "  -r                      Use 'relaxed' open mode."
 msgstr ""
 
-#: test/ippfind.c:2821
+#: test/ippfind.c:2770
 msgid "  -s                      Print service name if true."
 msgstr ""
 
-#: scheduler/main.c:2105
+#: scheduler/main.c:2109
 msgid "  -s cups-files.conf      Set cups-files.conf file to use."
 msgstr ""
 
@@ -1366,11 +1366,11 @@
 msgid "  -t                      Test PPDs instead of generating them."
 msgstr ""
 
-#: scheduler/main.c:2106
+#: scheduler/main.c:2110
 msgid "  -t                      Test the configuration file."
 msgstr ""
 
-#: test/ippfind.c:2822
+#: test/ippfind.c:2771
 msgid "  -t key                  True if the TXT record contains the key."
 msgstr ""
 
@@ -1382,7 +1382,7 @@
 msgid "  -u                      Remove the PPD file when finished."
 msgstr ""
 
-#: test/ippfind.c:2823
+#: test/ippfind.c:2772
 msgid "  -u regex                Match URI to regular expression."
 msgstr ""
 
@@ -1394,7 +1394,7 @@
 msgid "  -vv                     Be very verbose."
 msgstr ""
 
-#: test/ippfind.c:2824
+#: test/ippfind.c:2773
 msgid ""
 "  -x utility [argument ...] ;\n"
 "                          Execute program if true."
@@ -1404,89 +1404,89 @@
 msgid "  -z                      Compress PPD files using GNU zip."
 msgstr ""
 
-#: test/ippfind.c:2867
+#: test/ippfind.c:2816
 msgid "  IPPFIND_SERVICE_DOMAIN  Domain name"
 msgstr ""
 
-#: test/ippfind.c:2868
+#: test/ippfind.c:2817
 msgid ""
 "  IPPFIND_SERVICE_HOSTNAME\n"
 "                          Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2870
+#: test/ippfind.c:2819
 msgid "  IPPFIND_SERVICE_NAME    Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2871
+#: test/ippfind.c:2820
 msgid "  IPPFIND_SERVICE_PORT    Port number"
 msgstr ""
 
-#: test/ippfind.c:2872
+#: test/ippfind.c:2821
 msgid "  IPPFIND_SERVICE_REGTYPE DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2873
+#: test/ippfind.c:2822
 msgid "  IPPFIND_SERVICE_SCHEME  URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2874
+#: test/ippfind.c:2823
 msgid "  IPPFIND_SERVICE_URI     URI"
 msgstr ""
 
-#: test/ippfind.c:2875
+#: test/ippfind.c:2824
 msgid "  IPPFIND_TXT_*           Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2850
+#: test/ippfind.c:2799
 msgid ""
 "  expression --and expression\n"
 "                          Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2852
+#: test/ippfind.c:2801
 msgid ""
 "  expression --or expression\n"
 "                          Logical OR."
 msgstr ""
 
-#: test/ippfind.c:2849
+#: test/ippfind.c:2798
 msgid "  expression expression   Logical AND."
 msgstr ""
 
-#: test/ippfind.c:2857
+#: test/ippfind.c:2806
 msgid "  {service_domain}        Domain name"
 msgstr ""
 
-#: test/ippfind.c:2858
+#: test/ippfind.c:2807
 msgid "  {service_hostname}      Fully-qualified domain name"
 msgstr ""
 
-#: test/ippfind.c:2859
+#: test/ippfind.c:2808
 msgid "  {service_name}          Service instance name"
 msgstr ""
 
-#: test/ippfind.c:2860
+#: test/ippfind.c:2809
 msgid "  {service_port}          Port number"
 msgstr ""
 
-#: test/ippfind.c:2861
+#: test/ippfind.c:2810
 msgid "  {service_regtype}       DNS-SD registration type"
 msgstr ""
 
-#: test/ippfind.c:2862
+#: test/ippfind.c:2811
 msgid "  {service_scheme}        URI scheme"
 msgstr ""
 
-#: test/ippfind.c:2863
+#: test/ippfind.c:2812
 msgid "  {service_uri}           URI"
 msgstr ""
 
-#: test/ippfind.c:2864
+#: test/ippfind.c:2813
 msgid "  {txt_*}                 Value of TXT record key"
 msgstr ""
 
-#: test/ippfind.c:2856
+#: test/ippfind.c:2805
 msgid "  {}                      URI"
 msgstr ""
 
@@ -1574,7 +1574,7 @@
 "\"%s\": Bad attribute name - invalid character (RFC 8011 section 5.1.4)."
 msgstr ""
 
-#: cups/ipp.c:4777
+#: cups/ipp.c:4876
 #, c-format
 msgid "\"%s\": Bad boolen value %d (RFC 8011 section 5.1.21)."
 msgstr ""
@@ -1823,7 +1823,7 @@
 msgstr ""
 
 #: filter/rastertoepson.c:999 filter/rastertohp.c:668
-#: filter/rastertolabel.c:1120
+#: filter/rastertolabel.c:1121
 #, c-format
 msgid "%s job-id user title copies options [file]"
 msgstr ""
@@ -2209,12 +2209,12 @@
 msgid "%s: Unknown option \"%c\"."
 msgstr ""
 
-#: tools/ippeveprinter.c:381 tools/ippeveprinter.c:566 tools/ippfind.c:627
+#: tools/ippeveprinter.c:414 tools/ippeveprinter.c:604 tools/ippfind.c:627
 #, c-format
 msgid "%s: Unknown option \"%s\"."
 msgstr ""
 
-#: tools/ippeveprinter.c:555 tools/ippfind.c:919 tools/ipptool.c:606
+#: tools/ippeveprinter.c:593 tools/ippfind.c:919 tools/ipptool.c:606
 #, c-format
 msgid "%s: Unknown option \"-%c\"."
 msgstr ""
@@ -2251,159 +2251,159 @@
 msgid "%s: Warning - mode option ignored."
 msgstr ""
 
-#: ppdc/sample.c:305
+#: ppdc/sample.c:308
 msgid "-1"
 msgstr "-1"
 
-#: ppdc/sample.c:296
+#: ppdc/sample.c:299
 msgid "-10"
 msgstr "-10"
 
-#: ppdc/sample.c:388
+#: ppdc/sample.c:391
 msgid "-100"
 msgstr "-100"
 
-#: ppdc/sample.c:387
+#: ppdc/sample.c:390
 msgid "-105"
 msgstr "-105"
 
-#: ppdc/sample.c:295
+#: ppdc/sample.c:298
 msgid "-11"
 msgstr "-11"
 
-#: ppdc/sample.c:386
+#: ppdc/sample.c:389
 msgid "-110"
 msgstr "-110"
 
-#: ppdc/sample.c:385
+#: ppdc/sample.c:388
 msgid "-115"
 msgstr "-115"
 
-#: ppdc/sample.c:294
+#: ppdc/sample.c:297
 msgid "-12"
 msgstr "-12"
 
-#: ppdc/sample.c:384
+#: ppdc/sample.c:387
 msgid "-120"
 msgstr "-120"
 
-#: ppdc/sample.c:293
+#: ppdc/sample.c:296
 msgid "-13"
 msgstr "-13"
 
-#: ppdc/sample.c:292
+#: ppdc/sample.c:295
 msgid "-14"
 msgstr "-14"
 
-#: ppdc/sample.c:291
+#: ppdc/sample.c:294
 msgid "-15"
 msgstr "-15"
 
-#: ppdc/sample.c:304
+#: ppdc/sample.c:307
 msgid "-2"
 msgstr "-2"
 
-#: ppdc/sample.c:404
+#: ppdc/sample.c:407
 msgid "-20"
 msgstr "-20"
 
-#: ppdc/sample.c:403
+#: ppdc/sample.c:406
 msgid "-25"
 msgstr "-25"
 
-#: ppdc/sample.c:303
+#: ppdc/sample.c:306
 msgid "-3"
 msgstr "-3"
 
-#: ppdc/sample.c:402
+#: ppdc/sample.c:405
 msgid "-30"
 msgstr "-30"
 
-#: ppdc/sample.c:401
+#: ppdc/sample.c:404
 msgid "-35"
 msgstr "-35"
 
-#: ppdc/sample.c:302
+#: ppdc/sample.c:305
 msgid "-4"
 msgstr "-4"
 
-#: ppdc/sample.c:400
+#: ppdc/sample.c:403
 msgid "-40"
 msgstr "-40"
 
-#: ppdc/sample.c:399
+#: ppdc/sample.c:402
 msgid "-45"
 msgstr "-45"
 
-#: ppdc/sample.c:301
+#: ppdc/sample.c:304
 msgid "-5"
 msgstr "-5"
 
-#: ppdc/sample.c:398
+#: ppdc/sample.c:401
 msgid "-50"
 msgstr "-50"
 
-#: ppdc/sample.c:397
+#: ppdc/sample.c:400
 msgid "-55"
 msgstr "-55"
 
-#: ppdc/sample.c:300
+#: ppdc/sample.c:303
 msgid "-6"
 msgstr "-6"
 
-#: ppdc/sample.c:396
+#: ppdc/sample.c:399
 msgid "-60"
 msgstr "-60"
 
-#: ppdc/sample.c:395
+#: ppdc/sample.c:398
 msgid "-65"
 msgstr "-65"
 
-#: ppdc/sample.c:299
+#: ppdc/sample.c:302
 msgid "-7"
 msgstr "-7"
 
-#: ppdc/sample.c:394
+#: ppdc/sample.c:397
 msgid "-70"
 msgstr "-70"
 
-#: ppdc/sample.c:393
+#: ppdc/sample.c:396
 msgid "-75"
 msgstr "-75"
 
-#: ppdc/sample.c:298
+#: ppdc/sample.c:301
 msgid "-8"
 msgstr "-8"
 
-#: ppdc/sample.c:392
+#: ppdc/sample.c:395
 msgid "-80"
 msgstr "-80"
 
-#: ppdc/sample.c:391
+#: ppdc/sample.c:394
 msgid "-85"
 msgstr "-85"
 
-#: ppdc/sample.c:297
+#: ppdc/sample.c:300
 msgid "-9"
 msgstr "-9"
 
-#: ppdc/sample.c:390
+#: ppdc/sample.c:393
 msgid "-90"
 msgstr "-90"
 
-#: ppdc/sample.c:389
+#: ppdc/sample.c:392
 msgid "-95"
 msgstr "-95"
 
-#: ppdc/sample.c:306
+#: ppdc/sample.c:309
 msgid "0"
 msgstr "0"
 
-#: ppdc/sample.c:307
+#: ppdc/sample.c:310
 msgid "1"
 msgstr "1"
 
-#: ppdc/sample.c:379
+#: ppdc/sample.c:382
 msgid "1 inch/sec."
 msgstr "1 英寸/秒"
 
@@ -2415,7 +2415,7 @@
 msgid "1.25x2.25\""
 msgstr "1.25x2.25 英寸"
 
-#: ppdc/sample.c:427
+#: ppdc/sample.c:430
 msgid "1.5 inch/sec."
 msgstr "1.5 英寸/秒"
 
@@ -2435,11 +2435,11 @@
 msgid "1.50x2.00\""
 msgstr "1.50x2.00 英寸"
 
-#: ppdc/sample.c:316
+#: ppdc/sample.c:319
 msgid "10"
 msgstr "10"
 
-#: ppdc/sample.c:438
+#: ppdc/sample.c:441
 msgid "10 inches/sec."
 msgstr "10 英寸/秒"
 
@@ -2455,39 +2455,39 @@
 msgid "10 x 14"
 msgstr ""
 
-#: ppdc/sample.c:418
+#: ppdc/sample.c:421
 msgid "100"
 msgstr "100"
 
-#: ppdc/sample.c:329
+#: ppdc/sample.c:332
 msgid "100 mm/sec."
 msgstr "100 毫米/秒"
 
-#: ppdc/sample.c:419
+#: ppdc/sample.c:422
 msgid "105"
 msgstr "105"
 
-#: ppdc/sample.c:317
+#: ppdc/sample.c:320
 msgid "11"
 msgstr "11"
 
-#: ppdc/sample.c:439
+#: ppdc/sample.c:442
 msgid "11 inches/sec."
 msgstr "11 英寸/秒"
 
-#: ppdc/sample.c:420
+#: ppdc/sample.c:423
 msgid "110"
 msgstr "110"
 
-#: ppdc/sample.c:421
+#: ppdc/sample.c:424
 msgid "115"
 msgstr "115"
 
-#: ppdc/sample.c:318
+#: ppdc/sample.c:321
 msgid "12"
 msgstr "12"
 
-#: ppdc/sample.c:440
+#: ppdc/sample.c:443
 msgid "12 inches/sec."
 msgstr "12 英寸/秒"
 
@@ -2495,39 +2495,39 @@
 msgid "12 x 11"
 msgstr ""
 
-#: ppdc/sample.c:422
+#: ppdc/sample.c:425
 msgid "120"
 msgstr "120"
 
-#: ppdc/sample.c:330
+#: ppdc/sample.c:333
 msgid "120 mm/sec."
 msgstr "120 毫米/秒"
 
-#: ppdc/sample.c:243
+#: ppdc/sample.c:247
 msgid "120x60dpi"
 msgstr "120x60dpi"
 
-#: ppdc/sample.c:249
+#: ppdc/sample.c:253
 msgid "120x72dpi"
 msgstr "120x72dpi"
 
-#: ppdc/sample.c:319
+#: ppdc/sample.c:322
 msgid "13"
 msgstr "13"
 
-#: ppdc/sample.c:232
+#: ppdc/sample.c:233
 msgid "136dpi"
 msgstr "136dpi"
 
-#: ppdc/sample.c:320
+#: ppdc/sample.c:323
 msgid "14"
 msgstr "14"
 
-#: ppdc/sample.c:321
+#: ppdc/sample.c:324
 msgid "15"
 msgstr "15"
 
-#: ppdc/sample.c:323
+#: ppdc/sample.c:326
 msgid "15 mm/sec."
 msgstr "15 毫米/秒"
 
@@ -2535,59 +2535,59 @@
 msgid "15 x 11"
 msgstr ""
 
-#: ppdc/sample.c:331
+#: ppdc/sample.c:334
 msgid "150 mm/sec."
 msgstr "150 毫米/秒"
 
-#: ppdc/sample.c:278
+#: ppdc/sample.c:281
 msgid "150dpi"
 msgstr "150dpi"
 
-#: ppdc/sample.c:363
+#: ppdc/sample.c:366
 msgid "16"
 msgstr "16"
 
-#: ppdc/sample.c:364
+#: ppdc/sample.c:367
 msgid "17"
 msgstr "17"
 
-#: ppdc/sample.c:365
+#: ppdc/sample.c:368
 msgid "18"
 msgstr "18"
 
-#: ppdc/sample.c:244
+#: ppdc/sample.c:248
 msgid "180dpi"
 msgstr "180dpi"
 
-#: ppdc/sample.c:366
+#: ppdc/sample.c:369
 msgid "19"
 msgstr "19"
 
-#: ppdc/sample.c:308
+#: ppdc/sample.c:311
 msgid "2"
 msgstr "2"
 
-#: ppdc/sample.c:380
+#: ppdc/sample.c:383
 msgid "2 inches/sec."
 msgstr "2 英寸/秒"
 
-#: cups/ppd-cache.c:2996
+#: cups/ppd-cache.c:3012
 msgid "2-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2997
+#: cups/ppd-cache.c:3013
 msgid "2-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2995
+#: cups/ppd-cache.c:3011
 msgid "2-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2994
+#: cups/ppd-cache.c:3010
 msgid "2-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3872 ppdc/sample.c:262
+#: cups/ppd-cache.c:3872 ppdc/sample.c:265
 msgid "2-Sided Printing"
 msgstr "双面打印"
 
@@ -2631,107 +2631,107 @@
 msgid "2.25x1.25\""
 msgstr "2.25x1.25 英寸"
 
-#: ppdc/sample.c:188
+#: ppdc/sample.c:189
 msgid "2.25x4.00\""
 msgstr "2.25x4.00 英寸"
 
-#: ppdc/sample.c:189
+#: ppdc/sample.c:190
 msgid "2.25x5.50\""
 msgstr "2.25x5.50 英寸"
 
-#: ppdc/sample.c:190
+#: ppdc/sample.c:191
 msgid "2.38x5.50\""
 msgstr "2.38x5.50 英寸"
 
-#: ppdc/sample.c:428
+#: ppdc/sample.c:431
 msgid "2.5 inches/sec."
 msgstr "2.5 英寸/秒"
 
-#: ppdc/sample.c:191
+#: ppdc/sample.c:192
 msgid "2.50x1.00\""
 msgstr "2.50x1.00 英寸"
 
-#: ppdc/sample.c:192
+#: ppdc/sample.c:193
 msgid "2.50x2.00\""
 msgstr "2.50x2.00 英寸"
 
-#: ppdc/sample.c:193
+#: ppdc/sample.c:194
 msgid "2.75x1.25\""
 msgstr "2.75x1.25 英寸"
 
-#: ppdc/sample.c:194
+#: ppdc/sample.c:195
 msgid "2.9 x 1\""
 msgstr "2.9 x 1 英寸"
 
-#: ppdc/sample.c:367
+#: ppdc/sample.c:370
 msgid "20"
 msgstr "20"
 
-#: ppdc/sample.c:324
+#: ppdc/sample.c:327
 msgid "20 mm/sec."
 msgstr "20 毫米/秒"
 
-#: ppdc/sample.c:332
+#: ppdc/sample.c:335
 msgid "200 mm/sec."
 msgstr "200 毫米/秒"
 
-#: ppdc/sample.c:233
+#: ppdc/sample.c:234
 msgid "203dpi"
 msgstr "203dpi"
 
-#: ppdc/sample.c:368
+#: ppdc/sample.c:371
 msgid "21"
 msgstr "21"
 
-#: ppdc/sample.c:369
+#: ppdc/sample.c:372
 msgid "22"
 msgstr "22"
 
-#: ppdc/sample.c:370
+#: ppdc/sample.c:373
 msgid "23"
 msgstr "23"
 
-#: ppdc/sample.c:371
+#: ppdc/sample.c:374
 msgid "24"
 msgstr "24"
 
-#: ppdc/sample.c:241
+#: ppdc/sample.c:245
 msgid "24-Pin Series"
 msgstr "24 针系列"
 
-#: ppdc/sample.c:250
+#: ppdc/sample.c:254
 msgid "240x72dpi"
 msgstr "240x72dpi"
 
-#: ppdc/sample.c:372
+#: ppdc/sample.c:375
 msgid "25"
 msgstr "25"
 
-#: ppdc/sample.c:333
+#: ppdc/sample.c:336
 msgid "250 mm/sec."
 msgstr "250 毫米/秒"
 
-#: ppdc/sample.c:373
+#: ppdc/sample.c:376
 msgid "26"
 msgstr "26"
 
-#: ppdc/sample.c:374
+#: ppdc/sample.c:377
 msgid "27"
 msgstr "27"
 
-#: ppdc/sample.c:375
+#: ppdc/sample.c:378
 msgid "28"
 msgstr "28"
 
-#: ppdc/sample.c:376
+#: ppdc/sample.c:379
 msgid "29"
 msgstr "29"
 
-#: ppdc/sample.c:309
+#: ppdc/sample.c:312
 msgid "3"
 msgstr "3"
 
-#: ppdc/sample.c:381
+#: ppdc/sample.c:384
 msgid "3 inches/sec."
 msgstr "3 英寸/秒"
 
@@ -2739,59 +2739,59 @@
 msgid "3 x 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3007
+#: cups/ppd-cache.c:3023
 msgid "3-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3005
+#: cups/ppd-cache.c:3021
 msgid "3-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3004
+#: cups/ppd-cache.c:3020
 msgid "3-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3006
+#: cups/ppd-cache.c:3022
 msgid "3-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: ppdc/sample.c:195
+#: ppdc/sample.c:196
 msgid "3.00x1.00\""
 msgstr "3.00x1.00 英寸"
 
-#: ppdc/sample.c:196
+#: ppdc/sample.c:197
 msgid "3.00x1.25\""
 msgstr "3.00x1.25 英寸"
 
-#: ppdc/sample.c:197
+#: ppdc/sample.c:198
 msgid "3.00x2.00\""
 msgstr "3.00x2.00 英寸"
 
-#: ppdc/sample.c:198
+#: ppdc/sample.c:199
 msgid "3.00x3.00\""
 msgstr "3.00x3.00 英寸"
 
-#: ppdc/sample.c:199
+#: ppdc/sample.c:200
 msgid "3.00x5.00\""
 msgstr "3.00x5.00 英寸"
 
-#: ppdc/sample.c:200
+#: ppdc/sample.c:201
 msgid "3.25x2.00\""
 msgstr "3.25x2.00 英寸"
 
-#: ppdc/sample.c:201
+#: ppdc/sample.c:202
 msgid "3.25x5.00\""
 msgstr "3.25x5.00 英寸"
 
-#: ppdc/sample.c:202
+#: ppdc/sample.c:203
 msgid "3.25x5.50\""
 msgstr "3.25x5.50 英寸"
 
-#: ppdc/sample.c:203
+#: ppdc/sample.c:204
 msgid "3.25x5.83\""
 msgstr "3.25x5.83 英寸"
 
-#: ppdc/sample.c:204
+#: ppdc/sample.c:205
 msgid "3.25x7.83\""
 msgstr "3.25x7.83 英寸"
 
@@ -2803,115 +2803,115 @@
 msgid "3.5\" Disk"
 msgstr "3.5 英寸磁盘"
 
-#: ppdc/sample.c:205
+#: ppdc/sample.c:206
 msgid "3.50x1.00\""
 msgstr "3.50x1.00 英寸"
 
-#: ppdc/sample.c:377
+#: ppdc/sample.c:380
 msgid "30"
 msgstr "30"
 
-#: ppdc/sample.c:325
+#: ppdc/sample.c:328
 msgid "30 mm/sec."
 msgstr "30 毫米/秒"
 
-#: ppdc/sample.c:334
+#: ppdc/sample.c:337
 msgid "300 mm/sec."
 msgstr "300 毫米/秒"
 
-#: ppdc/sample.c:234
+#: ppdc/sample.c:235
 msgid "300dpi"
 msgstr "300dpi"
 
-#: ppdc/sample.c:405
+#: ppdc/sample.c:408
 msgid "35"
 msgstr "35"
 
-#: ppdc/sample.c:246
+#: ppdc/sample.c:250
 msgid "360dpi"
 msgstr "360dpi"
 
-#: ppdc/sample.c:245
+#: ppdc/sample.c:249
 msgid "360x180dpi"
 msgstr "360x180dpi"
 
-#: ppdc/sample.c:310
+#: ppdc/sample.c:313
 msgid "4"
 msgstr "4"
 
-#: ppdc/sample.c:382
+#: ppdc/sample.c:385
 msgid "4 inches/sec."
 msgstr "4 英寸/秒"
 
-#: cups/ppd-cache.c:3001
+#: cups/ppd-cache.c:3017
 msgid "4-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2999
+#: cups/ppd-cache.c:3015
 msgid "4-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2998
+#: cups/ppd-cache.c:3014
 msgid "4-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3000
+#: cups/ppd-cache.c:3016
 msgid "4-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: ppdc/sample.c:206
+#: ppdc/sample.c:207
 msgid "4.00x1.00\""
 msgstr "4.00x1.00 英寸"
 
-#: ppdc/sample.c:214
+#: ppdc/sample.c:215
 msgid "4.00x13.00\""
 msgstr "4.00x13.00 英寸"
 
-#: ppdc/sample.c:207
+#: ppdc/sample.c:208
 msgid "4.00x2.00\""
 msgstr "4.00x2.00 英寸"
 
-#: ppdc/sample.c:208
+#: ppdc/sample.c:209
 msgid "4.00x2.50\""
 msgstr "4.00x2.50 英寸"
 
-#: ppdc/sample.c:209
+#: ppdc/sample.c:210
 msgid "4.00x3.00\""
 msgstr "4.00x3.00 英寸"
 
-#: ppdc/sample.c:210
+#: ppdc/sample.c:211
 msgid "4.00x4.00\""
 msgstr "4.00x4.00 英寸"
 
-#: ppdc/sample.c:211
+#: ppdc/sample.c:212
 msgid "4.00x5.00\""
 msgstr "4.00x5.00 英寸"
 
-#: ppdc/sample.c:212
+#: ppdc/sample.c:213
 msgid "4.00x6.00\""
 msgstr "4.00x6.00 英寸"
 
-#: ppdc/sample.c:213
+#: ppdc/sample.c:214
 msgid "4.00x6.50\""
 msgstr "4.00x6.50 英寸"
 
-#: ppdc/sample.c:406
+#: ppdc/sample.c:409
 msgid "40"
 msgstr "40"
 
-#: ppdc/sample.c:326
+#: ppdc/sample.c:329
 msgid "40 mm/sec."
 msgstr "40 毫米/秒"
 
-#: ppdc/sample.c:407
+#: ppdc/sample.c:410
 msgid "45"
 msgstr "45"
 
-#: ppdc/sample.c:311
+#: ppdc/sample.c:314
 msgid "5"
 msgstr "5"
 
-#: ppdc/sample.c:432
+#: ppdc/sample.c:435
 msgid "5 inches/sec."
 msgstr "5 英寸/秒"
 
@@ -2919,79 +2919,79 @@
 msgid "5 x 7"
 msgstr ""
 
-#: ppdc/sample.c:408
+#: ppdc/sample.c:411
 msgid "50"
 msgstr "50"
 
-#: ppdc/sample.c:409
+#: ppdc/sample.c:412
 msgid "55"
 msgstr "55"
 
-#: ppdc/sample.c:312
+#: ppdc/sample.c:315
 msgid "6"
 msgstr "6"
 
-#: ppdc/sample.c:433
+#: ppdc/sample.c:436
 msgid "6 inches/sec."
 msgstr "6 英寸/秒"
 
-#: ppdc/sample.c:215
+#: ppdc/sample.c:216
 msgid "6.00x1.00\""
 msgstr "6.00x1.00 英寸"
 
-#: ppdc/sample.c:216
+#: ppdc/sample.c:217
 msgid "6.00x2.00\""
 msgstr "6.00x2.00 英寸"
 
-#: ppdc/sample.c:217
+#: ppdc/sample.c:218
 msgid "6.00x3.00\""
 msgstr "6.00x3.00 英寸"
 
-#: ppdc/sample.c:218
+#: ppdc/sample.c:219
 msgid "6.00x4.00\""
 msgstr "6.00x4.00 英寸"
 
-#: ppdc/sample.c:219
+#: ppdc/sample.c:220
 msgid "6.00x5.00\""
 msgstr "6.00x5.00 英寸"
 
-#: ppdc/sample.c:220
+#: ppdc/sample.c:221
 msgid "6.00x6.00\""
 msgstr "6.00x6.00 英寸"
 
-#: ppdc/sample.c:221
+#: ppdc/sample.c:222
 msgid "6.00x6.50\""
 msgstr "6.00x6.50 英寸"
 
-#: ppdc/sample.c:410
+#: ppdc/sample.c:413
 msgid "60"
 msgstr "60"
 
-#: ppdc/sample.c:327
+#: ppdc/sample.c:330
 msgid "60 mm/sec."
 msgstr "60 毫米/秒"
 
-#: ppdc/sample.c:253
+#: ppdc/sample.c:257
 msgid "600dpi"
 msgstr "600dpi"
 
-#: ppdc/sample.c:242
+#: ppdc/sample.c:246
 msgid "60dpi"
 msgstr "60dpi"
 
-#: ppdc/sample.c:248
+#: ppdc/sample.c:252
 msgid "60x72dpi"
 msgstr ""
 
-#: ppdc/sample.c:411
+#: ppdc/sample.c:414
 msgid "65"
 msgstr "65"
 
-#: ppdc/sample.c:313
+#: ppdc/sample.c:316
 msgid "7"
 msgstr "7"
 
-#: ppdc/sample.c:435
+#: ppdc/sample.c:438
 msgid "7 inches/sec."
 msgstr "7 英寸/秒"
 
@@ -2999,19 +2999,19 @@
 msgid "7 x 9"
 msgstr ""
 
-#: ppdc/sample.c:412
+#: ppdc/sample.c:415
 msgid "70"
 msgstr "70"
 
-#: ppdc/sample.c:413
+#: ppdc/sample.c:416
 msgid "75"
 msgstr "75"
 
-#: ppdc/sample.c:314
+#: ppdc/sample.c:317
 msgid "8"
 msgstr "8"
 
-#: ppdc/sample.c:436
+#: ppdc/sample.c:439
 msgid "8 inches/sec."
 msgstr "8 英寸/秒"
 
@@ -3019,51 +3019,51 @@
 msgid "8 x 10"
 msgstr ""
 
-#: ppdc/sample.c:222
+#: ppdc/sample.c:223
 msgid "8.00x1.00\""
 msgstr "8.00x1.00 英寸"
 
-#: ppdc/sample.c:223
+#: ppdc/sample.c:224
 msgid "8.00x2.00\""
 msgstr "8.00x2.00 英寸"
 
-#: ppdc/sample.c:224
+#: ppdc/sample.c:225
 msgid "8.00x3.00\""
 msgstr "8.00x3.00 英寸"
 
-#: ppdc/sample.c:225
+#: ppdc/sample.c:226
 msgid "8.00x4.00\""
 msgstr "8.00x4.00 英寸"
 
-#: ppdc/sample.c:226
+#: ppdc/sample.c:227
 msgid "8.00x5.00\""
 msgstr "8.00x5.00 英寸"
 
-#: ppdc/sample.c:227
+#: ppdc/sample.c:228
 msgid "8.00x6.00\""
 msgstr "8.00x6.00 英寸"
 
-#: ppdc/sample.c:228
+#: ppdc/sample.c:229
 msgid "8.00x6.50\""
 msgstr "8.00x6.50 英寸"
 
-#: ppdc/sample.c:414
+#: ppdc/sample.c:417
 msgid "80"
 msgstr "80"
 
-#: ppdc/sample.c:328
+#: ppdc/sample.c:331
 msgid "80 mm/sec."
 msgstr "80 毫米/秒"
 
-#: ppdc/sample.c:415
+#: ppdc/sample.c:418
 msgid "85"
 msgstr "85"
 
-#: ppdc/sample.c:315
+#: ppdc/sample.c:318
 msgid "9"
 msgstr "9"
 
-#: ppdc/sample.c:437
+#: ppdc/sample.c:440
 msgid "9 inches/sec."
 msgstr "9 英寸/秒"
 
@@ -3075,15 +3075,15 @@
 msgid "9 x 12"
 msgstr ""
 
-#: ppdc/sample.c:247
+#: ppdc/sample.c:251
 msgid "9-Pin Series"
 msgstr "9 针系列"
 
-#: ppdc/sample.c:416
+#: ppdc/sample.c:419
 msgid "90"
 msgstr "90"
 
-#: ppdc/sample.c:417
+#: ppdc/sample.c:420
 msgid "95"
 msgstr "95"
 
@@ -3091,11 +3091,11 @@
 msgid "?Invalid help command unknown."
 msgstr ""
 
-#: cgi-bin/admin.c:2353
+#: cgi-bin/admin.c:2352
 msgid "A Samba password is required to export printer drivers"
 msgstr ""
 
-#: cgi-bin/admin.c:2349
+#: cgi-bin/admin.c:2348
 msgid "A Samba username is required to export printer drivers"
 msgstr ""
 
@@ -3249,11 +3249,11 @@
 msgid "Accept Jobs"
 msgstr "接受作业"
 
-#: cups/http-support.c:1494
+#: cups/http-support.c:1499
 msgid "Accepted"
 msgstr "已接受"
 
-#: cups/ppd-cache.c:2977
+#: cups/ppd-cache.c:2993
 msgid "Accordian Fold"
 msgstr ""
 
@@ -3278,23 +3278,23 @@
 msgid "Administration"
 msgstr "管理"
 
-#: cups/ppd-cache.c:3485
+#: cups/ppd-cache.c:3472
 msgid "Advanced Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3398
+#: cups/ppd-cache.c:3386
 msgid "Alternate"
 msgstr ""
 
-#: cups/ppd-cache.c:3406
+#: cups/ppd-cache.c:3394
 msgid "Alternate Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3479
+#: cups/ppd-cache.c:3466
 msgid "Aluminum"
 msgstr ""
 
-#: ppdc/sample.c:424
+#: ppdc/sample.c:427
 msgid "Always"
 msgstr "始终"
 
@@ -3302,23 +3302,23 @@
 msgid "AppSocket/HP JetDirect"
 msgstr "AppSocket/HP JetDirect"
 
-#: ppdc/sample.c:445
+#: ppdc/sample.c:448
 msgid "Applicator"
 msgstr "涂敷器"
 
-#: cups/ppd-cache.c:3513
+#: cups/ppd-cache.c:3500
 msgid "Archival Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3525
+#: cups/ppd-cache.c:3512
 msgid "Archival Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3602
+#: cups/ppd-cache.c:3589
 msgid "Archival Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3574
+#: cups/ppd-cache.c:3561
 msgid "Archival Photo Paper"
 msgstr ""
 
@@ -3342,7 +3342,7 @@
 msgid "Attribute groups are out of order (%x < %x)."
 msgstr ""
 
-#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3480 cups/ppd-cache.c:3803
+#: cups/ppd-cache.c:3384 cups/ppd-cache.c:3467 cups/ppd-cache.c:3771
 msgid "Automatic"
 msgstr ""
 
@@ -3394,7 +3394,7 @@
 msgid "B9"
 msgstr "B9"
 
-#: cups/ppd-cache.c:3481
+#: cups/ppd-cache.c:3468
 msgid "Back Print Film"
 msgstr ""
 
@@ -3436,7 +3436,7 @@
 msgid "Bad PPD file."
 msgstr ""
 
-#: cups/http-support.c:1512
+#: cups/http-support.c:1517
 msgid "Bad Request"
 msgstr "错误的请求"
 
@@ -3448,7 +3448,7 @@
 msgid "Bad UIConstraints"
 msgstr "错误的 UIConstraints"
 
-#: cups/hash.c:48 cups/http-support.c:1606
+#: cups/hash.c:49 cups/http-support.c:1611
 msgid "Bad arguments to function"
 msgstr ""
 
@@ -3461,7 +3461,7 @@
 msgid "Bad custom parameter"
 msgstr "错误的自定参数"
 
-#: cups/http-support.c:1746 scheduler/ipp.c:2365
+#: cups/http-support.c:1751 scheduler/ipp.c:2365
 #, c-format
 msgid "Bad device-uri \"%s\"."
 msgstr ""
@@ -3485,7 +3485,7 @@
 msgid "Bad filename buffer"
 msgstr ""
 
-#: cups/http-support.c:1615
+#: cups/http-support.c:1620
 msgid "Bad hostname/address in URI"
 msgstr ""
 
@@ -3548,7 +3548,7 @@
 msgid "Bad page-ranges values %d-%d."
 msgstr "错误的 page-ranges 值 %d-%d。"
 
-#: cups/http-support.c:1612
+#: cups/http-support.c:1617
 msgid "Bad port number in URI"
 msgstr ""
 
@@ -3581,19 +3581,19 @@
 msgid "Bad requesting-user-name value: %s"
 msgstr ""
 
-#: cups/http-support.c:1609
+#: cups/http-support.c:1614
 msgid "Bad resource in URI"
 msgstr ""
 
-#: cups/http-support.c:1621
+#: cups/http-support.c:1626
 msgid "Bad scheme in URI"
 msgstr ""
 
-#: cgi-bin/admin.c:1469
+#: cgi-bin/admin.c:1468
 msgid "Bad subscription ID"
 msgstr ""
 
-#: cups/http-support.c:1618
+#: cups/http-support.c:1623
 msgid "Bad username in URI"
 msgstr ""
 
@@ -3601,11 +3601,11 @@
 msgid "Bad value string"
 msgstr ""
 
-#: cups/http-support.c:1624
+#: cups/http-support.c:1629
 msgid "Bad/empty URI"
 msgstr ""
 
-#: cups/ppd-cache.c:2962
+#: cups/ppd-cache.c:2978
 msgid "Bale"
 msgstr ""
 
@@ -3613,39 +3613,39 @@
 msgid "Banners"
 msgstr "标题"
 
-#: cups/ppd-cache.c:2963
+#: cups/ppd-cache.c:2979
 msgid "Bind"
 msgstr ""
 
-#: cups/ppd-cache.c:2967
+#: cups/ppd-cache.c:2983
 msgid "Bind (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2965
+#: cups/ppd-cache.c:2981
 msgid "Bind (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2964
+#: cups/ppd-cache.c:2980
 msgid "Bind (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2966
+#: cups/ppd-cache.c:2982
 msgid "Bind (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3514
+#: cups/ppd-cache.c:3501
 msgid "Bond Envelope"
 msgstr ""
 
-#: ppdc/sample.c:282
+#: ppdc/sample.c:285
 msgid "Bond Paper"
 msgstr "半透明纸"
 
-#: cups/ppd-cache.c:4152
+#: cups/ppd-cache.c:4277
 msgid "Booklet"
 msgstr ""
 
-#: cups/ppd-cache.c:2968
+#: cups/ppd-cache.c:2984
 msgid "Booklet Maker"
 msgstr ""
 
@@ -3654,11 +3654,11 @@
 msgid "Boolean expected for waiteof option \"%s\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3409
+#: cups/ppd-cache.c:3397
 msgid "Bottom"
 msgstr ""
 
-#: cups/ppd-cache.c:3804
+#: cups/ppd-cache.c:3772
 msgid "Bottom Tray"
 msgstr ""
 
@@ -3666,15 +3666,15 @@
 msgid "Buffer overflow detected, aborting."
 msgstr ""
 
-#: cups/ppd-cache.c:3484
+#: cups/ppd-cache.c:3471
 msgid "CD"
 msgstr ""
 
-#: ppdc/sample.c:277
+#: ppdc/sample.c:280
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ppdc/sample.c:358
+#: ppdc/sample.c:361
 msgid "CPCL Label Printer"
 msgstr "CPCL 标签打印机"
 
@@ -3682,11 +3682,11 @@
 msgid "Cancel Jobs"
 msgstr ""
 
-#: cgi-bin/admin.c:1470 cgi-bin/admin.c:1509 cgi-bin/admin.c:1519
+#: cgi-bin/admin.c:1469 cgi-bin/admin.c:1508 cgi-bin/admin.c:1518
 msgid "Cancel RSS Subscription"
 msgstr "取消 RSS 订阅"
 
-#: backend/ipp.c:2287
+#: backend/ipp.c:2295
 msgid "Canceling print job."
 msgstr ""
 
@@ -3698,23 +3698,23 @@
 msgid "Cannot share a remote Kerberized printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3482
+#: cups/ppd-cache.c:3469
 msgid "Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3483
+#: cups/ppd-cache.c:3470
 msgid "Cardstock"
 msgstr ""
 
-#: ppdc/sample.c:271
+#: ppdc/sample.c:274
 msgid "Cassette"
 msgstr ""
 
-#: cups/ppd-cache.c:3413
+#: cups/ppd-cache.c:3401
 msgid "Center"
 msgstr ""
 
-#: cups/ppd-cache.c:3805
+#: cups/ppd-cache.c:3773
 msgid "Center Tray"
 msgstr ""
 
@@ -3740,27 +3740,27 @@
 msgid "Close-Job doesn't support the job-uri attribute."
 msgstr ""
 
-#: cups/ppd-cache.c:2969
+#: cups/ppd-cache.c:2985
 msgid "Coat"
 msgstr ""
 
-#: cups/ppd-cache.c:3515
+#: cups/ppd-cache.c:3502
 msgid "Coated Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3603
+#: cups/ppd-cache.c:3590
 msgid "Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3790 ppdc/sample.c:276
+#: cups/ppd-cache.c:3790 ppdc/sample.c:279
 msgid "Color"
 msgstr "彩色"
 
-#: cups/ppd-cache.c:3751 ppdc/sample.c:274
+#: cups/ppd-cache.c:3751 ppdc/sample.c:277
 msgid "Color Mode"
 msgstr "彩色模式"
 
-#: cups/ppd-cache.c:3550
+#: cups/ppd-cache.c:3537
 msgid "Colored Labels"
 msgstr ""
 
@@ -3775,59 +3775,59 @@
 msgid "Community name uses indefinite length"
 msgstr "团体名称使用不定长度"
 
-#: backend/ipp.c:865 backend/lpd.c:929 backend/socket.c:375
+#: backend/ipp.c:864 backend/lpd.c:933 backend/socket.c:375
 msgid "Connected to printer."
 msgstr ""
 
-#: backend/ipp.c:701 backend/lpd.c:753 backend/socket.c:295
+#: backend/ipp.c:700 backend/lpd.c:757 backend/socket.c:295
 msgid "Connecting to printer."
 msgstr ""
 
-#: cups/http-support.c:1482
+#: cups/http-support.c:1487
 msgid "Continue"
 msgstr "继续"
 
-#: ppdc/sample.c:360
+#: ppdc/sample.c:363
 msgid "Continuous"
 msgstr "连续"
 
-#: cups/ppd-cache.c:3499
+#: cups/ppd-cache.c:3486
 msgid "Continuous Long"
 msgstr ""
 
-#: cups/ppd-cache.c:3500
+#: cups/ppd-cache.c:3487
 msgid "Continuous Short"
 msgstr ""
 
-#: backend/lpd.c:1078 backend/lpd.c:1210
+#: backend/lpd.c:1082 backend/lpd.c:1214
 msgid "Control file sent successfully."
 msgstr ""
 
-#: backend/ipp.c:1396 backend/lpd.c:445
+#: backend/ipp.c:1395 backend/lpd.c:449
 msgid "Copying print data."
 msgstr ""
 
-#: cups/ppd-cache.c:3516
+#: cups/ppd-cache.c:3503
 msgid "Cotton Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3604
+#: cups/ppd-cache.c:3591
 msgid "Cotton Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:2970
+#: cups/ppd-cache.c:2986
 msgid "Cover"
 msgstr ""
 
-#: cups/http-support.c:1491
+#: cups/http-support.c:1496
 msgid "Created"
 msgstr "创建"
 
-#: cups/tls-darwin.c:748 cups/tls-gnutls.c:582
+#: cups/tls-darwin.c:723 cups/tls-gnutls.c:582
 msgid "Credentials do not validate against site CA certificate."
 msgstr ""
 
-#: cups/tls-darwin.c:759 cups/tls-gnutls.c:599
+#: cups/tls-darwin.c:734 cups/tls-gnutls.c:599
 msgid "Credentials have expired."
 msgstr ""
 
@@ -3835,39 +3835,39 @@
 msgid "Custom"
 msgstr "自定"
 
-#: ppdc/sample.c:354
+#: ppdc/sample.c:357
 msgid "CustominCutInterval"
 msgstr "CustominCutInterval"
 
-#: ppdc/sample.c:352
+#: ppdc/sample.c:355
 msgid "CustominTearInterval"
 msgstr "CustominTearInterval"
 
-#: ppdc/sample.c:338
+#: cups/ppd-cache.c:4312 ppdc/sample.c:341
 msgid "Cut"
 msgstr "切纸"
 
-#: cups/ppd-cache.c:3026
+#: cups/ppd-cache.c:3042
 msgid "Cut Media"
 msgstr ""
 
-#: ppdc/sample.c:446
+#: ppdc/sample.c:449
 msgid "Cutter"
 msgstr "切纸器"
 
-#: cups/ppd-cache.c:3509
+#: cups/ppd-cache.c:3496
 msgid "DVD"
 msgstr ""
 
-#: ppdc/sample.c:239
+#: ppdc/sample.c:243
 msgid "Dark"
 msgstr "暗"
 
-#: ppdc/sample.c:235
+#: ppdc/sample.c:239
 msgid "Darkness"
 msgstr "暗"
 
-#: backend/lpd.c:1163
+#: backend/lpd.c:1167
 msgid "Data file sent successfully."
 msgstr ""
 
@@ -3883,7 +3883,7 @@
 msgid "Delete Printer"
 msgstr "删除打印机"
 
-#: ppdc/sample.c:273
+#: ppdc/sample.c:276
 msgid "DeskJet Series"
 msgstr "DeskJet 系列"
 
@@ -3903,7 +3903,7 @@
 "        location = %s"
 msgstr ""
 
-#: ppdc/sample.c:431
+#: ppdc/sample.c:434
 msgid "Direct Thermal Media"
 msgstr "热敏介质"
 
@@ -3932,11 +3932,11 @@
 msgid "Directory \"%s\" permissions OK (0%o/uid=%d/gid=%d)."
 msgstr ""
 
-#: ppdc/sample.c:340
+#: ppdc/sample.c:343
 msgid "Disabled"
 msgstr "停用"
 
-#: cups/ppd-cache.c:3402
+#: cups/ppd-cache.c:3390
 msgid "Disc"
 msgstr ""
 
@@ -3945,40 +3945,40 @@
 msgid "Document #%d does not exist in job #%d."
 msgstr ""
 
-#: cups/ppd-cache.c:2978
+#: cups/ppd-cache.c:2994
 msgid "Double Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3019
+#: cups/ppd-cache.c:3035
 msgid "Double Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3017
+#: cups/ppd-cache.c:3033
 msgid "Double Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3016
+#: cups/ppd-cache.c:3032
 msgid "Double Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3018
+#: cups/ppd-cache.c:3034
 msgid "Double Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3507
+#: cups/ppd-cache.c:3494
 msgid "Double Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:4283 cups/ppd-cache.c:4285 cups/ppd-cache.c:4348
-#: cups/ppd-cache.c:4385
+#: cups/ppd-cache.c:4471 cups/ppd-cache.c:4473 cups/ppd-cache.c:4536
+#: cups/ppd-cache.c:4573
 msgid "Draft"
 msgstr ""
 
-#: cups/ppd-cache.c:3508
+#: cups/ppd-cache.c:3495
 msgid "Dry Film"
 msgstr ""
 
-#: ppdc/sample.c:267
+#: ppdc/sample.c:270
 msgid "Duplexer"
 msgstr "双面打印器"
 
@@ -3986,11 +3986,11 @@
 msgid "Dymo"
 msgstr "Dymo"
 
-#: ppdc/sample.c:426
+#: ppdc/sample.c:429
 msgid "EPL1 Label Printer"
 msgstr "EPL1 标签打印机"
 
-#: ppdc/sample.c:429
+#: ppdc/sample.c:432
 msgid "EPL2 Label Printer"
 msgstr "EPL2 标签打印机"
 
@@ -4000,7 +4000,7 @@
 msgid "Edit Configuration File"
 msgstr "编辑配置文件"
 
-#: cups/ppd-cache.c:3510
+#: cups/ppd-cache.c:3497
 msgid "Embossing Foil"
 msgstr ""
 
@@ -4012,7 +4012,7 @@
 msgid "Encryption is not supported."
 msgstr ""
 
-#: cups/ppd-cache.c:3511
+#: cups/ppd-cache.c:3498
 msgid "End Board"
 msgstr ""
 
@@ -4021,7 +4021,7 @@
 msgid "Ending Banner"
 msgstr "结束标题"
 
-#: cups/ppd-cache.c:2979
+#: cups/ppd-cache.c:2995
 msgid "Engineering Z Fold"
 msgstr ""
 
@@ -4038,7 +4038,7 @@
 "请输入您的用户名称和密码或者 root 用户的用户名称和密码来访问此页面。如果您正在使用 Kerberos 鉴定，请确定您拥有的 Kerberos "
 "票据是有效的。"
 
-#: cups/ppd-cache.c:3401 cups/ppd-cache.c:3512
+#: cups/ppd-cache.c:3389 cups/ppd-cache.c:3499
 msgid "Envelope"
 msgstr ""
 
@@ -4130,7 +4130,7 @@
 msgid "Envelope DL"
 msgstr ""
 
-#: ppdc/sample.c:261
+#: ppdc/sample.c:264
 msgid "Envelope Feed"
 msgstr "信封送纸"
 
@@ -4258,7 +4258,7 @@
 msgid "Environment Variables:"
 msgstr ""
 
-#: ppdc/sample.c:240
+#: ppdc/sample.c:244
 msgid "Epson"
 msgstr "Epson"
 
@@ -4287,51 +4287,51 @@
 msgid "European Fanfold Legal"
 msgstr ""
 
-#: ppdc/sample.c:350
+#: ppdc/sample.c:353
 msgid "Every 10 Labels"
 msgstr "每 10 个标签"
 
-#: ppdc/sample.c:342
+#: ppdc/sample.c:345
 msgid "Every 2 Labels"
 msgstr "每 2 个标签"
 
-#: ppdc/sample.c:343
+#: ppdc/sample.c:346
 msgid "Every 3 Labels"
 msgstr "每 3 个标签"
 
-#: ppdc/sample.c:344
+#: ppdc/sample.c:347
 msgid "Every 4 Labels"
 msgstr "每 4 个标签"
 
-#: ppdc/sample.c:345
+#: ppdc/sample.c:348
 msgid "Every 5 Labels"
 msgstr "每 5 个标签"
 
-#: ppdc/sample.c:346
+#: ppdc/sample.c:349
 msgid "Every 6 Labels"
 msgstr "每 6 个标签"
 
-#: ppdc/sample.c:347
+#: ppdc/sample.c:350
 msgid "Every 7 Labels"
 msgstr "每 7 个标签"
 
-#: ppdc/sample.c:348
+#: ppdc/sample.c:351
 msgid "Every 8 Labels"
 msgstr "每 8 个标签"
 
-#: ppdc/sample.c:349
+#: ppdc/sample.c:352
 msgid "Every 9 Labels"
 msgstr "每 9 个标签"
 
-#: ppdc/sample.c:341
+#: ppdc/sample.c:344
 msgid "Every Label"
 msgstr "每个标签"
 
-#: cups/ppd-cache.c:3490
+#: cups/ppd-cache.c:3477
 msgid "Everyday Glossy Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3491
+#: cups/ppd-cache.c:3478
 msgid "Everyday Matte Paper"
 msgstr ""
 
@@ -4339,11 +4339,11 @@
 msgid "Executive"
 msgstr ""
 
-#: cups/http-support.c:1540
+#: cups/http-support.c:1545
 msgid "Expectation Failed"
 msgstr "预期失败"
 
-#: cgi-bin/admin.c:2341 cgi-bin/admin.c:2360
+#: cgi-bin/admin.c:2340 cgi-bin/admin.c:2359
 msgid "Export Printers to Samba"
 msgstr "将打印机导出为 Samba"
 
@@ -4351,7 +4351,7 @@
 msgid "Expressions:"
 msgstr ""
 
-#: cups/ppd-cache.c:3492
+#: cups/ppd-cache.c:3479
 msgid "Extra Heavyweight Paper"
 msgstr ""
 
@@ -4365,15 +4365,15 @@
 msgid "FAIL"
 msgstr ""
 
-#: cups/ppd-cache.c:3524
+#: cups/ppd-cache.c:3511
 msgid "Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3806
+#: cups/ppd-cache.c:3774
 msgid "Face Down"
 msgstr ""
 
-#: cups/ppd-cache.c:3807
+#: cups/ppd-cache.c:3775
 msgid "Face Up"
 msgstr ""
 
@@ -4417,37 +4417,37 @@
 "in \"%s/cups-files.conf\"."
 msgstr ""
 
-#: cups/ppd-cache.c:3531
+#: cups/ppd-cache.c:3518
 msgid "Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3517
+#: cups/ppd-cache.c:3504
 msgid "Fine Envelope"
 msgstr ""
 
 #: filter/rastertoepson.c:1131 filter/rastertohp.c:802
-#: filter/rastertolabel.c:1259
+#: filter/rastertolabel.c:1260
 #, c-format
 msgid "Finished page %d."
 msgstr ""
 
-#: cups/ppd-cache.c:3532
+#: cups/ppd-cache.c:3519
 msgid "Flexo Base"
 msgstr ""
 
-#: cups/ppd-cache.c:3533
+#: cups/ppd-cache.c:3520
 msgid "Flexo Photo Polymer"
 msgstr ""
 
-#: cups/ppd-cache.c:3534
+#: cups/ppd-cache.c:3521
 msgid "Flute"
 msgstr ""
 
-#: cups/ppd-cache.c:3535
+#: cups/ppd-cache.c:3522
 msgid "Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:4061
+#: cups/ppd-cache.c:4134
 msgid "Fold"
 msgstr ""
 
@@ -4455,19 +4455,19 @@
 msgid "Folio"
 msgstr "对开本"
 
-#: cups/http-support.c:1519
+#: cups/http-support.c:1524
 msgid "Forbidden"
 msgstr "禁止"
 
-#: cups/http-support.c:1503
+#: cups/http-support.c:1508
 msgid "Found"
 msgstr ""
 
-#: cups/ppd-cache.c:3536
+#: cups/ppd-cache.c:3523
 msgid "Full Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:2980
+#: cups/ppd-cache.c:2996
 msgid "Gate Fold"
 msgstr ""
 
@@ -4475,7 +4475,7 @@
 msgid "General"
 msgstr "通用"
 
-#: ppdc/sample.c:251
+#: ppdc/sample.c:255
 msgid "Generic"
 msgstr "通用"
 
@@ -4483,47 +4483,47 @@
 msgid "Get-Response-PDU uses indefinite length"
 msgstr "Get-Response-PDU 使用不定长度"
 
-#: cups/ppd-cache.c:3537
+#: cups/ppd-cache.c:3524
 msgid "Glass"
 msgstr ""
 
-#: cups/ppd-cache.c:3538
+#: cups/ppd-cache.c:3525
 msgid "Glass Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3539
+#: cups/ppd-cache.c:3526
 msgid "Glass Opaque"
 msgstr ""
 
-#: cups/ppd-cache.c:3540
+#: cups/ppd-cache.c:3527
 msgid "Glass Surfaced"
 msgstr ""
 
-#: cups/ppd-cache.c:3541
+#: cups/ppd-cache.c:3528
 msgid "Glass Textured"
 msgstr ""
 
-#: cups/ppd-cache.c:3486
+#: cups/ppd-cache.c:3473
 msgid "Glossy Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3526
+#: cups/ppd-cache.c:3513
 msgid "Glossy Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3551
+#: cups/ppd-cache.c:3538
 msgid "Glossy Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3502
+#: cups/ppd-cache.c:3489
 msgid "Glossy Optical Disc"
 msgstr ""
 
-#: ppdc/sample.c:285
+#: ppdc/sample.c:288
 msgid "Glossy Paper"
 msgstr "光面纸"
 
-#: cups/ppd-cache.c:3576
+#: cups/ppd-cache.c:3563
 msgid "Glossy Photo Paper"
 msgstr ""
 
@@ -4534,27 +4534,27 @@
 msgid "Got a printer-uri attribute but no job-id."
 msgstr ""
 
-#: cups/ppd-cache.c:3542
+#: cups/ppd-cache.c:3529
 msgid "Gravure Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3767 cups/ppd-cache.c:3778 ppdc/sample.c:275
+#: cups/ppd-cache.c:3767 cups/ppd-cache.c:3778 ppdc/sample.c:278
 msgid "Grayscale"
 msgstr "灰度"
 
-#: ppdc/sample.c:272
+#: ppdc/sample.c:275
 msgid "HP"
 msgstr "HP"
 
-#: cups/ppd-cache.c:3404
+#: cups/ppd-cache.c:3392
 msgid "Hagaki"
 msgstr ""
 
-#: cups/ppd-cache.c:2981
+#: cups/ppd-cache.c:2997
 msgid "Half Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:2982
+#: cups/ppd-cache.c:2998
 msgid "Half Z Fold"
 msgstr ""
 
@@ -4562,19 +4562,19 @@
 msgid "Hanging Folder"
 msgstr "吊夹"
 
-#: cups/hash.c:292
+#: cups/hash.c:289
 msgid "Hash buffer too small."
 msgstr ""
 
-#: cups/ppd-cache.c:3607
+#: cups/ppd-cache.c:3594
 msgid "Heavyweight Coated Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3518
+#: cups/ppd-cache.c:3505
 msgid "Heavyweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3606
+#: cups/ppd-cache.c:3593
 msgid "Heavyweight Paper"
 msgstr ""
 
@@ -4582,23 +4582,23 @@
 msgid "Help file not in index."
 msgstr ""
 
-#: cups/ppd-cache.c:4290 cups/ppd-cache.c:4359 cups/ppd-cache.c:4390
+#: cups/ppd-cache.c:4478 cups/ppd-cache.c:4547 cups/ppd-cache.c:4578
 msgid "High"
 msgstr ""
 
-#: cups/ppd-cache.c:3527
+#: cups/ppd-cache.c:3514
 msgid "High Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3552
+#: cups/ppd-cache.c:3539
 msgid "High Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3503
+#: cups/ppd-cache.c:3490
 msgid "High Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3577
+#: cups/ppd-cache.c:3564
 msgid "High Gloss Photo Paper"
 msgstr ""
 
@@ -4718,43 +4718,43 @@
 msgid "Illegal whitespace character"
 msgstr "非法空白字符"
 
-#: cups/ppd-cache.c:3543
+#: cups/ppd-cache.c:3530
 msgid "Image Setter Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3544
+#: cups/ppd-cache.c:3531
 msgid "Imaging Cylinder"
 msgstr ""
 
-#: cups/ppd-cache.c:3519
+#: cups/ppd-cache.c:3506
 msgid "Inkjet Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3553
+#: cups/ppd-cache.c:3540
 msgid "Inkjet Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3608
+#: cups/ppd-cache.c:3595
 msgid "Inkjet Paper"
 msgstr ""
 
-#: ppdc/sample.c:266
+#: ppdc/sample.c:269
 msgid "Installable Options"
 msgstr "可安装的选项"
 
-#: ppdc/sample.c:269
+#: ppdc/sample.c:272
 msgid "Installed"
 msgstr "已安装"
 
-#: ppdc/sample.c:288
+#: ppdc/sample.c:291
 msgid "IntelliBar Label Printer"
 msgstr "IntelliBar 标签打印机"
 
-#: ppdc/sample.c:287
+#: ppdc/sample.c:290
 msgid "Intellitech"
 msgstr "Intellitech"
 
-#: cups/http-support.c:1546
+#: cups/http-support.c:1551
 msgid "Internal Server Error"
 msgstr ""
 
@@ -4770,7 +4770,7 @@
 msgid "Internet Postage 3-Part"
 msgstr "Internet 邮寄 3 部分"
 
-#: backend/ipp.c:319
+#: backend/ipp.c:318
 msgid "Internet Printing Protocol"
 msgstr "Internet 打印协议"
 
@@ -4937,31 +4937,31 @@
 msgid "Jobs"
 msgstr "作业"
 
-#: cups/ppd-cache.c:2989
+#: cups/ppd-cache.c:3005
 msgid "Jog"
 msgstr ""
 
-#: backend/lpd.c:162
+#: backend/lpd.c:166
 msgid "LPD/LPR Host or Printer"
 msgstr "LPD/LPR 主机或打印机"
 
-#: ppdc/sample.c:230
+#: ppdc/sample.c:231
 msgid "Label Printer"
 msgstr "标签打印机"
 
-#: ppdc/sample.c:441
+#: ppdc/sample.c:444
 msgid "Label Top"
 msgstr "标签顶部"
 
-#: cups/ppd-cache.c:3549
+#: cups/ppd-cache.c:3536
 msgid "Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:2990
+#: cups/ppd-cache.c:3006
 msgid "Laminate"
 msgstr ""
 
-#: cups/ppd-cache.c:3559
+#: cups/ppd-cache.c:3546
 msgid "Laminating Foil"
 msgstr ""
 
@@ -4974,31 +4974,31 @@
 msgid "Large Address"
 msgstr "长地址"
 
-#: cups/ppd-cache.c:3399
+#: cups/ppd-cache.c:3387
 msgid "Large Capacity"
 msgstr ""
 
-#: cups/ppd-cache.c:3808
+#: cups/ppd-cache.c:3776
 msgid "Large Capacity Tray"
 msgstr ""
 
-#: ppdc/sample.c:286
+#: ppdc/sample.c:289
 msgid "LaserJet Series PCL 4/5"
 msgstr "LaserJet 系列 PCL 4/5"
 
-#: cups/ppd-cache.c:3411
+#: cups/ppd-cache.c:3399
 msgid "Left"
 msgstr ""
 
-#: cups/ppd-cache.c:2983
+#: cups/ppd-cache.c:2999
 msgid "Left Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3809
+#: cups/ppd-cache.c:3777
 msgid "Left Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:2984
+#: cups/ppd-cache.c:3000
 msgid "Letter Fold"
 msgstr ""
 
@@ -5010,19 +5010,19 @@
 msgid "Letter Oversize Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:3560 cups/ppd-cache.c:3609
+#: cups/ppd-cache.c:3547 cups/ppd-cache.c:3596
 msgid "Letterhead"
 msgstr ""
 
-#: ppdc/sample.c:236
+#: ppdc/sample.c:240
 msgid "Light"
 msgstr "指示灯"
 
-#: cups/ppd-cache.c:3520
+#: cups/ppd-cache.c:3507
 msgid "Lightweight Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3610
+#: cups/ppd-cache.c:3597
 msgid "Lightweight Paper"
 msgstr ""
 
@@ -5042,91 +5042,91 @@
 msgid "Local printer created."
 msgstr ""
 
-#: cups/ppd-cache.c:3872 ppdc/sample.c:264
+#: cups/ppd-cache.c:3872 ppdc/sample.c:267
 msgid "Long-Edge (Portrait)"
 msgstr "长边（纵向）"
 
-#: cups/http-support.c:1870
+#: cups/http-support.c:1875
 msgid "Looking for printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3810
+#: cups/ppd-cache.c:3778
 msgid "Mailbox 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3819
+#: cups/ppd-cache.c:3787
 msgid "Mailbox 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3811
+#: cups/ppd-cache.c:3779
 msgid "Mailbox 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3812
+#: cups/ppd-cache.c:3780
 msgid "Mailbox 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3813
+#: cups/ppd-cache.c:3781
 msgid "Mailbox 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3814
+#: cups/ppd-cache.c:3782
 msgid "Mailbox 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3815
+#: cups/ppd-cache.c:3783
 msgid "Mailbox 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3816
+#: cups/ppd-cache.c:3784
 msgid "Mailbox 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3817
+#: cups/ppd-cache.c:3785
 msgid "Mailbox 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3818
+#: cups/ppd-cache.c:3786
 msgid "Mailbox 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3397
+#: cups/ppd-cache.c:3385
 msgid "Main"
 msgstr ""
 
-#: cups/ppd-cache.c:3405
+#: ppdc/sample.c:237
 msgid "Main Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3400
+#: cups/ppd-cache.c:3388
 msgid "Manual"
 msgstr ""
 
-#: ppdc/sample.c:260
+#: ppdc/sample.c:263
 msgid "Manual Feed"
 msgstr "手动送纸"
 
-#: cups/ppd-cache.c:3487
+#: cups/ppd-cache.c:3474
 msgid "Matte Brochure Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3488
+#: cups/ppd-cache.c:3475
 msgid "Matte Cover Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3528
+#: cups/ppd-cache.c:3515
 msgid "Matte Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3554
+#: cups/ppd-cache.c:3541
 msgid "Matte Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3504
+#: cups/ppd-cache.c:3491
 msgid "Matte Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3578
+#: cups/ppd-cache.c:3565
 msgid "Matte Photo Paper"
 msgstr ""
 
@@ -5134,19 +5134,19 @@
 msgid "Media Size"
 msgstr "介质大小"
 
-#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:254
+#: cups/ppd.c:808 cups/ppd.c:1345 ppdc/sample.c:236
 msgid "Media Source"
 msgstr "介质来源"
 
-#: ppdc/sample.c:359
+#: ppdc/sample.c:362
 msgid "Media Tracking"
 msgstr "介质跟踪"
 
-#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:280
+#: cups/ppd.c:806 cups/ppd.c:1343 ppdc/sample.c:283
 msgid "Media Type"
 msgstr "介质类型"
 
-#: ppdc/sample.c:237
+#: ppdc/sample.c:241
 msgid "Medium"
 msgstr "中等"
 
@@ -5154,35 +5154,35 @@
 msgid "Memory allocation error"
 msgstr "内存分配错误"
 
-#: cups/ppd-cache.c:3561
+#: cups/ppd-cache.c:3548
 msgid "Metal"
 msgstr ""
 
-#: cups/ppd-cache.c:3562
+#: cups/ppd-cache.c:3549
 msgid "Metal Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3563
+#: cups/ppd-cache.c:3550
 msgid "Metal High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3564
+#: cups/ppd-cache.c:3551
 msgid "Metal Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3565
+#: cups/ppd-cache.c:3552
 msgid "Metal Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3566
+#: cups/ppd-cache.c:3553
 msgid "Metal Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3494
+#: cups/ppd-cache.c:3481
 msgid "Mid-Weight Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3820
+#: cups/ppd-cache.c:3396 cups/ppd-cache.c:3788
 msgid "Middle"
 msgstr ""
 
@@ -5246,11 +5246,11 @@
 msgid "Missing required attributes."
 msgstr ""
 
-#: cups/http-support.c:1636
+#: cups/http-support.c:1641
 msgid "Missing resource in URI"
 msgstr ""
 
-#: cups/http-support.c:1630
+#: cups/http-support.c:1635
 msgid "Missing scheme in URI"
 msgstr ""
 
@@ -5292,7 +5292,7 @@
 msgid "Modify Printer"
 msgstr "修改打印机"
 
-#: cups/ppd-cache.c:3567
+#: cups/ppd-cache.c:3554
 msgid "Mounting Tape"
 msgstr ""
 
@@ -5304,43 +5304,43 @@
 msgid "Move Job"
 msgstr "移动作业"
 
-#: cups/http-support.c:1500
+#: cups/http-support.c:1505
 msgid "Moved Permanently"
 msgstr "永久移动"
 
-#: cups/ppd-cache.c:3568
+#: cups/ppd-cache.c:3555
 msgid "Multi Layer"
 msgstr ""
 
-#: cups/ppd-cache.c:3569
+#: cups/ppd-cache.c:3556
 msgid "Multi Part Form"
 msgstr ""
 
-#: cups/ppd-cache.c:3011
+#: cups/ppd-cache.c:3027
 msgid "Multi-Hole Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3009
+#: cups/ppd-cache.c:3025
 msgid "Multi-Hole Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3008
+#: cups/ppd-cache.c:3024
 msgid "Multi-Hole Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3010
+#: cups/ppd-cache.c:3026
 msgid "Multi-Hole Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3415
+#: cups/ppd-cache.c:3403
 msgid "Multipurpose"
 msgstr ""
 
-#: cups/ppd-cache.c:3493
+#: cups/ppd-cache.c:3480
 msgid "Multipurpose Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3821
+#: cups/ppd-cache.c:3789
 msgid "My Mailbox"
 msgstr ""
 
@@ -5356,15 +5356,15 @@
 msgid "Nested classes are not allowed."
 msgstr ""
 
-#: ppdc/sample.c:425
+#: ppdc/sample.c:428
 msgid "Never"
 msgstr "永不"
 
-#: cups/tls-darwin.c:690 cups/tls-gnutls.c:524
+#: cups/tls-darwin.c:665 cups/tls-gnutls.c:524
 msgid "New credentials are not valid for name."
 msgstr ""
 
-#: cups/tls-darwin.c:680 cups/tls-gnutls.c:514
+#: cups/tls-darwin.c:655 cups/tls-gnutls.c:514
 msgid "New credentials are older than stored credentials."
 msgstr ""
 
@@ -5372,7 +5372,7 @@
 msgid "No"
 msgstr "否"
 
-#: cups/http-support.c:1497
+#: cups/http-support.c:1502
 msgid "No Content"
 msgstr "无内容"
 
@@ -5413,7 +5413,7 @@
 msgid "No authentication information provided."
 msgstr ""
 
-#: cups/tls-darwin.c:630 cups/tls-gnutls.c:461
+#: cups/tls-darwin.c:605 cups/tls-gnutls.c:461
 msgid "No common name specified."
 msgstr ""
 
@@ -5454,7 +5454,7 @@
 msgstr "无名称 OID"
 
 #: filter/rastertoepson.c:1161 filter/rastertohp.c:833
-#: filter/rastertolabel.c:1288
+#: filter/rastertolabel.c:1289
 msgid "No pages were found."
 msgstr ""
 
@@ -5490,7 +5490,7 @@
 msgid "No request-id"
 msgstr "无 request-id"
 
-#: cups/tls-darwin.c:710 cups/tls-gnutls.c:544
+#: cups/tls-darwin.c:685 cups/tls-gnutls.c:544
 msgid "No stored credentials, not valid for name."
 msgstr ""
 
@@ -5510,41 +5510,41 @@
 msgid "No version number"
 msgstr "无版本号"
 
-#: ppdc/sample.c:362
+#: ppdc/sample.c:365
 msgid "Non-continuous (Mark sensing)"
 msgstr "非连续（标记感应）"
 
-#: ppdc/sample.c:361
+#: ppdc/sample.c:364
 msgid "Non-continuous (Web sensing)"
 msgstr "非连续（Web 感应）"
 
-#: cups/ppd-cache.c:4014 cups/ppd-cache.c:4064 cups/ppd-cache.c:4114
-#: cups/ppd-cache.c:4174
+#: cups/ppd-cache.c:4059 cups/ppd-cache.c:4137 cups/ppd-cache.c:4225
+#: cups/ppd-cache.c:4315 cups/ppd-cache.c:4362
 msgid "None"
 msgstr "无"
 
-#: cups/ppd-cache.c:4287 cups/ppd-cache.c:4353 cups/ppd-cache.c:4387
-#: ppdc/sample.c:238
+#: cups/ppd-cache.c:4475 cups/ppd-cache.c:4541 cups/ppd-cache.c:4575
+#: ppdc/sample.c:242
 msgid "Normal"
 msgstr "正常"
 
-#: cups/http-support.c:1522
+#: cups/http-support.c:1527
 msgid "Not Found"
 msgstr "找不到"
 
-#: cups/http-support.c:1534
+#: cups/http-support.c:1539
 msgid "Not Implemented"
 msgstr "未完成"
 
-#: ppdc/sample.c:268
+#: ppdc/sample.c:271
 msgid "Not Installed"
 msgstr "未安装"
 
-#: cups/http-support.c:1509
+#: cups/http-support.c:1514
 msgid "Not Modified"
 msgstr "未修改"
 
-#: cups/http-support.c:1537
+#: cups/http-support.c:1542
 msgid "Not Supported"
 msgstr "不支持"
 
@@ -5562,19 +5562,19 @@
 "itself."
 msgstr ""
 
-#: cups/http-support.c:1488 cups/http-support.c:1627 cups/ppd.c:283
+#: cups/http-support.c:1493 cups/http-support.c:1632 cups/ppd.c:283
 msgid "OK"
 msgstr "好"
 
-#: cups/ppd-cache.c:3872 ppdc/sample.c:263
+#: cups/ppd-cache.c:3872 ppdc/sample.c:266
 msgid "Off (1-Sided)"
 msgstr "关闭（单面）"
 
-#: cups/ppd-cache.c:3489
+#: cups/ppd-cache.c:3476
 msgid "Office Recycled Paper"
 msgstr ""
 
-#: ppdc/sample.c:356
+#: ppdc/sample.c:359
 msgid "Oki"
 msgstr "Oki"
 
@@ -5603,7 +5603,7 @@
 msgid "Operation Policy"
 msgstr "操作策略"
 
-#: cups/ppd-cache.c:3501
+#: cups/ppd-cache.c:3488
 msgid "Optical Disc"
 msgstr ""
 
@@ -5617,17 +5617,17 @@
 msgstr "选项已安装"
 
 #: berkeley/lpq.c:642 berkeley/lpr.c:431 berkeley/lprm.c:232
-#: scheduler/cupsfilter.c:1476 scheduler/main.c:2133 systemv/cancel.c:401
+#: scheduler/cupsfilter.c:1476 scheduler/main.c:2135 systemv/cancel.c:401
 #: systemv/cupsaccept.c:243 systemv/cupsctl.c:232 systemv/cupstestppd.c:3857
 #: systemv/lp.c:750 systemv/lpadmin.c:1620 systemv/lpinfo.c:497
 #: systemv/lpmove.c:216 systemv/lpoptions.c:538 systemv/lpstat.c:2044
-#: tools/ippeveprinter.c:7664 tools/ippfind.c:2765 tools/ipptool.c:4307
+#: tools/ippeveprinter.c:7922 tools/ippfind.c:2765 tools/ipptool.c:4307
 #: ppdc/ppdc.cxx:426 ppdc/ppdhtml.cxx:173 ppdc/ppdi.cxx:119
 #: ppdc/ppdmerge.cxx:356 ppdc/ppdpo.cxx:243
 msgid "Options:"
 msgstr ""
 
-#: cups/ppd-cache.c:3570
+#: cups/ppd-cache.c:3557
 msgid "Other"
 msgstr ""
 
@@ -5659,7 +5659,7 @@
 msgid "PASS"
 msgstr ""
 
-#: ppdc/sample.c:252
+#: ppdc/sample.c:256
 msgid "PCL Laser Printer"
 msgstr "PCL 激光打印机"
 
@@ -5695,7 +5695,7 @@
 msgid "Packet does not start with SEQUENCE"
 msgstr "包不以 SEQUENCE 开始"
 
-#: cups/ppd-cache.c:3571
+#: cups/ppd-cache.c:3558
 msgid "Paper"
 msgstr ""
 
@@ -5715,15 +5715,15 @@
 msgid "Paper tray is missing."
 msgstr ""
 
-#: cups/ppd-cache.c:2985
+#: cups/ppd-cache.c:3001
 msgid "Parallel Fold"
 msgstr ""
 
-#: ppdc/sample.c:355
+#: ppdc/sample.c:358
 msgid "ParamCustominCutInterval"
 msgstr "ParamCustominCutInterval"
 
-#: ppdc/sample.c:353
+#: ppdc/sample.c:356
 msgid "ParamCustominTearInterval"
 msgstr "ParamCustominTearInterval"
 
@@ -5745,11 +5745,11 @@
 msgid "Pause Printer"
 msgstr "打印机暂停打印"
 
-#: ppdc/sample.c:443
+#: ppdc/sample.c:446
 msgid "Peel-Off"
 msgstr "剥离"
 
-#: cups/ppd-cache.c:3555
+#: cups/ppd-cache.c:3542
 msgid "Permanent Labels"
 msgstr ""
 
@@ -5757,7 +5757,7 @@
 msgid "Photo"
 msgstr "照片"
 
-#: cups/ppd-cache.c:3575
+#: cups/ppd-cache.c:3562
 msgid "Photo Film"
 msgstr ""
 
@@ -5765,59 +5765,59 @@
 msgid "Photo Labels"
 msgstr "照片标签"
 
-#: cups/ppd-cache.c:3572 cups/ppd-cache.c:3573
+#: cups/ppd-cache.c:3559 cups/ppd-cache.c:3560
 msgid "Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3545 cups/ppd-cache.c:3547
+#: cups/ppd-cache.c:3532 cups/ppd-cache.c:3534
 msgid "Photo Paper Plus Glossy II"
 msgstr ""
 
-#: cups/ppd-cache.c:3546 cups/ppd-cache.c:3548
+#: cups/ppd-cache.c:3533 cups/ppd-cache.c:3535
 msgid "Photo Paper Pro Platinum"
 msgstr ""
 
-#: cups/ppd-cache.c:3521
+#: cups/ppd-cache.c:3508
 msgid "Plain Envelope"
 msgstr ""
 
-#: ppdc/sample.c:281
+#: ppdc/sample.c:284
 msgid "Plain Paper"
 msgstr "普通纸张"
 
-#: cups/ppd-cache.c:3581
+#: cups/ppd-cache.c:3568
 msgid "Plastic"
 msgstr ""
 
-#: cups/ppd-cache.c:3582
+#: cups/ppd-cache.c:3569
 msgid "Plastic Archival"
 msgstr ""
 
-#: cups/ppd-cache.c:3583
+#: cups/ppd-cache.c:3570
 msgid "Plastic Colored"
 msgstr ""
 
-#: cups/ppd-cache.c:3584
+#: cups/ppd-cache.c:3571
 msgid "Plastic Glossy"
 msgstr ""
 
-#: cups/ppd-cache.c:3585
+#: cups/ppd-cache.c:3572
 msgid "Plastic High Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3586
+#: cups/ppd-cache.c:3573
 msgid "Plastic Matte"
 msgstr ""
 
-#: cups/ppd-cache.c:3587
+#: cups/ppd-cache.c:3574
 msgid "Plastic Satin"
 msgstr ""
 
-#: cups/ppd-cache.c:3588
+#: cups/ppd-cache.c:3575
 msgid "Plastic Semi Gloss"
 msgstr ""
 
-#: cups/ppd-cache.c:3589
+#: cups/ppd-cache.c:3576
 msgid "Plate"
 msgstr ""
 
@@ -5825,7 +5825,7 @@
 msgid "Policies"
 msgstr "策略"
 
-#: cups/ppd-cache.c:3590
+#: cups/ppd-cache.c:3577
 msgid "Polyester"
 msgstr ""
 
@@ -5833,7 +5833,7 @@
 msgid "Port Monitor"
 msgstr "端口监视器"
 
-#: ppdc/sample.c:270
+#: ppdc/sample.c:273
 msgid "PostScript Printer"
 msgstr "PostScript 打印机"
 
@@ -5853,39 +5853,39 @@
 msgid "Postcard Long Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:2986
+#: cups/ppd-cache.c:3002
 msgid "Poster Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3591
+#: cups/ppd-cache.c:3578
 msgid "Pre Cut Tabs"
 msgstr ""
 
-#: cups/ppd-cache.c:3495
+#: cups/ppd-cache.c:3482
 msgid "Premium Inkjet Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3496
+#: cups/ppd-cache.c:3483
 msgid "Premium Photo Glossy Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3497
+#: cups/ppd-cache.c:3484
 msgid "Premium Presentation Matte Paper"
 msgstr ""
 
-#: backend/ipp.c:973 backend/ipp.c:981
+#: backend/ipp.c:972 backend/ipp.c:980
 msgid "Preparing to print."
 msgstr ""
 
-#: cups/ppd-cache.c:3522
+#: cups/ppd-cache.c:3509
 msgid "Preprinted Envelope"
 msgstr ""
 
-#: cups/ppd-cache.c:3611
+#: cups/ppd-cache.c:3598
 msgid "Preprinted Paper"
 msgstr ""
 
-#: ppdc/sample.c:290
+#: ppdc/sample.c:293
 msgid "Print Density"
 msgstr "打印密度"
 
@@ -5893,15 +5893,15 @@
 msgid "Print Job:"
 msgstr "打印作业："
 
-#: ppdc/sample.c:335
+#: ppdc/sample.c:338
 msgid "Print Mode"
 msgstr "打印模式"
 
-#: cups/ppd-cache.c:4281 cups/ppd-cache.c:4343 cups/ppd-cache.c:4383
+#: cups/ppd-cache.c:4469 cups/ppd-cache.c:4531 cups/ppd-cache.c:4571
 msgid "Print Quality"
 msgstr ""
 
-#: ppdc/sample.c:378
+#: ppdc/sample.c:381
 msgid "Print Rate"
 msgstr "打印速率"
 
@@ -5909,7 +5909,7 @@
 msgid "Print Self-Test Page"
 msgstr "打印自测试页面"
 
-#: ppdc/sample.c:322
+#: ppdc/sample.c:325
 msgid "Print Speed"
 msgstr "打印速度"
 
@@ -5917,11 +5917,11 @@
 msgid "Print Test Page"
 msgstr "打印测试页"
 
-#: ppdc/sample.c:351
+#: ppdc/sample.c:354
 msgid "Print and Cut"
 msgstr "打印和切纸"
 
-#: ppdc/sample.c:339
+#: ppdc/sample.c:342
 msgid "Print and Tear"
 msgstr "打印和撕纸"
 
@@ -5929,15 +5929,15 @@
 msgid "Print file sent."
 msgstr ""
 
-#: backend/ipp.c:2261
+#: backend/ipp.c:2269
 msgid "Print job canceled at printer."
 msgstr ""
 
-#: backend/ipp.c:2253
+#: backend/ipp.c:2261
 msgid "Print job too large."
 msgstr ""
 
-#: backend/ipp.c:1721
+#: backend/ipp.c:1722
 msgid "Print job was not accepted."
 msgstr ""
 
@@ -5950,7 +5950,7 @@
 msgid "Printer Added"
 msgstr "打印机已添加"
 
-#: ppdc/sample.c:255
+#: ppdc/sample.c:258
 msgid "Printer Default"
 msgstr "打印机默认"
 
@@ -5966,19 +5966,19 @@
 msgid "Printer Paused"
 msgstr "打印机已暂停"
 
-#: ppdc/sample.c:289
+#: ppdc/sample.c:292
 msgid "Printer Settings"
 msgstr "打印机设置"
 
-#: backend/ipp.c:2256
+#: backend/ipp.c:2264
 msgid "Printer cannot print supplied content."
 msgstr ""
 
-#: backend/ipp.c:2259
+#: backend/ipp.c:2267
 msgid "Printer cannot print with supplied options."
 msgstr ""
 
-#: cups/ppd-cache.c:4556
+#: cups/ppd-cache.c:4744
 msgid "Printer does not support required IPP attributes or document formats."
 msgstr ""
 
@@ -5991,16 +5991,16 @@
 msgstr "打印机"
 
 #: filter/rastertoepson.c:1107 filter/rastertohp.c:774
-#: filter/rastertolabel.c:1235
+#: filter/rastertolabel.c:1236
 #, c-format
 msgid "Printing page %d, %u%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:4111
+#: cups/ppd-cache.c:4222
 msgid "Punch"
 msgstr ""
 
-#: cups/ppd-cache.c:3612
+#: cups/ppd-cache.c:3599
 msgid "Punched Paper"
 msgstr ""
 
@@ -6016,11 +6016,11 @@
 msgid "Rank    Owner   Job     File(s)                         Total Size"
 msgstr ""
 
-#: cups/ppd-cache.c:3414
+#: cups/ppd-cache.c:3402
 msgid "Rear"
 msgstr ""
 
-#: cups/ppd-cache.c:3822
+#: cups/ppd-cache.c:3790
 msgid "Rear Tray"
 msgstr ""
 
@@ -6028,25 +6028,25 @@
 msgid "Reject Jobs"
 msgstr "拒绝作业"
 
-#: backend/lpd.c:1074 backend/lpd.c:1206
+#: backend/lpd.c:1078 backend/lpd.c:1210
 #, c-format
 msgid "Remote host did not accept control file (%d)."
 msgstr ""
 
-#: backend/lpd.c:1159
+#: backend/lpd.c:1163
 #, c-format
 msgid "Remote host did not accept data file (%d)."
 msgstr ""
 
-#: ppdc/sample.c:423
+#: ppdc/sample.c:426
 msgid "Reprint After Error"
 msgstr "出错后重新打印"
 
-#: cups/http-support.c:1525
+#: cups/http-support.c:1530
 msgid "Request Entity Too Large"
 msgstr "请求实体太大"
 
-#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:231
+#: cups/ppd.c:812 cups/ppd.c:1349 ppdc/sample.c:232
 msgid "Resolution"
 msgstr "分辨率"
 
@@ -6062,63 +6062,63 @@
 msgid "Return Address"
 msgstr "寄信人地址"
 
-#: ppdc/sample.c:444
+#: ppdc/sample.c:447
 msgid "Rewind"
 msgstr "倒回"
 
-#: cups/ppd-cache.c:3412
+#: cups/ppd-cache.c:3400
 msgid "Right"
 msgstr ""
 
-#: cups/ppd-cache.c:2987
+#: cups/ppd-cache.c:3003
 msgid "Right Gate Fold"
 msgstr ""
 
-#: cups/ppd-cache.c:3823
+#: cups/ppd-cache.c:3791
 msgid "Right Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3592
+#: cups/ppd-cache.c:3579
 msgid "Roll"
 msgstr ""
 
-#: cups/ppd-cache.c:3436
+#: cups/ppd-cache.c:3424
 msgid "Roll 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3445
+#: cups/ppd-cache.c:3433
 msgid "Roll 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3437
+#: cups/ppd-cache.c:3425
 msgid "Roll 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3438
+#: cups/ppd-cache.c:3426
 msgid "Roll 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3439
+#: cups/ppd-cache.c:3427
 msgid "Roll 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3440
+#: cups/ppd-cache.c:3428
 msgid "Roll 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3441
+#: cups/ppd-cache.c:3429
 msgid "Roll 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3442
+#: cups/ppd-cache.c:3430
 msgid "Roll 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3443
+#: cups/ppd-cache.c:3431
 msgid "Roll 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3444
+#: cups/ppd-cache.c:3432
 msgid "Roll 9"
 msgstr ""
 
@@ -6131,39 +6131,39 @@
 msgid "SEQUENCE uses indefinite length"
 msgstr "SEQUENCE 使用不定长度"
 
-#: cups/http-support.c:1549
+#: cups/http-support.c:1554
 msgid "SSL/TLS Negotiation Error"
 msgstr ""
 
-#: cups/ppd-cache.c:3012
+#: cups/ppd-cache.c:3028
 msgid "Saddle Stitch"
 msgstr ""
 
-#: cups/ppd-cache.c:3556
+#: cups/ppd-cache.c:3543
 msgid "Satin Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3505
+#: cups/ppd-cache.c:3492
 msgid "Satin Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3579
+#: cups/ppd-cache.c:3566
 msgid "Satin Photo Paper"
 msgstr ""
 
-#: cups/ppd-cache.c:3593
+#: cups/ppd-cache.c:3580
 msgid "Screen"
 msgstr ""
 
-#: cups/ppd-cache.c:3594
+#: cups/ppd-cache.c:3581
 msgid "Screen Paged"
 msgstr ""
 
-#: cups/ppd-cache.c:3557
+#: cups/ppd-cache.c:3544
 msgid "Security Labels"
 msgstr ""
 
-#: cups/http-support.c:1506
+#: cups/http-support.c:1511
 msgid "See Other"
 msgstr "请参阅其他"
 
@@ -6171,31 +6171,31 @@
 msgid "See remote printer."
 msgstr ""
 
-#: cups/ppd-cache.c:3595
+#: cups/ppd-cache.c:3582
 msgid "Self Adhesive"
 msgstr ""
 
-#: cups/ppd-cache.c:3596
+#: cups/ppd-cache.c:3583
 msgid "Self Adhesive Film"
 msgstr ""
 
-#: cups/tls-darwin.c:765 cups/tls-gnutls.c:606
+#: cups/tls-darwin.c:740 cups/tls-gnutls.c:606
 msgid "Self-signed credentials are blocked."
 msgstr ""
 
-#: cups/ppd-cache.c:3529
+#: cups/ppd-cache.c:3516
 msgid "Semi-Gloss Fabric"
 msgstr ""
 
-#: cups/ppd-cache.c:3558
+#: cups/ppd-cache.c:3545
 msgid "Semi-Gloss Labels"
 msgstr ""
 
-#: cups/ppd-cache.c:3506
+#: cups/ppd-cache.c:3493
 msgid "Semi-Gloss Optical Disc"
 msgstr ""
 
-#: cups/ppd-cache.c:3580
+#: cups/ppd-cache.c:3567
 msgid "Semi-Gloss Photo Paper"
 msgstr ""
 
@@ -6219,11 +6219,11 @@
 msgid "Server Stopped"
 msgstr "服务器已停止"
 
-#: cups/tls-darwin.c:1275 cups/tls-gnutls.c:1298
+#: cups/tls-darwin.c:1250 cups/tls-gnutls.c:1299
 msgid "Server credentials not set."
 msgstr ""
 
-#: cups/http-support.c:1543
+#: cups/http-support.c:1548
 msgid "Service Unavailable"
 msgstr "服务不可用"
 
@@ -6252,140 +6252,140 @@
 msgid "Shipping Address"
 msgstr "送货地址"
 
-#: cups/ppd-cache.c:3872 ppdc/sample.c:265
+#: cups/ppd-cache.c:3872 ppdc/sample.c:268
 msgid "Short-Edge (Landscape)"
 msgstr "短边（横向）"
 
-#: cups/ppd-cache.c:3597
+#: cups/ppd-cache.c:3584
 msgid "Shrink Foil"
 msgstr ""
 
-#: cups/ppd-cache.c:3410
+#: cups/ppd-cache.c:3398
 msgid "Side"
 msgstr ""
 
-#: cups/ppd-cache.c:3824
+#: cups/ppd-cache.c:3792
 msgid "Side Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3598
+#: cups/ppd-cache.c:3585
 msgid "Single Face"
 msgstr ""
 
-#: cups/ppd-cache.c:3003
+#: cups/ppd-cache.c:3019
 msgid "Single Punch (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3002
+#: cups/ppd-cache.c:3018
 msgid "Single Punch (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2992
+#: cups/ppd-cache.c:3008
 msgid "Single Punch (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2993
+#: cups/ppd-cache.c:3009
 msgid "Single Punch (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3021
+#: cups/ppd-cache.c:3037
 msgid "Single Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3020
+#: cups/ppd-cache.c:3036
 msgid "Single Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3014
+#: cups/ppd-cache.c:3030
 msgid "Single Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3015
+#: cups/ppd-cache.c:3031
 msgid "Single Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3599
+#: cups/ppd-cache.c:3586
 msgid "Single Wall Cardboard"
 msgstr ""
 
-#: cups/ppd-cache.c:3600
+#: cups/ppd-cache.c:3587
 msgid "Sleeve"
 msgstr ""
 
-#: ppdc/sample.c:283
+#: ppdc/sample.c:286
 msgid "Special Paper"
 msgstr "专用纸张"
 
-#: backend/lpd.c:1115
+#: backend/lpd.c:1119
 #, c-format
 msgid "Spooling job, %.0f%% complete."
 msgstr ""
 
-#: cups/ppd-cache.c:3825
+#: cups/ppd-cache.c:3793
 msgid "Stacker 1"
 msgstr ""
 
-#: cups/ppd-cache.c:3834
+#: cups/ppd-cache.c:3802
 msgid "Stacker 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3826
+#: cups/ppd-cache.c:3794
 msgid "Stacker 2"
 msgstr ""
 
-#: cups/ppd-cache.c:3827
+#: cups/ppd-cache.c:3795
 msgid "Stacker 3"
 msgstr ""
 
-#: cups/ppd-cache.c:3828
+#: cups/ppd-cache.c:3796
 msgid "Stacker 4"
 msgstr ""
 
-#: cups/ppd-cache.c:3829
+#: cups/ppd-cache.c:3797
 msgid "Stacker 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3830
+#: cups/ppd-cache.c:3798
 msgid "Stacker 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3831
+#: cups/ppd-cache.c:3799
 msgid "Stacker 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3832
+#: cups/ppd-cache.c:3800
 msgid "Stacker 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3833
+#: cups/ppd-cache.c:3801
 msgid "Stacker 9"
 msgstr ""
 
-#: ppdc/sample.c:336
+#: ppdc/sample.c:339
 msgid "Standard"
 msgstr "标准"
 
-#: cups/ppd-cache.c:4011
+#: cups/ppd-cache.c:4056
 msgid "Staple"
 msgstr ""
 
-#: cups/ppd-cache.c:2971
+#: cups/ppd-cache.c:2987
 msgid "Staple Edge"
 msgstr ""
 
-#: cups/ppd-cache.c:2975
+#: cups/ppd-cache.c:2991
 msgid "Staple Edge (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2973
+#: cups/ppd-cache.c:2989
 msgid "Staple Edge (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:2972
+#: cups/ppd-cache.c:2988
 msgid "Staple Edge (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:2974
+#: cups/ppd-cache.c:2990
 msgid "Staple Edge (Reverse Portrait)"
 msgstr ""
 
@@ -6395,7 +6395,7 @@
 msgstr "启动标题"
 
 #: filter/rastertoepson.c:1083 filter/rastertohp.c:750
-#: filter/rastertolabel.c:1211
+#: filter/rastertolabel.c:1212
 #, c-format
 msgid "Starting page %d."
 msgstr ""
@@ -6426,11 +6426,11 @@
 msgid "Super B/A3"
 msgstr "Super B/A3"
 
-#: cups/http-support.c:1485
+#: cups/http-support.c:1490
 msgid "Switching Protocols"
 msgstr "交换协议"
 
-#: cups/ppd-cache.c:3613
+#: cups/ppd-cache.c:3600
 msgid "Tab Stock"
 msgstr ""
 
@@ -6446,15 +6446,15 @@
 msgid "Tabloid Oversize Long Edge"
 msgstr ""
 
-#: ppdc/sample.c:337
+#: ppdc/sample.c:340
 msgid "Tear"
 msgstr "撕纸"
 
-#: ppdc/sample.c:442
+#: ppdc/sample.c:445
 msgid "Tear-Off"
 msgstr "撕纸"
 
-#: ppdc/sample.c:383
+#: ppdc/sample.c:386
 msgid "Tear-Off Adjust Position"
 msgstr "撕纸调整位置"
 
@@ -6492,7 +6492,7 @@
 msgstr "PPD 文件“%s”未能打开。%s"
 
 #: filter/rastertoepson.c:1052 filter/rastertohp.c:721
-#: filter/rastertolabel.c:1175
+#: filter/rastertolabel.c:1176
 msgid "The PPD file could not be opened."
 msgstr ""
 
@@ -6536,17 +6536,17 @@
 msgid "The optical photoconductor will need to be replaced soon."
 msgstr ""
 
-#: backend/ipp.c:993
+#: backend/ipp.c:992
 msgid ""
 "The printer configuration is incorrect or the printer no longer exists."
 msgstr ""
 
-#: backend/lpd.c:678 backend/lpd.c:1067 backend/lpd.c:1149 backend/lpd.c:1199
+#: backend/lpd.c:682 backend/lpd.c:1071 backend/lpd.c:1153 backend/lpd.c:1203
 msgid "The printer did not respond."
 msgstr ""
 
-#: backend/ipp.c:766 backend/ipp.c:956 backend/ipp.c:1070 backend/ipp.c:1523
-#: backend/ipp.c:1693 backend/lpd.c:886 backend/socket.c:354
+#: backend/ipp.c:765 backend/ipp.c:955 backend/ipp.c:1069 backend/ipp.c:1524
+#: backend/ipp.c:1694 backend/lpd.c:890 backend/socket.c:354
 #: backend/usb-unix.c:117 backend/usb-unix.c:407 backend/usb-unix.c:490
 msgid "The printer is in use."
 msgstr ""
@@ -6563,8 +6563,8 @@
 msgid "The printer is not connected."
 msgstr ""
 
-#: backend/ipp.c:744 backend/ipp.c:777 backend/ipp.c:952 backend/lpd.c:865
-#: backend/lpd.c:906 backend/socket.c:333 backend/socket.c:366
+#: backend/ipp.c:743 backend/ipp.c:776 backend/ipp.c:951 backend/lpd.c:869
+#: backend/lpd.c:910 backend/socket.c:333 backend/socket.c:366
 msgid "The printer is not responding."
 msgstr ""
 
@@ -6580,7 +6580,7 @@
 msgid "The printer is offline."
 msgstr ""
 
-#: backend/ipp.c:760 backend/lpd.c:880 backend/socket.c:348
+#: backend/ipp.c:759 backend/lpd.c:884 backend/socket.c:348
 msgid "The printer is unreachable at this time."
 msgstr ""
 
@@ -6592,7 +6592,7 @@
 msgid "The printer may be out of toner."
 msgstr ""
 
-#: backend/ipp.c:753 backend/lpd.c:873 backend/socket.c:341
+#: backend/ipp.c:752 backend/lpd.c:877 backend/socket.c:341
 msgid "The printer may not exist or is unavailable at this time."
 msgstr ""
 
@@ -6682,7 +6682,7 @@
 msgid "There was an unrecoverable USB error."
 msgstr ""
 
-#: ppdc/sample.c:430
+#: ppdc/sample.c:433
 msgid "Thermal Transfer Media"
 msgstr "热转印介质"
 
@@ -6700,140 +6700,140 @@
 msgid "Too many printer-state-reasons values (%d > %d)."
 msgstr ""
 
-#: cups/ppd-cache.c:3407
+#: cups/ppd-cache.c:3395
 msgid "Top"
 msgstr ""
 
-#: cups/ppd-cache.c:3835
+#: cups/ppd-cache.c:3803
 msgid "Top Tray"
 msgstr ""
 
-#: cups/ppd-cache.c:3614
+#: cups/ppd-cache.c:3601
 msgid "Tractor"
 msgstr ""
 
-#: cups/ppd-cache.c:3615
+#: cups/ppd-cache.c:3602
 msgid "Transfer"
 msgstr ""
 
-#: ppdc/sample.c:284
+#: ppdc/sample.c:287
 msgid "Transparency"
 msgstr "透明度"
 
-#: ppdc/sample.c:279
+#: ppdc/sample.c:282
 msgid "Tray"
 msgstr "纸盒"
 
-#: ppdc/sample.c:256
+#: ppdc/sample.c:259
 msgid "Tray 1"
 msgstr "纸盒 1"
 
-#: cups/ppd-cache.c:3425 cups/ppd-cache.c:3845
+#: cups/ppd-cache.c:3413 cups/ppd-cache.c:3813
 msgid "Tray 10"
 msgstr ""
 
-#: cups/ppd-cache.c:3426
+#: cups/ppd-cache.c:3414
 msgid "Tray 11"
 msgstr ""
 
-#: cups/ppd-cache.c:3427
+#: cups/ppd-cache.c:3415
 msgid "Tray 12"
 msgstr ""
 
-#: cups/ppd-cache.c:3428
+#: cups/ppd-cache.c:3416
 msgid "Tray 13"
 msgstr ""
 
-#: cups/ppd-cache.c:3429
+#: cups/ppd-cache.c:3417
 msgid "Tray 14"
 msgstr ""
 
-#: cups/ppd-cache.c:3430
+#: cups/ppd-cache.c:3418
 msgid "Tray 15"
 msgstr ""
 
-#: cups/ppd-cache.c:3431
+#: cups/ppd-cache.c:3419
 msgid "Tray 16"
 msgstr ""
 
-#: cups/ppd-cache.c:3432
+#: cups/ppd-cache.c:3420
 msgid "Tray 17"
 msgstr ""
 
-#: cups/ppd-cache.c:3433
+#: cups/ppd-cache.c:3421
 msgid "Tray 18"
 msgstr ""
 
-#: cups/ppd-cache.c:3434
+#: cups/ppd-cache.c:3422
 msgid "Tray 19"
 msgstr ""
 
-#: ppdc/sample.c:257
+#: ppdc/sample.c:260
 msgid "Tray 2"
 msgstr "纸盒 2"
 
-#: cups/ppd-cache.c:3435
+#: cups/ppd-cache.c:3423
 msgid "Tray 20"
 msgstr ""
 
-#: ppdc/sample.c:258
+#: ppdc/sample.c:261
 msgid "Tray 3"
 msgstr "纸盒 3"
 
-#: ppdc/sample.c:259
+#: ppdc/sample.c:262
 msgid "Tray 4"
 msgstr "纸盒 4"
 
-#: cups/ppd-cache.c:3420 cups/ppd-cache.c:3840
+#: cups/ppd-cache.c:3408 cups/ppd-cache.c:3808
 msgid "Tray 5"
 msgstr ""
 
-#: cups/ppd-cache.c:3421 cups/ppd-cache.c:3841
+#: cups/ppd-cache.c:3409 cups/ppd-cache.c:3809
 msgid "Tray 6"
 msgstr ""
 
-#: cups/ppd-cache.c:3422 cups/ppd-cache.c:3842
+#: cups/ppd-cache.c:3410 cups/ppd-cache.c:3810
 msgid "Tray 7"
 msgstr ""
 
-#: cups/ppd-cache.c:3423 cups/ppd-cache.c:3843
+#: cups/ppd-cache.c:3411 cups/ppd-cache.c:3811
 msgid "Tray 8"
 msgstr ""
 
-#: cups/ppd-cache.c:3424 cups/ppd-cache.c:3844
+#: cups/ppd-cache.c:3412 cups/ppd-cache.c:3812
 msgid "Tray 9"
 msgstr ""
 
-#: cups/ppd-cache.c:3025
+#: cups/ppd-cache.c:3041
 msgid "Triple Staple (Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3023
+#: cups/ppd-cache.c:3039
 msgid "Triple Staple (Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3022
+#: cups/ppd-cache.c:3038
 msgid "Triple Staple (Reverse Landscape)"
 msgstr ""
 
-#: cups/ppd-cache.c:3024
+#: cups/ppd-cache.c:3040
 msgid "Triple Staple (Reverse Portrait)"
 msgstr ""
 
-#: cups/ppd-cache.c:3617
+#: cups/ppd-cache.c:3604
 msgid "Triple Wall Cardboard"
 msgstr ""
 
-#: cups/tls-darwin.c:670 cups/tls-darwin.c:752 cups/tls-gnutls.c:504
+#: cups/tls-darwin.c:645 cups/tls-darwin.c:727 cups/tls-gnutls.c:504
 #: cups/tls-gnutls.c:586
 msgid "Trust on first use is disabled."
 msgstr ""
 
-#: cups/http-support.c:1528
+#: cups/http-support.c:1533
 msgid "URI Too Long"
 msgstr "URI 太长"
 
-#: cups/http-support.c:1603
+#: cups/http-support.c:1608
 msgid "URI too large"
 msgstr ""
 
@@ -6889,7 +6889,7 @@
 msgid "Unable to add class"
 msgstr ""
 
-#: backend/ipp.c:1880
+#: backend/ipp.c:1887
 msgid "Unable to add document to print job."
 msgstr ""
 
@@ -6914,11 +6914,11 @@
 msgid "Unable to allocate memory for pages array"
 msgstr ""
 
-#: cgi-bin/admin.c:1510
+#: cgi-bin/admin.c:1509
 msgid "Unable to cancel RSS subscription"
 msgstr ""
 
-#: backend/ipp.c:2165 backend/ipp.c:2696
+#: backend/ipp.c:2173 backend/ipp.c:2704
 msgid "Unable to cancel print job."
 msgstr ""
 
@@ -6952,7 +6952,7 @@
 msgid "Unable to connect to host."
 msgstr "无法连接到主机。"
 
-#: backend/ipp.c:723 backend/ipp.c:1275 backend/lpd.c:846 backend/socket.c:314
+#: backend/ipp.c:722 backend/ipp.c:1274 backend/lpd.c:850 backend/socket.c:314
 #: backend/usb-unix.c:103
 msgid "Unable to contact printer, queuing on next printer in class."
 msgstr ""
@@ -6991,7 +6991,7 @@
 msgid "Unable to copy Windows 9x printer driver files (%d)."
 msgstr ""
 
-#: cups/tls-darwin.c:636 cups/tls-gnutls.c:467
+#: cups/tls-darwin.c:611 cups/tls-gnutls.c:467
 msgid "Unable to create credentials from array."
 msgstr ""
 
@@ -7003,7 +7003,7 @@
 msgid "Unable to create printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1566 cups/tls-gnutls.c:1510
+#: cups/tls-darwin.c:1541 cups/tls-gnutls.c:1511
 msgid "Unable to create server credentials."
 msgstr ""
 
@@ -7027,37 +7027,37 @@
 msgid "Unable to edit cupsd.conf files larger than 1MB"
 msgstr ""
 
-#: cups/tls-darwin.c:1754
+#: cups/tls-darwin.c:1729
 msgid ""
 "Unable to establish a secure connection to host (certificate chain invalid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1744
+#: cups/tls-darwin.c:1719
 msgid ""
 "Unable to establish a secure connection to host (certificate not yet valid)."
 msgstr ""
 
-#: cups/tls-darwin.c:1739
+#: cups/tls-darwin.c:1714
 msgid ""
 "Unable to establish a secure connection to host (expired certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1749
+#: cups/tls-darwin.c:1724
 msgid "Unable to establish a secure connection to host (host name mismatch)."
 msgstr ""
 
-#: cups/tls-darwin.c:1759
+#: cups/tls-darwin.c:1734
 msgid ""
 "Unable to establish a secure connection to host (peer dropped connection "
 "before responding)."
 msgstr ""
 
-#: cups/tls-darwin.c:1734
+#: cups/tls-darwin.c:1709
 msgid ""
 "Unable to establish a secure connection to host (self-signed certificate)."
 msgstr ""
 
-#: cups/tls-darwin.c:1729
+#: cups/tls-darwin.c:1704
 msgid ""
 "Unable to establish a secure connection to host (untrusted certificate)."
 msgstr ""
@@ -7070,15 +7070,15 @@
 msgid "Unable to find destination for job"
 msgstr ""
 
-#: cups/http-support.c:2094
+#: cups/http-support.c:2099
 msgid "Unable to find printer."
 msgstr ""
 
-#: cups/tls-darwin.c:1579
+#: cups/tls-darwin.c:1554
 msgid "Unable to find server credentials."
 msgstr ""
 
-#: backend/ipp.c:3359
+#: backend/ipp.c:3367
 msgid "Unable to get backend exit status."
 msgstr ""
 
@@ -7106,7 +7106,7 @@
 msgid "Unable to get printer status"
 msgstr ""
 
-#: backend/ipp.c:1017
+#: backend/ipp.c:1016
 msgid "Unable to get printer status."
 msgstr ""
 
@@ -7129,7 +7129,7 @@
 msgid "Unable to locate printer \"%s\"."
 msgstr ""
 
-#: backend/dnssd.c:752 backend/ipp.c:336 backend/lpd.c:181
+#: backend/dnssd.c:752 backend/ipp.c:335 backend/lpd.c:185
 #: backend/socket.c:155
 msgid "Unable to locate printer."
 msgstr ""
@@ -7171,14 +7171,14 @@
 msgid "Unable to open help file."
 msgstr ""
 
-#: backend/ipp.c:377 backend/ipp.c:1620 backend/ipp.c:1833 backend/lpd.c:469
+#: backend/ipp.c:376 backend/ipp.c:1621 backend/ipp.c:1834 backend/lpd.c:473
 #: backend/socket.c:142 backend/usb.c:224 filter/gziptoany.c:65
 #: filter/pstops.c:262
 msgid "Unable to open print file"
 msgstr ""
 
 #: filter/rastertoepson.c:1012 filter/rastertohp.c:681
-#: filter/rastertolabel.c:1133
+#: filter/rastertolabel.c:1134
 msgid "Unable to open raster file"
 msgstr ""
 
@@ -7195,7 +7195,7 @@
 msgid "Unable to rename job document file."
 msgstr ""
 
-#: cups/dest.c:3265
+#: cups/dest.c:3252
 msgid "Unable to resolve printer-uri."
 msgstr ""
 
@@ -7229,7 +7229,7 @@
 msgid "Unable to set server default"
 msgstr ""
 
-#: backend/ipp.c:3218 backend/ipp.c:3295 backend/ipp.c:3303
+#: backend/ipp.c:3226 backend/ipp.c:3303 backend/ipp.c:3311
 msgid "Unable to start backend process."
 msgstr ""
 
@@ -7250,7 +7250,7 @@
 msgid "Unable to write uncompressed print data: %s"
 msgstr ""
 
-#: cups/http-support.c:1516
+#: cups/http-support.c:1521
 msgid "Unauthorized"
 msgstr "未授权"
 
@@ -7258,7 +7258,7 @@
 msgid "Units"
 msgstr "单位"
 
-#: cups/http-support.c:1556 cups/http-support.c:1640 cups/ppd.c:313
+#: cups/http-support.c:1561 cups/http-support.c:1645 cups/ppd.c:313
 msgid "Unknown"
 msgstr "未知"
 
@@ -7267,22 +7267,22 @@
 msgid "Unknown choice \"%s\" for option \"%s\"."
 msgstr ""
 
-#: backend/ipp.c:519
+#: backend/ipp.c:518
 #, c-format
 msgid "Unknown encryption option value: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:327
+#: backend/lpd.c:331
 #, c-format
 msgid "Unknown file order: \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:298
+#: backend/lpd.c:302
 #, c-format
 msgid "Unknown format character: \"%c\"."
 msgstr ""
 
-#: cups/hash.c:278
+#: cups/hash.c:279
 msgid "Unknown hash algorithm."
 msgstr ""
 
@@ -7290,7 +7290,7 @@
 msgid "Unknown media size name."
 msgstr ""
 
-#: backend/ipp.c:583
+#: backend/ipp.c:582
 #, c-format
 msgid "Unknown option \"%s\" with value \"%s\"."
 msgstr ""
@@ -7300,7 +7300,7 @@
 msgid "Unknown option \"%s\"."
 msgstr ""
 
-#: backend/lpd.c:313
+#: backend/lpd.c:317
 #, c-format
 msgid "Unknown print mode: \"%s\"."
 msgstr ""
@@ -7323,7 +7323,7 @@
 msgid "Unknown request version."
 msgstr ""
 
-#: cups/http-support.c:1633
+#: cups/http-support.c:1638
 msgid "Unknown scheme in URI"
 msgstr ""
 
@@ -7331,7 +7331,7 @@
 msgid "Unknown service name."
 msgstr ""
 
-#: backend/ipp.c:548
+#: backend/ipp.c:547
 #, c-format
 msgid "Unknown version option value: \"%s\"."
 msgstr ""
@@ -7407,11 +7407,11 @@
 msgid "Unsupported value type"
 msgstr "不支持的值类型"
 
-#: cups/http-support.c:1531
+#: cups/http-support.c:1536
 msgid "Upgrade Required"
 msgstr "要求升级"
 
-#: systemv/lpadmin.c:664
+#: systemv/lpadmin.c:662
 msgid ""
 "Usage:\n"
 "\n"
@@ -7423,7 +7423,7 @@
 "                       [-u allow:user,user] [-u deny:user,user]"
 msgstr ""
 
-#: backend/dnssd.c:192 backend/ipp.c:325 backend/lpd.c:168
+#: backend/dnssd.c:192 backend/ipp.c:324 backend/lpd.c:172
 #: backend/socket.c:119 backend/usb.c:170 filter/commandtops.c:57
 #: filter/gziptoany.c:38 filter/pstops.c:223 monitor/bcp.c:48
 #: monitor/tbcp.c:47
@@ -7439,7 +7439,7 @@
 msgid "Usage: cupsctl [options] [param=value ... paramN=valueN]"
 msgstr ""
 
-#: scheduler/main.c:2132
+#: scheduler/main.c:2134
 msgid "Usage: cupsd [options]"
 msgstr ""
 
@@ -7472,7 +7472,7 @@
 msgid "Usage: lpmove job/src dest"
 msgstr ""
 
-#: systemv/lpoptions.c:536
+#: systemv/lpoptions.c:523
 msgid ""
 "Usage: lpoptions [-h server] [-E] -d printer\n"
 "       lpoptions [-h server] [-E] [-p printer] -l\n"
@@ -7518,7 +7518,7 @@
 msgid "VarBind uses indefinite length"
 msgstr "VarBind 使用不定长度"
 
-#: cups/ppd-cache.c:3605
+#: cups/ppd-cache.c:3592
 msgid "Vellum Paper"
 msgstr ""
 
@@ -7526,7 +7526,7 @@
 msgid "Version uses indefinite length"
 msgstr "Version 使用不定长度"
 
-#: backend/ipp.c:2000
+#: backend/ipp.c:2009
 msgid "Waiting for job to complete."
 msgstr ""
 
@@ -7542,19 +7542,19 @@
 msgid "Warning, no Windows 2000 printer drivers are installed."
 msgstr ""
 
-#: cups/ppd-cache.c:3530
+#: cups/ppd-cache.c:3517
 msgid "Waterproof Fabric"
 msgstr ""
 
-#: cups/http-support.c:1552
+#: cups/http-support.c:1557
 msgid "Web Interface is Disabled"
 msgstr ""
 
-#: cups/ppd-cache.c:3618
+#: cups/ppd-cache.c:3605
 msgid "Wet Film"
 msgstr ""
 
-#: cups/ppd-cache.c:3523
+#: cups/ppd-cache.c:3510
 msgid "Windowed Envelope"
 msgstr ""
 
@@ -7562,22 +7562,22 @@
 msgid "Yes"
 msgstr "是"
 
-#: scheduler/client.c:2248
+#: scheduler/client.c:2236
 #, c-format
 msgid ""
 "You must access this page using the URL <A "
 "HREF=\"https://%s:%d%s\">https://%s:%d%s</A>."
 msgstr "您必须使用 URL <A HREF=\"https://%s:%d%s\">https://%s:%d%s</A> 访问此页面。"
 
-#: cups/ppd-cache.c:2988
+#: cups/ppd-cache.c:3004
 msgid "Z Fold"
 msgstr ""
 
-#: ppdc/sample.c:434
+#: ppdc/sample.c:437
 msgid "ZPL Label Printer"
 msgstr "ZPL 标签打印机"
 
-#: ppdc/sample.c:357
+#: ppdc/sample.c:360
 msgid "Zebra"
 msgstr "Zebra"
 
@@ -7985,7 +7985,7 @@
 msgid "lpadmin: Unable to open PPD \"%s\": %s on line %d."
 msgstr ""
 
-#: systemv/lpadmin.c:1473
+#: systemv/lpadmin.c:1458
 #, c-format
 msgid "lpadmin: Unable to open PPD file \"%s\" - %s"
 msgstr ""
@@ -8658,7 +8658,7 @@
 msgid "scheduler is running"
 msgstr ""
 
-#: cups/adminutil.c:1384
+#: cups/adminutil.c:1380
 #, c-format
 msgid "stat of %s failed: %s"
 msgstr "获得 %s 的状态失败：%s"
@@ -10074,447 +10074,447 @@
 msgstr ""
 
 #. TRANSLATORS: Finishings
-#: locale/ipp-strings.c:580
+#: locale/ipp-strings.c:584
 msgid "finishings"
 msgstr ""
 
 #. TRANSLATORS: Finishings
-#: locale/ipp-strings.c:582
+#: locale/ipp-strings.c:586
 msgid "finishings-col"
 msgstr ""
 
 #. TRANSLATORS: Fold
-#: locale/ipp-strings.c:584
+#: locale/ipp-strings.c:588
 msgid "finishings.10"
 msgstr ""
 
 #. TRANSLATORS: Z Fold
-#: locale/ipp-strings.c:586
+#: locale/ipp-strings.c:590
 msgid "finishings.100"
 msgstr ""
 
 #. TRANSLATORS: Engineering Z Fold
-#: locale/ipp-strings.c:588
+#: locale/ipp-strings.c:592
 msgid "finishings.101"
 msgstr ""
 
 #. TRANSLATORS: Trim
-#: locale/ipp-strings.c:590
+#: locale/ipp-strings.c:594
 msgid "finishings.11"
 msgstr ""
 
 #. TRANSLATORS: Bale
-#: locale/ipp-strings.c:592
+#: locale/ipp-strings.c:596
 msgid "finishings.12"
 msgstr ""
 
 #. TRANSLATORS: Booklet Maker
-#: locale/ipp-strings.c:594
+#: locale/ipp-strings.c:598
 msgid "finishings.13"
 msgstr ""
 
 #. TRANSLATORS: Jog Offset
-#: locale/ipp-strings.c:596
+#: locale/ipp-strings.c:600
 msgid "finishings.14"
 msgstr ""
 
 #. TRANSLATORS: Coat
-#: locale/ipp-strings.c:598
+#: locale/ipp-strings.c:602
 msgid "finishings.15"
 msgstr ""
 
 #. TRANSLATORS: Laminate
-#: locale/ipp-strings.c:600
+#: locale/ipp-strings.c:604
 msgid "finishings.16"
 msgstr ""
 
 #. TRANSLATORS: Staple Top Left
-#: locale/ipp-strings.c:602
+#: locale/ipp-strings.c:606
 msgid "finishings.20"
 msgstr ""
 
 #. TRANSLATORS: Staple Bottom Left
-#: locale/ipp-strings.c:604
+#: locale/ipp-strings.c:608
 msgid "finishings.21"
 msgstr ""
 
 #. TRANSLATORS: Staple Top Right
-#: locale/ipp-strings.c:606
+#: locale/ipp-strings.c:610
 msgid "finishings.22"
 msgstr ""
 
 #. TRANSLATORS: Staple Bottom Right
-#: locale/ipp-strings.c:608
+#: locale/ipp-strings.c:612
 msgid "finishings.23"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Left
-#: locale/ipp-strings.c:610
+#: locale/ipp-strings.c:614
 msgid "finishings.24"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Top
-#: locale/ipp-strings.c:612
+#: locale/ipp-strings.c:616
 msgid "finishings.25"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Right
-#: locale/ipp-strings.c:614
+#: locale/ipp-strings.c:618
 msgid "finishings.26"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch Bottom
-#: locale/ipp-strings.c:616
+#: locale/ipp-strings.c:620
 msgid "finishings.27"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Left
-#: locale/ipp-strings.c:618
+#: locale/ipp-strings.c:622
 msgid "finishings.28"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Top
-#: locale/ipp-strings.c:620
+#: locale/ipp-strings.c:624
 msgid "finishings.29"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:622
+#: locale/ipp-strings.c:626
 msgid "finishings.3"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Right
-#: locale/ipp-strings.c:624
+#: locale/ipp-strings.c:628
 msgid "finishings.30"
 msgstr ""
 
 #. TRANSLATORS: 2 Staples on Bottom
-#: locale/ipp-strings.c:626
+#: locale/ipp-strings.c:630
 msgid "finishings.31"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Left
-#: locale/ipp-strings.c:628
+#: locale/ipp-strings.c:632
 msgid "finishings.32"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Top
-#: locale/ipp-strings.c:630
+#: locale/ipp-strings.c:634
 msgid "finishings.33"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Right
-#: locale/ipp-strings.c:632
+#: locale/ipp-strings.c:636
 msgid "finishings.34"
 msgstr ""
 
 #. TRANSLATORS: 3 Staples on Bottom
-#: locale/ipp-strings.c:634
+#: locale/ipp-strings.c:638
 msgid "finishings.35"
 msgstr ""
 
 #. TRANSLATORS: Staple
-#: locale/ipp-strings.c:636
+#: locale/ipp-strings.c:640
 msgid "finishings.4"
 msgstr ""
 
 #. TRANSLATORS: Punch
-#: locale/ipp-strings.c:638
+#: locale/ipp-strings.c:642
 msgid "finishings.5"
 msgstr ""
 
 #. TRANSLATORS: Bind Left
-#: locale/ipp-strings.c:640
+#: locale/ipp-strings.c:644
 msgid "finishings.50"
 msgstr ""
 
 #. TRANSLATORS: Bind Top
-#: locale/ipp-strings.c:642
+#: locale/ipp-strings.c:646
 msgid "finishings.51"
 msgstr ""
 
 #. TRANSLATORS: Bind Right
-#: locale/ipp-strings.c:644
+#: locale/ipp-strings.c:648
 msgid "finishings.52"
 msgstr ""
 
 #. TRANSLATORS: Bind Bottom
-#: locale/ipp-strings.c:646
+#: locale/ipp-strings.c:650
 msgid "finishings.53"
 msgstr ""
 
 #. TRANSLATORS: Cover
-#: locale/ipp-strings.c:648
+#: locale/ipp-strings.c:652
 msgid "finishings.6"
 msgstr ""
 
 #. TRANSLATORS: Trim Pages
-#: locale/ipp-strings.c:650
+#: locale/ipp-strings.c:654
 msgid "finishings.60"
 msgstr ""
 
 #. TRANSLATORS: Trim Documents
-#: locale/ipp-strings.c:652
+#: locale/ipp-strings.c:656
 msgid "finishings.61"
 msgstr ""
 
 #. TRANSLATORS: Trim Copies
-#: locale/ipp-strings.c:654
+#: locale/ipp-strings.c:658
 msgid "finishings.62"
 msgstr ""
 
 #. TRANSLATORS: Trim Job
-#: locale/ipp-strings.c:656
+#: locale/ipp-strings.c:660
 msgid "finishings.63"
 msgstr ""
 
 #. TRANSLATORS: Bind
-#: locale/ipp-strings.c:658
+#: locale/ipp-strings.c:662
 msgid "finishings.7"
 msgstr ""
 
 #. TRANSLATORS: Punch Top Left
-#: locale/ipp-strings.c:660
+#: locale/ipp-strings.c:664
 msgid "finishings.70"
 msgstr ""
 
 #. TRANSLATORS: Punch Bottom Left
-#: locale/ipp-strings.c:662
+#: locale/ipp-strings.c:666
 msgid "finishings.71"
 msgstr ""
 
 #. TRANSLATORS: Punch Top Right
-#: locale/ipp-strings.c:664
+#: locale/ipp-strings.c:668
 msgid "finishings.72"
 msgstr ""
 
 #. TRANSLATORS: Punch Bottom Right
-#: locale/ipp-strings.c:666
+#: locale/ipp-strings.c:670
 msgid "finishings.73"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Left
-#: locale/ipp-strings.c:668
+#: locale/ipp-strings.c:672
 msgid "finishings.74"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Top
-#: locale/ipp-strings.c:670
+#: locale/ipp-strings.c:674
 msgid "finishings.75"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Right
-#: locale/ipp-strings.c:672
+#: locale/ipp-strings.c:676
 msgid "finishings.76"
 msgstr ""
 
 #. TRANSLATORS: 2-hole Punch Bottom
-#: locale/ipp-strings.c:674
+#: locale/ipp-strings.c:678
 msgid "finishings.77"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Left
-#: locale/ipp-strings.c:676
+#: locale/ipp-strings.c:680
 msgid "finishings.78"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Top
-#: locale/ipp-strings.c:678
+#: locale/ipp-strings.c:682
 msgid "finishings.79"
 msgstr ""
 
 #. TRANSLATORS: Saddle Stitch
-#: locale/ipp-strings.c:680
+#: locale/ipp-strings.c:684
 msgid "finishings.8"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Right
-#: locale/ipp-strings.c:682
+#: locale/ipp-strings.c:686
 msgid "finishings.80"
 msgstr ""
 
 #. TRANSLATORS: 3-hole Punch Bottom
-#: locale/ipp-strings.c:684
+#: locale/ipp-strings.c:688
 msgid "finishings.81"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Left
-#: locale/ipp-strings.c:686
+#: locale/ipp-strings.c:690
 msgid "finishings.82"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Top
-#: locale/ipp-strings.c:688
+#: locale/ipp-strings.c:692
 msgid "finishings.83"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Right
-#: locale/ipp-strings.c:690
+#: locale/ipp-strings.c:694
 msgid "finishings.84"
 msgstr ""
 
 #. TRANSLATORS: 4-hole Punch Bottom
-#: locale/ipp-strings.c:692
+#: locale/ipp-strings.c:696
 msgid "finishings.85"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Left
-#: locale/ipp-strings.c:694
+#: locale/ipp-strings.c:698
 msgid "finishings.86"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Top
-#: locale/ipp-strings.c:696
+#: locale/ipp-strings.c:700
 msgid "finishings.87"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Right
-#: locale/ipp-strings.c:698
+#: locale/ipp-strings.c:702
 msgid "finishings.88"
 msgstr ""
 
 #. TRANSLATORS: Multi-hole Punch Bottom
-#: locale/ipp-strings.c:700
+#: locale/ipp-strings.c:704
 msgid "finishings.89"
 msgstr ""
 
 #. TRANSLATORS: Edge Stitch
-#: locale/ipp-strings.c:702
+#: locale/ipp-strings.c:706
 msgid "finishings.9"
 msgstr ""
 
 #. TRANSLATORS: Accordion Fold
-#: locale/ipp-strings.c:704
+#: locale/ipp-strings.c:708
 msgid "finishings.90"
 msgstr ""
 
 #. TRANSLATORS: Double Gate Fold
-#: locale/ipp-strings.c:706
+#: locale/ipp-strings.c:710
 msgid "finishings.91"
 msgstr ""
 
 #. TRANSLATORS: Gate Fold
-#: locale/ipp-strings.c:708
+#: locale/ipp-strings.c:712
 msgid "finishings.92"
 msgstr ""
 
 #. TRANSLATORS: Half Fold
-#: locale/ipp-strings.c:710
+#: locale/ipp-strings.c:714
 msgid "finishings.93"
 msgstr ""
 
 #. TRANSLATORS: Half Z Fold
-#: locale/ipp-strings.c:712
+#: locale/ipp-strings.c:716
 msgid "finishings.94"
 msgstr ""
 
 #. TRANSLATORS: Left Gate Fold
-#: locale/ipp-strings.c:714
+#: locale/ipp-strings.c:718
 msgid "finishings.95"
 msgstr ""
 
 #. TRANSLATORS: Letter Fold
-#: locale/ipp-strings.c:716
+#: locale/ipp-strings.c:720
 msgid "finishings.96"
 msgstr ""
 
 #. TRANSLATORS: Parallel Fold
-#: locale/ipp-strings.c:718
+#: locale/ipp-strings.c:722
 msgid "finishings.97"
 msgstr ""
 
 #. TRANSLATORS: Poster Fold
-#: locale/ipp-strings.c:720
+#: locale/ipp-strings.c:724
 msgid "finishings.98"
 msgstr ""
 
 #. TRANSLATORS: Right Gate Fold
-#: locale/ipp-strings.c:722
+#: locale/ipp-strings.c:726
 msgid "finishings.99"
 msgstr ""
 
 #. TRANSLATORS: Fold
-#: locale/ipp-strings.c:724
+#: locale/ipp-strings.c:728
 msgid "folding"
 msgstr ""
 
 #. TRANSLATORS: Fold Direction
-#: locale/ipp-strings.c:726
+#: locale/ipp-strings.c:730
 msgid "folding-direction"
 msgstr ""
 
 #. TRANSLATORS: Inward
-#: locale/ipp-strings.c:728
+#: locale/ipp-strings.c:732
 msgid "folding-direction.inward"
 msgstr ""
 
 #. TRANSLATORS: Outward
-#: locale/ipp-strings.c:730
+#: locale/ipp-strings.c:734
 msgid "folding-direction.outward"
 msgstr ""
 
 #. TRANSLATORS: Fold Position
-#: locale/ipp-strings.c:732
+#: locale/ipp-strings.c:736
 msgid "folding-offset"
 msgstr ""
 
 #. TRANSLATORS: Fold Edge
-#: locale/ipp-strings.c:734
+#: locale/ipp-strings.c:738
 msgid "folding-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:736
+#: locale/ipp-strings.c:740
 msgid "folding-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:738
+#: locale/ipp-strings.c:742
 msgid "folding-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:740
+#: locale/ipp-strings.c:744
 msgid "folding-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:742
+#: locale/ipp-strings.c:746
 msgid "folding-reference-edge.top"
 msgstr ""
 
 #. TRANSLATORS: Font Name
-#: locale/ipp-strings.c:744
+#: locale/ipp-strings.c:748
 msgid "font-name-requested"
 msgstr ""
 
 #. TRANSLATORS: Font Size
-#: locale/ipp-strings.c:746
+#: locale/ipp-strings.c:750
 msgid "font-size-requested"
 msgstr ""
 
 #. TRANSLATORS: Force Front Side
-#: locale/ipp-strings.c:748
+#: locale/ipp-strings.c:752
 msgid "force-front-side"
 msgstr ""
 
 #. TRANSLATORS: From Name
-#: locale/ipp-strings.c:750
+#: locale/ipp-strings.c:754
 msgid "from-name"
 msgstr ""
 
 #. TRANSLATORS: Imposition Template
-#: locale/ipp-strings.c:752
+#: locale/ipp-strings.c:756
 msgid "imposition-template"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:754
+#: locale/ipp-strings.c:758
 msgid "imposition-template.none"
 msgstr ""
 
 #. TRANSLATORS: Signature
-#: locale/ipp-strings.c:756
+#: locale/ipp-strings.c:760
 msgid "imposition-template.signature"
 msgstr ""
 
@@ -10660,72 +10660,72 @@
 msgstr ""
 
 #. TRANSLATORS: Insert Page Number
-#: locale/ipp-strings.c:758
+#: locale/ipp-strings.c:762
 msgid "insert-after-page-number"
 msgstr ""
 
 #. TRANSLATORS: Insert Count
-#: locale/ipp-strings.c:760
+#: locale/ipp-strings.c:764
 msgid "insert-count"
 msgstr ""
 
 #. TRANSLATORS: Insert Sheet
-#: locale/ipp-strings.c:762
+#: locale/ipp-strings.c:766
 msgid "insert-sheet"
 msgstr ""
 
 #. TRANSLATORS: Job Account ID
-#: locale/ipp-strings.c:764
+#: locale/ipp-strings.c:768
 msgid "job-account-id"
 msgstr ""
 
 #. TRANSLATORS: Job Account Type
-#: locale/ipp-strings.c:766
+#: locale/ipp-strings.c:770
 msgid "job-account-type"
 msgstr ""
 
 #. TRANSLATORS: General
-#: locale/ipp-strings.c:768
+#: locale/ipp-strings.c:772
 msgid "job-account-type.general"
 msgstr ""
 
 #. TRANSLATORS: Group
-#: locale/ipp-strings.c:770
+#: locale/ipp-strings.c:774
 msgid "job-account-type.group"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:772
+#: locale/ipp-strings.c:776
 msgid "job-account-type.none"
 msgstr ""
 
 #. TRANSLATORS: Job Accounting Output Bin
-#: locale/ipp-strings.c:774
+#: locale/ipp-strings.c:778
 msgid "job-accounting-output-bin"
 msgstr ""
 
 #. TRANSLATORS: Job Accounting Sheets
-#: locale/ipp-strings.c:776
+#: locale/ipp-strings.c:780
 msgid "job-accounting-sheets"
 msgstr ""
 
 #. TRANSLATORS: Type of Job Accounting Sheets
-#: locale/ipp-strings.c:778
+#: locale/ipp-strings.c:782
 msgid "job-accounting-sheets-type"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:780
+#: locale/ipp-strings.c:784
 msgid "job-accounting-sheets-type.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:782
+#: locale/ipp-strings.c:786
 msgid "job-accounting-sheets-type.standard"
 msgstr ""
 
 #. TRANSLATORS: Job Accounting User ID
-#: locale/ipp-strings.c:784
+#: locale/ipp-strings.c:788
 msgid "job-accounting-user-id"
 msgstr ""
 
@@ -10742,8258 +10742,8292 @@
 msgstr ""
 
 #. TRANSLATORS: Copies
-#: locale/ipp-strings.c:788
+#: locale/ipp-strings.c:792
 msgid "job-copies"
 msgstr ""
 
 #. TRANSLATORS: Back Cover
-#: locale/ipp-strings.c:790
+#: locale/ipp-strings.c:794
 msgid "job-cover-back"
 msgstr ""
 
 #. TRANSLATORS: Front Cover
-#: locale/ipp-strings.c:792
+#: locale/ipp-strings.c:796
 msgid "job-cover-front"
 msgstr ""
 
 #. TRANSLATORS: Delay Output Until
-#: locale/ipp-strings.c:794
+#: locale/ipp-strings.c:798
 msgid "job-delay-output-until"
 msgstr ""
 
 #. TRANSLATORS: Delay Output Until
-#: locale/ipp-strings.c:796
+#: locale/ipp-strings.c:800
 msgid "job-delay-output-until-time"
 msgstr ""
 
 #. TRANSLATORS: Daytime
-#: locale/ipp-strings.c:798
+#: locale/ipp-strings.c:802
 msgid "job-delay-output-until.day-time"
 msgstr ""
 
 #. TRANSLATORS: Evening
-#: locale/ipp-strings.c:800
+#: locale/ipp-strings.c:804
 msgid "job-delay-output-until.evening"
 msgstr ""
 
 #. TRANSLATORS: Released
-#: locale/ipp-strings.c:802
+#: locale/ipp-strings.c:806
 msgid "job-delay-output-until.indefinite"
 msgstr ""
 
 #. TRANSLATORS: Night
-#: locale/ipp-strings.c:804
+#: locale/ipp-strings.c:808
 msgid "job-delay-output-until.night"
 msgstr ""
 
 #. TRANSLATORS: No Delay
-#: locale/ipp-strings.c:806
+#: locale/ipp-strings.c:810
 msgid "job-delay-output-until.no-delay-output"
 msgstr ""
 
 #. TRANSLATORS: Second Shift
-#: locale/ipp-strings.c:808
+#: locale/ipp-strings.c:812
 msgid "job-delay-output-until.second-shift"
 msgstr ""
 
 #. TRANSLATORS: Third Shift
-#: locale/ipp-strings.c:810
+#: locale/ipp-strings.c:814
 msgid "job-delay-output-until.third-shift"
 msgstr ""
 
 #. TRANSLATORS: Weekend
-#: locale/ipp-strings.c:812
+#: locale/ipp-strings.c:816
 msgid "job-delay-output-until.weekend"
 msgstr ""
 
 #. TRANSLATORS: On Error
-#: locale/ipp-strings.c:814
+#: locale/ipp-strings.c:818
 msgid "job-error-action"
 msgstr ""
 
 #. TRANSLATORS: Abort Job
-#: locale/ipp-strings.c:816
+#: locale/ipp-strings.c:820
 msgid "job-error-action.abort-job"
 msgstr ""
 
 #. TRANSLATORS: Cancel Job
-#: locale/ipp-strings.c:818
+#: locale/ipp-strings.c:822
 msgid "job-error-action.cancel-job"
 msgstr ""
 
 #. TRANSLATORS: Continue Job
-#: locale/ipp-strings.c:820
+#: locale/ipp-strings.c:824
 msgid "job-error-action.continue-job"
 msgstr ""
 
 #. TRANSLATORS: Suspend Job
-#: locale/ipp-strings.c:822
+#: locale/ipp-strings.c:826
 msgid "job-error-action.suspend-job"
 msgstr ""
 
 #. TRANSLATORS: Print Error Sheet
-#: locale/ipp-strings.c:824
+#: locale/ipp-strings.c:828
 msgid "job-error-sheet"
 msgstr ""
 
 #. TRANSLATORS: Type of Error Sheet
-#: locale/ipp-strings.c:826
+#: locale/ipp-strings.c:830
 msgid "job-error-sheet-type"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:828
+#: locale/ipp-strings.c:832
 msgid "job-error-sheet-type.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:830
+#: locale/ipp-strings.c:834
 msgid "job-error-sheet-type.standard"
 msgstr ""
 
 #. TRANSLATORS: Print Error Sheet
-#: locale/ipp-strings.c:832
+#: locale/ipp-strings.c:836
 msgid "job-error-sheet-when"
 msgstr ""
 
 #. TRANSLATORS: Always
-#: locale/ipp-strings.c:834
+#: locale/ipp-strings.c:838
 msgid "job-error-sheet-when.always"
 msgstr ""
 
 #. TRANSLATORS: On Error
-#: locale/ipp-strings.c:836
+#: locale/ipp-strings.c:840
 msgid "job-error-sheet-when.on-error"
 msgstr ""
 
 #. TRANSLATORS: Job Finishings
-#: locale/ipp-strings.c:838
+#: locale/ipp-strings.c:842
 msgid "job-finishings"
 msgstr ""
 
 #. TRANSLATORS: Hold Until
-#: locale/ipp-strings.c:840
+#: locale/ipp-strings.c:844
 msgid "job-hold-until"
 msgstr ""
 
 #. TRANSLATORS: Hold Until
-#: locale/ipp-strings.c:842
+#: locale/ipp-strings.c:846
 msgid "job-hold-until-time"
 msgstr ""
 
 #. TRANSLATORS: Daytime
-#: locale/ipp-strings.c:844
+#: locale/ipp-strings.c:848
 msgid "job-hold-until.day-time"
 msgstr ""
 
 #. TRANSLATORS: Evening
-#: locale/ipp-strings.c:846
+#: locale/ipp-strings.c:850
 msgid "job-hold-until.evening"
 msgstr ""
 
 #. TRANSLATORS: Released
-#: locale/ipp-strings.c:848
+#: locale/ipp-strings.c:852
 msgid "job-hold-until.indefinite"
 msgstr ""
 
 #. TRANSLATORS: Night
-#: locale/ipp-strings.c:850
+#: locale/ipp-strings.c:854
 msgid "job-hold-until.night"
 msgstr ""
 
 #. TRANSLATORS: No Hold
-#: locale/ipp-strings.c:852
+#: locale/ipp-strings.c:856
 msgid "job-hold-until.no-hold"
 msgstr ""
 
 #. TRANSLATORS: Second Shift
-#: locale/ipp-strings.c:854
+#: locale/ipp-strings.c:858
 msgid "job-hold-until.second-shift"
 msgstr ""
 
 #. TRANSLATORS: Third Shift
-#: locale/ipp-strings.c:856
+#: locale/ipp-strings.c:860
 msgid "job-hold-until.third-shift"
 msgstr ""
 
 #. TRANSLATORS: Weekend
-#: locale/ipp-strings.c:858
+#: locale/ipp-strings.c:862
 msgid "job-hold-until.weekend"
 msgstr ""
 
 #. TRANSLATORS: Job Mandatory Attributes
-#: locale/ipp-strings.c:860
+#: locale/ipp-strings.c:864
 msgid "job-mandatory-attributes"
 msgstr ""
 
 #. TRANSLATORS: Title
-#: locale/ipp-strings.c:862
+#: locale/ipp-strings.c:866
 msgid "job-name"
 msgstr ""
 
 #. TRANSLATORS: Job Phone Number
-#: locale/ipp-strings.c:868
+#: locale/ipp-strings.c:872
 msgid "job-phone-number"
 msgstr ""
 
 #. TRANSLATORS: Job Priority
-#: locale/ipp-strings.c:870
+#: locale/ipp-strings.c:874
 msgid "job-priority"
 msgstr ""
 
 #. TRANSLATORS: Job Recipient Name
-#: locale/ipp-strings.c:894
+#: locale/ipp-strings.c:898
 msgid "job-recipient-name"
 msgstr ""
 
 #. TRANSLATORS: Job Save Disposition
-#: locale/ipp-strings.c:912
+#: locale/ipp-strings.c:916
 msgid "job-save-disposition"
 msgstr ""
 
 #. TRANSLATORS: Job Sheet Message
-#: locale/ipp-strings.c:914
+#: locale/ipp-strings.c:918
 msgid "job-sheet-message"
 msgstr ""
 
 #. TRANSLATORS: Banner Page
-#: locale/ipp-strings.c:916
+#: locale/ipp-strings.c:920
 msgid "job-sheets"
 msgstr ""
 
 #. TRANSLATORS: Banner Page
-#: locale/ipp-strings.c:918
+#: locale/ipp-strings.c:922
 msgid "job-sheets-col"
 msgstr ""
 
 #. TRANSLATORS: First Page in Document
-#: locale/ipp-strings.c:920
+#: locale/ipp-strings.c:924
 msgid "job-sheets.first-print-stream-page"
 msgstr ""
 
 #. TRANSLATORS: Start and End Sheets
-#: locale/ipp-strings.c:922
+#: locale/ipp-strings.c:926
 msgid "job-sheets.job-both-sheet"
 msgstr ""
 
 #. TRANSLATORS: End Sheet
-#: locale/ipp-strings.c:924
+#: locale/ipp-strings.c:928
 msgid "job-sheets.job-end-sheet"
 msgstr ""
 
 #. TRANSLATORS: Start Sheet
-#: locale/ipp-strings.c:926
+#: locale/ipp-strings.c:930
 msgid "job-sheets.job-start-sheet"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:928
+#: locale/ipp-strings.c:932
 msgid "job-sheets.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:930
+#: locale/ipp-strings.c:934
 msgid "job-sheets.standard"
 msgstr ""
 
 #. TRANSLATORS: Job State
-#: locale/ipp-strings.c:932
+#: locale/ipp-strings.c:936
 msgid "job-state"
 msgstr ""
 
 #. TRANSLATORS: Job State Message
-#: locale/ipp-strings.c:934
+#: locale/ipp-strings.c:938
 msgid "job-state-message"
 msgstr ""
 
 #. TRANSLATORS: Detailed Job State
-#: locale/ipp-strings.c:936
+#: locale/ipp-strings.c:940
 msgid "job-state-reasons"
 msgstr ""
 
 #. TRANSLATORS: Stopping
-#: locale/ipp-strings.c:938
+#: locale/ipp-strings.c:942
 msgid "job-state-reasons.aborted-by-system"
 msgstr ""
 
 #. TRANSLATORS: Account Authorization Failed
-#: locale/ipp-strings.c:940
+#: locale/ipp-strings.c:944
 msgid "job-state-reasons.account-authorization-failed"
 msgstr ""
 
 #. TRANSLATORS: Account Closed
-#: locale/ipp-strings.c:942
+#: locale/ipp-strings.c:946
 msgid "job-state-reasons.account-closed"
 msgstr ""
 
 #. TRANSLATORS: Account Info Needed
-#: locale/ipp-strings.c:944
+#: locale/ipp-strings.c:948
 msgid "job-state-reasons.account-info-needed"
 msgstr ""
 
 #. TRANSLATORS: Account Limit Reached
-#: locale/ipp-strings.c:946
+#: locale/ipp-strings.c:950
 msgid "job-state-reasons.account-limit-reached"
 msgstr ""
 
 #. TRANSLATORS: Decompression error
-#: locale/ipp-strings.c:948
+#: locale/ipp-strings.c:952
 msgid "job-state-reasons.compression-error"
 msgstr ""
 
 #. TRANSLATORS: Conflicting Attributes
-#: locale/ipp-strings.c:950
+#: locale/ipp-strings.c:954
 msgid "job-state-reasons.conflicting-attributes"
 msgstr ""
 
 #. TRANSLATORS: Connected To Destination
-#: locale/ipp-strings.c:952
+#: locale/ipp-strings.c:956
 msgid "job-state-reasons.connected-to-destination"
 msgstr ""
 
 #. TRANSLATORS: Connecting To Destination
-#: locale/ipp-strings.c:954
+#: locale/ipp-strings.c:958
 msgid "job-state-reasons.connecting-to-destination"
 msgstr ""
 
 #. TRANSLATORS: Destination Uri Failed
-#: locale/ipp-strings.c:956
+#: locale/ipp-strings.c:960
 msgid "job-state-reasons.destination-uri-failed"
 msgstr ""
 
 #. TRANSLATORS: Digital Signature Did Not Verify
-#: locale/ipp-strings.c:958
+#: locale/ipp-strings.c:962
 msgid "job-state-reasons.digital-signature-did-not-verify"
 msgstr ""
 
 #. TRANSLATORS: Digital Signature Type Not Supported
-#: locale/ipp-strings.c:960
+#: locale/ipp-strings.c:964
 msgid "job-state-reasons.digital-signature-type-not-supported"
 msgstr ""
 
 #. TRANSLATORS: Document Access Error
-#: locale/ipp-strings.c:962
+#: locale/ipp-strings.c:966
 msgid "job-state-reasons.document-access-error"
 msgstr ""
 
 #. TRANSLATORS: Document Format Error
-#: locale/ipp-strings.c:964
+#: locale/ipp-strings.c:968
 msgid "job-state-reasons.document-format-error"
 msgstr ""
 
 #. TRANSLATORS: Document Password Error
-#: locale/ipp-strings.c:966
+#: locale/ipp-strings.c:970
 msgid "job-state-reasons.document-password-error"
 msgstr ""
 
 #. TRANSLATORS: Document Permission Error
-#: locale/ipp-strings.c:968
+#: locale/ipp-strings.c:972
 msgid "job-state-reasons.document-permission-error"
 msgstr ""
 
 #. TRANSLATORS: Document Security Error
-#: locale/ipp-strings.c:970
+#: locale/ipp-strings.c:974
 msgid "job-state-reasons.document-security-error"
 msgstr ""
 
 #. TRANSLATORS: Document Unprintable Error
-#: locale/ipp-strings.c:972
+#: locale/ipp-strings.c:976
 msgid "job-state-reasons.document-unprintable-error"
 msgstr ""
 
 #. TRANSLATORS: Errors Detected
-#: locale/ipp-strings.c:974
+#: locale/ipp-strings.c:978
 msgid "job-state-reasons.errors-detected"
 msgstr ""
 
 #. TRANSLATORS: Canceled at printer
-#: locale/ipp-strings.c:976
+#: locale/ipp-strings.c:980
 msgid "job-state-reasons.job-canceled-at-device"
 msgstr ""
 
 #. TRANSLATORS: Canceled by operator
-#: locale/ipp-strings.c:978
+#: locale/ipp-strings.c:982
 msgid "job-state-reasons.job-canceled-by-operator"
 msgstr ""
 
 #. TRANSLATORS: Canceled by user
-#: locale/ipp-strings.c:980
+#: locale/ipp-strings.c:984
 msgid "job-state-reasons.job-canceled-by-user"
 msgstr ""
 
 #. TRANSLATORS:
-#: locale/ipp-strings.c:982
+#: locale/ipp-strings.c:986
 msgid "job-state-reasons.job-completed-successfully"
 msgstr ""
 
 #. TRANSLATORS: Completed with errors
-#: locale/ipp-strings.c:984
+#: locale/ipp-strings.c:988
 msgid "job-state-reasons.job-completed-with-errors"
 msgstr ""
 
 #. TRANSLATORS: Completed with warnings
-#: locale/ipp-strings.c:986
+#: locale/ipp-strings.c:990
 msgid "job-state-reasons.job-completed-with-warnings"
 msgstr ""
 
 #. TRANSLATORS: Insufficient data
-#: locale/ipp-strings.c:988
+#: locale/ipp-strings.c:992
 msgid "job-state-reasons.job-data-insufficient"
 msgstr ""
 
 #. TRANSLATORS: Job Delay Output Until Specified
-#: locale/ipp-strings.c:990
+#: locale/ipp-strings.c:994
 msgid "job-state-reasons.job-delay-output-until-specified"
 msgstr ""
 
 #. TRANSLATORS: Job Digital Signature Wait
-#: locale/ipp-strings.c:992
+#: locale/ipp-strings.c:996
 msgid "job-state-reasons.job-digital-signature-wait"
 msgstr ""
 
 #. TRANSLATORS: Job Fetchable
-#: locale/ipp-strings.c:994
+#: locale/ipp-strings.c:998
 msgid "job-state-reasons.job-fetchable"
 msgstr ""
 
 #. TRANSLATORS: Job Held For Review
-#: locale/ipp-strings.c:996
+#: locale/ipp-strings.c:1000
 msgid "job-state-reasons.job-held-for-review"
 msgstr ""
 
 #. TRANSLATORS: Job held
-#: locale/ipp-strings.c:998
+#: locale/ipp-strings.c:1002
 msgid "job-state-reasons.job-hold-until-specified"
 msgstr ""
 
 #. TRANSLATORS: Incoming
-#: locale/ipp-strings.c:1000
+#: locale/ipp-strings.c:1004
 msgid "job-state-reasons.job-incoming"
 msgstr ""
 
 #. TRANSLATORS: Interpreting
-#: locale/ipp-strings.c:1002
+#: locale/ipp-strings.c:1006
 msgid "job-state-reasons.job-interpreting"
 msgstr ""
 
 #. TRANSLATORS: Outgoing
-#: locale/ipp-strings.c:1004
+#: locale/ipp-strings.c:1008
 msgid "job-state-reasons.job-outgoing"
 msgstr ""
 
 #. TRANSLATORS: Job Password Wait
-#: locale/ipp-strings.c:1006
+#: locale/ipp-strings.c:1010
 msgid "job-state-reasons.job-password-wait"
 msgstr ""
 
 #. TRANSLATORS: Job Printed Successfully
-#: locale/ipp-strings.c:1008
+#: locale/ipp-strings.c:1012
 msgid "job-state-reasons.job-printed-successfully"
 msgstr ""
 
 #. TRANSLATORS: Job Printed With Errors
-#: locale/ipp-strings.c:1010
+#: locale/ipp-strings.c:1014
 msgid "job-state-reasons.job-printed-with-errors"
 msgstr ""
 
 #. TRANSLATORS: Job Printed With Warnings
-#: locale/ipp-strings.c:1012
+#: locale/ipp-strings.c:1016
 msgid "job-state-reasons.job-printed-with-warnings"
 msgstr ""
 
 #. TRANSLATORS: Printing
-#: locale/ipp-strings.c:1014
+#: locale/ipp-strings.c:1018
 msgid "job-state-reasons.job-printing"
 msgstr ""
 
 #. TRANSLATORS: Preparing to print
-#: locale/ipp-strings.c:1016
+#: locale/ipp-strings.c:1020
 msgid "job-state-reasons.job-queued"
 msgstr ""
 
 #. TRANSLATORS: Processing document
-#: locale/ipp-strings.c:1018
+#: locale/ipp-strings.c:1022
 msgid "job-state-reasons.job-queued-for-marker"
 msgstr ""
 
 #. TRANSLATORS: Job Release Wait
-#: locale/ipp-strings.c:1020
+#: locale/ipp-strings.c:1024
 msgid "job-state-reasons.job-release-wait"
 msgstr ""
 
 #. TRANSLATORS: Restartable
-#: locale/ipp-strings.c:1022
+#: locale/ipp-strings.c:1026
 msgid "job-state-reasons.job-restartable"
 msgstr ""
 
 #. TRANSLATORS: Job Resuming
-#: locale/ipp-strings.c:1024
+#: locale/ipp-strings.c:1028
 msgid "job-state-reasons.job-resuming"
 msgstr ""
 
 #. TRANSLATORS: Job Saved Successfully
-#: locale/ipp-strings.c:1026
+#: locale/ipp-strings.c:1030
 msgid "job-state-reasons.job-saved-successfully"
 msgstr ""
 
 #. TRANSLATORS: Job Saved With Errors
-#: locale/ipp-strings.c:1028
+#: locale/ipp-strings.c:1032
 msgid "job-state-reasons.job-saved-with-errors"
 msgstr ""
 
 #. TRANSLATORS: Job Saved With Warnings
-#: locale/ipp-strings.c:1030
+#: locale/ipp-strings.c:1034
 msgid "job-state-reasons.job-saved-with-warnings"
 msgstr ""
 
 #. TRANSLATORS: Job Saving
-#: locale/ipp-strings.c:1032
+#: locale/ipp-strings.c:1036
 msgid "job-state-reasons.job-saving"
 msgstr ""
 
 #. TRANSLATORS: Job Spooling
-#: locale/ipp-strings.c:1034
+#: locale/ipp-strings.c:1038
 msgid "job-state-reasons.job-spooling"
 msgstr ""
 
 #. TRANSLATORS: Job Streaming
-#: locale/ipp-strings.c:1036
+#: locale/ipp-strings.c:1040
 msgid "job-state-reasons.job-streaming"
 msgstr ""
 
 #. TRANSLATORS: Suspended
-#: locale/ipp-strings.c:1038
+#: locale/ipp-strings.c:1042
 msgid "job-state-reasons.job-suspended"
 msgstr ""
 
 #. TRANSLATORS: Job Suspended By Operator
-#: locale/ipp-strings.c:1040
+#: locale/ipp-strings.c:1044
 msgid "job-state-reasons.job-suspended-by-operator"
 msgstr ""
 
 #. TRANSLATORS: Job Suspended By System
-#: locale/ipp-strings.c:1042
+#: locale/ipp-strings.c:1046
 msgid "job-state-reasons.job-suspended-by-system"
 msgstr ""
 
 #. TRANSLATORS: Job Suspended By User
-#: locale/ipp-strings.c:1044
+#: locale/ipp-strings.c:1048
 msgid "job-state-reasons.job-suspended-by-user"
 msgstr ""
 
 #. TRANSLATORS: Job Suspending
-#: locale/ipp-strings.c:1046
+#: locale/ipp-strings.c:1050
 msgid "job-state-reasons.job-suspending"
 msgstr ""
 
 #. TRANSLATORS: Job Transferring
-#: locale/ipp-strings.c:1048
+#: locale/ipp-strings.c:1052
 msgid "job-state-reasons.job-transferring"
 msgstr ""
 
 #. TRANSLATORS: Transforming
-#: locale/ipp-strings.c:1050
+#: locale/ipp-strings.c:1054
 msgid "job-state-reasons.job-transforming"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1052
+#: locale/ipp-strings.c:1056
 msgid "job-state-reasons.none"
 msgstr ""
 
 #. TRANSLATORS: Printer offline
-#: locale/ipp-strings.c:1054
+#: locale/ipp-strings.c:1058
 msgid "job-state-reasons.printer-stopped"
 msgstr ""
 
 #. TRANSLATORS: Printer partially stopped
-#: locale/ipp-strings.c:1056
+#: locale/ipp-strings.c:1060
 msgid "job-state-reasons.printer-stopped-partly"
 msgstr ""
 
 #. TRANSLATORS: Stopping
-#: locale/ipp-strings.c:1058
+#: locale/ipp-strings.c:1062
 msgid "job-state-reasons.processing-to-stop-point"
 msgstr ""
 
 #. TRANSLATORS: Ready
-#: locale/ipp-strings.c:1060
+#: locale/ipp-strings.c:1064
 msgid "job-state-reasons.queued-in-device"
 msgstr ""
 
 #. TRANSLATORS: Resources Are Not Ready
-#: locale/ipp-strings.c:1062
+#: locale/ipp-strings.c:1066
 msgid "job-state-reasons.resources-are-not-ready"
 msgstr ""
 
 #. TRANSLATORS: Resources Are Not Supported
-#: locale/ipp-strings.c:1064
+#: locale/ipp-strings.c:1068
 msgid "job-state-reasons.resources-are-not-supported"
 msgstr ""
 
 #. TRANSLATORS: Service offline
-#: locale/ipp-strings.c:1066
+#: locale/ipp-strings.c:1070
 msgid "job-state-reasons.service-off-line"
 msgstr ""
 
 #. TRANSLATORS: Submission Interrupted
-#: locale/ipp-strings.c:1068
+#: locale/ipp-strings.c:1072
 msgid "job-state-reasons.submission-interrupted"
 msgstr ""
 
 #. TRANSLATORS: Unsupported Attributes Or Values
-#: locale/ipp-strings.c:1070
+#: locale/ipp-strings.c:1074
 msgid "job-state-reasons.unsupported-attributes-or-values"
 msgstr ""
 
 #. TRANSLATORS: Unsupported Compression
-#: locale/ipp-strings.c:1072
+#: locale/ipp-strings.c:1076
 msgid "job-state-reasons.unsupported-compression"
 msgstr ""
 
 #. TRANSLATORS: Unsupported Document Format
-#: locale/ipp-strings.c:1074
+#: locale/ipp-strings.c:1078
 msgid "job-state-reasons.unsupported-document-format"
 msgstr ""
 
 #. TRANSLATORS: Waiting For User Action
-#: locale/ipp-strings.c:1076
+#: locale/ipp-strings.c:1080
 msgid "job-state-reasons.waiting-for-user-action"
 msgstr ""
 
 #. TRANSLATORS: Warnings Detected
-#: locale/ipp-strings.c:1078
+#: locale/ipp-strings.c:1082
 msgid "job-state-reasons.warnings-detected"
 msgstr ""
 
 #. TRANSLATORS: Pending
-#: locale/ipp-strings.c:1080
+#: locale/ipp-strings.c:1084
 msgid "job-state.3"
 msgstr ""
 
 #. TRANSLATORS: Held
-#: locale/ipp-strings.c:1082
+#: locale/ipp-strings.c:1086
 msgid "job-state.4"
 msgstr ""
 
 #. TRANSLATORS: Processing
-#: locale/ipp-strings.c:1084
+#: locale/ipp-strings.c:1088
 msgid "job-state.5"
 msgstr ""
 
 #. TRANSLATORS: Stopped
-#: locale/ipp-strings.c:1086
+#: locale/ipp-strings.c:1090
 msgid "job-state.6"
 msgstr ""
 
 #. TRANSLATORS: Canceled
-#: locale/ipp-strings.c:1088
+#: locale/ipp-strings.c:1092
 msgid "job-state.7"
 msgstr ""
 
 #. TRANSLATORS: Aborted
-#: locale/ipp-strings.c:1090
+#: locale/ipp-strings.c:1094
 msgid "job-state.8"
 msgstr ""
 
 #. TRANSLATORS: Completed
-#: locale/ipp-strings.c:1092
+#: locale/ipp-strings.c:1096
 msgid "job-state.9"
 msgstr ""
 
 #. TRANSLATORS: Laminate Pages
-#: locale/ipp-strings.c:1094
+#: locale/ipp-strings.c:1098
 msgid "laminating"
 msgstr ""
 
 #. TRANSLATORS: Laminate
-#: locale/ipp-strings.c:1096
+#: locale/ipp-strings.c:1100
 msgid "laminating-sides"
 msgstr ""
 
 #. TRANSLATORS: Back Only
-#: locale/ipp-strings.c:1098
+#: locale/ipp-strings.c:1102
 msgid "laminating-sides.back"
 msgstr ""
 
 #. TRANSLATORS: Front and Back
-#: locale/ipp-strings.c:1100
+#: locale/ipp-strings.c:1104
 msgid "laminating-sides.both"
 msgstr ""
 
 #. TRANSLATORS: Front Only
-#: locale/ipp-strings.c:1102
+#: locale/ipp-strings.c:1106
 msgid "laminating-sides.front"
 msgstr ""
 
 #. TRANSLATORS: Type of Lamination
-#: locale/ipp-strings.c:1104
+#: locale/ipp-strings.c:1108
 msgid "laminating-type"
 msgstr ""
 
 #. TRANSLATORS: Archival
-#: locale/ipp-strings.c:1106
+#: locale/ipp-strings.c:1110
 msgid "laminating-type.archival"
 msgstr ""
 
 #. TRANSLATORS: Glossy
-#: locale/ipp-strings.c:1108
+#: locale/ipp-strings.c:1112
 msgid "laminating-type.glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss
-#: locale/ipp-strings.c:1110
+#: locale/ipp-strings.c:1114
 msgid "laminating-type.high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte
-#: locale/ipp-strings.c:1112
+#: locale/ipp-strings.c:1116
 msgid "laminating-type.matte"
 msgstr ""
 
 #. TRANSLATORS: Semi-gloss
-#: locale/ipp-strings.c:1114
+#: locale/ipp-strings.c:1118
 msgid "laminating-type.semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Translucent
-#: locale/ipp-strings.c:1116
+#: locale/ipp-strings.c:1120
 msgid "laminating-type.translucent"
 msgstr ""
 
 #. TRANSLATORS: Logo
-#: locale/ipp-strings.c:1118
+#: locale/ipp-strings.c:1122
 msgid "logo"
 msgstr ""
 
 #. TRANSLATORS: Amount of Material
-#: locale/ipp-strings.c:1120
+#: locale/ipp-strings.c:1124
 msgid "material-amount"
 msgstr ""
 
 #. TRANSLATORS: Amount Units
-#: locale/ipp-strings.c:1122
+#: locale/ipp-strings.c:1126
 msgid "material-amount-units"
 msgstr ""
 
 #. TRANSLATORS: Grams
-#: locale/ipp-strings.c:1124
+#: locale/ipp-strings.c:1128
 msgid "material-amount-units.g"
 msgstr ""
 
 #. TRANSLATORS: Kilograms
-#: locale/ipp-strings.c:1126
+#: locale/ipp-strings.c:1130
 msgid "material-amount-units.kg"
 msgstr ""
 
 #. TRANSLATORS: Liters
-#: locale/ipp-strings.c:1128
+#: locale/ipp-strings.c:1132
 msgid "material-amount-units.l"
 msgstr ""
 
 #. TRANSLATORS: Meters
-#: locale/ipp-strings.c:1130
+#: locale/ipp-strings.c:1134
 msgid "material-amount-units.m"
 msgstr ""
 
 #. TRANSLATORS: Milliliters
-#: locale/ipp-strings.c:1132
+#: locale/ipp-strings.c:1136
 msgid "material-amount-units.ml"
 msgstr ""
 
 #. TRANSLATORS: Millimeters
-#: locale/ipp-strings.c:1134
+#: locale/ipp-strings.c:1138
 msgid "material-amount-units.mm"
 msgstr ""
 
 #. TRANSLATORS: Material Color
-#: locale/ipp-strings.c:1136
+#: locale/ipp-strings.c:1140
 msgid "material-color"
 msgstr ""
 
 #. TRANSLATORS: Material Diameter
-#: locale/ipp-strings.c:1138
+#: locale/ipp-strings.c:1142
 msgid "material-diameter"
 msgstr ""
 
 #. TRANSLATORS: Material Diameter Tolerance
-#: locale/ipp-strings.c:1140
+#: locale/ipp-strings.c:1144
 msgid "material-diameter-tolerance"
 msgstr ""
 
 #. TRANSLATORS: Material Fill Density
-#: locale/ipp-strings.c:1142
+#: locale/ipp-strings.c:1146
 msgid "material-fill-density"
 msgstr ""
 
 #. TRANSLATORS: Material Name
-#: locale/ipp-strings.c:1144
+#: locale/ipp-strings.c:1148
 msgid "material-name"
 msgstr ""
 
 #. TRANSLATORS: Use Material For
-#: locale/ipp-strings.c:1148
+#: locale/ipp-strings.c:1152
 msgid "material-purpose"
 msgstr ""
 
 #. TRANSLATORS: Everything
-#: locale/ipp-strings.c:1150
+#: locale/ipp-strings.c:1154
 msgid "material-purpose.all"
 msgstr ""
 
 #. TRANSLATORS: Base
-#: locale/ipp-strings.c:1152
+#: locale/ipp-strings.c:1156
 msgid "material-purpose.base"
 msgstr ""
 
 #. TRANSLATORS: In-fill
-#: locale/ipp-strings.c:1154
+#: locale/ipp-strings.c:1158
 msgid "material-purpose.in-fill"
 msgstr ""
 
 #. TRANSLATORS: Shell
-#: locale/ipp-strings.c:1156
+#: locale/ipp-strings.c:1160
 msgid "material-purpose.shell"
 msgstr ""
 
 #. TRANSLATORS: Supports
-#: locale/ipp-strings.c:1158
+#: locale/ipp-strings.c:1162
 msgid "material-purpose.support"
 msgstr ""
 
 #. TRANSLATORS: Feed Rate
-#: locale/ipp-strings.c:1160
+#: locale/ipp-strings.c:1164
 msgid "material-rate"
 msgstr ""
 
 #. TRANSLATORS: Feed Rate Units
-#: locale/ipp-strings.c:1162
+#: locale/ipp-strings.c:1166
 msgid "material-rate-units"
 msgstr ""
 
 #. TRANSLATORS: Milligrams per second
-#: locale/ipp-strings.c:1164
+#: locale/ipp-strings.c:1168
 msgid "material-rate-units.mg_second"
 msgstr ""
 
 #. TRANSLATORS: Milliliters per second
-#: locale/ipp-strings.c:1166
+#: locale/ipp-strings.c:1170
 msgid "material-rate-units.ml_second"
 msgstr ""
 
 #. TRANSLATORS: Millimeters per second
-#: locale/ipp-strings.c:1168
+#: locale/ipp-strings.c:1172
 msgid "material-rate-units.mm_second"
 msgstr ""
 
 #. TRANSLATORS: Material Shell Thickness
-#: locale/ipp-strings.c:1172
+#: locale/ipp-strings.c:1176
 msgid "material-shell-thickness"
 msgstr ""
 
 #. TRANSLATORS: Material Temperature
-#: locale/ipp-strings.c:1174
+#: locale/ipp-strings.c:1178
 msgid "material-temperature"
 msgstr ""
 
 #. TRANSLATORS: Material Type
-#: locale/ipp-strings.c:1176
+#: locale/ipp-strings.c:1180
 msgid "material-type"
 msgstr ""
 
 #. TRANSLATORS: ABS
-#: locale/ipp-strings.c:1178
+#: locale/ipp-strings.c:1182
 msgid "material-type.abs"
 msgstr ""
 
 #. TRANSLATORS: Carbon Fiber ABS
-#: locale/ipp-strings.c:1180
+#: locale/ipp-strings.c:1184
 msgid "material-type.abs-carbon-fiber"
 msgstr ""
 
 #. TRANSLATORS: Carbon Nanotube ABS
-#: locale/ipp-strings.c:1182
+#: locale/ipp-strings.c:1186
 msgid "material-type.abs-carbon-nanotube"
 msgstr ""
 
 #. TRANSLATORS: Chocolate
-#: locale/ipp-strings.c:1184
+#: locale/ipp-strings.c:1188
 msgid "material-type.chocolate"
 msgstr ""
 
 #. TRANSLATORS: Gold
-#: locale/ipp-strings.c:1186
+#: locale/ipp-strings.c:1190
 msgid "material-type.gold"
 msgstr ""
 
 #. TRANSLATORS: Nylon
-#: locale/ipp-strings.c:1188
+#: locale/ipp-strings.c:1192
 msgid "material-type.nylon"
 msgstr ""
 
 #. TRANSLATORS: Pet
-#: locale/ipp-strings.c:1190
+#: locale/ipp-strings.c:1194
 msgid "material-type.pet"
 msgstr ""
 
 #. TRANSLATORS: Photopolymer
-#: locale/ipp-strings.c:1192
+#: locale/ipp-strings.c:1196
 msgid "material-type.photopolymer"
 msgstr ""
 
 #. TRANSLATORS: PLA
-#: locale/ipp-strings.c:1194
+#: locale/ipp-strings.c:1198
 msgid "material-type.pla"
 msgstr ""
 
 #. TRANSLATORS: Conductive PLA
-#: locale/ipp-strings.c:1196
+#: locale/ipp-strings.c:1200
 msgid "material-type.pla-conductive"
 msgstr ""
 
 #. TRANSLATORS: Flexible PLA
-#: locale/ipp-strings.c:1200
+#: locale/ipp-strings.c:1204
 msgid "material-type.pla-flexible"
 msgstr ""
 
 #. TRANSLATORS: Magnetic PLA
-#: locale/ipp-strings.c:1202
+#: locale/ipp-strings.c:1206
 msgid "material-type.pla-magnetic"
 msgstr ""
 
 #. TRANSLATORS: Steel PLA
-#: locale/ipp-strings.c:1204
+#: locale/ipp-strings.c:1208
 msgid "material-type.pla-steel"
 msgstr ""
 
 #. TRANSLATORS: Stone PLA
-#: locale/ipp-strings.c:1206
+#: locale/ipp-strings.c:1210
 msgid "material-type.pla-stone"
 msgstr ""
 
 #. TRANSLATORS: Wood PLA
-#: locale/ipp-strings.c:1208
+#: locale/ipp-strings.c:1212
 msgid "material-type.pla-wood"
 msgstr ""
 
 #. TRANSLATORS: Polycarbonate
-#: locale/ipp-strings.c:1210
+#: locale/ipp-strings.c:1214
 msgid "material-type.polycarbonate"
 msgstr ""
 
 #. TRANSLATORS: Dissolvable PVA
-#: locale/ipp-strings.c:1212
+#: locale/ipp-strings.c:1216
 msgid "material-type.pva-dissolvable"
 msgstr ""
 
 #. TRANSLATORS: Silver
-#: locale/ipp-strings.c:1214
+#: locale/ipp-strings.c:1218
 msgid "material-type.silver"
 msgstr ""
 
 #. TRANSLATORS: Titanium
-#: locale/ipp-strings.c:1216
+#: locale/ipp-strings.c:1220
 msgid "material-type.titanium"
 msgstr ""
 
 #. TRANSLATORS: Wax
-#: locale/ipp-strings.c:1218
+#: locale/ipp-strings.c:1222
 msgid "material-type.wax"
 msgstr ""
 
 #. TRANSLATORS: Materials
-#: locale/ipp-strings.c:1220
+#: locale/ipp-strings.c:1224
 msgid "materials-col"
 msgstr ""
 
 #. TRANSLATORS: Media
-#: locale/ipp-strings.c:1222
+#: locale/ipp-strings.c:1226
 msgid "media"
 msgstr ""
 
 #. TRANSLATORS: Back Coating of Media
-#: locale/ipp-strings.c:1224
+#: locale/ipp-strings.c:1228
 msgid "media-back-coating"
 msgstr ""
 
 #. TRANSLATORS: Glossy
-#: locale/ipp-strings.c:1226
+#: locale/ipp-strings.c:1230
 msgid "media-back-coating.glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss
-#: locale/ipp-strings.c:1228
+#: locale/ipp-strings.c:1232
 msgid "media-back-coating.high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte
-#: locale/ipp-strings.c:1230
+#: locale/ipp-strings.c:1234
 msgid "media-back-coating.matte"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1232
+#: locale/ipp-strings.c:1236
 msgid "media-back-coating.none"
 msgstr ""
 
 #. TRANSLATORS: Satin
-#: locale/ipp-strings.c:1234
+#: locale/ipp-strings.c:1238
 msgid "media-back-coating.satin"
 msgstr ""
 
 #. TRANSLATORS: Semi-gloss
-#: locale/ipp-strings.c:1236
+#: locale/ipp-strings.c:1240
 msgid "media-back-coating.semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Media Bottom Margin
-#: locale/ipp-strings.c:1238
+#: locale/ipp-strings.c:1242
 msgid "media-bottom-margin"
 msgstr ""
 
 #. TRANSLATORS: Media
-#: locale/ipp-strings.c:1240
+#: locale/ipp-strings.c:1244
 msgid "media-col"
 msgstr ""
 
 #. TRANSLATORS: Media Color
-#: locale/ipp-strings.c:1242
+#: locale/ipp-strings.c:1246
 msgid "media-color"
 msgstr ""
 
 #. TRANSLATORS: Black
-#: locale/ipp-strings.c:1244
+#: locale/ipp-strings.c:1248
 msgid "media-color.black"
 msgstr ""
 
 #. TRANSLATORS: Blue
-#: locale/ipp-strings.c:1246
+#: locale/ipp-strings.c:1250
 msgid "media-color.blue"
 msgstr ""
 
 #. TRANSLATORS: Brown
-#: locale/ipp-strings.c:1248
+#: locale/ipp-strings.c:1252
 msgid "media-color.brown"
 msgstr ""
 
 #. TRANSLATORS: Buff
-#: locale/ipp-strings.c:1250
+#: locale/ipp-strings.c:1254
 msgid "media-color.buff"
 msgstr ""
 
 #. TRANSLATORS: Clear Black
-#: locale/ipp-strings.c:1252
+#: locale/ipp-strings.c:1256
 msgid "media-color.clear-black"
 msgstr ""
 
 #. TRANSLATORS: Clear Blue
-#: locale/ipp-strings.c:1254
+#: locale/ipp-strings.c:1258
 msgid "media-color.clear-blue"
 msgstr ""
 
 #. TRANSLATORS: Clear Brown
-#: locale/ipp-strings.c:1256
+#: locale/ipp-strings.c:1260
 msgid "media-color.clear-brown"
 msgstr ""
 
 #. TRANSLATORS: Clear Buff
-#: locale/ipp-strings.c:1258
+#: locale/ipp-strings.c:1262
 msgid "media-color.clear-buff"
 msgstr ""
 
 #. TRANSLATORS: Clear Cyan
-#: locale/ipp-strings.c:1260
+#: locale/ipp-strings.c:1264
 msgid "media-color.clear-cyan"
 msgstr ""
 
 #. TRANSLATORS: Clear Gold
-#: locale/ipp-strings.c:1262
+#: locale/ipp-strings.c:1266
 msgid "media-color.clear-gold"
 msgstr ""
 
 #. TRANSLATORS: Clear Goldenrod
-#: locale/ipp-strings.c:1264
+#: locale/ipp-strings.c:1268
 msgid "media-color.clear-goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Clear Gray
-#: locale/ipp-strings.c:1266
+#: locale/ipp-strings.c:1270
 msgid "media-color.clear-gray"
 msgstr ""
 
 #. TRANSLATORS: Clear Green
-#: locale/ipp-strings.c:1268
+#: locale/ipp-strings.c:1272
 msgid "media-color.clear-green"
 msgstr ""
 
 #. TRANSLATORS: Clear Ivory
-#: locale/ipp-strings.c:1270
+#: locale/ipp-strings.c:1274
 msgid "media-color.clear-ivory"
 msgstr ""
 
 #. TRANSLATORS: Clear Magenta
-#: locale/ipp-strings.c:1272
+#: locale/ipp-strings.c:1276
 msgid "media-color.clear-magenta"
 msgstr ""
 
 #. TRANSLATORS: Clear Multi Color
-#: locale/ipp-strings.c:1274
+#: locale/ipp-strings.c:1278
 msgid "media-color.clear-multi-color"
 msgstr ""
 
 #. TRANSLATORS: Clear Mustard
-#: locale/ipp-strings.c:1276
+#: locale/ipp-strings.c:1280
 msgid "media-color.clear-mustard"
 msgstr ""
 
 #. TRANSLATORS: Clear Orange
-#: locale/ipp-strings.c:1278
+#: locale/ipp-strings.c:1282
 msgid "media-color.clear-orange"
 msgstr ""
 
 #. TRANSLATORS: Clear Pink
-#: locale/ipp-strings.c:1280
+#: locale/ipp-strings.c:1284
 msgid "media-color.clear-pink"
 msgstr ""
 
 #. TRANSLATORS: Clear Red
-#: locale/ipp-strings.c:1282
+#: locale/ipp-strings.c:1286
 msgid "media-color.clear-red"
 msgstr ""
 
 #. TRANSLATORS: Clear Silver
-#: locale/ipp-strings.c:1284
+#: locale/ipp-strings.c:1288
 msgid "media-color.clear-silver"
 msgstr ""
 
 #. TRANSLATORS: Clear Turquoise
-#: locale/ipp-strings.c:1286
+#: locale/ipp-strings.c:1290
 msgid "media-color.clear-turquoise"
 msgstr ""
 
 #. TRANSLATORS: Clear Violet
-#: locale/ipp-strings.c:1288
+#: locale/ipp-strings.c:1292
 msgid "media-color.clear-violet"
 msgstr ""
 
 #. TRANSLATORS: Clear White
-#: locale/ipp-strings.c:1290
+#: locale/ipp-strings.c:1294
 msgid "media-color.clear-white"
 msgstr ""
 
 #. TRANSLATORS: Clear Yellow
-#: locale/ipp-strings.c:1292
+#: locale/ipp-strings.c:1296
 msgid "media-color.clear-yellow"
 msgstr ""
 
 #. TRANSLATORS: Cyan
-#: locale/ipp-strings.c:1294
+#: locale/ipp-strings.c:1298
 msgid "media-color.cyan"
 msgstr ""
 
 #. TRANSLATORS: Dark Blue
-#: locale/ipp-strings.c:1296
+#: locale/ipp-strings.c:1300
 msgid "media-color.dark-blue"
 msgstr ""
 
 #. TRANSLATORS: Dark Brown
-#: locale/ipp-strings.c:1298
+#: locale/ipp-strings.c:1302
 msgid "media-color.dark-brown"
 msgstr ""
 
 #. TRANSLATORS: Dark Buff
-#: locale/ipp-strings.c:1300
+#: locale/ipp-strings.c:1304
 msgid "media-color.dark-buff"
 msgstr ""
 
 #. TRANSLATORS: Dark Cyan
-#: locale/ipp-strings.c:1302
+#: locale/ipp-strings.c:1306
 msgid "media-color.dark-cyan"
 msgstr ""
 
 #. TRANSLATORS: Dark Gold
-#: locale/ipp-strings.c:1304
+#: locale/ipp-strings.c:1308
 msgid "media-color.dark-gold"
 msgstr ""
 
 #. TRANSLATORS: Dark Goldenrod
-#: locale/ipp-strings.c:1306
+#: locale/ipp-strings.c:1310
 msgid "media-color.dark-goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Dark Gray
-#: locale/ipp-strings.c:1308
+#: locale/ipp-strings.c:1312
 msgid "media-color.dark-gray"
 msgstr ""
 
 #. TRANSLATORS: Dark Green
-#: locale/ipp-strings.c:1310
+#: locale/ipp-strings.c:1314
 msgid "media-color.dark-green"
 msgstr ""
 
 #. TRANSLATORS: Dark Ivory
-#: locale/ipp-strings.c:1312
+#: locale/ipp-strings.c:1316
 msgid "media-color.dark-ivory"
 msgstr ""
 
 #. TRANSLATORS: Dark Magenta
-#: locale/ipp-strings.c:1314
+#: locale/ipp-strings.c:1318
 msgid "media-color.dark-magenta"
 msgstr ""
 
 #. TRANSLATORS: Dark Mustard
-#: locale/ipp-strings.c:1316
+#: locale/ipp-strings.c:1320
 msgid "media-color.dark-mustard"
 msgstr ""
 
 #. TRANSLATORS: Dark Orange
-#: locale/ipp-strings.c:1318
+#: locale/ipp-strings.c:1322
 msgid "media-color.dark-orange"
 msgstr ""
 
 #. TRANSLATORS: Dark Pink
-#: locale/ipp-strings.c:1320
+#: locale/ipp-strings.c:1324
 msgid "media-color.dark-pink"
 msgstr ""
 
 #. TRANSLATORS: Dark Red
-#: locale/ipp-strings.c:1322
+#: locale/ipp-strings.c:1326
 msgid "media-color.dark-red"
 msgstr ""
 
 #. TRANSLATORS: Dark Silver
-#: locale/ipp-strings.c:1324
+#: locale/ipp-strings.c:1328
 msgid "media-color.dark-silver"
 msgstr ""
 
 #. TRANSLATORS: Dark Turquoise
-#: locale/ipp-strings.c:1326
+#: locale/ipp-strings.c:1330
 msgid "media-color.dark-turquoise"
 msgstr ""
 
 #. TRANSLATORS: Dark Violet
-#: locale/ipp-strings.c:1328
+#: locale/ipp-strings.c:1332
 msgid "media-color.dark-violet"
 msgstr ""
 
 #. TRANSLATORS: Dark Yellow
-#: locale/ipp-strings.c:1330
+#: locale/ipp-strings.c:1334
 msgid "media-color.dark-yellow"
 msgstr ""
 
 #. TRANSLATORS: Gold
-#: locale/ipp-strings.c:1332
+#: locale/ipp-strings.c:1336
 msgid "media-color.gold"
 msgstr ""
 
 #. TRANSLATORS: Goldenrod
-#: locale/ipp-strings.c:1334
+#: locale/ipp-strings.c:1338
 msgid "media-color.goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Gray
-#: locale/ipp-strings.c:1336
+#: locale/ipp-strings.c:1340
 msgid "media-color.gray"
 msgstr ""
 
 #. TRANSLATORS: Green
-#: locale/ipp-strings.c:1338
+#: locale/ipp-strings.c:1342
 msgid "media-color.green"
 msgstr ""
 
 #. TRANSLATORS: Ivory
-#: locale/ipp-strings.c:1340
+#: locale/ipp-strings.c:1344
 msgid "media-color.ivory"
 msgstr ""
 
 #. TRANSLATORS: Light Black
-#: locale/ipp-strings.c:1342
+#: locale/ipp-strings.c:1346
 msgid "media-color.light-black"
 msgstr ""
 
 #. TRANSLATORS: Light Blue
-#: locale/ipp-strings.c:1344
+#: locale/ipp-strings.c:1348
 msgid "media-color.light-blue"
 msgstr ""
 
 #. TRANSLATORS: Light Brown
-#: locale/ipp-strings.c:1346
+#: locale/ipp-strings.c:1350
 msgid "media-color.light-brown"
 msgstr ""
 
 #. TRANSLATORS: Light Buff
-#: locale/ipp-strings.c:1348
+#: locale/ipp-strings.c:1352
 msgid "media-color.light-buff"
 msgstr ""
 
 #. TRANSLATORS: Light Cyan
-#: locale/ipp-strings.c:1350
+#: locale/ipp-strings.c:1354
 msgid "media-color.light-cyan"
 msgstr ""
 
 #. TRANSLATORS: Light Gold
-#: locale/ipp-strings.c:1352
+#: locale/ipp-strings.c:1356
 msgid "media-color.light-gold"
 msgstr ""
 
 #. TRANSLATORS: Light Goldenrod
-#: locale/ipp-strings.c:1354
+#: locale/ipp-strings.c:1358
 msgid "media-color.light-goldenrod"
 msgstr ""
 
 #. TRANSLATORS: Light Gray
-#: locale/ipp-strings.c:1356
+#: locale/ipp-strings.c:1360
 msgid "media-color.light-gray"
 msgstr ""
 
 #. TRANSLATORS: Light Green
-#: locale/ipp-strings.c:1358
+#: locale/ipp-strings.c:1362
 msgid "media-color.light-green"
 msgstr ""
 
 #. TRANSLATORS: Light Ivory
-#: locale/ipp-strings.c:1360
+#: locale/ipp-strings.c:1364
 msgid "media-color.light-ivory"
 msgstr ""
 
 #. TRANSLATORS: Light Magenta
-#: locale/ipp-strings.c:1362
+#: locale/ipp-strings.c:1366
 msgid "media-color.light-magenta"
 msgstr ""
 
 #. TRANSLATORS: Light Mustard
-#: locale/ipp-strings.c:1364
+#: locale/ipp-strings.c:1368
 msgid "media-color.light-mustard"
 msgstr ""
 
 #. TRANSLATORS: Light Orange
-#: locale/ipp-strings.c:1366
+#: locale/ipp-strings.c:1370
 msgid "media-color.light-orange"
 msgstr ""
 
 #. TRANSLATORS: Light Pink
-#: locale/ipp-strings.c:1368
+#: locale/ipp-strings.c:1372
 msgid "media-color.light-pink"
 msgstr ""
 
 #. TRANSLATORS: Light Red
-#: locale/ipp-strings.c:1370
+#: locale/ipp-strings.c:1374
 msgid "media-color.light-red"
 msgstr ""
 
 #. TRANSLATORS: Light Silver
-#: locale/ipp-strings.c:1372
+#: locale/ipp-strings.c:1376
 msgid "media-color.light-silver"
 msgstr ""
 
 #. TRANSLATORS: Light Turquoise
-#: locale/ipp-strings.c:1374
+#: locale/ipp-strings.c:1378
 msgid "media-color.light-turquoise"
 msgstr ""
 
 #. TRANSLATORS: Light Violet
-#: locale/ipp-strings.c:1376
+#: locale/ipp-strings.c:1380
 msgid "media-color.light-violet"
 msgstr ""
 
 #. TRANSLATORS: Light Yellow
-#: locale/ipp-strings.c:1378
+#: locale/ipp-strings.c:1382
 msgid "media-color.light-yellow"
 msgstr ""
 
 #. TRANSLATORS: Magenta
-#: locale/ipp-strings.c:1380
+#: locale/ipp-strings.c:1384
 msgid "media-color.magenta"
 msgstr ""
 
 #. TRANSLATORS: Multi-color
-#: locale/ipp-strings.c:1382
+#: locale/ipp-strings.c:1386
 msgid "media-color.multi-color"
 msgstr ""
 
 #. TRANSLATORS: Mustard
-#: locale/ipp-strings.c:1384
+#: locale/ipp-strings.c:1388
 msgid "media-color.mustard"
 msgstr ""
 
 #. TRANSLATORS: No Color
-#: locale/ipp-strings.c:1386
+#: locale/ipp-strings.c:1390
 msgid "media-color.no-color"
 msgstr ""
 
 #. TRANSLATORS: Orange
-#: locale/ipp-strings.c:1388
+#: locale/ipp-strings.c:1392
 msgid "media-color.orange"
 msgstr ""
 
 #. TRANSLATORS: Pink
-#: locale/ipp-strings.c:1390
+#: locale/ipp-strings.c:1394
 msgid "media-color.pink"
 msgstr ""
 
 #. TRANSLATORS: Red
-#: locale/ipp-strings.c:1392
+#: locale/ipp-strings.c:1396
 msgid "media-color.red"
 msgstr ""
 
 #. TRANSLATORS: Silver
-#: locale/ipp-strings.c:1394
+#: locale/ipp-strings.c:1398
 msgid "media-color.silver"
 msgstr ""
 
 #. TRANSLATORS: Turquoise
-#: locale/ipp-strings.c:1396
+#: locale/ipp-strings.c:1400
 msgid "media-color.turquoise"
 msgstr ""
 
 #. TRANSLATORS: Violet
-#: locale/ipp-strings.c:1398
+#: locale/ipp-strings.c:1402
 msgid "media-color.violet"
 msgstr ""
 
 #. TRANSLATORS: White
-#: locale/ipp-strings.c:1400
+#: locale/ipp-strings.c:1404
 msgid "media-color.white"
 msgstr ""
 
 #. TRANSLATORS: Yellow
-#: locale/ipp-strings.c:1402
+#: locale/ipp-strings.c:1406
 msgid "media-color.yellow"
 msgstr ""
 
 #. TRANSLATORS: Front Coating of Media
-#: locale/ipp-strings.c:1404
+#: locale/ipp-strings.c:1408
 msgid "media-front-coating"
 msgstr ""
 
 #. TRANSLATORS: Media Grain
-#: locale/ipp-strings.c:1406
+#: locale/ipp-strings.c:1410
 msgid "media-grain"
 msgstr ""
 
 #. TRANSLATORS: Cross-Feed Direction
-#: locale/ipp-strings.c:1408
+#: locale/ipp-strings.c:1412
 msgid "media-grain.x-direction"
 msgstr ""
 
 #. TRANSLATORS: Feed Direction
-#: locale/ipp-strings.c:1410
+#: locale/ipp-strings.c:1414
 msgid "media-grain.y-direction"
 msgstr ""
 
 #. TRANSLATORS: Media Hole Count
-#: locale/ipp-strings.c:1412
+#: locale/ipp-strings.c:1416
 msgid "media-hole-count"
 msgstr ""
 
 #. TRANSLATORS: Media Info
-#: locale/ipp-strings.c:1414
+#: locale/ipp-strings.c:1418
 msgid "media-info"
 msgstr ""
 
 #. TRANSLATORS: Force Media
-#: locale/ipp-strings.c:1416
+#: locale/ipp-strings.c:1420
 msgid "media-input-tray-check"
 msgstr ""
 
 #. TRANSLATORS: Media Left Margin
-#: locale/ipp-strings.c:1418
+#: locale/ipp-strings.c:1422
 msgid "media-left-margin"
 msgstr ""
 
 #. TRANSLATORS: Pre-printed Media
-#: locale/ipp-strings.c:1420
+#: locale/ipp-strings.c:1424
 msgid "media-pre-printed"
 msgstr ""
 
 #. TRANSLATORS: Blank
-#: locale/ipp-strings.c:1422
+#: locale/ipp-strings.c:1426
 msgid "media-pre-printed.blank"
 msgstr ""
 
 #. TRANSLATORS: Letterhead
-#: locale/ipp-strings.c:1424
+#: locale/ipp-strings.c:1428
 msgid "media-pre-printed.letter-head"
 msgstr ""
 
 #. TRANSLATORS: Pre-printed
-#: locale/ipp-strings.c:1426
+#: locale/ipp-strings.c:1430
 msgid "media-pre-printed.pre-printed"
 msgstr ""
 
 #. TRANSLATORS: Recycled Media
-#: locale/ipp-strings.c:1428
+#: locale/ipp-strings.c:1432
 msgid "media-recycled"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:1430
+#: locale/ipp-strings.c:1434
 msgid "media-recycled.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:1432
+#: locale/ipp-strings.c:1436
 msgid "media-recycled.standard"
 msgstr ""
 
 #. TRANSLATORS: Media Right Margin
-#: locale/ipp-strings.c:1434
+#: locale/ipp-strings.c:1438
 msgid "media-right-margin"
 msgstr ""
 
 #. TRANSLATORS: Media Dimensions
-#: locale/ipp-strings.c:1436
+#: locale/ipp-strings.c:1440
 msgid "media-size"
 msgstr ""
 
 #. TRANSLATORS: Media Name
-#: locale/ipp-strings.c:1438
+#: locale/ipp-strings.c:1442
 msgid "media-size-name"
 msgstr ""
 
 #. TRANSLATORS: Media Source
-#: locale/ipp-strings.c:1440
+#: locale/ipp-strings.c:1444
 msgid "media-source"
 msgstr ""
 
 #. TRANSLATORS: Alternate
-#: locale/ipp-strings.c:1442
+#: locale/ipp-strings.c:1446
 msgid "media-source.alternate"
 msgstr ""
 
 #. TRANSLATORS: Alternate Roll
-#: locale/ipp-strings.c:1444
+#: locale/ipp-strings.c:1448
 msgid "media-source.alternate-roll"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:1446
+#: locale/ipp-strings.c:1450
 msgid "media-source.auto"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:1448
+#: locale/ipp-strings.c:1452
 msgid "media-source.bottom"
 msgstr ""
 
 #. TRANSLATORS: By-pass Tray
-#: locale/ipp-strings.c:1450
+#: locale/ipp-strings.c:1454
 msgid "media-source.by-pass-tray"
 msgstr ""
 
 #. TRANSLATORS: Center
-#: locale/ipp-strings.c:1452
+#: locale/ipp-strings.c:1456
 msgid "media-source.center"
 msgstr ""
 
 #. TRANSLATORS: Disc
-#: locale/ipp-strings.c:1454
+#: locale/ipp-strings.c:1458
 msgid "media-source.disc"
 msgstr ""
 
 #. TRANSLATORS: Envelope
-#: locale/ipp-strings.c:1456
+#: locale/ipp-strings.c:1460
 msgid "media-source.envelope"
 msgstr ""
 
 #. TRANSLATORS: Hagaki
-#: locale/ipp-strings.c:1458
+#: locale/ipp-strings.c:1462
 msgid "media-source.hagaki"
 msgstr ""
 
 #. TRANSLATORS: Large Capacity
-#: locale/ipp-strings.c:1460
+#: locale/ipp-strings.c:1464
 msgid "media-source.large-capacity"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:1462
+#: locale/ipp-strings.c:1466
 msgid "media-source.left"
 msgstr ""
 
 #. TRANSLATORS: Main
-#: locale/ipp-strings.c:1464
+#: locale/ipp-strings.c:1468
 msgid "media-source.main"
 msgstr ""
 
 #. TRANSLATORS: Main Roll
-#: locale/ipp-strings.c:1466
+#: locale/ipp-strings.c:1470
 msgid "media-source.main-roll"
 msgstr ""
 
 #. TRANSLATORS: Manual
-#: locale/ipp-strings.c:1468
+#: locale/ipp-strings.c:1472
 msgid "media-source.manual"
 msgstr ""
 
 #. TRANSLATORS: Middle
-#: locale/ipp-strings.c:1470
+#: locale/ipp-strings.c:1474
 msgid "media-source.middle"
 msgstr ""
 
 #. TRANSLATORS: Photo
-#: locale/ipp-strings.c:1472
+#: locale/ipp-strings.c:1476
 msgid "media-source.photo"
 msgstr ""
 
 #. TRANSLATORS: Rear
-#: locale/ipp-strings.c:1474
+#: locale/ipp-strings.c:1478
 msgid "media-source.rear"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:1476
+#: locale/ipp-strings.c:1480
 msgid "media-source.right"
 msgstr ""
 
 #. TRANSLATORS: Roll 1
-#: locale/ipp-strings.c:1478
+#: locale/ipp-strings.c:1482
 msgid "media-source.roll-1"
 msgstr ""
 
 #. TRANSLATORS: Roll 10
-#: locale/ipp-strings.c:1480
+#: locale/ipp-strings.c:1484
 msgid "media-source.roll-10"
 msgstr ""
 
 #. TRANSLATORS: Roll 2
-#: locale/ipp-strings.c:1482
+#: locale/ipp-strings.c:1486
 msgid "media-source.roll-2"
 msgstr ""
 
 #. TRANSLATORS: Roll 3
-#: locale/ipp-strings.c:1484
+#: locale/ipp-strings.c:1488
 msgid "media-source.roll-3"
 msgstr ""
 
 #. TRANSLATORS: Roll 4
-#: locale/ipp-strings.c:1486
+#: locale/ipp-strings.c:1490
 msgid "media-source.roll-4"
 msgstr ""
 
 #. TRANSLATORS: Roll 5
-#: locale/ipp-strings.c:1488
+#: locale/ipp-strings.c:1492
 msgid "media-source.roll-5"
 msgstr ""
 
 #. TRANSLATORS: Roll 6
-#: locale/ipp-strings.c:1490
+#: locale/ipp-strings.c:1494
 msgid "media-source.roll-6"
 msgstr ""
 
 #. TRANSLATORS: Roll 7
-#: locale/ipp-strings.c:1492
+#: locale/ipp-strings.c:1496
 msgid "media-source.roll-7"
 msgstr ""
 
 #. TRANSLATORS: Roll 8
-#: locale/ipp-strings.c:1494
+#: locale/ipp-strings.c:1498
 msgid "media-source.roll-8"
 msgstr ""
 
 #. TRANSLATORS: Roll 9
-#: locale/ipp-strings.c:1496
+#: locale/ipp-strings.c:1500
 msgid "media-source.roll-9"
 msgstr ""
 
 #. TRANSLATORS: Side
-#: locale/ipp-strings.c:1498
+#: locale/ipp-strings.c:1502
 msgid "media-source.side"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:1500
+#: locale/ipp-strings.c:1504
 msgid "media-source.top"
 msgstr ""
 
 #. TRANSLATORS: Tray 1
-#: locale/ipp-strings.c:1502
+#: locale/ipp-strings.c:1506
 msgid "media-source.tray-1"
 msgstr ""
 
 #. TRANSLATORS: Tray 10
-#: locale/ipp-strings.c:1504
+#: locale/ipp-strings.c:1508
 msgid "media-source.tray-10"
 msgstr ""
 
 #. TRANSLATORS: Tray 11
-#: locale/ipp-strings.c:1506
+#: locale/ipp-strings.c:1510
 msgid "media-source.tray-11"
 msgstr ""
 
 #. TRANSLATORS: Tray 12
-#: locale/ipp-strings.c:1508
+#: locale/ipp-strings.c:1512
 msgid "media-source.tray-12"
 msgstr ""
 
 #. TRANSLATORS: Tray 13
-#: locale/ipp-strings.c:1510
+#: locale/ipp-strings.c:1514
 msgid "media-source.tray-13"
 msgstr ""
 
 #. TRANSLATORS: Tray 14
-#: locale/ipp-strings.c:1512
+#: locale/ipp-strings.c:1516
 msgid "media-source.tray-14"
 msgstr ""
 
 #. TRANSLATORS: Tray 15
-#: locale/ipp-strings.c:1514
+#: locale/ipp-strings.c:1518
 msgid "media-source.tray-15"
 msgstr ""
 
 #. TRANSLATORS: Tray 16
-#: locale/ipp-strings.c:1516
+#: locale/ipp-strings.c:1520
 msgid "media-source.tray-16"
 msgstr ""
 
 #. TRANSLATORS: Tray 17
-#: locale/ipp-strings.c:1518
+#: locale/ipp-strings.c:1522
 msgid "media-source.tray-17"
 msgstr ""
 
 #. TRANSLATORS: Tray 18
-#: locale/ipp-strings.c:1520
+#: locale/ipp-strings.c:1524
 msgid "media-source.tray-18"
 msgstr ""
 
 #. TRANSLATORS: Tray 19
-#: locale/ipp-strings.c:1522
+#: locale/ipp-strings.c:1526
 msgid "media-source.tray-19"
 msgstr ""
 
 #. TRANSLATORS: Tray 2
-#: locale/ipp-strings.c:1524
+#: locale/ipp-strings.c:1528
 msgid "media-source.tray-2"
 msgstr ""
 
 #. TRANSLATORS: Tray 20
-#: locale/ipp-strings.c:1526
+#: locale/ipp-strings.c:1530
 msgid "media-source.tray-20"
 msgstr ""
 
 #. TRANSLATORS: Tray 3
-#: locale/ipp-strings.c:1528
+#: locale/ipp-strings.c:1532
 msgid "media-source.tray-3"
 msgstr ""
 
 #. TRANSLATORS: Tray 4
-#: locale/ipp-strings.c:1530
+#: locale/ipp-strings.c:1534
 msgid "media-source.tray-4"
 msgstr ""
 
 #. TRANSLATORS: Tray 5
-#: locale/ipp-strings.c:1532
+#: locale/ipp-strings.c:1536
 msgid "media-source.tray-5"
 msgstr ""
 
 #. TRANSLATORS: Tray 6
-#: locale/ipp-strings.c:1534
+#: locale/ipp-strings.c:1538
 msgid "media-source.tray-6"
 msgstr ""
 
 #. TRANSLATORS: Tray 7
-#: locale/ipp-strings.c:1536
+#: locale/ipp-strings.c:1540
 msgid "media-source.tray-7"
 msgstr ""
 
 #. TRANSLATORS: Tray 8
-#: locale/ipp-strings.c:1538
+#: locale/ipp-strings.c:1542
 msgid "media-source.tray-8"
 msgstr ""
 
 #. TRANSLATORS: Tray 9
-#: locale/ipp-strings.c:1540
+#: locale/ipp-strings.c:1544
 msgid "media-source.tray-9"
 msgstr ""
 
 #. TRANSLATORS: Media Thickness
-#: locale/ipp-strings.c:1542
+#: locale/ipp-strings.c:1546
 msgid "media-thickness"
 msgstr ""
 
 #. TRANSLATORS: Media Tooth (Texture)
-#: locale/ipp-strings.c:1544
+#: locale/ipp-strings.c:1548
 msgid "media-tooth"
 msgstr ""
 
 #. TRANSLATORS: Antique
-#: locale/ipp-strings.c:1546
+#: locale/ipp-strings.c:1550
 msgid "media-tooth.antique"
 msgstr ""
 
 #. TRANSLATORS: Extra Smooth
-#: locale/ipp-strings.c:1548
+#: locale/ipp-strings.c:1552
 msgid "media-tooth.calendared"
 msgstr ""
 
 #. TRANSLATORS: Coarse
-#: locale/ipp-strings.c:1550
+#: locale/ipp-strings.c:1554
 msgid "media-tooth.coarse"
 msgstr ""
 
 #. TRANSLATORS: Fine
-#: locale/ipp-strings.c:1552
+#: locale/ipp-strings.c:1556
 msgid "media-tooth.fine"
 msgstr ""
 
 #. TRANSLATORS: Linen
-#: locale/ipp-strings.c:1554
+#: locale/ipp-strings.c:1558
 msgid "media-tooth.linen"
 msgstr ""
 
 #. TRANSLATORS: Medium
-#: locale/ipp-strings.c:1556
+#: locale/ipp-strings.c:1560
 msgid "media-tooth.medium"
 msgstr ""
 
 #. TRANSLATORS: Smooth
-#: locale/ipp-strings.c:1558
+#: locale/ipp-strings.c:1562
 msgid "media-tooth.smooth"
 msgstr ""
 
 #. TRANSLATORS: Stipple
-#: locale/ipp-strings.c:1560
+#: locale/ipp-strings.c:1564
 msgid "media-tooth.stipple"
 msgstr ""
 
 #. TRANSLATORS: Rough
-#: locale/ipp-strings.c:1562
+#: locale/ipp-strings.c:1566
 msgid "media-tooth.uncalendared"
 msgstr ""
 
 #. TRANSLATORS: Vellum
-#: locale/ipp-strings.c:1564
+#: locale/ipp-strings.c:1568
 msgid "media-tooth.vellum"
 msgstr ""
 
 #. TRANSLATORS: Media Top Margin
-#: locale/ipp-strings.c:1566
+#: locale/ipp-strings.c:1570
 msgid "media-top-margin"
 msgstr ""
 
 #. TRANSLATORS: Media Type
-#: locale/ipp-strings.c:1568
+#: locale/ipp-strings.c:1572
 msgid "media-type"
 msgstr ""
 
 #. TRANSLATORS: Aluminum
-#: locale/ipp-strings.c:1570
+#: locale/ipp-strings.c:1574
 msgid "media-type.aluminum"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:1572
+#: locale/ipp-strings.c:1576
 msgid "media-type.auto"
 msgstr ""
 
 #. TRANSLATORS: Back Print Film
-#: locale/ipp-strings.c:1574
+#: locale/ipp-strings.c:1578
 msgid "media-type.back-print-film"
 msgstr ""
 
 #. TRANSLATORS: Cardboard
-#: locale/ipp-strings.c:1576
+#: locale/ipp-strings.c:1580
 msgid "media-type.cardboard"
 msgstr ""
 
 #. TRANSLATORS: Cardstock
-#: locale/ipp-strings.c:1578
+#: locale/ipp-strings.c:1582
 msgid "media-type.cardstock"
 msgstr ""
 
 #. TRANSLATORS: CD
-#: locale/ipp-strings.c:1580
+#: locale/ipp-strings.c:1584
 msgid "media-type.cd"
 msgstr ""
 
+#. TRANSLATORS: Photo Advanced Paper
+#: locale/ipp-strings.c:1586
 msgid "media-type.com.hp.advanced-photo"
 msgstr ""
 
+#. TRANSLATORS: Brochure Glossy Paper
+#: locale/ipp-strings.c:1588
 msgid "media-type.com.hp.brochure-glossy"
 msgstr ""
 
+#. TRANSLATORS: Brochure Matte Paper
+#: locale/ipp-strings.c:1590
 msgid "media-type.com.hp.brochure-matte"
 msgstr ""
 
+#. TRANSLATORS: Matte Coverstock
+#: locale/ipp-strings.c:1592
 msgid "media-type.com.hp.cover-matte"
 msgstr ""
 
+#. TRANSLATORS: EcoSMART Lite Paper
+#: locale/ipp-strings.c:1594
 msgid "media-type.com.hp.ecosmart-lite"
 msgstr ""
 
+#. TRANSLATORS: Everyday Glossy Paper
+#: locale/ipp-strings.c:1596
 msgid "media-type.com.hp.everyday-glossy"
 msgstr ""
 
+#. TRANSLATORS: Everyday Matte Paper
+#: locale/ipp-strings.c:1598
 msgid "media-type.com.hp.everyday-matte"
 msgstr ""
 
+#. TRANSLATORS: Extra Heavyweight Paper
+#: locale/ipp-strings.c:1600
 msgid "media-type.com.hp.extra-heavy"
 msgstr ""
 
+#. TRANSLATORS: Intermediate Paper
+#: locale/ipp-strings.c:1602
 msgid "media-type.com.hp.intermediate"
 msgstr ""
 
+#. TRANSLATORS: Mid-Weight Paper
+#: locale/ipp-strings.c:1604
 msgid "media-type.com.hp.mid-weight"
 msgstr ""
 
+#. TRANSLATORS: Inkjet Premium Paper
+#: locale/ipp-strings.c:1606
 msgid "media-type.com.hp.premium-inkjet"
 msgstr ""
 
+#. TRANSLATORS: Photo Premium Paper
+#: locale/ipp-strings.c:1608
 msgid "media-type.com.hp.premium-photo"
 msgstr ""
 
+#. TRANSLATORS: Premium Matte Presentation Paper
+#: locale/ipp-strings.c:1610
 msgid "media-type.com.hp.premium-presentation-matte"
 msgstr ""
 
 #. TRANSLATORS: Continuous
-#: locale/ipp-strings.c:1582
+#: locale/ipp-strings.c:1612
 msgid "media-type.continuous"
 msgstr ""
 
 #. TRANSLATORS: Continuous Long
-#: locale/ipp-strings.c:1584
+#: locale/ipp-strings.c:1614
 msgid "media-type.continuous-long"
 msgstr ""
 
 #. TRANSLATORS: Continuous Short
-#: locale/ipp-strings.c:1586
+#: locale/ipp-strings.c:1616
 msgid "media-type.continuous-short"
 msgstr ""
 
 #. TRANSLATORS: Corrugated Board
-#: locale/ipp-strings.c:1588
+#: locale/ipp-strings.c:1618
 msgid "media-type.corrugated-board"
 msgstr ""
 
 #. TRANSLATORS: Optical Disc
-#: locale/ipp-strings.c:1590
+#: locale/ipp-strings.c:1620
 msgid "media-type.disc"
 msgstr ""
 
 #. TRANSLATORS: Glossy Optical Disc
-#: locale/ipp-strings.c:1592
+#: locale/ipp-strings.c:1622
 msgid "media-type.disc-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Optical Disc
-#: locale/ipp-strings.c:1594
+#: locale/ipp-strings.c:1624
 msgid "media-type.disc-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte Optical Disc
-#: locale/ipp-strings.c:1596
+#: locale/ipp-strings.c:1626
 msgid "media-type.disc-matte"
 msgstr ""
 
 #. TRANSLATORS: Satin Optical Disc
-#: locale/ipp-strings.c:1598
+#: locale/ipp-strings.c:1628
 msgid "media-type.disc-satin"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Optical Disc
-#: locale/ipp-strings.c:1600
+#: locale/ipp-strings.c:1630
 msgid "media-type.disc-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Double Wall
-#: locale/ipp-strings.c:1602
+#: locale/ipp-strings.c:1632
 msgid "media-type.double-wall"
 msgstr ""
 
 #. TRANSLATORS: Dry Film
-#: locale/ipp-strings.c:1604
+#: locale/ipp-strings.c:1634
 msgid "media-type.dry-film"
 msgstr ""
 
 #. TRANSLATORS: DVD
-#: locale/ipp-strings.c:1606
+#: locale/ipp-strings.c:1636
 msgid "media-type.dvd"
 msgstr ""
 
 #. TRANSLATORS: Embossing Foil
-#: locale/ipp-strings.c:1608
+#: locale/ipp-strings.c:1638
 msgid "media-type.embossing-foil"
 msgstr ""
 
 #. TRANSLATORS: End Board
-#: locale/ipp-strings.c:1610
+#: locale/ipp-strings.c:1640
 msgid "media-type.end-board"
 msgstr ""
 
 #. TRANSLATORS: Envelope
-#: locale/ipp-strings.c:1612
+#: locale/ipp-strings.c:1642
 msgid "media-type.envelope"
 msgstr ""
 
 #. TRANSLATORS: Archival Envelope
-#: locale/ipp-strings.c:1614
+#: locale/ipp-strings.c:1644
 msgid "media-type.envelope-archival"
 msgstr ""
 
 #. TRANSLATORS: Bond Envelope
-#: locale/ipp-strings.c:1616
+#: locale/ipp-strings.c:1646
 msgid "media-type.envelope-bond"
 msgstr ""
 
 #. TRANSLATORS: Coated Envelope
-#: locale/ipp-strings.c:1618
+#: locale/ipp-strings.c:1648
 msgid "media-type.envelope-coated"
 msgstr ""
 
 #. TRANSLATORS: Cotton Envelope
-#: locale/ipp-strings.c:1620
+#: locale/ipp-strings.c:1650
 msgid "media-type.envelope-cotton"
 msgstr ""
 
 #. TRANSLATORS: Fine Envelope
-#: locale/ipp-strings.c:1622
+#: locale/ipp-strings.c:1652
 msgid "media-type.envelope-fine"
 msgstr ""
 
 #. TRANSLATORS: Heavyweight Envelope
-#: locale/ipp-strings.c:1624
+#: locale/ipp-strings.c:1654
 msgid "media-type.envelope-heavyweight"
 msgstr ""
 
 #. TRANSLATORS: Inkjet Envelope
-#: locale/ipp-strings.c:1626
+#: locale/ipp-strings.c:1656
 msgid "media-type.envelope-inkjet"
 msgstr ""
 
 #. TRANSLATORS: Lightweight Envelope
-#: locale/ipp-strings.c:1628
+#: locale/ipp-strings.c:1658
 msgid "media-type.envelope-lightweight"
 msgstr ""
 
 #. TRANSLATORS: Plain Envelope
-#: locale/ipp-strings.c:1630
+#: locale/ipp-strings.c:1660
 msgid "media-type.envelope-plain"
 msgstr ""
 
 #. TRANSLATORS: Preprinted Envelope
-#: locale/ipp-strings.c:1632
+#: locale/ipp-strings.c:1662
 msgid "media-type.envelope-preprinted"
 msgstr ""
 
 #. TRANSLATORS: Windowed Envelope
-#: locale/ipp-strings.c:1634
+#: locale/ipp-strings.c:1664
 msgid "media-type.envelope-window"
 msgstr ""
 
 #. TRANSLATORS: Fabric
-#: locale/ipp-strings.c:1636
+#: locale/ipp-strings.c:1666
 msgid "media-type.fabric"
 msgstr ""
 
 #. TRANSLATORS: Archival Fabric
-#: locale/ipp-strings.c:1638
+#: locale/ipp-strings.c:1668
 msgid "media-type.fabric-archival"
 msgstr ""
 
 #. TRANSLATORS: Glossy Fabric
-#: locale/ipp-strings.c:1640
+#: locale/ipp-strings.c:1670
 msgid "media-type.fabric-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Fabric
-#: locale/ipp-strings.c:1642
+#: locale/ipp-strings.c:1672
 msgid "media-type.fabric-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte Fabric
-#: locale/ipp-strings.c:1644
+#: locale/ipp-strings.c:1674
 msgid "media-type.fabric-matte"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Fabric
-#: locale/ipp-strings.c:1646
+#: locale/ipp-strings.c:1676
 msgid "media-type.fabric-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Waterproof Fabric
-#: locale/ipp-strings.c:1648
+#: locale/ipp-strings.c:1678
 msgid "media-type.fabric-waterproof"
 msgstr ""
 
 #. TRANSLATORS: Film
-#: locale/ipp-strings.c:1650
+#: locale/ipp-strings.c:1680
 msgid "media-type.film"
 msgstr ""
 
 #. TRANSLATORS: Flexo Base
-#: locale/ipp-strings.c:1652
+#: locale/ipp-strings.c:1682
 msgid "media-type.flexo-base"
 msgstr ""
 
 #. TRANSLATORS: Flexo Photo Polymer
-#: locale/ipp-strings.c:1654
+#: locale/ipp-strings.c:1684
 msgid "media-type.flexo-photo-polymer"
 msgstr ""
 
 #. TRANSLATORS: Flute
-#: locale/ipp-strings.c:1656
+#: locale/ipp-strings.c:1686
 msgid "media-type.flute"
 msgstr ""
 
 #. TRANSLATORS: Foil
-#: locale/ipp-strings.c:1658
+#: locale/ipp-strings.c:1688
 msgid "media-type.foil"
 msgstr ""
 
 #. TRANSLATORS: Full Cut Tabs
-#: locale/ipp-strings.c:1660
+#: locale/ipp-strings.c:1690
 msgid "media-type.full-cut-tabs"
 msgstr ""
 
 #. TRANSLATORS: Glass
-#: locale/ipp-strings.c:1662
+#: locale/ipp-strings.c:1692
 msgid "media-type.glass"
 msgstr ""
 
 #. TRANSLATORS: Glass Colored
-#: locale/ipp-strings.c:1664
+#: locale/ipp-strings.c:1694
 msgid "media-type.glass-colored"
 msgstr ""
 
 #. TRANSLATORS: Glass Opaque
-#: locale/ipp-strings.c:1666
+#: locale/ipp-strings.c:1696
 msgid "media-type.glass-opaque"
 msgstr ""
 
 #. TRANSLATORS: Glass Surfaced
-#: locale/ipp-strings.c:1668
+#: locale/ipp-strings.c:1698
 msgid "media-type.glass-surfaced"
 msgstr ""
 
 #. TRANSLATORS: Glass Textured
-#: locale/ipp-strings.c:1670
+#: locale/ipp-strings.c:1700
 msgid "media-type.glass-textured"
 msgstr ""
 
 #. TRANSLATORS: Gravure Cylinder
-#: locale/ipp-strings.c:1672
+#: locale/ipp-strings.c:1702
 msgid "media-type.gravure-cylinder"
 msgstr ""
 
 #. TRANSLATORS: Image Setter Paper
-#: locale/ipp-strings.c:1674
+#: locale/ipp-strings.c:1704
 msgid "media-type.image-setter-paper"
 msgstr ""
 
 #. TRANSLATORS: Imaging Cylinder
-#: locale/ipp-strings.c:1676
+#: locale/ipp-strings.c:1706
 msgid "media-type.imaging-cylinder"
 msgstr ""
 
+#. TRANSLATORS: Photo Paper Plus Glossy II
+#: locale/ipp-strings.c:1712
 msgid "media-type.jp.co.canon_photo-paper-plus-glossy-ii"
 msgstr ""
 
+#. TRANSLATORS: Photo Paper Pro Platinum
+#: locale/ipp-strings.c:1714
 msgid "media-type.jp.co.canon_photo-paper-pro-platinum"
 msgstr ""
 
+#. TRANSLATORS: Photo Paper Plus Glossy II
+#: locale/ipp-strings.c:1708
 msgid "media-type.jp.co.canon-photo-paper-plus-glossy-ii"
 msgstr ""
 
+#. TRANSLATORS: Photo Paper Pro Platinum
+#: locale/ipp-strings.c:1710
 msgid "media-type.jp.co.canon-photo-paper-pro-platinum"
 msgstr ""
 
 #. TRANSLATORS: Labels
-#: locale/ipp-strings.c:1678
+#: locale/ipp-strings.c:1716
 msgid "media-type.labels"
 msgstr ""
 
 #. TRANSLATORS: Colored Labels
-#: locale/ipp-strings.c:1680
+#: locale/ipp-strings.c:1718
 msgid "media-type.labels-colored"
 msgstr ""
 
 #. TRANSLATORS: Glossy Labels
-#: locale/ipp-strings.c:1682
+#: locale/ipp-strings.c:1720
 msgid "media-type.labels-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Labels
-#: locale/ipp-strings.c:1684
+#: locale/ipp-strings.c:1722
 msgid "media-type.labels-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Inkjet Labels
-#: locale/ipp-strings.c:1686
+#: locale/ipp-strings.c:1724
 msgid "media-type.labels-inkjet"
 msgstr ""
 
 #. TRANSLATORS: Matte Labels
-#: locale/ipp-strings.c:1688
+#: locale/ipp-strings.c:1726
 msgid "media-type.labels-matte"
 msgstr ""
 
 #. TRANSLATORS: Permanent Labels
-#: locale/ipp-strings.c:1690
+#: locale/ipp-strings.c:1728
 msgid "media-type.labels-permanent"
 msgstr ""
 
 #. TRANSLATORS: Satin Labels
-#: locale/ipp-strings.c:1692
+#: locale/ipp-strings.c:1730
 msgid "media-type.labels-satin"
 msgstr ""
 
 #. TRANSLATORS: Security Labels
-#: locale/ipp-strings.c:1694
+#: locale/ipp-strings.c:1732
 msgid "media-type.labels-security"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Labels
-#: locale/ipp-strings.c:1696
+#: locale/ipp-strings.c:1734
 msgid "media-type.labels-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Laminating Foil
-#: locale/ipp-strings.c:1698
+#: locale/ipp-strings.c:1736
 msgid "media-type.laminating-foil"
 msgstr ""
 
 #. TRANSLATORS: Letterhead
-#: locale/ipp-strings.c:1700
+#: locale/ipp-strings.c:1738
 msgid "media-type.letterhead"
 msgstr ""
 
 #. TRANSLATORS: Metal
-#: locale/ipp-strings.c:1702
+#: locale/ipp-strings.c:1740
 msgid "media-type.metal"
 msgstr ""
 
 #. TRANSLATORS: Metal Glossy
-#: locale/ipp-strings.c:1704
+#: locale/ipp-strings.c:1742
 msgid "media-type.metal-glossy"
 msgstr ""
 
 #. TRANSLATORS: Metal High Gloss
-#: locale/ipp-strings.c:1706
+#: locale/ipp-strings.c:1744
 msgid "media-type.metal-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Metal Matte
-#: locale/ipp-strings.c:1708
+#: locale/ipp-strings.c:1746
 msgid "media-type.metal-matte"
 msgstr ""
 
 #. TRANSLATORS: Metal Satin
-#: locale/ipp-strings.c:1710
+#: locale/ipp-strings.c:1748
 msgid "media-type.metal-satin"
 msgstr ""
 
 #. TRANSLATORS: Metal Semi Gloss
-#: locale/ipp-strings.c:1712
+#: locale/ipp-strings.c:1750
 msgid "media-type.metal-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Mounting Tape
-#: locale/ipp-strings.c:1714
+#: locale/ipp-strings.c:1752
 msgid "media-type.mounting-tape"
 msgstr ""
 
 #. TRANSLATORS: Multi Layer
-#: locale/ipp-strings.c:1716
+#: locale/ipp-strings.c:1754
 msgid "media-type.multi-layer"
 msgstr ""
 
 #. TRANSLATORS: Multi Part Form
-#: locale/ipp-strings.c:1718
+#: locale/ipp-strings.c:1756
 msgid "media-type.multi-part-form"
 msgstr ""
 
 #. TRANSLATORS: Other
-#: locale/ipp-strings.c:1720
+#: locale/ipp-strings.c:1758
 msgid "media-type.other"
 msgstr ""
 
 #. TRANSLATORS: Paper
-#: locale/ipp-strings.c:1722
+#: locale/ipp-strings.c:1760
 msgid "media-type.paper"
 msgstr ""
 
 #. TRANSLATORS: Photo Paper
-#: locale/ipp-strings.c:1724
+#: locale/ipp-strings.c:1762
 msgid "media-type.photographic"
 msgstr ""
 
 #. TRANSLATORS: Photographic Archival
-#: locale/ipp-strings.c:1726
+#: locale/ipp-strings.c:1764
 msgid "media-type.photographic-archival"
 msgstr ""
 
 #. TRANSLATORS: Photo Film
-#: locale/ipp-strings.c:1728
+#: locale/ipp-strings.c:1766
 msgid "media-type.photographic-film"
 msgstr ""
 
 #. TRANSLATORS: Glossy Photo Paper
-#: locale/ipp-strings.c:1730
+#: locale/ipp-strings.c:1768
 msgid "media-type.photographic-glossy"
 msgstr ""
 
 #. TRANSLATORS: High Gloss Photo Paper
-#: locale/ipp-strings.c:1732
+#: locale/ipp-strings.c:1770
 msgid "media-type.photographic-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Matte Photo Paper
-#: locale/ipp-strings.c:1734
+#: locale/ipp-strings.c:1772
 msgid "media-type.photographic-matte"
 msgstr ""
 
 #. TRANSLATORS: Satin Photo Paper
-#: locale/ipp-strings.c:1736
+#: locale/ipp-strings.c:1774
 msgid "media-type.photographic-satin"
 msgstr ""
 
 #. TRANSLATORS: Semi-Gloss Photo Paper
-#: locale/ipp-strings.c:1738
+#: locale/ipp-strings.c:1776
 msgid "media-type.photographic-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Plastic
-#: locale/ipp-strings.c:1740
+#: locale/ipp-strings.c:1778
 msgid "media-type.plastic"
 msgstr ""
 
 #. TRANSLATORS: Plastic Archival
-#: locale/ipp-strings.c:1742
+#: locale/ipp-strings.c:1780
 msgid "media-type.plastic-archival"
 msgstr ""
 
 #. TRANSLATORS: Plastic Colored
-#: locale/ipp-strings.c:1744
+#: locale/ipp-strings.c:1782
 msgid "media-type.plastic-colored"
 msgstr ""
 
 #. TRANSLATORS: Plastic Glossy
-#: locale/ipp-strings.c:1746
+#: locale/ipp-strings.c:1784
 msgid "media-type.plastic-glossy"
 msgstr ""
 
 #. TRANSLATORS: Plastic High Gloss
-#: locale/ipp-strings.c:1748
+#: locale/ipp-strings.c:1786
 msgid "media-type.plastic-high-gloss"
 msgstr ""
 
 #. TRANSLATORS: Plastic Matte
-#: locale/ipp-strings.c:1750
+#: locale/ipp-strings.c:1788
 msgid "media-type.plastic-matte"
 msgstr ""
 
 #. TRANSLATORS: Plastic Satin
-#: locale/ipp-strings.c:1752
+#: locale/ipp-strings.c:1790
 msgid "media-type.plastic-satin"
 msgstr ""
 
 #. TRANSLATORS: Plastic Semi Gloss
-#: locale/ipp-strings.c:1754
+#: locale/ipp-strings.c:1792
 msgid "media-type.plastic-semi-gloss"
 msgstr ""
 
 #. TRANSLATORS: Plate
-#: locale/ipp-strings.c:1756
+#: locale/ipp-strings.c:1794
 msgid "media-type.plate"
 msgstr ""
 
 #. TRANSLATORS: Polyester
-#: locale/ipp-strings.c:1758
+#: locale/ipp-strings.c:1796
 msgid "media-type.polyester"
 msgstr ""
 
 #. TRANSLATORS: Pre Cut Tabs
-#: locale/ipp-strings.c:1760
+#: locale/ipp-strings.c:1798
 msgid "media-type.pre-cut-tabs"
 msgstr ""
 
 #. TRANSLATORS: Roll
-#: locale/ipp-strings.c:1762
+#: locale/ipp-strings.c:1800
 msgid "media-type.roll"
 msgstr ""
 
 #. TRANSLATORS: Screen
-#: locale/ipp-strings.c:1764
+#: locale/ipp-strings.c:1802
 msgid "media-type.screen"
 msgstr ""
 
 #. TRANSLATORS: Screen Paged
-#: locale/ipp-strings.c:1766
+#: locale/ipp-strings.c:1804
 msgid "media-type.screen-paged"
 msgstr ""
 
 #. TRANSLATORS: Self Adhesive
-#: locale/ipp-strings.c:1768
+#: locale/ipp-strings.c:1806
 msgid "media-type.self-adhesive"
 msgstr ""
 
 #. TRANSLATORS: Self Adhesive Film
-#: locale/ipp-strings.c:1770
+#: locale/ipp-strings.c:1808
 msgid "media-type.self-adhesive-film"
 msgstr ""
 
 #. TRANSLATORS: Shrink Foil
-#: locale/ipp-strings.c:1772
+#: locale/ipp-strings.c:1810
 msgid "media-type.shrink-foil"
 msgstr ""
 
 #. TRANSLATORS: Single Face
-#: locale/ipp-strings.c:1774
+#: locale/ipp-strings.c:1812
 msgid "media-type.single-face"
 msgstr ""
 
 #. TRANSLATORS: Single Wall
-#: locale/ipp-strings.c:1776
+#: locale/ipp-strings.c:1814
 msgid "media-type.single-wall"
 msgstr ""
 
 #. TRANSLATORS: Sleeve
-#: locale/ipp-strings.c:1778
+#: locale/ipp-strings.c:1816
 msgid "media-type.sleeve"
 msgstr ""
 
 #. TRANSLATORS: Stationery
-#: locale/ipp-strings.c:1780
+#: locale/ipp-strings.c:1818
 msgid "media-type.stationery"
 msgstr ""
 
 #. TRANSLATORS: Stationery Archival
-#: locale/ipp-strings.c:1782
+#: locale/ipp-strings.c:1820
 msgid "media-type.stationery-archival"
 msgstr ""
 
 #. TRANSLATORS: Coated Paper
-#: locale/ipp-strings.c:1784
+#: locale/ipp-strings.c:1822
 msgid "media-type.stationery-coated"
 msgstr ""
 
 #. TRANSLATORS: Stationery Cotton
-#: locale/ipp-strings.c:1786
+#: locale/ipp-strings.c:1824
 msgid "media-type.stationery-cotton"
 msgstr ""
 
 #. TRANSLATORS: Vellum Paper
-#: locale/ipp-strings.c:1788
+#: locale/ipp-strings.c:1826
 msgid "media-type.stationery-fine"
 msgstr ""
 
 #. TRANSLATORS: Heavyweight Paper
-#: locale/ipp-strings.c:1790
+#: locale/ipp-strings.c:1828
 msgid "media-type.stationery-heavyweight"
 msgstr ""
 
 #. TRANSLATORS: Stationery Heavyweight Coated
-#: locale/ipp-strings.c:1792
+#: locale/ipp-strings.c:1830
 msgid "media-type.stationery-heavyweight-coated"
 msgstr ""
 
 #. TRANSLATORS: Stationery Inkjet Paper
-#: locale/ipp-strings.c:1794
+#: locale/ipp-strings.c:1832
 msgid "media-type.stationery-inkjet"
 msgstr ""
 
 #. TRANSLATORS: Letterhead
-#: locale/ipp-strings.c:1796
+#: locale/ipp-strings.c:1834
 msgid "media-type.stationery-letterhead"
 msgstr ""
 
 #. TRANSLATORS: Lightweight Paper
-#: locale/ipp-strings.c:1798
+#: locale/ipp-strings.c:1836
 msgid "media-type.stationery-lightweight"
 msgstr ""
 
 #. TRANSLATORS: Preprinted Paper
-#: locale/ipp-strings.c:1800
+#: locale/ipp-strings.c:1838
 msgid "media-type.stationery-preprinted"
 msgstr ""
 
 #. TRANSLATORS: Punched Paper
-#: locale/ipp-strings.c:1802
+#: locale/ipp-strings.c:1840
 msgid "media-type.stationery-prepunched"
 msgstr ""
 
 #. TRANSLATORS: Tab Stock
-#: locale/ipp-strings.c:1804
+#: locale/ipp-strings.c:1842
 msgid "media-type.tab-stock"
 msgstr ""
 
 #. TRANSLATORS: Tractor
-#: locale/ipp-strings.c:1806
+#: locale/ipp-strings.c:1844
 msgid "media-type.tractor"
 msgstr ""
 
 #. TRANSLATORS: Transfer
-#: locale/ipp-strings.c:1808
+#: locale/ipp-strings.c:1846
 msgid "media-type.transfer"
 msgstr ""
 
 #. TRANSLATORS: Transparency
-#: locale/ipp-strings.c:1810
+#: locale/ipp-strings.c:1848
 msgid "media-type.transparency"
 msgstr ""
 
 #. TRANSLATORS: Triple Wall
-#: locale/ipp-strings.c:1812
+#: locale/ipp-strings.c:1850
 msgid "media-type.triple-wall"
 msgstr ""
 
 #. TRANSLATORS: Wet Film
-#: locale/ipp-strings.c:1814
+#: locale/ipp-strings.c:1852
 msgid "media-type.wet-film"
 msgstr ""
 
 #. TRANSLATORS: Media Weight (grams per m²)
-#: locale/ipp-strings.c:1816
+#: locale/ipp-strings.c:1854
 msgid "media-weight-metric"
 msgstr ""
 
 #. TRANSLATORS: 28 x 40″
-#: locale/ipp-strings.c:1818
+#: locale/ipp-strings.c:1856
 msgid "media.asme_f_28x40in"
 msgstr ""
 
 #. TRANSLATORS: A4 or US Letter
-#: locale/ipp-strings.c:1820
+#: locale/ipp-strings.c:1858
 msgid "media.choice_iso_a4_210x297mm_na_letter_8.5x11in"
 msgstr ""
 
 #. TRANSLATORS: 2a0
-#: locale/ipp-strings.c:1822
+#: locale/ipp-strings.c:1860
 msgid "media.iso_2a0_1189x1682mm"
 msgstr ""
 
 #. TRANSLATORS: A0
-#: locale/ipp-strings.c:1824
+#: locale/ipp-strings.c:1862
 msgid "media.iso_a0_841x1189mm"
 msgstr ""
 
 #. TRANSLATORS: A0x3
-#: locale/ipp-strings.c:1826
+#: locale/ipp-strings.c:1864
 msgid "media.iso_a0x3_1189x2523mm"
 msgstr ""
 
 #. TRANSLATORS: A10
-#: locale/ipp-strings.c:1828
+#: locale/ipp-strings.c:1866
 msgid "media.iso_a10_26x37mm"
 msgstr ""
 
 #. TRANSLATORS: A1
-#: locale/ipp-strings.c:1830
+#: locale/ipp-strings.c:1868
 msgid "media.iso_a1_594x841mm"
 msgstr ""
 
 #. TRANSLATORS: A1x3
-#: locale/ipp-strings.c:1832
+#: locale/ipp-strings.c:1870
 msgid "media.iso_a1x3_841x1783mm"
 msgstr ""
 
 #. TRANSLATORS: A1x4
-#: locale/ipp-strings.c:1834
+#: locale/ipp-strings.c:1872
 msgid "media.iso_a1x4_841x2378mm"
 msgstr ""
 
 #. TRANSLATORS: A2
-#: locale/ipp-strings.c:1836
+#: locale/ipp-strings.c:1874
 msgid "media.iso_a2_420x594mm"
 msgstr ""
 
 #. TRANSLATORS: A2x3
-#: locale/ipp-strings.c:1838
+#: locale/ipp-strings.c:1876
 msgid "media.iso_a2x3_594x1261mm"
 msgstr ""
 
 #. TRANSLATORS: A2x4
-#: locale/ipp-strings.c:1840
+#: locale/ipp-strings.c:1878
 msgid "media.iso_a2x4_594x1682mm"
 msgstr ""
 
 #. TRANSLATORS: A2x5
-#: locale/ipp-strings.c:1842
+#: locale/ipp-strings.c:1880
 msgid "media.iso_a2x5_594x2102mm"
 msgstr ""
 
 #. TRANSLATORS: A3 (Extra)
-#: locale/ipp-strings.c:1844
+#: locale/ipp-strings.c:1882
 msgid "media.iso_a3-extra_322x445mm"
 msgstr ""
 
 #. TRANSLATORS: A3
-#: locale/ipp-strings.c:1846
+#: locale/ipp-strings.c:1884
 msgid "media.iso_a3_297x420mm"
 msgstr ""
 
 #. TRANSLATORS: A3x3
-#: locale/ipp-strings.c:1848
+#: locale/ipp-strings.c:1886
 msgid "media.iso_a3x3_420x891mm"
 msgstr ""
 
 #. TRANSLATORS: A3x4
-#: locale/ipp-strings.c:1850
+#: locale/ipp-strings.c:1888
 msgid "media.iso_a3x4_420x1189mm"
 msgstr ""
 
 #. TRANSLATORS: A3x5
-#: locale/ipp-strings.c:1852
+#: locale/ipp-strings.c:1890
 msgid "media.iso_a3x5_420x1486mm"
 msgstr ""
 
 #. TRANSLATORS: A3x6
-#: locale/ipp-strings.c:1854
+#: locale/ipp-strings.c:1892
 msgid "media.iso_a3x6_420x1783mm"
 msgstr ""
 
 #. TRANSLATORS: A3x7
-#: locale/ipp-strings.c:1856
+#: locale/ipp-strings.c:1894
 msgid "media.iso_a3x7_420x2080mm"
 msgstr ""
 
 #. TRANSLATORS: A4 (Extra)
-#: locale/ipp-strings.c:1858
+#: locale/ipp-strings.c:1896
 msgid "media.iso_a4-extra_235.5x322.3mm"
 msgstr ""
 
 #. TRANSLATORS: A4 (Tab)
-#: locale/ipp-strings.c:1860
+#: locale/ipp-strings.c:1898
 msgid "media.iso_a4-tab_225x297mm"
 msgstr ""
 
 #. TRANSLATORS: A4
-#: locale/ipp-strings.c:1862
+#: locale/ipp-strings.c:1900
 msgid "media.iso_a4_210x297mm"
 msgstr ""
 
 #. TRANSLATORS: A4x3
-#: locale/ipp-strings.c:1864
+#: locale/ipp-strings.c:1902
 msgid "media.iso_a4x3_297x630mm"
 msgstr ""
 
 #. TRANSLATORS: A4x4
-#: locale/ipp-strings.c:1866
+#: locale/ipp-strings.c:1904
 msgid "media.iso_a4x4_297x841mm"
 msgstr ""
 
 #. TRANSLATORS: A4x5
-#: locale/ipp-strings.c:1868
+#: locale/ipp-strings.c:1906
 msgid "media.iso_a4x5_297x1051mm"
 msgstr ""
 
 #. TRANSLATORS: A4x6
-#: locale/ipp-strings.c:1870
+#: locale/ipp-strings.c:1908
 msgid "media.iso_a4x6_297x1261mm"
 msgstr ""
 
 #. TRANSLATORS: A4x7
-#: locale/ipp-strings.c:1872
+#: locale/ipp-strings.c:1910
 msgid "media.iso_a4x7_297x1471mm"
 msgstr ""
 
 #. TRANSLATORS: A4x8
-#: locale/ipp-strings.c:1874
+#: locale/ipp-strings.c:1912
 msgid "media.iso_a4x8_297x1682mm"
 msgstr ""
 
 #. TRANSLATORS: A4x9
-#: locale/ipp-strings.c:1876
+#: locale/ipp-strings.c:1914
 msgid "media.iso_a4x9_297x1892mm"
 msgstr ""
 
 #. TRANSLATORS: A5 (Extra)
-#: locale/ipp-strings.c:1878
+#: locale/ipp-strings.c:1916
 msgid "media.iso_a5-extra_174x235mm"
 msgstr ""
 
 #. TRANSLATORS: A5
-#: locale/ipp-strings.c:1880
+#: locale/ipp-strings.c:1918
 msgid "media.iso_a5_148x210mm"
 msgstr ""
 
 #. TRANSLATORS: A6
-#: locale/ipp-strings.c:1882
+#: locale/ipp-strings.c:1920
 msgid "media.iso_a6_105x148mm"
 msgstr ""
 
 #. TRANSLATORS: A7
-#: locale/ipp-strings.c:1884
+#: locale/ipp-strings.c:1922
 msgid "media.iso_a7_74x105mm"
 msgstr ""
 
 #. TRANSLATORS: A8
-#: locale/ipp-strings.c:1886
+#: locale/ipp-strings.c:1924
 msgid "media.iso_a8_52x74mm"
 msgstr ""
 
 #. TRANSLATORS: A9
-#: locale/ipp-strings.c:1888
+#: locale/ipp-strings.c:1926
 msgid "media.iso_a9_37x52mm"
 msgstr ""
 
 #. TRANSLATORS: B0
-#: locale/ipp-strings.c:1890
+#: locale/ipp-strings.c:1928
 msgid "media.iso_b0_1000x1414mm"
 msgstr ""
 
 #. TRANSLATORS: B10
-#: locale/ipp-strings.c:1892
+#: locale/ipp-strings.c:1930
 msgid "media.iso_b10_31x44mm"
 msgstr ""
 
 #. TRANSLATORS: B1
-#: locale/ipp-strings.c:1894
+#: locale/ipp-strings.c:1932
 msgid "media.iso_b1_707x1000mm"
 msgstr ""
 
 #. TRANSLATORS: B2
-#: locale/ipp-strings.c:1896
+#: locale/ipp-strings.c:1934
 msgid "media.iso_b2_500x707mm"
 msgstr ""
 
 #. TRANSLATORS: B3
-#: locale/ipp-strings.c:1898
+#: locale/ipp-strings.c:1936
 msgid "media.iso_b3_353x500mm"
 msgstr ""
 
 #. TRANSLATORS: B4
-#: locale/ipp-strings.c:1900
+#: locale/ipp-strings.c:1938
 msgid "media.iso_b4_250x353mm"
 msgstr ""
 
 #. TRANSLATORS: B5 (Extra)
-#: locale/ipp-strings.c:1902
+#: locale/ipp-strings.c:1940
 msgid "media.iso_b5-extra_201x276mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope B5
-#: locale/ipp-strings.c:1904
+#: locale/ipp-strings.c:1942
 msgid "media.iso_b5_176x250mm"
 msgstr ""
 
 #. TRANSLATORS: B6
-#: locale/ipp-strings.c:1906
+#: locale/ipp-strings.c:1944
 msgid "media.iso_b6_125x176mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope B6/C4
-#: locale/ipp-strings.c:1908
+#: locale/ipp-strings.c:1946
 msgid "media.iso_b6c4_125x324mm"
 msgstr ""
 
 #. TRANSLATORS: B7
-#: locale/ipp-strings.c:1910
+#: locale/ipp-strings.c:1948
 msgid "media.iso_b7_88x125mm"
 msgstr ""
 
 #. TRANSLATORS: B8
-#: locale/ipp-strings.c:1912
+#: locale/ipp-strings.c:1950
 msgid "media.iso_b8_62x88mm"
 msgstr ""
 
 #. TRANSLATORS: B9
-#: locale/ipp-strings.c:1914
+#: locale/ipp-strings.c:1952
 msgid "media.iso_b9_44x62mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 0
-#: locale/ipp-strings.c:1916
+#: locale/ipp-strings.c:1954
 msgid "media.iso_c0_917x1297mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 10
-#: locale/ipp-strings.c:1918
+#: locale/ipp-strings.c:1956
 msgid "media.iso_c10_28x40mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 1
-#: locale/ipp-strings.c:1920
+#: locale/ipp-strings.c:1958
 msgid "media.iso_c1_648x917mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 2
-#: locale/ipp-strings.c:1922
+#: locale/ipp-strings.c:1960
 msgid "media.iso_c2_458x648mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 3
-#: locale/ipp-strings.c:1924
+#: locale/ipp-strings.c:1962
 msgid "media.iso_c3_324x458mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 4
-#: locale/ipp-strings.c:1926
+#: locale/ipp-strings.c:1964
 msgid "media.iso_c4_229x324mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 5
-#: locale/ipp-strings.c:1928
+#: locale/ipp-strings.c:1966
 msgid "media.iso_c5_162x229mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 6
-#: locale/ipp-strings.c:1930
+#: locale/ipp-strings.c:1968
 msgid "media.iso_c6_114x162mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 6c5
-#: locale/ipp-strings.c:1932
+#: locale/ipp-strings.c:1970
 msgid "media.iso_c6c5_114x229mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 7
-#: locale/ipp-strings.c:1934
+#: locale/ipp-strings.c:1972
 msgid "media.iso_c7_81x114mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 7c6
-#: locale/ipp-strings.c:1936
+#: locale/ipp-strings.c:1974
 msgid "media.iso_c7c6_81x162mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 8
-#: locale/ipp-strings.c:1938
+#: locale/ipp-strings.c:1976
 msgid "media.iso_c8_57x81mm"
 msgstr ""
 
 #. TRANSLATORS: CEnvelope 9
-#: locale/ipp-strings.c:1940
+#: locale/ipp-strings.c:1978
 msgid "media.iso_c9_40x57mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope DL
-#: locale/ipp-strings.c:1942
+#: locale/ipp-strings.c:1980
 msgid "media.iso_dl_110x220mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA0
-#: locale/ipp-strings.c:1948
+#: locale/ipp-strings.c:1986
 msgid "media.iso_ra0_860x1220mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA1
-#: locale/ipp-strings.c:1950
+#: locale/ipp-strings.c:1988
 msgid "media.iso_ra1_610x860mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA2
-#: locale/ipp-strings.c:1952
+#: locale/ipp-strings.c:1990
 msgid "media.iso_ra2_430x610mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA3
-#: locale/ipp-strings.c:1954
+#: locale/ipp-strings.c:1992
 msgid "media.iso_ra3_305x430mm"
 msgstr ""
 
 #. TRANSLATORS: ISO RA4
-#: locale/ipp-strings.c:1956
+#: locale/ipp-strings.c:1994
 msgid "media.iso_ra4_215x305mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA0
-#: locale/ipp-strings.c:1958
+#: locale/ipp-strings.c:1996
 msgid "media.iso_sra0_900x1280mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA1
-#: locale/ipp-strings.c:1960
+#: locale/ipp-strings.c:1998
 msgid "media.iso_sra1_640x900mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA2
-#: locale/ipp-strings.c:1962
+#: locale/ipp-strings.c:2000
 msgid "media.iso_sra2_450x640mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA3
-#: locale/ipp-strings.c:1964
+#: locale/ipp-strings.c:2002
 msgid "media.iso_sra3_320x450mm"
 msgstr ""
 
 #. TRANSLATORS: ISO SRA4
-#: locale/ipp-strings.c:1966
+#: locale/ipp-strings.c:2004
 msgid "media.iso_sra4_225x320mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B0
-#: locale/ipp-strings.c:1968
+#: locale/ipp-strings.c:2006
 msgid "media.jis_b0_1030x1456mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B10
-#: locale/ipp-strings.c:1970
+#: locale/ipp-strings.c:2008
 msgid "media.jis_b10_32x45mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B1
-#: locale/ipp-strings.c:1972
+#: locale/ipp-strings.c:2010
 msgid "media.jis_b1_728x1030mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B2
-#: locale/ipp-strings.c:1974
+#: locale/ipp-strings.c:2012
 msgid "media.jis_b2_515x728mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B3
-#: locale/ipp-strings.c:1976
+#: locale/ipp-strings.c:2014
 msgid "media.jis_b3_364x515mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B4
-#: locale/ipp-strings.c:1978
+#: locale/ipp-strings.c:2016
 msgid "media.jis_b4_257x364mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B5
-#: locale/ipp-strings.c:1980
+#: locale/ipp-strings.c:2018
 msgid "media.jis_b5_182x257mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B6
-#: locale/ipp-strings.c:1982
+#: locale/ipp-strings.c:2020
 msgid "media.jis_b6_128x182mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B7
-#: locale/ipp-strings.c:1984
+#: locale/ipp-strings.c:2022
 msgid "media.jis_b7_91x128mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B8
-#: locale/ipp-strings.c:1986
+#: locale/ipp-strings.c:2024
 msgid "media.jis_b8_64x91mm"
 msgstr ""
 
 #. TRANSLATORS: JIS B9
-#: locale/ipp-strings.c:1988
+#: locale/ipp-strings.c:2026
 msgid "media.jis_b9_45x64mm"
 msgstr ""
 
 #. TRANSLATORS: JIS Executive
-#: locale/ipp-strings.c:1990
+#: locale/ipp-strings.c:2028
 msgid "media.jis_exec_216x330mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chou 2
-#: locale/ipp-strings.c:1992
+#: locale/ipp-strings.c:2030
 msgid "media.jpn_chou2_111.1x146mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chou 3
-#: locale/ipp-strings.c:1994
+#: locale/ipp-strings.c:2032
 msgid "media.jpn_chou3_120x235mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chou 4
-#: locale/ipp-strings.c:1998
+#: locale/ipp-strings.c:2036
 msgid "media.jpn_chou4_90x205mm"
 msgstr ""
 
 #. TRANSLATORS: Hagaki
-#: locale/ipp-strings.c:2000
+#: locale/ipp-strings.c:2038
 msgid "media.jpn_hagaki_100x148mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Kahu
-#: locale/ipp-strings.c:2002
+#: locale/ipp-strings.c:2040
 msgid "media.jpn_kahu_240x322.1mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Kahu 2
-#: locale/ipp-strings.c:2006
+#: locale/ipp-strings.c:2044
 msgid "media.jpn_kaku2_240x332mm"
 msgstr ""
 
 #. TRANSLATORS: 216 x 277mm
-#: locale/ipp-strings.c:2008
+#: locale/ipp-strings.c:2046
 msgid "media.jpn_kaku3_216x277mm"
 msgstr ""
 
 #. TRANSLATORS: 197 x 267mm
-#: locale/ipp-strings.c:2010
+#: locale/ipp-strings.c:2048
 msgid "media.jpn_kaku4_197x267mm"
 msgstr ""
 
 #. TRANSLATORS: 190 x 240mm
-#: locale/ipp-strings.c:2012
+#: locale/ipp-strings.c:2050
 msgid "media.jpn_kaku5_190x240mm"
 msgstr ""
 
 #. TRANSLATORS: 142 x 205mm
-#: locale/ipp-strings.c:2014
+#: locale/ipp-strings.c:2052
 msgid "media.jpn_kaku7_142x205mm"
 msgstr ""
 
 #. TRANSLATORS: 119 x 197mm
-#: locale/ipp-strings.c:2016
+#: locale/ipp-strings.c:2054
 msgid "media.jpn_kaku8_119x197mm"
 msgstr ""
 
 #. TRANSLATORS: Oufuku Reply Postcard
-#: locale/ipp-strings.c:2018
+#: locale/ipp-strings.c:2056
 msgid "media.jpn_oufuku_148x200mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope You 4
-#: locale/ipp-strings.c:2020
+#: locale/ipp-strings.c:2058
 msgid "media.jpn_you4_105x235mm"
 msgstr ""
 
 #. TRANSLATORS: 10 x 11″
-#: locale/ipp-strings.c:2022
+#: locale/ipp-strings.c:2060
 msgid "media.na_10x11_10x11in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 13″
-#: locale/ipp-strings.c:2024
+#: locale/ipp-strings.c:2062
 msgid "media.na_10x13_10x13in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 14″
-#: locale/ipp-strings.c:2026
+#: locale/ipp-strings.c:2064
 msgid "media.na_10x14_10x14in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 15″
-#: locale/ipp-strings.c:2028
+#: locale/ipp-strings.c:2066
 msgid "media.na_10x15_10x15in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 12″
-#: locale/ipp-strings.c:2030
+#: locale/ipp-strings.c:2068
 msgid "media.na_11x12_11x12in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 15″
-#: locale/ipp-strings.c:2032
+#: locale/ipp-strings.c:2070
 msgid "media.na_11x15_11x15in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 19″
-#: locale/ipp-strings.c:2034
+#: locale/ipp-strings.c:2072
 msgid "media.na_12x19_12x19in"
 msgstr ""
 
 #. TRANSLATORS: 5 x 7″
-#: locale/ipp-strings.c:2036
+#: locale/ipp-strings.c:2074
 msgid "media.na_5x7_5x7in"
 msgstr ""
 
 #. TRANSLATORS: 6 x 9″
-#: locale/ipp-strings.c:2038
+#: locale/ipp-strings.c:2076
 msgid "media.na_6x9_6x9in"
 msgstr ""
 
 #. TRANSLATORS: 7 x 9″
-#: locale/ipp-strings.c:2040
+#: locale/ipp-strings.c:2078
 msgid "media.na_7x9_7x9in"
 msgstr ""
 
 #. TRANSLATORS: 9 x 11″
-#: locale/ipp-strings.c:2042
+#: locale/ipp-strings.c:2080
 msgid "media.na_9x11_9x11in"
 msgstr ""
 
 #. TRANSLATORS: Envelope A2
-#: locale/ipp-strings.c:2044
+#: locale/ipp-strings.c:2082
 msgid "media.na_a2_4.375x5.75in"
 msgstr ""
 
 #. TRANSLATORS: 9 x 12″
-#: locale/ipp-strings.c:2046
+#: locale/ipp-strings.c:2084
 msgid "media.na_arch-a_9x12in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 18″
-#: locale/ipp-strings.c:2048
+#: locale/ipp-strings.c:2086
 msgid "media.na_arch-b_12x18in"
 msgstr ""
 
 #. TRANSLATORS: 18 x 24″
-#: locale/ipp-strings.c:2050
+#: locale/ipp-strings.c:2088
 msgid "media.na_arch-c_18x24in"
 msgstr ""
 
 #. TRANSLATORS: 24 x 36″
-#: locale/ipp-strings.c:2052
+#: locale/ipp-strings.c:2090
 msgid "media.na_arch-d_24x36in"
 msgstr ""
 
 #. TRANSLATORS: 26 x 38″
-#: locale/ipp-strings.c:2054
+#: locale/ipp-strings.c:2092
 msgid "media.na_arch-e2_26x38in"
 msgstr ""
 
 #. TRANSLATORS: 27 x 39″
-#: locale/ipp-strings.c:2056
+#: locale/ipp-strings.c:2094
 msgid "media.na_arch-e3_27x39in"
 msgstr ""
 
 #. TRANSLATORS: 36 x 48″
-#: locale/ipp-strings.c:2058
+#: locale/ipp-strings.c:2096
 msgid "media.na_arch-e_36x48in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 19.17″
-#: locale/ipp-strings.c:2060
+#: locale/ipp-strings.c:2098
 msgid "media.na_b-plus_12x19.17in"
 msgstr ""
 
 #. TRANSLATORS: Envelope C5
-#: locale/ipp-strings.c:2062
+#: locale/ipp-strings.c:2100
 msgid "media.na_c5_6.5x9.5in"
 msgstr ""
 
 #. TRANSLATORS: 17 x 22″
-#: locale/ipp-strings.c:2064
+#: locale/ipp-strings.c:2102
 msgid "media.na_c_17x22in"
 msgstr ""
 
 #. TRANSLATORS: 22 x 34″
-#: locale/ipp-strings.c:2066
+#: locale/ipp-strings.c:2104
 msgid "media.na_d_22x34in"
 msgstr ""
 
 #. TRANSLATORS: 34 x 44″
-#: locale/ipp-strings.c:2068
+#: locale/ipp-strings.c:2106
 msgid "media.na_e_34x44in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 14″
-#: locale/ipp-strings.c:2070
+#: locale/ipp-strings.c:2108
 msgid "media.na_edp_11x14in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 14″
-#: locale/ipp-strings.c:2072
+#: locale/ipp-strings.c:2110
 msgid "media.na_eur-edp_12x14in"
 msgstr ""
 
 #. TRANSLATORS: Executive
-#: locale/ipp-strings.c:2074
+#: locale/ipp-strings.c:2112
 msgid "media.na_executive_7.25x10.5in"
 msgstr ""
 
 #. TRANSLATORS: 44 x 68″
-#: locale/ipp-strings.c:2076
+#: locale/ipp-strings.c:2114
 msgid "media.na_f_44x68in"
 msgstr ""
 
 #. TRANSLATORS: European Fanfold
-#: locale/ipp-strings.c:2078
+#: locale/ipp-strings.c:2116
 msgid "media.na_fanfold-eur_8.5x12in"
 msgstr ""
 
 #. TRANSLATORS: US Fanfold
-#: locale/ipp-strings.c:2080
+#: locale/ipp-strings.c:2118
 msgid "media.na_fanfold-us_11x14.875in"
 msgstr ""
 
 #. TRANSLATORS: Foolscap
-#: locale/ipp-strings.c:2082
+#: locale/ipp-strings.c:2120
 msgid "media.na_foolscap_8.5x13in"
 msgstr ""
 
 #. TRANSLATORS: 8 x 13″
-#: locale/ipp-strings.c:2084
+#: locale/ipp-strings.c:2122
 msgid "media.na_govt-legal_8x13in"
 msgstr ""
 
 #. TRANSLATORS: 8 x 10″
-#: locale/ipp-strings.c:2086
+#: locale/ipp-strings.c:2124
 msgid "media.na_govt-letter_8x10in"
 msgstr ""
 
 #. TRANSLATORS: 3 x 5″
-#: locale/ipp-strings.c:2088
+#: locale/ipp-strings.c:2126
 msgid "media.na_index-3x5_3x5in"
 msgstr ""
 
 #. TRANSLATORS: 6 x 8″
-#: locale/ipp-strings.c:2090
+#: locale/ipp-strings.c:2128
 msgid "media.na_index-4x6-ext_6x8in"
 msgstr ""
 
 #. TRANSLATORS: 4 x 6″
-#: locale/ipp-strings.c:2092
+#: locale/ipp-strings.c:2130
 msgid "media.na_index-4x6_4x6in"
 msgstr ""
 
 #. TRANSLATORS: 5 x 8″
-#: locale/ipp-strings.c:2094
+#: locale/ipp-strings.c:2132
 msgid "media.na_index-5x8_5x8in"
 msgstr ""
 
 #. TRANSLATORS: Statement
-#: locale/ipp-strings.c:2096
+#: locale/ipp-strings.c:2134
 msgid "media.na_invoice_5.5x8.5in"
 msgstr ""
 
 #. TRANSLATORS: 11 x 17″
-#: locale/ipp-strings.c:2098
+#: locale/ipp-strings.c:2136
 msgid "media.na_ledger_11x17in"
 msgstr ""
 
 #. TRANSLATORS: US Legal (Extra)
-#: locale/ipp-strings.c:2100
+#: locale/ipp-strings.c:2138
 msgid "media.na_legal-extra_9.5x15in"
 msgstr ""
 
 #. TRANSLATORS: US Legal
-#: locale/ipp-strings.c:2102
+#: locale/ipp-strings.c:2140
 msgid "media.na_legal_8.5x14in"
 msgstr ""
 
 #. TRANSLATORS: US Letter (Extra)
-#: locale/ipp-strings.c:2104
+#: locale/ipp-strings.c:2142
 msgid "media.na_letter-extra_9.5x12in"
 msgstr ""
 
 #. TRANSLATORS: US Letter (Plus)
-#: locale/ipp-strings.c:2106
+#: locale/ipp-strings.c:2144
 msgid "media.na_letter-plus_8.5x12.69in"
 msgstr ""
 
 #. TRANSLATORS: US Letter
-#: locale/ipp-strings.c:2108
+#: locale/ipp-strings.c:2146
 msgid "media.na_letter_8.5x11in"
 msgstr ""
 
 #. TRANSLATORS: Envelope Monarch
-#: locale/ipp-strings.c:2110
+#: locale/ipp-strings.c:2148
 msgid "media.na_monarch_3.875x7.5in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #10
-#: locale/ipp-strings.c:2112
+#: locale/ipp-strings.c:2150
 msgid "media.na_number-10_4.125x9.5in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #11
-#: locale/ipp-strings.c:2114
+#: locale/ipp-strings.c:2152
 msgid "media.na_number-11_4.5x10.375in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #12
-#: locale/ipp-strings.c:2116
+#: locale/ipp-strings.c:2154
 msgid "media.na_number-12_4.75x11in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #14
-#: locale/ipp-strings.c:2118
+#: locale/ipp-strings.c:2156
 msgid "media.na_number-14_5x11.5in"
 msgstr ""
 
 #. TRANSLATORS: Envelope #9
-#: locale/ipp-strings.c:2120
+#: locale/ipp-strings.c:2158
 msgid "media.na_number-9_3.875x8.875in"
 msgstr ""
 
 #. TRANSLATORS: 8.5 x 13.4″
-#: locale/ipp-strings.c:2122
+#: locale/ipp-strings.c:2160
 msgid "media.na_oficio_8.5x13.4in"
 msgstr ""
 
 #. TRANSLATORS: Envelope Personal
-#: locale/ipp-strings.c:2124
+#: locale/ipp-strings.c:2162
 msgid "media.na_personal_3.625x6.5in"
 msgstr ""
 
 #. TRANSLATORS: Quarto
-#: locale/ipp-strings.c:2126
+#: locale/ipp-strings.c:2164
 msgid "media.na_quarto_8.5x10.83in"
 msgstr ""
 
 #. TRANSLATORS: 8.94 x 14″
-#: locale/ipp-strings.c:2128
+#: locale/ipp-strings.c:2166
 msgid "media.na_super-a_8.94x14in"
 msgstr ""
 
 #. TRANSLATORS: 13 x 19″
-#: locale/ipp-strings.c:2130
+#: locale/ipp-strings.c:2168
 msgid "media.na_super-b_13x19in"
 msgstr ""
 
 #. TRANSLATORS: 30 x 42″
-#: locale/ipp-strings.c:2132
+#: locale/ipp-strings.c:2170
 msgid "media.na_wide-format_30x42in"
 msgstr ""
 
 #. TRANSLATORS: 12 x 16″
-#: locale/ipp-strings.c:2134
+#: locale/ipp-strings.c:2172
 msgid "media.oe_12x16_12x16in"
 msgstr ""
 
 #. TRANSLATORS: 14 x 17″
-#: locale/ipp-strings.c:2136
+#: locale/ipp-strings.c:2174
 msgid "media.oe_14x17_14x17in"
 msgstr ""
 
 #. TRANSLATORS: 18 x 22″
-#: locale/ipp-strings.c:2138
+#: locale/ipp-strings.c:2176
 msgid "media.oe_18x22_18x22in"
 msgstr ""
 
 #. TRANSLATORS: 17 x 24″
-#: locale/ipp-strings.c:2140
+#: locale/ipp-strings.c:2178
 msgid "media.oe_a2plus_17x24in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 12″
-#: locale/ipp-strings.c:2144
+#: locale/ipp-strings.c:2182
 msgid "media.oe_photo-10r_10x12in"
 msgstr ""
 
 #. TRANSLATORS: 20 x 24″
-#: locale/ipp-strings.c:2146
+#: locale/ipp-strings.c:2184
 msgid "media.oe_photo-20r_20x24in"
 msgstr ""
 
 #. TRANSLATORS: 3.5 x 5″
-#: locale/ipp-strings.c:2148
+#: locale/ipp-strings.c:2186
 msgid "media.oe_photo-l_3.5x5in"
 msgstr ""
 
 #. TRANSLATORS: 10 x 15″
-#: locale/ipp-strings.c:2150
+#: locale/ipp-strings.c:2188
 msgid "media.oe_photo-s10r_10x15in"
 msgstr ""
 
 #. TRANSLATORS: 184 x 260mm
-#: locale/ipp-strings.c:2156
+#: locale/ipp-strings.c:2194
 msgid "media.om_16k_184x260mm"
 msgstr ""
 
 #. TRANSLATORS: 195 x 270mm
-#: locale/ipp-strings.c:2158
+#: locale/ipp-strings.c:2196
 msgid "media.om_16k_195x270mm"
 msgstr ""
 
 #. TRANSLATORS: 275 x 395mm
-#: locale/ipp-strings.c:2166
+#: locale/ipp-strings.c:2204
 msgid "media.om_dai-pa-kai_275x395mm"
 msgstr ""
 
 #. TRANSLATORS: Folio
-#: locale/ipp-strings.c:2170
+#: locale/ipp-strings.c:2208
 msgid "media.om_folio-sp_215x315mm"
 msgstr ""
 
 #. TRANSLATORS: Folio (Special)
-#: locale/ipp-strings.c:2172
+#: locale/ipp-strings.c:2210
 msgid "media.om_folio_210x330mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Invitation
-#: locale/ipp-strings.c:2174
+#: locale/ipp-strings.c:2212
 msgid "media.om_invite_220x220mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Italian
-#: locale/ipp-strings.c:2176
+#: locale/ipp-strings.c:2214
 msgid "media.om_italian_110x230mm"
 msgstr ""
 
 #. TRANSLATORS: 198 x 275mm
-#: locale/ipp-strings.c:2178
+#: locale/ipp-strings.c:2216
 msgid "media.om_juuro-ku-kai_198x275mm"
 msgstr ""
 
 #. TRANSLATORS: 200 x 300
-#: locale/ipp-strings.c:2180
+#: locale/ipp-strings.c:2218
 msgid "media.om_large-photo_200x300"
 msgstr ""
 
 #. TRANSLATORS: 130 x 180mm
-#: locale/ipp-strings.c:2182
+#: locale/ipp-strings.c:2220
 msgid "media.om_medium-photo_130x180mm"
 msgstr ""
 
 #. TRANSLATORS: 267 x 389mm
-#: locale/ipp-strings.c:2184
+#: locale/ipp-strings.c:2222
 msgid "media.om_pa-kai_267x389mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Postfix
-#: locale/ipp-strings.c:2186
+#: locale/ipp-strings.c:2224
 msgid "media.om_postfix_114x229mm"
 msgstr ""
 
 #. TRANSLATORS: 100 x 150mm
-#: locale/ipp-strings.c:2188
+#: locale/ipp-strings.c:2226
 msgid "media.om_small-photo_100x150mm"
 msgstr ""
 
 #. TRANSLATORS: 100 x 200mm
-#: locale/ipp-strings.c:2192
+#: locale/ipp-strings.c:2230
 msgid "media.om_wide-photo_100x200mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #10
-#: locale/ipp-strings.c:2194
+#: locale/ipp-strings.c:2232
 msgid "media.prc_10_324x458mm"
 msgstr ""
 
 #. TRANSLATORS: Chinese 16k
-#: locale/ipp-strings.c:2196
+#: locale/ipp-strings.c:2234
 msgid "media.prc_16k_146x215mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #1
-#: locale/ipp-strings.c:2198
+#: locale/ipp-strings.c:2236
 msgid "media.prc_1_102x165mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #2
-#: locale/ipp-strings.c:2200
+#: locale/ipp-strings.c:2238
 msgid "media.prc_2_102x176mm"
 msgstr ""
 
 #. TRANSLATORS: Chinese 32k
-#: locale/ipp-strings.c:2202
+#: locale/ipp-strings.c:2240
 msgid "media.prc_32k_97x151mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #3
-#: locale/ipp-strings.c:2204
+#: locale/ipp-strings.c:2242
 msgid "media.prc_3_125x176mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #4
-#: locale/ipp-strings.c:2206
+#: locale/ipp-strings.c:2244
 msgid "media.prc_4_110x208mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #5
-#: locale/ipp-strings.c:2208
+#: locale/ipp-strings.c:2246
 msgid "media.prc_5_110x220mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #6
-#: locale/ipp-strings.c:2210
+#: locale/ipp-strings.c:2248
 msgid "media.prc_6_120x320mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #7
-#: locale/ipp-strings.c:2212
+#: locale/ipp-strings.c:2250
 msgid "media.prc_7_160x230mm"
 msgstr ""
 
 #. TRANSLATORS: Envelope Chinese #8
-#: locale/ipp-strings.c:2214
+#: locale/ipp-strings.c:2252
 msgid "media.prc_8_120x309mm"
 msgstr ""
 
 #. TRANSLATORS: ROC 16k
-#: locale/ipp-strings.c:2216
+#: locale/ipp-strings.c:2254
 msgid "media.roc_16k_7.75x10.75in"
 msgstr ""
 
 #. TRANSLATORS: ROC 8k
-#: locale/ipp-strings.c:2218
+#: locale/ipp-strings.c:2256
 msgid "media.roc_8k_10.75x15.5in"
 msgstr ""
 
 #. TRANSLATORS: Multiple Document Handling
-#: locale/ipp-strings.c:2220
+#: locale/ipp-strings.c:2258
 msgid "multiple-document-handling"
 msgstr ""
 
 #. TRANSLATORS: Separate Documents Collated Copies
-#: locale/ipp-strings.c:2222
+#: locale/ipp-strings.c:2260
 msgid "multiple-document-handling.separate-documents-collated-copies"
 msgstr ""
 
 #. TRANSLATORS: Separate Documents Uncollated Copies
-#: locale/ipp-strings.c:2224
+#: locale/ipp-strings.c:2262
 msgid "multiple-document-handling.separate-documents-uncollated-copies"
 msgstr ""
 
 #. TRANSLATORS: Single Document
-#: locale/ipp-strings.c:2226
+#: locale/ipp-strings.c:2264
 msgid "multiple-document-handling.single-document"
 msgstr ""
 
 #. TRANSLATORS: Single Document New Sheet
-#: locale/ipp-strings.c:2228
+#: locale/ipp-strings.c:2266
 msgid "multiple-document-handling.single-document-new-sheet"
 msgstr ""
 
 #. TRANSLATORS: Multiple Object Handling
-#: locale/ipp-strings.c:2230
+#: locale/ipp-strings.c:2268
 msgid "multiple-object-handling"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2234
+#: locale/ipp-strings.c:2272
 msgid "multiple-object-handling.auto"
 msgstr ""
 
 #. TRANSLATORS: Best Fit
-#: locale/ipp-strings.c:2236
+#: locale/ipp-strings.c:2274
 msgid "multiple-object-handling.best-fit"
 msgstr ""
 
 #. TRANSLATORS: Best Quality
-#: locale/ipp-strings.c:2238
+#: locale/ipp-strings.c:2276
 msgid "multiple-object-handling.best-quality"
 msgstr ""
 
 #. TRANSLATORS: Best Speed
-#: locale/ipp-strings.c:2240
+#: locale/ipp-strings.c:2278
 msgid "multiple-object-handling.best-speed"
 msgstr ""
 
 #. TRANSLATORS: One At A Time
-#: locale/ipp-strings.c:2242
+#: locale/ipp-strings.c:2280
 msgid "multiple-object-handling.one-at-a-time"
 msgstr ""
 
 #. TRANSLATORS: On Timeout
-#: locale/ipp-strings.c:2244
+#: locale/ipp-strings.c:2282
 msgid "multiple-operation-time-out-action"
 msgstr ""
 
 #. TRANSLATORS: Abort Job
-#: locale/ipp-strings.c:2246
+#: locale/ipp-strings.c:2284
 msgid "multiple-operation-time-out-action.abort-job"
 msgstr ""
 
 #. TRANSLATORS: Hold Job
-#: locale/ipp-strings.c:2248
+#: locale/ipp-strings.c:2286
 msgid "multiple-operation-time-out-action.hold-job"
 msgstr ""
 
 #. TRANSLATORS: Process Job
-#: locale/ipp-strings.c:2250
+#: locale/ipp-strings.c:2288
 msgid "multiple-operation-time-out-action.process-job"
 msgstr ""
 
 #. TRANSLATORS: Noise Removal
-#: locale/ipp-strings.c:2252
+#: locale/ipp-strings.c:2290
 msgid "noise-removal"
 msgstr ""
 
 #. TRANSLATORS: Notify Attributes
-#: locale/ipp-strings.c:2254
+#: locale/ipp-strings.c:2292
 msgid "notify-attributes"
 msgstr ""
 
 #. TRANSLATORS: Notify Charset
-#: locale/ipp-strings.c:2256
+#: locale/ipp-strings.c:2294
 msgid "notify-charset"
 msgstr ""
 
 #. TRANSLATORS: Notify Events
-#: locale/ipp-strings.c:2258
+#: locale/ipp-strings.c:2296
 msgid "notify-events"
 msgstr ""
 
 #. TRANSLATORS: Document Completed
-#: locale/ipp-strings.c:2260
+#: locale/ipp-strings.c:2298
 msgid "notify-events.document-completed"
 msgstr ""
 
 #. TRANSLATORS: Document Config Changed
-#: locale/ipp-strings.c:2262
+#: locale/ipp-strings.c:2300
 msgid "notify-events.document-config-changed"
 msgstr ""
 
 #. TRANSLATORS: Document Created
-#: locale/ipp-strings.c:2264
+#: locale/ipp-strings.c:2302
 msgid "notify-events.document-created"
 msgstr ""
 
 #. TRANSLATORS: Document Fetchable
-#: locale/ipp-strings.c:2266
+#: locale/ipp-strings.c:2304
 msgid "notify-events.document-fetchable"
 msgstr ""
 
 #. TRANSLATORS: Document State Changed
-#: locale/ipp-strings.c:2268
+#: locale/ipp-strings.c:2306
 msgid "notify-events.document-state-changed"
 msgstr ""
 
 #. TRANSLATORS: Document Stopped
-#: locale/ipp-strings.c:2270
+#: locale/ipp-strings.c:2308
 msgid "notify-events.document-stopped"
 msgstr ""
 
 #. TRANSLATORS: Job Completed
-#: locale/ipp-strings.c:2272
+#: locale/ipp-strings.c:2310
 msgid "notify-events.job-completed"
 msgstr ""
 
 #. TRANSLATORS: Job Config Changed
-#: locale/ipp-strings.c:2274
+#: locale/ipp-strings.c:2312
 msgid "notify-events.job-config-changed"
 msgstr ""
 
 #. TRANSLATORS: Job Created
-#: locale/ipp-strings.c:2276
+#: locale/ipp-strings.c:2314
 msgid "notify-events.job-created"
 msgstr ""
 
 #. TRANSLATORS: Job Fetchable
-#: locale/ipp-strings.c:2278
+#: locale/ipp-strings.c:2316
 msgid "notify-events.job-fetchable"
 msgstr ""
 
 #. TRANSLATORS: Job Progress
-#: locale/ipp-strings.c:2280
+#: locale/ipp-strings.c:2318
 msgid "notify-events.job-progress"
 msgstr ""
 
 #. TRANSLATORS: Job State Changed
-#: locale/ipp-strings.c:2282
+#: locale/ipp-strings.c:2320
 msgid "notify-events.job-state-changed"
 msgstr ""
 
 #. TRANSLATORS: Job Stopped
-#: locale/ipp-strings.c:2284
+#: locale/ipp-strings.c:2322
 msgid "notify-events.job-stopped"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2286
+#: locale/ipp-strings.c:2324
 msgid "notify-events.none"
 msgstr ""
 
 #. TRANSLATORS: Printer Config Changed
-#: locale/ipp-strings.c:2288
+#: locale/ipp-strings.c:2326
 msgid "notify-events.printer-config-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Finishings Changed
-#: locale/ipp-strings.c:2290
+#: locale/ipp-strings.c:2328
 msgid "notify-events.printer-finishings-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Media Changed
-#: locale/ipp-strings.c:2292
+#: locale/ipp-strings.c:2330
 msgid "notify-events.printer-media-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Queue Order Changed
-#: locale/ipp-strings.c:2294
+#: locale/ipp-strings.c:2332
 msgid "notify-events.printer-queue-order-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Restarted
-#: locale/ipp-strings.c:2296
+#: locale/ipp-strings.c:2334
 msgid "notify-events.printer-restarted"
 msgstr ""
 
 #. TRANSLATORS: Printer Shutdown
-#: locale/ipp-strings.c:2298
+#: locale/ipp-strings.c:2336
 msgid "notify-events.printer-shutdown"
 msgstr ""
 
 #. TRANSLATORS: Printer State Changed
-#: locale/ipp-strings.c:2300
+#: locale/ipp-strings.c:2338
 msgid "notify-events.printer-state-changed"
 msgstr ""
 
 #. TRANSLATORS: Printer Stopped
-#: locale/ipp-strings.c:2302
+#: locale/ipp-strings.c:2340
 msgid "notify-events.printer-stopped"
 msgstr ""
 
 #. TRANSLATORS: Notify Get Interval
-#: locale/ipp-strings.c:2304
+#: locale/ipp-strings.c:2342
 msgid "notify-get-interval"
 msgstr ""
 
 #. TRANSLATORS: Notify Lease Duration
-#: locale/ipp-strings.c:2306
+#: locale/ipp-strings.c:2344
 msgid "notify-lease-duration"
 msgstr ""
 
 #. TRANSLATORS: Notify Natural Language
-#: locale/ipp-strings.c:2308
+#: locale/ipp-strings.c:2346
 msgid "notify-natural-language"
 msgstr ""
 
 #. TRANSLATORS: Notify Pull Method
-#: locale/ipp-strings.c:2310
+#: locale/ipp-strings.c:2348
 msgid "notify-pull-method"
 msgstr ""
 
 #. TRANSLATORS: Notify Recipient
-#: locale/ipp-strings.c:2312
+#: locale/ipp-strings.c:2350
 msgid "notify-recipient-uri"
 msgstr ""
 
 #. TRANSLATORS: Notify Sequence Numbers
-#: locale/ipp-strings.c:2314
+#: locale/ipp-strings.c:2352
 msgid "notify-sequence-numbers"
 msgstr ""
 
 #. TRANSLATORS: Notify Subscription Ids
-#: locale/ipp-strings.c:2316
+#: locale/ipp-strings.c:2354
 msgid "notify-subscription-ids"
 msgstr ""
 
 #. TRANSLATORS: Notify Time Interval
-#: locale/ipp-strings.c:2318
+#: locale/ipp-strings.c:2356
 msgid "notify-time-interval"
 msgstr ""
 
 #. TRANSLATORS: Notify User Data
-#: locale/ipp-strings.c:2320
+#: locale/ipp-strings.c:2358
 msgid "notify-user-data"
 msgstr ""
 
 #. TRANSLATORS: Notify Wait
-#: locale/ipp-strings.c:2322
+#: locale/ipp-strings.c:2360
 msgid "notify-wait"
 msgstr ""
 
 #. TRANSLATORS: Number Of Retries
-#: locale/ipp-strings.c:2324
+#: locale/ipp-strings.c:2362
 msgid "number-of-retries"
 msgstr ""
 
 #. TRANSLATORS: Number-Up
-#: locale/ipp-strings.c:2326
+#: locale/ipp-strings.c:2364
 msgid "number-up"
 msgstr ""
 
 #. TRANSLATORS: Object Offset
-#: locale/ipp-strings.c:2328
+#: locale/ipp-strings.c:2366
 msgid "object-offset"
 msgstr ""
 
 #. TRANSLATORS: Object Size
-#: locale/ipp-strings.c:2330
+#: locale/ipp-strings.c:2368
 msgid "object-size"
 msgstr ""
 
 #. TRANSLATORS: Organization Name
-#: locale/ipp-strings.c:2332
+#: locale/ipp-strings.c:2370
 msgid "organization-name"
 msgstr ""
 
 #. TRANSLATORS: Orientation
-#: locale/ipp-strings.c:2334
+#: locale/ipp-strings.c:2372
 msgid "orientation-requested"
 msgstr ""
 
 #. TRANSLATORS: Portrait
-#: locale/ipp-strings.c:2336
+#: locale/ipp-strings.c:2374
 msgid "orientation-requested.3"
 msgstr ""
 
 #. TRANSLATORS: Landscape
-#: locale/ipp-strings.c:2338
+#: locale/ipp-strings.c:2376
 msgid "orientation-requested.4"
 msgstr ""
 
 #. TRANSLATORS: Reverse Landscape
-#: locale/ipp-strings.c:2340
+#: locale/ipp-strings.c:2378
 msgid "orientation-requested.5"
 msgstr ""
 
 #. TRANSLATORS: Reverse Portrait
-#: locale/ipp-strings.c:2342
+#: locale/ipp-strings.c:2380
 msgid "orientation-requested.6"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2344
+#: locale/ipp-strings.c:2382
 msgid "orientation-requested.7"
 msgstr ""
 
 #. TRANSLATORS: Scanned Image Options
-#: locale/ipp-strings.c:2346
+#: locale/ipp-strings.c:2384
 msgid "output-attributes"
 msgstr ""
 
 #. TRANSLATORS: Output Tray
-#: locale/ipp-strings.c:2348
+#: locale/ipp-strings.c:2386
 msgid "output-bin"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2350
+#: locale/ipp-strings.c:2388
 msgid "output-bin.auto"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:2352
+#: locale/ipp-strings.c:2390
 msgid "output-bin.bottom"
 msgstr ""
 
 #. TRANSLATORS: Center
-#: locale/ipp-strings.c:2354
+#: locale/ipp-strings.c:2392
 msgid "output-bin.center"
 msgstr ""
 
 #. TRANSLATORS: Face Down
-#: locale/ipp-strings.c:2356
+#: locale/ipp-strings.c:2394
 msgid "output-bin.face-down"
 msgstr ""
 
 #. TRANSLATORS: Face Up
-#: locale/ipp-strings.c:2358
+#: locale/ipp-strings.c:2396
 msgid "output-bin.face-up"
 msgstr ""
 
 #. TRANSLATORS: Large Capacity
-#: locale/ipp-strings.c:2360
+#: locale/ipp-strings.c:2398
 msgid "output-bin.large-capacity"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:2362
+#: locale/ipp-strings.c:2400
 msgid "output-bin.left"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 1
-#: locale/ipp-strings.c:2364
+#: locale/ipp-strings.c:2402
 msgid "output-bin.mailbox-1"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 10
-#: locale/ipp-strings.c:2366
+#: locale/ipp-strings.c:2404
 msgid "output-bin.mailbox-10"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 2
-#: locale/ipp-strings.c:2368
+#: locale/ipp-strings.c:2406
 msgid "output-bin.mailbox-2"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 3
-#: locale/ipp-strings.c:2370
+#: locale/ipp-strings.c:2408
 msgid "output-bin.mailbox-3"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 4
-#: locale/ipp-strings.c:2372
+#: locale/ipp-strings.c:2410
 msgid "output-bin.mailbox-4"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 5
-#: locale/ipp-strings.c:2374
+#: locale/ipp-strings.c:2412
 msgid "output-bin.mailbox-5"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 6
-#: locale/ipp-strings.c:2376
+#: locale/ipp-strings.c:2414
 msgid "output-bin.mailbox-6"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 7
-#: locale/ipp-strings.c:2378
+#: locale/ipp-strings.c:2416
 msgid "output-bin.mailbox-7"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 8
-#: locale/ipp-strings.c:2380
+#: locale/ipp-strings.c:2418
 msgid "output-bin.mailbox-8"
 msgstr ""
 
 #. TRANSLATORS: Mailbox 9
-#: locale/ipp-strings.c:2382
+#: locale/ipp-strings.c:2420
 msgid "output-bin.mailbox-9"
 msgstr ""
 
 #. TRANSLATORS: Middle
-#: locale/ipp-strings.c:2384
+#: locale/ipp-strings.c:2422
 msgid "output-bin.middle"
 msgstr ""
 
 #. TRANSLATORS: My Mailbox
-#: locale/ipp-strings.c:2386
+#: locale/ipp-strings.c:2424
 msgid "output-bin.my-mailbox"
 msgstr ""
 
 #. TRANSLATORS: Rear
-#: locale/ipp-strings.c:2388
+#: locale/ipp-strings.c:2426
 msgid "output-bin.rear"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:2390
+#: locale/ipp-strings.c:2428
 msgid "output-bin.right"
 msgstr ""
 
 #. TRANSLATORS: Side
-#: locale/ipp-strings.c:2392
+#: locale/ipp-strings.c:2430
 msgid "output-bin.side"
 msgstr ""
 
 #. TRANSLATORS: Stacker 1
-#: locale/ipp-strings.c:2394
+#: locale/ipp-strings.c:2432
 msgid "output-bin.stacker-1"
 msgstr ""
 
 #. TRANSLATORS: Stacker 10
-#: locale/ipp-strings.c:2396
+#: locale/ipp-strings.c:2434
 msgid "output-bin.stacker-10"
 msgstr ""
 
 #. TRANSLATORS: Stacker 2
-#: locale/ipp-strings.c:2398
+#: locale/ipp-strings.c:2436
 msgid "output-bin.stacker-2"
 msgstr ""
 
 #. TRANSLATORS: Stacker 3
-#: locale/ipp-strings.c:2400
+#: locale/ipp-strings.c:2438
 msgid "output-bin.stacker-3"
 msgstr ""
 
 #. TRANSLATORS: Stacker 4
-#: locale/ipp-strings.c:2402
+#: locale/ipp-strings.c:2440
 msgid "output-bin.stacker-4"
 msgstr ""
 
 #. TRANSLATORS: Stacker 5
-#: locale/ipp-strings.c:2404
+#: locale/ipp-strings.c:2442
 msgid "output-bin.stacker-5"
 msgstr ""
 
 #. TRANSLATORS: Stacker 6
-#: locale/ipp-strings.c:2406
+#: locale/ipp-strings.c:2444
 msgid "output-bin.stacker-6"
 msgstr ""
 
 #. TRANSLATORS: Stacker 7
-#: locale/ipp-strings.c:2408
+#: locale/ipp-strings.c:2446
 msgid "output-bin.stacker-7"
 msgstr ""
 
 #. TRANSLATORS: Stacker 8
-#: locale/ipp-strings.c:2410
+#: locale/ipp-strings.c:2448
 msgid "output-bin.stacker-8"
 msgstr ""
 
 #. TRANSLATORS: Stacker 9
-#: locale/ipp-strings.c:2412
+#: locale/ipp-strings.c:2450
 msgid "output-bin.stacker-9"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:2414
+#: locale/ipp-strings.c:2452
 msgid "output-bin.top"
 msgstr ""
 
 #. TRANSLATORS: Tray 1
-#: locale/ipp-strings.c:2416
+#: locale/ipp-strings.c:2454
 msgid "output-bin.tray-1"
 msgstr ""
 
 #. TRANSLATORS: Tray 10
-#: locale/ipp-strings.c:2418
+#: locale/ipp-strings.c:2456
 msgid "output-bin.tray-10"
 msgstr ""
 
 #. TRANSLATORS: Tray 2
-#: locale/ipp-strings.c:2420
+#: locale/ipp-strings.c:2458
 msgid "output-bin.tray-2"
 msgstr ""
 
 #. TRANSLATORS: Tray 3
-#: locale/ipp-strings.c:2422
+#: locale/ipp-strings.c:2460
 msgid "output-bin.tray-3"
 msgstr ""
 
 #. TRANSLATORS: Tray 4
-#: locale/ipp-strings.c:2424
+#: locale/ipp-strings.c:2462
 msgid "output-bin.tray-4"
 msgstr ""
 
 #. TRANSLATORS: Tray 5
-#: locale/ipp-strings.c:2426
+#: locale/ipp-strings.c:2464
 msgid "output-bin.tray-5"
 msgstr ""
 
 #. TRANSLATORS: Tray 6
-#: locale/ipp-strings.c:2428
+#: locale/ipp-strings.c:2466
 msgid "output-bin.tray-6"
 msgstr ""
 
 #. TRANSLATORS: Tray 7
-#: locale/ipp-strings.c:2430
+#: locale/ipp-strings.c:2468
 msgid "output-bin.tray-7"
 msgstr ""
 
 #. TRANSLATORS: Tray 8
-#: locale/ipp-strings.c:2432
+#: locale/ipp-strings.c:2470
 msgid "output-bin.tray-8"
 msgstr ""
 
 #. TRANSLATORS: Tray 9
-#: locale/ipp-strings.c:2434
+#: locale/ipp-strings.c:2472
 msgid "output-bin.tray-9"
 msgstr ""
 
 #. TRANSLATORS: Scanned Image Quality
-#: locale/ipp-strings.c:2436
+#: locale/ipp-strings.c:2474
 msgid "output-compression-quality-factor"
 msgstr ""
 
 #. TRANSLATORS: Page Delivery
-#: locale/ipp-strings.c:2438
+#: locale/ipp-strings.c:2476
 msgid "page-delivery"
 msgstr ""
 
 #. TRANSLATORS: Reverse Order Face-down
-#: locale/ipp-strings.c:2440
+#: locale/ipp-strings.c:2478
 msgid "page-delivery.reverse-order-face-down"
 msgstr ""
 
 #. TRANSLATORS: Reverse Order Face-up
-#: locale/ipp-strings.c:2442
+#: locale/ipp-strings.c:2480
 msgid "page-delivery.reverse-order-face-up"
 msgstr ""
 
 #. TRANSLATORS: Same Order Face-down
-#: locale/ipp-strings.c:2444
+#: locale/ipp-strings.c:2482
 msgid "page-delivery.same-order-face-down"
 msgstr ""
 
 #. TRANSLATORS: Same Order Face-up
-#: locale/ipp-strings.c:2446
+#: locale/ipp-strings.c:2484
 msgid "page-delivery.same-order-face-up"
 msgstr ""
 
 #. TRANSLATORS: System Specified
-#: locale/ipp-strings.c:2448
+#: locale/ipp-strings.c:2486
 msgid "page-delivery.system-specified"
 msgstr ""
 
 #. TRANSLATORS: Page Order Received
-#: locale/ipp-strings.c:2450
+#: locale/ipp-strings.c:2488
 msgid "page-order-received"
 msgstr ""
 
 #. TRANSLATORS: 1 To N
-#: locale/ipp-strings.c:2452
+#: locale/ipp-strings.c:2490
 msgid "page-order-received.1-to-n-order"
 msgstr ""
 
 #. TRANSLATORS: N To 1
-#: locale/ipp-strings.c:2454
+#: locale/ipp-strings.c:2492
 msgid "page-order-received.n-to-1-order"
 msgstr ""
 
 #. TRANSLATORS: Page Ranges
-#: locale/ipp-strings.c:2456
+#: locale/ipp-strings.c:2494
 msgid "page-ranges"
 msgstr ""
 
 #. TRANSLATORS: Pages
-#: locale/ipp-strings.c:2458
+#: locale/ipp-strings.c:2496
 msgid "pages"
 msgstr ""
 
 #. TRANSLATORS: Pages Per Subset
-#: locale/ipp-strings.c:2460
+#: locale/ipp-strings.c:2498
 msgid "pages-per-subset"
 msgstr ""
 
 #. TRANSLATORS: Platform Shape
-#: locale/ipp-strings.c:2472
+#: locale/ipp-strings.c:2510
 msgid "platform-shape"
 msgstr ""
 
 #. TRANSLATORS: Round
-#: locale/ipp-strings.c:2474
+#: locale/ipp-strings.c:2512
 msgid "platform-shape.ellipse"
 msgstr ""
 
 #. TRANSLATORS: Rectangle
-#: locale/ipp-strings.c:2476
+#: locale/ipp-strings.c:2514
 msgid "platform-shape.rectangle"
 msgstr ""
 
 #. TRANSLATORS: Platform Temperature
-#: locale/ipp-strings.c:2478
+#: locale/ipp-strings.c:2516
 msgid "platform-temperature"
 msgstr ""
 
 #. TRANSLATORS: Post-dial String
-#: locale/ipp-strings.c:2480
+#: locale/ipp-strings.c:2518
 msgid "post-dial-string"
 msgstr ""
 
 #. TRANSLATORS: Pre-dial String
-#: locale/ipp-strings.c:2482
+#: locale/ipp-strings.c:2520
 msgid "pre-dial-string"
 msgstr ""
 
 #. TRANSLATORS: Number-Up Layout
-#: locale/ipp-strings.c:2484
+#: locale/ipp-strings.c:2522
 msgid "presentation-direction-number-up"
 msgstr ""
 
 #. TRANSLATORS: Top-bottom, Right-left
-#: locale/ipp-strings.c:2486
+#: locale/ipp-strings.c:2524
 msgid "presentation-direction-number-up.tobottom-toleft"
 msgstr ""
 
 #. TRANSLATORS: Top-bottom, Left-right
-#: locale/ipp-strings.c:2488
+#: locale/ipp-strings.c:2526
 msgid "presentation-direction-number-up.tobottom-toright"
 msgstr ""
 
 #. TRANSLATORS: Right-left, Top-bottom
-#: locale/ipp-strings.c:2490
+#: locale/ipp-strings.c:2528
 msgid "presentation-direction-number-up.toleft-tobottom"
 msgstr ""
 
 #. TRANSLATORS: Right-left, Bottom-top
-#: locale/ipp-strings.c:2492
+#: locale/ipp-strings.c:2530
 msgid "presentation-direction-number-up.toleft-totop"
 msgstr ""
 
 #. TRANSLATORS: Left-right, Top-bottom
-#: locale/ipp-strings.c:2494
+#: locale/ipp-strings.c:2532
 msgid "presentation-direction-number-up.toright-tobottom"
 msgstr ""
 
 #. TRANSLATORS: Left-right, Bottom-top
-#: locale/ipp-strings.c:2496
+#: locale/ipp-strings.c:2534
 msgid "presentation-direction-number-up.toright-totop"
 msgstr ""
 
 #. TRANSLATORS: Bottom-top, Right-left
-#: locale/ipp-strings.c:2498
+#: locale/ipp-strings.c:2536
 msgid "presentation-direction-number-up.totop-toleft"
 msgstr ""
 
 #. TRANSLATORS: Bottom-top, Left-right
-#: locale/ipp-strings.c:2500
+#: locale/ipp-strings.c:2538
 msgid "presentation-direction-number-up.totop-toright"
 msgstr ""
 
 #. TRANSLATORS: Print Accuracy
-#: locale/ipp-strings.c:2502
+#: locale/ipp-strings.c:2540
 msgid "print-accuracy"
 msgstr ""
 
 #. TRANSLATORS: Print Base
-#: locale/ipp-strings.c:2504
+#: locale/ipp-strings.c:2542
 msgid "print-base"
 msgstr ""
 
 #. TRANSLATORS: Brim
-#: locale/ipp-strings.c:2508
+#: locale/ipp-strings.c:2546
 msgid "print-base.brim"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2510
+#: locale/ipp-strings.c:2548
 msgid "print-base.none"
 msgstr ""
 
 #. TRANSLATORS: Raft
-#: locale/ipp-strings.c:2512
+#: locale/ipp-strings.c:2550
 msgid "print-base.raft"
 msgstr ""
 
 #. TRANSLATORS: Skirt
-#: locale/ipp-strings.c:2514
+#: locale/ipp-strings.c:2552
 msgid "print-base.skirt"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:2516
+#: locale/ipp-strings.c:2554
 msgid "print-base.standard"
 msgstr ""
 
 #. TRANSLATORS: Print Color Mode
-#: locale/ipp-strings.c:2518
+#: locale/ipp-strings.c:2556
 msgid "print-color-mode"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2520
+#: locale/ipp-strings.c:2558
 msgid "print-color-mode.auto"
 msgstr ""
 
 #. TRANSLATORS: Text
-#: locale/ipp-strings.c:2524
+#: locale/ipp-strings.c:2562
 msgid "print-color-mode.bi-level"
 msgstr ""
 
 #. TRANSLATORS: Color
-#: locale/ipp-strings.c:2526
+#: locale/ipp-strings.c:2564
 msgid "print-color-mode.color"
 msgstr ""
 
 #. TRANSLATORS: Highlight
-#: locale/ipp-strings.c:2528
+#: locale/ipp-strings.c:2566
 msgid "print-color-mode.highlight"
 msgstr ""
 
 #. TRANSLATORS: Monochrome
-#: locale/ipp-strings.c:2530
+#: locale/ipp-strings.c:2568
 msgid "print-color-mode.monochrome"
 msgstr ""
 
 #. TRANSLATORS: Process Text
-#: locale/ipp-strings.c:2532
+#: locale/ipp-strings.c:2570
 msgid "print-color-mode.process-bi-level"
 msgstr ""
 
 #. TRANSLATORS: Process Monochrome
-#: locale/ipp-strings.c:2534
+#: locale/ipp-strings.c:2572
 msgid "print-color-mode.process-monochrome"
 msgstr ""
 
 #. TRANSLATORS: Print Optimization
-#: locale/ipp-strings.c:2536
+#: locale/ipp-strings.c:2574
 msgid "print-content-optimize"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2540
+#: locale/ipp-strings.c:2578
 msgid "print-content-optimize.auto"
 msgstr ""
 
 #. TRANSLATORS: Graphics
-#: locale/ipp-strings.c:2542
+#: locale/ipp-strings.c:2580
 msgid "print-content-optimize.graphic"
 msgstr ""
 
 #. TRANSLATORS: Photo
-#: locale/ipp-strings.c:2546
+#: locale/ipp-strings.c:2584
 msgid "print-content-optimize.photo"
 msgstr ""
 
 #. TRANSLATORS: Text
-#: locale/ipp-strings.c:2548
+#: locale/ipp-strings.c:2586
 msgid "print-content-optimize.text"
 msgstr ""
 
 #. TRANSLATORS: Text and Graphics
-#: locale/ipp-strings.c:2550
+#: locale/ipp-strings.c:2588
 msgid "print-content-optimize.text-and-graphic"
 msgstr ""
 
 #. TRANSLATORS: Print Objects
-#: locale/ipp-strings.c:2554
+#: locale/ipp-strings.c:2592
 msgid "print-objects"
 msgstr ""
 
 #. TRANSLATORS: Print Quality
-#: locale/ipp-strings.c:2556
+#: locale/ipp-strings.c:2594
 msgid "print-quality"
 msgstr ""
 
 #. TRANSLATORS: Draft
-#: locale/ipp-strings.c:2558
+#: locale/ipp-strings.c:2596
 msgid "print-quality.3"
 msgstr ""
 
 #. TRANSLATORS: Normal
-#: locale/ipp-strings.c:2560
+#: locale/ipp-strings.c:2598
 msgid "print-quality.4"
 msgstr ""
 
 #. TRANSLATORS: High
-#: locale/ipp-strings.c:2562
+#: locale/ipp-strings.c:2600
 msgid "print-quality.5"
 msgstr ""
 
 #. TRANSLATORS: Print Rendering Intent
-#: locale/ipp-strings.c:2564
+#: locale/ipp-strings.c:2602
 msgid "print-rendering-intent"
 msgstr ""
 
 #. TRANSLATORS: Absolute
-#: locale/ipp-strings.c:2566
+#: locale/ipp-strings.c:2604
 msgid "print-rendering-intent.absolute"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2568
+#: locale/ipp-strings.c:2606
 msgid "print-rendering-intent.auto"
 msgstr ""
 
 #. TRANSLATORS: Perceptual
-#: locale/ipp-strings.c:2570
+#: locale/ipp-strings.c:2608
 msgid "print-rendering-intent.perceptual"
 msgstr ""
 
 #. TRANSLATORS: Relative
-#: locale/ipp-strings.c:2572
+#: locale/ipp-strings.c:2610
 msgid "print-rendering-intent.relative"
 msgstr ""
 
 #. TRANSLATORS: Relative w/Black Point Compensation
-#: locale/ipp-strings.c:2574
+#: locale/ipp-strings.c:2612
 msgid "print-rendering-intent.relative-bpc"
 msgstr ""
 
 #. TRANSLATORS: Saturation
-#: locale/ipp-strings.c:2576
+#: locale/ipp-strings.c:2614
 msgid "print-rendering-intent.saturation"
 msgstr ""
 
 #. TRANSLATORS: Print Scaling
-#: locale/ipp-strings.c:2578
+#: locale/ipp-strings.c:2616
 msgid "print-scaling"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:2580
+#: locale/ipp-strings.c:2618
 msgid "print-scaling.auto"
 msgstr ""
 
 #. TRANSLATORS: Auto-fit
-#: locale/ipp-strings.c:2582
+#: locale/ipp-strings.c:2620
 msgid "print-scaling.auto-fit"
 msgstr ""
 
 #. TRANSLATORS: Fill
-#: locale/ipp-strings.c:2584
+#: locale/ipp-strings.c:2622
 msgid "print-scaling.fill"
 msgstr ""
 
 #. TRANSLATORS: Fit
-#: locale/ipp-strings.c:2586
+#: locale/ipp-strings.c:2624
 msgid "print-scaling.fit"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2588
+#: locale/ipp-strings.c:2626
 msgid "print-scaling.none"
 msgstr ""
 
 #. TRANSLATORS: Print Supports
-#: locale/ipp-strings.c:2590
+#: locale/ipp-strings.c:2628
 msgid "print-supports"
 msgstr ""
 
 #. TRANSLATORS: With Specified Material
-#: locale/ipp-strings.c:2594
+#: locale/ipp-strings.c:2632
 msgid "print-supports.material"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:2596
+#: locale/ipp-strings.c:2634
 msgid "print-supports.none"
 msgstr ""
 
 #. TRANSLATORS: Standard
-#: locale/ipp-strings.c:2598
+#: locale/ipp-strings.c:2636
 msgid "print-supports.standard"
 msgstr ""
 
 #. TRANSLATORS: Message From Operator
-#: locale/ipp-strings.c:2620
+#: locale/ipp-strings.c:2658
 msgid "printer-message-from-operator"
 msgstr ""
 
 #. TRANSLATORS: Print Resolution
-#: locale/ipp-strings.c:2622
+#: locale/ipp-strings.c:2660
 msgid "printer-resolution"
 msgstr ""
 
 #. TRANSLATORS: Printer State
-#: locale/ipp-strings.c:2624
+#: locale/ipp-strings.c:2662
 msgid "printer-state"
 msgstr ""
 
 #. TRANSLATORS: Detailed Printer State
-#: locale/ipp-strings.c:2626
+#: locale/ipp-strings.c:2664
 msgid "printer-state-reasons"
 msgstr ""
 
 #. TRANSLATORS: Old Alerts Have Been Removed
-#: locale/ipp-strings.c:2628
+#: locale/ipp-strings.c:2666
 msgid "printer-state-reasons.alert-removal-of-binary-change-entry"
 msgstr ""
 
 #. TRANSLATORS: Bander Added
-#: locale/ipp-strings.c:2630
+#: locale/ipp-strings.c:2668
 msgid "printer-state-reasons.bander-added"
 msgstr ""
 
 #. TRANSLATORS: Bander Almost Empty
-#: locale/ipp-strings.c:2632
+#: locale/ipp-strings.c:2670
 msgid "printer-state-reasons.bander-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Bander Almost Full
-#: locale/ipp-strings.c:2634
+#: locale/ipp-strings.c:2672
 msgid "printer-state-reasons.bander-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Bander At Limit
-#: locale/ipp-strings.c:2636
+#: locale/ipp-strings.c:2674
 msgid "printer-state-reasons.bander-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Bander Closed
-#: locale/ipp-strings.c:2638
+#: locale/ipp-strings.c:2676
 msgid "printer-state-reasons.bander-closed"
 msgstr ""
 
 #. TRANSLATORS: Bander Configuration Change
-#: locale/ipp-strings.c:2640
+#: locale/ipp-strings.c:2678
 msgid "printer-state-reasons.bander-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Bander Cover Closed
-#: locale/ipp-strings.c:2642
+#: locale/ipp-strings.c:2680
 msgid "printer-state-reasons.bander-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Bander Cover Open
-#: locale/ipp-strings.c:2644
+#: locale/ipp-strings.c:2682
 msgid "printer-state-reasons.bander-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Bander Empty
-#: locale/ipp-strings.c:2646
+#: locale/ipp-strings.c:2684
 msgid "printer-state-reasons.bander-empty"
 msgstr ""
 
 #. TRANSLATORS: Bander Full
-#: locale/ipp-strings.c:2648
+#: locale/ipp-strings.c:2686
 msgid "printer-state-reasons.bander-full"
 msgstr ""
 
 #. TRANSLATORS: Bander Interlock Closed
-#: locale/ipp-strings.c:2650
+#: locale/ipp-strings.c:2688
 msgid "printer-state-reasons.bander-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Bander Interlock Open
-#: locale/ipp-strings.c:2652
+#: locale/ipp-strings.c:2690
 msgid "printer-state-reasons.bander-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Bander Jam
-#: locale/ipp-strings.c:2654
+#: locale/ipp-strings.c:2692
 msgid "printer-state-reasons.bander-jam"
 msgstr ""
 
 #. TRANSLATORS: Bander Life Almost Over
-#: locale/ipp-strings.c:2656
+#: locale/ipp-strings.c:2694
 msgid "printer-state-reasons.bander-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Bander Life Over
-#: locale/ipp-strings.c:2658
+#: locale/ipp-strings.c:2696
 msgid "printer-state-reasons.bander-life-over"
 msgstr ""
 
 #. TRANSLATORS: Bander Memory Exhausted
-#: locale/ipp-strings.c:2660
+#: locale/ipp-strings.c:2698
 msgid "printer-state-reasons.bander-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Bander Missing
-#: locale/ipp-strings.c:2662
+#: locale/ipp-strings.c:2700
 msgid "printer-state-reasons.bander-missing"
 msgstr ""
 
 #. TRANSLATORS: Bander Motor Failure
-#: locale/ipp-strings.c:2664
+#: locale/ipp-strings.c:2702
 msgid "printer-state-reasons.bander-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Near Limit
-#: locale/ipp-strings.c:2666
+#: locale/ipp-strings.c:2704
 msgid "printer-state-reasons.bander-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Bander Offline
-#: locale/ipp-strings.c:2668
+#: locale/ipp-strings.c:2706
 msgid "printer-state-reasons.bander-offline"
 msgstr ""
 
 #. TRANSLATORS: Bander Opened
-#: locale/ipp-strings.c:2670
+#: locale/ipp-strings.c:2708
 msgid "printer-state-reasons.bander-opened"
 msgstr ""
 
 #. TRANSLATORS: Bander Over Temperature
-#: locale/ipp-strings.c:2672
+#: locale/ipp-strings.c:2710
 msgid "printer-state-reasons.bander-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Bander Power Saver
-#: locale/ipp-strings.c:2674
+#: locale/ipp-strings.c:2712
 msgid "printer-state-reasons.bander-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Bander Recoverable Failure
-#: locale/ipp-strings.c:2676
+#: locale/ipp-strings.c:2714
 msgid "printer-state-reasons.bander-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Recoverable Storage
-#: locale/ipp-strings.c:2678
+#: locale/ipp-strings.c:2716
 msgid "printer-state-reasons.bander-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Bander Removed
-#: locale/ipp-strings.c:2680
+#: locale/ipp-strings.c:2718
 msgid "printer-state-reasons.bander-removed"
 msgstr ""
 
 #. TRANSLATORS: Bander Resource Added
-#: locale/ipp-strings.c:2682
+#: locale/ipp-strings.c:2720
 msgid "printer-state-reasons.bander-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Bander Resource Removed
-#: locale/ipp-strings.c:2684
+#: locale/ipp-strings.c:2722
 msgid "printer-state-reasons.bander-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Bander Thermistor Failure
-#: locale/ipp-strings.c:2686
+#: locale/ipp-strings.c:2724
 msgid "printer-state-reasons.bander-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Timing Failure
-#: locale/ipp-strings.c:2688
+#: locale/ipp-strings.c:2726
 msgid "printer-state-reasons.bander-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Turned Off
-#: locale/ipp-strings.c:2690
+#: locale/ipp-strings.c:2728
 msgid "printer-state-reasons.bander-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Bander Turned On
-#: locale/ipp-strings.c:2692
+#: locale/ipp-strings.c:2730
 msgid "printer-state-reasons.bander-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Bander Under Temperature
-#: locale/ipp-strings.c:2694
+#: locale/ipp-strings.c:2732
 msgid "printer-state-reasons.bander-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Bander Unrecoverable Failure
-#: locale/ipp-strings.c:2696
+#: locale/ipp-strings.c:2734
 msgid "printer-state-reasons.bander-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Bander Unrecoverable Storage Error
-#: locale/ipp-strings.c:2698
+#: locale/ipp-strings.c:2736
 msgid "printer-state-reasons.bander-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Bander Warming Up
-#: locale/ipp-strings.c:2700
+#: locale/ipp-strings.c:2738
 msgid "printer-state-reasons.bander-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Binder Added
-#: locale/ipp-strings.c:2702
+#: locale/ipp-strings.c:2740
 msgid "printer-state-reasons.binder-added"
 msgstr ""
 
 #. TRANSLATORS: Binder Almost Empty
-#: locale/ipp-strings.c:2704
+#: locale/ipp-strings.c:2742
 msgid "printer-state-reasons.binder-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Binder Almost Full
-#: locale/ipp-strings.c:2706
+#: locale/ipp-strings.c:2744
 msgid "printer-state-reasons.binder-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Binder At Limit
-#: locale/ipp-strings.c:2708
+#: locale/ipp-strings.c:2746
 msgid "printer-state-reasons.binder-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Binder Closed
-#: locale/ipp-strings.c:2710
+#: locale/ipp-strings.c:2748
 msgid "printer-state-reasons.binder-closed"
 msgstr ""
 
 #. TRANSLATORS: Binder Configuration Change
-#: locale/ipp-strings.c:2712
+#: locale/ipp-strings.c:2750
 msgid "printer-state-reasons.binder-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Binder Cover Closed
-#: locale/ipp-strings.c:2714
+#: locale/ipp-strings.c:2752
 msgid "printer-state-reasons.binder-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Binder Cover Open
-#: locale/ipp-strings.c:2716
+#: locale/ipp-strings.c:2754
 msgid "printer-state-reasons.binder-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Binder Empty
-#: locale/ipp-strings.c:2718
+#: locale/ipp-strings.c:2756
 msgid "printer-state-reasons.binder-empty"
 msgstr ""
 
 #. TRANSLATORS: Binder Full
-#: locale/ipp-strings.c:2720
+#: locale/ipp-strings.c:2758
 msgid "printer-state-reasons.binder-full"
 msgstr ""
 
 #. TRANSLATORS: Binder Interlock Closed
-#: locale/ipp-strings.c:2722
+#: locale/ipp-strings.c:2760
 msgid "printer-state-reasons.binder-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Binder Interlock Open
-#: locale/ipp-strings.c:2724
+#: locale/ipp-strings.c:2762
 msgid "printer-state-reasons.binder-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Binder Jam
-#: locale/ipp-strings.c:2726
+#: locale/ipp-strings.c:2764
 msgid "printer-state-reasons.binder-jam"
 msgstr ""
 
 #. TRANSLATORS: Binder Life Almost Over
-#: locale/ipp-strings.c:2728
+#: locale/ipp-strings.c:2766
 msgid "printer-state-reasons.binder-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Binder Life Over
-#: locale/ipp-strings.c:2730
+#: locale/ipp-strings.c:2768
 msgid "printer-state-reasons.binder-life-over"
 msgstr ""
 
 #. TRANSLATORS: Binder Memory Exhausted
-#: locale/ipp-strings.c:2732
+#: locale/ipp-strings.c:2770
 msgid "printer-state-reasons.binder-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Binder Missing
-#: locale/ipp-strings.c:2734
+#: locale/ipp-strings.c:2772
 msgid "printer-state-reasons.binder-missing"
 msgstr ""
 
 #. TRANSLATORS: Binder Motor Failure
-#: locale/ipp-strings.c:2736
+#: locale/ipp-strings.c:2774
 msgid "printer-state-reasons.binder-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Near Limit
-#: locale/ipp-strings.c:2738
+#: locale/ipp-strings.c:2776
 msgid "printer-state-reasons.binder-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Binder Offline
-#: locale/ipp-strings.c:2740
+#: locale/ipp-strings.c:2778
 msgid "printer-state-reasons.binder-offline"
 msgstr ""
 
 #. TRANSLATORS: Binder Opened
-#: locale/ipp-strings.c:2742
+#: locale/ipp-strings.c:2780
 msgid "printer-state-reasons.binder-opened"
 msgstr ""
 
 #. TRANSLATORS: Binder Over Temperature
-#: locale/ipp-strings.c:2744
+#: locale/ipp-strings.c:2782
 msgid "printer-state-reasons.binder-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Binder Power Saver
-#: locale/ipp-strings.c:2746
+#: locale/ipp-strings.c:2784
 msgid "printer-state-reasons.binder-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Binder Recoverable Failure
-#: locale/ipp-strings.c:2748
+#: locale/ipp-strings.c:2786
 msgid "printer-state-reasons.binder-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Recoverable Storage
-#: locale/ipp-strings.c:2750
+#: locale/ipp-strings.c:2788
 msgid "printer-state-reasons.binder-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Binder Removed
-#: locale/ipp-strings.c:2752
+#: locale/ipp-strings.c:2790
 msgid "printer-state-reasons.binder-removed"
 msgstr ""
 
 #. TRANSLATORS: Binder Resource Added
-#: locale/ipp-strings.c:2754
+#: locale/ipp-strings.c:2792
 msgid "printer-state-reasons.binder-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Binder Resource Removed
-#: locale/ipp-strings.c:2756
+#: locale/ipp-strings.c:2794
 msgid "printer-state-reasons.binder-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Binder Thermistor Failure
-#: locale/ipp-strings.c:2758
+#: locale/ipp-strings.c:2796
 msgid "printer-state-reasons.binder-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Timing Failure
-#: locale/ipp-strings.c:2760
+#: locale/ipp-strings.c:2798
 msgid "printer-state-reasons.binder-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Turned Off
-#: locale/ipp-strings.c:2762
+#: locale/ipp-strings.c:2800
 msgid "printer-state-reasons.binder-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Binder Turned On
-#: locale/ipp-strings.c:2764
+#: locale/ipp-strings.c:2802
 msgid "printer-state-reasons.binder-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Binder Under Temperature
-#: locale/ipp-strings.c:2766
+#: locale/ipp-strings.c:2804
 msgid "printer-state-reasons.binder-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Binder Unrecoverable Failure
-#: locale/ipp-strings.c:2768
+#: locale/ipp-strings.c:2806
 msgid "printer-state-reasons.binder-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Binder Unrecoverable Storage Error
-#: locale/ipp-strings.c:2770
+#: locale/ipp-strings.c:2808
 msgid "printer-state-reasons.binder-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Binder Warming Up
-#: locale/ipp-strings.c:2772
+#: locale/ipp-strings.c:2810
 msgid "printer-state-reasons.binder-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Camera Failure
-#: locale/ipp-strings.c:2774
+#: locale/ipp-strings.c:2812
 msgid "printer-state-reasons.camera-failure"
 msgstr ""
 
 #. TRANSLATORS: Chamber Cooling
-#: locale/ipp-strings.c:2776
+#: locale/ipp-strings.c:2814
 msgid "printer-state-reasons.chamber-cooling"
 msgstr ""
 
 #. TRANSLATORS: Chamber Heating
-#: locale/ipp-strings.c:2780
+#: locale/ipp-strings.c:2818
 msgid "printer-state-reasons.chamber-heating"
 msgstr ""
 
 #. TRANSLATORS: Chamber Temperature High
-#: locale/ipp-strings.c:2782
+#: locale/ipp-strings.c:2820
 msgid "printer-state-reasons.chamber-temperature-high"
 msgstr ""
 
 #. TRANSLATORS: Chamber Temperature Low
-#: locale/ipp-strings.c:2784
+#: locale/ipp-strings.c:2822
 msgid "printer-state-reasons.chamber-temperature-low"
 msgstr ""
 
 #. TRANSLATORS: Cleaner Life Almost Over
-#: locale/ipp-strings.c:2786
+#: locale/ipp-strings.c:2824
 msgid "printer-state-reasons.cleaner-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Cleaner Life Over
-#: locale/ipp-strings.c:2788
+#: locale/ipp-strings.c:2826
 msgid "printer-state-reasons.cleaner-life-over"
 msgstr ""
 
 #. TRANSLATORS: Configuration Change
-#: locale/ipp-strings.c:2790
+#: locale/ipp-strings.c:2828
 msgid "printer-state-reasons.configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Connecting To Device
-#: locale/ipp-strings.c:2792
+#: locale/ipp-strings.c:2830
 msgid "printer-state-reasons.connecting-to-device"
 msgstr ""
 
 #. TRANSLATORS: Cover Open
-#: locale/ipp-strings.c:2794
+#: locale/ipp-strings.c:2832
 msgid "printer-state-reasons.cover-open"
 msgstr ""
 
 #. TRANSLATORS: Deactivated
-#: locale/ipp-strings.c:2796
+#: locale/ipp-strings.c:2834
 msgid "printer-state-reasons.deactivated"
 msgstr ""
 
 #. TRANSLATORS: Developer Empty
-#: locale/ipp-strings.c:2798
+#: locale/ipp-strings.c:2836
 msgid "printer-state-reasons.developer-empty"
 msgstr ""
 
 #. TRANSLATORS: Developer Low
-#: locale/ipp-strings.c:2800
+#: locale/ipp-strings.c:2838
 msgid "printer-state-reasons.developer-low"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Added
-#: locale/ipp-strings.c:2802
+#: locale/ipp-strings.c:2840
 msgid "printer-state-reasons.die-cutter-added"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Almost Empty
-#: locale/ipp-strings.c:2804
+#: locale/ipp-strings.c:2842
 msgid "printer-state-reasons.die-cutter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Almost Full
-#: locale/ipp-strings.c:2806
+#: locale/ipp-strings.c:2844
 msgid "printer-state-reasons.die-cutter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter At Limit
-#: locale/ipp-strings.c:2808
+#: locale/ipp-strings.c:2846
 msgid "printer-state-reasons.die-cutter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Closed
-#: locale/ipp-strings.c:2810
+#: locale/ipp-strings.c:2848
 msgid "printer-state-reasons.die-cutter-closed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Configuration Change
-#: locale/ipp-strings.c:2812
+#: locale/ipp-strings.c:2850
 msgid "printer-state-reasons.die-cutter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Cover Closed
-#: locale/ipp-strings.c:2814
+#: locale/ipp-strings.c:2852
 msgid "printer-state-reasons.die-cutter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Cover Open
-#: locale/ipp-strings.c:2816
+#: locale/ipp-strings.c:2854
 msgid "printer-state-reasons.die-cutter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Empty
-#: locale/ipp-strings.c:2818
+#: locale/ipp-strings.c:2856
 msgid "printer-state-reasons.die-cutter-empty"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Full
-#: locale/ipp-strings.c:2820
+#: locale/ipp-strings.c:2858
 msgid "printer-state-reasons.die-cutter-full"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Interlock Closed
-#: locale/ipp-strings.c:2822
+#: locale/ipp-strings.c:2860
 msgid "printer-state-reasons.die-cutter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Interlock Open
-#: locale/ipp-strings.c:2824
+#: locale/ipp-strings.c:2862
 msgid "printer-state-reasons.die-cutter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Jam
-#: locale/ipp-strings.c:2826
+#: locale/ipp-strings.c:2864
 msgid "printer-state-reasons.die-cutter-jam"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Life Almost Over
-#: locale/ipp-strings.c:2828
+#: locale/ipp-strings.c:2866
 msgid "printer-state-reasons.die-cutter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Life Over
-#: locale/ipp-strings.c:2830
+#: locale/ipp-strings.c:2868
 msgid "printer-state-reasons.die-cutter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Memory Exhausted
-#: locale/ipp-strings.c:2832
+#: locale/ipp-strings.c:2870
 msgid "printer-state-reasons.die-cutter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Missing
-#: locale/ipp-strings.c:2834
+#: locale/ipp-strings.c:2872
 msgid "printer-state-reasons.die-cutter-missing"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Motor Failure
-#: locale/ipp-strings.c:2836
+#: locale/ipp-strings.c:2874
 msgid "printer-state-reasons.die-cutter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Near Limit
-#: locale/ipp-strings.c:2838
+#: locale/ipp-strings.c:2876
 msgid "printer-state-reasons.die-cutter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Offline
-#: locale/ipp-strings.c:2840
+#: locale/ipp-strings.c:2878
 msgid "printer-state-reasons.die-cutter-offline"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Opened
-#: locale/ipp-strings.c:2842
+#: locale/ipp-strings.c:2880
 msgid "printer-state-reasons.die-cutter-opened"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Over Temperature
-#: locale/ipp-strings.c:2844
+#: locale/ipp-strings.c:2882
 msgid "printer-state-reasons.die-cutter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Power Saver
-#: locale/ipp-strings.c:2846
+#: locale/ipp-strings.c:2884
 msgid "printer-state-reasons.die-cutter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Recoverable Failure
-#: locale/ipp-strings.c:2848
+#: locale/ipp-strings.c:2886
 msgid "printer-state-reasons.die-cutter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Recoverable Storage
-#: locale/ipp-strings.c:2850
+#: locale/ipp-strings.c:2888
 msgid "printer-state-reasons.die-cutter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Removed
-#: locale/ipp-strings.c:2852
+#: locale/ipp-strings.c:2890
 msgid "printer-state-reasons.die-cutter-removed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Resource Added
-#: locale/ipp-strings.c:2854
+#: locale/ipp-strings.c:2892
 msgid "printer-state-reasons.die-cutter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Resource Removed
-#: locale/ipp-strings.c:2856
+#: locale/ipp-strings.c:2894
 msgid "printer-state-reasons.die-cutter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Thermistor Failure
-#: locale/ipp-strings.c:2858
+#: locale/ipp-strings.c:2896
 msgid "printer-state-reasons.die-cutter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Timing Failure
-#: locale/ipp-strings.c:2860
+#: locale/ipp-strings.c:2898
 msgid "printer-state-reasons.die-cutter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Turned Off
-#: locale/ipp-strings.c:2862
+#: locale/ipp-strings.c:2900
 msgid "printer-state-reasons.die-cutter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Turned On
-#: locale/ipp-strings.c:2864
+#: locale/ipp-strings.c:2902
 msgid "printer-state-reasons.die-cutter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Under Temperature
-#: locale/ipp-strings.c:2866
+#: locale/ipp-strings.c:2904
 msgid "printer-state-reasons.die-cutter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Unrecoverable Failure
-#: locale/ipp-strings.c:2868
+#: locale/ipp-strings.c:2906
 msgid "printer-state-reasons.die-cutter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Unrecoverable Storage Error
-#: locale/ipp-strings.c:2870
+#: locale/ipp-strings.c:2908
 msgid "printer-state-reasons.die-cutter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Die Cutter Warming Up
-#: locale/ipp-strings.c:2872
+#: locale/ipp-strings.c:2910
 msgid "printer-state-reasons.die-cutter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Door Open
-#: locale/ipp-strings.c:2874
+#: locale/ipp-strings.c:2912
 msgid "printer-state-reasons.door-open"
 msgstr ""
 
 #. TRANSLATORS: Extruder Cooling
-#: locale/ipp-strings.c:2876
+#: locale/ipp-strings.c:2914
 msgid "printer-state-reasons.extruder-cooling"
 msgstr ""
 
 #. TRANSLATORS: Extruder Failure
-#: locale/ipp-strings.c:2878
+#: locale/ipp-strings.c:2916
 msgid "printer-state-reasons.extruder-failure"
 msgstr ""
 
 #. TRANSLATORS: Extruder Heating
-#: locale/ipp-strings.c:2880
+#: locale/ipp-strings.c:2918
 msgid "printer-state-reasons.extruder-heating"
 msgstr ""
 
 #. TRANSLATORS: Extruder Jam
-#: locale/ipp-strings.c:2882
+#: locale/ipp-strings.c:2920
 msgid "printer-state-reasons.extruder-jam"
 msgstr ""
 
 #. TRANSLATORS: Extruder Temperature High
-#: locale/ipp-strings.c:2884
+#: locale/ipp-strings.c:2922
 msgid "printer-state-reasons.extruder-temperature-high"
 msgstr ""
 
 #. TRANSLATORS: Extruder Temperature Low
-#: locale/ipp-strings.c:2886
+#: locale/ipp-strings.c:2924
 msgid "printer-state-reasons.extruder-temperature-low"
 msgstr ""
 
 #. TRANSLATORS: Fan Failure
-#: locale/ipp-strings.c:2888
+#: locale/ipp-strings.c:2926
 msgid "printer-state-reasons.fan-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Added
-#: locale/ipp-strings.c:2900
+#: locale/ipp-strings.c:2938
 msgid "printer-state-reasons.folder-added"
 msgstr ""
 
 #. TRANSLATORS: Folder Almost Empty
-#: locale/ipp-strings.c:2902
+#: locale/ipp-strings.c:2940
 msgid "printer-state-reasons.folder-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Folder Almost Full
-#: locale/ipp-strings.c:2904
+#: locale/ipp-strings.c:2942
 msgid "printer-state-reasons.folder-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Folder At Limit
-#: locale/ipp-strings.c:2906
+#: locale/ipp-strings.c:2944
 msgid "printer-state-reasons.folder-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Folder Closed
-#: locale/ipp-strings.c:2908
+#: locale/ipp-strings.c:2946
 msgid "printer-state-reasons.folder-closed"
 msgstr ""
 
 #. TRANSLATORS: Folder Configuration Change
-#: locale/ipp-strings.c:2910
+#: locale/ipp-strings.c:2948
 msgid "printer-state-reasons.folder-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Folder Cover Closed
-#: locale/ipp-strings.c:2912
+#: locale/ipp-strings.c:2950
 msgid "printer-state-reasons.folder-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Folder Cover Open
-#: locale/ipp-strings.c:2914
+#: locale/ipp-strings.c:2952
 msgid "printer-state-reasons.folder-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Folder Empty
-#: locale/ipp-strings.c:2916
+#: locale/ipp-strings.c:2954
 msgid "printer-state-reasons.folder-empty"
 msgstr ""
 
 #. TRANSLATORS: Folder Full
-#: locale/ipp-strings.c:2918
+#: locale/ipp-strings.c:2956
 msgid "printer-state-reasons.folder-full"
 msgstr ""
 
 #. TRANSLATORS: Folder Interlock Closed
-#: locale/ipp-strings.c:2920
+#: locale/ipp-strings.c:2958
 msgid "printer-state-reasons.folder-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Folder Interlock Open
-#: locale/ipp-strings.c:2922
+#: locale/ipp-strings.c:2960
 msgid "printer-state-reasons.folder-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Folder Jam
-#: locale/ipp-strings.c:2924
+#: locale/ipp-strings.c:2962
 msgid "printer-state-reasons.folder-jam"
 msgstr ""
 
 #. TRANSLATORS: Folder Life Almost Over
-#: locale/ipp-strings.c:2926
+#: locale/ipp-strings.c:2964
 msgid "printer-state-reasons.folder-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Folder Life Over
-#: locale/ipp-strings.c:2928
+#: locale/ipp-strings.c:2966
 msgid "printer-state-reasons.folder-life-over"
 msgstr ""
 
 #. TRANSLATORS: Folder Memory Exhausted
-#: locale/ipp-strings.c:2930
+#: locale/ipp-strings.c:2968
 msgid "printer-state-reasons.folder-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Folder Missing
-#: locale/ipp-strings.c:2932
+#: locale/ipp-strings.c:2970
 msgid "printer-state-reasons.folder-missing"
 msgstr ""
 
 #. TRANSLATORS: Folder Motor Failure
-#: locale/ipp-strings.c:2934
+#: locale/ipp-strings.c:2972
 msgid "printer-state-reasons.folder-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Near Limit
-#: locale/ipp-strings.c:2936
+#: locale/ipp-strings.c:2974
 msgid "printer-state-reasons.folder-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Folder Offline
-#: locale/ipp-strings.c:2938
+#: locale/ipp-strings.c:2976
 msgid "printer-state-reasons.folder-offline"
 msgstr ""
 
 #. TRANSLATORS: Folder Opened
-#: locale/ipp-strings.c:2940
+#: locale/ipp-strings.c:2978
 msgid "printer-state-reasons.folder-opened"
 msgstr ""
 
 #. TRANSLATORS: Folder Over Temperature
-#: locale/ipp-strings.c:2942
+#: locale/ipp-strings.c:2980
 msgid "printer-state-reasons.folder-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Folder Power Saver
-#: locale/ipp-strings.c:2944
+#: locale/ipp-strings.c:2982
 msgid "printer-state-reasons.folder-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Folder Recoverable Failure
-#: locale/ipp-strings.c:2946
+#: locale/ipp-strings.c:2984
 msgid "printer-state-reasons.folder-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Recoverable Storage
-#: locale/ipp-strings.c:2948
+#: locale/ipp-strings.c:2986
 msgid "printer-state-reasons.folder-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Folder Removed
-#: locale/ipp-strings.c:2950
+#: locale/ipp-strings.c:2988
 msgid "printer-state-reasons.folder-removed"
 msgstr ""
 
 #. TRANSLATORS: Folder Resource Added
-#: locale/ipp-strings.c:2952
+#: locale/ipp-strings.c:2990
 msgid "printer-state-reasons.folder-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Folder Resource Removed
-#: locale/ipp-strings.c:2954
+#: locale/ipp-strings.c:2992
 msgid "printer-state-reasons.folder-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Folder Thermistor Failure
-#: locale/ipp-strings.c:2956
+#: locale/ipp-strings.c:2994
 msgid "printer-state-reasons.folder-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Timing Failure
-#: locale/ipp-strings.c:2958
+#: locale/ipp-strings.c:2996
 msgid "printer-state-reasons.folder-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Turned Off
-#: locale/ipp-strings.c:2960
+#: locale/ipp-strings.c:2998
 msgid "printer-state-reasons.folder-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Folder Turned On
-#: locale/ipp-strings.c:2962
+#: locale/ipp-strings.c:3000
 msgid "printer-state-reasons.folder-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Folder Under Temperature
-#: locale/ipp-strings.c:2964
+#: locale/ipp-strings.c:3002
 msgid "printer-state-reasons.folder-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Folder Unrecoverable Failure
-#: locale/ipp-strings.c:2966
+#: locale/ipp-strings.c:3004
 msgid "printer-state-reasons.folder-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Folder Unrecoverable Storage Error
-#: locale/ipp-strings.c:2968
+#: locale/ipp-strings.c:3006
 msgid "printer-state-reasons.folder-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Folder Warming Up
-#: locale/ipp-strings.c:2970
+#: locale/ipp-strings.c:3008
 msgid "printer-state-reasons.folder-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Fuser temperature high
-#: locale/ipp-strings.c:2972
+#: locale/ipp-strings.c:3010
 msgid "printer-state-reasons.fuser-over-temp"
 msgstr ""
 
 #. TRANSLATORS: Fuser temperature low
-#: locale/ipp-strings.c:2974
+#: locale/ipp-strings.c:3012
 msgid "printer-state-reasons.fuser-under-temp"
 msgstr ""
 
 #. TRANSLATORS: Hold New Jobs
-#: locale/ipp-strings.c:2976
+#: locale/ipp-strings.c:3014
 msgid "printer-state-reasons.hold-new-jobs"
 msgstr ""
 
 #. TRANSLATORS: Identify Printer
-#: locale/ipp-strings.c:2978
+#: locale/ipp-strings.c:3016
 msgid "printer-state-reasons.identify-printer-requested"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Added
-#: locale/ipp-strings.c:2980
+#: locale/ipp-strings.c:3018
 msgid "printer-state-reasons.imprinter-added"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Almost Empty
-#: locale/ipp-strings.c:2982
+#: locale/ipp-strings.c:3020
 msgid "printer-state-reasons.imprinter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Almost Full
-#: locale/ipp-strings.c:2984
+#: locale/ipp-strings.c:3022
 msgid "printer-state-reasons.imprinter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Imprinter At Limit
-#: locale/ipp-strings.c:2986
+#: locale/ipp-strings.c:3024
 msgid "printer-state-reasons.imprinter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Closed
-#: locale/ipp-strings.c:2988
+#: locale/ipp-strings.c:3026
 msgid "printer-state-reasons.imprinter-closed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Configuration Change
-#: locale/ipp-strings.c:2990
+#: locale/ipp-strings.c:3028
 msgid "printer-state-reasons.imprinter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Cover Closed
-#: locale/ipp-strings.c:2992
+#: locale/ipp-strings.c:3030
 msgid "printer-state-reasons.imprinter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Cover Open
-#: locale/ipp-strings.c:2994
+#: locale/ipp-strings.c:3032
 msgid "printer-state-reasons.imprinter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Empty
-#: locale/ipp-strings.c:2996
+#: locale/ipp-strings.c:3034
 msgid "printer-state-reasons.imprinter-empty"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Full
-#: locale/ipp-strings.c:2998
+#: locale/ipp-strings.c:3036
 msgid "printer-state-reasons.imprinter-full"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Interlock Closed
-#: locale/ipp-strings.c:3000
+#: locale/ipp-strings.c:3038
 msgid "printer-state-reasons.imprinter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Interlock Open
-#: locale/ipp-strings.c:3002
+#: locale/ipp-strings.c:3040
 msgid "printer-state-reasons.imprinter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Jam
-#: locale/ipp-strings.c:3004
+#: locale/ipp-strings.c:3042
 msgid "printer-state-reasons.imprinter-jam"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Life Almost Over
-#: locale/ipp-strings.c:3006
+#: locale/ipp-strings.c:3044
 msgid "printer-state-reasons.imprinter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Life Over
-#: locale/ipp-strings.c:3008
+#: locale/ipp-strings.c:3046
 msgid "printer-state-reasons.imprinter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Memory Exhausted
-#: locale/ipp-strings.c:3010
+#: locale/ipp-strings.c:3048
 msgid "printer-state-reasons.imprinter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Missing
-#: locale/ipp-strings.c:3012
+#: locale/ipp-strings.c:3050
 msgid "printer-state-reasons.imprinter-missing"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Motor Failure
-#: locale/ipp-strings.c:3014
+#: locale/ipp-strings.c:3052
 msgid "printer-state-reasons.imprinter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Near Limit
-#: locale/ipp-strings.c:3016
+#: locale/ipp-strings.c:3054
 msgid "printer-state-reasons.imprinter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Offline
-#: locale/ipp-strings.c:3018
+#: locale/ipp-strings.c:3056
 msgid "printer-state-reasons.imprinter-offline"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Opened
-#: locale/ipp-strings.c:3020
+#: locale/ipp-strings.c:3058
 msgid "printer-state-reasons.imprinter-opened"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Over Temperature
-#: locale/ipp-strings.c:3022
+#: locale/ipp-strings.c:3060
 msgid "printer-state-reasons.imprinter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Power Saver
-#: locale/ipp-strings.c:3024
+#: locale/ipp-strings.c:3062
 msgid "printer-state-reasons.imprinter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Recoverable Failure
-#: locale/ipp-strings.c:3026
+#: locale/ipp-strings.c:3064
 msgid "printer-state-reasons.imprinter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Recoverable Storage
-#: locale/ipp-strings.c:3028
+#: locale/ipp-strings.c:3066
 msgid "printer-state-reasons.imprinter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Removed
-#: locale/ipp-strings.c:3030
+#: locale/ipp-strings.c:3068
 msgid "printer-state-reasons.imprinter-removed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Resource Added
-#: locale/ipp-strings.c:3032
+#: locale/ipp-strings.c:3070
 msgid "printer-state-reasons.imprinter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Resource Removed
-#: locale/ipp-strings.c:3034
+#: locale/ipp-strings.c:3072
 msgid "printer-state-reasons.imprinter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Thermistor Failure
-#: locale/ipp-strings.c:3036
+#: locale/ipp-strings.c:3074
 msgid "printer-state-reasons.imprinter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Timing Failure
-#: locale/ipp-strings.c:3038
+#: locale/ipp-strings.c:3076
 msgid "printer-state-reasons.imprinter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Turned Off
-#: locale/ipp-strings.c:3040
+#: locale/ipp-strings.c:3078
 msgid "printer-state-reasons.imprinter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Turned On
-#: locale/ipp-strings.c:3042
+#: locale/ipp-strings.c:3080
 msgid "printer-state-reasons.imprinter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Under Temperature
-#: locale/ipp-strings.c:3044
+#: locale/ipp-strings.c:3082
 msgid "printer-state-reasons.imprinter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Unrecoverable Failure
-#: locale/ipp-strings.c:3046
+#: locale/ipp-strings.c:3084
 msgid "printer-state-reasons.imprinter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3048
+#: locale/ipp-strings.c:3086
 msgid "printer-state-reasons.imprinter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Imprinter Warming Up
-#: locale/ipp-strings.c:3050
+#: locale/ipp-strings.c:3088
 msgid "printer-state-reasons.imprinter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Input Cannot Feed Size Selected
-#: locale/ipp-strings.c:3052
+#: locale/ipp-strings.c:3090
 msgid "printer-state-reasons.input-cannot-feed-size-selected"
 msgstr ""
 
 #. TRANSLATORS: Input Manual Input Request
-#: locale/ipp-strings.c:3054
+#: locale/ipp-strings.c:3092
 msgid "printer-state-reasons.input-manual-input-request"
 msgstr ""
 
 #. TRANSLATORS: Input Media Color Change
-#: locale/ipp-strings.c:3056
+#: locale/ipp-strings.c:3094
 msgid "printer-state-reasons.input-media-color-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Form Parts Change
-#: locale/ipp-strings.c:3058
+#: locale/ipp-strings.c:3096
 msgid "printer-state-reasons.input-media-form-parts-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Size Change
-#: locale/ipp-strings.c:3060
+#: locale/ipp-strings.c:3098
 msgid "printer-state-reasons.input-media-size-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Type Change
-#: locale/ipp-strings.c:3068
+#: locale/ipp-strings.c:3106
 msgid "printer-state-reasons.input-media-type-change"
 msgstr ""
 
 #. TRANSLATORS: Input Media Weight Change
-#: locale/ipp-strings.c:3070
+#: locale/ipp-strings.c:3108
 msgid "printer-state-reasons.input-media-weight-change"
 msgstr ""
 
 #. TRANSLATORS: Input Tray Elevation Failure
-#: locale/ipp-strings.c:3080
+#: locale/ipp-strings.c:3118
 msgid "printer-state-reasons.input-tray-elevation-failure"
 msgstr ""
 
 #. TRANSLATORS: Paper tray is missing
-#: locale/ipp-strings.c:3082
+#: locale/ipp-strings.c:3120
 msgid "printer-state-reasons.input-tray-missing"
 msgstr ""
 
 #. TRANSLATORS: Input Tray Position Failure
-#: locale/ipp-strings.c:3084
+#: locale/ipp-strings.c:3122
 msgid "printer-state-reasons.input-tray-position-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Added
-#: locale/ipp-strings.c:3086
+#: locale/ipp-strings.c:3124
 msgid "printer-state-reasons.inserter-added"
 msgstr ""
 
 #. TRANSLATORS: Inserter Almost Empty
-#: locale/ipp-strings.c:3088
+#: locale/ipp-strings.c:3126
 msgid "printer-state-reasons.inserter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Inserter Almost Full
-#: locale/ipp-strings.c:3090
+#: locale/ipp-strings.c:3128
 msgid "printer-state-reasons.inserter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Inserter At Limit
-#: locale/ipp-strings.c:3092
+#: locale/ipp-strings.c:3130
 msgid "printer-state-reasons.inserter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Inserter Closed
-#: locale/ipp-strings.c:3094
+#: locale/ipp-strings.c:3132
 msgid "printer-state-reasons.inserter-closed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Configuration Change
-#: locale/ipp-strings.c:3096
+#: locale/ipp-strings.c:3134
 msgid "printer-state-reasons.inserter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Inserter Cover Closed
-#: locale/ipp-strings.c:3098
+#: locale/ipp-strings.c:3136
 msgid "printer-state-reasons.inserter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Cover Open
-#: locale/ipp-strings.c:3100
+#: locale/ipp-strings.c:3138
 msgid "printer-state-reasons.inserter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Inserter Empty
-#: locale/ipp-strings.c:3102
+#: locale/ipp-strings.c:3140
 msgid "printer-state-reasons.inserter-empty"
 msgstr ""
 
 #. TRANSLATORS: Inserter Full
-#: locale/ipp-strings.c:3104
+#: locale/ipp-strings.c:3142
 msgid "printer-state-reasons.inserter-full"
 msgstr ""
 
 #. TRANSLATORS: Inserter Interlock Closed
-#: locale/ipp-strings.c:3106
+#: locale/ipp-strings.c:3144
 msgid "printer-state-reasons.inserter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Interlock Open
-#: locale/ipp-strings.c:3108
+#: locale/ipp-strings.c:3146
 msgid "printer-state-reasons.inserter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Inserter Jam
-#: locale/ipp-strings.c:3110
+#: locale/ipp-strings.c:3148
 msgid "printer-state-reasons.inserter-jam"
 msgstr ""
 
 #. TRANSLATORS: Inserter Life Almost Over
-#: locale/ipp-strings.c:3112
+#: locale/ipp-strings.c:3150
 msgid "printer-state-reasons.inserter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Inserter Life Over
-#: locale/ipp-strings.c:3114
+#: locale/ipp-strings.c:3152
 msgid "printer-state-reasons.inserter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Inserter Memory Exhausted
-#: locale/ipp-strings.c:3116
+#: locale/ipp-strings.c:3154
 msgid "printer-state-reasons.inserter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Inserter Missing
-#: locale/ipp-strings.c:3118
+#: locale/ipp-strings.c:3156
 msgid "printer-state-reasons.inserter-missing"
 msgstr ""
 
 #. TRANSLATORS: Inserter Motor Failure
-#: locale/ipp-strings.c:3120
+#: locale/ipp-strings.c:3158
 msgid "printer-state-reasons.inserter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Near Limit
-#: locale/ipp-strings.c:3122
+#: locale/ipp-strings.c:3160
 msgid "printer-state-reasons.inserter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Inserter Offline
-#: locale/ipp-strings.c:3124
+#: locale/ipp-strings.c:3162
 msgid "printer-state-reasons.inserter-offline"
 msgstr ""
 
 #. TRANSLATORS: Inserter Opened
-#: locale/ipp-strings.c:3126
+#: locale/ipp-strings.c:3164
 msgid "printer-state-reasons.inserter-opened"
 msgstr ""
 
 #. TRANSLATORS: Inserter Over Temperature
-#: locale/ipp-strings.c:3128
+#: locale/ipp-strings.c:3166
 msgid "printer-state-reasons.inserter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Inserter Power Saver
-#: locale/ipp-strings.c:3130
+#: locale/ipp-strings.c:3168
 msgid "printer-state-reasons.inserter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Inserter Recoverable Failure
-#: locale/ipp-strings.c:3132
+#: locale/ipp-strings.c:3170
 msgid "printer-state-reasons.inserter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Recoverable Storage
-#: locale/ipp-strings.c:3134
+#: locale/ipp-strings.c:3172
 msgid "printer-state-reasons.inserter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Inserter Removed
-#: locale/ipp-strings.c:3136
+#: locale/ipp-strings.c:3174
 msgid "printer-state-reasons.inserter-removed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Resource Added
-#: locale/ipp-strings.c:3138
+#: locale/ipp-strings.c:3176
 msgid "printer-state-reasons.inserter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Inserter Resource Removed
-#: locale/ipp-strings.c:3140
+#: locale/ipp-strings.c:3178
 msgid "printer-state-reasons.inserter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Inserter Thermistor Failure
-#: locale/ipp-strings.c:3142
+#: locale/ipp-strings.c:3180
 msgid "printer-state-reasons.inserter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Timing Failure
-#: locale/ipp-strings.c:3144
+#: locale/ipp-strings.c:3182
 msgid "printer-state-reasons.inserter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Turned Off
-#: locale/ipp-strings.c:3146
+#: locale/ipp-strings.c:3184
 msgid "printer-state-reasons.inserter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Inserter Turned On
-#: locale/ipp-strings.c:3148
+#: locale/ipp-strings.c:3186
 msgid "printer-state-reasons.inserter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Inserter Under Temperature
-#: locale/ipp-strings.c:3150
+#: locale/ipp-strings.c:3188
 msgid "printer-state-reasons.inserter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Inserter Unrecoverable Failure
-#: locale/ipp-strings.c:3152
+#: locale/ipp-strings.c:3190
 msgid "printer-state-reasons.inserter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Inserter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3154
+#: locale/ipp-strings.c:3192
 msgid "printer-state-reasons.inserter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Inserter Warming Up
-#: locale/ipp-strings.c:3156
+#: locale/ipp-strings.c:3194
 msgid "printer-state-reasons.inserter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Interlock Closed
-#: locale/ipp-strings.c:3158
+#: locale/ipp-strings.c:3196
 msgid "printer-state-reasons.interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Interlock Open
-#: locale/ipp-strings.c:3160
+#: locale/ipp-strings.c:3198
 msgid "printer-state-reasons.interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Cartridge Added
-#: locale/ipp-strings.c:3162
+#: locale/ipp-strings.c:3200
 msgid "printer-state-reasons.interpreter-cartridge-added"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Cartridge Removed
-#: locale/ipp-strings.c:3164
+#: locale/ipp-strings.c:3202
 msgid "printer-state-reasons.interpreter-cartridge-deleted"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Complex Page Encountered
-#: locale/ipp-strings.c:3166
+#: locale/ipp-strings.c:3204
 msgid "printer-state-reasons.interpreter-complex-page-encountered"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Memory Decrease
-#: locale/ipp-strings.c:3168
+#: locale/ipp-strings.c:3206
 msgid "printer-state-reasons.interpreter-memory-decrease"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Memory Increase
-#: locale/ipp-strings.c:3170
+#: locale/ipp-strings.c:3208
 msgid "printer-state-reasons.interpreter-memory-increase"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Resource Added
-#: locale/ipp-strings.c:3172
+#: locale/ipp-strings.c:3210
 msgid "printer-state-reasons.interpreter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Interpreter Resource Deleted
-#: locale/ipp-strings.c:3174
+#: locale/ipp-strings.c:3212
 msgid "printer-state-reasons.interpreter-resource-deleted"
 msgstr ""
 
 #. TRANSLATORS: Printer resource unavailable
-#: locale/ipp-strings.c:3176
+#: locale/ipp-strings.c:3214
 msgid "printer-state-reasons.interpreter-resource-unavailable"
 msgstr ""
 
 #. TRANSLATORS: Lamp At End of Life
-#: locale/ipp-strings.c:3178
+#: locale/ipp-strings.c:3216
 msgid "printer-state-reasons.lamp-at-eol"
 msgstr ""
 
 #. TRANSLATORS: Lamp Failure
-#: locale/ipp-strings.c:3180
+#: locale/ipp-strings.c:3218
 msgid "printer-state-reasons.lamp-failure"
 msgstr ""
 
 #. TRANSLATORS: Lamp Near End of Life
-#: locale/ipp-strings.c:3182
+#: locale/ipp-strings.c:3220
 msgid "printer-state-reasons.lamp-near-eol"
 msgstr ""
 
 #. TRANSLATORS: Laser At End of Life
-#: locale/ipp-strings.c:3184
+#: locale/ipp-strings.c:3222
 msgid "printer-state-reasons.laser-at-eol"
 msgstr ""
 
 #. TRANSLATORS: Laser Failure
-#: locale/ipp-strings.c:3186
+#: locale/ipp-strings.c:3224
 msgid "printer-state-reasons.laser-failure"
 msgstr ""
 
 #. TRANSLATORS: Laser Near End of Life
-#: locale/ipp-strings.c:3188
+#: locale/ipp-strings.c:3226
 msgid "printer-state-reasons.laser-near-eol"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Added
-#: locale/ipp-strings.c:3190
+#: locale/ipp-strings.c:3228
 msgid "printer-state-reasons.make-envelope-added"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Almost Empty
-#: locale/ipp-strings.c:3192
+#: locale/ipp-strings.c:3230
 msgid "printer-state-reasons.make-envelope-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Almost Full
-#: locale/ipp-strings.c:3194
+#: locale/ipp-strings.c:3232
 msgid "printer-state-reasons.make-envelope-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker At Limit
-#: locale/ipp-strings.c:3196
+#: locale/ipp-strings.c:3234
 msgid "printer-state-reasons.make-envelope-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Closed
-#: locale/ipp-strings.c:3198
+#: locale/ipp-strings.c:3236
 msgid "printer-state-reasons.make-envelope-closed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Configuration Change
-#: locale/ipp-strings.c:3200
+#: locale/ipp-strings.c:3238
 msgid "printer-state-reasons.make-envelope-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Cover Closed
-#: locale/ipp-strings.c:3202
+#: locale/ipp-strings.c:3240
 msgid "printer-state-reasons.make-envelope-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Cover Open
-#: locale/ipp-strings.c:3204
+#: locale/ipp-strings.c:3242
 msgid "printer-state-reasons.make-envelope-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Empty
-#: locale/ipp-strings.c:3206
+#: locale/ipp-strings.c:3244
 msgid "printer-state-reasons.make-envelope-empty"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Full
-#: locale/ipp-strings.c:3208
+#: locale/ipp-strings.c:3246
 msgid "printer-state-reasons.make-envelope-full"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Interlock Closed
-#: locale/ipp-strings.c:3210
+#: locale/ipp-strings.c:3248
 msgid "printer-state-reasons.make-envelope-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Interlock Open
-#: locale/ipp-strings.c:3212
+#: locale/ipp-strings.c:3250
 msgid "printer-state-reasons.make-envelope-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Jam
-#: locale/ipp-strings.c:3214
+#: locale/ipp-strings.c:3252
 msgid "printer-state-reasons.make-envelope-jam"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Life Almost Over
-#: locale/ipp-strings.c:3216
+#: locale/ipp-strings.c:3254
 msgid "printer-state-reasons.make-envelope-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Life Over
-#: locale/ipp-strings.c:3218
+#: locale/ipp-strings.c:3256
 msgid "printer-state-reasons.make-envelope-life-over"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Memory Exhausted
-#: locale/ipp-strings.c:3220
+#: locale/ipp-strings.c:3258
 msgid "printer-state-reasons.make-envelope-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Missing
-#: locale/ipp-strings.c:3222
+#: locale/ipp-strings.c:3260
 msgid "printer-state-reasons.make-envelope-missing"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Motor Failure
-#: locale/ipp-strings.c:3224
+#: locale/ipp-strings.c:3262
 msgid "printer-state-reasons.make-envelope-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Near Limit
-#: locale/ipp-strings.c:3226
+#: locale/ipp-strings.c:3264
 msgid "printer-state-reasons.make-envelope-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Offline
-#: locale/ipp-strings.c:3228
+#: locale/ipp-strings.c:3266
 msgid "printer-state-reasons.make-envelope-offline"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Opened
-#: locale/ipp-strings.c:3230
+#: locale/ipp-strings.c:3268
 msgid "printer-state-reasons.make-envelope-opened"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Over Temperature
-#: locale/ipp-strings.c:3232
+#: locale/ipp-strings.c:3270
 msgid "printer-state-reasons.make-envelope-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Power Saver
-#: locale/ipp-strings.c:3234
+#: locale/ipp-strings.c:3272
 msgid "printer-state-reasons.make-envelope-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Recoverable Failure
-#: locale/ipp-strings.c:3236
+#: locale/ipp-strings.c:3274
 msgid "printer-state-reasons.make-envelope-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Recoverable Storage
-#: locale/ipp-strings.c:3238
+#: locale/ipp-strings.c:3276
 msgid "printer-state-reasons.make-envelope-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Removed
-#: locale/ipp-strings.c:3240
+#: locale/ipp-strings.c:3278
 msgid "printer-state-reasons.make-envelope-removed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Resource Added
-#: locale/ipp-strings.c:3242
+#: locale/ipp-strings.c:3280
 msgid "printer-state-reasons.make-envelope-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Resource Removed
-#: locale/ipp-strings.c:3244
+#: locale/ipp-strings.c:3282
 msgid "printer-state-reasons.make-envelope-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Thermistor Failure
-#: locale/ipp-strings.c:3246
+#: locale/ipp-strings.c:3284
 msgid "printer-state-reasons.make-envelope-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Timing Failure
-#: locale/ipp-strings.c:3248
+#: locale/ipp-strings.c:3286
 msgid "printer-state-reasons.make-envelope-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Turned Off
-#: locale/ipp-strings.c:3250
+#: locale/ipp-strings.c:3288
 msgid "printer-state-reasons.make-envelope-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Turned On
-#: locale/ipp-strings.c:3252
+#: locale/ipp-strings.c:3290
 msgid "printer-state-reasons.make-envelope-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Under Temperature
-#: locale/ipp-strings.c:3254
+#: locale/ipp-strings.c:3292
 msgid "printer-state-reasons.make-envelope-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Unrecoverable Failure
-#: locale/ipp-strings.c:3256
+#: locale/ipp-strings.c:3294
 msgid "printer-state-reasons.make-envelope-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Unrecoverable Storage Error
-#: locale/ipp-strings.c:3258
+#: locale/ipp-strings.c:3296
 msgid "printer-state-reasons.make-envelope-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Envelope Maker Warming Up
-#: locale/ipp-strings.c:3260
+#: locale/ipp-strings.c:3298
 msgid "printer-state-reasons.make-envelope-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Marker Adjusting Print Quality
-#: locale/ipp-strings.c:3262
+#: locale/ipp-strings.c:3300
 msgid "printer-state-reasons.marker-adjusting-print-quality"
 msgstr ""
 
 #. TRANSLATORS: Marker Developer Almost Empty
-#: locale/ipp-strings.c:3266
+#: locale/ipp-strings.c:3304
 msgid "printer-state-reasons.marker-developer-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Developer Empty
-#: locale/ipp-strings.c:3268
+#: locale/ipp-strings.c:3306
 msgid "printer-state-reasons.marker-developer-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Fuser Thermistor Failure
-#: locale/ipp-strings.c:3274
+#: locale/ipp-strings.c:3312
 msgid "printer-state-reasons.marker-fuser-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Marker Fuser Timing Failure
-#: locale/ipp-strings.c:3276
+#: locale/ipp-strings.c:3314
 msgid "printer-state-reasons.marker-fuser-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Marker Ink Almost Empty
-#: locale/ipp-strings.c:3278
+#: locale/ipp-strings.c:3316
 msgid "printer-state-reasons.marker-ink-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Ink Empty
-#: locale/ipp-strings.c:3280
+#: locale/ipp-strings.c:3318
 msgid "printer-state-reasons.marker-ink-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Print Ribbon Almost Empty
-#: locale/ipp-strings.c:3286
+#: locale/ipp-strings.c:3324
 msgid "printer-state-reasons.marker-print-ribbon-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Marker Print Ribbon Empty
-#: locale/ipp-strings.c:3288
+#: locale/ipp-strings.c:3326
 msgid "printer-state-reasons.marker-print-ribbon-empty"
 msgstr ""
 
 #. TRANSLATORS: Ink/toner empty
-#: locale/ipp-strings.c:3294
+#: locale/ipp-strings.c:3332
 msgid "printer-state-reasons.marker-supply-empty"
 msgstr ""
 
 #. TRANSLATORS: Ink/toner low
-#: locale/ipp-strings.c:3296
+#: locale/ipp-strings.c:3334
 msgid "printer-state-reasons.marker-supply-low"
 msgstr ""
 
 #. TRANSLATORS: Marker Toner Cartridge Missing
-#: locale/ipp-strings.c:3300
+#: locale/ipp-strings.c:3338
 msgid "printer-state-reasons.marker-toner-cartridge-missing"
 msgstr ""
 
 #. TRANSLATORS: Ink/toner waste bin almost full
-#: locale/ipp-strings.c:3304
+#: locale/ipp-strings.c:3342
 msgid "printer-state-reasons.marker-waste-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Ink/toner waste bin full
-#: locale/ipp-strings.c:3306
+#: locale/ipp-strings.c:3344
 msgid "printer-state-reasons.marker-waste-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Ink Receptacle Almost Full
-#: locale/ipp-strings.c:3308
+#: locale/ipp-strings.c:3346
 msgid "printer-state-reasons.marker-waste-ink-receptacle-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Ink Receptacle Full
-#: locale/ipp-strings.c:3310
+#: locale/ipp-strings.c:3348
 msgid "printer-state-reasons.marker-waste-ink-receptacle-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Toner Receptacle Almost Full
-#: locale/ipp-strings.c:3316
+#: locale/ipp-strings.c:3354
 msgid "printer-state-reasons.marker-waste-toner-receptacle-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Marker Waste Toner Receptacle Full
-#: locale/ipp-strings.c:3318
+#: locale/ipp-strings.c:3356
 msgid "printer-state-reasons.marker-waste-toner-receptacle-full"
 msgstr ""
 
 #. TRANSLATORS: Material Empty
-#: locale/ipp-strings.c:3322
+#: locale/ipp-strings.c:3360
 msgid "printer-state-reasons.material-empty"
 msgstr ""
 
 #. TRANSLATORS: Material Low
-#: locale/ipp-strings.c:3324
+#: locale/ipp-strings.c:3362
 msgid "printer-state-reasons.material-low"
 msgstr ""
 
 #. TRANSLATORS: Material Needed
-#: locale/ipp-strings.c:3326
+#: locale/ipp-strings.c:3364
 msgid "printer-state-reasons.material-needed"
 msgstr ""
 
 #. TRANSLATORS: Paper tray is empty
-#: locale/ipp-strings.c:3330
+#: locale/ipp-strings.c:3368
 msgid "printer-state-reasons.media-empty"
 msgstr ""
 
 #. TRANSLATORS: Paper jam
-#: locale/ipp-strings.c:3332
+#: locale/ipp-strings.c:3370
 msgid "printer-state-reasons.media-jam"
 msgstr ""
 
 #. TRANSLATORS: Paper tray is almost empty
-#: locale/ipp-strings.c:3334
+#: locale/ipp-strings.c:3372
 msgid "printer-state-reasons.media-low"
 msgstr ""
 
 #. TRANSLATORS: Load paper
-#: locale/ipp-strings.c:3336
+#: locale/ipp-strings.c:3374
 msgid "printer-state-reasons.media-needed"
 msgstr ""
 
 #. TRANSLATORS: Media Path Cannot Do 2-Sided Printing
-#: locale/ipp-strings.c:3338
+#: locale/ipp-strings.c:3376
 msgid "printer-state-reasons.media-path-cannot-duplex-media-selected"
 msgstr ""
 
 #. TRANSLATORS: Media Path Media Tray Almost Full
-#: locale/ipp-strings.c:3352
+#: locale/ipp-strings.c:3390
 msgid "printer-state-reasons.media-path-media-tray-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Media Path Media Tray Full
-#: locale/ipp-strings.c:3354
+#: locale/ipp-strings.c:3392
 msgid "printer-state-reasons.media-path-media-tray-full"
 msgstr ""
 
 #. TRANSLATORS: Media Path Media Tray Missing
-#: locale/ipp-strings.c:3356
+#: locale/ipp-strings.c:3394
 msgid "printer-state-reasons.media-path-media-tray-missing"
 msgstr ""
 
 #. TRANSLATORS: Motor Failure
-#: locale/ipp-strings.c:3372
+#: locale/ipp-strings.c:3410
 msgid "printer-state-reasons.motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Printer going offline
-#: locale/ipp-strings.c:3374
+#: locale/ipp-strings.c:3412
 msgid "printer-state-reasons.moving-to-paused"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:3376
+#: locale/ipp-strings.c:3414
 msgid "printer-state-reasons.none"
 msgstr ""
 
 #. TRANSLATORS: Optical Photoconductor Life Over
-#: locale/ipp-strings.c:3378
+#: locale/ipp-strings.c:3416
 msgid "printer-state-reasons.opc-life-over"
 msgstr ""
 
 #. TRANSLATORS: OPC almost at end-of-life
-#: locale/ipp-strings.c:3380
+#: locale/ipp-strings.c:3418
 msgid "printer-state-reasons.opc-near-eol"
 msgstr ""
 
 #. TRANSLATORS: Check the printer for errors
-#: locale/ipp-strings.c:3382
+#: locale/ipp-strings.c:3420
 msgid "printer-state-reasons.other"
 msgstr ""
 
 #. TRANSLATORS: Output bin is almost full
-#: locale/ipp-strings.c:3384
+#: locale/ipp-strings.c:3422
 msgid "printer-state-reasons.output-area-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Output bin is full
-#: locale/ipp-strings.c:3386
+#: locale/ipp-strings.c:3424
 msgid "printer-state-reasons.output-area-full"
 msgstr ""
 
 #. TRANSLATORS: Output Mailbox Select Failure
-#: locale/ipp-strings.c:3388
+#: locale/ipp-strings.c:3426
 msgid "printer-state-reasons.output-mailbox-select-failure"
 msgstr ""
 
 #. TRANSLATORS: Output tray is missing
-#: locale/ipp-strings.c:3396
+#: locale/ipp-strings.c:3434
 msgid "printer-state-reasons.output-tray-missing"
 msgstr ""
 
 #. TRANSLATORS: Paused
-#: locale/ipp-strings.c:3398
+#: locale/ipp-strings.c:3436
 msgid "printer-state-reasons.paused"
 msgstr ""
 
 #. TRANSLATORS: Perforater Added
-#: locale/ipp-strings.c:3400
+#: locale/ipp-strings.c:3438
 msgid "printer-state-reasons.perforater-added"
 msgstr ""
 
 #. TRANSLATORS: Perforater Almost Empty
-#: locale/ipp-strings.c:3402
+#: locale/ipp-strings.c:3440
 msgid "printer-state-reasons.perforater-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Perforater Almost Full
-#: locale/ipp-strings.c:3404
+#: locale/ipp-strings.c:3442
 msgid "printer-state-reasons.perforater-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Perforater At Limit
-#: locale/ipp-strings.c:3406
+#: locale/ipp-strings.c:3444
 msgid "printer-state-reasons.perforater-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Perforater Closed
-#: locale/ipp-strings.c:3408
+#: locale/ipp-strings.c:3446
 msgid "printer-state-reasons.perforater-closed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Configuration Change
-#: locale/ipp-strings.c:3410
+#: locale/ipp-strings.c:3448
 msgid "printer-state-reasons.perforater-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Perforater Cover Closed
-#: locale/ipp-strings.c:3412
+#: locale/ipp-strings.c:3450
 msgid "printer-state-reasons.perforater-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Cover Open
-#: locale/ipp-strings.c:3414
+#: locale/ipp-strings.c:3452
 msgid "printer-state-reasons.perforater-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Perforater Empty
-#: locale/ipp-strings.c:3416
+#: locale/ipp-strings.c:3454
 msgid "printer-state-reasons.perforater-empty"
 msgstr ""
 
 #. TRANSLATORS: Perforater Full
-#: locale/ipp-strings.c:3418
+#: locale/ipp-strings.c:3456
 msgid "printer-state-reasons.perforater-full"
 msgstr ""
 
 #. TRANSLATORS: Perforater Interlock Closed
-#: locale/ipp-strings.c:3420
+#: locale/ipp-strings.c:3458
 msgid "printer-state-reasons.perforater-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Interlock Open
-#: locale/ipp-strings.c:3422
+#: locale/ipp-strings.c:3460
 msgid "printer-state-reasons.perforater-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Perforater Jam
-#: locale/ipp-strings.c:3424
+#: locale/ipp-strings.c:3462
 msgid "printer-state-reasons.perforater-jam"
 msgstr ""
 
 #. TRANSLATORS: Perforater Life Almost Over
-#: locale/ipp-strings.c:3426
+#: locale/ipp-strings.c:3464
 msgid "printer-state-reasons.perforater-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Perforater Life Over
-#: locale/ipp-strings.c:3428
+#: locale/ipp-strings.c:3466
 msgid "printer-state-reasons.perforater-life-over"
 msgstr ""
 
 #. TRANSLATORS: Perforater Memory Exhausted
-#: locale/ipp-strings.c:3430
+#: locale/ipp-strings.c:3468
 msgid "printer-state-reasons.perforater-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Perforater Missing
-#: locale/ipp-strings.c:3432
+#: locale/ipp-strings.c:3470
 msgid "printer-state-reasons.perforater-missing"
 msgstr ""
 
 #. TRANSLATORS: Perforater Motor Failure
-#: locale/ipp-strings.c:3434
+#: locale/ipp-strings.c:3472
 msgid "printer-state-reasons.perforater-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Near Limit
-#: locale/ipp-strings.c:3436
+#: locale/ipp-strings.c:3474
 msgid "printer-state-reasons.perforater-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Perforater Offline
-#: locale/ipp-strings.c:3438
+#: locale/ipp-strings.c:3476
 msgid "printer-state-reasons.perforater-offline"
 msgstr ""
 
 #. TRANSLATORS: Perforater Opened
-#: locale/ipp-strings.c:3440
+#: locale/ipp-strings.c:3478
 msgid "printer-state-reasons.perforater-opened"
 msgstr ""
 
 #. TRANSLATORS: Perforater Over Temperature
-#: locale/ipp-strings.c:3442
+#: locale/ipp-strings.c:3480
 msgid "printer-state-reasons.perforater-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Perforater Power Saver
-#: locale/ipp-strings.c:3444
+#: locale/ipp-strings.c:3482
 msgid "printer-state-reasons.perforater-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Perforater Recoverable Failure
-#: locale/ipp-strings.c:3446
+#: locale/ipp-strings.c:3484
 msgid "printer-state-reasons.perforater-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Recoverable Storage
-#: locale/ipp-strings.c:3448
+#: locale/ipp-strings.c:3486
 msgid "printer-state-reasons.perforater-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Perforater Removed
-#: locale/ipp-strings.c:3450
+#: locale/ipp-strings.c:3488
 msgid "printer-state-reasons.perforater-removed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Resource Added
-#: locale/ipp-strings.c:3452
+#: locale/ipp-strings.c:3490
 msgid "printer-state-reasons.perforater-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Perforater Resource Removed
-#: locale/ipp-strings.c:3454
+#: locale/ipp-strings.c:3492
 msgid "printer-state-reasons.perforater-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Perforater Thermistor Failure
-#: locale/ipp-strings.c:3456
+#: locale/ipp-strings.c:3494
 msgid "printer-state-reasons.perforater-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Timing Failure
-#: locale/ipp-strings.c:3458
+#: locale/ipp-strings.c:3496
 msgid "printer-state-reasons.perforater-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Turned Off
-#: locale/ipp-strings.c:3460
+#: locale/ipp-strings.c:3498
 msgid "printer-state-reasons.perforater-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Perforater Turned On
-#: locale/ipp-strings.c:3462
+#: locale/ipp-strings.c:3500
 msgid "printer-state-reasons.perforater-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Perforater Under Temperature
-#: locale/ipp-strings.c:3464
+#: locale/ipp-strings.c:3502
 msgid "printer-state-reasons.perforater-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Perforater Unrecoverable Failure
-#: locale/ipp-strings.c:3466
+#: locale/ipp-strings.c:3504
 msgid "printer-state-reasons.perforater-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Perforater Unrecoverable Storage Error
-#: locale/ipp-strings.c:3468
+#: locale/ipp-strings.c:3506
 msgid "printer-state-reasons.perforater-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Perforater Warming Up
-#: locale/ipp-strings.c:3470
+#: locale/ipp-strings.c:3508
 msgid "printer-state-reasons.perforater-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Power Down
-#: locale/ipp-strings.c:3482
+#: locale/ipp-strings.c:3520
 msgid "printer-state-reasons.power-down"
 msgstr ""
 
 #. TRANSLATORS: Power Up
-#: locale/ipp-strings.c:3484
+#: locale/ipp-strings.c:3522
 msgid "printer-state-reasons.power-up"
 msgstr ""
 
 #. TRANSLATORS: Printer Reset Manually
-#: locale/ipp-strings.c:3486
+#: locale/ipp-strings.c:3524
 msgid "printer-state-reasons.printer-manual-reset"
 msgstr ""
 
 #. TRANSLATORS: Printer Reset Remotely
-#: locale/ipp-strings.c:3488
+#: locale/ipp-strings.c:3526
 msgid "printer-state-reasons.printer-nms-reset"
 msgstr ""
 
 #. TRANSLATORS: Printer Ready To Print
-#: locale/ipp-strings.c:3490
+#: locale/ipp-strings.c:3528
 msgid "printer-state-reasons.printer-ready-to-print"
 msgstr ""
 
 #. TRANSLATORS: Puncher Added
-#: locale/ipp-strings.c:3492
+#: locale/ipp-strings.c:3530
 msgid "printer-state-reasons.puncher-added"
 msgstr ""
 
 #. TRANSLATORS: Puncher Almost Empty
-#: locale/ipp-strings.c:3494
+#: locale/ipp-strings.c:3532
 msgid "printer-state-reasons.puncher-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Puncher Almost Full
-#: locale/ipp-strings.c:3496
+#: locale/ipp-strings.c:3534
 msgid "printer-state-reasons.puncher-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Puncher At Limit
-#: locale/ipp-strings.c:3498
+#: locale/ipp-strings.c:3536
 msgid "printer-state-reasons.puncher-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Puncher Closed
-#: locale/ipp-strings.c:3500
+#: locale/ipp-strings.c:3538
 msgid "printer-state-reasons.puncher-closed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Configuration Change
-#: locale/ipp-strings.c:3502
+#: locale/ipp-strings.c:3540
 msgid "printer-state-reasons.puncher-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Puncher Cover Closed
-#: locale/ipp-strings.c:3504
+#: locale/ipp-strings.c:3542
 msgid "printer-state-reasons.puncher-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Cover Open
-#: locale/ipp-strings.c:3506
+#: locale/ipp-strings.c:3544
 msgid "printer-state-reasons.puncher-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Puncher Empty
-#: locale/ipp-strings.c:3508
+#: locale/ipp-strings.c:3546
 msgid "printer-state-reasons.puncher-empty"
 msgstr ""
 
 #. TRANSLATORS: Puncher Full
-#: locale/ipp-strings.c:3510
+#: locale/ipp-strings.c:3548
 msgid "printer-state-reasons.puncher-full"
 msgstr ""
 
 #. TRANSLATORS: Puncher Interlock Closed
-#: locale/ipp-strings.c:3512
+#: locale/ipp-strings.c:3550
 msgid "printer-state-reasons.puncher-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Interlock Open
-#: locale/ipp-strings.c:3514
+#: locale/ipp-strings.c:3552
 msgid "printer-state-reasons.puncher-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Puncher Jam
-#: locale/ipp-strings.c:3516
+#: locale/ipp-strings.c:3554
 msgid "printer-state-reasons.puncher-jam"
 msgstr ""
 
 #. TRANSLATORS: Puncher Life Almost Over
-#: locale/ipp-strings.c:3518
+#: locale/ipp-strings.c:3556
 msgid "printer-state-reasons.puncher-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Puncher Life Over
-#: locale/ipp-strings.c:3520
+#: locale/ipp-strings.c:3558
 msgid "printer-state-reasons.puncher-life-over"
 msgstr ""
 
 #. TRANSLATORS: Puncher Memory Exhausted
-#: locale/ipp-strings.c:3522
+#: locale/ipp-strings.c:3560
 msgid "printer-state-reasons.puncher-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Puncher Missing
-#: locale/ipp-strings.c:3524
+#: locale/ipp-strings.c:3562
 msgid "printer-state-reasons.puncher-missing"
 msgstr ""
 
 #. TRANSLATORS: Puncher Motor Failure
-#: locale/ipp-strings.c:3526
+#: locale/ipp-strings.c:3564
 msgid "printer-state-reasons.puncher-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Near Limit
-#: locale/ipp-strings.c:3528
+#: locale/ipp-strings.c:3566
 msgid "printer-state-reasons.puncher-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Puncher Offline
-#: locale/ipp-strings.c:3530
+#: locale/ipp-strings.c:3568
 msgid "printer-state-reasons.puncher-offline"
 msgstr ""
 
 #. TRANSLATORS: Puncher Opened
-#: locale/ipp-strings.c:3532
+#: locale/ipp-strings.c:3570
 msgid "printer-state-reasons.puncher-opened"
 msgstr ""
 
 #. TRANSLATORS: Puncher Over Temperature
-#: locale/ipp-strings.c:3534
+#: locale/ipp-strings.c:3572
 msgid "printer-state-reasons.puncher-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Puncher Power Saver
-#: locale/ipp-strings.c:3536
+#: locale/ipp-strings.c:3574
 msgid "printer-state-reasons.puncher-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Puncher Recoverable Failure
-#: locale/ipp-strings.c:3538
+#: locale/ipp-strings.c:3576
 msgid "printer-state-reasons.puncher-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Recoverable Storage
-#: locale/ipp-strings.c:3540
+#: locale/ipp-strings.c:3578
 msgid "printer-state-reasons.puncher-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Puncher Removed
-#: locale/ipp-strings.c:3542
+#: locale/ipp-strings.c:3580
 msgid "printer-state-reasons.puncher-removed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Resource Added
-#: locale/ipp-strings.c:3544
+#: locale/ipp-strings.c:3582
 msgid "printer-state-reasons.puncher-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Puncher Resource Removed
-#: locale/ipp-strings.c:3546
+#: locale/ipp-strings.c:3584
 msgid "printer-state-reasons.puncher-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Puncher Thermistor Failure
-#: locale/ipp-strings.c:3548
+#: locale/ipp-strings.c:3586
 msgid "printer-state-reasons.puncher-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Timing Failure
-#: locale/ipp-strings.c:3550
+#: locale/ipp-strings.c:3588
 msgid "printer-state-reasons.puncher-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Turned Off
-#: locale/ipp-strings.c:3552
+#: locale/ipp-strings.c:3590
 msgid "printer-state-reasons.puncher-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Puncher Turned On
-#: locale/ipp-strings.c:3554
+#: locale/ipp-strings.c:3592
 msgid "printer-state-reasons.puncher-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Puncher Under Temperature
-#: locale/ipp-strings.c:3556
+#: locale/ipp-strings.c:3594
 msgid "printer-state-reasons.puncher-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Puncher Unrecoverable Failure
-#: locale/ipp-strings.c:3558
+#: locale/ipp-strings.c:3596
 msgid "printer-state-reasons.puncher-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Puncher Unrecoverable Storage Error
-#: locale/ipp-strings.c:3560
+#: locale/ipp-strings.c:3598
 msgid "printer-state-reasons.puncher-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Puncher Warming Up
-#: locale/ipp-strings.c:3562
+#: locale/ipp-strings.c:3600
 msgid "printer-state-reasons.puncher-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Added
-#: locale/ipp-strings.c:3564
+#: locale/ipp-strings.c:3602
 msgid "printer-state-reasons.separation-cutter-added"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Almost Empty
-#: locale/ipp-strings.c:3566
+#: locale/ipp-strings.c:3604
 msgid "printer-state-reasons.separation-cutter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Almost Full
-#: locale/ipp-strings.c:3568
+#: locale/ipp-strings.c:3606
 msgid "printer-state-reasons.separation-cutter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter At Limit
-#: locale/ipp-strings.c:3570
+#: locale/ipp-strings.c:3608
 msgid "printer-state-reasons.separation-cutter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Closed
-#: locale/ipp-strings.c:3572
+#: locale/ipp-strings.c:3610
 msgid "printer-state-reasons.separation-cutter-closed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Configuration Change
-#: locale/ipp-strings.c:3574
+#: locale/ipp-strings.c:3612
 msgid "printer-state-reasons.separation-cutter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Cover Closed
-#: locale/ipp-strings.c:3576
+#: locale/ipp-strings.c:3614
 msgid "printer-state-reasons.separation-cutter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Cover Open
-#: locale/ipp-strings.c:3578
+#: locale/ipp-strings.c:3616
 msgid "printer-state-reasons.separation-cutter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Empty
-#: locale/ipp-strings.c:3580
+#: locale/ipp-strings.c:3618
 msgid "printer-state-reasons.separation-cutter-empty"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Full
-#: locale/ipp-strings.c:3582
+#: locale/ipp-strings.c:3620
 msgid "printer-state-reasons.separation-cutter-full"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Interlock Closed
-#: locale/ipp-strings.c:3584
+#: locale/ipp-strings.c:3622
 msgid "printer-state-reasons.separation-cutter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Interlock Open
-#: locale/ipp-strings.c:3586
+#: locale/ipp-strings.c:3624
 msgid "printer-state-reasons.separation-cutter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Jam
-#: locale/ipp-strings.c:3588
+#: locale/ipp-strings.c:3626
 msgid "printer-state-reasons.separation-cutter-jam"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Life Almost Over
-#: locale/ipp-strings.c:3590
+#: locale/ipp-strings.c:3628
 msgid "printer-state-reasons.separation-cutter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Life Over
-#: locale/ipp-strings.c:3592
+#: locale/ipp-strings.c:3630
 msgid "printer-state-reasons.separation-cutter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Memory Exhausted
-#: locale/ipp-strings.c:3594
+#: locale/ipp-strings.c:3632
 msgid "printer-state-reasons.separation-cutter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Missing
-#: locale/ipp-strings.c:3596
+#: locale/ipp-strings.c:3634
 msgid "printer-state-reasons.separation-cutter-missing"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Motor Failure
-#: locale/ipp-strings.c:3598
+#: locale/ipp-strings.c:3636
 msgid "printer-state-reasons.separation-cutter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Near Limit
-#: locale/ipp-strings.c:3600
+#: locale/ipp-strings.c:3638
 msgid "printer-state-reasons.separation-cutter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Offline
-#: locale/ipp-strings.c:3602
+#: locale/ipp-strings.c:3640
 msgid "printer-state-reasons.separation-cutter-offline"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Opened
-#: locale/ipp-strings.c:3604
+#: locale/ipp-strings.c:3642
 msgid "printer-state-reasons.separation-cutter-opened"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Over Temperature
-#: locale/ipp-strings.c:3606
+#: locale/ipp-strings.c:3644
 msgid "printer-state-reasons.separation-cutter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Power Saver
-#: locale/ipp-strings.c:3608
+#: locale/ipp-strings.c:3646
 msgid "printer-state-reasons.separation-cutter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Recoverable Failure
-#: locale/ipp-strings.c:3610
+#: locale/ipp-strings.c:3648
 msgid "printer-state-reasons.separation-cutter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Recoverable Storage
-#: locale/ipp-strings.c:3612
+#: locale/ipp-strings.c:3650
 msgid "printer-state-reasons.separation-cutter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Removed
-#: locale/ipp-strings.c:3614
+#: locale/ipp-strings.c:3652
 msgid "printer-state-reasons.separation-cutter-removed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Resource Added
-#: locale/ipp-strings.c:3616
+#: locale/ipp-strings.c:3654
 msgid "printer-state-reasons.separation-cutter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Resource Removed
-#: locale/ipp-strings.c:3618
+#: locale/ipp-strings.c:3656
 msgid "printer-state-reasons.separation-cutter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Thermistor Failure
-#: locale/ipp-strings.c:3620
+#: locale/ipp-strings.c:3658
 msgid "printer-state-reasons.separation-cutter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Timing Failure
-#: locale/ipp-strings.c:3622
+#: locale/ipp-strings.c:3660
 msgid "printer-state-reasons.separation-cutter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Turned Off
-#: locale/ipp-strings.c:3624
+#: locale/ipp-strings.c:3662
 msgid "printer-state-reasons.separation-cutter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Turned On
-#: locale/ipp-strings.c:3626
+#: locale/ipp-strings.c:3664
 msgid "printer-state-reasons.separation-cutter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Under Temperature
-#: locale/ipp-strings.c:3628
+#: locale/ipp-strings.c:3666
 msgid "printer-state-reasons.separation-cutter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Unrecoverable Failure
-#: locale/ipp-strings.c:3630
+#: locale/ipp-strings.c:3668
 msgid "printer-state-reasons.separation-cutter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3632
+#: locale/ipp-strings.c:3670
 msgid "printer-state-reasons.separation-cutter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Separation Cutter Warming Up
-#: locale/ipp-strings.c:3634
+#: locale/ipp-strings.c:3672
 msgid "printer-state-reasons.separation-cutter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Added
-#: locale/ipp-strings.c:3636
+#: locale/ipp-strings.c:3674
 msgid "printer-state-reasons.sheet-rotator-added"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Almost Empty
-#: locale/ipp-strings.c:3638
+#: locale/ipp-strings.c:3676
 msgid "printer-state-reasons.sheet-rotator-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Almost Full
-#: locale/ipp-strings.c:3640
+#: locale/ipp-strings.c:3678
 msgid "printer-state-reasons.sheet-rotator-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator At Limit
-#: locale/ipp-strings.c:3642
+#: locale/ipp-strings.c:3680
 msgid "printer-state-reasons.sheet-rotator-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Closed
-#: locale/ipp-strings.c:3644
+#: locale/ipp-strings.c:3682
 msgid "printer-state-reasons.sheet-rotator-closed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Configuration Change
-#: locale/ipp-strings.c:3646
+#: locale/ipp-strings.c:3684
 msgid "printer-state-reasons.sheet-rotator-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Cover Closed
-#: locale/ipp-strings.c:3648
+#: locale/ipp-strings.c:3686
 msgid "printer-state-reasons.sheet-rotator-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Cover Open
-#: locale/ipp-strings.c:3650
+#: locale/ipp-strings.c:3688
 msgid "printer-state-reasons.sheet-rotator-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Empty
-#: locale/ipp-strings.c:3652
+#: locale/ipp-strings.c:3690
 msgid "printer-state-reasons.sheet-rotator-empty"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Full
-#: locale/ipp-strings.c:3654
+#: locale/ipp-strings.c:3692
 msgid "printer-state-reasons.sheet-rotator-full"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Interlock Closed
-#: locale/ipp-strings.c:3656
+#: locale/ipp-strings.c:3694
 msgid "printer-state-reasons.sheet-rotator-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Interlock Open
-#: locale/ipp-strings.c:3658
+#: locale/ipp-strings.c:3696
 msgid "printer-state-reasons.sheet-rotator-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Jam
-#: locale/ipp-strings.c:3660
+#: locale/ipp-strings.c:3698
 msgid "printer-state-reasons.sheet-rotator-jam"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Life Almost Over
-#: locale/ipp-strings.c:3662
+#: locale/ipp-strings.c:3700
 msgid "printer-state-reasons.sheet-rotator-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Life Over
-#: locale/ipp-strings.c:3664
+#: locale/ipp-strings.c:3702
 msgid "printer-state-reasons.sheet-rotator-life-over"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Memory Exhausted
-#: locale/ipp-strings.c:3666
+#: locale/ipp-strings.c:3704
 msgid "printer-state-reasons.sheet-rotator-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Missing
-#: locale/ipp-strings.c:3668
+#: locale/ipp-strings.c:3706
 msgid "printer-state-reasons.sheet-rotator-missing"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Motor Failure
-#: locale/ipp-strings.c:3670
+#: locale/ipp-strings.c:3708
 msgid "printer-state-reasons.sheet-rotator-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Near Limit
-#: locale/ipp-strings.c:3672
+#: locale/ipp-strings.c:3710
 msgid "printer-state-reasons.sheet-rotator-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Offline
-#: locale/ipp-strings.c:3674
+#: locale/ipp-strings.c:3712
 msgid "printer-state-reasons.sheet-rotator-offline"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Opened
-#: locale/ipp-strings.c:3676
+#: locale/ipp-strings.c:3714
 msgid "printer-state-reasons.sheet-rotator-opened"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Over Temperature
-#: locale/ipp-strings.c:3678
+#: locale/ipp-strings.c:3716
 msgid "printer-state-reasons.sheet-rotator-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Power Saver
-#: locale/ipp-strings.c:3680
+#: locale/ipp-strings.c:3718
 msgid "printer-state-reasons.sheet-rotator-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Recoverable Failure
-#: locale/ipp-strings.c:3682
+#: locale/ipp-strings.c:3720
 msgid "printer-state-reasons.sheet-rotator-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Recoverable Storage
-#: locale/ipp-strings.c:3684
+#: locale/ipp-strings.c:3722
 msgid "printer-state-reasons.sheet-rotator-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Removed
-#: locale/ipp-strings.c:3686
+#: locale/ipp-strings.c:3724
 msgid "printer-state-reasons.sheet-rotator-removed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Resource Added
-#: locale/ipp-strings.c:3688
+#: locale/ipp-strings.c:3726
 msgid "printer-state-reasons.sheet-rotator-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Resource Removed
-#: locale/ipp-strings.c:3690
+#: locale/ipp-strings.c:3728
 msgid "printer-state-reasons.sheet-rotator-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Thermistor Failure
-#: locale/ipp-strings.c:3692
+#: locale/ipp-strings.c:3730
 msgid "printer-state-reasons.sheet-rotator-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Timing Failure
-#: locale/ipp-strings.c:3694
+#: locale/ipp-strings.c:3732
 msgid "printer-state-reasons.sheet-rotator-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Turned Off
-#: locale/ipp-strings.c:3696
+#: locale/ipp-strings.c:3734
 msgid "printer-state-reasons.sheet-rotator-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Turned On
-#: locale/ipp-strings.c:3698
+#: locale/ipp-strings.c:3736
 msgid "printer-state-reasons.sheet-rotator-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Under Temperature
-#: locale/ipp-strings.c:3700
+#: locale/ipp-strings.c:3738
 msgid "printer-state-reasons.sheet-rotator-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Unrecoverable Failure
-#: locale/ipp-strings.c:3702
+#: locale/ipp-strings.c:3740
 msgid "printer-state-reasons.sheet-rotator-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Unrecoverable Storage Error
-#: locale/ipp-strings.c:3704
+#: locale/ipp-strings.c:3742
 msgid "printer-state-reasons.sheet-rotator-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Sheet Rotator Warming Up
-#: locale/ipp-strings.c:3706
+#: locale/ipp-strings.c:3744
 msgid "printer-state-reasons.sheet-rotator-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Printer offline
-#: locale/ipp-strings.c:3708
+#: locale/ipp-strings.c:3746
 msgid "printer-state-reasons.shutdown"
 msgstr ""
 
 #. TRANSLATORS: Slitter Added
-#: locale/ipp-strings.c:3710
+#: locale/ipp-strings.c:3748
 msgid "printer-state-reasons.slitter-added"
 msgstr ""
 
 #. TRANSLATORS: Slitter Almost Empty
-#: locale/ipp-strings.c:3712
+#: locale/ipp-strings.c:3750
 msgid "printer-state-reasons.slitter-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Slitter Almost Full
-#: locale/ipp-strings.c:3714
+#: locale/ipp-strings.c:3752
 msgid "printer-state-reasons.slitter-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Slitter At Limit
-#: locale/ipp-strings.c:3716
+#: locale/ipp-strings.c:3754
 msgid "printer-state-reasons.slitter-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Slitter Closed
-#: locale/ipp-strings.c:3718
+#: locale/ipp-strings.c:3756
 msgid "printer-state-reasons.slitter-closed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Configuration Change
-#: locale/ipp-strings.c:3720
+#: locale/ipp-strings.c:3758
 msgid "printer-state-reasons.slitter-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Slitter Cover Closed
-#: locale/ipp-strings.c:3722
+#: locale/ipp-strings.c:3760
 msgid "printer-state-reasons.slitter-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Cover Open
-#: locale/ipp-strings.c:3724
+#: locale/ipp-strings.c:3762
 msgid "printer-state-reasons.slitter-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Slitter Empty
-#: locale/ipp-strings.c:3726
+#: locale/ipp-strings.c:3764
 msgid "printer-state-reasons.slitter-empty"
 msgstr ""
 
 #. TRANSLATORS: Slitter Full
-#: locale/ipp-strings.c:3728
+#: locale/ipp-strings.c:3766
 msgid "printer-state-reasons.slitter-full"
 msgstr ""
 
 #. TRANSLATORS: Slitter Interlock Closed
-#: locale/ipp-strings.c:3730
+#: locale/ipp-strings.c:3768
 msgid "printer-state-reasons.slitter-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Interlock Open
-#: locale/ipp-strings.c:3732
+#: locale/ipp-strings.c:3770
 msgid "printer-state-reasons.slitter-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Slitter Jam
-#: locale/ipp-strings.c:3734
+#: locale/ipp-strings.c:3772
 msgid "printer-state-reasons.slitter-jam"
 msgstr ""
 
 #. TRANSLATORS: Slitter Life Almost Over
-#: locale/ipp-strings.c:3736
+#: locale/ipp-strings.c:3774
 msgid "printer-state-reasons.slitter-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Slitter Life Over
-#: locale/ipp-strings.c:3738
+#: locale/ipp-strings.c:3776
 msgid "printer-state-reasons.slitter-life-over"
 msgstr ""
 
 #. TRANSLATORS: Slitter Memory Exhausted
-#: locale/ipp-strings.c:3740
+#: locale/ipp-strings.c:3778
 msgid "printer-state-reasons.slitter-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Slitter Missing
-#: locale/ipp-strings.c:3742
+#: locale/ipp-strings.c:3780
 msgid "printer-state-reasons.slitter-missing"
 msgstr ""
 
 #. TRANSLATORS: Slitter Motor Failure
-#: locale/ipp-strings.c:3744
+#: locale/ipp-strings.c:3782
 msgid "printer-state-reasons.slitter-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Near Limit
-#: locale/ipp-strings.c:3746
+#: locale/ipp-strings.c:3784
 msgid "printer-state-reasons.slitter-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Slitter Offline
-#: locale/ipp-strings.c:3748
+#: locale/ipp-strings.c:3786
 msgid "printer-state-reasons.slitter-offline"
 msgstr ""
 
 #. TRANSLATORS: Slitter Opened
-#: locale/ipp-strings.c:3750
+#: locale/ipp-strings.c:3788
 msgid "printer-state-reasons.slitter-opened"
 msgstr ""
 
 #. TRANSLATORS: Slitter Over Temperature
-#: locale/ipp-strings.c:3752
+#: locale/ipp-strings.c:3790
 msgid "printer-state-reasons.slitter-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Slitter Power Saver
-#: locale/ipp-strings.c:3754
+#: locale/ipp-strings.c:3792
 msgid "printer-state-reasons.slitter-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Slitter Recoverable Failure
-#: locale/ipp-strings.c:3756
+#: locale/ipp-strings.c:3794
 msgid "printer-state-reasons.slitter-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Recoverable Storage
-#: locale/ipp-strings.c:3758
+#: locale/ipp-strings.c:3796
 msgid "printer-state-reasons.slitter-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Slitter Removed
-#: locale/ipp-strings.c:3760
+#: locale/ipp-strings.c:3798
 msgid "printer-state-reasons.slitter-removed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Resource Added
-#: locale/ipp-strings.c:3762
+#: locale/ipp-strings.c:3800
 msgid "printer-state-reasons.slitter-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Slitter Resource Removed
-#: locale/ipp-strings.c:3764
+#: locale/ipp-strings.c:3802
 msgid "printer-state-reasons.slitter-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Slitter Thermistor Failure
-#: locale/ipp-strings.c:3766
+#: locale/ipp-strings.c:3804
 msgid "printer-state-reasons.slitter-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Timing Failure
-#: locale/ipp-strings.c:3768
+#: locale/ipp-strings.c:3806
 msgid "printer-state-reasons.slitter-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Turned Off
-#: locale/ipp-strings.c:3770
+#: locale/ipp-strings.c:3808
 msgid "printer-state-reasons.slitter-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Slitter Turned On
-#: locale/ipp-strings.c:3772
+#: locale/ipp-strings.c:3810
 msgid "printer-state-reasons.slitter-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Slitter Under Temperature
-#: locale/ipp-strings.c:3774
+#: locale/ipp-strings.c:3812
 msgid "printer-state-reasons.slitter-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Slitter Unrecoverable Failure
-#: locale/ipp-strings.c:3776
+#: locale/ipp-strings.c:3814
 msgid "printer-state-reasons.slitter-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Slitter Unrecoverable Storage Error
-#: locale/ipp-strings.c:3778
+#: locale/ipp-strings.c:3816
 msgid "printer-state-reasons.slitter-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Slitter Warming Up
-#: locale/ipp-strings.c:3780
+#: locale/ipp-strings.c:3818
 msgid "printer-state-reasons.slitter-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Spool Area Full
-#: locale/ipp-strings.c:3782
+#: locale/ipp-strings.c:3820
 msgid "printer-state-reasons.spool-area-full"
 msgstr ""
 
 #. TRANSLATORS: Stacker Added
-#: locale/ipp-strings.c:3784
+#: locale/ipp-strings.c:3822
 msgid "printer-state-reasons.stacker-added"
 msgstr ""
 
 #. TRANSLATORS: Stacker Almost Empty
-#: locale/ipp-strings.c:3786
+#: locale/ipp-strings.c:3824
 msgid "printer-state-reasons.stacker-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Stacker Almost Full
-#: locale/ipp-strings.c:3788
+#: locale/ipp-strings.c:3826
 msgid "printer-state-reasons.stacker-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Stacker At Limit
-#: locale/ipp-strings.c:3790
+#: locale/ipp-strings.c:3828
 msgid "printer-state-reasons.stacker-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Stacker Closed
-#: locale/ipp-strings.c:3792
+#: locale/ipp-strings.c:3830
 msgid "printer-state-reasons.stacker-closed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Configuration Change
-#: locale/ipp-strings.c:3794
+#: locale/ipp-strings.c:3832
 msgid "printer-state-reasons.stacker-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Stacker Cover Closed
-#: locale/ipp-strings.c:3796
+#: locale/ipp-strings.c:3834
 msgid "printer-state-reasons.stacker-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Cover Open
-#: locale/ipp-strings.c:3798
+#: locale/ipp-strings.c:3836
 msgid "printer-state-reasons.stacker-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Stacker Empty
-#: locale/ipp-strings.c:3800
+#: locale/ipp-strings.c:3838
 msgid "printer-state-reasons.stacker-empty"
 msgstr ""
 
 #. TRANSLATORS: Stacker Full
-#: locale/ipp-strings.c:3802
+#: locale/ipp-strings.c:3840
 msgid "printer-state-reasons.stacker-full"
 msgstr ""
 
 #. TRANSLATORS: Stacker Interlock Closed
-#: locale/ipp-strings.c:3804
+#: locale/ipp-strings.c:3842
 msgid "printer-state-reasons.stacker-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Interlock Open
-#: locale/ipp-strings.c:3806
+#: locale/ipp-strings.c:3844
 msgid "printer-state-reasons.stacker-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Stacker Jam
-#: locale/ipp-strings.c:3808
+#: locale/ipp-strings.c:3846
 msgid "printer-state-reasons.stacker-jam"
 msgstr ""
 
 #. TRANSLATORS: Stacker Life Almost Over
-#: locale/ipp-strings.c:3810
+#: locale/ipp-strings.c:3848
 msgid "printer-state-reasons.stacker-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Stacker Life Over
-#: locale/ipp-strings.c:3812
+#: locale/ipp-strings.c:3850
 msgid "printer-state-reasons.stacker-life-over"
 msgstr ""
 
 #. TRANSLATORS: Stacker Memory Exhausted
-#: locale/ipp-strings.c:3814
+#: locale/ipp-strings.c:3852
 msgid "printer-state-reasons.stacker-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Stacker Missing
-#: locale/ipp-strings.c:3816
+#: locale/ipp-strings.c:3854
 msgid "printer-state-reasons.stacker-missing"
 msgstr ""
 
 #. TRANSLATORS: Stacker Motor Failure
-#: locale/ipp-strings.c:3818
+#: locale/ipp-strings.c:3856
 msgid "printer-state-reasons.stacker-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Near Limit
-#: locale/ipp-strings.c:3820
+#: locale/ipp-strings.c:3858
 msgid "printer-state-reasons.stacker-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Stacker Offline
-#: locale/ipp-strings.c:3822
+#: locale/ipp-strings.c:3860
 msgid "printer-state-reasons.stacker-offline"
 msgstr ""
 
 #. TRANSLATORS: Stacker Opened
-#: locale/ipp-strings.c:3824
+#: locale/ipp-strings.c:3862
 msgid "printer-state-reasons.stacker-opened"
 msgstr ""
 
 #. TRANSLATORS: Stacker Over Temperature
-#: locale/ipp-strings.c:3826
+#: locale/ipp-strings.c:3864
 msgid "printer-state-reasons.stacker-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stacker Power Saver
-#: locale/ipp-strings.c:3828
+#: locale/ipp-strings.c:3866
 msgid "printer-state-reasons.stacker-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Stacker Recoverable Failure
-#: locale/ipp-strings.c:3830
+#: locale/ipp-strings.c:3868
 msgid "printer-state-reasons.stacker-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Recoverable Storage
-#: locale/ipp-strings.c:3832
+#: locale/ipp-strings.c:3870
 msgid "printer-state-reasons.stacker-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Stacker Removed
-#: locale/ipp-strings.c:3834
+#: locale/ipp-strings.c:3872
 msgid "printer-state-reasons.stacker-removed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Resource Added
-#: locale/ipp-strings.c:3836
+#: locale/ipp-strings.c:3874
 msgid "printer-state-reasons.stacker-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Stacker Resource Removed
-#: locale/ipp-strings.c:3838
+#: locale/ipp-strings.c:3876
 msgid "printer-state-reasons.stacker-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Stacker Thermistor Failure
-#: locale/ipp-strings.c:3840
+#: locale/ipp-strings.c:3878
 msgid "printer-state-reasons.stacker-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Timing Failure
-#: locale/ipp-strings.c:3842
+#: locale/ipp-strings.c:3880
 msgid "printer-state-reasons.stacker-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Turned Off
-#: locale/ipp-strings.c:3844
+#: locale/ipp-strings.c:3882
 msgid "printer-state-reasons.stacker-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Stacker Turned On
-#: locale/ipp-strings.c:3846
+#: locale/ipp-strings.c:3884
 msgid "printer-state-reasons.stacker-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Stacker Under Temperature
-#: locale/ipp-strings.c:3848
+#: locale/ipp-strings.c:3886
 msgid "printer-state-reasons.stacker-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stacker Unrecoverable Failure
-#: locale/ipp-strings.c:3850
+#: locale/ipp-strings.c:3888
 msgid "printer-state-reasons.stacker-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stacker Unrecoverable Storage Error
-#: locale/ipp-strings.c:3852
+#: locale/ipp-strings.c:3890
 msgid "printer-state-reasons.stacker-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Stacker Warming Up
-#: locale/ipp-strings.c:3854
+#: locale/ipp-strings.c:3892
 msgid "printer-state-reasons.stacker-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Stapler Added
-#: locale/ipp-strings.c:3856
+#: locale/ipp-strings.c:3894
 msgid "printer-state-reasons.stapler-added"
 msgstr ""
 
 #. TRANSLATORS: Stapler Almost Empty
-#: locale/ipp-strings.c:3858
+#: locale/ipp-strings.c:3896
 msgid "printer-state-reasons.stapler-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Stapler Almost Full
-#: locale/ipp-strings.c:3860
+#: locale/ipp-strings.c:3898
 msgid "printer-state-reasons.stapler-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Stapler At Limit
-#: locale/ipp-strings.c:3862
+#: locale/ipp-strings.c:3900
 msgid "printer-state-reasons.stapler-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Stapler Closed
-#: locale/ipp-strings.c:3864
+#: locale/ipp-strings.c:3902
 msgid "printer-state-reasons.stapler-closed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Configuration Change
-#: locale/ipp-strings.c:3866
+#: locale/ipp-strings.c:3904
 msgid "printer-state-reasons.stapler-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Stapler Cover Closed
-#: locale/ipp-strings.c:3868
+#: locale/ipp-strings.c:3906
 msgid "printer-state-reasons.stapler-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Cover Open
-#: locale/ipp-strings.c:3870
+#: locale/ipp-strings.c:3908
 msgid "printer-state-reasons.stapler-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Stapler Empty
-#: locale/ipp-strings.c:3872
+#: locale/ipp-strings.c:3910
 msgid "printer-state-reasons.stapler-empty"
 msgstr ""
 
 #. TRANSLATORS: Stapler Full
-#: locale/ipp-strings.c:3874
+#: locale/ipp-strings.c:3912
 msgid "printer-state-reasons.stapler-full"
 msgstr ""
 
 #. TRANSLATORS: Stapler Interlock Closed
-#: locale/ipp-strings.c:3876
+#: locale/ipp-strings.c:3914
 msgid "printer-state-reasons.stapler-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Interlock Open
-#: locale/ipp-strings.c:3878
+#: locale/ipp-strings.c:3916
 msgid "printer-state-reasons.stapler-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Stapler Jam
-#: locale/ipp-strings.c:3880
+#: locale/ipp-strings.c:3918
 msgid "printer-state-reasons.stapler-jam"
 msgstr ""
 
 #. TRANSLATORS: Stapler Life Almost Over
-#: locale/ipp-strings.c:3882
+#: locale/ipp-strings.c:3920
 msgid "printer-state-reasons.stapler-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Stapler Life Over
-#: locale/ipp-strings.c:3884
+#: locale/ipp-strings.c:3922
 msgid "printer-state-reasons.stapler-life-over"
 msgstr ""
 
 #. TRANSLATORS: Stapler Memory Exhausted
-#: locale/ipp-strings.c:3886
+#: locale/ipp-strings.c:3924
 msgid "printer-state-reasons.stapler-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Stapler Missing
-#: locale/ipp-strings.c:3888
+#: locale/ipp-strings.c:3926
 msgid "printer-state-reasons.stapler-missing"
 msgstr ""
 
 #. TRANSLATORS: Stapler Motor Failure
-#: locale/ipp-strings.c:3890
+#: locale/ipp-strings.c:3928
 msgid "printer-state-reasons.stapler-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Near Limit
-#: locale/ipp-strings.c:3892
+#: locale/ipp-strings.c:3930
 msgid "printer-state-reasons.stapler-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Stapler Offline
-#: locale/ipp-strings.c:3894
+#: locale/ipp-strings.c:3932
 msgid "printer-state-reasons.stapler-offline"
 msgstr ""
 
 #. TRANSLATORS: Stapler Opened
-#: locale/ipp-strings.c:3896
+#: locale/ipp-strings.c:3934
 msgid "printer-state-reasons.stapler-opened"
 msgstr ""
 
 #. TRANSLATORS: Stapler Over Temperature
-#: locale/ipp-strings.c:3898
+#: locale/ipp-strings.c:3936
 msgid "printer-state-reasons.stapler-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stapler Power Saver
-#: locale/ipp-strings.c:3900
+#: locale/ipp-strings.c:3938
 msgid "printer-state-reasons.stapler-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Stapler Recoverable Failure
-#: locale/ipp-strings.c:3902
+#: locale/ipp-strings.c:3940
 msgid "printer-state-reasons.stapler-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Recoverable Storage
-#: locale/ipp-strings.c:3904
+#: locale/ipp-strings.c:3942
 msgid "printer-state-reasons.stapler-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Stapler Removed
-#: locale/ipp-strings.c:3906
+#: locale/ipp-strings.c:3944
 msgid "printer-state-reasons.stapler-removed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Resource Added
-#: locale/ipp-strings.c:3908
+#: locale/ipp-strings.c:3946
 msgid "printer-state-reasons.stapler-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Stapler Resource Removed
-#: locale/ipp-strings.c:3910
+#: locale/ipp-strings.c:3948
 msgid "printer-state-reasons.stapler-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Stapler Thermistor Failure
-#: locale/ipp-strings.c:3912
+#: locale/ipp-strings.c:3950
 msgid "printer-state-reasons.stapler-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Timing Failure
-#: locale/ipp-strings.c:3914
+#: locale/ipp-strings.c:3952
 msgid "printer-state-reasons.stapler-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Turned Off
-#: locale/ipp-strings.c:3916
+#: locale/ipp-strings.c:3954
 msgid "printer-state-reasons.stapler-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Stapler Turned On
-#: locale/ipp-strings.c:3918
+#: locale/ipp-strings.c:3956
 msgid "printer-state-reasons.stapler-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Stapler Under Temperature
-#: locale/ipp-strings.c:3920
+#: locale/ipp-strings.c:3958
 msgid "printer-state-reasons.stapler-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stapler Unrecoverable Failure
-#: locale/ipp-strings.c:3922
+#: locale/ipp-strings.c:3960
 msgid "printer-state-reasons.stapler-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stapler Unrecoverable Storage Error
-#: locale/ipp-strings.c:3924
+#: locale/ipp-strings.c:3962
 msgid "printer-state-reasons.stapler-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Stapler Warming Up
-#: locale/ipp-strings.c:3926
+#: locale/ipp-strings.c:3964
 msgid "printer-state-reasons.stapler-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Added
-#: locale/ipp-strings.c:3928
+#: locale/ipp-strings.c:3966
 msgid "printer-state-reasons.stitcher-added"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Almost Empty
-#: locale/ipp-strings.c:3930
+#: locale/ipp-strings.c:3968
 msgid "printer-state-reasons.stitcher-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Almost Full
-#: locale/ipp-strings.c:3932
+#: locale/ipp-strings.c:3970
 msgid "printer-state-reasons.stitcher-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Stitcher At Limit
-#: locale/ipp-strings.c:3934
+#: locale/ipp-strings.c:3972
 msgid "printer-state-reasons.stitcher-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Closed
-#: locale/ipp-strings.c:3936
+#: locale/ipp-strings.c:3974
 msgid "printer-state-reasons.stitcher-closed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Configuration Change
-#: locale/ipp-strings.c:3938
+#: locale/ipp-strings.c:3976
 msgid "printer-state-reasons.stitcher-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Cover Closed
-#: locale/ipp-strings.c:3940
+#: locale/ipp-strings.c:3978
 msgid "printer-state-reasons.stitcher-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Cover Open
-#: locale/ipp-strings.c:3942
+#: locale/ipp-strings.c:3980
 msgid "printer-state-reasons.stitcher-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Empty
-#: locale/ipp-strings.c:3944
+#: locale/ipp-strings.c:3982
 msgid "printer-state-reasons.stitcher-empty"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Full
-#: locale/ipp-strings.c:3946
+#: locale/ipp-strings.c:3984
 msgid "printer-state-reasons.stitcher-full"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Interlock Closed
-#: locale/ipp-strings.c:3948
+#: locale/ipp-strings.c:3986
 msgid "printer-state-reasons.stitcher-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Interlock Open
-#: locale/ipp-strings.c:3950
+#: locale/ipp-strings.c:3988
 msgid "printer-state-reasons.stitcher-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Jam
-#: locale/ipp-strings.c:3952
+#: locale/ipp-strings.c:3990
 msgid "printer-state-reasons.stitcher-jam"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Life Almost Over
-#: locale/ipp-strings.c:3954
+#: locale/ipp-strings.c:3992
 msgid "printer-state-reasons.stitcher-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Life Over
-#: locale/ipp-strings.c:3956
+#: locale/ipp-strings.c:3994
 msgid "printer-state-reasons.stitcher-life-over"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Memory Exhausted
-#: locale/ipp-strings.c:3958
+#: locale/ipp-strings.c:3996
 msgid "printer-state-reasons.stitcher-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Missing
-#: locale/ipp-strings.c:3960
+#: locale/ipp-strings.c:3998
 msgid "printer-state-reasons.stitcher-missing"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Motor Failure
-#: locale/ipp-strings.c:3962
+#: locale/ipp-strings.c:4000
 msgid "printer-state-reasons.stitcher-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Near Limit
-#: locale/ipp-strings.c:3964
+#: locale/ipp-strings.c:4002
 msgid "printer-state-reasons.stitcher-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Offline
-#: locale/ipp-strings.c:3966
+#: locale/ipp-strings.c:4004
 msgid "printer-state-reasons.stitcher-offline"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Opened
-#: locale/ipp-strings.c:3968
+#: locale/ipp-strings.c:4006
 msgid "printer-state-reasons.stitcher-opened"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Over Temperature
-#: locale/ipp-strings.c:3970
+#: locale/ipp-strings.c:4008
 msgid "printer-state-reasons.stitcher-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Power Saver
-#: locale/ipp-strings.c:3972
+#: locale/ipp-strings.c:4010
 msgid "printer-state-reasons.stitcher-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Recoverable Failure
-#: locale/ipp-strings.c:3974
+#: locale/ipp-strings.c:4012
 msgid "printer-state-reasons.stitcher-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Recoverable Storage
-#: locale/ipp-strings.c:3976
+#: locale/ipp-strings.c:4014
 msgid "printer-state-reasons.stitcher-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Removed
-#: locale/ipp-strings.c:3978
+#: locale/ipp-strings.c:4016
 msgid "printer-state-reasons.stitcher-removed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Resource Added
-#: locale/ipp-strings.c:3980
+#: locale/ipp-strings.c:4018
 msgid "printer-state-reasons.stitcher-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Resource Removed
-#: locale/ipp-strings.c:3982
+#: locale/ipp-strings.c:4020
 msgid "printer-state-reasons.stitcher-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Thermistor Failure
-#: locale/ipp-strings.c:3984
+#: locale/ipp-strings.c:4022
 msgid "printer-state-reasons.stitcher-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Timing Failure
-#: locale/ipp-strings.c:3986
+#: locale/ipp-strings.c:4024
 msgid "printer-state-reasons.stitcher-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Turned Off
-#: locale/ipp-strings.c:3988
+#: locale/ipp-strings.c:4026
 msgid "printer-state-reasons.stitcher-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Turned On
-#: locale/ipp-strings.c:3990
+#: locale/ipp-strings.c:4028
 msgid "printer-state-reasons.stitcher-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Under Temperature
-#: locale/ipp-strings.c:3992
+#: locale/ipp-strings.c:4030
 msgid "printer-state-reasons.stitcher-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Unrecoverable Failure
-#: locale/ipp-strings.c:3994
+#: locale/ipp-strings.c:4032
 msgid "printer-state-reasons.stitcher-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Unrecoverable Storage Error
-#: locale/ipp-strings.c:3996
+#: locale/ipp-strings.c:4034
 msgid "printer-state-reasons.stitcher-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Stitcher Warming Up
-#: locale/ipp-strings.c:3998
+#: locale/ipp-strings.c:4036
 msgid "printer-state-reasons.stitcher-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Partially stopped
-#: locale/ipp-strings.c:4000
+#: locale/ipp-strings.c:4038
 msgid "printer-state-reasons.stopped-partly"
 msgstr ""
 
 #. TRANSLATORS: Stopping
-#: locale/ipp-strings.c:4002
+#: locale/ipp-strings.c:4040
 msgid "printer-state-reasons.stopping"
 msgstr ""
 
 #. TRANSLATORS: Subunit Added
-#: locale/ipp-strings.c:4004
+#: locale/ipp-strings.c:4042
 msgid "printer-state-reasons.subunit-added"
 msgstr ""
 
 #. TRANSLATORS: Subunit Almost Empty
-#: locale/ipp-strings.c:4006
+#: locale/ipp-strings.c:4044
 msgid "printer-state-reasons.subunit-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Subunit Almost Full
-#: locale/ipp-strings.c:4008
+#: locale/ipp-strings.c:4046
 msgid "printer-state-reasons.subunit-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Subunit At Limit
-#: locale/ipp-strings.c:4010
+#: locale/ipp-strings.c:4048
 msgid "printer-state-reasons.subunit-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Subunit Closed
-#: locale/ipp-strings.c:4012
+#: locale/ipp-strings.c:4050
 msgid "printer-state-reasons.subunit-closed"
 msgstr ""
 
 #. TRANSLATORS: Subunit Empty
-#: locale/ipp-strings.c:4016
+#: locale/ipp-strings.c:4054
 msgid "printer-state-reasons.subunit-empty"
 msgstr ""
 
 #. TRANSLATORS: Subunit Full
-#: locale/ipp-strings.c:4018
+#: locale/ipp-strings.c:4056
 msgid "printer-state-reasons.subunit-full"
 msgstr ""
 
 #. TRANSLATORS: Subunit Life Almost Over
-#: locale/ipp-strings.c:4020
+#: locale/ipp-strings.c:4058
 msgid "printer-state-reasons.subunit-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Subunit Life Over
-#: locale/ipp-strings.c:4022
+#: locale/ipp-strings.c:4060
 msgid "printer-state-reasons.subunit-life-over"
 msgstr ""
 
 #. TRANSLATORS: Subunit Memory Exhausted
-#: locale/ipp-strings.c:4024
+#: locale/ipp-strings.c:4062
 msgid "printer-state-reasons.subunit-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Subunit Missing
-#: locale/ipp-strings.c:4026
+#: locale/ipp-strings.c:4064
 msgid "printer-state-reasons.subunit-missing"
 msgstr ""
 
 #. TRANSLATORS: Subunit Motor Failure
-#: locale/ipp-strings.c:4028
+#: locale/ipp-strings.c:4066
 msgid "printer-state-reasons.subunit-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Near Limit
-#: locale/ipp-strings.c:4030
+#: locale/ipp-strings.c:4068
 msgid "printer-state-reasons.subunit-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Subunit Offline
-#: locale/ipp-strings.c:4032
+#: locale/ipp-strings.c:4070
 msgid "printer-state-reasons.subunit-offline"
 msgstr ""
 
 #. TRANSLATORS: Subunit Opened
-#: locale/ipp-strings.c:4034
+#: locale/ipp-strings.c:4072
 msgid "printer-state-reasons.subunit-opened"
 msgstr ""
 
 #. TRANSLATORS: Subunit Over Temperature
-#: locale/ipp-strings.c:4036
+#: locale/ipp-strings.c:4074
 msgid "printer-state-reasons.subunit-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Subunit Power Saver
-#: locale/ipp-strings.c:4038
+#: locale/ipp-strings.c:4076
 msgid "printer-state-reasons.subunit-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Subunit Recoverable Failure
-#: locale/ipp-strings.c:4040
+#: locale/ipp-strings.c:4078
 msgid "printer-state-reasons.subunit-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Recoverable Storage
-#: locale/ipp-strings.c:4042
+#: locale/ipp-strings.c:4080
 msgid "printer-state-reasons.subunit-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Subunit Removed
-#: locale/ipp-strings.c:4044
+#: locale/ipp-strings.c:4082
 msgid "printer-state-reasons.subunit-removed"
 msgstr ""
 
 #. TRANSLATORS: Subunit Resource Added
-#: locale/ipp-strings.c:4046
+#: locale/ipp-strings.c:4084
 msgid "printer-state-reasons.subunit-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Subunit Resource Removed
-#: locale/ipp-strings.c:4048
+#: locale/ipp-strings.c:4086
 msgid "printer-state-reasons.subunit-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Subunit Thermistor Failure
-#: locale/ipp-strings.c:4050
+#: locale/ipp-strings.c:4088
 msgid "printer-state-reasons.subunit-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Timing Failure
-#: locale/ipp-strings.c:4052
+#: locale/ipp-strings.c:4090
 msgid "printer-state-reasons.subunit-timing-Failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Turned Off
-#: locale/ipp-strings.c:4054
+#: locale/ipp-strings.c:4092
 msgid "printer-state-reasons.subunit-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Subunit Turned On
-#: locale/ipp-strings.c:4056
+#: locale/ipp-strings.c:4094
 msgid "printer-state-reasons.subunit-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Subunit Under Temperature
-#: locale/ipp-strings.c:4058
+#: locale/ipp-strings.c:4096
 msgid "printer-state-reasons.subunit-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Subunit Unrecoverable Failure
-#: locale/ipp-strings.c:4060
+#: locale/ipp-strings.c:4098
 msgid "printer-state-reasons.subunit-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Subunit Unrecoverable Storage
-#: locale/ipp-strings.c:4062
+#: locale/ipp-strings.c:4100
 msgid "printer-state-reasons.subunit-unrecoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Subunit Warming Up
-#: locale/ipp-strings.c:4064
+#: locale/ipp-strings.c:4102
 msgid "printer-state-reasons.subunit-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Printer stopped responding
-#: locale/ipp-strings.c:4066
+#: locale/ipp-strings.c:4104
 msgid "printer-state-reasons.timed-out"
 msgstr ""
 
 #. TRANSLATORS: Out of toner
-#: locale/ipp-strings.c:4068
+#: locale/ipp-strings.c:4106
 msgid "printer-state-reasons.toner-empty"
 msgstr ""
 
 #. TRANSLATORS: Toner low
-#: locale/ipp-strings.c:4070
+#: locale/ipp-strings.c:4108
 msgid "printer-state-reasons.toner-low"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Added
-#: locale/ipp-strings.c:4072
+#: locale/ipp-strings.c:4110
 msgid "printer-state-reasons.trimmer-added"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Almost Empty
-#: locale/ipp-strings.c:4074
+#: locale/ipp-strings.c:4112
 msgid "printer-state-reasons.trimmer-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Almost Full
-#: locale/ipp-strings.c:4076
+#: locale/ipp-strings.c:4114
 msgid "printer-state-reasons.trimmer-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Trimmer At Limit
-#: locale/ipp-strings.c:4078
+#: locale/ipp-strings.c:4116
 msgid "printer-state-reasons.trimmer-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Closed
-#: locale/ipp-strings.c:4080
+#: locale/ipp-strings.c:4118
 msgid "printer-state-reasons.trimmer-closed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Configuration Change
-#: locale/ipp-strings.c:4082
+#: locale/ipp-strings.c:4120
 msgid "printer-state-reasons.trimmer-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Cover Closed
-#: locale/ipp-strings.c:4084
+#: locale/ipp-strings.c:4122
 msgid "printer-state-reasons.trimmer-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Cover Open
-#: locale/ipp-strings.c:4086
+#: locale/ipp-strings.c:4124
 msgid "printer-state-reasons.trimmer-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Empty
-#: locale/ipp-strings.c:4088
+#: locale/ipp-strings.c:4126
 msgid "printer-state-reasons.trimmer-empty"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Full
-#: locale/ipp-strings.c:4090
+#: locale/ipp-strings.c:4128
 msgid "printer-state-reasons.trimmer-full"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Interlock Closed
-#: locale/ipp-strings.c:4092
+#: locale/ipp-strings.c:4130
 msgid "printer-state-reasons.trimmer-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Interlock Open
-#: locale/ipp-strings.c:4094
+#: locale/ipp-strings.c:4132
 msgid "printer-state-reasons.trimmer-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Jam
-#: locale/ipp-strings.c:4096
+#: locale/ipp-strings.c:4134
 msgid "printer-state-reasons.trimmer-jam"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Life Almost Over
-#: locale/ipp-strings.c:4098
+#: locale/ipp-strings.c:4136
 msgid "printer-state-reasons.trimmer-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Life Over
-#: locale/ipp-strings.c:4100
+#: locale/ipp-strings.c:4138
 msgid "printer-state-reasons.trimmer-life-over"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Memory Exhausted
-#: locale/ipp-strings.c:4102
+#: locale/ipp-strings.c:4140
 msgid "printer-state-reasons.trimmer-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Missing
-#: locale/ipp-strings.c:4104
+#: locale/ipp-strings.c:4142
 msgid "printer-state-reasons.trimmer-missing"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Motor Failure
-#: locale/ipp-strings.c:4106
+#: locale/ipp-strings.c:4144
 msgid "printer-state-reasons.trimmer-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Near Limit
-#: locale/ipp-strings.c:4108
+#: locale/ipp-strings.c:4146
 msgid "printer-state-reasons.trimmer-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Offline
-#: locale/ipp-strings.c:4110
+#: locale/ipp-strings.c:4148
 msgid "printer-state-reasons.trimmer-offline"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Opened
-#: locale/ipp-strings.c:4112
+#: locale/ipp-strings.c:4150
 msgid "printer-state-reasons.trimmer-opened"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Over Temperature
-#: locale/ipp-strings.c:4114
+#: locale/ipp-strings.c:4152
 msgid "printer-state-reasons.trimmer-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Power Saver
-#: locale/ipp-strings.c:4116
+#: locale/ipp-strings.c:4154
 msgid "printer-state-reasons.trimmer-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Recoverable Failure
-#: locale/ipp-strings.c:4118
+#: locale/ipp-strings.c:4156
 msgid "printer-state-reasons.trimmer-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Recoverable Storage
-#: locale/ipp-strings.c:4120
+#: locale/ipp-strings.c:4158
 msgid "printer-state-reasons.trimmer-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Removed
-#: locale/ipp-strings.c:4122
+#: locale/ipp-strings.c:4160
 msgid "printer-state-reasons.trimmer-removed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Resource Added
-#: locale/ipp-strings.c:4124
+#: locale/ipp-strings.c:4162
 msgid "printer-state-reasons.trimmer-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Resource Removed
-#: locale/ipp-strings.c:4126
+#: locale/ipp-strings.c:4164
 msgid "printer-state-reasons.trimmer-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Thermistor Failure
-#: locale/ipp-strings.c:4128
+#: locale/ipp-strings.c:4166
 msgid "printer-state-reasons.trimmer-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Timing Failure
-#: locale/ipp-strings.c:4130
+#: locale/ipp-strings.c:4168
 msgid "printer-state-reasons.trimmer-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Turned Off
-#: locale/ipp-strings.c:4132
+#: locale/ipp-strings.c:4170
 msgid "printer-state-reasons.trimmer-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Turned On
-#: locale/ipp-strings.c:4134
+#: locale/ipp-strings.c:4172
 msgid "printer-state-reasons.trimmer-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Under Temperature
-#: locale/ipp-strings.c:4136
+#: locale/ipp-strings.c:4174
 msgid "printer-state-reasons.trimmer-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Unrecoverable Failure
-#: locale/ipp-strings.c:4138
+#: locale/ipp-strings.c:4176
 msgid "printer-state-reasons.trimmer-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Unrecoverable Storage Error
-#: locale/ipp-strings.c:4140
+#: locale/ipp-strings.c:4178
 msgid "printer-state-reasons.trimmer-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Trimmer Warming Up
-#: locale/ipp-strings.c:4142
+#: locale/ipp-strings.c:4180
 msgid "printer-state-reasons.trimmer-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Unknown
-#: locale/ipp-strings.c:4144
+#: locale/ipp-strings.c:4182
 msgid "printer-state-reasons.unknown"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Added
-#: locale/ipp-strings.c:4146
+#: locale/ipp-strings.c:4184
 msgid "printer-state-reasons.wrapper-added"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Almost Empty
-#: locale/ipp-strings.c:4148
+#: locale/ipp-strings.c:4186
 msgid "printer-state-reasons.wrapper-almost-empty"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Almost Full
-#: locale/ipp-strings.c:4150
+#: locale/ipp-strings.c:4188
 msgid "printer-state-reasons.wrapper-almost-full"
 msgstr ""
 
 #. TRANSLATORS: Wrapper At Limit
-#: locale/ipp-strings.c:4152
+#: locale/ipp-strings.c:4190
 msgid "printer-state-reasons.wrapper-at-limit"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Closed
-#: locale/ipp-strings.c:4154
+#: locale/ipp-strings.c:4192
 msgid "printer-state-reasons.wrapper-closed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Configuration Change
-#: locale/ipp-strings.c:4156
+#: locale/ipp-strings.c:4194
 msgid "printer-state-reasons.wrapper-configuration-change"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Cover Closed
-#: locale/ipp-strings.c:4158
+#: locale/ipp-strings.c:4196
 msgid "printer-state-reasons.wrapper-cover-closed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Cover Open
-#: locale/ipp-strings.c:4160
+#: locale/ipp-strings.c:4198
 msgid "printer-state-reasons.wrapper-cover-open"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Empty
-#: locale/ipp-strings.c:4162
+#: locale/ipp-strings.c:4200
 msgid "printer-state-reasons.wrapper-empty"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Full
-#: locale/ipp-strings.c:4164
+#: locale/ipp-strings.c:4202
 msgid "printer-state-reasons.wrapper-full"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Interlock Closed
-#: locale/ipp-strings.c:4166
+#: locale/ipp-strings.c:4204
 msgid "printer-state-reasons.wrapper-interlock-closed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Interlock Open
-#: locale/ipp-strings.c:4168
+#: locale/ipp-strings.c:4206
 msgid "printer-state-reasons.wrapper-interlock-open"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Jam
-#: locale/ipp-strings.c:4170
+#: locale/ipp-strings.c:4208
 msgid "printer-state-reasons.wrapper-jam"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Life Almost Over
-#: locale/ipp-strings.c:4172
+#: locale/ipp-strings.c:4210
 msgid "printer-state-reasons.wrapper-life-almost-over"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Life Over
-#: locale/ipp-strings.c:4174
+#: locale/ipp-strings.c:4212
 msgid "printer-state-reasons.wrapper-life-over"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Memory Exhausted
-#: locale/ipp-strings.c:4176
+#: locale/ipp-strings.c:4214
 msgid "printer-state-reasons.wrapper-memory-exhausted"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Missing
-#: locale/ipp-strings.c:4178
+#: locale/ipp-strings.c:4216
 msgid "printer-state-reasons.wrapper-missing"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Motor Failure
-#: locale/ipp-strings.c:4180
+#: locale/ipp-strings.c:4218
 msgid "printer-state-reasons.wrapper-motor-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Near Limit
-#: locale/ipp-strings.c:4182
+#: locale/ipp-strings.c:4220
 msgid "printer-state-reasons.wrapper-near-limit"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Offline
-#: locale/ipp-strings.c:4184
+#: locale/ipp-strings.c:4222
 msgid "printer-state-reasons.wrapper-offline"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Opened
-#: locale/ipp-strings.c:4186
+#: locale/ipp-strings.c:4224
 msgid "printer-state-reasons.wrapper-opened"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Over Temperature
-#: locale/ipp-strings.c:4188
+#: locale/ipp-strings.c:4226
 msgid "printer-state-reasons.wrapper-over-temperature"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Power Saver
-#: locale/ipp-strings.c:4190
+#: locale/ipp-strings.c:4228
 msgid "printer-state-reasons.wrapper-power-saver"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Recoverable Failure
-#: locale/ipp-strings.c:4192
+#: locale/ipp-strings.c:4230
 msgid "printer-state-reasons.wrapper-recoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Recoverable Storage
-#: locale/ipp-strings.c:4194
+#: locale/ipp-strings.c:4232
 msgid "printer-state-reasons.wrapper-recoverable-storage"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Removed
-#: locale/ipp-strings.c:4196
+#: locale/ipp-strings.c:4234
 msgid "printer-state-reasons.wrapper-removed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Resource Added
-#: locale/ipp-strings.c:4198
+#: locale/ipp-strings.c:4236
 msgid "printer-state-reasons.wrapper-resource-added"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Resource Removed
-#: locale/ipp-strings.c:4200
+#: locale/ipp-strings.c:4238
 msgid "printer-state-reasons.wrapper-resource-removed"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Thermistor Failure
-#: locale/ipp-strings.c:4202
+#: locale/ipp-strings.c:4240
 msgid "printer-state-reasons.wrapper-thermistor-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Timing Failure
-#: locale/ipp-strings.c:4204
+#: locale/ipp-strings.c:4242
 msgid "printer-state-reasons.wrapper-timing-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Turned Off
-#: locale/ipp-strings.c:4206
+#: locale/ipp-strings.c:4244
 msgid "printer-state-reasons.wrapper-turned-off"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Turned On
-#: locale/ipp-strings.c:4208
+#: locale/ipp-strings.c:4246
 msgid "printer-state-reasons.wrapper-turned-on"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Under Temperature
-#: locale/ipp-strings.c:4210
+#: locale/ipp-strings.c:4248
 msgid "printer-state-reasons.wrapper-under-temperature"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Unrecoverable Failure
-#: locale/ipp-strings.c:4212
+#: locale/ipp-strings.c:4250
 msgid "printer-state-reasons.wrapper-unrecoverable-failure"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Unrecoverable Storage Error
-#: locale/ipp-strings.c:4214
+#: locale/ipp-strings.c:4252
 msgid "printer-state-reasons.wrapper-unrecoverable-storage-error"
 msgstr ""
 
 #. TRANSLATORS: Wrapper Warming Up
-#: locale/ipp-strings.c:4216
+#: locale/ipp-strings.c:4254
 msgid "printer-state-reasons.wrapper-warming-up"
 msgstr ""
 
 #. TRANSLATORS: Idle
-#: locale/ipp-strings.c:4218
+#: locale/ipp-strings.c:4256
 msgid "printer-state.3"
 msgstr ""
 
 #. TRANSLATORS: Processing
-#: locale/ipp-strings.c:4220
+#: locale/ipp-strings.c:4258
 msgid "printer-state.4"
 msgstr ""
 
 #. TRANSLATORS: Stopped
-#: locale/ipp-strings.c:4222
+#: locale/ipp-strings.c:4260
 msgid "printer-state.5"
 msgstr ""
 
 #. TRANSLATORS: Printer Uptime
-#: locale/ipp-strings.c:4224
+#: locale/ipp-strings.c:4262
 msgid "printer-up-time"
 msgstr ""
 
 #. TRANSLATORS: Proof Print
-#: locale/ipp-strings.c:4226
+#: locale/ipp-strings.c:4264
 msgid "proof-print"
 msgstr ""
 
 #. TRANSLATORS: Proof Print Copies
-#: locale/ipp-strings.c:4228
+#: locale/ipp-strings.c:4266
 msgid "proof-print-copies"
 msgstr ""
 
 #. TRANSLATORS: Punching
-#: locale/ipp-strings.c:4230
+#: locale/ipp-strings.c:4268
 msgid "punching"
 msgstr ""
 
 #. TRANSLATORS: Punching Locations
-#: locale/ipp-strings.c:4232
+#: locale/ipp-strings.c:4270
 msgid "punching-locations"
 msgstr ""
 
 #. TRANSLATORS: Punching Offset
-#: locale/ipp-strings.c:4234
+#: locale/ipp-strings.c:4272
 msgid "punching-offset"
 msgstr ""
 
 #. TRANSLATORS: Punch Edge
-#: locale/ipp-strings.c:4236
+#: locale/ipp-strings.c:4274
 msgid "punching-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:4238
+#: locale/ipp-strings.c:4276
 msgid "punching-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:4240
+#: locale/ipp-strings.c:4278
 msgid "punching-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:4242
+#: locale/ipp-strings.c:4280
 msgid "punching-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:4244
+#: locale/ipp-strings.c:4282
 msgid "punching-reference-edge.top"
 msgstr ""
 
 #. TRANSLATORS: Requested Attributes
-#: locale/ipp-strings.c:4246
+#: locale/ipp-strings.c:4284
 msgid "requested-attributes"
 msgstr ""
 
 #. TRANSLATORS: Retry Interval
-#: locale/ipp-strings.c:4248
+#: locale/ipp-strings.c:4286
 msgid "retry-interval"
 msgstr ""
 
 #. TRANSLATORS: Retry Timeout
-#: locale/ipp-strings.c:4250
+#: locale/ipp-strings.c:4288
 msgid "retry-time-out"
 msgstr ""
 
 #. TRANSLATORS: Save Disposition
-#: locale/ipp-strings.c:4252
+#: locale/ipp-strings.c:4290
 msgid "save-disposition"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:4254
+#: locale/ipp-strings.c:4292
 msgid "save-disposition.none"
 msgstr ""
 
 #. TRANSLATORS: Print and Save
-#: locale/ipp-strings.c:4256
+#: locale/ipp-strings.c:4294
 msgid "save-disposition.print-save"
 msgstr ""
 
 #. TRANSLATORS: Save Only
-#: locale/ipp-strings.c:4258
+#: locale/ipp-strings.c:4296
 msgid "save-disposition.save-only"
 msgstr ""
 
 #. TRANSLATORS: Save Document Format
-#: locale/ipp-strings.c:4260
+#: locale/ipp-strings.c:4298
 msgid "save-document-format"
 msgstr ""
 
 #. TRANSLATORS: Save Info
-#: locale/ipp-strings.c:4262
+#: locale/ipp-strings.c:4300
 msgid "save-info"
 msgstr ""
 
 #. TRANSLATORS: Save Location
-#: locale/ipp-strings.c:4264
+#: locale/ipp-strings.c:4302
 msgid "save-location"
 msgstr ""
 
 #. TRANSLATORS: Save Name
-#: locale/ipp-strings.c:4266
+#: locale/ipp-strings.c:4304
 msgid "save-name"
 msgstr ""
 
 #. TRANSLATORS: Separator Sheets
-#: locale/ipp-strings.c:4268
+#: locale/ipp-strings.c:4306
 msgid "separator-sheets"
 msgstr ""
 
 #. TRANSLATORS: Type of Separator Sheets
-#: locale/ipp-strings.c:4270
+#: locale/ipp-strings.c:4308
 msgid "separator-sheets-type"
 msgstr ""
 
 #. TRANSLATORS: Start and End Sheets
-#: locale/ipp-strings.c:4272
+#: locale/ipp-strings.c:4310
 msgid "separator-sheets-type.both-sheets"
 msgstr ""
 
 #. TRANSLATORS: End Sheet
-#: locale/ipp-strings.c:4274
+#: locale/ipp-strings.c:4312
 msgid "separator-sheets-type.end-sheet"
 msgstr ""
 
 #. TRANSLATORS: None
-#: locale/ipp-strings.c:4276
+#: locale/ipp-strings.c:4314
 msgid "separator-sheets-type.none"
 msgstr ""
 
 #. TRANSLATORS: Slip Sheets
-#: locale/ipp-strings.c:4278
+#: locale/ipp-strings.c:4316
 msgid "separator-sheets-type.slip-sheets"
 msgstr ""
 
 #. TRANSLATORS: Start Sheet
-#: locale/ipp-strings.c:4280
+#: locale/ipp-strings.c:4318
 msgid "separator-sheets-type.start-sheet"
 msgstr ""
 
@@ -19007,291 +19041,291 @@
 msgstr ""
 
 #. TRANSLATORS: 2-Sided Printing
-#: locale/ipp-strings.c:4282
+#: locale/ipp-strings.c:4320
 msgid "sides"
 msgstr ""
 
 #. TRANSLATORS: Off
-#: locale/ipp-strings.c:4284
+#: locale/ipp-strings.c:4322
 msgid "sides.one-sided"
 msgstr ""
 
 #. TRANSLATORS: On (Portrait)
-#: locale/ipp-strings.c:4286
+#: locale/ipp-strings.c:4324
 msgid "sides.two-sided-long-edge"
 msgstr ""
 
 #. TRANSLATORS: On (Landscape)
-#: locale/ipp-strings.c:4288
+#: locale/ipp-strings.c:4326
 msgid "sides.two-sided-short-edge"
 msgstr ""
 
 #. TRANSLATORS: Status Message
-#: locale/ipp-strings.c:4290
+#: locale/ipp-strings.c:4328
 msgid "status-message"
 msgstr ""
 
 #. TRANSLATORS: Staple
-#: locale/ipp-strings.c:4292
+#: locale/ipp-strings.c:4330
 msgid "stitching"
 msgstr ""
 
 #. TRANSLATORS: Stitching Angle
-#: locale/ipp-strings.c:4294
+#: locale/ipp-strings.c:4332
 msgid "stitching-angle"
 msgstr ""
 
 #. TRANSLATORS: Stitching Locations
-#: locale/ipp-strings.c:4296
+#: locale/ipp-strings.c:4334
 msgid "stitching-locations"
 msgstr ""
 
 #. TRANSLATORS: Staple Method
-#: locale/ipp-strings.c:4298
+#: locale/ipp-strings.c:4336
 msgid "stitching-method"
 msgstr ""
 
 #. TRANSLATORS: Automatic
-#: locale/ipp-strings.c:4300
+#: locale/ipp-strings.c:4338
 msgid "stitching-method.auto"
 msgstr ""
 
 #. TRANSLATORS: Crimp
-#: locale/ipp-strings.c:4302
+#: locale/ipp-strings.c:4340
 msgid "stitching-method.crimp"
 msgstr ""
 
 #. TRANSLATORS: Wire
-#: locale/ipp-strings.c:4304
+#: locale/ipp-strings.c:4342
 msgid "stitching-method.wire"
 msgstr ""
 
 #. TRANSLATORS: Stitching Offset
-#: locale/ipp-strings.c:4306
+#: locale/ipp-strings.c:4344
 msgid "stitching-offset"
 msgstr ""
 
 #. TRANSLATORS: Staple Edge
-#: locale/ipp-strings.c:4308
+#: locale/ipp-strings.c:4346
 msgid "stitching-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:4310
+#: locale/ipp-strings.c:4348
 msgid "stitching-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:4312
+#: locale/ipp-strings.c:4350
 msgid "stitching-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:4314
+#: locale/ipp-strings.c:4352
 msgid "stitching-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:4316
+#: locale/ipp-strings.c:4354
 msgid "stitching-reference-edge.top"
 msgstr ""
 
 #. TRANSLATORS: Subject
-#: locale/ipp-strings.c:4318
+#: locale/ipp-strings.c:4356
 msgid "subject"
 msgstr ""
 
 #. TRANSLATORS: T33 Subaddress
-#: locale/ipp-strings.c:4342
+#: locale/ipp-strings.c:4380
 msgid "t33-subaddress"
 msgstr ""
 
 #. TRANSLATORS: To Name
-#: locale/ipp-strings.c:4344
+#: locale/ipp-strings.c:4382
 msgid "to-name"
 msgstr ""
 
 #. TRANSLATORS: Transmission Status
-#: locale/ipp-strings.c:4346
+#: locale/ipp-strings.c:4384
 msgid "transmission-status"
 msgstr ""
 
 #. TRANSLATORS: Pending
-#: locale/ipp-strings.c:4348
+#: locale/ipp-strings.c:4386
 msgid "transmission-status.3"
 msgstr ""
 
 #. TRANSLATORS: Pending Retry
-#: locale/ipp-strings.c:4350
+#: locale/ipp-strings.c:4388
 msgid "transmission-status.4"
 msgstr ""
 
 #. TRANSLATORS: Processing
-#: locale/ipp-strings.c:4352
+#: locale/ipp-strings.c:4390
 msgid "transmission-status.5"
 msgstr ""
 
 #. TRANSLATORS: Canceled
-#: locale/ipp-strings.c:4354
+#: locale/ipp-strings.c:4392
 msgid "transmission-status.7"
 msgstr ""
 
 #. TRANSLATORS: Aborted
-#: locale/ipp-strings.c:4356
+#: locale/ipp-strings.c:4394
 msgid "transmission-status.8"
 msgstr ""
 
 #. TRANSLATORS: Completed
-#: locale/ipp-strings.c:4358
+#: locale/ipp-strings.c:4396
 msgid "transmission-status.9"
 msgstr ""
 
 #. TRANSLATORS: Cut
-#: locale/ipp-strings.c:4360
+#: locale/ipp-strings.c:4398
 msgid "trimming"
 msgstr ""
 
 #. TRANSLATORS: Cut Position
-#: locale/ipp-strings.c:4362
+#: locale/ipp-strings.c:4400
 msgid "trimming-offset"
 msgstr ""
 
 #. TRANSLATORS: Cut Edge
-#: locale/ipp-strings.c:4364
+#: locale/ipp-strings.c:4402
 msgid "trimming-reference-edge"
 msgstr ""
 
 #. TRANSLATORS: Bottom
-#: locale/ipp-strings.c:4366
+#: locale/ipp-strings.c:4404
 msgid "trimming-reference-edge.bottom"
 msgstr ""
 
 #. TRANSLATORS: Left
-#: locale/ipp-strings.c:4368
+#: locale/ipp-strings.c:4406
 msgid "trimming-reference-edge.left"
 msgstr ""
 
 #. TRANSLATORS: Right
-#: locale/ipp-strings.c:4370
+#: locale/ipp-strings.c:4408
 msgid "trimming-reference-edge.right"
 msgstr ""
 
 #. TRANSLATORS: Top
-#: locale/ipp-strings.c:4372
+#: locale/ipp-strings.c:4410
 msgid "trimming-reference-edge.top"
 msgstr ""
 
 #. TRANSLATORS: Type of Cut
-#: locale/ipp-strings.c:4374
+#: locale/ipp-strings.c:4412
 msgid "trimming-type"
 msgstr ""
 
 #. TRANSLATORS: Draw Line
-#: locale/ipp-strings.c:4376
+#: locale/ipp-strings.c:4414
 msgid "trimming-type.draw-line"
 msgstr ""
 
 #. TRANSLATORS: Full
-#: locale/ipp-strings.c:4378
+#: locale/ipp-strings.c:4416
 msgid "trimming-type.full"
 msgstr ""
 
 #. TRANSLATORS: Partial
-#: locale/ipp-strings.c:4380
+#: locale/ipp-strings.c:4418
 msgid "trimming-type.partial"
 msgstr ""
 
 #. TRANSLATORS: Perforate
-#: locale/ipp-strings.c:4382
+#: locale/ipp-strings.c:4420
 msgid "trimming-type.perforate"
 msgstr ""
 
 #. TRANSLATORS: Score
-#: locale/ipp-strings.c:4384
+#: locale/ipp-strings.c:4422
 msgid "trimming-type.score"
 msgstr ""
 
 #. TRANSLATORS: Tab
-#: locale/ipp-strings.c:4386
+#: locale/ipp-strings.c:4424
 msgid "trimming-type.tab"
 msgstr ""
 
 #. TRANSLATORS: Cut After
-#: locale/ipp-strings.c:4388
+#: locale/ipp-strings.c:4426
 msgid "trimming-when"
 msgstr ""
 
 #. TRANSLATORS: Every Document
-#: locale/ipp-strings.c:4390
+#: locale/ipp-strings.c:4428
 msgid "trimming-when.after-documents"
 msgstr ""
 
 #. TRANSLATORS: Job
-#: locale/ipp-strings.c:4392
+#: locale/ipp-strings.c:4430
 msgid "trimming-when.after-job"
 msgstr ""
 
 #. TRANSLATORS: Every Set
-#: locale/ipp-strings.c:4394
+#: locale/ipp-strings.c:4432
 msgid "trimming-when.after-sets"
 msgstr ""
 
 #. TRANSLATORS: Every Page
-#: locale/ipp-strings.c:4396
+#: locale/ipp-strings.c:4434
 msgid "trimming-when.after-sheets"
 msgstr ""
 
 #. TRANSLATORS: X Accuracy
-#: locale/ipp-strings.c:4398
+#: locale/ipp-strings.c:4436
 msgid "x-accuracy"
 msgstr ""
 
 #. TRANSLATORS: X Dimension
-#: locale/ipp-strings.c:4400
+#: locale/ipp-strings.c:4438
 msgid "x-dimension"
 msgstr ""
 
 #. TRANSLATORS: X Offset
-#: locale/ipp-strings.c:4402
+#: locale/ipp-strings.c:4440
 msgid "x-offset"
 msgstr ""
 
 #. TRANSLATORS: X Origin
-#: locale/ipp-strings.c:4404
+#: locale/ipp-strings.c:4442
 msgid "x-origin"
 msgstr ""
 
 #. TRANSLATORS: Y Accuracy
-#: locale/ipp-strings.c:4406
+#: locale/ipp-strings.c:4444
 msgid "y-accuracy"
 msgstr ""
 
 #. TRANSLATORS: Y Dimension
-#: locale/ipp-strings.c:4408
+#: locale/ipp-strings.c:4446
 msgid "y-dimension"
 msgstr ""
 
 #. TRANSLATORS: Y Offset
-#: locale/ipp-strings.c:4410
+#: locale/ipp-strings.c:4448
 msgid "y-offset"
 msgstr ""
 
 #. TRANSLATORS: Y Origin
-#: locale/ipp-strings.c:4412
+#: locale/ipp-strings.c:4450
 msgid "y-origin"
 msgstr ""
 
 #. TRANSLATORS: Z Accuracy
-#: locale/ipp-strings.c:4414
+#: locale/ipp-strings.c:4452
 msgid "z-accuracy"
 msgstr ""
 
 #. TRANSLATORS: Z Dimension
-#: locale/ipp-strings.c:4416
+#: locale/ipp-strings.c:4454
 msgid "z-dimension"
 msgstr ""
 
 #. TRANSLATORS: Z Offset
-#: locale/ipp-strings.c:4418
+#: locale/ipp-strings.c:4456
 msgid "z-offset"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/debconf.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/debconf.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/debconf.po	2020-01-23 16:52:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/debconf.po	2020-07-08 13:54:01.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:42+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: ../Debconf/AutoSelect.pm:88
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/dpkg-dev.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/dpkg-dev.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/dpkg-dev.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/dpkg-dev.po	2020-07-08 13:54:00.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:44+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:39+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: scripts/dpkg-architecture.pl scripts/dpkg-buildflags.pl
 #: scripts/dpkg-buildpackage.pl scripts/dpkg-checkbuilddeps.pl
@@ -544,8 +544,9 @@
 #: scripts/dpkg-gencontrol.pl scripts/dpkg-mergechangelogs.pl
 #: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/IPC.pm
 #: scripts/Dpkg/Interface/Storable.pm scripts/Dpkg/Source/Functions.pm
-#: scripts/Dpkg/Source/Package.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Package/V3/Quilt.pm scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm scripts/Dpkg/Source/Package.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Package/V3/Quilt.pm
+#: scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot write %s"
 msgstr "无法写入 %s"
@@ -629,7 +630,7 @@
 msgid "missing Priority for source files"
 msgstr "构建源文件中缺失了 Priority 字段"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/Vendor.pm
+#: scripts/dpkg-genchanges.pl scripts/Dpkg/Vendor.pm
 #, perl-format
 msgid "%s is empty"
 msgstr ""
@@ -671,10 +672,10 @@
 msgid "package %s in control file but not in files list"
 msgstr "控制文件声明了包 %s 但它却不在文件列表中"
 
-#: scripts/dpkg-genchanges.pl scripts/dpkg-source.pl scripts/Dpkg/BuildFlags.pm
-#: scripts/Dpkg/Compression/FileHandle.pm scripts/Dpkg/Interface/Storable.pm
-#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/Package/V2.pm
-#: scripts/Dpkg/Source/Quilt.pm
+#: scripts/Dpkg/BuildFlags.pm scripts/Dpkg/Compression/FileHandle.pm
+#: scripts/Dpkg/File.pm scripts/Dpkg/Interface/Storable.pm
+#: scripts/Dpkg/Shlibs/Objdump.pm scripts/Dpkg/Source/BinaryFiles.pm
+#: scripts/Dpkg/Source/Package/V2.pm scripts/Dpkg/Source/Quilt.pm
 #, perl-format
 msgid "cannot read %s"
 msgstr "无法读取 %s"
@@ -1385,7 +1386,8 @@
 msgid "shared libs info file '%s' line %d: bad line '%s'"
 msgstr ""
 
-#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Checksums.pm
+#: scripts/dpkg-shlibdeps.pl scripts/Dpkg/Changelog/Parse.pm
+#: scripts/Dpkg/Checksums.pm
 #, perl-format
 msgid "cannot open file %s"
 msgstr "无法打开文件 %s"
@@ -1431,7 +1433,7 @@
 msgid "directory argument %s is not a directory"
 msgstr "指定的目录参数 %s 实际不是一个目录"
 
-#: scripts/dpkg-source.pl scripts/Dpkg/Source/Package/V2.pm
+#: scripts/dpkg-source.pl scripts/Dpkg/Source/BinaryFiles.pm
 #: scripts/Dpkg/Source/Package/V3/Bzr.pm scripts/Dpkg/Source/Package/V3/Git.pm
 #, perl-format
 msgid "unable to chdir to '%s'"
@@ -2756,12 +2758,12 @@
 msgid "-b takes only one parameter with format '%s'"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm
 #, perl-format
 msgid "unwanted binary file: %s"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm
 #, perl-format
 msgid ""
 "detected %d unwanted binary file (add it in debian/source/include-binaries "
@@ -2840,7 +2842,7 @@
 msgid "cannot find an editor"
 msgstr ""
 
-#: scripts/Dpkg/Source/Package/V2.pm
+#: scripts/Dpkg/Source/BinaryFiles.pm
 #, perl-format
 msgid "adding %s to %s"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/dpkg.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/dpkg.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/dpkg.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/dpkg.po	2020-07-08 13:54:02.000000000 +0000
@@ -24,18 +24,18 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:43+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:38+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: lib/dpkg/ar.c
 msgid "failed to fstat archive"
-msgstr "fstat 包文件失败"
+msgstr "在包文件上执行 fstat 失败"
 
 #: lib/dpkg/ar.c
 #, c-format
 msgid "failed to read archive '%.255s'"
-msgstr "读取包文件 %.255s 失败"
+msgstr "读取归档 %.255s 失败"
 
 #: lib/dpkg/ar.c lib/dpkg/dbmodify.c
 #, c-format
@@ -145,7 +145,8 @@
 msgid "error creating new backup file '%s'"
 msgstr "新建备份文件 '%s' 时出错"
 
-#: lib/dpkg/atomic-file.c lib/dpkg/triglib.c src/infodb-upgrade.c src/remove.c
+#: lib/dpkg/atomic-file.c lib/dpkg/db-ctrl-upgrade.c lib/dpkg/triglib.c
+#: src/remove.c
 #, c-format
 msgid "cannot remove '%.250s'"
 msgstr "无法移除 %.250s"
@@ -185,7 +186,7 @@
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding input to gzip stream"
-msgstr "%s：将输入绑定到 gzip 流出错"
+msgstr "%s：将输入绑定到 gzip 流时出错"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -200,7 +201,7 @@
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding output to gzip stream"
-msgstr "%s：将输出绑定到 gzip 流出错"
+msgstr "%s：将输出绑定到 gzip 流时出错"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -220,7 +221,7 @@
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding input to bzip2 stream"
-msgstr "%s：将输入绑定到 bzip2 流失败"
+msgstr "%s：将输入绑定到 bzip2 流时失败"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -235,7 +236,7 @@
 #: lib/dpkg/compress.c
 #, c-format
 msgid "%s: error binding output to bzip2 stream"
-msgstr "%s：将输出绑定到 bzip2 流出错"
+msgstr "%s：将输出绑定到 bzip2 流时出错"
 
 #: lib/dpkg/compress.c
 #, c-format
@@ -277,7 +278,7 @@
 
 #: lib/dpkg/compress.c
 msgid "file format not recognized"
-msgstr "无法识别文件格式"
+msgstr "文件格式无法识别"
 
 #: lib/dpkg/compress.c
 msgid "unsupported type of integrity check"
@@ -377,37 +378,37 @@
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "failed to remove my own update file %.255s"
-msgstr "删除自身的更新文件 %.255s 失败"
+msgstr "删除自身的更新文件 %.255s 时失败"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to write updated status of '%.250s'"
-msgstr "无法写入 %.250s 的更新状态"
+msgstr "无法写入 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to flush updated status of '%.250s'"
-msgstr "无法刷新 %.250s 的更新状态"
+msgstr "无法刷新 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to truncate for updated status of '%.250s'"
-msgstr "无法截断 %.250s 的更新状态"
+msgstr "无法截断 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to fsync updated status of '%.250s'"
-msgstr "无法同步 %.250s 的更新状态"
+msgstr "无法同步 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to close updated status of '%.250s'"
-msgstr "无法关闭 %.250s 的更新状态"
+msgstr "无法关闭 %.250s 的新状态"
 
 #: lib/dpkg/dbmodify.c
 #, c-format
 msgid "unable to install updated status of '%.250s'"
-msgstr "无法安装 %.250s 的更新状态"
+msgstr "无法安装 %.250s 的新状态"
 
 #: lib/dpkg/deb-version.c
 msgid "format version with too big major component"
@@ -415,7 +416,7 @@
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty major component"
-msgstr "格式版本的主版本为空"
+msgstr "格式版本的主版本部分为空"
 
 #: lib/dpkg/deb-version.c
 msgid "format version has no dot"
@@ -427,11 +428,11 @@
 
 #: lib/dpkg/deb-version.c
 msgid "format version with empty minor component"
-msgstr "格式版本的次版本为空"
+msgstr "格式版本的次版本部分为空"
 
 #: lib/dpkg/deb-version.c
 msgid "format version followed by junk"
-msgstr "格式版本后缀多余"
+msgstr "格式版本含有多余成分"
 
 #: lib/dpkg/dir.c
 #, c-format
@@ -462,7 +463,7 @@
 #: lib/dpkg/dump.c
 #, c-format
 msgid "failed to write details of '%.50s' to '%.250s'"
-msgstr "将 %.50s 的详情写入至 %.250s 失败"
+msgstr "将 %.50s 的详情写入至 %.250s 时失败"
 
 #: lib/dpkg/dump.c
 #, c-format
@@ -472,7 +473,7 @@
 #: lib/dpkg/dump.c
 #, c-format
 msgid "failed to write %s database record about '%.50s' to '%.250s'"
-msgstr "将从 %2$.50s 到 %3$.250s 的资料写入 %1$s 数据库记录失败"
+msgstr "将关于 %2$.50s 的 %1$s 数据库记录写入 %3$.250s 时失败"
 
 #: lib/dpkg/ehandle.c utils/update-alternatives.c
 msgid "error"
@@ -509,7 +510,7 @@
 
 #: lib/dpkg/ehandle.c
 msgid "unrecoverable fatal error, aborting"
-msgstr "无法从致命错误中恢复，中止"
+msgstr "无法恢复的致命错误，中止"
 
 #: lib/dpkg/ehandle.c
 msgid "outside error context, aborting"
@@ -532,12 +533,12 @@
 #: lib/dpkg/fields.c
 #, c-format
 msgid "junk after %s"
-msgstr "忽略 %s 后的数据"
+msgstr "%s 后有多余内容"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "invalid package name (%.250s)"
-msgstr "软件包名称无效(%.250s)"
+msgstr "软件包名称无效 (%.250s)"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -561,7 +562,7 @@
 
 #: lib/dpkg/fields.c
 msgid "yes/no in boolean field"
-msgstr "布尔型字段的 yes/no"
+msgstr "布尔型字段中的 yes/no"
 
 #: lib/dpkg/fields.c
 msgid "foreign/allowed/same/no in quadstate field"
@@ -621,7 +622,7 @@
 #, c-format
 msgid ""
 "'%s' field, missing package name, or garbage where package name expected"
-msgstr "%s\" 字段缺少软件包名，或者填写的软件包名无意义"
+msgstr "%s\" 字段中缺少软件包名，或者填写的软件包名无效"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -633,7 +634,7 @@
 msgid ""
 "'%s' field, missing architecture name, or garbage where architecture name "
 "expected"
-msgstr "'%s' 字段缺少体系结构名，或者填写的体系结构名称无意义"
+msgstr "'%s' 字段缺少体系结构名，或者填写的体系结构名称无效"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -656,8 +657,8 @@
 "'%s' field, reference to '%.255s':\n"
 " '%c' is obsolete, use '%c=' or '%c%c' instead"
 msgstr ""
-"%s 字段，引用 %.255s :\n"
-"  %c  已被废弃，请使用 %c= 或者 %c%c"
+"'%s' 字段，引用 '%.255s' :\n"
+" '%c'  已被废弃，请使用 '%c=' 或者 '%c%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -665,8 +666,8 @@
 "'%s' field, reference to '%.255s':\n"
 " implicit exact match on version number, suggest using '=' instead"
 msgstr ""
-"%s 字段，引用 %.255s :\n"
-" 未明确要求版本号完全一致，建议使用 ‘=‘"
+"'%s' 字段，引用 '%.255s' :\n"
+" 未明确要求版本号完全一致，建议使用 '='"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -679,28 +680,28 @@
 "'%s' field, reference to '%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
-"%s 字段，引用 %.255s :\n"
+"'%s' 字段，引用 '%.255s' :\n"
 " 版本号以非字母数字字符开头，建议加一个空格"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': version contains '%c'"
-msgstr "%s 字段，引用 %.255s ：版本号含有 %c"
+msgstr "'%s' 字段，引用 '%.255s' ：版本号含有 '%c'"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': version unterminated"
-msgstr "%s 字段，引用 %.255s ：版本号未终止"
+msgstr "'%s' 字段，引用 '%.255s' ：版本号未终止"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, reference to '%.255s': error in version"
-msgstr "%s 字段，引用 %.255s ：版本号错误"
+msgstr "'%s' 字段，引用 '%.255s' ：版本号错误"
 
 #: lib/dpkg/fields.c
 #, c-format
 msgid "'%s' field, syntax error after reference to package '%.255s'"
-msgstr "%s 字段，在引用软件包 %.255s 后有语法错误"
+msgstr "'%s' 字段，在引用软件包 '%.255s' 后有语法错误"
 
 #: lib/dpkg/fields.c
 #, c-format
@@ -773,7 +774,7 @@
 
 #: lib/dpkg/log.c
 msgid "<package status and progress file descriptor>"
-msgstr "<包状态和进度文件描述符>"
+msgstr "<软件包状态和进度文件描述符>"
 
 #: lib/dpkg/log.c
 #, c-format
@@ -896,7 +897,7 @@
 #: lib/dpkg/options.c dpkg-split/main.c
 #, c-format
 msgid "invalid integer for --%s: '%.250s'"
-msgstr "--%s 有一个无效的整数： %.250s"
+msgstr "--%s 接受到无效的整数： %.250s"
 
 #: lib/dpkg/options.c
 #, c-format
@@ -1165,7 +1166,7 @@
 msgid "rm command for cleanup"
 msgstr "用于清理的 rm 命令"
 
-#: lib/dpkg/pkg-db.c lib/dpkg/pkg-spec.c
+#: lib/dpkg/pkg-hash.c lib/dpkg/pkg-spec.c
 #, c-format
 msgid "ambiguous package name '%s' with more than one installed instance"
 msgstr "软件包名 '%s' 含糊不清， 它有一个以上的安装实例"
@@ -1185,7 +1186,7 @@
 
 #: lib/dpkg/pkg-show.c
 msgid "(no description available)"
-msgstr "(无可用描述)"
+msgstr "(无描述)"
 
 #: lib/dpkg/pkg-show.c
 #, c-format
@@ -1277,7 +1278,7 @@
 #: lib/dpkg/treewalk.c
 #, c-format
 msgid "treewalk root %s is not a directory"
-msgstr "treewalk 根节点 %s 不是一个目录"
+msgstr "treewalk 的根节点 %s 不是一个目录"
 
 #: lib/dpkg/trigdeferred.c
 #, c-format
@@ -1493,7 +1494,7 @@
 msgid "error creating device '%.255s'"
 msgstr "新建设备文件 %.255s 时出错"
 
-#: src/archives.c src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-upgrade.c src/archives.c
 #, c-format
 msgid "error creating hard link '%.255s'"
 msgstr "新建硬链接 %.255s 时出错"
@@ -1794,10 +1795,10 @@
 msgid "archive '%s' is not a regular file"
 msgstr "归档 '%s' 不是普通文件"
 
-#: src/archives.c src/divertcmd.c src/enquiry.c src/main.c src/packages.c
-#: src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c src/verify.c
-#: dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c dpkg-deb/main.c
-#: dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
+#: src/archives.c src/divertcmd.c src/enquiry.c src/force.c src/main.c
+#: src/packages.c src/querycmd.c src/select.c src/statcmd.c src/trigcmd.c
+#: src/verify.c dpkg-deb/build.c dpkg-deb/extract.c dpkg-deb/info.c
+#: dpkg-deb/main.c dpkg-split/info.c dpkg-split/main.c dpkg-split/queue.c
 msgid "<standard output>"
 msgstr "<标准输出>"
 
@@ -2219,12 +2220,12 @@
 #: src/depcon.c
 #, c-format
 msgid "  %.250s is unpacked, but has never been configured.\n"
-msgstr "  已解包 %.250s，但仍未配置。\n"
+msgstr "  已解压 %.250s，但仍未配置。\n"
 
 #: src/depcon.c
 #, c-format
 msgid "  %.250s is unpacked, but is version %.250s.\n"
-msgstr "  已解包 %.250s，但它的版本是 %.250s。\n"
+msgstr "  已解压 %.250s，但它的版本是 %.250s。\n"
 
 #: src/depcon.c
 #, c-format
@@ -2436,7 +2437,7 @@
 #: src/divertcmd.c
 #, c-format
 msgid "diversion of %s to %s by %s"
-msgstr "%3$s 导致 %1$s 转移到 %2$s"
+msgstr "通过 %3$s 从 %1$s 到 %2$s 的转移"
 
 #: src/divertcmd.c
 #, c-format
@@ -2465,7 +2466,7 @@
 #: src/divertcmd.c
 #, c-format
 msgid "Leaving '%s'\n"
-msgstr "正在离开 %s\n"
+msgstr "正在忽略 %s\n"
 
 #: src/divertcmd.c
 #, c-format
@@ -2528,15 +2529,15 @@
 msgid "divert-to may not contain newlines"
 msgstr "转移目标名不可以含有换行符"
 
-#: src/divertdb.c
+#: lib/dpkg/db-fsys-divert.c
 msgid "failed to open diversions file"
 msgstr "无法打开转移文件"
 
-#: src/divertdb.c
+#: lib/dpkg/db-fsys-divert.c
 msgid "failed to fstat diversions file"
 msgstr "无法 fstat 转移文件"
 
-#: src/divertdb.c
+#: lib/dpkg/db-fsys-divert.c
 #, c-format
 msgid "conflicting diversions involving '%.250s' or '%.250s'"
 msgstr "转移项间存在着冲突关系， %.250s 和 %.250s 中只能取其一"
@@ -2820,26 +2821,26 @@
 "Package %s is on hold, not touching it.  Use --force-hold to override.\n"
 msgstr "软件包 %s 被要求保持原来的版本，因而不会去改动它。请使用 --force-hold 选项来忽略该设置。\n"
 
-#: src/errors.c
+#: src/force.c
 msgid "overriding problem because --force enabled:"
 msgstr "由于开启了 --force 选项，以下问题被忽略："
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing final newline"
 msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少结尾换行符"
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing value"
 msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值"
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' is missing value separator"
 msgstr "软件包 '%2$s' 的控制文件 '%1$s' 缺少值分隔符"
 
-#: src/filesdb-hash.c
+#: lib/dpkg/db-fsys-digest.c
 #, c-format
 msgid "control file '%s' for package '%s' contains empty filename"
 msgstr "软件包 '%2$s' 的控制文件 '%1$s' 含有空文件名"
@@ -2874,7 +2875,7 @@
 msgid "unable to open files list file for package '%.250s'"
 msgstr "无法打开软件包 %.250s 的文件名列表文件"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid ""
 "files list file for package '%.250s' missing; assuming package has no files "
@@ -2896,12 +2897,12 @@
 msgid "reading files list for package '%.250s'"
 msgstr "正在读取软件包 %.250s 的文件列表"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid "files list file for package '%.250s' is missing final newline"
 msgstr "软件包 %.250s 的文件名列表文件缺少最后结尾的换行符"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid "files list file for package '%.250s' contains empty filename"
 msgstr "软件包 %.250s 的文件名列表文件含有空的文件名"
@@ -2911,11 +2912,11 @@
 msgid "error closing files list file for package '%.250s'"
 msgstr "关闭软件包 %.250s 的文件名列表文件时出错"
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 msgid "(Reading database ... "
 msgstr "(正在读取数据库 ... "
 
-#: src/filesdb.c
+#: lib/dpkg/db-fsys-files.c
 #, c-format
 msgid "%d file or directory currently installed.)\n"
 msgid_plural "%d files and directories currently installed.)\n"
@@ -2935,7 +2936,7 @@
 
 #: src/help.c
 msgid "unpacked but not configured"
-msgstr "已解包，但尚未配置"
+msgstr "已解压，但尚未配置"
 
 #: src/help.c
 msgid "broken due to postinst failure"
@@ -2979,37 +2980,37 @@
 "Note: root's PATH should usually contain /usr/local/sbin, /usr/sbin and /sbin"
 msgstr "提示：root 的 PATH 环境变量通常应当包含 /usr/local/sbin、/usr/sbin 和 /sbin"
 
-#: src/infodb-access.c
+#: lib/dpkg/db-ctrl-access.c
 #, c-format
 msgid "unable to check existence of '%.250s'"
 msgstr "无法判断 %.250s 是否存在"
 
-#: src/infodb-access.c src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-access.c lib/dpkg/db-ctrl-upgrade.c
 msgid "cannot read info directory"
 msgstr "无法读取 info 目录"
 
-#: src/infodb-format.c src/unpack.c
+#: lib/dpkg/db-ctrl-format.c src/unpack.c
 #, c-format
 msgid "error trying to open %.250s"
 msgstr "试图打开 %.250s 出错"
 
-#: src/infodb-format.c
+#: lib/dpkg/db-ctrl-format.c
 #, c-format
 msgid "corrupt info database format file '%s'"
 msgstr "损坏的信息库格式文件 %s"
 
-#: src/infodb-format.c
+#: lib/dpkg/db-ctrl-format.c
 #, c-format
 msgid ""
 "info database format (%d) is bogus or too new; try getting a newer dpkg"
 msgstr "信息数据库格式(%d)是伪造的或者太新；建议尝试新版本的 dpkg"
 
-#: src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-upgrade.c
 #, c-format
 msgid "info file %s/%s not associated to any package"
 msgstr "info 文件 %s/%s 与任何软件包都无关"
 
-#: src/infodb-upgrade.c
+#: lib/dpkg/db-ctrl-upgrade.c
 #, c-format
 msgid "error while writing '%s'"
 msgstr "写入 %s 时发生错误"
@@ -3248,67 +3249,67 @@
 "\n"
 "带有 [*] 的选项将会输出较大篇幅的文字 - 可使用管道将其输出连接到 less 或 more ！"
 
-#: src/main.c
+#: src/force.c
 msgid "Set all force options"
 msgstr "设置所有的强制选项"
 
-#: src/main.c
+#: src/force.c
 msgid "Replace a package with a lower version"
 msgstr "以旧版本的软件包来代替现有软件包"
 
-#: src/main.c
+#: src/force.c
 msgid "Configure any package which may help this one"
 msgstr "配置任何可能与这有关的软件包"
 
-#: src/main.c
+#: src/force.c
 msgid "Process incidental packages even when on hold"
 msgstr "处理意外的软件包，即使它处于搁置状态"
 
-#: src/main.c
+#: src/force.c
 msgid "Try to (de)install things even when not root"
 msgstr "以非 root 权限尝试（反）安装这些东西"
 
-#: src/main.c
+#: src/force.c
 msgid "PATH is missing important programs, problems likely"
 msgstr "环境变量 PATH 里缺失重要的程序，问题可能"
 
-#: src/main.c
+#: src/force.c
 msgid "Install a package even if it fails authenticity check"
 msgstr "安装一个软件包，即使它的真实性检查失败"
 
-#: src/main.c
+#: src/force.c
 msgid "Process even packages with wrong versions"
 msgstr "继续处理，即使软件包版本错误"
 
-#: src/main.c
+#: src/force.c
 msgid "Overwrite a file from one package with another"
 msgstr "将一个软件包的文件覆盖到另一个包的文件上"
 
-#: src/main.c
+#: src/force.c
 msgid "Overwrite a diverted file with an undiverted version"
 msgstr "以原封未动的文件覆盖一个转移文件"
 
-#: src/main.c
+#: src/force.c
 msgid "Overwrite one package's directory with another's file"
 msgstr "用其他软件包的文件覆盖一个软件包的目录"
 
-#: src/main.c
+#: src/force.c
 msgid "Do not perform safe I/O operations when unpacking"
-msgstr "不要在解包的时候进行安全I/O操作"
+msgstr "不要在解压的时候进行安全I/O操作"
 
-#: src/main.c
+#: src/force.c
 msgid "Do not chroot into maintainer script environment"
 msgstr "不要 chroot 到维护者脚本环境中"
 
-#: src/main.c
+#: src/force.c
 msgid "Always use the new config files, don't prompt"
 msgstr "总是使用新的配置文件，不提示"
 
-#: src/main.c
+#: src/force.c
 msgid "Always use the old config files, don't prompt"
 msgstr "总是使用旧的配置文件，不提示"
 
-#: src/main.c
+#: src/force.c
 msgid ""
 "Use the default option for new config files if one\n"
 "is available, don't prompt. If no default can be found,\n"
@@ -3319,39 +3320,39 @@
 "如果找不到默认设置，将会有提示，除非打开\n"
 "confold 或 confnew 选项"
 
-#: src/main.c
+#: src/force.c
 msgid "Always install missing config files"
 msgstr "总是安装缺失的配置文件"
 
-#: src/main.c
+#: src/force.c
 msgid "Offer to replace config files with no new versions"
 msgstr "建议不以新版本配置文件取代原有版本"
 
-#: src/main.c
+#: src/force.c
 msgid "Process even packages with wrong or no architecture"
 msgstr "继续处理，即使软件包没有体系结构或者体系结构错误"
 
-#: src/main.c
+#: src/force.c
 msgid "Install even if it would break another package"
 msgstr "继续安装，即使它会损坏另一个软件包"
 
-#: src/main.c
+#: src/force.c
 msgid "Allow installation of conflicting packages"
 msgstr "允许安装存在冲突的软件包"
 
-#: src/main.c
+#: src/force.c
 msgid "Turn all dependency problems into warnings"
 msgstr "将所有依赖问题转为警告"
 
-#: src/main.c
+#: src/force.c
 msgid "Turn dependency version problems into warnings"
 msgstr "将所有依赖版本问题转为警告"
 
-#: src/main.c
+#: src/force.c
 msgid "Remove packages which require installation"
 msgstr "移除要求安装的软件包"
 
-#: src/main.c
+#: src/force.c
 msgid "Remove an essential package"
 msgstr "移除一个至关重要的软件包"
 
@@ -3483,7 +3484,7 @@
 msgid "cannot remove architecture '%s' currently in use by the database"
 msgstr "无法移除体系结构 %s ，当前它仍被数据库使用"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid ""
 "%s forcing options - control behaviour when problems found:\n"
@@ -3496,7 +3497,7 @@
 "  遇错即停:           --refuse-<手段>,<手段>,... | --no-force-<手段>,...\n"
 " 可强制执行的“手段”:\n"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid ""
 "\n"
@@ -3507,12 +3508,12 @@
 "【警告】- 使用标记有 [!] 的选项会严重破坏您的安装。\n"
 "标记有 [*] 的强制选项默认为开启。\n"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid "unknown force/refuse option '%.*s'"
 msgstr "无法识别的 force/refuse 选项 %.*s"
 
-#: src/main.c
+#: src/force.c
 #, c-format
 msgid "obsolete force/refuse option '%s'"
 msgstr "废弃的强制或拒绝选项 '%s'"
@@ -4194,43 +4195,43 @@
 msgid "--update is useless for --remove"
 msgstr "对于 --remove，--update 是无效的"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride uid %s"
 msgstr "无效的 statoverride 用户ID(uid) %s"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride gid %s"
 msgstr "无效的 statoverride 组ID(gid) %s"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "invalid statoverride mode %s"
 msgstr "无效的 statoverride 权限位(mode) %s"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "failed to open statoverride file"
 msgstr "无法打开 statoverride 文件"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "failed to fstat statoverride file"
 msgstr "无法 fstat statoverride 文件"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "reading statoverride file '%.250s'"
 msgstr "读取 statoverride 文件 '%.250s'"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "statoverride file is missing final newline"
 msgstr "statoverride 文件结尾处缺失换行符"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "statoverride file contains empty line"
 msgstr "statoverride 文件含有空行"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "syntax error in statoverride file"
 msgstr "statoverride 文件中有语法错误"
 
@@ -4239,7 +4240,7 @@
 msgid "unknown user '%s' in statoverride file"
 msgstr "在 statoverride 文件中有未知用户 '%s'"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 msgid "unexpected end of line in statoverride file"
 msgstr "statoverride 文件有非预期的行结束符"
 
@@ -4248,7 +4249,7 @@
 msgid "unknown group '%s' in statoverride file"
 msgstr "statoverride 文件有无效组 %s"
 
-#: src/statdb.c
+#: lib/dpkg/db-fsys-override.c
 #, c-format
 msgid "multiple statoverrides present for file '%.250s'"
 msgstr "存在多个 statoverride 用于文件  %.250s"
@@ -4573,22 +4574,22 @@
 #: src/unpack.c
 #, c-format
 msgid "package architecture (%s) does not match system (%s)"
-msgstr "软件包体系架构(%s)与本机系统体系结构(%s)不符"
+msgstr "软件包体系结构(%s)与本机系统体系结构(%s)不符"
 
 #: src/unpack.c
 #, c-format
 msgid "Preparing to unpack %s ...\n"
-msgstr "正准备解包 %s  ...\n"
+msgstr "准备解压 %s  ...\n"
 
 #: src/unpack.c
 #, c-format
 msgid "Unpacking %s (%s) ...\n"
-msgstr "正在解包 %s (%s) ...\n"
+msgstr "正在解压 %s (%s) ...\n"
 
 #: src/unpack.c
 #, c-format
 msgid "Unpacking %s (%s) over (%s) ...\n"
-msgstr "正在将 %s (%s) 解包到 (%s) 上 ...\n"
+msgstr "正在解压 %s (%s) 并覆盖 (%s) ...\n"
 
 #: src/unpack.c
 msgid "package filesystem archive extraction"
@@ -4856,7 +4857,7 @@
 
 #: dpkg-deb/extract.c
 msgid "archive has no newlines in header"
-msgstr "包文件的文件头中没有换行"
+msgstr "归档文件的文件头中没有换行"
 
 #: dpkg-deb/extract.c
 #, c-format
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/dselect.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/dselect.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/dselect.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/dselect.po	2020-07-08 13:54:02.000000000 +0000
@@ -18,8 +18,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:44+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:39+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: dselect/basecmds.cc
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/duplicity.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/duplicity.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/duplicity.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/duplicity.po	2020-07-08 13:54:03.000000000 +0000
@@ -15,48 +15,48 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:15+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:04+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: ../duplicity/dup_main.py:121
+#: ../duplicity/dup_main.py:111
 msgid "Reuse configured PASSPHRASE as SIGN_PASSPHRASE"
 msgstr "SIGN_PASSPHRASE 重用 PASSPHRASE 的配置。"
 
-#: ../duplicity/dup_main.py:128
+#: ../duplicity/dup_main.py:118
 msgid "Reuse configured SIGN_PASSPHRASE as PASSPHRASE"
 msgstr "PASSPHRASE 重用 SIGN_PASSPHRASE 的配置。"
 
-#: ../duplicity/dup_main.py:167
+#: ../duplicity/dup_main.py:157
 msgid "PASSPHRASE variable not set, asking user."
 msgstr "变量 PASSPHRASE 未设置，询问用户。"
 
-#: ../duplicity/dup_main.py:182
+#: ../duplicity/dup_main.py:172
 msgid "GnuPG passphrase for signing key:"
 msgstr "GnuPG 签名密钥的密码："
 
-#: ../duplicity/dup_main.py:187
+#: ../duplicity/dup_main.py:177
 msgid "GnuPG passphrase:"
 msgstr "GnuPG 密码："
 
-#: ../duplicity/dup_main.py:192
+#: ../duplicity/dup_main.py:182
 msgid "Retype passphrase for signing key to confirm: "
 msgstr "请再次输入签名密钥的密码： "
 
-#: ../duplicity/dup_main.py:194
+#: ../duplicity/dup_main.py:184
 msgid "Retype passphrase to confirm: "
 msgstr "请再次输入密码： "
 
-#: ../duplicity/dup_main.py:197
+#: ../duplicity/dup_main.py:187
 msgid "First and second passphrases do not match!  Please try again."
 msgstr "两次输入的密码不匹配，请重试!"
 
-#: ../duplicity/dup_main.py:204
+#: ../duplicity/dup_main.py:194
 msgid ""
 "Cannot use empty passphrase with symmetric encryption!  Please try again."
 msgstr "对称加密不能使用空密码，请重试！"
 
-#: ../duplicity/dup_main.py:261
+#: ../duplicity/dup_main.py:251
 #, python-format
 msgid ""
 "File %s complete in backup set.\n"
@@ -65,7 +65,7 @@
 "文件 %s 已完成备份。\n"
 "从文件 %s 开始重启备份。"
 
-#: ../duplicity/dup_main.py:270
+#: ../duplicity/dup_main.py:260
 #, python-format
 msgid ""
 "File %s missing in backup set.\n"
@@ -74,217 +74,217 @@
 "文件 %s 未完成备份。\n"
 "从文件 %s 开始重启备份。"
 
-#: ../duplicity/dup_main.py:319
+#: ../duplicity/dup_main.py:309
 #, python-format
 msgid "File %s was corrupted during upload."
 msgstr "文件 %s 上传时出错。"
 
-#: ../duplicity/dup_main.py:359
+#: ../duplicity/dup_main.py:349
 msgid ""
 "Restarting backup, but current encryption settings do not match original "
 "settings"
 msgstr "正在重启备份，然而当前加密设置与原设置不匹配"
 
-#: ../duplicity/dup_main.py:382
+#: ../duplicity/dup_main.py:372
 #, python-format
 msgid "Restarting after volume %s, file %s, block %s"
 msgstr "从卷 %s，文件 %s，块 %s 之后重启备份。"
 
-#: ../duplicity/dup_main.py:452
+#: ../duplicity/dup_main.py:442
 #, python-format
 msgid "Processed volume %d"
 msgstr "已处理的卷 %d"
 
-#: ../duplicity/dup_main.py:602
+#: ../duplicity/dup_main.py:592
 msgid ""
 "Fatal Error: Unable to start incremental backup.  Old signatures not found "
 "and incremental specified"
 msgstr "致命错误：没有旧签名，无法启动增量备份。"
 
-#: ../duplicity/dup_main.py:606
+#: ../duplicity/dup_main.py:596
 msgid "No signatures found, switching to full backup."
 msgstr "找不到签名，转换到完全备份。"
 
-#: ../duplicity/dup_main.py:620
+#: ../duplicity/dup_main.py:610
 msgid "Backup Statistics"
 msgstr "备份统计"
 
-#: ../duplicity/dup_main.py:726
+#: ../duplicity/dup_main.py:716
 #, python-format
 msgid "%s not found in archive - no files restored."
 msgstr "存档中没有 %s - 没有进行任何还原。"
 
-#: ../duplicity/dup_main.py:730
+#: ../duplicity/dup_main.py:720
 msgid "No files found in archive - nothing restored."
 msgstr "存档中找不到文件 - 没有进行任何还原。"
 
-#: ../duplicity/dup_main.py:763
+#: ../duplicity/dup_main.py:753
 #, python-format
 msgid "Processed volume %d of %d"
 msgstr "已处理 %d 卷，共 %d 卷"
 
-#: ../duplicity/dup_main.py:797
+#: ../duplicity/dup_main.py:787
 #, python-format
 msgid "Invalid data - %s hash mismatch for file:"
 msgstr "无效的数据 -  %s hash 值与文件不匹配："
 
-#: ../duplicity/dup_main.py:800
+#: ../duplicity/dup_main.py:790
 #, python-format
 msgid "Calculated hash: %s"
 msgstr "计算的 hash 值：%s"
 
-#: ../duplicity/dup_main.py:801
+#: ../duplicity/dup_main.py:791
 #, python-format
 msgid "Manifest hash: %s"
 msgstr "清单的 hash 值：%s"
 
-#: ../duplicity/dup_main.py:844
+#: ../duplicity/dup_main.py:834
 #, python-format
 msgid "Volume was signed by key %s, not %s"
 msgstr "该卷由 %s 证书签名，而非 %s"
 
-#: ../duplicity/dup_main.py:876
+#: ../duplicity/dup_main.py:866
 #, python-format
 msgid "Verify complete: %s, %s."
 msgstr "完成验证：%s，%s。"
 
-#: ../duplicity/dup_main.py:877
+#: ../duplicity/dup_main.py:867
 #, python-format
 msgid "%d file compared"
 msgid_plural "%d files compared"
 msgstr[0] "已比较 %d 文件"
 
-#: ../duplicity/dup_main.py:879
+#: ../duplicity/dup_main.py:869
 #, python-format
 msgid "%d difference found"
 msgid_plural "%d differences found"
 msgstr[0] "找到 %d 项差异"
 
-#: ../duplicity/dup_main.py:898
+#: ../duplicity/dup_main.py:888
 msgid "No extraneous files found, nothing deleted in cleanup."
 msgstr "未发现无关的文件，本次清理没有删除任何文件。"
 
-#: ../duplicity/dup_main.py:903
+#: ../duplicity/dup_main.py:893
 msgid "Deleting this file from backend:"
 msgid_plural "Deleting these files from backend:"
 msgstr[0] "从后台中删除此文件："
 
-#: ../duplicity/dup_main.py:914
+#: ../duplicity/dup_main.py:904
 msgid "Found the following file to delete:"
 msgid_plural "Found the following files to delete:"
 msgstr[0] "找到以下要删除的文件："
 
-#: ../duplicity/dup_main.py:917
+#: ../duplicity/dup_main.py:907
 msgid "Run duplicity again with the --force option to actually delete."
 msgstr "用 --force 选项重新运行 duplicity 以执行删除操作。"
 
-#: ../duplicity/dup_main.py:960
+#: ../duplicity/dup_main.py:950
 msgid "There are backup set(s) at time(s):"
 msgstr "已有备份集："
 
-#: ../duplicity/dup_main.py:962
+#: ../duplicity/dup_main.py:952
 msgid "Which can't be deleted because newer sets depend on them."
 msgstr "这些备份集被新的备份所依赖，不能被删除。"
 
-#: ../duplicity/dup_main.py:966
+#: ../duplicity/dup_main.py:956
 msgid ""
 "Current active backup chain is older than specified time.  However, it will "
 "not be deleted.  To remove all your backups, manually purge the repository."
 msgstr "当前活动备份链已超出指定的寿命，但是不会被删除。要删除所有备份，请手动清理仓库。"
 
-#: ../duplicity/dup_main.py:979
+#: ../duplicity/dup_main.py:969
 msgid "No old backup sets found, nothing deleted."
 msgstr "未发现旧备份，没有删除任何文件。"
 
-#: ../duplicity/dup_main.py:982
+#: ../duplicity/dup_main.py:972
 msgid "Deleting backup chain at time:"
 msgid_plural "Deleting backup chains at times:"
 msgstr[0] "删除如下时间的备份链："
 
-#: ../duplicity/dup_main.py:994
+#: ../duplicity/dup_main.py:984
 #, python-format
 msgid "Deleting any incremental signature chain rooted at %s"
 msgstr ""
 
-#: ../duplicity/dup_main.py:996
+#: ../duplicity/dup_main.py:986
 #, python-format
 msgid "Deleting any incremental backup chain rooted at %s"
 msgstr ""
 
-#: ../duplicity/dup_main.py:999
+#: ../duplicity/dup_main.py:989
 #, python-format
 msgid "Deleting complete signature chain %s"
 msgstr "删除完全签名链 %s"
 
-#: ../duplicity/dup_main.py:1001
+#: ../duplicity/dup_main.py:991
 #, python-format
 msgid "Deleting complete backup chain %s"
 msgstr "删除完全备份链 %s"
 
-#: ../duplicity/dup_main.py:1007
+#: ../duplicity/dup_main.py:997
 msgid "Found old backup chain at the following time:"
 msgid_plural "Found old backup chains at the following times:"
 msgstr[0] "找到如下时间的旧备份链："
 
-#: ../duplicity/dup_main.py:1011
+#: ../duplicity/dup_main.py:1001
 msgid "Rerun command with --force option to actually delete."
 msgstr "用 --force 选项重新运行命令以执行删除。"
 
-#: ../duplicity/dup_main.py:1231
+#: ../duplicity/dup_main.py:1221
 #, python-format
 msgid "Deleting local %s (not authoritative at backend)."
 msgstr "删除本地 %s (不会作用在后台设备上)。"
 
-#: ../duplicity/dup_main.py:1236
+#: ../duplicity/dup_main.py:1226
 #, python-format
 msgid "Unable to delete %s: %s"
 msgstr "无法删除 %s：%s"
 
-#: ../duplicity/dup_main.py:1270 ../duplicity/dup_temp.py:271
+#: ../duplicity/dup_main.py:1260 ../duplicity/dup_temp.py:270
 #, python-format
 msgid "Failed to read %s: %s"
 msgstr "读取 %s 失败： %s"
 
-#: ../duplicity/dup_main.py:1284
+#: ../duplicity/dup_main.py:1274
 #, python-format
 msgid "Copying %s to local cache."
 msgstr "拷贝 %s 到本地缓冲。"
 
-#: ../duplicity/dup_main.py:1332
+#: ../duplicity/dup_main.py:1322
 msgid "Local and Remote metadata are synchronized, no sync needed."
 msgstr "本地和远程元数据已同步，无需再次同步。"
 
-#: ../duplicity/dup_main.py:1337
+#: ../duplicity/dup_main.py:1327
 msgid "Synchronizing remote metadata to local cache..."
 msgstr "同步远程元数据到本地缓冲..."
 
-#: ../duplicity/dup_main.py:1350
+#: ../duplicity/dup_main.py:1340
 msgid "Sync would copy the following from remote to local:"
 msgstr "同步将会从远程拷贝以下内容到本地："
 
-#: ../duplicity/dup_main.py:1353
+#: ../duplicity/dup_main.py:1343
 msgid "Sync would remove the following spurious local files:"
 msgstr "同步将会删除以下本地无效文件："
 
-#: ../duplicity/dup_main.py:1397
+#: ../duplicity/dup_main.py:1387
 msgid "Unable to get free space on temp."
 msgstr "无法申请临时空闲空间。"
 
-#: ../duplicity/dup_main.py:1405
+#: ../duplicity/dup_main.py:1395
 #, python-format
 msgid "Temp space has %d available, backup needs approx %d."
 msgstr "临时空间还剩余 %d，备份需要大约 %d。"
 
-#: ../duplicity/dup_main.py:1408
+#: ../duplicity/dup_main.py:1398
 #, python-format
 msgid "Temp has %d available, backup will use approx %d."
 msgstr "临时空间还剩余 %d，备份需要大约 %d。"
 
-#: ../duplicity/dup_main.py:1416
+#: ../duplicity/dup_main.py:1406
 msgid "Unable to get max open files."
 msgstr "无法获取打开文件数的上限。"
 
-#: ../duplicity/dup_main.py:1420
+#: ../duplicity/dup_main.py:1410
 #, python-format
 msgid ""
 "Max open files of %s is too low, should be >= 1024.\n"
@@ -293,7 +293,7 @@
 "%s 的打开文件数上限太低，该数值需要 >= 1024。\n"
 "请通过 ulimit -n 1024 更正设置。\n"
 
-#: ../duplicity/dup_main.py:1472
+#: ../duplicity/dup_main.py:1462
 msgid ""
 "RESTART: The first volume failed to upload before termination.\n"
 "         Restart is impossible...starting backup from beginning."
@@ -301,7 +301,7 @@
 "重启备份：第一个卷未能在结束前完成上传。\n"
 "         无法重启... 重头开始备份。"
 
-#: ../duplicity/dup_main.py:1478
+#: ../duplicity/dup_main.py:1468
 #, python-format
 msgid ""
 "RESTART: Volumes %d to %d failed to upload before termination.\n"
@@ -310,7 +310,7 @@
 "重启备份：卷 %d 到 %d 未能在结束前完成上传。\n"
 "         从卷 %d 开始重启备份。"
 
-#: ../duplicity/dup_main.py:1485
+#: ../duplicity/dup_main.py:1475
 #, python-format
 msgid ""
 "RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
@@ -322,7 +322,7 @@
 "         无法重启备份 ... duplicity 将会清除最近一部分备份 \n"
 "         然后重头开始备份。"
 
-#: ../duplicity/dup_main.py:1506
+#: ../duplicity/dup_main.py:1496
 msgid ""
 "\n"
 "PYTHONOPTIMIZE in the environment causes duplicity to fail to\n"
@@ -338,59 +338,59 @@
 "\n"
 "具体请查阅 https://bugs.launchpad.net/duplicity/+bug/931175\n"
 
-#: ../duplicity/dup_main.py:1529
+#: ../duplicity/dup_main.py:1519
 #, python-format
 msgid "Acquiring lockfile %s"
 msgstr ""
 
-#: ../duplicity/dup_main.py:1587
+#: ../duplicity/dup_main.py:1577
 #, python-format
 msgid "Last %s backup left a partial set, restarting."
 msgstr "最近 %s 备份遗留一个不完整备份集，重启备份。"
 
-#: ../duplicity/dup_main.py:1591
+#: ../duplicity/dup_main.py:1581
 #, python-format
 msgid "Cleaning up previous partial %s backup set, restarting."
 msgstr "正在清理遗留的不完整备份集 %s，并重启备份。"
 
-#: ../duplicity/dup_main.py:1603
+#: ../duplicity/dup_main.py:1593
 msgid "Last full backup date:"
 msgstr "最后一次完全备份日期："
 
-#: ../duplicity/dup_main.py:1605
+#: ../duplicity/dup_main.py:1595
 msgid "Last full backup date: none"
 msgstr "最后一次完全备份日期：无"
 
-#: ../duplicity/dup_main.py:1608
+#: ../duplicity/dup_main.py:1598
 msgid "Last full backup is too old, forcing full backup"
 msgstr "最后一次完全备份已过期，强制完全备份"
 
-#: ../duplicity/dup_main.py:1657
+#: ../duplicity/dup_main.py:1647
 msgid ""
 "When using symmetric encryption, the signing passphrase must equal the "
 "encryption passphrase."
 msgstr "使用对称加密时，必须采用相同的签名密码与加密密码。"
 
-#: ../bin/duplicity:120
+#: ../bin/duplicity:102
 msgid "INT intercepted...exiting."
 msgstr "收到 INT 信号 ... 正在退出。"
 
-#: ../bin/duplicity:128
+#: ../bin/duplicity:110
 #, python-format
 msgid "GPG error detail: %s"
 msgstr "GPG 错误详情：%s"
 
-#: ../bin/duplicity:138
+#: ../bin/duplicity:120
 #, python-format
 msgid "User error detail: %s"
 msgstr "用户错误详情：%s"
 
-#: ../bin/duplicity:148
+#: ../bin/duplicity:130
 #, python-format
 msgid "Backend error detail: %s"
 msgstr "后台设备错误详情：%s"
 
-#: ../bin/rdiffdir:64 ../duplicity/commandline.py:236
+#: ../bin/rdiffdir:64 ../duplicity/commandline.py:235
 #, python-format
 msgid "Error opening file %s"
 msgstr "打开文件 %s 时出错"
@@ -400,34 +400,34 @@
 msgid "File %s already exists, will not overwrite."
 msgstr "文件 %s 已存在，不进行覆盖。"
 
-#: ../duplicity/selection.py:121
+#: ../duplicity/selection.py:119
 #, python-format
 msgid "Skipping socket %s"
 msgstr "跳过套接字 %s"
 
-#: ../duplicity/selection.py:125
+#: ../duplicity/selection.py:123
 #, python-format
 msgid "Error initializing file %s"
 msgstr "初始化文件 %s 时出错"
 
-#: ../duplicity/selection.py:129 ../duplicity/selection.py:154
-#: ../duplicity/selection.py:458
+#: ../duplicity/selection.py:127 ../duplicity/selection.py:152
+#: ../duplicity/selection.py:452
 #, python-format
 msgid "Error accessing possibly locked file %s"
 msgstr "访问可能被锁定的文件 %s 时出错"
 
-#: ../duplicity/selection.py:169
+#: ../duplicity/selection.py:167
 #, python-format
 msgid "Warning: base %s doesn't exist, continuing"
 msgstr "警告：基本路径 %s 不存在，正在继续"
 
-#: ../duplicity/selection.py:172 ../duplicity/selection.py:190
-#: ../duplicity/selection.py:193
+#: ../duplicity/selection.py:170 ../duplicity/selection.py:188
+#: ../duplicity/selection.py:191
 #, python-format
 msgid "Selecting %s"
 msgstr "选择 %s"
 
-#: ../duplicity/selection.py:290
+#: ../duplicity/selection.py:288
 #, python-format
 msgid ""
 "Fatal Error: The file specification\n"
@@ -444,7 +444,7 @@
 "下的任何文件。正确的指定应当以基本路径或者\n"
 "匹配基本路径的模式 (如 '**') 开始。"
 
-#: ../duplicity/selection.py:299
+#: ../duplicity/selection.py:297
 #, python-format
 msgid ""
 "Fatal Error while processing expression\n"
@@ -453,7 +453,7 @@
 "处理正则表达式时发生致命错误\n"
 "%s"
 
-#: ../duplicity/selection.py:308
+#: ../duplicity/selection.py:306
 #, python-format
 msgid ""
 "Last selection expression:\n"
@@ -468,12 +468,12 @@
 "所有文件，所以表达式无效。鉴于表达式与\n"
 "您的真实意图可能不符，程序将会退出。"
 
-#: ../duplicity/selection.py:364
+#: ../duplicity/selection.py:362
 #, python-format
 msgid "Reading globbing filelist %s"
 msgstr "读取通配符文件列表 %s"
 
-#: ../duplicity/selection.py:397
+#: ../duplicity/selection.py:395
 #, python-format
 msgid "Error compiling regular expression %s"
 msgstr "解析正则表达式 %s 时出错"
@@ -486,7 +486,7 @@
 "警告：exclude-device-files 不是第一个选择器。\n"
 "这可能不是您的意图"
 
-#: ../duplicity/commandline.py:79
+#: ../duplicity/commandline.py:78
 #, python-format
 msgid ""
 "Warning: Option %s is pending deprecation and will be removed in a future "
@@ -496,7 +496,7 @@
 "警告：选项 %s 即将被放弃并在未来的版本中移除。\n"
 "强烈建议使用默认文件名。"
 
-#: ../duplicity/commandline.py:86
+#: ../duplicity/commandline.py:85
 #, python-format
 msgid ""
 "Warning: Option %s is pending deprecation and will be removed in a future "
@@ -507,7 +507,7 @@
 "警告：选项 %s 即将被放弃并在未来的版本中移除。\n"
 "请使用 --include-filelist 和 --exclude-filelist (可使用通配符)。"
 
-#: ../duplicity/commandline.py:96
+#: ../duplicity/commandline.py:95
 #, python-format
 msgid ""
 "Warning: Option %s is pending deprecation and will be removed in a future "
@@ -521,288 +521,288 @@
 "因此可以用 --include-filelist=/dev/stdin 或 --exclude-filelist=/dev/stdin\n"
 "进行替代。"
 
-#. Used in usage help to represent a Unix-style path name. Example:
+#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
 #. --archive-dir <path>
-#: ../duplicity/commandline.py:257 ../duplicity/commandline.py:267
-#: ../duplicity/commandline.py:288 ../duplicity/commandline.py:362
-#: ../duplicity/commandline.py:380 ../duplicity/commandline.py:612
-#: ../duplicity/commandline.py:645 ../duplicity/commandline.py:858
+#: ../duplicity/commandline.py:256 ../duplicity/commandline.py:266
+#: ../duplicity/commandline.py:287 ../duplicity/commandline.py:358
+#: ../duplicity/commandline.py:376 ../duplicity/commandline.py:608
+#: ../duplicity/commandline.py:641 ../duplicity/commandline.py:854
 msgid "path"
 msgstr "路径"
 
-#. Used in usage help to represent an ID for a GnuPG key. Example:
+#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
 #. --encrypt-key <gpg_key_id>
-#. Used in usage help to represent an ID for a hidden GnuPG key. Example:
+#. TRANSL: Used in usage help to represent an ID for a hidden GnuPG key. Example:
 #. --hidden-encrypt-key <gpg_key_id>
-#. Used in usage help to represent an ID for a GnuPG key. Example:
+#. TRANSL: Used in usage help to represent an ID for a GnuPG key. Example:
 #. --encrypt-key <gpg_key_id>
-#: ../duplicity/commandline.py:283 ../duplicity/commandline.py:290
-#: ../duplicity/commandline.py:386 ../duplicity/commandline.py:596
-#: ../duplicity/commandline.py:831
+#: ../duplicity/commandline.py:282 ../duplicity/commandline.py:289
+#: ../duplicity/commandline.py:382 ../duplicity/commandline.py:592
+#: ../duplicity/commandline.py:827
 msgid "gpg-key-id"
 msgstr "gpg证书编号"
 
-#. Used in usage help to represent a "glob" style pattern for
+#. TRANSL: Used in usage help to represent a "glob" style pattern for
 #. matching one or more files, as described in the documentation.
 #. Example:
 #. --exclude <shell_pattern>
-#: ../duplicity/commandline.py:298 ../duplicity/commandline.py:411
-#: ../duplicity/commandline.py:881
+#: ../duplicity/commandline.py:297 ../duplicity/commandline.py:407
+#: ../duplicity/commandline.py:877
 msgid "shell_pattern"
 msgstr "shell模式"
 
-#. Used in usage help to represent the name of a file. Example:
+#. TRANSL: Used in usage help to represent the name of a file. Example:
 #. --log-file <filename>
-#: ../duplicity/commandline.py:304 ../duplicity/commandline.py:313
-#: ../duplicity/commandline.py:320 ../duplicity/commandline.py:413
-#: ../duplicity/commandline.py:420 ../duplicity/commandline.py:433
-#: ../duplicity/commandline.py:827
+#: ../duplicity/commandline.py:303 ../duplicity/commandline.py:312
+#: ../duplicity/commandline.py:319 ../duplicity/commandline.py:409
+#: ../duplicity/commandline.py:416 ../duplicity/commandline.py:429
+#: ../duplicity/commandline.py:823
 msgid "filename"
 msgstr "文件名"
 
-#. Used in usage help to represent a regular expression (regexp).
-#: ../duplicity/commandline.py:327 ../duplicity/commandline.py:424
+#. TRANSL: Used in usage help to represent a regular expression (regexp).
+#: ../duplicity/commandline.py:326 ../duplicity/commandline.py:420
 msgid "regular_expression"
 msgstr "正则表达式"
 
-#. Used in usage help to represent a time spec for a previous
+#. TRANSL: Used in usage help to represent a time spec for a previous
 #. point in time, as described in the documentation. Example:
 #. duplicity remove-older-than time [options] target_url
-#: ../duplicity/commandline.py:331 ../duplicity/commandline.py:374
-#: ../duplicity/commandline.py:500 ../duplicity/commandline.py:913
+#: ../duplicity/commandline.py:330 ../duplicity/commandline.py:370
+#: ../duplicity/commandline.py:496 ../duplicity/commandline.py:909
 msgid "time"
 msgstr "时间"
 
-#. Used in usage help. (Should be consistent with the "Options:"
+#. TRANSL: Used in usage help. (Should be consistent with the "Options:"
 #. header.) Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:382 ../duplicity/commandline.py:480
-#: ../duplicity/commandline.py:503 ../duplicity/commandline.py:604
-#: ../duplicity/commandline.py:846
+#: ../duplicity/commandline.py:378 ../duplicity/commandline.py:476
+#: ../duplicity/commandline.py:499 ../duplicity/commandline.py:600
+#: ../duplicity/commandline.py:842
 msgid "options"
 msgstr "选项"
 
-#: ../duplicity/commandline.py:397
+#: ../duplicity/commandline.py:393
 #, python-format
 msgid ""
 "Running in 'ignore errors' mode due to %s; please re-consider if this was "
 "not intended"
 msgstr "由于 %s，目前程序运行在“忽略错误”的模式下，请谨慎考虑"
 
-#. Used in usage help to represent an imap mailbox
-#: ../duplicity/commandline.py:409
+#. TRANSL: Used in usage help to represent an imap mailbox
+#: ../duplicity/commandline.py:405
 msgid "imap_mailbox"
 msgstr "imap邮箱"
 
-#: ../duplicity/commandline.py:427
+#: ../duplicity/commandline.py:423
 msgid "file_descriptor"
 msgstr "文件描述符"
 
-#. Used in usage help to represent a desired number of
+#. TRANSL: Used in usage help to represent a desired number of
 #. something. Example:
 #. --num-retries <number>
-#: ../duplicity/commandline.py:438 ../duplicity/commandline.py:460
-#: ../duplicity/commandline.py:477 ../duplicity/commandline.py:486
-#: ../duplicity/commandline.py:536 ../duplicity/commandline.py:541
-#: ../duplicity/commandline.py:545 ../duplicity/commandline.py:564
-#: ../duplicity/commandline.py:570 ../duplicity/commandline.py:574
-#: ../duplicity/commandline.py:640 ../duplicity/commandline.py:841
+#: ../duplicity/commandline.py:434 ../duplicity/commandline.py:456
+#: ../duplicity/commandline.py:473 ../duplicity/commandline.py:482
+#: ../duplicity/commandline.py:532 ../duplicity/commandline.py:537
+#: ../duplicity/commandline.py:541 ../duplicity/commandline.py:560
+#: ../duplicity/commandline.py:566 ../duplicity/commandline.py:570
+#: ../duplicity/commandline.py:636 ../duplicity/commandline.py:837
 msgid "number"
 msgstr "数字"
 
-#. Used in usage help (noun)
-#: ../duplicity/commandline.py:441
+#. TRANSL: Used in usage help (noun)
+#: ../duplicity/commandline.py:437
 msgid "backup name"
 msgstr "备份名"
 
-#. noun
-#: ../duplicity/commandline.py:580 ../duplicity/commandline.py:583
-#: ../duplicity/commandline.py:812
+#. TRANSL: noun
+#: ../duplicity/commandline.py:576 ../duplicity/commandline.py:579
+#: ../duplicity/commandline.py:808
 msgid "command"
 msgstr "命令"
 
-#: ../duplicity/commandline.py:586
+#: ../duplicity/commandline.py:582
 msgid "pyrax|cloudfiles"
 msgstr "pyrax|cloudfiles"
 
-#: ../duplicity/commandline.py:607
+#: ../duplicity/commandline.py:603
 msgid "pem formatted bundle of certificate authorities"
 msgstr "证书机构的 pem 文件"
 
-#: ../duplicity/commandline.py:608
+#: ../duplicity/commandline.py:604
 msgid "path to a folder with certificate authority files"
 msgstr ""
 
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. --timeout <seconds>
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. --backend-retry-delay <seconds>
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. --timeout <seconds>
-#: ../duplicity/commandline.py:617 ../duplicity/commandline.py:651
-#: ../duplicity/commandline.py:875
+#: ../duplicity/commandline.py:613 ../duplicity/commandline.py:647
+#: ../duplicity/commandline.py:871
 msgid "seconds"
 msgstr "秒"
 
-#. abbreviation for "character" (noun)
-#: ../duplicity/commandline.py:623 ../duplicity/commandline.py:809
+#. TRANSL: abbreviation for "character" (noun)
+#: ../duplicity/commandline.py:619 ../duplicity/commandline.py:805
 msgid "char"
 msgstr "字符"
 
-#: ../duplicity/commandline.py:775
+#: ../duplicity/commandline.py:771
 #, python-format
 msgid "Using archive dir: %s"
 msgstr "使用存档目录：%s"
 
-#: ../duplicity/commandline.py:776
+#: ../duplicity/commandline.py:772
 #, python-format
 msgid "Using backup name: %s"
 msgstr "使用备份名：%s"
 
-#: ../duplicity/commandline.py:783
+#: ../duplicity/commandline.py:779
 #, python-format
 msgid "Command line error: %s"
 msgstr "命令行错误：%s"
 
-#: ../duplicity/commandline.py:784
+#: ../duplicity/commandline.py:780
 msgid "Enter 'duplicity --help' for help screen."
 msgstr "输入 duplicity --help 查看帮助"
 
-#. Used in usage help to represent a Unix-style path name. Example:
+#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other_host[:port]//absolute_path
-#: ../duplicity/commandline.py:797
+#: ../duplicity/commandline.py:793
 msgid "absolute_path"
 msgstr "绝对路径"
 
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. tahoe://alias/some_dir
-#: ../duplicity/commandline.py:801
+#: ../duplicity/commandline.py:797
 msgid "alias"
 msgstr "别名"
 
-#. Used in help to represent a "bucket name" for Amazon Web
+#. TRANSL: Used in help to represent a "bucket name" for Amazon Web
 #. Services' Simple Storage Service (S3). Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:806
+#: ../duplicity/commandline.py:802
 msgid "bucket_name"
 msgstr "S3的bucket名"
 
-#. Used in usage help to represent the name of a container in
+#. TRANSL: Used in usage help to represent the name of a container in
 #. Amazon Web Services' Cloudfront. Example:
 #. cf+http://container_name
-#: ../duplicity/commandline.py:817
+#: ../duplicity/commandline.py:813
 msgid "container_name"
 msgstr "容器名"
 
-#. noun
-#: ../duplicity/commandline.py:820
+#. TRANSL: noun
+#: ../duplicity/commandline.py:816
 msgid "count"
 msgstr "数量"
 
-#. Used in usage help to represent the name of a file directory
-#: ../duplicity/commandline.py:823
+#. TRANSL: Used in usage help to represent the name of a file directory
+#: ../duplicity/commandline.py:819
 msgid "directory"
 msgstr "目录"
 
-#. Used in usage help, e.g. to represent the name of a code
+#. TRANSL: Used in usage help, e.g. to represent the name of a code
 #. module. Example:
 #. rsync://user[:password]@other.host[:port]::/module/some_dir
-#: ../duplicity/commandline.py:836
+#: ../duplicity/commandline.py:832
 msgid "module"
 msgstr "模块"
 
-#. Used in usage help to represent an internet hostname. Example:
+#. TRANSL: Used in usage help to represent an internet hostname. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:850
+#: ../duplicity/commandline.py:846
 msgid "other.host"
 msgstr "other.host"
 
-#. Used in usage help. Example:
+#. TRANSL: Used in usage help. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:854
+#: ../duplicity/commandline.py:850
 msgid "password"
 msgstr "密码"
 
-#. Used in usage help to represent a TCP port number. Example:
+#. TRANSL: Used in usage help to represent a TCP port number. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:862
+#: ../duplicity/commandline.py:858
 msgid "port"
 msgstr "端口"
 
-#. Used in usage help. This represents a string to be used as a
+#. TRANSL: Used in usage help. This represents a string to be used as a
 #. prefix to names for backup files created by Duplicity. Example:
 #. s3://other.host/bucket_name[/prefix]
-#: ../duplicity/commandline.py:867
+#: ../duplicity/commandline.py:863
 msgid "prefix"
 msgstr "前缀"
 
-#. Used in usage help to represent a Unix-style path name. Example:
+#. TRANSL: Used in usage help to represent a Unix-style path name. Example:
 #. rsync://user[:password]@other.host[:port]/relative_path
-#: ../duplicity/commandline.py:871
+#: ../duplicity/commandline.py:867
 msgid "relative_path"
 msgstr "相对路径"
 
-#. Used in usage help to represent the name of a single file
+#. TRANSL: Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. Example:
 #. file:///some_dir
-#: ../duplicity/commandline.py:886
+#: ../duplicity/commandline.py:882
 msgid "some_dir"
 msgstr "路径"
 
-#. Used in usage help to represent the name of a single file
+#. TRANSL: Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory where files will be
 #. coming FROM. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:892
+#: ../duplicity/commandline.py:888
 msgid "source_dir"
 msgstr "源路径"
 
-#. Used in usage help to represent a URL files will be coming
+#. TRANSL: Used in usage help to represent a URL files will be coming
 #. FROM. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:897
+#: ../duplicity/commandline.py:893
 msgid "source_url"
 msgstr "源url"
 
-#. Used in usage help to represent the name of a single file
+#. TRANSL: Used in usage help to represent the name of a single file
 #. directory or a Unix-style path to a directory. where files will be
 #. going TO. Example:
 #. duplicity [restore] [options] source_url target_dir
-#: ../duplicity/commandline.py:903
+#: ../duplicity/commandline.py:899
 msgid "target_dir"
 msgstr "目标路径"
 
-#. Used in usage help to represent a URL files will be going TO.
+#. TRANSL: Used in usage help to represent a URL files will be going TO.
 #. Example:
 #. duplicity [full|incremental] [options] source_dir target_url
-#: ../duplicity/commandline.py:908
+#: ../duplicity/commandline.py:904
 msgid "target_url"
 msgstr "目标url"
 
-#. Used in usage help to represent a user name (i.e. login).
+#. TRANSL: Used in usage help to represent a user name (i.e. login).
 #. Example:
 #. ftp://user[:password]@other.host[:port]/some_dir
-#: ../duplicity/commandline.py:918
+#: ../duplicity/commandline.py:914
 msgid "user"
 msgstr "用户名"
 
-#. account id for b2. Example: b2://account_id@bucket/
-#: ../duplicity/commandline.py:921
+#. TRANSL: account id for b2. Example: b2://account_id@bucket/
+#: ../duplicity/commandline.py:917
 msgid "account_id"
 msgstr "账户ID"
 
-#. application_key for b2.
+#. TRANSL: application_key for b2.
 #. Example: b2://account_id:application_key@bucket/
-#: ../duplicity/commandline.py:925
+#: ../duplicity/commandline.py:921
 msgid "application_key"
 msgstr "Backblaze_B2的application_key"
 
-#. Header in usage help
+#. TRANSL: Header in usage help
 #: ../duplicity/commandline.py:944
 msgid "Backends and their URL formats:"
 msgstr "后台及其 URL 格式："
 
-#. Header in usage help
+#. TRANSL: Header in usage help
 #: ../duplicity/commandline.py:977
 msgid "Commands:"
 msgstr "命令："
@@ -874,42 +874,42 @@
 msgid "Main action: "
 msgstr "主要操作： "
 
-#: ../duplicity/backend.py:103
+#: ../duplicity/backend.py:102
 #, python-format
 msgid "Import of %s %s"
 msgstr "Python import %s %s"
 
-#: ../duplicity/backend.py:212
+#: ../duplicity/backend.py:211
 #, python-format
 msgid "Could not initialize backend: %s"
 msgstr "无法初始化后台：%s"
 
-#: ../duplicity/backend.py:379
+#: ../duplicity/backend.py:390
 #, python-format
 msgid "Backtrace of previous error: %s"
 msgstr "上一条错误的回溯：%s"
 
-#: ../duplicity/backend.py:394
+#: ../duplicity/backend.py:406
 #, python-format
 msgid "Giving up after %s attempts. %s: %s"
 msgstr "%s 次尝试后放弃。%s: %s"
 
-#: ../duplicity/backend.py:398
+#: ../duplicity/backend.py:410
 #, python-format
 msgid "Attempt %s failed. %s: %s"
 msgstr "%s 次尝试失败。%s: %s"
 
-#: ../duplicity/backend.py:492
+#: ../duplicity/backend.py:504
 #, python-format
 msgid "Reading results of '%s'"
 msgstr "读“%s”的结果"
 
-#: ../duplicity/backend.py:518
+#: ../duplicity/backend.py:530
 #, python-format
 msgid "Writing %s"
 msgstr "写入 %s"
 
-#: ../duplicity/backend.py:559
+#: ../duplicity/backend.py:571
 #, python-format
 msgid "File %s not found locally after get from backend"
 msgstr "从后台取回后，本地找不到文件 %s。"
@@ -950,247 +950,249 @@
 msgid "task execution done (success: %s)"
 msgstr "任务执行完毕 (结果：%s)"
 
-#: ../duplicity/patchdir.py:84 ../duplicity/patchdir.py:89
+#: ../duplicity/patchdir.py:82 ../duplicity/patchdir.py:87
 #, python-format
 msgid "Patching %s"
 msgstr "写回 %s"
 
-#: ../duplicity/patchdir.py:550
+#: ../duplicity/patchdir.py:547
 #, python-format
 msgid "Error '%s' patching %s"
 msgstr "错误“%s”，当前正在写回 %s"
 
-#: ../duplicity/patchdir.py:625
+#: ../duplicity/patchdir.py:622
 #, python-format
 msgid "Writing %s of type %s"
 msgstr "写入 %s，其类型为 %s"
 
-#: ../duplicity/dup_collections.py:180 ../duplicity/dup_collections.py:194
+#: ../duplicity/dup_collections.py:177 ../duplicity/dup_collections.py:191
 #, python-format
 msgid "BackupSet.delete: missing %s"
 msgstr "BackupSet.delete: %s 丢失"
 
-#: ../duplicity/dup_collections.py:219
+#: ../duplicity/dup_collections.py:216
 msgid "Fatal Error: No manifests found for most recent backup"
 msgstr "致命错误：没有最近备份的清单"
 
-#: ../duplicity/dup_collections.py:228
+#: ../duplicity/dup_collections.py:225
 msgid ""
 "Fatal Error: Remote manifest does not match local one.  Either the remote "
 "backup set or the local archive directory has been corrupted."
 msgstr "致命错误：远程和本地清单不匹配，本地存档目录或远程备份集崩溃。"
 
-#: ../duplicity/dup_collections.py:236
+#: ../duplicity/dup_collections.py:233
 msgid "Fatal Error: Neither remote nor local manifest is readable."
 msgstr "致命错误：本地和远程清单不可读"
 
-#: ../duplicity/dup_collections.py:247
+#: ../duplicity/dup_collections.py:244
 #, python-format
 msgid "Processing local manifest %s (%s)"
 msgstr ""
 
-#: ../duplicity/dup_collections.py:259
+#: ../duplicity/dup_collections.py:256
 #, python-format
 msgid "Error processing remote manifest (%s): %s"
 msgstr ""
 
-#: ../duplicity/dup_collections.py:262
+#: ../duplicity/dup_collections.py:259
 #, python-format
 msgid "Processing remote manifest %s (%s)"
 msgstr ""
 
-#: ../duplicity/dup_collections.py:358
+#: ../duplicity/dup_collections.py:355
 msgid "Preferring Backupset over previous one!"
 msgstr "使用前一个备份集！"
 
-#: ../duplicity/dup_collections.py:361
+#: ../duplicity/dup_collections.py:358
 #, python-format
 msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
 msgstr "忽略增量备份集 (开始时间：%s；结束时间：%s)"
 
-#: ../duplicity/dup_collections.py:366
+#: ../duplicity/dup_collections.py:363
 #, python-format
 msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
 msgstr "新增增量备份集 (开始时间：%s / 结束时间：%s)"
 
-#: ../duplicity/dup_collections.py:436
+#: ../duplicity/dup_collections.py:433
 msgid "Chain start time: "
 msgstr "备份链开始时间： "
 
-#: ../duplicity/dup_collections.py:437
+#: ../duplicity/dup_collections.py:434
 msgid "Chain end time: "
 msgstr "备份链结束时间： "
 
-#: ../duplicity/dup_collections.py:438
+#: ../duplicity/dup_collections.py:435
 #, python-format
 msgid "Number of contained backup sets: %d"
 msgstr "包含的备份集数量：%d"
 
-#: ../duplicity/dup_collections.py:440
+#: ../duplicity/dup_collections.py:437
 #, python-format
 msgid "Total number of contained volumes: %d"
 msgstr "包含的卷数量：%d"
 
-#: ../duplicity/dup_collections.py:442 ../duplicity/dup_collections.py:1239
+#: ../duplicity/dup_collections.py:439 ../duplicity/dup_collections.py:1228
 msgid "Type of backup set:"
 msgstr "备份集类型："
 
-#: ../duplicity/dup_collections.py:442 ../duplicity/dup_collections.py:1239
+#: ../duplicity/dup_collections.py:439 ../duplicity/dup_collections.py:1228
 msgid "Time:"
 msgstr "时间："
 
-#: ../duplicity/dup_collections.py:442
+#: ../duplicity/dup_collections.py:439
 msgid "Num volumes:"
 msgstr "卷数量："
 
-#: ../duplicity/dup_collections.py:446 ../duplicity/dup_collections.py:1245
+#: ../duplicity/dup_collections.py:443 ../duplicity/dup_collections.py:1234
 msgid "Full"
 msgstr "完全"
 
-#: ../duplicity/dup_collections.py:449 ../duplicity/dup_collections.py:1247
+#: ../duplicity/dup_collections.py:446 ../duplicity/dup_collections.py:1236
 msgid "Incremental"
 msgstr "增量"
 
-#: ../duplicity/dup_collections.py:509
+#: ../duplicity/dup_collections.py:506
 msgid "local"
 msgstr "本地"
 
-#: ../duplicity/dup_collections.py:511
+#. TRANSL: remote name for rclone.
+#. Example: rclone://remote:/some_dir
+#: ../duplicity/commandline.py:925 ../duplicity/dup_collections.py:508
 msgid "remote"
 msgstr "远程"
 
-#: ../duplicity/dup_collections.py:666
+#: ../duplicity/dup_collections.py:663
 msgid "Collection Status"
 msgstr "归集状态"
 
-#: ../duplicity/dup_collections.py:668
+#: ../duplicity/dup_collections.py:665
 #, python-format
 msgid "Connecting with backend: %s"
 msgstr "正在连接后台设备：%s"
 
-#: ../duplicity/dup_collections.py:670
+#: ../duplicity/dup_collections.py:667
 #, python-format
 msgid "Archive dir: %s"
 msgstr "存档路径：%s"
 
-#: ../duplicity/dup_collections.py:673
+#: ../duplicity/dup_collections.py:670
 #, python-format
 msgid "Found %d secondary backup chain."
 msgid_plural "Found %d secondary backup chains."
 msgstr[0] "找到 %d 条次级备份链。"
 
-#: ../duplicity/dup_collections.py:678
+#: ../duplicity/dup_collections.py:675
 #, python-format
 msgid "Secondary chain %d of %d:"
 msgstr "第 %d 次级链 (总共 %d )："
 
-#: ../duplicity/dup_collections.py:684
+#: ../duplicity/dup_collections.py:681
 msgid "Found primary backup chain with matching signature chain:"
 msgstr "找到主备份链及对应的签名链："
 
-#: ../duplicity/dup_collections.py:688
+#: ../duplicity/dup_collections.py:685
 msgid "No backup chains with active signatures found"
 msgstr "没有找到活动签名的备份链"
 
-#: ../duplicity/dup_collections.py:691
+#: ../duplicity/dup_collections.py:688
 #, python-format
 msgid "Also found %d backup set not part of any chain,"
 msgid_plural "Also found %d backup sets not part of any chain,"
 msgstr[0] "还找到 %d 不属于任何备份链的备份集，"
 
-#: ../duplicity/dup_collections.py:695
+#: ../duplicity/dup_collections.py:692
 #, python-format
 msgid "and %d incomplete backup set."
 msgid_plural "and %d incomplete backup sets."
 msgstr[0] "以及 %d 不完整的备份集。"
 
-#. "cleanup" is a hard-coded command, so do not translate it
-#: ../duplicity/dup_collections.py:700
+#. TRANSL: "cleanup" is a hard-coded command, so do not translate it
+#: ../duplicity/dup_collections.py:697
 msgid ""
 "These may be deleted by running duplicity with the \"cleanup\" command."
 msgstr "可以通过“cleanup”命令删除。"
 
-#: ../duplicity/dup_collections.py:703
+#: ../duplicity/dup_collections.py:700
 msgid "No orphaned or incomplete backup sets found."
 msgstr "没有找到孤立或不完整的备份集。"
 
-#: ../duplicity/dup_collections.py:719
+#: ../duplicity/dup_collections.py:716
 #, python-format
 msgid "%d file exists on backend"
 msgid_plural "%d files exist on backend"
 msgstr[0] "备份中有 %d 个文件"
 
-#: ../duplicity/dup_collections.py:729
+#: ../duplicity/dup_collections.py:726
 #, python-format
 msgid "%d file exists in cache"
 msgid_plural "%d files exist in cache"
 msgstr[0] "缓存中有 %d 个文件"
 
-#: ../duplicity/dup_collections.py:782
+#: ../duplicity/dup_collections.py:779
 msgid ""
 "Warning, discarding last backup set, because of missing signature file."
 msgstr "警告，由于缺少签名文件，将废弃最后一个备份集。"
 
-#: ../duplicity/dup_collections.py:805
+#: ../duplicity/dup_collections.py:802
 msgid "Warning, found the following local orphaned signature file:"
 msgid_plural "Warning, found the following local orphaned signature files:"
 msgstr[0] "警告，找到以下孤立的签名文件："
 
-#: ../duplicity/dup_collections.py:814
+#: ../duplicity/dup_collections.py:811
 msgid "Warning, found the following remote orphaned signature file:"
 msgid_plural "Warning, found the following remote orphaned signature files:"
 msgstr[0] "警告，找到以下孤立的远程签名文件："
 
-#: ../duplicity/dup_collections.py:823
+#: ../duplicity/dup_collections.py:820
 msgid "Warning, found signatures but no corresponding backup files"
 msgstr "警告，找到无对应备份文件的签名"
 
-#: ../duplicity/dup_collections.py:827
+#: ../duplicity/dup_collections.py:824
 msgid ""
 "Warning, found incomplete backup sets, probably left from aborted session"
 msgstr "警告，找到不完整的备份集，可能来自于中断的会话"
 
-#: ../duplicity/dup_collections.py:831
+#: ../duplicity/dup_collections.py:828
 msgid "Warning, found the following orphaned backup file:"
 msgid_plural "Warning, found the following orphaned backup files:"
 msgstr[0] "警告，找到以下废弃的备份文件："
 
-#: ../duplicity/dup_collections.py:848
+#: ../duplicity/dup_collections.py:845
 #, python-format
 msgid "Extracting backup chains from list of files: %s"
 msgstr "从文件列表中提取备份链：%s"
 
-#: ../duplicity/dup_collections.py:860
+#: ../duplicity/dup_collections.py:857
 #, python-format
 msgid "File %s is part of known set"
 msgstr "文件 %s 属于已知集合"
 
-#: ../duplicity/dup_collections.py:863
+#: ../duplicity/dup_collections.py:860
 #, python-format
 msgid "File %s is not part of a known set; creating new set"
 msgstr "文件 %s 不属于任何已知集合，建立新集合"
 
-#: ../duplicity/dup_collections.py:868
+#: ../duplicity/dup_collections.py:865
 #, python-format
 msgid "Ignoring file (rejected by backup set) '%s'"
 msgstr "忽略 (被备份集拒绝) 文件 %s"
 
-#: ../duplicity/dup_collections.py:884
+#: ../duplicity/dup_collections.py:881
 #, python-format
 msgid "Found backup chain %s"
 msgstr "找到备份链 %s"
 
-#: ../duplicity/dup_collections.py:889
+#: ../duplicity/dup_collections.py:886
 #, python-format
 msgid "Added set %s to pre-existing chain %s"
 msgstr "将集合 %s 加入已存在的备份链 %s"
 
-#: ../duplicity/dup_collections.py:893
+#: ../duplicity/dup_collections.py:890
 #, python-format
 msgid "Found orphaned set %s"
 msgstr "找到孤立的集合 %s"
 
-#: ../duplicity/dup_collections.py:1043
+#: ../duplicity/dup_collections.py:1040
 #, python-format
 msgid ""
 "No signature chain for the requested time. Using oldest available chain, "
@@ -1232,17 +1234,17 @@
 msgid "D %s"
 msgstr "删除 %s"
 
-#: ../duplicity/lazy.py:352
+#: ../duplicity/lazy.py:355
 #, python-format
 msgid "Warning: oldindex %s >= newindex %s"
 msgstr "警告：原索引 %s >= 新索引 %s"
 
-#: ../duplicity/lazy.py:427
+#: ../duplicity/lazy.py:430
 #, python-format
 msgid "Error '%s' processing %s"
 msgstr "错误 %s (处理 %s 时出错)"
 
-#: ../duplicity/lazy.py:437
+#: ../duplicity/lazy.py:440
 #, python-format
 msgid "Skipping %s because of previous error"
 msgstr "由于之前的错误，跳过 %s"
@@ -1326,22 +1328,22 @@
 "MultiBackend: failed to get %s. Tried all backing stores and none succeeded"
 msgstr "多后台：提取 %s 失败。已尝试所有后台存储均失败"
 
-#: ../duplicity/backends/multibackend.py:309
+#: ../duplicity/backends/multibackend.py:305
 #, python-format
 msgid "MultiBackend: list from %s: %s"
 msgstr "多后台：从 %s 列出：%s"
 
-#: ../duplicity/backends/multibackend.py:315
+#: ../duplicity/backends/multibackend.py:317
 #, python-format
 msgid "MultiBackend: combined list: %s"
 msgstr "多后台：混合列表：%s"
 
-#: ../duplicity/backends/multibackend.py:343
+#: ../duplicity/backends/multibackend.py:345
 #, python-format
 msgid "MultiBackend: failed to delete %s from %s"
 msgstr "多后台：删除 %s 失败 (从 %s 删除)"
 
-#: ../duplicity/backends/multibackend.py:347
+#: ../duplicity/backends/multibackend.py:349
 #, python-format
 msgid ""
 "MultiBackend: failed to delete %s. Tried all backing stores and none "
@@ -1488,13 +1490,13 @@
 msgid "WebDAV DEL Bad status code %s reason %s."
 msgstr ""
 
-#: ../duplicity/librsync.py:195
+#: ../duplicity/librsync.py:196
 msgid ""
 "basis_file must be a (true) file or an object whose file attribute is the "
 "underlying true file object"
 msgstr ""
 
-#: ../duplicity/manifest.py:96
+#: ../duplicity/manifest.py:95
 #, python-format
 msgid ""
 "Fatal Error: Backup source host has changed.\n"
@@ -1505,7 +1507,7 @@
 "当前主机名：%s\n"
 "之前的主机名：%s"
 
-#: ../duplicity/manifest.py:103
+#: ../duplicity/manifest.py:102
 #, python-format
 msgid ""
 "Fatal Error: Backup source directory has changed.\n"
@@ -1516,7 +1518,7 @@
 "当前文件夹：%s\n"
 "之前的文件夹：%s"
 
-#: ../duplicity/manifest.py:113
+#: ../duplicity/manifest.py:112
 msgid ""
 "Aborting because you may have accidentally tried to backup two different "
 "data sets to the same remote location, or using the same archive directory.  "
@@ -1526,131 +1528,131 @@
 "由于您试图在相同远程路径或相同的存档目录备份两个不同的数据集，所以操作被取消。如果这不是一个错误，请使用 --allow-source-mismatch "
 "开关禁用此通知"
 
-#: ../duplicity/manifest.py:215
+#: ../duplicity/manifest.py:214
 #, python-format
 msgid "Found manifest volume %s"
 msgstr ""
 
-#: ../duplicity/manifest.py:222
+#: ../duplicity/manifest.py:221
 #, python-format
 msgid "Found %s volumes in manifest"
 msgstr ""
 
-#: ../duplicity/manifest.py:258
+#: ../duplicity/manifest.py:257
 msgid "Manifests not equal because different volume numbers"
 msgstr "清单包含不同的卷数"
 
-#: ../duplicity/manifest.py:263
+#: ../duplicity/manifest.py:262
 msgid "Manifests not equal because volume lists differ"
 msgstr "清单的卷列表不同"
 
-#: ../duplicity/manifest.py:268
+#: ../duplicity/manifest.py:267
 msgid "Manifests not equal because hosts or directories differ"
 msgstr "清单的主机或目录不同"
 
-#: ../duplicity/manifest.py:425
+#: ../duplicity/manifest.py:424
 msgid "Warning, found extra Volume identifier"
 msgstr "警告，找到额外的卷标识"
 
-#: ../duplicity/manifest.py:451
+#: ../duplicity/manifest.py:450
 msgid "Other is not VolumeInfo"
 msgstr "Other 不是合法的 卷信息"
 
-#: ../duplicity/manifest.py:454
+#: ../duplicity/manifest.py:453
 msgid "Volume numbers don't match"
 msgstr "卷数量不匹配"
 
-#: ../duplicity/manifest.py:457
+#: ../duplicity/manifest.py:456
 msgid "start_indicies don't match"
 msgstr "起始索引不匹配"
 
-#: ../duplicity/manifest.py:460
+#: ../duplicity/manifest.py:459
 msgid "end_index don't match"
 msgstr "结束索引不匹配"
 
-#: ../duplicity/manifest.py:467
+#: ../duplicity/manifest.py:466
 msgid "Hashes don't match"
 msgstr "哈希值不匹配"
 
-#: ../duplicity/path.py:116
+#: ../duplicity/path.py:115
 #, python-format
 msgid "Warning: %s invalid devnums (0x%X), treating as (0, 0)."
 msgstr "警告：%s 无效的设备号 (0x%X)，设为 (0, 0)。"
 
-#: ../duplicity/path.py:245 ../duplicity/path.py:306
+#: ../duplicity/path.py:244 ../duplicity/path.py:305
 #, python-format
 msgid "Warning: %s has negative mtime, treating as 0."
 msgstr "警告：%s 包含负数 mtime，设为 0。"
 
-#: ../duplicity/path.py:370
+#: ../duplicity/path.py:369
 msgid "Difference found:"
 msgstr "找到差异："
 
-#: ../duplicity/path.py:379
+#: ../duplicity/path.py:378
 #, python-format
 msgid "New file %s"
 msgstr "新文件 %s"
 
-#: ../duplicity/path.py:382
+#: ../duplicity/path.py:381
 #, python-format
 msgid "File %s is missing"
 msgstr "文件 %s 已丢失"
 
-#: ../duplicity/path.py:385
+#: ../duplicity/path.py:384
 #, python-format
 msgid "File %%s has type %s, expected %s"
 msgstr "文件 %%s 类型为 %s，应当为 %s"
 
-#: ../duplicity/path.py:391 ../duplicity/path.py:417
+#: ../duplicity/path.py:390 ../duplicity/path.py:416
 #, python-format
 msgid "File %%s has permissions %s, expected %s"
 msgstr "文件 %%s 权限为 %s，应当为 %s"
 
-#: ../duplicity/path.py:396
+#: ../duplicity/path.py:395
 #, python-format
 msgid "File %%s has mtime %s, expected %s"
 msgstr "文件 %%s mtime 为 %s，应当为 %s"
 
-#: ../duplicity/path.py:404
+#: ../duplicity/path.py:403
 #, python-format
 msgid "Data for file %s is different"
 msgstr "文件 %s 的数据不同"
 
-#: ../duplicity/path.py:412
+#: ../duplicity/path.py:411
 #, python-format
 msgid "Symlink %%s points to %s, expected %s"
 msgstr "软链接 %%s 指向 %s，应当为 %s"
 
-#: ../duplicity/path.py:421
+#: ../duplicity/path.py:420
 #, python-format
 msgid "Device file %%s has numbers %s, expected %s"
 msgstr "设备文件 %%s 设备号为 %s，应当为 %s"
 
-#: ../duplicity/path.py:603
+#: ../duplicity/path.py:602
 #, python-format
 msgid "Making directory %s"
 msgstr "创建目录 %s"
 
-#: ../duplicity/path.py:613
+#: ../duplicity/path.py:612
 #, python-format
 msgid "Deleting %s"
 msgstr "删除 %s"
 
-#: ../duplicity/path.py:622
+#: ../duplicity/path.py:621
 #, python-format
 msgid "Touching %s"
 msgstr "创建 %s"
 
-#: ../duplicity/path.py:629
+#: ../duplicity/path.py:628
 #, python-format
 msgid "Deleting tree %s"
 msgstr "删除目录树 %s"
 
-#: ../duplicity/gpginterface.py:238
+#: ../duplicity/gpginterface.py:240
 msgid "Threading not available -- zombie processes may appear"
 msgstr "线程不可用 -- 可能存在僵死进程"
 
-#: ../duplicity/gpginterface.py:705
+#: ../duplicity/gpginterface.py:707
 #, python-format
 msgid "GPG process %d terminated before wait()"
 msgstr "GPG 进程 %d 在 wait() 前终止"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/e2fsprogs.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/e2fsprogs.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/e2fsprogs.po	2020-01-23 16:51:54.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/e2fsprogs.po	2020-07-08 13:53:55.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:41+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Poedit-Bookmarks: -1,591,-1,-1,-1,-1,-1,-1,-1,-1\n"
@@ -38,9 +38,9 @@
 #: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1571
 #: e2fsck/unix.c:1685 misc/badblocks.c:1251 misc/badblocks.c:1259
 #: misc/badblocks.c:1273 misc/badblocks.c:1285 misc/dumpe2fs.c:431
-#: misc/dumpe2fs.c:688 misc/dumpe2fs.c:692 misc/e2image.c:1430
+#: misc/dumpe2fs.c:692 misc/dumpe2fs.c:696 misc/e2image.c:1430
 #: misc/e2image.c:1627 misc/e2image.c:1648 misc/mke2fs.c:236
-#: misc/tune2fs.c:2796 misc/tune2fs.c:2895 resize/main.c:414
+#: misc/tune2fs.c:2808 misc/tune2fs.c:2907 resize/main.c:414
 #, c-format
 msgid "while trying to open %s"
 msgstr "尝试打开 %s 时"
@@ -91,15 +91,15 @@
 msgid "Error writing block %lu (%s).  "
 msgstr "写块 %lu（%s）出错。  "
 
-#: e2fsck/emptydir.c:57
+#: e2fsck/emptydir.c:56
 msgid "empty dirblocks"
 msgstr "空目录块"
 
-#: e2fsck/emptydir.c:62
+#: e2fsck/emptydir.c:61
 msgid "empty dir map"
 msgstr "空ACL映射"
 
-#: e2fsck/emptydir.c:98
+#: e2fsck/emptydir.c:97
 #, c-format
 msgid "Empty directory block %u (#%d) in inode %u\n"
 msgstr "空目录块 %u（#%d）于 inode %u 中\n"
@@ -109,12 +109,12 @@
 msgid "%s: %s filename nblocks blocksize\n"
 msgstr "%s：%s  文件名  块数  块大小\n"
 
-#: e2fsck/extend.c:44
+#: e2fsck/extend.c:45
 #, c-format
 msgid "Illegal number of blocks!\n"
 msgstr "非法的块数量！\n"
 
-#: e2fsck/extend.c:50
+#: e2fsck/extend.c:51
 #, c-format
 msgid "Couldn't allocate block buffer (size=%d)\n"
 msgstr "无法为块缓存分配内存（大小=%d）\n"
@@ -180,7 +180,7 @@
 msgid "%s: journal too short\n"
 msgstr "%s： 日志过短\n"
 
-#: e2fsck/journal.c:972 misc/fuse2fs.c:3792
+#: e2fsck/journal.c:972 misc/fuse2fs.c:3787
 #, c-format
 msgid "%s: recovering journal\n"
 msgstr "%s：正在修复日志\n"
@@ -414,11 +414,11 @@
 
 #: e2fsck/message.c:482
 msgid "user"
-msgstr ""
+msgstr "用户"
 
 #: e2fsck/message.c:485
 msgid "group"
-msgstr ""
+msgstr "组"
 
 #: e2fsck/message.c:488
 msgid "project"
@@ -426,27 +426,27 @@
 
 #: e2fsck/message.c:491
 msgid "unknown quota type"
-msgstr ""
+msgstr "未知配额类型"
 
 #: e2fsck/pass1b.c:222
 msgid "multiply claimed inode map"
 msgstr "重叠块映射"
 
-#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:826
+#: e2fsck/pass1b.c:672 e2fsck/pass1b.c:830
 #, c-format
 msgid "internal error: can't find dup_blk for %llu\n"
 msgstr "内部错误：无法找到 %llu 的dup_blk信息\n"
 
-#: e2fsck/pass1b.c:952
+#: e2fsck/pass1b.c:956
 msgid "returned from clone_file_block"
 msgstr "从clone_file_block返回"
 
-#: e2fsck/pass1b.c:976
+#: e2fsck/pass1b.c:980
 #, c-format
 msgid "internal error: couldn't lookup EA block record for %llu"
 msgstr "内部错误：无法查找 %llu 的EA块记录"
 
-#: e2fsck/pass1b.c:988
+#: e2fsck/pass1b.c:992
 #, c-format
 msgid "internal error: couldn't lookup EA inode record for %u"
 msgstr "内部错误：无法查找 %u 的EA inode块记录"
@@ -456,89 +456,89 @@
 msgid "while hashing entry with e_value_inum = %u"
 msgstr ""
 
-#: e2fsck/pass1.c:775 e2fsck/pass2.c:1007
+#: e2fsck/pass1.c:775 e2fsck/pass2.c:1010
 msgid "reading directory block"
 msgstr "正在读取目录块"
 
-#: e2fsck/pass1.c:1224
+#: e2fsck/pass1.c:1226
 msgid "in-use inode map"
 msgstr "使用中的inode映射"
 
-#: e2fsck/pass1.c:1235
+#: e2fsck/pass1.c:1237
 msgid "directory inode map"
 msgstr "目录inode映射"
 
-#: e2fsck/pass1.c:1245
+#: e2fsck/pass1.c:1247
 msgid "regular file inode map"
 msgstr "普通文件inode映射"
 
-#: e2fsck/pass1.c:1254 misc/e2image.c:1282
+#: e2fsck/pass1.c:1256 misc/e2image.c:1282
 msgid "in-use block map"
 msgstr "使用中的块映射"
 
-#: e2fsck/pass1.c:1263
+#: e2fsck/pass1.c:1265
 msgid "metadata block map"
 msgstr "元数据块映射"
 
-#: e2fsck/pass1.c:1325
+#: e2fsck/pass1.c:1327
 msgid "opening inode scan"
 msgstr "开始 inode 扫描"
 
-#: e2fsck/pass1.c:1363
+#: e2fsck/pass1.c:1174
 msgid "getting next inode from scan"
 msgstr "从扫描进度中获取下一个 inode"
 
-#: e2fsck/pass1.c:2067
+#: e2fsck/pass1.c:2080
 msgid "Pass 1"
 msgstr "第 1 步"
 
-#: e2fsck/pass1.c:2128
+#: e2fsck/pass1.c:2141
 #, c-format
 msgid "reading indirect blocks of inode %u"
 msgstr "读取inode为 %u 的链接块时"
 
-#: e2fsck/pass1.c:2179
+#: e2fsck/pass1.c:2192
 msgid "bad inode map"
 msgstr "坏块映射"
 
-#: e2fsck/pass1.c:2219
+#: e2fsck/pass1.c:2232
 msgid "inode in bad block map"
 msgstr "更新坏块映射时"
 
-#: e2fsck/pass1.c:2239
+#: e2fsck/pass1.c:2252
 msgid "imagic inode map"
 msgstr "inode的imagic映射"
 
-#: e2fsck/pass1.c:2270
+#: e2fsck/pass1.c:2283
 msgid "multiply claimed block map"
 msgstr "重叠块映射"
 
-#: e2fsck/pass1.c:2395
+#: e2fsck/pass1.c:2408
 msgid "ext attr block map"
 msgstr "扩展属性块映射"
 
-#: e2fsck/pass1.c:3640
+#: e2fsck/pass1.c:3653
 #, c-format
 msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
 msgstr "%6lu（%c）：应为 %6lu 但实际为 %6lu （块 %lld）\n"
 
-#: e2fsck/pass1.c:4060
+#: e2fsck/pass1.c:4073
 msgid "block bitmap"
 msgstr "块位图"
 
-#: e2fsck/pass1.c:4066
+#: e2fsck/pass1.c:4079
 msgid "inode bitmap"
 msgstr "inode 位图"
 
-#: e2fsck/pass1.c:4072
+#: e2fsck/pass1.c:4085
 msgid "inode table"
 msgstr "inode表"
 
-#: e2fsck/pass2.c:307
+#: e2fsck/pass2.c:308
 msgid "Pass 2"
 msgstr "第 2 步"
 
-#: e2fsck/pass2.c:1079 e2fsck/pass2.c:1246
+#: e2fsck/pass2.c:1083 e2fsck/pass2.c:1250
 msgid "Can not continue."
 msgstr "无法继续。"
 
@@ -554,11 +554,11 @@
 msgid "Pass 3"
 msgstr "第 3 步"
 
-#: e2fsck/pass3.c:344
+#: e2fsck/pass3.c:350
 msgid "inode loop detection bitmap"
 msgstr "循环inode检测位图"
 
-#: e2fsck/pass4.c:277
+#: e2fsck/pass4.c:289
 msgid "Pass 4"
 msgstr "第 4 步"
 
@@ -574,179 +574,179 @@
 msgid "check_block_bitmap_checksum: Memory allocation error"
 msgstr "check_block_bitmap_checksum：内存分配出错"
 
-#: e2fsck/problem.c:52
+#: e2fsck/problem.c:53
 msgid "(no prompt)"
 msgstr "（没有提示）"
 
-#: e2fsck/problem.c:53
+#: e2fsck/problem.c:54
 msgid "Fix"
 msgstr "处理"
 
-#: e2fsck/problem.c:54
+#: e2fsck/problem.c:55
 msgid "Clear"
 msgstr "清除"
 
-#: e2fsck/problem.c:55
+#: e2fsck/problem.c:56
 msgid "Relocate"
 msgstr "重定位"
 
-#: e2fsck/problem.c:56
+#: e2fsck/problem.c:57
 msgid "Allocate"
 msgstr "分配"
 
-#: e2fsck/problem.c:57
+#: e2fsck/problem.c:58
 msgid "Expand"
 msgstr "扩充"
 
-#: e2fsck/problem.c:58
+#: e2fsck/problem.c:59
 msgid "Connect to /lost+found"
 msgstr "连接到 /lost+found"
 
-#: e2fsck/problem.c:59
+#: e2fsck/problem.c:60
 msgid "Create"
 msgstr "创建"
 
-#: e2fsck/problem.c:60
+#: e2fsck/problem.c:61
 msgid "Salvage"
 msgstr "修复"
 
-#: e2fsck/problem.c:61
+#: e2fsck/problem.c:62
 msgid "Truncate"
 msgstr "截断"
 
-#: e2fsck/problem.c:62
+#: e2fsck/problem.c:63
 msgid "Clear inode"
 msgstr "清除inode"
 
-#: e2fsck/problem.c:63
+#: e2fsck/problem.c:64
 msgid "Abort"
 msgstr "中断"
 
-#: e2fsck/problem.c:64
+#: e2fsck/problem.c:65
 msgid "Split"
 msgstr "分割"
 
-#: e2fsck/problem.c:65
+#: e2fsck/problem.c:66
 msgid "Continue"
 msgstr "继续"
 
-#: e2fsck/problem.c:66
+#: e2fsck/problem.c:67
 msgid "Clone multiply-claimed blocks"
 msgstr "克隆重叠块"
 
-#: e2fsck/problem.c:67
+#: e2fsck/problem.c:68
 msgid "Delete file"
 msgstr "删除文件"
 
-#: e2fsck/problem.c:68
+#: e2fsck/problem.c:69
 msgid "Suppress messages"
 msgstr "不显示消息"
 
-#: e2fsck/problem.c:69
+#: e2fsck/problem.c:70
 msgid "Unlink"
 msgstr "解除链接"
 
-#: e2fsck/problem.c:70
+#: e2fsck/problem.c:71
 msgid "Clear HTree index"
 msgstr "清除HTree索引"
 
-#: e2fsck/problem.c:71
+#: e2fsck/problem.c:72
 msgid "Recreate"
 msgstr "重建"
 
-#: e2fsck/problem.c:81
+#: e2fsck/problem.c:83
 msgid "(NONE)"
 msgstr "（空）"
 
-#: e2fsck/problem.c:82
+#: e2fsck/problem.c:84
 msgid "FIXED"
 msgstr "已处理"
 
-#: e2fsck/problem.c:83
+#: e2fsck/problem.c:85
 msgid "CLEARED"
 msgstr "已清除"
 
-#: e2fsck/problem.c:84
+#: e2fsck/problem.c:86
 msgid "RELOCATED"
 msgstr "已重定位"
 
-#: e2fsck/problem.c:85
+#: e2fsck/problem.c:87
 msgid "ALLOCATED"
 msgstr "已分配"
 
-#: e2fsck/problem.c:86
+#: e2fsck/problem.c:88
 msgid "EXPANDED"
 msgstr "已扩充"
 
-#: e2fsck/problem.c:87
+#: e2fsck/problem.c:89
 msgid "RECONNECTED"
 msgstr "已重新连接"
 
-#: e2fsck/problem.c:88
+#: e2fsck/problem.c:90
 msgid "CREATED"
 msgstr "已创建"
 
-#: e2fsck/problem.c:89
+#: e2fsck/problem.c:91
 msgid "SALVAGED"
 msgstr "已修复"
 
-#: e2fsck/problem.c:90
+#: e2fsck/problem.c:92
 msgid "TRUNCATED"
 msgstr "截断"
 
-#: e2fsck/problem.c:91
+#: e2fsck/problem.c:93
 msgid "INODE CLEARED"
 msgstr "INODE 已清除"
 
-#: e2fsck/problem.c:92
+#: e2fsck/problem.c:94
 msgid "ABORTED"
 msgstr "已中断"
 
-#: e2fsck/problem.c:93
+#: e2fsck/problem.c:95
 msgid "SPLIT"
 msgstr "分割"
 
-#: e2fsck/problem.c:94
+#: e2fsck/problem.c:96
 msgid "CONTINUING"
 msgstr "继续"
 
-#: e2fsck/problem.c:95
+#: e2fsck/problem.c:97
 msgid "MULTIPLY-CLAIMED BLOCKS CLONED"
 msgstr "重叠块已克隆"
 
-#: e2fsck/problem.c:96
+#: e2fsck/problem.c:98
 msgid "FILE DELETED"
 msgstr "文件已删除"
 
-#: e2fsck/problem.c:97
+#: e2fsck/problem.c:99
 msgid "SUPPRESSED"
 msgstr "禁止"
 
-#: e2fsck/problem.c:98
+#: e2fsck/problem.c:100
 msgid "UNLINKED"
 msgstr "已解除链接"
 
-#: e2fsck/problem.c:99
+#: e2fsck/problem.c:101
 msgid "HTREE INDEX CLEARED"
 msgstr "HTree索引已清除"
 
-#: e2fsck/problem.c:100
+#: e2fsck/problem.c:102
 msgid "WILL RECREATE"
 msgstr "将会重建"
 
 #. @-expanded: block bitmap for group %g is not in group.  (block %b)\n
-#: e2fsck/problem.c:115
+#: e2fsck/problem.c:118
 msgid "@b @B for @g %g is not in @g.  (@b %b)\n"
 msgstr "@g %g 的@b@B并不在 @g 中。（@b %b）\n"
 
 #. @-expanded: inode bitmap for group %g is not in group.  (block %b)\n
-#: e2fsck/problem.c:119
+#: e2fsck/problem.c:122
 msgid "@i @B for @g %g is not in @g.  (@b %b)\n"
 msgstr "@g %g 的@i@B 并不在 @g 中。（@b %b）\n"
 
 #. @-expanded: inode table for group %g is not in group.  (block %b)\n
 #. @-expanded: WARNING: SEVERE DATA LOSS POSSIBLE.\n
-#: e2fsck/problem.c:124
+#: e2fsck/problem.c:127
 msgid ""
 "@i table for @g %g is not in @g.  (@b %b)\n"
 "WARNING: SEVERE DATA LOSS POSSIBLE.\n"
@@ -763,7 +763,7 @@
 #. @-expanded:  or\n
 #. @-expanded:     e2fsck -b 32768 <device>\n
 #. @-expanded: \n
-#: e2fsck/problem.c:130
+#: e2fsck/problem.c:133
 msgid ""
 "\n"
 "The @S could not be read or does not describe a valid ext2/ext3/ext4\n"
@@ -787,7 +787,7 @@
 #. @-expanded: The filesystem size (according to the superblock) is %b blocks\n
 #. @-expanded: The physical size of the device is %c blocks\n
 #. @-expanded: Either the superblock or the partition table is likely to be corrupt!\n
-#: e2fsck/problem.c:141
+#: e2fsck/problem.c:144
 msgid ""
 "The @f size (according to the @S) is %b @bs\n"
 "The physical size of the @v is %c @bs\n"
@@ -800,7 +800,7 @@
 #. @-expanded: superblock block_size = %b, fragsize = %c.\n
 #. @-expanded: This version of e2fsck does not support fragment sizes different\n
 #. @-expanded: from the block size.\n
-#: e2fsck/problem.c:148
+#: e2fsck/problem.c:151
 msgid ""
 "@S @b_size = %b, fragsize = %c.\n"
 "This version of e2fsck does not support fragment sizes different\n"
@@ -811,18 +811,18 @@
 "@b大小不同。\n"
 
 #. @-expanded: superblock blocks_per_group = %b, should have been %c\n
-#: e2fsck/problem.c:155
+#: e2fsck/problem.c:158
 msgid "@S @bs_per_group = %b, should have been %c\n"
 msgstr "每组的@S@b数 = %b，应当为 %c。\n"
 
 #. @-expanded: superblock first_data_block = %b, should have been %c\n
-#: e2fsck/problem.c:160
+#: e2fsck/problem.c:163
 msgid "@S first_data_@b = %b, should have been %c\n"
 msgstr "@S的第一个数据块 = %b，应当为 %c\n"
 
 #. @-expanded: filesystem did not have a UUID; generating one.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:165
+#: e2fsck/problem.c:168
 msgid ""
 "@f did not have a UUID; generating one.\n"
 "\n"
@@ -830,7 +830,7 @@
 "@f没有UUID；正在创建新的UUID。\n"
 "\n"
 
-#: e2fsck/problem.c:171
+#: e2fsck/problem.c:174
 #, no-c-format
 msgid ""
 "Note: if several inode or block bitmap blocks or part\n"
@@ -847,48 +847,48 @@
 "\n"
 
 #. @-expanded: Corruption found in superblock.  (%s = %N).\n
-#: e2fsck/problem.c:180
+#: e2fsck/problem.c:183
 msgid "Corruption found in @S.  (%s = %N).\n"
 msgstr "在@S中发现错误。（%s = %N）。\n"
 
 #. @-expanded: Error determining size of the physical device: %m\n
-#: e2fsck/problem.c:186
+#: e2fsck/problem.c:189
 #, no-c-format
 msgid "Error determining size of the physical @v: %m\n"
 msgstr "决定物理@v的大小出错 %m\n"
 
 #. @-expanded: inode count in superblock is %i, should be %j.\n
-#: e2fsck/problem.c:191
+#: e2fsck/problem.c:194
 msgid "@i count in @S is %i, @s %j.\n"
 msgstr "@S中的@i个数为 %i，@s %j。\n"
 
-#: e2fsck/problem.c:195
+#: e2fsck/problem.c:198
 msgid "The Hurd does not support the filetype feature.\n"
 msgstr "Hurd内核不支持文件类型\n"
 
 #. @-expanded: superblock has an invalid journal (inode %i).\n
-#: e2fsck/problem.c:201
+#: e2fsck/problem.c:204
 #, no-c-format
 msgid "@S has an @n @j (@i %i).\n"
 msgstr "@S含有一个@n@j（@i %i）。\n"
 
 #. @-expanded: External journal has multiple filesystem users (unsupported).\n
-#: e2fsck/problem.c:206
+#: e2fsck/problem.c:209
 msgid "External @j has multiple @f users (unsupported).\n"
 msgstr "外部@j含有多个@f用户（不支持此特性）。\n"
 
 #. @-expanded: Can't find external journal\n
-#: e2fsck/problem.c:211
+#: e2fsck/problem.c:214
 msgid "Can't find external @j\n"
 msgstr "无法找到外部@j\n"
 
 #. @-expanded: External journal has bad superblock\n
-#: e2fsck/problem.c:216
+#: e2fsck/problem.c:219
 msgid "External @j has bad @S\n"
 msgstr "外部@j有坏@S\n"
 
 #. @-expanded: External journal does not support this filesystem\n
-#: e2fsck/problem.c:221
+#: e2fsck/problem.c:224
 msgid "External @j does not support this @f\n"
 msgstr "外部@j不支持此@f\n"
 
@@ -896,7 +896,7 @@
 #. @-expanded: It is likely that your copy of e2fsck is old and/or doesn't support this journal
 #. @-expanded: format.\n
 #. @-expanded: It is also possible the journal superblock is corrupt.\n
-#: e2fsck/problem.c:226
+#: e2fsck/problem.c:229
 msgid ""
 "@f @j @S is unknown type %N (unsupported).\n"
 "It is likely that your copy of e2fsck is old and/or doesn't support this @j "
@@ -908,80 +908,80 @@
 "也有可能@j@S已经损坏。\n"
 
 #. @-expanded: journal superblock is corrupt.\n
-#: e2fsck/problem.c:235
+#: e2fsck/problem.c:238
 msgid "@j @S is corrupt.\n"
 msgstr "@j@S被损坏。\n"
 
 #. @-expanded: superblock has_journal flag is clear, but a journal is present.\n
-#: e2fsck/problem.c:240
+#: e2fsck/problem.c:243
 msgid "@S has_@j flag is clear, but a @j is present.\n"
 msgstr "@S不具有has_journal标志，但发现了@j。\n"
 
 #. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
-#: e2fsck/problem.c:245
+#: e2fsck/problem.c:248
 msgid "@S needs_recovery flag is set, but no @j is present.\n"
 msgstr "@S被设置了needs_recovery标志，但找不到相应的@j。\n"
 
 #. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
-#: e2fsck/problem.c:250
+#: e2fsck/problem.c:253
 msgid "@S needs_recovery flag is clear, but @j has data.\n"
 msgstr "@S不具有的恢复标志，然而在@j中找到了恢复数据。\n"
 
 #. @-expanded: Clear journal
-#: e2fsck/problem.c:255
+#: e2fsck/problem.c:258
 msgid "Clear @j"
 msgstr "清除@j"
 
 #. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
-#: e2fsck/problem.c:260 e2fsck/problem.c:796
+#: e2fsck/problem.c:263 e2fsck/problem.c:799
 msgid "@f has feature flag(s) set, but is a revision 0 @f.  "
 msgstr "@f被设置了特性标志，但特性版本号为0。  "
 
 #. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
-#: e2fsck/problem.c:265
+#: e2fsck/problem.c:268
 msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
 msgstr "@s@o@i %i（uid=%lu，gid=%lg，mode=%lm，size=%ls）\n"
 
 #. @-expanded: illegal %B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:270
+#: e2fsck/problem.c:273
 msgid "@I %B (%b) found in @o @i %i.\n"
 msgstr "@o@i %i 中发现 @I %B（%b）。\n"
 
 #. @-expanded: Already cleared %B (%b) found in orphaned inode %i.\n
-#: e2fsck/problem.c:275
+#: e2fsck/problem.c:278
 msgid "Already cleared %B (%b) found in @o @i %i.\n"
 msgstr "@o@i %i 中发现已清除的 %B（%b）。\n"
 
 #. @-expanded: illegal orphaned inode %i in superblock.\n
-#: e2fsck/problem.c:281
+#: e2fsck/problem.c:284
 #, no-c-format
 msgid "@I @o @i %i in @S.\n"
 msgstr "@S中有@I@o@i %i。\n"
 
 #. @-expanded: illegal inode %i in orphaned inode list.\n
-#: e2fsck/problem.c:287
+#: e2fsck/problem.c:290
 #, no-c-format
 msgid "@I @i %i in @o @i list.\n"
 msgstr "@o@i中发现@I@i %i。\n"
 
 #. @-expanded: journal superblock has an unknown read-only feature flag set.\n
-#: e2fsck/problem.c:292
+#: e2fsck/problem.c:295
 msgid "@j @S has an unknown read-only feature flag set.\n"
 msgstr "@j@S被设置了未知的只读属性标签。\n"
 
 #. @-expanded: journal superblock has an unknown incompatible feature flag set.\n
-#: e2fsck/problem.c:297
+#: e2fsck/problem.c:300
 msgid "@j @S has an unknown incompatible feature flag set.\n"
 msgstr "@j@S被设置了未知的不兼容属性标签。\n"
 
 #. @-expanded: journal version not supported by this e2fsck.\n
-#: e2fsck/problem.c:302
+#: e2fsck/problem.c:305
 msgid "@j version not supported by this e2fsck.\n"
 msgstr "e2fsck不支持此@j版本。\n"
 
 #. @-expanded: Moving journal from /%s to hidden inode.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:308
+#: e2fsck/problem.c:311
 #, no-c-format
 msgid ""
 "Moving @j from /%s to hidden @i.\n"
@@ -992,7 +992,7 @@
 
 #. @-expanded: Error moving journal: %m\n
 #. @-expanded: \n
-#: e2fsck/problem.c:314
+#: e2fsck/problem.c:317
 #, no-c-format
 msgid ""
 "Error moving @j: %m\n"
@@ -1004,7 +1004,7 @@
 #. @-expanded: Found invalid V2 journal superblock fields (from V1 journal).\n
 #. @-expanded: Clearing fields beyond the V1 journal superblock...\n
 #. @-expanded: \n
-#: e2fsck/problem.c:319
+#: e2fsck/problem.c:322
 msgid ""
 "Found @n V2 @j @S fields (from V1 @j).\n"
 "Clearing fields beyond the V1 @j @S...\n"
@@ -1015,18 +1015,18 @@
 "\n"
 
 #. @-expanded: Run journal anyway
-#: e2fsck/problem.c:325
+#: e2fsck/problem.c:328
 msgid "Run @j anyway"
 msgstr "强制@j"
 
 #. @-expanded: Recovery flag not set in backup superblock, so running journal anyway.\n
-#: e2fsck/problem.c:330
+#: e2fsck/problem.c:333
 msgid "Recovery flag not set in backup @S, so running @j anyway.\n"
 msgstr "备份@S中未设置恢复标志，继续处理日志。\n"
 
 #. @-expanded: Backing up journal inode block information.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:335
+#: e2fsck/problem.c:338
 msgid ""
 "Backing up @j @i @b information.\n"
 "\n"
@@ -1036,7 +1036,7 @@
 
 #. @-expanded: filesystem does not have resize_inode enabled, but s_reserved_gdt_blocks\n
 #. @-expanded: is %N; should be zero.
-#: e2fsck/problem.c:341
+#: e2fsck/problem.c:344
 msgid ""
 "@f does not have resize_@i enabled, but s_reserved_gdt_@bs\n"
 "is %N; @s zero.  "
@@ -1045,18 +1045,18 @@
 "（但实际为%N）。  "
 
 #. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
-#: e2fsck/problem.c:347
+#: e2fsck/problem.c:350
 msgid "Resize_@i not enabled, but the resize @i is non-zero.  "
 msgstr "不支持更改@i大小，但所给的变更值非零。  "
 
 #. @-expanded: Resize inode not valid.
-#: e2fsck/problem.c:352
+#: e2fsck/problem.c:355
 msgid "Resize @i not valid.  "
 msgstr "改变@i大小的值无效。  "
 
 #. @-expanded: superblock last mount time (%t,\n
 #. @-expanded: \tnow = %T) is in the future.\n
-#: e2fsck/problem.c:357
+#: e2fsck/problem.c:360
 msgid ""
 "@S last mount time (%t,\n"
 "\tnow = %T) is in the future.\n"
@@ -1066,7 +1066,7 @@
 
 #. @-expanded: superblock last write time (%t,\n
 #. @-expanded: \tnow = %T) is in the future.\n
-#: e2fsck/problem.c:362
+#: e2fsck/problem.c:365
 msgid ""
 "@S last write time (%t,\n"
 "\tnow = %T) is in the future.\n"
@@ -1075,14 +1075,14 @@
 "\t当前：%T）在未来。\n"
 
 #. @-expanded: superblock hint for external superblock should be %X.
-#: e2fsck/problem.c:368
+#: e2fsck/problem.c:371
 #, no-c-format
 msgid "@S hint for external superblock @s %X.  "
 msgstr "外部超级块的@S标记@s %X。  "
 
 #. @-expanded: Adding dirhash hint to filesystem.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:373
+#: e2fsck/problem.c:376
 msgid ""
 "Adding dirhash hint to @f.\n"
 "\n"
@@ -1091,39 +1091,39 @@
 "\n"
 
 #. @-expanded: group descriptor %g checksum is %04x, should be %04y.
-#: e2fsck/problem.c:378
+#: e2fsck/problem.c:381
 msgid "@g descriptor %g checksum is %04x, should be %04y.  "
 msgstr "@g描述符 %g 的校验值为%04x，应当为 %04y。  "
 
 #. @-expanded: group descriptor %g marked uninitialized without feature set.\n
-#: e2fsck/problem.c:384
+#: e2fsck/problem.c:387
 #, no-c-format
 msgid "@g descriptor %g marked uninitialized without feature set.\n"
 msgstr "@g描述符 %g被标记为未初始化，并且没有设定特性。\n"
 
 #. @-expanded: group descriptor %g has invalid unused inodes count %b.
-#: e2fsck/problem.c:389
+#: e2fsck/problem.c:392
 msgid "@g descriptor %g has invalid unused inodes count %b.  "
 msgstr "@g描述符 %g 中的未使用inode数 %b 为无效值。  "
 
 #. @-expanded: Last group block bitmap uninitialized.
-#: e2fsck/problem.c:394
+#: e2fsck/problem.c:397
 msgid "Last @g @b @B uninitialized.  "
 msgstr "最后一个@g的@b@B未初始化。  "
 
-#: e2fsck/problem.c:400
+#: e2fsck/problem.c:403
 #, no-c-format
 msgid "Journal transaction %i was corrupt, replay was aborted.\n"
 msgstr "日志事务 %i 损坏，撤销过程已终止。\n"
 
-#: e2fsck/problem.c:405
+#: e2fsck/problem.c:408
 msgid "The test_fs flag is set (and ext4 is available).  "
 msgstr "设置了 test_fs 标志（并且ext4可用）。  "
 
 #. @-expanded: superblock last mount time is in the future.\n
 #. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly
 #. @-expanded: set)\n
-#: e2fsck/problem.c:410
+#: e2fsck/problem.c:413
 msgid ""
 "@S last mount time is in the future.\n"
 "\t(by less than a day, probably due to the hardware clock being incorrectly "
@@ -1135,7 +1135,7 @@
 #. @-expanded: superblock last write time is in the future.\n
 #. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly
 #. @-expanded: set)\n
-#: e2fsck/problem.c:416
+#: e2fsck/problem.c:419
 msgid ""
 "@S last write time is in the future.\n"
 "\t(by less than a day, probably due to the hardware clock being incorrectly "
@@ -1145,48 +1145,48 @@
 "\t（相差不到一天，可能是硬件时钟设定错误所致）\n"
 
 #. @-expanded: One or more block group descriptor checksums are invalid.
-#: e2fsck/problem.c:422
+#: e2fsck/problem.c:425
 msgid "One or more @b @g descriptor checksums are invalid.  "
 msgstr "一个或多个@b@g描述符的校验值无效。  "
 
 #. @-expanded: Setting free inodes count to %j (was %i)\n
-#: e2fsck/problem.c:427
+#: e2fsck/problem.c:430
 msgid "Setting free @is count to %j (was %i)\n"
 msgstr "设置未使用的@i数为 %j（曾为%i）\n"
 
 #. @-expanded: Setting free blocks count to %c (was %b)\n
-#: e2fsck/problem.c:432
+#: e2fsck/problem.c:435
 msgid "Setting free @bs count to %c (was %b)\n"
 msgstr "设置未使用的@b数为 %c（曾为%b）\n"
 
 #. @-expanded: Hiding %U quota inode %i (%Q).\n
-#: e2fsck/problem.c:437
+#: e2fsck/problem.c:440
 msgid "Hiding %U @q @i %i (%Q).\n"
 msgstr ""
 
 #. @-expanded: superblock has invalid MMP block.
-#: e2fsck/problem.c:442
+#: e2fsck/problem.c:445
 msgid "@S has invalid MMP block.  "
 msgstr "@S含有无效的MMP块。  "
 
 #. @-expanded: superblock has invalid MMP magic.
-#: e2fsck/problem.c:447
+#: e2fsck/problem.c:450
 msgid "@S has invalid MMP magic.  "
 msgstr "@S含有无效的MMP幻数。  "
 
-#: e2fsck/problem.c:453
+#: e2fsck/problem.c:456
 #, no-c-format
 msgid "ext2fs_open2: %m\n"
 msgstr "ext2fs_open2: %m\n"
 
-#: e2fsck/problem.c:459
+#: e2fsck/problem.c:462
 #, no-c-format
 msgid "ext2fs_check_desc: %m\n"
 msgstr "ext2fs_check_desc: %m\n"
 
 #. @-expanded: superblock metadata_csum supersedes uninit_bg; both feature bits cannot be set
 #. @-expanded: simultaneously.
-#: e2fsck/problem.c:465
+#: e2fsck/problem.c:468
 msgid ""
 "@S metadata_csum supersedes uninit_bg; both feature bits cannot be set "
 "simultaneously."
@@ -1198,156 +1198,156 @@
 msgstr ""
 
 #. @-expanded: superblock 64bit filesystem needs extents to access the whole disk.
-#: e2fsck/problem.c:476
+#: e2fsck/problem.c:479
 msgid "@S 64bit @f needs extents to access the whole disk.  "
 msgstr ""
 
-#: e2fsck/problem.c:481
+#: e2fsck/problem.c:484
 msgid "First_meta_bg is too big.  (%N, max value %g).  "
 msgstr "第一个meta_bg太大。（%N，最大值 %g）  "
 
 #. @-expanded: External journal superblock checksum does not match superblock.
-#: e2fsck/problem.c:486
+#: e2fsck/problem.c:489
 msgid "External @j @S checksum does not match @S.  "
 msgstr "外部@j@S校验值与@S自身不符  "
 
 #. @-expanded: superblock metadata_csum_seed is not necessary without metadata_csum.
-#: e2fsck/problem.c:491
+#: e2fsck/problem.c:494
 msgid "@S metadata_csum_seed is not necessary without metadata_csum."
 msgstr "只有同时开启了@S的 metadata_csum 特性，metadata_csum_seed 特性才有意义。"
 
-#: e2fsck/problem.c:497
+#: e2fsck/problem.c:500
 #, no-c-format
 msgid "Error initializing quota context in support library: %m\n"
 msgstr "初始化支持库中的引用上下文时出错：%m\n"
 
 #. @-expanded: Bad required extra isize in superblock (%N).
-#: e2fsck/problem.c:502
+#: e2fsck/problem.c:505
 msgid "Bad required extra isize in @S (%N).  "
 msgstr ""
 
 #. @-expanded: Bad desired extra isize in superblock (%N).
-#: e2fsck/problem.c:507
+#: e2fsck/problem.c:510
 msgid "Bad desired extra isize in @S (%N).  "
 msgstr ""
 
 #. @-expanded: Invalid %U quota inode %i.
-#: e2fsck/problem.c:512
+#: e2fsck/problem.c:515
 msgid "Invalid %U @q @i %i.  "
-msgstr ""
+msgstr "无效的 %U @q @i %i。  "
 
 #. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
-#: e2fsck/problem.c:530
+#: e2fsck/problem.c:533
 msgid "Pass 1: Checking @is, @bs, and sizes\n"
 msgstr "第 1 步：检查@i、@b和大小\n"
 
 #. @-expanded: root inode is not a directory.
-#: e2fsck/problem.c:534
+#: e2fsck/problem.c:537
 msgid "@r is not a @d.  "
 msgstr "@r不是一个@d。  "
 
 #. @-expanded: root inode has dtime set (probably due to old mke2fs).
-#: e2fsck/problem.c:539
+#: e2fsck/problem.c:542
 msgid "@r has dtime set (probably due to old mke2fs).  "
 msgstr "@r被设置了删除时间（可能由老版本的mke2fs导致）。  "
 
 #. @-expanded: Reserved inode %i (%Q) has invalid mode.
-#: e2fsck/problem.c:544
+#: e2fsck/problem.c:547
 msgid "Reserved @i %i (%Q) has @n mode.  "
 msgstr "保留的@i %i（%Q）的模式无效。  "
 
 #. @-expanded: deleted inode %i has zero dtime.
-#: e2fsck/problem.c:550
+#: e2fsck/problem.c:553
 #, no-c-format
 msgid "@D @i %i has zero dtime.  "
 msgstr "@D@i %i 的删除时间为零。  "
 
 #. @-expanded: inode %i is in use, but has dtime set.
-#: e2fsck/problem.c:556
+#: e2fsck/problem.c:559
 #, no-c-format
 msgid "@i %i is in use, but has dtime set.  "
 msgstr "使用中的@i %i 被设置了删除时间。  "
 
 #. @-expanded: inode %i is a zero-length directory.
-#: e2fsck/problem.c:562
+#: e2fsck/problem.c:565
 #, no-c-format
 msgid "@i %i is a @z @d.  "
 msgstr "@i %i 为@z@d。  "
 
 #. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:567
+#: e2fsck/problem.c:570
 msgid "@g %g's @b @B at %b @C.\n"
 msgstr "位于 %b 的@g %g的@b@B@C。\n"
 
 #. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:572
+#: e2fsck/problem.c:575
 msgid "@g %g's @i @B at %b @C.\n"
 msgstr "位于 %b 的@g %g的@i@B@C。\n"
 
 #. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
-#: e2fsck/problem.c:577
+#: e2fsck/problem.c:580
 msgid "@g %g's @i table at %b @C.\n"
 msgstr "位于 %b 的@g %g的@i表@C。\n"
 
 #. @-expanded: group %g's block bitmap (%b) is bad.
-#: e2fsck/problem.c:582
+#: e2fsck/problem.c:585
 msgid "@g %g's @b @B (%b) is bad.  "
 msgstr "@g %g 的@b@B无效。  "
 
 #. @-expanded: group %g's inode bitmap (%b) is bad.
-#: e2fsck/problem.c:587
+#: e2fsck/problem.c:590
 msgid "@g %g's @i @B (%b) is bad.  "
 msgstr "@g %g 的@i@B无效。  "
 
 #. @-expanded: inode %i, i_size is %Is, should be %N.
-#: e2fsck/problem.c:592
+#: e2fsck/problem.c:595
 msgid "@i %i, i_size is %Is, @s %N.  "
 msgstr "@i %i的大小为 %ls，@s %N。  "
 
 #. @-expanded: inode %i, i_blocks is %Ib, should be %N.
-#: e2fsck/problem.c:597
+#: e2fsck/problem.c:600
 msgid "@i %i, i_@bs is %Ib, @s %N.  "
 msgstr "@i %i的i_blocks为 %ls，@s %N。  "
 
 #. @-expanded: illegal %B (%b) in inode %i.
-#: e2fsck/problem.c:602
+#: e2fsck/problem.c:605
 msgid "@I %B (%b) in @i %i.  "
 msgstr "@I %B（%b）于@i %i。  "
 
 #. @-expanded: %B (%b) overlaps filesystem metadata in inode %i.
-#: e2fsck/problem.c:607
+#: e2fsck/problem.c:610
 msgid "%B (%b) overlaps @f metadata in @i %i.  "
 msgstr "%B（%b）与@i %i 记录元数据的位置重叠。  "
 
 #. @-expanded: inode %i has illegal block(s).
-#: e2fsck/problem.c:613
+#: e2fsck/problem.c:616
 #, no-c-format
 msgid "@i %i has illegal @b(s).  "
 msgstr "@i %i 中包含非法@b。  "
 
 #. @-expanded: Too many illegal blocks in inode %i.\n
-#: e2fsck/problem.c:619
+#: e2fsck/problem.c:622
 #, no-c-format
 msgid "Too many illegal @bs in @i %i.\n"
 msgstr "@i %i 中包含了过多的非法@b。\n"
 
 #. @-expanded: illegal %B (%b) in bad block inode.
-#: e2fsck/problem.c:624
+#: e2fsck/problem.c:627
 msgid "@I %B (%b) in bad @b @i.  "
 msgstr "@I %B（%b）于坏@b@i。  "
 
 #. @-expanded: Bad block inode has illegal block(s).
-#: e2fsck/problem.c:629
+#: e2fsck/problem.c:632
 msgid "Bad @b @i has illegal @b(s).  "
 msgstr "坏@b@i含有无效的@b。  "
 
 #. @-expanded: Duplicate or bad block in use!\n
-#: e2fsck/problem.c:634
+#: e2fsck/problem.c:637
 msgid "Duplicate or bad @b in use!\n"
 msgstr "使用了重复@b或坏@b！\n"
 
 #. @-expanded: Bad block %b used as bad block inode indirect block.
-#: e2fsck/problem.c:639
+#: e2fsck/problem.c:642
 msgid "Bad @b %b used as bad @b @i indirect @b.  "
 msgstr "坏@b %b 被用作坏@b@i的链接@b。  "
 
@@ -1355,7 +1355,7 @@
 #. @-expanded: The bad block inode has probably been corrupted.  You probably\n
 #. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n
 #. @-expanded: in the filesystem.\n
-#: e2fsck/problem.c:644
+#: e2fsck/problem.c:647
 msgid ""
 "\n"
 "The bad @b @i has probably been corrupted.  You probably\n"
@@ -1368,7 +1368,7 @@
 
 #. @-expanded: \n
 #. @-expanded: If the block is really bad, the filesystem can not be fixed.\n
-#: e2fsck/problem.c:651
+#: e2fsck/problem.c:654
 msgid ""
 "\n"
 "If the @b is really bad, the @f can not be fixed.\n"
@@ -1379,7 +1379,7 @@
 #. @-expanded: You can remove this block from the bad block list and hope\n
 #. @-expanded: that the block is really OK.  But there are no guarantees.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:656
+#: e2fsck/problem.c:659
 msgid ""
 "You can remove this @b from the bad @b list and hope\n"
 "that the @b is really OK.  But there are no guarantees.\n"
@@ -1390,121 +1390,121 @@
 "\n"
 
 #. @-expanded: The primary superblock (%b) is on the bad block list.\n
-#: e2fsck/problem.c:662
+#: e2fsck/problem.c:665
 msgid "The primary @S (%b) is on the bad @b list.\n"
 msgstr "主@S（%b）位于坏@b列表中。\n"
 
 #. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
-#: e2fsck/problem.c:667
+#: e2fsck/problem.c:670
 msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
 msgstr "主@g描述符中的块 %b 位于坏@b列表中\n"
 
 #. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
-#: e2fsck/problem.c:673
+#: e2fsck/problem.c:676
 msgid "Warning: Group %g's @S (%b) is bad.\n"
 msgstr "警告：组 %g 的@S（%b）为坏块。\n"
 
 #. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
-#: e2fsck/problem.c:679
+#: e2fsck/problem.c:682
 msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
 msgstr "警告：组 %g 描述符的备份含有一个坏@b（%b）。\n"
 
 #. @-expanded: Programming error?  block #%b claimed for no reason in process_bad_block.\n
-#: e2fsck/problem.c:685
+#: e2fsck/problem.c:688
 msgid "Programming error?  @b #%b claimed for no reason in process_bad_@b.\n"
 msgstr "检测到@b #%b 为坏@b，但原因未知（可能是程序错误导致的）。\n"
 
 #. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
-#: e2fsck/problem.c:691
+#: e2fsck/problem.c:694
 msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
 msgstr "在@b@g %g 中为 %s 分配 %N 个连续的@b时出错：%m\n"
 
 #. @-expanded: error allocating block buffer for relocating %s\n
-#: e2fsck/problem.c:697
+#: e2fsck/problem.c:700
 #, no-c-format
 msgid "@A @b buffer for relocating %s\n"
 msgstr "重定位 %s 时分配@b缓存出错\n"
 
 #. @-expanded: Relocating group %g's %s from %b to %c...\n
-#: e2fsck/problem.c:702
+#: e2fsck/problem.c:705
 msgid "Relocating @g %g's %s from %b to %c...\n"
 msgstr "正在将@g %g 的 %s 从 %b 重定位至 %c...\n"
 
 #. @-expanded: Relocating group %g's %s to %c...\n
-#: e2fsck/problem.c:708
+#: e2fsck/problem.c:711
 #, no-c-format
 msgid "Relocating @g %g's %s to %c...\n"
 msgstr "正在将@g %g 的 %s 重定位至 %c...\n"
 
 #. @-expanded: Warning: could not read block %b of %s: %m\n
-#: e2fsck/problem.c:713
+#: e2fsck/problem.c:716
 msgid "Warning: could not read @b %b of %s: %m\n"
 msgstr "警告：无法从%s中读取@b %b：%m\n"
 
 #. @-expanded: Warning: could not write block %b for %s: %m\n
-#: e2fsck/problem.c:718
+#: e2fsck/problem.c:721
 msgid "Warning: could not write @b %b for %s: %m\n"
 msgstr "警告：无法向%s中写入@b %b：%m\n"
 
 #. @-expanded: error allocating inode bitmap (%N): %m\n
-#: e2fsck/problem.c:723 e2fsck/problem.c:1871
+#: e2fsck/problem.c:726 e2fsck/problem.c:1883
 msgid "@A @i @B (%N): %m\n"
 msgstr "分配@i@B（%N）时出错：%m\n"
 
 #. @-expanded: error allocating block bitmap (%N): %m\n
-#: e2fsck/problem.c:728
+#: e2fsck/problem.c:731
 msgid "@A @b @B (%N): %m\n"
 msgstr "分配@b@B（%N）时出错：%m\n"
 
 #. @-expanded: error allocating icount link information: %m\n
-#: e2fsck/problem.c:734
+#: e2fsck/problem.c:737
 #, no-c-format
 msgid "@A icount link information: %m\n"
 msgstr "分配icount链接信息时出错：%m\n"
 
 #. @-expanded: error allocating directory block array: %m\n
-#: e2fsck/problem.c:740
+#: e2fsck/problem.c:743
 #, no-c-format
 msgid "@A @d @b array: %m\n"
 msgstr "分配@d@b数组时出错：%m\n"
 
 #. @-expanded: Error while scanning inodes (%i): %m\n
-#: e2fsck/problem.c:746
+#: e2fsck/problem.c:749
 #, no-c-format
 msgid "Error while scanning @is (%i): %m\n"
 msgstr "扫描@i（%i）时出错：%m\n"
 
 #. @-expanded: Error while iterating over blocks in inode %i: %m\n
-#: e2fsck/problem.c:752
+#: e2fsck/problem.c:755
 #, no-c-format
 msgid "Error while iterating over @bs in @i %i: %m\n"
 msgstr "迭代@i %i 中的@b时出错：%m\n"
 
 #. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n
-#: e2fsck/problem.c:757
+#: e2fsck/problem.c:760
 msgid "Error storing @i count information (@i=%i, count=%N): %m\n"
 msgstr "写入@i计数信息时出错（@i %i，计数=%N）：%m\n"
 
 #. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
-#: e2fsck/problem.c:762
+#: e2fsck/problem.c:765
 msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
 msgstr "写入@d@b信息时出错（@i %i，@b %b，数量=%N）\n"
 
 #. @-expanded: Error reading inode %i: %m\n
-#: e2fsck/problem.c:769
+#: e2fsck/problem.c:772
 #, no-c-format
 msgid "Error reading @i %i: %m\n"
 msgstr "读取@i %i出错：%m\n"
 
 #. @-expanded: inode %i has imagic flag set.
-#: e2fsck/problem.c:778
+#: e2fsck/problem.c:781
 #, no-c-format
 msgid "@i %i has imagic flag set.  "
 msgstr "@i %i 被设置了imagic标志。  "
 
 #. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n
 #. @-expanded: or append-only flag set.
-#: e2fsck/problem.c:784
+#: e2fsck/problem.c:787
 #, no-c-format
 msgid ""
 "Special (@v/socket/fifo/symlink) file (@i %i) has immutable\n"
@@ -1514,198 +1514,198 @@
 "（保护）或 a（仅追加） 标志。  "
 
 #. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
-#: e2fsck/problem.c:791
+#: e2fsck/problem.c:794
 #, no-c-format
 msgid "Special (@v/socket/fifo) @i %i has non-zero size.  "
 msgstr "特殊文件（@v/套接字/队列）@i %i 为非零大小。  "
 
 #. @-expanded: journal inode is not in use, but contains data.
-#: e2fsck/problem.c:801
+#: e2fsck/problem.c:804
 msgid "@j @i is not in use, but contains data.  "
 msgstr "@j @i 未被使用，但含有数据。  "
 
 #. @-expanded: journal is not regular file.
-#: e2fsck/problem.c:806
+#: e2fsck/problem.c:809
 msgid "@j is not regular file.  "
 msgstr "@j不是普通文件。  "
 
 #. @-expanded: inode %i was part of the orphaned inode list.
-#: e2fsck/problem.c:812
+#: e2fsck/problem.c:815
 #, no-c-format
 msgid "@i %i was part of the @o @i list.  "
 msgstr "@i %i 位于@o@i列表中。  "
 
 #. @-expanded: inodes that were part of a corrupted orphan linked list found.
-#: e2fsck/problem.c:818
+#: e2fsck/problem.c:821
 msgid "@is that were part of a corrupted orphan linked list found.  "
 msgstr "发现了可能属于损坏的孤立链接表的@i。  "
 
 #. @-expanded: error allocating refcount structure (%N): %m\n
-#: e2fsck/problem.c:823
+#: e2fsck/problem.c:826
 msgid "@A refcount structure (%N): %m\n"
 msgstr "分配refcount结构体（%N）时出错：%m\n"
 
 #. @-expanded: Error reading extended attribute block %b for inode %i.
-#: e2fsck/problem.c:828
+#: e2fsck/problem.c:831
 msgid "Error reading @a @b %b for @i %i.  "
 msgstr "读取@i %i 的@a@b %b 时出错。  "
 
 #. @-expanded: inode %i has a bad extended attribute block %b.
-#: e2fsck/problem.c:833
+#: e2fsck/problem.c:836
 msgid "@i %i has a bad @a @b %b.  "
 msgstr "@i %i 有一个 @a@b %b。  "
 
 #. @-expanded: Error reading extended attribute block %b (%m).
-#: e2fsck/problem.c:838
+#: e2fsck/problem.c:841
 msgid "Error reading @a @b %b (%m).  "
 msgstr "读取@a@b %b 时出错（%m）。  "
 
 #. @-expanded: extended attribute block %b has reference count %r, should be %N.
-#: e2fsck/problem.c:843
+#: e2fsck/problem.c:846
 msgid "@a @b %b has reference count %r, @s %N.  "
 msgstr "@a@b %b 的引用计数为 %r，@s %N。  "
 
 #. @-expanded: Error writing extended attribute block %b (%m).
-#: e2fsck/problem.c:848
+#: e2fsck/problem.c:851
 msgid "Error writing @a @b %b (%m).  "
 msgstr "写入@a@b %b 时出错（%m）。  "
 
 #. @-expanded: extended attribute block %b has h_blocks > 1.
-#: e2fsck/problem.c:853
+#: e2fsck/problem.c:856
 msgid "@a @b %b has h_@bs > 1.  "
 msgstr "@a@b %b 的h_blocks >1。  "
 
 #. @-expanded: error allocating extended attribute region allocation structure.
-#: e2fsck/problem.c:858
+#: e2fsck/problem.c:861
 msgid "@A @a region allocation structure.  "
 msgstr "构建外部属性区域的分配结构体时出错。  "
 
 #. @-expanded: extended attribute block %b is corrupt (allocation collision).
-#: e2fsck/problem.c:863
+#: e2fsck/problem.c:866
 msgid "@a @b %b is corrupt (allocation collision).  "
 msgstr "@a@b %b 已损坏（分配冲突）。  "
 
 #. @-expanded: extended attribute block %b is corrupt (invalid name).
-#: e2fsck/problem.c:868
+#: e2fsck/problem.c:871
 msgid "@a @b %b is corrupt (@n name).  "
 msgstr "@a@b %b 已损坏（@n名称）。  "
 
 #. @-expanded: extended attribute block %b is corrupt (invalid value).
-#: e2fsck/problem.c:873
+#: e2fsck/problem.c:876
 msgid "@a @b %b is corrupt (@n value).  "
 msgstr "@a@b %b 已损坏（@n值）。  "
 
 #. @-expanded: inode %i is too big.
-#: e2fsck/problem.c:879
+#: e2fsck/problem.c:882
 #, no-c-format
 msgid "@i %i is too big.  "
 msgstr "@i %i 过大。  "
 
 #. @-expanded: %B (%b) causes directory to be too big.
-#: e2fsck/problem.c:883
+#: e2fsck/problem.c:886
 msgid "%B (%b) causes @d to be too big.  "
 msgstr "%B（%b）造成@d过大。  "
 
-#: e2fsck/problem.c:888
+#: e2fsck/problem.c:891
 msgid "%B (%b) causes file to be too big.  "
 msgstr "%B（%b）造成文件过大。  "
 
-#: e2fsck/problem.c:893
+#: e2fsck/problem.c:896
 msgid "%B (%b) causes symlink to be too big.  "
 msgstr "%B（%b）造成符号链接过大。  "
 
 #. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n
-#: e2fsck/problem.c:899
+#: e2fsck/problem.c:902
 #, no-c-format
 msgid "@i %i has INDEX_FL flag set on @f without htree support.\n"
 msgstr "@i %i 被设置了INDEX_FL标志，但文件系统不支持htree。\n"
 
 #. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n
-#: e2fsck/problem.c:905
+#: e2fsck/problem.c:908
 #, no-c-format
 msgid "@i %i has INDEX_FL flag set but is not a @d.\n"
 msgstr "@i %i 被设置了INDEX_FL标志，但它并非目录。\n"
 
 #. @-expanded: HTREE directory inode %i has an invalid root node.\n
-#: e2fsck/problem.c:911
+#: e2fsck/problem.c:914
 #, no-c-format
 msgid "@h %i has an @n root node.\n"
 msgstr "@h %i 有一个@n根节点。\n"
 
 #. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n
-#: e2fsck/problem.c:916
+#: e2fsck/problem.c:919
 msgid "@h %i has an unsupported hash version (%N)\n"
 msgstr "@h %i 有一个无效的hash版本（%N）\n"
 
 #. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n
-#: e2fsck/problem.c:922
+#: e2fsck/problem.c:925
 #, no-c-format
 msgid "@h %i uses an incompatible htree root node flag.\n"
 msgstr "@h %i 使用了一个不兼容的htree根节点标志。\n"
 
 #. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n
-#: e2fsck/problem.c:927
+#: e2fsck/problem.c:930
 msgid "@h %i has a tree depth (%N) which is too big\n"
 msgstr "@h %i 树的深度过大（%N）\n"
 
 #. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n
 #. @-expanded: filesystem metadata.
-#: e2fsck/problem.c:933
+#: e2fsck/problem.c:936
 msgid ""
 "Bad @b @i has an indirect @b (%b) that conflicts with\n"
 "@f metadata.  "
 msgstr "坏@b@i含有一个与@f元数据冲突的连接@b（%b）。  "
 
 #. @-expanded: Resize inode (re)creation failed: %m.
-#: e2fsck/problem.c:940
+#: e2fsck/problem.c:943
 #, no-c-format
 msgid "Resize @i (re)creation failed: %m."
 msgstr "改变@i大小失败：%m。"
 
 #. @-expanded: inode %i has a extra size (%IS) which is invalid\n
-#: e2fsck/problem.c:945
+#: e2fsck/problem.c:948
 msgid "@i %i has a extra size (%IS) which is @n\n"
 msgstr "@i %i 有一个额外的大小 %lS（@n值）\n"
 
 #. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n
-#: e2fsck/problem.c:950
+#: e2fsck/problem.c:953
 msgid "@a in @i %i has a namelen (%N) which is @n\n"
 msgstr "@i %i 中的@a有一个名称长度%lS（@n值）\n"
 
 #. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n
-#: e2fsck/problem.c:955
+#: e2fsck/problem.c:958
 msgid "@a in @i %i has a value offset (%N) which is @n\n"
 msgstr "@i %i 中的@a含有一个@n的偏移量（%N）\n"
 
 #. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
-#: e2fsck/problem.c:960
+#: e2fsck/problem.c:963
 msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
 msgstr "@i %i 中的@a含有一个@n的数值块（%N），应当为0\n"
 
 #. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
-#: e2fsck/problem.c:965
+#: e2fsck/problem.c:968
 msgid "@a in @i %i has a value size (%N) which is @n\n"
 msgstr "@i %i 中的@a含有一个@n的大小（%N）\n"
 
 #. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n
-#: e2fsck/problem.c:970
+#: e2fsck/problem.c:973
 msgid "@a in @i %i has a hash (%N) which is @n\n"
 msgstr "@i %i 中的@a有一个@nhash值（%N）\n"
 
 #. @-expanded: inode %i is a %It but it looks like it is really a directory.\n
-#: e2fsck/problem.c:975
+#: e2fsck/problem.c:978
 msgid "@i %i is a %It but it looks like it is really a directory.\n"
 msgstr "@i %i 是一个@lt，但它实际上可能是一个目录。\n"
 
 #. @-expanded: Error while reading over extent tree in inode %i: %m\n
-#: e2fsck/problem.c:981
+#: e2fsck/problem.c:984
 #, no-c-format
 msgid "Error while reading over @x tree in @i %i: %m\n"
 msgstr "读取@i %i 中的@x树时出错：%m\n"
 
 #. @-expanded: Failed to iterate extents in inode %i\n
 #. @-expanded: \t(op %s, blk %b, lblk %c): %m\n
-#: e2fsck/problem.c:986
+#: e2fsck/problem.c:989
 msgid ""
 "Failed to iterate extents in @i %i\n"
 "\t(op %s, blk %b, lblk %c): %m\n"
@@ -1715,7 +1715,7 @@
 
 #. @-expanded: inode %i has an invalid extent\n
 #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
-#: e2fsck/problem.c:992
+#: e2fsck/problem.c:995
 msgid ""
 "@i %i has an @n extent\n"
 "\t(logical @b %c, @n physical @b %b, len %N)\n"
@@ -1725,7 +1725,7 @@
 
 #. @-expanded: inode %i has an invalid extent\n
 #. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n
-#: e2fsck/problem.c:997
+#: e2fsck/problem.c:1000
 msgid ""
 "@i %i has an @n extent\n"
 "\t(logical @b %c, physical @b %b, @n len %N)\n"
@@ -1734,31 +1734,31 @@
 "\t（逻辑块 %c，物理块@b %b，长度 %N）\n"
 
 #. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n
-#: e2fsck/problem.c:1003
+#: e2fsck/problem.c:1006
 #, no-c-format
 msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
 msgstr "@i %i 被设置了EXTENTS_FL标志，但文件系统不支持extent。\n"
 
 #. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
-#: e2fsck/problem.c:1009
+#: e2fsck/problem.c:1012
 #, no-c-format
 msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
 msgstr "@i %i 为extent格式，但@S不具有EXTENTS特性\n"
 
 #. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
-#: e2fsck/problem.c:1015
+#: e2fsck/problem.c:1018
 #, no-c-format
 msgid "@i %i missing EXTENT_FL, but is in extents format\n"
 msgstr "@i %i 不具有EXTENT_FL标志，但却为EXTENTS格式\n"
 
-#: e2fsck/problem.c:1021
+#: e2fsck/problem.c:1024
 #, no-c-format
 msgid "Fast symlink %i has EXTENT_FL set.  "
 msgstr "直接符号链接 %i 被设置了EXTENT_FL标志。  "
 
 #. @-expanded: inode %i has out of order extents\n
 #. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n
-#: e2fsck/problem.c:1026
+#: e2fsck/problem.c:1029
 msgid ""
 "@i %i has out of order extents\n"
 "\t(@n logical @b %c, physical @b %b, len %N)\n"
@@ -1767,39 +1767,39 @@
 "\t（@n 逻辑@b %c，物理@b %b，长度 %N）\n"
 
 #. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n
-#: e2fsck/problem.c:1030
+#: e2fsck/problem.c:1033
 msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n"
 msgstr "@i %i 是一个无效的extent节点（块 %b，lblk %c）\n"
 
 #. @-expanded: Error converting subcluster block bitmap: %m\n
-#: e2fsck/problem.c:1036
+#: e2fsck/problem.c:1039
 #, no-c-format
 msgid "Error converting subcluster @b @B: %m\n"
 msgstr "转换子簇的@d@b时出错：%m\n"
 
 #. @-expanded: quota inode is not a regular file.
-#: e2fsck/problem.c:1041
+#: e2fsck/problem.c:1044
 msgid "@q @i is not a regular file.  "
-msgstr ""
+msgstr "@q @i 不是普通文件。  "
 
 #. @-expanded: quota inode is not in use, but contains data.
-#: e2fsck/problem.c:1046
+#: e2fsck/problem.c:1049
 msgid "@q @i is not in use, but contains data.  "
 msgstr "@q @i 未被使用，但含有数据。  "
 
 #. @-expanded: quota inode is visible to the user.
-#: e2fsck/problem.c:1051
+#: e2fsck/problem.c:1054
 msgid "@q @i is visible to the user.  "
 msgstr "使用中的@q@i被对用户可见。  "
 
 #. @-expanded: The bad block inode looks invalid.
-#: e2fsck/problem.c:1056
+#: e2fsck/problem.c:1059
 msgid "The bad @b @i looks @n.  "
 msgstr "坏@b@i似乎是@n。  "
 
 #. @-expanded: inode %i has zero length extent\n
 #. @-expanded: \t(invalid logical block %c, physical block %b)\n
-#: e2fsck/problem.c:1061
+#: e2fsck/problem.c:1064
 msgid ""
 "@i %i has zero length extent\n"
 "\t(@n logical @b %c, physical @b %b)\n"
@@ -1808,26 +1808,26 @@
 "\t（@n 逻辑@b %c，物理@b %b）\n"
 
 #. @-expanded: inode %i seems to contain garbage.
-#: e2fsck/problem.c:1067
+#: e2fsck/problem.c:1070
 #, no-c-format
 msgid "@i %i seems to contain garbage.  "
 msgstr "@i %i 含有无效数据。  "
 
 #. @-expanded: inode %i passes checks, but checksum does not match inode.
-#: e2fsck/problem.c:1073
+#: e2fsck/problem.c:1076
 #, no-c-format
 msgid "@i %i passes checks, but checksum does not match @i.  "
 msgstr "@i %i 通过检验，但其校验值与自身不符。  "
 
 #. @-expanded: inode %i extended attribute is corrupt (allocation collision).
-#: e2fsck/problem.c:1079
+#: e2fsck/problem.c:1082
 #, no-c-format
 msgid "@i %i @a is corrupt (allocation collision).  "
 msgstr "@i %i @a 已损坏（分配冲突）。  "
 
 #. @-expanded: inode %i extent block passes checks, but checksum does not match extent\n
 #. @-expanded: \t(logical block %c, physical block %b, len %N)\n
-#: e2fsck/problem.c:1087
+#: e2fsck/problem.c:1090
 msgid ""
 "@i %i extent block passes checks, but checksum does not match extent\n"
 "\t(logical @b %c, physical @b %b, len %N)\n"
@@ -1836,13 +1836,13 @@
 "\t（逻辑@b %c，物理@b %b，长度 %N）\n"
 
 #. @-expanded: inode %i extended attribute block %b passes checks, but checksum does not match block.
-#: e2fsck/problem.c:1096
+#: e2fsck/problem.c:1099
 msgid "@i %i @a @b %b passes checks, but checksum does not match @b.  "
 msgstr "@i %i 的@a @b %b 通过检验，但其校验值与自身不符。  "
 
 #. @-expanded: Interior extent node level %N of inode %i:\n
 #. @-expanded: Logical start %b does not match logical start %c at next level.
-#: e2fsck/problem.c:1101
+#: e2fsck/problem.c:1104
 msgid ""
 "Interior @x node level %N of @i %i:\n"
 "Logical start %b does not match logical start %c at next level.  "
@@ -1852,7 +1852,7 @@
 
 #. @-expanded: inode %i, end of extent exceeds allowed value\n
 #. @-expanded: \t(logical block %c, physical block %b, len %N)\n
-#: e2fsck/problem.c:1107
+#: e2fsck/problem.c:1110
 msgid ""
 "@i %i, end of extent exceeds allowed value\n"
 "\t(logical @b %c, physical @b %b, len %N)\n"
@@ -1861,38 +1861,38 @@
 "\t（逻辑@b %c，物理块@b %b，长度 %N）\n"
 
 #. @-expanded: inode %i has inline data, but superblock is missing INLINE_DATA feature\n
-#: e2fsck/problem.c:1113
+#: e2fsck/problem.c:1116
 #, no-c-format
 msgid "@i %i has inline data, but @S is missing INLINE_DATA feature\n"
 msgstr "@i %i 含有内联数据，但@S不具有 INLINE_DATA 特性\n"
 
 #. @-expanded: inode %i has INLINE_DATA_FL flag on filesystem without inline data support.\n
-#: e2fsck/problem.c:1119
+#: e2fsck/problem.c:1122
 #, no-c-format
 msgid "@i %i has INLINE_DATA_FL flag on @f without inline data support.\n"
 msgstr "@i %i 被设置了 INLINE_DATA_FL 标志，但文件系统不支持内联数据。\n"
 
 #. @-expanded: inode %i block %b conflicts with critical metadata, skipping block checks.\n
-#: e2fsck/problem.c:1127
+#: e2fsck/problem.c:1130
 #, no-c-format
 msgid ""
 "@i %i block %b conflicts with critical metadata, skipping block checks.\n"
 msgstr "@i %i 块 %b 与关键元数据冲突，跳过对块的检查。\n"
 
 #. @-expanded: directory inode %i block %b should be at block %c.
-#: e2fsck/problem.c:1132
+#: e2fsck/problem.c:1135
 msgid "@d @i %i @b %b should be at @b %c.  "
 msgstr "@d@i %i @b %b 应为@b %c。  "
 
 #. @-expanded: directory inode %i has extent marked uninitialized at block %c.
-#: e2fsck/problem.c:1138
+#: e2fsck/problem.c:1141
 #, no-c-format
 msgid "@d @i %i has @x marked uninitialized at @b %c.  "
 msgstr "@d@i %i 含有被标记为未初始化的@x，位于@b %c。  "
 
 #. @-expanded: inode %i logical block %b (physical block %c) violates cluster allocation rules.\n
 #. @-expanded: Will fix in pass 1B.\n
-#: e2fsck/problem.c:1143
+#: e2fsck/problem.c:1146
 msgid ""
 "@i %i logical @b %b (physical @b %c) violates cluster allocation rules.\n"
 "Will fix in pass 1B.\n"
@@ -1901,14 +1901,14 @@
 "将会在第 1B 步中进行修复。\n"
 
 #. @-expanded: inode %i has INLINE_DATA_FL flag but extended attribute not found.
-#: e2fsck/problem.c:1149
+#: e2fsck/problem.c:1152
 #, no-c-format
 msgid "@i %i has INLINE_DATA_FL flag but @a not found.  "
 msgstr "@i %i 被设置了INDEX_DATA_FL标志，但找不到相应的@a。  "
 
 #. @-expanded: Special (device/socket/fifo) file (inode %i) has extents\n
 #. @-expanded: or inline-data flag set.
-#: e2fsck/problem.c:1156
+#: e2fsck/problem.c:1159
 #, no-c-format
 msgid ""
 "Special (@v/socket/fifo) file (@i %i) has extents\n"
@@ -1918,42 +1918,42 @@
 "extents 或内联数据标志。  "
 
 #. @-expanded: inode %i has extent header but inline data flag is set.\n
-#: e2fsck/problem.c:1163
+#: e2fsck/problem.c:1166
 #, no-c-format
 msgid "@i %i has @x header but inline data flag is set.\n"
 msgstr "@i %i 含有@x头部，但被设置了内联数据标志。\n"
 
 #. @-expanded: inode %i seems to have inline data but extent flag is set.\n
-#: e2fsck/problem.c:1169
+#: e2fsck/problem.c:1172
 #, no-c-format
 msgid "@i %i seems to have inline data but @x flag is set.\n"
 msgstr "@i %i 似乎含有内联数据，但被设置了@x标志。\n"
 
 #. @-expanded: inode %i seems to have block map but inline data and extent flags set.\n
-#: e2fsck/problem.c:1175
+#: e2fsck/problem.c:1178
 #, no-c-format
 msgid "@i %i seems to have @b map but inline data and @x flags set.\n"
 msgstr "@i %i 似乎含有@b位图，但被设置了内联数据标志和@x标志。\n"
 
 #. @-expanded: inode %i has inline data and extent flags set but i_block contains junk.\n
-#: e2fsck/problem.c:1181
+#: e2fsck/problem.c:1184
 #, no-c-format
 msgid "@i %i has inline data and @x flags set but i_block contains junk.\n"
 msgstr "@i %i 含有内联数据且被设置了@x标志，但 i_block 中含有无效数据。\n"
 
 #. @-expanded: Bad block list says the bad block list inode is bad.
-#: e2fsck/problem.c:1186
+#: e2fsck/problem.c:1189
 msgid "Bad block list says the bad block list @i is bad.  "
 msgstr "坏块列表中的数据表明，坏块列表@i 已损坏。  "
 
 #. @-expanded: error allocating extent region allocation structure.
-#: e2fsck/problem.c:1191
+#: e2fsck/problem.c:1194
 msgid "@A @x region allocation structure.  "
 msgstr "构建extent区域的分配结构体时出错。  "
 
 #. @-expanded: inode %i has a duplicate extent mapping\n
 #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n
-#: e2fsck/problem.c:1196
+#: e2fsck/problem.c:1199
 msgid ""
 "@i %i has a duplicate @x mapping\n"
 "\t(logical @b %c, @n physical @b %b, len %N)\n"
@@ -1962,46 +1962,46 @@
 "\t（逻辑块 %c，@n物理块@b %b，长度 %N）\n"
 
 #. @-expanded: error allocating memory for encrypted directory list\n
-#: e2fsck/problem.c:1201
+#: e2fsck/problem.c:1204
 msgid "@A memory for encrypted @d list\n"
 msgstr "为加密@d列表分配内存时出错\n"
 
 #. @-expanded: inode %i extent tree could be more shallow (%b; could be <= %c)\n
-#: e2fsck/problem.c:1206
+#: e2fsck/problem.c:1209
 msgid "@i %i @x tree could be more shallow (%b; could be <= %c)\n"
 msgstr "@i %i @x树的深度可以更小（当前为%b；可以 <= %c）\n"
 
 #. @-expanded: inode %i on bigalloc filesystem cannot be block mapped.
-#: e2fsck/problem.c:1212
+#: e2fsck/problem.c:1215
 #, no-c-format
 msgid "@i %i on bigalloc @f cannot be @b mapped.  "
 msgstr "位于 bigalloc @f 的@i %i on bigalloc @f 无法被@b映射。  "
 
 #. @-expanded: inode %i has corrupt extent header.
-#: e2fsck/problem.c:1218
+#: e2fsck/problem.c:1221
 #, no-c-format
 msgid "@i %i has corrupt @x header.  "
 msgstr "@i %i 含有损坏的@x头部。  "
 
 #. @-expanded: Timestamp(s) on inode %i beyond 2310-04-04 are likely pre-1970.\n
-#: e2fsck/problem.c:1224
+#: e2fsck/problem.c:1227
 #, no-c-format
 msgid "Timestamp(s) on @i %i beyond 2310-04-04 are likely pre-1970.\n"
 msgstr "@i %i 的时间戳超过了 2310-04-04，可能应为 1970 年之前。\n"
 
 #. @-expanded: inode %i has illegal extended attribute value inode %N.\n
-#: e2fsck/problem.c:1229
+#: e2fsck/problem.c:1232
 msgid "@i %i has @I @a value @i %N.\n"
-msgstr ""
+msgstr "@i %i 有一个 @I @a 值 @i %N。\n"
 
 #. @-expanded: inode %i has invalid extended attribute. EA inode %N missing EA_INODE flag.\n
-#: e2fsck/problem.c:1235
+#: e2fsck/problem.c:1238
 msgid "@i %i has @n @a. EA @i %N missing EA_INODE flag.\n"
 msgstr ""
 
 #. @-expanded: EA inode %N for parent inode %i missing EA_INODE flag.\n
 #. @-expanded:
-#: e2fsck/problem.c:1240
+#: e2fsck/problem.c:1243
 msgid ""
 "EA @i %N for parent @i %i missing EA_INODE flag.\n"
 " "
@@ -2010,7 +2010,7 @@
 #. @-expanded: \n
 #. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n
 #. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n
-#: e2fsck/problem.c:1248
+#: e2fsck/problem.c:1260
 msgid ""
 "\n"
 "Running additional passes to resolve @bs claimed by more than one @i...\n"
@@ -2021,46 +2021,46 @@
 "第 1B 步：重新扫描@m @b\n"
 
 #. @-expanded: multiply-claimed block(s) in inode %i:
-#: e2fsck/problem.c:1255
+#: e2fsck/problem.c:1267
 #, no-c-format
 msgid "@m @b(s) in @i %i:"
 msgstr "@m@b位于@i %i："
 
-#: e2fsck/problem.c:1271
+#: e2fsck/problem.c:1283
 #, no-c-format
 msgid "Error while scanning inodes (%i): %m\n"
 msgstr "扫描Inode（%i\\）时出错：%m\n"
 
 #. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n
-#: e2fsck/problem.c:1277
+#: e2fsck/problem.c:1289
 #, no-c-format
 msgid "@A @i @B (@i_dup_map): %m\n"
 msgstr "分配@i@B时出错（inode_dup_map）：%m\n"
 
 #. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n
-#: e2fsck/problem.c:1283
+#: e2fsck/problem.c:1295
 #, no-c-format
 msgid "Error while iterating over @bs in @i %i (%s): %m\n"
 msgstr "迭代@i %i中的@b时出错（%s）：%m\n"
 
 #. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
-#: e2fsck/problem.c:1288 e2fsck/problem.c:1663
+#: e2fsck/problem.c:1300 e2fsck/problem.c:1675
 msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
 msgstr "为@aB %b（@i %i）调整refcount时出错：%m\n"
 
 #. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
-#: e2fsck/problem.c:1298
+#: e2fsck/problem.c:1310
 msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
 msgstr "第 1C 步：扫描含有@m@b的目录@i\n"
 
 #. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
-#: e2fsck/problem.c:1304
+#: e2fsck/problem.c:1316
 msgid "Pass 1D: Reconciling @m @bs\n"
 msgstr "第 1C 步：调整@m@b\n"
 
 #. @-expanded: File %Q (inode #%i, mod time %IM) \n
 #. @-expanded:   has %r multiply-claimed block(s), shared with %N file(s):\n
-#: e2fsck/problem.c:1309
+#: e2fsck/problem.c:1321
 msgid ""
 "File %Q (@i #%i, mod time %IM) \n"
 "  has %r @m @b(s), shared with %N file(s):\n"
@@ -2069,18 +2069,18 @@
 "与 %N 个文件共享 %r 个@m@b\n"
 
 #. @-expanded: \t%Q (inode #%i, mod time %IM)\n
-#: e2fsck/problem.c:1315
+#: e2fsck/problem.c:1327
 msgid "\t%Q (@i #%i, mod time %IM)\n"
 msgstr "\t%Q（@i #%i，修改时间 %IM）\n"
 
 #. @-expanded: \t<filesystem metadata>\n
-#: e2fsck/problem.c:1320
+#: e2fsck/problem.c:1332
 msgid "\t<@f metadata>\n"
 msgstr "\t<@f元数据>\n"
 
 #. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n
 #. @-expanded: \n
-#: e2fsck/problem.c:1325
+#: e2fsck/problem.c:1337
 msgid ""
 "(There are %N @is containing @m @bs.)\n"
 "\n"
@@ -2090,7 +2090,7 @@
 
 #. @-expanded: multiply-claimed blocks already reassigned or cloned.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:1330
+#: e2fsck/problem.c:1342
 msgid ""
 "@m @bs already reassigned or cloned.\n"
 "\n"
@@ -2098,345 +2098,345 @@
 "@m@b已被重新分配或克隆。\n"
 "\n"
 
-#: e2fsck/problem.c:1344
+#: e2fsck/problem.c:1356
 #, no-c-format
 msgid "Couldn't clone file: %m\n"
 msgstr "无法克隆文件：%m\n"
 
 #. @-expanded: Pass 1E: Optimizing extent trees\n
-#: e2fsck/problem.c:1350
+#: e2fsck/problem.c:1362
 msgid "Pass 1E: Optimizing @x trees\n"
 msgstr "第 1E 步：优化@x树\n"
 
 #. @-expanded: Failed to optimize extent tree %p (%i): %m\n
-#: e2fsck/problem.c:1356
+#: e2fsck/problem.c:1368
 #, no-c-format
 msgid "Failed to optimize @x tree %p (%i): %m\n"
 msgstr "优化@x树 %p（%i）失败：%m\n"
 
 #. @-expanded: Optimizing extent trees:
-#: e2fsck/problem.c:1361
+#: e2fsck/problem.c:1373
 msgid "Optimizing @x trees: "
 msgstr "优化@x树： "
 
-#: e2fsck/problem.c:1376
+#: e2fsck/problem.c:1388
 msgid "Internal error: max extent tree depth too large (%b; expected=%c).\n"
 msgstr "内部错误：extent树的最大深度过大（当前为 %b；应为 %c）。\n"
 
 #. @-expanded: inode %i extent tree (at level %b) could be shorter.
-#: e2fsck/problem.c:1381
+#: e2fsck/problem.c:1393
 msgid "@i %i @x tree (at level %b) could be shorter.  "
 msgstr "@i %i 的@x树（位于第 %b 层）的深度可以更小。  "
 
 #. @-expanded: inode %i extent tree (at level %b) could be narrower.
-#: e2fsck/problem.c:1386
+#: e2fsck/problem.c:1398
 msgid "@i %i @x tree (at level %b) could be narrower.  "
 msgstr "@i %i 的@x树（位于第 %b 层）可以更窄。  "
 
 #. @-expanded: Pass 2: Checking directory structure\n
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1405
 msgid "Pass 2: Checking @d structure\n"
 msgstr "第 2 步：检查目录结构\n"
 
 #. @-expanded: invalid inode number for '.' in directory inode %i.\n
-#: e2fsck/problem.c:1399
+#: e2fsck/problem.c:1411
 #, no-c-format
 msgid "@n @i number for '.' in @d @i %i.\n"
 msgstr "@d@i %i 中“.”的@n@i编号无效。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n
-#: e2fsck/problem.c:1404
+#: e2fsck/problem.c:1416
 msgid "@E has @n @i #: %Di.\n"
 msgstr "@E含有@n@i #：%Di\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di.
-#: e2fsck/problem.c:1409
+#: e2fsck/problem.c:1421
 msgid "@E has @D/unused @i %Di.  "
 msgstr "@E含有@D或未使用的@ %Di。  "
 
 #. @-expanded: entry '%Dn' in %p (%i) is a link to '.'
-#: e2fsck/problem.c:1414
+#: e2fsck/problem.c:1426
 msgid "@E @L to '.'  "
 msgstr "@E是一个指向“.”的链接  "
 
 #. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
-#: e2fsck/problem.c:1419
+#: e2fsck/problem.c:1431
 msgid "@E points to @i (%Di) located in a bad @b.\n"
 msgstr "@E指向位于坏@b的@i（%Di）。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
-#: e2fsck/problem.c:1424
+#: e2fsck/problem.c:1436
 msgid "@E @L to @d %P (%Di).\n"
 msgstr "@E是一个指向@d %P（%Di）的链接。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n
-#: e2fsck/problem.c:1429
+#: e2fsck/problem.c:1441
 msgid "@E @L to the @r.\n"
 msgstr "@E是一个指向@r的链接。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n
-#: e2fsck/problem.c:1434
+#: e2fsck/problem.c:1446
 msgid "@E has illegal characters in its name.\n"
 msgstr "@E的名称中有无效字符。\n"
 
 #. @-expanded: Missing '.' in directory inode %i.\n
-#: e2fsck/problem.c:1440
+#: e2fsck/problem.c:1452
 #, no-c-format
 msgid "Missing '.' in @d @i %i.\n"
 msgstr "@d@i %i 中缺少“.”。\n"
 
 #. @-expanded: Missing '..' in directory inode %i.\n
-#: e2fsck/problem.c:1446
+#: e2fsck/problem.c:1458
 #, no-c-format
 msgid "Missing '..' in @d @i %i.\n"
 msgstr "@d@i %i 中缺少“..”。\n"
 
 #. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
-#: e2fsck/problem.c:1451
+#: e2fsck/problem.c:1463
 msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
 msgstr "@d@i %i 中的第一个@e“%Dn”（@i=%Di）@s“.”\n"
 
 #. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
-#: e2fsck/problem.c:1456
+#: e2fsck/problem.c:1468
 msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n"
 msgstr "@d@i %i 中的第二个@e“%Dn”（@i=%Di）@s“..”\n"
 
 #. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n
-#: e2fsck/problem.c:1461
+#: e2fsck/problem.c:1473
 msgid "i_faddr @F %IF, @s zero.\n"
 msgstr "@i %i （%Q）的i_faddr为 %IF，@s0。\n"
 
 #. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n
-#: e2fsck/problem.c:1466
+#: e2fsck/problem.c:1478
 msgid "i_file_acl @F %If, @s zero.\n"
 msgstr "@i %i （%Q）的i_file_acl为 %IF，@s0。\n"
 
 #. @-expanded: i_size_high for inode %i (%Q) is %Id, should be zero.\n
-#: e2fsck/problem.c:1471
+#: e2fsck/problem.c:1483
 msgid "i_size_high @F %Id, @s zero.\n"
 msgstr ""
 
 #. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1476
+#: e2fsck/problem.c:1488
 msgid "i_frag @F %N, @s zero.\n"
 msgstr "@i %i （%Q）的i_frag为 %N，@s0。\n"
 
 #. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1481
+#: e2fsck/problem.c:1493
 msgid "i_fsize @F %N, @s zero.\n"
 msgstr "@i %i （%Q）的i_size为 %N，@s0。\n"
 
 #. @-expanded: inode %i (%Q) has invalid mode (%Im).\n
-#: e2fsck/problem.c:1486
+#: e2fsck/problem.c:1498
 msgid "@i %i (%Q) has @n mode (%Im).\n"
 msgstr "@i %i（%Q）有@n模式 （%Im）。\n"
 
 #. @-expanded: directory inode %i, %B, offset %N: directory corrupted\n
-#: e2fsck/problem.c:1491
+#: e2fsck/problem.c:1503
 msgid "@d @i %i, %B, offset %N: @d corrupted\n"
 msgstr "@d@i %i，%B，偏移量 %N：@d已损坏\n"
 
 #. @-expanded: directory inode %i, %B, offset %N: filename too long\n
-#: e2fsck/problem.c:1496
+#: e2fsck/problem.c:1508
 msgid "@d @i %i, %B, offset %N: filename too long\n"
 msgstr "@d@i %i，%B，偏移量 %N：文件名过长\n"
 
 #. @-expanded: directory inode %i has an unallocated %B.
-#: e2fsck/problem.c:1501
+#: e2fsck/problem.c:1513
 msgid "@d @i %i has an unallocated %B.  "
 msgstr "@d@i %i 含有未分配的 %B。  "
 
 #. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:1507
+#: e2fsck/problem.c:1519
 #, no-c-format
 msgid "'.' @d @e in @d @i %i is not NULL terminated\n"
 msgstr "@d@i %i 中的“.”@d@e 没有以NULL终止\n"
 
 #. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n
-#: e2fsck/problem.c:1513
+#: e2fsck/problem.c:1525
 #, no-c-format
 msgid "'..' @d @e in @d @i %i is not NULL terminated\n"
 msgstr "@d@i %i 中的“..”@d@e 没有以NULL终止\n"
 
 #. @-expanded: inode %i (%Q) is an illegal character device.\n
-#: e2fsck/problem.c:1518
+#: e2fsck/problem.c:1530
 msgid "@i %i (%Q) is an @I character @v.\n"
 msgstr "@i %i（%Q）是一个@I的字符@v。\n"
 
 #. @-expanded: inode %i (%Q) is an illegal block device.\n
-#: e2fsck/problem.c:1523
+#: e2fsck/problem.c:1535
 msgid "@i %i (%Q) is an @I @b @v.\n"
 msgstr "@i %i（%Q）是一个@I的@b@v。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n
-#: e2fsck/problem.c:1528
+#: e2fsck/problem.c:1540
 msgid "@E is duplicate '.' @e.\n"
 msgstr "@E为重复的“.”目录@e。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n
-#: e2fsck/problem.c:1533
+#: e2fsck/problem.c:1545
 msgid "@E is duplicate '..' @e.\n"
 msgstr "@E为重复的“..”目录@e。\n"
 
-#: e2fsck/problem.c:1539 e2fsck/problem.c:1898
+#: e2fsck/problem.c:1551 e2fsck/problem.c:1910
 #, no-c-format
 msgid "Internal error: couldn't find dir_info for %i.\n"
 msgstr "内部错误：无法找到 %i 的dir_info。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n
-#: e2fsck/problem.c:1544
+#: e2fsck/problem.c:1556
 msgid "@E has rec_len of %Dr, @s %N.\n"
 msgstr "@E的rec_len为 %Dr，@s %N。\n"
 
 #. @-expanded: error allocating icount structure: %m\n
-#: e2fsck/problem.c:1550
+#: e2fsck/problem.c:1562
 #, no-c-format
 msgid "@A icount structure: %m\n"
 msgstr "分配icount结构体时出错：%m\n"
 
 #. @-expanded: Error iterating over directory blocks: %m\n
-#: e2fsck/problem.c:1556
+#: e2fsck/problem.c:1568
 #, no-c-format
 msgid "Error iterating over @d @bs: %m\n"
 msgstr "迭代@d@b时出错：%m\n"
 
 #. @-expanded: Error reading directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1561
+#: e2fsck/problem.c:1573
 msgid "Error reading @d @b %b (@i %i): %m\n"
 msgstr "读取@d@b %b（@i %i）时出错：%m\n"
 
 #. @-expanded: Error writing directory block %b (inode %i): %m\n
-#: e2fsck/problem.c:1566
+#: e2fsck/problem.c:1578
 msgid "Error writing @d @b %b (@i %i): %m\n"
 msgstr "写入@d@b %b（@i %i）时出错：%m\n"
 
 #. @-expanded: error allocating new directory block for inode %i (%s): %m\n
-#: e2fsck/problem.c:1572
+#: e2fsck/problem.c:1584
 #, no-c-format
 msgid "@A new @d @b for @i %i (%s): %m\n"
 msgstr "为@i %i（%s）分配新@d@b时出错：%m\n"
 
 #. @-expanded: Error deallocating inode %i: %m\n
-#: e2fsck/problem.c:1578
+#: e2fsck/problem.c:1590
 #, no-c-format
 msgid "Error deallocating @i %i: %m\n"
 msgstr "取消分配@i %i时出错：%m\n"
 
 #. @-expanded: directory entry for '.' in %p (%i) is big.\n
-#: e2fsck/problem.c:1584
+#: e2fsck/problem.c:1596
 #, no-c-format
 msgid "@d @e for '.' in %p (%i) is big.\n"
 msgstr "%p（%i）中“.”的@d@e太大。\n"
 
 #. @-expanded: inode %i (%Q) is an illegal FIFO.\n
-#: e2fsck/problem.c:1589
+#: e2fsck/problem.c:1601
 msgid "@i %i (%Q) is an @I FIFO.\n"
 msgstr "@i %i（%Q）是一个@I队列。\n"
 
 #. @-expanded: inode %i (%Q) is an illegal socket.\n
-#: e2fsck/problem.c:1594
+#: e2fsck/problem.c:1606
 msgid "@i %i (%Q) is an @I socket.\n"
 msgstr "@i %i（%Q）是一个@I套接字。\n"
 
 #. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n
-#: e2fsck/problem.c:1599
+#: e2fsck/problem.c:1611
 msgid "Setting filetype for @E to %N.\n"
 msgstr "将@E的文件类型设置为 %N。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
-#: e2fsck/problem.c:1604
+#: e2fsck/problem.c:1616
 msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
 msgstr "@E含有错误的文件类型（%Dt，@s %N）。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
-#: e2fsck/problem.c:1609
+#: e2fsck/problem.c:1621
 msgid "@E has filetype set.\n"
 msgstr "@E被设置了文件类型。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n
-#: e2fsck/problem.c:1614
+#: e2fsck/problem.c:1626
 msgid "@E has a @z name.\n"
 msgstr "@E含有长度为零的名称。\n"
 
 #. @-expanded: Symlink %Q (inode #%i) is invalid.\n
-#: e2fsck/problem.c:1619
+#: e2fsck/problem.c:1631
 msgid "Symlink %Q (@i #%i) is @n.\n"
 msgstr "符号链接 %Q（@i #%i）无效。\n"
 
 #. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n
-#: e2fsck/problem.c:1624
+#: e2fsck/problem.c:1636
 msgid "@a @b @F @n (%If).\n"
 msgstr "@i %i 的@a@b无效（%lf）。\n"
 
 #. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
-#: e2fsck/problem.c:1629
+#: e2fsck/problem.c:1641
 msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
 msgstr "@f含有大文件，但@S中未设置LARGE_FILE标志。\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B not referenced\n
-#: e2fsck/problem.c:1634
+#: e2fsck/problem.c:1646
 msgid "@p @h %d: %B not referenced\n"
 msgstr "@h %d 中发现问题：%B\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B referenced twice\n
-#: e2fsck/problem.c:1639
+#: e2fsck/problem.c:1651
 msgid "@p @h %d: %B referenced twice\n"
 msgstr "@h %d 中发现问题：%B 被引用了两次\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B has bad min hash\n
-#: e2fsck/problem.c:1644
+#: e2fsck/problem.c:1656
 msgid "@p @h %d: %B has bad min hash\n"
 msgstr "@h %d 中发现问题：%B 含有错误的最小hash值\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B has bad max hash\n
-#: e2fsck/problem.c:1649
+#: e2fsck/problem.c:1661
 msgid "@p @h %d: %B has bad max hash\n"
 msgstr "@h %d 中发现问题：%B 含有错误的最大hash值\n"
 
 #. @-expanded: invalid HTREE directory inode %d (%q).
-#: e2fsck/problem.c:1654
+#: e2fsck/problem.c:1666
 msgid "@n @h %d (%q).  "
 msgstr "@n@h %d（%q）。  "
 
 #. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n
-#: e2fsck/problem.c:1658
+#: e2fsck/problem.c:1670
 msgid "@p @h %d (%q): bad @b number %b.\n"
 msgstr "@h %d（%q）中发现问题：@b编号 %b 无效。\n"
 
 #. @-expanded: problem in HTREE directory inode %d: root node is invalid\n
-#: e2fsck/problem.c:1669
+#: e2fsck/problem.c:1681
 #, no-c-format
 msgid "@p @h %d: root node is @n\n"
 msgstr "@p@h %d：结点@n\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B has invalid limit (%N)\n
-#: e2fsck/problem.c:1674
+#: e2fsck/problem.c:1686
 msgid "@p @h %d: %B has @n limit (%N)\n"
 msgstr "@h %d 中发现问题：%B 含有@n限制（%N）\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B has invalid count (%N)\n
-#: e2fsck/problem.c:1679
+#: e2fsck/problem.c:1691
 msgid "@p @h %d: %B has @n count (%N)\n"
 msgstr "@h %d 中发现问题：%B 含有@n计数（%N）\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B has an unordered hash table\n
-#: e2fsck/problem.c:1684
+#: e2fsck/problem.c:1696
 msgid "@p @h %d: %B has an unordered hash table\n"
 msgstr "@h %d 中发现问题：%B 含有未排序的hash表\n"
 
 #. @-expanded: problem in HTREE directory inode %d: %B has invalid depth (%N)\n
-#: e2fsck/problem.c:1689
+#: e2fsck/problem.c:1701
 msgid "@p @h %d: %B has @n depth (%N)\n"
 msgstr "@h %d 中发现问题：%B 含有@n深度（%N）\n"
 
 #. @-expanded: Duplicate entry '%Dn' in %p (%i) found.
-#: e2fsck/problem.c:1694
+#: e2fsck/problem.c:1706
 msgid "Duplicate @E found.  "
 msgstr "发现%p（%i）中有重复项“%Dn”。  "
 
 #. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n
 #. @-expanded: Rename to %s
-#: e2fsck/problem.c:1699
+#: e2fsck/problem.c:1711
 #, no-c-format
 msgid ""
 "@E has a non-unique filename.\n"
@@ -2448,7 +2448,7 @@
 #. @-expanded: Duplicate entry '%Dn' found.\n
 #. @-expanded: \tMarking %p (%i) to be rebuilt.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:1704
+#: e2fsck/problem.c:1716
 msgid ""
 "Duplicate @e '%Dn' found.\n"
 "\tMarking %p (%i) to be rebuilt.\n"
@@ -2459,155 +2459,155 @@
 "\n"
 
 #. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1709
+#: e2fsck/problem.c:1721
 msgid "i_blocks_hi @F %N, @s zero.\n"
 msgstr "@i %i（%Q）的i_blocks_hi为 %N，@s0。\n"
 
 #. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
-#: e2fsck/problem.c:1714
+#: e2fsck/problem.c:1726
 msgid "Unexpected @b in @h %d (%q).\n"
 msgstr "@h %d（%q）中有额外的@b。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
-#: e2fsck/problem.c:1719
+#: e2fsck/problem.c:1731
 msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
 msgstr "@E引用了@g %g 中的@i %Di，但该@g被设置了_INODE_UNINIT标志。\n"
 
 #. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
-#: e2fsck/problem.c:1724
+#: e2fsck/problem.c:1736
 msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
 msgstr "@E引用了@g %g 中的@i %Di，但该@i位于未使用inode区。\n"
 
 #. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
-#: e2fsck/problem.c:1729
+#: e2fsck/problem.c:1741
 msgid "i_file_acl_hi @F %N, @s zero.\n"
 msgstr "@i %i （%Q）的i_file_acl_hi为 %N，@s0。\n"
 
 #. @-expanded: problem in HTREE directory inode %d: root node fails checksum.\n
-#: e2fsck/problem.c:1735
+#: e2fsck/problem.c:1747
 #, no-c-format
 msgid "@p @h %d: root node fails checksum.\n"
 msgstr "@p@h %d：根结点的校验值错误。\n"
 
 #. @-expanded: problem in HTREE directory inode %d: internal node fails checksum.\n
-#: e2fsck/problem.c:1741
+#: e2fsck/problem.c:1753
 #, no-c-format
 msgid "@p @h %d: internal node fails checksum.\n"
 msgstr "@p@h %d：内部结点的校验值错误。\n"
 
 #. @-expanded: directory inode %i, %B, offset %N: directory has no checksum.\n
-#: e2fsck/problem.c:1746
+#: e2fsck/problem.c:1758
 msgid "@d @i %i, %B, offset %N: @d has no checksum.\n"
 msgstr "@d@i %i，%B，偏移量 %N：@d缺少校验值。\n"
 
 #. @-expanded: directory inode %i, %B: directory passes checks but fails checksum.\n
-#: e2fsck/problem.c:1751
+#: e2fsck/problem.c:1763
 msgid "@d @i %i, %B: @d passes checks but fails checksum.\n"
 msgstr "@d@i %i，%B：@d通过了检验，但校验值错误。\n"
 
 #. @-expanded: Inline directory inode %i size (%N) must be a multiple of 4.\n
-#: e2fsck/problem.c:1756
+#: e2fsck/problem.c:1768
 msgid "Inline @d @i %i size (%N) must be a multiple of 4.\n"
 msgstr "内联@d @i %i 的大小（%N）必须为4的整数倍。\n"
 
 #. @-expanded: Fixing size of inline directory inode %i failed.\n
-#: e2fsck/problem.c:1762
+#: e2fsck/problem.c:1774
 #, no-c-format
 msgid "Fixing size of inline @d @i %i failed.\n"
 msgstr "修复内联@d @i %i 的大小失败。\n"
 
 #. @-expanded: Encrypted entry '%Dn' in %p (%i) is too short.\n
-#: e2fsck/problem.c:1767
+#: e2fsck/problem.c:1779
 msgid "Encrypted @E is too short.\n"
 msgstr "加密的@E太短。\n"
 
 #. @-expanded: Pass 3: Checking directory connectivity\n
-#: e2fsck/problem.c:1774
+#: e2fsck/problem.c:1786
 msgid "Pass 3: Checking @d connectivity\n"
 msgstr "第 3 步：检查目录连接性\n"
 
 #. @-expanded: root inode not allocated.
-#: e2fsck/problem.c:1779
+#: e2fsck/problem.c:1791
 msgid "@r not allocated.  "
 msgstr "@r未被分配。  "
 
 #. @-expanded: No room in lost+found directory.
-#: e2fsck/problem.c:1784
+#: e2fsck/problem.c:1796
 msgid "No room in @l @d.  "
 msgstr "@l@d中没有空间。  "
 
 #. @-expanded: Unconnected directory inode %i (%p)\n
-#: e2fsck/problem.c:1790
+#: e2fsck/problem.c:1802
 #, no-c-format
 msgid "Unconnected @d @i %i (%p)\n"
 msgstr "未被连接的@d@i %i（%p）\n"
 
 #. @-expanded: /lost+found not found.
-#: e2fsck/problem.c:1795
+#: e2fsck/problem.c:1807
 msgid "/@l not found.  "
 msgstr "/@l未找到。  "
 
 #. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
-#: e2fsck/problem.c:1800
+#: e2fsck/problem.c:1812
 msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
 msgstr "%Q（%i）中的“..”为 %P（%j），@s %q（%d）\n"
 
 #. @-expanded: Bad or non-existent /lost+found.  Cannot reconnect.\n
-#: e2fsck/problem.c:1806
+#: e2fsck/problem.c:1818
 #, no-c-format
 msgid "Bad or non-existent /@l.  Cannot reconnect.\n"
 msgstr "错误或不存在的/@l。无法重新连接。\n"
 
 #. @-expanded: Could not expand /lost+found: %m\n
-#: e2fsck/problem.c:1812
+#: e2fsck/problem.c:1824
 #, no-c-format
 msgid "Could not expand /@l: %m\n"
 msgstr "无法扩充/@l：%m\n"
 
-#: e2fsck/problem.c:1818
+#: e2fsck/problem.c:1830
 #, no-c-format
 msgid "Could not reconnect %i: %m\n"
 msgstr "无法重新连接%i：%m\n"
 
 #. @-expanded: Error while trying to find /lost+found: %m\n
-#: e2fsck/problem.c:1824
+#: e2fsck/problem.c:1836
 #, no-c-format
 msgid "Error while trying to find /@l: %m\n"
 msgstr "尝试查找/@l时出错：%m\n"
 
 #. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1830
+#: e2fsck/problem.c:1842
 #, no-c-format
 msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
 msgstr "ext2fs_new_block：尝试创建/@l@d时%m\n"
 
 #. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
-#: e2fsck/problem.c:1836
+#: e2fsck/problem.c:1848
 #, no-c-format
 msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
 msgstr "ext2fs_new_inode：尝试创建/@l@d时%m\n"
 
 #. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
-#: e2fsck/problem.c:1842
+#: e2fsck/problem.c:1854
 #, no-c-format
 msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
 msgstr "ext2fs_new_dir_block：创建新的@d@b时%m\n"
 
 #. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
-#: e2fsck/problem.c:1848
+#: e2fsck/problem.c:1860
 #, no-c-format
 msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
 msgstr "ext2fs_new_dir_block：为/@l创建新的@d@b时%m\n"
 
 #. @-expanded: Error while adjusting inode count on inode %i\n
-#: e2fsck/problem.c:1854
+#: e2fsck/problem.c:1866
 #, no-c-format
 msgid "Error while adjusting @i count on @i %i\n"
 msgstr "调整@i %i的inode计数时出错\n"
 
 #. @-expanded: Couldn't fix parent of inode %i: %m\n
 #. @-expanded: \n
-#: e2fsck/problem.c:1860
+#: e2fsck/problem.c:1872
 #, no-c-format
 msgid ""
 "Couldn't fix parent of @i %i: %m\n"
@@ -2618,7 +2618,7 @@
 
 #. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
 #. @-expanded: \n
-#: e2fsck/problem.c:1866
+#: e2fsck/problem.c:1878
 #, no-c-format
 msgid ""
 "Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
@@ -2628,41 +2628,41 @@
 "\n"
 
 #. @-expanded: Error creating root directory (%s): %m\n
-#: e2fsck/problem.c:1877
+#: e2fsck/problem.c:1889
 #, no-c-format
 msgid "Error creating root @d (%s): %m\n"
 msgstr "创建根@d（%s）时出错：%m\n"
 
 #. @-expanded: Error creating /lost+found directory (%s): %m\n
-#: e2fsck/problem.c:1883
+#: e2fsck/problem.c:1895
 #, no-c-format
 msgid "Error creating /@l @d (%s): %m\n"
 msgstr "创建/@l@d（%s）时出错：%m\n"
 
 #. @-expanded: root inode is not a directory; aborting.\n
-#: e2fsck/problem.c:1888
+#: e2fsck/problem.c:1900
 msgid "@r is not a @d; aborting.\n"
 msgstr "@r不是一个@d；已终止执行。\n"
 
 #. @-expanded: Cannot proceed without a root inode.\n
-#: e2fsck/problem.c:1893
+#: e2fsck/problem.c:1905
 msgid "Cannot proceed without a @r.\n"
 msgstr "无法在没有@r的情况下继续。\n"
 
 #. @-expanded: /lost+found is not a directory (ino=%i)\n
-#: e2fsck/problem.c:1904
+#: e2fsck/problem.c:1916
 #, no-c-format
 msgid "/@l is not a @d (ino=%i)\n"
 msgstr "/@l 不是一个@d（ino=%i）\n"
 
 #. @-expanded: /lost+found has inline data\n
-#: e2fsck/problem.c:1909
+#: e2fsck/problem.c:1921
 msgid "/@l has inline data\n"
 msgstr "/@l 含有内联数据\n"
 
 #. @-expanded: Cannot allocate space for /lost+found.\n
 #. @-expanded: Place lost files in root directory instead
-#: e2fsck/problem.c:1914
+#: e2fsck/problem.c:1926
 msgid ""
 "Cannot allocate space for /@l.\n"
 "Place lost files in root directory instead"
@@ -2673,7 +2673,7 @@
 #. @-expanded: Insufficient space to recover lost files!\n
 #. @-expanded: Move data off the filesystem and re-run e2fsck.\n
 #. @-expanded: \n
-#: e2fsck/problem.c:1919
+#: e2fsck/problem.c:1931
 msgid ""
 "Insufficient space to recover lost files!\n"
 "Move data off the @f and re-run e2fsck.\n"
@@ -2684,52 +2684,52 @@
 "\n"
 
 #. @-expanded: /lost+found is encrypted\n
-#: e2fsck/problem.c:1924
+#: e2fsck/problem.c:1936
 msgid "/@l is encrypted\n"
 msgstr "/@l 已被加密\n"
 
-#: e2fsck/problem.c:1931
+#: e2fsck/problem.c:1943
 msgid "Pass 3A: Optimizing directories\n"
 msgstr "第 3A 步：优化目录\n"
 
-#: e2fsck/problem.c:1937
+#: e2fsck/problem.c:1949
 #, no-c-format
 msgid "Failed to create dirs_to_hash iterator: %m\n"
 msgstr "创建dirs_to_hash迭代器出错：%m\n"
 
-#: e2fsck/problem.c:1942
+#: e2fsck/problem.c:1954
 msgid "Failed to optimize directory %q (%d): %m\n"
 msgstr "优化目录 %q（%d）失败：%m\n"
 
-#: e2fsck/problem.c:1947
+#: e2fsck/problem.c:1959
 msgid "Optimizing directories: "
 msgstr "优化目录： "
 
-#: e2fsck/problem.c:1964
+#: e2fsck/problem.c:1976
 msgid "Pass 4: Checking reference counts\n"
 msgstr "第 4 步：检查引用计数\n"
 
 #. @-expanded: unattached zero-length inode %i.
-#: e2fsck/problem.c:1970
+#: e2fsck/problem.c:1982
 #, no-c-format
 msgid "@u @z @i %i.  "
 msgstr "@u@z@i %i。  "
 
 #. @-expanded: unattached inode %i\n
-#: e2fsck/problem.c:1976
+#: e2fsck/problem.c:1988
 #, no-c-format
 msgid "@u @i %i\n"
 msgstr "@u@i %i。\n"
 
 #. @-expanded: inode %i ref count is %Il, should be %N.
-#: e2fsck/problem.c:1981
+#: e2fsck/problem.c:1993
 msgid "@i %i ref count is %Il, @s %N.  "
 msgstr "@i %i 的引用计数为 %Il，@s %N。  "
 
 #. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
 #. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
 #. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il.  They should be the same!\n
-#: e2fsck/problem.c:1985
+#: e2fsck/problem.c:1997
 msgid ""
 "WARNING: PROGRAMMING BUG IN E2FSCK!\n"
 "\tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n"
@@ -2740,143 +2740,143 @@
 "@i_link_info[%i] 为 %N，@i.i_links_count 为 %Il。它们应当相同！\n"
 
 #. @-expanded: extended attribute inode %i ref count is %N, should be %n.
-#: e2fsck/problem.c:1992
+#: e2fsck/problem.c:2004
 msgid "@a @i %i ref count is %N, @s %n. "
 msgstr ""
 
 #. @-expanded: Pass 5: Checking group summary information\n
-#: e2fsck/problem.c:2004
+#: e2fsck/problem.c:2021
 msgid "Pass 5: Checking @g summary information\n"
 msgstr "第 5 步：检查@g概要信息\n"
 
 #. @-expanded: Padding at end of inode bitmap is not set.
-#: e2fsck/problem.c:2009
+#: e2fsck/problem.c:2026
 msgid "Padding at end of @i @B is not set. "
 msgstr "@i@B末尾的填充值未设置。 "
 
 #. @-expanded: Padding at end of block bitmap is not set.
-#: e2fsck/problem.c:2014
+#: e2fsck/problem.c:2031
 msgid "Padding at end of @b @B is not set. "
 msgstr "@b@B末尾的填充值未设置。 "
 
 #. @-expanded: block bitmap differences:
-#: e2fsck/problem.c:2019
+#: e2fsck/problem.c:2036
 msgid "@b @B differences: "
 msgstr "@b@B的差异： "
 
 #. @-expanded: inode bitmap differences:
-#: e2fsck/problem.c:2041
+#: e2fsck/problem.c:2058
 msgid "@i @B differences: "
 msgstr "@i@B的差异： "
 
 #. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:2063
+#: e2fsck/problem.c:2080
 msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
 msgstr "@g #%g的可用@i计数错误（%i，实际为%j）。\n"
 
 #. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
-#: e2fsck/problem.c:2068
+#: e2fsck/problem.c:2085
 msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
 msgstr "@g #%g的目录计数错误（%i，实际为%j）\n"
 
 #. @-expanded: Free inodes count wrong (%i, counted=%j).\n
-#: e2fsck/problem.c:2073
+#: e2fsck/problem.c:2090
 msgid "Free @is count wrong (%i, counted=%j).\n"
 msgstr "可用@i数错误（%i，实际为%j）\n"
 
 #. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
-#: e2fsck/problem.c:2078
+#: e2fsck/problem.c:2095
 msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
 msgstr "@g #%g的可用@b计数错误（%i，实际为%j）。\n"
 
 #. @-expanded: Free blocks count wrong (%b, counted=%c).\n
-#: e2fsck/problem.c:2083
+#: e2fsck/problem.c:2100
 msgid "Free @bs count wrong (%b, counted=%c).\n"
 msgstr "可用@b数错误（%i，实际为%j）\n"
 
 #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
 #. @-expanded: endpoints (%i, %j)\n
-#: e2fsck/problem.c:2088
+#: e2fsck/problem.c:2105
 msgid ""
 "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
 "endpoints (%i, %j)\n"
 msgstr "程序错误：@f（# %n）@B端点（%b，%c）与计算值（%i，%j）不符\n"
 
-#: e2fsck/problem.c:2094
+#: e2fsck/problem.c:2111
 msgid "Internal error: fudging end of bitmap (%N)\n"
 msgstr "内部错误：虚构的位图端点\n"
 
 #. @-expanded: Error copying in replacement inode bitmap: %m\n
-#: e2fsck/problem.c:2100
+#: e2fsck/problem.c:2117
 #, no-c-format
 msgid "Error copying in replacement @i @B: %m\n"
 msgstr "替换@i@B时拷贝错误：%m\n"
 
 #. @-expanded: Error copying in replacement block bitmap: %m\n
-#: e2fsck/problem.c:2106
+#: e2fsck/problem.c:2123
 #, no-c-format
 msgid "Error copying in replacement @b @B: %m\n"
 msgstr "替换@b@B时拷贝错误：%m\n"
 
 #. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
-#: e2fsck/problem.c:2136
+#: e2fsck/problem.c:2153
 #, no-c-format
 msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
 msgstr "@g %g @b已被使用，但@g被标记为BLOCK_UNINIT\n"
 
 #. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
-#: e2fsck/problem.c:2142
+#: e2fsck/problem.c:2159
 #, no-c-format
 msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
 msgstr "@g %g @i已被使用，但@g被标记为INODE_UNINIT\n"
 
 #. @-expanded: group %g inode bitmap does not match checksum.\n
-#: e2fsck/problem.c:2148
+#: e2fsck/problem.c:2165
 #, no-c-format
 msgid "@g %g @i @B does not match checksum.\n"
 msgstr "@g %g @i @B 与自身校验值不符。\n"
 
 #. @-expanded: group %g block bitmap does not match checksum.\n
-#: e2fsck/problem.c:2154
+#: e2fsck/problem.c:2171
 #, no-c-format
 msgid "@g %g @b @B does not match checksum.\n"
 msgstr "@g %g @b @B 与自身校验值不符。\n"
 
 #. @-expanded: Recreate journal
-#: e2fsck/problem.c:2161
+#: e2fsck/problem.c:2178
 msgid "Recreate @j"
 msgstr "重建@j"
 
-#: e2fsck/problem.c:2166
+#: e2fsck/problem.c:2183
 msgid "Update quota info for quota type %N"
 msgstr "更新配额类型 %N 的配额信息"
 
 #. @-expanded: Error setting block group checksum info: %m\n
-#: e2fsck/problem.c:2172
+#: e2fsck/problem.c:2189
 #, no-c-format
 msgid "Error setting @b @g checksum info: %m\n"
 msgstr "设置@b@g的校验信息时出错：%m\n"
 
-#: e2fsck/problem.c:2178
+#: e2fsck/problem.c:2195
 #, no-c-format
 msgid "Error writing file system info: %m\n"
 msgstr "写入文件系统信息时出错：%m\n"
 
-#: e2fsck/problem.c:2184
+#: e2fsck/problem.c:2201
 #, no-c-format
 msgid "Error flushing writes to storage device: %m\n"
 msgstr "将缓冲写入到存储设备：%m\n"
 
-#: e2fsck/problem.c:2189
+#: e2fsck/problem.c:2206
 msgid "Error writing quota info for quota type %N: %m\n"
 msgstr "写入配额类型 %N 的配额信息时出错：%m\n"
 
-#: e2fsck/problem.c:2352
+#: e2fsck/problem.c:2369
 #, c-format
 msgid "Unhandled error code (0x%x)!\n"
 msgstr "未处理的错误码 （0x%x）！\n"
 
-#: e2fsck/problem.c:2482 e2fsck/problem.c:2486
+#: e2fsck/problem.c:2499 e2fsck/problem.c:2503
 msgid "IGNORED"
 msgstr "已忽略"
 
@@ -2905,12 +2905,12 @@
 #: e2fsck/super.c:224
 #, c-format
 msgid "while calling ext2fs_block_iterate for inode %u"
-msgstr ""
+msgstr "为 inode %u 调用 ext2fs_block_iterate 时"
 
 #: e2fsck/super.c:249
 #, c-format
 msgid "while calling ext2fs_adjust_ea_refcount2 for inode %u"
-msgstr ""
+msgstr "为 inode %u 调用 ext2fs_adjust_ea_refcount2 时"
 
 #: e2fsck/super.c:374
 msgid "Truncating"
@@ -3090,7 +3090,7 @@
 msgid_plural "%12u files\n"
 msgstr[0] "%12u 个文件\n"
 
-#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2986 misc/util.c:129
+#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2997 misc/util.c:129
 #: resize/main.c:354
 #, c-format
 msgid "while determining whether %s is mounted."
@@ -3225,11 +3225,11 @@
 
 #: e2fsck/unix.c:769
 msgid "\tea_ver=<ea_version (1 or 2)>\n"
-msgstr ""
+msgstr "\tea_ver=<ea_version (1 或 2)>\n"
 
 #: e2fsck/unix.c:778
 msgid "\treadahead_kb=<buffer size>\n"
-msgstr ""
+msgstr "\treadahead_kb=<缓冲大小>\n"
 
 #: e2fsck/unix.c:790
 #, c-format
@@ -3259,7 +3259,7 @@
 msgstr "此版本的e2fsck不支持 -t 选项。\n"
 
 #: e2fsck/unix.c:934 e2fsck/unix.c:1012 misc/e2initrd_helper.c:330
-#: misc/tune2fs.c:1695 misc/tune2fs.c:1990 misc/tune2fs.c:2008
+#: misc/tune2fs.c:1707 misc/tune2fs.c:2002 misc/tune2fs.c:2020
 #, c-format
 msgid "Unable to resolve '%s'"
 msgstr "无法解析“%s”"
@@ -3319,7 +3319,7 @@
 msgid "while checking MMP block"
 msgstr "检测 MMP 块时"
 
-#: misc/tune2fs.c:2900
+#: misc/tune2fs.c:2912
 msgid ""
 "If you are sure the filesystem is not in use on any node, run:\n"
 "'tune2fs -f -E clear_mmp {device}'\n"
@@ -3332,8 +3332,8 @@
 msgstr "读取 MMP 块时"
 
 #: e2fsck/unix.c:1302 e2fsck/unix.c:1354 misc/e2undo.c:236 misc/e2undo.c:281
-#: misc/mke2fs.c:2696 misc/mke2fs.c:2747 misc/tune2fs.c:2713
-#: misc/tune2fs.c:2758 resize/main.c:188 resize/main.c:233
+#: misc/mke2fs.c:2694 misc/mke2fs.c:2745 misc/tune2fs.c:2725
+#: misc/tune2fs.c:2770 resize/main.c:188 resize/main.c:233
 #, c-format
 msgid ""
 "Overwriting existing filesystem; this can be undone using the command:\n"
@@ -3344,13 +3344,13 @@
 "    e2undo %s %s\n"
 "\n"
 
-#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2736 misc/tune2fs.c:2747
+#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2734 misc/tune2fs.c:2759
 #: resize/main.c:222
 #, c-format
 msgid "while trying to delete %s"
 msgstr "尝试删除 %s 时"
 
-#: e2fsck/unix.c:1369 misc/mke2fs.c:2762 resize/main.c:243
+#: e2fsck/unix.c:1369 misc/mke2fs.c:2760 resize/main.c:243
 msgid "while trying to setup undo file\n"
 msgstr "尝试创建撤销记录时\n"
 
@@ -3435,65 +3435,65 @@
 msgid "Get a newer version of e2fsck!"
 msgstr "请获取新版本的e2fsck！"
 
-#: e2fsck/unix.c:1749
+#: e2fsck/unix.c:1748
 #, c-format
 msgid "while checking journal for %s"
 msgstr "检查 %s 的日志时"
 
-#: e2fsck/unix.c:1752
+#: e2fsck/unix.c:1751
 msgid "Cannot proceed with file system check"
 msgstr "无法在系统检查时进行"
 
-#: e2fsck/unix.c:1763
+#: e2fsck/unix.c:1762
 msgid ""
 "Warning: skipping journal recovery because doing a read-only filesystem "
 "check.\n"
 msgstr "警告：由于只读系统检查，跳过日志恢复流程。\n"
 
-#: e2fsck/unix.c:1775
+#: e2fsck/unix.c:1774
 #, c-format
 msgid "unable to set superblock flags on %s\n"
 msgstr "无法设置 %s 的超级块标志。\n"
 
-#: e2fsck/unix.c:1781
+#: e2fsck/unix.c:1780
 #, c-format
 msgid "Journal checksum error found in %s\n"
 msgstr "在 %s 中发现日志校验值错误\n"
 
-#: e2fsck/unix.c:1785
+#: e2fsck/unix.c:1784
 #, c-format
 msgid "Journal corrupted in %s\n"
 msgstr "%s 中的日志已损坏\n"
 
-#: e2fsck/unix.c:1789
+#: e2fsck/unix.c:1788
 #, c-format
 msgid "while recovering journal of %s"
 msgstr "恢复 %s 的日志时"
 
-#: e2fsck/unix.c:1811
+#: e2fsck/unix.c:1810
 #, c-format
 msgid "%s has unsupported feature(s):"
 msgstr "%s 有不被支持的特性："
 
-#: e2fsck/unix.c:1876
+#: e2fsck/unix.c:1875
 #, c-format
 msgid "%s: %s while reading bad blocks inode\n"
 msgstr "%s：读取坏块inode时%s\n"
 
-#: e2fsck/unix.c:1879
+#: e2fsck/unix.c:1878
 msgid "This doesn't bode well, but we'll try to go on...\n"
 msgstr "这并不是一个好预兆，然而我们将继续进行...\n"
 
-#: e2fsck/unix.c:1919
+#: e2fsck/unix.c:1918
 #, c-format
 msgid "Creating journal (%d blocks): "
 msgstr "创建日志（%d 个块）： "
 
-#: e2fsck/unix.c:1929
+#: e2fsck/unix.c:1928
 msgid " Done.\n"
 msgstr " 完毕。\n"
 
-#: e2fsck/unix.c:1931
+#: e2fsck/unix.c:1930
 msgid ""
 "\n"
 "*** journal has been regenerated ***\n"
@@ -3501,36 +3501,38 @@
 "\n"
 "*** 日志已被重建 ***\n"
 
-#: e2fsck/unix.c:1937
+#: e2fsck/unix.c:1936
 msgid "aborted"
 msgstr "已中止"
 
-#: e2fsck/unix.c:1939
+#: e2fsck/unix.c:1938
 #, c-format
 msgid "%s: e2fsck canceled.\n"
 msgstr "%s：e2fsck被取消。\n"
 
-#: e2fsck/unix.c:1966
+#: e2fsck/unix.c:1965
 msgid "Restarting e2fsck from the beginning...\n"
 msgstr "正在从头开始e2fsck...\n"
 
-#: e2fsck/unix.c:1970
+#: e2fsck/unix.c:1969
 msgid "while resetting context"
 msgstr "重置上下文时"
 
-#: e2fsck/unix.c:2029
+#: e2fsck/unix.c:2028
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM ERRORS CORRECTED *****\n"
 msgstr ""
+"\n"
+"%s：***** 文件系统错误已修正 *****\n"
 
-#: e2fsck/unix.c:2031
+#: e2fsck/unix.c:2030
 #, c-format
 msgid "%s: File system was modified.\n"
-msgstr ""
+msgstr "%s：文件系统已被修改。\n"
 
-#: e2fsck/unix.c:2035 e2fsck/util.c:71
+#: e2fsck/unix.c:2034 e2fsck/util.c:71
 #, c-format
 msgid ""
 "\n"
@@ -3539,12 +3541,12 @@
 "\n"
 "%s：***** 文件系统已修改 *****\n"
 
-#: e2fsck/unix.c:2040
+#: e2fsck/unix.c:2039
 #, c-format
 msgid "%s: ***** REBOOT SYSTEM *****\n"
 msgstr "%s：***** 请重新启动系统 *****\n"
 
-#: e2fsck/unix.c:2050 e2fsck/util.c:77
+#: e2fsck/unix.c:2049 e2fsck/util.c:77
 #, c-format
 msgid ""
 "\n"
@@ -3555,51 +3557,51 @@
 "%s：********** 警告：文件系统上仍有错误 **********\n"
 "\n"
 
-#: e2fsck/util.c:196 misc/util.c:93
+#: e2fsck/util.c:195 misc/util.c:93
 msgid "yY"
 msgstr "yY"
 
-#: e2fsck/util.c:197 misc/util.c:112
+#: e2fsck/util.c:196 misc/util.c:112
 msgid "nN"
 msgstr "nN"
 
-#: e2fsck/util.c:198
+#: e2fsck/util.c:197
 msgid "aA"
 msgstr "aA"
 
-#: e2fsck/util.c:202
+#: e2fsck/util.c:201
 msgid " ('a' enables 'yes' to all) "
 msgstr " （“a” 表示全部回答“yes”） "
 
-#: e2fsck/util.c:219
+#: e2fsck/util.c:218
 msgid "<y>"
 msgstr "<y>"
 
-#: e2fsck/util.c:221
+#: e2fsck/util.c:220
 msgid "<n>"
 msgstr "<n>"
 
-#: e2fsck/util.c:223
+#: e2fsck/util.c:222
 msgid " (y/n)"
 msgstr " （y/n）"
 
-#: e2fsck/util.c:246
+#: e2fsck/util.c:245
 msgid "cancelled!\n"
 msgstr "已取消！\n"
 
-#: e2fsck/util.c:279
+#: e2fsck/util.c:278
 msgid "yes to all\n"
 msgstr "全部回答“yes”\n"
 
-#: e2fsck/util.c:281
+#: e2fsck/util.c:280
 msgid "yes\n"
 msgstr "是\n"
 
-#: e2fsck/util.c:283
+#: e2fsck/util.c:282
 msgid "no\n"
 msgstr "否\n"
 
-#: e2fsck/util.c:293
+#: e2fsck/util.c:292
 #, c-format
 msgid ""
 "%s? no\n"
@@ -3608,7 +3610,7 @@
 "%s? no\n"
 "\n"
 
-#: e2fsck/util.c:297
+#: e2fsck/util.c:296
 #, c-format
 msgid ""
 "%s? yes\n"
@@ -3617,38 +3619,38 @@
 "%s? yes\n"
 "\n"
 
-#: e2fsck/util.c:301
+#: e2fsck/util.c:300
 msgid "yes"
 msgstr "yes"
 
-#: e2fsck/util.c:301
+#: e2fsck/util.c:300
 msgid "no"
 msgstr "no"
 
-#: e2fsck/util.c:317
+#: e2fsck/util.c:316
 #, c-format
 msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
 msgstr "e2fsck_read_bitmaps：%s 含有非法的位图块"
 
-#: e2fsck/util.c:322
+#: e2fsck/util.c:321
 msgid "reading inode and block bitmaps"
 msgstr "读取inode和块位图"
 
-#: e2fsck/util.c:334
+#: e2fsck/util.c:333
 #, c-format
 msgid "while retrying to read bitmaps for %s"
 msgstr "重新尝试读取 %s 的位图时"
 
-#: e2fsck/util.c:346
+#: e2fsck/util.c:345
 msgid "writing block and inode bitmaps"
 msgstr "写入块和inode位图"
 
-#: e2fsck/util.c:351
+#: e2fsck/util.c:350
 #, c-format
 msgid "while rewriting block and inode bitmaps for %s"
 msgstr "重写 %s  的block和inode位图时"
 
-#: e2fsck/util.c:363
+#: e2fsck/util.c:362
 #, c-format
 msgid ""
 "\n"
@@ -3671,27 +3673,27 @@
 msgid "Memory used: %lu, "
 msgstr "已使用内存：%lu， "
 
-#: e2fsck/util.c:455
+#: e2fsck/util.c:454
 #, c-format
 msgid "time: %5.2f/%5.2f/%5.2f\n"
 msgstr "时间：%5.2f/%5.2f/%5.2f\n"
 
-#: e2fsck/util.c:460
+#: e2fsck/util.c:459
 #, c-format
 msgid "elapsed time: %6.3f\n"
 msgstr "持续时间：%6.3f\n"
 
-#: e2fsck/util.c:495 e2fsck/util.c:509
+#: e2fsck/util.c:494 e2fsck/util.c:508
 #, c-format
 msgid "while reading inode %lu in %s"
 msgstr "读取 %2$s 中的inode %1$lu 时"
 
-#: e2fsck/util.c:523 e2fsck/util.c:536
+#: e2fsck/util.c:522 e2fsck/util.c:535
 #, c-format
 msgid "while writing inode %lu in %s"
 msgstr "写入 %2$s 中的inode %1$lu 时"
 
-#: e2fsck/util.c:792
+#: e2fsck/util.c:793
 msgid ""
 "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is "
 "running.\n"
@@ -3710,6 +3712,10 @@
 "       [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
 "       device [last_block [first_block]]\n"
 msgstr ""
+"用法：%s [-b 块大小] [-i 输入文件] [-o 输出文件] [-svwnfBX]\n"
+"       [-c 立即块数] [-d 读取延迟因子] [-e 最大坏块数]\n"
+"       [-p 需要通过测试的块数] [-t 测试模式 [-t 测试模式 [...]]]\n"
+"       设备 [末块 [首块]]\n"
 
 #: misc/badblocks.c:111
 #, c-format
@@ -3969,8 +3975,8 @@
 msgid "while reading inode %u"
 msgstr "读取 inode %u 时"
 
-#: misc/create_inode.c:90 misc/create_inode.c:288 misc/create_inode.c:353
-#: misc/create_inode.c:391
+#: misc/create_inode.c:90 misc/create_inode.c:290 misc/create_inode.c:355
+#: misc/create_inode.c:393
 msgid "while expanding directory"
 msgstr "扩充目录时"
 
@@ -3979,73 +3985,73 @@
 msgid "while linking \"%s\""
 msgstr "链接“%s”时"
 
-#: misc/create_inode.c:105 misc/create_inode.c:132 misc/create_inode.c:322
+#: misc/create_inode.c:105 misc/create_inode.c:134 misc/create_inode.c:324
 #, c-format
 msgid "while writing inode %u"
 msgstr "写入 inode %u 时"
 
-#: misc/create_inode.c:152 misc/create_inode.c:176
+#: misc/create_inode.c:154 misc/create_inode.c:178
 #, c-format
 msgid "while listing attributes of \"%s\""
 msgstr "尝试列出“%s”的属性时"
 
-#: misc/create_inode.c:163
+#: misc/create_inode.c:165
 #, c-format
 msgid "while opening inode %u"
 msgstr "打开 inode %u 时"
 
-#: misc/create_inode.c:169 misc/create_inode.c:196 misc/create_inode.c:1043
+#: misc/create_inode.c:171 misc/create_inode.c:198 misc/create_inode.c:1045
 #: misc/e2undo.c:182 misc/e2undo.c:479 misc/e2undo.c:485 misc/e2undo.c:491
 #: misc/mke2fs.c:359
 msgid "while allocating memory"
 msgstr "分配内存时"
 
-#: misc/create_inode.c:189 misc/create_inode.c:205
+#: misc/create_inode.c:191 misc/create_inode.c:207
 #, c-format
 msgid "while reading attribute \"%s\" of \"%s\""
 msgstr "读取 %s 的“%s”标志时"
 
-#: misc/create_inode.c:214
+#: misc/create_inode.c:216
 #, c-format
 msgid "while writing attribute \"%s\" to inode %u"
 msgstr "写入标志“%s”到 inode %u 时"
 
-#: misc/create_inode.c:224
+#: misc/create_inode.c:226
 #, c-format
 msgid "while closing inode %u"
 msgstr "关闭 inode %u 时"
 
-#: misc/create_inode.c:275
+#: misc/create_inode.c:277
 #, c-format
 msgid "while allocating inode \"%s\""
 msgstr "分配 inode“%s”时"
 
-#: misc/create_inode.c:294
+#: misc/create_inode.c:296
 #, c-format
 msgid "while creating inode \"%s\""
 msgstr "创建 inode “%s”时"
 
-#: misc/create_inode.c:360
+#: misc/create_inode.c:362
 #, c-format
 msgid "while creating symlink \"%s\""
 msgstr "创建符号链接“%s”时"
 
-#: misc/create_inode.c:378 misc/create_inode.c:963
+#: misc/create_inode.c:380 misc/create_inode.c:965
 #, c-format
 msgid "while looking up \"%s\""
 msgstr "查找“%s”时"
 
-#: misc/create_inode.c:398
+#: misc/create_inode.c:400
 #, c-format
 msgid "while creating directory \"%s\""
 msgstr "创建目录“%s”时"
 
-#: misc/create_inode.c:627
+#: misc/create_inode.c:629
 #, c-format
 msgid "while opening \"%s\" to copy"
 msgstr "打开“%s”并拷贝时"
 
-#: misc/create_inode.c:805
+#: misc/create_inode.c:807
 #, c-format
 msgid "while changing working directory to \"%s\""
 msgstr "改变工作目录为“%s”时"
@@ -4055,64 +4061,64 @@
 msgid "while opening directory \"%s\""
 msgstr "打开目录“%s”时"
 
-#: misc/create_inode.c:825
+#: misc/create_inode.c:827
 #, c-format
 msgid "while lstat \"%s\""
 msgstr "对“%s”进行lstat调用时"
 
-#: misc/create_inode.c:875
+#: misc/create_inode.c:877
 #, c-format
 msgid "while creating special file \"%s\""
 msgstr "创建特殊文件“%s”时"
 
-#: misc/create_inode.c:884
+#: misc/create_inode.c:886
 msgid "malloc failed"
 msgstr "内存分配失败"
 
-#: misc/create_inode.c:892
+#: misc/create_inode.c:894
 #, c-format
 msgid "while trying to read link \"%s\""
 msgstr "尝试读取链接“%s”时"
 
-#: misc/create_inode.c:899
+#: misc/create_inode.c:901
 msgid "symlink increased in size between lstat() and readlink()"
 msgstr "在执行 lstat() 和 readlink() 期间，符号链接的大小发生改变"
 
-#: misc/create_inode.c:910
+#: misc/create_inode.c:912
 #, c-format
 msgid "while writing symlink\"%s\""
 msgstr "写入符号链接“%s”时"
 
-#: misc/create_inode.c:921
+#: misc/create_inode.c:923
 #, c-format
 msgid "while writing file \"%s\""
 msgstr "写入文件“%s”时"
 
-#: misc/create_inode.c:934
+#: misc/create_inode.c:936
 #, c-format
 msgid "while making dir \"%s\""
 msgstr "创建目录“%s”时"
 
-#: misc/create_inode.c:952
+#: misc/create_inode.c:954
 msgid "while changing directory"
 msgstr "改变目录时"
 
-#: misc/create_inode.c:958
+#: misc/create_inode.c:960
 #, c-format
 msgid "ignoring entry \"%s\""
 msgstr "忽略项“%s”"
 
-#: misc/create_inode.c:971
+#: misc/create_inode.c:973
 #, c-format
 msgid "while setting inode for \"%s\""
 msgstr "为“%s”设置 inode 时"
 
-#: misc/create_inode.c:978
+#: misc/create_inode.c:980
 #, c-format
 msgid "while setting xattrs for \"%s\""
 msgstr "设置“%s”的 xattrs 时"
 
-#: misc/create_inode.c:1004
+#: misc/create_inode.c:1006
 msgid "while saving inode data"
 msgstr "保存 inode 数据时"
 
@@ -4262,21 +4268,21 @@
 msgid "Couldn't find journal superblock magic numbers"
 msgstr "无法找到日志超级块的幻数"
 
-#: misc/dumpe2fs.c:507 misc/mke2fs.c:800 misc/tune2fs.c:2027
+#: misc/dumpe2fs.c:511 misc/mke2fs.c:798 misc/tune2fs.c:2039
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr "无法为解析选项获取内存！\n"
 
-#: misc/dumpe2fs.c:533
+#: misc/dumpe2fs.c:537
 #, c-format
 msgid "Invalid superblock parameter: %s\n"
 msgstr "无效的超级块参数：%s\n"
 
-#: misc/dumpe2fs.c:548
+#: misc/dumpe2fs.c:552
 #, c-format
 msgid "Invalid blocksize parameter: %s\n"
 msgstr "无效的块大小参数：%s\n"
 
-#: misc/dumpe2fs.c:559
+#: misc/dumpe2fs.c:563
 #, c-format
 msgid ""
 "\n"
@@ -4298,7 +4304,7 @@
 "\tsuperblock=<超级块编号>\n"
 "\tblocksize=<块大小>\n"
 
-#: misc/dumpe2fs.c:649 misc/mke2fs.c:1889
+#: misc/dumpe2fs.c:653 misc/mke2fs.c:1887
 #, c-format
 msgid "\tUsing %s\n"
 msgstr "\t使用 %s\n"
@@ -4313,7 +4319,7 @@
 "*** 发现文件系统的校验值有误！请立即运行 e2fsck！\n"
 "\n"
 
-#: misc/dumpe2fs.c:694 misc/e2image.c:1629 misc/tune2fs.c:2913
+#: misc/dumpe2fs.c:698 misc/e2image.c:1629 misc/tune2fs.c:2925
 #: resize/main.c:416
 msgid "Couldn't find valid filesystem superblock.\n"
 msgstr "找不到有效的文件系统超级块。\n"
@@ -4506,7 +4512,7 @@
 
 #: misc/e2image.c:1565
 msgid "-a option can only be used with raw or QCOW2 images."
-msgstr "-a 选项只能用于原始或qcow2镜像"
+msgstr "-a 选项只能用于原始或 QCOW2 镜像。"
 
 #: misc/e2image.c:1576
 msgid "Offsets are only allowed with raw images."
@@ -4604,7 +4610,7 @@
 msgid "e2label: not an ext2 filesystem\n"
 msgstr "e2label：不是一个ex2文件系统\n"
 
-#: misc/e2label.c:97 misc/tune2fs.c:3117
+#: misc/e2label.c:97 misc/tune2fs.c:3128
 #, c-format
 msgid "Warning: label too long, truncating.\n"
 msgstr "警告：卷标太长，已截短。\n"
@@ -4619,7 +4625,7 @@
 msgid "e2label: error writing superblock\n"
 msgstr "e2label：写入超级块时出错\n"
 
-#: misc/e2label.c:117 misc/tune2fs.c:1687
+#: misc/e2label.c:117 misc/tune2fs.c:1699
 #, c-format
 msgid "Usage: e2label device [newlabel]\n"
 msgstr "用法：e2label 设备 [新卷标]\n"
@@ -4629,7 +4635,7 @@
 msgid ""
 "Usage: %s [-f] [-h] [-n] [-o offset] [-v] [-z undo_file] <transaction file> "
 "<filesystem>\n"
-msgstr ""
+msgstr "用法：%s [-f] [-h] [-n] [-o offset] [-v] [-z undo_file] <事务文件> <文件系统>\n"
 
 #: misc/e2undo.c:149
 msgid "The file system superblock doesn't match the undo file.\n"
@@ -4827,7 +4833,7 @@
 msgstr ""
 "偏移字节     起始字节      结束字节   块数      块大小  grp  创建/挂载时间             超级块 UUID 标签\n"
 
-#: misc/findsuper.c:264
+#: misc/findsuper.c:265
 #, c-format
 msgid ""
 "\n"
@@ -4935,53 +4941,53 @@
 msgid "%s: too many arguments\n"
 msgstr "%s：参数过多\n"
 
-#: misc/fuse2fs.c:3745
+#: misc/fuse2fs.c:3740
 msgid "Mounting read-only.\n"
 msgstr "以只读模式挂载。\n"
 
-#: misc/fuse2fs.c:3769
+#: misc/fuse2fs.c:3764
 #, c-format
 msgid "%s: Allowing users to allocate all blocks. This is dangerous!\n"
 msgstr "%s：允许用户分配所有块。这样做很危险！\n"
 
-#: misc/fuse2fs.c:3781 misc/fuse2fs.c:3795
+#: misc/fuse2fs.c:3776 misc/fuse2fs.c:3790
 #, c-format
 msgid "%s: %s.\n"
 msgstr "%s：%s。\n"
 
-#: misc/fuse2fs.c:3782 misc/fuse2fs.c:3797 misc/tune2fs.c:3013
+#: misc/fuse2fs.c:3777 misc/fuse2fs.c:3792 misc/tune2fs.c:3024
 #, c-format
 msgid "Please run e2fsck -fy %s.\n"
 msgstr "请先运行“e2fsck -fy %s”。\n"
 
-#: misc/fuse2fs.c:3804
+#: misc/fuse2fs.c:3799
 msgid ""
 "Journal needs recovery; running `e2fsck -E journal_only' is required.\n"
 msgstr "日志需要恢复；请运行“e2fsck -E journal_only”。\n"
 
-#: misc/fuse2fs.c:3812
+#: misc/fuse2fs.c:3807
 #, c-format
 msgid "%s: Writing to the journal is not supported.\n"
 msgstr "%s：不支持写入日志。\n"
 
-#: misc/fuse2fs.c:3827
+#: misc/fuse2fs.c:3822
 msgid "Warning: Mounting unchecked fs, running e2fsck is recommended.\n"
 msgstr "警告：正在挂载未经检查的文件系统，建议您先运行 e2fsck。\n"
 
-#: misc/fuse2fs.c:3831
+#: misc/fuse2fs.c:3826
 msgid ""
 "Warning: Maximal mount count reached, running e2fsck is recommended.\n"
 msgstr "警告：尝试挂载次数超过最大值，建议您运行 e2fsck。\n"
 
-#: misc/fuse2fs.c:3836
+#: misc/fuse2fs.c:3831
 msgid "Warning: Check time reached; running e2fsck is recommended.\n"
 msgstr "警告：检查超时，建议您运行 e2fsck。\n"
 
-#: misc/fuse2fs.c:3840
+#: misc/fuse2fs.c:3835
 msgid "Orphans detected; running e2fsck is recommended.\n"
 msgstr "检测到孤立块；建议您运行 e2fsck。\n"
 
-#: misc/fuse2fs.c:3844
+#: misc/fuse2fs.c:3839
 msgid "Errors detected; running e2fsck is required.\n"
 msgstr "检测到错误；请运行 e2fsck。\n"
 
@@ -5082,7 +5088,7 @@
 "\n"
 "无法写入 %d 个块到起始于%llu的inode表：%s\n"
 
-#: misc/mke2fs.c:456 misc/mke2fs.c:2809 misc/mke2fs.c:3214
+#: misc/mke2fs.c:456 misc/mke2fs.c:2807 misc/mke2fs.c:3212
 msgid "done                            \n"
 msgstr "完成                            \n"
 
@@ -5146,12 +5152,12 @@
 msgid "while writing journal superblock"
 msgstr "写入日志超级块时"
 
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:664
 #, c-format
 msgid "Creating filesystem with %llu %dk blocks and %u inodes\n"
 msgstr "创建含有 %llu 个块（每块 %dk）和 %u 个inode的文件系统\n"
 
-#: misc/mke2fs.c:673
+#: misc/mke2fs.c:672
 #, c-format
 msgid ""
 "warning: %llu blocks unused.\n"
@@ -5165,154 +5171,154 @@
 msgid "Filesystem label=%s\n"
 msgstr "文件系统标签=%s\n"
 
-#: misc/mke2fs.c:681
+#: misc/mke2fs.c:679
 #, c-format
 msgid "OS type: %s\n"
 msgstr "操作系统： %s\n"
 
-#: misc/mke2fs.c:683
+#: misc/mke2fs.c:681
 #, c-format
 msgid "Block size=%u (log=%u)\n"
 msgstr "块大小=%u（log=%u）\n"
 
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:684
 #, c-format
 msgid "Cluster size=%u (log=%u)\n"
 msgstr "簇大小=%u（log=%u）\n"
 
-#: misc/mke2fs.c:690
+#: misc/mke2fs.c:688
 #, c-format
 msgid "Fragment size=%u (log=%u)\n"
 msgstr "分块大小=%u（log=%u）\n"
 
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:690
 #, c-format
 msgid "Stride=%u blocks, Stripe width=%u blocks\n"
 msgstr "步长=%u 块，带宽=%u 块\n"
 
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:692
 #, c-format
 msgid "%u inodes, %llu blocks\n"
 msgstr "%u 个inode，%llu 个块\n"
 
-#: misc/mke2fs.c:696
+#: misc/mke2fs.c:694
 #, c-format
 msgid "%llu blocks (%2.2f%%) reserved for the super user\n"
 msgstr "%llu 个块（%2.2f%%）为超级用户保留\n"
 
-#: misc/mke2fs.c:699
+#: misc/mke2fs.c:697
 #, c-format
 msgid "First data block=%u\n"
 msgstr "第一个数据块=%u\n"
 
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:699
 #, c-format
 msgid "Root directory owner=%u:%u\n"
 msgstr "根目录的所有者=%u:%u\n"
 
-#: misc/mke2fs.c:703
+#: misc/mke2fs.c:701
 #, c-format
 msgid "Maximum filesystem blocks=%lu\n"
 msgstr "文件系统块的最大值=%lu\n"
 
-#: misc/mke2fs.c:707
+#: misc/mke2fs.c:705
 #, c-format
 msgid "%u block groups\n"
 msgstr "%u 个块组\n"
 
-#: misc/mke2fs.c:709
+#: misc/mke2fs.c:707
 #, c-format
 msgid "%u block group\n"
 msgstr "%u 个块组\n"
 
-#: misc/mke2fs.c:711
+#: misc/mke2fs.c:709
 #, c-format
 msgid "%u blocks per group, %u clusters per group\n"
 msgstr "每组 %u 个块，%u 个簇\n"
 
-#: misc/mke2fs.c:714
+#: misc/mke2fs.c:712
 #, c-format
 msgid "%u blocks per group, %u fragments per group\n"
 msgstr "每组 %u 个块，%u 个碎片\n"
 
-#: misc/mke2fs.c:716
+#: misc/mke2fs.c:714
 #, c-format
 msgid "%u inodes per group\n"
 msgstr "每组 %u 个inode\n"
 
-#: misc/mke2fs.c:725
+#: misc/mke2fs.c:723
 #, c-format
 msgid "Filesystem UUID: %s\n"
 msgstr "文件系统UUID：%s\n"
 
-#: misc/mke2fs.c:726
+#: misc/mke2fs.c:724
 msgid "Superblock backups stored on blocks: "
 msgstr "超级块的备份存储于下列块： "
 
-#: misc/mke2fs.c:822
+#: misc/mke2fs.c:820
 #, c-format
 msgid "%s requires '-O 64bit'\n"
 msgstr "%s 需要“-O 64bit”选项\n"
 
-#: misc/mke2fs.c:828
+#: misc/mke2fs.c:826
 #, c-format
 msgid "'%s' must be before 'resize=%u'\n"
 msgstr "“%s”选项必须位于“resize=%u”之前\n"
 
-#: misc/mke2fs.c:841
+#: misc/mke2fs.c:839
 #, c-format
 msgid "Invalid desc_size: '%s'\n"
 msgstr "desc_size值无效：“%s”\n"
 
-#: misc/mke2fs.c:855
+#: misc/mke2fs.c:853
 #, c-format
 msgid "Invalid hash seed: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:867
+#: misc/mke2fs.c:865
 #, c-format
 msgid "Invalid offset: %s\n"
 msgstr "无效的偏移量： %s\n"
 
-#: misc/mke2fs.c:881 misc/tune2fs.c:2055
+#: misc/mke2fs.c:879 misc/tune2fs.c:2067
 #, c-format
 msgid "Invalid mmp_update_interval: %s\n"
 msgstr "无效mmp更新间隔：%s\n"
 
-#: misc/mke2fs.c:898
+#: misc/mke2fs.c:896
 #, c-format
 msgid "Invalid # of backup superblocks: %s\n"
 msgstr "备份超级块编号无效：%s\n"
 
-#: misc/mke2fs.c:920
+#: misc/mke2fs.c:918
 #, c-format
 msgid "Invalid stride parameter: %s\n"
 msgstr "无效的步长参数：%s\n"
 
-#: misc/mke2fs.c:935
+#: misc/mke2fs.c:933
 #, c-format
 msgid "Invalid stripe-width parameter: %s\n"
 msgstr "无效的带宽参数：%s\n"
 
-#: misc/mke2fs.c:958
+#: misc/mke2fs.c:956
 #, c-format
 msgid "Invalid resize parameter: %s\n"
 msgstr "无效的改变大小参数：%s\n"
 
-#: misc/mke2fs.c:965
+#: misc/mke2fs.c:963
 msgid "The resize maximum must be greater than the filesystem size.\n"
 msgstr "所需改变的大小必须大于当前文件系统的大小。\n"
 
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:987
 msgid "On-line resizing not supported with revision 0 filesystems\n"
 msgstr "版本为0的文件系统不支持在线改变大小。\n"
 
-#: misc/mke2fs.c:1015 misc/mke2fs.c:1024
+#: misc/mke2fs.c:1013 misc/mke2fs.c:1022
 #, c-format
 msgid "Invalid root_owner: '%s'\n"
 msgstr "无效的根目录所有者：“%s”\n"
 
-#: misc/mke2fs.c:1056
+#: misc/mke2fs.c:1065
 #, c-format
 msgid ""
 "\n"
@@ -5360,7 +5366,7 @@
 "\tquotatype=<要启用的配额类型>\n"
 "\n"
 
-#: misc/mke2fs.c:1114
+#: misc/mke2fs.c:1112
 #, c-format
 msgid ""
 "\n"
@@ -5371,7 +5377,7 @@
 "警告：RAID带宽 %u 不是步长 %u 的偶数倍。\n"
 "\n"
 
-#: misc/mke2fs.c:1179
+#: misc/mke2fs.c:1177
 #, c-format
 msgid ""
 "Syntax error in mke2fs config file (%s, line #%d)\n"
@@ -5380,17 +5386,17 @@
 "mke2fs配置文件中有语法错误（%s，第 %d 行）\n"
 "\t%s\n"
 
-#: misc/mke2fs.c:1192 misc/tune2fs.c:1068
+#: misc/mke2fs.c:1190 misc/tune2fs.c:1068
 #, c-format
 msgid "Invalid filesystem option set: %s\n"
 msgstr "设置了无效的文件系统选项：%s\n"
 
-#: misc/mke2fs.c:1204 misc/tune2fs.c:417
+#: misc/mke2fs.c:1202 misc/tune2fs.c:417
 #, c-format
 msgid "Invalid mount option set: %s\n"
 msgstr "设置了无效的挂载选项：%s\n"
 
-#: misc/mke2fs.c:1340
+#: misc/mke2fs.c:1338
 #, c-format
 msgid ""
 "\n"
@@ -5399,7 +5405,7 @@
 "\n"
 "你的mke2fs.conf文件中没有定义类型 %s 的文件系统。\n"
 
-#: misc/mke2fs.c:1344
+#: misc/mke2fs.c:1342
 msgid ""
 "You probably need to install an updated mke2fs.conf file.\n"
 "\n"
@@ -5407,11 +5413,11 @@
 "你可能需要升级mke2fs.conf文件。\n"
 "\n"
 
-#: misc/mke2fs.c:1348
+#: misc/mke2fs.c:1346
 msgid "Aborting...\n"
 msgstr "正在终止...\n"
 
-#: misc/mke2fs.c:1389
+#: misc/mke2fs.c:1387
 #, c-format
 msgid ""
 "\n"
@@ -5422,71 +5428,71 @@
 "警告：mke2fs.conf中未定义文件系统类型 %s\n"
 "\n"
 
-#: misc/mke2fs.c:1571
+#: misc/mke2fs.c:1569
 msgid "Couldn't allocate memory for new PATH.\n"
 msgstr "无法为新路径分配内存。\n"
 
-#: misc/mke2fs.c:1608
+#: misc/mke2fs.c:1606
 #, c-format
 msgid "Couldn't init profile successfully (error: %ld).\n"
 msgstr "无法成功初始化配置（错误：%ld）。\n"
 
-#: misc/mke2fs.c:1641
+#: misc/mke2fs.c:1639
 #, c-format
 msgid "invalid block size - %s"
 msgstr "无效的块大小 - %s"
 
-#: misc/mke2fs.c:1645
+#: misc/mke2fs.c:1643
 #, c-format
 msgid "Warning: blocksize %d not usable on most systems.\n"
 msgstr "警告：块大小 %d 在很多系统中不可用。\n"
 
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1659
 #, c-format
 msgid "invalid cluster size - %s"
 msgstr "无效的簇大小 - %s"
 
-#: misc/mke2fs.c:1674
+#: misc/mke2fs.c:1672
 msgid "'-R' is deprecated, use '-E' instead"
 msgstr "“-R” 选项已被废弃，请使用“-E”选项"
 
-#: misc/mke2fs.c:1688 misc/tune2fs.c:1784
+#: misc/mke2fs.c:1686 misc/tune2fs.c:1796
 #, c-format
 msgid "bad error behavior - %s"
 msgstr "出错行为有误 - %s"
 
-#: misc/mke2fs.c:1700
+#: misc/mke2fs.c:1698
 msgid "Illegal number for blocks per group"
 msgstr "非法的每组块数"
 
-#: misc/mke2fs.c:1705
+#: misc/mke2fs.c:1703
 msgid "blocks per group must be multiple of 8"
 msgstr "每组块数必须是8的倍数"
 
-#: misc/mke2fs.c:1713
+#: misc/mke2fs.c:1711
 msgid "Illegal number for flex_bg size"
 msgstr "非法的弹性组大小"
 
-#: misc/mke2fs.c:1719
+#: misc/mke2fs.c:1717
 msgid "flex_bg size must be a power of 2"
 msgstr "弹性组的大小必须是2的次方"
 
-#: misc/mke2fs.c:1724
+#: misc/mke2fs.c:1722
 #, c-format
 msgid "flex_bg size (%lu) must be less than or equal to 2^31"
 msgstr "弹性组的大小（%lu）必须小于等于2^31"
 
-#: misc/mke2fs.c:1734
+#: misc/mke2fs.c:1732
 #, c-format
 msgid "invalid inode ratio %s (min %d/max %d)"
 msgstr "无效的inode比 %s（最小 %d /最大 %d）"
 
-#: misc/mke2fs.c:1744
+#: misc/mke2fs.c:1742
 #, c-format
 msgid "invalid inode size - %s"
 msgstr "无效的inode大小 - %s"
 
-#: misc/mke2fs.c:1757
+#: misc/mke2fs.c:1755
 msgid ""
 "Warning: -K option is deprecated and should not be used anymore. Use '-E "
 "nodiscard' extended option instead!\n"
@@ -5494,11 +5500,11 @@
 "警告：-K 选项已被废弃，今后也不应当被使用。请使用扩展选项\n"
 "“-E nodiscard”作为替代！\n"
 
-#: misc/mke2fs.c:1768
+#: misc/mke2fs.c:1766
 msgid "in malloc for bad_blocks_filename"
 msgstr "为bad_blocks_filename分配内存时"
 
-#: misc/mke2fs.c:1777
+#: misc/mke2fs.c:1775
 #, c-format
 msgid ""
 "Warning: label too long; will be truncated to '%s'\n"
@@ -5507,73 +5513,73 @@
 "警告：卷标太长，已截短为“%s”\n"
 "\n"
 
-#: misc/mke2fs.c:1786
+#: misc/mke2fs.c:1784
 #, c-format
 msgid "invalid reserved blocks percent - %s"
 msgstr "无效的保留块百分比 - %s"
 
-#: misc/mke2fs.c:1801
+#: misc/mke2fs.c:1799
 #, c-format
 msgid "bad num inodes - %s"
 msgstr "错误的inode数 - %s"
 
-#: misc/mke2fs.c:1814
+#: misc/mke2fs.c:1812
 msgid "while allocating fs_feature string"
 msgstr "分配 fs_feature 字符串时"
 
-#: misc/mke2fs.c:1831
+#: misc/mke2fs.c:1829
 #, c-format
 msgid "bad revision level - %s"
 msgstr "错误的版本号 - %s"
 
-#: misc/mke2fs.c:1836
+#: misc/mke2fs.c:1834
 #, c-format
 msgid "while trying to create revision %d"
 msgstr "尝试创建版本 %d 时"
 
-#: misc/mke2fs.c:1850
+#: misc/mke2fs.c:1848
 msgid "The -t option may only be used once"
 msgstr "-t 选项只能被指定一次"
 
-#: misc/mke2fs.c:1858
+#: misc/mke2fs.c:1856
 msgid "The -T option may only be used once"
 msgstr "-T 选项只能被指定一次"
 
-#: misc/mke2fs.c:1914 misc/mke2fs.c:3298
+#: misc/mke2fs.c:1912 misc/mke2fs.c:3296
 #, c-format
 msgid "while trying to open journal device %s\n"
 msgstr "尝试打开日志设备 %s 时\n"
 
-#: misc/mke2fs.c:1920
+#: misc/mke2fs.c:1918
 #, c-format
 msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
 msgstr "日志设备的块大小（%d）不能低于最小的块大小 %d\n"
 
-#: misc/mke2fs.c:1926
+#: misc/mke2fs.c:1924
 #, c-format
 msgid "Using journal device's blocksize: %d\n"
 msgstr "根据日志设备确定块大小：%d\n"
 
-#: misc/mke2fs.c:1937
+#: misc/mke2fs.c:1935
 #, c-format
 msgid "invalid blocks '%s' on device '%s'"
 msgstr "无效的块数“%s”于设备“%s”"
 
-#: misc/mke2fs.c:1967
+#: misc/mke2fs.c:1965
 msgid "filesystem"
 msgstr "文件系统"
 
-#: misc/mke2fs.c:1985 resize/main.c:497
+#: misc/mke2fs.c:1983 resize/main.c:497
 msgid "while trying to determine filesystem size"
 msgstr "尝试确定文件系统大小时"
 
-#: misc/mke2fs.c:1991
+#: misc/mke2fs.c:1989
 msgid ""
 "Couldn't determine device size; you must specify\n"
 "the size of the filesystem\n"
 msgstr "无法确定设备大小；你必须手动指定大小\n"
 
-#: misc/mke2fs.c:1998
+#: misc/mke2fs.c:1996
 msgid ""
 "Device size reported to be zero.  Invalid partition specified, or\n"
 "\tpartition table wasn't reread after running fdisk, due to\n"
@@ -5584,49 +5590,49 @@
 "\t执行fdisk后未被重新加载（分区正被占用）导致的。\n"
 "\t你可能需要重启后重新读取分区表。\n"
 
-#: misc/mke2fs.c:2015
+#: misc/mke2fs.c:2013
 msgid "Filesystem larger than apparent device size."
 msgstr "文件系统大小超过设备的实际大小。"
 
-#: misc/mke2fs.c:2035
+#: misc/mke2fs.c:2033
 msgid "Failed to parse fs types list\n"
 msgstr "解析文件系统类型列表失败\n"
 
-#: misc/mke2fs.c:2085
+#: misc/mke2fs.c:2083
 msgid "The HURD does not support the filetype feature.\n"
 msgstr "HURD 不支持文件类型。\n"
 
-#: misc/mke2fs.c:2090
+#: misc/mke2fs.c:2088
 msgid "The HURD does not support the huge_file feature.\n"
 msgstr "HURD 不支持大文件特性。\n"
 
-#: misc/mke2fs.c:2095
+#: misc/mke2fs.c:2093
 msgid "The HURD does not support the metadata_csum feature.\n"
 msgstr "HURD 不支持元数据校验值特性。\n"
 
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2098
 msgid "The HURD does not support the ea_inode feature.\n"
-msgstr ""
+msgstr "HURD 不支持 ea_inode 特性。\n"
 
-#: misc/mke2fs.c:2110
+#: misc/mke2fs.c:2108
 msgid "while trying to determine hardware sector size"
 msgstr "尝试确定硬件扇区大小时"
 
-#: misc/mke2fs.c:2116
+#: misc/mke2fs.c:2114
 msgid "while trying to determine physical sector size"
 msgstr "尝试确定物理扇区大小时"
 
-#: misc/mke2fs.c:2148
+#: misc/mke2fs.c:2146
 msgid "while setting blocksize; too small for device\n"
 msgstr "设置块大小时；对于设备来说太小\n"
 
-#: misc/mke2fs.c:2153
+#: misc/mke2fs.c:2151
 #, c-format
 msgid ""
 "Warning: specified blocksize %d is less than device physical sectorsize %d\n"
 msgstr "警告：指定的块大小 %d 小于设备物理扇区大小%d\n"
 
-#: misc/mke2fs.c:2177
+#: misc/mke2fs.c:2175
 #, c-format
 msgid ""
 "%s: Size of device (0x%llx blocks) %s too big to be expressed\n"
@@ -5635,83 +5641,83 @@
 "%1$s：设备 %3$s 的尺寸（0x%2$llx 个块）太大，无法用32位数表示\n"
 "\t改为使用 %4$d 的块大小。\n"
 
-#: misc/mke2fs.c:2191
+#: misc/mke2fs.c:2189
 #, c-format
 msgid ""
 "%s: Size of device (0x%llx blocks) %s too big to create\n"
 "\ta filesystem using a blocksize of %d.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2213
+#: misc/mke2fs.c:2211
 msgid "fs_types for mke2fs.conf resolution: "
 msgstr "mke2fs.conf中有关文件系统类型的解释： "
 
-#: misc/mke2fs.c:2220
+#: misc/mke2fs.c:2218
 msgid "Filesystem features not supported with revision 0 filesystems\n"
 msgstr "版本为0的文件系统不支持这些特性\n"
 
-#: misc/mke2fs.c:2228
+#: misc/mke2fs.c:2226
 msgid "Sparse superblocks not supported with revision 0 filesystems\n"
 msgstr "版本为0的文件系统不支持分散式超级块\n"
 
-#: misc/mke2fs.c:2238
+#: misc/mke2fs.c:2236
 msgid "Journals not supported with revision 0 filesystems\n"
 msgstr "版本为0的文件系统不支持日志\n"
 
-#: misc/mke2fs.c:2251
+#: misc/mke2fs.c:2249
 #, c-format
 msgid "invalid reserved blocks percent - %lf"
 msgstr "无效的保留块百分比 - %lf"
 
-#: misc/mke2fs.c:2268
+#: misc/mke2fs.c:2266
 msgid ""
 "Extents MUST be enabled for a 64-bit filesystem.  Pass -O extents to "
 "rectify.\n"
 msgstr "64位系统必须启用extent特性。请使用“-O extents”选项来修正。\n"
 
-#: misc/mke2fs.c:2288
+#: misc/mke2fs.c:2286
 msgid "The cluster size may not be smaller than the block size.\n"
 msgstr "簇大小不能小于块大小。\n"
 
-#: misc/mke2fs.c:2294
+#: misc/mke2fs.c:2292
 msgid "specifying a cluster size requires the bigalloc feature"
 msgstr "指定簇大小需要启用bigalloc特性"
 
-#: misc/mke2fs.c:2314
+#: misc/mke2fs.c:2312
 #, c-format
 msgid "warning: Unable to get device geometry for %s\n"
 msgstr "警告：无法获取 %s 的设备布局\n"
 
-#: misc/mke2fs.c:2317
+#: misc/mke2fs.c:2315
 #, c-format
 msgid "%s alignment is offset by %lu bytes.\n"
 msgstr "%s 未对齐，偏移了 %lu 个字节。\n"
 
-#: misc/mke2fs.c:2319
+#: misc/mke2fs.c:2317
 #, c-format
 msgid ""
 "This may result in very poor performance, (re)-partitioning suggested.\n"
 msgstr "这可能导致性能下降，建议重新进行分区。\n"
 
-#: misc/mke2fs.c:2340
+#: misc/mke2fs.c:2338
 #, c-format
 msgid "%d-byte blocks too big for system (max %d)"
 msgstr "%d字节的块对于系统来说太大（最大为 %d）"
 
-#: misc/mke2fs.c:2344
+#: misc/mke2fs.c:2342
 #, c-format
 msgid ""
 "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
 msgstr "警告：%d字节的块对于系统来说太大（最大为 %d），但仍然强制进行操作\n"
 
-#: misc/mke2fs.c:2352
+#: misc/mke2fs.c:2350
 #, c-format
 msgid ""
 "Suggestion: Use Linux kernel >= 3.18 for improved stability of the metadata "
 "and journal checksum features.\n"
 msgstr "建议：使用 3.18 以上的 Linux 内核以提高元数据稳定性，以及使用日志校验值特性。\n"
 
-#: misc/mke2fs.c:2434
+#: misc/mke2fs.c:2432
 #, c-format
 msgid ""
 "\n"
@@ -5725,16 +5731,16 @@
 "将创建含有 %llu 个块的文件系统，这可能与您的预期不服。\n"
 "\n"
 
-#: misc/mke2fs.c:2449
+#: misc/mke2fs.c:2447
 #, c-format
 msgid "%d byte inodes are too small for project quota"
 msgstr ""
 
-#: misc/mke2fs.c:2480
+#: misc/mke2fs.c:2478
 msgid "Can't support bigalloc feature without extents feature"
 msgstr "无法在缺乏extent特性的情况下支持bigalloc特性"
 
-#: misc/mke2fs.c:2487
+#: misc/mke2fs.c:2485
 msgid ""
 "The resize_inode and meta_bg features are not compatible.\n"
 "They can not be both enabled simultaneously.\n"
@@ -5742,7 +5748,7 @@
 "resize_inode 和 meta_bg 特性不兼容。\n"
 "无法同时启用它们。\n"
 
-#: misc/mke2fs.c:2495
+#: misc/mke2fs.c:2493
 msgid ""
 "\n"
 "Warning: the bigalloc feature is still under development\n"
@@ -5754,39 +5760,39 @@
 "更多详情请参见 https://ext4.wiki.kernel.org/index.php/Bigalloc\n"
 "\n"
 
-#: misc/mke2fs.c:2507
+#: misc/mke2fs.c:2505
 msgid "reserved online resize blocks not supported on non-sparse filesystem"
 msgstr "非分散式文件系统不支持为在线调整大小设置保留块"
 
-#: misc/mke2fs.c:2516
+#: misc/mke2fs.c:2514
 msgid "blocks per group count out of range"
 msgstr "每组块数超过允许范围"
 
-#: misc/mke2fs.c:2538
+#: misc/mke2fs.c:2536
 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
 msgstr "弹性组特性未启用，所以无法指定弹性组尺寸"
 
-#: misc/mke2fs.c:2550
+#: misc/mke2fs.c:2548
 #, c-format
 msgid "invalid inode size %d (min %d/max %d)"
 msgstr "无效的inode大小 %d（最小 %d /最大 %d）"
 
-#: misc/mke2fs.c:2565
+#: misc/mke2fs.c:2563
 #, c-format
 msgid "%d byte inodes are too small for inline data; specify larger size"
 msgstr "%d 字节的 inode 对于内联数据来说太小；请指定一个更大的值"
 
-#: misc/mke2fs.c:2580
+#: misc/mke2fs.c:2578
 #, c-format
 msgid "too many inodes (%llu), raise inode ratio?"
 msgstr "inode太多（%llu），是否提高inode比？"
 
-#: misc/mke2fs.c:2587
+#: misc/mke2fs.c:2585
 #, c-format
 msgid "too many inodes (%llu), specify < 2^32 inodes"
 msgstr "inode数量太多（%llu），请指定小于 2^32 的inode数"
 
-#: misc/mke2fs.c:2601
+#: misc/mke2fs.c:2599
 #, c-format
 msgid ""
 "inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -5797,36 +5803,36 @@
 "\t的系统来说太大，请指定更高的inode比（使用 -i 选项）\n"
 "\t或更少的inode数（-N）。\n"
 
-#: misc/mke2fs.c:2788
+#: misc/mke2fs.c:2786
 msgid "Discarding device blocks: "
 msgstr "丢弃设备块： "
 
-#: misc/mke2fs.c:2804
+#: misc/mke2fs.c:2802
 msgid "failed - "
 msgstr "已失败 - "
 
-#: misc/mke2fs.c:2863
+#: misc/mke2fs.c:2861
 msgid "while initializing quota context"
 msgstr "初始化配额上下文时"
 
-#: misc/mke2fs.c:2870
+#: misc/mke2fs.c:2868
 msgid "while writing quota inodes"
 msgstr "写入配额 inode 时"
 
-#: misc/mke2fs.c:2895
+#: misc/mke2fs.c:2893
 #, c-format
 msgid "bad error behavior in profile - %s"
 msgstr "配置中的出错行为有误 - %s"
 
-#: misc/mke2fs.c:2971
+#: misc/mke2fs.c:2969
 msgid "in malloc for android_sparse_params"
-msgstr ""
+msgstr "为 android_sparse_params 分配内存时"
 
-#: misc/mke2fs.c:2985
+#: misc/mke2fs.c:2983
 msgid "while setting up superblock"
 msgstr "设置superblock时"
 
-#: misc/mke2fs.c:3001
+#: misc/mke2fs.c:2999
 msgid ""
 "Extents are not enabled.  The file extent tree can be checksummed, whereas "
 "block maps cannot.  Not enabling extents reduces the coverage of metadata "
@@ -5835,34 +5841,34 @@
 "未启用 extent 特性，所以仅对文件 extent 树进行校验，而不会对块位图进行校验。不启用 extent "
 "将降低元数据校验值的覆盖范围。可以使用参数“-O extents”来进行纠正。\n"
 
-#: misc/mke2fs.c:3008
+#: misc/mke2fs.c:3006
 msgid ""
 "64-bit filesystem support is not enabled.  The larger fields afforded by "
 "this feature enable full-strength checksumming.  Pass -O 64bit to rectify.\n"
 msgstr "未启用 64 位文件系统支持，将无法使用更大的字段来进行更完整的校验。可以使用参数“-O 64bit”来进行纠正。\n"
 
-#: misc/mke2fs.c:3016
+#: misc/mke2fs.c:3014
 msgid "The metadata_csum_seed feature requires the metadata_csum feature.\n"
 msgstr ""
 
-#: misc/mke2fs.c:3040
+#: misc/mke2fs.c:3038
 msgid "Discard succeeded and will return 0s - skipping inode table wipe\n"
 msgstr "舍弃成功，将会返回0值 - 跳过擦除inode表\n"
 
-#: misc/mke2fs.c:3139
+#: misc/mke2fs.c:3137
 #, c-format
 msgid "unknown os - %s"
 msgstr "未知操作系统 - %s"
 
-#: misc/mke2fs.c:3202
+#: misc/mke2fs.c:3200
 msgid "Allocating group tables: "
 msgstr "正在分配组表： "
 
-#: misc/mke2fs.c:3210
+#: misc/mke2fs.c:3208
 msgid "while trying to allocate filesystem tables"
 msgstr "尝试分配文件系统表时"
 
-#: misc/mke2fs.c:3219
+#: misc/mke2fs.c:3217
 msgid ""
 "\n"
 "\twhile converting subcluster bitmap"
@@ -5870,30 +5876,30 @@
 "\n"
 "\t转换子簇位图时"
 
-#: misc/mke2fs.c:3225
+#: misc/mke2fs.c:3223
 #, c-format
 msgid "%s may be further corrupted by superblock rewrite\n"
 msgstr "%s 可能因超级块被改写而损\n"
 
-#: misc/mke2fs.c:3266
+#: misc/mke2fs.c:3264
 #, c-format
 msgid "while zeroing block %llu at end of filesystem"
 msgstr "对文件系统末尾的块 %llu 填零时"
 
-#: misc/mke2fs.c:3279
+#: misc/mke2fs.c:3277
 msgid "while reserving blocks for online resize"
 msgstr "为在线改变大小保留块时"
 
-#: misc/mke2fs.c:3291 misc/tune2fs.c:1492
+#: misc/mke2fs.c:3289 misc/tune2fs.c:1504
 msgid "journal"
 msgstr "日志"
 
-#: misc/mke2fs.c:3303
+#: misc/mke2fs.c:3301
 #, c-format
 msgid "Adding journal to device %s: "
 msgstr "将日志添加到设备 %s： "
 
-#: misc/mke2fs.c:3310
+#: misc/mke2fs.c:3308
 #, c-format
 msgid ""
 "\n"
@@ -5902,21 +5908,21 @@
 "\n"
 "\t尝试将日志添加到设备 %s时"
 
-#: misc/mke2fs.c:3315 misc/mke2fs.c:3344 misc/mke2fs.c:3382
-#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1521 misc/tune2fs.c:1540
+#: misc/mke2fs.c:3313 misc/mke2fs.c:3342 misc/mke2fs.c:3380
+#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1533 misc/tune2fs.c:1552
 msgid "done\n"
 msgstr "完成\n"
 
-#: misc/mke2fs.c:3321
+#: misc/mke2fs.c:3319
 msgid "Skipping journal creation in super-only mode\n"
 msgstr "跳过创建日志的步骤（唯超级块模式）\n"
 
-#: misc/mke2fs.c:3331
+#: misc/mke2fs.c:3329
 #, c-format
 msgid "Creating journal (%u blocks): "
 msgstr "创建日志（%u 个块） "
 
-#: misc/mke2fs.c:3340
+#: misc/mke2fs.c:3338
 msgid ""
 "\n"
 "\twhile trying to create journal"
@@ -5924,7 +5930,7 @@
 "\n"
 "\t尝试创建日志时"
 
-#: misc/mke2fs.c:3352 misc/tune2fs.c:1133
+#: misc/mke2fs.c:3350 misc/tune2fs.c:1133
 msgid ""
 "\n"
 "Error while enabling multiple mount protection feature."
@@ -5932,21 +5938,21 @@
 "\n"
 "启用MMP特性失败。"
 
-#: misc/mke2fs.c:3357
+#: misc/mke2fs.c:3355
 #, c-format
 msgid ""
 "Multiple mount protection is enabled with update interval %d seconds.\n"
 msgstr "MMP（多重挂载保护）已被启用，更新间隔为 %d 秒。\n"
 
-#: misc/mke2fs.c:3373
+#: misc/mke2fs.c:3371
 msgid "Copying files into the device: "
 msgstr "将文件复制到设备： "
 
-#: misc/mke2fs.c:3379
+#: misc/mke2fs.c:3377
 msgid "while populating file system"
 msgstr "于填充文件系统时"
 
-#: misc/mke2fs.c:3386
+#: misc/mke2fs.c:3384
 msgid "Writing superblocks and filesystem accounting information: "
 msgstr "写入超级块和文件系统账户统计信息： "
 
@@ -5956,7 +5962,7 @@
 "Warning, had trouble writing out superblocks.\n"
 msgstr ""
 
-#: misc/mke2fs.c:3396
+#: misc/mke2fs.c:3394
 msgid ""
 "done\n"
 "\n"
@@ -6068,12 +6074,12 @@
 msgid "while trying to open external journal"
 msgstr "尝试打开外部日志时"
 
-#: misc/tune2fs.c:287 misc/tune2fs.c:2804
+#: misc/tune2fs.c:287 misc/tune2fs.c:2816
 #, c-format
 msgid "%s is not a journal device.\n"
 msgstr "%s 不是日志设备。\n"
 
-#: misc/tune2fs.c:303 misc/tune2fs.c:2820
+#: misc/tune2fs.c:303 misc/tune2fs.c:2832
 msgid "Filesystem's UUID not found on journal device.\n"
 msgstr "日志设备中未找到文件系统的UUID。\n"
 
@@ -6244,22 +6250,22 @@
 msgid "Cannot disable metadata_csum on a mounted filesystem!\n"
 msgstr "无法在已挂载的文件系统上禁用元数据校验特性！\n"
 
-#: misc/tune2fs.c:1334
+#: misc/tune2fs.c:1346
 #, c-format
 msgid "Cannot enable 64-bit mode while mounted!\n"
 msgstr "无法在已挂载的文件系统上启用 64 位模式！\n"
 
-#: misc/tune2fs.c:1344
+#: misc/tune2fs.c:1356
 #, c-format
 msgid "Cannot disable 64-bit mode while mounted!\n"
 msgstr "无法在已挂载的文件系统上禁用 64 位模式！\n"
 
-#: misc/tune2fs.c:1374
+#: misc/tune2fs.c:1386
 #, c-format
 msgid "Cannot enable project feature; inode size too small.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1395
+#: misc/tune2fs.c:1407
 msgid ""
 "\n"
 "Warning: '^quota' option overrides '-Q'arguments.\n"
@@ -6267,7 +6273,7 @@
 "\n"
 "警告：“^quota”选项将覆盖“-Q”的参数。\n"
 
-#: misc/tune2fs.c:1419
+#: misc/tune2fs.c:1431
 msgid ""
 "Setting feature 'metadata_csum_seed' is only supported\n"
 "on filesystems with the metadata_csum feature enabled.\n"
@@ -6275,7 +6281,7 @@
 "只有在启用了元数据校验值特性的文件系统才支持\n"
 "“metadata_csum_seed”特性。\n"
 
-#: misc/tune2fs.c:1437
+#: misc/tune2fs.c:1449
 msgid ""
 "UUID has changed since enabling metadata_csum.  Filesystem must be unmounted "
 "\n"
@@ -6284,15 +6290,15 @@
 "启用元数据校验值特性后UUID被改变。必须卸载文件系统并安全改写所有元数据，以便\n"
 "与新的 UUID 相匹配。\n"
 
-#: misc/tune2fs.c:1443
+#: misc/tune2fs.c:1455
 msgid "Recalculating checksums could take some time."
-msgstr ""
+msgstr "重新计算校验值需要花费一段时间。"
 
-#: misc/tune2fs.c:1485
+#: misc/tune2fs.c:1497
 msgid "The filesystem already has a journal.\n"
 msgstr "文件系统已有日志。\n"
 
-#: misc/tune2fs.c:1505
+#: misc/tune2fs.c:1517
 #, c-format
 msgid ""
 "\n"
@@ -6301,21 +6307,21 @@
 "\n"
 "\t尝试打开位于 %s 的日志时\n"
 
-#: misc/tune2fs.c:1509
+#: misc/tune2fs.c:1521
 #, c-format
 msgid "Creating journal on device %s: "
 msgstr "在设备 %s 上创建日志： "
 
-#: misc/tune2fs.c:1517
+#: misc/tune2fs.c:1529
 #, c-format
 msgid "while adding filesystem to journal on %s"
 msgstr "将文件系统添加到 %s 上的日志"
 
-#: misc/tune2fs.c:1523
+#: misc/tune2fs.c:1535
 msgid "Creating journal inode: "
 msgstr "创建日志inode： "
 
-#: misc/tune2fs.c:1537
+#: misc/tune2fs.c:1549
 msgid ""
 "\n"
 "\twhile trying to create journal file"
@@ -6323,31 +6329,31 @@
 "\n"
 "\t尝试创建日志文件时"
 
-#: misc/tune2fs.c:1575
+#: misc/tune2fs.c:1587
 #, c-format
 msgid "Cannot enable project quota; inode size too small.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1588
+#: misc/tune2fs.c:1600
 msgid "while initializing quota context in support library"
 msgstr "初始化支持库中的引用上下文时"
 
-#: misc/tune2fs.c:1603
+#: misc/tune2fs.c:1615
 #, c-format
 msgid "while updating quota limits (%d)"
 msgstr "更新配额限制（%d）时"
 
-#: misc/tune2fs.c:1611
+#: misc/tune2fs.c:1623
 #, c-format
 msgid "while writing quota file (%d)"
 msgstr "写入配额文件（%d）时"
 
-#: misc/tune2fs.c:1629
+#: misc/tune2fs.c:1641
 #, c-format
 msgid "while removing quota file (%d)"
 msgstr "移除配额文件（%d）时"
 
-#: misc/tune2fs.c:1672
+#: misc/tune2fs.c:1684
 msgid ""
 "\n"
 "Bad quota options specified.\n"
@@ -6370,92 +6376,92 @@
 "\n"
 "\n"
 
-#: misc/tune2fs.c:1730
+#: misc/tune2fs.c:1742
 #, c-format
 msgid "Couldn't parse date/time specifier: %s"
 msgstr "无法解析日期/时间描述符：%s"
 
-#: misc/tune2fs.c:1755 misc/tune2fs.c:1768
+#: misc/tune2fs.c:1767 misc/tune2fs.c:1780
 #, c-format
 msgid "bad mounts count - %s"
 msgstr "错误挂载计数 - %s"
 
-#: misc/tune2fs.c:1811
+#: misc/tune2fs.c:1823
 #, c-format
 msgid "bad gid/group name - %s"
 msgstr "错误的gid/组名 - %s"
 
-#: misc/tune2fs.c:1844
+#: misc/tune2fs.c:1856
 #, c-format
 msgid "bad interval - %s"
 msgstr "错误的间隔 - %s"
 
-#: misc/tune2fs.c:1873
+#: misc/tune2fs.c:1885
 #, c-format
 msgid "bad reserved block ratio - %s"
 msgstr "错误的保留块比 - %s"
 
-#: misc/tune2fs.c:1888
+#: misc/tune2fs.c:1900
 msgid "-o may only be specified once"
 msgstr "-o只能被指定一次"
 
-#: misc/tune2fs.c:1897
+#: misc/tune2fs.c:1909
 msgid "-O may only be specified once"
 msgstr "-O只能被指定一次"
 
-#: misc/tune2fs.c:1914
+#: misc/tune2fs.c:1926
 #, c-format
 msgid "bad reserved blocks count - %s"
 msgstr "错误的保留块数 - %s"
 
-#: misc/tune2fs.c:1943
+#: misc/tune2fs.c:1955
 #, c-format
 msgid "bad uid/user name - %s"
 msgstr "错误的uid/用户名 - %s"
 
-#: misc/tune2fs.c:1960
+#: misc/tune2fs.c:1972
 #, c-format
 msgid "bad inode size - %s"
 msgstr "无效的inode大小 - %s"
 
-#: misc/tune2fs.c:1967
+#: misc/tune2fs.c:1979
 #, c-format
 msgid "Inode size must be a power of two- %s"
 msgstr "Inode 大小必须是2的次方- %s"
 
-#: misc/tune2fs.c:2064
+#: misc/tune2fs.c:2076
 #, c-format
 msgid "mmp_update_interval too big: %lu\n"
 msgstr "MMP更新间隔太长：%lu\n"
 
-#: misc/tune2fs.c:2069
+#: misc/tune2fs.c:2081
 #, c-format
 msgid "Setting multiple mount protection update interval to %lu second\n"
 msgid_plural ""
 "Setting multiple mount protection update interval to %lu seconds\n"
 msgstr[0] "设置MMP更新间隔为 %lu 秒\n"
 
-#: misc/tune2fs.c:2096
+#: misc/tune2fs.c:2108
 #, c-format
 msgid "Invalid RAID stride: %s\n"
 msgstr "无效的RAID带宽：%s\n"
 
-#: misc/tune2fs.c:2111
+#: misc/tune2fs.c:2123
 #, c-format
 msgid "Invalid RAID stripe-width: %s\n"
 msgstr "无效的带宽参数：%s\n"
 
-#: misc/tune2fs.c:2126
+#: misc/tune2fs.c:2138
 #, c-format
 msgid "Invalid hash algorithm: %s\n"
 msgstr "无效的hash算法：%s\n"
 
-#: misc/tune2fs.c:2132
+#: misc/tune2fs.c:2144
 #, c-format
 msgid "Setting default hash algorithm to %s (%d)\n"
 msgstr "将默认hash算法设置为 %s （%d）\n"
 
-#: misc/tune2fs.c:2191
+#: misc/tune2fs.c:2199
 msgid ""
 "\n"
 "Bad options specified.\n"
@@ -6474,31 +6480,31 @@
 "\t^test_fs\n"
 msgstr ""
 
-#: misc/tune2fs.c:2622
+#: misc/tune2fs.c:2634
 msgid "Failed to read inode bitmap\n"
 msgstr "读取inode位图失败\n"
 
-#: misc/tune2fs.c:2627
+#: misc/tune2fs.c:2639
 msgid "Failed to read block bitmap\n"
 msgstr "读取块位图失败\n"
 
-#: misc/tune2fs.c:2644 resize/resize2fs.c:1277
+#: misc/tune2fs.c:2656 resize/resize2fs.c:1277
 msgid "blocks to be moved"
 msgstr "需要移动的块"
 
-#: misc/tune2fs.c:2647
+#: misc/tune2fs.c:2659
 msgid "Failed to allocate block bitmap when increasing inode size\n"
 msgstr "增加inode大小时为分配块位图失败\n"
 
-#: misc/tune2fs.c:2653
+#: misc/tune2fs.c:2665
 msgid "Not enough space to increase inode size \n"
 msgstr "没有足够的空间用于增加inode大小 \n"
 
-#: misc/tune2fs.c:2658
+#: misc/tune2fs.c:2670
 msgid "Failed to relocate blocks during inode resize \n"
 msgstr "改变块大小时重定位块失败 \n"
 
-#: misc/tune2fs.c:2690
+#: misc/tune2fs.c:2702
 msgid ""
 "Error in resizing the inode size.\n"
 "Run e2undo to undo the file system changes. \n"
@@ -6506,7 +6512,7 @@
 "改变inode大小时出错。\n"
 "请运行e2undo来撤销对文件系统的更改。 \n"
 
-#: misc/tune2fs.c:2907
+#: misc/tune2fs.c:2919
 #, c-format
 msgid ""
 "MMP block magic is bad. Try to fix it by running:\n"
@@ -6515,29 +6521,29 @@
 "MMP块幻数错误。请尝试运行一下命令来修复：\n"
 "“e2fsck -f %s”\n"
 
-#: misc/tune2fs.c:2919
+#: misc/tune2fs.c:2931
 msgid "Cannot modify a journal device.\n"
 msgstr "无法修改日志设备。\n"
 
-#: misc/tune2fs.c:2932
+#: misc/tune2fs.c:2944
 #, c-format
 msgid "The inode size is already %lu\n"
 msgstr "inode大小已经为 %lu\n"
 
-#: misc/tune2fs.c:2939
+#: misc/tune2fs.c:2951
 msgid "Shrinking inode size is not supported\n"
 msgstr "不支持缩小inode大小\n"
 
-#: misc/tune2fs.c:2944
+#: misc/tune2fs.c:2956
 #, c-format
 msgid "Invalid inode size %lu (max %d)\n"
 msgstr "无效的inode大小 %lu（最大 %d）\n"
 
-#: misc/tune2fs.c:2950
+#: misc/tune2fs.c:2962
 msgid "Resizing inodes could take some time."
 msgstr "改变 inode 大小需要花费一段时间。"
 
-#: misc/tune2fs.c:2998
+#: misc/tune2fs.c:3009
 #, c-format
 msgid ""
 "Warning: The journal is dirty. You may wish to replay the journal like:\n"
@@ -6553,57 +6559,57 @@
 "\n"
 "然后重新运行本命令。否则，任何所做更改都可能被日志恢复操作所覆盖。\n"
 
-#: misc/tune2fs.c:3009
+#: misc/tune2fs.c:3020
 #, c-format
 msgid "Recovering journal.\n"
 msgstr "正在修复日志。\n"
 
-#: misc/tune2fs.c:3028
+#: misc/tune2fs.c:3039
 #, c-format
 msgid "Setting maximal mount count to %d\n"
 msgstr "设置最大挂载次数为 %d\n"
 
-#: misc/tune2fs.c:3034
+#: misc/tune2fs.c:3045
 #, c-format
 msgid "Setting current mount count to %d\n"
 msgstr "设置当前挂载次数为 %d\n"
 
-#: misc/tune2fs.c:3039
+#: misc/tune2fs.c:3050
 #, c-format
 msgid "Setting error behavior to %d\n"
 msgstr "将出错行为设置为 %d\n"
 
-#: misc/tune2fs.c:3044
+#: misc/tune2fs.c:3055
 #, c-format
 msgid "Setting reserved blocks gid to %lu\n"
 msgstr "设置保留块的gid为 %lu\n"
 
-#: misc/tune2fs.c:3049
+#: misc/tune2fs.c:3060
 #, c-format
 msgid "interval between checks is too big (%lu)"
 msgstr "检查间隔太长（%lu）"
 
-#: misc/tune2fs.c:3056
+#: misc/tune2fs.c:3067
 #, c-format
 msgid "Setting interval between checks to %lu seconds\n"
 msgstr "将检查间隔设置为 %lu 秒\n"
 
-#: misc/tune2fs.c:3063
+#: misc/tune2fs.c:3074
 #, c-format
 msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n"
 msgstr "将保留块所占百分比设置为 %g%%（%llu 个块）\n"
 
-#: misc/tune2fs.c:3069
+#: misc/tune2fs.c:3080
 #, c-format
 msgid "reserved blocks count is too big (%llu)"
 msgstr "保留块的数量太大（%llu）"
 
-#: misc/tune2fs.c:3076
+#: misc/tune2fs.c:3087
 #, c-format
 msgid "Setting reserved blocks count to %llu\n"
 msgstr "设置保留块数为 %llu\n"
 
-#: misc/tune2fs.c:3081
+#: misc/tune2fs.c:3092
 msgid ""
 "\n"
 "The filesystem already has sparse superblocks.\n"
@@ -6611,7 +6617,7 @@
 "\n"
 "文件系统已经含有分散式超级块\n"
 
-#: misc/tune2fs.c:3084
+#: misc/tune2fs.c:3095
 msgid ""
 "\n"
 "Setting the sparse superblock flag not supported\n"
@@ -6621,7 +6627,7 @@
 "启用了meta_bg特性的文件系统不支持设置分散式\n"
 "超级块标志。\n"
 
-#: misc/tune2fs.c:3094
+#: misc/tune2fs.c:3105
 #, c-format
 msgid ""
 "\n"
@@ -6630,7 +6636,7 @@
 "\n"
 "已设置分散式超级块标志。  %s"
 
-#: misc/tune2fs.c:3099
+#: misc/tune2fs.c:3110
 msgid ""
 "\n"
 "Clearing the sparse superblock flag not supported.\n"
@@ -6638,79 +6644,79 @@
 "\n"
 "移除不被支持的分散式超级块标志。\n"
 
-#: misc/tune2fs.c:3107
+#: misc/tune2fs.c:3118
 #, c-format
 msgid "Setting time filesystem last checked to %s\n"
 msgstr "设置上一次检查的时间为 %s\n"
 
-#: misc/tune2fs.c:3113
+#: misc/tune2fs.c:3124
 #, c-format
 msgid "Setting reserved blocks uid to %lu\n"
 msgstr "设置保留块的uid为 %lu\n"
 
-#: misc/tune2fs.c:3145
+#: misc/tune2fs.c:3156
 msgid "Error in using clear_mmp. It must be used with -f\n"
 msgstr "clear_mmp选项使用错误，必须和 -f 选项一起使用\n"
 
-#: misc/tune2fs.c:3163
+#: misc/tune2fs.c:3174
 msgid ""
 "The quota feature may only be changed when the filesystem is unmounted.\n"
 msgstr "只有当文件系统被卸载时才能修改配额特性。\n"
 
-#: misc/tune2fs.c:3196
+#: misc/tune2fs.c:3207
 msgid "The UUID may only be changed when the filesystem is unmounted.\n"
 msgstr "只有当文件系统被卸载时才能改变UUID。\n"
 
-#: misc/tune2fs.c:3199
+#: misc/tune2fs.c:3210
 msgid ""
 "If you only use kernels newer than v4.4, run 'tune2fs -O metadata_csum_seed' "
 "and re-run this command.\n"
 msgstr ""
-"若您仅使用 Linux 4.4 以上的内核，请运行“tune2fs -O metadata_csum_seed”，然后重新运行此命了。\n"
+"若您仅使用 Linux 4.4 以上的内核，请运行“tune2fs -O metadata_csum_seed”，然后重新运行此命令。\n"
 
 #: misc/tune2fs.c:3232
 msgid "Setting UUID on a checksummed filesystem could take some time."
 msgstr "在启用了校验值的文件系统上设置 UUID 需要花费一段时间。"
 
-#: misc/tune2fs.c:3229
+#: misc/tune2fs.c:3240
 msgid "Invalid UUID format\n"
 msgstr "无效的 UUID 格式\n"
 
-#: misc/tune2fs.c:3245
+#: misc/tune2fs.c:3256
 msgid "Need to update journal superblock.\n"
 msgstr "需要更新日志超级块。\n"
 
-#: misc/tune2fs.c:3267
+#: misc/tune2fs.c:3278
 msgid ""
 "The inode size may only be changed when the filesystem is unmounted.\n"
 msgstr "只有当文件系统被卸载时才能改变inode大小。\n"
 
-#: misc/tune2fs.c:3274
+#: misc/tune2fs.c:3285
 msgid ""
 "Changing the inode size not supported for filesystems with the flex_bg\n"
 "feature enabled.\n"
 msgstr "启用了弹性组特性的文件系统不支持改变inode大小\n"
 
-#: misc/tune2fs.c:3292
+#: misc/tune2fs.c:3303
 #, c-format
 msgid "Setting inode size %lu\n"
 msgstr "正在将inode大小设置为 %lu\n"
 
-#: misc/tune2fs.c:3296
+#: misc/tune2fs.c:3307
 msgid "Failed to change inode size\n"
 msgstr "改变inode大小失败\n"
 
-#: misc/tune2fs.c:3310
+#: misc/tune2fs.c:3321
 #, c-format
 msgid "Setting stride size to %d\n"
 msgstr "设置步长为 %d\n"
 
-#: misc/tune2fs.c:3315
+#: misc/tune2fs.c:3326
 #, c-format
 msgid "Setting stripe width to %d\n"
 msgstr "设置带宽为 %d\n"
 
-#: misc/tune2fs.c:3322
+#: misc/tune2fs.c:3333
 #, c-format
 msgid "Setting extended default mount options to '%s'\n"
 msgstr "设置默认挂载的扩展选项为 “%s”\n"
@@ -6722,11 +6728,11 @@
 #: misc/util.c:105
 #, c-format
 msgid "Proceed anyway (or wait %d seconds to proceed) ? (y,N) "
-msgstr ""
+msgstr "无论如何也要继续（或等待 %d 秒）?（y,N） "
 
 #: misc/util.c:109
 msgid "Proceed anyway? (y,N) "
-msgstr ""
+msgstr "无论如何也要继续?（y,N) "
 
 #: misc/util.c:136
 msgid "mke2fs forced anyway.  Hope /etc/mtab is incorrect.\n"
@@ -6967,6 +6973,9 @@
 "[-S RAID-stride] [-z undo_file]\n"
 "\n"
 msgstr ""
+"用法：%s [-d 调试标志] [-f] [-F] [-M] [-P] [-p] 设备 [-b|-s|新大小] [S RAID-stride] [-z "
+"撤销文件]\n"
+"\n"
 
 #: resize/main.c:73
 msgid "Extending the inode table"
@@ -7867,7 +7876,7 @@
 
 #: lib/ext2fs/ext2_err.c:166
 msgid "Ext2 file already exists"
-msgstr "ext2文件已存在"
+msgstr "Ext2 文件已存在"
 
 #: lib/ext2fs/ext2_err.c:167
 msgid "Block bitmap checksum does not match bitmap"
@@ -7955,7 +7964,7 @@
 
 #: lib/ext2fs/ext2_err.c:188
 msgid "Inode is corrupted"
-msgstr ""
+msgstr "Inode 已损坏"
 
 #: lib/support/prof_err.c:11
 msgid "Profile version 0.0"
@@ -8086,42 +8095,42 @@
 msgid "\tlast mounted on %s on %s"
 msgstr "\t上一次挂载于 %s， 时间 %s"
 
-#: lib/support/plausible.c:121
+#: lib/support/plausible.c:117
 #, c-format
 msgid "\tlast mounted on %s"
 msgstr "\t上一次挂载于%s"
 
-#: lib/support/plausible.c:124
+#: lib/support/plausible.c:120
 #, c-format
 msgid "\tcreated on %s"
 msgstr "\t创建于 %s"
 
-#: lib/support/plausible.c:127
+#: lib/support/plausible.c:123
 #, c-format
 msgid "\tlast modified on %s"
 msgstr "\t上一次修改于 %s"
 
-#: lib/support/plausible.c:161
+#: lib/support/plausible.c:157
 #, c-format
 msgid "Found a %s partition table in %s\n"
 msgstr "在 %s 中发现一个 %s 分区表\n"
 
-#: lib/support/plausible.c:191
+#: lib/support/plausible.c:187
 #, c-format
 msgid "The file %s does not exist and no size was specified.\n"
 msgstr "文件 %s 不存在，也没有指定大小。\n"
 
-#: lib/support/plausible.c:199
+#: lib/support/plausible.c:195
 #, c-format
 msgid "Creating regular file %s\n"
 msgstr "创建一般文件 %s\n"
 
-#: lib/support/plausible.c:202
+#: lib/support/plausible.c:198
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr "无法打开 %s：%s\n"
 
-#: lib/support/plausible.c:205
+#: lib/support/plausible.c:201
 msgid ""
 "\n"
 "The device apparently does not exist; did you specify it correctly?\n"
@@ -8129,22 +8138,22 @@
 "\n"
 "设备不存在。请确认所给设备名是否正确。\n"
 
-#: lib/support/plausible.c:227
+#: lib/support/plausible.c:223
 #, c-format
 msgid "%s is not a block special device.\n"
 msgstr "错误：%s 不是块设备。\n"
 
-#: lib/support/plausible.c:249
+#: lib/support/plausible.c:245
 #, c-format
 msgid "%s contains a %s file system labelled '%s'\n"
 msgstr "%1$s 有一个标签为“%3$s”的 %2$s 文件系统\n"
 
-#: lib/support/plausible.c:252
+#: lib/support/plausible.c:248
 #, c-format
 msgid "%s contains a %s file system\n"
 msgstr "%s 有一个 %s 文件系统\n"
 
-#: lib/support/plausible.c:276
+#: lib/support/plausible.c:272
 #, c-format
 msgid "%s contains `%s' data\n"
 msgstr "%s 含有“%s”数据\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/elfutils.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/elfutils.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/elfutils.po	2020-01-23 16:51:56.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/elfutils.po	2020-07-08 13:53:56.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:39+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: lib/color.c:53
 msgid ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/fcitx-mozc.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/fcitx-mozc.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/fcitx-mozc.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/fcitx-mozc.po	2020-07-08 13:53:53.000000000 +0000
@@ -20,8 +20,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:02+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:44+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: ../eim.cc:184
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/fetchmail.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/fetchmail.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/fetchmail.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/fetchmail.po	2020-07-08 13:54:02.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:52+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:46+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: checkalias.c:174
@@ -101,7 +101,7 @@
 
 #: driver.c:593
 msgid " (length -1)"
-msgstr " ( 长度 -1)"
+msgstr " (长度 -1)"
 
 #: driver.c:596
 msgid " (oversized)"
@@ -258,7 +258,7 @@
 
 #: driver.c:1178
 msgid " (previously authorized)"
-msgstr " (事先已授权)"
+msgstr " （先前已授权）"
 
 #: driver.c:1181
 msgid "For help, see http://www.fetchmail.info/fetchmail-FAQ.html#R15\n"
@@ -366,7 +366,7 @@
 msgid "%s at %s (folder %s)"
 msgstr "%s 在 %s (邮箱 %s)"
 
-#: driver.c:1335 rcfile_y.y:392
+#: driver.c:1335 rcfile_y.y:390
 #, c-format
 msgid "%s at %s"
 msgstr "%s 在 %s"
@@ -495,7 +495,7 @@
 msgid "Option --limit is not supported with %s\n"
 msgstr "%s 不支持 --limit 选项\n"
 
-#: env.c:62
+#: env.c:58
 #, c-format
 msgid ""
 "%s: The QMAILINJECT environment variable is set.\n"
@@ -510,7 +510,7 @@
 "尝试用 “env QMAILINJECT= %s 您的参数”\n"
 "%s: 退出\n"
 
-#: env.c:74
+#: env.c:70
 #, c-format
 msgid ""
 "%s: The NULLMAILER_FLAGS environment variable is set.\n"
@@ -526,12 +526,12 @@
 "Return-Path:字段。尝试用 “env NULLMAILER_FLAGS= %s  您的参数”\n"
 "%s: 退出\n"
 
-#: env.c:86
+#: env.c:82
 #, c-format
 msgid "%s: You don't exist.  Go away.\n"
 msgstr "%s: 不存在您的用户名，退出\n"
 
-#: env.c:204
+#: env.c:200
 #, c-format
 msgid "%s: can't determine your host!"
 msgstr "%s: 无法确认您的主机!"
@@ -541,11 +541,11 @@
 msgid "gethostbyname failed for %s\n"
 msgstr "%s 主机上 gethostbyname 函数出错\n"
 
-#: env.c:229
+#: env.c:225
 msgid "Cannot find my own host in hosts database to qualify it!\n"
 msgstr "无法在主机数据库中找到自己的主机来验证它！\n"
 
-#: env.c:233
+#: env.c:229
 msgid ""
 "Trying to continue with unqualified hostname.\n"
 "DO NOT report broken Received: headers, HELO/EHLO lines or similar "
@@ -651,259 +651,259 @@
 msgid "could not get current working directory\n"
 msgstr "无法得到当前工作目录\n"
 
-#: fetchmail.c:297
+#: fetchmail.c:304
 #, c-format
 msgid "This is fetchmail release %s"
 msgstr "这是 fetchmail 发行版 %s"
 
-#: fetchmail.c:322
+#: fetchmail.c:339
 msgid "The nodetach option is in effect, ignoring logfile option.\n"
 msgstr "nodetach 选项在起作用，忽略 logfile 选项。\n"
 
-#: fetchmail.c:329
+#: fetchmail.c:346
 msgid "Not running in daemon mode, ignoring logfile option.\n"
 msgstr "未以 daemon 模式运行，忽略 logfile 选项。\n"
 
-#: fetchmail.c:336
+#: fetchmail.c:353
 #, c-format
 msgid "Logfile \"%s\" does not exist, ignoring logfile option.\n"
 msgstr "日志文件 \"%s\" 不存在，忽略 logfile 选项。\n"
 
-#: fetchmail.c:342
+#: fetchmail.c:359
 #, c-format
 msgid "Logfile \"%s\" is not writable, aborting.\n"
 msgstr "日志文件 \"%s\" 不可写，退出。\n"
 
-#: fetchmail.c:360
+#: fetchmail.c:377
 #, c-format
 msgid ""
 "syslog and logfile options are both set, ignoring syslog, and logging to %s"
 msgstr "同时指定了 syslog 和 logfile 选项，忽略 syslog 并登录至 %s"
 
-#: fetchmail.c:448
+#: fetchmail.c:468
 #, c-format
 msgid "Taking options from command line%s%s\n"
 msgstr "正从命令行获得选项 %s%s\n"
 
-#: fetchmail.c:449
+#: fetchmail.c:469
 msgid " and "
 msgstr " 和 "
 
-#: fetchmail.c:454
+#: fetchmail.c:474
 #, c-format
 msgid "No mailservers set up -- perhaps %s is missing?\n"
 msgstr "未设置邮件服务器 -- 可能未找到 %s？\n"
 
-#: fetchmail.c:475
+#: fetchmail.c:495
 msgid "fetchmail: no mailservers have been specified.\n"
 msgstr "fetchmail: 未指定邮件服务器\n"
 
-#: fetchmail.c:487
+#: fetchmail.c:507
 msgid "fetchmail: no other fetchmail is running\n"
 msgstr "fetchmail: 无其它 fetchmail 正在运行\n"
 
-#: fetchmail.c:493
+#: fetchmail.c:513
 #, c-format
 msgid "fetchmail: error killing %s fetchmail at %ld; bailing out.\n"
 msgstr "fetchmail: 终止 %s fetchmail 进程号 %ld 时出错；退出。\n"
 
-#: fetchmail.c:494 fetchmail.c:503
+#: fetchmail.c:514 fetchmail.c:523
 msgid "background"
 msgstr "后台"
 
-#: fetchmail.c:494 fetchmail.c:503
+#: fetchmail.c:514 fetchmail.c:523
 msgid "foreground"
 msgstr "前台"
 
-#: fetchmail.c:502
+#: fetchmail.c:522
 #, c-format
 msgid "fetchmail: %s fetchmail at %ld killed.\n"
 msgstr "fetchmail: %s fetchmail 进程号 %ld 终止。\n"
 
-#: fetchmail.c:525
+#: fetchmail.c:545
 msgid ""
 "fetchmail: can't check mail while another fetchmail to same host is "
 "running.\n"
 msgstr "fetchmail: 有另一个 fetchmail 在同一主机上运行时无法检查邮件。\n"
 
-#: fetchmail.c:531
+#: fetchmail.c:551
 #, c-format
 msgid ""
 "fetchmail: can't poll specified hosts with another fetchmail running at "
 "%ld.\n"
 msgstr "fetchmail: 有另一个 fetchmail 进程号 %ld 在指定主机上运行时无法收邮件。\n"
 
-#: fetchmail.c:538
+#: fetchmail.c:558
 #, c-format
 msgid "fetchmail: another foreground fetchmail is running at %ld.\n"
 msgstr "fetchmail: 另一个前台 fetchmail 进程号 %ld 正在运行。\n"
 
-#: fetchmail.c:548
+#: fetchmail.c:568
 msgid ""
 "fetchmail: can't accept options while a background fetchmail is running.\n"
 msgstr "fetchmail: 有后台 fetchmail 正在运行时无法接受选项\n"
 
-#: fetchmail.c:560
+#: fetchmail.c:580
 #, c-format
 msgid "fetchmail: background fetchmail at %ld awakened.\n"
 msgstr "fetchmail: 后台 fetchmail 进程号 %ld 被唤醒\n"
 
-#: fetchmail.c:572
+#: fetchmail.c:592
 #, c-format
 msgid "fetchmail: elder sibling at %ld died mysteriously.\n"
 msgstr "fetchmail: 上次 fetchmail 进程号 %ld 不明原因的终止\n"
 
-#: fetchmail.c:587
+#: fetchmail.c:607
 #, c-format
 msgid "fetchmail: can't find a password for %s@%s.\n"
 msgstr "fetchmail: 无法找到 %s@%s 的密码\n"
 
-#: fetchmail.c:591
+#: fetchmail.c:611
 #, c-format
 msgid "Enter password for %s@%s: "
-msgstr "输入 %s@%s 的密码: "
+msgstr "输入 %s@%s 的密码： "
 
-#: fetchmail.c:633
+#: fetchmail.c:653
 msgid "fetchmail: Cannot detach into background. Aborting.\n"
 msgstr "fetchmail: 无法转入后台。退出\n"
 
-#: fetchmail.c:637
+#: fetchmail.c:657
 #, c-format
 msgid "starting fetchmail %s daemon\n"
 msgstr "开启 fetchmail %s 后台服务\n"
 
-#: fetchmail.c:653 fetchmail.c:655
+#: fetchmail.c:673 fetchmail.c:675
 #, c-format
 msgid "could not open %s to append logs to\n"
 msgstr "无法打开 %s 添加记录\n"
 
-#: fetchmail.c:674
+#: fetchmail.c:694
 msgid "--check mode enabled, not fetching mail\n"
 msgstr "开启 --check 模式, 而非真正取回邮件\n"
 
-#: fetchmail.c:696
+#: fetchmail.c:716
 #, c-format
 msgid "couldn't time-check %s (error %d)\n"
-msgstr "不能校正时间 %s （错误 %d ）\n"
+msgstr "无法时限检测 %s (错误号 %d)\n"
 
-#: fetchmail.c:701
+#: fetchmail.c:721
 #, c-format
 msgid "restarting fetchmail (%s changed)\n"
 msgstr "正在重启 fetchmail (%s 改变了)\n"
 
-#: fetchmail.c:705
+#: fetchmail.c:725
 msgid "attempt to re-exec may fail as directory has not been restored\n"
 msgstr "由于目录尚未重置，因此重新执行的尝试可能失败\n"
 
-#: fetchmail.c:731
+#: fetchmail.c:751
 msgid "attempt to re-exec fetchmail failed\n"
 msgstr "重新执行 fetchmail 的尝试失败了\n"
 
-#: fetchmail.c:761
+#: fetchmail.c:781
 #, c-format
 msgid "poll of %s skipped (failed authentication or too many timeouts)\n"
 msgstr "忽略收取 %s 的邮件 (验证失败或多次超时)\n"
 
-#: fetchmail.c:773
+#: fetchmail.c:793
 #, c-format
 msgid "interval not reached, not querying %s\n"
 msgstr "时间间隔未到，不查寻 %s\n"
 
-#: fetchmail.c:811
+#: fetchmail.c:831
 msgid "Query status=0 (SUCCESS)\n"
 msgstr "查询状态=0 (成功)\n"
 
-#: fetchmail.c:813
+#: fetchmail.c:833
 msgid "Query status=1 (NOMAIL)\n"
 msgstr "查询状态=1 (无邮件)\n"
 
-#: fetchmail.c:815
+#: fetchmail.c:835
 msgid "Query status=2 (SOCKET)\n"
 msgstr "查询状态=2 (套接字输入输出错误)\n"
 
-#: fetchmail.c:817
+#: fetchmail.c:837
 msgid "Query status=3 (AUTHFAIL)\n"
 msgstr "查询状态=3 (用户验证失败)\n"
 
-#: fetchmail.c:819
+#: fetchmail.c:839
 msgid "Query status=4 (PROTOCOL)\n"
 msgstr "查询状态=4 (协议无效)\n"
 
-#: fetchmail.c:821
+#: fetchmail.c:841
 msgid "Query status=5 (SYNTAX)\n"
 msgstr "查询状态=5 (命令行语法错误)\n"
 
-#: fetchmail.c:823
+#: fetchmail.c:843
 msgid "Query status=6 (IOERR)\n"
 msgstr "查询状态=6 (配置文件权限错误)\n"
 
-#: fetchmail.c:825
+#: fetchmail.c:845
 msgid "Query status=7 (ERROR)\n"
 msgstr "查询状态=7 (协议错误)\n"
 
-#: fetchmail.c:827
+#: fetchmail.c:847
 msgid "Query status=8 (EXCLUDE)\n"
 msgstr "查询状态=8 (客户端受到排斥)\n"
 
-#: fetchmail.c:829
+#: fetchmail.c:849
 msgid "Query status=9 (LOCKBUSY)\n"
 msgstr "查询状态=9 (服务器死锁)\n"
 
-#: fetchmail.c:831
+#: fetchmail.c:851
 msgid "Query status=10 (SMTP)\n"
 msgstr "查询状态=10 (SMTP 错误)\n"
 
-#: fetchmail.c:833
+#: fetchmail.c:853
 msgid "Query status=11 (DNS)\n"
 msgstr "查询状态=11 (DNS 错误)\n"
 
-#: fetchmail.c:835
+#: fetchmail.c:855
 msgid "Query status=12 (BSMTP)\n"
 msgstr "查询状态=12 (无法打开批量输出)\n"
 
-#: fetchmail.c:837
+#: fetchmail.c:857
 msgid "Query status=13 (MAXFETCH)\n"
 msgstr "查询状态=13 (到达收件上限)\n"
 
-#: fetchmail.c:839
+#: fetchmail.c:859
 #, c-format
 msgid "Query status=%d\n"
 msgstr "查询状态=%d\n"
 
-#: fetchmail.c:881
+#: fetchmail.c:901
 msgid "All connections are wedged.  Exiting.\n"
 msgstr "所有连接堵塞。退出\n"
 
-#: fetchmail.c:889
+#: fetchmail.c:909
 #, c-format
 msgid "sleeping at %s for %d seconds\n"
 msgstr "在 %s 休眠 %d 秒\n"
 
-#: fetchmail.c:913
+#: fetchmail.c:933
 #, c-format
 msgid "awakened by %s\n"
 msgstr "通过信号 %s 唤醒\n"
 
-#: fetchmail.c:916
+#: fetchmail.c:936
 #, c-format
 msgid "awakened by signal %d\n"
 msgstr "通过信号 %d 唤醒\n"
 
-#: fetchmail.c:924
+#: fetchmail.c:944
 #, c-format
 msgid "awakened at %s\n"
 msgstr "在 %s 被唤醒\n"
 
-#: fetchmail.c:929
+#: fetchmail.c:949
 #, c-format
 msgid "normal termination, status %d\n"
 msgstr "正常结束，返回值 %d\n"
 
-#: fetchmail.c:1090
+#: fetchmail.c:1113
 msgid "couldn't time-check the run-control file\n"
-msgstr "不能检查 run-control 文件的时间\n"
+msgstr "无法对 run-control 文件进行时限检测\n"
 
-#: fetchmail.c:1124
+#: fetchmail.c:1147
 #, c-format
 msgid "Warning: multiple mentions of host %s in config file\n"
 msgstr "警告: 在配置文件中多次提及主机 %s\n"
@@ -912,674 +912,674 @@
 msgid "fetchmail: Error: multiple \"defaults\" records in config file.\n"
 msgstr "fetchmail: 错误: 在配置文件中有多个 “default” 记录。\n"
 
-#: fetchmail.c:1285
+#: fetchmail.c:1316
 msgid "SSL support is not compiled in.\n"
-msgstr "SSL 支持未编译在内\n"
+msgstr "SSL 支持未编译在内。\n"
 
-#: fetchmail.c:1292
+#: fetchmail.c:1323
 msgid "KERBEROS v4 support is configured, but not compiled in.\n"
-msgstr "设置了 KERBEROS v4 支持，但未编译在内\n"
+msgstr "配置了 KERBEROS v4 支持，但该功能未编译在内。\n"
 
-#: fetchmail.c:1298
+#: fetchmail.c:1329
 msgid "KERBEROS v5 support is configured, but not compiled in.\n"
-msgstr "设置了 KERBEROS v5 支持，但未编译在内\n"
+msgstr "配置了 KERBEROS v5 支持，但该功能未编译在内。\n"
 
-#: fetchmail.c:1304
+#: fetchmail.c:1335
 msgid "GSSAPI support is configured, but not compiled in.\n"
-msgstr "设置了 GSSAPI 支持，但未编译在内\n"
+msgstr "配置了 GSSAPI 支持，但该功能未编译在内。\n"
 
-#: fetchmail.c:1334
+#: fetchmail.c:1365
 #, c-format
 msgid ""
 "fetchmail: warning: no DNS available to check multidrop fetches from %s\n"
 msgstr "fetchmail: 警告: 无可用的 DNS 来检查取自 %s 的多投邮件\n"
 
-#: fetchmail.c:1345
+#: fetchmail.c:1376
 #, c-format
 msgid "warning: multidrop for %s requires envelope option!\n"
 msgstr "警告: %s 设置了多投邮件，需设置 envelope 选项！\n"
 
-#: fetchmail.c:1346
+#: fetchmail.c:1377
 msgid "warning: Do not ask for support if all mail goes to postmaster!\n"
 msgstr "警告: 如果所有邮件均被邮件管理员收取，不要寻求支持！\n"
 
-#: fetchmail.c:1363
+#: fetchmail.c:1394
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, specify positive port number for "
 "service or port\n"
 msgstr "fetchmail: %s 配置无效，为服务或端口指定大于零的端口\n"
 
-#: fetchmail.c:1370
+#: fetchmail.c:1401
 #, c-format
 msgid ""
 "fetchmail: %s configuration invalid, RPOP requires a privileged port\n"
 msgstr "fetchmail: %s 配置无效，RPOP 要求开放一个特许端口\n"
 
-#: fetchmail.c:1388
+#: fetchmail.c:1419
 #, c-format
 msgid "%s configuration invalid, LMTP can't use default SMTP port\n"
 msgstr "%s 配置无效，LMTP 不能用默认的 SMTP 端口\n"
 
-#: fetchmail.c:1402
+#: fetchmail.c:1433
 msgid "Both fetchall and keep on in daemon or idle mode is a mistake!\n"
 msgstr "收取所有邮件并保留服务器上的备份或使用 idle 模式是错误的！\n"
 
-#: fetchmail.c:1436
+#: fetchmail.c:1467
 #, c-format
 msgid "terminated with signal %d\n"
 msgstr "以信号 %d 终止\n"
 
-#: fetchmail.c:1509
+#: fetchmail.c:1540
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll started\n"
 msgstr "%1$s 在 %4$s 查寻 %2$s (协议 %3$s): 收件开始\n"
 
-#: fetchmail.c:1534
+#: fetchmail.c:1565
 msgid "POP2 support is not configured.\n"
 msgstr "未设置 POP2 支持\n"
 
-#: fetchmail.c:1546
+#: fetchmail.c:1577
 msgid "POP3 support is not configured.\n"
 msgstr "未设置 POP3 支持\n"
 
-#: fetchmail.c:1556
+#: fetchmail.c:1587
 msgid "IMAP support is not configured.\n"
 msgstr "未设置 IMAP 支持\n"
 
-#: fetchmail.c:1562
+#: fetchmail.c:1593
 msgid "ETRN support is not configured.\n"
 msgstr "未设置 ETRN 支持\n"
 
-#: fetchmail.c:1570
+#: fetchmail.c:1601
 msgid "ODMR support is not configured.\n"
 msgstr "未设置 ODMR 支持\n"
 
-#: fetchmail.c:1577
+#: fetchmail.c:1608
 msgid "unsupported protocol selected.\n"
 msgstr "选中了不支持的协议\n"
 
-#: fetchmail.c:1588
+#: fetchmail.c:1619
 #, c-format
 msgid "%s querying %s (protocol %s) at %s: poll completed\n"
 msgstr "%1$s 在 %4$s 查询 %2$s (协议 %3$s): 收件完成\n"
 
-#: fetchmail.c:1613
+#: fetchmail.c:1644
 #, c-format
 msgid "Poll interval is %d seconds\n"
 msgstr "收件间隔 %d 秒\n"
 
-#: fetchmail.c:1615
+#: fetchmail.c:1646
 #, c-format
 msgid "Logfile is %s\n"
 msgstr "日志文件为 %s\n"
 
-#: fetchmail.c:1617
+#: fetchmail.c:1648
 #, c-format
 msgid "Idfile is %s\n"
 msgstr "Idfile 文件为 %s\n"
 
-#: fetchmail.c:1620
+#: fetchmail.c:1651
 msgid "Progress messages will be logged via syslog\n"
 msgstr "邮件情况将通过 syslog 来记录\n"
 
-#: fetchmail.c:1623
+#: fetchmail.c:1654
 msgid "Fetchmail will masquerade and will not generate Received\n"
 msgstr "Fetchmail 将进行伪装且不会生成 Receiverd 部分\n"
 
-#: fetchmail.c:1625
+#: fetchmail.c:1656
 msgid "Fetchmail will show progress dots even in logfiles.\n"
 msgstr "Fetchmail 将在日志文件中显示进度条(以点的形式)\n"
 
-#: fetchmail.c:1627
+#: fetchmail.c:1658
 #, c-format
 msgid "Fetchmail will forward misaddressed multidrop messages to %s.\n"
 msgstr "Fetchmail 将转发地址错误的多投邮件给 %s。\n"
 
-#: fetchmail.c:1631
+#: fetchmail.c:1662
 msgid "Fetchmail will direct error mail to the postmaster.\n"
 msgstr "Fetchmail 将把错误邮件转给邮件管理员\n"
 
-#: fetchmail.c:1633
+#: fetchmail.c:1664
 msgid "Fetchmail will direct error mail to the sender.\n"
 msgstr "Fetchmail 将把错误邮件退给发送者\n"
 
-#: fetchmail.c:1636
+#: fetchmail.c:1667
 msgid "Fetchmail will treat permanent errors as permanent (drop messages).\n"
 msgstr "Fetchmail 将把长期错误当成不可恢复的错误(删除邮件)。\n"
 
-#: fetchmail.c:1638
+#: fetchmail.c:1669
 msgid "Fetchmail will treat permanent errors as temporary (keep messages).\n"
 msgstr "Fetchmail 将把惯性错误当成临时问题(保留邮件)。\n"
 
-#: fetchmail.c:1645
+#: fetchmail.c:1676
 #, c-format
 msgid "Options for retrieving from %s@%s:\n"
 msgstr "从 %s@%s 收件时的选项:\n"
 
-#: fetchmail.c:1649
+#: fetchmail.c:1680
 #, c-format
 msgid "  Mail will be retrieved via %s\n"
 msgstr "  邮件将通过 %s 收取\n"
 
-#: fetchmail.c:1652
+#: fetchmail.c:1683
 #, c-format
 msgid "  Poll of this server will occur every %d interval.\n"
 msgid_plural "  Poll of this server will occur every %d intervals.\n"
 msgstr[0] "  每隔 %d 秒将收取此服务器中的邮件\n"
 
-#: fetchmail.c:1656
+#: fetchmail.c:1687
 #, c-format
 msgid "  True name of server is %s.\n"
 msgstr "  服务器的实名为 %s。\n"
 
-#: fetchmail.c:1659
+#: fetchmail.c:1690
 msgid "  This host will not be queried when no host is specified.\n"
 msgstr "  若不指明主机将不查询此主机\n"
 
-#: fetchmail.c:1660
+#: fetchmail.c:1691
 msgid "  This host will be queried when no host is specified.\n"
 msgstr "  若不指明主机将查询此主机\n"
 
-#: fetchmail.c:1664
+#: fetchmail.c:1695
 msgid "  Password will be prompted for.\n"
 msgstr "  密码会被提示\n"
 
-#: fetchmail.c:1668
+#: fetchmail.c:1699
 #, c-format
 msgid "  APOP secret = \"%s\".\n"
 msgstr "  APOP 密码 = “%s”\n"
 
-#: fetchmail.c:1671
+#: fetchmail.c:1702
 #, c-format
 msgid "  RPOP id = \"%s\".\n"
 msgstr "  RPOP 密码 = “%s”\n"
 
-#: fetchmail.c:1674
+#: fetchmail.c:1705
 #, c-format
 msgid "  Password = \"%s\".\n"
 msgstr "  密码 = “%s”\n"
 
-#: fetchmail.c:1683
+#: fetchmail.c:1714
 #, c-format
 msgid "  Protocol is KPOP with Kerberos %s authentication"
 msgstr "  协议是带有 Kerberos %s 认证协议的 KPOP"
 
-#: fetchmail.c:1686
+#: fetchmail.c:1717
 #, c-format
 msgid "  Protocol is %s"
 msgstr "  协议是 %s"
 
-#: fetchmail.c:1688
+#: fetchmail.c:1719
 #, c-format
 msgid " (using service %s)"
 msgstr " (正在使用服务 %s)"
 
-#: fetchmail.c:1690
+#: fetchmail.c:1721
 msgid " (using default port)"
 msgstr " (正在使用默认端口)"
 
-#: fetchmail.c:1692
+#: fetchmail.c:1723
 msgid " (forcing UIDL use)"
 msgstr " (正在强制使用 UIDL)"
 
-#: fetchmail.c:1698
+#: fetchmail.c:1729
 msgid "  All available authentication methods will be tried.\n"
 msgstr "  将尝试所有有效的验证方式\n"
 
-#: fetchmail.c:1701
+#: fetchmail.c:1732
 msgid "  Password authentication will be forced.\n"
 msgstr "  强制密码验证\n"
 
-#: fetchmail.c:1704
+#: fetchmail.c:1735
 msgid "  MSN authentication will be forced.\n"
 msgstr "  强制 MSN 验证\n"
 
-#: fetchmail.c:1707
+#: fetchmail.c:1738
 msgid "  NTLM authentication will be forced.\n"
 msgstr "  强制 NTLM 验证\n"
 
-#: fetchmail.c:1710
+#: fetchmail.c:1741
 msgid "  OTP authentication will be forced.\n"
 msgstr "  强制 OTP 验证\n"
 
-#: fetchmail.c:1713
+#: fetchmail.c:1744
 msgid "  CRAM-MD5 authentication will be forced.\n"
 msgstr "  强制 CRAM-MD5 验证\n"
 
-#: fetchmail.c:1716
+#: fetchmail.c:1747
 msgid "  GSSAPI authentication will be forced.\n"
 msgstr "  强制 GSSAPI 验证\n"
 
-#: fetchmail.c:1719
+#: fetchmail.c:1750
 msgid "  Kerberos V4 authentication will be forced.\n"
 msgstr "  强制 Kerberos V4 验证\n"
 
-#: fetchmail.c:1722
+#: fetchmail.c:1753
 msgid "  Kerberos V5 authentication will be forced.\n"
 msgstr "  强制 Kerberos V5 验证\n"
 
-#: fetchmail.c:1725
+#: fetchmail.c:1756
 msgid "  End-to-end encryption assumed.\n"
 msgstr "  假设为终端到终端加密\n"
 
-#: fetchmail.c:1729
+#: fetchmail.c:1760
 #, c-format
 msgid "  Mail service principal is: %s\n"
 msgstr "  邮件服务协议验证方为: %s\n"
 
-#: fetchmail.c:1732
+#: fetchmail.c:1763
 msgid "  SSL encrypted sessions enabled.\n"
 msgstr "  启用 SSL 加密会话\n"
 
-#: fetchmail.c:1734
+#: fetchmail.c:1765
 #, c-format
 msgid "  SSL protocol: %s.\n"
 msgstr "  SSL 协议: %s\n"
 
-#: fetchmail.c:1736
+#: fetchmail.c:1767
 msgid "  SSL server certificate checking enabled.\n"
-msgstr "  启用 SSL 服务器证书检查\n"
+msgstr "  已启用 SSL 服务器证书检查。\n"
 
-#: fetchmail.c:1741
+#: fetchmail.c:1772
 #, c-format
 msgid "  SSL trusted certificate file: %s\n"
 msgstr "  SSL 受信证书文件: %s\n"
 
-#: fetchmail.c:1743
+#: fetchmail.c:1774
 #, c-format
 msgid "  SSL trusted certificate directory: %s\n"
 msgstr "  SSL 受信证书目录: %s\n"
 
-#: fetchmail.c:1745
+#: fetchmail.c:1776
 #, c-format
 msgid "  SSL server CommonName: %s\n"
 msgstr "  SSL 服务器名: %s\n"
 
-#: fetchmail.c:1747
+#: fetchmail.c:1778
 #, c-format
 msgid "  SSL key fingerprint (checked against the server key): %s\n"
 msgstr "  SSL 密钥指纹 (与服务器密钥对比过): %s\n"
 
-#: fetchmail.c:1750
+#: fetchmail.c:1781
 #, c-format
 msgid "  Server nonresponse timeout is %d seconds"
 msgstr "  服务器未响应，超时 %d 秒"
 
-#: fetchmail.c:1752
+#: fetchmail.c:1783
 msgid " (default).\n"
 msgstr " (默认)。\n"
 
-#: fetchmail.c:1759
+#: fetchmail.c:1790
 msgid "  Default mailbox selected.\n"
 msgstr "  已选中默认邮箱。\n"
 
-#: fetchmail.c:1764
+#: fetchmail.c:1795
 msgid "  Selected mailboxes are:"
 msgstr "  选中的邮箱是:"
 
-#: fetchmail.c:1770
+#: fetchmail.c:1801
 msgid "  All messages will be retrieved (--all on).\n"
 msgstr "  收取所有邮件( --all 选项开启).\n"
 
-#: fetchmail.c:1771
+#: fetchmail.c:1802
 msgid "  Only new messages will be retrieved (--all off).\n"
 msgstr "  只收取新邮件( --all 选项关闭).\n"
 
-#: fetchmail.c:1773
+#: fetchmail.c:1804
 msgid "  Fetched messages will be kept on the server (--keep on).\n"
 msgstr "  收取的邮件会在服务器上保留副本( --keep 开启).\n"
 
-#: fetchmail.c:1774
+#: fetchmail.c:1805
 msgid "  Fetched messages will not be kept on the server (--keep off).\n"
 msgstr "  收取的邮件不会保留在服务器上( --keep 关闭).\n"
 
-#: fetchmail.c:1776
+#: fetchmail.c:1807
 msgid ""
 "  Old messages will be flushed before message retrieval (--flush on).\n"
 msgstr "  在收取新邮件前删除旧邮件(--flush 开启).\n"
 
-#: fetchmail.c:1777
+#: fetchmail.c:1808
 msgid ""
 "  Old messages will not be flushed before message retrieval (--flush off).\n"
 msgstr "  在收取新邮件前不删除旧邮件(--flush 关闭).\n"
 
-#: fetchmail.c:1779
+#: fetchmail.c:1810
 msgid ""
 "  Oversized messages will be flushed before message retrieval (--limitflush "
 "on).\n"
 msgstr "  收件前将删除超大的邮件(--limitflush 开启).\n"
 
-#: fetchmail.c:1780
+#: fetchmail.c:1811
 msgid ""
 "  Oversized messages will not be flushed before message retrieval (--"
 "limitflush off).\n"
 msgstr "  收件前将不删除超大的邮件(--limitflush 关闭).\n"
 
-#: fetchmail.c:1782
+#: fetchmail.c:1813
 msgid "  Rewrite of server-local addresses is enabled (--norewrite off).\n"
 msgstr "  本地收件人地址重写(--norewrite 关闭).\n"
 
-#: fetchmail.c:1783
+#: fetchmail.c:1814
 msgid "  Rewrite of server-local addresses is disabled (--norewrite on).\n"
 msgstr "  不重写本地收件人地址(--norewrite 开启).\n"
 
-#: fetchmail.c:1785
+#: fetchmail.c:1816
 msgid "  Carriage-return stripping is enabled (stripcr on).\n"
 msgstr "  回车符清除(stripcr 开启).\n"
 
-#: fetchmail.c:1786
+#: fetchmail.c:1817
 msgid "  Carriage-return stripping is disabled (stripcr off).\n"
 msgstr "  不清除回车符(stripcr 关闭).\n"
 
-#: fetchmail.c:1788
+#: fetchmail.c:1819
 msgid "  Carriage-return forcing is enabled (forcecr on).\n"
 msgstr "  强行在换行前插入回车符(forcecr 开启).\n"
 
-#: fetchmail.c:1789
+#: fetchmail.c:1820
 msgid "  Carriage-return forcing is disabled (forcecr off).\n"
 msgstr "  不在换行前强行插入回车符(forcecr 关闭).\n"
 
-#: fetchmail.c:1791
+#: fetchmail.c:1822
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is disabled (pass8bits on).\n"
 msgstr "  忽略 Content-Transfer-Encoding (pass8bits 开启).\n"
 
-#: fetchmail.c:1792
+#: fetchmail.c:1823
 msgid ""
 "  Interpretation of Content-Transfer-Encoding is enabled (pass8bits off).\n"
 msgstr "  不忽略 Content-Transfer-Encoding (pass8bits 关闭).\n"
 
-#: fetchmail.c:1794
+#: fetchmail.c:1825
 msgid "  MIME decoding is enabled (mimedecode on).\n"
 msgstr "  解开 MIME 编码 (mimedecode 开启).\n"
 
-#: fetchmail.c:1795
+#: fetchmail.c:1826
 msgid "  MIME decoding is disabled (mimedecode off).\n"
 msgstr "  不解开 MIME 编码 (mimedecode 关闭).\n"
 
-#: fetchmail.c:1797
+#: fetchmail.c:1828
 msgid "  Idle after poll is enabled (idle on).\n"
 msgstr "  收件后回到 idle 模式 (idle 开启).\n"
 
-#: fetchmail.c:1798
+#: fetchmail.c:1829
 msgid "  Idle after poll is disabled (idle off).\n"
 msgstr "  收件后不回到 idle 模式 (idle 关闭).\n"
 
-#: fetchmail.c:1800
+#: fetchmail.c:1831
 msgid "  Nonempty Status lines will be discarded (dropstatus on)\n"
 msgstr "  删除带有 Status 字样的行 (dropstatus 开启)\n"
 
-#: fetchmail.c:1801
+#: fetchmail.c:1832
 msgid "  Nonempty Status lines will be kept (dropstatus off)\n"
 msgstr "  保留带有 Status 字样的 行 (dropstatus 关闭)\n"
 
-#: fetchmail.c:1803
+#: fetchmail.c:1834
 msgid "  Delivered-To lines will be discarded (dropdelivered on)\n"
 msgstr "  删除带有 Delivered-to 的行 (dropdelivered 开启)\n"
 
-#: fetchmail.c:1804
+#: fetchmail.c:1835
 msgid "  Delivered-To lines will be kept (dropdelivered off)\n"
 msgstr "  保留带有 Delivered-to 的行 (dropdelivered 关闭)\n"
 
-#: fetchmail.c:1808
+#: fetchmail.c:1839
 #, c-format
 msgid "  Message size limit is %d octets (--limit %d).\n"
 msgstr "  邮件大小被限制为 %d 字节 (--limit %d).\n"
 
-#: fetchmail.c:1811
+#: fetchmail.c:1842
 msgid "  No message size limit (--limit 0).\n"
 msgstr "  邮件大小无限制 (--limit 0).\n"
 
-#: fetchmail.c:1813
+#: fetchmail.c:1844
 #, c-format
 msgid "  Message size warning interval is %d seconds (--warnings %d).\n"
 msgstr "  每隔 %d 秒发出邮件大小警告 (--warnings %d).\n"
 
-#: fetchmail.c:1816
+#: fetchmail.c:1847
 msgid "  Size warnings on every poll (--warnings 0).\n"
 msgstr "  每次收件都给出邮件大小警告 (--warnings 0).\n"
 
-#: fetchmail.c:1819
+#: fetchmail.c:1850
 #, c-format
 msgid "  Received-message limit is %d (--fetchlimit %d).\n"
 msgstr "  单次收件限制为 %d 封(--fetchlimit %d).\n"
 
-#: fetchmail.c:1822
+#: fetchmail.c:1853
 msgid "  No received-message limit (--fetchlimit 0).\n"
 msgstr "  无收件限制 (--fetchlimit 0).\n"
 
-#: fetchmail.c:1824
+#: fetchmail.c:1855
 #, c-format
 msgid "  Fetch message size limit is %d (--fetchsizelimit %d).\n"
 msgstr "  限制所收邮件大小为 %d 字节(--fetchsizelimit %d).\n"
 
-#: fetchmail.c:1827
+#: fetchmail.c:1858
 msgid "  No fetch message size limit (--fetchsizelimit 0).\n"
 msgstr "  所收邮件大小无限制 (--fetchsizelimit 0).\n"
 
-#: fetchmail.c:1831
+#: fetchmail.c:1862
 msgid "  Do binary search of UIDs during each poll (--fastuidl 1).\n"
 msgstr "  每次收件期间对 UIDs 进行折半查找 (--fastuidl 1).\n"
 
-#: fetchmail.c:1833
+#: fetchmail.c:1864
 #, c-format
 msgid ""
 "  Do binary search of UIDs during %d out of %d polls (--fastuidl %d).\n"
 msgstr "  每 %2$d 次收件中有 %1$d 次对 UIDs 进行折半查找 (--fastuidl %3$d).\n"
 
-#: fetchmail.c:1836
+#: fetchmail.c:1867
 msgid "   Do linear search of UIDs during each poll (--fastuidl 0).\n"
 msgstr "   每次收件期间对 UIDs 进行线性查找 (--fastuidl 0).\n"
 
-#: fetchmail.c:1838
+#: fetchmail.c:1869
 #, c-format
 msgid "  SMTP message batch limit is %d.\n"
 msgstr "  单次 SMTP 会话中最多传送 %d 封邮件。\n"
 
-#: fetchmail.c:1840
+#: fetchmail.c:1871
 msgid "  No SMTP message batch limit (--batchlimit 0).\n"
 msgstr "  单次 SMTP 会话中无传送邮件限制 (--batchlimit 0)。\n"
 
-#: fetchmail.c:1844
+#: fetchmail.c:1875
 #, c-format
 msgid "  Deletion interval between expunges forced to %d (--expunge %d).\n"
 msgstr "  两次删除操作之间最多传送 %d 封邮件(--expunge %d)。\n"
 
-#: fetchmail.c:1846
+#: fetchmail.c:1877
 msgid "  No forced expunges (--expunge 0).\n"
 msgstr "  两次删除操作之间无传送邮件限制(--expunge 0)。\n"
 
-#: fetchmail.c:1853
+#: fetchmail.c:1884
 msgid "  Domains for which mail will be fetched are:"
 msgstr "  要收取的邮件位于服务器:"
 
-#: fetchmail.c:1858 fetchmail.c:1878
+#: fetchmail.c:1889 fetchmail.c:1909
 msgid " (default)"
 msgstr " (默认)"
 
-#: fetchmail.c:1863
+#: fetchmail.c:1894
 #, c-format
 msgid "  Messages will be appended to %s as BSMTP\n"
 msgstr "  邮件作为 BSMTP 附加至 %s\n"
 
-#: fetchmail.c:1865
+#: fetchmail.c:1896
 #, c-format
 msgid "  Messages will be delivered with \"%s\".\n"
 msgstr "  邮件通过 “%s” 投递。\n"
 
-#: fetchmail.c:1872
+#: fetchmail.c:1903
 #, c-format
 msgid "  Messages will be %cMTP-forwarded to:"
 msgstr "  邮件将被 %cMPT 转发到:"
 
-#: fetchmail.c:1883
+#: fetchmail.c:1914
 #, c-format
 msgid "  Host part of MAIL FROM line will be %s\n"
 msgstr "  MAIL FROM 这一行的 Host 部分是 %s\n"
 
-#: fetchmail.c:1886
+#: fetchmail.c:1917
 #, c-format
 msgid "  Address to be put in RCPT TO lines shipped to SMTP will be %s\n"
 msgstr "  RCPT TO 这一行中将要被送往 SMTP 的地址是　%s\n"
 
-#: fetchmail.c:1895
+#: fetchmail.c:1926
 msgid "  Recognized listener spam block responses are:"
 msgstr "  识别出的监听端垃圾邮件拒收响应为:"
 
 # fetchmail.c:1809
-#: fetchmail.c:1901
+#: fetchmail.c:1932
 msgid "  Spam-blocking disabled\n"
 msgstr "  关闭垃圾邮件拒收\n"
 
-#: fetchmail.c:1904
+#: fetchmail.c:1935
 #, c-format
 msgid "  Server connection will be brought up with \"%s\".\n"
 msgstr "  服务器连接将被 “%s” 唤起\n"
 
-#: fetchmail.c:1907
+#: fetchmail.c:1938
 msgid "  No pre-connection command.\n"
 msgstr "  无连接前要执行的程序。\n"
 
-#: fetchmail.c:1909
+#: fetchmail.c:1940
 #, c-format
 msgid "  Server connection will be taken down with \"%s\".\n"
 msgstr "  服务器连接将被 “%s” 关闭。\n"
 
-#: fetchmail.c:1912
+#: fetchmail.c:1943
 msgid "  No post-connection command.\n"
 msgstr "  无连接后要执行的程序。\n"
 
-#: fetchmail.c:1915
+#: fetchmail.c:1946
 msgid "  No localnames declared for this host.\n"
 msgstr "  此服务器没有要关联的本地用户名。\n"
 
-#: fetchmail.c:1925
+#: fetchmail.c:1956
 msgid "  Multi-drop mode: "
 msgstr "  多投模式: "
 
-#: fetchmail.c:1927
+#: fetchmail.c:1958
 msgid "  Single-drop mode: "
 msgstr "  单投模式: "
 
-#: fetchmail.c:1929
+#: fetchmail.c:1960
 #, c-format
 msgid "%d local name recognized.\n"
 msgid_plural "%d local names recognized.\n"
 msgstr[0] "识别出 %d 个本地用户名。\n"
 
-#: fetchmail.c:1944
+#: fetchmail.c:1975
 msgid "  DNS lookup for multidrop addresses is enabled.\n"
 msgstr "  启用 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1945
+#: fetchmail.c:1976
 msgid "  DNS lookup for multidrop addresses is disabled.\n"
 msgstr "  关闭 DNS 搜寻多投地址。\n"
 
-#: fetchmail.c:1949
+#: fetchmail.c:1980
 msgid ""
 "  Server aliases will be compared with multidrop addresses by IP address.\n"
 msgstr "  服务器昵称将以 IP 地址与多投地址进行比较\n"
 
-#: fetchmail.c:1951
+#: fetchmail.c:1982
 msgid "  Server aliases will be compared with multidrop addresses by name.\n"
 msgstr "  服务器昵称将以名字与多投地址进行比较\n"
 
-#: fetchmail.c:1954
+#: fetchmail.c:1985
 msgid "  Envelope-address routing is disabled\n"
 msgstr "  禁用 Envelope-address 路由\n"
 
-#: fetchmail.c:1957
+#: fetchmail.c:1988
 #, c-format
 msgid "  Envelope header is assumed to be: %s\n"
 msgstr "  邮件头假定为: %s\n"
 
-#: fetchmail.c:1960
+#: fetchmail.c:1991
 #, c-format
 msgid "  Number of envelope headers to be skipped over: %d\n"
 msgstr "  跳过的邮件头数目为: %d\n"
 
-#: fetchmail.c:1963
+#: fetchmail.c:1994
 #, c-format
 msgid "  Prefix %s will be removed from user id\n"
 msgstr "  将从用户 id 中移除前缀 %s\n"
 
-#: fetchmail.c:1966
+#: fetchmail.c:1997
 msgid "  No prefix stripping\n"
 msgstr "  没有要从用户 id 中清除的前缀\n"
 
-#: fetchmail.c:1971
+#: fetchmail.c:2002
 msgid "  Predeclared mailserver aliases:"
 msgstr "  预先声明的邮件服务器昵称:"
 
-#: fetchmail.c:1979
+#: fetchmail.c:2010
 msgid "  Local domains:"
 msgstr "  本地域:"
 
-#: fetchmail.c:1989
+#: fetchmail.c:2020
 #, c-format
 msgid "  Connection must be through interface %s.\n"
 msgstr "  必须通过地址 %s 连接\n"
 
-#: fetchmail.c:1991
+#: fetchmail.c:2022
 msgid "  No interface requirement specified.\n"
 msgstr "  未指定地址要求。\n"
 
-#: fetchmail.c:1993
+#: fetchmail.c:2024
 #, c-format
 msgid "  Polling loop will monitor %s.\n"
 msgstr "  收件轮循将监听 %s。\n"
 
-#: fetchmail.c:1995
+#: fetchmail.c:2026
 msgid "  No monitor interface specified.\n"
 msgstr "  未指定监听地址。\n"
 
-#: fetchmail.c:1999
+#: fetchmail.c:2030
 #, c-format
 msgid "  Server connections will be made via plugin %s (--plugin %s).\n"
 msgstr "  通过外部程序 %s 进行服务器连接 (--plugin %s)。\n"
 
-#: fetchmail.c:2001
+#: fetchmail.c:2032
 msgid "  No plugin command specified.\n"
 msgstr "  未指定外部程序。\n"
 
-#: fetchmail.c:2003
+#: fetchmail.c:2034
 #, c-format
 msgid "  Listener connections will be made via plugout %s (--plugout %s).\n"
 msgstr "  通过外部程序 %s 进行 SMTP 连接(--plugout %s)。\n"
 
-#: fetchmail.c:2005
+#: fetchmail.c:2036
 msgid "  No plugout command specified.\n"
 msgstr "  未指定外部程序。\n"
 
-#: fetchmail.c:2012
+#: fetchmail.c:2043
 msgid "  No UIDs saved from this host.\n"
 msgstr "  未从此主机上保存 UIDs。\n"
 
-#: fetchmail.c:2015
+#: fetchmail.c:2046
 #, c-format
 msgid "  %d UIDs saved.\n"
 msgstr "  保存了 %d 个UIDs。\n"
 
-#: fetchmail.c:2021
+#: fetchmail.c:2052
 msgid "  Poll trace information will be added to the Received header.\n"
 msgstr "  收件跟踪信息将被加入 Received 邮件头。\n"
 
-#: fetchmail.c:2023
+#: fetchmail.c:2054
 msgid "  No poll trace information will be added to the Received header.\n"
 msgstr ""
 "  无收件跟踪信息要被加入 Received 邮件头。\n"
 "。\n"
 
-#: fetchmail.c:2028
+#: fetchmail.c:2059
 msgid "  Messages with bad headers will be rejected.\n"
 msgstr "  邮件头错误的邮件将被拒收。\n"
 
-#: fetchmail.c:2031
+#: fetchmail.c:2062
 msgid "  Messages with bad headers will be passed on.\n"
 msgstr "  邮件头错误的邮件可以接收。\n"
 
-#: fetchmail.c:2036
+#: fetchmail.c:2067
 #, c-format
 msgid "  Pass-through properties \"%s\".\n"
 msgstr "  传送的 properties 选项为 “%s” 。\n"
@@ -2391,45 +2391,45 @@
 msgid "Option --folder is not supported with POP3\n"
 msgstr "POP3 不支持 --folder 选项\n"
 
-#: rcfile_y.y:132
+#: rcfile_y.y:130
 msgid "server option after user options"
 msgstr "服务器选项在用户选项后"
 
-#: rcfile_y.y:175
+#: rcfile_y.y:173
 msgid "SDPS not enabled."
 msgstr "SDPS 不可用"
 
-#: rcfile_y.y:219
+#: rcfile_y.y:217
 msgid ""
 "fetchmail: interface option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr "fetchmail: interface 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
-#: rcfile_y.y:227
+#: rcfile_y.y:225
 msgid ""
 "fetchmail: monitor option is only supported under Linux (without IPv6) and "
 "FreeBSD\n"
 msgstr "fetchmail: monitor 选项只有 Linux(无 IPv6)和 FreeBSD 支持\n"
 
-#: rcfile_y.y:341
+#: rcfile_y.y:339
 msgid "SSL is not enabled"
 msgstr "SSL 不可用"
 
-#: rcfile_y.y:393
+#: rcfile_y.y:391
 msgid "end of input"
 msgstr "输入结束"
 
-#: rcfile_y.y:431
+#: rcfile_y.y:429
 #, c-format
 msgid "File %s must be a regular file.\n"
 msgstr "文件 %s 必须是个普通文件。\n"
 
-#: rcfile_y.y:441
+#: rcfile_y.y:439
 #, c-format
 msgid "File %s must have no more than -rwx------ (0700) permissions.\n"
 msgstr "文件 %s 不允许拥有高于 -rwx------ (0700) 的权限。\n"
 
-#: rcfile_y.y:453
+#: rcfile_y.y:451
 #, c-format
 msgid "File %s must be owned by you.\n"
 msgstr "文件 %s 必须归您所有。\n"
@@ -2810,80 +2810,80 @@
 msgid "smtp listener protocol error\n"
 msgstr "smtp 端协议错误\n"
 
-#: socket.c:111 socket.c:140
+#: socket.c:112 socket.c:141
 msgid "fetchmail: malloc failed\n"
 msgstr "fetchmail: malloc 失败\n"
 
-#: socket.c:172
+#: socket.c:173
 msgid "fetchmail: socketpair failed\n"
 msgstr "fetchmail: socketpair 失败\n"
 
-#: socket.c:178
+#: socket.c:179
 msgid "fetchmail: fork failed\n"
 msgstr "fetchmail: fork 失败\n"
 
-#: socket.c:185
+#: socket.c:186
 msgid "dup2 failed\n"
 msgstr "dup2 失败\n"
 
-#: socket.c:191
+#: socket.c:192
 #, c-format
 msgid "running %s (host %s service %s)\n"
 msgstr "正在运行 %s (主机 %s 服务 %s)\n"
 
-#: socket.c:196
+#: socket.c:197
 #, c-format
 msgid "execvp(%s) failed\n"
 msgstr "execvp(%s) 失败\n"
 
-#: socket.c:271
+#: socket.c:272
 #, c-format
 msgid "getaddrinfo(\"%s\",\"%s\") error: %s\n"
 msgstr "getaddrinfo(“%s”，“%s”) 错误: %s\n"
 
-#: socket.c:274
+#: socket.c:275
 msgid "Try adding the --service option (see also FAQ item R12).\n"
 msgstr "试着加入 --service 选项(参见 FAQ 条目 R12)。\n"
 
-#: socket.c:288 socket.c:291
+#: socket.c:289 socket.c:292
 #, c-format
 msgid "unknown (%s)"
 msgstr "未知 (%s)"
 
-#: socket.c:294
+#: socket.c:295
 #, c-format
 msgid "Trying to connect to %s/%s..."
 msgstr "正在尝试连接至 %s/%s..."
 
-#: socket.c:303
+#: socket.c:304
 #, c-format
 msgid "cannot create socket: %s\n"
 msgstr "无法创建套接字: %s\n"
 
-#: socket.c:305
+#: socket.c:306
 #, c-format
 msgid "name %d: cannot create socket family %d type %d: %s\n"
 msgstr "名称 %d: 无法创建套接字 %d 类型 %d: %s\n"
 
-#: socket.c:323
+#: socket.c:324
 msgid "connection failed.\n"
 msgstr "连接失败。\n"
 
-#: socket.c:325
+#: socket.c:326
 #, c-format
 msgid "connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:326
+#: socket.c:327
 #, c-format
 msgid "name %d: connection to %s:%s [%s/%s] failed: %s.\n"
 msgstr "名称 %d: 连接至 %s:%s [%s/%s] 失败: %s。\n"
 
-#: socket.c:332
+#: socket.c:333
 msgid "connected.\n"
 msgstr "已连接。\n"
 
-#: socket.c:345
+#: socket.c:346
 #, c-format
 msgid ""
 "Connection errors for this poll:\n"
@@ -2892,128 +2892,128 @@
 "此服务器连接错误:\n"
 "%s"
 
-#: socket.c:411
+#: socket.c:416
 #, c-format
 msgid "OpenSSL reported: %s\n"
-msgstr ""
+msgstr "OpenSSL 报告了：%s\n"
 
-#: socket.c:652
+#: socket.c:657
 msgid "Server certificate:\n"
 msgstr "服务器认证:\n"
 
-#: socket.c:657
+#: socket.c:662
 #, c-format
 msgid "Certificate chain, from root to peer, starting at depth %d:\n"
 msgstr "验证链从根到节点，在 %d 开始:\n"
 
-#: socket.c:660
+#: socket.c:665
 #, c-format
 msgid "Certificate at depth %d:\n"
 msgstr "验证处于 %d 层:\n"
 
-#: socket.c:666
+#: socket.c:671
 #, c-format
 msgid "Issuer Organization: %s\n"
 msgstr "发行组织: %s\n"
 
-#: socket.c:669
+#: socket.c:674
 msgid "Warning: Issuer Organization Name too long (possibly truncated).\n"
 msgstr "警告: 发行组织名字太长 (可能截短)。\n"
 
-#: socket.c:671
+#: socket.c:676
 msgid "Unknown Organization\n"
 msgstr "未知的组织\n"
 
-#: socket.c:673
+#: socket.c:678
 #, c-format
 msgid "Issuer CommonName: %s\n"
 msgstr "发行者: %s\n"
 
-#: socket.c:676
+#: socket.c:681
 msgid "Warning: Issuer CommonName too long (possibly truncated).\n"
 msgstr "警告: 发行者名称太长 (可能截短)。\n"
 
-#: socket.c:678
+#: socket.c:683
 msgid "Unknown Issuer CommonName\n"
 msgstr "未知的发行者名称\n"
 
-#: socket.c:684
+#: socket.c:689
 #, c-format
 msgid "Subject CommonName: %s\n"
 msgstr "邮件标题: %s\n"
 
-#: socket.c:690
+#: socket.c:695
 msgid "Bad certificate: Subject CommonName too long!\n"
 msgstr "证书错误: 邮件标题太长!\n"
 
-#: socket.c:696
+#: socket.c:701
 msgid "Bad certificate: Subject CommonName contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题名中带有 NUL 字符，退出！\n"
 
-#: socket.c:724
+#: socket.c:729
 #, c-format
 msgid "Subject Alternative Name: %s\n"
 msgstr "邮件标题别名: %s\n"
 
-#: socket.c:730
+#: socket.c:735
 msgid "Bad certificate: Subject Alternative Name contains NUL, aborting!\n"
 msgstr "证书错误: 邮件标题别名带有 NUL 字符，退出！\n"
 
-#: socket.c:747
+#: socket.c:752
 #, c-format
 msgid "Server CommonName mismatch: %s != %s\n"
 msgstr "服务器名不匹配: %s != %s\n"
 
-#: socket.c:754
+#: socket.c:759
 msgid "Server name not set, could not verify certificate!\n"
 msgstr "未设置服务器名称，无法验证证书！\n"
 
-#: socket.c:759
+#: socket.c:764
 msgid "Unknown Server CommonName\n"
 msgstr "未知的服务器名\n"
 
-#: socket.c:761
+#: socket.c:766
 msgid "Server name not specified in certificate!\n"
 msgstr "服务器名称未在证书中指定！\n"
 
-#: socket.c:773
+#: socket.c:778
 msgid "EVP_md5() failed!\n"
 msgstr "EVP_md5() 失败！\n"
 
-#: socket.c:777
+#: socket.c:782
 msgid "Out of memory!\n"
 msgstr "超出内存！\n"
 
-#: socket.c:785
+#: socket.c:790
 msgid "Digest text buffer too small!\n"
 msgstr "Digest 文本缓冲区太小！\n"
 
-#: socket.c:791
+#: socket.c:796
 #, c-format
 msgid "%s key fingerprint: %s\n"
 msgstr "%s 密钥指纹: %s\n"
 
-#: socket.c:795
+#: socket.c:800
 #, c-format
 msgid "%s fingerprints match.\n"
 msgstr "%s 指纹匹配。\n"
 
-#: socket.c:797
+#: socket.c:802
 #, c-format
 msgid "%s fingerprints do not match!\n"
 msgstr "%s 指纹不匹配！\n"
 
-#: socket.c:809
+#: socket.c:814
 #, c-format
 msgid "Server certificate verification error: %s\n"
-msgstr "服务器证书验证错误: %s\n"
+msgstr "服务器证书验证错误：%s\n"
 
-#: socket.c:824
+#: socket.c:829
 #, c-format
 msgid "Broken certification chain at: %s\n"
-msgstr ""
+msgstr "证书链错误，位于: %s\n"
 
-#: socket.c:826
+#: socket.c:831
 msgid ""
 "This could mean that the server did not provide the intermediate CA's "
 "certificate(s), which is nothing fetchmail could do anything about.  For "
@@ -3021,10 +3021,10 @@
 "fetchmail.\n"
 msgstr ""
 
-#: socket.c:836
+#: socket.c:841
 #, c-format
 msgid "Missing trust anchor certificate: %s\n"
-msgstr ""
+msgstr "缺失信任锚（trust anchor）证书：%s\n"
 
 #: socket.c:839
 msgid ""
@@ -3034,7 +3034,7 @@
 "sslcertfile in the manual page.\n"
 msgstr ""
 
-#: socket.c:1100
+#: socket.c:1106
 msgid "File descriptor out of range for SSL"
 msgstr "文件描述符超出 SSL 的范围"
 
@@ -3047,21 +3047,21 @@
 msgid "Invalid SSL protocol '%s' specified, using default (SSLv23).\n"
 msgstr "指定了无效的 SSL 协议 ‘%s’，将用默认的协议(SSLv23)代替。\n"
 
-#: socket.c:1274
+#: socket.c:1280
 msgid "Certificate/fingerprint verification was somehow skipped!\n"
-msgstr "证书(指纹)验证被不明原因地跳过！\n"
+msgstr "证书/指纹验证被不明原因地跳过！\n"
 
-#: socket.c:1291
+#: socket.c:1297
 msgid ""
 "Warning: the connection is insecure, continuing anyways. (Better use --"
 "sslcertck!)\n"
 msgstr "警告:此连接不安全，但会继续运行。(最好使用 --sslcertck！)\n"
 
-#: socket.c:1333
+#: socket.c:1339
 msgid "Cygwin socket read retry\n"
 msgstr "重试读取 Cygwin 接口\n"
 
-#: socket.c:1336
+#: socket.c:1342
 msgid "Cygwin socket read retry failed!\n"
 msgstr "重试读取 Cygwin 接口失败！\n"
 
@@ -3180,7 +3180,7 @@
 msgid "Old UID list from %s:"
 msgstr "来自 %s 的旧 UID 列表:"
 
-#: uid.c:266 uid.c:275 uid.c:343
+#: uid.c:277 uid.c:286 uid.c:355
 msgid " <empty>"
 msgstr " <空>"
 
@@ -3202,43 +3202,43 @@
 msgid "swapping UID lists\n"
 msgstr "正在转储 UID 列表\n"
 
-#: uid.c:390
+#: uid.c:402
 msgid "not swapping UID lists, no UIDs seen this query\n"
-msgstr "不转储 UID 列表，本次查寻无 UIDs 读取\n"
+msgstr "不转储 UID 列表，本次查询无 UIDs 读取\n"
 
-#: uid.c:410
+#: uid.c:422
 msgid "discarding new UID list\n"
 msgstr "正在撤消新的 UID 列表\n"
 
-#: uid.c:467
+#: uid.c:479
 msgid "Deleting fetchids file.\n"
-msgstr "正在删除 fetchids 文件\n"
+msgstr "正在删除 fetchids 文件。\n"
 
-#: uid.c:470
+#: uid.c:482
 #, c-format
 msgid "Error deleting %s: %s\n"
 msgstr "删除 %s 时出错: %s\n"
 
-#: uid.c:477
+#: uid.c:489
 msgid "Writing fetchids file.\n"
 msgstr "正在写入 fetchids 文件。\n"
 
-#: uid.c:491 uid.c:500
+#: uid.c:503 uid.c:512
 #, c-format
 msgid "Write error on fetchids file %s: %s\n"
 msgstr "将错误写入 fetchids 文件 %s: %s\n"
 
-#: uid.c:512
+#: uid.c:524
 #, c-format
 msgid "Error writing to fetchids file %s, old file left in place.\n"
 msgstr "写入 fetchids 文件 %s 时出错，存在旧文件。\n"
 
-#: uid.c:516
+#: uid.c:528
 #, c-format
 msgid "Cannot rename fetchids file %s to %s: %s\n"
 msgstr "无法将 fetchids 文件 %s 重命名为 %s: %s\n"
 
-#: uid.c:520
+#: uid.c:532
 #, c-format
 msgid "Cannot open fetchids file %s for writing: %s\n"
 msgstr "无法打开 fetchids 文件 %s 写入: %s\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/friendly-recovery.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/friendly-recovery.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/friendly-recovery.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/friendly-recovery.po	2020-07-08 13:54:02.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:45+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: \n"
 
 #: ../lib/recovery-mode/options/apt-snapshots:20
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gas.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gas.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gas.po	2020-01-23 16:51:54.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gas.po	2020-07-08 13:53:55.000000000 +0000
@@ -16,8 +16,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:37+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:34+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
@@ -181,7 +181,7 @@
 "\t\t\t  ELF .size directive check (default --size-check=error)\n"
 msgstr ""
 
-#: as.c:303
+#: as.c:302
 #, c-format
 msgid ""
 "  --elf-stt-common=[no|yes]\n"
@@ -432,7 +432,7 @@
 msgid "GNU assembler %s\n"
 msgstr "GNU 汇编器 %s\n"
 
-#: as.c:673
+#: as.c:659
 #, c-format
 msgid "Copyright (C) 2018 Free Software Foundation, Inc.\n"
 msgstr ""
@@ -1935,7 +1935,7 @@
 msgid "selected processor does not support `%s'"
 msgstr ""
 
-#: config/tc-aarch64.c:7544 config/tc-arm.c:27479
+#: config/tc-aarch64.c:7544 config/tc-arm.c:27481
 msgid "GOT already in the symbol table"
 msgstr ""
 
@@ -1961,8 +1961,8 @@
 msgid "immediate offset out of range"
 msgstr ""
 
-#: config/tc-aarch64.c:7953 config/tc-arm.c:27817 config/tc-arm.c:27885
-#: config/tc-arm.c:28167
+#: config/tc-aarch64.c:7953 config/tc-arm.c:27819 config/tc-arm.c:27887
+#: config/tc-arm.c:28169
 #, c-format
 msgid "undefined symbol %s used as an immediate value"
 msgstr ""
@@ -1983,7 +1983,7 @@
 msgid "conditional branch target not word aligned"
 msgstr ""
 
-#: config/tc-aarch64.c:7995 config/tc-aarch64.c:8010 config/tc-arm.c:28462
+#: config/tc-aarch64.c:7995 config/tc-aarch64.c:8010 config/tc-arm.c:28464
 msgid "conditional branch out of range"
 msgstr ""
 
@@ -1991,14 +1991,14 @@
 msgid "branch target not word aligned"
 msgstr ""
 
-#: config/tc-aarch64.c:8026 config/tc-arm.c:899 config/tc-arm.c:29265
+#: config/tc-aarch64.c:8026 config/tc-arm.c:899 config/tc-arm.c:29267
 #: config/tc-mips.c:16047 config/tc-mips.c:16063 config/tc-mips.c:16153
 msgid "branch out of range"
 msgstr ""
 
-#: config/tc-aarch64.c:8085 config/tc-arm.c:28058 config/tc-arm.c:28073
-#: config/tc-arm.c:28088 config/tc-arm.c:28099 config/tc-arm.c:28122
-#: config/tc-arm.c:28969 config/tc-moxie.c:716 config/tc-pj.c:452
+#: config/tc-aarch64.c:8085 config/tc-arm.c:28060 config/tc-arm.c:28075
+#: config/tc-arm.c:28090 config/tc-arm.c:28101 config/tc-arm.c:28124
+#: config/tc-arm.c:28971 config/tc-moxie.c:716 config/tc-pj.c:452
 #: config/tc-sh.c:3727
 msgid "offset out of range"
 msgstr ""
@@ -2016,7 +2016,7 @@
 msgid "unexpected %s fixup"
 msgstr ""
 
-#: config/tc-aarch64.c:8327 config/tc-arm.c:29685 config/tc-arm.c:29706
+#: config/tc-aarch64.c:8327 config/tc-arm.c:29687 config/tc-arm.c:29708
 #: config/tc-mips.c:18414 config/tc-or1k.c:345 config/tc-score.c:7468
 #, c-format
 msgid "cannot represent %s relocation in this object file format"
@@ -2027,16 +2027,16 @@
 msgid "cannot do %u-byte relocation"
 msgstr ""
 
-#: config/tc-aarch64.c:8683 config/tc-arm.c:30180 config/tc-score.c:6293
+#: config/tc-aarch64.c:8683 config/tc-arm.c:30182 config/tc-score.c:6293
 #: config/tc-score.c:6523 config/tc-score.c:6528
 msgid "virtual memory exhausted"
 msgstr ""
 
-#: config/tc-aarch64.c:8849 config/tc-arm.c:30523
+#: config/tc-aarch64.c:8849 config/tc-arm.c:30525
 msgid "assemble for big-endian"
 msgstr ""
 
-#: config/tc-aarch64.c:8850 config/tc-arm.c:30524
+#: config/tc-aarch64.c:8850 config/tc-arm.c:30526
 msgid "assemble for little-endian"
 msgstr ""
 
@@ -2052,41 +2052,41 @@
 msgid "do not output verbose error messages"
 msgstr ""
 
-#: config/tc-aarch64.c:9137 config/tc-arm.c:31607
+#: config/tc-aarch64.c:9137 config/tc-arm.c:31611
 msgid "invalid architectural extension"
 msgstr ""
 
-#: config/tc-aarch64.c:9162 config/tc-arm.c:31639
+#: config/tc-aarch64.c:9162 config/tc-arm.c:31643
 msgid "must specify extensions to add before specifying those to remove"
 msgstr ""
 
-#: config/tc-aarch64.c:9170 config/tc-arm.c:31647
+#: config/tc-aarch64.c:9170 config/tc-arm.c:31651
 msgid "missing architectural extension"
 msgstr ""
 
-#: config/tc-aarch64.c:9197 config/tc-arm.c:31733
+#: config/tc-aarch64.c:9197 config/tc-arm.c:31737
 #, c-format
 msgid "unknown architectural extension `%s'"
 msgstr ""
 
-#: config/tc-aarch64.c:9221 config/tc-arm.c:31783 config/tc-metag.c:5834
+#: config/tc-aarch64.c:9221 config/tc-arm.c:31787 config/tc-metag.c:5834
 #, c-format
 msgid "missing cpu name `%s'"
 msgstr ""
 
-#: config/tc-aarch64.c:9235 config/tc-aarch64.c:9452 config/tc-arm.c:31818
-#: config/tc-arm.c:32617 config/tc-csky.c:896 config/tc-metag.c:5845
+#: config/tc-aarch64.c:9235 config/tc-aarch64.c:9452 config/tc-arm.c:31822
+#: config/tc-arm.c:32621 config/tc-csky.c:896 config/tc-metag.c:5845
 #, c-format
 msgid "unknown cpu `%s'"
 msgstr ""
 
-#: config/tc-aarch64.c:9253 config/tc-arm.c:31836
+#: config/tc-aarch64.c:9253 config/tc-arm.c:31840
 #, c-format
 msgid "missing architecture name `%s'"
 msgstr ""
 
-#: config/tc-aarch64.c:9267 config/tc-aarch64.c:9499 config/tc-arm.c:31858
-#: config/tc-arm.c:32652 config/tc-arm.c:32682 config/tc-score.c:7703
+#: config/tc-aarch64.c:9267 config/tc-aarch64.c:9499 config/tc-arm.c:31862
+#: config/tc-arm.c:32656 config/tc-arm.c:32686 config/tc-score.c:7703
 #, c-format
 msgid "unknown architecture `%s'\n"
 msgstr ""
@@ -2105,16 +2105,16 @@
 msgid "<abi name>\t  specify for ABI <abi name>"
 msgstr ""
 
-#: config/tc-aarch64.c:9310 config/tc-arm.c:31945 config/tc-metag.c:5911
+#: config/tc-aarch64.c:9310 config/tc-arm.c:31949 config/tc-metag.c:5911
 msgid "<cpu name>\t  assemble for CPU <cpu name>"
 msgstr ""
 
-#: config/tc-aarch64.c:9312 config/tc-arm.c:31947
+#: config/tc-aarch64.c:9312 config/tc-arm.c:31951
 msgid "<arch name>\t  assemble for architecture <arch name>"
 msgstr ""
 
-#: config/tc-aarch64.c:9351 config/tc-aarch64.c:9371 config/tc-arm.c:32015
-#: config/tc-arm.c:32033 config/tc-arm.c:32053 config/tc-metag.c:5936
+#: config/tc-aarch64.c:9351 config/tc-aarch64.c:9371 config/tc-arm.c:32019
+#: config/tc-arm.c:32037 config/tc-arm.c:32057 config/tc-metag.c:5936
 #, c-format
 msgid "option `-%c%s' is deprecated: %s"
 msgstr ""
@@ -2124,12 +2124,12 @@
 msgid " AArch64-specific assembler options:\n"
 msgstr ""
 
-#: config/tc-aarch64.c:9402 config/tc-arc.c:3583 config/tc-arm.c:32084
+#: config/tc-aarch64.c:9402 config/tc-arc.c:3583 config/tc-arm.c:32088
 #, c-format
 msgid "  -EB                     assemble code for a big-endian cpu\n"
 msgstr ""
 
-#: config/tc-aarch64.c:9407 config/tc-arc.c:3585 config/tc-arm.c:32089
+#: config/tc-aarch64.c:9407 config/tc-arc.c:3585 config/tc-arm.c:32093
 #, c-format
 msgid "  -EL                     assemble code for a little-endian cpu\n"
 msgstr ""
@@ -3486,7 +3486,7 @@
 #: config/tc-arm.c:12139 config/tc-arm.c:14259 config/tc-arm.c:16192
 #: config/tc-arm.c:16227 config/tc-arm.c:17155 config/tc-arm.c:19082
 #: config/tc-arm.c:19090 config/tc-arm.c:19097 config/tc-arm.c:20739
-#: config/tc-arm.c:28846 config/tc-arm.c:28910 config/tc-arm.c:28918
+#: config/tc-arm.c:28848 config/tc-arm.c:28912 config/tc-arm.c:28920
 #: config/tc-metag.c:5176 config/tc-z8k.c:1151 config/tc-z8k.c:1161
 msgid "immediate value out of range"
 msgstr "立即数越界"
@@ -3907,7 +3907,7 @@
 msgid "shift by register not allowed in thumb mode"
 msgstr ""
 
-#: config/tc-arm.c:11274 config/tc-arm.c:14099 config/tc-arm.c:28140
+#: config/tc-arm.c:11274 config/tc-arm.c:14099 config/tc-arm.c:28142
 msgid "shift expression is too large"
 msgstr ""
 
@@ -4148,7 +4148,7 @@
 msgid "operand size must match register width"
 msgstr ""
 
-#: config/tc-arm.c:14158
+#: config/tc-arm.c:14139
 msgid "bad type in Neon instruction"
 msgstr ""
 
@@ -4412,580 +4412,580 @@
 msgid "file finished with an open IT block."
 msgstr ""
 
-#: config/tc-arm.c:26787
+#: config/tc-arm.c:26789
 #, c-format
 msgid "alignments greater than %d bytes not supported in .text sections."
 msgstr ""
 
-#: config/tc-arm.c:27054 config/tc-ia64.c:3594
+#: config/tc-arm.c:27056 config/tc-ia64.c:3594
 #, c-format
 msgid "Group section `%s' has no group signature"
 msgstr ""
 
-#: config/tc-arm.c:27100
+#: config/tc-arm.c:27102
 msgid "handlerdata in cantunwind frame"
 msgstr ""
 
-#: config/tc-arm.c:27117
+#: config/tc-arm.c:27119
 msgid "too many unwind opcodes for personality routine 0"
 msgstr ""
 
-#: config/tc-arm.c:27148
+#: config/tc-arm.c:27150
 msgid "attempt to recreate an unwind entry"
 msgstr ""
 
-#: config/tc-arm.c:27158
+#: config/tc-arm.c:27160
 msgid "too many unwind opcodes"
 msgstr ""
 
-#: config/tc-arm.c:27457
+#: config/tc-arm.c:27459
 #, c-format
 msgid "[-mwarn-syms]: Assignment makes a symbol match an ARM instruction: %s"
 msgstr ""
 
-#: config/tc-arm.c:27819 config/tc-arm.c:27887
+#: config/tc-arm.c:27821 config/tc-arm.c:27889
 #, c-format
 msgid "symbol %s is in a different section"
 msgstr ""
 
-#: config/tc-arm.c:27821 config/tc-arm.c:27889
+#: config/tc-arm.c:27823 config/tc-arm.c:27891
 #, c-format
 msgid "symbol %s is weak and may be overridden later"
 msgstr ""
 
-#: config/tc-arm.c:27866 config/tc-arm.c:28238
+#: config/tc-arm.c:27868 config/tc-arm.c:28240
 #, c-format
 msgid "invalid constant (%lx) after fixup"
 msgstr ""
 
-#: config/tc-arm.c:27922
+#: config/tc-arm.c:27924
 #, c-format
 msgid "unable to compute ADRL instructions for PC offset of 0x%lx"
 msgstr ""
 
-#: config/tc-arm.c:27958 config/tc-arm.c:27988
+#: config/tc-arm.c:27960 config/tc-arm.c:27990
 msgid "invalid literal constant: pool needs to be closer"
 msgstr ""
 
-#: config/tc-arm.c:27961 config/tc-arm.c:28010
+#: config/tc-arm.c:27963 config/tc-arm.c:28012
 #, c-format
 msgid "bad immediate value for offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:27991
+#: config/tc-arm.c:27993
 #, c-format
 msgid "bad immediate value for 8-bit offset (%ld)"
 msgstr ""
 
-#: config/tc-arm.c:28051
+#: config/tc-arm.c:28053
 msgid "offset not a multiple of 4"
 msgstr "偏移量不是 4 的倍数"
 
-#: config/tc-arm.c:28254
+#: config/tc-arm.c:28256
 msgid "invalid smc expression"
 msgstr ""
 
-#: config/tc-arm.c:28264
+#: config/tc-arm.c:28266
 msgid "invalid hvc expression"
 msgstr ""
 
-#: config/tc-arm.c:28275 config/tc-arm.c:28284
+#: config/tc-arm.c:28277 config/tc-arm.c:28286
 msgid "invalid swi expression"
 msgstr ""
 
-#: config/tc-arm.c:28294
+#: config/tc-arm.c:28296
 msgid "invalid expression in load/store multiple"
 msgstr ""
 
-#: config/tc-arm.c:28356
+#: config/tc-arm.c:28358
 #, c-format
 msgid "blx to '%s' an ARM ISA state function changed to bl"
 msgstr ""
 
-#: config/tc-arm.c:28375
+#: config/tc-arm.c:28377
 msgid "misaligned branch destination"
 msgstr ""
 
-#: config/tc-arm.c:28496
+#: config/tc-arm.c:28498
 #, c-format
 msgid "blx to Thumb func '%s' from Thumb ISA state changed to bl"
 msgstr ""
 
-#: config/tc-arm.c:28545
+#: config/tc-arm.c:28547
 msgid "Thumb2 branch out of range"
 msgstr ""
 
-#: config/tc-arm.c:28660
+#: config/tc-arm.c:28662
 msgid "rel31 relocation overflow"
 msgstr ""
 
-#: config/tc-arm.c:28682 config/tc-arm.c:28688 config/tc-arm.c:28692
-#: config/tc-arm.c:28739
+#: config/tc-arm.c:28684 config/tc-arm.c:28690 config/tc-arm.c:28694
+#: config/tc-arm.c:28741
 msgid "co-processor offset out of range"
 msgstr ""
 
-#: config/tc-arm.c:28756
+#: config/tc-arm.c:28758
 #, c-format
 msgid "invalid offset, target not word aligned (0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:28763 config/tc-arm.c:28772 config/tc-arm.c:28780
-#: config/tc-arm.c:28788 config/tc-arm.c:28796
+#: config/tc-arm.c:28765 config/tc-arm.c:28774 config/tc-arm.c:28782
+#: config/tc-arm.c:28790 config/tc-arm.c:28798
 #, c-format
 msgid "invalid offset, value too big (0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:28837
+#: config/tc-arm.c:28839
 msgid "invalid Hi register with immediate"
 msgstr ""
 
-#: config/tc-arm.c:28853
+#: config/tc-arm.c:28855
 msgid "invalid immediate for stack address calculation"
 msgstr ""
 
-#: config/tc-arm.c:28872
+#: config/tc-arm.c:28874
 msgid "address calculation needs a strongly defined nearby symbol"
 msgstr ""
 
-#: config/tc-arm.c:28888
+#: config/tc-arm.c:28890
 msgid "symbol too far away"
 msgstr ""
 
-#: config/tc-arm.c:28900
+#: config/tc-arm.c:28902
 #, c-format
 msgid "invalid immediate for address calculation (value = 0x%08lX)"
 msgstr ""
 
-#: config/tc-arm.c:28930
+#: config/tc-arm.c:28932
 #, c-format
 msgid "invalid immediate: %ld is out of range"
 msgstr ""
 
-#: config/tc-arm.c:28942
+#: config/tc-arm.c:28944
 #, c-format
 msgid "invalid shift value: %ld"
 msgstr ""
 
-#: config/tc-arm.c:29012 config/tc-arm.c:29083
+#: config/tc-arm.c:29014 config/tc-arm.c:29085
 #, c-format
 msgid "the offset 0x%08lX is not representable"
 msgstr ""
 
-#: config/tc-arm.c:29044
+#: config/tc-arm.c:29046
 #, c-format
 msgid "Unable to process relocation for thumb opcode: %lx"
 msgstr ""
 
-#: config/tc-arm.c:29123
+#: config/tc-arm.c:29125
 #, c-format
 msgid "bad offset 0x%08lX (only 12 bits available for the magnitude)"
 msgstr ""
 
-#: config/tc-arm.c:29162
+#: config/tc-arm.c:29164
 #, c-format
 msgid "bad offset 0x%08lX (only 8 bits available for the magnitude)"
 msgstr ""
 
-#: config/tc-arm.c:29202
+#: config/tc-arm.c:29204
 #, c-format
 msgid "bad offset 0x%08lX (must be word-aligned)"
 msgstr ""
 
-#: config/tc-arm.c:29207
+#: config/tc-arm.c:29209
 #, c-format
 msgid "bad offset 0x%08lX (must be an 8-bit number of words)"
 msgstr ""
 
-#: config/tc-arm.c:29428 config/tc-score.c:7379
+#: config/tc-arm.c:29430 config/tc-score.c:7379
 #, c-format
 msgid "bad relocation fixup type (%d)"
 msgstr ""
 
-#: config/tc-arm.c:29546
+#: config/tc-arm.c:29548
 msgid "literal referenced across section boundary"
 msgstr ""
 
-#: config/tc-arm.c:29626
+#: config/tc-arm.c:29628
 msgid "internal relocation (type: IMMEDIATE) not fixed up"
 msgstr ""
 
-#: config/tc-arm.c:29631
+#: config/tc-arm.c:29633
 msgid "ADRL used for a symbol not defined in the same file"
 msgstr ""
 
-#: config/tc-arm.c:29654
+#: config/tc-arm.c:29656
 #, c-format
 msgid "undefined local label `%s'"
 msgstr ""
 
-#: config/tc-arm.c:29660
+#: config/tc-arm.c:29662
 msgid "internal_relocation (type: OFFSET_IMM) not fixed up"
 msgstr ""
 
-#: config/tc-arm.c:29682 config/tc-cris.c:4006 config/tc-csky.c:877
+#: config/tc-arm.c:29684 config/tc-cris.c:4006 config/tc-csky.c:877
 #: config/tc-ft32.c:709 config/tc-mcore.c:1928 config/tc-microblaze.c:1995
 #: config/tc-mmix.c:2894 config/tc-moxie.c:825 config/tc-ns32k.c:2248
 #: config/tc-score.c:7466
 msgid "<unknown>"
 msgstr "<未知>"
 
-#: config/tc-arm.c:30084
+#: config/tc-arm.c:30086
 #, c-format
 msgid "%s: unexpected function type: %d"
 msgstr ""
 
-#: config/tc-arm.c:30224
+#: config/tc-arm.c:30226
 msgid "use of old and new-style options to set CPU type"
 msgstr ""
 
-#: config/tc-arm.c:30243
+#: config/tc-arm.c:30245
 msgid "use of old and new-style options to set FPU type"
 msgstr ""
 
-#: config/tc-arm.c:30322
+#: config/tc-arm.c:30324
 msgid "hard-float conflicts with specified fpu"
 msgstr ""
 
-#: config/tc-arm.c:30513
+#: config/tc-arm.c:30515
 msgid "generate PIC code"
 msgstr ""
 
-#: config/tc-arm.c:30514
+#: config/tc-arm.c:30516
 msgid "assemble Thumb code"
 msgstr ""
 
-#: config/tc-arm.c:30515
+#: config/tc-arm.c:30517
 msgid "support ARM/Thumb interworking"
 msgstr ""
 
-#: config/tc-arm.c:30517
+#: config/tc-arm.c:30519
 msgid "code uses 32-bit program counter"
 msgstr ""
 
-#: config/tc-arm.c:30518
+#: config/tc-arm.c:30520
 msgid "code uses 26-bit program counter"
 msgstr ""
 
-#: config/tc-arm.c:30519
+#: config/tc-arm.c:30521
 msgid "floating point args are in fp regs"
 msgstr ""
 
-#: config/tc-arm.c:30521
+#: config/tc-arm.c:30523
 msgid "re-entrant code"
 msgstr ""
 
-#: config/tc-arm.c:30522
+#: config/tc-arm.c:30524
 msgid "code is ATPCS conformant"
 msgstr ""
 
 #. These are recognized by the assembler, but have no affect on code.
-#: config/tc-arm.c:30528
+#: config/tc-arm.c:30530
 msgid "use frame pointer"
 msgstr ""
 
-#: config/tc-arm.c:30529
+#: config/tc-arm.c:30531
 msgid "use stack size checking"
 msgstr ""
 
-#: config/tc-arm.c:30532
+#: config/tc-arm.c:30534
 msgid "do not warn on use of deprecated feature"
 msgstr ""
 
-#: config/tc-arm.c:30539
+#: config/tc-arm.c:30541
 msgid "warn about symbols that match instruction names [default]"
 msgstr ""
 
-#: config/tc-arm.c:30540
+#: config/tc-arm.c:30542
 msgid "disable warnings about symobls that match instructions"
 msgstr ""
 
 #. DON'T add any new processors to this list -- we want the whole list
 #. to go away...  Add them to the processors table instead.
-#: config/tc-arm.c:30556 config/tc-arm.c:30557
+#: config/tc-arm.c:30558 config/tc-arm.c:30559
 msgid "use -mcpu=arm1"
 msgstr ""
 
-#: config/tc-arm.c:30558 config/tc-arm.c:30559
+#: config/tc-arm.c:30560 config/tc-arm.c:30561
 msgid "use -mcpu=arm2"
 msgstr ""
 
-#: config/tc-arm.c:30560 config/tc-arm.c:30561
+#: config/tc-arm.c:30562 config/tc-arm.c:30563
 msgid "use -mcpu=arm250"
 msgstr ""
 
-#: config/tc-arm.c:30562 config/tc-arm.c:30563
+#: config/tc-arm.c:30564 config/tc-arm.c:30565
 msgid "use -mcpu=arm3"
 msgstr ""
 
-#: config/tc-arm.c:30564 config/tc-arm.c:30565
+#: config/tc-arm.c:30566 config/tc-arm.c:30567
 msgid "use -mcpu=arm6"
 msgstr ""
 
-#: config/tc-arm.c:30566 config/tc-arm.c:30567
+#: config/tc-arm.c:30568 config/tc-arm.c:30569
 msgid "use -mcpu=arm600"
 msgstr ""
 
-#: config/tc-arm.c:30568 config/tc-arm.c:30569
+#: config/tc-arm.c:30570 config/tc-arm.c:30571
 msgid "use -mcpu=arm610"
 msgstr ""
 
-#: config/tc-arm.c:30570 config/tc-arm.c:30571
+#: config/tc-arm.c:30572 config/tc-arm.c:30573
 msgid "use -mcpu=arm620"
 msgstr ""
 
-#: config/tc-arm.c:30572 config/tc-arm.c:30573
+#: config/tc-arm.c:30574 config/tc-arm.c:30575
 msgid "use -mcpu=arm7"
 msgstr ""
 
-#: config/tc-arm.c:30574 config/tc-arm.c:30575
+#: config/tc-arm.c:30576 config/tc-arm.c:30577
 msgid "use -mcpu=arm70"
 msgstr ""
 
-#: config/tc-arm.c:30576 config/tc-arm.c:30577
+#: config/tc-arm.c:30578 config/tc-arm.c:30579
 msgid "use -mcpu=arm700"
 msgstr ""
 
-#: config/tc-arm.c:30578 config/tc-arm.c:30579
+#: config/tc-arm.c:30580 config/tc-arm.c:30581
 msgid "use -mcpu=arm700i"
 msgstr ""
 
-#: config/tc-arm.c:30580 config/tc-arm.c:30581
+#: config/tc-arm.c:30582 config/tc-arm.c:30583
 msgid "use -mcpu=arm710"
 msgstr ""
 
-#: config/tc-arm.c:30582 config/tc-arm.c:30583
+#: config/tc-arm.c:30584 config/tc-arm.c:30585
 msgid "use -mcpu=arm710c"
 msgstr ""
 
-#: config/tc-arm.c:30584 config/tc-arm.c:30585
+#: config/tc-arm.c:30586 config/tc-arm.c:30587
 msgid "use -mcpu=arm720"
 msgstr ""
 
-#: config/tc-arm.c:30586 config/tc-arm.c:30587
+#: config/tc-arm.c:30588 config/tc-arm.c:30589
 msgid "use -mcpu=arm7d"
 msgstr ""
 
-#: config/tc-arm.c:30588 config/tc-arm.c:30589
+#: config/tc-arm.c:30590 config/tc-arm.c:30591
 msgid "use -mcpu=arm7di"
 msgstr ""
 
-#: config/tc-arm.c:30590 config/tc-arm.c:30591
+#: config/tc-arm.c:30592 config/tc-arm.c:30593
 msgid "use -mcpu=arm7m"
 msgstr ""
 
-#: config/tc-arm.c:30592 config/tc-arm.c:30593
+#: config/tc-arm.c:30594 config/tc-arm.c:30595
 msgid "use -mcpu=arm7dm"
 msgstr ""
 
-#: config/tc-arm.c:30594 config/tc-arm.c:30595
+#: config/tc-arm.c:30596 config/tc-arm.c:30597
 msgid "use -mcpu=arm7dmi"
 msgstr ""
 
-#: config/tc-arm.c:30596 config/tc-arm.c:30597
+#: config/tc-arm.c:30598 config/tc-arm.c:30599
 msgid "use -mcpu=arm7100"
 msgstr ""
 
-#: config/tc-arm.c:30598 config/tc-arm.c:30599
+#: config/tc-arm.c:30600 config/tc-arm.c:30601
 msgid "use -mcpu=arm7500"
 msgstr ""
 
-#: config/tc-arm.c:30600 config/tc-arm.c:30601
+#: config/tc-arm.c:30602 config/tc-arm.c:30603
 msgid "use -mcpu=arm7500fe"
 msgstr ""
 
-#: config/tc-arm.c:30602 config/tc-arm.c:30603 config/tc-arm.c:30604
-#: config/tc-arm.c:30605
+#: config/tc-arm.c:30604 config/tc-arm.c:30605 config/tc-arm.c:30606
+#: config/tc-arm.c:30607
 msgid "use -mcpu=arm7tdmi"
 msgstr ""
 
-#: config/tc-arm.c:30606 config/tc-arm.c:30607
+#: config/tc-arm.c:30608 config/tc-arm.c:30609
 msgid "use -mcpu=arm710t"
 msgstr ""
 
-#: config/tc-arm.c:30608 config/tc-arm.c:30609
+#: config/tc-arm.c:30610 config/tc-arm.c:30611
 msgid "use -mcpu=arm720t"
 msgstr ""
 
-#: config/tc-arm.c:30610 config/tc-arm.c:30611
+#: config/tc-arm.c:30612 config/tc-arm.c:30613
 msgid "use -mcpu=arm740t"
 msgstr ""
 
-#: config/tc-arm.c:30612 config/tc-arm.c:30613
+#: config/tc-arm.c:30614 config/tc-arm.c:30615
 msgid "use -mcpu=arm8"
 msgstr ""
 
-#: config/tc-arm.c:30614 config/tc-arm.c:30615
+#: config/tc-arm.c:30616 config/tc-arm.c:30617
 msgid "use -mcpu=arm810"
 msgstr ""
 
-#: config/tc-arm.c:30616 config/tc-arm.c:30617
+#: config/tc-arm.c:30618 config/tc-arm.c:30619
 msgid "use -mcpu=arm9"
 msgstr ""
 
-#: config/tc-arm.c:30618 config/tc-arm.c:30619
+#: config/tc-arm.c:30620 config/tc-arm.c:30621
 msgid "use -mcpu=arm9tdmi"
 msgstr ""
 
-#: config/tc-arm.c:30620 config/tc-arm.c:30621
+#: config/tc-arm.c:30622 config/tc-arm.c:30623
 msgid "use -mcpu=arm920"
 msgstr ""
 
-#: config/tc-arm.c:30622 config/tc-arm.c:30623
+#: config/tc-arm.c:30624 config/tc-arm.c:30625
 msgid "use -mcpu=arm940"
 msgstr ""
 
-#: config/tc-arm.c:30624
+#: config/tc-arm.c:30626
 msgid "use -mcpu=strongarm"
 msgstr ""
 
-#: config/tc-arm.c:30626
+#: config/tc-arm.c:30628
 msgid "use -mcpu=strongarm110"
 msgstr ""
 
-#: config/tc-arm.c:30628
+#: config/tc-arm.c:30630
 msgid "use -mcpu=strongarm1100"
 msgstr ""
 
-#: config/tc-arm.c:30630
+#: config/tc-arm.c:30632
 msgid "use -mcpu=strongarm1110"
 msgstr ""
 
-#: config/tc-arm.c:30631
+#: config/tc-arm.c:30633
 msgid "use -mcpu=xscale"
 msgstr ""
 
-#: config/tc-arm.c:30632
+#: config/tc-arm.c:30634
 msgid "use -mcpu=iwmmxt"
 msgstr ""
 
-#: config/tc-arm.c:30633
+#: config/tc-arm.c:30635
 msgid "use -mcpu=all"
 msgstr ""
 
 #. Architecture variants -- don't add any more to this list either.
-#: config/tc-arm.c:30636 config/tc-arm.c:30637
+#: config/tc-arm.c:30638 config/tc-arm.c:30639
 msgid "use -march=armv2"
 msgstr ""
 
-#: config/tc-arm.c:30638 config/tc-arm.c:30639
+#: config/tc-arm.c:30640 config/tc-arm.c:30641
 msgid "use -march=armv2a"
 msgstr ""
 
-#: config/tc-arm.c:30640 config/tc-arm.c:30641
+#: config/tc-arm.c:30642 config/tc-arm.c:30643
 msgid "use -march=armv3"
 msgstr ""
 
-#: config/tc-arm.c:30642 config/tc-arm.c:30643
+#: config/tc-arm.c:30644 config/tc-arm.c:30645
 msgid "use -march=armv3m"
 msgstr ""
 
-#: config/tc-arm.c:30644 config/tc-arm.c:30645
+#: config/tc-arm.c:30646 config/tc-arm.c:30647
 msgid "use -march=armv4"
 msgstr ""
 
-#: config/tc-arm.c:30646 config/tc-arm.c:30647
+#: config/tc-arm.c:30648 config/tc-arm.c:30649
 msgid "use -march=armv4t"
 msgstr ""
 
-#: config/tc-arm.c:30648 config/tc-arm.c:30649
+#: config/tc-arm.c:30650 config/tc-arm.c:30651
 msgid "use -march=armv5"
 msgstr ""
 
-#: config/tc-arm.c:30650 config/tc-arm.c:30651
+#: config/tc-arm.c:30652 config/tc-arm.c:30653
 msgid "use -march=armv5t"
 msgstr ""
 
-#: config/tc-arm.c:30652 config/tc-arm.c:30653
+#: config/tc-arm.c:30654 config/tc-arm.c:30655
 msgid "use -march=armv5te"
 msgstr ""
 
 #. Floating point variants -- don't add any more to this list either.
-#: config/tc-arm.c:30656
+#: config/tc-arm.c:30658
 msgid "use -mfpu=fpe"
 msgstr ""
 
-#: config/tc-arm.c:30657
+#: config/tc-arm.c:30659
 msgid "use -mfpu=fpa10"
 msgstr ""
 
-#: config/tc-arm.c:30658
+#: config/tc-arm.c:30660
 msgid "use -mfpu=fpa11"
 msgstr ""
 
-#: config/tc-arm.c:30660
+#: config/tc-arm.c:30662
 msgid "use either -mfpu=softfpa or -mfpu=softvfp"
 msgstr ""
 
-#: config/tc-arm.c:31706
+#: config/tc-arm.c:31710
 msgid "extension does not apply to the base architecture"
 msgstr ""
 
-#: config/tc-arm.c:31735
+#: config/tc-arm.c:31739
 msgid "architectural extensions must be specified in alphabetical order"
 msgstr ""
 
-#: config/tc-arm.c:31874 config/tc-arm.c:32815
+#: config/tc-arm.c:31878 config/tc-arm.c:32819
 #, c-format
 msgid "unknown floating point format `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:31890
+#: config/tc-arm.c:31894
 #, c-format
 msgid "unknown floating point abi `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:31906
+#: config/tc-arm.c:31910
 #, c-format
 msgid "unknown EABI `%s'\n"
 msgstr ""
 
-#: config/tc-arm.c:31926
+#: config/tc-arm.c:31930
 #, c-format
 msgid ""
 "unknown implicit IT mode `%s', should be arm, thumb, always, or never."
 msgstr ""
 
-#: config/tc-arm.c:31949 config/tc-metag.c:5913
+#: config/tc-arm.c:31953 config/tc-metag.c:5913
 msgid "<fpu name>\t  assemble for FPU architecture <fpu name>"
 msgstr ""
 
-#: config/tc-arm.c:31951
+#: config/tc-arm.c:31955
 msgid "<abi>\t  assemble for floating point ABI <abi>"
 msgstr ""
 
-#: config/tc-arm.c:31954
+#: config/tc-arm.c:31958
 msgid "<ver>\t\t  assemble for eabi version <ver>"
 msgstr ""
 
-#: config/tc-arm.c:31957
+#: config/tc-arm.c:31961
 msgid "<mode>\t  controls implicit insertion of IT instructions"
 msgstr ""
 
-#: config/tc-arm.c:31959
+#: config/tc-arm.c:31963
 msgid "\t\t\t  TI CodeComposer Studio syntax compatibility mode"
 msgstr ""
 
-#: config/tc-arm.c:32073
+#: config/tc-arm.c:32077
 #, c-format
 msgid " ARM-specific assembler options:\n"
 msgstr ""
 
-#: config/tc-arm.c:32093
+#: config/tc-arm.c:32097
 #, c-format
 msgid "  --fix-v4bx              Allow BX in ARMv4 code\n"
 msgstr ""
 
-#: config/tc-arm.c:32403
+#: config/tc-arm.c:32407
 msgid "no architecture contains all the instructions used\n"
 msgstr ""
 
-#: config/tc-arm.c:32755
+#: config/tc-arm.c:32759
 #, c-format
 msgid ""
 "architectural extension `%s' is not allowed for the current base architecture"
 msgstr ""
 
-#: config/tc-arm.c:32778
+#: config/tc-arm.c:32782
 #, c-format
 msgid "unknown architecture extension `%s'\n"
 msgstr ""
@@ -7206,7 +7206,7 @@
 msgid "Internal assembler error for macro %s"
 msgstr ""
 
-#: config/tc-ppc.c:2141
+#: config/tc-i370.c:629 config/tc-ppc.c:2129
 msgid "identifier+constant@got means identifier@got+constant"
 msgstr ""
 
@@ -7446,7 +7446,7 @@
 msgid "cannot do %s %u byte relocation"
 msgstr ""
 
-#: config/tc-i386.c:3838 config/tc-i386.c:3865
+#: config/tc-i386.c:3549 config/tc-i386.c:3576
 #, c-format
 msgid "can't use register '%s%s' as operand %d in '%s'."
 msgstr ""
@@ -7507,7 +7507,7 @@
 msgid "translating to `%sp'"
 msgstr ""
 
-#: config/tc-i386.c:4291
+#: config/tc-i386.c:3854
 #, c-format
 msgid "instruction `%s' isn't supported in 16-bit mode."
 msgstr ""
@@ -7657,7 +7657,7 @@
 msgid "unsupported broadcast"
 msgstr ""
 
-#: config/tc-i386.c:5687
+#: config/tc-i386.c:5282
 msgid "broadcast not on source memory operand"
 msgstr ""
 
@@ -7711,7 +7711,7 @@
 msgid "stand-alone `%s' prefix"
 msgstr ""
 
-#: config/tc-i386.c:6199 config/tc-i386.c:6215
+#: config/tc-i386.c:5362 config/tc-i386.c:5378
 #, c-format
 msgid "`%s' operand %d must use `%ses' segment"
 msgstr ""
@@ -7756,7 +7756,7 @@
 "`%s%.3s%d' source group in `%s'"
 msgstr ""
 
-#: config/tc-i386.c:6817
+#: config/tc-i386.c:6139
 #, c-format
 msgid "you can't `pop %scs'"
 msgstr ""
@@ -7778,7 +7778,7 @@
 msgid "segment override on `%s' is ineffectual"
 msgstr ""
 
-#: config/tc-i386.c:7837 config/tc-i386.c:7978 config/tc-i386.c:8042
+#: config/tc-i386.c:6975 config/tc-i386.c:7076 config/tc-i386.c:7131
 msgid "skipping prefixes on this instruction"
 msgstr ""
 
@@ -8059,7 +8059,7 @@
 msgid "invalid -mrelax-relocations= option: `%s'"
 msgstr ""
 
-#: config/tc-i386.c:11463
+#: config/tc-i386.c:10486
 #, c-format
 msgid ""
 "  -Q                      ignored\n"
@@ -8117,21 +8117,21 @@
 msgid "  -msse2avx               encode SSE instructions with VEX prefix\n"
 msgstr ""
 
-#: config/tc-i386.c:10994
+#: config/tc-i386.c:10522
 #, c-format
 msgid ""
 "  -msse-check=[none|error|warning]\n"
 "                          check SSE instructions\n"
 msgstr ""
 
-#: config/tc-i386.c:10997
+#: config/tc-i386.c:10525
 #, c-format
 msgid ""
 "  -moperand-check=[none|error|warning]\n"
 "                          check operand combinations for validity\n"
 msgstr ""
 
-#: config/tc-i386.c:11000
+#: config/tc-i386.c:10528
 #, c-format
 msgid ""
 "  -mavxscalar=[128|256]   encode scalar AVX instructions with specific "
@@ -8139,7 +8139,7 @@
 "                           length\n"
 msgstr ""
 
-#: config/tc-i386.c:11003
+#: config/tc-i386.c:10531
 #, c-format
 msgid ""
 "  -mevexlig=[128|256|512] encode scalar EVEX instructions with specific "
@@ -8147,7 +8147,7 @@
 "                           length\n"
 msgstr ""
 
-#: config/tc-i386.c:11006
+#: config/tc-i386.c:10534
 #, c-format
 msgid ""
 "  -mevexwig=[0|1]         encode EVEX instructions with specific EVEX.W "
@@ -8155,7 +8155,7 @@
 "                           for EVEX.W bit ignored instructions\n"
 msgstr ""
 
-#: config/tc-i386.c:11009
+#: config/tc-i386.c:10537
 #, c-format
 msgid ""
 "  -mevexrcig=[rne|rd|ru|rz]\n"
@@ -8164,12 +8164,12 @@
 "                           for SAE-only ignored instructions\n"
 msgstr ""
 
-#: config/tc-i386.c:11013
+#: config/tc-i386.c:10541
 #, c-format
 msgid "  -mmnemonic=[att|intel]  use AT&T/Intel mnemonic\n"
 msgstr ""
 
-#: config/tc-i386.c:11015
+#: config/tc-i386.c:10543
 #, c-format
 msgid "  -msyntax=[att|intel]    use AT&T/Intel syntax\n"
 msgstr ""
@@ -8205,14 +8205,14 @@
 msgid "  -mbig-obj               generate big object files\n"
 msgstr ""
 
-#: config/tc-i386.c:11029
+#: config/tc-i386.c:10559
 #, c-format
 msgid ""
 "  -momit-lock-prefix=[no|yes]\n"
 "                          strip all lock prefixes\n"
 msgstr ""
 
-#: config/tc-i386.c:11032
+#: config/tc-i386.c:10562
 #, c-format
 msgid ""
 "  -mfence-as-lock-add=[no|yes]\n"
@@ -8220,14 +8220,14 @@
 "                           lock addl $0x0, (%%{re}sp)\n"
 msgstr ""
 
-#: config/tc-i386.c:11036
+#: config/tc-i386.c:10566
 #, c-format
 msgid ""
 "  -mrelax-relocations=[no|yes]\n"
 "                          generate relax relocations\n"
 msgstr ""
 
-#: config/tc-i386.c:11039
+#: config/tc-i386.c:10569
 #, c-format
 msgid "  -mamd64                 accept only AMD64 ISA\n"
 msgstr ""
@@ -13378,7 +13378,7 @@
 msgid "Can not find match relax hint.  Line: %d"
 msgstr ""
 
-#: config/tc-nds32.c:5046
+#: config/tc-nds32.c:4999
 #, c-format
 msgid "Internal error: Relax hint error. %s: %x"
 msgstr ""
@@ -13437,7 +13437,7 @@
 msgid "Internal error: Unknown fixup type %d (`%s')"
 msgstr ""
 
-#: config/tc-nds32.c:6762
+#: config/tc-nds32.c:6711
 msgid "need PIC qualifier with symbol."
 msgstr ""
 
@@ -13971,7 +13971,7 @@
 "-m821, -m850, -m860     generate code for PowerPC 821/850/860\n"
 msgstr ""
 
-#: config/tc-ppc.c:1346
+#: config/tc-ppc.c:1345
 #, c-format
 msgid ""
 "-mppc64, -m620          generate code for PowerPC 620/625/630\n"
@@ -13992,7 +13992,7 @@
 "-many                   generate code for any architecture (PWR/PWRX/PPC)\n"
 msgstr ""
 
-#: config/tc-ppc.c:1361
+#: config/tc-ppc.c:1360
 #, c-format
 msgid ""
 "-maltivec               generate code for AltiVec\n"
@@ -14011,7 +14011,7 @@
 "-mno-regnames           Do not allow symbolic names for registers\n"
 msgstr ""
 
-#: config/tc-ppc.c:1377
+#: config/tc-ppc.c:1376
 #, c-format
 msgid ""
 "-mrelocatable           support for GCC's -mrelocatble option\n"
@@ -14028,7 +14028,7 @@
 "-Qy, -Qn                ignored\n"
 msgstr ""
 
-#: config/tc-ppc.c:1391
+#: config/tc-ppc.c:1390
 #, c-format
 msgid ""
 "-nops=count             when aligning, more than COUNT nops uses a branch\n"
@@ -14096,7 +14096,7 @@
 msgid "duplicate macro %s"
 msgstr ""
 
-#: config/tc-ppc.c:2161
+#: config/tc-ppc.c:2149
 msgid "symbol+offset not supported for got tls"
 msgstr ""
 
@@ -15987,7 +15987,7 @@
 msgid "FP branch in delay slot"
 msgstr ""
 
-#: config/tc-sparc.c:1573
+#: config/tc-sparc.c:1629
 msgid "FP branch preceded by FP instruction; NOP inserted"
 msgstr ""
 
@@ -19157,12 +19157,12 @@
 msgid "unresolved loop target symbol: %s"
 msgstr ""
 
-#: config/tc-xtensa.c:11008
+#: config/tc-xtensa.c:10972
 #, c-format
 msgid "invalid expression evaluation type %d"
 msgstr ""
 
-#: config/tc-xtensa.c:11025
+#: config/tc-xtensa.c:10989
 msgid "loop too long for LOOP instruction"
 msgstr ""
 
@@ -19644,7 +19644,7 @@
 msgid "file number less than one"
 msgstr ""
 
-#: dwarf2dbg.c:792
+#: dwarf2dbg.c:789
 #, c-format
 msgid "file number %ld already allocated"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gcc.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gcc.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gcc.po	2020-01-23 16:51:57.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gcc.po	2020-07-08 13:53:58.000000000 +0000
@@ -33,15 +33,15 @@
 "Project-Id-Version: gcc 6.1.0\n"
 "Report-Msgid-Bugs-To: https://gcc.gnu.org/bugs/\n"
 "POT-Creation-Date: 2018-07-25 14:25+0000\n"
-"PO-Revision-Date: 2019-06-13 14:01+0000\n"
+"PO-Revision-Date: 2020-03-30 14:52+0000\n"
 "Last-Translator: Mingye Wang <arthur2e5@aosc.xyz>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:23+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 12:01+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Poedit-Basepath: C:/MSYS/source/gcc-4.6.0/gcc\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gdb.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gdb.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gdb.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gdb.po	2020-07-08 13:53:56.000000000 +0000
@@ -14,28 +14,27 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:56+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:49+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: aarch64-fbsd-nat.c:71 aarch64-fbsd-nat.c:103 alpha-bsd-nat.c:103
 #: alpha-bsd-nat.c:134 amd64-bsd-nat.c:55 amd64-bsd-nat.c:131
 #: amd64-fbsd-nat.c:172 amd64-linux-nat.c:225 amd64-linux-nat.c:309
-#: arm-fbsd-nat.c:74 arm-fbsd-nat.c:107 hppa-nbsd-nat.c:180
-#: hppa-nbsd-nat.c:209 hppa-obsd-nat.c:206 hppa-obsd-nat.c:233
-#: i386-bsd-nat.c:140 i386-bsd-nat.c:230 i386-linux-nat.c:223
-#: i386-linux-nat.c:238 m32r-linux-nat.c:121 m32r-linux-nat.c:170
-#: m68k-bsd-nat.c:127 m68k-bsd-nat.c:156 m68k-linux-nat.c:268
-#: m68k-linux-nat.c:283 mips64-obsd-nat.c:95 mips64-obsd-nat.c:110
+#: arm-fbsd-nat.c:74 arm-fbsd-nat.c:107 hppa-nbsd-nat.c:180 hppa-nbsd-nat.c:209
+#: hppa-obsd-nat.c:206 hppa-obsd-nat.c:233 i386-bsd-nat.c:140
+#: i386-bsd-nat.c:230 i386-linux-nat.c:223 i386-linux-nat.c:238
+#: m32r-linux-nat.c:121 m32r-linux-nat.c:170 m68k-bsd-nat.c:127
+#: m68k-bsd-nat.c:156 m68k-linux-nat.c:268 m68k-linux-nat.c:283
 #: mips-fbsd-nat.c:74 mips-fbsd-nat.c:105 mips-linux-nat.c:286
 #: mips-linux-nat.c:367 mips-nbsd-nat.c:60 mips-nbsd-nat.c:90
-#: ppc-fbsd-nat.c:133 ppc-fbsd-nat.c:159 ppc-nbsd-nat.c:98 ppc-nbsd-nat.c:127
-#: ppc-obsd-nat.c:88 ppc-obsd-nat.c:122 riscv-fbsd-nat.c:75
-#: riscv-fbsd-nat.c:107 riscv-linux-nat.c:217 riscv-linux-nat.c:235
-#: riscv-linux-nat.c:272 riscv-linux-nat.c:296 s390-linux-nat.c:281
-#: s390-linux-nat.c:298 sh-nbsd-nat.c:62 sh-nbsd-nat.c:84 sparc-nat.c:170
-#: sparc-nat.c:203 tilegx-linux-nat.c:143 tilegx-linux-nat.c:159
-#: vax-bsd-nat.c:80 vax-bsd-nat.c:95 xtensa-linux-nat.c:211
-#: xtensa-linux-nat.c:230
+#: mips64-obsd-nat.c:95 mips64-obsd-nat.c:110 ppc-fbsd-nat.c:133
+#: ppc-fbsd-nat.c:159 ppc-nbsd-nat.c:98 ppc-nbsd-nat.c:127 ppc-obsd-nat.c:88
+#: ppc-obsd-nat.c:122 riscv-fbsd-nat.c:75 riscv-fbsd-nat.c:107
+#: riscv-linux-nat.c:217 riscv-linux-nat.c:235 riscv-linux-nat.c:272
+#: riscv-linux-nat.c:296 s390-linux-nat.c:281 s390-linux-nat.c:298
+#: sh-nbsd-nat.c:62 sh-nbsd-nat.c:84 sparc-nat.c:170 sparc-nat.c:203
+#: tilegx-linux-nat.c:143 tilegx-linux-nat.c:159 vax-bsd-nat.c:80
+#: vax-bsd-nat.c:95 xtensa-linux-nat.c:211 xtensa-linux-nat.c:230
 msgid "Couldn't get registers"
 msgstr "无法获取寄存器"
 
@@ -47,9 +46,9 @@
 #: i386-bsd-nat.c:310 i386-linux-nat.c:287 i386-linux-nat.c:301
 #: m68k-bsd-nat.c:137 m68k-bsd-nat.c:169 m68k-linux-nat.c:362
 #: m68k-linux-nat.c:376 mips-fbsd-nat.c:84 mips-fbsd-nat.c:119
-#: mips-nbsd-nat.c:73 mips-nbsd-nat.c:107 ppc-obsd-nat.c:104
-#: ppc-obsd-nat.c:141 riscv-fbsd-nat.c:86 riscv-fbsd-nat.c:121
-#: s390-linux-nat.c:318 s390-linux-nat.c:335 sparc-nat.c:182
+#: mips-nbsd-nat.c:73 mips-nbsd-nat.c:107 ppc-obsd-nat.c:104 ppc-obsd-nat.c:141
+#: riscv-fbsd-nat.c:86 riscv-fbsd-nat.c:121 s390-linux-nat.c:318
+#: s390-linux-nat.c:335 sparc-nat.c:182
 msgid "Couldn't get floating point status"
 msgstr ""
 
@@ -57,7 +56,7 @@
 #: amd64-linux-nat.c:314 arm-fbsd-nat.c:113 hppa-nbsd-nat.c:214
 #: hppa-obsd-nat.c:238 i386-bsd-nat.c:235 i386-linux-nat.c:243
 #: m32r-linux-nat.c:175 m68k-bsd-nat.c:161 m68k-linux-nat.c:288
-#: mips64-obsd-nat.c:115 mips-fbsd-nat.c:111 mips-nbsd-nat.c:95
+#: mips-fbsd-nat.c:111 mips-nbsd-nat.c:95 mips64-obsd-nat.c:115
 #: ppc-fbsd-nat.c:164 ppc-nbsd-nat.c:133 ppc-obsd-nat.c:132
 #: riscv-fbsd-nat.c:113 s390-linux-nat.c:303 sparc-nat.c:208
 #: tilegx-linux-nat.c:164 vax-bsd-nat.c:100 xtensa-linux-nat.c:238
@@ -121,7 +120,7 @@
 msgstr ""
 
 #: aarch64-linux-tdep.c:714 arm-linux-tdep.c:1204 i386-tdep.c:4133
-#: i386-tdep.c:4242 i386-tdep.c:4257 ppc-linux-tdep.c:1710 stap-probe.c:769
+#: i386-tdep.c:4242 i386-tdep.c:4257 ppc-linux-tdep.c:1710 stap-probe.c:775
 #, possible-c-format
 msgid "Invalid register name `%s' on expression `%s'."
 msgstr ""
@@ -946,26 +945,26 @@
 msgid "Invalid character '%s' in expression."
 msgstr "表达式中含有无效字符 '%s'"
 
-#: ada-lex.l:355
+#: ada-lex.l:354
 #, possible-c-format
 msgid "Invalid base: %d."
 msgstr ""
 
-#: ada-lex.l:366 ada-lex.l:373
+#: ada-lex.l:365 ada-lex.l:372
 msgid "Integer literal out of range"
 msgstr ""
 
-#: ada-lex.l:368
+#: ada-lex.l:367
 #, possible-c-format
 msgid "Invalid digit `%c' in based literal"
 msgstr ""
 
-#: ada-lex.l:613
+#: ada-lex.l:612
 #, possible-c-format
 msgid "ambiguous attribute name: `%s'"
 msgstr "不明确的属性名：`%s'"
 
-#: ada-lex.l:616
+#: ada-lex.l:615
 #, possible-c-format
 msgid "unrecognized attribute: `%s'"
 msgstr "无法辨认的属性: `%s'"
@@ -1237,8 +1236,8 @@
 msgstr "<被优化或零长度>"
 
 #: ada-valprint.c:1217 cp-valprint.c:314 guile/scm-pretty-print.c:631
-#: mi/mi-cmd-stack.c:536 mi/mi-cmd-stack.c:550 python/py-framefilter.c:401
-#: python/py-prettyprint.c:267 stack.c:456 stack.c:493
+#: mi/mi-cmd-stack.c:536 mi/mi-cmd-stack.c:550 python/py-prettyprint.c:267
+#: python/py-framefilter.c:401 stack.c:456 stack.c:493
 #, possible-c-format
 msgid "<error reading variable: %s>"
 msgstr ""
@@ -1544,8 +1543,8 @@
 msgstr ""
 
 #. multiply
-#: arch/arm.c:134 arch/arm-get-next-pcs.c:682 arch/arm-get-next-pcs.c:703
-#: arch/arm-get-next-pcs.c:819
+#: arch/arm-get-next-pcs.c:682 arch/arm-get-next-pcs.c:703
+#: arch/arm-get-next-pcs.c:819 arch/arm.c:134
 msgid "Invalid update to pc in instruction"
 msgstr ""
 
@@ -2875,11 +2874,11 @@
 msgid "Must start with a format string."
 msgstr ""
 
-#: ax-gdb.c:2705 breakpoint.c:2228 printcmd.c:2550
+#: ax-gdb.c:2705 breakpoint.c:2228 printcmd.c:2551
 msgid "Bad format string, non-terminated '\"'."
 msgstr ""
 
-#: ax-gdb.c:2710 breakpoint.c:2233 printcmd.c:2555
+#: ax-gdb.c:2710 breakpoint.c:2233 printcmd.c:2556
 msgid "Invalid argument syntax"
 msgstr ""
 
@@ -2973,8 +2972,8 @@
 msgid " %02x"
 msgstr ""
 
-#: ax-general.c:372 darwin-nat.c:545 darwin-nat-info.c:292
-#: darwin-nat-info.c:585 darwin-nat-info.c:787
+#: ax-general.c:372 darwin-nat-info.c:292 darwin-nat-info.c:585
+#: darwin-nat-info.c:787 darwin-nat.c:545
 msgid "\n"
 msgstr ""
 
@@ -3570,7 +3569,7 @@
 msgid "Catchpoint %d (exec)"
 msgstr ""
 
-#: breakpoint.c:8656 printcmd.c:2545
+#: breakpoint.c:8656 printcmd.c:2546
 msgid "Bad format string, missing '\"'."
 msgstr ""
 
@@ -5037,8 +5036,8 @@
 
 #: dbxread.c:2720 exec.c:521 exec.c:787 gdbsupport/print-utils.c:77
 #: gdbsupport/print-utils.c:120 gdbsupport/print-utils.c:288 mdebugread.c:3597
-#: printcmd.c:1013 printcmd.c:2706 psymtab.c:695 psymtab.c:708 target.c:647
-#: ui-out.c:782 utils.c:1574 valprint.c:1367
+#: printcmd.c:1013 printcmd.c:2707 psymtab.c:695 psymtab.c:708 target.c:647
+#: ui-out.c:782 utils.c:1583 valprint.c:1367
 msgid "failed internal consistency check"
 msgstr ""
 
@@ -6502,11 +6501,11 @@
 #. Should never come here as hookc would be 0.
 #: cli/cli-script.c:1499 gdbsupport/common-exceptions.c:93
 #: gdbsupport/common-exceptions.c:109 gdbsupport/common-exceptions.c:125
-#: hppa-tdep.c:3127 hppa-tdep.c:3140 infcall.c:983 infcmd.c:1576
-#: language.c:464 mi/mi-out.c:227 mi/mi-out.c:247 mips-tdep.c:305
-#: mips-tdep.c:509 mips-tdep.c:2235 mips-tdep.c:5762 mips-tdep.c:6927
-#: mn10300-tdep.c:127 reggroups.c:274 remote.c:2116 remote.c:8663
-#: remote.c:9949 utils.c:380 utils.c:408
+#: hppa-tdep.c:3127 hppa-tdep.c:3140 infcall.c:983 infcmd.c:1576 language.c:464
+#: mi/mi-out.c:227 mi/mi-out.c:247 mips-tdep.c:305 mips-tdep.c:509
+#: mips-tdep.c:2235 mips-tdep.c:5762 mips-tdep.c:6927 mn10300-tdep.c:127
+#: reggroups.c:274 remote.c:2116 remote.c:8663 remote.c:9949 utils.c:380
+#: utils.c:408
 msgid "bad switch"
 msgstr ""
 
@@ -6931,7 +6930,7 @@
 msgstr ""
 
 #. Probably TLS here.
-#: compile/compile-loc2c.c:633 compile/compile-c-symbols.c:135
+#: compile/compile-c-symbols.c:135 compile/compile-loc2c.c:633
 #: compile/compile-cplus-symbols.c:129
 #, possible-c-format
 msgid ""
@@ -6939,13 +6938,13 @@
 "current thread in compiled code."
 msgstr ""
 
-#: compile/compile-loc2c.c:623 compile/compile-c-symbols.c:153
+#: compile/compile-c-symbols.c:153 compile/compile-loc2c.c:623
 #: compile/compile-cplus-symbols.c:147
 #, possible-c-format
 msgid "Symbol \"%s\" cannot be used because there is no selected frame"
 msgstr ""
 
-#: compile/compile-loc2c.c:629 compile/compile-c-symbols.c:160
+#: compile/compile-c-symbols.c:160 compile/compile-loc2c.c:629
 #: compile/compile-cplus-symbols.c:154
 #, possible-c-format
 msgid ""
@@ -7183,19 +7182,19 @@
 msgid "Unexpected type id from GCC, check you use recent enough GCC."
 msgstr ""
 
-#: compile/compile-cplus-types.c:461 compile/compile-c-types.c:48
+#: compile/compile-c-types.c:48 compile/compile-cplus-types.c:461
 msgid "array type with non-constant lower bound is not supported"
 msgstr ""
 
-#: compile/compile-cplus-types.c:469 compile/compile-c-types.c:51
+#: compile/compile-c-types.c:51 compile/compile-cplus-types.c:469
 msgid "cannot convert array type with non-zero lower bound to C"
 msgstr ""
 
-#: compile/compile-cplus-types.c:480 compile/compile-c-types.c:60
+#: compile/compile-c-types.c:60 compile/compile-cplus-types.c:480
 msgid "variably-sized vector type is not supported"
 msgstr ""
 
-#: compile/compile-cplus-types.c:981 compile/compile-c-types.c:171
+#: compile/compile-c-types.c:171 compile/compile-cplus-types.c:981
 msgid "function has unknown return type; assuming int"
 msgstr ""
 
@@ -8698,7 +8697,7 @@
 msgid "Attaching to program: %s, %s\n"
 msgstr ""
 
-#: darwin-nat.c:2054 inf-ptrace.c:219 procfs.c:1889 remote.c:5801
+#: darwin-nat.c:2054 inf-ptrace.c:219 procfs.c:1810 remote.c:5801
 #, possible-c-format
 msgid "Attaching to %s\n"
 msgstr ""
@@ -9133,7 +9132,7 @@
 msgid "skipping section '%s' which does not contain valid DOF data."
 msgstr ""
 
-#: dtrace-probe.c:660 stap-probe.c:187
+#: dtrace-probe.c:660 stap-probe.c:193
 #, possible-c-format
 msgid ""
 "Probe '%s' has %d arguments, but GDB is requesting\n"
@@ -9184,7 +9183,7 @@
 "register %s (#%d) at %s"
 msgstr ""
 
-#: dwarf2expr.h:212 dwarf2-frame.c:302
+#: dwarf2-frame.c:302 dwarf2expr.h:212
 #, possible-c-format
 msgid "%s is invalid in this context"
 msgstr ""
@@ -11142,8 +11141,7 @@
 "handle_inferior_event: Invalid gnu-indirect-function breakpoint type %d"
 msgstr ""
 
-#: elfread.c:1084 elfread.c:1097 elfread.c:1123 machoread.c:808
-#: machoread.c:824
+#: elfread.c:1084 elfread.c:1097 elfread.c:1123 machoread.c:808 machoread.c:824
 #, possible-c-format
 msgid "Can't read symbols from %s: %s"
 msgstr ""
@@ -11554,7 +11552,7 @@
 msgid "Debugging of FreeBSD lwp module is %s.\n"
 msgstr ""
 
-#: fbsd-nat.c:1351 linux-nat.c:1010 procfs.c:2287 procfs.c:2408
+#: fbsd-nat.c:1351 linux-nat.c:1010 procfs.c:2208 procfs.c:2329
 #, possible-c-format
 msgid "[%s exited]\n"
 msgstr ""
@@ -11661,8 +11659,8 @@
 msgid "Empty search range.\n"
 msgstr ""
 
-#: findcmd.c:128 python/py-value.c:478 python/py-lazy-string.c:177
-#: python/py-lazy-string.c:210
+#: findcmd.c:128 python/py-lazy-string.c:177 python/py-lazy-string.c:210
+#: python/py-value.c:478
 msgid "Invalid length."
 msgstr ""
 
@@ -12125,7 +12123,7 @@
 msgid "When non-zero, architecture debugging is enabled."
 msgstr ""
 
-#: gdbserver/ax.c:837 printcmd.c:2587
+#: gdbserver/ax.c:837 printcmd.c:2588
 msgid "Wrong number of arguments for specified format-string"
 msgstr ""
 
@@ -13074,8 +13072,8 @@
 "the `info dos ldt' command."
 msgstr ""
 
-#: guile/scm-param.c:915 guile/scm-param.c:920 guile/scm-iterator.c:162
-#: guile/scm-cmd.c:702 guile/scm-pretty-print.c:158
+#: guile/scm-cmd.c:702 guile/scm-pretty-print.c:158 guile/scm-iterator.c:162
+#: guile/scm-param.c:915 guile/scm-param.c:920
 msgid "procedure"
 msgstr ""
 
@@ -13147,12 +13145,12 @@
 msgid "'%s' is not a prefix command"
 msgstr ""
 
-#: guile/scm-param.c:244 guile/scm-cmd.c:682 python/py-cmd.c:534
-#: python/py-param.c:342
+#: guile/scm-cmd.c:682 guile/scm-param.c:244 python/py-param.c:342
+#: python/py-cmd.c:534
 msgid "This command is not documented."
 msgstr ""
 
-#: guile/scm-param.c:894 guile/scm-cmd.c:709
+#: guile/scm-cmd.c:709 guile/scm-param.c:894
 msgid "invalid command class argument"
 msgstr ""
 
@@ -13168,7 +13166,7 @@
 msgid "command is already registered"
 msgstr ""
 
-#: guile/scm-value.c:1085 guile/scm-lazy-string.c:162
+#: guile/scm-lazy-string.c:162 guile/scm-value.c:1085
 msgid "invalid length"
 msgstr ""
 
@@ -13184,14 +13182,14 @@
 msgid "cannot create a value from NULL"
 msgstr ""
 
-#: guile/scm-param.c:514 guile/scm-param.c:701 guile/scm-type.c:986
-#: guile/scm-type.c:1027 guile/scm-utils.c:205 guile/scm-value.c:618
-#: guile/scm-pretty-print.c:156
+#: guile/scm-utils.c:205 guile/scm-value.c:618 guile/scm-pretty-print.c:156
+#: guile/scm-type.c:986 guile/scm-type.c:1027 guile/scm-param.c:514
+#: guile/scm-param.c:701
 msgid "string"
 msgstr ""
 
-#: guile/scm-param.c:494 guile/scm-objfile.c:290 guile/scm-value.c:705
-#: guile/scm-pretty-print.c:255 guile/scm-progspace.c:330
+#: guile/scm-value.c:705 guile/scm-pretty-print.c:255 guile/scm-param.c:494
+#: guile/scm-progspace.c:330 guile/scm-objfile.c:290
 msgid "list"
 msgstr ""
 
@@ -13346,8 +13344,8 @@
 msgid "length is larger than array size"
 msgstr ""
 
-#: guile/scm-param.c:722 guile/scm-utils.c:215 guile/scm-breakpoint.c:589
-#: guile/scm-breakpoint.c:628
+#: guile/scm-utils.c:215 guile/scm-breakpoint.c:589 guile/scm-breakpoint.c:628
+#: guile/scm-param.c:722
 msgid "boolean"
 msgstr ""
 
@@ -13439,9 +13437,8 @@
 msgid "write buffer not empty: ~a"
 msgstr ""
 
-#: guile/scm-param.c:762 guile/scm-type.c:1109 guile/scm-ports.c:1179
-#: guile/scm-ports.c:1221 guile/scm-breakpoint.c:666
-#: guile/scm-breakpoint.c:707
+#: guile/scm-ports.c:1179 guile/scm-ports.c:1221 guile/scm-breakpoint.c:666
+#: guile/scm-breakpoint.c:707 guile/scm-type.c:1109 guile/scm-param.c:762
 msgid "integer"
 msgstr ""
 
@@ -14510,8 +14507,8 @@
 "The default is to unwind the frame."
 msgstr ""
 
-#: infcmd.c:66 infcmd.c:2482 infcmd.c:2869 linux-fork.c:651
-#: record-btrace.c:387 remote-sim.c:894
+#: infcmd.c:66 infcmd.c:2482 infcmd.c:2869 linux-fork.c:651 record-btrace.c:387
+#: remote-sim.c:894
 msgid "The program is not being run."
 msgstr ""
 
@@ -14802,7 +14799,7 @@
 msgid "\"unset\" must be followed by the name of an unset subcommand.\n"
 msgstr ""
 
-#: fbsd-nat.c:327 infcmd.c:3019 procfs.c:3552
+#: fbsd-nat.c:327 infcmd.c:3019 procfs.c:3473
 msgid "Not supported on this target."
 msgstr ""
 
@@ -16544,7 +16541,7 @@
 msgid "Could not compile regex to match '<file> (deleted)'"
 msgstr ""
 
-#: fbsd-nat.c:335 linux-tdep.c:763 procfs.c:3574
+#: fbsd-nat.c:335 linux-tdep.c:763 procfs.c:3495
 msgid "No current process: you must name one."
 msgstr ""
 
@@ -16575,7 +16572,7 @@
 msgstr ""
 
 #. No output for summary mode.
-#: fbsd-tdep.c:1131 linux-tdep.c:826 linux-tdep.c:1075 procfs.c:3509
+#: fbsd-tdep.c:1131 linux-tdep.c:826 linux-tdep.c:1075 procfs.c:3430
 msgid ""
 "Mapped address spaces:\n"
 "\n"
@@ -19865,7 +19862,7 @@
 msgid "Invalid target CPU."
 msgstr ""
 
-#: nto-procfs.c:703 procfs.c:1879
+#: nto-procfs.c:703 procfs.c:1800
 msgid "Attaching GDB to itself is not a good idea..."
 msgstr ""
 
@@ -20640,16 +20637,16 @@
 msgid " (cannot be evaluated in the current context)"
 msgstr ""
 
-#: printcmd.c:2539
+#: printcmd.c:2540
 msgid "format-control string and values to print"
 msgstr ""
 
-#: printcmd.c:2614
+#: printcmd.c:2615
 #, possible-c-format
 msgid "expected wchar_t argument for %%lc"
 msgstr ""
 
-#: printcmd.c:2646
+#: printcmd.c:2647
 msgid "long long not supported in printf"
 msgstr ""
 
@@ -20663,7 +20660,7 @@
 "Only for symbols with fixed locations (global or static scope)."
 msgstr ""
 
-#: printcmd.c:2758
+#: printcmd.c:2759
 msgid ""
 "Examine memory: x/FMT ADDRESS.\n"
 "ADDRESS is an expression for the memory address to examine.\n"
@@ -20812,7 +20809,7 @@
 msgid "Show the largest offset that will be printed in <symbol+1234> form."
 msgstr ""
 
-#: printcmd.c:2917
+#: printcmd.c:2918
 msgid ""
 "Tell GDB to only display the symbolic form of an address if the\n"
 "offset between the closest earlier symbol and the address is less than\n"
@@ -21027,126 +21024,126 @@
 msgid "procfs_find_LDT_entry: could not read gregs for %d:%ld."
 msgstr ""
 
-#: procfs.c:1886
+#: procfs.c:1807
 #, possible-c-format
 msgid "Attaching to program `%s', %s\n"
 msgstr ""
 
-#: procfs.c:1912 target.c:3175
+#: procfs.c:1833 target.c:3175
 #, possible-c-format
 msgid "Detaching from program: %s, %s\n"
 msgstr ""
 
-#: procfs.c:1933
+#: procfs.c:1854
 msgid "procfs: out of memory in 'attach'"
 msgstr ""
 
-#: procfs.c:2022
+#: procfs.c:1943
 msgid "Was stopped when attached, make it runnable again? "
 msgstr ""
 
-#: procfs.c:2065
+#: procfs.c:1986
 #, possible-c-format
 msgid "procfs: fetch_registers failed to find procinfo for %s"
 msgstr ""
 
-#: procfs.c:2114
+#: procfs.c:2035
 #, possible-c-format
 msgid "procfs: store_registers: failed to find procinfo for %s"
 msgstr ""
 
-#: procfs.c:2233
+#: procfs.c:2154
 #, possible-c-format
 msgid "procfs: couldn't stop process %d: wait returned %d."
 msgstr ""
 
-#: procfs.c:2339
+#: procfs.c:2260
 msgid "procfs: trapped on entry to "
 msgstr ""
 
-#: procfs.c:2350 procfs.c:2436
+#: procfs.c:2271 procfs.c:2357
 #, possible-c-format
 msgid "%ld syscall arguments:\n"
 msgstr ""
 
-#: procfs.c:2425
+#: procfs.c:2346
 msgid "procfs: trapped on exit from "
 msgstr ""
 
-#: procfs.c:2454
+#: procfs.c:2375
 #, possible-c-format
 msgid "Retry #%d:\n"
 msgstr ""
 
-#: procfs.c:2487
+#: procfs.c:2408
 msgid "child stopped for unknown reason:\n"
 msgstr ""
 
-#: procfs.c:2489
+#: procfs.c:2410
 msgid "... giving up..."
 msgstr ""
 
-#: procfs.c:2514
+#: procfs.c:2435
 msgid "procfs: ...giving up..."
 msgstr ""
 
-#: procfs.c:2741
+#: procfs.c:2662
 msgid ""
 "resume: target already running.  Pretend to resume, and hope for the best!"
 msgstr ""
 
-#: procfs.c:2777
+#: procfs.c:2698
 #, possible-c-format
 msgid "\tUsing the running image of %s %s via /proc.\n"
 msgstr ""
 
-#: procfs.c:2868
+#: procfs.c:2789
 msgid "procfs: out of memory in 'init_inferior'"
 msgstr ""
 
-#: procfs.c:2951
+#: procfs.c:2872
 msgid "procfs: create_procinfo failed in child."
 msgstr ""
 
 #. Not found.  This must be an error rather than merely passing
 #. the file to execlp(), because execlp() would try all the
 #. exec()s, causing GDB to get confused.
-#: procfs.c:3081
+#: procfs.c:3002
 #, possible-c-format
 msgid "procfs:%d -- Can't find shell %s in PATH"
 msgstr ""
 
-#: procfs.c:3595
+#: procfs.c:3516
 #, possible-c-format
 msgid "process %d flags:\n"
 msgstr ""
 
-#: procfs.c:3605
+#: procfs.c:3526
 #, possible-c-format
 msgid "thread %d flags:\n"
 msgstr ""
 
-#: procfs.c:3663
+#: procfs.c:3584
 msgid "you must be debugging a process to use this command."
 msgstr ""
 
-#: procfs.c:3666
+#: procfs.c:3587
 msgid "system call to trace"
 msgstr ""
 
-#: procfs.c:3707
+#: procfs.c:3628
 msgid "Give a trace of entries into the syscall."
 msgstr ""
 
-#: procfs.c:3709
+#: procfs.c:3630
 msgid "Give a trace of exits from the syscall."
 msgstr ""
 
-#: procfs.c:3711
+#: procfs.c:3632
 msgid "Cancel a trace of entries into the syscall."
 msgstr ""
 
-#: procfs.c:3713
+#: procfs.c:3634
 msgid "Cancel a trace of exits from the syscall."
 msgstr ""
 
@@ -21300,7 +21297,7 @@
 msgid "Command object already initialized."
 msgstr ""
 
-#: python/py-cmd.c:470 python/py-param.c:682
+#: python/py-param.c:682 python/py-cmd.c:470
 msgid "Invalid command class argument."
 msgstr ""
 
@@ -21355,10 +21352,10 @@
 msgid "internal error: Unhandled Python exception"
 msgstr ""
 
-#: python/py-xmethods.c:537 python/py-xmethods.c:544 python/py-xmethods.c:558
-#: python/py-xmethods.c:569 python/py-xmethods.c:578 python/python.c:309
-#: python/python.c:392 python/python.c:408 python/py-function.c:94
-#: python/py-prettyprint.c:519
+#: python/py-prettyprint.c:519 python/py-xmethods.c:537
+#: python/py-xmethods.c:544 python/py-xmethods.c:558 python/py-xmethods.c:569
+#: python/py-xmethods.c:578 python/py-function.c:94 python/python.c:309
+#: python/python.c:392 python/python.c:408
 msgid "Error while executing Python code."
 msgstr ""
 
@@ -25349,11 +25346,11 @@
 msgid "Cannot initialize thread debugging library: %s"
 msgstr ""
 
-#: sol-thread.c:1131
+#: sol-thread.c:1099
 msgid "info sol-thread: failed to get info for thread."
 msgstr ""
 
-#: sol-thread.c:1219
+#: sol-thread.c:1187
 msgid "Show info on Solaris user threads."
 msgstr ""
 
@@ -25887,7 +25884,7 @@
 msgid "%s preprocessor macro info.\n"
 msgstr ""
 
-#: source.c:1187
+#: source.c:1182
 msgid "invalid filename_display_string"
 msgstr ""
 
@@ -25895,70 +25892,70 @@
 msgid "Source file is more recent than executable."
 msgstr ""
 
-#: source.c:1292
+#: source.c:1287
 #, possible-c-format
 msgid "Line number %d out of range; %s has %d lines."
 msgstr ""
 
-#: source.c:1431
+#: source.c:1426
 msgid "No line number information available"
 msgstr ""
 
 #. Is there any case in which we get here, and have an address
 #. which the user would want to see?  If we have debugging symbols
 #. and no line numbers?
-#: source.c:1491
+#: source.c:1486
 #, possible-c-format
 msgid "Line number %d is out of range for \"%s\".\n"
 msgstr ""
 
-#: source.c:1526
+#: source.c:1521
 msgid "Expression not found"
 msgstr ""
 
-#: source.c:1586
+#: source.c:1581
 msgid "Expression not found\n"
 msgstr ""
 
-#: source.c:1703
+#: source.c:1698
 msgid "Too many arguments in command"
 msgstr ""
 
-#: source.c:1712
+#: source.c:1707
 #, possible-c-format
 msgid "Source path substitution rule matching `%s':\n"
 msgstr ""
 
-#: source.c:1714
+#: source.c:1709
 msgid "List of all source path substitution rules:\n"
 msgstr ""
 
-#: source.c:1737 source.c:1788
+#: source.c:1732 source.c:1783
 msgid "Incorrect usage, too many arguments in command"
 msgstr ""
 
-#: source.c:1747
+#: source.c:1742
 msgid "Delete all source path substitution rules? "
 msgstr ""
 
-#: source.c:1748
+#: source.c:1743
 msgid "Canceled"
 msgstr ""
 
-#: source.c:1770
+#: source.c:1765
 #, possible-c-format
 msgid "No substitution rule defined for `%s'"
 msgstr ""
 
-#: source.c:1785
+#: source.c:1780
 msgid "Incorrect usage, too few arguments in command"
 msgstr ""
 
-#: source.c:1791
+#: source.c:1786
 msgid "First argument must be at least one character long"
 msgstr ""
 
-#: source.c:1852
+#: source.c:1847
 msgid ""
 "Add directory DIR to beginning of search path for source files.\n"
 "Forget cached info on source file locations and line positions.\n"
@@ -25967,15 +25964,15 @@
 "With no argument, reset the search path to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1868
+#: source.c:1863
 msgid "Set the search path for finding source files."
 msgstr ""
 
-#: source.c:1870
+#: source.c:1865
 msgid "Show the search path for finding source files."
 msgstr ""
 
-#: source.c:1872
+#: source.c:1867
 msgid ""
 "$cwd in the path means the current working directory.\n"
 "$cdir in the path means the compilation directory of the source file.\n"
@@ -25984,11 +25981,11 @@
 "Setting the value to an empty string sets it to $cdir:$cwd, the default."
 msgstr ""
 
-#: source.c:1883
+#: source.c:1878
 msgid "Information about the current source file."
 msgstr ""
 
-#: source.c:1885
+#: source.c:1880
 msgid ""
 "Core addresses of the code for a source line.\n"
 "Line can be specified as\n"
@@ -26003,28 +26000,28 @@
 "The address is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:1897
+#: source.c:1892
 msgid ""
 "Search for regular expression (see regex(3)) from last line listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:1903
+#: source.c:1898
 msgid ""
 "Search backward for regular expression (see regex(3)) from last line "
 "listed.\n"
 "The matching line number is also stored as the value of \"$_\"."
 msgstr ""
 
-#: source.c:1908
+#: source.c:1903
 msgid "Set number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:1909
+#: source.c:1904
 msgid "Show number of source lines gdb will list by default."
 msgstr ""
 
-#: source.c:1910
+#: source.c:1905
 msgid ""
 "Use this to choose how many source lines the \"list\" displays (unless\n"
 "the \"list\" argument explicitly specifies some other number).\n"
@@ -26054,15 +26051,15 @@
 "is not specified, print all substitution rules."
 msgstr ""
 
-#: source.c:1947
+#: source.c:1942
 msgid "Set how to display filenames."
 msgstr ""
 
-#: source.c:1948
+#: source.c:1943
 msgid "Show how to display filenames."
 msgstr ""
 
-#: source.c:1949
+#: source.c:1944
 msgid ""
 "filename-display can be:\n"
 "  basename - display only basename of a filename\n"
@@ -26743,7 +26740,7 @@
 "or both.  Note that one or both of these values may be <optimized out>."
 msgstr ""
 
-#: stap-probe.c:180
+#: stap-probe.c:186
 #, possible-c-format
 msgid ""
 "Probe '%s' apparently does not have arguments, but \n"
@@ -26751,133 +26748,133 @@
 "Please report this bug."
 msgstr ""
 
-#: stap-probe.c:272
+#: stap-probe.c:278
 #, possible-c-format
 msgid "SystemTap Probe expression debugging is %s.\n"
 msgstr ""
 
-#: stap-probe.c:417
+#: stap-probe.c:423
 #, possible-c-format
 msgid "Invalid opcode in expression `%s' for SystemTapprobe"
 msgstr ""
 
-#: stap-probe.c:466
+#: stap-probe.c:472
 #, possible-c-format
 msgid "Undefined bitness for probe '%s'."
 msgstr ""
 
-#: stap-probe.c:736
+#: stap-probe.c:742
 #, possible-c-format
 msgid "Invalid register displacement syntax on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:820
+#: stap-probe.c:826
 #, possible-c-format
 msgid "Missing register name suffix on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:830
+#: stap-probe.c:836
 #, possible-c-format
 msgid "Missing indirection suffix on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:906
+#: stap-probe.c:912
 #, possible-c-format
 msgid "Invalid operator `%c' for register displacement on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:959 stap-probe.c:987
+#: stap-probe.c:965 stap-probe.c:993
 #, possible-c-format
 msgid "Invalid constant suffix on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:965
+#: stap-probe.c:971
 #, possible-c-format
 msgid "Unknown numeric token on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:994
+#: stap-probe.c:1000
 #, possible-c-format
 msgid "Operator `%c' not recognized on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:1026
+#: stap-probe.c:1032
 #, possible-c-format
 msgid "Missign close-paren on expression `%s'."
 msgstr ""
 
-#: stap-probe.c:1034
+#: stap-probe.c:1040
 #, possible-c-format
 msgid "Cannot parse expression `%s'."
 msgstr ""
 
-#: stap-probe.c:1077
+#: stap-probe.c:1083
 #, possible-c-format
 msgid "Invalid operator `%c' on expression `%s'."
 msgstr ""
 
 #. We have an error, because we don't expect anything
 #. except 1, 2, 4 and 8.
-#: stap-probe.c:1248
+#: stap-probe.c:1254
 #, possible-c-format
 msgid "unrecognized bitness %s%c' for probe `%s'"
 msgstr ""
 
-#: stap-probe.c:1316
+#: stap-probe.c:1322
 msgid ""
 "The SystemTap SDT probe support is not fully implemented on this target;\n"
 "you will not be able to inspect the arguments of the probes.\n"
 "Please report a bug against GDB requesting a port to this target."
 msgstr ""
 
-#: stap-probe.c:1434
+#: stap-probe.c:1440
 msgid "Could not read the value of a SystemTap semaphore."
 msgstr ""
 
-#: stap-probe.c:1450
+#: stap-probe.c:1456
 msgid "Could not write the value of a SystemTap semaphore."
 msgstr ""
 
-#: stap-probe.c:1525
+#: stap-probe.c:1531
 #, possible-c-format
 msgid "corrupt probe name when reading `%s'"
 msgstr ""
 
-#: stap-probe.c:1561
+#: stap-probe.c:1567
 #, possible-c-format
 msgid "corrupt probe argument when reading `%s'"
 msgstr ""
 
-#: stap-probe.c:1601
+#: stap-probe.c:1607
 #, possible-c-format
 msgid "could not obtain base address for SystemTap section on objfile `%s'."
 msgstr ""
 
 #. If we are here, it means we have failed to parse every known
 #. probe.
-#: stap-probe.c:1672
+#: stap-probe.c:1678
 msgid "could not parse SystemTap probe(s) from inferior"
 msgstr ""
 
-#: stap-probe.c:1693
+#: stap-probe.c:1699
 msgid "Semaphore"
 msgstr ""
 
-#: stap-probe.c:1713
+#: stap-probe.c:1719
 msgid "Set SystemTap expression debugging."
 msgstr ""
 
-#: stap-probe.c:1714
+#: stap-probe.c:1720
 msgid "Show SystemTap expression debugging."
 msgstr ""
 
-#: stap-probe.c:1715
+#: stap-probe.c:1721
 msgid ""
 "When non-zero, the internal representation of SystemTap expressions will be "
 "printed."
 msgstr ""
 
-#: stap-probe.c:1722
+#: stap-probe.c:1728
 msgid ""
 "Show information about SystemTap static probes.\n"
 "Usage: info probes stap [PROVIDER [NAME [OBJECT]]]\n"
@@ -27935,8 +27932,7 @@
 msgid "Attempt to unpush the dummy target"
 msgstr ""
 
-#: fbsd-tdep.c:2036 fbsd-tdep.c:2052 fbsd-tdep.c:2061 target.c:687
-#: target.c:772
+#: fbsd-tdep.c:2036 fbsd-tdep.c:2052 fbsd-tdep.c:2061 target.c:687 target.c:772
 msgid "Cannot find thread-local variables on this target"
 msgstr ""
 
@@ -28913,7 +28909,7 @@
 msgid "Ignoring trace file definition \"%s\""
 msgstr ""
 
-#: tracefile.c:299 tracefile-tfile.c:846
+#: tracefile-tfile.c:846 tracefile.c:299
 #, possible-c-format
 msgid "Unknown block type '%c' (0x%x) in trace frame"
 msgstr ""
@@ -29807,11 +29803,11 @@
 "Usage: > [win] [n]\n"
 msgstr ""
 
-#: tui/tui-win.c:1457
+#: tui/tui-win.c:1468
 msgid "Set the kind of border for TUI windows."
 msgstr ""
 
-#: tui/tui-win.c:1458
+#: tui/tui-win.c:1469
 msgid "Show the kind of border for TUI windows."
 msgstr ""
 
@@ -29823,11 +29819,11 @@
 "acs             use the Alternate Character Set"
 msgstr ""
 
-#: tui/tui-win.c:1469
+#: tui/tui-win.c:1480
 msgid "Set the attribute mode to use for the TUI window borders."
 msgstr ""
 
-#: tui/tui-win.c:1470
+#: tui/tui-win.c:1481
 msgid "Show the attribute mode to use for the TUI window borders."
 msgstr ""
 
@@ -29843,11 +29839,11 @@
 "bold-standout   use extra bright or bold with standout mode"
 msgstr ""
 
-#: tui/tui-win.c:1485
+#: tui/tui-win.c:1496
 msgid "Set the attribute mode to use for the active TUI window border."
 msgstr ""
 
-#: tui/tui-win.c:1486
+#: tui/tui-win.c:1497
 msgid "Show the attribute mode to use for the active TUI window border."
 msgstr ""
 
@@ -30247,91 +30243,91 @@
 msgid "Number of characters gdb thinks are in a line is %s.\n"
 msgstr ""
 
-#: utils.c:2819
+#: utils.c:2834
 #, possible-c-format
 msgid "Timestamping debugging messages is %s.\n"
 msgstr ""
 
-#: utils.c:3424
+#: utils.c:3439
 msgid "Set number of characters where GDB should wrap lines of its output."
 msgstr ""
 
-#: utils.c:3425
+#: utils.c:3440
 msgid "Show number of characters where GDB should wrap lines of its output."
 msgstr ""
 
-#: utils.c:3426
+#: utils.c:3441
 msgid ""
 "This affects where GDB wraps its output to fit the screen width.\n"
 "Setting this to \"unlimited\" or zero prevents GDB from wrapping its output."
 msgstr ""
 
-#: utils.c:3433
+#: utils.c:3448
 msgid "Set number of lines in a page for GDB output pagination."
 msgstr ""
 
-#: utils.c:3434
+#: utils.c:3449
 msgid "Show number of lines in a page for GDB output pagination."
 msgstr ""
 
-#: utils.c:3435
+#: utils.c:3450
 msgid ""
 "This affects the number of lines after which GDB will pause\n"
 "its output and ask you whether to continue.\n"
 "Setting this to \"unlimited\" or zero causes GDB never pause during output."
 msgstr ""
 
-#: utils.c:3444
+#: utils.c:3459
 msgid "Set state of GDB output pagination."
 msgstr ""
 
-#: utils.c:3445
+#: utils.c:3460
 msgid "Show state of GDB output pagination."
 msgstr ""
 
-#: utils.c:3446
+#: utils.c:3461
 msgid ""
 "When pagination is ON, GDB pauses at end of each screenful of\n"
 "its output and asks you whether to continue.\n"
 "Turning pagination off is an alternative to \"set height unlimited\"."
 msgstr ""
 
-#: utils.c:3455
+#: utils.c:3470
 msgid "Set printing of 8-bit characters in strings as \\nnn."
 msgstr ""
 
-#: utils.c:3456
+#: utils.c:3471
 msgid "Show printing of 8-bit characters in strings as \\nnn."
 msgstr ""
 
-#: utils.c:3463
+#: utils.c:3478
 msgid "Set timestamping of debugging messages."
 msgstr ""
 
-#: utils.c:3464
+#: utils.c:3479
 msgid "Show timestamping of debugging messages."
 msgstr ""
 
-#: utils.c:3465
+#: utils.c:3480
 msgid ""
 "When set, debugging messages will be marked with seconds and microseconds."
 msgstr ""
 
-#: utils.c:2923
+#: utils.c:2938
 #, possible-c-format
 msgid "invalid hex \"%s\""
 msgstr ""
 
-#: utils.c:2936
+#: utils.c:2951
 #, possible-c-format
 msgid "invalid decimal \"%s\""
 msgstr ""
 
-#: utils.c:3080
+#: utils.c:3095
 msgid "process-id to attach"
 msgstr ""
 
-#: utils.c:3086
+#: utils.c:3101
 #, possible-c-format
 msgid "Illegal process-id: %s."
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gettext-runtime.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gettext-runtime.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gettext-runtime.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gettext-runtime.po	2020-07-08 13:53:54.000000000 +0000
@@ -20,8 +20,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:58+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: gnulib-lib/closeout.c:66
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gettext-tools.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gettext-tools.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gettext-tools.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gettext-tools.po	2020-07-08 13:53:53.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:58+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:50+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: gnulib-lib/argmatch.c:133
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/git-gui.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/git-gui.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/git-gui.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/git-gui.po	2020-07-08 13:53:59.000000000 +0000
@@ -31,36 +31,36 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:18+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:07+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
-#: git-gui.sh:41 git-gui.sh:793 git-gui.sh:807 git-gui.sh:820 git-gui.sh:903
-#: git-gui.sh:922
+#: git-gui.sh:917 git-gui.sh:931 git-gui.sh:944 git-gui.sh:1034 git-gui.sh:1053
+#: git-gui.sh:3212
 msgid "git-gui: fatal error"
 msgstr "git-gui: 致命错误"
 
-#: git-gui.sh:743
+#: git-gui.sh:847
 #, tcl-format
 msgid "Invalid font specified in %s:"
 msgstr "%s 中指定的字体无效:"
 
-#: git-gui.sh:779
+#: git-gui.sh:901
 msgid "Main Font"
 msgstr "主要字体"
 
-#: git-gui.sh:780
+#: git-gui.sh:902
 msgid "Diff/Console Font"
 msgstr "Diff/控制终端字体"
 
-#: git-gui.sh:794
+#: git-gui.sh:918
 msgid "Cannot find git in PATH."
 msgstr "PATH 中没有找到 git"
 
-#: git-gui.sh:821
+#: git-gui.sh:945
 msgid "Cannot parse Git version string:"
 msgstr "无法解析 Git 的版本信息:"
 
-#: git-gui.sh:839
+#: git-gui.sh:970
 #, tcl-format
 msgid ""
 "Git version cannot be determined.\n"
@@ -79,39 +79,39 @@
 "\n"
 "是否假定 '%s' 为版本 1.5.0?\n"
 
-#: git-gui.sh:1128
+#: git-gui.sh:1267
 msgid "Git directory not found:"
 msgstr "Git 目录无法找到:"
 
-#: git-gui.sh:1146
+#: git-gui.sh:1301
 msgid "Cannot move to top of working directory:"
 msgstr "无法移动到工作根目录:"
 
-#: git-gui.sh:1154
+#: git-gui.sh:1309
 msgid "Cannot use bare repository:"
 msgstr ""
 
-#: git-gui.sh:1162
+#: git-gui.sh:1317
 msgid "No working directory"
 msgstr "没有工作目录"
 
-#: git-gui.sh:1334 lib/checkout_op.tcl:306
+#: git-gui.sh:1491 lib/checkout_op.tcl:306
 msgid "Refreshing file status..."
 msgstr "更新文件状态..."
 
-#: git-gui.sh:1390
+#: git-gui.sh:1551
 msgid "Scanning for modified files ..."
 msgstr "扫描修改过的文件 ..."
 
-#: git-gui.sh:1454
+#: git-gui.sh:1629
 msgid "Calling prepare-commit-msg hook..."
 msgstr "调用 prepare-commit-msg 命令"
 
-#: git-gui.sh:1471
+#: git-gui.sh:1646
 msgid "Commit declined by prepare-commit-msg hook."
 msgstr "提交被 prepare-commit-msg 命令拒绝"
 
-#: git-gui.sh:1629 lib/browser.tcl:246
+#: git-gui.sh:1804 lib/browser.tcl:252
 msgid "Ready."
 msgstr "就绪"
 
@@ -120,52 +120,52 @@
 msgid "Displaying only %s of %s files."
 msgstr ""
 
-#: git-gui.sh:1913
+#: git-gui.sh:2091
 msgid "Unmodified"
 msgstr "未修改"
 
-#: git-gui.sh:1915
+#: git-gui.sh:2093
 msgid "Modified, not staged"
 msgstr "修改但未缓存"
 
-#: git-gui.sh:1916 git-gui.sh:1924
+#: git-gui.sh:2094 git-gui.sh:2106
 msgid "Staged for commit"
 msgstr "缓存为提交"
 
-#: git-gui.sh:1917 git-gui.sh:1925
+#: git-gui.sh:2095 git-gui.sh:2107
 msgid "Portions staged for commit"
 msgstr "部分缓存为提交"
 
-#: git-gui.sh:1918 git-gui.sh:1926
+#: git-gui.sh:2096 git-gui.sh:2108
 msgid "Staged for commit, missing"
 msgstr "缓存为提交, 不存在"
 
-#: git-gui.sh:1920
+#: git-gui.sh:2098
 msgid "File type changed, not staged"
 msgstr "文件类型改变，未应用"
 
-#: git-gui.sh:1921
+#: git-gui.sh:2101
 msgid "File type changed, staged"
 msgstr "文件类型改变，应用"
 
-#: git-gui.sh:1923
+#: git-gui.sh:2105
 msgid "Untracked, not staged"
 msgstr "未跟踪, 未缓存"
 
-#: git-gui.sh:1928
+#: git-gui.sh:2110
 msgid "Missing"
 msgstr "不存在"
 
-#: git-gui.sh:1929
+#: git-gui.sh:2111
 msgid "Staged for removal"
 msgstr "缓存为删除"
 
-#: git-gui.sh:1930
+#: git-gui.sh:2112
 msgid "Staged for removal, still present"
 msgstr "缓存为删除, 但仍存在"
 
-#: git-gui.sh:1932 git-gui.sh:1933 git-gui.sh:1934 git-gui.sh:1935
-#: git-gui.sh:1936 git-gui.sh:1937
+#: git-gui.sh:2114 git-gui.sh:2115 git-gui.sh:2116 git-gui.sh:2117
+#: git-gui.sh:2118 git-gui.sh:2119
 msgid "Requires merge resolution"
 msgstr "需要解决合并冲突"
 
@@ -173,148 +173,147 @@
 msgid "Starting gitk... please wait..."
 msgstr "启动 gitk... 请等待..."
 
-#: git-gui.sh:1984
+#: git-gui.sh:2164
 msgid "Couldn't find gitk in PATH"
 msgstr "在 PATH 中找不到 gitk"
 
-#: git-gui.sh:2043
+#: git-gui.sh:2224
 msgid "Couldn't find git gui in PATH"
 msgstr ""
 
-#: git-gui.sh:2455 lib/choose_repository.tcl:36
+#: git-gui.sh:2726 lib/choose_repository.tcl:53
 msgid "Repository"
 msgstr "版本库(repository)"
 
-#: git-gui.sh:2456
+#: git-gui.sh:2727
 msgid "Edit"
 msgstr "编辑"
 
-#: git-gui.sh:2458 lib/choose_rev.tcl:561
+#: git-gui.sh:2729 lib/choose_rev.tcl:567
 msgid "Branch"
 msgstr "分支(branch)"
 
-#: git-gui.sh:2461 lib/choose_rev.tcl:548
+#: git-gui.sh:2732 lib/choose_rev.tcl:554
 msgid "Commit@@noun"
 msgstr "提交(commit)"
 
-#: git-gui.sh:2464 lib/merge.tcl:121 lib/merge.tcl:150 lib/merge.tcl:168
+#: git-gui.sh:2735 lib/merge.tcl:127 lib/merge.tcl:174
 msgid "Merge"
 msgstr "合并(merge)"
 
-#: git-gui.sh:2465 lib/choose_rev.tcl:557
+#: git-gui.sh:2736 lib/choose_rev.tcl:563
 msgid "Remote"
 msgstr "远端(remote)"
 
-#: git-gui.sh:2468
+#: git-gui.sh:2739
 msgid "Tools"
 msgstr "工具"
 
-#: git-gui.sh:2477
+#: git-gui.sh:2748
 msgid "Explore Working Copy"
 msgstr "浏览工作拷贝"
 
-#: git-gui.sh:2483
+#: git-gui.sh:2772
 msgid "Browse Current Branch's Files"
 msgstr "浏览当前分支上的文件"
 
-#: git-gui.sh:2487
+#: git-gui.sh:2776
 msgid "Browse Branch Files..."
 msgstr "浏览分支上的文件..."
 
-#: git-gui.sh:2492
+#: git-gui.sh:2781
 msgid "Visualize Current Branch's History"
 msgstr "图示当前分支的历史"
 
-#: git-gui.sh:2496
+#: git-gui.sh:2785
 msgid "Visualize All Branch History"
 msgstr "图示所有分支的历史"
 
-#: git-gui.sh:2503
+#: git-gui.sh:2792
 #, tcl-format
 msgid "Browse %s's Files"
 msgstr "浏览 %s 上的文件"
 
-#: git-gui.sh:2505
+#: git-gui.sh:2794
 #, tcl-format
 msgid "Visualize %s's History"
 msgstr "图示 %s 分支的历史"
 
-#: git-gui.sh:2510 lib/database.tcl:27 lib/database.tcl:67
+#: git-gui.sh:2799 lib/database.tcl:40
 msgid "Database Statistics"
 msgstr "数据库统计信息"
 
-#: git-gui.sh:2513 lib/database.tcl:34
+#: git-gui.sh:2802 lib/database.tcl:33
 msgid "Compress Database"
 msgstr "压缩数据库"
 
-#: git-gui.sh:2516
+#: git-gui.sh:2805
 msgid "Verify Database"
 msgstr "验证数据库"
 
-#: git-gui.sh:2523 git-gui.sh:2527 git-gui.sh:2531 lib/shortcut.tcl:8
-#: lib/shortcut.tcl:40 lib/shortcut.tcl:72
+#: git-gui.sh:2812 git-gui.sh:2816 git-gui.sh:2820
 msgid "Create Desktop Icon"
 msgstr "创建桌面图标"
 
-#: git-gui.sh:2539 lib/choose_repository.tcl:183 lib/choose_repository.tcl:191
+#: git-gui.sh:2828 lib/choose_repository.tcl:209 lib/choose_repository.tcl:217
 msgid "Quit"
 msgstr "退出"
 
-#: git-gui.sh:2547
+#: git-gui.sh:2836
 msgid "Undo"
 msgstr "撤销"
 
-#: git-gui.sh:2550
+#: git-gui.sh:2839
 msgid "Redo"
 msgstr "重做"
 
-#: git-gui.sh:2554 git-gui.sh:3109
+#: git-gui.sh:2843 git-gui.sh:3461
 msgid "Cut"
 msgstr "剪切"
 
-#: git-gui.sh:2557 git-gui.sh:3112 git-gui.sh:3186 git-gui.sh:3259
+#: git-gui.sh:2846 git-gui.sh:3464 git-gui.sh:3540 git-gui.sh:3633
 #: lib/console.tcl:69
 msgid "Copy"
 msgstr "复制"
 
-#: git-gui.sh:2560 git-gui.sh:3115
+#: git-gui.sh:2849 git-gui.sh:3467
 msgid "Paste"
 msgstr "粘贴"
 
-#: git-gui.sh:2563 git-gui.sh:3118 lib/branch_delete.tcl:26
-#: lib/remote_branch_delete.tcl:38
+#: git-gui.sh:2852 git-gui.sh:3470 lib/remote_branch_delete.tcl:39
+#: lib/branch_delete.tcl:28
 msgid "Delete"
 msgstr "删除"
 
-#: git-gui.sh:2567 git-gui.sh:3122 git-gui.sh:3263 lib/console.tcl:71
+#: git-gui.sh:2856 git-gui.sh:3474 git-gui.sh:3637 lib/console.tcl:71
 msgid "Select All"
 msgstr "全选"
 
-#: git-gui.sh:2576
+#: git-gui.sh:2865
 msgid "Create..."
 msgstr "新建..."
 
-#: git-gui.sh:2582
+#: git-gui.sh:2871
 msgid "Checkout..."
 msgstr "Checkout..."
 
-#: git-gui.sh:2588
+#: git-gui.sh:2877
 msgid "Rename..."
 msgstr "更名..."
 
-#: git-gui.sh:2593
+#: git-gui.sh:2882
 msgid "Delete..."
 msgstr "删除..."
 
-#: git-gui.sh:2598
+#: git-gui.sh:2887
 msgid "Reset..."
 msgstr "复位(Reset)..."
 
-#: git-gui.sh:2608
+#: git-gui.sh:2897
 msgid "Done"
 msgstr "完成"
 
-#: git-gui.sh:2610
+#: git-gui.sh:2899
 msgid "Commit@@verb"
 msgstr "提交"
 
@@ -322,230 +321,230 @@
 msgid "New Commit"
 msgstr "新建提交"
 
-#: git-gui.sh:2627 git-gui.sh:3057
+#: git-gui.sh:2908 git-gui.sh:3400
 msgid "Amend Last Commit"
 msgstr "修正上次提交"
 
-#: git-gui.sh:2637 git-gui.sh:3011 lib/remote_branch_delete.tcl:99
+#: git-gui.sh:2918 git-gui.sh:3361 lib/remote_branch_delete.tcl:101
 msgid "Rescan"
 msgstr "重新扫描"
 
-#: git-gui.sh:2643
+#: git-gui.sh:2924
 msgid "Stage To Commit"
 msgstr "缓存为提交"
 
-#: git-gui.sh:2649
+#: git-gui.sh:2930
 msgid "Stage Changed Files To Commit"
 msgstr "缓存修改的文件为提交"
 
-#: git-gui.sh:2655
+#: git-gui.sh:2936
 msgid "Unstage From Commit"
 msgstr "从本次提交撤除"
 
-#: git-gui.sh:2661 lib/index.tcl:412
+#: git-gui.sh:2942 lib/index.tcl:521
 msgid "Revert Changes"
 msgstr "撤销修改"
 
-#: git-gui.sh:2669 git-gui.sh:3310 git-gui.sh:3341
+#: git-gui.sh:2950 git-gui.sh:3700 git-gui.sh:3731
 msgid "Show Less Context"
 msgstr "显示更少上下文"
 
-#: git-gui.sh:2673 git-gui.sh:3314 git-gui.sh:3345
+#: git-gui.sh:2954 git-gui.sh:3704 git-gui.sh:3735
 msgid "Show More Context"
 msgstr "显示更多上下文"
 
-#: git-gui.sh:2680 git-gui.sh:3024 git-gui.sh:3133
+#: git-gui.sh:2961 git-gui.sh:3374 git-gui.sh:3485
 msgid "Sign Off"
 msgstr "签名(Sign Off)"
 
-#: git-gui.sh:2696
+#: git-gui.sh:2977
 msgid "Local Merge..."
 msgstr "本地合并..."
 
-#: git-gui.sh:2701
+#: git-gui.sh:2982
 msgid "Abort Merge..."
 msgstr "中止合并..."
 
-#: git-gui.sh:2713 git-gui.sh:2741
+#: git-gui.sh:2994 git-gui.sh:3022
 msgid "Add..."
 msgstr "添加..."
 
-#: git-gui.sh:2717
+#: git-gui.sh:2998
 msgid "Push..."
 msgstr "上传..."
 
-#: git-gui.sh:2721
+#: git-gui.sh:3002
 msgid "Delete Branch..."
 msgstr "删除分支"
 
-#: git-gui.sh:2731 git-gui.sh:3292
+#: git-gui.sh:3012 git-gui.sh:3666
 msgid "Options..."
 msgstr "选项..."
 
-#: git-gui.sh:2742
+#: git-gui.sh:3023
 msgid "Remove..."
 msgstr "移除..."
 
-#: git-gui.sh:2751 lib/choose_repository.tcl:50
+#: git-gui.sh:3032 lib/choose_repository.tcl:67
 msgid "Help"
 msgstr "帮助"
 
-#: git-gui.sh:2755 git-gui.sh:2759 lib/about.tcl:14
-#: lib/choose_repository.tcl:44 lib/choose_repository.tcl:53
+#: git-gui.sh:3036 git-gui.sh:3040 lib/choose_repository.tcl:61
+#: lib/choose_repository.tcl:70 lib/about.tcl:14
 #, tcl-format
 msgid "About %s"
 msgstr "关于 %s"
 
-#: git-gui.sh:2783
+#: git-gui.sh:3064
 msgid "Online Documentation"
 msgstr "在线文档"
 
-#: git-gui.sh:2786 lib/choose_repository.tcl:47 lib/choose_repository.tcl:56
+#: git-gui.sh:3067 lib/choose_repository.tcl:64 lib/choose_repository.tcl:73
 msgid "Show SSH Key"
 msgstr "显示 SSH 密钥"
 
-#: git-gui.sh:2893
+#: git-gui.sh:3213
 #, tcl-format
 msgid "fatal: cannot stat path %s: No such file or directory"
 msgstr "致命错误: 无法获取路径 %s 的信息: 该文件或目录不存在"
 
-#: git-gui.sh:2926
+#: git-gui.sh:3246
 msgid "Current Branch:"
 msgstr "当前分支:"
 
-#: git-gui.sh:2947
+#: git-gui.sh:3293
 msgid "Staged Changes (Will Commit)"
 msgstr "已缓存的改动 (将被提交)"
 
-#: git-gui.sh:2967
+#: git-gui.sh:3271
 msgid "Unstaged Changes"
 msgstr "未缓存的改动"
 
-#: git-gui.sh:3017
+#: git-gui.sh:3367
 msgid "Stage Changed"
 msgstr "缓存改动"
 
-#: git-gui.sh:3036 lib/transport.tcl:104 lib/transport.tcl:193
+#: git-gui.sh:3386 lib/transport.tcl:137
 msgid "Push"
 msgstr "上传"
 
-#: git-gui.sh:3071
+#: git-gui.sh:3413
 msgid "Initial Commit Message:"
 msgstr "初始的提交描述:"
 
-#: git-gui.sh:3072
+#: git-gui.sh:3414
 msgid "Amended Commit Message:"
 msgstr "修正的提交描述:"
 
-#: git-gui.sh:3073
+#: git-gui.sh:3415
 msgid "Amended Initial Commit Message:"
 msgstr "修正的初始提交描述:"
 
-#: git-gui.sh:3074
+#: git-gui.sh:3416
 msgid "Amended Merge Commit Message:"
 msgstr "修正的合并提交描述:"
 
-#: git-gui.sh:3075
+#: git-gui.sh:3417
 msgid "Merge Commit Message:"
 msgstr "合并提交描述:"
 
-#: git-gui.sh:3076
+#: git-gui.sh:3418
 msgid "Commit Message:"
 msgstr "提交描述:"
 
-#: git-gui.sh:3125 git-gui.sh:3267 lib/console.tcl:73
+#: git-gui.sh:3477 git-gui.sh:3641 lib/console.tcl:73
 msgid "Copy All"
 msgstr "全部复制"
 
-#: git-gui.sh:3149 lib/blame.tcl:104
+#: git-gui.sh:3501 lib/blame.tcl:106
 msgid "File:"
 msgstr "文件:"
 
-#: git-gui.sh:3255
+#: git-gui.sh:3629
 msgid "Refresh"
 msgstr "刷新"
 
-#: git-gui.sh:3276
+#: git-gui.sh:3650
 msgid "Decrease Font Size"
 msgstr "缩小字体"
 
-#: git-gui.sh:3280
+#: git-gui.sh:3654
 msgid "Increase Font Size"
 msgstr "放大字体"
 
-#: git-gui.sh:3288 lib/blame.tcl:281
+#: git-gui.sh:3662 lib/blame.tcl:296
 msgid "Encoding"
 msgstr "编码"
 
-#: git-gui.sh:3299
+#: git-gui.sh:3673
 msgid "Apply/Reverse Hunk"
 msgstr "应用/撤消此修改块"
 
-#: git-gui.sh:3304
+#: git-gui.sh:3678
 msgid "Apply/Reverse Line"
 msgstr "应用/恢复行"
 
-#: git-gui.sh:3323
+#: git-gui.sh:3713
 msgid "Run Merge Tool"
 msgstr "运行合并操作"
 
-#: git-gui.sh:3328
+#: git-gui.sh:3718
 msgid "Use Remote Version"
 msgstr "使用外部版本"
 
-#: git-gui.sh:3332
+#: git-gui.sh:3722
 msgid "Use Local Version"
 msgstr "使用本地版本"
 
-#: git-gui.sh:3336
+#: git-gui.sh:3726
 msgid "Revert To Base"
 msgstr "返回到初始"
 
-#: git-gui.sh:3354
+#: git-gui.sh:3744
 msgid "Visualize These Changes In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3358
+#: git-gui.sh:3748
 msgid "Visualize Current Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3362
+#: git-gui.sh:3752
 msgid "Visualize All Branch History In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3367
+#: git-gui.sh:3757
 msgid "Start git gui In The Submodule"
 msgstr ""
 
-#: git-gui.sh:3389
+#: git-gui.sh:3793
 msgid "Unstage Hunk From Commit"
 msgstr "从提交中撤除修改块"
 
-#: git-gui.sh:3391
+#: git-gui.sh:3797
 msgid "Unstage Lines From Commit"
 msgstr ""
 
-#: git-gui.sh:3393
+#: git-gui.sh:3800
 msgid "Unstage Line From Commit"
 msgstr "提交中未应用的行"
 
-#: git-gui.sh:3396
+#: git-gui.sh:3804
 msgid "Stage Hunk For Commit"
 msgstr "缓存修改块为提交"
 
-#: git-gui.sh:3398
+#: git-gui.sh:3808
 msgid "Stage Lines For Commit"
 msgstr ""
 
-#: git-gui.sh:3400
+#: git-gui.sh:3811
 msgid "Stage Line For Commit"
 msgstr "提交中应用的行"
 
-#: git-gui.sh:3424
+#: git-gui.sh:3861
 msgid "Initializing..."
 msgstr "初始化..."
 
-#: git-gui.sh:3541
+#: git-gui.sh:4017
 #, tcl-format
 msgid ""
 "Possible environment issues exist.\n"
@@ -560,7 +559,7 @@
 "由 %s 执行的 Git 子进程可能忽略下列环境变量:\n"
 "\n"
 
-#: git-gui.sh:3570
+#: git-gui.sh:4046
 msgid ""
 "\n"
 "This is due to a known issue with the\n"
@@ -570,7 +569,7 @@
 "这是由 Cygwin 发布的 Tcl 代码中一个\n"
 "已知问题所引起."
 
-#: git-gui.sh:3575
+#: git-gui.sh:4051
 #, tcl-format
 msgid ""
 "\n"
@@ -593,137 +592,136 @@
 msgid "File Viewer"
 msgstr "文件查看器"
 
-#: lib/blame.tcl:78
+#: lib/blame.tcl:80
 msgid "Commit:"
 msgstr "提交:"
 
-#: lib/blame.tcl:271
+#: lib/blame.tcl:282
 msgid "Copy Commit"
 msgstr "复制提交"
 
-#: lib/blame.tcl:275
+#: lib/blame.tcl:286
 msgid "Find Text..."
 msgstr "查找文本..."
 
-#: lib/blame.tcl:284
+#: lib/blame.tcl:299
 msgid "Do Full Copy Detection"
 msgstr "进行全局拷贝检测"
 
-#: lib/blame.tcl:288
+#: lib/blame.tcl:303
 msgid "Show History Context"
 msgstr "显示历史信息"
 
-#: lib/blame.tcl:291
+#: lib/blame.tcl:306
 msgid "Blame Parent Commit"
 msgstr ""
 
-#: lib/blame.tcl:450
+#: lib/blame.tcl:468
 #, tcl-format
 msgid "Reading %s..."
 msgstr "读取 %s..."
 
-#: lib/blame.tcl:557
+#: lib/blame.tcl:596
 msgid "Loading copy/move tracking annotations..."
 msgstr "装载复制/移动跟踪标注..."
 
-#: lib/blame.tcl:577
+#: lib/blame.tcl:613
 msgid "lines annotated"
 msgstr "标注行"
 
-#: lib/blame.tcl:769
+#: lib/blame.tcl:815
 msgid "Loading original location annotations..."
 msgstr "装载原始位置标注..."
 
-#: lib/blame.tcl:772
+#: lib/blame.tcl:818
 msgid "Annotation complete."
 msgstr "标注完成."
 
-#: lib/blame.tcl:802
+#: lib/blame.tcl:849
 msgid "Busy"
 msgstr "忙碌"
 
-#: lib/blame.tcl:803
+#: lib/blame.tcl:850
 msgid "Annotation process is already running."
 msgstr "正在运行注释处理。"
 
-#: lib/blame.tcl:842
+#: lib/blame.tcl:889
 msgid "Running thorough copy detection..."
 msgstr "正在运行全局拷贝检测"
 
-#: lib/blame.tcl:910
+#: lib/blame.tcl:957
 msgid "Loading annotation..."
 msgstr "裝載标注..."
 
-#: lib/blame.tcl:963
+#: lib/blame.tcl:1010
 msgid "Author:"
 msgstr "作者:"
 
-#: lib/blame.tcl:967
+#: lib/blame.tcl:1014
 msgid "Committer:"
 msgstr "提交者:"
 
-#: lib/blame.tcl:972
+#: lib/blame.tcl:1019
 msgid "Original File:"
 msgstr "原始文件:"
 
-#: lib/blame.tcl:1020
+#: lib/blame.tcl:1067
 msgid "Cannot find HEAD commit:"
 msgstr "无法找到 HEAD 提交："
 
-#: lib/blame.tcl:1075
+#: lib/blame.tcl:1122
 msgid "Cannot find parent commit:"
 msgstr "无法找到上一次提交"
 
-#: lib/blame.tcl:1090
+#: lib/blame.tcl:1137
 msgid "Unable to display parent"
 msgstr "无法显示上一次操作"
 
-#: lib/blame.tcl:1091 lib/diff.tcl:320
+#: lib/blame.tcl:1138 lib/diff.tcl:345
 msgid "Error loading diff:"
 msgstr "装载 diff 错误:"
 
-#: lib/blame.tcl:1231
+#: lib/blame.tcl:1279
 msgid "Originally By:"
 msgstr "最初由:"
 
-#: lib/blame.tcl:1237
+#: lib/blame.tcl:1285
 msgid "In File:"
 msgstr "在文件:"
 
-#: lib/blame.tcl:1242
+#: lib/blame.tcl:1290
 msgid "Copied Or Moved Here By:"
 msgstr "由复制或移动至此:"
 
-#: lib/branch_checkout.tcl:14 lib/branch_checkout.tcl:19
+#: lib/branch_checkout.tcl:21
 msgid "Checkout Branch"
 msgstr "Checkout 分支"
 
-#: lib/branch_checkout.tcl:23
+#: lib/branch_checkout.tcl:26
 msgid "Checkout"
 msgstr "Checkout"
 
-#: lib/branch_checkout.tcl:27 lib/branch_create.tcl:35
-#: lib/branch_delete.tcl:32 lib/branch_rename.tcl:30 lib/browser.tcl:282
-#: lib/checkout_op.tcl:579 lib/choose_font.tcl:43 lib/merge.tcl:172
-#: lib/option.tcl:125 lib/remote_add.tcl:32 lib/remote_branch_delete.tcl:42
-#: lib/tools_dlg.tcl:40 lib/tools_dlg.tcl:204 lib/tools_dlg.tcl:352
-#: lib/transport.tcl:108
+#: lib/transport.tcl:141 lib/checkout_op.tcl:580 lib/remote_add.tcl:34
+#: lib/browser.tcl:292 lib/branch_checkout.tcl:30 lib/branch_rename.tcl:32
+#: lib/choose_font.tcl:45 lib/option.tcl:127 lib/tools_dlg.tcl:41
+#: lib/tools_dlg.tcl:202 lib/tools_dlg.tcl:345 lib/remote_branch_delete.tcl:43
+#: lib/branch_create.tcl:37 lib/branch_delete.tcl:34 lib/merge.tcl:178
 msgid "Cancel"
 msgstr "取消"
 
-#: lib/branch_checkout.tcl:32 lib/browser.tcl:287 lib/tools_dlg.tcl:328
+#: lib/browser.tcl:297 lib/branch_checkout.tcl:35 lib/tools_dlg.tcl:321
 msgid "Revision"
 msgstr "版本"
 
-#: lib/branch_checkout.tcl:36 lib/branch_create.tcl:69 lib/option.tcl:280
+#: lib/branch_checkout.tcl:39 lib/option.tcl:310 lib/branch_create.tcl:69
 msgid "Options"
 msgstr "选项"
 
-#: lib/branch_checkout.tcl:39 lib/branch_create.tcl:92
+#: lib/branch_checkout.tcl:42 lib/branch_create.tcl:92
 msgid "Fetch Tracking Branch"
 msgstr "获取跟踪分支"
 
-#: lib/branch_checkout.tcl:44
+#: lib/branch_checkout.tcl:47
 msgid "Detach From Local Branch"
 msgstr "从本地分支脱离"
 
@@ -731,23 +729,23 @@
 msgid "Create Branch"
 msgstr "创建分支"
 
-#: lib/branch_create.tcl:27
+#: lib/branch_create.tcl:28
 msgid "Create New Branch"
 msgstr "新建分支"
 
-#: lib/branch_create.tcl:31 lib/choose_repository.tcl:381
+#: lib/choose_repository.tcl:422 lib/branch_create.tcl:33
 msgid "Create"
 msgstr "新建"
 
-#: lib/branch_create.tcl:40
+#: lib/branch_create.tcl:42
 msgid "Branch Name"
 msgstr "分支名"
 
-#: lib/branch_create.tcl:43 lib/remote_add.tcl:39 lib/tools_dlg.tcl:50
+#: lib/remote_add.tcl:41 lib/tools_dlg.tcl:51 lib/branch_create.tcl:44
 msgid "Name:"
 msgstr "名字:"
 
-#: lib/branch_create.tcl:58
+#: lib/branch_create.tcl:57
 msgid "Match Tracking Branch Name"
 msgstr "匹配跟踪分支名字"
 
@@ -767,7 +765,7 @@
 msgid "Fast Forward Only"
 msgstr "仅快速合并"
 
-#: lib/branch_create.tcl:85 lib/checkout_op.tcl:571
+#: lib/checkout_op.tcl:572 lib/branch_create.tcl:85
 msgid "Reset"
 msgstr "复位"
 
@@ -775,20 +773,20 @@
 msgid "Checkout After Creation"
 msgstr "在创建后Checkout"
 
-#: lib/branch_create.tcl:131
+#: lib/branch_create.tcl:132
 msgid "Please select a tracking branch."
 msgstr "请选择某个跟踪分支."
 
-#: lib/branch_create.tcl:140
+#: lib/branch_create.tcl:141
 #, tcl-format
 msgid "Tracking branch %s is not a branch in the remote repository."
 msgstr "跟踪分支 %s 并不是远端版本库中的一个分支"
 
-#: lib/branch_create.tcl:153 lib/branch_rename.tcl:86
+#: lib/branch_rename.tcl:92 lib/branch_create.tcl:154
 msgid "Please supply a branch name."
 msgstr "请提供分支名字."
 
-#: lib/branch_create.tcl:164 lib/branch_rename.tcl:106
+#: lib/branch_rename.tcl:112 lib/branch_create.tcl:165
 #, tcl-format
 msgid "'%s' is not an acceptable branch name."
 msgstr "'%s'不是一个可接受的分支名."
@@ -797,19 +795,19 @@
 msgid "Delete Branch"
 msgstr "删除分支"
 
-#: lib/branch_delete.tcl:20
+#: lib/branch_delete.tcl:21
 msgid "Delete Local Branch"
 msgstr "删除本地分支"
 
-#: lib/branch_delete.tcl:37
+#: lib/branch_delete.tcl:39
 msgid "Local Branches"
 msgstr "本地分支"
 
-#: lib/branch_delete.tcl:52
+#: lib/branch_delete.tcl:51
 msgid "Delete Only If Merged Into"
 msgstr "仅在合并后删除"
 
-#: lib/branch_delete.tcl:54 lib/remote_branch_delete.tcl:119
+#: lib/remote_branch_delete.tcl:120 lib/branch_delete.tcl:53
 msgid "Always (Do not perform merge checks)"
 msgstr "总是合并 (不作合并检查)"
 
@@ -818,7 +816,7 @@
 msgid "The following branches are not completely merged into %s:"
 msgstr "下列分支没有完全被合并到 %s:"
 
-#: lib/branch_delete.tcl:115 lib/remote_branch_delete.tcl:217
+#: lib/remote_branch_delete.tcl:218 lib/branch_delete.tcl:115
 msgid ""
 "Recovering deleted branches is difficult.\n"
 "\n"
@@ -837,32 +835,32 @@
 "无法删除分支:\n"
 "%s"
 
-#: lib/branch_rename.tcl:14 lib/branch_rename.tcl:22
+#: lib/branch_rename.tcl:23
 msgid "Rename Branch"
 msgstr "更改分支名:"
 
-#: lib/branch_rename.tcl:26
+#: lib/branch_rename.tcl:28
 msgid "Rename"
 msgstr "更名..."
 
-#: lib/branch_rename.tcl:36
+#: lib/branch_rename.tcl:38
 msgid "Branch:"
 msgstr "分支:"
 
-#: lib/branch_rename.tcl:39
+#: lib/branch_rename.tcl:46
 msgid "New Name:"
 msgstr "新名字:"
 
-#: lib/branch_rename.tcl:75
+#: lib/branch_rename.tcl:81
 msgid "Please select a branch to rename."
 msgstr "请选择分支更名."
 
-#: lib/branch_rename.tcl:96 lib/checkout_op.tcl:202
+#: lib/checkout_op.tcl:202 lib/branch_rename.tcl:102
 #, tcl-format
 msgid "Branch '%s' already exists."
 msgstr "分支 '%s' 已经存在."
 
-#: lib/branch_rename.tcl:117
+#: lib/branch_rename.tcl:123
 #, tcl-format
 msgid "Failed to rename '%s'."
 msgstr "无法更名 '%s'."
@@ -875,22 +873,22 @@
 msgid "File Browser"
 msgstr "文件浏览器"
 
-#: lib/browser.tcl:126 lib/browser.tcl:143
+#: lib/browser.tcl:132 lib/browser.tcl:149
 #, tcl-format
 msgid "Loading %s..."
 msgstr "正在载入 %s..."
 
-#: lib/browser.tcl:187
+#: lib/browser.tcl:193
 msgid "[Up To Parent]"
 msgstr "[上层目录]"
 
-#: lib/browser.tcl:267 lib/browser.tcl:273
+#: lib/browser.tcl:282
 msgid "Browse Branch Files"
 msgstr "浏览分支文件"
 
-#: lib/browser.tcl:278 lib/choose_repository.tcl:398
-#: lib/choose_repository.tcl:486 lib/choose_repository.tcl:497
-#: lib/choose_repository.tcl:1028
+#: lib/browser.tcl:288 lib/choose_repository.tcl:437
+#: lib/choose_repository.tcl:524 lib/choose_repository.tcl:533
+#: lib/choose_repository.tcl:1115
 msgid "Browse"
 msgstr "浏览"
 
@@ -904,8 +902,8 @@
 msgid "fatal: Cannot resolve %s"
 msgstr "致命错误: 无法解决 %s"
 
-#: lib/checkout_op.tcl:146 lib/console.tcl:81 lib/database.tcl:31
-#: lib/sshkey.tcl:53
+#: lib/checkout_op.tcl:146 lib/sshkey.tcl:58 lib/console.tcl:81
+#: lib/database.tcl:30
 msgid "Close"
 msgstr "关闭"
 
@@ -970,21 +968,21 @@
 msgid "files checked out"
 msgstr "文件已检查完毕"
 
-#: lib/checkout_op.tcl:376
+#: lib/checkout_op.tcl:377
 #, tcl-format
 msgid "Aborted checkout of '%s' (file level merging is required)."
 msgstr "中止 '%s' 的 checkout 操作 (需要做文件级合并)."
 
-#: lib/checkout_op.tcl:377
+#: lib/checkout_op.tcl:378
 msgid "File level merge required."
 msgstr "需要文件级合并."
 
-#: lib/checkout_op.tcl:381
+#: lib/checkout_op.tcl:382
 #, tcl-format
 msgid "Staying on branch '%s'."
 msgstr "停留在分支 '%s'."
 
-#: lib/checkout_op.tcl:452
+#: lib/checkout_op.tcl:453
 msgid ""
 "You are no longer on a local branch.\n"
 "\n"
@@ -995,30 +993,30 @@
 "\n"
 "如果你想位于某分支上, 从当前脱节的Checkout中创建一个新分支."
 
-#: lib/checkout_op.tcl:503 lib/checkout_op.tcl:507
+#: lib/checkout_op.tcl:504 lib/checkout_op.tcl:508
 #, tcl-format
 msgid "Checked out '%s'."
 msgstr "'%s' 已被 checkout"
 
-#: lib/checkout_op.tcl:535
+#: lib/checkout_op.tcl:536
 #, tcl-format
 msgid "Resetting '%s' to '%s' will lose the following commits:"
 msgstr "复位 '%s' 到 '%s' 将导致下列提交的丢失:"
 
-#: lib/checkout_op.tcl:557
+#: lib/checkout_op.tcl:558
 msgid "Recovering lost commits may not be easy."
 msgstr "恢复丢失的提交是比较困难的."
 
-#: lib/checkout_op.tcl:562
+#: lib/checkout_op.tcl:563
 #, tcl-format
 msgid "Reset '%s'?"
 msgstr "复位 '%s'?"
 
-#: lib/checkout_op.tcl:567 lib/merge.tcl:164 lib/tools_dlg.tcl:343
+#: lib/checkout_op.tcl:568 lib/tools_dlg.tcl:336 lib/merge.tcl:170
 msgid "Visualize"
 msgstr "图示"
 
-#: lib/checkout_op.tcl:635
+#: lib/checkout_op.tcl:636
 #, tcl-format
 msgid ""
 "Failed to set current branch.\n"
@@ -1034,23 +1032,23 @@
 "\n"
 "这本不该发生, %s 将关闭并放弃."
 
-#: lib/choose_font.tcl:39
+#: lib/choose_font.tcl:41
 msgid "Select"
 msgstr "选择"
 
-#: lib/choose_font.tcl:53
+#: lib/choose_font.tcl:55
 msgid "Font Family"
 msgstr "字体族"
 
-#: lib/choose_font.tcl:74
+#: lib/choose_font.tcl:76
 msgid "Font Size"
 msgstr "字体大小"
 
-#: lib/choose_font.tcl:91
+#: lib/choose_font.tcl:93
 msgid "Font Example"
 msgstr "字体样例"
 
-#: lib/choose_font.tcl:103
+#: lib/choose_font.tcl:105
 msgid ""
 "This is example text.\n"
 "If you like this text, it can be your font."
@@ -1058,234 +1056,234 @@
 "这是样例文本.\n"
 "如果你喜欢, 你可以设置该字体."
 
-#: lib/choose_repository.tcl:28
+#: lib/choose_repository.tcl:45
 msgid "Git Gui"
 msgstr "Git Gui"
 
-#: lib/choose_repository.tcl:87 lib/choose_repository.tcl:386
+#: lib/choose_repository.tcl:104 lib/choose_repository.tcl:427
 msgid "Create New Repository"
 msgstr "创建新的版本库"
 
-#: lib/choose_repository.tcl:93
+#: lib/choose_repository.tcl:110
 msgid "New..."
 msgstr "新建..."
 
-#: lib/choose_repository.tcl:100 lib/choose_repository.tcl:471
+#: lib/choose_repository.tcl:117 lib/choose_repository.tcl:511
 msgid "Clone Existing Repository"
 msgstr "克隆已有版本库"
 
-#: lib/choose_repository.tcl:106
+#: lib/choose_repository.tcl:128
 msgid "Clone..."
 msgstr "克隆..."
 
-#: lib/choose_repository.tcl:113 lib/choose_repository.tcl:1016
+#: lib/choose_repository.tcl:135 lib/choose_repository.tcl:1105
 msgid "Open Existing Repository"
 msgstr "打开已有版本库"
 
-#: lib/choose_repository.tcl:119
+#: lib/choose_repository.tcl:141
 msgid "Open..."
 msgstr "打开..."
 
-#: lib/choose_repository.tcl:132
+#: lib/choose_repository.tcl:154
 msgid "Recent Repositories"
 msgstr "最近版本库"
 
-#: lib/choose_repository.tcl:138
+#: lib/choose_repository.tcl:164
 msgid "Open Recent Repository:"
 msgstr "打开最近版本库"
 
-#: lib/choose_repository.tcl:306 lib/choose_repository.tcl:313
-#: lib/choose_repository.tcl:320
+#: lib/choose_repository.tcl:331 lib/choose_repository.tcl:338
+#: lib/choose_repository.tcl:345
 #, tcl-format
 msgid "Failed to create repository %s:"
 msgstr "无法创建版本库 %s:"
 
-#: lib/choose_repository.tcl:391
+#: lib/choose_repository.tcl:432
 msgid "Directory:"
 msgstr "目录:"
 
-#: lib/choose_repository.tcl:423 lib/choose_repository.tcl:550
-#: lib/choose_repository.tcl:1052
+#: lib/choose_repository.tcl:462 lib/choose_repository.tcl:588
+#: lib/choose_repository.tcl:1139
 msgid "Git Repository"
 msgstr "Git 版本库"
 
-#: lib/choose_repository.tcl:448
+#: lib/choose_repository.tcl:487
 #, tcl-format
 msgid "Directory %s already exists."
 msgstr "目录 %s 已经存在."
 
-#: lib/choose_repository.tcl:452
+#: lib/choose_repository.tcl:491
 #, tcl-format
 msgid "File %s already exists."
 msgstr "文件 %s 已经存在."
 
-#: lib/choose_repository.tcl:466
+#: lib/choose_repository.tcl:506
 msgid "Clone"
 msgstr "克隆"
 
-#: lib/choose_repository.tcl:479
+#: lib/choose_repository.tcl:519
 msgid "Source Location:"
 msgstr "源位置"
 
-#: lib/choose_repository.tcl:490
+#: lib/choose_repository.tcl:528
 msgid "Target Directory:"
 msgstr "目标目录"
 
-#: lib/choose_repository.tcl:502
+#: lib/choose_repository.tcl:538
 msgid "Clone Type:"
 msgstr "克隆类型:"
 
-#: lib/choose_repository.tcl:508
+#: lib/choose_repository.tcl:543
 msgid "Standard (Fast, Semi-Redundant, Hardlinks)"
 msgstr "标准方式 (快速, 部分备份, 作硬连接)"
 
-#: lib/choose_repository.tcl:514
+#: lib/choose_repository.tcl:548
 msgid "Full Copy (Slower, Redundant Backup)"
 msgstr "全部复制 (较慢, 做备份)"
 
-#: lib/choose_repository.tcl:520
+#: lib/choose_repository.tcl:553
 msgid "Shared (Fastest, Not Recommended, No Backup)"
 msgstr "共享方式 (最快, 不推荐, 不做备份)"
 
-#: lib/choose_repository.tcl:556 lib/choose_repository.tcl:603
-#: lib/choose_repository.tcl:749 lib/choose_repository.tcl:819
-#: lib/choose_repository.tcl:1058 lib/choose_repository.tcl:1066
+#: lib/choose_repository.tcl:594 lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:790 lib/choose_repository.tcl:864
+#: lib/choose_repository.tcl:1145 lib/choose_repository.tcl:1153
 #, tcl-format
 msgid "Not a Git repository: %s"
 msgstr "不是一个 Git 版本库: %s"
 
-#: lib/choose_repository.tcl:592
+#: lib/choose_repository.tcl:630
 msgid "Standard only available for local repository."
 msgstr "标准方式仅当是本地版本库时有效."
 
-#: lib/choose_repository.tcl:596
+#: lib/choose_repository.tcl:634
 msgid "Shared only available for local repository."
 msgstr "共享方式仅当是本地版本库时有效."
 
-#: lib/choose_repository.tcl:617
+#: lib/choose_repository.tcl:655
 #, tcl-format
 msgid "Location %s already exists."
 msgstr "位置 %s 已经存在."
 
-#: lib/choose_repository.tcl:628
+#: lib/choose_repository.tcl:666
 msgid "Failed to configure origin"
 msgstr "无法配置 origin"
 
-#: lib/choose_repository.tcl:640
+#: lib/choose_repository.tcl:678
 msgid "Counting objects"
 msgstr "清点对象"
 
-#: lib/choose_repository.tcl:641
+#: lib/choose_repository.tcl:679
 msgid "buckets"
 msgstr "仓库"
 
-#: lib/choose_repository.tcl:665
+#: lib/choose_repository.tcl:703
 #, tcl-format
 msgid "Unable to copy objects/info/alternates: %s"
 msgstr "无法复制 objects/info/alternates: %s"
 
-#: lib/choose_repository.tcl:701
+#: lib/choose_repository.tcl:740
 #, tcl-format
 msgid "Nothing to clone from %s."
 msgstr "没有东西可从 %s 克隆."
 
-#: lib/choose_repository.tcl:703 lib/choose_repository.tcl:917
-#: lib/choose_repository.tcl:929
+#: lib/choose_repository.tcl:742 lib/choose_repository.tcl:962
+#: lib/choose_repository.tcl:974
 msgid "The 'master' branch has not been initialized."
 msgstr "'master'分支尚未初始化."
 
-#: lib/choose_repository.tcl:716
+#: lib/choose_repository.tcl:755
 msgid "Hardlinks are unavailable.  Falling back to copying."
 msgstr "硬连接不可用. 使用复制."
 
-#: lib/choose_repository.tcl:728
+#: lib/choose_repository.tcl:769
 #, tcl-format
 msgid "Cloning from %s"
 msgstr "从 %s 克隆"
 
-#: lib/choose_repository.tcl:759
+#: lib/choose_repository.tcl:800
 msgid "Copying objects"
 msgstr "复制 objects"
 
-#: lib/choose_repository.tcl:760
+#: lib/choose_repository.tcl:801
 msgid "KiB"
 msgstr "KiB"
 
-#: lib/choose_repository.tcl:784
+#: lib/choose_repository.tcl:825
 #, tcl-format
 msgid "Unable to copy object: %s"
 msgstr "无法复制 object: %s"
 
-#: lib/choose_repository.tcl:794
+#: lib/choose_repository.tcl:837
 msgid "Linking objects"
 msgstr "链接 objects"
 
-#: lib/choose_repository.tcl:795
+#: lib/choose_repository.tcl:838
 msgid "objects"
 msgstr "objects"
 
-#: lib/choose_repository.tcl:803
+#: lib/choose_repository.tcl:846
 #, tcl-format
 msgid "Unable to hardlink object: %s"
 msgstr "无法硬链接 object: %s"
 
-#: lib/choose_repository.tcl:858
+#: lib/choose_repository.tcl:903
 msgid "Cannot fetch branches and objects.  See console output for details."
 msgstr "无法获取分支和对象. 请查看控制终端的输出."
 
-#: lib/choose_repository.tcl:869
+#: lib/choose_repository.tcl:914
 msgid "Cannot fetch tags.  See console output for details."
 msgstr "无法获取标签. 请查看控制终端的输出."
 
-#: lib/choose_repository.tcl:893
+#: lib/choose_repository.tcl:938
 msgid "Cannot determine HEAD.  See console output for details."
 msgstr "无法确定 HEAD. 请查看控制终端的输出."
 
-#: lib/choose_repository.tcl:902
+#: lib/choose_repository.tcl:947
 #, tcl-format
 msgid "Unable to cleanup %s"
 msgstr "无法清理 %s"
 
-#: lib/choose_repository.tcl:908
+#: lib/choose_repository.tcl:953
 msgid "Clone failed."
 msgstr "克隆失败."
 
-#: lib/choose_repository.tcl:915
+#: lib/choose_repository.tcl:960
 msgid "No default branch obtained."
 msgstr "没有获取缺省分支"
 
-#: lib/choose_repository.tcl:926
+#: lib/choose_repository.tcl:971
 #, tcl-format
 msgid "Cannot resolve %s as a commit."
 msgstr "无法解析 %s 为提交."
 
-#: lib/choose_repository.tcl:938
+#: lib/choose_repository.tcl:998
 msgid "Creating working directory"
 msgstr "创建工作目录"
 
-#: lib/choose_repository.tcl:939 lib/index.tcl:67 lib/index.tcl:130
-#: lib/index.tcl:198
+#: lib/index.tcl:77 lib/index.tcl:146 lib/index.tcl:220 lib/index.tcl:587
+#: lib/choose_repository.tcl:999
 msgid "files"
 msgstr "文件"
 
-#: lib/choose_repository.tcl:968
+#: lib/choose_repository.tcl:1028
 msgid "Initial file checkout failed."
 msgstr "初始的文件checkout失败"
 
-#: lib/choose_repository.tcl:1011
+#: git-gui.sh:3549 lib/choose_repository.tcl:1100
 msgid "Open"
 msgstr "打开"
 
-#: lib/choose_repository.tcl:1021
+#: lib/choose_repository.tcl:1110
 msgid "Repository:"
 msgstr "版本库"
 
-#: lib/choose_repository.tcl:1072
+#: lib/choose_repository.tcl:1159
 #, tcl-format
 msgid "Failed to open repository %s:"
 msgstr "无法打开版本库 %s:"
 
-#: lib/choose_rev.tcl:53
+#: lib/choose_rev.tcl:52
 msgid "This Detached Checkout"
 msgstr "该脱节的Checkout"
 
@@ -1293,36 +1291,36 @@
 msgid "Revision Expression:"
 msgstr "版本表达式:"
 
-#: lib/choose_rev.tcl:74
+#: lib/choose_rev.tcl:72
 msgid "Local Branch"
 msgstr "本地分支"
 
-#: lib/choose_rev.tcl:79
+#: lib/choose_rev.tcl:77
 msgid "Tracking Branch"
 msgstr "跟踪分支:"
 
-#: lib/choose_rev.tcl:84 lib/choose_rev.tcl:538
+#: lib/choose_rev.tcl:82 lib/choose_rev.tcl:544
 msgid "Tag"
 msgstr "标签"
 
-#: lib/choose_rev.tcl:317
+#: lib/choose_rev.tcl:321
 #, tcl-format
 msgid "Invalid revision: %s"
 msgstr "无效版本: %s"
 
-#: lib/choose_rev.tcl:338
+#: lib/choose_rev.tcl:342
 msgid "No revision selected."
 msgstr "没有选择版本."
 
-#: lib/choose_rev.tcl:346
+#: lib/choose_rev.tcl:350
 msgid "Revision expression is empty."
 msgstr "版本表达式为空."
 
-#: lib/choose_rev.tcl:531
+#: lib/choose_rev.tcl:537
 msgid "Updated"
 msgstr "已更新"
 
-#: lib/choose_rev.tcl:559
+#: lib/choose_rev.tcl:565
 msgid "URL"
 msgstr "URL"
 
@@ -1350,24 +1348,24 @@
 "你当前正在一次尚未完成的合并操作过程中. 除非中止当前合并活动,\n"
 "否则无法修正之前的提交.\n"
 
-#: lib/commit.tcl:48
+#: lib/commit.tcl:56
 msgid "Error loading commit data for amend:"
 msgstr "为修正装载提交数据出错:"
 
-#: lib/commit.tcl:75
+#: lib/commit.tcl:83
 msgid "Unable to obtain your identity:"
 msgstr "无法获知你的身份:"
 
-#: lib/commit.tcl:80
+#: lib/commit.tcl:88
 msgid "Invalid GIT_COMMITTER_IDENT:"
 msgstr "无效的 GIT_COMMITTER_IDENT"
 
-#: lib/commit.tcl:129
+#: lib/commit.tcl:138
 #, tcl-format
 msgid "warning: Tcl does not support encoding '%s'."
 msgstr "警告: Tcl 不支持编码方式 '%s'."
 
-#: lib/commit.tcl:149
+#: lib/commit.tcl:158
 msgid ""
 "Last scanned state does not match repository state.\n"
 "\n"
@@ -1382,7 +1380,7 @@
 "\n"
 "重新扫描将自动开始.\n"
 
-#: lib/commit.tcl:172
+#: lib/commit.tcl:182
 #, tcl-format
 msgid ""
 "Unmerged files cannot be committed.\n"
@@ -1394,7 +1392,7 @@
 "\n"
 "文件 %s 有合并冲突, 你必须解决这些冲突并缓存该文件作提交.\n"
 
-#: lib/commit.tcl:180
+#: lib/commit.tcl:190
 #, tcl-format
 msgid ""
 "Unknown file state %s detected.\n"
@@ -1405,7 +1403,7 @@
 "\n"
 "文件 %s 无法由该程序提交.\n"
 
-#: lib/commit.tcl:188
+#: lib/commit.tcl:198
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1415,7 +1413,7 @@
 "\n"
 "提交前你必须首先缓存至少一个文件.\n"
 
-#: lib/commit.tcl:203
+#: lib/commit.tcl:213
 msgid ""
 "Please supply a commit message.\n"
 "\n"
@@ -1433,40 +1431,40 @@
 "- 第二行: 空行\n"
 "- 剩余行: 请描述为什么你做的这些改动是好的.\n"
 
-#: lib/commit.tcl:234
+#: lib/commit.tcl:244
 msgid "Calling pre-commit hook..."
 msgstr "调用 pre-commit 命令......"
 
-#: lib/commit.tcl:249
+#: lib/commit.tcl:259
 msgid "Commit declined by pre-commit hook."
 msgstr "提交被 pre-commit 命令终止。"
 
-#: lib/commit.tcl:272
+#: lib/commit.tcl:299
 msgid "Calling commit-msg hook..."
 msgstr "调用 commit-msg 命令......"
 
-#: lib/commit.tcl:287
+#: lib/commit.tcl:314
 msgid "Commit declined by commit-msg hook."
 msgstr "提交被 commit-msg 命令终止。"
 
-#: lib/commit.tcl:300
+#: lib/commit.tcl:327
 msgid "Committing changes..."
 msgstr "正在提交更改..."
 
-#: lib/commit.tcl:316
+#: lib/commit.tcl:344
 msgid "write-tree failed:"
 msgstr "write-tree 失败:"
 
-#: lib/commit.tcl:317 lib/commit.tcl:361 lib/commit.tcl:382
+#: lib/commit.tcl:345 lib/commit.tcl:395 lib/commit.tcl:422
 msgid "Commit failed."
 msgstr "提交失败。"
 
-#: lib/commit.tcl:334
+#: lib/commit.tcl:362
 #, tcl-format
 msgid "Commit %s appears to be corrupt"
 msgstr "提交 %s 似乎已损坏"
 
-#: lib/commit.tcl:339
+#: lib/commit.tcl:367
 msgid ""
 "No changes to commit.\n"
 "\n"
@@ -1480,19 +1478,19 @@
 "\n"
 "重新扫描将自动开始.\n"
 
-#: lib/commit.tcl:346
+#: lib/commit.tcl:374
 msgid "No changes to commit."
 msgstr "没有改动要提交."
 
-#: lib/commit.tcl:360
+#: lib/commit.tcl:394
 msgid "commit-tree failed:"
 msgstr "commit-tree 失败:"
 
-#: lib/commit.tcl:381
+#: lib/commit.tcl:421
 msgid "update-ref failed:"
 msgstr "update-ref 失败:"
 
-#: lib/commit.tcl:469
+#: lib/commit.tcl:514
 #, tcl-format
 msgid "Created commit %s: %s"
 msgstr "创建了 commit %s: %s"
@@ -1509,31 +1507,31 @@
 msgid "Error: Command Failed"
 msgstr "错误: 命令失败"
 
-#: lib/database.tcl:43
+#: lib/database.tcl:42
 msgid "Number of loose objects"
 msgstr "松散对象的数量"
 
-#: lib/database.tcl:44
+#: lib/database.tcl:43
 msgid "Disk space used by loose objects"
 msgstr "松散对象所使用的磁盘空间"
 
-#: lib/database.tcl:45
+#: lib/database.tcl:44
 msgid "Number of packed objects"
 msgstr "压缩对象数量"
 
-#: lib/database.tcl:46
+#: lib/database.tcl:45
 msgid "Number of packs"
 msgstr "压缩包数量"
 
-#: lib/database.tcl:47
+#: lib/database.tcl:46
 msgid "Disk space used by packed objects"
 msgstr "压缩对象所使用的磁盘空间"
 
-#: lib/database.tcl:48
+#: lib/database.tcl:47
 msgid "Packed objects waiting for pruning"
 msgstr "压缩对象等待清理"
 
-#: lib/database.tcl:49
+#: lib/database.tcl:48
 msgid "Garbage files"
 msgstr "垃圾文件"
 
@@ -1561,7 +1559,7 @@
 msgid "Invalid date from Git: %s"
 msgstr "无效的日期: %s"
 
-#: lib/diff.tcl:64
+#: lib/diff.tcl:77
 #, tcl-format
 msgid ""
 "No differences detected.\n"
@@ -1582,12 +1580,12 @@
 "\n"
 "将会自动重新启动一次扫描以寻找其他可能具有同样状态的文件。"
 
-#: lib/diff.tcl:104
+#: lib/diff.tcl:117
 #, tcl-format
 msgid "Loading diff of %s..."
 msgstr "运行 %s 对比......"
 
-#: lib/diff.tcl:125
+#: lib/diff.tcl:143
 msgid ""
 "LOCAL: deleted\n"
 "REMOTE:\n"
@@ -1595,7 +1593,7 @@
 "本地：已删除\n"
 "外部：\n"
 
-#: lib/diff.tcl:130
+#: lib/diff.tcl:148
 msgid ""
 "REMOTE: deleted\n"
 "LOCAL:\n"
@@ -1603,32 +1601,32 @@
 "外部：已删除\n"
 "本地：\n"
 
-#: lib/diff.tcl:137
+#: lib/diff.tcl:155
 msgid "LOCAL:\n"
 msgstr "本地：\n"
 
-#: lib/diff.tcl:140
+#: lib/diff.tcl:158
 msgid "REMOTE:\n"
 msgstr "外部：\n"
 
-#: lib/diff.tcl:202 lib/diff.tcl:319
+#: lib/diff.tcl:220 lib/diff.tcl:344
 #, tcl-format
 msgid "Unable to display %s"
 msgstr "无法显示 %s"
 
-#: lib/diff.tcl:203
+#: lib/diff.tcl:221
 msgid "Error loading file:"
 msgstr "装载文件出错:"
 
-#: lib/diff.tcl:210
+#: lib/diff.tcl:227
 msgid "Git Repository (subproject)"
 msgstr "Git 版本库 (子项目)"
 
-#: lib/diff.tcl:222
+#: lib/diff.tcl:239
 msgid "* Binary file (not showing content)."
 msgstr "* 二进制文件 (不显示内容)."
 
-#: lib/diff.tcl:227
+#: lib/diff.tcl:244
 #, tcl-format
 msgid ""
 "* Untracked file is %d bytes.\n"
@@ -1637,7 +1635,7 @@
 "* 未追踪到的文件为 %d bytes。\n"
 "* 只显示头 %d bytes。\n"
 
-#: lib/diff.tcl:233
+#: lib/diff.tcl:250
 #, tcl-format
 msgid ""
 "\n"
@@ -1648,19 +1646,19 @@
 "* 未追踪到的文件被 %s 缩显在此。\n"
 "* 要查看完整文件，请使用外部编辑器。\n"
 
-#: lib/diff.tcl:482
+#: lib/diff.tcl:583
 msgid "Failed to unstage selected hunk."
 msgstr "无法将选择的代码段从缓存中删除."
 
-#: lib/diff.tcl:489
+#: lib/diff.tcl:594
 msgid "Failed to stage selected hunk."
 msgstr "无法缓存所选代码段."
 
-#: lib/diff.tcl:568
+#: lib/diff.tcl:687
 msgid "Failed to unstage selected line."
 msgstr "取消应用选择的行失败。"
 
-#: lib/diff.tcl:576
+#: lib/diff.tcl:700
 msgid "Failed to stage selected line."
 msgstr "应用选择的行失败。"
 
@@ -1685,7 +1683,7 @@
 msgid "warning"
 msgstr "警告"
 
-#: lib/error.tcl:94
+#: lib/error.tcl:96
 msgid "You must correct the above errors before committing."
 msgstr "你必须在提交前修正上述错误."
 
@@ -1693,61 +1691,61 @@
 msgid "Unable to unlock the index."
 msgstr "无法解锁缓存 (index)"
 
-#: lib/index.tcl:15
+#: lib/index.tcl:30
 msgid "Index Error"
 msgstr "缓存(Index)错误"
 
-#: lib/index.tcl:17
+#: lib/index.tcl:32
 msgid ""
 "Updating the Git index failed.  A rescan will be automatically started to "
 "resynchronize git-gui."
 msgstr "更新 Git 缓存(Index)失败, 重新扫描将自动开始以重新同步 git-gui."
 
-#: lib/index.tcl:28
+#: lib/index.tcl:43
 msgid "Continue"
 msgstr "继续"
 
-#: lib/index.tcl:31
+#: lib/index.tcl:46
 msgid "Unlock Index"
 msgstr "解锁 Index"
 
-#: lib/index.tcl:289
+#: lib/index.tcl:330
 #, tcl-format
 msgid "Unstaging %s from commit"
 msgstr "从提交缓存中删除 %s"
 
-#: lib/index.tcl:328
+#: lib/index.tcl:369
 msgid "Ready to commit."
 msgstr "准备提交。"
 
-#: lib/index.tcl:341
+#: lib/index.tcl:382
 #, tcl-format
 msgid "Adding %s"
 msgstr "添加 %s"
 
-#: lib/index.tcl:398
+#: lib/index.tcl:503
 #, tcl-format
 msgid "Revert changes in file %s?"
 msgstr "撤销文件 %s 中的改动?"
 
-#: lib/index.tcl:400
+#: lib/index.tcl:508
 #, tcl-format
 msgid "Revert changes in these %i files?"
 msgstr "撤销这些 (%i个) 文件的改动?"
 
-#: lib/index.tcl:408
+#: lib/index.tcl:517
 msgid "Any unstaged changes will be permanently lost by the revert."
 msgstr "任何未缓存的改动将在这次撤销中永久丢失."
 
-#: lib/index.tcl:411
+#: lib/index.tcl:520 lib/index.tcl:563
 msgid "Do Nothing"
 msgstr "不做操作"
 
-#: lib/index.tcl:429
+#: lib/index.tcl:726
 msgid "Reverting selected files"
 msgstr "还原选中的文件"
 
-#: lib/index.tcl:433
+#: lib/index.tcl:730
 #, tcl-format
 msgid "Reverting %s"
 msgstr "正在还原 %s"
@@ -1809,34 +1807,34 @@
 "\n"
 "你必须完成当前的提交后才能开始合并. 如果需要, 这么做将有助于中止一次失败的合并.\n"
 
-#: lib/merge.tcl:107
+#: lib/merge.tcl:108
 #, tcl-format
 msgid "%s of %s"
 msgstr "%s 自 %s"
 
-#: lib/merge.tcl:120
+#: lib/merge.tcl:126
 #, tcl-format
 msgid "Merging %s and %s..."
 msgstr "正在合并 %s 和 %s..."
 
-#: lib/merge.tcl:131
+#: lib/merge.tcl:137
 msgid "Merge completed successfully."
 msgstr "合并成功完成."
 
-#: lib/merge.tcl:133
+#: lib/merge.tcl:139
 msgid "Merge failed.  Conflict resolution is required."
 msgstr "合并失败. 需要解决冲突."
 
-#: lib/merge.tcl:158
+#: lib/merge.tcl:164
 #, tcl-format
 msgid "Merge Into %s"
 msgstr "合并到 %s"
 
-#: lib/merge.tcl:177
+#: lib/merge.tcl:183
 msgid "Revision To Merge"
 msgstr "要合并的版本"
 
-#: lib/merge.tcl:212
+#: lib/merge.tcl:218
 msgid ""
 "Cannot abort while amending.\n"
 "\n"
@@ -1846,7 +1844,7 @@
 "\n"
 "你必须先完成本次修正操作.\n"
 
-#: lib/merge.tcl:222
+#: lib/merge.tcl:228
 msgid ""
 "Abort merge?\n"
 "\n"
@@ -1860,7 +1858,7 @@
 "\n"
 "是否要继续中止当前的合并操作?"
 
-#: lib/merge.tcl:228
+#: lib/merge.tcl:234
 msgid ""
 "Reset changes?\n"
 "\n"
@@ -1874,19 +1872,19 @@
 "\n"
 "是否要继续复位当前的改动?"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:246
 msgid "Aborting"
 msgstr "中止"
 
-#: lib/merge.tcl:239
+#: lib/merge.tcl:247
 msgid "files reset"
 msgstr "已重置文件"
 
-#: lib/merge.tcl:267
+#: lib/merge.tcl:277
 msgid "Abort failed."
 msgstr "中止失败"
 
-#: lib/merge.tcl:269
+#: lib/merge.tcl:279
 msgid "Abort completed.  Ready."
 msgstr "中止完成. 就绪."
 
@@ -1933,21 +1931,21 @@
 msgid "Conflict file does not exist"
 msgstr "冲突文件不存在"
 
-#: lib/mergetool.tcl:264
+#: lib/mergetool.tcl:246
 #, tcl-format
 msgid "Not a GUI merge tool: '%s'"
 msgstr "不是图形合并工具:’%s‘"
 
-#: lib/mergetool.tcl:268
+#: lib/mergetool.tcl:275
 #, tcl-format
 msgid "Unsupported merge tool '%s'"
 msgstr "不支持的合并工具 ’%s‘"
 
-#: lib/mergetool.tcl:303
+#: lib/mergetool.tcl:310
 msgid "Merge tool is already running, terminate it?"
 msgstr "合并工具正在运行，是否终止？"
 
-#: lib/mergetool.tcl:323
+#: lib/mergetool.tcl:330
 #, tcl-format
 msgid ""
 "Error retrieving versions:\n"
@@ -1956,7 +1954,7 @@
 "还原版本错误：\n"
 "%s"
 
-#: lib/mergetool.tcl:343
+#: lib/mergetool.tcl:350
 #, tcl-format
 msgid ""
 "Could not start the merge tool:\n"
@@ -1967,11 +1965,11 @@
 "\n"
 "%s"
 
-#: lib/mergetool.tcl:347
+#: lib/mergetool.tcl:354
 msgid "Running merge tool..."
 msgstr "正在运行合并工具......"
 
-#: lib/mergetool.tcl:375 lib/mergetool.tcl:383
+#: lib/mergetool.tcl:382 lib/mergetool.tcl:390
 msgid "Merge tool failed."
 msgstr "合并操作失败。"
 
@@ -1985,129 +1983,129 @@
 msgid "Invalid repo encoding '%s'"
 msgstr "仓库编码 ’%s‘ 无效"
 
-#: lib/option.tcl:117
+#: lib/option.tcl:119
 msgid "Restore Defaults"
 msgstr "恢复默认值"
 
-#: lib/option.tcl:121
+#: lib/option.tcl:123
 msgid "Save"
 msgstr "保存"
 
-#: lib/option.tcl:131
+#: lib/option.tcl:133
 #, tcl-format
 msgid "%s Repository"
 msgstr "%s 版本库"
 
-#: lib/option.tcl:132
+#: lib/option.tcl:134
 msgid "Global (All Repositories)"
 msgstr "全局 (所有版本库)"
 
-#: lib/option.tcl:138
+#: lib/option.tcl:140
 msgid "User Name"
 msgstr "用户名"
 
-#: lib/option.tcl:139
+#: lib/option.tcl:141
 msgid "Email Address"
 msgstr "Email 地址"
 
-#: lib/option.tcl:141
+#: lib/option.tcl:143
 msgid "Summarize Merge Commits"
 msgstr "概述合并提交:"
 
-#: lib/option.tcl:142
+#: lib/option.tcl:144
 msgid "Merge Verbosity"
 msgstr "合并冗余度"
 
-#: lib/option.tcl:143
+#: lib/option.tcl:145
 msgid "Show Diffstat After Merge"
 msgstr "在合并后显示 Diffstat"
 
-#: lib/option.tcl:144
+#: lib/option.tcl:146
 msgid "Use Merge Tool"
 msgstr "使用合并工具"
 
-#: lib/option.tcl:146
+#: lib/option.tcl:148
 msgid "Trust File Modification Timestamps"
 msgstr "相信文件的改动时间"
 
-#: lib/option.tcl:147
+#: lib/option.tcl:149
 msgid "Prune Tracking Branches During Fetch"
 msgstr "获取时清除跟踪分支"
 
-#: lib/option.tcl:148
+#: lib/option.tcl:150
 msgid "Match Tracking Branches"
 msgstr "匹配跟踪分支"
 
-#: lib/option.tcl:149
+#: lib/option.tcl:152
 msgid "Blame Copy Only On Changed Files"
 msgstr ""
 
-#: lib/option.tcl:150
+#: lib/option.tcl:154
 msgid "Minimum Letters To Blame Copy On"
 msgstr ""
 
-#: lib/option.tcl:151
+#: lib/option.tcl:155
 msgid "Blame History Context Radius (days)"
 msgstr ""
 
-#: lib/option.tcl:152
+#: lib/option.tcl:156
 msgid "Number of Diff Context Lines"
 msgstr "Diff 上下文行数"
 
-#: lib/option.tcl:153
+#: lib/option.tcl:158
 msgid "Commit Message Text Width"
 msgstr "提交信息文本宽度"
 
-#: lib/option.tcl:154
+#: lib/option.tcl:159
 msgid "New Branch Name Template"
 msgstr "新建分支命名模板"
 
-#: lib/option.tcl:155
+#: lib/option.tcl:160
 msgid "Default File Contents Encoding"
 msgstr "默认文件内容编码"
 
-#: lib/option.tcl:203
+#: lib/option.tcl:210
 msgid "Change"
 msgstr "修改"
 
-#: lib/option.tcl:230
+#: lib/option.tcl:254
 msgid "Spelling Dictionary:"
 msgstr "拼写词典："
 
-#: lib/option.tcl:254
+#: lib/option.tcl:284
 msgid "Change Font"
 msgstr "更改字体"
 
-#: lib/option.tcl:258
+#: lib/option.tcl:288
 #, tcl-format
 msgid "Choose %s"
 msgstr "选择 %s"
 
-#: lib/option.tcl:264
+#: lib/option.tcl:294
 msgid "pt."
 msgstr "磅"
 
-#: lib/option.tcl:278
+#: lib/option.tcl:308
 msgid "Preferences"
 msgstr "首选项"
 
-#: lib/option.tcl:314
+#: lib/option.tcl:345
 msgid "Failed to completely save options:"
 msgstr "无法完全保存选项:"
 
-#: lib/remote.tcl:163
+#: lib/remote.tcl:218
 msgid "Remove Remote"
 msgstr "删除外部地址"
 
-#: lib/remote.tcl:168
+#: lib/remote.tcl:223
 msgid "Prune from"
 msgstr "从..清除(prune)"
 
-#: lib/remote.tcl:173
+#: lib/remote.tcl:228
 msgid "Fetch from"
 msgstr "从..获取(fetch)"
 
-#: lib/remote.tcl:215
+#: lib/remote.tcl:200
 msgid "Push to"
 msgstr "上传到(push)"
 
@@ -2115,15 +2113,15 @@
 msgid "Add Remote"
 msgstr "添加外部地址"
 
-#: lib/remote_add.tcl:24
+#: lib/remote_add.tcl:25
 msgid "Add New Remote"
 msgstr "添加新的外部地址"
 
-#: lib/remote_add.tcl:28 lib/tools_dlg.tcl:36
+#: lib/remote_add.tcl:30 lib/tools_dlg.tcl:37
 msgid "Add"
 msgstr "添加"
 
-#: lib/remote_add.tcl:37
+#: lib/remote_add.tcl:39
 msgid "Remote Details"
 msgstr "外部地址详情"
 
@@ -2131,95 +2129,95 @@
 msgid "Location:"
 msgstr "地址："
 
-#: lib/remote_add.tcl:62
+#: lib/remote_add.tcl:60
 msgid "Further Action"
 msgstr "下一步"
 
-#: lib/remote_add.tcl:65
+#: lib/remote_add.tcl:63
 msgid "Fetch Immediately"
 msgstr "立刻获取"
 
-#: lib/remote_add.tcl:71
+#: lib/remote_add.tcl:69
 msgid "Initialize Remote Repository and Push"
 msgstr "初始化外部仓库，然后上传"
 
-#: lib/remote_add.tcl:77
+#: lib/remote_add.tcl:75
 msgid "Do Nothing Else Now"
 msgstr "现在什么也不做"
 
-#: lib/remote_add.tcl:101
+#: lib/remote_add.tcl:100
 msgid "Please supply a remote name."
 msgstr "请提供一个外部地址名称"
 
-#: lib/remote_add.tcl:114
+#: lib/remote_add.tcl:113
 #, tcl-format
 msgid "'%s' is not an acceptable remote name."
 msgstr "外部地址名称 %s 无效"
 
-#: lib/remote_add.tcl:125
+#: lib/remote_add.tcl:124
 #, tcl-format
 msgid "Failed to add remote '%s' of location '%s'."
 msgstr "添加位于 %s 的外部地址 %s 失败。"
 
-#: lib/remote_add.tcl:133 lib/transport.tcl:6
+#: lib/transport.tcl:6 lib/remote_add.tcl:132
 #, tcl-format
 msgid "fetch %s"
 msgstr "获取 %s"
 
-#: lib/remote_add.tcl:134
+#: lib/remote_add.tcl:133
 #, tcl-format
 msgid "Fetching the %s"
 msgstr "正在获取 %s"
 
-#: lib/remote_add.tcl:157
+#: lib/remote_add.tcl:156
 #, tcl-format
 msgid "Do not know how to initialize repository at location '%s'."
 msgstr "无法获知怎样在 %s 位置初始化仓库"
 
-#: lib/remote_add.tcl:163 lib/transport.tcl:25 lib/transport.tcl:63
-#: lib/transport.tcl:81
+#: lib/transport.tcl:54 lib/transport.tcl:92 lib/transport.tcl:110
+#: lib/remote_add.tcl:162
 #, tcl-format
 msgid "push %s"
 msgstr "上传 %s"
 
-#: lib/remote_add.tcl:164
+#: lib/remote_add.tcl:163
 #, tcl-format
 msgid "Setting up the %s (at %s)"
 msgstr "正在建立 %s（在 %s）"
 
-#: lib/remote_branch_delete.tcl:29 lib/remote_branch_delete.tcl:34
+#: lib/remote_branch_delete.tcl:34
 msgid "Delete Branch Remotely"
 msgstr "删除外部分支"
 
-#: lib/remote_branch_delete.tcl:47
+#: lib/remote_branch_delete.tcl:48
 msgid "From Repository"
 msgstr "从版本库"
 
-#: lib/remote_branch_delete.tcl:50 lib/transport.tcl:134
+#: lib/transport.tcl:165 lib/remote_branch_delete.tcl:51
 msgid "Remote:"
 msgstr "外部："
 
-#: lib/remote_branch_delete.tcl:66 lib/transport.tcl:149
+#: lib/transport.tcl:187 lib/remote_branch_delete.tcl:72
 msgid "Arbitrary Location:"
 msgstr "任意地址："
 
-#: lib/remote_branch_delete.tcl:84
+#: lib/remote_branch_delete.tcl:88
 msgid "Branches"
 msgstr "分支"
 
-#: lib/remote_branch_delete.tcl:109
+#: lib/remote_branch_delete.tcl:110
 msgid "Delete Only If"
 msgstr "删除仅当"
 
-#: lib/remote_branch_delete.tcl:111
+#: lib/remote_branch_delete.tcl:112
 msgid "Merged Into:"
 msgstr "合并到"
 
-#: lib/remote_branch_delete.tcl:152
+#: lib/remote_branch_delete.tcl:153
 msgid "A branch is required for 'Merged Into'."
 msgstr "'合并到' 需要指定某个分支"
 
-#: lib/remote_branch_delete.tcl:184
+#: lib/remote_branch_delete.tcl:185
 #, tcl-format
 msgid ""
 "The following branches are not completely merged into %s:\n"
@@ -2229,40 +2227,40 @@
 "下列分支没有全部合并到 %s ：\n"
 " - %s"
 
-#: lib/remote_branch_delete.tcl:189
+#: lib/remote_branch_delete.tcl:190
 #, tcl-format
 msgid ""
 "One or more of the merge tests failed because you have not fetched the "
 "necessary commits.  Try fetching from %s first."
 msgstr "一个或多个合并测试失败。因为没有获取到可以提交的内容，请尝试先从 %s 获取。"
 
-#: lib/remote_branch_delete.tcl:207
+#: lib/remote_branch_delete.tcl:208
 msgid "Please select one or more branches to delete."
 msgstr "请选择要删除的一个或多个分支"
 
-#: lib/remote_branch_delete.tcl:226
+#: lib/remote_branch_delete.tcl:227
 #, tcl-format
 msgid "Deleting branches from %s"
 msgstr "正在删除 %s 分支"
 
-#: lib/remote_branch_delete.tcl:292
+#: lib/remote_branch_delete.tcl:300
 msgid "No repository selected."
 msgstr "没有选择版本库"
 
-#: lib/remote_branch_delete.tcl:297
+#: lib/remote_branch_delete.tcl:305
 #, tcl-format
 msgid "Scanning %s..."
 msgstr "正在扫描 %s..."
 
-#: lib/search.tcl:21
+#: lib/search.tcl:48
 msgid "Find:"
 msgstr "查找："
 
-#: lib/search.tcl:23
+#: lib/search.tcl:50
 msgid "Next"
 msgstr "下一个"
 
-#: lib/search.tcl:24
+#: lib/search.tcl:51
 msgid "Prev"
 msgstr "上一个"
 
@@ -2270,11 +2268,11 @@
 msgid "Case-Sensitive"
 msgstr "区分大小写"
 
-#: lib/shortcut.tcl:21 lib/shortcut.tcl:62
+#: lib/shortcut.tcl:24 lib/shortcut.tcl:65
 msgid "Cannot write shortcut:"
 msgstr "无法修改快捷键:"
 
-#: lib/shortcut.tcl:137
+#: lib/shortcut.tcl:140
 msgid "Cannot write icon:"
 msgstr "无法修改图标:"
 
@@ -2315,32 +2313,32 @@
 msgid "Spell Checker Failed"
 msgstr "拼写检查器失败"
 
-#: lib/sshkey.tcl:31
+#: lib/sshkey.tcl:34
 msgid "No keys found."
 msgstr "没有发现密钥。"
 
-#: lib/sshkey.tcl:34
+#: lib/sshkey.tcl:37
 #, tcl-format
 msgid "Found a public key in: %s"
 msgstr "在 %s 发现一个公共密钥"
 
-#: lib/sshkey.tcl:40
+#: lib/sshkey.tcl:43
 msgid "Generate Key"
 msgstr "生成密钥"
 
-#: lib/sshkey.tcl:56
+#: lib/sshkey.tcl:61
 msgid "Copy To Clipboard"
 msgstr "复制到剪贴板"
 
-#: lib/sshkey.tcl:70
+#: lib/sshkey.tcl:75
 msgid "Your OpenSSH Public Key"
 msgstr "您的 OpenSSH 公共密钥"
 
-#: lib/sshkey.tcl:78
+#: lib/sshkey.tcl:83
 msgid "Generating..."
 msgstr "正在生成......"
 
-#: lib/sshkey.tcl:84
+#: lib/sshkey.tcl:89
 #, tcl-format
 msgid ""
 "Could not start ssh-keygen:\n"
@@ -2351,50 +2349,50 @@
 "\n"
 "%s"
 
-#: lib/sshkey.tcl:111
+#: lib/sshkey.tcl:116
 msgid "Generation failed."
 msgstr "生成失败。"
 
-#: lib/sshkey.tcl:118
+#: lib/sshkey.tcl:123
 msgid "Generation succeeded, but no keys found."
 msgstr ""
 
-#: lib/sshkey.tcl:121
+#: lib/sshkey.tcl:126
 #, tcl-format
 msgid "Your key is in: %s"
 msgstr "您的密钥在：%s"
 
-#: lib/status_bar.tcl:83
+#: lib/status_bar.tcl:263
 #, tcl-format
 msgid "%s ... %*i of %*i %s (%3i%%)"
 msgstr "%s ... %*i of %*i %s (%3i%%)"
 
-#: lib/tools.tcl:75
+#: lib/tools.tcl:76
 #, tcl-format
 msgid "Running %s requires a selected file."
 msgstr "正在运行 %s 需要选择一个文件。"
 
-#: lib/tools.tcl:90
+#: lib/tools.tcl:96
 #, tcl-format
 msgid "Are you sure you want to run %s?"
 msgstr "您确实要运行 %s ？"
 
-#: lib/tools.tcl:110
+#: lib/tools.tcl:118
 #, tcl-format
 msgid "Tool: %s"
 msgstr "操作：%s"
 
-#: lib/tools.tcl:111
+#: lib/tools.tcl:119
 #, tcl-format
 msgid "Running: %s"
 msgstr "正在运行：%s"
 
-#: lib/tools.tcl:149
+#: lib/tools.tcl:158
 #, tcl-format
 msgid "Tool completed successfully: %s"
 msgstr "操作成功完成：%s"
 
-#: lib/tools.tcl:151
+#: lib/tools.tcl:160
 #, tcl-format
 msgid "Tool failed: %s"
 msgstr "操作失败：%s"
@@ -2407,52 +2405,52 @@
 msgid "Add New Tool Command"
 msgstr "添加新操作命令"
 
-#: lib/tools_dlg.tcl:33
+#: lib/tools_dlg.tcl:34
 msgid "Add globally"
 msgstr "添加到全局"
 
-#: lib/tools_dlg.tcl:45
+#: lib/tools_dlg.tcl:46
 msgid "Tool Details"
 msgstr "操作明细"
 
-#: lib/tools_dlg.tcl:48
+#: lib/tools_dlg.tcl:49
 msgid "Use '/' separators to create a submenu tree:"
 msgstr "使用 ’/‘ 分隔符创建子菜单"
 
-#: lib/tools_dlg.tcl:61
+#: lib/tools_dlg.tcl:60
 msgid "Command:"
 msgstr "命令："
 
-#: lib/tools_dlg.tcl:74
+#: lib/tools_dlg.tcl:71
 msgid "Show a dialog before running"
 msgstr "运行之前显示对话框"
 
-#: lib/tools_dlg.tcl:80
+#: lib/tools_dlg.tcl:77
 msgid "Ask the user to select a revision (sets $REVISION)"
 msgstr "询问用户选择一个版本（设置 $REVISION）"
 
-#: lib/tools_dlg.tcl:85
+#: lib/tools_dlg.tcl:82
 msgid "Ask the user for additional arguments (sets $ARGS)"
 msgstr "询问用户设置其他参数（设置 $ARGS）"
 
-#: lib/tools_dlg.tcl:92
+#: lib/tools_dlg.tcl:89
 msgid "Don't show the command output window"
 msgstr "不显示命令输出窗口"
 
-#: lib/tools_dlg.tcl:97
+#: lib/tools_dlg.tcl:94
 msgid "Run only if a diff is selected ($FILENAME not empty)"
 msgstr "只在选择比较时运行（$FILENAME 非空)"
 
-#: lib/tools_dlg.tcl:121
+#: lib/tools_dlg.tcl:118
 msgid "Please supply a name for the tool."
 msgstr "请为操作命名"
 
-#: lib/tools_dlg.tcl:129
+#: lib/tools_dlg.tcl:126
 #, tcl-format
 msgid "Tool '%s' already exists."
 msgstr "操作 ’%s‘ 已经存在。"
 
-#: lib/tools_dlg.tcl:151
+#: lib/tools_dlg.tcl:148
 #, tcl-format
 msgid ""
 "Could not add tool:\n"
@@ -2465,28 +2463,28 @@
 msgid "Remove Tool"
 msgstr "删除操作"
 
-#: lib/tools_dlg.tcl:196
+#: lib/tools_dlg.tcl:193
 msgid "Remove Tool Commands"
 msgstr "删除操作命令"
 
-#: lib/tools_dlg.tcl:200
+#: lib/tools_dlg.tcl:198
 msgid "Remove"
 msgstr "移除"
 
-#: lib/tools_dlg.tcl:236
+#: lib/tools_dlg.tcl:231
 msgid "(Blue denotes repository-local tools)"
 msgstr "(蓝色表示本地仓库工具)"
 
-#: lib/tools_dlg.tcl:297
+#: lib/tools_dlg.tcl:292
 #, tcl-format
 msgid "Run Command: %s"
 msgstr "运行命令：%s"
 
-#: lib/tools_dlg.tcl:311
+#: lib/tools_dlg.tcl:306
 msgid "Arguments"
 msgstr "参数"
 
-#: lib/tools_dlg.tcl:348
+#: lib/tools_dlg.tcl:341
 msgid "OK"
 msgstr "确定"
 
@@ -2505,45 +2503,45 @@
 msgid "Pruning tracking branches deleted from %s"
 msgstr "正在清理被 %s 删除的分支"
 
-#: lib/transport.tcl:26
+#: lib/transport.tcl:55
 #, tcl-format
 msgid "Pushing changes to %s"
 msgstr "上传改动到 %s"
 
-#: lib/transport.tcl:64
+#: lib/transport.tcl:93
 #, tcl-format
 msgid "Mirroring to %s"
 msgstr "镜像同步到 %s"
 
-#: lib/transport.tcl:82
+#: lib/transport.tcl:111
 #, tcl-format
 msgid "Pushing %s %s to %s"
 msgstr "上传 %s %s 到 %s"
 
-#: lib/transport.tcl:100
+#: lib/transport.tcl:132
 msgid "Push Branches"
 msgstr "上传分支"
 
-#: lib/transport.tcl:114
+#: lib/transport.tcl:147
 msgid "Source Branches"
 msgstr "获取分支"
 
-#: lib/transport.tcl:131
+#: lib/transport.tcl:162
 msgid "Destination Repository"
 msgstr "目标版本库"
 
-#: lib/transport.tcl:169
+#: lib/transport.tcl:205
 msgid "Transfer Options"
 msgstr "传输选项"
 
-#: lib/transport.tcl:171
+#: lib/transport.tcl:207
 msgid "Force overwrite existing branch (may discard changes)"
 msgstr "强制覆盖已有的分支 (可能会丢失改动)"
 
-#: lib/transport.tcl:175
+#: lib/transport.tcl:211
 msgid "Use thin pack (for slow network connections)"
 msgstr "使用 thin pack (适用于低速网络连接)"
 
-#: lib/transport.tcl:179
+#: lib/transport.tcl:215
 msgid "Include tags"
 msgstr "包含标签"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/git.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/git.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/git.po	2020-01-23 16:52:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/git.po	2020-07-08 13:54:01.000000000 +0000
@@ -139,48 +139,48 @@
 "Project-Id-Version: Git\n"
 "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
 "POT-Creation-Date: 2018-03-16 07:29+0800\n"
-"PO-Revision-Date: 2019-12-10 21:04+0000\n"
+"PO-Revision-Date: 2020-04-21 13:58+0000\n"
 "Last-Translator: Jiang Xin <Unknown>\n"
 "Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:17+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:06+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: advice.c:62
+#: advice.c:55
 #, c-format
 msgid "hint: %.*s\n"
 msgstr "提示：%.*s\n"
 
-#: advice.c:162
+#: advice.c:247
 msgid "Cherry-picking is not possible because you have unmerged files."
 msgstr "无法拣选，因为您有未合并的文件。"
 
-#: advice.c:164
+#: advice.c:249
 msgid "Committing is not possible because you have unmerged files."
 msgstr "无法提交，因为您有未合并的文件。"
 
-#: advice.c:166
+#: advice.c:251
 msgid "Merging is not possible because you have unmerged files."
 msgstr "无法合并，因为您有未合并的文件。"
 
-#: advice.c:168
+#: advice.c:253
 msgid "Pulling is not possible because you have unmerged files."
 msgstr "无法拉取，因为您有未合并的文件。"
 
-#: advice.c:170
+#: advice.c:255
 msgid "Reverting is not possible because you have unmerged files."
 msgstr "无法回退，因为您有未合并的文件。"
 
-#: advice.c:172
+#: advice.c:257
 #, c-format
 msgid "It is not possible to %s because you have unmerged files."
 msgstr "无法 %s，因为您有未合并的文件。"
 
-#: advice.c:180
+#: advice.c:265
 msgid ""
 "Fix them up in the work tree, and then use 'git add/rm <file>'\n"
 "as appropriate to mark resolution and make a commit."
@@ -188,23 +188,23 @@
 "请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
 "解决方案并提交。"
 
-#: advice.c:188
+#: advice.c:273
 msgid "Exiting because of an unresolved conflict."
 msgstr "因为存在未解决的冲突而退出。"
 
-#: advice.c:193 builtin/merge.c:1332
+#: advice.c:278 builtin/merge.c:1353
 msgid "You have not concluded your merge (MERGE_HEAD exists)."
 msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
 
-#: advice.c:195
+#: advice.c:280
 msgid "Please, commit your changes before merging."
 msgstr "请在合并前先提交您的修改。"
 
-#: advice.c:196
+#: advice.c:281
 msgid "Exiting because of unfinished merge."
 msgstr "因为存在未完成的合并而退出。"
 
-#: advice.c:130
+#: advice.c:192
 #, c-format
 msgid ""
 "Note: checking out '%s'.\n"
@@ -383,23 +383,23 @@
 msgid "unable to open or read %s"
 msgstr "不能打开或读取 %s"
 
-#: apply.c:2926
+#: apply.c:2936
 #, c-format
 msgid "invalid start of line: '%c'"
 msgstr "无效的行首字符：'%c'"
 
-#: apply.c:3047
+#: apply.c:3057
 #, c-format
 msgid "Hunk #%d succeeded at %d (offset %d line)."
 msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
 msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）"
 
-#: apply.c:3059
+#: apply.c:3069
 #, c-format
 msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
 msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
 
-#: apply.c:3065
+#: apply.c:3075
 #, c-format
 msgid ""
 "while searching for:\n"
@@ -408,443 +408,445 @@
 "当查询：\n"
 "%.*s"
 
-#: apply.c:3087
+#: apply.c:3097
 #, c-format
 msgid "missing binary patch data for '%s'"
 msgstr "缺失 '%s' 的二进制补丁数据"
 
-#: apply.c:3095
+#: apply.c:3105
 #, c-format
 msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
 msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
 
-#: apply.c:3142
+#: apply.c:3152
 #, c-format
 msgid "cannot apply binary patch to '%s' without full index line"
 msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
 
-#: apply.c:3152
+#: apply.c:3163
 #, c-format
 msgid ""
 "the patch applies to '%s' (%s), which does not match the current contents."
 msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
 
-#: apply.c:3160
+#: apply.c:3171
 #, c-format
 msgid "the patch applies to an empty '%s' but it is not empty"
 msgstr "补丁应用到空文件 '%s'，但其并非空文件"
 
-#: apply.c:3178
+#: apply.c:3189
 #, c-format
 msgid "the necessary postimage %s for '%s' cannot be read"
 msgstr "无法读取 '%2$s' 必需的目标文件 %1$s"
 
-#: apply.c:3191
+#: apply.c:3202
 #, c-format
 msgid "binary patch does not apply to '%s'"
 msgstr "二进制补丁未应用到 '%s'"
 
-#: apply.c:3197
+#: apply.c:3209
 #, c-format
 msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
 msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
 
-#: apply.c:3218
+#: apply.c:3230
 #, c-format
 msgid "patch failed: %s:%ld"
 msgstr "打补丁失败：%s:%ld"
 
-#: apply.c:3341
+#: apply.c:3353
 #, c-format
 msgid "cannot checkout %s"
 msgstr "不能检出 %s"
 
-#: apply.c:3393 apply.c:3404 apply.c:3450 midx.c:61 setup.c:280
+#: apply.c:3405 apply.c:3416 apply.c:3462 midx.c:61 setup.c:308
 #, c-format
 msgid "failed to read %s"
 msgstr "无法读取 %s"
 
-#: apply.c:3401
+#: apply.c:3413
 #, c-format
 msgid "reading from '%s' beyond a symbolic link"
 msgstr "读取位于符号链接中的 '%s'"
 
-#: apply.c:3430 apply.c:3673
+#: apply.c:3442 apply.c:3685
 #, c-format
 msgid "path %s has been renamed/deleted"
 msgstr "路径 %s 已经被重命名/删除"
 
-#: apply.c:3516 apply.c:3688
+#: apply.c:3528 apply.c:3700
 #, c-format
 msgid "%s: does not exist in index"
 msgstr "%s：不存在于索引中"
 
-#: apply.c:3525 apply.c:3696
+#: apply.c:3537 apply.c:3708
 #, c-format
 msgid "%s: does not match index"
 msgstr "%s：和索引不匹配"
 
-#: apply.c:3560
+#: apply.c:3572
 msgid "repository lacks the necessary blob to fall back on 3-way merge."
 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 
-#: apply.c:3563
+#: apply.c:3575
 #, c-format
 msgid "Falling back to three-way merge...\n"
 msgstr "回落到三方合并...\n"
 
-#: apply.c:3579 apply.c:3583
+#: apply.c:3591 apply.c:3595
 #, c-format
 msgid "cannot read the current contents of '%s'"
 msgstr "无法读取 '%s' 的当前内容"
 
-#: apply.c:3595
+#: apply.c:3607
 #, c-format
 msgid "Failed to fall back on three-way merge...\n"
 msgstr "无法回落到三方合并...\n"
 
-#: apply.c:3609
+#: apply.c:3621
 #, c-format
 msgid "Applied patch to '%s' with conflicts.\n"
 msgstr "应用补丁到 '%s' 存在冲突。\n"
 
-#: apply.c:3614
+#: apply.c:3626
 #, c-format
 msgid "Applied patch to '%s' cleanly.\n"
 msgstr "成功应用补丁到 '%s'。\n"
 
-#: apply.c:3640
+#: apply.c:3652
 msgid "removal patch leaves file contents"
 msgstr "移除补丁仍留下了文件内容"
 
-#: apply.c:3713
+#: apply.c:3725
 #, c-format
 msgid "%s: wrong type"
 msgstr "%s：错误类型"
 
-#: apply.c:3715
+#: apply.c:3727
 #, c-format
 msgid "%s has type %o, expected %o"
 msgstr "%s 的类型是 %o，应为 %o"
 
-#: apply.c:3866 apply.c:3868 read-cache.c:830 read-cache.c:856
-#: read-cache.c:1309
+#: apply.c:3878 apply.c:3880 read-cache.c:830 read-cache.c:856
+#: read-cache.c:1325
 #, c-format
 msgid "invalid path '%s'"
 msgstr "无效路径 '%s'"
 
-#: apply.c:3924
+#: apply.c:3936
 #, c-format
 msgid "%s: already exists in index"
 msgstr "%s：已经存在于索引中"
 
-#: apply.c:3927
+#: apply.c:3939
 #, c-format
 msgid "%s: already exists in working directory"
 msgstr "%s：已经存在于工作区中"
 
-#: apply.c:3947
+#: apply.c:3959
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o)"
 msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
 
-#: apply.c:3952
+#: apply.c:3964
 #, c-format
 msgid "new mode (%o) of %s does not match old mode (%o) of %s"
 msgstr "%2$s 的新模式（%1$o）和 %4$s 的旧模式（%3$o）不匹配"
 
-#: apply.c:3972
+#: apply.c:3984
 #, c-format
 msgid "affected file '%s' is beyond a symbolic link"
 msgstr "受影响的文件 '%s' 位于符号链接中"
 
-#: apply.c:3976
+#: apply.c:3988
 #, c-format
 msgid "%s: patch does not apply"
 msgstr "%s：补丁未应用"
 
-#: apply.c:3991
+#: apply.c:4003
 #, c-format
 msgid "Checking patch %s..."
 msgstr "正在检查补丁 %s..."
 
-#: apply.c:4083
+#: apply.c:4095
 #, c-format
 msgid "sha1 information is lacking or useless for submodule %s"
 msgstr "子模组 %s 的 sha1 信息缺失或无效"
 
-#: apply.c:4090
+#: apply.c:4102
 #, c-format
 msgid "mode change for %s, which is not in current HEAD"
 msgstr "%s 的模式变更，但它不在当前 HEAD 中"
 
-#: apply.c:4093
+#: apply.c:4105
 #, c-format
 msgid "sha1 information is lacking or useless (%s)."
 msgstr "sha1 信息缺失或无效（%s）。"
 
-#: apply.c:4098 builtin/checkout.c:279 builtin/reset.c:143
+#: add-interactive.c:721 apply.c:4110 builtin/checkout.c:294
+#: builtin/reset.c:145
 #, c-format
 msgid "make_cache_entry failed for path '%s'"
 msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
 
-#: apply.c:4102
+#: apply.c:4114
 #, c-format
 msgid "could not add %s to temporary index"
 msgstr "不能在临时索引中添加 %s"
 
-#: apply.c:4112
+#: apply.c:4124
 #, c-format
 msgid "could not write temporary index to %s"
 msgstr "不能把临时索引写入到 %s"
 
-#: apply.c:4250
+#: apply.c:4262
 #, c-format
 msgid "unable to remove %s from index"
 msgstr "不能从索引中移除 %s"
 
-#: apply.c:4284
+#: apply.c:4296
 #, c-format
 msgid "corrupt patch for submodule %s"
 msgstr "子模组 %s 损坏的补丁"
 
-#: apply.c:4290
+#: apply.c:4302
 #, c-format
 msgid "unable to stat newly created file '%s'"
 msgstr "不能对新建文件 '%s' 调用 stat"
 
-#: apply.c:4298
+#: apply.c:4310
 #, c-format
 msgid "unable to create backing store for newly created file %s"
 msgstr "不能为新建文件 %s 创建后端存储"
 
-#: apply.c:4304 apply.c:4449
+#: apply.c:4316 apply.c:4461
 #, c-format
 msgid "unable to add cache entry for %s"
 msgstr "无法为 %s 添加缓存条目"
 
-#: apply.c:4347
+#: apply.c:4359
 #, c-format
 msgid "failed to write to '%s'"
 msgstr "写入 '%s' 失败"
 
-#: apply.c:4351
+#: apply.c:4363
 #, c-format
 msgid "closing file '%s'"
 msgstr "关闭文件 '%s'"
 
-#: apply.c:4421
+#: apply.c:4433
 #, c-format
 msgid "unable to write file '%s' mode %o"
 msgstr "不能写文件 '%s' 权限 %o"
 
-#: apply.c:4519
+#: apply.c:4531
 #, c-format
 msgid "Applied patch %s cleanly."
 msgstr "成功应用补丁 %s。"
 
-#: apply.c:4527
+#: apply.c:4539
 msgid "internal error"
 msgstr "内部错误"
 
-#: apply.c:4530
+#: apply.c:4542
 #, c-format
 msgid "Applying patch %%s with %d reject..."
 msgid_plural "Applying patch %%s with %d rejects..."
 msgstr[0] "应用 %%s 个补丁，其中 %d 个被拒绝..."
 
-#: apply.c:4541
+#: apply.c:4553
 #, c-format
 msgid "truncating .rej filename to %.*s.rej"
 msgstr "截短 .rej 文件名为 %.*s.rej"
 
-#: apply.c:4549 builtin/fetch.c:898 builtin/fetch.c:1194
+#: apply.c:4561 builtin/fetch.c:902 builtin/fetch.c:1195
 #, c-format
 msgid "cannot open %s"
 msgstr "不能打开 %s"
 
-#: apply.c:4563
+#: apply.c:4575
 #, c-format
 msgid "Hunk #%d applied cleanly."
 msgstr "第 #%d 个片段成功应用。"
 
-#: apply.c:4567
+#: apply.c:4579
 #, c-format
 msgid "Rejected hunk #%d."
 msgstr "拒绝第 #%d 个片段。"
 
-#: apply.c:4686
+#: apply.c:4698
 #, c-format
 msgid "Skipped patch '%s'."
 msgstr "略过补丁 '%s'。"
 
-#: apply.c:4694
+#: apply.c:4706
 msgid "unrecognized input"
 msgstr "未能识别的输入"
 
-#: apply.c:4714
+#: apply.c:4726
 msgid "unable to read index file"
 msgstr "无法读取索引文件"
 
-#: apply.c:4871
+#: apply.c:4883
 #, c-format
 msgid "can't open patch '%s': %s"
 msgstr "不能打开补丁 '%s'：%s"
 
-#: apply.c:4898
+#: apply.c:4910
 #, c-format
 msgid "squelched %d whitespace error"
 msgid_plural "squelched %d whitespace errors"
 msgstr[0] "抑制下仍有 %d 个空白字符误用"
 
-#: apply.c:4904 apply.c:4919
+#: apply.c:4916 apply.c:4931
 #, c-format
 msgid "%d line adds whitespace errors."
 msgid_plural "%d lines add whitespace errors."
 msgstr[0] "%d 行新增了空白字符误用。"
 
-#: apply.c:4912
+#: apply.c:4924
 #, c-format
 msgid "%d line applied after fixing whitespace errors."
 msgid_plural "%d lines applied after fixing whitespace errors."
 msgstr[0] "修复空白错误后，应用了 %d 行。"
 
-#: apply.c:4928 builtin/add.c:540 builtin/mv.c:301 builtin/rm.c:390
+#: apply.c:4940 builtin/add.c:612 builtin/mv.c:301 builtin/rm.c:406
 msgid "Unable to write new index file"
 msgstr "无法写入新索引文件"
 
-#: apply.c:4955 apply.c:4958 builtin/am.c:2197 builtin/am.c:2200
-#: builtin/clone.c:122 builtin/fetch.c:143 builtin/merge.c:273
-#: builtin/pull.c:209 builtin/submodule--helper.c:407
-#: builtin/submodule--helper.c:1367 builtin/submodule--helper.c:1370
-#: builtin/submodule--helper.c:1850 builtin/submodule--helper.c:1853
-#: builtin/submodule--helper.c:2092 git-add--interactive.perl:211
+#: add-interactive.c:1136 apply.c:4967 apply.c:4970 builtin/am.c:2250
+#: builtin/am.c:2253 builtin/clone.c:123 builtin/fetch.c:145
+#: builtin/merge.c:276 builtin/pull.c:190 builtin/submodule--helper.c:409
+#: builtin/submodule--helper.c:1394 builtin/submodule--helper.c:1397
+#: builtin/submodule--helper.c:1902 builtin/submodule--helper.c:1905
+#: builtin/submodule--helper.c:2148 bugreport.c:129
+#: git-add--interactive.perl:213
 msgid "path"
 msgstr "路径"
 
-#: apply.c:4956
+#: apply.c:4968
 msgid "don't apply changes matching the given path"
 msgstr "不要应用与给出路径向匹配的变更"
 
-#: apply.c:4959
+#: apply.c:4971
 msgid "apply changes matching the given path"
 msgstr "应用与给出路径向匹配的变更"
 
-#: apply.c:4961 builtin/am.c:2206
+#: apply.c:4973 builtin/am.c:2259
 msgid "num"
 msgstr "数字"
 
-#: apply.c:4962
+#: apply.c:4974
 msgid "remove <num> leading slashes from traditional diff paths"
 msgstr "从传统的 diff 路径中移除指定数量的前导斜线"
 
-#: apply.c:4965
+#: apply.c:4977
 msgid "ignore additions made by the patch"
 msgstr "忽略补丁中的添加的文件"
 
-#: apply.c:4967
+#: apply.c:4979
 msgid "instead of applying the patch, output diffstat for the input"
 msgstr "不应用补丁，而是显示输入的差异统计（diffstat）"
 
-#: apply.c:4971
+#: apply.c:4983
 msgid "show number of added and deleted lines in decimal notation"
 msgstr "以十进制数显示添加和删除的行数"
 
-#: apply.c:4973
+#: apply.c:4985
 msgid "instead of applying the patch, output a summary for the input"
 msgstr "不应用补丁，而是显示输入的概要"
 
-#: apply.c:4975
+#: apply.c:4987
 msgid "instead of applying the patch, see if the patch is applicable"
 msgstr "不应用补丁，而是查看补丁是否可应用"
 
-#: apply.c:4977
+#: apply.c:4989
 msgid "make sure the patch is applicable to the current index"
 msgstr "确认补丁可以应用到当前索引"
 
-#: apply.c:4981
+#: apply.c:4993
 msgid "apply a patch without touching the working tree"
 msgstr "应用补丁而不修改工作区"
 
-#: apply.c:4983
+#: apply.c:4995
 msgid "accept a patch that touches outside the working area"
 msgstr "接受修改工作区之外文件的补丁"
 
-#: apply.c:4986
+#: apply.c:4998
 msgid "also apply the patch (use with --stat/--summary/--check)"
 msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）"
 
-#: apply.c:4988
+#: apply.c:5000
 msgid "attempt three-way merge if a patch does not apply"
 msgstr "如果一个补丁不能应用则尝试三方合并"
 
-#: apply.c:4990
+#: apply.c:5002
 msgid "build a temporary index based on embedded index information"
 msgstr "创建一个临时索引基于嵌入的索引信息"
 
-#: apply.c:4993 builtin/checkout-index.c:173 builtin/ls-files.c:524
+#: apply.c:5005 builtin/checkout-index.c:173 builtin/ls-files.c:525
 msgid "paths are separated with NUL character"
 msgstr "路径以 NUL 字符分隔"
 
-#: apply.c:4995
+#: apply.c:5007
 msgid "ensure at least <n> lines of context match"
 msgstr "确保至少匹配 <n> 行上下文"
 
-#: apply.c:4996 builtin/am.c:2185 builtin/interpret-trailers.c:98
+#: apply.c:5008 builtin/am.c:2238 builtin/interpret-trailers.c:98
 #: builtin/interpret-trailers.c:100 builtin/interpret-trailers.c:102
-#: builtin/pack-objects.c:3310 builtin/rebase.c:1445
+#: builtin/pack-objects.c:3458 builtin/rebase.c:1332
 msgid "action"
 msgstr "动作"
 
-#: apply.c:4997
+#: apply.c:5009
 msgid "detect new or modified lines that have whitespace errors"
 msgstr "检查新增和修改的行中间的空白字符滥用"
 
-#: apply.c:5000 apply.c:5003
+#: apply.c:5012 apply.c:5015
 msgid "ignore changes in whitespace when finding context"
 msgstr "查找上下文时忽略空白字符的变更"
 
-#: apply.c:5006
+#: apply.c:5018
 msgid "apply the patch in reverse"
 msgstr "反向应用补丁"
 
-#: apply.c:5008
+#: apply.c:5020
 msgid "don't expect at least one line of context"
 msgstr "无需至少一行上下文"
 
-#: apply.c:5010
+#: apply.c:5022
 msgid "leave the rejected hunks in corresponding *.rej files"
 msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中"
 
-#: apply.c:5012
+#: apply.c:5024
 msgid "allow overlapping hunks"
 msgstr "允许重叠的补丁片段"
 
-#: apply.c:5013 builtin/add.c:291 builtin/check-ignore.c:22
-#: builtin/commit.c:1337 builtin/count-objects.c:98 builtin/fsck.c:786
-#: builtin/log.c:2085 builtin/mv.c:123 builtin/read-tree.c:128
+#: apply.c:5025 builtin/add.c:323 builtin/check-ignore.c:22
+#: builtin/commit.c:1366 builtin/count-objects.c:98 builtin/fsck.c:775
+#: builtin/log.c:2186 builtin/mv.c:123 builtin/read-tree.c:128
 msgid "be verbose"
 msgstr "冗长输出"
 
-#: apply.c:5015
+#: apply.c:5027
 msgid "tolerate incorrectly detected missing new-line at the end of file"
 msgstr "允许不正确的文件末尾换行符"
 
-#: apply.c:5018
+#: apply.c:5030
 msgid "do not trust the line counts in the hunk headers"
 msgstr "不信任补丁片段的头信息中的行号"
 
-#: apply.c:5020 builtin/am.c:2194
+#: apply.c:5032 builtin/am.c:2247
 msgid "root"
 msgstr "根目录"
 
-#: apply.c:5021
+#: apply.c:5033
 msgid "prepend <root> to all filenames"
 msgstr "为所有文件名前添加 <根目录>"
 
 #: archive.c:14
 msgid "git archive [<options>] <tree-ish> [<path>...]"
-msgstr "git archive [<选项>] <树或提交> [<路径>...]"
+msgstr "git archive [<选项>] <树对象> [<路径>...]"
 
 #: archive.c:15
 msgid "git archive --list"
@@ -853,116 +855,116 @@
 #: archive.c:16
 msgid ""
 "git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
-msgstr "git archive --remote <仓库> [--exec <命令>] [<选项>] <树或提交> [<路径>...]"
+msgstr "git archive --remote <仓库> [--exec <命令>] [<选项>] <树对象> [<路径>...]"
 
 #: archive.c:17
 msgid "git archive --remote <repo> [--exec <cmd>] --list"
 msgstr "git archive --remote <仓库> [--exec <命令>] --list"
 
-#: archive.c:372 builtin/add.c:177 builtin/add.c:516 builtin/rm.c:299
+#: archive.c:377 builtin/add.c:181 builtin/add.c:588 builtin/rm.c:315
 #, c-format
 msgid "pathspec '%s' did not match any files"
 msgstr "路径规格 '%s' 未匹配任何文件"
 
-#: archive.c:457
+#: archive.c:464
 msgid "fmt"
 msgstr "格式"
 
-#: archive.c:457
+#: archive.c:464
 msgid "archive format"
 msgstr "归档格式"
 
-#: archive.c:458 builtin/log.c:1581
+#: archive.c:465 builtin/log.c:1674
 msgid "prefix"
 msgstr "前缀"
 
-#: archive.c:459
+#: archive.c:466
 msgid "prepend prefix to each pathname in the archive"
 msgstr "为归档中每个路径名加上前缀"
 
-#: archive.c:460 builtin/blame.c:861 builtin/blame.c:873 builtin/blame.c:874
-#: builtin/commit-tree.c:117 builtin/config.c:129 builtin/fast-export.c:1162
-#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:899
-#: builtin/hash-object.c:105 builtin/ls-files.c:560 builtin/ls-files.c:563
+#: archive.c:467 builtin/blame.c:861 builtin/blame.c:865 builtin/blame.c:866
+#: builtin/commit-tree.c:117 builtin/config.c:130 builtin/fast-export.c:1162
+#: builtin/fast-export.c:1164 builtin/fast-export.c:1168 builtin/grep.c:907
+#: builtin/hash-object.c:105 builtin/ls-files.c:561 builtin/ls-files.c:564
 #: builtin/notes.c:412 builtin/notes.c:578 builtin/read-tree.c:123
-#: parse-options.h:186
+#: parse-options.h:190
 msgid "file"
 msgstr "文件"
 
-#: archive.c:461 builtin/archive.c:90
+#: archive.c:468 builtin/archive.c:90
 msgid "write the archive to this file"
 msgstr "归档写入此文件"
 
-#: archive.c:463
+#: archive.c:470
 msgid "read .gitattributes in working directory"
 msgstr "读取工作区中的 .gitattributes"
 
-#: archive.c:464
+#: archive.c:471
 msgid "report archived files on stderr"
 msgstr "在标准错误上报告归档文件"
 
-#: archive.c:465
+#: archive.c:472
 msgid "store only"
 msgstr "只存储"
 
-#: archive.c:466
+#: archive.c:473
 msgid "compress faster"
 msgstr "压缩速度更快"
 
-#: archive.c:474
+#: archive.c:481
 msgid "compress better"
 msgstr "压缩效果更好"
 
-#: archive.c:477
+#: archive.c:484
 msgid "list supported archive formats"
 msgstr "列出支持的归档格式"
 
-#: archive.c:479 builtin/archive.c:91 builtin/clone.c:112 builtin/clone.c:115
-#: builtin/submodule--helper.c:1379 builtin/submodule--helper.c:1859
+#: archive.c:486 builtin/archive.c:91 builtin/clone.c:113 builtin/clone.c:116
+#: builtin/submodule--helper.c:1406 builtin/submodule--helper.c:1911
 msgid "repo"
 msgstr "仓库"
 
-#: archive.c:480 builtin/archive.c:92
+#: archive.c:487 builtin/archive.c:92
 msgid "retrieve the archive from remote repository <repo>"
 msgstr "从远程仓库（<仓库>）提取归档文件"
 
-#: archive.c:481 builtin/archive.c:93 builtin/difftool.c:715
+#: archive.c:488 builtin/archive.c:93 builtin/difftool.c:715
 #: builtin/notes.c:498
 msgid "command"
 msgstr "命令"
 
-#: archive.c:482 builtin/archive.c:94
+#: archive.c:489 builtin/archive.c:94
 msgid "path to the remote git-upload-archive command"
 msgstr "远程 git-upload-archive 命令的路径"
 
-#: archive.c:489
+#: archive.c:496
 msgid "Unexpected option --remote"
 msgstr "未知参数 --remote"
 
-#: archive.c:491
+#: archive.c:498
 msgid "Option --exec can only be used together with --remote"
 msgstr "选项 --exec 只能和 --remote 同时使用"
 
-#: archive.c:493
+#: archive.c:500
 msgid "Unexpected option --output"
 msgstr "未知参数 --output"
 
-#: archive.c:515
+#: archive.c:522
 #, c-format
 msgid "Unknown archive format '%s'"
 msgstr "未知归档格式 '%s'"
 
-#: archive.c:522
+#: archive.c:529
 #, c-format
 msgid "Argument not supported for format '%s': -%d"
 msgstr "参数不支持此格式 '%s'：-%d"
 
-#: attr.c:213
+#: attr.c:212
 #, c-format
 msgid "%.*s is not a valid attribute name"
 msgstr "%.*s 不是一个有效的属性名"
 
-#: attr.c:410
+#: attr.c:409
 msgid ""
 "Negative patterns are ignored in git attributes\n"
 "Use '\\!' for literal leading exclamation."
@@ -980,12 +982,12 @@
 msgid "We cannot bisect more!\n"
 msgstr "我们无法进行更多的二分查找！\n"
 
-#: bisect.c:733
+#: bisect.c:745
 #, c-format
 msgid "Not a valid commit name %s"
 msgstr "不是一个有效的提交名 %s"
 
-#: bisect.c:758
+#: bisect.c:770
 #, c-format
 msgid ""
 "The merge base %s is bad.\n"
@@ -994,7 +996,7 @@
 "合并基线 %s 是坏的。\n"
 "这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
 
-#: bisect.c:763
+#: bisect.c:775
 #, c-format
 msgid ""
 "The merge base %s is new.\n"
@@ -1003,7 +1005,7 @@
 "合并基线 %s 是新的。\n"
 "介于 %s 和 [%s] 之间的属性已经被修改。\n"
 
-#: bisect.c:768
+#: bisect.c:780
 #, c-format
 msgid ""
 "The merge base %s is %s.\n"
@@ -1012,7 +1014,7 @@
 "合并基线 %s 是 %s。\n"
 "这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
 
-#: bisect.c:776
+#: bisect.c:788
 #, c-format
 msgid ""
 "Some %s revs are not ancestors of the %s rev.\n"
@@ -1023,7 +1025,7 @@
 "这种情况下 git 二分查找无法正常工作。\n"
 "您可能弄错了 %s 和 %s 版本？\n"
 
-#: bisect.c:789
+#: bisect.c:801
 #, c-format
 msgid ""
 "the merge base between %s and [%s] must be skipped.\n"
@@ -1034,36 +1036,36 @@
 "所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
 "我们仍旧继续。"
 
-#: bisect.c:822
+#: bisect.c:840
 #, c-format
 msgid "Bisecting: a merge base must be tested\n"
 msgstr "二分查找中：合并基线必须是经过测试的\n"
 
-#: bisect.c:865
+#: bisect.c:890
 #, c-format
 msgid "a %s revision is needed"
 msgstr "需要一个 %s 版本"
 
-#: bisect.c:884 builtin/notes.c:177 builtin/tag.c:254
+#: bisect.c:920 builtin/notes.c:177 builtin/tag.c:255
 #, c-format
 msgid "could not create file '%s'"
 msgstr "不能创建文件 '%s'"
 
-#: bisect.c:928 builtin/merge.c:148
+#: bisect.c:966 builtin/merge.c:151
 #, c-format
 msgid "could not read file '%s'"
 msgstr "不能读取文件 '%s'"
 
-#: bisect.c:958
+#: bisect.c:997
 msgid "reading bisect refs failed"
 msgstr "读取二分查找引用失败"
 
-#: bisect.c:977
+#: bisect.c:1019
 #, c-format
 msgid "%s was both %s and %s\n"
 msgstr "%s 同时为 %s 和 %s\n"
 
-#: bisect.c:985
+#: bisect.c:1028
 #, c-format
 msgid ""
 "No testable commit found.\n"
@@ -1072,7 +1074,7 @@
 "没有发现可测试的提交。\n"
 "可能您在运行时使用了错误的路径参数？\n"
 
-#: bisect.c:1004
+#: bisect.c:1057
 #, c-format
 msgid "(roughly %d step)"
 msgid_plural "(roughly %d steps)"
@@ -1081,43 +1083,43 @@
 #. TRANSLATORS: the last %s will be replaced with "(roughly %d
 #. steps)" translation.
 #. 
-#: bisect.c:1010
+#: bisect.c:1063
 #, c-format
 msgid "Bisecting: %d revision left to test after this %s\n"
 msgid_plural "Bisecting: %d revisions left to test after this %s\n"
 msgstr[0] "二分查找中：在此之后，还剩 %d 个版本待测试 %s\n"
 
-#: blame.c:2700
+#: blame.c:2777
 msgid "--contents and --reverse do not blend well."
 msgstr "--contents 和 --reverse 不能混用。"
 
-#: blame.c:2714
+#: blame.c:2791
 msgid "cannot use --contents with final commit object name"
 msgstr "不能将 --contents 和最终的提交对象名共用"
 
-#: blame.c:2735
+#: blame.c:2812
 msgid "--reverse and --first-parent together require specified latest commit"
 msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
 
-#: blame.c:2744 bundle.c:167 ref-filter.c:2203 remote.c:1941 sequencer.c:1971
-#: sequencer.c:4305 builtin/commit.c:1020 builtin/log.c:387 builtin/log.c:964
-#: builtin/log.c:1452 builtin/log.c:1844 builtin/log.c:2134 builtin/merge.c:411
-#: builtin/pack-objects.c:3128 builtin/pack-objects.c:3143
+#: blame.c:2821 bundle.c:167 ref-filter.c:2200 remote.c:1924 sequencer.c:2018
+#: sequencer.c:4466 submodule.c:847 builtin/commit.c:1047 builtin/log.c:405
+#: builtin/log.c:1012 builtin/log.c:1541 builtin/log.c:1945 builtin/log.c:2235
+#: builtin/merge.c:415 builtin/pack-objects.c:3276 builtin/pack-objects.c:3291
 #: builtin/shortlog.c:192
 msgid "revision walk setup failed"
 msgstr "版本遍历设置失败"
 
-#: blame.c:2762
+#: blame.c:2839
 msgid ""
 "--reverse --first-parent together require range along first-parent chain"
 msgstr "--reverse 和 --first-parent 共用，需要第一祖先链上的提交范围"
 
-#: blame.c:2773
+#: blame.c:2850
 #, c-format
 msgid "no such path %s in %s"
 msgstr "在 %2$s 中无此路径 %1$s"
 
-#: blame.c:2784
+#: blame.c:2861
 #, c-format
 msgid "cannot read blob %s for path %s"
 msgstr "不能为路径 %2$s 读取数据对象 %1$s"
@@ -1246,12 +1248,12 @@
 msgid "Not a valid branch point: '%s'."
 msgstr "无效的分支点：'%s'。"
 
-#: branch.c:364
+#: branch.c:365
 #, c-format
 msgid "'%s' is already checked out at '%s'"
 msgstr "'%s' 已经检出到 '%s'"
 
-#: branch.c:387
+#: branch.c:388
 #, c-format
 msgid "HEAD of working tree %s is not updated"
 msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1266,8 +1268,8 @@
 msgid "unrecognized header: %s%s (%d)"
 msgstr "未能识别的包头：%s%s (%d)"
 
-#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2221 sequencer.c:2962
-#: builtin/commit.c:791
+#: bundle.c:90 rerere.c:480 rerere.c:690 sequencer.c:2270 sequencer.c:3034
+#: builtin/commit.c:814
 #, c-format
 msgid "could not open '%s'"
 msgstr "不能打开 '%s'"
@@ -1292,58 +1294,58 @@
 msgid_plural "The bundle requires these %d refs:"
 msgstr[0] "这个包需要这个引用："
 
-#: bundle.c:279
+#: bundle.c:280
 msgid "Could not spawn pack-objects"
 msgstr "不能生成 pack-objects 进程"
 
-#: bundle.c:290
+#: bundle.c:291
 msgid "pack-objects died"
 msgstr "pack-objects 终止"
 
-#: bundle.c:332
+#: bundle.c:333
 msgid "rev-list died"
 msgstr "rev-list 终止"
 
-#: bundle.c:381
+#: bundle.c:382
 #, c-format
 msgid "ref '%s' is excluded by the rev-list options"
 msgstr "引用 '%s' 被 rev-list 选项排除"
 
-#: bundle.c:460 builtin/log.c:202 builtin/log.c:1733 builtin/shortlog.c:306
+#: bundle.c:461 builtin/log.c:208 builtin/log.c:1834 builtin/shortlog.c:306
 #, c-format
 msgid "unrecognized argument: %s"
 msgstr "未能识别的参数：%s"
 
-#: bundle.c:468
+#: bundle.c:469
 msgid "Refusing to create empty bundle."
 msgstr "不能创建空包。"
 
-#: bundle.c:478
+#: bundle.c:479
 #, c-format
 msgid "cannot create '%s'"
 msgstr "不能创建 '%s'"
 
-#: bundle.c:503
+#: bundle.c:504
 msgid "index-pack died"
 msgstr "index-pack 终止"
 
-#: color.c:296
+#: color.c:329
 #, c-format
 msgid "invalid color value: %.*s"
 msgstr "无效的颜色值：%.*s"
 
-#: commit.c:50 sequencer.c:2665 builtin/am.c:354 builtin/am.c:398
-#: builtin/am.c:1366 builtin/am.c:2009 builtin/replace.c:456
+#: commit.c:52 sequencer.c:2739 builtin/am.c:359 builtin/am.c:403
+#: builtin/am.c:1371 builtin/am.c:2013 builtin/replace.c:457
 #, c-format
 msgid "could not parse %s"
 msgstr "不能解析 %s"
 
-#: commit.c:52
+#: commit.c:54
 #, c-format
 msgid "%s %s is not a commit!"
 msgstr "%s %s 不是一个提交！"
 
-#: commit.c:1391
+#: commit.c:1432
 msgid ""
 "Warning: commit message did not conform to UTF-8.\n"
 "You may want to amend it after fixing the message, or set the config\n"
@@ -1357,157 +1359,157 @@
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
-#: config.c:197
+#: config.c:198
 msgid "relative config include conditionals must come from files"
 msgstr "相对路径的配置文件条件引用必须来自于文件"
 
-#: config.c:821
+#: config.c:836
 #, c-format
 msgid "bad config line %d in blob %s"
 msgstr "数据对象 %2$s 中错误的配置行 %1$d"
 
-#: config.c:825
+#: config.c:840
 #, c-format
 msgid "bad config line %d in file %s"
 msgstr "文件 %2$s 中错误的配置行 %1$d"
 
-#: config.c:829
+#: config.c:844
 #, c-format
 msgid "bad config line %d in standard input"
 msgstr "标准输入中错误的配置行 %d"
 
-#: config.c:833
+#: config.c:848
 #, c-format
 msgid "bad config line %d in submodule-blob %s"
 msgstr "子模组数据对象 %2$s 中错误的配置行 %1$d"
 
-#: config.c:837
+#: config.c:852
 #, c-format
 msgid "bad config line %d in command line %s"
 msgstr "命令行 %2$s 中错误的配置行 %1$d"
 
-#: config.c:841
+#: config.c:856
 #, c-format
 msgid "bad config line %d in %s"
 msgstr "在 %2$s 中错误的配置行 %1$d"
 
-#: config.c:978
+#: config.c:993
 msgid "out of range"
 msgstr "超出范围"
 
-#: config.c:978
+#: config.c:993
 msgid "invalid unit"
 msgstr "无效的单位"
 
-#: config.c:979
+#: config.c:994
 #, c-format
 msgid "bad numeric config value '%s' for '%s': %s"
 msgstr "配置变量 '%2$s' 的数字取值 '%1$s' 设置错误：%3$s"
 
-#: config.c:998
+#: config.c:1013
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
 msgstr "数据对象 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:1001
+#: config.c:1016
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in file %s: %s"
 msgstr "文件 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:1004
+#: config.c:1019
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in standard input: %s"
 msgstr "标准输入中配置变量 '%2$s' 错误的取值 '%1$s'：%3$s"
 
-#: config.c:1007
+#: config.c:1022
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
 msgstr "子模组数据 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:1010
+#: config.c:1025
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
 msgstr "命令行 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:1013
+#: config.c:1028
 #, c-format
 msgid "bad numeric config value '%s' for '%s' in %s: %s"
 msgstr "在 %3$s 中配置变量 '%2$s' 错误的取值 '%1$s'：%4$s"
 
-#: config.c:1108
+#: config.c:1123
 #, c-format
 msgid "failed to expand user dir in: '%s'"
 msgstr "无法扩展用户目录：'%s'"
 
-#: config.c:1117
+#: config.c:1132
 #, c-format
 msgid "'%s' for '%s' is not a valid timestamp"
 msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
 
-#: config.c:1222 config.c:1233
+#: config.c:1237 config.c:1248
 #, c-format
 msgid "bad zlib compression level %d"
 msgstr "错误的 zlib 压缩级别 %d"
 
-#: config.c:1358
+#: config.c:1373
 #, c-format
 msgid "invalid mode for object creation: %s"
 msgstr "无效的对象创建模式：%s"
 
-#: config.c:1513 builtin/pack-objects.c:3394
+#: config.c:1533 builtin/pack-objects.c:3542
 #, c-format
 msgid "bad pack compression level %d"
 msgstr "错误的打包压缩级别 %d"
 
-#: config.c:1740
+#: config.c:1759
 msgid "unable to parse command-line config"
 msgstr "无法解析命令行中的配置"
 
-#: config.c:2091
+#: config.c:2113
 msgid "unknown error occurred while reading the configuration files"
 msgstr "在读取配置文件时遇到未知错误"
 
-#: config.c:2261
+#: config.c:2283
 #, c-format
 msgid "Invalid %s: '%s'"
 msgstr "无效 %s：'%s'"
 
-#: config.c:2144
+#: config.c:2250
 #, c-format
 msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
 msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
 
-#: config.c:2306
+#: config.c:2328
 #, c-format
 msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
 msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
 
-#: config.c:2352
+#: config.c:2374
 #, c-format
 msgid "unable to parse '%s' from command-line config"
 msgstr "无法解析命令行配置中的 '%s'"
 
-#: config.c:2354
+#: config.c:2376
 #, c-format
 msgid "bad config variable '%s' in file '%s' at line %d"
 msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
 
-#: config.c:2467
+#: config.c:2489
 #, c-format
 msgid "%s has multiple values"
 msgstr "%s 有多个取值"
 
-#: config.c:2832 config.c:3085
+#: config.c:2854 config.c:3107
 #, c-format
 msgid "fstat on %s failed"
 msgstr "对 %s 调用 fstat 失败"
 
-#: config.c:2971
+#: config.c:2993
 #, c-format
 msgid "could not set '%s' to '%s'"
 msgstr "不能设置 '%s' 为 '%s'"
 
-#: config.c:2973 builtin/remote.c:782
+#: config.c:2995 builtin/remote.c:655 builtin/remote.c:849 builtin/remote.c:857
 #, c-format
 msgid "could not unset '%s'"
 msgstr "不能取消设置 '%s'"
@@ -1527,19 +1529,19 @@
 "\n"
 "请确认您有正确的访问权限并且仓库存在。"
 
-#: connected.c:88 builtin/fsck.c:221 builtin/prune.c:43
+#: connected.c:107 builtin/fsck.c:209 builtin/prune.c:45
 msgid "Checking connectivity"
 msgstr "正在检查连通性"
 
-#: connected.c:100
+#: connected.c:119
 msgid "Could not run 'git rev-list'"
 msgstr "不能执行 'git rev-list'"
 
-#: connected.c:120
+#: connected.c:139
 msgid "failed write to rev-list"
 msgstr "写入 rev-list 失败"
 
-#: connected.c:127
+#: connected.c:146
 msgid "failed to close rev-list's stdin"
 msgstr "关闭 rev-list 的标准输入失败"
 
@@ -1635,11 +1637,11 @@
 msgid "failed to read orderfile '%s'"
 msgstr "读取排序文件 '%s' 失败"
 
-#: diffcore-rename.c:543
+#: diffcore-rename.c:592
 msgid "Performing inexact rename detection"
 msgstr "正在进行非精确的重命名探测"
 
-#: diff.c:74
+#: diff.c:108
 #, c-format
 msgid "option '%s' requires a value"
 msgstr "选项 '%s'  需要一个值"
@@ -1676,24 +1678,24 @@
 "发现配置变量 'diff.dirstat' 中的错误：\n"
 "%s"
 
-#: diff.c:4218
+#: diff.c:4238
 #, c-format
 msgid "external diff died, stopping at %s"
 msgstr "外部 diff 退出，停止在 %s"
 
-#: diff.c:4563
+#: diff.c:4583
 msgid "--name-only, --name-status, --check and -s are mutually exclusive"
 msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
 
-#: diff.c:4566
+#: diff.c:4586
 msgid "-G, -S and --find-object are mutually exclusive"
 msgstr "-G、-S 和 --find-object 是互斥的"
 
-#: diff.c:4644
+#: diff.c:4664
 msgid "--follow requires exactly one pathspec"
 msgstr "--follow 明确要求只跟一个路径规格"
 
-#: diff.c:4729
+#: diff.c:4749
 #, c-format
 msgid ""
 "Failed to parse --dirstat/-X option parameter:\n"
@@ -1702,31 +1704,31 @@
 "无法解析 --dirstat/-X 选项的参数：\n"
 "%s"
 
-#: diff.c:4417
+#: diff.c:4743
 #, c-format
 msgid "Failed to parse --submodule option parameter: '%s'"
 msgstr "无法解析 --submodule 选项的参数：'%s'"
 
-#: diff.c:6180
+#: diff.c:6200
 msgid "inexact rename detection was skipped due to too many files."
 msgstr "因为文件太多，略过不严格的重命名检查。"
 
-#: diff.c:6183
+#: diff.c:6203
 msgid "only found copies from modified paths due to too many files."
 msgstr "因为文件太多，只在修改的路径中查找拷贝。"
 
-#: diff.c:6186
+#: diff.c:6206
 #, c-format
 msgid ""
 "you may want to set your %s variable to at least %d and retry the command."
 msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
 
-#: dir.c:1877
+#: dir.c:2275
 #, c-format
 msgid "could not open directory '%s'"
 msgstr "不能打开目录 '%s'"
 
-#: dir.c:2128
+#: dir.c:2575
 msgid "failed to get kernel name and information"
 msgstr "无法获得内核名称和信息"
 
@@ -1734,17 +1736,17 @@
 msgid "Untracked cache is disabled on this system or location."
 msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
 
-#: dir.c:3101 dir.c:3106
+#: dir.c:3526 dir.c:3531
 #, c-format
 msgid "could not create directories for %s"
 msgstr "不能为 %s 创建目录"
 
-#: dir.c:3135
+#: dir.c:3560
 #, c-format
 msgid "could not migrate git directory from '%s' to '%s'"
 msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
 
-#: editor.c:73
+#: editor.c:74
 #, c-format
 msgid "hint: Waiting for your editor to close the file...%c"
 msgstr "提示：等待您的编辑器关闭文件...%c"
@@ -1753,20 +1755,20 @@
 msgid "Filtering content"
 msgstr "过滤内容"
 
-#: entry.c:476
+#: entry.c:479
 #, c-format
 msgid "could not stat file '%s'"
 msgstr "不能对文件 '%s' 调用 stat"
 
-#: promisor-remote.c:25
+#: promisor-remote.c:23
 msgid "Remote with no URL"
 msgstr "远程未设置 URL"
 
-#: fetch-pack.c:150
+#: fetch-pack.c:151
 msgid "git fetch-pack: expected shallow list"
 msgstr "git fetch-pack：应为 shallow 列表"
 
-#: fetch-pack.c:164
+#: fetch-pack.c:165
 msgid "git fetch-pack: expected ACK/NAK, got a flush packet"
 msgstr "git fetch-pack：期望 ACK/NAK，却得到 flush 包"
 
@@ -1775,209 +1777,209 @@
 msgid "remote error: %s"
 msgstr "远程错误：%s"
 
-#: fetch-pack.c:184
+#: fetch-pack.c:185
 #, c-format
 msgid "git fetch-pack: expected ACK/NAK, got '%s'"
 msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
 
-#: fetch-pack.c:257
+#: fetch-pack.c:258
 msgid "--stateless-rpc requires multi_ack_detailed"
 msgstr "--stateless-rpc 需要 multi_ack_detailed"
 
-#: fetch-pack.c:356 fetch-pack.c:1280
+#: fetch-pack.c:357 fetch-pack.c:1364
 #, c-format
 msgid "invalid shallow line: %s"
 msgstr "无效的 shallow 信息：%s"
 
-#: fetch-pack.c:362 fetch-pack.c:1286
+#: fetch-pack.c:363 fetch-pack.c:1370
 #, c-format
 msgid "invalid unshallow line: %s"
 msgstr "无效的 unshallow 信息：%s"
 
-#: fetch-pack.c:364 fetch-pack.c:1288
+#: fetch-pack.c:365 fetch-pack.c:1372
 #, c-format
 msgid "object not found: %s"
 msgstr "对象未找到：%s"
 
-#: fetch-pack.c:367 fetch-pack.c:1291
+#: fetch-pack.c:368 fetch-pack.c:1375
 #, c-format
 msgid "error in object: %s"
 msgstr "对象中出错：%s"
 
-#: fetch-pack.c:369 fetch-pack.c:1293
+#: fetch-pack.c:370 fetch-pack.c:1377
 #, c-format
 msgid "no shallow found: %s"
 msgstr "未发现 shallow：%s"
 
-#: fetch-pack.c:372 fetch-pack.c:1297
+#: fetch-pack.c:373 fetch-pack.c:1381
 #, c-format
 msgid "expected shallow/unshallow, got %s"
 msgstr "应为 shallow/unshallow，却得到 %s"
 
-#: fetch-pack.c:414
+#: fetch-pack.c:415
 #, c-format
 msgid "got %s %d %s"
 msgstr "得到 %s %d %s"
 
-#: fetch-pack.c:431
+#: fetch-pack.c:432
 #, c-format
 msgid "invalid commit %s"
 msgstr "无效提交 %s"
 
-#: fetch-pack.c:462
+#: fetch-pack.c:463
 msgid "giving up"
 msgstr "放弃"
 
-#: fetch-pack.c:475 progress.c:312
+#: fetch-pack.c:476 progress.c:336
 msgid "done"
 msgstr "完成"
 
-#: fetch-pack.c:487
+#: fetch-pack.c:488
 #, c-format
 msgid "got %s (%d) %s"
 msgstr "得到 %s (%d) %s"
 
-#: fetch-pack.c:533
+#: fetch-pack.c:534
 #, c-format
 msgid "Marking %s as complete"
 msgstr "标记 %s 为完成"
 
-#: fetch-pack.c:742
+#: fetch-pack.c:755
 #, c-format
 msgid "already have %s (%s)"
 msgstr "已经有 %s（%s）"
 
-#: fetch-pack.c:781
+#: fetch-pack.c:819
 msgid "fetch-pack: unable to fork off sideband demultiplexer"
 msgstr "fetch-pack：无法派生 sideband 多路输出"
 
-#: fetch-pack.c:789
+#: fetch-pack.c:827
 msgid "protocol error: bad pack header"
 msgstr "协议错误：坏的包头"
 
-#: fetch-pack.c:857
+#: fetch-pack.c:901
 #, c-format
 msgid "fetch-pack: unable to fork off %s"
 msgstr "fetch-pack：无法派生进程 %s"
 
-#: fetch-pack.c:873
+#: fetch-pack.c:917
 #, c-format
 msgid "%s failed"
 msgstr "%s 失败"
 
-#: fetch-pack.c:875
+#: fetch-pack.c:919
 msgid "error in sideband demultiplexer"
 msgstr "sideband 多路输出出错"
 
-#: fetch-pack.c:914
+#: fetch-pack.c:973
 msgid "Server does not support shallow clients"
 msgstr "服务器不支持 shalllow 客户端"
 
-#: fetch-pack.c:944
+#: fetch-pack.c:930
 msgid "Server supports multi_ack_detailed"
 msgstr "服务器支持 multi_ack_detailed"
 
-#: fetch-pack.c:947
+#: fetch-pack.c:933
 msgid "Server supports no-done"
 msgstr "服务器支持 no-done"
 
-#: fetch-pack.c:953
+#: fetch-pack.c:939
 msgid "Server supports multi_ack"
 msgstr "服务器支持 multi_ack"
 
-#: fetch-pack.c:957
+#: fetch-pack.c:943
 msgid "Server supports side-band-64k"
 msgstr "服务器支持 side-band-64k"
 
-#: fetch-pack.c:961
+#: fetch-pack.c:947
 msgid "Server supports side-band"
 msgstr "服务器支持 side-band"
 
-#: fetch-pack.c:965
+#: fetch-pack.c:951
 msgid "Server supports allow-tip-sha1-in-want"
 msgstr "服务器支持 allow-tip-sha1-in-want"
 
-#: fetch-pack.c:969
+#: fetch-pack.c:955
 msgid "Server supports allow-reachable-sha1-in-want"
 msgstr "服务器支持 allow-reachable-sha1-in-want"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:965
 msgid "Server supports ofs-delta"
 msgstr "服务器支持 ofs-delta"
 
-#: fetch-pack.c:1157
+#: fetch-pack.c:1218
 msgid "Server supports filter"
 msgstr "服务器支持 filter"
 
-#: fetch-pack.c:907
+#: fetch-pack.c:966
 #, c-format
 msgid "Server version is %.*s"
 msgstr "服务器版本 %.*s"
 
-#: fetch-pack.c:974
+#: fetch-pack.c:1033
 msgid "Server does not support --shallow-since"
 msgstr "服务器不支持 --shallow-since"
 
-#: fetch-pack.c:979
+#: fetch-pack.c:1038
 msgid "Server does not support --shallow-exclude"
 msgstr "服务器不支持 --shallow-exclude"
 
-#: fetch-pack.c:983
+#: fetch-pack.c:1042
 msgid "Server does not support --deepen"
 msgstr "服务器不支持 --deepen"
 
-#: fetch-pack.c:1000
+#: fetch-pack.c:1059
 msgid "no common commits"
 msgstr "没有共同的提交"
 
-#: fetch-pack.c:1012 fetch-pack.c:1468
+#: fetch-pack.c:1071 fetch-pack.c:1563
 msgid "git fetch-pack: fetch failed."
 msgstr "git fetch-pack：获取失败。"
 
-#: fetch-pack.c:1693
+#: fetch-pack.c:1789
 msgid "no matching remote head"
 msgstr "没有匹配的远程分支"
 
-#: fetch-pack.c:1743
+#: fetch-pack.c:1839
 #, c-format
 msgid "no such remote ref %s"
 msgstr "没有这样的远程引用 %s"
 
-#: fetch-pack.c:1746
+#: fetch-pack.c:1842
 #, c-format
 msgid "Server does not allow request for unadvertised object %s"
 msgstr "服务器不允许请求未公开的对象 %s"
 
-#: gpg-interface.c:321
+#: gpg-interface.c:457
 msgid "gpg failed to sign the data"
-msgstr "gpg 无法为数据签名"
+msgstr "gpg 数据签名失败"
 
-#: gpg-interface.c:347
+#: gpg-interface.c:272
 msgid "could not create temporary file"
 msgstr "不能创建临时文件"
 
-#: gpg-interface.c:350
+#: gpg-interface.c:275
 #, c-format
 msgid "failed writing detached signature to '%s'"
 msgstr "无法将分离式签名写入 '%s'"
 
-#: graph.c:97
+#: graph.c:98
 #, c-format
 msgid "ignore invalid color '%.*s' in log.graphColors"
 msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
 
-#: grep.c:2124
+#: grep.c:2128
 #, c-format
 msgid "'%s': unable to read %s"
 msgstr "'%s'：无法读取 %s"
 
-#: grep.c:2141 setup.c:165 builtin/clone.c:408 builtin/diff.c:82
+#: grep.c:2145 setup.c:176 builtin/clone.c:411 builtin/diff.c:82
 #: builtin/rm.c:135
 #, c-format
 msgid "failed to stat '%s'"
 msgstr "对 '%s' 调用 stat 失败"
 
-#: grep.c:2152
+#: grep.c:2156
 #, c-format
 msgid "'%s': short read"
 msgstr "'%s'：读取不完整"
@@ -1995,7 +1997,7 @@
 msgid "These are common Git commands used in various situations:"
 msgstr "这些是各种场合常见的 Git 命令："
 
-#: help.c:596
+#: help.c:511
 #, c-format
 msgid ""
 "'%s' appears to be a git command, but we were not\n"
@@ -2004,31 +2006,31 @@
 "'%s' 像是一个 git 命令，但却无法运行。\n"
 "可能是 git-%s 受损？"
 
-#: help.c:655
+#: help.c:570
 msgid "Uh oh. Your system reports no Git commands at all."
 msgstr "唉呀，您的系统中未发现 Git 命令。"
 
-#: help.c:677
+#: help.c:592
 #, c-format
 msgid "WARNING: You called a Git command named '%s', which does not exist."
 msgstr "警告：您运行了一个并不存在的 Git 命令 '%s'。"
 
-#: help.c:682
+#: help.c:597
 #, c-format
 msgid "Continuing under the assumption that you meant '%s'."
 msgstr "假定你想要的是 '%s' 并继续。"
 
-#: help.c:687
+#: help.c:602
 #, c-format
 msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
 msgstr "假定你想要的是 '%2$s'，在 %1$0.1f 秒钟后继续。"
 
-#: help.c:695
+#: help.c:610
 #, c-format
 msgid "git: '%s' is not a git command. See 'git --help'."
 msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。"
 
-#: help.c:699
+#: help.c:614
 msgid ""
 "\n"
 "The most similar command is"
@@ -2039,16 +2041,16 @@
 "\n"
 "最相似的命令是"
 
-#: help.c:714
+#: help.c:653
 msgid "git version [<options>]"
 msgstr "git version [<选项>]"
 
-#: help.c:783
+#: help.c:708
 #, c-format
 msgid "%s: %s - %s"
 msgstr "%s：%s - %s"
 
-#: help.c:787
+#: help.c:712
 msgid ""
 "\n"
 "Did you mean this?"
@@ -2113,7 +2115,7 @@
 msgid "name consists only of disallowed characters: %s"
 msgstr "姓名中仅包含禁用字符：%s"
 
-#: ident.c:436 builtin/commit.c:611
+#: ident.c:436 builtin/commit.c:634
 #, c-format
 msgid "invalid date format: %s"
 msgstr "无效的日期格式：%s"
@@ -2122,11 +2124,11 @@
 msgid "multiple filter-specs cannot be combined"
 msgstr "不能混用多种过滤规格"
 
-#: list-objects-filter-options.c:126
+#: list-objects-filter-options.c:137
 msgid "cannot change partial clone promisor remote"
 msgstr "无法修改部分克隆的 promisor 远程仓库"
 
-#: lockfile.c:151
+#: lockfile.c:152
 #, c-format
 msgid ""
 "Unable to create '%s.lock': %s.\n"
@@ -2144,7 +2146,7 @@
 "可能之前有一个 git 进程在这个仓库中异常退出：\n"
 "手动删除这个文件再继续。"
 
-#: lockfile.c:159
+#: lockfile.c:160
 #, c-format
 msgid "Unable to create '%s.lock': %s"
 msgstr "不能创建 '%s.lock'：%s"
@@ -2153,86 +2155,86 @@
 msgid "failed to read the cache"
 msgstr "读取缓存失败"
 
-#: merge.c:107 rerere.c:720 builtin/am.c:1874 builtin/am.c:1908
-#: builtin/checkout.c:537 builtin/checkout.c:796 builtin/clone.c:785
-#: builtin/stash.c:264
+#: merge.c:108 rerere.c:720 builtin/am.c:1878 builtin/am.c:1912
+#: builtin/checkout.c:559 builtin/checkout.c:824 builtin/clone.c:816
+#: builtin/stash.c:265
 msgid "unable to write new index file"
 msgstr "无法写新的索引文件"
 
-#: merge-recursive.c:367
+#: merge-recursive.c:356
 msgid "(bad commit)\n"
 msgstr "（坏提交）\n"
 
-#: merge-recursive.c:257 merge-recursive.c:265
+#: merge-recursive.c:209
 #, c-format
 msgid "addinfo_cache failed for path '%s'"
 msgstr "为路径 '%s' addinfo_cache 失败"
 
-#: merge-recursive.c:329
+#: merge-recursive.c:435
 msgid "error building trees"
 msgstr "创建树出错"
 
-#: merge-recursive.c:885
+#: merge-recursive.c:874
 #, c-format
 msgid "failed to create path '%s'%s"
 msgstr "创建路径 '%s'%s 失败"
 
-#: merge-recursive.c:896
+#: merge-recursive.c:885
 #, c-format
 msgid "Removing %s to make room for subdirectory\n"
 msgstr "删除 %s 以便为子目录留出空间\n"
 
-#: merge-recursive.c:910 merge-recursive.c:929
+#: merge-recursive.c:899 merge-recursive.c:918
 msgid ": perhaps a D/F conflict?"
 msgstr "：可能是一个目录/文件冲突？"
 
-#: merge-recursive.c:919
+#: merge-recursive.c:908
 #, c-format
 msgid "refusing to lose untracked file at '%s'"
 msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
 
-#: merge-recursive.c:960 builtin/cat-file.c:41
+#: merge-recursive.c:949 builtin/cat-file.c:41
 #, c-format
 msgid "cannot read object %s '%s'"
 msgstr "不能读取对象 %s '%s'"
 
-#: merge-recursive.c:965
+#: merge-recursive.c:954
 #, c-format
 msgid "blob expected for %s '%s'"
 msgstr "%s '%s' 应为数据对象"
 
-#: merge-recursive.c:990
+#: merge-recursive.c:979
 #, c-format
 msgid "failed to open '%s': %s"
 msgstr "打开 '%s' 失败：%s"
 
-#: merge-recursive.c:1001
+#: merge-recursive.c:990
 #, c-format
 msgid "failed to symlink '%s': %s"
 msgstr "创建符号链接 '%s' 失败：%s"
 
-#: merge-recursive.c:1006
+#: merge-recursive.c:995
 #, c-format
 msgid "do not know what to do with %06o %s '%s'"
 msgstr "不知道如何处理 %06o %s '%s'"
 
-#: merge-recursive.c:1349
+#: merge-recursive.c:1341
 msgid "Failed to execute internal merge"
 msgstr "无法执行内部合并"
 
-#: merge-recursive.c:1354
+#: merge-recursive.c:1346
 #, c-format
 msgid "Unable to add %s to database"
 msgstr "不能添加 %s 至对象库"
 
-#: merge-recursive.c:1482
+#: merge-recursive.c:1474
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
 "in tree."
 msgstr "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版本被保留。"
 
-#: merge-recursive.c:1487
+#: merge-recursive.c:1479
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2240,7 +2242,7 @@
 msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 %7$s 版本被保留。"
 
-#: merge-recursive.c:1494
+#: merge-recursive.c:1486
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2248,7 +2250,7 @@
 msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版本保留在 %8$s 中。"
 
-#: merge-recursive.c:1499
+#: merge-recursive.c:1491
 #, c-format
 msgid ""
 "CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2256,20 +2258,20 @@
 msgstr ""
 "冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 %7$s 版本保留在 %9$s 中。"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
 msgid "rename"
 msgstr "重命名"
 
-#: merge-recursive.c:1534
+#: merge-recursive.c:1526
 msgid "renamed"
 msgstr "重命名"
 
-#: merge-recursive.c:1713
+#: merge-recursive.c:1676
 #, c-format
 msgid "%s is a directory in %s adding as %s instead"
 msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
 
-#: merge-recursive.c:1737
+#: merge-recursive.c:1708
 #, c-format
 msgid ""
 "CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
@@ -2278,100 +2280,100 @@
 "冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 \"%6$s\" 中重命名 \"%4$s\"-"
 ">\"%5$s\"%7$s"
 
-#: merge-recursive.c:1742
+#: merge-recursive.c:1713
 msgid " (left unresolved)"
 msgstr " （留下未解决）"
 
-#: merge-recursive.c:1851
+#: merge-recursive.c:1805
 #, c-format
 msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
 msgstr "冲突（重命名/重命名）：在 %3$s 中重命名 %1$s->%2$s，在 %6$s 中重命名 %4$s->%5$s"
 
-#: merge-recursive.c:1379
+#: merge-recursive.c:1734
 #, c-format
 msgid "Renaming %s to %s and %s to %s instead"
 msgstr "代之以重命名 %s 至 %s，以及 %s 至 %s"
 
-#: merge-recursive.c:1582
+#: merge-recursive.c:2737
 #, c-format
 msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
 msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
 
-#: merge-recursive.c:1597
+#: merge-recursive.c:2763
 #, c-format
 msgid "Adding merged %s"
 msgstr "添加合并后的 %s"
 
-#: merge-recursive.c:3120
+#: merge-recursive.c:3132
 #, c-format
 msgid "Adding as %s instead"
 msgstr "而是以 %s 为名添加"
 
-#: merge-recursive.c:2961
+#: merge-recursive.c:2973
 #, c-format
 msgid "cannot read object %s"
 msgstr "不能读取对象 %s"
 
-#: merge-recursive.c:2964
+#: merge-recursive.c:2976
 #, c-format
 msgid "object %s is not a blob"
 msgstr "对象 %s 不是一个数据对象"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
 msgid "modify"
 msgstr "修改"
 
-#: merge-recursive.c:3028
+#: merge-recursive.c:3040
 msgid "modified"
 msgstr "修改"
 
-#: merge-recursive.c:3040
+#: merge-recursive.c:3052
 msgid "content"
 msgstr "内容"
 
-#: merge-recursive.c:3044
+#: merge-recursive.c:3056
 msgid "add/add"
 msgstr "添加/添加"
 
-#: merge-recursive.c:3067
+#: merge-recursive.c:3079
 #, c-format
 msgid "Skipped %s (merged same as existing)"
 msgstr "略过 %s（已经做过相同合并）"
 
-#: merge-recursive.c:1386
+#: merge-recursive.c:1378
 #, c-format
 msgid "Auto-merging %s"
 msgstr "自动合并 %s"
 
-#: merge-recursive.c:3089 git-submodule.sh:937
+#: merge-recursive.c:3101 git-submodule.sh:985
 msgid "submodule"
 msgstr "子模组"
 
-#: merge-recursive.c:3090
+#: merge-recursive.c:3102
 #, c-format
 msgid "CONFLICT (%s): Merge conflict in %s"
 msgstr "冲突（%s）：合并冲突于 %s"
 
-#: merge-recursive.c:3327
+#: merge-recursive.c:3339
 #, c-format
 msgid "Removing %s"
 msgstr "删除 %s"
 
-#: merge-recursive.c:3350
+#: merge-recursive.c:3362
 msgid "file/directory"
 msgstr "文件/目录"
 
-#: merge-recursive.c:3355
+#: merge-recursive.c:3367
 msgid "directory/file"
 msgstr "目录/文件"
 
-#: merge-recursive.c:3362
+#: merge-recursive.c:3374
 #, c-format
 msgid ""
 "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
 msgstr "冲突（%1$s）：在 %3$s 中有一个名为 %2$s 的目录。以 %5$s 为名添加 %4$s"
 
-#: merge-recursive.c:3371
+#: merge-recursive.c:3383
 #, c-format
 msgid "Adding %s"
 msgstr "添加 %s"
@@ -2381,35 +2383,35 @@
 msgid "Dirty index: cannot merge (dirty: %s)"
 msgstr "脏索引：不能合并（脏文件：%s）"
 
-#: merge-recursive.c:3424
+#: merge-recursive.c:3436
 msgid "Already up to date!"
 msgstr "已经是最新的！"
 
-#: merge-recursive.c:3433
+#: merge-recursive.c:3445
 #, c-format
 msgid "merging of trees %s and %s failed"
 msgstr "无法合并树 %s 和 %s"
 
-#: merge-recursive.c:3537
+#: merge-recursive.c:3549
 msgid "Merging:"
 msgstr "合并："
 
-#: merge-recursive.c:3550
+#: merge-recursive.c:3562
 #, c-format
 msgid "found %u common ancestor:"
 msgid_plural "found %u common ancestors:"
 msgstr[0] "发现 %u 个共同祖先："
 
-#: merge-recursive.c:3600
+#: merge-recursive.c:3612
 msgid "merge returned no commit"
 msgstr "合并未返回提交"
 
-#: merge-recursive.c:3756
+#: merge-recursive.c:3768
 #, c-format
 msgid "Could not parse object '%s'"
 msgstr "不能解析对象 '%s'"
 
-#: merge-recursive.c:3774 builtin/merge.c:694 builtin/merge.c:874
+#: merge-recursive.c:3786 builtin/merge.c:705 builtin/merge.c:885
 msgid "Unable to write index."
 msgstr "不能写入索引。"
 
@@ -2457,25 +2459,25 @@
 msgid "unable to parse object: %s"
 msgstr "不能解析对象：%s"
 
-#: packfile.c:641
+#: packfile.c:629
 msgid "offset before end of packfile (broken .idx?)"
 msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
 
-#: packfile.c:1887
+#: packfile.c:1899
 #, c-format
 msgid "offset before start of pack index for %s (corrupt index?)"
 msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
 
-#: packfile.c:1891
+#: packfile.c:1903
 #, c-format
 msgid "offset beyond end of pack index for %s (truncated index?)"
 msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
 
-#: parse-options.c:888
+#: parse-options.c:882
 msgid "..."
 msgstr "..."
 
-#: parse-options.c:907
+#: parse-options.c:901
 #, c-format
 msgid "usage: %s"
 msgstr "用法：%s"
@@ -2483,18 +2485,18 @@
 #. TRANSLATORS: the colon here should align with the
 #. one in "usage: %s" translation.
 #. 
-#: parse-options.c:913
+#: parse-options.c:907
 #, c-format
 msgid "   or: %s"
 msgstr "   或：%s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:916
+#: parse-options.c:910
 #, c-format
 msgid "    %s"
 msgstr "    %s"
 
-#: parse-options.c:955
+#: parse-options.c:949
 msgid "-NUM"
 msgstr "-数字"
 
@@ -2503,87 +2505,87 @@
 msgid "malformed object name '%s'"
 msgstr "格式错误的对象名 '%s'"
 
-#: path.c:897
+#: path.c:915
 #, c-format
 msgid "Could not make %s writable by group"
 msgstr "不能设置 %s 为组可写"
 
-#: pathspec.c:128
+#: pathspec.c:130
 msgid "Escape character '\\' not allowed as last character in attr value"
 msgstr "转义字符 '\\' 不能作为属性值的最后一个字符"
 
-#: pathspec.c:146
+#: pathspec.c:148
 msgid "Only one 'attr:' specification is allowed."
 msgstr "只允许一个 'attr:' 规格。"
 
-#: pathspec.c:149
+#: pathspec.c:151
 msgid "attr spec must not be empty"
 msgstr "属性规格不能为空"
 
-#: pathspec.c:192
+#: pathspec.c:194
 #, c-format
 msgid "invalid attribute name %s"
 msgstr "无效的属性名 %s"
 
-#: pathspec.c:257
+#: pathspec.c:259
 msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
 msgstr "全局的 'glob' 和 'noglob' 路径规格设置不兼容"
 
-#: pathspec.c:264
+#: pathspec.c:266
 msgid ""
 "global 'literal' pathspec setting is incompatible with all other global "
 "pathspec settings"
 msgstr "全局的 'literal' 路径规格设置和其它的全局路径规格设置不兼容"
 
-#: pathspec.c:304
+#: pathspec.c:306
 msgid "invalid parameter for pathspec magic 'prefix'"
 msgstr "路径规格包含无效的神奇前缀"
 
-#: pathspec.c:325
+#: pathspec.c:327
 #, c-format
 msgid "Invalid pathspec magic '%.*s' in '%s'"
 msgstr "在路径规格 '%3$s' 中无效的神奇前缀 '%2$.*1$s'"
 
-#: pathspec.c:330
+#: pathspec.c:332
 #, c-format
 msgid "Missing ')' at the end of pathspec magic in '%s'"
 msgstr "路径规格 '%s' 的神奇前缀结尾少了一个 ')'"
 
-#: pathspec.c:368
+#: pathspec.c:370
 #, c-format
 msgid "Unimplemented pathspec magic '%c' in '%s'"
 msgstr "路径规格 '%2$s' 中包含未实现的神奇前缀 '%1$c'"
 
-#: pathspec.c:427
+#: pathspec.c:429
 #, c-format
 msgid "%s: 'literal' and 'glob' are incompatible"
 msgstr "%s：'literal' 和 'glob' 不兼容"
 
-#: pathspec.c:440
+#: pathspec.c:442
 #, c-format
 msgid "%s: '%s' is outside repository"
 msgstr "%s：'%s' 在仓库之外"
 
-#: pathspec.c:514
+#: pathspec.c:521
 #, c-format
 msgid "'%s' (mnemonic: '%c')"
 msgstr "'%s'（助记符：'%c'）"
 
-#: pathspec.c:524
+#: pathspec.c:531
 #, c-format
 msgid "%s: pathspec magic not supported by this command: %s"
 msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
 
-#: pathspec.c:591
+#: pathspec.c:598
 #, c-format
 msgid "pathspec '%s' is beyond a symbolic link"
 msgstr "路径规格 '%s' 位于符号链接中"
 
-#: pretty.c:966
+#: pretty.c:982
 msgid "unable to parse --pretty format"
 msgstr "不能解析 --pretty 格式"
 
-#: read-cache.c:1635
+#: read-cache.c:1651
 #, c-format
 msgid ""
 "index.version set, but the value is invalid.\n"
@@ -2592,7 +2594,7 @@
 "设置了 index.version，但是取值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:1645
+#: read-cache.c:1661
 #, c-format
 msgid ""
 "GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2601,52 +2603,53 @@
 "设置了 GIT_INDEX_VERSION，但是取值无效。\n"
 "使用版本 %i"
 
-#: read-cache.c:3010 wrapper.c:622 builtin/merge.c:1119
+#: read-cache.c:3026 strbuf.c:1176 wrapper.c:622 builtin/merge.c:1130
 #, c-format
 msgid "could not close '%s'"
 msgstr "不能关闭 '%s'"
 
-#: read-cache.c:3113 sequencer.c:2296 sequencer.c:3917
+#: read-cache.c:3129 sequencer.c:2355 sequencer.c:4066
 #, c-format
 msgid "could not stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: read-cache.c:3126
+#: read-cache.c:3142
 #, c-format
 msgid "unable to open git dir: %s"
 msgstr "不能打开 git 目录：%s"
 
-#: read-cache.c:3138
+#: read-cache.c:3154
 #, c-format
 msgid "unable to unlink: %s"
 msgstr "无法删除：%s"
 
-#: refs.c:706
+#: refs.c:543 builtin/merge.c:760 builtin/merge.c:871 builtin/merge.c:973
+#: builtin/merge.c:983
 #, c-format
 msgid "Could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: refs.c:2055
+#: refs.c:2011
 msgid "ref updates forbidden inside quarantine environment"
 msgstr "在隔离环境中禁止更新引用"
 
-#: refs/files-backend.c:1234
+#: refs/files-backend.c:1233
 #, c-format
 msgid "could not remove reference %s"
 msgstr "无法删除引用 %s"
 
-#: refs/files-backend.c:1248 refs/packed-backend.c:1541
+#: refs/files-backend.c:1247 refs/packed-backend.c:1541
 #: refs/packed-backend.c:1551
 #, c-format
 msgid "could not delete reference %s: %s"
 msgstr "无法删除引用 %s：%s"
 
-#: refs/files-backend.c:1251 refs/packed-backend.c:1554
+#: refs/files-backend.c:1250 refs/packed-backend.c:1554
 #, c-format
 msgid "could not delete references: %s"
 msgstr "无法删除引用：%s"
 
-#: ref-filter.c:42 wt-status.c:1938
+#: ref-filter.c:42 wt-status.c:1936
 msgid "gone"
 msgstr "丢失"
 
@@ -2810,12 +2813,12 @@
 msgid "malformed format string %s"
 msgstr "错误的格式化字符串 %s"
 
-#: ref-filter.c:1313
+#: ref-filter.c:1424
 #, c-format
 msgid "(no branch, rebasing %s)"
 msgstr "（非分支，正变基 %s）"
 
-#: ref-filter.c:1316
+#: ref-filter.c:1430
 #, c-format
 msgid "(no branch, bisect started on %s)"
 msgstr "（非分支，二分查找开始于 %s）"
@@ -2823,7 +2826,7 @@
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached at " in wt-status.c
 #. 
-#: ref-filter.c:1324
+#: ref-filter.c:1438
 #, c-format
 msgid "(HEAD detached at %s)"
 msgstr "（头指针分离于 %s）"
@@ -2831,146 +2834,146 @@
 #. TRANSLATORS: make sure this matches "HEAD
 #. detached from " in wt-status.c
 #. 
-#: ref-filter.c:1331
+#: ref-filter.c:1445
 #, c-format
 msgid "(HEAD detached from %s)"
 msgstr "（头指针分离自 %s）"
 
-#: ref-filter.c:1335
+#: ref-filter.c:1449
 msgid "(no branch)"
 msgstr "（非分支）"
 
-#: ref-filter.c:1540 ref-filter.c:1749
+#: ref-filter.c:1538 ref-filter.c:1747
 #, c-format
 msgid "missing object %s for %s"
 msgstr "缺失 %2$s 的对象 %1$s"
 
-#: ref-filter.c:1550
+#: ref-filter.c:1548
 #, c-format
 msgid "parse_object_buffer failed on %s for %s"
 msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
 
-#: ref-filter.c:2004
+#: ref-filter.c:2001
 #, c-format
 msgid "malformed object at '%s'"
 msgstr "格式错误的对象 '%s'"
 
-#: ref-filter.c:2093
+#: ref-filter.c:2090
 #, c-format
 msgid "ignoring ref with broken name %s"
 msgstr "忽略带有错误名称 %s 的引用"
 
-#: refs.c:669 ref-filter.c:2098
+#: ref-filter.c:2095 refs.c:625
 #, c-format
 msgid "ignoring broken ref %s"
 msgstr "忽略损坏的引用 %s"
 
-#: ref-filter.c:2389
+#: ref-filter.c:2395
 #, c-format
 msgid "format: %%(end) atom missing"
 msgstr "格式：缺少 %%(end) 元素"
 
-#: ref-filter.c:2502
+#: ref-filter.c:2508
 #, c-format
 msgid "malformed object name %s"
 msgstr "格式错误的对象名 %s"
 
-#: remote.c:611
+#: remote.c:594
 #, c-format
 msgid "Cannot fetch both %s and %s to %s"
 msgstr "不能同时获取 %s 和 %s 至 %s"
 
-#: remote.c:615
+#: remote.c:598
 #, c-format
 msgid "%s usually tracks %s, not %s"
 msgstr "%s 通常跟踪 %s，而非 %s"
 
-#: remote.c:619
+#: remote.c:602
 #, c-format
 msgid "%s tracks both %s and %s"
 msgstr "%s 同时跟踪 %s 和 %s"
 
-#: remote.c:811
+#: remote.c:623
 msgid "Internal error"
 msgstr "内部错误"
 
-#: remote.c:1627 remote.c:1728
+#: remote.c:1610 remote.c:1711
 msgid "HEAD does not point to a branch"
 msgstr "HEAD 没有指向一个分支"
 
-#: remote.c:1636
+#: remote.c:1619
 #, c-format
 msgid "no such branch: '%s'"
 msgstr "没有此分支：'%s'"
 
-#: remote.c:1639
+#: remote.c:1622
 #, c-format
 msgid "no upstream configured for branch '%s'"
 msgstr "尚未给分支 '%s' 设置上游"
 
-#: remote.c:1645
+#: remote.c:1628
 #, c-format
 msgid "upstream branch '%s' not stored as a remote-tracking branch"
 msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
 
-#: remote.c:1660
+#: remote.c:1643
 #, c-format
 msgid "push destination '%s' on remote '%s' has no local tracking branch"
 msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
 
-#: remote.c:1672
+#: remote.c:1655
 #, c-format
 msgid "branch '%s' has no remote for pushing"
 msgstr "分支 '%s' 没有设置要推送的远程服务器"
 
-#: remote.c:1682
+#: remote.c:1665
 #, c-format
 msgid "push refspecs for '%s' do not include '%s'"
 msgstr "向 '%s' 推送引用规格未包含 '%s'"
 
-#: remote.c:1695
+#: remote.c:1678
 msgid "push has no destination (push.default is 'nothing')"
 msgstr "推送无目标（push.default 是 'nothing'）"
 
-#: remote.c:1717
+#: remote.c:1700
 msgid "cannot resolve 'simple' push to a single destination"
 msgstr "无法解析 'simple' 推送至一个单独的目标"
 
-#: remote.c:2019
+#: remote.c:2002
 #, c-format
 msgid "Your branch is based on '%s', but the upstream is gone.\n"
 msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
 
-#: remote.c:2023
+#: remote.c:2006
 msgid "  (use \"git branch --unset-upstream\" to fixup)\n"
 msgstr "  （使用 \"git branch --unset-upstream\" 来修复）\n"
 
-#: remote.c:2026
+#: remote.c:2009
 #, c-format
 msgid "Your branch is up to date with '%s'.\n"
 msgstr "您的分支与上游分支 '%s' 一致。\n"
 
-#: remote.c:2030
+#: remote.c:2013
 #, c-format
 msgid "Your branch and '%s' refer to different commits.\n"
 msgstr "您的分支和 '%s' 指向不同的提交。\n"
 
-#: remote.c:2033
+#: remote.c:2016
 #, c-format
 msgid "  (use \"%s\" for details)\n"
 msgstr "  （使用 \"%s\" 查看详情）\n"
 
-#: remote.c:2037
+#: remote.c:2020
 #, c-format
 msgid "Your branch is ahead of '%s' by %d commit.\n"
 msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
 msgstr[0] "您的分支领先 '%s' 共 %d 个提交。\n"
 
-#: remote.c:2043
+#: remote.c:2026
 msgid "  (use \"git push\" to publish your local commits)\n"
 msgstr "  （使用 \"git push\" 来发布您的本地提交）\n"
 
-#: remote.c:2046
+#: remote.c:2029
 #, c-format
 msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
 msgid_plural ""
@@ -2978,11 +2981,11 @@
 msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
 
 #  译者：注意保持前导空格
-#: remote.c:2054
+#: remote.c:2037
 msgid "  (use \"git pull\" to update your local branch)\n"
 msgstr "  （使用 \"git pull\" 来更新您的本地分支）\n"
 
-#: remote.c:2057
+#: remote.c:2040
 #, c-format
 msgid ""
 "Your branch and '%s' have diverged,\n"
@@ -2995,20 +2998,20 @@
 "并且分别有 %d 和 %d 处不同的提交。\n"
 
 #  译者：注意保持前导空格
-#: remote.c:2067
+#: remote.c:2050
 msgid "  (use \"git pull\" to merge the remote branch into yours)\n"
 msgstr "  （使用 \"git pull\" 来合并远程分支）\n"
 
-#: revision.c:2509
+#: revision.c:2655
 msgid "your current branch appears to be broken"
 msgstr "您的当前分支好像被损坏"
 
-#: revision.c:2512
+#: revision.c:2658
 #, c-format
 msgid "your current branch '%s' does not have any commits yet"
 msgstr "您的当前分支 '%s' 尚无任何提交"
 
-#: revision.c:2720
+#: revision.c:2866
 msgid "--first-parent is incompatible with --bisect"
 msgstr "--first-parent 与 --bisect 不兼容"
 
@@ -3025,56 +3028,56 @@
 "因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
 "配置 `git config advice.ignoredHook false` 来关闭这条警告。"
 
-#: send-pack.c:142
+#: send-pack.c:145
 msgid "unexpected flush packet while reading remote unpack status"
 msgstr "读取远程解包状态时收到意外的 flush 包"
 
-#: send-pack.c:144
+#: send-pack.c:147
 #, c-format
 msgid "unable to parse remote unpack status: %s"
 msgstr "不能解析远程解包状态：%s"
 
-#: send-pack.c:146
+#: send-pack.c:149
 #, c-format
 msgid "remote unpack failed: %s"
 msgstr "远程解包失败：%s"
 
-#: send-pack.c:307
+#: send-pack.c:308
 msgid "failed to sign the push certificate"
 msgstr "为推送证书签名失败"
 
-#: send-pack.c:421
+#: send-pack.c:399
 msgid "the receiving end does not support --signed push"
 msgstr "接收端不支持签名推送"
 
-#: send-pack.c:423
+#: send-pack.c:401
 msgid ""
 "not sending a push certificate since the receiving end does not support --"
 "signed push"
 msgstr "未发送推送证书，因为接收端不支持签名推送"
 
-#: send-pack.c:435
+#: send-pack.c:413
 msgid "the receiving end does not support --atomic push"
 msgstr "接收端不支持原子推送"
 
-#: send-pack.c:440
+#: send-pack.c:418
 msgid "the receiving end does not support push options"
 msgstr "接收端不支持推送选项"
 
-#: sequencer.c:187
+#: sequencer.c:192
 #, c-format
 msgid "invalid commit message cleanup mode '%s'"
 msgstr "无效的提交信息清理模式 '%s'"
 
-#: sequencer.c:321
+#: sequencer.c:326
 msgid "revert"
 msgstr "还原"
 
-#: sequencer.c:323
+#: sequencer.c:328
 msgid "cherry-pick"
 msgstr "拣选"
 
-#: sequencer.c:325
+#: sequencer.c:327
 msgid "rebase -i"
 msgstr "rebase -i"
 
@@ -3083,7 +3086,7 @@
 msgid "Unknown action: %d"
 msgstr "未知动作：%d"
 
-#: sequencer.c:385
+#: sequencer.c:390
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'"
@@ -3091,7 +3094,7 @@
 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
 "命令标记修正后的文件"
 
-#: sequencer.c:388
+#: sequencer.c:393
 msgid ""
 "after resolving the conflicts, mark the corrected paths\n"
 "with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3100,66 +3103,66 @@
 "冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
 "对修正后的文件做标记，然后用 'git commit' 提交"
 
-#: sequencer.c:401 sequencer.c:2847
+#: sequencer.c:406 sequencer.c:2921
 #, c-format
 msgid "could not lock '%s'"
 msgstr "不能锁定 '%s'"
 
-#: refs.c:833 sequencer.c:403 sequencer.c:2647 sequencer.c:2851
-#: sequencer.c:2865 sequencer.c:3122 sequencer.c:5001 wrapper.c:620
+#: refs.c:789 sequencer.c:408 sequencer.c:2721 sequencer.c:2925
+#: sequencer.c:2939 sequencer.c:3195 sequencer.c:5159 strbuf.c:1173
+#: wrapper.c:620
 #, c-format
 msgid "could not write to '%s'"
 msgstr "不能写入 '%s'"
 
-#: sequencer.c:408
+#: sequencer.c:413
 #, c-format
 msgid "could not write eol to '%s'"
 msgstr "不能将换行符写入 '%s'"
 
-#: sequencer.c:413 sequencer.c:2652 sequencer.c:2853 sequencer.c:2867
-#: sequencer.c:3130
+#: sequencer.c:418 sequencer.c:2726 sequencer.c:2927 sequencer.c:2941
+#: sequencer.c:3203
 #, c-format
 msgid "failed to finalize '%s'"
 msgstr "无法完成 '%s'"
 
-#: sequencer.c:436 sequencer.c:1585 sequencer.c:2672 sequencer.c:3112
-#: sequencer.c:3221 builtin/am.c:244 builtin/commit.c:763 builtin/merge.c:1117
-#: builtin/rebase.c:568
+#: sequencer.c:431 sequencer.c:1620 sequencer.c:2746 sequencer.c:3185
+#: sequencer.c:3294 builtin/am.c:249 builtin/commit.c:786 builtin/merge.c:1128
 #, c-format
 msgid "could not read '%s'"
 msgstr "不能读取 '%s'"
 
-#: sequencer.c:462
+#: sequencer.c:457
 #, c-format
 msgid "your local changes would be overwritten by %s."
 msgstr "您的本地修改将被%s覆盖。"
 
-#: sequencer.c:466
+#: sequencer.c:461
 msgid "commit your changes or stash them to proceed."
 msgstr "提交您的修改或贮藏后再继续。"
 
-#: sequencer.c:498
+#: sequencer.c:493
 #, c-format
 msgid "%s: fast-forward"
 msgstr "%s：快进"
 
 #. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. "rebase -i".
+#. "rebase".
 #. 
-#: sequencer.c:631
+#: sequencer.c:626
 #, c-format
 msgid "%s: Unable to write new index file"
 msgstr "%s：无法写入新索引文件"
 
-#: sequencer.c:662
+#: sequencer.c:657
 msgid "could not resolve HEAD commit"
 msgstr "不能解析 HEAD 提交"
 
-#: sequencer.c:648
+#: sequencer.c:643
 msgid "unable to update cache tree"
 msgstr "不能更新缓存树"
 
-#: sequencer.c:872
+#: sequencer.c:867
 #, c-format
 msgid ""
 "you have staged changes in your working tree\n"
@@ -3188,11 +3191,11 @@
 "\n"
 "  git rebase --continue\n"
 
-#: sequencer.c:1146
+#: sequencer.c:1141
 msgid "'prepare-commit-msg' hook failed"
 msgstr "'prepare-commit-msg' 钩子失败"
 
-#: sequencer.c:1153
+#: sequencer.c:1147
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -3216,7 +3219,7 @@
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1166
+#: sequencer.c:1160
 msgid ""
 "Your name and email address were configured automatically based\n"
 "on your username and hostname. Please check that they are accurate.\n"
@@ -3239,64 +3242,64 @@
 "\n"
 "    git commit --amend --reset-author\n"
 
-#: sequencer.c:1208
+#: sequencer.c:1202
 msgid "couldn't look up newly created commit"
 msgstr "无法找到新创建的提交"
 
-#: sequencer.c:1210
+#: sequencer.c:1204
 msgid "could not parse newly created commit"
 msgstr "不能解析新创建的提交"
 
-#: sequencer.c:1256
+#: sequencer.c:1250
 msgid "unable to resolve HEAD after creating commit"
 msgstr "创建提交后，不能解析 HEAD"
 
-#: sequencer.c:1258
+#: sequencer.c:1252
 msgid "detached HEAD"
 msgstr "分离头指针"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: sequencer.c:1262
+#: sequencer.c:1256
 msgid " (root-commit)"
 msgstr " （根提交）"
 
-#: sequencer.c:1283
+#: sequencer.c:1277
 msgid "could not parse HEAD"
 msgstr "不能解析 HEAD"
 
-#: sequencer.c:1285
+#: sequencer.c:1279
 #, c-format
 msgid "HEAD %s is not a commit!"
 msgstr "HEAD %s 不是一个提交！"
 
-#: sequencer.c:1289 builtin/commit.c:1571
+#: sequencer.c:1283 sequencer.c:1357 builtin/commit.c:1579
 msgid "could not parse HEAD commit"
 msgstr "不能解析 HEAD 提交"
 
-#: sequencer.c:1341 sequencer.c:1933
+#: sequencer.c:1335 sequencer.c:1980
 msgid "unable to parse commit author"
 msgstr "不能解析提交作者"
 
-#: sequencer.c:1352 builtin/am.c:1561 builtin/merge.c:684
+#: sequencer.c:1346 builtin/am.c:1566 builtin/merge.c:695
 msgid "git write-tree failed to write a tree"
 msgstr "git write-tree 无法写入树对象"
 
-#: sequencer.c:1369 sequencer.c:1429
+#: sequencer.c:1379 sequencer.c:1450
 #, c-format
 msgid "unable to read commit message from '%s'"
 msgstr "不能从 '%s' 读取提交说明"
 
-#: sequencer.c:1396 builtin/am.c:1583 builtin/commit.c:1670 builtin/merge.c:883
-#: builtin/merge.c:908
+#: sequencer.c:1406 builtin/am.c:1588 builtin/commit.c:1680 builtin/merge.c:894
+#: builtin/merge.c:919
 msgid "failed to write commit object"
 msgstr "写提交对象失败"
 
-#: sequencer.c:1456
+#: sequencer.c:1481
 #, c-format
 msgid "could not parse commit %s"
 msgstr "不能解析提交 %s"
 
-#: sequencer.c:1461
+#: sequencer.c:1486
 #, c-format
 msgid "could not parse parent commit %s"
 msgstr "不能解析父提交 %s"
@@ -3323,247 +3326,249 @@
 "\n"
 "\t%.*s"
 
-#: sequencer.c:1592 sequencer.c:1617
+#: sequencer.c:1627 sequencer.c:1652
 #, c-format
 msgid "This is a combination of %d commits."
 msgstr "这是一个 %d 个提交的组合。"
 
-#: sequencer.c:1602
+#: sequencer.c:1637
 msgid "need a HEAD to fixup"
 msgstr "需要一个 HEAD 来修复"
 
-#: sequencer.c:1604 sequencer.c:3157
+#: sequencer.c:1639 sequencer.c:3230
 msgid "could not read HEAD"
 msgstr "不能读取 HEAD"
 
-#: sequencer.c:1606
+#: sequencer.c:1641
 msgid "could not read HEAD's commit message"
 msgstr "不能读取 HEAD 的提交说明"
 
-#: sequencer.c:1612
+#: sequencer.c:1647
 #, c-format
 msgid "cannot write '%s'"
 msgstr "不能写 '%s'"
 
-#: sequencer.c:1619 git-rebase--preserve-merges.sh:496
+#: sequencer.c:1654 git-rebase--preserve-merges.sh:496
 msgid "This is the 1st commit message:"
 msgstr "这是第一个提交说明："
 
-#: sequencer.c:1627
+#: sequencer.c:1662
 #, c-format
 msgid "could not read commit message of %s"
 msgstr "不能读取 %s 的提交说明"
 
-#: sequencer.c:1634
+#: sequencer.c:1669
 #, c-format
 msgid "This is the commit message #%d:"
 msgstr "这是提交说明 #%d："
 
-#: sequencer.c:1640
+#: sequencer.c:1675
 #, c-format
 msgid "The commit message #%d will be skipped:"
 msgstr "提交说明 #%d 将被跳过："
 
-#: sequencer.c:1535 sequencer.c:1645
+#: sequencer.c:1569 sequencer.c:1680
 #, c-format
 msgid "unknown command: %d"
 msgstr "未知命令：%d"
 
-#: sequencer.c:1728
+#: sequencer.c:1763
 msgid "your index file is unmerged."
 msgstr "您的索引文件未完成合并。"
 
-#: sequencer.c:1754
+#: sequencer.c:1789
 #, c-format
 msgid "commit %s is a merge but no -m option was given."
 msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
 
-#: sequencer.c:1762 sequencer.c:1770
+#: sequencer.c:1797 sequencer.c:1805
 #, c-format
 msgid "commit %s does not have parent %d"
 msgstr "提交 %s 没有第 %d 个父提交"
 
-#: sequencer.c:1510
+#: sequencer.c:1770
 #, c-format
 msgid "mainline was specified but commit %s is not a merge."
 msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
 
-#: sequencer.c:1776
+#: sequencer.c:1811
 #, c-format
 msgid "cannot get commit message for %s"
 msgstr "不能得到 %s 的提交说明"
 
 #. TRANSLATORS: The first %s will be a "todo" command like
 #. "revert" or "pick", the second %s a SHA1.
-#: sequencer.c:1795
+#: sequencer.c:1830
 #, c-format
 msgid "%s: cannot parse parent commit %s"
 msgstr "%s：不能解析父提交 %s"
 
-#: sequencer.c:1860
+#: sequencer.c:1895
 #, c-format
 msgid "could not rename '%s' to '%s'"
 msgstr "不能将 '%s' 重命名为 '%s'"
 
-#: sequencer.c:1915
+#: sequencer.c:1952
 #, c-format
 msgid "could not revert %s... %s"
 msgstr "不能还原 %s... %s"
 
-#: sequencer.c:1916
+#: sequencer.c:1953
 #, c-format
 msgid "could not apply %s... %s"
 msgstr "不能应用 %s... %s"
 
-#: sequencer.c:2590 sequencer.c:4308
+#: sequencer.c:2664 sequencer.c:4469
 msgid "empty commit set passed"
 msgstr "提供了空的提交集"
 
-#: sequencer.c:1983
+#: sequencer.c:2030
 #, c-format
 msgid "git %s: failed to read the index"
 msgstr "git %s：无法读取索引"
 
-#: sequencer.c:1990
+#: sequencer.c:2037
 #, c-format
 msgid "git %s: failed to refresh the index"
 msgstr "git %s：无法刷新索引"
 
-#: sequencer.c:2066
+#: sequencer.c:2114
 #, c-format
 msgid "%s does not accept arguments: '%s'"
 msgstr "%s 不接受参数：'%s'"
 
-#: sequencer.c:2075
+#: sequencer.c:2123
 #, c-format
 msgid "missing arguments for %s"
 msgstr "缺少 %s 的参数"
 
-#: sequencer.c:2166
+#: sequencer.c:2215
 #, c-format
 msgid "invalid line %d: %.*s"
 msgstr "无效行 %d：%.*s"
 
-#: sequencer.c:2177
+#: sequencer.c:2226
 #, c-format
 msgid "cannot '%s' without a previous commit"
 msgstr "没有父提交的情况下不能 '%s'"
 
-#: sequencer.c:2225 builtin/rebase.c:153 builtin/rebase.c:178
-#: builtin/rebase.c:204 builtin/rebase.c:229
+#: rebase-interactive.c:233 rebase-interactive.c:238 sequencer.c:2274
+#: builtin/rebase.c:176 builtin/rebase.c:201 builtin/rebase.c:227
+#: builtin/rebase.c:252
 #, c-format
 msgid "could not read '%s'."
 msgstr "不能读取 '%s'。"
 
-#: sequencer.c:2302
+#: sequencer.c:2361
 msgid "please fix this using 'git rebase --edit-todo'."
 msgstr "请用 'git rebase --edit-todo' 来修改。"
 
-#: sequencer.c:2304
+#: sequencer.c:2363
 #, c-format
 msgid "unusable instruction sheet: '%s'"
 msgstr "不可用的指令清单：'%s'"
 
-#: sequencer.c:2309
+#: sequencer.c:2368
 msgid "no commits parsed."
 msgstr "没有解析提交。"
 
-#: sequencer.c:2320
+#: sequencer.c:2379
 msgid "cannot cherry-pick during a revert."
 msgstr "不能在回退中执行拣选。"
 
-#: sequencer.c:2322
+#: sequencer.c:2381
 msgid "cannot revert during a cherry-pick."
 msgstr "不能在拣选中执行回退。"
 
-#: config.c:406 sequencer.c:2401
+#: config.c:408 sequencer.c:2456
 #, c-format
 msgid "invalid key: %s"
 msgstr "无效键名：%s"
 
-#: sequencer.c:2404
+#: sequencer.c:2459
 #, c-format
 msgid "invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: sequencer.c:2507
+#: sequencer.c:2576
 #, c-format
 msgid "malformed options sheet: '%s'"
 msgstr "格式错误的选项清单：'%s'"
 
-#: sequencer.c:2100
+#: sequencer.c:2487
 msgid "a cherry-pick or revert is already in progress"
 msgstr "一个拣选或还原操作已在进行"
 
-#: sequencer.c:2101
+#: sequencer.c:2488
 msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
 msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
 
-#: sequencer.c:2627
+#: sequencer.c:2701
 #, c-format
 msgid "could not create sequencer directory '%s'"
 msgstr "不能创建序列目录 '%s'"
 
-#: sequencer.c:2642
+#: sequencer.c:2716
 msgid "could not lock HEAD"
 msgstr "不能锁定 HEAD"
 
-#: sequencer.c:2702 sequencer.c:4057
+#: sequencer.c:2776 sequencer.c:4206
 msgid "no cherry-pick or revert in progress"
 msgstr "拣选或还原操作并未进行"
 
-#: sequencer.c:2704 sequencer.c:2715
+#: sequencer.c:2778 sequencer.c:2789
 msgid "cannot resolve HEAD"
 msgstr "不能解析 HEAD"
 
-#: sequencer.c:2706 sequencer.c:2750
+#: sequencer.c:2780 sequencer.c:2824
 msgid "cannot abort from a branch yet to be born"
 msgstr "不能从尚未建立的分支终止"
 
-#: sequencer.c:2736 builtin/grep.c:736
+#: sequencer.c:2810 builtin/grep.c:744
 #, c-format
 msgid "cannot open '%s'"
 msgstr "不能打开 '%s'"
 
-#: sequencer.c:2738
+#: sequencer.c:2812
 #, c-format
 msgid "cannot read '%s': %s"
 msgstr "不能读取 '%s'：%s"
 
-#: sequencer.c:2739
+#: sequencer.c:2813
 msgid "unexpected end of file"
 msgstr "意外的文件结束"
 
-#: sequencer.c:2745
+#: sequencer.c:2819
 #, c-format
 msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
 msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
 
-#: sequencer.c:2756
+#: sequencer.c:2830
 msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
 msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
 
-#: sequencer.c:2949 sequencer.c:3969
+#: sequencer.c:1433 sequencer.c:4118
 #, c-format
 msgid "could not update %s"
 msgstr "不能更新 %s"
 
-#: sequencer.c:2987 sequencer.c:3949
+#: sequencer.c:3060 sequencer.c:4098
 msgid "cannot read HEAD"
 msgstr "不能读取 HEAD"
 
-#: sequencer.c:3043 sequencer.c:3047 builtin/difftool.c:641
+#: sequencer.c:3116 sequencer.c:3120 builtin/difftool.c:641
 #, c-format
 msgid "could not copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: sequencer.c:3069 sequencer.c:3506 builtin/rebase.c:850 builtin/rebase.c:1613
-#: builtin/rebase.c:1987 builtin/rebase.c:2031
+#: add-interactive.c:521 add-interactive.c:822 reset.c:65 sequencer.c:3142
+#: sequencer.c:3581 sequencer.c:3723 builtin/rebase.c:1518
+#: builtin/rebase.c:1919
 msgid "could not read index"
 msgstr "不能读取索引"
 
 #  译者：注意保持前导空格
-#: sequencer.c:3074
+#: sequencer.c:3147
 #, c-format
 msgid ""
 "execution failed: %s\n"
@@ -3578,11 +3583,11 @@
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3080
+#: sequencer.c:3153
 msgid "and made changes to the index and/or the working tree\n"
 msgstr "并且修改索引和/或工作区\n"
 
-#: sequencer.c:3086
+#: sequencer.c:3159
 #, c-format
 msgid ""
 "execution succeeded: %s\n"
@@ -3599,73 +3604,72 @@
 "  git rebase --continue\n"
 "\n"
 
-#: sequencer.c:3623 builtin/rebase.c:712
+#: sequencer.c:3744
 #, c-format
 msgid "Applied autostash.\n"
 msgstr "已应用 autostash。\n"
 
-#: sequencer.c:3635
+#: sequencer.c:3756
 #, c-format
 msgid "cannot store %s"
 msgstr "不能存储 %s"
 
-#: sequencer.c:3638 builtin/rebase.c:728 git-rebase--preserve-merges.sh:113
-#, c-format
+#: git-rebase--preserve-merges.sh:113
 msgid ""
 "Applying autostash resulted in conflicts.\n"
 "Your changes are safe in the stash.\n"
 "You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
 msgstr ""
-"应用 autostash 导致冲突。\n"
+"应用 autostash 导致了冲突。\n"
 "您的修改安全地保存在贮藏区中。\n"
 "您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
 
-#: sequencer.c:3827
+#: sequencer.c:3976
 #, c-format
 msgid "Stopped at %s...  %.*s\n"
 msgstr "停止在 %s... %.*s\n"
 
-#: sequencer.c:3898
+#: sequencer.c:4047
 #, c-format
 msgid "unknown command %d"
 msgstr "未知命令 %d"
 
-#: sequencer.c:3957
+#: sequencer.c:4106
 msgid "could not read orig-head"
 msgstr "不能读取 orig-head"
 
-#: sequencer.c:3962
+#: sequencer.c:4111
 msgid "could not read 'onto'"
 msgstr "不能读取 'onto'"
 
-#: sequencer.c:3976
+#: sequencer.c:4125
 #, c-format
 msgid "could not update HEAD to %s"
 msgstr "不能更新 HEAD 为 %s"
 
-#: sequencer.c:4069
+#: sequencer.c:4218
 msgid "cannot rebase: You have unstaged changes."
 msgstr "不能变基：您有未暂存的变更。"
 
-#: sequencer.c:4174
+#: sequencer.c:4324
 msgid "could not remove CHERRY_PICK_HEAD"
 msgstr "不能删除 CHERRY_PICK_HEAD"
 
-#: sequencer.c:4078
+#: sequencer.c:4227
 msgid "cannot amend non-existing commit"
 msgstr "不能修补不存在的提交"
 
-#: sequencer.c:4080
+#: sequencer.c:4229
 #, c-format
 msgid "invalid file: '%s'"
 msgstr "无效文件：'%s'"
 
-#: sequencer.c:4082
+#: sequencer.c:4231
 #, c-format
 msgid "invalid contents: '%s'"
 msgstr "无效内容：'%s'"
 
-#: sequencer.c:4085
+#: sequencer.c:4234
 msgid ""
 "\n"
 "You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3674,44 +3678,44 @@
 "\n"
 "您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
 
-#: sequencer.c:4181
+#: sequencer.c:4331
 msgid "could not commit staged changes."
 msgstr "不能提交暂存的修改。"
 
-#: sequencer.c:4285
+#: sequencer.c:4446
 #, c-format
 msgid "%s: can't cherry-pick a %s"
 msgstr "%s：不能拣选一个%s"
 
-#: sequencer.c:4289
+#: sequencer.c:4450
 #, c-format
 msgid "%s: bad revision"
 msgstr "%s：错误的版本"
 
-#: sequencer.c:4324
+#: sequencer.c:4485
 msgid "can't revert as initial commit"
 msgstr "不能作为初始提交回退"
 
-#: sequencer.c:4774
+#: sequencer.c:4962
 msgid "make_script: unhandled options"
 msgstr "make_script：有未能处理的选项"
 
-#: sequencer.c:4777
+#: sequencer.c:4965
 msgid "make_script: error preparing revisions"
 msgstr "make_script：准备版本时错误"
 
-#: builtin/rebase.c:158 builtin/rebase.c:182 builtin/rebase.c:209
+#: builtin/rebase.c:181 builtin/rebase.c:205 builtin/rebase.c:232
 #, c-format
 msgid "unusable todo list: '%s'"
 msgstr "不可用的待办列表：'%s'"
 
-#: rebase-interactive.c:26
+#: rebase-interactive.c:33
 #, c-format
 msgid ""
 "unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
 msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
 
-#: rebase-interactive.c:173
+#: rebase-interactive.c:193
 #, c-format
 msgid ""
 "Warning: some commits may have been dropped accidentally.\n"
@@ -3720,7 +3724,7 @@
 "警告：一些提交可能被意外丢弃。\n"
 "丢弃的提交（从新到旧）：\n"
 
-#: rebase-interactive.c:180
+#: rebase-interactive.c:200
 #, c-format
 msgid ""
 "To avoid this message, use \"drop\" to explicitly remove a commit.\n"
@@ -3736,7 +3740,7 @@
 "可选值有：ignore、warn、error。\n"
 "\n"
 
-#: sequencer.c:4935
+#: rebase-interactive.c:11
 msgid ""
 "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
 "continue'.\n"
@@ -3745,18 +3749,18 @@
 "您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
 "或者您可以用 'git rebase --abort' 终止变基。\n"
 
-#: refs.c:860 wrapper.c:188 wrapper.c:358 builtin/am.c:714
-#: builtin/rebase.c:1004
+#: refs.c:816 strbuf.c:1171 wrapper.c:188 wrapper.c:358 builtin/am.c:719
+#: builtin/rebase.c:852
 #, c-format
 msgid "could not open '%s' for writing"
 msgstr "无法打开 '%s' 进行写入"
 
-#: range-diff.c:92 sequencer.c:4985
+#: range-diff.c:98 sequencer.c:5143
 #, c-format
 msgid "could not parse commit '%s'"
 msgstr "不能解析提交 '%s'"
 
-#: sequencer.c:5166
+#: sequencer.c:5336
 msgid "the script was already rearranged."
 msgstr "脚本已经重新编排。"
 
@@ -3765,7 +3769,7 @@
 msgid "'%s' is outside repository"
 msgstr "'%s' 在仓库之外"
 
-#: setup.c:174
+#: setup.c:185
 #, c-format
 msgid ""
 "%s: no such path in the working tree.\n"
@@ -3774,7 +3778,7 @@
 "%s：工作区中无此路径。\n"
 "使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
 
-#: setup.c:187
+#: setup.c:198
 #, c-format
 msgid ""
 "ambiguous argument '%s': unknown revision or path not in the working tree.\n"
@@ -3785,12 +3789,12 @@
 "使用 '--' 来分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:236
+#: setup.c:264
 #, c-format
 msgid "option '%s' must come before non-option arguments"
 msgstr "选项 '%s' 必须在其他非选项参数之前"
 
-#: setup.c:255
+#: setup.c:283
 #, c-format
 msgid ""
 "ambiguous argument '%s': both revision and filename\n"
@@ -3801,92 +3805,92 @@
 "使用 '--' 来分隔版本和路径，例如：\n"
 "'git <命令> [<版本>...] -- [<文件>...]'"
 
-#: setup.c:391
+#: setup.c:419
 msgid "unable to set up work tree using invalid config"
 msgstr "无法使用无效配置来创建工作区"
 
-#: setup.c:395
+#: setup.c:423
 msgid "this operation must be run in a work tree"
 msgstr "该操作必须在一个工作区中运行"
 
-#: setup.c:541
+#: setup.c:569
 #, c-format
 msgid "Expected git repo version <= %d, found %d"
 msgstr "期望 git 仓库版本 <= %d，却得到 %d"
 
-#: setup.c:549
+#: setup.c:577
 msgid "unknown repository extensions found:"
 msgstr "发现未知的仓库扩展："
 
-#: setup.c:568
+#: setup.c:596
 #, c-format
 msgid "error opening '%s'"
 msgstr "打开 '%s' 出错"
 
-#: setup.c:570
+#: setup.c:598
 #, c-format
 msgid "too large to be a .git file: '%s'"
 msgstr "文件太大，无法作为 .git 文件：'%s'"
 
-#: setup.c:572
+#: setup.c:600
 #, c-format
 msgid "error reading %s"
 msgstr "读取 %s 出错"
 
-#: setup.c:574
+#: setup.c:602
 #, c-format
 msgid "invalid gitfile format: %s"
 msgstr "无效的 gitfile 格式：%s"
 
-#: setup.c:576
+#: setup.c:604
 #, c-format
 msgid "no path in gitfile: %s"
 msgstr "在 gitfile 中没有路径：%s"
 
-#: setup.c:578
+#: setup.c:606
 #, c-format
 msgid "not a git repository: %s"
 msgstr "不是一个 git 仓库：%s"
 
-#: setup.c:677
+#: setup.c:708
 #, c-format
 msgid "'$%s' too big"
 msgstr "'$%s' 太大"
 
-#: setup.c:691
+#: setup.c:722
 #, c-format
 msgid "not a git repository: '%s'"
 msgstr "不是一个 git 仓库：'%s'"
 
-#: setup.c:720 setup.c:722 setup.c:753
+#: setup.c:751 setup.c:753 setup.c:784
 #, c-format
 msgid "cannot chdir to '%s'"
 msgstr "不能切换目录到 '%s'"
 
-#: setup.c:725 setup.c:781 setup.c:791 setup.c:830 setup.c:838
+#: setup.c:756 setup.c:812 setup.c:822 setup.c:861 setup.c:869
 msgid "cannot come back to cwd"
 msgstr "无法返回当前工作目录"
 
-#: setup.c:1110
+#: setup.c:1141
 #, c-format
 msgid "not a git repository (or any of the parent directories): %s"
 msgstr "不是一个 git 仓库（或者任何父目录）：%s"
 
-#: setup.c:852
+#: setup.c:883
 #, c-format
 msgid "failed to stat '%*s%s%s'"
 msgstr "获取 '%*s%s%s' 状态（stat）失败"
 
-#: setup.c:1090
+#: setup.c:1121
 msgid "Unable to read current working directory"
 msgstr "不能读取当前工作目录"
 
-#: setup.c:1099 setup.c:1105
+#: setup.c:1130 setup.c:1136
 #, c-format
 msgid "cannot change to '%s'"
 msgstr "不能切换到 '%s'"
 
-#: setup.c:1116
+#: setup.c:1147
 #, c-format
 msgid ""
 "not a git repository (or any parent up to mount point %s)\n"
@@ -3895,7 +3899,7 @@
 "不是一个 git 仓库（或者直至挂载点 %s 的任何父目录）\n"
 "停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
 
-#: setup.c:1227
+#: setup.c:1258
 #, c-format
 msgid ""
 "problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3904,53 +3908,53 @@
 "参数 core.sharedRepository 的文件属性值有问题（0%.3o）。\n"
 "文件属主必须始终拥有读写权限。"
 
-#: setup.c:1271
+#: setup.c:1304
 msgid "open /dev/null or dup failed"
 msgstr "不能打开或者复制 /dev/null"
 
-#: setup.c:1286
+#: setup.c:1319
 msgid "fork failed"
 msgstr "fork 失败"
 
-#: setup.c:1291
+#: setup.c:1324
 msgid "setsid failed"
 msgstr "setsid 失败"
 
-#: sha1-file.c:685
+#: sha1-file.c:703
 #, c-format
 msgid "path '%s' does not exist"
 msgstr "路径 '%s' 不存在"
 
-#: sha1-file.c:711
+#: sha1-file.c:724
 #, c-format
 msgid "reference repository '%s' as a linked checkout is not supported yet."
 msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
 
-#: sha1-file.c:717
+#: sha1-file.c:730
 #, c-format
 msgid "reference repository '%s' is not a local repository."
 msgstr "参考仓库 '%s' 不是一个本地仓库。"
 
-#: sha1-file.c:723
+#: sha1-file.c:736
 #, c-format
 msgid "reference repository '%s' is shallow"
 msgstr "参考仓库 '%s' 是一个浅克隆"
 
-#: sha1-file.c:731
+#: sha1-file.c:744
 #, c-format
 msgid "reference repository '%s' is grafted"
 msgstr "参考仓库 '%s' 已被移植"
 
-#: sha1-name.c:487
+#: sha1-name.c:486
 #, c-format
 msgid "short SHA1 %s is ambiguous"
 msgstr "短 SHA1 %s 存在歧义"
 
-#: sha1-name.c:498
+#: sha1-name.c:497
 msgid "The candidates are:"
 msgstr "候选者有："
 
-#: sha1_name.c:693
+#: sha1-name.c:770
 msgid ""
 "Git normally never creates a ref that ends with 40 hex characters\n"
 "because it will be ignored when you just specify 40-hex. These refs\n"
@@ -3980,7 +3984,7 @@
 msgid "Could not find section in .gitmodules where path=%s"
 msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
 
-#: submodule-config.c:761
+#: submodule-config.c:766
 #, c-format
 msgid "Could not update .gitmodules entry %s"
 msgstr "不能更新 .gitmodules 条目 %s"
@@ -4009,48 +4013,48 @@
 msgid "submodule entry '%s' (%s) is a %s, not a commit"
 msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
 
-#: submodule.c:1147 builtin/branch.c:680 builtin/submodule--helper.c:1989
+#: submodule.c:1147 builtin/branch.c:678 builtin/submodule--helper.c:2045
 msgid "Failed to resolve HEAD as a valid ref."
 msgstr "无法将 HEAD 解析为有效引用。"
 
-#: submodule.c:1651
+#: submodule.c:1662
 #, c-format
 msgid "'%s' not recognized as a git repository"
 msgstr "无法将 '%s' 识别为一个 git 仓库"
 
-#: submodule.c:1789
+#: submodule.c:1800
 #, c-format
 msgid "could not start 'git status' in submodule '%s'"
 msgstr "无法在子模组 '%s' 中启动 'git status'"
 
-#: submodule.c:1802
+#: submodule.c:1813
 #, c-format
 msgid "could not run 'git status' in submodule '%s'"
 msgstr "无法在子模组 '%s' 中执行 'git status'"
 
-#: submodule.c:1907
+#: submodule.c:1918
 #, c-format
 msgid "submodule '%s' has dirty index"
 msgstr "子模组 '%s' 中有脏索引"
 
-#: submodule.c:2007
+#: submodule.c:2059
 #, c-format
 msgid ""
 "relocate_gitdir for submodule '%s' with more than one worktree not supported"
 msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
 
-#: submodule.c:2019 submodule.c:2074
+#: submodule.c:2071 submodule.c:2130
 #, c-format
 msgid "could not lookup name for submodule '%s'"
 msgstr "不能查询子模组 '%s' 的名称"
 
-#: rerere.c:881 submodule.c:2023 builtin/log.c:1790
-#: builtin/submodule--helper.c:1418 builtin/submodule--helper.c:1428
+#: rerere.c:881 submodule.c:2078 builtin/log.c:1891
+#: builtin/submodule--helper.c:1454 builtin/submodule--helper.c:1466
 #, c-format
 msgid "could not create directory '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: submodule.c:2026
+#: submodule.c:2082
 #, c-format
 msgid ""
 "Migrating git directory of '%s%s' from\n"
@@ -4061,12 +4065,12 @@
 "'%s' 迁移至\n"
 "'%s'\n"
 
-#: submodule.c:2109
+#: submodule.c:1855 submodule.c:2165
 #, c-format
 msgid "could not recurse into submodule '%s'"
 msgstr "无法递归进子模组路径 '%s'"
 
-#: submodule.c:2153
+#: submodule.c:2210
 msgid "could not start ls-files in .."
 msgstr "无法在 .. 中启动 ls-files"
 
@@ -4074,16 +4078,16 @@
 msgid "BUG: returned path string doesn't match cwd?"
 msgstr "BUG：返回的路径和当前路径不匹配？"
 
-#: submodule.c:2192
+#: submodule.c:2250
 #, c-format
 msgid "ls-tree returned unexpected return code %d"
 msgstr "ls-tree 返回未知返回值 %d"
 
-#: submodule-config.c:303
+#: submodule-config.c:304
 msgid "negative values not allowed for submodule.fetchjobs"
 msgstr "submodule.fetchjobs 不允许为负值"
 
-#: submodule-config.c:490
+#: submodule-config.c:499
 #, c-format
 msgid "invalid value for %s"
 msgstr "%s 的值无效"
@@ -4099,7 +4103,7 @@
 msgid "unknown value '%s' for key '%s'"
 msgstr "键 '%2$s' 的未知取值 '%1$s'"
 
-#: trailer.c:539 trailer.c:544 builtin/remote.c:295
+#: trailer.c:539 trailer.c:544 builtin/remote.c:298 builtin/remote.c:323
 #, c-format
 msgid "more than one %s"
 msgstr "多于一个 %s"
@@ -4152,14 +4156,14 @@
 msgid "transport: invalid depth option '%s'"
 msgstr "传输：无效的深度选项 '%s'"
 
-#: transport.c:1044
+#: transport.c:1052
 #, c-format
 msgid ""
 "The following submodule paths contain changes that can\n"
 "not be found on any remote:\n"
 msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
 
-#: transport.c:1048
+#: transport.c:1056
 #, c-format
 msgid ""
 "\n"
@@ -4186,32 +4190,32 @@
 "以推送至远程。\n"
 "\n"
 
-#: transport.c:1056
+#: transport.c:1064
 msgid "Aborting."
 msgstr "正在终止。"
 
-#: transport-helper.c:1079
+#: transport-helper.c:1025
 #, c-format
 msgid "Could not read ref %s"
 msgstr "不能读取引用 %s"
 
-#: tree-walk.c:33
+#: tree-walk.c:32
 msgid "too-short tree object"
 msgstr "太短的树对象"
 
-#: tree-walk.c:39
+#: tree-walk.c:38
 msgid "malformed mode in tree entry"
 msgstr "树对象中的条目模式错误"
 
-#: tree-walk.c:43
+#: tree-walk.c:42
 msgid "empty filename in tree entry"
 msgstr "树对象条目中空的文件名"
 
-#: tree-walk.c:118
+#: tree-walk.c:117
 msgid "too-short tree file"
 msgstr "太短的树文件"
 
-#: unpack-trees.c:110
+#: unpack-trees.c:113
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4220,7 +4224,7 @@
 "您对下列文件的本地修改将被检出操作覆盖：\n"
 "%%s请在切换分支前提交或贮藏您的修改。"
 
-#: unpack-trees.c:112
+#: unpack-trees.c:115
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by checkout:\n"
@@ -4229,7 +4233,7 @@
 "您对下列文件的本地修改将被检出操作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:115
+#: unpack-trees.c:118
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4238,7 +4242,7 @@
 "您对下列文件的本地修改将被合并操作覆盖：\n"
 "%%s请在合并前提交或贮藏您的修改。"
 
-#: unpack-trees.c:117
+#: unpack-trees.c:120
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by merge:\n"
@@ -4247,7 +4251,7 @@
 "您对下列文件的本地修改将被合并操作覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:120
+#: unpack-trees.c:123
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4256,7 +4260,7 @@
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s请在 %s 之前提交或贮藏您的修改。"
 
-#: unpack-trees.c:122
+#: unpack-trees.c:125
 #, c-format
 msgid ""
 "Your local changes to the following files would be overwritten by %s:\n"
@@ -4265,7 +4269,7 @@
 "您对下列文件的本地修改将被 %s 覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:127
+#: unpack-trees.c:130
 #, c-format
 msgid ""
 "Updating the following directories would lose untracked files in them:\n"
@@ -4274,7 +4278,7 @@
 "更新如下目录将会丢失其中未跟踪的文件：\n"
 "%s"
 
-#: unpack-trees.c:131
+#: unpack-trees.c:134
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4283,7 +4287,7 @@
 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
 "%%s请在切换分支之前移动或删除。"
 
-#: unpack-trees.c:133
+#: unpack-trees.c:136
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by checkout:\n"
@@ -4292,7 +4296,7 @@
 "工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:136
+#: unpack-trees.c:139
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4301,7 +4305,7 @@
 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
 "%%s请在合并前移动或删除。"
 
-#: unpack-trees.c:138
+#: unpack-trees.c:141
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by merge:\n"
@@ -4310,7 +4314,7 @@
 "工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:141
+#: unpack-trees.c:144
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4319,7 +4323,7 @@
 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
 "%%s请在 %s 前移动或删除。"
 
-#: unpack-trees.c:143
+#: unpack-trees.c:146
 #, c-format
 msgid ""
 "The following untracked working tree files would be removed by %s:\n"
@@ -4328,7 +4332,7 @@
 "工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
 "%%s"
 
-#: unpack-trees.c:149
+#: unpack-trees.c:152
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4338,7 +4342,7 @@
 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
 "%%s请在切换分支前移动或删除。"
 
-#: unpack-trees.c:151
+#: unpack-trees.c:154
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by "
@@ -4348,7 +4352,7 @@
 "工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:154
+#: unpack-trees.c:157
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4357,7 +4361,7 @@
 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
 "%%s请在合并前移动或删除。"
 
-#: unpack-trees.c:156
+#: unpack-trees.c:159
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by merge:\n"
@@ -4366,7 +4370,7 @@
 "工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:159
+#: unpack-trees.c:162
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4375,7 +4379,7 @@
 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
 "%%s请在 %s 前移动或删除。"
 
-#: unpack-trees.c:161
+#: unpack-trees.c:164
 #, c-format
 msgid ""
 "The following untracked working tree files would be overwritten by %s:\n"
@@ -4384,7 +4388,7 @@
 "工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
 "%%s"
 
-#: unpack-trees.c:169
+#: unpack-trees.c:172
 #, c-format
 msgid "Entry '%s' overlaps with '%s'.  Cannot bind."
 msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
@@ -4418,7 +4422,7 @@
 "工作区中下列文件将被稀疏检出更新所删除：\n"
 "%s"
 
-#: unpack-trees.c:178
+#: unpack-trees.c:175
 #, c-format
 msgid ""
 "Cannot update submodule:\n"
@@ -4427,12 +4431,12 @@
 "无法更新子模组：\n"
 "%s"
 
-#: unpack-trees.c:255
+#: unpack-trees.c:262
 #, c-format
 msgid "Aborting\n"
 msgstr "正在终止\n"
 
-#: unpack-trees.c:333
+#: unpack-trees.c:336
 msgid "Checking out files"
 msgstr "正在检出文件"
 
@@ -4465,32 +4469,32 @@
 msgid "invalid '..' path segment"
 msgstr "无效的 '..' 路径片段"
 
-#: worktree.c:258 builtin/am.c:2084
+#: worktree.c:262 builtin/am.c:2098
 #, c-format
 msgid "failed to read '%s'"
 msgstr "读取 '%s' 失败"
 
-#: worktree.c:304
+#: worktree.c:309
 #, c-format
 msgid "'%s' at main working tree is not the repository directory"
 msgstr "在主工作区的 '%s' 不是仓库目录"
 
-#: worktree.c:315
+#: worktree.c:320
 #, c-format
 msgid "'%s' file does not contain absolute path to the working tree location"
 msgstr "文件 '%s' 不包含工作区的绝对路径"
 
-#: worktree.c:327
+#: worktree.c:332
 #, c-format
 msgid "'%s' does not exist"
 msgstr "'%s' 不存在"
 
-#: worktree.c:333
+#: worktree.c:338
 #, c-format
 msgid "'%s' is not a .git file, error code %d"
 msgstr "'%s' 不是一个 .git 文件，错误码 %d"
 
-#: worktree.c:341
+#: worktree.c:347
 #, c-format
 msgid "'%s' does not point back to '%s'"
 msgstr "'%s' 没有指回到 '%s'"
@@ -4500,8 +4504,8 @@
 msgid "could not open '%s' for reading and writing"
 msgstr "无法打开 '%s' 进行读写"
 
-#: sequencer.c:790 wrapper.c:190 wrapper.c:360 builtin/am.c:705
-#: builtin/am.c:797 builtin/merge.c:1114 builtin/rebase.c:1046
+#: sequencer.c:785 wrapper.c:190 wrapper.c:360 builtin/am.c:710
+#: builtin/am.c:802 builtin/merge.c:1125 builtin/rebase.c:896
 #, c-format
 msgid "could not open '%s' for reading"
 msgstr "无法打开 '%s' 进行读取"
@@ -4520,7 +4524,7 @@
 msgstr "未合并的路径："
 
 #  译者：注意保持前导空格
-#: wt-status.c:178 wt-status.c:205
+#: wt-status.c:181 wt-status.c:208
 #, c-format
 msgid "  (use \"git reset %s <file>...\" to unstage)"
 msgstr "  （使用 \"git reset %s <文件>...\" 以取消暂存）"
@@ -4545,11 +4549,11 @@
 msgid "  (use \"git rm <file>...\" to mark resolution)"
 msgstr "  （使用 \"git rm <文件>...\" 标记解决方案）"
 
-#: wt-status.c:211 wt-status.c:1074
+#: wt-status.c:211 wt-status.c:1072
 msgid "Changes to be committed:"
 msgstr "要提交的变更："
 
-#: wt-status.c:234 wt-status.c:1083
+#: wt-status.c:234 wt-status.c:1081
 msgid "Changes not staged for commit:"
 msgstr "尚未暂存以备提交的变更："
 
@@ -4564,7 +4568,7 @@
 msgstr "  （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:224
+#: wt-status.c:227
 msgid ""
 "  (use \"git checkout -- <file>...\" to discard changes in working directory)"
 msgstr "  （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
@@ -4655,21 +4659,21 @@
 msgid "untracked content, "
 msgstr "未跟踪的内容, "
 
-#: wt-status.c:906
+#: wt-status.c:904
 #, c-format
 msgid "Your stash currently has %d entry"
 msgid_plural "Your stash currently has %d entries"
 msgstr[0] "您的贮藏区当前有 %d 条记录"
 
-#: wt-status.c:938
+#: wt-status.c:936
 msgid "Submodules changed but not updated:"
 msgstr "子模组已修改但尚未更新："
 
-#: wt-status.c:940
+#: wt-status.c:938
 msgid "Submodule changes to be committed:"
 msgstr "要提交的子模组变更："
 
-#: wt-status.c:1022
+#: wt-status.c:1020
 msgid ""
 "Do not modify or remove the line above.\n"
 "Everything below it will be ignored."
@@ -4677,248 +4681,248 @@
 "不要改动或删除上面的一行。\n"
 "其下所有内容都将被忽略。"
 
-#: wt-status.c:1144
+#: wt-status.c:1142
 msgid "You have unmerged paths."
 msgstr "您有尚未合并的路径。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1147
+#: wt-status.c:1145
 msgid "  (fix conflicts and run \"git commit\")"
 msgstr "  （解决冲突并运行 \"git commit\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1149
+#: wt-status.c:1147
 msgid "  (use \"git merge --abort\" to abort the merge)"
 msgstr "  （使用 \"git merge --abort\" 终止合并）"
 
-#: wt-status.c:1153
+#: wt-status.c:1151
 msgid "All conflicts fixed but you are still merging."
 msgstr "所有冲突已解决但您仍处于合并中。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1156
+#: wt-status.c:1154
 msgid "  (use \"git commit\" to conclude merge)"
 msgstr "  （使用 \"git commit\" 结束合并）"
 
-#: wt-status.c:1165
+#: wt-status.c:1163
 msgid "You are in the middle of an am session."
 msgstr "您正处于 am 操作过程中。"
 
-#: wt-status.c:1168
+#: wt-status.c:1166
 msgid "The current patch is empty."
 msgstr "当前的补丁为空。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1172
+#: wt-status.c:1170
 msgid "  (fix conflicts and then run \"git am --continue\")"
 msgstr "  （解决冲突，然后运行 \"git am --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1174
+#: wt-status.c:1172
 msgid "  (use \"git am --skip\" to skip this patch)"
 msgstr "  （使用 \"git am --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1176
+#: wt-status.c:1174
 msgid "  (use \"git am --abort\" to restore the original branch)"
 msgstr "  （使用 \"git am --abort\" 恢复原有分支）"
 
-#: wt-status.c:1309
+#: wt-status.c:1307
 msgid "git-rebase-todo is missing."
 msgstr "git-rebase-todo 丢失。"
 
-#: wt-status.c:1311
+#: wt-status.c:1309
 msgid "No commands done."
 msgstr "没有命令被执行。"
 
-#: wt-status.c:1314
+#: wt-status.c:1312
 #, c-format
 msgid "Last command done (%d command done):"
 msgid_plural "Last commands done (%d commands done):"
 msgstr[0] "最后一条命令已完成（%d 条命令被执行）："
 
-#: wt-status.c:1325
+#: wt-status.c:1323
 #, c-format
 msgid "  (see more in file %s)"
 msgstr "  （更多参见文件 %s）"
 
-#: wt-status.c:1330
+#: wt-status.c:1328
 msgid "No commands remaining."
 msgstr "未剩下任何命令。"
 
-#: wt-status.c:1333
+#: wt-status.c:1331
 #, c-format
 msgid "Next command to do (%d remaining command):"
 msgid_plural "Next commands to do (%d remaining commands):"
 msgstr[0] "接下来要执行的命令（剩余 %d 条命令）："
 
 #  译者：注意保持前导空格
-#: wt-status.c:1341
+#: wt-status.c:1339
 msgid "  (use \"git rebase --edit-todo\" to view and edit)"
 msgstr "  （使用 \"git rebase --edit-todo\" 来查看和编辑）"
 
-#: wt-status.c:1353
+#: wt-status.c:1351
 #, c-format
 msgid "You are currently rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
 
-#: wt-status.c:1358
+#: wt-status.c:1356
 msgid "You are currently rebasing."
 msgstr "您在执行变基操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1371
+#: wt-status.c:1369
 msgid "  (fix conflicts and then run \"git rebase --continue\")"
 msgstr "  （解决冲突，然后运行 \"git rebase --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1373
+#: wt-status.c:1371
 msgid "  (use \"git rebase --skip\" to skip this patch)"
 msgstr "  （使用 \"git rebase --skip\" 跳过此补丁）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1375
+#: wt-status.c:1373
 msgid "  (use \"git rebase --abort\" to check out the original branch)"
 msgstr "  （使用 \"git rebase --abort\" 以检出原有分支）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1382
+#: wt-status.c:1380
 msgid "  (all conflicts fixed: run \"git rebase --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git rebase --continue\"）"
 
-#: wt-status.c:1386
+#: wt-status.c:1384
 #, c-format
 msgid ""
 "You are currently splitting a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
 
-#: wt-status.c:1391
+#: wt-status.c:1389
 msgid "You are currently splitting a commit during a rebase."
 msgstr "您在执行变基操作时拆分提交。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1394
+#: wt-status.c:1392
 msgid ""
 "  (Once your working directory is clean, run \"git rebase --continue\")"
 msgstr "  （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
 
-#: wt-status.c:1398
+#: wt-status.c:1396
 #, c-format
 msgid ""
 "You are currently editing a commit while rebasing branch '%s' on '%s'."
 msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
 
-#: wt-status.c:1403
+#: wt-status.c:1401
 msgid "You are currently editing a commit during a rebase."
 msgstr "您在执行变基操作时编辑提交。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1406
+#: wt-status.c:1404
 msgid "  (use \"git commit --amend\" to amend the current commit)"
 msgstr "  （使用 \"git commit --amend\" 修补当前提交）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1408
+#: wt-status.c:1406
 msgid ""
 "  (use \"git rebase --continue\" once you are satisfied with your changes)"
 msgstr "  （当您对您的修改满意后执行 \"git rebase --continue\"）"
 
-#: wt-status.c:1422
+#: wt-status.c:1420
 #, c-format
 msgid "You are currently cherry-picking commit %s."
 msgstr "您在执行拣选提交 %s 的操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1429
+#: wt-status.c:1427
 msgid "  (fix conflicts and run \"git cherry-pick --continue\")"
 msgstr "  （解决冲突并运行 \"git cherry-pick --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1435
+#: wt-status.c:1433
 msgid "  (all conflicts fixed: run \"git cherry-pick --continue\")"
 msgstr "  （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1439
+#: wt-status.c:1437
 msgid ""
 "  (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
 msgstr "  （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
 
-#: wt-status.c:1452
+#: wt-status.c:1450
 #, c-format
 msgid "You are currently reverting commit %s."
 msgstr "您在执行反转提交 %s 的操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1458
+#: wt-status.c:1456
 msgid "  (fix conflicts and run \"git revert --continue\")"
 msgstr "  （解决冲突并执行 \"git revert --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1464
+#: wt-status.c:1462
 msgid "  (all conflicts fixed: run \"git revert --continue\")"
 msgstr "  （所有冲突已解决：执行 \"git revert --continue\"）"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1468
+#: wt-status.c:1466
 msgid "  (use \"git revert --abort\" to cancel the revert operation)"
 msgstr "  （使用 \"git revert --abort\" 以取消反转提交操作）"
 
-#: wt-status.c:1478
+#: wt-status.c:1476
 #, c-format
 msgid "You are currently bisecting, started from branch '%s'."
 msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
 
-#: wt-status.c:1482
+#: wt-status.c:1480
 msgid "You are currently bisecting."
 msgstr "您在执行二分查找操作。"
 
 #  译者：注意保持前导空格
-#: wt-status.c:1485
+#: wt-status.c:1483
 msgid "  (use \"git bisect reset\" to get back to the original branch)"
 msgstr "  （使用 \"git bisect reset\" 以回到原有分支）"
 
-#: wt-status.c:1694
+#: wt-status.c:1692
 msgid "On branch "
 msgstr "位于分支 "
 
-#: wt-status.c:1701
+#: wt-status.c:1699
 msgid "interactive rebase in progress; onto "
 msgstr "交互式变基操作正在进行中；至 "
 
-#: wt-status.c:1703
+#: wt-status.c:1701
 msgid "rebase in progress; onto "
 msgstr "变基操作正在进行中；至 "
 
-#: wt-status.h:67
+#: wt-status.h:80
 msgid "HEAD detached at "
 msgstr "头指针分离于 "
 
-#: wt-status.h:68
+#: wt-status.h:81
 msgid "HEAD detached from "
 msgstr "头指针分离自 "
 
-#: wt-status.c:1713
+#: wt-status.c:1711
 msgid "Not currently on any branch."
 msgstr "当前不在任何分支上。"
 
-#: wt-status.c:1730
+#: wt-status.c:1728
 msgid "Initial commit"
 msgstr "初始提交"
 
-#: wt-status.c:1731
+#: wt-status.c:1729
 msgid "No commits yet"
 msgstr "尚无提交"
 
-#: wt-status.c:1745
+#: wt-status.c:1743
 msgid "Untracked files"
 msgstr "未跟踪的文件"
 
-#: wt-status.c:1747
+#: wt-status.c:1745
 msgid "Ignored files"
 msgstr "忽略的文件"
 
-#: wt-status.c:1751
+#: wt-status.c:1749
 #, c-format
 msgid ""
 "It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4928,231 +4932,231 @@
 "耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
 "但您需要小心不要忘了添加新文件（参见 'git help status'）。"
 
-#: wt-status.c:1757
+#: wt-status.c:1755
 #, c-format
 msgid "Untracked files not listed%s"
 msgstr "未跟踪的文件没有列出%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1759
+#: wt-status.c:1757
 msgid " (use -u option to show untracked files)"
 msgstr " （使用 -u 参数显示未跟踪的文件）"
 
-#: wt-status.c:1765
+#: wt-status.c:1763
 msgid "No changes"
 msgstr "没有修改"
 
-#: wt-status.c:1770
+#: wt-status.c:1768
 #, c-format
 msgid ""
 "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
 msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n"
 
-#: wt-status.c:1773
+#: wt-status.c:1771
 #, c-format
 msgid "no changes added to commit\n"
 msgstr "修改尚未加入提交\n"
 
-#: wt-status.c:1776
+#: wt-status.c:1774
 #, c-format
 msgid ""
 "nothing added to commit but untracked files present (use \"git add\" to "
 "track)\n"
 msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1779
+#: wt-status.c:1777
 #, c-format
 msgid "nothing added to commit but untracked files present\n"
 msgstr "提交为空，但是存在尚未跟踪的文件\n"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1782
+#: wt-status.c:1780
 #, c-format
 msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
 msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
 
-#: wt-status.c:1785 wt-status.c:1790
+#: wt-status.c:1783 wt-status.c:1788
 #, c-format
 msgid "nothing to commit\n"
 msgstr "无文件要提交\n"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1788
+#: wt-status.c:1786
 #, c-format
 msgid "nothing to commit (use -u to show untracked files)\n"
 msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1792
+#: wt-status.c:1790
 #, c-format
 msgid "nothing to commit, working tree clean\n"
 msgstr "无文件要提交，干净的工作区\n"
 
-#: wt-status.c:1905
+#: wt-status.c:1903
 msgid "No commits yet on "
 msgstr "尚无提交在 "
 
-#: wt-status.c:1909
+#: wt-status.c:1907
 msgid "HEAD (no branch)"
 msgstr "HEAD（非分支）"
 
-#: wt-status.c:1940
+#: wt-status.c:1938
 msgid "different"
 msgstr "不同"
 
 #  译者：注意保持句尾空格
-#: wt-status.c:1942 wt-status.c:1950
+#: wt-status.c:1940 wt-status.c:1948
 msgid "behind "
 msgstr "落后 "
 
-#: wt-status.c:1945 wt-status.c:1948
+#: wt-status.c:1943 wt-status.c:1946
 msgid "ahead "
 msgstr "领先 "
 
 #. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2470
+#: wt-status.c:2468
 #, c-format
 msgid "cannot %s: You have unstaged changes."
 msgstr "不能%s：您有未暂存的变更。"
 
-#: wt-status.c:2476
+#: wt-status.c:2474
 msgid "additionally, your index contains uncommitted changes."
 msgstr "另外，您的索引中包含未提交的变更。"
 
-#: wt-status.c:2478
+#: wt-status.c:2476
 #, c-format
 msgid "cannot %s: Your index contains uncommitted changes."
 msgstr "不能%s：您的索引中包含未提交的变更。"
 
-#: compat/precompose_utf8.c:58 builtin/clone.c:452
+#: compat/precompose_utf8.c:58 builtin/clone.c:456
 #, c-format
 msgid "failed to unlink '%s'"
 msgstr "删除 '%s' 失败"
 
-#: builtin/add.c:25
+#: builtin/add.c:26
 msgid "git add [<options>] [--] <pathspec>..."
 msgstr "git add [<选项>] [--] <路径规格>..."
 
-#: builtin/add.c:84
+#: builtin/add.c:88
 #, c-format
 msgid "unexpected diff status %c"
 msgstr "意外的差异状态 %c"
 
-#: builtin/add.c:89 builtin/commit.c:288
+#: builtin/add.c:93 builtin/commit.c:285
 msgid "updating files failed"
 msgstr "更新文件失败"
 
-#: builtin/add.c:99
+#: builtin/add.c:103
 #, c-format
 msgid "remove '%s'\n"
 msgstr "删除 '%s'\n"
 
-#: builtin/add.c:174
+#: builtin/add.c:178
 msgid "Unstaged changes after refreshing the index:"
 msgstr "刷新索引之后尚未被暂存的变更："
 
-#: builtin/add.c:234 builtin/rev-parse.c:897
+#: builtin/add.c:266 builtin/rev-parse.c:904
 msgid "Could not read the index"
 msgstr "不能读取索引"
 
-#: builtin/add.c:245
+#: builtin/add.c:277
 #, c-format
 msgid "Could not open '%s' for writing."
 msgstr "无法为写入打开 '%s'。"
 
-#: builtin/add.c:249
+#: builtin/add.c:281
 msgid "Could not write patch"
 msgstr "不能生成补丁"
 
-#: builtin/add.c:252
+#: builtin/add.c:284
 msgid "editing patch failed"
 msgstr "编辑补丁失败"
 
-#: builtin/add.c:255
+#: builtin/add.c:287
 #, c-format
 msgid "Could not stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/add.c:257
+#: builtin/add.c:289
 msgid "Empty patch. Aborted."
 msgstr "空补丁。异常终止。"
 
-#: builtin/add.c:262
+#: builtin/add.c:294
 #, c-format
 msgid "Could not apply '%s'"
 msgstr "不能应用 '%s'"
 
-#: builtin/add.c:270
+#: builtin/add.c:302
 msgid "The following paths are ignored by one of your .gitignore files:\n"
 msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
 
-#: builtin/add.c:290 builtin/clean.c:910 builtin/fetch.c:162 builtin/mv.c:124
-#: builtin/prune-packed.c:56 builtin/pull.c:223 builtin/push.c:547
-#: builtin/remote.c:1345 builtin/rm.c:241 builtin/send-pack.c:165
+#: builtin/add.c:322 builtin/clean.c:904 builtin/fetch.c:164 builtin/mv.c:124
+#: builtin/prune-packed.c:14 builtin/pull.c:204 builtin/push.c:548
+#: builtin/remote.c:1421 builtin/rm.c:242 builtin/send-pack.c:165
 msgid "dry run"
 msgstr "演习"
 
-#: builtin/add.c:293
+#: builtin/add.c:325
 msgid "interactive picking"
 msgstr "交互式拣选"
 
-#: builtin/add.c:294 builtin/checkout.c:1480 builtin/reset.c:306
+#: builtin/add.c:326 builtin/checkout.c:1535 builtin/reset.c:308
 msgid "select hunks interactively"
 msgstr "交互式挑选数据块"
 
-#: builtin/add.c:295
+#: builtin/add.c:327
 msgid "edit current diff and apply"
 msgstr "编辑当前差异并应用"
 
-#: builtin/add.c:296
+#: builtin/add.c:328
 msgid "allow adding otherwise ignored files"
 msgstr "允许添加忽略的文件"
 
-#: builtin/add.c:297
+#: builtin/add.c:329
 msgid "update tracked files"
 msgstr "更新已跟踪的文件"
 
-#: builtin/add.c:298
+#: builtin/add.c:330
 msgid "renormalize EOL of tracked files (implies -u)"
 msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
 
-#: builtin/add.c:299
+#: builtin/add.c:331
 msgid "record only the fact that the path will be added later"
 msgstr "只记录，该路径稍后再添加"
 
-#: builtin/add.c:300
+#: builtin/add.c:332
 msgid "add changes from all tracked and untracked files"
 msgstr "添加所有改变的已跟踪文件和未跟踪文件"
 
-#: builtin/add.c:303
+#: builtin/add.c:335
 msgid "ignore paths removed in the working tree (same as --no-all)"
 msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
 
-#: builtin/add.c:305
+#: builtin/add.c:337
 msgid "don't add, only refresh the index"
 msgstr "不添加，只刷新索引"
 
-#: builtin/add.c:306
+#: builtin/add.c:338
 msgid "just skip files which cannot be added because of errors"
 msgstr "跳过因出错不能添加的文件"
 
-#: builtin/add.c:307
+#: builtin/add.c:339
 msgid "check if - even missing - files are ignored in dry run"
 msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
 
-#: builtin/add.c:309 builtin/update-index.c:964
+#: builtin/update-index.c:946
 msgid "(+/-)x"
 msgstr "(+/-)x"
 
-#: builtin/add.c:309 builtin/update-index.c:1002
+#: builtin/add.c:341 builtin/update-index.c:1004
 msgid "override the executable bit of the listed files"
 msgstr "覆盖列表里文件的可执行位"
 
-#: builtin/add.c:311
+#: builtin/add.c:343
 msgid "warn when adding an embedded repository"
 msgstr "创建一个嵌入式仓库时给予警告"
 
-#: builtin/add.c:326
+#: builtin/add.c:363
 #, c-format
 msgid ""
 "You've added another git repository inside your current repository.\n"
@@ -5169,8 +5173,8 @@
 "\n"
 "See \"git help submodule\" for more information."
 msgstr ""
-"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并且不知道该如何获取它。\n"
-"如果您要添加一个子模组，使用：\n"
+"您在当前仓库中添加了另一个Git仓库。克隆外层的仓库将不包含嵌入仓库的\n"
+"内容，并且不知道该如何获取它。如果您要添加一个子模组，使用：\n"
 "\n"
 "\tgit submodule add <url> %s\n"
 "\n"
@@ -5180,150 +5184,151 @@
 "\n"
 "参见 \"git help submodule\" 获取更多信息。"
 
-#: builtin/add.c:354
+#: builtin/add.c:391
 #, c-format
 msgid "adding embedded git repository: %s"
 msgstr "正在添加嵌入式 git 仓库：%s"
 
-#: builtin/add.c:372
+#: builtin/add.c:393
 #, c-format
 msgid "Use -f if you really want to add them.\n"
 msgstr "使用 -f 参数如果您确实要添加它们。\n"
 
-#: builtin/add.c:379
+#: builtin/add.c:419
 msgid "adding files failed"
 msgstr "添加文件失败"
 
-#: builtin/add.c:419
+#: builtin/add.c:476
 msgid "-A and -u are mutually incompatible"
 msgstr "-A 和 -u 选项互斥"
 
-#: builtin/add.c:426
+#: builtin/add.c:479
 msgid "Option --ignore-missing can only be used together with --dry-run"
 msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
 
-#: builtin/add.c:430
+#: builtin/add.c:483
 #, c-format
 msgid "--chmod param '%s' must be either -x or +x"
 msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
 
-#: builtin/add.c:445
+#: builtin/add.c:512
 #, c-format
 msgid "Nothing specified, nothing added.\n"
 msgstr "没有指定文件，也没有文件被添加。\n"
 
-#: builtin/add.c:446
+#: builtin/add.c:483
 #, c-format
 msgid "Maybe you wanted to say 'git add .'?\n"
 msgstr "也许您想要执行 'git add .'？\n"
 
-#: read-cache.c:1967 read-cache.c:2255 rerere.c:565 rerere.c:599 rerere.c:1111
-#: builtin/add.c:460 builtin/check-ignore.c:178 builtin/checkout.c:468
-#: builtin/checkout.c:652 builtin/clean.c:967 builtin/commit.c:347
-#: builtin/diff-tree.c:120 builtin/grep.c:499 builtin/mv.c:145
-#: builtin/reset.c:245 builtin/rm.c:271 builtin/submodule--helper.c:330
+#: read-cache.c:1983 read-cache.c:2271 rerere.c:565 rerere.c:599 rerere.c:1111
+#: submodule.c:1619 builtin/add.c:532 builtin/check-ignore.c:181
+#: builtin/checkout.c:488 builtin/checkout.c:676 builtin/clean.c:961
+#: builtin/commit.c:364 builtin/diff-tree.c:121 builtin/grep.c:507
+#: builtin/mv.c:145 builtin/reset.c:247 builtin/rm.c:290
+#: builtin/submodule--helper.c:332
 msgid "index file corrupt"
 msgstr "索引文件损坏"
 
-#: builtin/am.c:347
+#: builtin/am.c:352
 msgid "could not parse author script"
 msgstr "不能解析作者脚本"
 
-#: builtin/am.c:431
+#: builtin/am.c:436
 #, c-format
 msgid "'%s' was deleted by the applypatch-msg hook"
 msgstr "'%s' 被 applypatch-msg 钩子删除"
 
-#: builtin/am.c:473
+#: builtin/am.c:478
 #, c-format
 msgid "Malformed input line: '%s'."
 msgstr "非法的输入行：'%s'。"
 
-#: builtin/am.c:511
+#: builtin/am.c:516
 #, c-format
 msgid "Failed to copy notes from '%s' to '%s'"
 msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
 
-#: builtin/am.c:537
+#: builtin/am.c:542
 msgid "fseek failed"
 msgstr "fseek 失败"
 
-#: builtin/am.c:725
+#: builtin/am.c:730
 #, c-format
 msgid "could not parse patch '%s'"
 msgstr "无法解析补丁 '%s'"
 
-#: builtin/am.c:790
+#: builtin/am.c:795
 msgid "Only one StGIT patch series can be applied at once"
 msgstr "一次只能有一个 StGIT 补丁队列被应用"
 
-#: builtin/am.c:838
+#: builtin/am.c:843
 msgid "invalid timestamp"
 msgstr "无效的时间戳"
 
-#: builtin/am.c:843 builtin/am.c:855
+#: builtin/am.c:848 builtin/am.c:860
 msgid "invalid Date line"
 msgstr "无效的日期行"
 
-#: builtin/am.c:850
+#: builtin/am.c:855
 msgid "invalid timezone offset"
 msgstr "无效的时区偏移值"
 
-#: builtin/am.c:943
+#: builtin/am.c:948
 msgid "Patch format detection failed."
 msgstr "补丁格式探测失败。"
 
-#: builtin/am.c:948 builtin/clone.c:406
+#: builtin/am.c:953 builtin/clone.c:409
 #, c-format
 msgid "failed to create directory '%s'"
 msgstr "创建目录 '%s' 失败"
 
-#: builtin/am.c:953
+#: builtin/am.c:958
 msgid "Failed to split patches."
 msgstr "拆分补丁失败。"
 
-#: builtin/am.c:1695 builtin/commit.c:374
+#: builtin/am.c:1699 builtin/commit.c:395
 msgid "unable to write index file"
 msgstr "无法写入索引文件"
 
-#: builtin/am.c:1084
+#: builtin/am.c:1089
 #, c-format
 msgid "When you have resolved this problem, run \"%s --continue\"."
 msgstr "当您解决这一问题，执行 \"%s --continue\"。"
 
-#: builtin/am.c:1085
+#: builtin/am.c:1090
 #, c-format
 msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
 msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
 
-#: builtin/am.c:1086
+#: builtin/am.c:1091
 #, c-format
 msgid "To restore the original branch and stop patching, run \"%s --abort\"."
 msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
 
-#: builtin/am.c:1197
+#: builtin/am.c:1202
 msgid "Patch is empty."
 msgstr "补丁为空。"
 
-#: builtin/am.c:1265
+#: builtin/am.c:1270
 #, c-format
 msgid "invalid ident line: %.*s"
 msgstr "无效的身份标识：%.*s"
 
-#: commit-graph.c:855 builtin/am.c:1287
+#: commit-graph.c:948 builtin/am.c:1292
 #, c-format
 msgid "unable to parse commit %s"
 msgstr "不能解析提交 %s"
 
-#: builtin/am.c:1484
+#: builtin/am.c:1489
 msgid "Repository lacks necessary blobs to fall back on 3-way merge."
 msgstr "仓库缺乏必要的数据对象以进行三方合并。"
 
-#: builtin/am.c:1486
+#: builtin/am.c:1491
 msgid "Using index info to reconstruct a base tree..."
 msgstr "使用索引来重建一个（三方合并的）基础目录树..."
 
-#: builtin/am.c:1505
+#: builtin/am.c:1510
 msgid ""
 "Did you hand edit your patch?\n"
 "It does not apply to blobs recorded in its index."
@@ -5331,28 +5336,28 @@
 "您是否曾手动编辑过您的补丁？\n"
 "无法应用补丁到索引中的数据对象上。"
 
-#: builtin/am.c:1511
+#: builtin/am.c:1516
 msgid "Falling back to patching base and 3-way merge..."
 msgstr "回落到基础版本上打补丁及进行三方合并..."
 
-#: builtin/am.c:1537
+#: builtin/am.c:1542
 msgid "Failed to merge in the changes."
 msgstr "无法合并变更。"
 
-#: builtin/am.c:1569
+#: builtin/am.c:1574
 msgid "applying to an empty history"
 msgstr "正应用到一个空历史上"
 
-#: builtin/am.c:1616 builtin/am.c:1620
+#: builtin/am.c:1621 builtin/am.c:1625
 #, c-format
 msgid "cannot resume: %s does not exist."
 msgstr "无法继续：%s 不存在。"
 
-#: builtin/am.c:1703
+#: builtin/am.c:1659
 msgid "cannot be interactive without stdin connected to a terminal."
 msgstr "标准输入没有和终端关联，不能进行交互式操作。"
 
-#: builtin/am.c:1638
+#: builtin/am.c:1643
 msgid "Commit Body is:"
 msgstr "提交内容为："
 
@@ -5361,26 +5366,26 @@
 #. in your translation. The program will only accept English
 #. input at this point.
 #. 
-#: builtin/am.c:1648
+#: builtin/am.c:1653
 #, c-format
 msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
 msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]： "
 
-#: builtin/am.c:1699
+#: builtin/am.c:1703
 #, c-format
 msgid "Dirty index: cannot apply patches (dirty: %s)"
 msgstr "脏索引：不能应用补丁（脏文件：%s）"
 
-#: builtin/am.c:1739 builtin/am.c:1807
+#: builtin/am.c:1743 builtin/am.c:1811
 #, c-format
 msgid "Applying: %.*s"
 msgstr "应用：%.*s"
 
-#: builtin/am.c:1756
+#: builtin/am.c:1760
 msgid "No changes -- Patch already applied."
 msgstr "没有变更 —— 补丁已经应用过。"
 
-#: builtin/am.c:1762
+#: builtin/am.c:1766
 #, c-format
 msgid "Patch failed at %s %.*s"
 msgstr "打补丁失败于 %s %.*s"
@@ -5389,7 +5394,7 @@
 msgid "Use 'git am --show-current-patch' to see the failed patch"
 msgstr "用 'git am --show-current-patch' 命令查看失败的补丁"
 
-#: builtin/am.c:1810
+#: builtin/am.c:1814
 msgid ""
 "No changes - did you forget to use 'git add'?\n"
 "If there is nothing left to stage, chances are that something else\n"
@@ -5399,7 +5404,7 @@
 "如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
 "您也许想要跳过这个补丁。"
 
-#: builtin/am.c:1817
+#: builtin/am.c:1821
 msgid ""
 "You still have unmerged paths in your index.\n"
 "You should 'git add' each file with resolved conflicts to mark them as "
@@ -5410,129 +5415,131 @@
 "您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
 "你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
 
-#: builtin/am.c:1924 builtin/am.c:1928 builtin/am.c:1940 builtin/reset.c:329
-#: builtin/reset.c:337
+#: builtin/am.c:1928 builtin/am.c:1932 builtin/am.c:1944 builtin/reset.c:347
+#: builtin/reset.c:355
 #, c-format
 msgid "Could not parse object '%s'."
 msgstr "不能解析对象 '%s'。"
 
-#: builtin/am.c:1976
+#: builtin/am.c:1980
 msgid "failed to clean index"
 msgstr "清空索引失败"
 
-#: builtin/am.c:2020
+#: builtin/am.c:2024
 msgid ""
 "You seem to have moved HEAD since the last 'am' failure.\n"
 "Not rewinding to ORIG_HEAD"
 msgstr "您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD"
 
-#: builtin/am.c:2117
+#: builtin/am.c:2131
 #, c-format
 msgid "Invalid value for --patch-format: %s"
 msgstr "无效的 --patch-format 值：%s"
 
-#: builtin/am.c:2153
+#: builtin/am.c:2206
 msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
 msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
 
-#: builtin/am.c:2154
+#: builtin/am.c:2207
 msgid "git am [<options>] (--continue | --skip | --abort)"
 msgstr "git am [<选项>] (--continue | --skip | --abort)"
 
-#: builtin/am.c:2160
+#: builtin/am.c:2213
 msgid "run interactively"
 msgstr "以交互式方式运行"
 
-#: builtin/am.c:2162
+#: builtin/am.c:2215
 msgid "historical option -- no-op"
 msgstr "老的参数 —— 无作用"
 
-#: builtin/am.c:2164
+#: builtin/am.c:2217
 msgid "allow fall back on 3way merging if needed"
 msgstr "如果必要，允许使用三方合并。"
 
-#: builtin/am.c:2165 builtin/init-db.c:494 builtin/prune-packed.c:58
-#: builtin/repack.c:297 builtin/stash.c:812
+#: builtin/am.c:2218 builtin/init-db.c:541 builtin/prune-packed.c:16
+#: builtin/repack.c:306 builtin/stash.c:816
 msgid "be quiet"
 msgstr "静默模式"
 
-#: builtin/am.c:2167
+#: builtin/am.c:2220
 msgid "add a Signed-off-by line to the commit message"
 msgstr "在提交说明中添加一个 Signed-off-by 签名"
 
-#: builtin/am.c:2170
+#: builtin/am.c:2223
 msgid "recode into utf8 (default)"
 msgstr "使用 utf8 字符集（默认）"
 
-#: builtin/am.c:2172
+#: builtin/am.c:2225
 msgid "pass -k flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -k 参数"
 
-#: builtin/am.c:2174
+#: builtin/am.c:2227
 msgid "pass -b flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -b 参数"
 
-#: builtin/am.c:2176
+#: builtin/am.c:2229
 msgid "pass -m flag to git-mailinfo"
 msgstr "向 git-mailinfo 传递 -m 参数"
 
-#: builtin/am.c:2178
+#: builtin/am.c:2231
 msgid "pass --keep-cr flag to git-mailsplit for mbox format"
 msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
 
-#: builtin/am.c:2181
+#: builtin/am.c:2234
 msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
 msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
 
-#: builtin/am.c:2184
+#: builtin/am.c:2237
 msgid "strip everything before a scissors line"
 msgstr "丢弃裁切线前的所有内容"
 
-#: builtin/am.c:2186 builtin/am.c:2189 builtin/am.c:2192 builtin/am.c:2195
-#: builtin/am.c:2198 builtin/am.c:2201 builtin/am.c:2204 builtin/am.c:2207
-#: builtin/am.c:2213
+#: builtin/am.c:2239 builtin/am.c:2242 builtin/am.c:2245 builtin/am.c:2248
+#: builtin/am.c:2251 builtin/am.c:2254 builtin/am.c:2257 builtin/am.c:2260
+#: builtin/am.c:2266
 msgid "pass it through git-apply"
 msgstr "传递给 git-apply"
 
-#: builtin/am.c:2203 builtin/commit.c:1368 builtin/fmt-merge-msg.c:671
-#: builtin/fmt-merge-msg.c:674 builtin/grep.c:883 builtin/merge.c:249
-#: builtin/pull.c:160 builtin/pull.c:219 builtin/rebase.c:1442
-#: builtin/repack.c:308 builtin/repack.c:312 builtin/repack.c:314
-#: builtin/show-branch.c:650 builtin/show-ref.c:172 builtin/tag.c:403
-#: parse-options.h:150 parse-options.h:171 parse-options.h:312
+#: builtin/am.c:2256 builtin/commit.c:1397 builtin/fmt-merge-msg.c:17
+#: builtin/fmt-merge-msg.c:20 builtin/grep.c:891 builtin/merge.c:252
+#: builtin/pull.c:141 builtin/pull.c:200 builtin/pull.c:217
+#: builtin/rebase.c:1329 builtin/repack.c:317 builtin/repack.c:321
+#: builtin/repack.c:323 builtin/show-branch.c:650 builtin/show-ref.c:172
+#: builtin/tag.c:404 parse-options.h:154 parse-options.h:175
+#: parse-options.h:316
 msgid "n"
 msgstr "n"
 
-#: builtin/am.c:2209 builtin/branch.c:661 builtin/for-each-ref.c:38
-#: builtin/replace.c:555 builtin/tag.c:437 builtin/verify-tag.c:38
+#: builtin/am.c:2262 builtin/branch.c:659 builtin/for-each-ref.c:38
+#: builtin/replace.c:556 builtin/tag.c:438 builtin/verify-tag.c:38
+#: bugreport.c:131
 msgid "format"
 msgstr "格式"
 
-#: builtin/am.c:2210
+#: builtin/am.c:2263
 msgid "format the patch(es) are in"
 msgstr "补丁的格式"
 
-#: builtin/am.c:2216
+#: builtin/am.c:2269
 msgid "override error message when patch failure occurs"
 msgstr "打补丁失败时显示的错误信息"
 
-#: builtin/am.c:2218
+#: builtin/am.c:2271
 msgid "continue applying patches after resolving a conflict"
 msgstr "冲突解决后继续应用补丁"
 
-#: builtin/am.c:2221
+#: builtin/am.c:2274
 msgid "synonyms for --continue"
 msgstr "和 --continue 同义"
 
-#: builtin/am.c:2224
+#: builtin/am.c:2277
 msgid "skip the current patch"
 msgstr "跳过当前补丁"
 
-#: builtin/am.c:2227
+#: builtin/am.c:2280
 msgid "restore the original branch and abort the patching operation."
 msgstr "恢复原始分支并终止打补丁操作。"
 
-#: builtin/am.c:2230
+#: builtin/am.c:2283
 msgid "abort the patching operation but keep HEAD where it is."
 msgstr "终止补丁操作但保持 HEAD 不变。"
 
@@ -5540,29 +5547,29 @@
 msgid "show the patch being applied."
 msgstr "显示正在应用的补丁。"
 
-#: builtin/am.c:2237
+#: builtin/am.c:2292
 msgid "lie about committer date"
 msgstr "将作者日期作为提交日期"
 
-#: builtin/am.c:2239
+#: builtin/am.c:2294
 msgid "use current timestamp for author date"
 msgstr "用当前时间作为作者日期"
 
-#: builtin/am.c:2241 builtin/commit-tree.c:120 builtin/commit.c:1511
-#: builtin/merge.c:286 builtin/pull.c:194 builtin/rebase.c:490
-#: builtin/rebase.c:1483 builtin/revert.c:117 builtin/tag.c:418
+#: builtin/am.c:2296 builtin/commit-tree.c:120 builtin/commit.c:1517
+#: builtin/merge.c:289 builtin/pull.c:175 builtin/rebase.c:524
+#: builtin/rebase.c:1380 builtin/revert.c:117 builtin/tag.c:419
 msgid "key-id"
 msgstr "key-id"
 
-#: builtin/am.c:2242 builtin/rebase.c:491 builtin/rebase.c:1484
+#: builtin/am.c:2297 builtin/rebase.c:525 builtin/rebase.c:1381
 msgid "GPG-sign commits"
 msgstr "使用 GPG 签名提交"
 
-#: builtin/am.c:2245
+#: builtin/am.c:2300
 msgid "(internal use for git-rebase)"
 msgstr "（内部使用，用于 git-rebase）"
 
-#: builtin/am.c:2263
+#: builtin/am.c:2318
 msgid ""
 "The -b/--binary option has been a no-op for long time, and\n"
 "it will be removed. Please do not use it anymore."
@@ -5570,16 +5577,16 @@
 "参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
 "请不要再使用它了。"
 
-#: builtin/am.c:2270
+#: builtin/am.c:2325
 msgid "failed to read the index"
 msgstr "读取索引失败"
 
-#: builtin/am.c:2285
+#: builtin/am.c:2340
 #, c-format
 msgid "previous rebase directory %s still exists but mbox given."
 msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
 
-#: builtin/am.c:2309
+#: builtin/am.c:2364
 #, c-format
 msgid ""
 "Stray %s directory found.\n"
@@ -5588,7 +5595,7 @@
 "发现了错误的 %s 目录。\n"
 "使用 \"git am --abort\" 删除它。"
 
-#: builtin/am.c:2315
+#: builtin/am.c:2370
 msgid "Resolve operation not in progress, we are not resuming."
 msgstr "解决操作未进行，我们不会继续。"
 
@@ -5661,31 +5668,31 @@
 msgid "could not open the file BISECT_TERMS"
 msgstr "不能打开文件 BISECT_TERMS"
 
-#: builtin/bisect--helper.c:630
+#: builtin/bisect--helper.c:633
 msgid "perform 'git bisect next'"
 msgstr "执行 'git bisect next'"
 
-#: builtin/bisect--helper.c:632
+#: builtin/bisect--helper.c:635
 msgid "write the terms to .git/BISECT_TERMS"
 msgstr "将术语写入 .git/BISECT_TERMS"
 
-#: builtin/bisect--helper.c:634
+#: builtin/bisect--helper.c:637
 msgid "cleanup the bisection state"
 msgstr "清除二分查找状态"
 
-#: builtin/bisect--helper.c:636
+#: builtin/bisect--helper.c:639
 msgid "check for expected revs"
 msgstr "检查预期的版本"
 
-#: builtin/bisect--helper.c:650
+#: builtin/bisect--helper.c:653
 msgid "update BISECT_HEAD instead of checking out the current commit"
 msgstr "更新 BISECT_HEAD 而非检出当前提交"
 
-#: builtin/bisect--helper.c:669
+#: builtin/bisect--helper.c:673
 msgid "--write-terms requires two arguments"
 msgstr "--write-terms 需要两个参数"
 
-#: builtin/bisect--helper.c:673
+#: builtin/bisect--helper.c:677
 msgid "--bisect-clean-state requires no arguments"
 msgstr "--bisect-clean-state 不带参数"
 
@@ -5761,43 +5768,43 @@
 msgid "Ignore whitespace differences"
 msgstr "忽略空白差异"
 
-#: builtin/blame.c:870
+#: builtin/blame.c:817
 msgid "Use an experimental heuristic to improve diffs"
 msgstr "使用一个试验性的启发式算法改进差异显示"
 
-#: builtin/blame.c:872
+#: builtin/blame.c:864
 msgid "Spend extra cycles to find better match"
 msgstr "花费额外的循环来找到更好的匹配"
 
-#: builtin/blame.c:873
+#: builtin/blame.c:865
 msgid "Use revisions from <file> instead of calling git-rev-list"
 msgstr "使用来自 <文件> 的修订集而不是调用 git-rev-list"
 
-#: builtin/blame.c:874
+#: builtin/blame.c:866
 msgid "Use <file>'s contents as the final image"
 msgstr "使用 <文件> 的内容作为最终的图片"
 
-#: builtin/blame.c:875 builtin/blame.c:876
+#: builtin/blame.c:867 builtin/blame.c:868
 msgid "score"
 msgstr "得分"
 
-#: builtin/blame.c:875
+#: builtin/blame.c:867
 msgid "Find line copies within and across files"
 msgstr "找到文件内及跨文件的行拷贝"
 
-#: builtin/blame.c:876
+#: builtin/blame.c:868
 msgid "Find line movements within and across files"
 msgstr "找到文件内及跨文件的行移动"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:869
 msgid "n,m"
 msgstr "n,m"
 
-#: builtin/blame.c:877
+#: builtin/blame.c:869
 msgid "Process only line range n,m, counting from 1"
 msgstr "只处理行范围在 n 和 m 之间的，从 1 开始"
 
-#: builtin/blame.c:929
+#: builtin/blame.c:921
 msgid "--progress can't be used with --incremental or porcelain formats"
 msgstr "--progress 不能和 --incremental 或 --porcelain 同时使用"
 
@@ -5809,7 +5816,7 @@
 #. your language may need more or fewer display
 #. columns.
 #. 
-#: builtin/blame.c:980
+#: builtin/blame.c:972
 msgid "4 years, 11 months ago"
 msgstr "4 年 11 个月前"
 
@@ -6021,7 +6028,7 @@
 msgid "do not use"
 msgstr "不要使用"
 
-#: builtin/branch.c:626 builtin/rebase.c:486
+#: builtin/branch.c:626 builtin/rebase.c:520
 msgid "upstream"
 msgstr "上游"
 
@@ -6029,7 +6036,7 @@
 msgid "change the upstream info"
 msgstr "改变上游信息"
 
-#: builtin/branch.c:627
+#: builtin/branch.c:603
 msgid "Unset the upstream info"
 msgstr "取消上游信息的设置"
 
@@ -6117,122 +6124,122 @@
 msgid "field name to sort on"
 msgstr "排序的字段名"
 
-#: builtin/branch.c:657 builtin/for-each-ref.c:42 builtin/notes.c:415
+#: builtin/branch.c:656 builtin/for-each-ref.c:42 builtin/notes.c:415
 #: builtin/notes.c:418 builtin/notes.c:581 builtin/notes.c:584
-#: builtin/tag.c:433
+#: builtin/tag.c:434
 msgid "object"
 msgstr "对象"
 
-#: builtin/branch.c:658
+#: builtin/branch.c:657
 msgid "print only branches of the object"
 msgstr "只打印指向该对象的分支"
 
-#: builtin/branch.c:660 builtin/for-each-ref.c:48 builtin/tag.c:440
+#: builtin/branch.c:658 builtin/for-each-ref.c:48 builtin/tag.c:441
 msgid "sorting and filtering are case insensitive"
 msgstr "排序和过滤属于大小写不敏感"
 
-#: builtin/branch.c:661 builtin/for-each-ref.c:38 builtin/tag.c:438
+#: builtin/branch.c:659 builtin/for-each-ref.c:38 builtin/tag.c:439
 #: builtin/verify-tag.c:38
 msgid "format to use for the output"
 msgstr "输出格式"
 
-#: builtin/branch.c:684 builtin/clone.c:760
+#: builtin/branch.c:682 builtin/clone.c:789
 msgid "HEAD not found below refs/heads!"
 msgstr "HEAD 没有位于 /refs/heads 之下！"
 
-#: builtin/branch.c:708
+#: builtin/branch.c:706
 msgid "--column and --verbose are incompatible"
 msgstr "--column 和 --verbose 不兼容"
 
-#: builtin/branch.c:723 builtin/branch.c:777 builtin/branch.c:786
+#: builtin/branch.c:721 builtin/branch.c:775 builtin/branch.c:784
 msgid "branch name required"
 msgstr "必须提供分支名"
 
-#: builtin/branch.c:753
+#: builtin/branch.c:751
 msgid "Cannot give description to detached HEAD"
 msgstr "不能向分离头指针提供描述"
 
-#: builtin/branch.c:758
+#: builtin/branch.c:756
 msgid "cannot edit description of more than one branch"
 msgstr "不能为一个以上的分支编辑描述"
 
-#: builtin/branch.c:765
+#: builtin/branch.c:763
 #, c-format
 msgid "No commit on branch '%s' yet."
 msgstr "分支 '%s' 尚无提交。"
 
-#: builtin/branch.c:768
+#: builtin/branch.c:766
 #, c-format
 msgid "No branch named '%s'."
 msgstr "没有分支 '%s'。"
 
-#: builtin/branch.c:783
+#: builtin/branch.c:781
 msgid "too many branches for a copy operation"
 msgstr "为拷贝操作提供了太多的分支名"
 
-#: builtin/branch.c:792
+#: builtin/branch.c:790
 msgid "too many arguments for a rename operation"
 msgstr "为重命名操作提供了太多的参数"
 
-#: builtin/branch.c:797
+#: builtin/branch.c:795
 msgid "too many arguments to set new upstream"
 msgstr "为设置新上游提供了太多的参数"
 
-#: builtin/branch.c:801
+#: builtin/branch.c:799
 #, c-format
 msgid ""
 "could not set upstream of HEAD to %s when it does not point to any branch."
 msgstr "无法设置 HEAD 的上游为 %s，因为 HEAD 没有指向任何分支。"
 
-#: builtin/branch.c:804 builtin/branch.c:827
+#: builtin/branch.c:802 builtin/branch.c:825
 #, c-format
 msgid "no such branch '%s'"
 msgstr "没有此分支 '%s'"
 
-#: builtin/branch.c:808
+#: builtin/branch.c:806
 #, c-format
 msgid "branch '%s' does not exist"
 msgstr "分支 '%s' 不存在"
 
-#: builtin/branch.c:821
+#: builtin/branch.c:819
 msgid "too many arguments to unset upstream"
 msgstr "为取消上游设置操作提供了太多的参数"
 
-#: builtin/branch.c:825
+#: builtin/branch.c:823
 msgid ""
 "could not unset upstream of HEAD when it does not point to any branch."
 msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
 
-#: builtin/branch.c:831
+#: builtin/branch.c:829
 #, c-format
 msgid "Branch '%s' has no upstream information"
 msgstr "分支 '%s' 没有上游信息"
 
-#: builtin/branch.c:810
+#: builtin/branch.c:812
 msgid ""
 "-a and -r options to 'git branch' do not make sense with a branch name"
 msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
 
-#: builtin/branch.c:845
+#: builtin/branch.c:843
 msgid ""
 "the '--set-upstream' option is no longer supported. Please use '--track' or "
 "'--set-upstream-to' instead."
 msgstr "不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
 
-#: builtin/bundle.c:45
+#: builtin/bundle.c:119
 #, c-format
 msgid "%s is okay\n"
 msgstr "%s 可以\n"
 
-#: builtin/bundle.c:58
+#: builtin/bundle.c:93
 msgid "Need a repository to create a bundle."
 msgstr "需要一个仓库来创建包。"
 
-#: builtin/bundle.c:62
+#: builtin/bundle.c:160
 msgid "Need a repository to unbundle."
 msgstr "需要一个仓库来解包。"
 
-#: builtin/cat-file.c:595
+#: builtin/cat-file.c:598
 msgid ""
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -6240,7 +6247,7 @@
 "git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
 "p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
 
-#: builtin/cat-file.c:596
+#: builtin/cat-file.c:599
 msgid ""
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
@@ -6248,63 +6255,63 @@
 "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
 "filters]"
 
-#: builtin/cat-file.c:635
+#: builtin/cat-file.c:638
 msgid "<type> can be one of: blob, tree, commit, tag"
 msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
 
-#: builtin/cat-file.c:636
+#: builtin/cat-file.c:639
 msgid "show object type"
 msgstr "显示对象类型"
 
-#: builtin/cat-file.c:637
+#: builtin/cat-file.c:640
 msgid "show object size"
 msgstr "显示对象大小"
 
-#: builtin/cat-file.c:639
+#: builtin/cat-file.c:642
 msgid "exit with zero when there's no error"
 msgstr "当没有错误时退出并返回零"
 
-#: builtin/cat-file.c:640
+#: builtin/cat-file.c:643
 msgid "pretty-print object's content"
 msgstr "美观地打印对象的内容"
 
-#: builtin/cat-file.c:642
+#: builtin/cat-file.c:645
 msgid "for blob objects, run textconv on object's content"
 msgstr "对于数据对象，对其内容做文本转换"
 
-#: builtin/cat-file.c:644
+#: builtin/cat-file.c:647
 msgid "for blob objects, run filters on object's content"
 msgstr "对于数据对象，对其内容做过滤"
 
-#: builtin/cat-file.c:645 git-submodule.sh:936
+#: builtin/cat-file.c:648 git-submodule.sh:984
 msgid "blob"
 msgstr "数据对象"
 
-#: builtin/cat-file.c:646
+#: builtin/cat-file.c:649
 msgid "use a specific path for --textconv/--filters"
 msgstr "对于 --textconv/--filters 使用一个特定的路径"
 
-#: builtin/cat-file.c:648
+#: builtin/cat-file.c:651
 msgid "allow -s and -t to work with broken/corrupt objects"
 msgstr "允许 -s 和 -t 对损坏的对象生效"
 
-#: builtin/cat-file.c:649
+#: builtin/cat-file.c:652
 msgid "buffer --batch output"
 msgstr "缓冲 --batch 的输出"
 
-#: builtin/cat-file.c:651
+#: builtin/cat-file.c:654
 msgid "show info and content of objects fed from the standard input"
 msgstr "显示从标准输入提供的对象的信息和内容"
 
-#: builtin/cat-file.c:655
+#: builtin/cat-file.c:658
 msgid "show info about objects fed from the standard input"
 msgstr "显示从标准输入提供的对象的信息"
 
-#: builtin/cat-file.c:659
+#: builtin/cat-file.c:662
 msgid "follow in-tree symlinks (used with --batch or --batch-check)"
 msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
 
-#: builtin/cat-file.c:661
+#: builtin/cat-file.c:664
 msgid "show all objects with --batch or --batch-check"
 msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
 
@@ -6332,8 +6339,8 @@
 msgid "terminate input and output records by a NUL character"
 msgstr "输入和输出的记录使用 NUL 字符终结"
 
-#: builtin/check-ignore.c:21 builtin/checkout.c:1433 builtin/gc.c:537
-#: builtin/worktree.c:506
+#: builtin/check-ignore.c:21 builtin/checkout.c:1488 builtin/gc.c:537
+#: builtin/worktree.c:502
 msgid "suppress progress reporting"
 msgstr "不显示进度报告"
 
@@ -6345,27 +6352,27 @@
 msgid "ignore index when checking"
 msgstr "检查时忽略索引"
 
-#: builtin/check-ignore.c:160
+#: builtin/check-ignore.c:163
 msgid "cannot specify pathnames with --stdin"
 msgstr "不能同时指定路径及 --stdin 参数"
 
-#: builtin/check-ignore.c:163
+#: builtin/check-ignore.c:166
 msgid "-z only makes sense with --stdin"
 msgstr "-z 需要和 --stdin 参数共用才有意义"
 
-#: builtin/check-ignore.c:165
+#: builtin/check-ignore.c:168
 msgid "no path specified"
 msgstr "未指定路径"
 
-#: builtin/check-ignore.c:169
+#: builtin/check-ignore.c:172
 msgid "--quiet is only valid with a single pathname"
 msgstr "参数 --quiet 只在提供一个路径名时有效"
 
-#: builtin/check-ignore.c:171
+#: builtin/check-ignore.c:174
 msgid "cannot have both --quiet and --verbose"
 msgstr "不能同时提供 --quiet 和 --verbose 参数"
 
-#: builtin/check-ignore.c:174
+#: builtin/check-ignore.c:177
 msgid "--non-matching is only valid with --verbose"
 msgstr "--non-matching 选项只在使用 --verbose 时有效"
 
@@ -6423,9 +6430,9 @@
 msgstr "将内容写入临时文件"
 
 #: builtin/checkout-index.c:178 builtin/column.c:31
-#: builtin/submodule--helper.c:1373 builtin/submodule--helper.c:1376
-#: builtin/submodule--helper.c:1384 builtin/submodule--helper.c:1857
-#: builtin/worktree.c:679
+#: builtin/submodule--helper.c:1400 builtin/submodule--helper.c:1403
+#: builtin/submodule--helper.c:1411 builtin/submodule--helper.c:1909
+#: builtin/worktree.c:675
 msgid "string"
 msgstr "字符串"
 
@@ -6445,106 +6452,106 @@
 msgid "git checkout [<options>] [<branch>] -- <file>..."
 msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
 
-#: builtin/checkout.c:173 builtin/checkout.c:212
+#: builtin/checkout.c:188 builtin/checkout.c:227
 #, c-format
 msgid "path '%s' does not have our version"
 msgstr "路径 '%s' 没有我们的版本"
 
-#: builtin/checkout.c:175 builtin/checkout.c:214
+#: builtin/checkout.c:190 builtin/checkout.c:229
 #, c-format
 msgid "path '%s' does not have their version"
 msgstr "路径 '%s' 没有他们的版本"
 
-#: builtin/checkout.c:191
+#: builtin/checkout.c:206
 #, c-format
 msgid "path '%s' does not have all necessary versions"
 msgstr "路径 '%s' 没有全部必需的版本"
 
-#: builtin/checkout.c:241
+#: builtin/checkout.c:256
 #, c-format
 msgid "path '%s' does not have necessary versions"
 msgstr "路径 '%s' 没有必需的版本"
 
-#: builtin/checkout.c:259
+#: builtin/checkout.c:274
 #, c-format
 msgid "path '%s': cannot merge"
 msgstr "path '%s'：无法合并"
 
-#: builtin/checkout.c:275
+#: builtin/checkout.c:290
 #, c-format
 msgid "Unable to add merge result for '%s'"
 msgstr "无法为 '%s' 添加合并结果"
 
-#: builtin/checkout.c:410 builtin/checkout.c:413 builtin/checkout.c:416
-#: builtin/checkout.c:420
+#: builtin/checkout.c:430 builtin/checkout.c:433 builtin/checkout.c:436
+#: builtin/checkout.c:440
 #, c-format
 msgid "'%s' cannot be used with updating paths"
 msgstr "'%s' 不能在更新路径时使用"
 
-#: builtin/checkout.c:423 builtin/checkout.c:426
+#: builtin/checkout.c:443 builtin/checkout.c:446
 #, c-format
 msgid "'%s' cannot be used with %s"
 msgstr "'%s' 不能和 %s 同时使用"
 
-#: builtin/checkout.c:430
+#: builtin/checkout.c:450
 #, c-format
 msgid "Cannot update paths and switch to branch '%s' at the same time."
 msgstr "不能同时更新路径并切换到分支'%s'。"
 
-#: builtin/checkout.c:507 builtin/checkout.c:514
+#: builtin/checkout.c:527 builtin/checkout.c:534
 #, c-format
 msgid "path '%s' is unmerged"
 msgstr "路径 '%s' 未合并"
 
-#: builtin/checkout.c:680
+#: builtin/checkout.c:704
 msgid "you need to resolve your current index first"
 msgstr "您需要先解决当前索引的冲突"
 
-#: builtin/checkout.c:833
+#: builtin/checkout.c:861
 #, c-format
 msgid "Can not do reflog for '%s': %s\n"
 msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
 
-#: builtin/checkout.c:875
+#: builtin/checkout.c:903
 msgid "HEAD is now at"
 msgstr "HEAD 目前位于"
 
-#: builtin/checkout.c:879 builtin/clone.c:713
+#: builtin/checkout.c:907 builtin/clone.c:720
 msgid "unable to update HEAD"
 msgstr "不能更新 HEAD"
 
-#: builtin/checkout.c:883
+#: builtin/checkout.c:911
 #, c-format
 msgid "Reset branch '%s'\n"
 msgstr "重置分支 '%s'\n"
 
-#: builtin/checkout.c:886
+#: builtin/checkout.c:914
 #, c-format
 msgid "Already on '%s'\n"
 msgstr "已经位于 '%s'\n"
 
-#: builtin/checkout.c:890
+#: builtin/checkout.c:918
 #, c-format
 msgid "Switched to and reset branch '%s'\n"
 msgstr "切换并重置分支 '%s'\n"
 
-#: builtin/checkout.c:892 builtin/checkout.c:1289
+#: builtin/checkout.c:920 builtin/checkout.c:1344
 #, c-format
 msgid "Switched to a new branch '%s'\n"
 msgstr "切换到一个新分支 '%s'\n"
 
-#: builtin/checkout.c:894
+#: builtin/checkout.c:922
 #, c-format
 msgid "Switched to branch '%s'\n"
 msgstr "切换到分支 '%s'\n"
 
 #  译者：注意保持前导空格
-#: builtin/checkout.c:945
+#: builtin/checkout.c:973
 #, c-format
 msgid " ... and %d more.\n"
 msgstr " ... 及其它 %d 个。\n"
 
-#: builtin/checkout.c:951
+#: builtin/checkout.c:979
 #, c-format
 msgid ""
 "Warning: you are leaving %d commit behind, not connected to\n"
@@ -6561,7 +6568,7 @@
 "\n"
 "%s\n"
 
-#: builtin/checkout.c:970
+#: builtin/checkout.c:998
 #, c-format
 msgid ""
 "If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6582,196 +6589,197 @@
 " git branch <新分支名> %s\n"
 "\n"
 
-#: builtin/checkout.c:1005
+#: builtin/checkout.c:1033
 msgid "internal error in revision walk"
 msgstr "在版本遍历时遇到内部错误"
 
-#: builtin/checkout.c:1009
+#: builtin/checkout.c:1037
 msgid "Previous HEAD position was"
 msgstr "之前的 HEAD 位置是"
 
-#: builtin/checkout.c:1049 builtin/checkout.c:1284
+#: builtin/checkout.c:1077 builtin/checkout.c:1339
 msgid "You are on a branch yet to be born"
 msgstr "您位于一个尚未初始化的分支"
 
-#: builtin/checkout.c:1193
+#: builtin/checkout.c:1252
 #, c-format
 msgid "only one reference expected, %d given."
 msgstr "应只有一个引用，却给出了 %d 个"
 
-#: builtin/checkout.c:1243 builtin/worktree.c:290 builtin/worktree.c:455
+#: builtin/checkout.c:1298 builtin/worktree.c:283 builtin/worktree.c:451
 #, c-format
 msgid "invalid reference: %s"
 msgstr "无效引用：%s"
 
-#: builtin/checkout.c:1256 builtin/checkout.c:1618
+#: builtin/checkout.c:1311 builtin/checkout.c:1677
 #, c-format
 msgid "reference is not a tree: %s"
 msgstr "引用不是一个树：%s"
 
-#: builtin/checkout.c:1352
+#: builtin/checkout.c:1407
 msgid "paths cannot be used with switching branches"
 msgstr "路径不能和切换分支同时使用"
 
-#: builtin/checkout.c:1355 builtin/checkout.c:1359 builtin/checkout.c:1363
+#: builtin/checkout.c:1410 builtin/checkout.c:1414 builtin/checkout.c:1418
 #, c-format
 msgid "'%s' cannot be used with switching branches"
 msgstr "'%s' 不能和切换分支同时使用"
 
-#: builtin/checkout.c:1367 builtin/checkout.c:1370 builtin/checkout.c:1373
-#: builtin/checkout.c:1378 builtin/checkout.c:1383
+#: builtin/checkout.c:1422 builtin/checkout.c:1425 builtin/checkout.c:1428
+#: builtin/checkout.c:1433 builtin/checkout.c:1438
 #, c-format
 msgid "'%s' cannot be used with '%s'"
 msgstr "'%s' 不能和 '%s' 同时使用"
 
-#: builtin/checkout.c:1388
+#: builtin/checkout.c:1443
 #, c-format
 msgid "Cannot switch branch to a non-commit '%s'"
 msgstr "不能切换分支到一个非提交 '%s'"
 
-#: builtin/checkout.c:1691 builtin/checkout.c:1693 builtin/checkout.c:1742
-#: builtin/checkout.c:1744 builtin/clone.c:120 builtin/remote.c:169
-#: builtin/remote.c:171 builtin/worktree.c:499 builtin/worktree.c:501
+#: builtin/checkout.c:1751 builtin/checkout.c:1753 builtin/checkout.c:1802
+#: builtin/checkout.c:1804 builtin/clone.c:121 builtin/remote.c:170
+#: builtin/remote.c:172 builtin/worktree.c:495 builtin/worktree.c:497
 msgid "branch"
 msgstr "分支"
 
-#: builtin/checkout.c:1692
+#: builtin/checkout.c:1752
 msgid "create and checkout a new branch"
 msgstr "创建并检出一个新的分支"
 
-#: builtin/checkout.c:1694
+#: builtin/checkout.c:1754
 msgid "create/reset and checkout a branch"
 msgstr "创建/重置并检出一个分支"
 
-#: builtin/checkout.c:1695
+#: builtin/checkout.c:1755
 msgid "create reflog for new branch"
 msgstr "为新的分支创建引用日志"
 
-#: builtin/checkout.c:1452 builtin/worktree.c:503
+#: builtin/checkout.c:1507 builtin/worktree.c:499
 msgid "detach HEAD at named commit"
 msgstr "HEAD 从指定的提交分离"
 
-#: builtin/checkout.c:1453
+#: builtin/checkout.c:1508
 msgid "set upstream info for new branch"
 msgstr "为新的分支设置上游信息"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1512
 msgid "new-branch"
 msgstr "新分支"
 
-#: builtin/checkout.c:1457
+#: builtin/checkout.c:1512
 msgid "new unparented branch"
 msgstr "新的没有父提交的分支"
 
-#: builtin/checkout.c:1475
+#: builtin/checkout.c:1530
 msgid "checkout our version for unmerged files"
 msgstr "对尚未合并的文件检出我们的版本"
 
-#: builtin/checkout.c:1478
+#: builtin/checkout.c:1533
 msgid "checkout their version for unmerged files"
 msgstr "对尚未合并的文件检出他们的版本"
 
-#: builtin/checkout.c:1455
+#: builtin/checkout.c:1510
 msgid "force checkout (throw away local modifications)"
 msgstr "强制检出（丢弃本地修改）"
 
-#: builtin/checkout.c:1438
+#: builtin/checkout.c:1493
 msgid "perform a 3-way merge with the new branch"
 msgstr "和新的分支执行三方合并"
 
-#: builtin/checkout.c:1459 builtin/merge.c:288
+#: builtin/checkout.c:1514 builtin/merge.c:292
 msgid "update ignored files (default)"
 msgstr "更新忽略的文件（默认）"
 
-#: builtin/checkout.c:1439 builtin/log.c:1618 parse-options.h:318
+#: builtin/checkout.c:1494 builtin/log.c:1709 parse-options.h:322
 msgid "style"
 msgstr "风格"
 
-#: builtin/checkout.c:1440
+#: builtin/checkout.c:1495
 msgid "conflict style (merge or diff3)"
 msgstr "冲突输出风格（merge 或 diff3）"
 
-#: builtin/checkout.c:1482
+#: builtin/checkout.c:1537
 msgid "do not limit pathspecs to sparse entries only"
 msgstr "对路径不做稀疏检出的限制"
 
-#: builtin/checkout.c:1132
+#: builtin/checkout.c:1262
 msgid "second guess 'git checkout <no-such-branch>'"
 msgstr "二次猜测'git checkout <无此分支>'"
 
-#: builtin/checkout.c:1462
+#: builtin/checkout.c:1517
 msgid "do not check if another worktree is holding the given ref"
 msgstr "不检查指定的引用是否被其他工作区所占用"
 
-#: builtin/checkout.c:1437 builtin/clone.c:90 builtin/commit-graph.c:59
-#: builtin/commit-graph.c:180 builtin/fetch.c:166 builtin/merge.c:285
-#: builtin/pull.c:138 builtin/push.c:562 builtin/send-pack.c:174
+#: builtin/checkout.c:1492 builtin/clone.c:91 builtin/commit-graph.c:80
+#: builtin/commit-graph.c:164 builtin/fetch.c:168 builtin/merge.c:288
+#: builtin/multi-pack-index.c:27 builtin/pull.c:119 builtin/push.c:561
+#: builtin/send-pack.c:173
 msgid "force progress reporting"
 msgstr "强制显示进度报告"
 
-#: builtin/checkout.c:1533
+#: builtin/checkout.c:1565
 msgid "-b, -B and --orphan are mutually exclusive"
 msgstr "-b、-B 和 --orphan 是互斥的"
 
-#: builtin/checkout.c:1573
+#: builtin/checkout.c:1633
 msgid "--track needs a branch name"
 msgstr "--track 需要一个分支名"
 
-#: builtin/checkout.c:1190
+#: builtin/checkout.c:1213
 msgid "Missing branch name; try -b"
 msgstr "缺少分支名；尝试 -b"
 
-#: builtin/checkout.c:1631
+#: builtin/checkout.c:1686
 msgid "invalid path specification"
 msgstr "无效的路径规格"
 
-#: builtin/checkout.c:1638
+#: builtin/checkout.c:1693
 #, c-format
 msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
 msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
 
-#: builtin/checkout.c:1642
+#: builtin/checkout.c:1697
 #, c-format
 msgid "git checkout: --detach does not take a path argument '%s'"
 msgstr "git checkout：--detach 不能接收路径参数 '%s'"
 
-#: builtin/checkout.c:1646
+#: builtin/checkout.c:1720
 msgid ""
 "git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
 "checking out of the index."
 msgstr "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。"
 
-#: builtin/clean.c:28
+#: builtin/clean.c:29
 msgid ""
 "git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
 msgstr "git clean [-d] [-f] [-i] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..."
 
-#: builtin/clean.c:32
+#: builtin/clean.c:33
 #, c-format
 msgid "Removing %s\n"
 msgstr "正删除 %s\n"
 
-#: builtin/clean.c:33
+#: builtin/clean.c:34
 #, c-format
 msgid "Would remove %s\n"
 msgstr "将删除 %s\n"
 
-#: builtin/clean.c:34
+#: builtin/clean.c:35
 #, c-format
 msgid "Skipping repository %s\n"
 msgstr "忽略仓库 %s\n"
 
-#: builtin/clean.c:35
+#: builtin/clean.c:36
 #, c-format
 msgid "Would skip repository %s\n"
 msgstr "将忽略仓库 %s\n"
 
-#: builtin/clean.c:36
+#: builtin/clean.c:37
 #, c-format
 msgid "failed to remove %s"
 msgstr "删除 %s 失败"
 
-#: builtin/clean.c:301 git-add--interactive.perl:593
+#: builtin/clean.c:302 git-add--interactive.perl:595
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6784,7 +6792,7 @@
 "foo        - 通过唯一前缀选择一个选项\n"
 "           - （空）什么也不选择\n"
 
-#: builtin/clean.c:305 git-add--interactive.perl:602
+#: builtin/clean.c:306 git-add--interactive.perl:604
 #, c-format
 msgid ""
 "Prompt help:\n"
@@ -6805,38 +6813,38 @@
 "*          - 选择所有选项\n"
 "           - （空）结束选择\n"
 
-#: builtin/clean.c:521 git-add--interactive.perl:568
-#: git-add--interactive.perl:573
+#: builtin/clean.c:521 git-add--interactive.perl:570
+#: git-add--interactive.perl:575
 #, c-format, perl-format
 msgid "Huh (%s)?\n"
 msgstr "嗯（%s）？\n"
 
-#: builtin/clean.c:663
+#: builtin/clean.c:661
 #, c-format
 msgid "Input ignore patterns>> "
 msgstr "输入模版以排除条目>> "
 
-#: builtin/clean.c:700
+#: builtin/clean.c:696
 #, c-format
 msgid "WARNING: Cannot find items matched by: %s"
 msgstr "警告：无法找到和 %s 匹配的条目"
 
-#: builtin/clean.c:721
+#: builtin/clean.c:717
 msgid "Select items to delete"
 msgstr "选择要删除的条目"
 
 #. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:762
+#: builtin/clean.c:758
 #, c-format
 msgid "Remove %s [y/N]? "
 msgstr "删除 %s [y/N]？ "
 
-#: builtin/clean.c:787 git-add--interactive.perl:1763
+#: add-interactive.c:1157 builtin/clean.c:781 git-add--interactive.perl:1765
 #, c-format
 msgid "Bye.\n"
 msgstr "再见。\n"
 
-#: builtin/clean.c:795
+#: builtin/clean.c:789
 msgid ""
 "clean               - start cleaning\n"
 "filter by pattern   - exclude items from deletion\n"
@@ -6854,69 +6862,69 @@
 "help                - 显示本帮助\n"
 "?                   - 显示如何在提示符下选择的帮助"
 
-#: builtin/clean.c:822 git-add--interactive.perl:1849
+#: add-interactive.c:1083 builtin/clean.c:816 git-add--interactive.perl:1851
 msgid "*** Commands ***"
 msgstr "*** 命令 ***"
 
-#: builtin/clean.c:823 git-add--interactive.perl:1846
+#: add-interactive.c:1084 builtin/clean.c:817 git-add--interactive.perl:1848
 msgid "What now"
 msgstr "请选择"
 
-#: builtin/clean.c:831
+#: builtin/clean.c:825
 msgid "Would remove the following item:"
 msgid_plural "Would remove the following items:"
 msgstr[0] "将删除如下条目："
 
-#: builtin/clean.c:847
+#: builtin/clean.c:841
 msgid "No more files to clean, exiting."
 msgstr "没有要清理的文件，退出。"
 
-#: builtin/clean.c:909
+#: builtin/clean.c:903
 msgid "do not print names of files removed"
 msgstr "不打印删除文件的名称"
 
-#: builtin/clean.c:911
+#: builtin/clean.c:905
 msgid "force"
 msgstr "强制"
 
-#: builtin/clean.c:912
+#: builtin/clean.c:906
 msgid "interactive cleaning"
 msgstr "交互式清除"
 
-#: builtin/clean.c:914
+#: builtin/clean.c:908
 msgid "remove whole directories"
 msgstr "删除整个目录"
 
-#: builtin/clean.c:915 builtin/describe.c:548 builtin/describe.c:550
-#: builtin/grep.c:901 builtin/log.c:176 builtin/log.c:178
-#: builtin/ls-files.c:557 builtin/name-rev.c:417 builtin/name-rev.c:419
+#: builtin/clean.c:909 builtin/describe.c:565 builtin/describe.c:567
+#: builtin/grep.c:909 builtin/log.c:182 builtin/log.c:184
+#: builtin/ls-files.c:558 builtin/name-rev.c:526 builtin/name-rev.c:528
 #: builtin/show-ref.c:179
 msgid "pattern"
 msgstr "模式"
 
-#: builtin/clean.c:916
+#: builtin/clean.c:910
 msgid "add <pattern> to ignore rules"
 msgstr "添加 <模式> 到忽略规则"
 
-#: builtin/clean.c:917
+#: builtin/clean.c:911
 msgid "remove ignored files, too"
 msgstr "也删除忽略的文件"
 
-#: builtin/clean.c:919
+#: builtin/clean.c:913
 msgid "remove only ignored files"
 msgstr "只删除忽略的文件"
 
-#: builtin/clean.c:937
+#: builtin/clean.c:931
 msgid "-x and -X cannot be used together"
 msgstr "-x 和 -X 不能同时使用"
 
-#: builtin/clean.c:941
+#: builtin/clean.c:935
 msgid ""
 "clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
 "clean"
 msgstr "clean.requireForce 设置为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
 
-#: builtin/clean.c:944
+#: builtin/clean.c:938
 msgid ""
 "clean.requireForce defaults to true and neither -i, -n, nor -f given; "
 "refusing to clean"
@@ -6926,27 +6934,27 @@
 msgid "git clone [<options>] [--] <repo> [<dir>]"
 msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
 
-#: builtin/clone.c:92
+#: builtin/clone.c:93
 msgid "don't create a checkout"
 msgstr "不创建一个检出"
 
-#: builtin/clone.c:93 builtin/clone.c:95 builtin/init-db.c:489
+#: builtin/clone.c:94 builtin/clone.c:96 builtin/init-db.c:536
 msgid "create a bare repository"
 msgstr "创建一个纯仓库"
 
-#: builtin/clone.c:97
+#: builtin/clone.c:98
 msgid "create a mirror repository (implies bare)"
 msgstr "创建一个镜像仓库（也是纯仓库）"
 
-#: builtin/clone.c:99
+#: builtin/clone.c:100
 msgid "to clone from a local repository"
 msgstr "从本地仓库克隆"
 
-#: builtin/clone.c:101
+#: builtin/clone.c:102
 msgid "don't use local hardlinks, always copy"
 msgstr "不使用本地硬链接，始终复制"
 
-#: builtin/clone.c:103
+#: builtin/clone.c:104
 msgid "setup as shared repository"
 msgstr "设置为共享仓库"
 
@@ -6958,110 +6966,112 @@
 msgid "initialize submodules in the clone"
 msgstr "在克隆时初始化子模组"
 
-#: builtin/clone.c:109
+#: builtin/clone.c:110
 msgid "number of submodules cloned in parallel"
 msgstr "并发克隆的子模组的数量"
 
-#: builtin/clone.c:110 builtin/init-db.c:486
+#: builtin/clone.c:111 builtin/init-db.c:533
 msgid "template-directory"
 msgstr "模板目录"
 
-#: builtin/clone.c:111 builtin/init-db.c:487
+#: builtin/clone.c:112 builtin/init-db.c:534
 msgid "directory from which templates will be used"
 msgstr "模板目录将被使用"
 
-#: builtin/clone.c:113 builtin/clone.c:115 builtin/submodule--helper.c:1380
-#: builtin/submodule--helper.c:1860
+#: builtin/clone.c:114 builtin/clone.c:116 builtin/submodule--helper.c:1407
+#: builtin/submodule--helper.c:1912
 msgid "reference repository"
 msgstr "参考仓库"
 
-#: builtin/clone.c:117 builtin/submodule--helper.c:1382
-#: builtin/submodule--helper.c:1862
+#: builtin/clone.c:118 builtin/submodule--helper.c:1409
+#: builtin/submodule--helper.c:1914
 msgid "use --reference only while cloning"
 msgstr "仅在克隆时参考 --reference 指向的本地仓库"
 
-#: builtin/clone.c:118 builtin/column.c:27 builtin/merge-file.c:46
-#: builtin/pack-objects.c:3294 builtin/repack.c:320
+#: builtin/clone.c:119 builtin/column.c:27 builtin/merge-file.c:46
+#: builtin/pack-objects.c:3442 builtin/repack.c:329
 msgid "name"
 msgstr "名称"
 
-#: builtin/clone.c:119
+#: builtin/clone.c:120
 msgid "use <name> instead of 'origin' to track upstream"
 msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
 
-#: builtin/clone.c:121
+#: builtin/clone.c:122
 msgid "checkout <branch> instead of the remote's HEAD"
 msgstr "检出 <分支> 而不是远程 HEAD"
 
-#: builtin/clone.c:123
+#: builtin/clone.c:124
 msgid "path to git-upload-pack on the remote"
 msgstr "远程 git-upload-pack 路径"
 
-#: builtin/clone.c:124 builtin/fetch.c:167 builtin/grep.c:840
-#: builtin/pull.c:227
+#: builtin/clone.c:125 builtin/fetch.c:169 builtin/grep.c:848
+#: builtin/pull.c:208
 msgid "depth"
 msgstr "深度"
 
-#: builtin/clone.c:125
+#: builtin/clone.c:126
 msgid "create a shallow clone of that depth"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/clone.c:126 builtin/fetch.c:169 builtin/pack-objects.c:3283
+#: builtin/clone.c:127 builtin/fetch.c:171 builtin/pack-objects.c:3431
+#: builtin/pull.c:211
 msgid "time"
 msgstr "时间"
 
-#: builtin/clone.c:127
+#: builtin/clone.c:128
 msgid "create a shallow clone since a specific time"
 msgstr "从一个特定时间创建一个浅克隆"
 
-#: builtin/clone.c:128 builtin/fetch.c:171 builtin/fetch.c:194
-#: builtin/rebase.c:1417
+#: builtin/clone.c:129 builtin/fetch.c:173 builtin/fetch.c:196
+#: builtin/pull.c:214 builtin/pull.c:239 builtin/rebase.c:1304
 msgid "revision"
 msgstr "版本"
 
-#: builtin/clone.c:129 builtin/fetch.c:172
+#: builtin/clone.c:130 builtin/fetch.c:174 builtin/pull.c:215
 msgid "deepen history of shallow clone, excluding rev"
 msgstr "深化浅克隆的历史，除了特定版本"
 
-#: builtin/clone.c:131
+#: builtin/clone.c:132 builtin/submodule--helper.c:1419
+#: builtin/submodule--helper.c:1928
 msgid "clone only one branch, HEAD or --branch"
 msgstr "只克隆一个分支、HEAD 或 --branch"
 
-#: builtin/clone.c:133
+#: builtin/clone.c:134
 msgid "don't clone any tags, and make later fetches not to follow them"
 msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
 
-#: builtin/clone.c:135
+#: builtin/clone.c:136
 msgid "any cloned submodules will be shallow"
 msgstr "子模组将以浅下载模式克隆"
 
-#: builtin/clone.c:136 builtin/init-db.c:495
+#: builtin/clone.c:137 builtin/init-db.c:542
 msgid "gitdir"
 msgstr "git目录"
 
-#: builtin/clone.c:137 builtin/init-db.c:496
+#: builtin/clone.c:138 builtin/init-db.c:543
 msgid "separate git dir from working tree"
 msgstr "git目录和工作区分离"
 
-#: builtin/clone.c:138
+#: builtin/clone.c:139
 msgid "key=value"
 msgstr "key=value"
 
-#: builtin/clone.c:139
+#: builtin/clone.c:140
 msgid "set config inside the new repository"
 msgstr "在新仓库中设置配置信息"
 
-#: builtin/clone.c:142 builtin/fetch.c:190 builtin/pull.c:240
-#: builtin/push.c:573
+#: builtin/clone.c:143 builtin/fetch.c:192 builtin/pull.c:234
+#: builtin/push.c:571
 msgid "use IPv4 addresses only"
 msgstr "只使用 IPv4 地址"
 
-#: builtin/clone.c:144 builtin/fetch.c:192 builtin/pull.c:243
-#: builtin/push.c:575
+#: builtin/clone.c:145 builtin/fetch.c:194 builtin/pull.c:237
+#: builtin/push.c:573
 msgid "use IPv6 addresses only"
 msgstr "只使用 IPv6 地址"
 
-#: builtin/clone.c:284
+#: builtin/clone.c:287
 msgid ""
 "No directory name could be guessed.\n"
 "Please specify a directory on the command line"
@@ -7069,42 +7079,42 @@
 "无法猜到目录名。\n"
 "请在命令行指定一个目录"
 
-#: builtin/clone.c:337
+#: builtin/clone.c:340
 #, c-format
 msgid "info: Could not add alternate for '%s': %s\n"
 msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
 
-#: builtin/clone.c:401
+#: builtin/sparse-checkout.c:326
 #, c-format
 msgid "failed to open '%s'"
-msgstr "打开 '%s' 失败"
+msgstr "无法打开 '%s'"
 
-#: builtin/clone.c:410
+#: builtin/clone.c:413
 #, c-format
 msgid "%s exists and is not a directory"
 msgstr "%s 存在且不是一个目录"
 
-#: builtin/clone.c:423
+#: builtin/clone.c:426
 #, c-format
 msgid "failed to stat %s\n"
 msgstr "对 %s 调用 stat 失败\n"
 
-#: builtin/clone.c:457
+#: builtin/clone.c:462
 #, c-format
 msgid "failed to create link '%s'"
 msgstr "创建链接 '%s' 失败"
 
-#: builtin/clone.c:461
+#: builtin/clone.c:466
 #, c-format
 msgid "failed to copy file to '%s'"
 msgstr "拷贝文件至 '%s' 失败"
 
-#: builtin/clone.c:491
+#: builtin/clone.c:498
 #, c-format
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: builtin/clone.c:489
+#: builtin/clone.c:492
 msgid ""
 "Clone succeeded, but checkout failed.\n"
 "You can inspect what was checked out with 'git status'\n"
@@ -7114,134 +7124,134 @@
 "您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
 "'git checkout -f HEAD' 重试\n"
 
-#: builtin/clone.c:582
+#: builtin/clone.c:589
 #, c-format
 msgid "Could not find remote branch %s to clone."
 msgstr "不能发现要克隆的远程分支 %s。"
 
-#: fetch-pack.c:1716 builtin/clone.c:685
+#: fetch-pack.c:1812 builtin/clone.c:692
 msgid "remote did not send all necessary objects"
 msgstr "远程没有发送所有必需的对象"
 
-#: builtin/clone.c:701
+#: builtin/clone.c:708
 #, c-format
 msgid "unable to update %s"
 msgstr "不能更新 %s"
 
-#: builtin/clone.c:751
+#: builtin/clone.c:779
 msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
 msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
 
-#: builtin/clone.c:782
+#: builtin/clone.c:811
 msgid "unable to checkout working tree"
 msgstr "不能检出工作区"
 
-#: builtin/clone.c:832
+#: builtin/clone.c:868
 msgid "unable to write parameters to config file"
 msgstr "无法将参数写入配置文件"
 
-#: builtin/clone.c:895
+#: builtin/clone.c:931
 msgid "cannot repack to clean up"
 msgstr "无法执行 repack 来清理"
 
-#: builtin/clone.c:897
+#: builtin/clone.c:933
 msgid "cannot unlink temporary alternates file"
 msgstr "无法删除临时的 alternates 文件"
 
-#: builtin/clone.c:937 builtin/receive-pack.c:1948
+#: builtin/clone.c:971 builtin/receive-pack.c:1972
 msgid "Too many arguments."
 msgstr "太多参数。"
 
-#: builtin/clone.c:941
+#: builtin/clone.c:975
 msgid "You must specify a repository to clone."
 msgstr "您必须指定一个仓库来克隆。"
 
-#: builtin/clone.c:954
+#: builtin/clone.c:988
 #, c-format
 msgid "--bare and --origin %s options are incompatible."
 msgstr "--bare 和 --origin %s 选项不兼容。"
 
-#: builtin/clone.c:957
+#: builtin/clone.c:991
 msgid "--bare and --separate-git-dir are incompatible."
 msgstr "--bare 和 --separate-git-dir 选项不兼容。"
 
-#: builtin/clone.c:970
+#: builtin/clone.c:1004
 #, c-format
 msgid "repository '%s' does not exist"
 msgstr "仓库 '%s' 不存在"
 
-#: builtin/clone.c:976 builtin/fetch.c:1790
+#: builtin/clone.c:1010 builtin/fetch.c:1789
 #, c-format
 msgid "depth %s is not a positive number"
 msgstr "深度 %s 不是一个正数"
 
-#: builtin/clone.c:986
+#: builtin/clone.c:1020
 #, c-format
 msgid "destination path '%s' already exists and is not an empty directory."
 msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
 
-#: builtin/clone.c:996
+#: builtin/clone.c:1030
 #, c-format
 msgid "working tree '%s' already exists."
 msgstr "工作区 '%s' 已经存在。"
 
-#: builtin/clone.c:1011 builtin/clone.c:1032 builtin/difftool.c:271
-#: builtin/log.c:1785 builtin/worktree.c:302 builtin/worktree.c:334
+#: builtin/clone.c:1045 builtin/clone.c:1066 builtin/difftool.c:271
+#: builtin/log.c:1886 builtin/worktree.c:295 builtin/worktree.c:327
 #, c-format
 msgid "could not create leading directories of '%s'"
 msgstr "不能为 '%s' 创建先导目录"
 
-#: builtin/clone.c:1016
+#: builtin/clone.c:1050
 #, c-format
 msgid "could not create work tree dir '%s'"
 msgstr "不能创建工作区目录 '%s'"
 
-#: builtin/clone.c:1036
+#: builtin/clone.c:1070
 #, c-format
 msgid "Cloning into bare repository '%s'...\n"
 msgstr "克隆到纯仓库 '%s'...\n"
 
-#: builtin/clone.c:1038
+#: builtin/clone.c:1072
 #, c-format
 msgid "Cloning into '%s'...\n"
 msgstr "正克隆到 '%s'...\n"
 
-#: builtin/clone.c:1062
+#: builtin/clone.c:1096
 msgid ""
 "clone --recursive is not compatible with both --reference and --reference-if-"
 "able"
 msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
 
-#: builtin/clone.c:1123
+#: builtin/clone.c:1160
 msgid "--depth is ignored in local clones; use file:// instead."
 msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1125
+#: builtin/clone.c:1162
 msgid "--shallow-since is ignored in local clones; use file:// instead."
 msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1127
+#: builtin/clone.c:1164
 msgid "--shallow-exclude is ignored in local clones; use file:// instead."
 msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1129
+#: builtin/clone.c:1166
 msgid "--filter is ignored in local clones; use file:// instead."
 msgstr "--filter 在本地克隆时被忽略，请改用 file:// 协议。"
 
-#: builtin/clone.c:1132
+#: builtin/clone.c:1169
 msgid "source repository is shallow, ignoring --local"
 msgstr "源仓库是浅克隆，忽略 --local"
 
-#: builtin/clone.c:1137
+#: builtin/clone.c:1174
 msgid "--local is ignored"
 msgstr "--local 被忽略"
 
-#: builtin/clone.c:1212 builtin/clone.c:1220
+#: builtin/clone.c:1249 builtin/clone.c:1257
 #, c-format
 msgid "Remote branch %s not found in upstream %s"
 msgstr "远程分支 %s 在上游 %s 未发现"
 
-#: builtin/clone.c:1223
+#: builtin/clone.c:1260
 msgid "You appear to have cloned an empty repository."
 msgstr "您似乎克隆了一个空仓库。"
 
@@ -7308,11 +7318,11 @@
 "    git commit --allow-empty\n"
 "\n"
 
-#: builtin/commit.c:59
+#: builtin/commit.c:62
 msgid "Otherwise, please use 'git reset'\n"
 msgstr "否则，请使用命令 'git reset'\n"
 
-#: builtin/commit.c:62
+#: builtin/commit.c:65
 msgid ""
 "If you wish to skip this commit, use:\n"
 "\n"
@@ -7328,98 +7338,98 @@
 "然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
 "操作。\n"
 
-#: builtin/commit.c:315
+#: builtin/commit.c:312
 msgid "failed to unpack HEAD tree object"
 msgstr "解包 HEAD 树对象失败"
 
-#: builtin/commit.c:356
+#: builtin/commit.c:373
 msgid "unable to create temporary index"
 msgstr "不能创建临时索引"
 
-#: builtin/commit.c:362
+#: builtin/commit.c:382
 msgid "interactive add failed"
 msgstr "交互式添加失败"
 
-#: builtin/commit.c:376
+#: builtin/commit.c:397
 msgid "unable to update temporary index"
 msgstr "无法更新临时索引"
 
-#: builtin/commit.c:378
+#: builtin/commit.c:399
 msgid "Failed to update main cache tree"
 msgstr "不能更新树的主缓存"
 
-#: builtin/commit.c:403 builtin/commit.c:426 builtin/commit.c:472
+#: builtin/commit.c:424 builtin/commit.c:447 builtin/commit.c:495
 msgid "unable to write new_index file"
 msgstr "无法写 new_index 文件"
 
-#: builtin/commit.c:455
+#: builtin/commit.c:476
 msgid "cannot do a partial commit during a merge."
 msgstr "在合并过程中不能做部分提交。"
 
-#: builtin/commit.c:457
+#: builtin/commit.c:478
 msgid "cannot do a partial commit during a cherry-pick."
 msgstr "在拣选过程中不能做部分提交。"
 
-#: builtin/commit.c:465
+#: builtin/commit.c:488
 msgid "cannot read the index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c:484
+#: builtin/commit.c:507
 msgid "unable to write temporary index file"
 msgstr "无法写临时索引文件"
 
-#: builtin/commit.c:582
+#: builtin/commit.c:605
 #, c-format
 msgid "commit '%s' lacks author header"
 msgstr "提交 '%s' 缺少作者信息"
 
-#: builtin/commit.c:584
+#: builtin/commit.c:607
 #, c-format
 msgid "commit '%s' has malformed author line"
 msgstr "提交 '%s' 有格式错误的作者信息"
 
-#: builtin/commit.c:603
+#: builtin/commit.c:626
 msgid "malformed --author parameter"
 msgstr "格式错误的 --author 参数"
 
-#: builtin/commit.c:656
+#: builtin/commit.c:679
 msgid ""
 "unable to select a comment character that is not used\n"
 "in the current commit message"
 msgstr "无法选择一个未被当前提交说明使用的注释字符"
 
-#: builtin/commit.c:694 builtin/commit.c:727 builtin/commit.c:1072
+#: builtin/commit.c:717 builtin/commit.c:750 builtin/commit.c:1099
 #, c-format
 msgid "could not lookup commit %s"
 msgstr "不能查询提交 %s"
 
-#: builtin/commit.c:706 builtin/shortlog.c:319
+#: builtin/commit.c:729 builtin/shortlog.c:319
 #, c-format
 msgid "(reading log message from standard input)\n"
 msgstr "（正从标准输入中读取日志信息）\n"
 
-#: builtin/commit.c:708
+#: builtin/commit.c:731
 msgid "could not read log from standard input"
 msgstr "不能从标准输入中读取日志信息"
 
-#: builtin/commit.c:712
+#: builtin/commit.c:735
 #, c-format
 msgid "could not read log file '%s'"
 msgstr "不能读取日志文件 '%s'"
 
-#: builtin/commit.c:743 builtin/commit.c:759
+#: builtin/commit.c:766 builtin/commit.c:782
 msgid "could not read SQUASH_MSG"
 msgstr "不能读取 SQUASH_MSG"
 
-#: builtin/commit.c:750
+#: builtin/commit.c:773
 msgid "could not read MERGE_MSG"
 msgstr "不能读取 MERGE_MSG"
 
-#: builtin/commit.c:810
+#: builtin/commit.c:833
 msgid "could not write commit template"
 msgstr "不能写提交模版"
 
-#: builtin/commit.c:829
+#: builtin/commit.c:852
 #, c-format
 msgid ""
 "\n"
@@ -7433,7 +7443,7 @@
 "\t%s\n"
 "然后重试。\n"
 
-#: builtin/commit.c:834
+#: builtin/commit.c:857
 #, c-format
 msgid ""
 "\n"
@@ -7447,7 +7457,7 @@
 "\t%s\n"
 "然后重试。\n"
 
-#: builtin/commit.c:847
+#: builtin/commit.c:870
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7456,7 +7466,7 @@
 "请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
 "说明将会终止提交。\n"
 
-#: builtin/commit.c:855
+#: builtin/commit.c:878
 #, c-format
 msgid ""
 "Please enter the commit message for your changes. Lines starting\n"
@@ -7467,342 +7477,342 @@
 "也可以删除它们。一个空的提交说明将会终止提交。\n"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:872
+#: builtin/commit.c:895
 #, c-format
 msgid "%sAuthor:    %.*s <%.*s>"
 msgstr "%s作者：  %.*s <%.*s>"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:880
+#: builtin/commit.c:903
 #, c-format
 msgid "%sDate:      %s"
 msgstr "%s日期：  %s"
 
 #  译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:887
+#: builtin/commit.c:910
 #, c-format
 msgid "%sCommitter: %.*s <%.*s>"
 msgstr "%s提交者：%.*s <%.*s>"
 
-#: builtin/commit.c:905
+#: builtin/commit.c:928
 msgid "Cannot read index"
 msgstr "无法读取索引"
 
-#: builtin/commit.c:972
+#: builtin/commit.c:999
 msgid "Error building trees"
 msgstr "无法创建树对象"
 
-#: builtin/commit.c:986 builtin/tag.c:275
+#: builtin/commit.c:1013 builtin/tag.c:276
 #, c-format
 msgid "Please supply the message using either -m or -F option.\n"
 msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
 
-#: builtin/commit.c:1030
+#: builtin/commit.c:1057
 #, c-format
 msgid "--author '%s' is not 'Name <email>' and matches no existing author"
 msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
 
-#: builtin/commit.c:1044
+#: builtin/commit.c:1071
 #, c-format
 msgid "Invalid ignored mode '%s'"
 msgstr "无效的忽略模式 '%s'"
 
-#: builtin/commit.c:1062 builtin/commit.c:1304
+#: builtin/commit.c:1089 builtin/commit.c:1333
 #, c-format
 msgid "Invalid untracked files mode '%s'"
 msgstr "无效的未追踪文件参数 '%s'"
 
-#: builtin/commit.c:1102
+#: builtin/commit.c:1129
 msgid "--long and -z are incompatible"
 msgstr "--long 和 -z 选项不兼容"
 
-#: builtin/commit.c:1146
+#: builtin/commit.c:1173
 msgid "Using both --reset-author and --author does not make sense"
 msgstr "同时使用 --reset-author 和 --author 没有意义"
 
-#: builtin/commit.c:1155
+#: builtin/commit.c:1182
 msgid "You have nothing to amend."
 msgstr "您没有可修补的提交。"
 
-#: builtin/commit.c:1158
+#: builtin/commit.c:1185
 msgid "You are in the middle of a merge -- cannot amend."
 msgstr "您正处于一个合并过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1187
 msgid "You are in the middle of a cherry-pick -- cannot amend."
 msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
 
-#: builtin/commit.c:1163
+#: builtin/commit.c:1192
 msgid "Options --squash and --fixup cannot be used together"
 msgstr "选项 --squash 和 --fixup 不能同时使用"
 
-#: builtin/commit.c:1173
+#: builtin/commit.c:1202
 msgid "Only one of -c/-C/-F/--fixup can be used."
 msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
 
-#: builtin/commit.c:1175
+#: builtin/commit.c:1204
 msgid "Option -m cannot be combined with -c/-C/-F."
 msgstr "选项 -m 不能和 -c/-C/-F 同时使用。"
 
-#: builtin/commit.c:1183
+#: builtin/commit.c:1213
 msgid "--reset-author can be used only with -C, -c or --amend."
 msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
 
-#: builtin/commit.c:1200
+#: builtin/commit.c:1231
 msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
 msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
 
-#: builtin/commit.c:1202
+#: builtin/commit.c:361
 msgid "No paths with --include/--only does not make sense."
 msgstr "参数 --include/--only 不跟路径没有意义。"
 
-#: sequencer.c:537 builtin/tag.c:565
+#: sequencer.c:532 builtin/tag.c:566
 #, c-format
 msgid "Invalid cleanup mode %s"
 msgstr "无效的清理模式 %s"
 
-#: builtin/commit.c:1160
+#: builtin/commit.c:1185
 msgid "Paths with -a does not make sense."
 msgstr "路径和 -a 选项同时使用没有意义。"
 
-#: builtin/commit.c:1339 builtin/commit.c:1523
+#: builtin/commit.c:1368 builtin/commit.c:1529
 msgid "show status concisely"
 msgstr "以简洁的格式显示状态"
 
-#: builtin/commit.c:1341 builtin/commit.c:1525
+#: builtin/commit.c:1370 builtin/commit.c:1531
 msgid "show branch information"
 msgstr "显示分支信息"
 
-#: builtin/commit.c:1343
+#: builtin/commit.c:1372
 msgid "show stash information"
 msgstr "显示贮藏区信息"
 
-#: builtin/commit.c:1345 builtin/commit.c:1527
+#: builtin/commit.c:1374 builtin/commit.c:1533
 msgid "compute full ahead/behind values"
 msgstr "计算完整的领先/落后值"
 
-#: builtin/commit.c:1347
+#: builtin/commit.c:1376
 msgid "version"
 msgstr "版本"
 
-#: builtin/commit.c:1347 builtin/commit.c:1529 builtin/push.c:548
-#: builtin/worktree.c:650
+#: builtin/commit.c:1376 builtin/commit.c:1535 builtin/push.c:549
+#: builtin/worktree.c:646
 msgid "machine-readable output"
 msgstr "机器可读的输出"
 
-#: builtin/commit.c:1350 builtin/commit.c:1531
+#: builtin/commit.c:1379 builtin/commit.c:1537
 msgid "show status in long format (default)"
 msgstr "以长格式显示状态（默认）"
 
-#: builtin/commit.c:1353 builtin/commit.c:1534
+#: builtin/commit.c:1382 builtin/commit.c:1540
 msgid "terminate entries with NUL"
 msgstr "条目以 NUL 字符结尾"
 
-#: builtin/commit.c:1355 builtin/commit.c:1359 builtin/commit.c:1537
+#: builtin/commit.c:1384 builtin/commit.c:1388 builtin/commit.c:1543
 #: builtin/fast-export.c:1153 builtin/fast-export.c:1156
-#: builtin/fast-export.c:1159 builtin/rebase.c:1495 parse-options.h:332
+#: builtin/fast-export.c:1159 builtin/rebase.c:1392 parse-options.h:336
 msgid "mode"
 msgstr "模式"
 
-#: builtin/commit.c:1356 builtin/commit.c:1537
+#: builtin/commit.c:1385 builtin/commit.c:1543
 msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
 msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
 
-#: builtin/commit.c:1360
+#: builtin/commit.c:1389
 msgid ""
 "show ignored files, optional modes: traditional, matching, no. (Default: "
 "traditional)"
 msgstr "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
 
-#: builtin/commit.c:1362 parse-options.h:188
+#: builtin/commit.c:1391 parse-options.h:192
 msgid "when"
 msgstr "何时"
 
-#: builtin/commit.c:1363
+#: builtin/commit.c:1392
 msgid ""
 "ignore changes to submodules, optional when: all, dirty, untracked. "
 "(Default: all)"
 msgstr "忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
 
-#: builtin/commit.c:1365
+#: builtin/commit.c:1394
 msgid "list untracked files in columns"
 msgstr "以列的方式显示未跟踪的文件"
 
-#: builtin/commit.c:1388
+#: builtin/commit.c:1417
 msgid "Unsupported combination of ignored and untracked-files arguments"
 msgstr "不支持已忽略和未跟踪文件参数的组合"
 
-#: builtin/commit.c:1493
+#: builtin/commit.c:1499
 msgid "suppress summary after successful commit"
 msgstr "提交成功后不显示概述信息"
 
-#: builtin/commit.c:1494
+#: builtin/commit.c:1500
 msgid "show diff in commit message template"
 msgstr "在提交说明模板里显示差异"
 
-#: builtin/commit.c:1496
+#: builtin/commit.c:1502
 msgid "Commit message options"
 msgstr "提交说明选项"
 
-#: builtin/commit.c:1497 builtin/merge.c:274 builtin/tag.c:414
+#: builtin/commit.c:1503 builtin/merge.c:277 builtin/tag.c:415
 msgid "read message from file"
 msgstr "从文件中读取提交说明"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1504
 msgid "author"
 msgstr "作者"
 
-#: builtin/commit.c:1498
+#: builtin/commit.c:1504
 msgid "override author for commit"
 msgstr "提交时覆盖作者"
 
-#: builtin/commit.c:1499 builtin/gc.c:538
+#: builtin/commit.c:1505 builtin/gc.c:538
 msgid "date"
 msgstr "日期"
 
-#: builtin/commit.c:1499
+#: builtin/commit.c:1505
 msgid "override date for commit"
 msgstr "提交时覆盖日期"
 
-#: builtin/commit-tree.c:114 builtin/commit.c:1500 builtin/merge.c:270
-#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1469
-#: builtin/tag.c:412
+#: builtin/commit-tree.c:114 builtin/commit.c:1506 builtin/merge.c:273
+#: builtin/notes.c:409 builtin/notes.c:575 builtin/stash.c:1474
+#: builtin/tag.c:413
 msgid "message"
 msgstr "说明"
 
-#: builtin/commit-tree.c:115 builtin/commit.c:1500
+#: builtin/commit-tree.c:115 builtin/commit.c:1506
 msgid "commit message"
 msgstr "提交说明"
 
-#: builtin/commit.c:1501 builtin/commit.c:1502 builtin/commit.c:1503
-#: builtin/commit.c:1504 parse-options.h:324 ref-filter.h:92
+#: builtin/commit.c:1507 builtin/commit.c:1508 builtin/commit.c:1509
+#: builtin/commit.c:1510 parse-options.h:328 ref-filter.h:92
 msgid "commit"
 msgstr "提交"
 
-#: builtin/commit.c:1501
+#: builtin/commit.c:1507
 msgid "reuse and edit message from specified commit"
 msgstr "重用并编辑指定提交的提交说明"
 
-#: builtin/commit.c:1502
+#: builtin/commit.c:1508
 msgid "reuse message from specified commit"
 msgstr "重用指定提交的提交说明"
 
-#: builtin/commit.c:1503
+#: builtin/commit.c:1509
 msgid "use autosquash formatted message to fixup specified commit"
 msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
 
-#: builtin/commit.c:1504
+#: builtin/commit.c:1510
 msgid "use autosquash formatted message to squash specified commit"
 msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
 
-#: builtin/commit.c:1505
+#: builtin/commit.c:1511
 msgid "the commit is authored by me now (used with -C/-c/--amend)"
 msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
 
-#: builtin/commit.c:1506 builtin/log.c:1565 builtin/merge.c:289
-#: builtin/pull.c:164 builtin/revert.c:110
+#: builtin/commit.c:1512 builtin/log.c:1655 builtin/merge.c:293
+#: builtin/pull.c:145 builtin/revert.c:110
 msgid "add Signed-off-by:"
 msgstr "添加 Signed-off-by: 签名"
 
-#: builtin/commit.c:1507
+#: builtin/commit.c:1513
 msgid "use specified template file"
 msgstr "使用指定的模板文件"
 
-#: builtin/commit.c:1508
+#: builtin/commit.c:1514
 msgid "force edit of commit"
 msgstr "强制编辑提交"
 
 #  译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1429
+#: builtin/commit.c:1481
 msgid "default"
 msgstr "default"
 
-#: parse-options.h:332
+#: parse-options.h:336
 msgid "how to strip spaces and #comments from message"
 msgstr "设置如何删除提交说明里的空格和#注释"
 
-#: builtin/commit.c:1510
+#: builtin/commit.c:1516
 msgid "include status in commit message template"
 msgstr "在提交说明模板里包含状态信息"
 
-#: builtin/commit-tree.c:121 builtin/commit.c:1512 builtin/merge.c:287
-#: builtin/pull.c:195 builtin/revert.c:118
+#: builtin/commit-tree.c:121 builtin/commit.c:1518 builtin/merge.c:290
+#: builtin/pull.c:176 builtin/revert.c:118
 msgid "GPG sign commit"
 msgstr "GPG 提交签名"
 
-#: builtin/commit.c:1515
+#: builtin/commit.c:1521
 msgid "Commit contents options"
 msgstr "提交内容选项"
 
-#: builtin/commit.c:1516
+#: builtin/commit.c:1522
 msgid "commit all changed files"
 msgstr "提交所有改动的文件"
 
-#: builtin/commit.c:1517
+#: builtin/commit.c:1523
 msgid "add specified files to index for commit"
 msgstr "添加指定的文件到索引区等待提交"
 
-#: builtin/commit.c:1518
+#: builtin/commit.c:1524
 msgid "interactively add files"
 msgstr "交互式添加文件"
 
-#: builtin/commit.c:1519
+#: builtin/commit.c:1525
 msgid "interactively add changes"
 msgstr "交互式添加变更"
 
-#: builtin/commit.c:1520
+#: builtin/commit.c:1526
 msgid "commit only specified files"
 msgstr "只提交指定的文件"
 
-#: builtin/commit.c:1521
+#: builtin/commit.c:1527
 msgid "bypass pre-commit and commit-msg hooks"
 msgstr "绕过 pre-commit 和 commit-msg 钩子"
 
-#: builtin/commit.c:1522
+#: builtin/commit.c:1528
 msgid "show what would be committed"
 msgstr "显示将要提交的内容"
 
-#: builtin/commit.c:1535
+#: builtin/commit.c:1541
 msgid "amend previous commit"
 msgstr "修改先前的提交"
 
-#: builtin/commit.c:1536
+#: builtin/commit.c:1542
 msgid "bypass post-rewrite hook"
 msgstr "绕过 post-rewrite 钩子"
 
-#: builtin/commit.c:1541
+#: builtin/commit.c:1549
 msgid "ok to record an empty change"
 msgstr "允许一个空提交"
 
-#: builtin/commit.c:1543
+#: builtin/commit.c:1551
 msgid "ok to record a change with an empty message"
 msgstr "允许空的提交说明"
 
-#: builtin/commit.c:1616
+#: builtin/commit.c:1624
 #, c-format
 msgid "Corrupt MERGE_HEAD file (%s)"
 msgstr "损坏的 MERGE_HEAD 文件（%s）"
 
-#: builtin/commit.c:1623
+#: builtin/commit.c:1631
 msgid "could not read MERGE_MODE"
 msgstr "不能读取 MERGE_MODE"
 
-#: builtin/commit.c:1642
+#: builtin/commit.c:1652
 #, c-format
 msgid "could not read commit message: %s"
 msgstr "不能读取提交说明：%s"
 
-#: builtin/commit.c:1649
+#: builtin/commit.c:1659
 #, c-format
 msgid "Aborting commit due to empty commit message.\n"
 msgstr "终止提交因为提交说明为空。\n"
 
-#: builtin/commit.c:1654
+#: builtin/commit.c:1664
 #, c-format
 msgid "Aborting commit; you did not edit the message.\n"
 msgstr "终止提交；您未更改来自模版的提交说明。\n"
 
-#: builtin/commit.c:1613
+#: builtin/commit.c:1788
 msgid ""
 "Repository has been updated, but unable to write\n"
 "new_index file. Check that disk is not full and quota is\n"
@@ -7815,143 +7825,143 @@
 msgid "git config [<options>]"
 msgstr "git config [<选项>]"
 
-#: builtin/config.c:124
+#: builtin/config.c:125
 msgid "Config file location"
 msgstr "配置文件位置"
 
-#: builtin/config.c:125
+#: builtin/config.c:126
 msgid "use global config file"
 msgstr "使用全局配置文件"
 
-#: builtin/config.c:126
+#: builtin/config.c:127
 msgid "use system config file"
 msgstr "使用系统级配置文件"
 
-#: builtin/config.c:127
+#: builtin/config.c:128
 msgid "use repository config file"
 msgstr "使用仓库级配置文件"
 
-#: builtin/config.c:129
+#: builtin/config.c:130
 msgid "use given config file"
 msgstr "使用指定的配置文件"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "blob-id"
 msgstr "数据对象 ID"
 
-#: builtin/config.c:130
+#: builtin/config.c:131
 msgid "read config from given blob object"
 msgstr "从给定的数据对象读取配置"
 
-#: builtin/config.c:131
+#: builtin/config.c:132
 msgid "Action"
 msgstr "操作"
 
-#: builtin/config.c:132
+#: builtin/config.c:133
 msgid "get value: name [value-regex]"
 msgstr "获取值：name [value-regex]"
 
-#: builtin/config.c:133
+#: builtin/config.c:134
 msgid "get all values: key [value-regex]"
 msgstr "获得所有的值：key [value-regex]"
 
-#: builtin/config.c:134
+#: builtin/config.c:135
 msgid "get values for regexp: name-regex [value-regex]"
 msgstr "根据正则表达式获得值：name-regex [value-regex]"
 
-#: builtin/config.c:135
+#: builtin/config.c:136
 msgid "get value specific for the URL: section[.var] URL"
 msgstr "获得 URL 取值：section[.var] URL"
 
-#: builtin/config.c:136
+#: builtin/config.c:137
 msgid "replace all matching variables: name value [value_regex]"
 msgstr "替换所有匹配的变量：name value [value_regex]"
 
-#: builtin/config.c:137
+#: builtin/config.c:138
 msgid "add a new variable: name value"
 msgstr "添加一个新的变量：name value"
 
-#: builtin/config.c:138
+#: builtin/config.c:139
 msgid "remove a variable: name [value-regex]"
 msgstr "删除一个变量：name [value-regex]"
 
-#: builtin/config.c:139
+#: builtin/config.c:140
 msgid "remove all matches: name [value-regex]"
 msgstr "删除所有匹配项：name [value-regex]"
 
-#: builtin/config.c:140
+#: builtin/config.c:141
 msgid "rename section: old-name new-name"
 msgstr "重命名小节：old-name new-name"
 
-#: builtin/config.c:141
+#: builtin/config.c:142
 msgid "remove a section: name"
 msgstr "删除一个小节：name"
 
-#: builtin/config.c:142
+#: builtin/config.c:143
 msgid "list all"
 msgstr "列出所有"
 
-#: builtin/config.c:143
+#: builtin/config.c:144
 msgid "open an editor"
 msgstr "打开一个编辑器"
 
-#: builtin/config.c:144
+#: builtin/config.c:145
 msgid "find the color configured: slot [default]"
 msgstr "获得配置的颜色：配置 [默认]"
 
-#: builtin/config.c:145
+#: builtin/config.c:146
 msgid "find the color setting: slot [stdout-is-tty]"
 msgstr "获得颜色设置：配置 [stdout-is-tty]"
 
-#: builtin/config.c:146
+#: builtin/config.c:147
 msgid "Type"
 msgstr "类型"
 
-#: builtin/config.c:148
+#: builtin/config.c:149
 msgid "value is \"true\" or \"false\""
 msgstr "值是 \"true\" 或 \"false\""
 
-#: builtin/config.c:149
+#: builtin/config.c:150
 msgid "value is decimal number"
 msgstr "值是十进制数"
 
-#: builtin/config.c:150
+#: builtin/config.c:151
 msgid "value is --bool or --int"
 msgstr "值是 --bool or --int"
 
-#: builtin/config.c:151
+#: builtin/config.c:152
 msgid "value is a path (file or directory name)"
 msgstr "值是一个路径（文件或目录名）"
 
-#: builtin/config.c:152
+#: builtin/config.c:153
 msgid "value is an expiry date"
 msgstr "值是一个到期日期"
 
-#: builtin/config.c:153
+#: builtin/config.c:154
 msgid "Other"
 msgstr "其它"
 
-#: builtin/config.c:154
+#: builtin/config.c:155
 msgid "terminate values with NUL byte"
 msgstr "终止值是 NUL 字节"
 
-#: builtin/config.c:155
+#: builtin/config.c:156
 msgid "show variable names only"
 msgstr "只显示变量名"
 
-#: builtin/config.c:156
+#: builtin/config.c:157
 msgid "respect include directives on lookup"
 msgstr "查询时参照 include 指令递归查找"
 
-#: builtin/config.c:157
+#: builtin/config.c:158
 msgid "show origin of config (file, standard input, blob, command line)"
 msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
 
-#: builtin/config.c:443
+#: builtin/config.c:459
 msgid "unable to parse default color value"
 msgstr "无法解析默认颜色值"
 
-#: builtin/config.c:587
+#: builtin/config.c:603
 #, c-format
 msgid ""
 "# This is Git's per-user configuration file.\n"
@@ -7966,16 +7976,16 @@
 "#\tname = %s\n"
 "#\temail = %s\n"
 
-#: builtin/config.c:616
+#: builtin/config.c:632
 msgid "--local can only be used inside a git repository"
 msgstr "--local 只能在一个仓库内使用"
 
-#: builtin/config.c:760
+#: builtin/config.c:786
 #, c-format
 msgid "cannot create configuration file %s"
 msgstr "不能创建配置文件 %s"
 
-#: builtin/config.c:773
+#: builtin/config.c:799
 #, c-format
 msgid ""
 "cannot overwrite multiple values with a single value\n"
@@ -8000,19 +8010,19 @@
 msgid "git describe [<options>] --dirty"
 msgstr "git describe [<选项>] --dirty"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "head"
 msgstr "头"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "lightweight"
 msgstr "轻量级的"
 
-#: builtin/describe.c:62
+#: builtin/describe.c:63
 msgid "annotated"
 msgstr "附注的"
 
-#: builtin/describe.c:275
+#: builtin/describe.c:277
 #, c-format
 msgid "annotated tag %s not available"
 msgstr "附注标签 %s 无效"
@@ -8027,22 +8037,22 @@
 msgid "tag '%s' is really '%s' here"
 msgstr "标签 '%s' 的确是在 '%s'"
 
-#: builtin/describe.c:325
+#: builtin/describe.c:328
 #, c-format
 msgid "no tag exactly matches '%s'"
 msgstr "没有标签准确匹配 '%s'"
 
-#: builtin/describe.c:327
+#: builtin/describe.c:330
 #, c-format
 msgid "No exact match on refs or tags, searching to describe\n"
 msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
 
-#: builtin/describe.c:381
+#: builtin/describe.c:397
 #, c-format
 msgid "finished search at %s\n"
 msgstr "完成搜索 %s\n"
 
-#: builtin/describe.c:407
+#: builtin/describe.c:424
 #, c-format
 msgid ""
 "No annotated tags can describe '%s'.\n"
@@ -8051,7 +8061,7 @@
 "没有附注标签能描述 '%s'。\n"
 "然而，存在未附注标签：尝试 --tags。"
 
-#: builtin/describe.c:411
+#: builtin/describe.c:428
 #, c-format
 msgid ""
 "No tags can describe '%s'.\n"
@@ -8060,12 +8070,12 @@
 "没有标签能描述 '%s'。\n"
 "尝试 --always，或者创建一些标签。"
 
-#: builtin/describe.c:441
+#: builtin/describe.c:458
 #, c-format
 msgid "traversed %lu commits\n"
 msgstr "已遍历 %lu 个提交\n"
 
-#: builtin/describe.c:444
+#: builtin/describe.c:461
 #, c-format
 msgid ""
 "more than %i tags found; listed %i most recent\n"
@@ -8074,90 +8084,90 @@
 "发现多于 %i 个标签，列出最近的 %i 个\n"
 "在 %s 放弃搜索\n"
 
-#: builtin/describe.c:512
+#: builtin/describe.c:529
 #, c-format
 msgid "describe %s\n"
 msgstr "描述 %s\n"
 
-#: builtin/describe.c:515
+#: builtin/describe.c:532
 #, c-format
 msgid "Not a valid object name %s"
 msgstr "不是一个有效的对象名 %s"
 
-#: builtin/describe.c:523
+#: builtin/describe.c:540
 #, c-format
 msgid "%s is neither a commit nor blob"
 msgstr "%s 既不是提交也不是数据对象"
 
-#: builtin/describe.c:537
+#: builtin/describe.c:554
 msgid "find the tag that comes after the commit"
 msgstr "寻找该提交之后的标签"
 
-#: builtin/describe.c:538
+#: builtin/describe.c:555
 msgid "debug search strategy on stderr"
 msgstr "在标准错误上调试搜索策略"
 
-#: builtin/describe.c:539
+#: builtin/describe.c:556
 msgid "use any ref"
 msgstr "使用任意引用"
 
-#: builtin/describe.c:540
+#: builtin/describe.c:557
 msgid "use any tag, even unannotated"
 msgstr "使用任意标签，即使未附带注释"
 
-#: builtin/describe.c:541
+#: builtin/describe.c:558
 msgid "always use long format"
 msgstr "始终使用长提交号格式"
 
-#: builtin/describe.c:542
+#: builtin/describe.c:559
 msgid "only follow first parent"
 msgstr "只跟随第一个父提交"
 
-#: builtin/describe.c:545
+#: builtin/describe.c:562
 msgid "only output exact matches"
 msgstr "只输出精确匹配"
 
-#: builtin/describe.c:547
+#: builtin/describe.c:564
 msgid "consider <n> most recent tags (default: 10)"
 msgstr "考虑最近 <n> 个标签（默认：10）"
 
-#: builtin/describe.c:549
+#: builtin/describe.c:566
 msgid "only consider tags matching <pattern>"
 msgstr "只考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c:551
+#: builtin/describe.c:568
 msgid "do not consider tags matching <pattern>"
 msgstr "不考虑匹配 <模式> 的标签"
 
-#: builtin/describe.c:553 builtin/name-rev.c:426
+#: builtin/describe.c:570 builtin/name-rev.c:535
 msgid "show abbreviated commit object as fallback"
 msgstr "显示简写的提交号作为后备"
 
-#: builtin/describe.c:554 builtin/describe.c:557
+#: builtin/describe.c:571 builtin/describe.c:574
 msgid "mark"
 msgstr "标记"
 
-#: builtin/describe.c:555
+#: builtin/describe.c:572
 msgid "append <mark> on dirty working tree (default: \"-dirty\")"
 msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
 
-#: builtin/describe.c:558
+#: builtin/describe.c:575
 msgid "append <mark> on broken working tree (default: \"-broken\")"
 msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
 
-#: builtin/describe.c:576
+#: builtin/describe.c:593
 msgid "--long is incompatible with --abbrev=0"
 msgstr "--long 与 --abbrev=0 不兼容"
 
-#: builtin/describe.c:605
+#: builtin/describe.c:622
 msgid "No names found, cannot describe anything."
 msgstr "没有发现名称，无法描述任何东西。"
 
-#: builtin/describe.c:656
+#: builtin/describe.c:673
 msgid "--dirty is incompatible with commit-ishes"
 msgstr "--dirty 与提交号不兼容"
 
-#: builtin/describe.c:658
+#: builtin/describe.c:675
 msgid "--broken is incompatible with commit-ishes"
 msgstr "--broken 与提交号不兼容"
 
@@ -8328,7 +8338,7 @@
 msgid "Skip output of blob data"
 msgstr "跳过数据对象的输出"
 
-#: builtin/fast-export.c:1177 builtin/log.c:1633
+#: builtin/fast-export.c:1177 builtin/log.c:1724
 msgid "refspec"
 msgstr "引用规格"
 
@@ -8340,185 +8350,185 @@
 msgid "anonymize output"
 msgstr "匿名输出"
 
-#: builtin/fetch.c:34
+#: builtin/fetch.c:35
 msgid "git fetch [<options>] [<repository> [<refspec>...]]"
 msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/fetch.c:35
+#: builtin/fetch.c:36
 msgid "git fetch [<options>] <group>"
 msgstr "git fetch [<选项>] <组>"
 
-#: builtin/fetch.c:36
+#: builtin/fetch.c:37
 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
 msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
 
-#: builtin/fetch.c:37
+#: builtin/fetch.c:38
 msgid "git fetch --all [<options>]"
 msgstr "git fetch --all [<选项>]"
 
-#: builtin/fetch.c:138 builtin/pull.c:204
+#: builtin/fetch.c:140 builtin/pull.c:185
 msgid "fetch from all remotes"
 msgstr "从所有的远程抓取"
 
-#: builtin/fetch.c:142 builtin/pull.c:207
+#: builtin/fetch.c:144 builtin/pull.c:188
 msgid "append to .git/FETCH_HEAD instead of overwriting"
 msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
 
-#: builtin/fetch.c:144 builtin/pull.c:210
+#: builtin/fetch.c:146 builtin/pull.c:191
 msgid "path to upload pack on remote end"
 msgstr "上传包到远程的路径"
 
-#: builtin/pull.c:212
+#: builtin/pull.c:193
 msgid "force overwrite of local branch"
 msgstr "强制覆盖本地分支"
 
-#: builtin/fetch.c:147
+#: builtin/fetch.c:149
 msgid "fetch from multiple remotes"
 msgstr "从多个远程抓取"
 
-#: builtin/fetch.c:149 builtin/pull.c:214
+#: builtin/fetch.c:151 builtin/pull.c:195
 msgid "fetch all tags and associated objects"
 msgstr "抓取所有的标签和关联对象"
 
-#: builtin/fetch.c:151
+#: builtin/fetch.c:153
 msgid "do not fetch all tags (--no-tags)"
 msgstr "不抓取任何标签(--no-tags)"
 
-#: builtin/fetch.c:153
+#: builtin/fetch.c:155
 msgid "number of submodules fetched in parallel"
 msgstr "子模组获取的并发数"
 
-#: builtin/fetch.c:155 builtin/pull.c:217
+#: builtin/fetch.c:157 builtin/pull.c:198
 msgid "prune remote-tracking branches no longer on remote"
 msgstr "清除远程已经不存在的分支的跟踪分支"
 
-#: builtin/fetch.c:157
+#: builtin/fetch.c:159
 msgid "prune local tags no longer on remote and clobber changed tags"
 msgstr "清除远程不存在的本地标签，并且替换变更标签"
 
 #  译者：可选值，不能翻译
-#: builtin/fetch.c:158 builtin/fetch.c:181 builtin/pull.c:141
+#: builtin/fetch.c:160 builtin/fetch.c:183 builtin/pull.c:122
 msgid "on-demand"
 msgstr "on-demand"
 
-#: builtin/fetch.c:159
+#: builtin/fetch.c:161
 msgid "control recursive fetching of submodules"
 msgstr "控制子模组的递归抓取"
 
-#: builtin/fetch.c:163 builtin/pull.c:225
+#: builtin/fetch.c:165 builtin/pull.c:206
 msgid "keep downloaded pack"
 msgstr "保持下载包"
 
-#: builtin/fetch.c:165
+#: builtin/fetch.c:167
 msgid "allow updating of HEAD ref"
 msgstr "允许更新 HEAD 引用"
 
-#: builtin/fetch.c:168 builtin/fetch.c:174 builtin/pull.c:228
+#: builtin/fetch.c:170 builtin/fetch.c:176 builtin/pull.c:209
+#: builtin/pull.c:218
 msgid "deepen history of shallow clone"
 msgstr "深化浅克隆的历史"
 
-#: builtin/fetch.c:170
+#: builtin/fetch.c:172 builtin/pull.c:212
 msgid "deepen history of shallow repository based on time"
 msgstr "基于时间来深化浅克隆的历史"
 
-#: builtin/fetch.c:176 builtin/pull.c:231
+#: builtin/fetch.c:178 builtin/pull.c:221
 msgid "convert to a complete repository"
 msgstr "转换为一个完整的仓库"
 
-#: builtin/commit-graph.c:55 builtin/commit-graph.c:107
-#: builtin/commit-graph.c:170 builtin/commit-graph.c:254 builtin/fetch.c:178
-#: builtin/log.c:1585
+#: builtin/commit-graph.c:76 builtin/commit-graph.c:152
+#: builtin/commit-graph.c:257 builtin/fetch.c:180 builtin/log.c:1678
 msgid "dir"
 msgstr "目录"
 
-#: builtin/fetch.c:179
+#: builtin/fetch.c:181
 msgid "prepend this to submodule path output"
 msgstr "在子模组路径输出的前面加上此目录"
 
-#: builtin/fetch.c:182
+#: builtin/fetch.c:184
 msgid ""
 "default for recursive fetching of submodules (lower priority than config "
 "files)"
 msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
 
-#: builtin/fetch.c:186 builtin/pull.c:234
+#: builtin/fetch.c:188 builtin/pull.c:224
 msgid "accept refs that update .git/shallow"
 msgstr "接受更新 .git/shallow 的引用"
 
-#: builtin/fetch.c:187 builtin/pull.c:236
+#: builtin/fetch.c:189 builtin/pull.c:226
 msgid "refmap"
 msgstr "引用映射"
 
-#: builtin/fetch.c:188 builtin/pull.c:237
+#: builtin/fetch.c:190 builtin/pull.c:227
 msgid "specify fetch refmap"
 msgstr "指定获取操作的引用映射"
 
-#: builtin/fetch.c:510
+#: builtin/fetch.c:514
 msgid "Couldn't find remote ref HEAD"
 msgstr "无法发现远程 HEAD 引用"
 
-#: builtin/fetch.c:650
+#: builtin/fetch.c:654
 #, c-format
 msgid "configuration fetch.output contains invalid value %s"
 msgstr "配置变量 fetch.output 包含无效值 %s"
 
-#: builtin/fetch.c:748
+#: builtin/fetch.c:752
 #, c-format
 msgid "object %s not found"
 msgstr "对象 %s 未发现"
 
-#: builtin/fetch.c:752
+#: builtin/fetch.c:756
 msgid "[up to date]"
 msgstr "[最新]"
 
-#: builtin/fetch.c:765 builtin/fetch.c:781 builtin/fetch.c:853
+#: builtin/fetch.c:769 builtin/fetch.c:785 builtin/fetch.c:857
 msgid "[rejected]"
 msgstr "[已拒绝]"
 
-#: builtin/fetch.c:766
+#: builtin/fetch.c:770
 msgid "can't fetch in current branch"
 msgstr "当前分支下不能执行获取操作"
 
-#: builtin/fetch.c:776
+#: builtin/fetch.c:780
 msgid "[tag update]"
 msgstr "[标签更新]"
 
-#: builtin/fetch.c:777 builtin/fetch.c:814 builtin/fetch.c:836
-#: builtin/fetch.c:848
+#: builtin/fetch.c:781 builtin/fetch.c:818 builtin/fetch.c:840
+#: builtin/fetch.c:852
 msgid "unable to update local ref"
 msgstr "不能更新本地引用"
 
-#: builtin/fetch.c:803
+#: builtin/fetch.c:807
 msgid "[new tag]"
 msgstr "[新标签]"
 
-#: builtin/fetch.c:806
+#: builtin/fetch.c:810
 msgid "[new branch]"
 msgstr "[新分支]"
 
-#: builtin/fetch.c:809
+#: builtin/fetch.c:813
 msgid "[new ref]"
 msgstr "[新引用]"
 
-#: builtin/fetch.c:848
+#: builtin/fetch.c:852
 msgid "forced update"
 msgstr "强制更新"
 
-#: builtin/fetch.c:853
+#: builtin/fetch.c:857
 msgid "non-fast-forward"
 msgstr "非快进"
 
-#: builtin/fetch.c:908
+#: builtin/fetch.c:914
 #, c-format
 msgid "%s did not send all necessary objects\n"
 msgstr "%s 未发送所有必需的对象\n"
 
-#: builtin/fetch.c:929
+#: builtin/fetch.c:935
 #, c-format
 msgid "reject %s because shallow roots are not allowed to be updated"
 msgstr "拒绝 %s 因为浅克隆不允许被更新"
 
-#: builtin/fetch.c:1020 builtin/fetch.c:1157
+#: builtin/fetch.c:1020 builtin/fetch.c:1158
 #, c-format
 msgid "From %.*s\n"
 msgstr "来自 %.*s\n"
@@ -8533,120 +8543,120 @@
 " 'git remote prune %s' 来删除旧的、有冲突的分支"
 
 #  译者：注意保持前导空格
-#: builtin/fetch.c:1127
+#: builtin/fetch.c:1128
 #, c-format
 msgid "   (%s will become dangling)"
 msgstr "   （%s 将成为悬空状态）"
 
 #  译者：注意保持前导空格
-#: builtin/fetch.c:1128
+#: builtin/fetch.c:1129
 #, c-format
 msgid "   (%s has become dangling)"
 msgstr "   （%s 已成为悬空状态）"
 
-#: builtin/fetch.c:1160
+#: builtin/fetch.c:1161
 msgid "[deleted]"
 msgstr "[已删除]"
 
-#: builtin/fetch.c:1161 builtin/remote.c:1036
+#: builtin/fetch.c:1162 builtin/remote.c:1112
 msgid "(none)"
 msgstr "（无）"
 
-#: builtin/fetch.c:1184
+#: builtin/fetch.c:1185
 #, c-format
 msgid "Refusing to fetch into current branch %s of non-bare repository"
 msgstr "拒绝获取到非纯仓库的当前分支 %s"
 
-#: builtin/fetch.c:1203
+#: builtin/fetch.c:1204
 #, c-format
 msgid "Option \"%s\" value \"%s\" is not valid for %s"
 msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
 
-#: builtin/fetch.c:1206
+#: builtin/fetch.c:1207
 #, c-format
 msgid "Option \"%s\" is ignored for %s\n"
 msgstr "选项 \"%s\" 为 %s 所忽略\n"
 
-#: builtin/fetch.c:1561 builtin/fetch.c:1623
+#: builtin/fetch.c:1562 builtin/fetch.c:1625
 #, c-format
 msgid "Fetching %s\n"
 msgstr "正在获取 %s\n"
 
-#: builtin/fetch.c:1571 builtin/fetch.c:1625 builtin/remote.c:100
+#: builtin/fetch.c:1572 builtin/fetch.c:1627 builtin/remote.c:101
 #, c-format
 msgid "Could not fetch %s"
 msgstr "不能获取 %s"
 
-#: builtin/fetch.c:1325 builtin/fetch.c:1498
+#: builtin/fetch.c:1481 builtin/fetch.c:1649
 msgid ""
 "--filter can only be used with the remote configured in core.partialClone"
 msgstr "只可以将 --filter 用于在 core.partialClone 中配置的远程仓库"
 
-#: builtin/fetch.c:1685
+#: builtin/fetch.c:1687
 msgid ""
 "No remote repository specified.  Please, specify either a URL or a\n"
 "remote name from which new revisions should be fetched."
 msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
 
-#: builtin/fetch.c:1722
+#: builtin/fetch.c:1724
 msgid "You need to specify a tag name."
 msgstr "您需要指定一个标签名称。"
 
-#: builtin/fetch.c:1774
+#: builtin/fetch.c:1773
 msgid "Negative depth in --deepen is not supported"
 msgstr "--deepen 不支持负数深度"
 
-#: builtin/fetch.c:1776
+#: builtin/fetch.c:1775
 msgid "--deepen and --depth are mutually exclusive"
 msgstr "--deepen 和 --depth 是互斥的"
 
-#: builtin/fetch.c:1781
+#: builtin/fetch.c:1780
 msgid "--depth and --unshallow cannot be used together"
 msgstr "--depth 和 --unshallow 不能同时使用"
 
-#: builtin/fetch.c:1783
+#: builtin/fetch.c:1782
 msgid "--unshallow on a complete repository does not make sense"
 msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
 
-#: builtin/fetch.c:1799
+#: builtin/fetch.c:1798
 msgid "fetch --all does not take a repository argument"
 msgstr "fetch --all 不能带一个仓库参数"
 
-#: builtin/fetch.c:1801
+#: builtin/fetch.c:1800
 msgid "fetch --all does not make sense with refspecs"
 msgstr "fetch --all 带引用规格没有任何意义"
 
-#: builtin/fetch.c:1810
+#: builtin/fetch.c:1809
 #, c-format
 msgid "No such remote or remote group: %s"
 msgstr "没有这样的远程或远程组：%s"
 
-#: builtin/fetch.c:1817
+#: builtin/fetch.c:1816
 msgid "Fetching a group and specifying refspecs does not make sense"
 msgstr "获取组并指定引用规格没有意义"
 
-#: builtin/fmt-merge-msg.c:18
+#: builtin/fmt-merge-msg.c:7
 msgid ""
 "git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
 msgstr "git fmt-merge-msg [-m <说明>] [--log[=<n>] | --no-log] [--file <文件>]"
 
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:18
 msgid "populate log with at most <n> entries from shortlog"
 msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
 
-#: builtin/fmt-merge-msg.c:675
+#: builtin/fmt-merge-msg.c:21
 msgid "alias for --log (deprecated)"
 msgstr "参数 --log 的别名（已弃用）"
 
-#: builtin/fmt-merge-msg.c:678
+#: builtin/fmt-merge-msg.c:24
 msgid "text"
 msgstr "文本"
 
-#: builtin/fmt-merge-msg.c:679
+#: builtin/fmt-merge-msg.c:25
 msgid "use <text> as start of message"
 msgstr "使用 <文本> 作为提交说明的开始"
 
-#: builtin/fmt-merge-msg.c:680
+#: builtin/fmt-merge-msg.c:26
 msgid "file to read from"
 msgstr "从文件中读取"
 
@@ -8686,7 +8696,7 @@
 msgid "show only <n> matched refs"
 msgstr "只显示 <n> 个匹配的引用"
 
-#: builtin/for-each-ref.c:39 builtin/tag.c:439
+#: builtin/for-each-ref.c:39 builtin/tag.c:440
 msgid "respect format colors"
 msgstr "遵照格式中的颜色输出"
 
@@ -8710,63 +8720,63 @@
 msgid "print only refs which don't contain the commit"
 msgstr "只打印不包含该提交的引用"
 
-#: builtin/fsck.c:685
+#: builtin/fsck.c:676
 msgid "Checking object directories"
 msgstr "正在检查对象目录"
 
-#: builtin/fsck.c:781
+#: builtin/fsck.c:770
 msgid "git fsck [<options>] [<object>...]"
 msgstr "git fsck [<选项>] [<对象>...]"
 
-#: builtin/fsck.c:787
+#: builtin/fsck.c:776
 msgid "show unreachable objects"
 msgstr "显示不可达的对象"
 
-#: builtin/fsck.c:788
+#: builtin/fsck.c:777
 msgid "show dangling objects"
 msgstr "显示悬空的对象"
 
-#: builtin/fsck.c:789
+#: builtin/fsck.c:778
 msgid "report tags"
 msgstr "报告标签"
 
-#: builtin/fsck.c:790
+#: builtin/fsck.c:779
 msgid "report root nodes"
 msgstr "报告根节点"
 
-#: builtin/fsck.c:791
+#: builtin/fsck.c:780
 msgid "make index objects head nodes"
 msgstr "将索引亦作为检查的头节点"
 
-#: builtin/fsck.c:792
+#: builtin/fsck.c:781
 msgid "make reflogs head nodes (default)"
 msgstr "将引用日志作为检查的头节点（默认）"
 
-#: builtin/fsck.c:793
+#: builtin/fsck.c:782
 msgid "also consider packs and alternate objects"
 msgstr "也考虑包和备用对象"
 
-#: builtin/fsck.c:794
+#: builtin/fsck.c:783
 msgid "check only connectivity"
 msgstr "仅检查连通性"
 
-#: builtin/fsck.c:795
+#: builtin/fsck.c:784
 msgid "enable more strict checking"
 msgstr "启用更严格的检查"
 
-#: builtin/fsck.c:797
+#: builtin/fsck.c:786
 msgid "write dangling objects in .git/lost-found"
 msgstr "将悬空对象写入 .git/lost-found 中"
 
-#: builtin/fsck.c:798 builtin/prune.c:132
+#: builtin/fsck.c:787 builtin/prune.c:134
 msgid "show progress"
 msgstr "显示进度"
 
-#: builtin/fsck.c:799
+#: builtin/fsck.c:788
 msgid "show verbose names for reachable objects"
 msgstr "显示可达对象的详细名称"
 
-#: builtin/fsck.c:859 builtin/index-pack.c:225
+#: builtin/fsck.c:847 builtin/index-pack.c:225
 msgid "Checking objects"
 msgstr "正在检查对象"
 
@@ -8845,7 +8855,7 @@
 "There are too many unreachable loose objects; run 'git prune' to remove them."
 msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
 
-#: builtin/grep.c:29
+#: builtin/grep.c:30
 msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
 msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
 
@@ -8863,227 +8873,227 @@
 #. variable for tweaking threads, currently
 #. grep.threads
 #. 
-#: builtin/grep.c:287 builtin/index-pack.c:1534 builtin/index-pack.c:1727
-#: builtin/pack-objects.c:2708
+#: builtin/grep.c:287 builtin/index-pack.c:1537 builtin/index-pack.c:1730
+#: builtin/pack-objects.c:2855
 #, c-format
 msgid "no threads support, ignoring %s"
 msgstr "没有线程支持，忽略 %s"
 
-#: builtin/grep.c:467 builtin/grep.c:592 builtin/grep.c:635
+#: builtin/grep.c:475 builtin/grep.c:600 builtin/grep.c:640
 #, c-format
 msgid "unable to read tree (%s)"
 msgstr "无法读取树（%s）"
 
-#: builtin/grep.c:650
+#: builtin/grep.c:655
 #, c-format
 msgid "unable to grep from object of type %s"
 msgstr "无法抓取来自于 %s 类型的对象"
 
-#: builtin/grep.c:716
+#: builtin/grep.c:724
 #, c-format
 msgid "switch `%c' expects a numerical value"
 msgstr "开关 `%c' 期望一个数字值"
 
-#: builtin/grep.c:815
+#: builtin/grep.c:823
 msgid "search in index instead of in the work tree"
 msgstr "在索引区搜索而不是在工作区"
 
-#: builtin/grep.c:817
+#: builtin/grep.c:825
 msgid "find in contents not managed by git"
 msgstr "在未被 git 管理的内容中查找"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:819
+#: builtin/grep.c:827
 msgid "search in both tracked and untracked files"
 msgstr "在跟踪和未跟踪的文件中搜索"
 
-#: builtin/grep.c:821
+#: builtin/grep.c:829
 msgid "ignore files specified via '.gitignore'"
 msgstr "忽略 '.gitignore' 包含的文件"
 
-#: builtin/grep.c:823
+#: builtin/grep.c:831
 msgid "recursively search in each submodule"
 msgstr "在每一个子模组中递归搜索"
 
-#: builtin/grep.c:826
+#: builtin/grep.c:834
 msgid "show non-matching lines"
 msgstr "显示未匹配的行"
 
-#: builtin/grep.c:828
+#: builtin/grep.c:836
 msgid "case insensitive matching"
 msgstr "不区分大小写匹配"
 
-#: builtin/grep.c:830
+#: builtin/grep.c:838
 msgid "match patterns only at word boundaries"
 msgstr "只在单词边界匹配模式"
 
-#: builtin/grep.c:832
+#: builtin/grep.c:840
 msgid "process binary files as text"
 msgstr "把二进制文件当做文本处理"
 
-#: builtin/grep.c:834
+#: builtin/grep.c:842
 msgid "don't match patterns in binary files"
 msgstr "不在二进制文件中匹配模式"
 
-#: builtin/grep.c:837
+#: builtin/grep.c:845
 msgid "process binary files with textconv filters"
 msgstr "用 textconv 过滤器处理二进制文件"
 
-#: builtin/grep.c:841
+#: builtin/grep.c:849
 msgid "descend at most <depth> levels"
 msgstr "最多以指定的深度向下寻找"
 
-#: builtin/grep.c:845
+#: builtin/grep.c:853
 msgid "use extended POSIX regular expressions"
 msgstr "使用扩展的 POSIX 正则表达式"
 
-#: builtin/grep.c:848
+#: builtin/grep.c:856
 msgid "use basic POSIX regular expressions (default)"
 msgstr "使用基本的 POSIX 正则表达式（默认）"
 
-#: builtin/grep.c:851
+#: builtin/grep.c:859
 msgid "interpret patterns as fixed strings"
 msgstr "把模式解析为固定的字符串"
 
-#: builtin/grep.c:854
+#: builtin/grep.c:862
 msgid "use Perl-compatible regular expressions"
 msgstr "使用 Perl 兼容的正则表达式"
 
-#: builtin/grep.c:857
+#: builtin/grep.c:865
 msgid "show line numbers"
 msgstr "显示行号"
 
-#: builtin/grep.c:859
+#: builtin/grep.c:867
 msgid "don't show filenames"
 msgstr "不显示文件名"
 
-#: builtin/grep.c:860
+#: builtin/grep.c:868
 msgid "show filenames"
 msgstr "显示文件名"
 
-#: builtin/grep.c:862
+#: builtin/grep.c:870
 msgid "show filenames relative to top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/grep.c:864
+#: builtin/grep.c:872
 msgid "show only filenames instead of matching lines"
 msgstr "只显示文件名而不显示匹配的行"
 
-#: builtin/grep.c:866
+#: builtin/grep.c:874
 msgid "synonym for --files-with-matches"
 msgstr "和 --files-with-matches 同义"
 
-#: builtin/grep.c:869
+#: builtin/grep.c:877
 msgid "show only the names of files without match"
 msgstr "只显示未匹配的文件名"
 
-#: builtin/grep.c:871
+#: builtin/grep.c:879
 msgid "print NUL after filenames"
 msgstr "在文件名后输出 NUL 字符"
 
-#: builtin/grep.c:876
+#: builtin/grep.c:884
 msgid "show the number of matches instead of matching lines"
 msgstr "显示总匹配行数，而不显示匹配的行"
 
-#: builtin/grep.c:877
+#: builtin/grep.c:885
 msgid "highlight matches"
 msgstr "高亮显示匹配项"
 
-#: builtin/grep.c:879
+#: builtin/grep.c:887
 msgid "print empty line between matches from different files"
 msgstr "在不同文件的匹配项之间打印空行"
 
-#: builtin/grep.c:881
+#: builtin/grep.c:889
 msgid "show filename only once above matches from same file"
 msgstr "只在同一文件的匹配项的上面显示一次文件名"
 
-#: builtin/grep.c:884
+#: builtin/grep.c:892
 msgid "show <n> context lines before and after matches"
 msgstr "显示匹配项前后的 <n> 行上下文"
 
-#: builtin/grep.c:887
+#: builtin/grep.c:895
 msgid "show <n> context lines before matches"
 msgstr "显示匹配项前 <n> 行上下文"
 
-#: builtin/grep.c:889
+#: builtin/grep.c:897
 msgid "show <n> context lines after matches"
 msgstr "显示匹配项后 <n> 行上下文"
 
-#: builtin/grep.c:891
+#: builtin/grep.c:899
 msgid "use <n> worker threads"
 msgstr "使用 <n> 个工作线程"
 
-#: builtin/grep.c:892
+#: builtin/grep.c:900
 msgid "shortcut for -C NUM"
 msgstr "快捷键 -C 数字"
 
-#: builtin/grep.c:895
+#: builtin/grep.c:903
 msgid "show a line with the function name before matches"
 msgstr "在匹配的前面显示一行函数名"
 
-#: builtin/grep.c:897
+#: builtin/grep.c:905
 msgid "show the surrounding function"
 msgstr "显示所在函数的前后内容"
 
-#: builtin/grep.c:900
+#: builtin/grep.c:908
 msgid "read patterns from file"
 msgstr "从文件读取模式"
 
-#: builtin/grep.c:902
+#: builtin/grep.c:910
 msgid "match <pattern>"
 msgstr "匹配 <模式>"
 
-#: builtin/grep.c:904
+#: builtin/grep.c:912
 msgid "combine patterns specified with -e"
 msgstr "组合用 -e 参数设定的模式"
 
-#: builtin/grep.c:916
+#: builtin/grep.c:924
 msgid "indicate hit with exit status without output"
 msgstr "不输出，而用退出码标识命中状态"
 
-#: builtin/grep.c:918
+#: builtin/grep.c:926
 msgid "show only matches from files that match all patterns"
 msgstr "只显示匹配所有模式的文件中的匹配"
 
-#: builtin/grep.c:920
+#: builtin/grep.c:928
 msgid "show parse tree for grep expression"
 msgstr "显示 grep 表达式的解析树"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:932
 msgid "pager"
 msgstr "分页"
 
-#: builtin/grep.c:924
+#: builtin/grep.c:932
 msgid "show matching files in the pager"
 msgstr "分页显示匹配的文件"
 
-#: builtin/grep.c:928
+#: builtin/grep.c:936
 msgid "allow calling of grep(1) (ignored by this build)"
 msgstr "允许调用 grep(1)（本次构建忽略）"
 
-#: builtin/grep.c:962
+#: builtin/grep.c:793
 msgid "no pattern given."
 msgstr "未提供模式匹配。"
 
-#: builtin/grep.c:1028
+#: builtin/grep.c:1039
 msgid "--no-index or --untracked cannot be used with revs"
 msgstr "--no-index 或 --untracked 不能和版本同时使用"
 
-#: builtin/grep.c:1036
+#: builtin/grep.c:1047
 #, c-format
 msgid "unable to resolve revision: %s"
 msgstr "不能解析版本：%s"
 
-#: builtin/grep.c:1073 builtin/index-pack.c:1531 builtin/pack-objects.c:2705
+#: builtin/grep.c:1087 builtin/index-pack.c:1534 builtin/pack-objects.c:2852
 #, c-format
 msgid "invalid number of threads specified (%d)"
 msgstr "指定的线程数无效（%d）"
 
-#: builtin/grep.c:1070 builtin/pack-objects.c:3400
+#: builtin/grep.c:1084 builtin/pack-objects.c:3548
 msgid "no threads support, ignoring --threads"
 msgstr "没有线程支持，忽略 --threads"
 
-#: builtin/grep.c:1096
+#: builtin/grep.c:1121
 msgid "--open-files-in-pager only works on the worktree"
 msgstr "--open-files-in-pager 仅用于工作区"
 
@@ -9091,15 +9101,15 @@
 msgid "option not supported with --recurse-submodules."
 msgstr "选项不支持和 --recurse-submodules 共用。"
 
-#: builtin/grep.c:1094
+#: builtin/grep.c:877
 msgid "--cached or --untracked cannot be used with --no-index."
 msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
 
-#: builtin/grep.c:1100
+#: builtin/grep.c:885
 msgid "--[no-]exclude-standard cannot be used for tracked contents."
 msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
 
-#: builtin/grep.c:1108
+#: builtin/grep.c:893
 msgid "both --cached and trees are given."
 msgstr "同时给出了 --cached 和树对象。"
 
@@ -9144,58 +9154,58 @@
 msgid "process file as it were from this path"
 msgstr "处理文件并假设其来自于此路径"
 
-#: builtin/help.c:46
+#: builtin/help.c:47
 msgid "print all available commands"
 msgstr "打印所有可用的命令"
 
-#: builtin/help.c:47
+#: builtin/help.c:48
 msgid "exclude guides"
 msgstr "排除向导"
 
-#: builtin/help.c:48
+#: builtin/help.c:49
 msgid "print list of useful guides"
 msgstr "显示有用的指南列表"
 
-#: builtin/help.c:51
+#: builtin/help.c:52
 msgid "show man page"
 msgstr "显示 man 手册"
 
-#: builtin/help.c:52
+#: builtin/help.c:53
 msgid "show manual in web browser"
 msgstr "在 web 浏览器中显示手册"
 
-#: builtin/help.c:54
+#: builtin/help.c:55
 msgid "show info page"
 msgstr "显示 info 手册"
 
-#: builtin/help.c:61
+#: builtin/help.c:62
 msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
 msgstr "git help [--all] [--guides] [--man | --web | --info] [<命令>]"
 
-#: builtin/help.c:77
+#: builtin/help.c:163
 #, c-format
 msgid "unrecognized help format '%s'"
 msgstr "未能识别的帮助格式 '%s'"
 
-#: builtin/help.c:104
+#: builtin/help.c:190
 msgid "Failed to start emacsclient."
 msgstr "无法启动 emacsclient。"
 
-#: builtin/help.c:117
+#: builtin/help.c:203
 msgid "Failed to parse emacsclient version."
 msgstr "无法解析 emacsclient 版本。"
 
-#: builtin/help.c:125
+#: builtin/help.c:211
 #, c-format
 msgid "emacsclient version '%d' too old (< 22)."
 msgstr "emacsclient 版本 '%d' 太老（< 22）。"
 
-#: builtin/help.c:143 builtin/help.c:165 builtin/help.c:175 builtin/help.c:183
+#: builtin/help.c:229 builtin/help.c:251 builtin/help.c:261 builtin/help.c:269
 #, c-format
 msgid "failed to exec '%s'"
 msgstr "执行 '%s' 失败"
 
-#: builtin/help.c:221
+#: builtin/help.c:307
 #, c-format
 msgid ""
 "'%s': path for unsupported man viewer.\n"
@@ -9204,7 +9214,7 @@
 "'%s'：不支持的 man 手册查看器的路径。\n"
 "请使用 'man.<工具>.cmd'。"
 
-#: builtin/help.c:233
+#: builtin/help.c:319
 #, c-format
 msgid ""
 "'%s': cmd for supported man viewer.\n"
@@ -9213,66 +9223,66 @@
 "'%s': 支持的 man 手册查看器命令。\n"
 "请使用 'man.<工具>.path'。"
 
-#: builtin/help.c:350
+#: builtin/help.c:436
 #, c-format
 msgid "'%s': unknown man viewer."
 msgstr "'%s'：未知的 man 查看器。"
 
-#: builtin/help.c:367
+#: builtin/help.c:453
 msgid "no man viewer handled the request"
 msgstr "没有 man 查看器处理此请求"
 
-#: builtin/help.c:375
+#: builtin/help.c:461
 msgid "no info viewer handled the request"
 msgstr "没有 info 查看器处理此请求"
 
-#: command-list.h:195
+#: command-list.h:197
 msgid "Defining attributes per path"
 msgstr "定义路径的属性"
 
-#: builtin/help.c:408
+#: builtin/help.c:412
 msgid "Everyday Git With 20 Commands Or So"
 msgstr "每一天 Git 常用的约 20 条命令"
 
-#: builtin/help.c:409
+#: builtin/help.c:413
 msgid "A Git glossary"
 msgstr "Git 词汇表"
 
-#: command-list.h:203
+#: command-list.h:206
 msgid "Specifies intentionally untracked files to ignore"
 msgstr "忽略指定的未跟踪文件"
 
-#: command-list.h:204
+#: command-list.h:207
 msgid "Defining submodule properties"
 msgstr "定义子模组属性"
 
-#: command-list.h:207
+#: command-list.h:210
 msgid "Specifying revisions and ranges for Git"
 msgstr "指定 Git 的版本和版本范围"
 
-#: builtin/help.c:413
+#: builtin/help.c:417
 msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
 msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
 
-#: command-list.h:210
+#: command-list.h:214
 msgid "An overview of recommended workflows with Git"
 msgstr "Git 推荐的工作流概览"
 
-#: builtin/help.c:426
+#: builtin/help.c:430
 msgid "The common Git guides are:\n"
 msgstr "最常用的 Git 向导有：\n"
 
-#: builtin/help.c:434 builtin/help.c:445 git.c:336
+#: builtin/help.c:520 builtin/help.c:531 git.c:337
 #, c-format
 msgid "'%s' is aliased to '%s'"
 msgstr "'%s' 是 '%s' 的别名"
 
-#: builtin/help.c:477 builtin/help.c:507
+#: builtin/help.c:563 builtin/help.c:593
 #, c-format
 msgid "usage: %s%s"
 msgstr "用法：%s%s"
 
-#: sha1-file.c:2213 builtin/index-pack.c:155
+#: sha1-file.c:2275 builtin/index-pack.c:155
 #, c-format
 msgid "unable to open %s"
 msgstr "不能打开 %s"
@@ -9310,15 +9320,15 @@
 msgid "used more bytes than were available"
 msgstr "用掉了超过可用的字节"
 
-#: builtin/index-pack.c:288 builtin/pack-objects.c:604
+#: builtin/index-pack.c:288 builtin/pack-objects.c:607
 msgid "pack too large for current definition of off_t"
 msgstr "包太大超过了当前 off_t 的定义"
 
-#: builtin/index-pack.c:291 builtin/unpack-objects.c:94
+#: builtin/index-pack.c:291 builtin/unpack-objects.c:95
 msgid "pack exceeds maximum allowed size"
 msgstr "包超过了最大允许值"
 
-#: commit-graph.c:1391 builtin/index-pack.c:306 builtin/repack.c:241
+#: builtin/index-pack.c:306 builtin/repack.c:250
 #, c-format
 msgid "unable to create '%s'"
 msgstr "不能创建 '%s'"
@@ -9374,304 +9384,304 @@
 msgid "serious inflate inconsistency"
 msgstr "解压缩严重的不一致"
 
-#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:764
-#: builtin/index-pack.c:803 builtin/index-pack.c:812
+#: builtin/index-pack.c:735 builtin/index-pack.c:741 builtin/index-pack.c:765
+#: builtin/index-pack.c:804 builtin/index-pack.c:813
 #, c-format
 msgid "SHA1 COLLISION FOUND WITH %s !"
 msgstr "发现 %s 出现 SHA1 冲突！"
 
-#: builtin/index-pack.c:738 builtin/pack-objects.c:157
-#: builtin/pack-objects.c:217 builtin/pack-objects.c:311
+#: builtin/index-pack.c:738 builtin/pack-objects.c:159
+#: builtin/pack-objects.c:219 builtin/pack-objects.c:314
 #, c-format
 msgid "unable to read %s"
 msgstr "不能读 %s"
 
-#: builtin/index-pack.c:801
+#: builtin/index-pack.c:802
 #, c-format
 msgid "cannot read existing object info %s"
 msgstr "不能读取现存对象信息 %s"
 
-#: builtin/index-pack.c:809
+#: builtin/index-pack.c:810
 #, c-format
 msgid "cannot read existing object %s"
 msgstr "不能读取现存对象 %s"
 
-#: builtin/index-pack.c:823
+#: builtin/index-pack.c:824
 #, c-format
 msgid "invalid blob object %s"
 msgstr "无效的数据对象 %s"
 
-#: builtin/fsck.c:705 builtin/index-pack.c:842
+#: builtin/fsck.c:696 builtin/index-pack.c:843
 #, c-format
 msgid "invalid %s"
 msgstr "无效的 %s"
 
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:843
 msgid "Error in object"
 msgstr "对象中出错"
 
-#: builtin/index-pack.c:847
+#: builtin/index-pack.c:848
 #, c-format
 msgid "Not all child objects of %s are reachable"
 msgstr "%s 的所有子对象并非都可达"
 
-#: builtin/index-pack.c:919 builtin/index-pack.c:950
+#: builtin/index-pack.c:920 builtin/index-pack.c:951
 msgid "failed to apply delta"
 msgstr "应用 delta 失败"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Receiving objects"
 msgstr "接收对象中"
 
-#: builtin/index-pack.c:1118
+#: builtin/index-pack.c:1121
 msgid "Indexing objects"
 msgstr "索引对象中"
 
-#: builtin/index-pack.c:1152
+#: builtin/index-pack.c:1155
 msgid "pack is corrupted (SHA1 mismatch)"
 msgstr "包冲突（SHA1 不匹配）"
 
-#: builtin/index-pack.c:1157
+#: builtin/index-pack.c:1160
 msgid "cannot fstat packfile"
 msgstr "不能对包文件调用 fstat"
 
-#: builtin/index-pack.c:1160
+#: builtin/index-pack.c:1163
 msgid "pack has junk at the end"
 msgstr "包的结尾有垃圾数据"
 
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1175
 msgid "confusion beyond insanity in parse_pack_objects()"
 msgstr "parse_pack_objects() 中遇到不可理喻的问题"
 
-#: builtin/index-pack.c:1195
+#: builtin/index-pack.c:1198
 msgid "Resolving deltas"
 msgstr "处理 delta 中"
 
-#: builtin/index-pack.c:1205 builtin/pack-objects.c:2481
+#: builtin/index-pack.c:1208 builtin/pack-objects.c:2616
 #, c-format
 msgid "unable to create thread: %s"
 msgstr "不能创建线程：%s"
 
-#: builtin/index-pack.c:1246
+#: builtin/index-pack.c:1249
 msgid "confusion beyond insanity"
 msgstr "不可理喻"
 
-#: builtin/index-pack.c:1252
+#: builtin/index-pack.c:1255
 #, c-format
 msgid "completed with %d local object"
 msgid_plural "completed with %d local objects"
 msgstr[0] "完成 %d 个本地对象"
 
-#: builtin/index-pack.c:1264
+#: builtin/index-pack.c:1267
 #, c-format
 msgid "Unexpected tail checksum for %s (disk corruption?)"
 msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
 
-#: builtin/index-pack.c:1268
+#: builtin/index-pack.c:1271
 #, c-format
 msgid "pack has %d unresolved delta"
 msgid_plural "pack has %d unresolved deltas"
 msgstr[0] "包有 %d 个未解决的 delta"
 
-#: builtin/index-pack.c:1292
+#: builtin/index-pack.c:1295
 #, c-format
 msgid "unable to deflate appended object (%d)"
 msgstr "不能压缩附加对象（%d）"
 
-#: builtin/index-pack.c:1388
+#: builtin/index-pack.c:1391
 #, c-format
 msgid "local object %s is corrupt"
 msgstr "本地对象 %s 已损坏"
 
-#: builtin/index-pack.c:1402
+#: builtin/index-pack.c:1405
 #, c-format
 msgid "packfile name '%s' does not end with '.pack'"
 msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
 
-#: builtin/index-pack.c:1427
+#: builtin/index-pack.c:1430
 #, c-format
 msgid "cannot write %s file '%s'"
 msgstr "无法写入 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1435
+#: builtin/index-pack.c:1438
 #, c-format
 msgid "cannot close written %s file '%s'"
 msgstr "无法关闭已写入的 %s 文件 '%s'"
 
-#: builtin/index-pack.c:1459
+#: builtin/index-pack.c:1462
 msgid "error while closing pack file"
 msgstr "关闭包文件时出错"
 
-#: builtin/index-pack.c:1473
+#: builtin/index-pack.c:1476
 msgid "cannot store pack file"
 msgstr "无法存储包文件"
 
-#: builtin/index-pack.c:1481
+#: builtin/index-pack.c:1484
 msgid "cannot store index file"
 msgstr "无法存储索引文件"
 
-#: builtin/index-pack.c:1525 builtin/pack-objects.c:2716
+#: builtin/index-pack.c:1528 builtin/pack-objects.c:2863
 #, c-format
 msgid "bad pack.indexversion=%<PRIu32>"
 msgstr "坏的 pack.indexversion=%<PRIu32>"
 
-#: builtin/index-pack.c:1593
+#: builtin/index-pack.c:1596
 #, c-format
 msgid "Cannot open existing pack file '%s'"
 msgstr "无法打开现存包文件 '%s'"
 
-#: builtin/index-pack.c:1595
+#: builtin/index-pack.c:1598
 #, c-format
 msgid "Cannot open existing pack idx file for '%s'"
 msgstr "无法为 %s 打开包索引文件"
 
-#: builtin/index-pack.c:1643
+#: builtin/index-pack.c:1646
 #, c-format
 msgid "non delta: %d object"
 msgid_plural "non delta: %d objects"
 msgstr[0] "非 delta：%d 个对象"
 
-#: builtin/index-pack.c:1650
+#: builtin/index-pack.c:1653
 #, c-format
 msgid "chain length = %d: %lu object"
 msgid_plural "chain length = %d: %lu objects"
 msgstr[0] "链长 = %d: %lu 对象"
 
-#: builtin/index-pack.c:1689
+#: builtin/index-pack.c:1692
 msgid "Cannot come back to cwd"
 msgstr "无法返回当前工作目录"
 
-#: builtin/index-pack.c:1738 builtin/index-pack.c:1741
-#: builtin/index-pack.c:1757 builtin/index-pack.c:1761
+#: builtin/index-pack.c:1741 builtin/index-pack.c:1744
+#: builtin/index-pack.c:1760 builtin/index-pack.c:1764
 #, c-format
 msgid "bad %s"
 msgstr "错误选项 %s"
 
-#: builtin/index-pack.c:1777
+#: builtin/index-pack.c:1780
 msgid "--fix-thin cannot be used without --stdin"
 msgstr "--fix-thin 不能和 --stdin 同时使用"
 
-#: builtin/index-pack.c:1779
+#: builtin/index-pack.c:1782
 msgid "--stdin requires a git repository"
 msgstr "--stdin 需要一个 git 仓库"
 
-#: builtin/index-pack.c:1785
+#: builtin/index-pack.c:1788
 msgid "--verify with no packfile name given"
 msgstr "--verify 没有提供包文件名参数"
 
-#: builtin/gc.c:475 builtin/init-db.c:55
+#: builtin/gc.c:475 builtin/init-db.c:57
 #, c-format
 msgid "cannot stat '%s'"
 msgstr "不能对 '%s' 调用 stat"
 
-#: builtin/init-db.c:61
+#: builtin/init-db.c:63
 #, c-format
 msgid "cannot stat template '%s'"
 msgstr "不能对模版 '%s' 调用 stat"
 
-#: builtin/init-db.c:66
+#: builtin/init-db.c:68
 #, c-format
 msgid "cannot opendir '%s'"
 msgstr "不能打开目录 '%s'"
 
-#: builtin/init-db.c:78
+#: builtin/init-db.c:80
 #, c-format
 msgid "cannot readlink '%s'"
 msgstr "不能读取链接 '%s'"
 
-#: builtin/init-db.c:80
+#: builtin/init-db.c:82
 #, c-format
 msgid "cannot symlink '%s' '%s'"
 msgstr "不能自 '%s' 到 '%s' 创建符号链接"
 
-#: builtin/init-db.c:86
+#: builtin/init-db.c:88
 #, c-format
 msgid "cannot copy '%s' to '%s'"
 msgstr "不能拷贝 '%s' 至 '%s'"
 
-#: builtin/init-db.c:90
+#: builtin/init-db.c:92
 #, c-format
 msgid "ignoring template %s"
 msgstr "忽略模版 %s"
 
-#: builtin/init-db.c:120
+#: builtin/init-db.c:118
 #, c-format
 msgid "templates not found %s"
 msgstr "模版未找到 %s"
 
-#: builtin/init-db.c:136
+#: builtin/init-db.c:138
 #, c-format
 msgid "not copying templates from '%s': %s"
 msgstr "没有从 '%s' 复制模版：%s"
 
-#: builtin/init-db.c:334
+#: builtin/init-db.c:356
 #, c-format
 msgid "unable to handle file type %d"
 msgstr "不能处理 %d 类型的文件"
 
-#: builtin/init-db.c:337
+#: builtin/init-db.c:359
 #, c-format
 msgid "unable to move %s to %s"
 msgstr "不能移动 %s 至 %s"
 
-#: builtin/init-db.c:354 builtin/init-db.c:357
+#: builtin/init-db.c:397 builtin/init-db.c:400
 #, c-format
 msgid "%s already exists"
 msgstr "%s 已经存在"
 
-#: builtin/init-db.c:413
+#: builtin/init-db.c:458
 #, c-format
 msgid "Reinitialized existing shared Git repository in %s%s\n"
 msgstr "重新初始化已存在的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:414
+#: builtin/init-db.c:459
 #, c-format
 msgid "Reinitialized existing Git repository in %s%s\n"
 msgstr "重新初始化已存在的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:418
+#: builtin/init-db.c:463
 #, c-format
 msgid "Initialized empty shared Git repository in %s%s\n"
 msgstr "已初始化空的共享 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:419
+#: builtin/init-db.c:464
 #, c-format
 msgid "Initialized empty Git repository in %s%s\n"
 msgstr "已初始化空的 Git 仓库于 %s%s\n"
 
-#: builtin/init-db.c:468
+#: builtin/init-db.c:513
 msgid ""
 "git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
 "shared[=<permissions>]] [<directory>]"
 msgstr ""
 "git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] [<目录>]"
 
-#: builtin/init-db.c:491
+#: builtin/init-db.c:538
 msgid "permissions"
 msgstr "权限"
 
-#: builtin/init-db.c:492
+#: builtin/init-db.c:539
 msgid "specify that the git repository is to be shared amongst several users"
 msgstr "指定 git 仓库是多个用户之间共享的"
 
-#: builtin/init-db.c:529 builtin/init-db.c:534
+#: builtin/init-db.c:578 builtin/init-db.c:583
 #, c-format
 msgid "cannot mkdir %s"
 msgstr "不能创建目录 %s"
 
-#: builtin/init-db.c:538
+#: builtin/init-db.c:587
 #, c-format
 msgid "cannot chdir to %s"
 msgstr "不能切换目录到 %s"
 
-#: builtin/init-db.c:559
+#: builtin/init-db.c:614
 #, c-format
 msgid ""
 "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
 "dir=<directory>)"
 msgstr "不允许 %s（或 --work-tree=<目录>）而没有指定 %s（或 --git-dir=<目录>）"
 
-#: builtin/init-db.c:587
+#: builtin/init-db.c:642
 #, c-format
 msgid "Cannot access work tree '%s'"
 msgstr "不能访问工作区 '%s'"
@@ -9736,120 +9746,120 @@
 msgid "no input file given for in-place editing"
 msgstr "没有给出要原位编辑的文件"
 
-#: builtin/log.c:55
+#: builtin/log.c:57
 msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
 msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
 
-#: builtin/log.c:56
+#: builtin/log.c:58
 msgid "git show [<options>] <object>..."
 msgstr "git show [<选项>] <对象>..."
 
-#: builtin/log.c:109
+#: builtin/log.c:111
 #, c-format
 msgid "invalid --decorate option: %s"
 msgstr "无效的 --decorate 选项：%s"
 
-#: diff.c:5278 builtin/log.c:172
+#: diff.c:5298 builtin/log.c:177
 msgid "suppress diff output"
 msgstr "不显示差异输出"
 
-#: builtin/log.c:173
+#: builtin/log.c:178
 msgid "show source"
 msgstr "显示源"
 
-#: builtin/log.c:174
+#: builtin/log.c:179
 msgid "Use mail map file"
 msgstr "使用邮件映射文件"
 
-#: builtin/log.c:176
+#: builtin/log.c:182
 msgid "only decorate refs that match <pattern>"
 msgstr "只修饰与 <模式> 匹配的引用"
 
-#: builtin/log.c:178
+#: builtin/log.c:184
 msgid "do not decorate refs that match <pattern>"
 msgstr "不修饰和 <模式> 匹配的引用"
 
-#: builtin/log.c:179
+#: builtin/log.c:185
 msgid "decorate options"
 msgstr "修饰选项"
 
-#: builtin/log.c:182
+#: builtin/log.c:188
 msgid "Process line range n,m in file, counting from 1"
 msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
 
-#: builtin/log.c:280
+#: builtin/log.c:298
 #, c-format
 msgid "Final output: %d %s\n"
 msgstr "最终输出：%d %s\n"
 
-#: builtin/log.c:534
+#: builtin/log.c:556
 #, c-format
 msgid "git show %s: bad file"
 msgstr "git show %s: 损坏的文件"
 
-#: builtin/log.c:525 builtin/log.c:619
+#: builtin/log.c:537 builtin/log.c:631
 #, c-format
 msgid "Could not read object %s"
 msgstr "不能读取对象 %s"
 
-#: builtin/log.c:643
+#: builtin/log.c:655
 #, c-format
 msgid "Unknown type: %d"
 msgstr "未知类型：%d"
 
-#: builtin/log.c:792
+#: builtin/log.c:842
 msgid "format.headers without value"
 msgstr "format.headers 没有值"
 
-#: builtin/log.c:909
+#: builtin/log.c:957
 msgid "name of output directory is too long"
 msgstr "输出目录名太长"
 
-#: builtin/log.c:881
+#: builtin/log.c:893
 #, c-format
 msgid "Cannot open patch file %s"
 msgstr "无法打开补丁文件 %s"
 
-#: builtin/log.c:898
+#: builtin/log.c:910
 msgid "Need exactly one range."
 msgstr "只需要一个范围。"
 
-#: builtin/log.c:908
+#: builtin/log.c:920
 msgid "Not a range."
 msgstr "不是一个范围。"
 
-#: builtin/log.c:1014
+#: builtin/log.c:1043
 msgid "Cover letter needs email format"
 msgstr "信封需要邮件地址格式"
 
-#: builtin/log.c:1160
+#: builtin/log.c:1249
 #, c-format
 msgid "insane in-reply-to: %s"
 msgstr "不正常的 in-reply-to：%s"
 
-#: builtin/log.c:1187
+#: builtin/log.c:1276
 msgid "git format-patch [<options>] [<since> | <revision-range>]"
 msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
 
-#: builtin/log.c:1172
+#: builtin/log.c:1204
 msgid "Two output directories?"
 msgstr "两个输出目录？"
 
-#: builtin/log.c:1279 builtin/log.c:1932 builtin/log.c:1934 builtin/log.c:1946
+#: builtin/log.c:1311 builtin/log.c:2054 builtin/log.c:2056 builtin/log.c:2068
 #, c-format
 msgid "Unknown commit %s"
 msgstr "未知提交 %s"
 
-#: builtin/notes.c:897 builtin/tag.c:545
+#: builtin/notes.c:897 builtin/tag.c:546
 #, c-format
 msgid "Failed to resolve '%s' as a valid ref."
 msgstr "无法解析 '%s' 为一个有效引用。"
 
-#: builtin/log.c:1294
+#: builtin/log.c:1326
 msgid "Could not find exact merge base."
 msgstr "不能找到准确的合并基线。"
 
-#: builtin/log.c:1298
+#: builtin/log.c:1330
 msgid ""
 "Failed to get upstream, if you want to record base commit automatically,\n"
 "please use git branch --set-upstream-to to track a remote branch.\n"
@@ -9859,180 +9869,180 @@
 "git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
 "参数 --base=<基线提交> 手动指定一个基线提交。"
 
-#: builtin/log.c:1318
+#: builtin/log.c:1350
 msgid "Failed to find exact merge base"
 msgstr "无法找到准确的合并基线"
 
-#: builtin/log.c:1406
+#: builtin/log.c:1495
 msgid "base commit should be the ancestor of revision list"
 msgstr "基线提交应该是版本列表的祖先"
 
-#: builtin/log.c:1410
+#: builtin/log.c:1499
 msgid "base commit shouldn't be in revision list"
 msgstr "基线提交不应该出现在版本列表中"
 
-#: builtin/log.c:1463
+#: builtin/log.c:1552
 msgid "cannot get patch id"
 msgstr "无法得到补丁 id"
 
-#: builtin/log.c:1560
+#: builtin/log.c:1650
 msgid "use [PATCH n/m] even with a single patch"
 msgstr "使用 [PATCH n/m]，即使只有一个补丁"
 
-#: builtin/log.c:1563
+#: builtin/log.c:1653
 msgid "use [PATCH] even with multiple patches"
 msgstr "使用 [PATCH]，即使有多个补丁"
 
-#: builtin/log.c:1567
+#: builtin/log.c:1657
 msgid "print patches to standard out"
 msgstr "打印补丁到标准输出"
 
-#: builtin/log.c:1569
+#: builtin/log.c:1659
 msgid "generate a cover letter"
 msgstr "生成一封附函"
 
-#: builtin/log.c:1571
+#: builtin/log.c:1661
 msgid "use simple number sequence for output file names"
 msgstr "使用简单的数字序列作为输出文件名"
 
-#: builtin/log.c:1572
+#: builtin/log.c:1662
 msgid "sfx"
 msgstr "后缀"
 
-#: builtin/log.c:1573
+#: builtin/log.c:1663
 msgid "use <sfx> instead of '.patch'"
 msgstr "使用 <后缀> 代替 '.patch'"
 
-#: builtin/log.c:1575
+#: builtin/log.c:1665
 msgid "start numbering patches at <n> instead of 1"
 msgstr "补丁以 <n> 开始编号，而不是1"
 
-#: builtin/log.c:1577
+#: builtin/log.c:1667
 msgid "mark the series as Nth re-roll"
 msgstr "标记补丁系列是第几次重制"
 
-#: builtin/log.c:1579
+#: builtin/log.c:1669
 msgid "Use [RFC PATCH] instead of [PATCH]"
 msgstr "使用 [RFC PATCH] 代替 [PATCH]"
 
-#: builtin/log.c:1582
+#: builtin/log.c:1675
 msgid "Use [<prefix>] instead of [PATCH]"
 msgstr "使用 [<前缀>] 代替 [PATCH]"
 
-#: builtin/log.c:1585
+#: builtin/log.c:1678
 msgid "store resulting files in <dir>"
 msgstr "把结果文件存储在 <目录>"
 
-#: builtin/log.c:1588
+#: builtin/log.c:1681
 msgid "don't strip/add [PATCH]"
 msgstr "不删除/添加 [PATCH]"
 
-#: builtin/log.c:1591
+#: builtin/log.c:1684
 msgid "don't output binary diffs"
 msgstr "不输出二进制差异"
 
-#: builtin/log.c:1593
+#: builtin/log.c:1686
 msgid "output all-zero hash in From header"
 msgstr "在 From 头信息中输出全为零的哈希值"
 
-#: builtin/log.c:1595
+#: builtin/log.c:1688
 msgid "don't include a patch matching a commit upstream"
 msgstr "不包含已在上游提交中的补丁"
 
-#: builtin/log.c:1597
+#: builtin/log.c:1690
 msgid "show patch format instead of default (patch + stat)"
 msgstr "显示纯补丁格式而非默认的（补丁+状态）"
 
-#: builtin/log.c:1599
+#: builtin/log.c:1692
 msgid "Messaging"
 msgstr "邮件发送"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1693
 msgid "header"
 msgstr "header"
 
-#: builtin/log.c:1601
+#: builtin/log.c:1694
 msgid "add email header"
 msgstr "添加邮件头"
 
-#: builtin/log.c:1602 builtin/log.c:1604
+#: builtin/log.c:1695 builtin/log.c:1696
 msgid "email"
 msgstr "邮件地址"
 
-#: builtin/log.c:1602
+#: builtin/log.c:1695
 msgid "add To: header"
 msgstr "添加收件人"
 
-#: builtin/log.c:1604
+#: builtin/log.c:1696
 msgid "add Cc: header"
 msgstr "添加抄送"
 
-#: builtin/log.c:1606
+#: builtin/log.c:1697
 msgid "ident"
 msgstr "标识"
 
-#: builtin/log.c:1607
+#: builtin/log.c:1698
 msgid "set From address to <ident> (or committer ident if absent)"
 msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
 
-#: builtin/log.c:1609
+#: builtin/log.c:1700
 msgid "message-id"
 msgstr "邮件标识"
 
-#: builtin/log.c:1610
+#: builtin/log.c:1701
 msgid "make first mail a reply to <message-id>"
 msgstr "使第一封邮件作为对 <邮件标识> 的回复"
 
-#: builtin/log.c:1611 builtin/log.c:1614
+#: builtin/log.c:1702 builtin/log.c:1705
 msgid "boundary"
 msgstr "边界"
 
-#: builtin/log.c:1612
+#: builtin/log.c:1703
 msgid "attach the patch"
 msgstr "附件方式添加补丁"
 
-#: builtin/log.c:1615
+#: builtin/log.c:1706
 msgid "inline the patch"
 msgstr "内联显示补丁"
 
-#: builtin/log.c:1619
+#: builtin/log.c:1710
 msgid "enable message threading, styles: shallow, deep"
 msgstr "启用邮件线索，风格：浅，深"
 
-#: builtin/log.c:1621
+#: builtin/log.c:1712
 msgid "signature"
 msgstr "签名"
 
-#: builtin/log.c:1622
+#: builtin/log.c:1713
 msgid "add a signature"
 msgstr "添加一个签名"
 
-#: builtin/log.c:1623
+#: builtin/log.c:1714
 msgid "base-commit"
 msgstr "基线提交"
 
-#: builtin/log.c:1624
+#: builtin/log.c:1715
 msgid "add prerequisite tree info to the patch series"
 msgstr "为补丁列表添加前置树信息"
 
-#: builtin/log.c:1626
+#: builtin/log.c:1717
 msgid "add a signature from a file"
 msgstr "从文件添加一个签名"
 
-#: builtin/log.c:1627
+#: builtin/log.c:1718
 msgid "don't print the patch filenames"
 msgstr "不要打印补丁文件名"
 
-#: builtin/log.c:1629
+#: builtin/log.c:1720
 msgid "show progress while generating patches"
 msgstr "在生成补丁时显示进度"
 
-#: builtin/log.c:1711
+#: builtin/log.c:1812
 #, c-format
 msgid "invalid ident line: %s"
 msgstr "包含无效的身份标识：%s"
 
-#: builtin/log.c:1600
+#: builtin/log.c:1362
 msgid "-n and -k are mutually exclusive."
 msgstr "-n 和 -k 互斥。"
 
@@ -10040,151 +10050,151 @@
 msgid "--subject-prefix/--rfc and -k are mutually exclusive."
 msgstr "--subject-prefix/--rfc 和 -k 互斥。"
 
-#: builtin/log.c:1736
+#: builtin/log.c:1837
 msgid "--name-only does not make sense"
 msgstr "--name-only 无意义"
 
-#: builtin/log.c:1738
+#: builtin/log.c:1839
 msgid "--name-status does not make sense"
 msgstr "--name-status 无意义"
 
-#: builtin/log.c:1740
+#: builtin/log.c:1841
 msgid "--check does not make sense"
 msgstr "--check 无意义"
 
-#: builtin/log.c:1773
+#: builtin/log.c:1874
 msgid "standard output, or directory, which one?"
 msgstr "标准输出或目录，哪一个？"
 
-#: builtin/log.c:1648
+#: builtin/log.c:1729
 #, c-format
 msgid "Could not create directory '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/log.c:1912
+#: builtin/log.c:2013
 #, c-format
 msgid "unable to read signature file '%s'"
 msgstr "无法读取签名文件 '%s'"
 
-#: builtin/log.c:1948
+#: builtin/log.c:2049
 msgid "Generating patches"
 msgstr "生成补丁"
 
-#: builtin/log.c:1817
+#: builtin/log.c:1931
 msgid "Failed to create output files"
 msgstr "无法创建输出文件"
 
-#: builtin/log.c:2051
+#: builtin/log.c:2152
 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
 msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
 
-#: builtin/log.c:2105
+#: builtin/log.c:2206
 #, c-format
 msgid ""
 "Could not find a tracked remote branch, please specify <upstream> manually.\n"
 msgstr "不能找到跟踪的远程分支，请手工指定 <上游>。\n"
 
-#: builtin/ls-files.c:470
+#: builtin/ls-files.c:471
 msgid "git ls-files [<options>] [<file>...]"
 msgstr "git ls-files [<选项>] [<文件>...]"
 
-#: builtin/ls-files.c:526
+#: builtin/ls-files.c:527
 msgid "identify the file status with tags"
 msgstr "用标签标识文件的状态"
 
-#: builtin/ls-files.c:528
+#: builtin/ls-files.c:529
 msgid "use lowercase letters for 'assume unchanged' files"
 msgstr "使用小写字母表示 '假设未改变的' 文件"
 
-#: builtin/ls-files.c:530
+#: builtin/ls-files.c:531
 msgid "use lowercase letters for 'fsmonitor clean' files"
 msgstr "使用小写字母表示 'fsmonitor clean' 文件"
 
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:533
 msgid "show cached files in the output (default)"
 msgstr "显示缓存的文件（默认）"
 
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:535
 msgid "show deleted files in the output"
 msgstr "显示已删除的文件"
 
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:537
 msgid "show modified files in the output"
 msgstr "显示已修改的文件"
 
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:539
 msgid "show other files in the output"
 msgstr "显示其它文件"
 
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:541
 msgid "show ignored files in the output"
 msgstr "显示忽略的文件"
 
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:544
 msgid "show staged contents' object name in the output"
 msgstr "显示暂存区内容的对象名称"
 
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:546
 msgid "show files on the filesystem that need to be removed"
 msgstr "显示文件系统需要删除的文件"
 
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:548
 msgid "show 'other' directories' names only"
 msgstr "只显示“其他”目录的名称"
 
-#: builtin/ls-files.c:549
+#: builtin/ls-files.c:550
 msgid "show line endings of files"
 msgstr "显示文件换行符格式"
 
-#: builtin/ls-files.c:551
+#: builtin/ls-files.c:552
 msgid "don't show empty directories"
 msgstr "不显示空目录"
 
-#: builtin/ls-files.c:554
+#: builtin/ls-files.c:555
 msgid "show unmerged files in the output"
 msgstr "显示未合并的文件"
 
-#: builtin/ls-files.c:556
+#: builtin/ls-files.c:557
 msgid "show resolve-undo information"
 msgstr "显示 resolve-undo 信息"
 
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:559
 msgid "skip files matching pattern"
 msgstr "匹配排除文件的模式"
 
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:562
 msgid "exclude patterns are read from <file>"
 msgstr "从 <文件> 中读取排除模式"
 
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:565
 msgid "read additional per-directory exclude patterns in <file>"
 msgstr "从 <文件> 读取额外的每个目录的排除模式"
 
-#: builtin/ls-files.c:566
+#: builtin/ls-files.c:567
 msgid "add the standard git exclusions"
 msgstr "添加标准的 git 排除"
 
-#: builtin/ls-files.c:570
+#: builtin/ls-files.c:571
 msgid "make the output relative to the project top directory"
 msgstr "显示相对于顶级目录的文件名"
 
-#: builtin/ls-files.c:573
+#: builtin/ls-files.c:574
 msgid "recurse through submodules"
 msgstr "在子模组中递归"
 
-#: builtin/ls-files.c:575
+#: builtin/ls-files.c:576
 msgid "if any <file> is not in the index, treat this as an error"
 msgstr "如果任何 <文件> 都不在索引区，视为错误"
 
-#: builtin/ls-files.c:576
+#: builtin/ls-files.c:577
 msgid "tree-ish"
-msgstr "树或提交"
+msgstr "树对象"
 
-#: builtin/ls-files.c:577
+#: builtin/ls-files.c:578
 msgid "pretend that paths removed since <tree-ish> are still present"
-msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
+msgstr "假装自从 <树对象> 之后删除的路径仍然存在"
 
-#: builtin/ls-files.c:579
+#: builtin/ls-files.c:580
 msgid "show debugging data"
 msgstr "显示调试数据"
 
@@ -10202,7 +10212,7 @@
 msgid "do not print remote URL"
 msgstr "不打印远程 URL"
 
-#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1488
+#: builtin/ls-remote.c:60 builtin/ls-remote.c:62 builtin/rebase.c:1384
 msgid "exec"
 msgstr "exec"
 
@@ -10236,7 +10246,7 @@
 
 #: builtin/ls-tree.c:30
 msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
-msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]"
+msgstr "git ls-tree [<选项>] <树对象> [<路径>...]"
 
 #: builtin/ls-tree.c:128
 msgid "only show trees"
@@ -10275,181 +10285,181 @@
 msgid "empty mbox: '%s'"
 msgstr "空的 mbox：'%s'"
 
-#: builtin/merge.c:55
+#: builtin/merge.c:56
 msgid "git merge [<options>] [<commit>...]"
 msgstr "git merge [<选项>] [<提交>...]"
 
-#: builtin/merge.c:56
+#: builtin/merge.c:57
 msgid "git merge --abort"
 msgstr "git merge --abort"
 
-#: builtin/merge.c:57
+#: builtin/merge.c:58
 msgid "git merge --continue"
 msgstr "git merge --continue"
 
-#: builtin/merge.c:118
+#: builtin/merge.c:121
 msgid "switch `m' requires a value"
 msgstr "开关 `m' 需要一个值"
 
-#: builtin/merge.c:187
+#: builtin/merge.c:190
 #, c-format
 msgid "Could not find merge strategy '%s'.\n"
 msgstr "不能找到合并策略 '%s'。\n"
 
-#: builtin/merge.c:188
+#: builtin/merge.c:191
 #, c-format
 msgid "Available strategies are:"
 msgstr "可用的策略有："
 
-#: builtin/merge.c:193
+#: builtin/merge.c:196
 #, c-format
 msgid "Available custom strategies are:"
 msgstr "可用的自定义策略有："
 
-#: builtin/merge.c:244 builtin/pull.c:152
+#: builtin/merge.c:247 builtin/pull.c:133
 msgid "do not show a diffstat at the end of the merge"
 msgstr "在合并的最后不显示差异统计"
 
-#: builtin/merge.c:247 builtin/pull.c:155
+#: builtin/merge.c:250 builtin/pull.c:136
 msgid "show a diffstat at the end of the merge"
 msgstr "在合并的最后显示差异统计"
 
-#: builtin/merge.c:248 builtin/pull.c:158
+#: builtin/merge.c:251 builtin/pull.c:139
 msgid "(synonym to --stat)"
 msgstr "（和 --stat 同义）"
 
-#: builtin/merge.c:250 builtin/pull.c:161
+#: builtin/merge.c:253 builtin/pull.c:142
 msgid "add (at most <n>) entries from shortlog to merge commit message"
 msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
 
-#: builtin/merge.c:253 builtin/pull.c:167
+#: builtin/merge.c:256 builtin/pull.c:148
 msgid "create a single commit instead of doing a merge"
 msgstr "创建一个单独的提交而不是做一次合并"
 
-#: builtin/merge.c:255 builtin/pull.c:170
+#: builtin/merge.c:258 builtin/pull.c:151
 msgid "perform a commit if the merge succeeds (default)"
 msgstr "如果合并成功，执行一次提交（默认）"
 
-#: builtin/merge.c:257 builtin/pull.c:173
+#: builtin/merge.c:260 builtin/pull.c:154
 msgid "edit message before committing"
 msgstr "在提交前编辑提交说明"
 
-#: builtin/merge.c:259
+#: builtin/merge.c:262
 msgid "allow fast-forward (default)"
 msgstr "允许快进（默认）"
 
-#: builtin/merge.c:261 builtin/pull.c:180
+#: builtin/merge.c:264 builtin/pull.c:161
 msgid "abort if fast-forward is not possible"
 msgstr "如果不能快进就放弃合并"
 
-#: builtin/merge.c:265 builtin/pull.c:183
+#: builtin/merge.c:268 builtin/pull.c:164
 msgid "verify that the named commit has a valid GPG signature"
 msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
 
-#: builtin/merge.c:266 builtin/notes.c:787 builtin/pull.c:187
-#: builtin/rebase.c:493 builtin/rebase.c:1501 builtin/revert.c:114
+#: builtin/merge.c:269 builtin/notes.c:787 builtin/pull.c:168
+#: builtin/rebase.c:527 builtin/rebase.c:1398 builtin/revert.c:114
 msgid "strategy"
 msgstr "策略"
 
-#: builtin/merge.c:267 builtin/pull.c:188
+#: builtin/merge.c:270 builtin/pull.c:169
 msgid "merge strategy to use"
 msgstr "要使用的合并策略"
 
-#: builtin/merge.c:268 builtin/pull.c:191
+#: builtin/merge.c:271 builtin/pull.c:172
 msgid "option=value"
 msgstr "option=value"
 
-#: builtin/merge.c:269 builtin/pull.c:192
+#: builtin/merge.c:272 builtin/pull.c:173
 msgid "option for selected merge strategy"
 msgstr "所选的合并策略的选项"
 
-#: builtin/merge.c:271
+#: builtin/merge.c:274
 msgid "merge commit message (for a non-fast-forward merge)"
 msgstr "合并的提交说明（针对非快进式合并）"
 
-#: builtin/merge.c:278
+#: builtin/merge.c:281
 msgid "abort the current in-progress merge"
 msgstr "放弃当前正在进行的合并"
 
-#: builtin/merge.c:282
+#: builtin/merge.c:285
 msgid "continue the current in-progress merge"
 msgstr "继续当前正在进行的合并"
 
-#: builtin/merge.c:284 builtin/pull.c:199
+#: builtin/merge.c:287 builtin/pull.c:180
 msgid "allow merging unrelated histories"
 msgstr "允许合并不相关的历史"
 
-#: builtin/merge.c:241
+#: builtin/merge.c:277
 msgid "verify commit-msg hook"
 msgstr "校验 commit-msg 钩子"
 
-#: builtin/merge.c:307
+#: builtin/merge.c:311
 msgid "could not run stash."
 msgstr "不能运行贮藏。"
 
-#: builtin/merge.c:312
+#: builtin/merge.c:316
 msgid "stash failed"
 msgstr "贮藏失败"
 
-#: builtin/merge.c:317
+#: builtin/merge.c:321
 #, c-format
 msgid "not a valid object: %s"
 msgstr "不是一个有效对象：%s"
 
-#: builtin/merge.c:339 builtin/merge.c:356
+#: builtin/merge.c:343 builtin/merge.c:360
 msgid "read-tree failed"
 msgstr "读取树失败"
 
 #  译者：注意保持前导空格
-#: builtin/merge.c:386
+#: builtin/merge.c:390
 msgid " (nothing to squash)"
 msgstr " （无可压缩）"
 
-#: builtin/merge.c:397
+#: builtin/merge.c:401
 #, c-format
 msgid "Squash commit -- not updating HEAD\n"
 msgstr "压缩提交 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:447
+#: builtin/merge.c:451
 #, c-format
 msgid "No merge message -- not updating HEAD\n"
 msgstr "无合并信息 -- 未更新 HEAD\n"
 
-#: builtin/merge.c:498
+#: builtin/merge.c:502
 #, c-format
 msgid "'%s' does not point to a commit"
 msgstr "'%s' 没有指向一个提交"
 
-#: builtin/merge.c:585
+#: builtin/merge.c:589
 #, c-format
 msgid "Bad branch.%s.mergeoptions string: %s"
 msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
 
-#: builtin/merge.c:705
+#: builtin/merge.c:716
 msgid "Not handling anything other than two heads merge."
 msgstr "未处理两个头合并之外的任何操作。"
 
-#: builtin/merge.c:719
+#: builtin/merge.c:730
 #, c-format
 msgid "Unknown option for merge-recursive: -X%s"
 msgstr "merge-recursive 的未知选项：-X%s"
 
-#: builtin/merge.c:734
+#: builtin/merge.c:745
 #, c-format
 msgid "unable to write %s"
 msgstr "不能写 %s"
 
-#: builtin/merge.c:786
+#: builtin/merge.c:797
 #, c-format
 msgid "Could not read from '%s'"
 msgstr "不能从 '%s' 读取"
 
-#: builtin/merge.c:795
+#: builtin/merge.c:806
 #, c-format
 msgid "Not committing merge; use 'git commit' to complete the merge.\n"
 msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
 
-#: builtin/merge.c:764
+#: builtin/merge.c:797
 #, c-format
 msgid ""
 "Please enter a commit message to explain why this merge is necessary,\n"
@@ -10463,68 +10473,68 @@
 "\n"
 "以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
 
-#: builtin/merge.c:862
+#: builtin/merge.c:873
 msgid "Empty commit message."
 msgstr "空提交信息。"
 
-#: builtin/merge.c:877
+#: builtin/merge.c:888
 #, c-format
 msgid "Wonderful.\n"
 msgstr "太棒了。\n"
 
-#: builtin/merge.c:938
+#: builtin/merge.c:949
 #, c-format
 msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
 msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
 
-#: builtin/merge.c:977
+#: builtin/merge.c:988
 msgid "No current branch."
 msgstr "没有当前分支。"
 
-#: builtin/merge.c:979
+#: builtin/merge.c:990
 msgid "No remote for the current branch."
 msgstr "当前分支没有对应的远程仓库。"
 
-#: builtin/merge.c:981
+#: builtin/merge.c:992
 msgid "No default upstream defined for the current branch."
 msgstr "当前分支没有定义默认的上游分支。"
 
-#: builtin/merge.c:986
+#: builtin/merge.c:997
 #, c-format
 msgid "No remote-tracking branch for %s from %s"
 msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
 
-#: builtin/merge.c:1043
+#: builtin/merge.c:1054
 #, c-format
 msgid "Bad value '%s' in environment '%s'"
 msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
 
-#: builtin/merge.c:1146
+#: builtin/merge.c:1157
 #, c-format
 msgid "not something we can merge in %s: %s"
 msgstr "不能在 %s 中合并：%s"
 
-#: builtin/merge.c:1180
+#: builtin/merge.c:1191
 msgid "not something we can merge"
 msgstr "不能合并"
 
-#: builtin/merge.c:1283
+#: builtin/merge.c:1295
 msgid "--abort expects no arguments"
 msgstr "--abort 不带参数"
 
-#: builtin/merge.c:1287
+#: builtin/merge.c:1299
 msgid "There is no merge to abort (MERGE_HEAD missing)."
 msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1309
+#: builtin/merge.c:1330
 msgid "--continue expects no arguments"
 msgstr "--continue 不带参数"
 
-#: builtin/merge.c:1313
+#: builtin/merge.c:1334
 msgid "There is no merge in progress (MERGE_HEAD missing)."
 msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
 
-#: builtin/merge.c:1329
+#: builtin/merge.c:1350
 msgid ""
 "You have not concluded your merge (MERGE_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10532,7 +10542,7 @@
 "您尚未结束您的合并（存在 MERGE_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c:1336
+#: builtin/merge.c:1357
 msgid ""
 "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
 "Please, commit your changes before you merge."
@@ -10540,112 +10550,112 @@
 "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
 "请在合并前先提交您的修改。"
 
-#: builtin/merge.c:1339
+#: builtin/merge.c:1360
 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
 msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
 
-#: builtin/merge.c:1353
+#: builtin/merge.c:1374
 msgid "You cannot combine --squash with --no-ff."
 msgstr "您不能将 --squash 和 --no-ff 组合使用。"
 
-#: builtin/merge.c:1371
+#: builtin/merge.c:1392
 msgid "No commit specified and merge.defaultToUpstream not set."
 msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
 
-#: builtin/merge.c:1388
+#: builtin/merge.c:1409
 msgid "Squash commit into empty head not supported yet"
 msgstr "尚不支持到空分支的压缩提交"
 
-#: builtin/merge.c:1390
+#: builtin/merge.c:1411
 msgid "Non-fast-forward commit does not make sense into an empty head"
 msgstr "到空分支的非快进式提交没有意义"
 
-#: builtin/merge.c:1395
+#: builtin/merge.c:1416
 #, c-format
 msgid "%s - not something we can merge"
 msgstr "%s - 不能被合并"
 
-#: builtin/merge.c:1397
+#: builtin/merge.c:1418
 msgid "Can merge only exactly one commit into empty head"
 msgstr "只能将一个提交合并到空分支上"
 
-#: commit.c:1128
+#: commit.c:1168
 #, c-format
 msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
 msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
 
-#: commit.c:1131
+#: commit.c:1172
 #, c-format
 msgid "Commit %s has a bad GPG signature allegedly by %s."
 msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
 
-#: commit.c:1134
+#: commit.c:1175
 #, c-format
 msgid "Commit %s does not have a GPG signature."
 msgstr "提交 %s 没有 GPG 签名。"
 
-#: commit.c:1137
+#: commit.c:1178
 #, c-format
 msgid "Commit %s has a good GPG signature by %s\n"
 msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
 
-#: builtin/merge.c:1476
+#: builtin/merge.c:1499
 msgid "refusing to merge unrelated histories"
 msgstr "拒绝合并无关的历史"
 
-#: builtin/merge.c:1485
+#: builtin/merge.c:1508
 msgid "Already up to date."
 msgstr "已经是最新的。"
 
-#: builtin/merge.c:1495
+#: builtin/merge.c:1518
 #, c-format
 msgid "Updating %s..%s\n"
 msgstr "更新 %s..%s\n"
 
-#: builtin/merge.c:1537
+#: builtin/merge.c:1564
 #, c-format
 msgid "Trying really trivial in-index merge...\n"
 msgstr "尝试非常小的索引内合并...\n"
 
-#: builtin/merge.c:1544
+#: builtin/merge.c:1571
 #, c-format
 msgid "Nope.\n"
 msgstr "无。\n"
 
-#: builtin/merge.c:1569
+#: builtin/merge.c:1596
 msgid "Already up to date. Yeeah!"
 msgstr "已经是最新的。耶！"
 
-#: builtin/merge.c:1575
+#: builtin/merge.c:1602
 msgid "Not possible to fast-forward, aborting."
 msgstr "无法快进，终止。"
 
-#: builtin/merge.c:1598 builtin/merge.c:1663
+#: builtin/merge.c:1630 builtin/merge.c:1695
 #, c-format
 msgid "Rewinding the tree to pristine...\n"
 msgstr "将树回滚至原始状态...\n"
 
-#: builtin/merge.c:1602
+#: builtin/merge.c:1634
 #, c-format
 msgid "Trying merge strategy %s...\n"
 msgstr "尝试合并策略 %s...\n"
 
-#: builtin/merge.c:1654
+#: builtin/merge.c:1686
 #, c-format
 msgid "No merge strategy handled the merge.\n"
 msgstr "没有合并策略处理此合并。\n"
 
-#: builtin/merge.c:1656
+#: builtin/merge.c:1688
 #, c-format
 msgid "Merge with strategy %s failed.\n"
 msgstr "使用策略 %s 合并失败。\n"
 
-#: builtin/merge.c:1665
+#: builtin/merge.c:1697
 #, c-format
 msgid "Using the %s to prepare resolving by hand.\n"
 msgstr "使用 %s 以准备手工解决。\n"
 
-#: builtin/merge.c:1677
+#: builtin/merge.c:1711
 #, c-format
 msgid "Automatic merge went well; stopped before committing as requested\n"
 msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -10670,32 +10680,32 @@
 msgid "git merge-base --fork-point <ref> [<commit>]"
 msgstr "git merge-base --fork-point <引用> [<提交>]"
 
-#: builtin/merge-base.c:153
+#: builtin/merge-base.c:143
 msgid "output all common ancestors"
 msgstr "输出所有共同的祖先"
 
-#: builtin/merge-base.c:155
+#: builtin/merge-base.c:145
 msgid "find ancestors for a single n-way merge"
 msgstr "查找一个多路合并的祖先提交"
 
-#: builtin/merge-base.c:157
+#: builtin/merge-base.c:147
 msgid "list revs not reachable from others"
 msgstr "显示不能被其他访问到的版本"
 
-#: builtin/merge-base.c:159
+#: builtin/merge-base.c:149
 msgid "is the first one ancestor of the other?"
 msgstr "第一个是其他的祖先提交么？"
 
-#: builtin/merge-base.c:161
+#: builtin/merge-base.c:151
 msgid "find where <commit> forked from reflog of <ref>"
-msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
+msgstr "根据 <引用> 的引用日志查找 <提交> 的分叉点"
 
 #: builtin/merge-file.c:9
 msgid ""
 "git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
 "<orig-file> <file2>"
 msgstr ""
-"git merge-file [<选项>] [-L <文件1> [-L <初始> [-L <名字2>]]] <文件1> <初始文件> <文件2>"
+"git merge-file [<选项>] [-L <名字1> [-L <初始名字> [-L <名字2>]]] <文件1> <初始文件> <文件2>"
 
 #: builtin/merge-file.c:35
 msgid "send results to standard output"
@@ -10862,52 +10872,52 @@
 msgid "Renaming %s to %s\n"
 msgstr "重命名 %s 至 %s\n"
 
-#: builtin/mv.c:277 builtin/remote.c:717 builtin/repack.c:511
+#: builtin/mv.c:277 builtin/remote.c:781 builtin/repack.c:520
 #, c-format
 msgid "renaming '%s' failed"
 msgstr "重命名 '%s' 失败"
 
-#: builtin/name-rev.c:356
+#: builtin/name-rev.c:465
 msgid "git name-rev [<options>] <commit>..."
 msgstr "git name-rev [<选项>] <提交>..."
 
-#: builtin/name-rev.c:357
+#: builtin/name-rev.c:466
 msgid "git name-rev [<options>] --all"
 msgstr "git name-rev [<选项>] --all"
 
-#: builtin/name-rev.c:358
+#: builtin/name-rev.c:467
 msgid "git name-rev [<options>] --stdin"
 msgstr "git name-rev [<选项>] --stdin"
 
-#: builtin/name-rev.c:415
+#: builtin/name-rev.c:524
 msgid "print only names (no SHA-1)"
 msgstr "只打印名称（无 SHA-1）"
 
-#: builtin/name-rev.c:416
+#: builtin/name-rev.c:525
 msgid "only use tags to name the commits"
 msgstr "只使用标签来命名提交"
 
-#: builtin/name-rev.c:418
+#: builtin/name-rev.c:527
 msgid "only use refs matching <pattern>"
 msgstr "只使用和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c:420
+#: builtin/name-rev.c:529
 msgid "ignore refs matching <pattern>"
 msgstr "忽略和 <模式> 相匹配的引用"
 
-#: builtin/name-rev.c:422
+#: builtin/name-rev.c:531
 msgid "list all commits reachable from all refs"
 msgstr "列出可以从所有引用访问的提交"
 
-#: builtin/name-rev.c:423
+#: builtin/name-rev.c:532
 msgid "read from stdin"
 msgstr "从标准输入读取"
 
-#: builtin/name-rev.c:424
+#: builtin/name-rev.c:533
 msgid "allow to print `undefined` names (default)"
 msgstr "允许打印 `未定义` 的名称（默认）"
 
-#: builtin/name-rev.c:430
+#: builtin/name-rev.c:539
 msgid "dereference tags in the input (internal use)"
 msgstr "反向解析输入中的标签（内部使用）"
 
@@ -11051,12 +11061,12 @@
 msgid "the note contents have been left in %s"
 msgstr "注解内容被留在 %s 中"
 
-#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:529
+#: builtin/gc.c:484 builtin/notes.c:240 builtin/tag.c:530
 #, c-format
 msgid "cannot read '%s'"
 msgstr "不能读取 '%s'"
 
-#: builtin/notes.c:242 builtin/tag.c:532
+#: builtin/notes.c:242 builtin/tag.c:533
 #, c-format
 msgid "could not open or read '%s'"
 msgstr "不能打开或读取 '%s'"
@@ -11294,7 +11304,7 @@
 msgid "read object names from the standard input"
 msgstr "从标准输入读取对象名称"
 
-#: builtin/notes.c:954 builtin/prune.c:130 builtin/worktree.c:164
+#: builtin/notes.c:954 builtin/prune.c:132 builtin/worktree.c:164
 msgid "do not remove, show only"
 msgstr "不删除，只显示"
 
@@ -11310,201 +11320,201 @@
 msgid "use notes from <notes-ref>"
 msgstr "从 <注解引用> 使用注解"
 
-#: builtin/notes.c:1034 builtin/stash.c:1607
+#: builtin/notes.c:1034 builtin/stash.c:1608
 #, c-format
 msgid "unknown subcommand: %s"
 msgstr "未知子命令：%s"
 
-#: builtin/pack-objects.c:52
+#: builtin/pack-objects.c:53
 msgid ""
 "git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
 
-#: builtin/pack-objects.c:53
+#: builtin/pack-objects.c:54
 msgid ""
 "git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
 msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
 
-#: archive-zip.c:474 builtin/pack-objects.c:230 builtin/pack-objects.c:233
+#: archive-zip.c:480 builtin/pack-objects.c:232 builtin/pack-objects.c:235
 #, c-format
 msgid "deflate error (%d)"
 msgstr "压缩错误 (%d)"
 
-#: builtin/pack-objects.c:841
+#: builtin/pack-objects.c:973
 msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
 msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
 
-#: builtin/pack-objects.c:854
+#: builtin/pack-objects.c:986
 msgid "Writing objects"
 msgstr "写入对象中"
 
-#: builtin/pack-objects.c:1164
+#: builtin/pack-objects.c:1298
 msgid "disabling bitmap writing, as some objects are not being packed"
 msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
 
-#: builtin/pack-objects.c:2659
+#: builtin/pack-objects.c:2802
 msgid "Compressing objects"
 msgstr "压缩对象中"
 
-#: builtin/pack-objects.c:2846
+#: builtin/pack-objects.c:2993
 msgid "invalid value for --missing"
 msgstr "选项 --missing 的值无效"
 
-#: builtin/pack-objects.c:3194
+#: builtin/pack-objects.c:3342
 #, c-format
 msgid "unsupported index version %s"
 msgstr "不支持的索引版本 %s"
 
-#: builtin/pack-objects.c:3198
+#: builtin/pack-objects.c:3346
 #, c-format
 msgid "bad index version '%s'"
 msgstr "坏的索引版本 '%s'"
 
-#: builtin/pack-objects.c:3228
+#: builtin/bundle.c:66 builtin/pack-objects.c:3376
 msgid "do not show progress meter"
 msgstr "不显示进度表"
 
-#: builtin/pack-objects.c:3230
+#: builtin/bundle.c:68 builtin/pack-objects.c:3378
 msgid "show progress meter"
 msgstr "显示进度表"
 
-#: builtin/pack-objects.c:3232
+#: builtin/bundle.c:70 builtin/pack-objects.c:3380
 msgid "show progress meter during object writing phase"
 msgstr "在对象写入阶段显示进度表"
 
-#: builtin/pack-objects.c:3235
+#: builtin/bundle.c:73 builtin/pack-objects.c:3383
 msgid "similar to --all-progress when progress meter is shown"
 msgstr "当进度表显示时类似于 --all-progress"
 
-#: builtin/pack-objects.c:2970
+#: builtin/pack-objects.c:2610
 msgid "version[,offset]"
 msgstr "版本[,偏移]"
 
-#: builtin/pack-objects.c:3237
+#: builtin/pack-objects.c:3385
 msgid "write the pack index file in the specified idx format version"
 msgstr "用指定的 idx 格式版本来写包索引文件"
 
-#: builtin/pack-objects.c:3240
+#: builtin/pack-objects.c:3388
 msgid "maximum size of each output pack file"
 msgstr "每个输出包的最大尺寸"
 
-#: builtin/pack-objects.c:3242
+#: builtin/pack-objects.c:3390
 msgid "ignore borrowed objects from alternate object store"
 msgstr "忽略从备用对象存储里借用对象"
 
-#: builtin/pack-objects.c:3244
+#: builtin/pack-objects.c:3392
 msgid "ignore packed objects"
 msgstr "忽略包对象"
 
-#: builtin/pack-objects.c:3246
+#: builtin/pack-objects.c:3394
 msgid "limit pack window by objects"
 msgstr "限制打包窗口的对象数"
 
-#: builtin/pack-objects.c:3248
+#: builtin/pack-objects.c:3396
 msgid "limit pack window by memory in addition to object limit"
 msgstr "除对象数量限制外设置打包窗口的内存限制"
 
-#: builtin/pack-objects.c:3250
+#: builtin/pack-objects.c:3398
 msgid "maximum length of delta chain allowed in the resulting pack"
 msgstr "打包允许的 delta 链的最大长度"
 
-#: builtin/pack-objects.c:3252
+#: builtin/pack-objects.c:3400
 msgid "reuse existing deltas"
 msgstr "重用已存在的 deltas"
 
-#: builtin/pack-objects.c:3254
+#: builtin/pack-objects.c:3402
 msgid "reuse existing objects"
 msgstr "重用已存在的对象"
 
-#: builtin/pack-objects.c:3256
+#: builtin/pack-objects.c:3404
 msgid "use OFS_DELTA objects"
 msgstr "使用 OFS_DELTA 对象"
 
-#: builtin/pack-objects.c:3258
+#: builtin/pack-objects.c:3406
 msgid "use threads when searching for best delta matches"
 msgstr "使用线程查询最佳 delta 匹配"
 
-#: builtin/pack-objects.c:3260
+#: builtin/pack-objects.c:3408
 msgid "do not create an empty pack output"
 msgstr "不创建空的包输出"
 
-#: builtin/pack-objects.c:3262
+#: builtin/pack-objects.c:3410
 msgid "read revision arguments from standard input"
 msgstr "从标准输入读取版本号参数"
 
-#: builtin/pack-objects.c:3264
+#: builtin/pack-objects.c:3412
 msgid "limit the objects to those that are not yet packed"
 msgstr "限制那些尚未打包的对象"
 
-#: builtin/pack-objects.c:3267
+#: builtin/pack-objects.c:3415
 msgid "include objects reachable from any reference"
 msgstr "包括可以从任何引用访问到的对象"
 
-#: builtin/pack-objects.c:3270
+#: builtin/pack-objects.c:3418
 msgid "include objects referred by reflog entries"
 msgstr "包括被引用日志引用到的对象"
 
-#: builtin/pack-objects.c:3273
+#: builtin/pack-objects.c:3421
 msgid "include objects referred to by the index"
 msgstr "包括被索引引用到的对象"
 
-#: builtin/pack-objects.c:3276
+#: builtin/pack-objects.c:3424
 msgid "output pack to stdout"
 msgstr "输出包到标准输出"
 
-#: builtin/pack-objects.c:3278
+#: builtin/pack-objects.c:3426
 msgid "include tag objects that refer to objects to be packed"
 msgstr "包括那些引用了待打包对象的标签对象"
 
-#: builtin/pack-objects.c:3280
+#: builtin/pack-objects.c:3428
 msgid "keep unreachable objects"
 msgstr "维持不可达的对象"
 
-#: builtin/pack-objects.c:3282
+#: builtin/pack-objects.c:3430
 msgid "pack loose unreachable objects"
 msgstr "打包松散的不可达对象"
 
-#: builtin/pack-objects.c:3284
+#: builtin/pack-objects.c:3432
 msgid "unpack unreachable objects newer than <time>"
 msgstr "将比给定 <时间> 新的无法访问的对象解包"
 
-#: builtin/pack-objects.c:3289
+#: builtin/pack-objects.c:3437
 msgid "create thin packs"
 msgstr "创建精简包"
 
-#: builtin/pack-objects.c:3291
+#: builtin/pack-objects.c:3439
 msgid "create packs suitable for shallow fetches"
 msgstr "创建适合浅克隆仓库获取的包"
 
-#: builtin/pack-objects.c:3293
+#: builtin/pack-objects.c:3441
 msgid "ignore packs that have companion .keep file"
 msgstr "忽略配有 .keep 文件的包"
 
-#: builtin/pack-objects.c:3297
+#: builtin/pack-objects.c:3445
 msgid "pack compression level"
 msgstr "打包压缩级别"
 
-#: builtin/pack-objects.c:3299
+#: builtin/pack-objects.c:3447
 msgid "do not hide commits by grafts"
 msgstr "显示被移植隐藏的提交"
 
-#: builtin/pack-objects.c:3301
+#: builtin/pack-objects.c:3449
 msgid "use a bitmap index if available to speed up counting objects"
 msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
 
-#: builtin/pack-objects.c:3303
+#: builtin/pack-objects.c:3451
 msgid "write a bitmap index together with the pack index"
 msgstr "在建立包索引的同时创建 bitmap 索引"
 
-#: builtin/pack-objects.c:3311
+#: builtin/pack-objects.c:3459
 msgid "handling for missing objects"
 msgstr "处理丢失的对象"
 
-#: builtin/pack-objects.c:3314
+#: builtin/pack-objects.c:3462
 msgid "do not pack objects in promisor packfiles"
 msgstr "不要打包 promisor 包文件中的对象"
 
-#: builtin/pack-objects.c:1870
+#: builtin/pack-objects.c:2005
 msgid "Counting objects"
 msgstr "对象计数中"
 
@@ -11520,94 +11530,94 @@
 msgid "prune loose refs (default)"
 msgstr "清除松散的引用（默认）"
 
-#: builtin/prune-packed.c:9
+#: builtin/prune-packed.c:6
 msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
 msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
 
-#: builtin/prune-packed.c:42
+#: prune-packed.c:35
 msgid "Removing duplicate objects"
 msgstr "正在删除重复对象"
 
-#: builtin/prune.c:12
+#: builtin/prune.c:14
 msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
 msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
 
-#: builtin/prune.c:131
+#: builtin/prune.c:133
 msgid "report pruned objects"
 msgstr "报告清除的对象"
 
-#: builtin/prune.c:134
+#: builtin/prune.c:136
 msgid "expire objects older than <time>"
 msgstr "使早于给定时间的对象过期"
 
-#: builtin/prune.c:136
+#: builtin/prune.c:138
 msgid "limit traversal to objects outside promisor packfiles"
 msgstr "限制遍历 promisor 包以外的对象"
 
-#: builtin/prune.c:150
+#: builtin/prune.c:152
 msgid "cannot prune in a precious-objects repo"
 msgstr "不能在珍品仓库中执行清理操作"
 
-#: builtin/pull.c:66 builtin/pull.c:68
+#: builtin/pull.c:45 builtin/pull.c:47
 #, c-format
 msgid "Invalid value for %s: %s"
 msgstr "%s 的值无效：%s"
 
-#: builtin/pull.c:88
+#: builtin/pull.c:67
 msgid "git pull [<options>] [<repository> [<refspec>...]]"
 msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/pull.c:142
+#: builtin/pull.c:123
 msgid "control for recursive fetching of submodules"
 msgstr "控制子模组的递归获取"
 
-#: builtin/pull.c:146
+#: builtin/pull.c:127
 msgid "Options related to merging"
 msgstr "和合并相关的选项"
 
-#: builtin/pull.c:149
+#: builtin/pull.c:130
 msgid "incorporate changes by rebasing rather than merging"
 msgstr "使用变基操作取代合并操作以合入修改"
 
-#: builtin/pull.c:177 builtin/rebase.c:448 builtin/revert.c:126
+#: builtin/pull.c:158 builtin/rebase.c:478 builtin/revert.c:126
 msgid "allow fast-forward"
 msgstr "允许快进式"
 
-#: builtin/pull.c:186
+#: builtin/pull.c:166
 msgid "automatically stash/stash pop before and after rebase"
 msgstr "变基操作前后执行自动贮藏和弹出贮藏"
 
-#: builtin/pull.c:202
+#: builtin/pull.c:183
 msgid "Options related to fetching"
 msgstr "和获取相关的参数"
 
-#: builtin/pull.c:220
+#: builtin/pull.c:201
 msgid "number of submodules pulled in parallel"
 msgstr "并发拉取的子模组的数量"
 
-#: builtin/pull.c:320
+#: builtin/pull.c:317
 #, c-format
 msgid "Invalid value for pull.ff: %s"
 msgstr "pull.ff 的取值无效：%s"
 
-#: builtin/pull.c:437
+#: builtin/pull.c:459
 msgid ""
 "There is no candidate for rebasing against among the refs that you just "
 "fetched."
 msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
 
-#: builtin/pull.c:439
+#: builtin/pull.c:461
 msgid ""
 "There are no candidates for merging among the refs that you just fetched."
 msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
 
-#: builtin/pull.c:440
+#: builtin/pull.c:462
 msgid ""
 "Generally this means that you provided a wildcard refspec which had no\n"
 "matches on the remote end."
 msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
 
-#: builtin/pull.c:443
+#: builtin/pull.c:465
 #, c-format
 msgid ""
 "You asked to pull from the remote '%s', but did not specify\n"
@@ -11617,42 +11627,42 @@
 "您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
 "分支默认的远程仓库，您必须在命令行中指定一个分支名。"
 
-#: builtin/pull.c:448 builtin/rebase.c:1347 git-parse-remote.sh:73
+#: builtin/pull.c:470 builtin/rebase.c:1234 git-parse-remote.sh:73
 msgid "You are not currently on a branch."
 msgstr "您当前不在一个分支上。"
 
-#: builtin/pull.c:450 builtin/pull.c:465 git-parse-remote.sh:79
+#: builtin/pull.c:472 builtin/pull.c:487 git-parse-remote.sh:79
 msgid "Please specify which branch you want to rebase against."
 msgstr "请指定您要变基到哪一个分支。"
 
-#: builtin/pull.c:452 builtin/pull.c:467 git-parse-remote.sh:82
+#: builtin/pull.c:474 builtin/pull.c:489 git-parse-remote.sh:82
 msgid "Please specify which branch you want to merge with."
 msgstr "请指定您要合并哪一个分支。"
 
-#: builtin/pull.c:453 builtin/pull.c:468
+#: builtin/pull.c:475 builtin/pull.c:490
 msgid "See git-pull(1) for details."
 msgstr "详见 git-pull(1)。"
 
-#: builtin/pull.c:455 builtin/pull.c:461 builtin/pull.c:470
-#: builtin/rebase.c:1353 git-parse-remote.sh:64
+#: builtin/pull.c:477 builtin/pull.c:483 builtin/pull.c:492
+#: builtin/rebase.c:1240 git-parse-remote.sh:64
 msgid "<remote>"
 msgstr "<远程>"
 
-#: builtin/pull.c:455 builtin/pull.c:470 builtin/pull.c:475
+#: builtin/pull.c:477 builtin/pull.c:492 builtin/pull.c:497
 #: git-parse-remote.sh:65
 msgid "<branch>"
 msgstr "<分支>"
 
-#: builtin/pull.c:463 builtin/rebase.c:1345 git-parse-remote.sh:75
+#: builtin/pull.c:485 builtin/rebase.c:1232 git-parse-remote.sh:75
 msgid "There is no tracking information for the current branch."
 msgstr "当前分支没有跟踪信息。"
 
-#: builtin/pull.c:472 git-parse-remote.sh:95
+#: builtin/pull.c:494 git-parse-remote.sh:95
 msgid ""
 "If you wish to set tracking information for this branch you can do so with:"
 msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
 
-#: builtin/pull.c:477
+#: builtin/pull.c:499
 #, c-format
 msgid ""
 "Your configuration specifies to merge with the ref '%s'\n"
@@ -11661,27 +11671,27 @@
 "您的配置中指定要合并远程的引用 '%s'，\n"
 "但是没有获取到这个引用。"
 
-#: builtin/pull.c:867
+#: builtin/pull.c:895
 msgid "ignoring --verify-signatures for rebase"
 msgstr "为变基操作忽略 --verify-signatures"
 
-#: builtin/pull.c:922
+#: builtin/pull.c:912
 msgid "--[no-]autostash option is only valid with --rebase."
 msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
 
-#: builtin/pull.c:930
+#: builtin/pull.c:955
 msgid "Updating an unborn branch with changes added to the index."
 msgstr "更新尚未诞生的分支，变更添加至索引。"
 
-#: builtin/pull.c:934
+#: builtin/pull.c:959
 msgid "pull with rebase"
 msgstr "变基式拉取"
 
-#: builtin/pull.c:935
+#: builtin/pull.c:960
 msgid "please commit or stash them."
 msgstr "请提交或贮藏它们。"
 
-#: builtin/pull.c:960
+#: builtin/pull.c:985
 #, c-format
 msgid ""
 "fetch updated the current branch head.\n"
@@ -11691,7 +11701,7 @@
 "fetch 更新了当前的分支。快进您的工作区\n"
 "至提交 %s。"
 
-#: builtin/pull.c:966
+#: builtin/pull.c:991
 #, c-format
 msgid ""
 "Cannot fast-forward your working tree.\n"
@@ -11708,15 +11718,15 @@
 "$ git reset --hard\n"
 "恢复之前的状态。"
 
-#: builtin/pull.c:981
+#: builtin/pull.c:1006
 msgid "Cannot merge multiple branches into empty head."
 msgstr "无法将多个分支合并到空分支。"
 
-#: builtin/pull.c:985
+#: builtin/pull.c:1010
 msgid "Cannot rebase onto multiple branches."
 msgstr "无法变基到多个分支。"
 
-#: builtin/pull.c:992
+#: builtin/pull.c:1018
 msgid "cannot rebase with locally recorded submodule modifications"
 msgstr "本地子模组中有修改，无法变基"
 
@@ -11724,15 +11734,15 @@
 msgid "git push [<options>] [<repository> [<refspec>...]]"
 msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
 
-#: builtin/push.c:111
+#: builtin/push.c:112
 msgid "tag shorthand without <tag>"
 msgstr "标签后面未提供 <标签> 参数"
 
-#: builtin/push.c:121
+#: builtin/push.c:122
 msgid "--delete only accepts plain target ref names"
 msgstr "--delete 只接受简单的目标引用名"
 
-#: builtin/push.c:167
+#: builtin/push.c:168
 msgid ""
 "\n"
 "To choose either option permanently, see push.default in 'git help config'."
@@ -11740,7 +11750,7 @@
 "\n"
 "为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
 
-#: builtin/push.c:149
+#: builtin/push.c:145
 #, c-format
 msgid ""
 "The upstream branch of your current branch does not match\n"
@@ -11764,7 +11774,7 @@
 "    git push %s %s\n"
 "%s"
 
-#: builtin/push.c:185
+#: builtin/push.c:186
 #, c-format
 msgid ""
 "You are not currently on a branch.\n"
@@ -11778,7 +11788,7 @@
 "\n"
 "    git push %s HEAD:<远程分支名字>\n"
 
-#: builtin/push.c:199
+#: builtin/push.c:200
 #, c-format
 msgid ""
 "The current branch %s has no upstream branch.\n"
@@ -11791,13 +11801,13 @@
 "\n"
 "    git push --set-upstream %s %s\n"
 
-#: builtin/push.c:207
+#: builtin/push.c:208
 #, c-format
 msgid ""
 "The current branch %s has multiple upstream branches, refusing to push."
 msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
 
-#: builtin/push.c:210
+#: builtin/push.c:211
 #, c-format
 msgid ""
 "You are pushing to remote '%s', which is not the upstream of\n"
@@ -11807,12 +11817,12 @@
 "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
 "而没有告诉我要推送什么、更新哪个远程分支。"
 
-#: builtin/push.c:269
+#: builtin/push.c:270
 msgid ""
 "You didn't specify any refspecs to push, and push.default is \"nothing\"."
 msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
 
-#: builtin/push.c:276
+#: builtin/push.c:277
 msgid ""
 "Updates were rejected because the tip of your current branch is behind\n"
 "its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11823,7 +11833,7 @@
 "再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:282
+#: builtin/push.c:283
 msgid ""
 "Updates were rejected because a pushed branch tip is behind its remote\n"
 "counterpart. Check out this branch and integrate the remote changes\n"
@@ -11834,7 +11844,7 @@
 "检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
 "'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:288
+#: builtin/push.c:289
 msgid ""
 "Updates were rejected because the remote contains work that you do\n"
 "not have locally. This is usually caused by another repository pushing\n"
@@ -11847,11 +11857,11 @@
 "（如 'git pull ...'）。\n"
 "详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
 
-#: builtin/push.c:295
+#: builtin/push.c:296
 msgid "Updates were rejected because the tag already exists in the remote."
 msgstr "更新被拒绝，因为该标签在远程已经存在。"
 
-#: builtin/push.c:298
+#: builtin/push.c:299
 msgid ""
 "You cannot update a remote ref that points at a non-commit object,\n"
 "or update a remote ref to make it point at a non-commit object,\n"
@@ -11860,22 +11870,22 @@
 "如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
 "也不能更新远程引用让其指向一个非提交对象。\n"
 
-#: builtin/push.c:359
+#: builtin/push.c:361
 #, c-format
 msgid "Pushing to %s\n"
 msgstr "推送到 %s\n"
 
-#: builtin/push.c:366
+#: builtin/push.c:368
 #, c-format
 msgid "failed to push some refs to '%s'"
 msgstr "推送一些引用到 '%s' 失败"
 
-#: builtin/push.c:611
+#: builtin/push.c:609
 #, c-format
 msgid "bad repository '%s'"
 msgstr "坏的仓库 '%s'"
 
-#: builtin/push.c:612
+#: builtin/push.c:610
 msgid ""
 "No configured push destination.\n"
 "Either specify the URL from the command-line or configure a remote "
@@ -11896,55 +11906,55 @@
 "\n"
 "    git push <名称>\n"
 
-#: builtin/push.c:627
+#: builtin/push.c:625
 msgid "--all and --tags are incompatible"
 msgstr "--all 和 --tags 不兼容"
 
-#: builtin/push.c:629
+#: builtin/push.c:627
 msgid "--all can't be combined with refspecs"
 msgstr "--all 不能和引用规格同时使用"
 
-#: builtin/push.c:633
+#: builtin/push.c:631
 msgid "--mirror and --tags are incompatible"
 msgstr "--mirror 和 --tags 不兼容"
 
-#: builtin/push.c:635
+#: builtin/push.c:633
 msgid "--mirror can't be combined with refspecs"
 msgstr "--mirror 不能和引用规格同时使用"
 
-#: builtin/push.c:638
+#: builtin/push.c:636
 msgid "--all and --mirror are incompatible"
 msgstr "--all 和 --mirror 不兼容"
 
-#: builtin/push.c:541
+#: builtin/push.c:542
 msgid "repository"
 msgstr "仓库"
 
-#: builtin/push.c:542 builtin/send-pack.c:164
+#: builtin/push.c:543 builtin/send-pack.c:164
 msgid "push all refs"
 msgstr "推送所有引用"
 
-#: builtin/push.c:543 builtin/send-pack.c:166
+#: builtin/push.c:544 builtin/send-pack.c:166
 msgid "mirror all refs"
 msgstr "镜像所有引用"
 
-#: builtin/push.c:545
+#: builtin/push.c:546
 msgid "delete refs"
 msgstr "删除引用"
 
-#: builtin/push.c:546
+#: builtin/push.c:547
 msgid "push tags (can't be used with --all or --mirror)"
 msgstr "推送标签（不能使用 --all or --mirror）"
 
-#: builtin/push.c:549 builtin/send-pack.c:167
+#: builtin/push.c:550 builtin/send-pack.c:167
 msgid "force updates"
 msgstr "强制更新"
 
-#: builtin/push.c:545 builtin/send-pack.c:180
+#: builtin/push.c:547 builtin/send-pack.c:175
 msgid "refname>:<expect"
 msgstr "引用名>:<期望值"
 
-#: builtin/push.c:552 builtin/send-pack.c:182
+#: builtin/push.c:552 builtin/send-pack.c:180
 msgid "require old value of ref to be at this value"
 msgstr "要求引用旧的取值为设定值"
 
@@ -11952,58 +11962,58 @@
 msgid "control recursive pushing of submodules"
 msgstr "控制子模组的递归推送"
 
-#: builtin/push.c:557 builtin/send-pack.c:175
+#: builtin/push.c:556 builtin/send-pack.c:174
 msgid "use thin pack"
 msgstr "使用精简打包"
 
-#: builtin/push.c:558 builtin/push.c:559 builtin/send-pack.c:161
+#: builtin/push.c:557 builtin/push.c:558 builtin/send-pack.c:161
 #: builtin/send-pack.c:162
 msgid "receive pack program"
 msgstr "接收包程序"
 
-#: builtin/push.c:560
+#: builtin/push.c:559
 msgid "set upstream for git pull/status"
 msgstr "设置 git pull/status 的上游"
 
-#: builtin/push.c:563
+#: builtin/push.c:562
 msgid "prune locally removed refs"
 msgstr "清除本地删除的引用"
 
-#: builtin/push.c:565
+#: builtin/push.c:564
 msgid "bypass pre-push hook"
 msgstr "绕过 pre-push 钩子"
 
-#: builtin/push.c:566
+#: builtin/push.c:565
 msgid "push missing but relevant tags"
 msgstr "推送缺失但有关的标签"
 
-#: builtin/push.c:569 builtin/send-pack.c:169
+#: builtin/push.c:567 builtin/send-pack.c:168
 msgid "GPG sign the push"
 msgstr "用 GPG 为推送签名"
 
-#: builtin/push.c:571 builtin/send-pack.c:176
+#: builtin/push.c:569 builtin/send-pack.c:175
 msgid "request atomic transaction on remote side"
 msgstr "需要远端支持原子事务"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:172
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:230 builtin/push.c:570 builtin/send-pack.c:171
 msgid "server-specific"
 msgstr "server-specific"
 
-#: builtin/clone.c:141 builtin/fetch.c:189 builtin/ls-remote.c:76
-#: builtin/push.c:572 builtin/send-pack.c:173
+#: builtin/clone.c:142 builtin/fetch.c:191 builtin/ls-remote.c:76
+#: builtin/pull.c:231 builtin/push.c:570 builtin/send-pack.c:172
 msgid "option to transmit"
 msgstr "传输选项"
 
-#: builtin/push.c:589
+#: builtin/push.c:587
 msgid "--delete is incompatible with --all, --mirror and --tags"
 msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
 
-#: builtin/push.c:591
+#: builtin/push.c:589
 msgid "--delete doesn't make sense without any refs"
 msgstr "--delete 未接任何引用没有意义"
 
-#: builtin/push.c:642
+#: builtin/push.c:640
 msgid "push options must not have new line characters"
 msgstr "推送选项不能有换行符"
 
@@ -12085,15 +12095,15 @@
 msgid "git rebase--helper [<options>]"
 msgstr "git rebase--helper [<选项>]"
 
-#: builtin/rebase.c:450
+#: builtin/rebase.c:469
 msgid "keep empty commits"
 msgstr "保持空提交"
 
-#: builtin/rebase.c:452 builtin/revert.c:128
+#: builtin/rebase.c:485 builtin/revert.c:128
 msgid "allow commits with empty messages"
 msgstr "允许提交说明为空"
 
-#: builtin/rebase.c:462
+#: builtin/rebase.c:496
 msgid "continue rebase"
 msgstr "继续变基"
 
@@ -12105,15 +12115,15 @@
 msgid "make rebase script"
 msgstr "制作变基脚本"
 
-#: builtin/rebase.c:470
+#: builtin/rebase.c:504
 msgid "shorten commit ids in the todo list"
 msgstr "缩短待办列表中的提交号"
 
-#: builtin/rebase.c:472
+#: builtin/rebase.c:506
 msgid "expand commit ids in the todo list"
 msgstr "扩展待办列表中的提交号"
 
-#: builtin/rebase.c:474
+#: builtin/rebase.c:508
 msgid "check the todo list"
 msgstr "检查待办列表"
 
@@ -12121,19 +12131,19 @@
 msgid "skip unnecessary picks"
 msgstr "跳过不必要的拣选"
 
-#: builtin/rebase.c:476
+#: builtin/rebase.c:510
 msgid "rearrange fixup/squash lines"
 msgstr "重新排列 fixup/squash 行"
 
-#: builtin/rebase.c:478
+#: builtin/rebase.c:512
 msgid "insert exec commands in todo list"
 msgstr "在待办列表中插入 exec 执行命令"
 
-#: builtin/receive-pack.c:32
+#: builtin/receive-pack.c:34
 msgid "git receive-pack <git-dir>"
 msgstr "git receive-pack <仓库目录>"
 
-#: builtin/receive-pack.c:830
+#: builtin/receive-pack.c:843
 msgid ""
 "By default, updating the current branch in a non-bare repository\n"
 "is denied, because it will make the index and work tree inconsistent\n"
@@ -12159,7 +12169,7 @@
 "若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
 "配置变量为 'refuse'。"
 
-#: builtin/receive-pack.c:850
+#: builtin/receive-pack.c:863
 msgid ""
 "By default, deleting the current branch is denied, because the next\n"
 "'git clone' won't result in any file checked out, causing confusion.\n"
@@ -12178,24 +12188,24 @@
 "\n"
 "若要屏蔽此信息，您可以设置它为 'refuse'。"
 
-#: builtin/receive-pack.c:1936
+#: builtin/receive-pack.c:1960
 msgid "quiet"
 msgstr "静默模式"
 
-#: builtin/receive-pack.c:1950
+#: builtin/receive-pack.c:1974
 msgid "You must specify a directory."
 msgstr "您必须指定一个目录。"
 
-#: builtin/reflog.c:567 builtin/reflog.c:572
+#: builtin/reflog.c:568 builtin/reflog.c:573
 #, c-format
 msgid "'%s' is not a valid timestamp"
 msgstr "'%s' 不是一个有效的时间戳"
 
-#: builtin/remote.c:16
+#: builtin/remote.c:17
 msgid "git remote [-v | --verbose]"
 msgstr "git remote [-v | --verbose]"
 
-#: builtin/remote.c:17
+#: builtin/remote.c:18
 msgid ""
 "git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <name> <url>"
@@ -12203,81 +12213,81 @@
 "git remote add [-t <分支>] [-m <master>] [-f] [--tags | --no-tags] [--"
 "mirror=<fetch|push>] <名称> <地址>"
 
-#: builtin/remote.c:18 builtin/remote.c:38
+#: builtin/remote.c:19 builtin/remote.c:39
 msgid "git remote rename <old> <new>"
 msgstr "git remote rename <旧名称> <新名称>"
 
-#: builtin/remote.c:19 builtin/remote.c:43
+#: builtin/remote.c:20 builtin/remote.c:44
 msgid "git remote remove <name>"
 msgstr "git remote remove <名称>"
 
-#: builtin/remote.c:20 builtin/remote.c:48
+#: builtin/remote.c:21 builtin/remote.c:49
 msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
 msgstr "git remote set-head <名称> (-a | --auto | -d | --delete | <分支>)"
 
-#: builtin/remote.c:21
+#: builtin/remote.c:22
 msgid "git remote [-v | --verbose] show [-n] <name>"
 msgstr "git remote [-v | --verbose] show [-n] <名称>"
 
-#: builtin/remote.c:22
+#: builtin/remote.c:23
 msgid "git remote prune [-n | --dry-run] <name>"
 msgstr "git remote prune [-n | --dry-run] <名称>"
 
-#: builtin/remote.c:23
+#: builtin/remote.c:24
 msgid ""
 "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
 msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]"
 
-#: builtin/remote.c:24
+#: builtin/remote.c:25
 msgid "git remote set-branches [--add] <name> <branch>..."
 msgstr "git remote set-branches [--add] <名称> <分支>..."
 
-#: builtin/remote.c:25 builtin/remote.c:74
+#: builtin/remote.c:26 builtin/remote.c:75
 msgid "git remote get-url [--push] [--all] <name>"
 msgstr "git remote get-url [--push] [--all] <名称>"
 
-#: builtin/remote.c:26 builtin/remote.c:79
+#: builtin/remote.c:27 builtin/remote.c:80
 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
 msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]"
 
-#: builtin/remote.c:27 builtin/remote.c:80
+#: builtin/remote.c:28 builtin/remote.c:81
 msgid "git remote set-url --add <name> <newurl>"
 msgstr "git remote set-url --add <名称> <新的地址>"
 
-#: builtin/remote.c:28 builtin/remote.c:81
+#: builtin/remote.c:29 builtin/remote.c:82
 msgid "git remote set-url --delete <name> <url>"
 msgstr "git remote set-url --delete <名称> <地址>"
 
-#: builtin/remote.c:33
+#: builtin/remote.c:34
 msgid "git remote add [<options>] <name> <url>"
 msgstr "git remote add [<选项>] <名称> <地址>"
 
-#: builtin/remote.c:53
+#: builtin/remote.c:54
 msgid "git remote set-branches <name> <branch>..."
 msgstr "git remote set-branches <名称> <分支>..."
 
-#: builtin/remote.c:54
+#: builtin/remote.c:55
 msgid "git remote set-branches --add <name> <branch>..."
 msgstr "git remote set-branches --add <名称> <分支>..."
 
-#: builtin/remote.c:59
+#: builtin/remote.c:60
 msgid "git remote show [<options>] <name>"
 msgstr "git remote show [<选项>] <名称>"
 
-#: builtin/remote.c:64
+#: builtin/remote.c:65
 msgid "git remote prune [<options>] <name>"
 msgstr "git remote prune [<选项>] <名称>"
 
-#: builtin/remote.c:69
+#: builtin/remote.c:70
 msgid "git remote update [<options>] [<group> | <remote>]..."
 msgstr "git remote update [<选项>] [<组> | <远程>]..."
 
-#: builtin/remote.c:98
+#: builtin/remote.c:99
 #, c-format
 msgid "Updating %s"
 msgstr "更新 %s 中"
 
-#: builtin/remote.c:130
+#: builtin/remote.c:131
 msgid ""
 "--mirror is dangerous and deprecated; please\n"
 "\t use --mirror=fetch or --mirror=push instead"
@@ -12285,86 +12295,86 @@
 "--mirror 选项危险且过时，请使用 --mirror=fetch\n"
 "\t 或 --mirror=push"
 
-#: builtin/remote.c:147
+#: builtin/remote.c:148
 #, c-format
 msgid "unknown mirror argument: %s"
 msgstr "未知的镜像参数：%s"
 
-#: builtin/remote.c:163
+#: builtin/remote.c:164
 msgid "fetch the remote branches"
 msgstr "抓取远程的分支"
 
-#: builtin/remote.c:165
+#: builtin/remote.c:166
 msgid "import all tags and associated objects when fetching"
 msgstr "抓取时导入所有的标签和关联对象"
 
-#: builtin/remote.c:168
+#: builtin/remote.c:169
 msgid "or do not fetch any tag at all (--no-tags)"
 msgstr "或不抓取任何标签（--no-tags）"
 
-#: builtin/remote.c:170
+#: builtin/remote.c:171
 msgid "branch(es) to track"
 msgstr "跟踪的分支"
 
-#: builtin/remote.c:171
+#: builtin/remote.c:172
 msgid "master branch"
 msgstr "主线分支"
 
-#: builtin/remote.c:169
+#: builtin/remote.c:168
 msgid "push|fetch"
 msgstr "push|fetch"
 
-#: builtin/remote.c:173
+#: builtin/remote.c:174
 msgid "set up remote as a mirror to push to or fetch from"
 msgstr "把远程设置为用以推送或抓取的镜像"
 
-#: builtin/remote.c:185
+#: builtin/remote.c:186
 msgid "specifying a master branch makes no sense with --mirror"
 msgstr "指定一个 master 分支并使用 --mirror 选项没有意义"
 
-#: builtin/remote.c:187
+#: builtin/remote.c:188
 msgid "specifying branches to track makes sense only with fetch mirrors"
 msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
 
-#: builtin/remote.c:194 builtin/remote.c:636
+#: builtin/remote.c:195 builtin/remote.c:696
 #, c-format
 msgid "remote %s already exists."
 msgstr "远程 %s 已经存在。"
 
-#: builtin/remote.c:198 builtin/remote.c:640
+#: builtin/remote.c:199 builtin/remote.c:700
 #, c-format
 msgid "'%s' is not a valid remote name"
 msgstr "'%s' 不是一个有效的远程名称"
 
-#: builtin/remote.c:238
+#: builtin/remote.c:239
 #, c-format
 msgid "Could not setup master '%s'"
 msgstr "无法设置 master '%s'"
 
-#: builtin/remote.c:344
+#: builtin/remote.c:354
 #, c-format
 msgid "Could not get fetch map for refspec %s"
 msgstr "无法得到引用规格 %s 的获取列表"
 
-#: builtin/remote.c:443 builtin/remote.c:451
+#: builtin/remote.c:453 builtin/remote.c:461
 msgid "(matching)"
 msgstr "（匹配）"
 
-#: builtin/remote.c:455
+#: builtin/remote.c:465
 msgid "(delete)"
 msgstr "（删除）"
 
-#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#: builtin/remote.c:636 builtin/remote.c:775 builtin/remote.c:875
 #, c-format
 msgid "No such remote: %s"
 msgstr "没有这样的远程：%s"
 
-#: builtin/remote.c:646
+#: builtin/remote.c:706
 #, c-format
 msgid "Could not rename config section '%s' to '%s'"
 msgstr "不能重命名配置小节 '%s' 到 '%s'"
 
-#: builtin/remote.c:666
+#: builtin/remote.c:726
 #, c-format
 msgid ""
 "Not updating non-default fetch refspec\n"
@@ -12375,17 +12385,17 @@
 "\t%s\n"
 "\t如果必要请手动更新配置。"
 
-#: builtin/remote.c:702
+#: builtin/remote.c:766
 #, c-format
 msgid "deleting '%s' failed"
 msgstr "删除 '%s' 失败"
 
-#: builtin/remote.c:736
+#: builtin/remote.c:800
 #, c-format
 msgid "creating '%s' failed"
 msgstr "创建 '%s' 失败"
 
-#: builtin/remote.c:802
+#: builtin/remote.c:876
 msgid ""
 "Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
 "to delete it, use:"
@@ -12394,113 +12404,113 @@
 "to delete them, use:"
 msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
 
-#: builtin/remote.c:816
+#: builtin/remote.c:890
 #, c-format
 msgid "Could not remove config section '%s'"
 msgstr "不能移除配置小节 '%s'"
 
-#: builtin/remote.c:917
+#: builtin/remote.c:993
 #, c-format
 msgid " new (next fetch will store in remotes/%s)"
 msgstr " 新的（下一次获取将存储于 remotes/%s）"
 
-#: builtin/remote.c:920
+#: builtin/remote.c:996
 msgid " tracked"
 msgstr " 已跟踪"
 
-#: builtin/remote.c:922
+#: builtin/remote.c:998
 msgid " stale (use 'git remote prune' to remove)"
 msgstr " 过时（使用 'git remote prune' 来移除）"
 
-#: builtin/remote.c:924
+#: builtin/remote.c:1000
 msgid " ???"
 msgstr " ???"
 
-#: builtin/remote.c:965
+#: builtin/remote.c:1041
 #, c-format
 msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
 msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
 
-#: builtin/remote.c:974
+#: builtin/remote.c:1050
 #, c-format
 msgid "rebases interactively onto remote %s"
 msgstr "交互式变基到远程 %s"
 
-#: builtin/remote.c:979
+#: builtin/remote.c:1055
 #, c-format
 msgid "rebases onto remote %s"
 msgstr "变基到远程 %s"
 
-#: builtin/remote.c:983
+#: builtin/remote.c:1059
 #, c-format
 msgid " merges with remote %s"
 msgstr " 与远程 %s 合并"
 
-#: builtin/remote.c:986
+#: builtin/remote.c:1062
 #, c-format
 msgid "merges with remote %s"
 msgstr "与远程 %s 合并"
 
-#: builtin/remote.c:989
+#: builtin/remote.c:1065
 #, c-format
 msgid "%-*s    and with remote %s\n"
 msgstr "%-*s    以及和远程 %s\n"
 
-#: builtin/remote.c:1032
+#: builtin/remote.c:1108
 msgid "create"
 msgstr "创建"
 
-#: builtin/remote.c:1035
+#: builtin/remote.c:1111
 msgid "delete"
 msgstr "删除"
 
-#: builtin/remote.c:1039
+#: builtin/remote.c:1115
 msgid "up to date"
 msgstr "最新"
 
-#: builtin/remote.c:1042
+#: builtin/remote.c:1118
 msgid "fast-forwardable"
 msgstr "可快进"
 
-#: builtin/remote.c:1045
+#: builtin/remote.c:1121
 msgid "local out of date"
 msgstr "本地已过时"
 
-#: builtin/remote.c:1052
+#: builtin/remote.c:1128
 #, c-format
 msgid "    %-*s forces to %-*s (%s)"
 msgstr "    %-*s 强制推送至 %-*s (%s)"
 
-#: builtin/remote.c:1055
+#: builtin/remote.c:1131
 #, c-format
 msgid "    %-*s pushes to %-*s (%s)"
 msgstr "    %-*s 推送至 %-*s (%s)"
 
-#: builtin/remote.c:1059
+#: builtin/remote.c:1135
 #, c-format
 msgid "    %-*s forces to %s"
 msgstr "    %-*s 强制推送至 %s"
 
-#: builtin/remote.c:1062
+#: builtin/remote.c:1138
 #, c-format
 msgid "    %-*s pushes to %s"
 msgstr "    %-*s 推送至 %s"
 
-#: builtin/remote.c:1130
+#: builtin/remote.c:1206
 msgid "do not query remotes"
 msgstr "不查询远程"
 
-#: builtin/remote.c:1157
+#: builtin/remote.c:1233
 #, c-format
 msgid "* remote %s"
 msgstr "* 远程 %s"
 
-#: builtin/remote.c:1158
+#: builtin/remote.c:1234
 #, c-format
 msgid "  Fetch URL: %s"
 msgstr "  获取地址：%s"
 
-#: builtin/remote.c:1159 builtin/remote.c:1175 builtin/remote.c:1314
+#: builtin/remote.c:1235 builtin/remote.c:1251 builtin/remote.c:1390
 msgid "(no URL)"
 msgstr "(无 URL)"
 
@@ -12508,194 +12518,194 @@
 #. with the one in " Fetch URL: %s"
 #. translation.
 #. 
-#: builtin/remote.c:1173 builtin/remote.c:1175
+#: builtin/remote.c:1249 builtin/remote.c:1251
 #, c-format
 msgid "  Push  URL: %s"
 msgstr "  推送地址：%s"
 
-#: builtin/remote.c:1177 builtin/remote.c:1179 builtin/remote.c:1181
+#: builtin/remote.c:1253 builtin/remote.c:1255 builtin/remote.c:1257
 #, c-format
 msgid "  HEAD branch: %s"
 msgstr "  HEAD 分支：%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1177
+#: builtin/remote.c:1253
 msgid "(not queried)"
 msgstr "（未查询）"
 
-#: builtin/remote.c:1179
+#: builtin/remote.c:1255
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: builtin/remote.c:1183
+#: builtin/remote.c:1259
 #, c-format
 msgid ""
 "  HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
 msgstr "  HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
 
-#: builtin/remote.c:1195
+#: builtin/remote.c:1271
 #, c-format
 msgid "  Remote branch:%s"
 msgid_plural "  Remote branches:%s"
 msgstr[0] "  远程分支：%s"
 
 #  译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1198 builtin/remote.c:1224
+#: builtin/remote.c:1274 builtin/remote.c:1300
 msgid " (status not queried)"
 msgstr " （状态未查询）"
 
-#: builtin/remote.c:1207
+#: builtin/remote.c:1283
 msgid "  Local branch configured for 'git pull':"
 msgid_plural "  Local branches configured for 'git pull':"
 msgstr[0] "  为 'git pull' 配置的本地分支："
 
-#: builtin/remote.c:1215
+#: builtin/remote.c:1291
 msgid "  Local refs will be mirrored by 'git push'"
 msgstr "  本地引用将在 'git push' 时被镜像"
 
-#: builtin/remote.c:1221
+#: builtin/remote.c:1297
 #, c-format
 msgid "  Local ref configured for 'git push'%s:"
 msgid_plural "  Local refs configured for 'git push'%s:"
 msgstr[0] "  为 'git push' 配置的本地引用%s："
 
-#: builtin/remote.c:1242
+#: builtin/remote.c:1318
 msgid "set refs/remotes/<name>/HEAD according to remote"
 msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c:1244
+#: builtin/remote.c:1320
 msgid "delete refs/remotes/<name>/HEAD"
 msgstr "删除 refs/remotes/<名称>/HEAD"
 
-#: builtin/remote.c:1259
+#: builtin/remote.c:1335
 msgid "Cannot determine remote HEAD"
 msgstr "无法确定远程 HEAD"
 
-#: builtin/remote.c:1261
+#: builtin/remote.c:1337
 msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
 msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
 
-#: builtin/remote.c:1271
+#: builtin/remote.c:1347
 #, c-format
 msgid "Could not delete %s"
 msgstr "无法删除 %s"
 
-#: builtin/remote.c:1279
+#: builtin/remote.c:1355
 #, c-format
 msgid "Not a valid ref: %s"
 msgstr "不是一个有效引用：%s"
 
-#: builtin/remote.c:1281
+#: builtin/remote.c:1357
 #, c-format
 msgid "Could not setup %s"
 msgstr "不能设置 %s"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c:1299
+#: builtin/remote.c:1375
 #, c-format
 msgid " %s will become dangling!"
 msgstr " %s 将成为悬空状态！"
 
 #  译者：注意保持前导空格
-#: builtin/remote.c:1300
+#: builtin/remote.c:1376
 #, c-format
 msgid " %s has become dangling!"
 msgstr " %s 已成为悬空状态！"
 
-#: builtin/remote.c:1310
+#: builtin/remote.c:1386
 #, c-format
 msgid "Pruning %s"
 msgstr "修剪 %s"
 
-#: builtin/remote.c:1311
+#: builtin/remote.c:1387
 #, c-format
 msgid "URL: %s"
 msgstr "URL：%s"
 
-#: builtin/remote.c:1327
+#: builtin/remote.c:1403
 #, c-format
 msgid " * [would prune] %s"
 msgstr " * [将删除] %s"
 
-#: builtin/remote.c:1330
+#: builtin/remote.c:1406
 #, c-format
 msgid " * [pruned] %s"
 msgstr " * [已删除] %s"
 
-#: builtin/remote.c:1375
+#: builtin/remote.c:1451
 msgid "prune remotes after fetching"
 msgstr "抓取后清除远程"
 
-#: builtin/remote.c:1438 builtin/remote.c:1492 builtin/remote.c:1560
+#: builtin/remote.c:1514 builtin/remote.c:1568 builtin/remote.c:1636
 #, c-format
 msgid "No such remote '%s'"
 msgstr "没有此远程 '%s'"
 
-#: builtin/remote.c:1454
+#: builtin/remote.c:1530
 msgid "add branch"
 msgstr "添加分支"
 
-#: builtin/remote.c:1461
+#: builtin/remote.c:1537
 msgid "no remote specified"
 msgstr "未指定远程"
 
-#: builtin/remote.c:1478
+#: builtin/remote.c:1554
 msgid "query push URLs rather than fetch URLs"
 msgstr "查询推送 URL 地址，而非获取 URL 地址"
 
-#: builtin/remote.c:1480
+#: builtin/remote.c:1556
 msgid "return all URLs"
 msgstr "返回所有 URL 地址"
 
-#: builtin/remote.c:1508
+#: builtin/remote.c:1584
 #, c-format
 msgid "no URLs configured for remote '%s'"
 msgstr "没有给远程仓库 '%s' 设定 URL"
 
-#: builtin/remote.c:1534
+#: builtin/remote.c:1610
 msgid "manipulate push URLs"
 msgstr "操作推送 URLS"
 
-#: builtin/remote.c:1536
+#: builtin/remote.c:1612
 msgid "add URL"
 msgstr "添加 URL"
 
-#: builtin/remote.c:1538
+#: builtin/remote.c:1614
 msgid "delete URLs"
 msgstr "删除 URLS"
 
-#: builtin/remote.c:1545
+#: builtin/remote.c:1621
 msgid "--add --delete doesn't make sense"
 msgstr "--add --delete 无意义"
 
-#: builtin/remote.c:1584
+#: builtin/remote.c:1660
 #, c-format
 msgid "Invalid old URL pattern: %s"
 msgstr "无效的旧 URL 匹配模版：%s"
 
-#: builtin/remote.c:1592
+#: builtin/remote.c:1668
 #, c-format
 msgid "No such URL found: %s"
 msgstr "未找到此 URL：%s"
 
-#: builtin/remote.c:1594
+#: builtin/remote.c:1670
 msgid "Will not delete all non-push URLs"
 msgstr "将不会删除所有非推送 URL 地址"
 
-#: builtin/remote.c:1610
+#: builtin/bundle.c:168 builtin/remote.c:1686
 msgid "be verbose; must be placed before a subcommand"
 msgstr "冗长输出；必须置于子命令之前"
 
-#: builtin/remote.c:1641
+#: builtin/bundle.c:190 builtin/remote.c:1717
 #, c-format
 msgid "Unknown subcommand: %s"
 msgstr "未知子命令：%s"
 
-#: builtin/repack.c:23
+#: builtin/repack.c:25
 msgid "git repack [<options>]"
 msgstr "git repack [<选项>]"
 
-#: builtin/repack.c:28
+#: builtin/repack.c:30
 msgid ""
 "Incremental repacks are incompatible with bitmap indexes.  Use\n"
 "--no-write-bitmap-index or disable the pack.writebitmaps configuration."
@@ -12703,87 +12713,87 @@
 "增量 repack 和 bitmap 索引不兼容。  使用 --no-write-bitmap-index\n"
 "或禁用 pack.writebitmaps 配置。"
 
-#: builtin/repack.c:285
+#: builtin/repack.c:294
 msgid "pack everything in a single pack"
 msgstr "所有内容打包到一个包文件中"
 
-#: builtin/repack.c:287
+#: builtin/repack.c:296
 msgid "same as -a, and turn unreachable objects loose"
 msgstr "和 -a 相同，并将不可达的对象设为松散对象"
 
-#: builtin/repack.c:290
+#: builtin/repack.c:299
 msgid "remove redundant packs, and run git-prune-packed"
 msgstr "删除多余的包，运行 git-prune-packed"
 
-#: builtin/repack.c:292
+#: builtin/repack.c:301
 msgid "pass --no-reuse-delta to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-delta"
 
-#: builtin/repack.c:294
+#: builtin/repack.c:303
 msgid "pass --no-reuse-object to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --no-reuse-object"
 
-#: builtin/repack.c:296
+#: builtin/repack.c:305
 msgid "do not run git-update-server-info"
 msgstr "不运行 git-update-server-info"
 
-#: builtin/repack.c:299
+#: builtin/repack.c:308
 msgid "pass --local to git-pack-objects"
 msgstr "向 git-pack-objects 传递参数 --local"
 
-#: builtin/repack.c:301
+#: builtin/repack.c:310
 msgid "write bitmap index"
 msgstr "写 bitmap 索引"
 
-#: builtin/repack.c:304
+#: builtin/repack.c:313
 msgid "approxidate"
 msgstr "近似日期"
 
-#: builtin/repack.c:305
+#: builtin/repack.c:314
 msgid "with -A, do not loosen objects older than this"
 msgstr "使用 -A，不要将早于给定时间的对象过期"
 
-#: builtin/repack.c:307
+#: builtin/repack.c:316
 msgid "with -a, repack unreachable objects"
 msgstr "使用 -a ，重新对不可达对象打包"
 
-#: builtin/repack.c:309
+#: builtin/repack.c:318
 msgid "size of the window used for delta compression"
 msgstr "用于增量压缩的窗口值"
 
-#: builtin/repack.c:310 builtin/repack.c:316
+#: builtin/repack.c:319 builtin/repack.c:325
 msgid "bytes"
 msgstr "字节"
 
-#: builtin/repack.c:311
+#: builtin/repack.c:320
 msgid "same as the above, but limit memory size instead of entries count"
 msgstr "和上面的相似，但限制内存大小而非条目数"
 
-#: builtin/repack.c:313
+#: builtin/repack.c:322
 msgid "limits the maximum delta depth"
 msgstr "限制最大增量深度"
 
-#: builtin/repack.c:315
+#: builtin/repack.c:324
 msgid "limits the maximum number of threads"
 msgstr "限制最大线程数"
 
-#: builtin/repack.c:317
+#: builtin/repack.c:326
 msgid "maximum size of each packfile"
 msgstr "每个包文件的最大尺寸"
 
-#: builtin/repack.c:319
+#: builtin/repack.c:328
 msgid "repack objects in packs marked with .keep"
 msgstr "对标记为 .keep 的包中的对象重新打包"
 
-#: builtin/repack.c:331
+#: builtin/repack.c:340
 msgid "cannot delete packs in a precious-objects repo"
 msgstr "不能删除珍品仓库中的打包文件"
 
-#: builtin/repack.c:335
+#: builtin/repack.c:344
 msgid "--keep-unreachable and -A are incompatible"
 msgstr "--keep-unreachable 和 -A 不兼容"
 
-#: builtin/repack.c:527
+#: builtin/repack.c:536
 #, c-format
 msgid "failed to remove '%s'"
 msgstr "删除 '%s' 失败"
@@ -12808,67 +12818,67 @@
 msgid "git replace [--format=<format>] [-l [<pattern>]]"
 msgstr "git replace [--format=<格式>] [-l [<模式>]]"
 
-#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#: builtin/replace.c:325 builtin/replace.c:363 builtin/replace.c:391
 #, c-format
 msgid "Not a valid object name: '%s'"
 msgstr "不是一个有效的对象名：'%s'"
 
-#: builtin/replace.c:415
+#: builtin/replace.c:416
 #, c-format
 msgid "bad mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有损坏的合并标签"
 
-#: builtin/replace.c:417
+#: builtin/replace.c:418
 #, c-format
 msgid "malformed mergetag in commit '%s'"
 msgstr "提交 '%s' 中含有格式错误的合并标签"
 
-#: builtin/replace.c:429
+#: builtin/replace.c:430
 #, c-format
 msgid ""
 "original commit '%s' contains mergetag '%s' that is discarded; use --edit "
 "instead of --graft"
 msgstr "原始提交 '%s' 包含已经丢弃的合并标签 '%s'，使用 --edit 代替 --graft"
 
-#: builtin/replace.c:407
+#: builtin/replace.c:401
 #, c-format
 msgid "the original commit '%s' has a gpg signature."
 msgstr "原始提交 '%s' 中包含一个 GPG 签名"
 
-#: builtin/replace.c:469
+#: builtin/replace.c:470
 msgid "the signature will be removed in the replacement commit!"
 msgstr "在替换的提交中签名将被移除！"
 
-#: builtin/replace.c:479
+#: builtin/replace.c:480
 #, c-format
 msgid "could not write replacement commit for: '%s'"
 msgstr "不能为 '%s' 写替换提交"
 
-#: builtin/replace.c:547
+#: builtin/replace.c:548
 msgid "list replace refs"
 msgstr "列出替换的引用"
 
-#: builtin/replace.c:548
+#: builtin/replace.c:549
 msgid "delete replace refs"
 msgstr "删除替换的引用"
 
-#: builtin/replace.c:549
+#: builtin/replace.c:550
 msgid "edit existing object"
 msgstr "编辑现存的对象"
 
-#: builtin/replace.c:550
+#: builtin/replace.c:551
 msgid "change a commit's parents"
 msgstr "修改一个提交的父提交"
 
-#: builtin/replace.c:552
+#: builtin/replace.c:553
 msgid "replace the ref if it exists"
 msgstr "如果存在则替换引用"
 
-#: builtin/replace.c:554
+#: builtin/replace.c:555
 msgid "do not pretty-print contents for --edit"
 msgstr "不要为 --edit 操作美观显示内容"
 
-#: builtin/replace.c:555
+#: builtin/replace.c:556
 msgid "use this format"
 msgstr "使用此格式"
 
@@ -12886,144 +12896,144 @@
 "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
 msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]"
 
-#: builtin/reset.c:33
+#: builtin/reset.c:32
 msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
 msgstr "git reset [-q] [<树或提交>] [--] <路径>..."
 
-#: builtin/reset.c:34
+#: builtin/reset.c:33
 msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
 msgstr "git reset --patch [<树或提交>] [--] [<路径>...]"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "mixed"
 msgstr "混杂"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "soft"
 msgstr "软性"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "hard"
 msgstr "硬性"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "merge"
 msgstr "合并"
 
-#: builtin/reset.c:40
+#: builtin/reset.c:41
 msgid "keep"
 msgstr "保持"
 
-#: builtin/reset.c:81
+#: builtin/reset.c:83
 msgid "You do not have a valid HEAD."
 msgstr "您没有一个有效的 HEAD。"
 
-#: builtin/reset.c:83
+#: builtin/reset.c:85
 msgid "Failed to find tree of HEAD."
 msgstr "无法找到 HEAD 指向的树。"
 
-#: builtin/reset.c:89
+#: builtin/reset.c:91
 #, c-format
 msgid "Failed to find tree of %s."
 msgstr "无法找到 %s 指向的树。"
 
-#: builtin/reset.c:114
+#: builtin/reset.c:116
 #, c-format
 msgid "HEAD is now at %s"
 msgstr "HEAD 现在位于 %s"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:193
+#: builtin/reset.c:195
 #, c-format
 msgid "Cannot do a %s reset in the middle of a merge."
 msgstr "在合并过程中不能做%s重置操作。"
 
-#: builtin/reset.c:293 builtin/stash.c:520 builtin/stash.c:595
+#: builtin/reset.c:295 builtin/stash.c:520 builtin/stash.c:595
 #: builtin/stash.c:619
 msgid "be quiet, only report errors"
 msgstr "安静模式，只报告错误"
 
-#: builtin/reset.c:295
+#: builtin/reset.c:297
 msgid "reset HEAD and index"
 msgstr "重置 HEAD 和索引"
 
-#: builtin/reset.c:296
+#: builtin/reset.c:298
 msgid "reset only HEAD"
 msgstr "只重置 HEAD"
 
-#: builtin/reset.c:298 builtin/reset.c:300
+#: builtin/reset.c:300 builtin/reset.c:302
 msgid "reset HEAD, index and working tree"
 msgstr "重置 HEAD、索引和工作区"
 
-#: builtin/reset.c:302
+#: builtin/reset.c:304
 msgid "reset HEAD but keep local changes"
 msgstr "重置 HEAD 但保存本地变更"
 
-#: builtin/reset.c:308
+#: builtin/reset.c:310
 msgid "record only the fact that removed paths will be added later"
 msgstr "将删除的路径标记为稍后添加"
 
-#: builtin/reset.c:326
+#: builtin/reset.c:344
 #, c-format
 msgid "Failed to resolve '%s' as a valid revision."
 msgstr "无法将 '%s' 解析为一个有效的版本。"
 
-#: builtin/reset.c:334
+#: builtin/reset.c:352
 #, c-format
 msgid "Failed to resolve '%s' as a valid tree."
 msgstr "无法将 '%s' 解析为一个有效的树对象。"
 
-#: builtin/reset.c:343
+#: builtin/reset.c:361
 msgid "--patch is incompatible with --{hard,mixed,soft}"
 msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
 
-#: builtin/reset.c:353
+#: builtin/reset.c:371
 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
 msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:355
+#: builtin/reset.c:373
 #, c-format
 msgid "Cannot do %s reset with paths."
 msgstr "不能带路径进行%s重置。"
 
 #  译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:370
+#: builtin/reset.c:388
 #, c-format
 msgid "%s reset is not allowed in a bare repository"
 msgstr "不能对纯仓库进行%s重置"
 
-#: builtin/reset.c:374
+#: builtin/reset.c:392
 msgid "-N can only be used with --mixed"
 msgstr "-N 只能和 --mixed 同时使用"
 
-#: builtin/reset.c:395
+#: builtin/reset.c:413
 msgid "Unstaged changes after reset:"
 msgstr "重置后取消暂存的变更："
 
-#: builtin/reset.c:408
+#: builtin/reset.c:434
 #, c-format
 msgid "Could not reset index file to revision '%s'."
 msgstr "不能重置索引文件至版本 '%s'。"
 
-#: builtin/reset.c:412
+#: builtin/reset.c:439
 msgid "Could not write new index file."
 msgstr "不能写入新的索引文件。"
 
-#: builtin/rev-list.c:411
+#: builtin/rev-list.c:499
 msgid "cannot combine --exclude-promisor-objects and --missing"
 msgstr "不能同时使用 --exclude-promisor-objects 和 --missing 选项"
 
-#: builtin/rev-list.c:472
+#: builtin/rev-list.c:560
 msgid "object filtering requires --objects"
 msgstr "对象过滤需要 --objects"
 
-#: builtin/rev-list.c:458
+#: builtin/rev-list.c:464
 #, c-format
 msgid "invalid sparse value '%s'"
 msgstr "无效的稀疏值 '%s'"
 
-#: builtin/rev-list.c:522
+#: builtin/rev-list.c:610
 msgid "rev-list does not support display of notes"
 msgstr "rev-list 不支持显示注解"
 
@@ -13031,23 +13041,23 @@
 msgid "cannot combine --use-bitmap-index with object filtering"
 msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
 
-#: builtin/rev-parse.c:408
+#: builtin/rev-parse.c:409
 msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
 msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
 
-#: builtin/rev-parse.c:413
+#: builtin/rev-parse.c:414
 msgid "keep the `--` passed as an arg"
 msgstr "保持 `--` 作为一个参数传递"
 
-#: builtin/rev-parse.c:415
+#: builtin/rev-parse.c:416
 msgid "stop parsing after the first non-option argument"
 msgstr "遇到第一个非选项参数后停止解析"
 
-#: builtin/rev-parse.c:418
+#: builtin/rev-parse.c:419
 msgid "output in stuck long form"
 msgstr "以固定长格式输出"
 
-#: builtin/rev-parse.c:551
+#: builtin/rev-parse.c:552
 msgid ""
 "git rev-parse --parseopt [<options>] -- [<args>...]\n"
 "   or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13114,7 +13124,7 @@
 msgid "merge strategy"
 msgstr "合并策略"
 
-#: builtin/rebase.c:1503 builtin/revert.c:115
+#: builtin/rebase.c:1400 builtin/revert.c:115
 msgid "option"
 msgstr "选项"
 
@@ -13181,37 +13191,37 @@
 msgid_plural "the following files have local modifications:"
 msgstr[0] "如下文件有本地修改："
 
-#: builtin/rm.c:242
+#: builtin/rm.c:243
 msgid "do not list removed files"
 msgstr "不列出删除的文件"
 
-#: builtin/rm.c:243
+#: builtin/rm.c:244
 msgid "only remove from the index"
 msgstr "只从索引区删除"
 
-#: builtin/rm.c:244
+#: builtin/rm.c:245
 msgid "override the up-to-date check"
 msgstr "忽略文件更新状态检查"
 
-#: builtin/rm.c:245
+#: builtin/rm.c:246
 msgid "allow recursive removal"
 msgstr "允许递归删除"
 
-#: builtin/rm.c:247
+#: builtin/rm.c:248
 msgid "exit with a zero status even if nothing matched"
 msgstr "即使没有匹配，也以零状态退出"
 
-#: builtin/rm.c:307
+#: builtin/rm.c:323
 #, c-format
 msgid "not removing '%s' recursively without -r"
 msgstr "未提供 -r 选项不会递归删除 '%s'"
 
-#: builtin/rm.c:346
+#: builtin/rm.c:362
 #, c-format
 msgid "git rm: unable to remove %s"
 msgstr "git rm：不能删除 %s"
 
-#: sequencer.c:311 builtin/rebase.c:760 builtin/rebase.c:1676 builtin/rm.c:369
+#: sequencer.c:316 builtin/rebase.c:743 builtin/rebase.c:1582 builtin/rm.c:385
 #, c-format
 msgid "could not remove '%s'"
 msgstr "无法删除 '%s'"
@@ -13231,19 +13241,19 @@
 msgid "remote name"
 msgstr "远程名称"
 
-#: builtin/send-pack.c:177
+#: builtin/send-pack.c:176
 msgid "use stateless RPC protocol"
 msgstr "使用无状态的 RPC 协议"
 
-#: builtin/send-pack.c:178
+#: builtin/send-pack.c:177
 msgid "read refs from stdin"
 msgstr "从标准输入读取引用"
 
-#: builtin/send-pack.c:179
+#: builtin/send-pack.c:178
 msgid "print status from remote helper"
 msgstr "打印来自远程 helper 的状态"
 
-#: builtin/shortlog.c:14
+#: builtin/shortlog.c:13
 msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
 msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
 
@@ -13263,7 +13273,7 @@
 msgid "Show the email address of each author"
 msgstr "显示每个作者的电子邮件地址"
 
-#: builtin/shortlog.c:270
+#: builtin/shortlog.c:235
 msgid "w[,i1[,i2]]"
 msgstr "w[,i1[,i2]]"
 
@@ -13462,36 +13472,36 @@
 msgid "prepend comment character and space to each line"
 msgstr "为每一行的行首添加注释符和空格"
 
-#: builtin/rebase.c:1963 builtin/submodule--helper.c:38
-#: builtin/submodule--helper.c:1934
+#: builtin/rebase.c:1895 builtin/submodule--helper.c:40
+#: builtin/submodule--helper.c:1990
 #, c-format
 msgid "No such ref: %s"
 msgstr "没有这样的引用：%s"
 
-#: builtin/submodule--helper.c:45 builtin/submodule--helper.c:1943
+#: builtin/submodule--helper.c:47 builtin/submodule--helper.c:1999
 #, c-format
 msgid "Expecting a full ref name, got %s"
 msgstr "期望一个完整的引用名称，却得到 %s"
 
-#: builtin/submodule--helper.c:62
+#: builtin/submodule--helper.c:64
 msgid "submodule--helper print-default-remote takes no arguments"
 msgstr "submodule--helper print-default-remote 不带参数"
 
-#: builtin/submodule--helper.c:100
+#: builtin/submodule--helper.c:102
 #, c-format
 msgid "cannot strip one component off url '%s'"
 msgstr "无法从 url '%s' 剥离一个组件"
 
-#: builtin/submodule--helper.c:408 builtin/submodule--helper.c:1368
+#: builtin/submodule--helper.c:410 builtin/submodule--helper.c:1395
 msgid "alternative anchor for relative paths"
 msgstr "相对路径的替代锚记（anchor）"
 
-#: builtin/submodule--helper.c:413
+#: builtin/submodule--helper.c:415
 msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:470 builtin/submodule--helper.c:628
-#: builtin/submodule--helper.c:651
+#: builtin/submodule--helper.c:472 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:653
 #, c-format
 msgid "No url found for submodule path '%s' in .gitmodules"
 msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
@@ -13503,192 +13513,192 @@
 "authoritative upstream."
 msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
 
-#: builtin/submodule--helper.c:665
+#: builtin/submodule--helper.c:667
 #, c-format
 msgid "Failed to register url for submodule path '%s'"
 msgstr "无法为子模组 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:669
+#: builtin/submodule--helper.c:671
 #, c-format
 msgid "Submodule '%s' (%s) registered for path '%s'\n"
 msgstr "子模组 '%s'（%s）已对路径 '%s' 注册\n"
 
 #
-#: builtin/submodule--helper.c:679
+#: builtin/submodule--helper.c:681
 #, c-format
 msgid "warning: command update mode suggested for submodule '%s'\n"
 msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
 
-#: builtin/submodule--helper.c:686
+#: builtin/submodule--helper.c:688
 #, c-format
 msgid "Failed to register update mode for submodule path '%s'"
 msgstr "无法为子模组 '%s' 注册更新模式"
 
-#: builtin/submodule--helper.c:708
+#: builtin/submodule--helper.c:710
 msgid "Suppress output for initializing a submodule"
 msgstr "阻止子模组初始化的输出"
 
-#: builtin/submodule--helper.c:557
+#: builtin/submodule--helper.c:711
 msgid "git submodule--helper init [<path>]"
 msgstr "git submodule--helper init [<路径>]"
 
-#: builtin/submodule--helper.c:785 builtin/submodule--helper.c:911
+#: builtin/submodule--helper.c:789 builtin/submodule--helper.c:924
 #, c-format
 msgid "no submodule mapping found in .gitmodules for path '%s'"
 msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
 
-#: builtin/submodule--helper.c:824
+#: builtin/submodule--helper.c:837
 #, c-format
 msgid "could not resolve HEAD ref inside the submodule '%s'"
 msgstr "无法解析子模组 '%s' 的 HEAD 引用"
 
-#: builtin/submodule--helper.c:851 builtin/submodule--helper.c:1020
+#: builtin/submodule--helper.c:864 builtin/submodule--helper.c:1033
 #, c-format
 msgid "failed to recurse into submodule '%s'"
 msgstr "递归子模组 '%s' 失败"
 
-#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1186
+#: builtin/submodule--helper.c:888 builtin/submodule--helper.c:1199
 msgid "Suppress submodule status output"
 msgstr "阻止子模组状态输出"
 
-#: builtin/submodule--helper.c:876
+#: builtin/submodule--helper.c:889
 msgid ""
 "Use commit stored in the index instead of the one stored in the submodule "
 "HEAD"
 msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
 
-#: builtin/submodule--helper.c:877
+#: builtin/submodule--helper.c:890
 msgid "recurse into nested submodules"
 msgstr "递归进入嵌套子模组中"
 
-#: builtin/submodule--helper.c:882
+#: builtin/submodule--helper.c:895
 msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
 msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
 
-#: builtin/submodule--helper.c:906
+#: builtin/submodule--helper.c:919
 msgid "git submodule--helper name <path>"
 msgstr "git submodule--helper name <路径>"
 
-#: builtin/submodule--helper.c:970
+#: builtin/submodule--helper.c:983
 #, c-format
 msgid "Synchronizing submodule url for '%s'\n"
 msgstr "为 '%s' 同步子模组 url\n"
 
-#: builtin/submodule--helper.c:976
+#: builtin/submodule--helper.c:989
 #, c-format
 msgid "failed to register url for submodule path '%s'"
 msgstr "无法为子模组路径 '%s' 注册 url"
 
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1003
 #, c-format
 msgid "failed to get the default remote for submodule '%s'"
 msgstr "无法得到子模组 '%s' 的默认远程关联"
 
-#: builtin/submodule--helper.c:1001
+#: builtin/submodule--helper.c:1014
 #, c-format
 msgid "failed to update remote for submodule '%s'"
 msgstr "无法为子模组 '%s' 更新远程关联"
 
-#: builtin/submodule--helper.c:1048
+#: builtin/submodule--helper.c:1061
 msgid "Suppress output of synchronizing submodule url"
 msgstr "阻止子模组 url 同步的输出"
 
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:1050
+#: builtin/submodule--helper.c:567 builtin/submodule--helper.c:1063
 msgid "Recurse into nested submodules"
 msgstr "递归进入嵌套子模组中"
 
-#: builtin/submodule--helper.c:1055
+#: builtin/submodule--helper.c:1068
 msgid "git submodule--helper sync [--quiet] [--recursive] [<path>]"
 msgstr "git submodule--helper sync [--quiet] [--recursive] [<路径>]"
 
-#: builtin/submodule--helper.c:1109
+#: builtin/submodule--helper.c:1122
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains a .git directory (use 'rm -rf' if you "
 "really want to remove it including all of its history)"
 msgstr "子模组工作区 '%s' 包含一个 .git 目录（如果您确需删除它及其全部历史，使用 'rm -rf' 命令）"
 
-#: builtin/submodule--helper.c:1121
+#: builtin/submodule--helper.c:1134
 #, c-format
 msgid ""
 "Submodule work tree '%s' contains local modifications; use '-f' to discard "
 "them"
 msgstr "子模组工作区 '%s' 包含本地修改；使用 '-f' 丢弃它们"
 
-#: builtin/submodule--helper.c:1129
+#: builtin/submodule--helper.c:1142
 #, c-format
 msgid "Cleared directory '%s'\n"
 msgstr "已清除目录 '%s'\n"
 
-#: builtin/submodule--helper.c:1131
+#: builtin/submodule--helper.c:1144
 #, c-format
 msgid "Could not remove submodule work tree '%s'\n"
 msgstr "无法移除子模组工作区 '%s'\n"
 
-#: builtin/submodule--helper.c:1142
+#: builtin/submodule--helper.c:1155
 #, c-format
 msgid "could not create empty submodule directory %s"
 msgstr "不能创建空的子模组目录 %s"
 
-#: builtin/submodule--helper.c:1158
+#: builtin/submodule--helper.c:1171
 #, c-format
 msgid "Submodule '%s' (%s) unregistered for path '%s'\n"
 msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
 
-#: builtin/submodule--helper.c:1187
+#: builtin/submodule--helper.c:1200
 msgid "Remove submodule working trees even if they contain local changes"
 msgstr "删除子模组工作区，即使包含本地修改"
 
-#: builtin/submodule--helper.c:1188
+#: builtin/submodule--helper.c:1201
 msgid "Unregister all submodules"
 msgstr "将所有子模组取消注册"
 
-#: builtin/submodule--helper.c:1193
+#: builtin/submodule--helper.c:1206
 msgid ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<path>...]]"
 msgstr ""
 "git submodule deinit [--quiet] [-f | --force] [--all | [--] [<路径>...]]"
 
-#: builtin/submodule--helper.c:1207
+#: builtin/submodule--helper.c:1220
 msgid "Use '--all' if you really want to deinitialize all submodules"
 msgstr "如果您确实想要对所有子模组执行取消初始化，请使用 '--all'"
 
-#: builtin/submodule--helper.c:1302 builtin/submodule--helper.c:1305
+#: builtin/submodule--helper.c:1328 builtin/submodule--helper.c:1331
 #, c-format
 msgid "submodule '%s' cannot add alternate: %s"
 msgstr "子模组 '%s' 不能添加仓库备选：%s"
 
-#: builtin/submodule--helper.c:1341
+#: builtin/submodule--helper.c:1367
 #, c-format
 msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
 msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
 
-#: builtin/submodule--helper.c:1348
+#: builtin/submodule--helper.c:1374
 #, c-format
 msgid "Value '%s' for submodule.alternateLocation is not recognized"
 msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
 
-#: builtin/submodule--helper.c:1371
+#: builtin/submodule--helper.c:1398
 msgid "where the new submodule will be cloned to"
 msgstr "新的子模组将要克隆的路径"
 
-#: builtin/submodule--helper.c:1374
+#: builtin/submodule--helper.c:1401
 msgid "name of the new submodule"
 msgstr "新子模组的名称"
 
-#: builtin/submodule--helper.c:1377
+#: builtin/submodule--helper.c:1404
 msgid "url where to clone the submodule from"
 msgstr "克隆子模组的 url 地址"
 
-#: builtin/submodule--helper.c:1385
+#: builtin/submodule--helper.c:1412
 msgid "depth for shallow clones"
 msgstr "浅克隆的深度"
 
-#: builtin/submodule--helper.c:1388 builtin/submodule--helper.c:1872
+#: builtin/submodule--helper.c:1415 builtin/submodule--helper.c:1924
 msgid "force cloning progress"
 msgstr "强制显示克隆进度"
 
-#: builtin/submodule--helper.c:1393
+#: builtin/submodule--helper.c:1407
 msgid ""
 "git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
 "<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13696,102 +13706,102 @@
 "git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] [--"
 "name <名字>] [--depth <深度>] --url <url> --path <路径>"
 
-#: builtin/submodule--helper.c:1424
+#: builtin/submodule--helper.c:1460
 #, c-format
 msgid "clone of '%s' into submodule path '%s' failed"
 msgstr "无法克隆 '%s' 到子模组路径 '%s'"
 
-#: builtin/submodule--helper.c:1438
+#: builtin/submodule--helper.c:1476
 #, c-format
 msgid "could not get submodule directory for '%s'"
 msgstr "无法得到 '%s' 的子模组目录"
 
-#: builtin/submodule--helper.c:1571
+#: builtin/submodule--helper.c:1617
 #, c-format
 msgid "Submodule path '%s' not initialized"
 msgstr "子模组 '%s' 尚未初始化"
 
-#: builtin/submodule--helper.c:1575
+#: builtin/submodule--helper.c:1621
 msgid "Maybe you want to use 'update --init'?"
 msgstr "也许您想要执行 'update --init'？"
 
-#: builtin/submodule--helper.c:1605
+#: builtin/submodule--helper.c:1651
 #, c-format
 msgid "Skipping unmerged submodule %s"
 msgstr "略过未合并的子模组 %s"
 
-#: builtin/submodule--helper.c:1634
+#: builtin/submodule--helper.c:1680
 #, c-format
 msgid "Skipping submodule '%s'"
 msgstr "略过子模组 '%s'"
 
-#: builtin/submodule--helper.c:1778
+#: builtin/submodule--helper.c:1830
 #, c-format
 msgid "Failed to clone '%s'. Retry scheduled"
 msgstr "克隆 '%s' 失败。按计划重试"
 
-#: builtin/submodule--helper.c:1789
+#: builtin/submodule--helper.c:1841
 #, c-format
 msgid "Failed to clone '%s' a second time, aborting"
 msgstr "第二次尝试克隆 '%s' 失败，退出"
 
-#: builtin/submodule--helper.c:1851 builtin/submodule--helper.c:2093
+#: builtin/submodule--helper.c:1903 builtin/submodule--helper.c:2149
 msgid "path into the working tree"
 msgstr "到工作区的路径"
 
-#: builtin/submodule--helper.c:1854
+#: builtin/submodule--helper.c:1906
 msgid "path into the working tree, across nested submodule boundaries"
 msgstr "工作区中的路径，递归嵌套子模组"
 
-#: builtin/submodule--helper.c:1858
+#: builtin/submodule--helper.c:1910
 msgid "rebase, merge, checkout or none"
 msgstr "rebase、merge、checkout 或 none"
 
-#: builtin/submodule--helper.c:1864
+#: builtin/submodule--helper.c:1916
 msgid "Create a shallow clone truncated to the specified number of revisions"
 msgstr "创建一个指定深度的浅克隆"
 
-#: builtin/submodule--helper.c:1867
+#: builtin/submodule--helper.c:1919
 msgid "parallel jobs"
 msgstr "并发任务"
 
-#: builtin/submodule--helper.c:1869
+#: builtin/submodule--helper.c:1921
 msgid "whether the initial clone should follow the shallow recommendation"
 msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
 
-#: builtin/submodule--helper.c:1870
+#: builtin/submodule--helper.c:1922
 msgid "don't print cloning progress"
 msgstr "不要输出克隆进度"
 
-#: builtin/submodule--helper.c:1592
+#: builtin/submodule--helper.c:1873
 msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
 msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
 
-#: builtin/submodule--helper.c:1890
+#: builtin/submodule--helper.c:1946
 msgid "bad value for update parameter"
 msgstr "update 参数取值错误"
 
-#: builtin/submodule--helper.c:1938
+#: builtin/submodule--helper.c:1994
 #, c-format
 msgid ""
 "Submodule (%s) branch configured to inherit branch from superproject, but "
 "the superproject is not on any branch"
 msgstr "子模组（%s）的分支配置为继承上级项目的分支，但是上级项目不在任何分支上"
 
-#: builtin/submodule--helper.c:2094
+#: builtin/submodule--helper.c:2150
 msgid "recurse into submodules"
 msgstr "在子模组中递归"
 
-#: builtin/submodule--helper.c:1795
+#: builtin/submodule--helper.c:2096
 msgid "git submodule--helper embed-git-dir [<path>...]"
 msgstr "git submodule--helper embed-git-dir [<路径>...]"
 
-#: builtin/submodule--helper.c:2235 git.c:433 git.c:683
+#: builtin/submodule--helper.c:2323 git.c:436 git.c:683
 #, c-format
 msgid "%s doesn't support --super-prefix"
 msgstr "%s 不支持 --super-prefix"
 
-#: builtin/submodule--helper.c:2241
+#: builtin/submodule--helper.c:2329
 #, c-format
 msgid "'%s' is not a valid submodule--helper subcommand"
 msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -13816,15 +13826,15 @@
 msgid "shorten ref output"
 msgstr "缩短引用输出"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
 msgid "reason"
 msgstr "原因"
 
-#: builtin/symbolic-ref.c:43 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:486
 msgid "reason of the update"
 msgstr "更新的原因"
 
-#: builtin/tag.c:24
+#: builtin/tag.c:25
 msgid ""
 "git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
 "[<head>]"
@@ -13897,384 +13907,384 @@
 msgid "bad object type."
 msgstr "坏的对象类型。"
 
-#: builtin/tag.c:284
+#: builtin/tag.c:285
 msgid "no tag message?"
 msgstr "无标签说明？"
 
-#: builtin/tag.c:291
+#: builtin/tag.c:292
 #, c-format
 msgid "The tag message has been left in %s\n"
 msgstr "标签说明被保留在 %s\n"
 
-#: builtin/tag.c:402
+#: builtin/tag.c:403
 msgid "list tag names"
 msgstr "列出标签名称"
 
-#: builtin/tag.c:404
+#: builtin/tag.c:405
 msgid "print <n> lines of each tag message"
 msgstr "每个标签信息打印 <n> 行"
 
-#: builtin/tag.c:406
+#: builtin/tag.c:407
 msgid "delete tags"
 msgstr "删除标签"
 
-#: builtin/tag.c:407
+#: builtin/tag.c:408
 msgid "verify tags"
 msgstr "验证标签"
 
-#: builtin/tag.c:409
+#: builtin/tag.c:410
 msgid "Tag creation options"
 msgstr "标签创建选项"
 
-#: builtin/tag.c:411
+#: builtin/tag.c:412
 msgid "annotated tag, needs a message"
 msgstr "附注标签，需要一个说明"
 
-#: builtin/tag.c:413
+#: builtin/tag.c:414
 msgid "tag message"
 msgstr "标签说明"
 
-#: builtin/tag.c:415
+#: builtin/tag.c:416
 msgid "force edit of tag message"
 msgstr "强制编辑标签说明"
 
-#: builtin/tag.c:416
+#: builtin/tag.c:417
 msgid "annotated and GPG-signed tag"
 msgstr "附注并附加 GPG 签名的标签"
 
-#: builtin/tag.c:419
+#: builtin/tag.c:420
 msgid "use another key to sign the tag"
 msgstr "使用另外的私钥签名该标签"
 
-#: builtin/tag.c:420
+#: builtin/tag.c:421
 msgid "replace the tag if exists"
 msgstr "如果存在，替换现有的标签"
 
-#: builtin/tag.c:421 builtin/update-ref.c:369
+#: builtin/tag.c:422 builtin/update-ref.c:492
 msgid "create a reflog"
 msgstr "创建引用日志"
 
-#: builtin/tag.c:423
+#: builtin/tag.c:424
 msgid "Tag listing options"
 msgstr "标签列表选项"
 
-#: builtin/tag.c:424
+#: builtin/tag.c:425
 msgid "show tag list in columns"
 msgstr "以列的方式显示标签列表"
 
-#: builtin/tag.c:425 builtin/tag.c:427
+#: builtin/tag.c:426 builtin/tag.c:428
 msgid "print only tags that contain the commit"
 msgstr "只打印包含该提交的标签"
 
-#: builtin/tag.c:426 builtin/tag.c:428
+#: builtin/tag.c:427 builtin/tag.c:429
 msgid "print only tags that don't contain the commit"
 msgstr "只打印不包含该提交的标签"
 
-#: builtin/tag.c:429
+#: builtin/tag.c:430
 msgid "print only tags that are merged"
 msgstr "只打印已经合并的标签"
 
-#: builtin/tag.c:430
+#: builtin/tag.c:431
 msgid "print only tags that are not merged"
 msgstr "只打印尚未合并的标签"
 
-#: builtin/tag.c:434
+#: builtin/tag.c:435
 msgid "print only tags of the object"
 msgstr "只打印指向该对象的标签"
 
-#: builtin/tag.c:482
+#: builtin/tag.c:483
 msgid "--column and -n are incompatible"
 msgstr "--column 和 -n 不兼容"
 
-#: builtin/tag.c:504
+#: builtin/tag.c:505
 msgid "-n option is only allowed in list mode"
 msgstr "-n 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:506
+#: builtin/tag.c:507
 msgid "--contains option is only allowed in list mode"
 msgstr "--contains 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:508
+#: builtin/tag.c:509
 msgid "--no-contains option is only allowed in list mode"
 msgstr "--no-contains 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:510
+#: builtin/tag.c:511
 msgid "--points-at option is only allowed in list mode"
 msgstr "--points-at 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:512
+#: builtin/tag.c:513
 msgid "--merged and --no-merged options are only allowed in list mode"
 msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
 
-#: builtin/tag.c:523
+#: builtin/tag.c:524
 msgid "only one -F or -m option is allowed."
 msgstr "只允许一个 -F 或 -m 选项。"
 
-#: builtin/tag.c:542
+#: builtin/tag.c:543
 msgid "too many params"
 msgstr "太多参数"
 
-#: builtin/tag.c:548
+#: builtin/tag.c:549
 #, c-format
 msgid "'%s' is not a valid tag name."
 msgstr "'%s' 不是一个有效的标签名称。"
 
-#: builtin/tag.c:553
+#: builtin/tag.c:554
 #, c-format
 msgid "tag '%s' already exists"
 msgstr "标签 '%s' 已存在"
 
-#: builtin/tag.c:584
+#: builtin/tag.c:585
 #, c-format
 msgid "Updated tag '%s' (was %s)\n"
 msgstr "已更新标签 '%s'（曾为 %s）\n"
 
-#: builtin/unpack-objects.c:500
+#: builtin/unpack-objects.c:502
 msgid "Unpacking objects"
 msgstr "展开对象中"
 
-#: builtin/update-index.c:83
+#: builtin/update-index.c:84
 #, c-format
 msgid "failed to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: builtin/pack-objects.c:917 builtin/update-index.c:89
+#: builtin/pack-objects.c:1047 builtin/update-index.c:90
 #, c-format
 msgid "failed to stat %s"
 msgstr "对 %s 调用 stat 失败"
 
-#: builtin/update-index.c:99
+#: builtin/update-index.c:100
 #, c-format
 msgid "failed to create file %s"
 msgstr "创建文件 %s 失败"
 
-#: builtin/update-index.c:107
+#: builtin/update-index.c:108
 #, c-format
 msgid "failed to delete file %s"
 msgstr "删除文件 %s 失败"
 
-#: builtin/update-index.c:114 builtin/update-index.c:220
+#: builtin/update-index.c:115 builtin/update-index.c:221
 #, c-format
 msgid "failed to delete directory %s"
 msgstr "删除目录 %s 失败"
 
-#: builtin/update-index.c:139
+#: builtin/update-index.c:140
 #, c-format
 msgid "Testing mtime in '%s' "
 msgstr "在 '%s' 中测试 mtime "
 
-#: builtin/update-index.c:153
+#: builtin/update-index.c:154
 msgid "directory stat info does not change after adding a new file"
 msgstr "添加一个新文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c:166
+#: builtin/update-index.c:167
 msgid "directory stat info does not change after adding a new directory"
 msgstr "添加一个新目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c:179
+#: builtin/update-index.c:180
 msgid "directory stat info changes after updating a file"
 msgstr "更新一个文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c:190
+#: builtin/update-index.c:191
 msgid "directory stat info changes after adding a file inside subdirectory"
 msgstr "在子目录中添加文件后，目录的状态信息被修改"
 
-#: builtin/update-index.c:201
+#: builtin/update-index.c:202
 msgid "directory stat info does not change after deleting a file"
 msgstr "删除一个文件后，目录的状态信息未改变"
 
-#: builtin/update-index.c:214
+#: builtin/update-index.c:215
 msgid "directory stat info does not change after deleting a directory"
 msgstr "删除一个目录后，目录的状态信息未改变"
 
-#: builtin/update-index.c:221
+#: builtin/update-index.c:222
 msgid " OK"
 msgstr " OK"
 
-#: builtin/update-index.c:589
+#: builtin/update-index.c:591
 msgid "git update-index [<options>] [--] [<file>...]"
 msgstr "git update-index [<选项>] [--] [<文件>...]"
 
-#: builtin/update-index.c:972
+#: builtin/update-index.c:974
 msgid "continue refresh even when index needs update"
 msgstr "当索引需要更新时继续刷新"
 
-#: builtin/update-index.c:975
+#: builtin/update-index.c:977
 msgid "refresh: ignore submodules"
 msgstr "刷新：忽略子模组"
 
-#: builtin/update-index.c:978
+#: builtin/update-index.c:980
 msgid "do not ignore new files"
 msgstr "不忽略新的文件"
 
-#: builtin/update-index.c:980
+#: builtin/update-index.c:982
 msgid "let files replace directories and vice-versa"
 msgstr "让文件替换目录（反之亦然）"
 
-#: builtin/update-index.c:982
+#: builtin/update-index.c:984
 msgid "notice files missing from worktree"
 msgstr "通知文件从工作区丢失"
 
-#: builtin/update-index.c:984
+#: builtin/update-index.c:986
 msgid "refresh even if index contains unmerged entries"
 msgstr "即使索引区包含未合并的条目也执行刷新"
 
-#: builtin/update-index.c:987
+#: builtin/update-index.c:989
 msgid "refresh stat information"
 msgstr "刷新统计信息"
 
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
 msgid "like --refresh, but ignore assume-unchanged setting"
 msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
 
-#: builtin/update-index.c:995
+#: builtin/update-index.c:997
 msgid "<mode>,<object>,<path>"
 msgstr "<存取模式>,<对象>,<路径>"
 
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
 msgid "add the specified entry to the index"
 msgstr "添加指定的条目到索引区"
 
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
 msgid "mark files as \"not changing\""
 msgstr "把文件标记为 \"没有变更\""
 
-#: builtin/update-index.c:1009
+#: builtin/update-index.c:1011
 msgid "clear assumed-unchanged bit"
 msgstr "清除 assumed-unchanged 位"
 
-#: builtin/update-index.c:1012
+#: builtin/update-index.c:1014
 msgid "mark files as \"index-only\""
 msgstr "把文件标记为 \"仅索引\""
 
-#: builtin/update-index.c:1015
+#: builtin/update-index.c:1017
 msgid "clear skip-worktree bit"
 msgstr "清除 skip-worktree 位"
 
-#: builtin/update-index.c:1018
+#: builtin/update-index.c:1022
 msgid "add to index only; do not add content to object database"
 msgstr "只添加到索引区；不添加对象到对象库"
 
-#: builtin/update-index.c:1020
+#: builtin/update-index.c:1024
 msgid "remove named paths even if present in worktree"
 msgstr "即使存在工作区里，也删除路径"
 
-#: builtin/update-index.c:1022
+#: builtin/update-index.c:1026
 msgid "with --stdin: input lines are terminated by null bytes"
 msgstr "携带 --stdin：输入的行以 null 字符终止"
 
-#: builtin/update-index.c:1024
+#: builtin/update-index.c:1028
 msgid "read list of paths to be updated from standard input"
 msgstr "从标准输入中读取需要更新的路径列表"
 
-#: builtin/update-index.c:1028
+#: builtin/update-index.c:1032
 msgid "add entries from standard input to the index"
 msgstr "从标准输入添加条目到索引区"
 
-#: builtin/update-index.c:1032
+#: builtin/update-index.c:1036
 msgid "repopulate stages #2 and #3 for the listed paths"
 msgstr "为指定文件重新生成第2和第3暂存区"
 
-#: builtin/update-index.c:1036
+#: builtin/update-index.c:1040
 msgid "only update entries that differ from HEAD"
 msgstr "只更新与 HEAD 不同的条目"
 
-#: builtin/update-index.c:1040
+#: builtin/update-index.c:1044
 msgid "ignore files missing from worktree"
 msgstr "忽略工作区丢失的文件"
 
-#: builtin/update-index.c:1043
+#: builtin/update-index.c:1047
 msgid "report actions to standard output"
 msgstr "在标准输出显示操作"
 
-#: builtin/update-index.c:1045
+#: builtin/update-index.c:1049
 msgid "(for porcelains) forget saved unresolved conflicts"
 msgstr "(for porcelains) 忘记保存的未解决的冲突"
 
-#: builtin/update-index.c:1049
+#: builtin/update-index.c:1053
 msgid "write index in this format"
 msgstr "以这种格式写入索引区"
 
-#: builtin/update-index.c:1051
+#: builtin/update-index.c:1055
 msgid "enable or disable split index"
 msgstr "启用或禁用索引拆分"
 
-#: builtin/update-index.c:1053
+#: builtin/update-index.c:1057
 msgid "enable/disable untracked cache"
 msgstr "启用/禁用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1055
+#: builtin/update-index.c:1059
 msgid "test if the filesystem supports untracked cache"
 msgstr "测试文件系统是否支持未跟踪文件缓存"
 
-#: builtin/update-index.c:1057
+#: builtin/update-index.c:1061
 msgid "enable untracked cache without testing the filesystem"
 msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
 
-#: builtin/update-index.c:1059
+#: builtin/update-index.c:1063
 msgid "write out the index even if is not flagged as changed"
 msgstr "即使没有被标记为已更改，也要写出索引"
 
-#: builtin/update-index.c:1061
+#: builtin/update-index.c:1065
 msgid "enable or disable file system monitor"
 msgstr "启用或禁用文件系统监控"
 
-#: builtin/update-index.c:1063
+#: builtin/update-index.c:1067
 msgid "mark files as fsmonitor valid"
 msgstr "标记文件为 fsmonitor 有效"
 
-#: builtin/update-index.c:1066
+#: builtin/update-index.c:1070
 msgid "clear fsmonitor valid bit"
 msgstr "清除 fsmonitor 有效位"
 
-#: builtin/update-index.c:1169
+#: builtin/update-index.c:1173
 msgid ""
 "core.splitIndex is set to false; remove or change it, if you really want to "
 "enable split index"
 msgstr "core.splitIndex 被设置为 false。如果您确实要启用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1178
+#: builtin/update-index.c:1182
 msgid ""
 "core.splitIndex is set to true; remove or change it, if you really want to "
 "disable split index"
 msgstr "core.splitIndex 被设置为 true。如果您确实要禁用索引拆分，请删除或修改它。"
 
-#: builtin/update-index.c:1190
+#: builtin/update-index.c:1194
 msgid ""
 "core.untrackedCache is set to true; remove or change it, if you really want "
 "to disable the untracked cache"
 msgstr "core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修改它。"
 
-#: builtin/update-index.c:1194
+#: builtin/update-index.c:1198
 msgid "Untracked cache disabled"
 msgstr "缓存未跟踪文件被禁用"
 
-#: builtin/update-index.c:1202
+#: builtin/update-index.c:1206
 msgid ""
 "core.untrackedCache is set to false; remove or change it, if you really want "
 "to enable the untracked cache"
 msgstr "core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或修改它。"
 
-#: builtin/update-index.c:1206
+#: builtin/update-index.c:1210
 #, c-format
 msgid "Untracked cache enabled for '%s'"
 msgstr "缓存未跟踪文件在 '%s' 启用"
 
-#: builtin/update-index.c:1214
+#: builtin/update-index.c:1218
 msgid ""
 "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
 msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置该选项"
 
-#: builtin/update-index.c:1218
+#: builtin/update-index.c:1222
 msgid "fsmonitor enabled"
 msgstr "fsmonitor 被启用"
 
-#: builtin/update-index.c:1221
+#: builtin/update-index.c:1225
 msgid ""
 "core.fsmonitor is set; remove it if you really want to disable fsmonitor"
 msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除该选项"
 
-#: builtin/update-index.c:1225
+#: builtin/update-index.c:1229
 msgid "fsmonitor disabled"
 msgstr "fsmonitor 被禁用"
 
@@ -14290,19 +14300,19 @@
 msgid "git update-ref [<options>] --stdin [-z]"
 msgstr "git update-ref [<选项>] --stdin [-z]"
 
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:487
 msgid "delete the reference"
 msgstr "删除引用"
 
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:489
 msgid "update <refname> not the one it points to"
 msgstr "更新 <引用名> 本身而不是它指向的引用"
 
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:490
 msgid "stdin has NUL-terminated arguments"
 msgstr "标准输入有以 NUL 字符终止的参数"
 
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:491
 msgid "read updates from stdin"
 msgstr "从标准输入读取更新"
 
@@ -14419,96 +14429,96 @@
 msgid "'%s' already exists"
 msgstr "'%s' 已经存在"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:301
 #, c-format
 msgid "could not create directory of '%s'"
 msgstr "不能创建目录 '%s'"
 
-#: builtin/worktree.c:308
+#: builtin/worktree.c:271
 #, c-format
 msgid "Preparing %s (identifier %s)"
-msgstr "准备 %s（标识符 %s）"
+msgstr "准备 %s （标识符 %s）"
 
-#: builtin/worktree.c:497
+#: builtin/worktree.c:493
 msgid "checkout <branch> even if already checked out in other worktree"
 msgstr "检出 <分支>，即使已经被检出到其它工作区"
 
-#: builtin/worktree.c:500
+#: builtin/worktree.c:496
 msgid "create a new branch"
 msgstr "创建一个新分支"
 
-#: builtin/worktree.c:502
+#: builtin/worktree.c:498
 msgid "create or reset a branch"
 msgstr "创建或重置一个分支"
 
-#: builtin/worktree.c:504
+#: builtin/worktree.c:500
 msgid "populate the new working tree"
 msgstr "生成新的工作区"
 
-#: builtin/worktree.c:505
+#: builtin/worktree.c:501
 msgid "keep the new working tree locked"
 msgstr "锁定新工作区"
 
-#: builtin/worktree.c:508
+#: builtin/worktree.c:504
 msgid "set up tracking mode (see git-branch(1))"
 msgstr "设置跟踪模式（参见 git-branch(1)）"
 
-#: builtin/worktree.c:511
+#: builtin/worktree.c:507
 msgid "try to match the new branch name with a remote-tracking branch"
 msgstr "尝试为新分支名匹配一个远程跟踪分支"
 
-#: builtin/worktree.c:519
+#: builtin/worktree.c:515
 msgid "-b, -B, and --detach are mutually exclusive"
 msgstr "-b、-B 和 --detach 是互斥的"
 
-#: builtin/worktree.c:580
+#: builtin/worktree.c:576
 msgid "--[no-]track can only be used if a new branch is created"
 msgstr "只能在创建新分支时使用选项 --[no-]track"
 
-#: builtin/worktree.c:680
+#: builtin/worktree.c:676
 msgid "reason for locking"
 msgstr "锁定原因"
 
-#: builtin/worktree.c:692 builtin/worktree.c:725 builtin/worktree.c:799
-#: builtin/worktree.c:926
+#: builtin/worktree.c:688 builtin/worktree.c:721 builtin/worktree.c:795
+#: builtin/worktree.c:922
 #, c-format
 msgid "'%s' is not a working tree"
 msgstr "'%s' 不是一个工作区"
 
-#: builtin/worktree.c:694 builtin/worktree.c:727
+#: builtin/worktree.c:690 builtin/worktree.c:723
 msgid "The main working tree cannot be locked or unlocked"
 msgstr "主工作区无法被加锁或解锁"
 
-#: builtin/worktree.c:699
+#: builtin/worktree.c:695
 #, c-format
 msgid "'%s' is already locked, reason: %s"
 msgstr "'%s' 已被锁定，原因：%s"
 
-#: builtin/worktree.c:701
+#: builtin/worktree.c:697
 #, c-format
 msgid "'%s' is already locked"
 msgstr "'%s' 已被锁定"
 
-#: builtin/worktree.c:729
+#: builtin/worktree.c:725
 #, c-format
 msgid "'%s' is not locked"
 msgstr "'%s' 未被锁定"
 
-#: builtin/worktree.c:770
+#: builtin/worktree.c:766
 msgid "working trees containing submodules cannot be moved or removed"
 msgstr "不能移动或删除包含子模组的工作区"
 
-#: builtin/worktree.c:801 builtin/worktree.c:928
+#: builtin/worktree.c:797 builtin/worktree.c:924
 #, c-format
 msgid "'%s' is a main working tree"
 msgstr "'%s' 是一个主工作区"
 
-#: builtin/worktree.c:806
+#: builtin/worktree.c:802
 #, c-format
 msgid "could not figure out destination name from '%s'"
 msgstr "无法从 '%s' 算出目标名称"
 
-#: builtin/worktree.c:812
+#: builtin/worktree.c:808
 #, c-format
 msgid "target '%s' already exists"
 msgstr "目标 '%s' 已存在"
@@ -14522,32 +14532,32 @@
 msgid "cannot move a locked working tree"
 msgstr "无法移动一个锁定的工作区"
 
-#: builtin/worktree.c:825
+#: builtin/worktree.c:821
 #, c-format
 msgid "validation failed, cannot move working tree: %s"
 msgstr "验证失败，无法移动工作区：%s"
 
-#: builtin/worktree.c:830
+#: builtin/worktree.c:826
 #, c-format
 msgid "failed to move '%s' to '%s'"
 msgstr "移动 '%s' 到 '%s' 失败"
 
-#: builtin/worktree.c:878
+#: builtin/worktree.c:874
 #, c-format
 msgid "failed to run 'git status' on '%s'"
 msgstr "在 '%s' 中执行 'git status' 失败"
 
-#: builtin/worktree.c:752
+#: builtin/worktree.c:855
 #, c-format
 msgid "'%s' is dirty, use --force to delete it"
 msgstr "'%s' 是脏的，使用 --force 删除"
 
-#: builtin/worktree.c:887
+#: builtin/worktree.c:883
 #, c-format
 msgid "failed to run 'git status' on '%s', code %d"
 msgstr "在 '%s' 中执行 'git status' 失败，退出码 %d"
 
-#: builtin/worktree.c:60 builtin/worktree.c:898
+#: builtin/worktree.c:60 builtin/worktree.c:894
 #, c-format
 msgid "failed to delete '%s'"
 msgstr "删除 '%s' 失败"
@@ -14565,7 +14575,7 @@
 msgid "cannot remove a locked working tree"
 msgstr "无法删除一个锁定的工作区"
 
-#: builtin/worktree.c:938
+#: builtin/worktree.c:934
 #, c-format
 msgid "validation failed, cannot remove working tree: %s"
 msgstr "验证失败，无法删除工作区：%s"
@@ -14636,7 +14646,7 @@
 "           [--git-dir=<路径>] [--work-tree=<路径>] [--namespace=<名称>]\n"
 "           <命令> [<参数>]"
 
-#: git.c:15
+#: git.c:34
 msgid ""
 "'git help -a' and 'git help -g' list available subcommands and some\n"
 "concept guides. See 'git help <command>' or 'git help <concept>'\n"
@@ -14646,37 +14656,37 @@
 "查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
 "帮助。"
 
-#: git.c:186
+#: git.c:187
 #, c-format
 msgid "no directory given for --git-dir\n"
 msgstr "没有为 --git-dir 提供目录\n"
 
-#: git.c:200
+#: git.c:201
 #, c-format
 msgid "no namespace given for --namespace\n"
 msgstr "没有为 --namespace 提供命名空间\n"
 
-#: git.c:214
+#: git.c:215
 #, c-format
 msgid "no directory given for --work-tree\n"
 msgstr "没有为 --work-tree 提供目录\n"
 
-#: git.c:228
+#: git.c:229
 #, c-format
 msgid "no prefix given for --super-prefix\n"
 msgstr "没有为 --super-prefix 提供前缀\n"
 
-#: git.c:250
+#: git.c:251
 #, c-format
 msgid "-c expects a configuration string\n"
 msgstr "应为 -c 提供一个配置字符串\n"
 
-#: git.c:288
+#: git.c:289
 #, c-format
 msgid "no directory given for -C\n"
 msgstr "没有为 -C 提供目录\n"
 
-#: git.c:314
+#: git.c:315
 #, c-format
 msgid "unknown option: %s\n"
 msgstr "未知选项：%s\n"
@@ -14691,20 +14701,20 @@
 msgid "failed to run command '%s': %s\n"
 msgstr "运行命令 '%s' 失败：%s\n"
 
-#: http.c:378
+#: http.c:399
 #, c-format
 msgid "negative value for http.postbuffer; defaulting to %d"
 msgstr "http.postbuffer 为负值，默认为 %d"
 
-#: http.c:399
+#: http.c:420
 msgid "Delegation control is not supported with cURL < 7.22.0"
 msgstr "不支持委托控制，因为 cURL < 7.22.0"
 
-#: http.c:408
+#: http.c:429
 msgid "Public key pinning not supported with cURL < 7.44.0"
 msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
 
-#: http.c:1968
+#: http.c:2032
 #, c-format
 msgid ""
 "unable to update url base from redirection:\n"
@@ -14760,95 +14770,95 @@
 msgid "List, create, or delete branches"
 msgstr "列出、创建或删除分支"
 
-#: command-list.h:64
+#: command-list.h:65
 msgid "Switch branches or restore working tree files"
 msgstr "切换分支或恢复工作区文件"
 
-#: command-list.h:71
+#: command-list.h:72
 msgid "Clone a repository into a new directory"
 msgstr "克隆仓库到一个新目录"
 
-#: command-list.h:73
+#: command-list.h:74
 msgid "Record changes to the repository"
 msgstr "记录变更到仓库"
 
-#: command-list.h:86
+#: command-list.h:87
 msgid "Show changes between commits, commit and working tree, etc"
 msgstr "显示提交之间、提交和工作区之间等的差异"
 
-#: command-list.h:93
+#: command-list.h:94
 msgid "Download objects and refs from another repository"
 msgstr "从另外一个仓库下载对象和引用"
 
-#: command-list.h:102
+#: command-list.h:103
 msgid "Print lines matching a pattern"
 msgstr "输出和模式匹配的行"
 
-#: command-list.h:111
+#: command-list.h:112
 msgid "Create an empty Git repository or reinitialize an existing one"
 msgstr "创建一个空的 Git 仓库或重新初始化一个已存在的仓库"
 
-#: command-list.h:115
+#: command-list.h:116
 msgid "Show commit logs"
 msgstr "显示提交日志"
 
-#: command-list.h:121
+#: command-list.h:122
 msgid "Join two or more development histories together"
 msgstr "合并两个或更多开发历史"
 
-#: command-list.h:131
+#: command-list.h:132
 msgid "Move or rename a file, a directory, or a symlink"
 msgstr "移动或重命名一个文件、目录或符号链接"
 
-#: command-list.h:142
+#: command-list.h:143
 msgid "Fetch from and integrate with another repository or a local branch"
 msgstr "获取并整合另外的仓库或一个本地分支"
 
-#: command-list.h:143
+#: command-list.h:144
 msgid "Update remote refs along with associated objects"
 msgstr "更新远程引用和相关的对象"
 
-#: command-list.h:147
+#: command-list.h:148
 msgid "Reapply commits on top of another base tip"
 msgstr "在另一个分支上重新应用提交"
 
-#: command-list.h:155
+#: command-list.h:156
 msgid "Reset current HEAD to the specified state"
 msgstr "重置当前 HEAD 到指定状态"
 
-#: command-list.h:160
+#: command-list.h:161
 msgid "Remove files from the working tree and from the index"
 msgstr "从工作区和索引中删除文件"
 
-#: command-list.h:165
+#: command-list.h:166
 msgid "Show various types of objects"
 msgstr "显示各种类型的对象"
 
-#: command-list.h:173
+#: command-list.h:175
 msgid "Show the working tree status"
 msgstr "显示工作区状态"
 
-#: command-list.h:179
+#: command-list.h:181
 msgid "Create, list, delete or verify a tag object signed with GPG"
 msgstr "创建、列出、删除或校验一个 GPG 签名的标签对象"
 
-#: parse-options.h:179
+#: parse-options.h:183
 msgid "expiry-date"
 msgstr "到期时间"
 
-#: parse-options.h:193
+#: parse-options.h:197
 msgid "no-op (backward compatibility)"
 msgstr "空操作（向后兼容）"
 
-#: parse-options.h:305
+#: parse-options.h:309
 msgid "be more verbose"
 msgstr "更加详细"
 
-#: parse-options.h:307
+#: parse-options.h:311
 msgid "be more quiet"
 msgstr "更加安静"
 
-#: parse-options.h:313
+#: parse-options.h:317
 msgid "use <n> digits to display SHA-1s"
 msgstr "用 <n> 位数字显示 SHA-1 哈希值"
 
@@ -14888,7 +14898,7 @@
 "Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
 msgstr "检出 '$start_head' 失败。尝试 'git bisect reset <有效分支>'。"
 
-#: builtin/bisect--helper.c:547
+#: builtin/bisect--helper.c:550
 msgid "won't bisect on cg-seek'ed tree"
 msgstr "不会在做了 cg-seek 的树上做二分查找"
 
@@ -14931,7 +14941,7 @@
 #. translation. The program will only accept English input
 #. at this point.
 #. 
-#: builtin/bisect--helper.c:329
+#: builtin/bisect--helper.c:318
 msgid "Are you sure [Y/n]? "
 msgstr "您确认么[Y/n]？ "
 
@@ -14955,7 +14965,7 @@
 "然后需要提供我至少一个好版本和一个坏版本。\n"
 "（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
 
-#: git-bisect.sh:300
+#: git-bisect.sh:302
 msgid "We are not bisecting."
 msgstr "我们没有在二分查找。"
 
@@ -14982,20 +14992,20 @@
 msgid "cannot read $file for replaying"
 msgstr "不能读取 $file 来重放"
 
-#: git-bisect.sh:232
+#: git-bisect.sh:233
 msgid "?? what are you talking about?"
 msgstr "?? 您在说什么?"
 
-#: git-bisect.sh:241
+#: git-bisect.sh:243
 msgid "bisect run failed: no command provided."
 msgstr "二分查找运行失败：没有提供命令。"
 
-#: git-bisect.sh:246
+#: git-bisect.sh:248
 #, sh-format
 msgid "running $command"
 msgstr "运行 $command"
 
-#: git-bisect.sh:253
+#: git-bisect.sh:255
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -15004,11 +15014,11 @@
 "二分查找运行失败：\n"
 "命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
 
-#: git-bisect.sh:279
+#: git-bisect.sh:281
 msgid "bisect run cannot continue any more"
 msgstr "二分查找不能继续运行"
 
-#: git-bisect.sh:285
+#: git-bisect.sh:287
 #, sh-format
 msgid ""
 "bisect run failed:\n"
@@ -15017,7 +15027,7 @@
 "二分查找运行失败：\n"
 "'bisect_state $state' 退出码为 $res"
 
-#: git-bisect.sh:292
+#: git-bisect.sh:294
 msgid "bisect run success"
 msgstr "二分查找运行成功"
 
@@ -15026,7 +15036,7 @@
 msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
 msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
 
-#: builtin/bisect--helper.c:376
+#: builtin/bisect--helper.c:379
 msgid "no terms defined"
 msgstr "未定义术语"
 
@@ -15077,7 +15087,7 @@
 msgid "Simple merge did not work, trying automatic merge."
 msgstr "简单合并未生效，尝试自动合并。"
 
-#: builtin/rebase.c:951 git-rebase--preserve-merges.sh:81
+#: builtin/rebase.c:799 git-rebase--preserve-merges.sh:81
 msgid ""
 "Resolve all conflicts manually, mark them as resolved with\n"
 "\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
@@ -15090,7 +15100,7 @@
 "\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
 "\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
 
-#: git-rebase.sh:163 git-rebase.sh:409
+#: git-legacy-rebase.sh:434
 #, sh-format
 msgid "Could not move back to $head_name"
 msgstr "无法移回 $head_name"
@@ -15104,27 +15114,27 @@
 msgid "Cannot store $stash_sha1"
 msgstr "不能存储 $stash_sha1"
 
-#: builtin/rebase.c:2107
+#: builtin/rebase.c:1994
 msgid "The pre-rebase hook refused to rebase."
 msgstr "pre-rebase 钩子拒绝了变基操作。"
 
-#: builtin/rebase.c:1530
+#: builtin/rebase.c:1432
 msgid "It looks like 'git am' is in progress. Cannot rebase."
 msgstr "看起来 'git-am' 正在执行中。无法变基。"
 
-#: builtin/rebase.c:1582
+#: builtin/rebase.c:1487
 msgid "No rebase in progress?"
 msgstr "没有正在进行的变基？"
 
-#: builtin/rebase.c:1586
+#: builtin/rebase.c:1491
 msgid "The --edit-todo action can only be used during interactive rebase."
 msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
 
-#: builtin/rebase.c:1609
+#: builtin/rebase.c:1514
 msgid "Cannot read HEAD"
 msgstr "不能读取 HEAD"
 
-#: builtin/rebase.c:1621
+#: builtin/rebase.c:1526
 msgid ""
 "You must edit all merge conflicts and then\n"
 "mark them as resolved using git add"
@@ -15132,7 +15142,7 @@
 "您必须编辑所有的合并冲突，然后通过 git add\n"
 "命令将它们标记为已解决"
 
-#: git-rebase.sh:435
+#: git-legacy-rebase.sh:460
 #, sh-format
 msgid ""
 "It seems that there is already a $state_dir_base directory, and\n"
@@ -15151,243 +15161,242 @@
 "\t$cmd_clear_stale_rebase\n"
 "然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
 
-#: git-rebase.sh:491
+#: git-legacy-rebase.sh:570
 #, sh-format
 msgid "invalid upstream '$upstream_name'"
 msgstr "无效的上游 '$upstream_name'"
 
-#: git-rebase.sh:515
+#: git-legacy-rebase.sh:594
 #, sh-format
 msgid "$onto_name: there are more than one merge bases"
 msgstr "$onto_name: 有一个以上的合并基准"
 
-#: git-rebase.sh:518 git-rebase.sh:522
+#: git-legacy-rebase.sh:597 git-legacy-rebase.sh:601
 #, sh-format
 msgid "$onto_name: there is no merge base"
 msgstr "$onto_name: 没有合并基准"
 
-#: git-rebase.sh:527
+#: git-legacy-rebase.sh:606
 #, sh-format
 msgid "Does not point to a valid commit: $onto_name"
 msgstr "没有指向一个有效的提交：$onto_name"
 
-#: git-rebase.sh:553
+#: git-legacy-rebase.sh:632
 #, sh-format
 msgid "fatal: no such branch/commit '$branch_name'"
 msgstr "严重错误：无此分支/提交 '$branch_name'"
 
-#: builtin/rebase.c:2012
+#: sequencer.c:3703
 msgid "Cannot autostash"
 msgstr "无法 autostash"
 
-#: git-rebase.sh:591
+#: git-legacy-rebase.sh:670
 #, sh-format
 msgid "Created autostash: $stash_abbrev"
 msgstr "创建了 autostash: $stash_abbrev"
 
-#: builtin/rebase.c:2036
+#: builtin/rebase.c:1927
 msgid "Please commit or stash them."
 msgstr "请提交或贮藏修改。"
 
-#: builtin/rebase.c:2087
+#: builtin/rebase.c:1974
 msgid "HEAD is up to date."
 msgstr "HEAD 是最新的。"
 
-#: git-rebase.sh:620
+#: git-legacy-rebase.sh:699
 #, sh-format
 msgid "Current branch $branch_name is up to date."
 msgstr "当前分支 $branch_name 是最新的。"
 
-#: builtin/rebase.c:2097
+#: builtin/rebase.c:1984
 msgid "HEAD is up to date, rebase forced."
 msgstr "HEAD 是最新的，强制变基。"
 
-#: git-rebase.sh:630
+#: git-legacy-rebase.sh:709
 #, sh-format
 msgid "Current branch $branch_name is up to date, rebase forced."
 msgstr "当前分支 $branch_name 是最新的，强制变基。"
 
-#: git-rebase.sh:642
+#: git-legacy-rebase.sh:725
 #, sh-format
 msgid "Changes from $mb to $onto:"
 msgstr "从 $mb 到 $onto 的变更："
 
-#: git-rebase.sh:651
+#: git-legacy-rebase.sh:736
 msgid "First, rewinding head to replay your work on top of it..."
 msgstr "首先，回退分支以便在上面重放您的工作..."
 
-#: git-rebase.sh:661
+#: git-legacy-rebase.sh:746
 #, sh-format
 msgid "Fast-forwarded $branch_name to $onto_name."
 msgstr "快进 $branch_name 至 $onto_name。"
 
-#: builtin/stash.c:224 git-legacy-stash.sh:75
+#: builtin/stash.c:225
 msgid "git stash clear with parameters is unimplemented"
 msgstr "git stash clear 不支持参数"
 
-#: builtin/stash.c:1145 git-legacy-stash.sh:150
+#: builtin/stash.c:1146
 msgid "You do not have the initial commit yet"
 msgstr "您尚未建立初始提交"
 
-#: builtin/stash.c:1172 git-legacy-stash.sh:165
+#: builtin/stash.c:1173
 msgid "Cannot save the current index state"
 msgstr "无法保存当前索引状态"
 
-#: builtin/stash.c:1181 git-legacy-stash.sh:180
+#: builtin/stash.c:1182
 msgid "Cannot save the untracked files"
 msgstr "无法保存未跟踪文件"
 
-#: builtin/stash.c:1192 builtin/stash.c:1201 git-legacy-stash.sh:200
-#: git-legacy-stash.sh:213
+#: builtin/stash.c:1193 builtin/stash.c:1202
 msgid "Cannot save the current worktree state"
 msgstr "无法保存当前工作区状态"
 
-#: builtin/stash.c:1046 git-legacy-stash.sh:217
+#: builtin/stash.c:1046
 msgid "No changes selected"
 msgstr "没有选择变更"
 
-#: git-legacy-stash.sh:220
+#: git-legacy-stash.sh:221
 msgid "Cannot remove temporary index (can't happen)"
 msgstr "无法删除临时索引（不应发生）"
 
-#: builtin/stash.c:1229 git-legacy-stash.sh:233
+#: builtin/stash.c:1230
 msgid "Cannot record working tree state"
 msgstr "不能记录工作区状态"
 
-#: git-legacy-stash.sh:271
+#: git-legacy-stash.sh:272
 #, sh-format
 msgid "Cannot update $ref_stash with $w_commit"
 msgstr "无法用 $w_commit 更新 $ref_stash"
 
-#: git-legacy-stash.sh:323
+#: git-legacy-stash.sh:324
 #, sh-format
 msgid "error: unknown option for 'stash push': $option"
 msgstr "错误：'stash push' 的未知选项：$option"
 
-#: builtin/stash.c:1278 git-legacy-stash.sh:337
+#: builtin/stash.c:1279
 msgid "Can't use --patch and --include-untracked or --all at the same time"
 msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
 
-#: builtin/stash.c:1309 git-legacy-stash.sh:345
+#: builtin/stash.c:1310
 msgid "No local changes to save"
 msgstr "没有要保存的本地修改"
 
-#: builtin/stash.c:1316 git-legacy-stash.sh:350
+#: builtin/stash.c:1317
 msgid "Cannot initialize stash"
 msgstr "无法初始化贮藏"
 
-#: builtin/stash.c:1331 git-legacy-stash.sh:354
+#: builtin/stash.c:1332
 msgid "Cannot save the current status"
 msgstr "无法保存当前状态"
 
-#: git-legacy-stash.sh:355
+#: git-legacy-stash.sh:356
 #, sh-format
 msgid "Saved working directory and index state $stash_msg"
 msgstr "保存工作目录和索引状态 $stash_msg"
 
-#: builtin/stash.c:1426 git-legacy-stash.sh:384
+#: builtin/stash.c:1427
 msgid "Cannot remove worktree changes"
 msgstr "无法删除工作区变更"
 
-#: git-legacy-stash.sh:535
+#: git-legacy-stash.sh:536
 #, sh-format
 msgid "unknown option: $opt"
 msgstr "未知选项: $opt"
 
-#: builtin/stash.c:161 git-legacy-stash.sh:548
+#: builtin/stash.c:162
 msgid "No stash entries found."
 msgstr "未发现贮藏条目。"
 
-#: git-legacy-stash.sh:555
+#: git-legacy-stash.sh:556
 #, sh-format
 msgid "Too many revisions specified: $REV"
 msgstr "指定了太多的版本：$REV"
 
-#: git-legacy-stash.sh:570
+#: git-legacy-stash.sh:571
 #, sh-format
 msgid "$reference is not a valid reference"
 msgstr "$reference 不是一个有效的引用"
 
-#: git-legacy-stash.sh:598
+#: git-legacy-stash.sh:599
 #, sh-format
 msgid "'$args' is not a stash-like commit"
 msgstr "'$args' 不是贮藏式提交"
 
-#: git-legacy-stash.sh:609
+#: git-legacy-stash.sh:610
 #, sh-format
 msgid "'$args' is not a stash reference"
 msgstr "'$args' 不是一个贮藏引用"
 
-#: git-legacy-stash.sh:617
+#: git-legacy-stash.sh:618
 msgid "unable to refresh index"
 msgstr "无法刷新索引"
 
-#: git-legacy-stash.sh:621
+#: git-legacy-stash.sh:622
 msgid "Cannot apply a stash in the middle of a merge"
 msgstr "无法在合并过程应用贮藏"
 
-#: git-legacy-stash.sh:629
+#: git-legacy-stash.sh:630
 msgid "Conflicts in index. Try without --index."
 msgstr "索引中有冲突。尝试不使用 --index。"
 
-#: git-legacy-stash.sh:631
+#: git-legacy-stash.sh:632
 msgid "Could not save index tree"
 msgstr "不能保存索引树"
 
-#: git-legacy-stash.sh:640
+#: git-legacy-stash.sh:641
 msgid "Could not restore untracked files from stash entry"
 msgstr "无法从贮藏条目中恢复未跟踪文件"
 
-#: git-legacy-stash.sh:665
+#: git-legacy-stash.sh:666
 msgid "Cannot unstage modified files"
 msgstr "无法将修改的文件取消暂存"
 
-#: builtin/stash.c:460 git-legacy-stash.sh:680
+#: builtin/stash.c:461
 msgid "Index was not unstashed."
 msgstr "索引未从贮藏中恢复。"
 
-#: builtin/stash.c:633 git-legacy-stash.sh:694
+#: builtin/stash.c:633
 msgid "The stash entry is kept in case you need it again."
 msgstr "贮藏条目被保留以备您再次需要。"
 
-#: git-legacy-stash.sh:703
+#: git-legacy-stash.sh:704
 #, sh-format
 msgid "Dropped ${REV} ($s)"
 msgstr "丢弃了 ${REV} ($s)"
 
-#: git-legacy-stash.sh:704
+#: git-legacy-stash.sh:705
 #, sh-format
 msgid "${REV}: Could not drop stash entry"
 msgstr "${REV}：无法丢弃贮藏条目"
 
-#: builtin/stash.c:656 git-legacy-stash.sh:712
+#: builtin/stash.c:656
 msgid "No branch name specified"
 msgstr "未指定分支名"
 
-#: git-legacy-stash.sh:791
+#: git-legacy-stash.sh:792
 msgid "(To restore them type \"git stash apply\")"
 msgstr "（为恢复数据输入 \"git stash apply\"）"
 
-#: git-submodule.sh:200
+#: git-submodule.sh:205
 msgid "Relative path can only be used from the toplevel of the working tree"
 msgstr "只能在工作区的顶级目录中使用相对路径"
 
-#: git-submodule.sh:210
+#: git-submodule.sh:215
 #, sh-format
 msgid "repo URL: '$repo' must be absolute or begin with ./|../"
 msgstr "仓库 URL：'$repo' 必须是绝对路径或以 ./|../ 起始"
 
-#: git-submodule.sh:229
+#: git-submodule.sh:234
 #, sh-format
 msgid "'$sm_path' already exists in the index"
 msgstr "'$sm_path' 已经存在于索引中"
 
-#: git-submodule.sh:232
+#: git-submodule.sh:237
 #, sh-format
 msgid "'$sm_path' already exists in the index and is not a submodule"
 msgstr "'$sm_path' 已经存在于索引中且不是一个子模组"
 
-#: git-submodule.sh:245
+#: git-submodule.sh:247
 #, sh-format
 msgid ""
 "The following path is ignored by one of your .gitignore files:\n"
@@ -15398,22 +15407,22 @@
 "$sm_path\n"
 "如果您确实想添加它，使用 -f 参数。"
 
-#: git-submodule.sh:268
+#: git-submodule.sh:275
 #, sh-format
 msgid "Adding existing repo at '$sm_path' to the index"
 msgstr "添加位于 '$sm_path' 的现存仓库到索引"
 
-#: git-submodule.sh:270
+#: git-submodule.sh:277
 #, sh-format
 msgid "'$sm_path' already exists and is not a valid git repo"
 msgstr "'$sm_path' 已存在且不是一个有效的 git 仓库"
 
-#: git-submodule.sh:278
+#: git-submodule.sh:285
 #, sh-format
 msgid "A git directory for '$sm_name' is found locally with remote(s):"
 msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程仓库："
 
-#: git-submodule.sh:280
+#: git-submodule.sh:287
 #, sh-format
 msgid ""
 "If you want to reuse this local git directory instead of cloning again from\n"
@@ -15428,22 +15437,22 @@
 "使用 '--force' 选项。如果本地 git 目录不是正确的仓库\n"
 "或者您不确定这里的含义，使用 '--name' 选项选择另外的名称。"
 
-#: git-submodule.sh:286
+#: git-submodule.sh:293
 #, sh-format
 msgid "Reactivating local git directory for submodule '$sm_name'."
 msgstr "激活本地 git 目录到子模组 '$sm_name'。"
 
-#: git-submodule.sh:298
+#: git-submodule.sh:305
 #, sh-format
 msgid "Unable to checkout submodule '$sm_path'"
 msgstr "不能检出子模组 '$sm_path'"
 
-#: git-submodule.sh:303
+#: git-submodule.sh:310
 #, sh-format
 msgid "Failed to add submodule '$sm_path'"
 msgstr "无法添加子模组 '$sm_path'"
 
-#: git-submodule.sh:312
+#: git-submodule.sh:319
 #, sh-format
 msgid "Failed to register submodule '$sm_path'"
 msgstr "无法注册子模组 '$sm_path'"
@@ -15458,103 +15467,103 @@
 msgid "Stopping at '$displaypath'; script returned non-zero status."
 msgstr "停止于 '$displaypath'；脚本返回非零值。"
 
-#: git-submodule.sh:573
+#: git-submodule.sh:592
 #, sh-format
 msgid "Unable to find current revision in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
 
-#: git-submodule.sh:583
+#: git-submodule.sh:602
 #, sh-format
 msgid "Unable to fetch in submodule path '$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中获取"
 
-#: git-submodule.sh:588
+#: git-submodule.sh:607
 #, sh-format
 msgid ""
 "Unable to find current ${remote_name}/${branch} revision in submodule path "
 "'$sm_path'"
 msgstr "无法在子模组路径 '$sm_path' 中找到当前版本 ${remote_name}/${branch}"
 
-#: git-submodule.sh:617
+#: git-submodule.sh:596
 #, sh-format
 msgid "Unable to fetch in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中获取"
 
-#: git-submodule.sh:612
+#: git-submodule.sh:631
 #, sh-format
 msgid ""
 "Fetched in submodule path '$displaypath', but it did not contain $sha1. "
 "Direct fetching of that commit failed."
 msgstr "获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
 
-#: git-submodule.sh:619
+#: git-submodule.sh:638
 #, sh-format
 msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
 
-#: git-submodule.sh:620
+#: git-submodule.sh:639
 #, sh-format
 msgid "Submodule path '$displaypath': checked out '$sha1'"
 msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
 
-#: git-submodule.sh:624
+#: git-submodule.sh:643
 #, sh-format
 msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
 msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
 
-#: git-submodule.sh:625
+#: git-submodule.sh:644
 #, sh-format
 msgid "Submodule path '$displaypath': rebased into '$sha1'"
 msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
 
-#: git-submodule.sh:630
+#: git-submodule.sh:649
 #, sh-format
 msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
 msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
 
-#: git-submodule.sh:631
+#: git-submodule.sh:650
 #, sh-format
 msgid "Submodule path '$displaypath': merged in '$sha1'"
 msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
 
-#: git-submodule.sh:636
+#: git-submodule.sh:655
 #, sh-format
 msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
 msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
 
-#: git-submodule.sh:637
+#: git-submodule.sh:656
 #, sh-format
 msgid "Submodule path '$displaypath': '$command $sha1'"
 msgstr "子模组 '$displaypath'：'$command $sha1'"
 
-#: git-submodule.sh:668
+#: git-submodule.sh:687
 #, sh-format
 msgid "Failed to recurse into submodule path '$displaypath'"
 msgstr "无法递归进子模组路径 '$displaypath'"
 
-#: git-submodule.sh:830
+#: git-submodule.sh:878
 msgid "The --cached option cannot be used with the --files option"
 msgstr "选项 --cached 不能和选项 --files 同时使用"
 
-#: git-submodule.sh:882
+#: git-submodule.sh:930
 #, sh-format
 msgid "unexpected mode $mod_dst"
 msgstr "意外的模式 $mod_dst"
 
 #  译者：注意保持前导空格
-#: git-submodule.sh:902
+#: git-submodule.sh:950
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_src"
 msgstr "  警告：$display_name 未包含提交 $sha1_src"
 
 #  译者：注意保持前导空格
-#: git-submodule.sh:905
+#: git-submodule.sh:953
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commit $sha1_dst"
 msgstr "  警告：$display_name 未包含提交 $sha1_dst"
 
 #  译者：注意保持前导空格
-#: git-submodule.sh:908
+#: git-submodule.sh:956
 #, sh-format
 msgid "  Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
 msgstr "  警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
@@ -15595,7 +15604,7 @@
 "\n"
 "这些行可以被重新排序；它们会被从上至下地执行。\n"
 
-#: rebase-interactive.c:65 git-rebase--preserve-merges.sh:228
+#: rebase-interactive.c:72 git-rebase--preserve-merges.sh:228
 msgid ""
 "\n"
 "Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
@@ -15603,7 +15612,7 @@
 "\n"
 "不要删除任意一行。使用 'drop' 显式地删除一个提交。\n"
 
-#: rebase-interactive.c:68 git-rebase--preserve-merges.sh:232
+#: rebase-interactive.c:75 git-rebase--preserve-merges.sh:232
 msgid ""
 "\n"
 "If you remove a line here THAT COMMIT WILL BE LOST.\n"
@@ -15782,7 +15791,7 @@
 msgid "Successfully rebased and updated $head_name."
 msgstr "成功变基并更新 $head_name。"
 
-#: sequencer.c:3718 git-rebase--preserve-merges.sh:779
+#: sequencer.c:3862 git-rebase--preserve-merges.sh:779
 msgid "could not detach HEAD"
 msgstr "不能分离头指针"
 
@@ -15833,7 +15842,7 @@
 msgid "Could not commit staged changes."
 msgstr "不能提交暂存的修改。"
 
-#: rebase-interactive.c:74 git-rebase--preserve-merges.sh:871
+#: rebase-interactive.c:81 git-rebase--preserve-merges.sh:871
 msgid ""
 "\n"
 "You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15883,7 +15892,7 @@
 msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
 msgstr[0] "变基 $shortrevisions 到 $shortonto（$todocount 个提交）"
 
-#: rebase-interactive.c:79 git-rebase--preserve-merges.sh:948
+#: rebase-interactive.c:86 git-rebase--preserve-merges.sh:948
 msgid ""
 "\n"
 "However, if you remove everything, the rebase will be aborted.\n"
@@ -15893,7 +15902,7 @@
 "然而，如果您删除全部内容，变基操作将会终止。\n"
 "\n"
 
-#: rebase-interactive.c:85 git-rebase--preserve-merges.sh:955
+#: git-rebase--preserve-merges.sh:955
 msgid "Note that empty commits are commented out"
 msgstr "注意空提交已被注释掉"
 
@@ -15955,118 +15964,122 @@
 msgstr "不能确定 git 目录的绝对路径"
 
 #. TRANSLATORS: you can adjust this to align "git add -i" status menu
-#: git-add--interactive.perl:210
+#: git-add--interactive.perl:212
 #, perl-format
 msgid "%12s %12s %s"
 msgstr "%12s %12s %s"
 
-#: git-add--interactive.perl:211
+#: add-interactive.c:1136 git-add--interactive.perl:213
 msgid "staged"
 msgstr "缓存"
 
-#: git-add--interactive.perl:211
+#: add-interactive.c:1136 git-add--interactive.perl:213
 msgid "unstaged"
 msgstr "未缓存"
 
-#: git-add--interactive.perl:267 git-add--interactive.perl:292
+#: add-interactive.c:576 git-add--interactive.perl:269
+#: git-add--interactive.perl:294
 msgid "binary"
 msgstr "二进制"
 
-#: git-add--interactive.perl:276 git-add--interactive.perl:330
+#: add-interactive.c:634 git-add--interactive.perl:278
+#: git-add--interactive.perl:332
 msgid "nothing"
 msgstr "无"
 
-#: git-add--interactive.perl:312 git-add--interactive.perl:327
+#: add-interactive.c:635 git-add--interactive.perl:314
+#: git-add--interactive.perl:329
 msgid "unchanged"
 msgstr "没有修改"
 
-#: git-add--interactive.perl:623
-#, perl-format
+#: add-interactive.c:887 git-add--interactive.perl:625
+#, c-format, perl-format
 msgid "added %d path\n"
 msgid_plural "added %d paths\n"
 msgstr[0] "增加了 %d 个路径\n"
 
-#: git-add--interactive.perl:626
-#, perl-format
+#: add-interactive.c:698 git-add--interactive.perl:628
+#, c-format, perl-format
 msgid "updated %d path\n"
 msgid_plural "updated %d paths\n"
 msgstr[0] "更新了 %d 个路径\n"
 
-#: git-add--interactive.perl:629
-#, perl-format
+#: add-interactive.c:805 git-add--interactive.perl:631
+#, c-format, perl-format
 msgid "reverted %d path\n"
 msgid_plural "reverted %d paths\n"
 msgstr[0] "还原了 %d 个路径\n"
 
-#: git-add--interactive.perl:632
+#: git-add--interactive.perl:634
 #, perl-format
 msgid "touched %d path\n"
 msgid_plural "touched %d paths\n"
 msgstr[0] "触碰了 %d 个路径\n"
 
-#: git-add--interactive.perl:641
+#: add-interactive.c:672 git-add--interactive.perl:643
 msgid "Update"
 msgstr "更新"
 
-#: git-add--interactive.perl:653
+#: add-interactive.c:751 git-add--interactive.perl:655
 msgid "Revert"
 msgstr "还原"
 
-#: git-add--interactive.perl:676
-#, perl-format
+#: add-interactive.c:716 git-add--interactive.perl:678
+#, c-format, perl-format
 msgid "note: %s is untracked now.\n"
 msgstr "说明：%s 现已成为未跟踪的。\n"
 
-#: git-add--interactive.perl:687
+#: add-interactive.c:860 git-add--interactive.perl:689
 msgid "Add untracked"
 msgstr "添加未跟踪的"
 
-#: git-add--interactive.perl:693
+#: add-interactive.c:856 git-add--interactive.perl:695
+#, c-format
 msgid "No untracked files.\n"
 msgstr "没有未跟踪的文件。\n"
 
-#: git-add--interactive.perl:1051
+#: git-add--interactive.perl:1053
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for staging."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为暂存。"
 
-#: git-add--interactive.perl:1054
+#: git-add--interactive.perl:1056
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for stashing."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为贮藏。"
 
-#: git-add--interactive.perl:1057
+#: git-add--interactive.perl:1059
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for unstaging."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为未暂存。"
 
-#: git-add--interactive.perl:1060 git-add--interactive.perl:1069
-#: git-add--interactive.perl:1075
+#: git-add--interactive.perl:1062 git-add--interactive.perl:1071
+#: git-add--interactive.perl:1077
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for applying."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为应用。"
 
-#: git-add--interactive.perl:1063 git-add--interactive.perl:1066
-#: git-add--interactive.perl:1072
+#: git-add--interactive.perl:1065 git-add--interactive.perl:1068
+#: git-add--interactive.perl:1074
 msgid ""
 "If the patch applies cleanly, the edited hunk will immediately be\n"
 "marked for discarding."
 msgstr "如果补丁能干净地应用，编辑块将立即标记为丢弃。"
 
-#: git-add--interactive.perl:1109
+#: git-add--interactive.perl:1111
 #, perl-format
 msgid "failed to open hunk edit file for writing: %s"
 msgstr "为写入打开块编辑文件失败：%s"
 
-#: git-add--interactive.perl:1110
+#: add-patch.c:1053 git-add--interactive.perl:1112
 msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
 msgstr "手动块编辑模式 -- 查看底部的快速指南。\n"
 
-#: git-add--interactive.perl:1116
+#: git-add--interactive.perl:1118
 #, perl-format
 msgid ""
 "---\n"
@@ -16080,7 +16093,7 @@
 "以 %s 开始的行将被删除。\n"
 
 #. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
-#: git-add--interactive.perl:1124
+#: add-patch.c:1071 git-add--interactive.perl:1126
 msgid ""
 "If it does not apply cleanly, you will be given an opportunity to\n"
 "edit again.  If all lines of the hunk are removed, then the edit is\n"
@@ -16089,23 +16102,29 @@
 "如果不能干净地应用，您将有机会重新编辑。如果该块的全部内容删除，则\n"
 "此次编辑被终止，该块不会被修改。\n"
 
-#: git-add--interactive.perl:1138
+#: git-add--interactive.perl:1140
 #, perl-format
 msgid "failed to open hunk edit file for reading: %s"
 msgstr "无法读取块编辑文件：%s"
 
 #. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#. 
+#. TRANSLATORS: do not translate [y/n]
 #. The program will only accept that input
 #. at this point.
 #. Consider translating (saying "no" discards!) as
 #. (saying "n" for "no" discards!) if the translation
 #. of the word "no" does not start with n.
-#: git-add--interactive.perl:1237
+#: add-patch.c:1218 git-add--interactive.perl:1239
 msgid ""
 "Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
 msgstr "您的编辑块不能被应用。重新编辑（选择 \"no\" 丢弃！） [y/n]? "
 
-#: git-add--interactive.perl:1246
+#: git-add--interactive.perl:1248
 msgid ""
 "y - stage this hunk\n"
 "n - do not stage this hunk\n"
@@ -16119,7 +16138,7 @@
 "a - 暂存该块和本文件中后面的全部块\n"
 "d - 不暂存该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1252
+#: git-add--interactive.perl:1254
 msgid ""
 "y - stash this hunk\n"
 "n - do not stash this hunk\n"
@@ -16133,7 +16152,7 @@
 "a - 贮藏该块和本文件中后面的全部块\n"
 "d - 不贮藏该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1258
+#: git-add--interactive.perl:1260
 msgid ""
 "y - unstage this hunk\n"
 "n - do not unstage this hunk\n"
@@ -16147,7 +16166,7 @@
 "a - 不暂存该块和本文件中后面的全部块\n"
 "d - 不要不暂存该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1264
+#: git-add--interactive.perl:1266
 msgid ""
 "y - apply this hunk to index\n"
 "n - do not apply this hunk to index\n"
@@ -16161,7 +16180,7 @@
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1270 git-add--interactive.perl:1288
+#: git-add--interactive.perl:1272 git-add--interactive.perl:1290
 msgid ""
 "y - discard this hunk from worktree\n"
 "n - do not discard this hunk from worktree\n"
@@ -16175,7 +16194,7 @@
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1276
+#: git-add--interactive.perl:1278
 msgid ""
 "y - discard this hunk from index and worktree\n"
 "n - do not discard this hunk from index and worktree\n"
@@ -16189,7 +16208,7 @@
 "a - 丢弃该块和本文件中后面的全部块\n"
 "d - 不要丢弃该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1282
+#: git-add--interactive.perl:1284
 msgid ""
 "y - apply this hunk to index and worktree\n"
 "n - do not apply this hunk to index and worktree\n"
@@ -16203,7 +16222,7 @@
 "a - 应用该块和本文件中后面的全部块\n"
 "d - 不要应用该块和本文件中后面的全部块"
 
-#: git-add--interactive.perl:1309
+#: git-add--interactive.perl:1311
 msgid ""
 "g - select a hunk to go to\n"
 "/ - search for a hunk matching the given regex\n"
@@ -16225,209 +16244,214 @@
 "e - 手动编辑当前块\n"
 "? - 显示帮助\n"
 
-#: git-add--interactive.perl:1340
+#: git-add--interactive.perl:1342
 msgid "The selected hunks do not apply to the index!\n"
 msgstr "选中的块不能应用到索引！\n"
 
-#: git-add--interactive.perl:1341
+#: add-patch.c:1262 git-add--interactive.perl:1343
 msgid "Apply them to the worktree anyway? "
 msgstr "无论如何都要应用到工作区么？ "
 
-#: git-add--interactive.perl:1344
+#: add-patch.c:1269 git-add--interactive.perl:1346
 msgid "Nothing was applied.\n"
 msgstr "未应用。\n"
 
-#: git-add--interactive.perl:1355
+#: git-add--interactive.perl:1357
 #, perl-format
 msgid "ignoring unmerged: %s\n"
 msgstr "忽略未合入的：%s\n"
 
-#: git-add--interactive.perl:1364
+#: add-interactive.c:929 add-patch.c:1675 git-add--interactive.perl:1366
+#, c-format
 msgid "Only binary files changed.\n"
 msgstr "只有二进制文件被修改。\n"
 
-#: git-add--interactive.perl:1366
+#: add-interactive.c:931 add-patch.c:1673 git-add--interactive.perl:1368
+#, c-format
 msgid "No changes.\n"
 msgstr "没有修改。\n"
 
-#: git-add--interactive.perl:1374
+#: add-interactive.c:935 git-add--interactive.perl:1376
 msgid "Patch update"
 msgstr "补丁更新"
 
-#: git-add--interactive.perl:1426
-#, perl-format
+#: add-patch.c:34 git-add--interactive.perl:1428
+#, c-format, perl-format
 msgid "Stage mode change [y,n,q,a,d%s,?]? "
 msgstr "暂存模式变更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1427
-#, perl-format
+#: add-patch.c:35 git-add--interactive.perl:1429
+#, c-format, perl-format
 msgid "Stage deletion [y,n,q,a,d%s,?]? "
 msgstr "暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1428
-#, perl-format
+#: add-patch.c:36 git-add--interactive.perl:1430
+#, c-format, perl-format
 msgid "Stage this hunk [y,n,q,a,d%s,?]? "
 msgstr "暂存该块 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1431
-#, perl-format
+#: add-patch.c:55 git-add--interactive.perl:1433
+#, c-format, perl-format
 msgid "Stash mode change [y,n,q,a,d%s,?]? "
 msgstr "贮藏模式变更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1432
-#, perl-format
+#: add-patch.c:56 git-add--interactive.perl:1434
+#, c-format, perl-format
 msgid "Stash deletion [y,n,q,a,d%s,?]? "
 msgstr "贮藏删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1433
-#, perl-format
+#: add-patch.c:57 git-add--interactive.perl:1435
+#, c-format, perl-format
 msgid "Stash this hunk [y,n,q,a,d%s,?]? "
 msgstr "贮藏该块 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1436
-#, perl-format
+#: add-patch.c:78 git-add--interactive.perl:1438
+#, c-format, perl-format
 msgid "Unstage mode change [y,n,q,a,d%s,?]? "
 msgstr "取消暂存模式变更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1437
-#, perl-format
+#: add-patch.c:79 git-add--interactive.perl:1439
+#, c-format, perl-format
 msgid "Unstage deletion [y,n,q,a,d%s,?]? "
 msgstr "取消暂存删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1438
-#, perl-format
+#: add-patch.c:80 git-add--interactive.perl:1440
+#, c-format, perl-format
 msgid "Unstage this hunk [y,n,q,a,d%s,?]? "
 msgstr "取消暂存该块 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1441
-#, perl-format
+#: add-patch.c:100 git-add--interactive.perl:1443
+#, c-format, perl-format
 msgid "Apply mode change to index [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到索引 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1442
-#, perl-format
+#: add-patch.c:101 git-add--interactive.perl:1444
+#, c-format, perl-format
 msgid "Apply deletion to index [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到索引 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1443
-#, perl-format
+#: add-patch.c:102 git-add--interactive.perl:1445
+#, c-format, perl-format
 msgid "Apply this hunk to index [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到索引 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1446 git-add--interactive.perl:1461
-#, perl-format
+#: add-patch.c:122 git-add--interactive.perl:1448
+#: git-add--interactive.perl:1463
+#, c-format, perl-format
 msgid "Discard mode change from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1447 git-add--interactive.perl:1462
-#, perl-format
+#: add-patch.c:123 git-add--interactive.perl:1449
+#: git-add--interactive.perl:1464
+#, c-format, perl-format
 msgid "Discard deletion from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃删除动作 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1448 git-add--interactive.perl:1463
-#, perl-format
+#: add-patch.c:124 git-add--interactive.perl:1450
+#: git-add--interactive.perl:1465
+#, c-format, perl-format
 msgid "Discard this hunk from worktree [y,n,q,a,d%s,?]? "
 msgstr "从工作区中丢弃该块 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1451
-#, perl-format
+#: add-patch.c:144 add-patch.c:187 git-add--interactive.perl:1453
+#, c-format, perl-format
 msgid "Discard mode change from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃模式变更 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1452
-#, perl-format
+#: add-patch.c:145 add-patch.c:188 git-add--interactive.perl:1454
+#, c-format, perl-format
 msgid "Discard deletion from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃删除 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1453
-#, perl-format
+#: add-patch.c:146 add-patch.c:189 git-add--interactive.perl:1455
+#, c-format, perl-format
 msgid "Discard this hunk from index and worktree [y,n,q,a,d%s,?]? "
 msgstr "从索引和工作区中丢弃该块 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1456
-#, perl-format
+#: add-patch.c:165 add-patch.c:208 git-add--interactive.perl:1458
+#, c-format, perl-format
 msgid "Apply mode change to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将模式变更应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1457
-#, perl-format
+#: add-patch.c:166 add-patch.c:209 git-add--interactive.perl:1459
+#, c-format, perl-format
 msgid "Apply deletion to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将删除操作应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1458
-#, perl-format
+#: add-patch.c:167 add-patch.c:210 git-add--interactive.perl:1460
+#, c-format, perl-format
 msgid "Apply this hunk to index and worktree [y,n,q,a,d%s,?]? "
 msgstr "将该块应用到索引和工作区 [y,n,q,a,d%s,?]? "
 
-#: git-add--interactive.perl:1568
+#: git-add--interactive.perl:1570
 msgid "No other hunks to goto\n"
 msgstr "没有其它可供跳转的块\n"
 
-#: git-add--interactive.perl:1575
+#: add-patch.c:1479 git-add--interactive.perl:1577
 msgid "go to which hunk (<ret> to see more)? "
 msgstr "跳转到哪个块（<回车> 查看更多）？ "
 
-#: git-add--interactive.perl:1577
+#: add-patch.c:1480 git-add--interactive.perl:1579
 msgid "go to which hunk? "
 msgstr "跳转到哪个块？ "
 
-#: git-add--interactive.perl:1586
+#: git-add--interactive.perl:1588
 #, perl-format
 msgid "Invalid number: '%s'\n"
 msgstr "无效数字：'%s'\n"
 
-#: git-add--interactive.perl:1591
+#: git-add--interactive.perl:1593
 #, perl-format
 msgid "Sorry, only %d hunk available.\n"
 msgid_plural "Sorry, only %d hunks available.\n"
 msgstr[0] "对不起，只有 %d 个可用块。\n"
 
-#: git-add--interactive.perl:1617
+#: git-add--interactive.perl:1619
 msgid "No other hunks to search\n"
 msgstr "没有其它可供查找的块\n"
 
-#: git-add--interactive.perl:1621
+#: add-patch.c:1511 git-add--interactive.perl:1623
 msgid "search for regex? "
 msgstr "使用正则表达式搜索？ "
 
-#: git-add--interactive.perl:1634
+#: git-add--interactive.perl:1636
 #, perl-format
 msgid "Malformed search regexp %s: %s\n"
 msgstr "错误的正则表达式 %s：%s\n"
 
-#: git-add--interactive.perl:1644
+#: git-add--interactive.perl:1646
 msgid "No hunk matches the given pattern\n"
-msgstr "没有和给定模式相匹配的快\n"
+msgstr "没有和给定模式相匹配的块\n"
 
-#: git-add--interactive.perl:1656 git-add--interactive.perl:1678
+#: git-add--interactive.perl:1658 git-add--interactive.perl:1680
 msgid "No previous hunk\n"
 msgstr "没有前一个块\n"
 
-#: git-add--interactive.perl:1665 git-add--interactive.perl:1684
+#: git-add--interactive.perl:1667 git-add--interactive.perl:1686
 msgid "No next hunk\n"
 msgstr "没有下一个块\n"
 
-#: git-add--interactive.perl:1690
+#: git-add--interactive.perl:1692
 msgid "Sorry, cannot split this hunk\n"
 msgstr "对不起，不能拆分这个块\n"
 
-#: git-add--interactive.perl:1696
+#: git-add--interactive.perl:1698
 #, perl-format
 msgid "Split into %d hunk.\n"
 msgid_plural "Split into %d hunks.\n"
 msgstr[0] "拆分为 %d 块。\n"
 
-#: git-add--interactive.perl:1706
+#: git-add--interactive.perl:1708
 msgid "Sorry, cannot edit this hunk\n"
 msgstr "对不起，不能编辑这个块\n"
 
-#: git-add--interactive.perl:1752
+#: add-interactive.c:974 git-add--interactive.perl:1754
 msgid "Review diff"
 msgstr "检视 diff"
 
 #. TRANSLATORS: please do not translate the command names
 #. 'status', 'update', 'revert', etc.
-#: git-add--interactive.perl:1771
+#: git-add--interactive.perl:1773
 msgid ""
 "status        - show paths with changes\n"
 "update        - add working tree state to the staged set of changes\n"
@@ -16444,19 +16468,19 @@
 "diff          - 显示 HEAD 和索引间差异\n"
 "add untracked - 添加未跟踪文件的内容至暂存列表\n"
 
-#: git-add--interactive.perl:1788 git-add--interactive.perl:1793
-#: git-add--interactive.perl:1796 git-add--interactive.perl:1803
-#: git-add--interactive.perl:1806 git-add--interactive.perl:1813
-#: git-add--interactive.perl:1817 git-add--interactive.perl:1823
+#: git-add--interactive.perl:1790 git-add--interactive.perl:1795
+#: git-add--interactive.perl:1798 git-add--interactive.perl:1805
+#: git-add--interactive.perl:1808 git-add--interactive.perl:1815
+#: git-add--interactive.perl:1819 git-add--interactive.perl:1825
 msgid "missing --"
 msgstr "缺失 --"
 
-#: git-add--interactive.perl:1819
+#: git-add--interactive.perl:1821
 #, perl-format
 msgid "unknown --patch mode: %s"
 msgstr "未知的 --patch 模式：%s"
 
-#: git-add--interactive.perl:1825 git-add--interactive.perl:1831
+#: git-add--interactive.perl:1827 git-add--interactive.perl:1833
 #, perl-format
 msgid "invalid argument %s, expecting --"
 msgstr "无效的参数 %s，期望是 --"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gnupg2.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gnupg2.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gnupg2.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gnupg2.po	2020-07-08 13:53:55.000000000 +0000
@@ -15,15 +15,15 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:19+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:08+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "X-Poedit-Country: CHINA\n"
 "Language: zh_CN\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 "X-Poedit-Basepath: d:\\msys\\source\\gnupg-1.4.3\n"
 
-#: agent/call-pinentry.c:309
+#: agent/call-pinentry.c:322
 #, c-format
 msgid "failed to acquire the pinentry lock: %s\n"
 msgstr "获取 pinentry 锁失败: %s\n"
@@ -34,45 +34,45 @@
 #. a literal one.  The actual to be translated text starts after
 #. the second vertical bar.  Note that gpg-agent has been set to
 #. utf-8 so that the strings are in the expected encoding.
-#: agent/call-pinentry.c:512
+#: agent/call-pinentry.c:528
 msgid "|pinentry-label|_OK"
 msgstr "|pinentry-label|好"
 
-#: agent/call-pinentry.c:513
+#: agent/call-pinentry.c:529
 msgid "|pinentry-label|_Cancel"
 msgstr "|pinentry-label|取消"
 
-#: agent/call-pinentry.c:514
+#: agent/call-pinentry.c:530
 msgid "|pinentry-label|_Yes"
 msgstr "|pinentry-label|是"
 
-#: agent/call-pinentry.c:515
+#: agent/call-pinentry.c:531
 msgid "|pinentry-label|_No"
 msgstr "|pinentry-label|否"
 
-#: agent/call-pinentry.c:516
+#: agent/call-pinentry.c:532
 msgid "|pinentry-label|PIN:"
 msgstr "|pinentry-label|PIN："
 
-#: agent/call-pinentry.c:517
+#: agent/call-pinentry.c:533
 msgid "|pinentry-label|_Save in password manager"
 msgstr "|pinentry-label|在密码管理器中保存"
 
-#: agent/call-pinentry.c:518
+#: agent/call-pinentry.c:534
 msgid "Do you really want to make your passphrase visible on the screen?"
 msgstr "您真的想要使您的密码在屏幕上可见吗？"
 
-#: agent/call-pinentry.c:520
+#: agent/call-pinentry.c:536
 msgid "|pinentry-tt|Make passphrase visible"
 msgstr "|pinentry-tt|使密码可见"
 
-#: agent/call-pinentry.c:521
+#: agent/call-pinentry.c:537
 msgid "|pinentry-tt|Hide passphrase"
 msgstr "|pinentry-tt|隐藏密码"
 
 #. TRANSLATORS: This string is displayed by Pinentry as the label
 #. for the quality bar.
-#: agent/call-pinentry.c:853
+#: agent/call-pinentry.c:869
 msgid "Quality:"
 msgstr "强度："
 
@@ -82,32 +82,32 @@
 #. tooltip is limited to about 900 characters.  If you do not
 #. translate this entry, a default english text (see source)
 #. will be used.
-#: agent/call-pinentry.c:874
+#: agent/call-pinentry.c:890
 msgid "pinentry.qualitybar.tooltip"
 msgstr "pinentry.qualitybar.tooltip"
 
-#: agent/call-pinentry.c:994
+#: agent/call-pinentry.c:1010
 msgid ""
 "Please enter your PIN, so that the secret key can be unlocked for this "
 "session"
 msgstr "请输入您的 PIN，从而为此会话解锁私钥"
 
-#: agent/call-pinentry.c:997
+#: agent/call-pinentry.c:1013
 msgid ""
 "Please enter your passphrase, so that the secret key can be unlocked for "
 "this session"
 msgstr "请输入您的密码，从而为此会话解锁私钥"
 
-#: agent/call-pinentry.c:1034 agent/call-pinentry.c:1220
+#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
 msgid "PIN:"
 msgstr "PIN："
 
-#: agent/call-pinentry.c:1034 agent/call-pinentry.c:1220
-#: agent/protect-tool.c:714 tools/symcryptrun.c:452
+#: agent/call-pinentry.c:1050 agent/call-pinentry.c:1237
+#: agent/protect-tool.c:715 tools/symcryptrun.c:452
 msgid "Passphrase:"
 msgstr "密码："
 
-#: agent/call-pinentry.c:1061 agent/command-ssh.c:3130 agent/genkey.c:416
+#: agent/call-pinentry.c:1077 agent/command-ssh.c:3130 agent/genkey.c:416
 #: tools/symcryptrun.c:451
 msgid "does not match - try again"
 msgstr "不匹配 - 请重试"
@@ -115,36 +115,37 @@
 #. TRANSLATORS: The string is appended to an error message in
 #. the pinentry.  The %s is the actual error message, the
 #. two %d give the current and maximum number of tries.
-#: agent/call-pinentry.c:1082
+#. Do not translate the "SETERROR" keyword.
+#: agent/call-pinentry.c:1099
 #, c-format
 msgid "SETERROR %s (try %d of %d)"
 msgstr "SETERROR %s (try %d of %d)"
 
-#: agent/call-pinentry.c:1093
+#: agent/call-pinentry.c:1110
 msgid "Repeat:"
 msgstr "重复："
 
-#: agent/call-pinentry.c:1121 agent/call-pinentry.c:1133
+#: agent/call-pinentry.c:1138 agent/call-pinentry.c:1150
 msgid "PIN too long"
 msgstr "PIN 太长"
 
-#: agent/call-pinentry.c:1122
+#: agent/call-pinentry.c:1139
 msgid "Passphrase too long"
 msgstr "密码太长"
 
-#: agent/call-pinentry.c:1130
+#: agent/call-pinentry.c:1147
 msgid "Invalid characters in PIN"
 msgstr "PIN 中含有无效字符"
 
-#: agent/call-pinentry.c:1135
+#: agent/call-pinentry.c:1152
 msgid "PIN too short"
 msgstr "PIN 太短"
 
-#: agent/call-pinentry.c:1154
+#: agent/call-pinentry.c:1171
 msgid "Bad PIN"
 msgstr "错误的 PIN"
 
-#: agent/call-pinentry.c:1154
+#: agent/call-pinentry.c:1171
 msgid "Bad Passphrase"
 msgstr "错误的密码"
 
@@ -153,31 +154,32 @@
 msgid "ssh keys greater than %d bits are not supported\n"
 msgstr "长度超过 %d 位的 ssh 密钥不被支持\n"
 
-#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:936
-#: g10/exec.c:546 g10/export.c:1270 g10/gpg.c:1325 g10/keygen.c:4680
-#: g10/keyring.c:1319 g10/keyring.c:1633 g10/openfile.c:291 g10/sign.c:885
-#: g10/sign.c:1188 g10/tdbio.c:751
+#: agent/command-ssh.c:862 common/dotlock.c:839 g10/card-util.c:969
+#: g10/exec.c:546 g10/export.c:1320 g10/gpg.c:1344 g10/keygen.c:4994
+#: g10/keyring.c:1322 g10/keyring.c:1636 g10/openfile.c:291 g10/sign.c:996
+#: g10/sign.c:1299 g10/tdbio.c:751
 #, c-format
 msgid "can't create '%s': %s\n"
 msgstr "无法创建 ‘%s’： %s\n"
 
-#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:893
+#: agent/command-ssh.c:874 common/helpfile.c:57 g10/card-util.c:926
 #: g10/dearmor.c:59 g10/dearmor.c:106 g10/decrypt.c:65 g10/decrypt.c:136
-#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1326
-#: g10/import.c:346 g10/import.c:490 g10/import.c:718 g10/keygen.c:3747
-#: g10/keyring.c:1659 g10/openfile.c:195 g10/openfile.c:209
-#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:867 g10/sign.c:1067
-#: g10/sign.c:1172 g10/sign.c:1317 g10/tdbdump.c:143 g10/tdbdump.c:151
+#: g10/decrypt.c:153 g10/encrypt.c:180 g10/encrypt.c:527 g10/gpg.c:1345
+#: g10/import.c:352 g10/import.c:536 g10/import.c:764 g10/keygen.c:4033
+#: g10/keyring.c:1662 g10/openfile.c:195 g10/openfile.c:209
+#: g10/plaintext.c:128 g10/plaintext.c:649 g10/sign.c:978 g10/sign.c:1178
+#: g10/sign.c:1283 g10/sign.c:1428 g10/tdbdump.c:143 g10/tdbdump.c:151
 #: g10/tdbio.c:756 g10/tdbio.c:827 g10/verify.c:96 g10/verify.c:160
-#: sm/gpgsm.c:2210 sm/gpgsm.c:2240 sm/gpgsm.c:2278 sm/qualified.c:66
+#: sm/gpgsm.c:2212 sm/gpgsm.c:2242 sm/gpgsm.c:2280 sm/qualified.c:66
 #: dirmngr/certcache.c:396 dirmngr/certcache.c:476 dirmngr/certcache.c:478
-#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1728
+#: dirmngr/crlcache.c:2422 dirmngr/dirmngr.c:1729
 #, c-format
 msgid "can't open '%s': %s\n"
 msgstr "无法打开 ‘%s’： %s\n"
 
 #: agent/command-ssh.c:2385 agent/command-ssh.c:2431 agent/command-ssh.c:2449
-#: agent/command-ssh.c:2601 g10/card-util.c:695 g10/card-util.c:712
+#: agent/command-ssh.c:2601 g10/card-util.c:724 g10/card-util.c:745
+#: g10/skclist.c:430
 #, c-format
 msgid "error getting serial number of card: %s\n"
 msgstr "获取卡的序列号时出现错误： %s\n"
@@ -294,7 +296,7 @@
 msgid "Please enter the PIN%s%s%s to unlock the card"
 msgstr "请输入密码 %s%s%s 来解锁"
 
-#: agent/genkey.c:110 sm/certreqgen-ui.c:410
+#: agent/genkey.c:110 sm/certreqgen-ui.c:432
 #, c-format
 msgid "error creating temporary file: %s\n"
 msgstr "创建临时文件时出现错误： %s\n"
@@ -361,7 +363,7 @@
 msgid "Please enter the new passphrase"
 msgstr "请输入新的密码"
 
-#: agent/gpg-agent.c:157 agent/preset-passphrase.c:73 scd/scdaemon.c:113
+#: agent/gpg-agent.c:158 agent/preset-passphrase.c:74 scd/scdaemon.c:114
 #: tools/gpg-check-pattern.c:69
 msgid ""
 "@Options:\n"
@@ -370,134 +372,134 @@
 "@选项:\n"
 " "
 
-#: agent/gpg-agent.c:159 scd/scdaemon.c:118 dirmngr/dirmngr.c:165
+#: agent/gpg-agent.c:160 scd/scdaemon.c:119 dirmngr/dirmngr.c:166
 msgid "run in daemon mode (background)"
 msgstr "以守护进程模式运行 （后台）"
 
-#: agent/gpg-agent.c:160 scd/scdaemon.c:115 dirmngr/dirmngr.c:164
+#: agent/gpg-agent.c:161 scd/scdaemon.c:116 dirmngr/dirmngr.c:165
 msgid "run in server mode (foreground)"
 msgstr "以服务进程模式运行 （前台）"
 
-#: agent/gpg-agent.c:162 dirmngr/dirmngr.c:167
+#: agent/gpg-agent.c:163 dirmngr/dirmngr.c:168
 msgid "run in supervised mode"
 msgstr "以管理进程模式运行"
 
-#: agent/gpg-agent.c:164 g10/gpg.c:598 g10/gpgv.c:76 kbx/kbxutil.c:88
-#: scd/scdaemon.c:119 sm/gpgsm.c:306 dirmngr/dirmngr-client.c:69
-#: dirmngr/dirmngr.c:179 dirmngr/dirmngr_ldap.c:134
-#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:102 tools/symcryptrun.c:178
+#: agent/gpg-agent.c:165 g10/gpg.c:604 g10/gpgv.c:76 kbx/kbxutil.c:88
+#: scd/scdaemon.c:120 sm/gpgsm.c:308 dirmngr/dirmngr-client.c:69
+#: dirmngr/dirmngr.c:180 dirmngr/dirmngr_ldap.c:134
+#: tools/gpg-connect-agent.c:77 tools/gpgconf.c:103 tools/symcryptrun.c:178
 msgid "verbose"
 msgstr "详细模式"
 
-#: agent/gpg-agent.c:165 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:120
-#: sm/gpgsm.c:307 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:180
+#: agent/gpg-agent.c:166 g10/gpgv.c:77 kbx/kbxutil.c:89 scd/scdaemon.c:121
+#: sm/gpgsm.c:309 dirmngr/dirmngr-client.c:70 dirmngr/dirmngr.c:181
 #: dirmngr/dirmngr_ldap.c:135
 msgid "be somewhat more quiet"
 msgstr "尽量减少提示信息"
 
-#: agent/gpg-agent.c:166 scd/scdaemon.c:121 dirmngr/dirmngr.c:181
+#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
 msgid "sh-style command output"
 msgstr "sh 风格的命令行输出"
 
-#: agent/gpg-agent.c:167 scd/scdaemon.c:122 dirmngr/dirmngr.c:182
+#: agent/gpg-agent.c:168 scd/scdaemon.c:123 dirmngr/dirmngr.c:183
 msgid "csh-style command output"
 msgstr "csh 风格的命令行输出"
 
-#: agent/gpg-agent.c:168 scd/scdaemon.c:123 sm/gpgsm.c:337
-#: dirmngr/dirmngr.c:183 tools/symcryptrun.c:181
+#: agent/gpg-agent.c:169 scd/scdaemon.c:124 sm/gpgsm.c:339
+#: dirmngr/dirmngr.c:184 tools/symcryptrun.c:181
 msgid "|FILE|read options from FILE"
 msgstr "|FILE|从 FILE 中读取选项"
 
-#: agent/gpg-agent.c:177 scd/scdaemon.c:133 dirmngr/dirmngr.c:186
+#: agent/gpg-agent.c:178 scd/scdaemon.c:134 dirmngr/dirmngr.c:187
 msgid "do not detach from the console"
 msgstr "未能从控制台分离"
 
-#: agent/gpg-agent.c:182 tools/symcryptrun.c:180
+#: agent/gpg-agent.c:183 tools/symcryptrun.c:180
 msgid "use a log file for the server"
 msgstr "为服务器使用日志文件"
 
-#: agent/gpg-agent.c:184
+#: agent/gpg-agent.c:185
 msgid "|PGM|use PGM as the PIN-Entry program"
 msgstr "|PGM|使用 PGM 作为 PIN-Entry 程序"
 
-#: agent/gpg-agent.c:189
+#: agent/gpg-agent.c:190
 msgid "|PGM|use PGM as the SCdaemon program"
 msgstr "|PGM|使用 PGM 作为 SCdaemon 程序"
 
-#: agent/gpg-agent.c:191
+#: agent/gpg-agent.c:192
 msgid "do not use the SCdaemon"
 msgstr "不使用 SCdaemon"
 
-#: agent/gpg-agent.c:195
+#: agent/gpg-agent.c:196
 msgid "|NAME|accept some commands via NAME"
 msgstr "|NAME|通过 NAME 接收一些命令"
 
-#: agent/gpg-agent.c:211
+#: agent/gpg-agent.c:212
 msgid "ignore requests to change the TTY"
 msgstr "忽略改变 TTY 的请求"
 
-#: agent/gpg-agent.c:213
+#: agent/gpg-agent.c:214
 msgid "ignore requests to change the X display"
 msgstr "忽略改变 X display 的请求"
 
-#: agent/gpg-agent.c:216
+#: agent/gpg-agent.c:217
 msgid "|N|expire cached PINs after N seconds"
 msgstr "|N|使被缓存的 PIN 在 N 秒后过期"
 
-#: agent/gpg-agent.c:230
+#: agent/gpg-agent.c:231
 msgid "do not use the PIN cache when signing"
 msgstr "在签名时不使用 PIN 缓存"
 
-#: agent/gpg-agent.c:232
+#: agent/gpg-agent.c:233
 msgid "disallow the use of an external password cache"
 msgstr "禁止使用一个外部的密码缓存"
 
-#: agent/gpg-agent.c:234
+#: agent/gpg-agent.c:235
 msgid "disallow clients to mark keys as \"trusted\""
 msgstr "禁止客户端将一个密钥标记为“信任”"
 
-#: agent/gpg-agent.c:237
+#: agent/gpg-agent.c:238
 msgid "allow presetting passphrase"
 msgstr "允许预设置的密码"
 
-#: agent/gpg-agent.c:239
+#: agent/gpg-agent.c:240
 msgid "disallow caller to override the pinentry"
 msgstr "禁止调用者覆盖 pinentry"
 
-#: agent/gpg-agent.c:242
+#: agent/gpg-agent.c:243
 msgid "allow passphrase to be prompted through Emacs"
 msgstr "运行密码通过 Emacs 回显"
 
-#: agent/gpg-agent.c:244
+#: agent/gpg-agent.c:245
 msgid "enable ssh support"
 msgstr "启用 ssh 支持"
 
-#: agent/gpg-agent.c:246
+#: agent/gpg-agent.c:247
 msgid "|ALGO|use ALGO to show ssh fingerprints"
 msgstr "|ALGO|使用 ALGO 显示 ssh 指纹"
 
-#: agent/gpg-agent.c:249
+#: agent/gpg-agent.c:250
 msgid "enable putty support"
 msgstr "启用 putty 支持"
 
 #. TRANSLATORS: @EMAIL@ will get replaced by the actual bug
 #. reporting address.  This is so that we can change the
 #. reporting address without breaking the translations.
-#: agent/gpg-agent.c:516 agent/preset-passphrase.c:96 agent/protect-tool.c:151
-#: g10/gpg.c:1043 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:293
-#: sm/gpgsm.c:559 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:397
+#: agent/gpg-agent.c:517 agent/preset-passphrase.c:97 agent/protect-tool.c:152
+#: g10/gpg.c:1062 g10/gpgv.c:145 kbx/kbxutil.c:113 scd/scdaemon.c:294
+#: sm/gpgsm.c:561 dirmngr/dirmngr-client.c:165 dirmngr/dirmngr.c:398
 #: dirmngr/dirmngr_ldap.c:204 tools/gpg-connect-agent.c:202
-#: tools/gpgconf.c:135 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
+#: tools/gpgconf.c:136 tools/symcryptrun.c:218 tools/gpg-check-pattern.c:140
 msgid "Please report bugs to <@EMAIL@>.\n"
 msgstr ""
 "请向 <@EMAIL@> 报告程序缺陷。\n"
 "请向 <i18n-zh@googlegroups.com> 邮件列表反映简体中文的翻译问题或建议。\n"
 
-#: agent/gpg-agent.c:525
+#: agent/gpg-agent.c:526
 msgid "Usage: @GPG_AGENT@ [options] (-h for help)"
 msgstr "用法： @GPG_AGENT@ [选项] （-h 获取帮助）"
 
-#: agent/gpg-agent.c:527
+#: agent/gpg-agent.c:528
 msgid ""
 "Syntax: @GPG_AGENT@ [options] [command [args]]\n"
 "Secret key management for @GNUPG@\n"
@@ -505,147 +507,147 @@
 "语法： @GPG_AGENT@ [options] [command [args]]\n"
 "@GNUPG@ 私钥管理器\n"
 
-#: agent/gpg-agent.c:572 g10/gpg.c:1235 scd/scdaemon.c:365 sm/gpgsm.c:707
-#: dirmngr/dirmngr.c:481
+#: agent/gpg-agent.c:573 g10/gpg.c:1254 scd/scdaemon.c:366 sm/gpgsm.c:709
+#: dirmngr/dirmngr.c:482
 #, c-format
 msgid "invalid debug-level '%s' given\n"
 msgstr "无效的调试级别‘%s’\n"
 
-#: agent/gpg-agent.c:926 g10/gpg.c:3777 g10/gpg.c:3801 sm/gpgsm.c:1622
-#: sm/gpgsm.c:1628
+#: agent/gpg-agent.c:927 g10/gpg.c:3811 g10/gpg.c:3835 sm/gpgsm.c:1624
+#: sm/gpgsm.c:1630
 #, c-format
 msgid "selected digest algorithm is invalid\n"
 msgstr "所选的散列算法无效\n"
 
-#: agent/gpg-agent.c:1151 g10/gpg.c:2522 scd/scdaemon.c:532 sm/gpgsm.c:1041
-#: dirmngr/dirmngr.c:951
+#: agent/gpg-agent.c:1152 g10/gpg.c:2543 scd/scdaemon.c:533 sm/gpgsm.c:1043
+#: dirmngr/dirmngr.c:952
 #, c-format
 msgid "Note: no default option file '%s'\n"
 msgstr "注意：没有默认配置文件‘%s’\n"
 
-#: agent/gpg-agent.c:1162 agent/gpg-agent.c:2038 g10/gpg.c:2526
-#: scd/scdaemon.c:537 sm/gpgsm.c:1045 dirmngr/dirmngr.c:956
-#: dirmngr/dirmngr.c:1834 tools/symcryptrun.c:944
+#: agent/gpg-agent.c:1163 agent/gpg-agent.c:2039 g10/gpg.c:2547
+#: scd/scdaemon.c:538 sm/gpgsm.c:1047 dirmngr/dirmngr.c:957
+#: dirmngr/dirmngr.c:1835 tools/symcryptrun.c:944
 #, c-format
 msgid "option file '%s': %s\n"
 msgstr "选项文件‘%s’：%s\n"
 
-#: agent/gpg-agent.c:1170 g10/gpg.c:2533 scd/scdaemon.c:545 sm/gpgsm.c:1052
-#: dirmngr/dirmngr.c:964
+#: agent/gpg-agent.c:1171 g10/gpg.c:2554 scd/scdaemon.c:546 sm/gpgsm.c:1054
+#: dirmngr/dirmngr.c:965
 #, c-format
 msgid "reading options from '%s'\n"
 msgstr "从‘%s’读取选项\n"
 
-#: agent/gpg-agent.c:1305 g10/gpg.c:3728 scd/scdaemon.c:670 sm/gpgsm.c:1562
-#: dirmngr/dirmngr.c:1072 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:599
+#: agent/gpg-agent.c:1306 g10/gpg.c:3762 scd/scdaemon.c:671 sm/gpgsm.c:1564
+#: dirmngr/dirmngr.c:1073 tools/gpg-connect-agent.c:1239 tools/gpgconf.c:614
 #, c-format
 msgid "Note: '%s' is not considered an option\n"
 msgstr "注意：‘%s’不被认为是一个选项\n"
 
-#: agent/gpg-agent.c:2183 scd/scdaemon.c:1117 dirmngr/dirmngr.c:1224
+#: agent/gpg-agent.c:2184 scd/scdaemon.c:1118 dirmngr/dirmngr.c:1225
 #, c-format
 msgid "can't create socket: %s\n"
 msgstr "创建 socket 失败：%s\n"
 
-#: agent/gpg-agent.c:2200 scd/scdaemon.c:1130 dirmngr/dirmngr.c:1237
+#: agent/gpg-agent.c:2201 scd/scdaemon.c:1131 dirmngr/dirmngr.c:1238
 #, c-format
 msgid "socket name '%s' is too long\n"
 msgstr "套接字名称‘%s’太长\n"
 
-#: agent/gpg-agent.c:2239
+#: agent/gpg-agent.c:2240
 #, c-format
 msgid "a gpg-agent is already running - not starting a new one\n"
 msgstr "一个 gpg-agent 实例正在运行 - 不启动新的实例\n"
 
-#: agent/gpg-agent.c:2250 scd/scdaemon.c:1154 dirmngr/dirmngr.c:1269
+#: agent/gpg-agent.c:2251 scd/scdaemon.c:1155 dirmngr/dirmngr.c:1270
 #, c-format
 msgid "error getting nonce for the socket\n"
 msgstr "获取套接字 nonce 时出现错误\n"
 
-#: agent/gpg-agent.c:2255 scd/scdaemon.c:1157 dirmngr/dirmngr.c:1272
+#: agent/gpg-agent.c:2256 scd/scdaemon.c:1158 dirmngr/dirmngr.c:1273
 #, c-format
 msgid "error binding socket to '%s': %s\n"
 msgstr "绑定套接字到 '%s' 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2266 agent/gpg-agent.c:2306 scd/scdaemon.c:1165
-#: dirmngr/dirmngr.c:1281
+#: agent/gpg-agent.c:2267 agent/gpg-agent.c:2307 scd/scdaemon.c:1166
+#: dirmngr/dirmngr.c:1282
 #, c-format
 msgid "can't set permissions of '%s': %s\n"
 msgstr "无法设置‘%s’的权限： %s\n"
 
-#: agent/gpg-agent.c:2280 scd/scdaemon.c:1177 dirmngr/dirmngr.c:1293
+#: agent/gpg-agent.c:2281 scd/scdaemon.c:1178 dirmngr/dirmngr.c:1294
 #, c-format
 msgid "listening on socket '%s'\n"
 msgstr "正在监听套接字‘%s’\n"
 
-#: agent/gpg-agent.c:2300 agent/gpg-agent.c:2343 g10/exec.c:261
+#: agent/gpg-agent.c:2301 agent/gpg-agent.c:2344 g10/exec.c:261
 #: g10/openfile.c:395 g10/openfile.c:415 sm/keydb.c:100
 #, c-format
 msgid "can't create directory '%s': %s\n"
 msgstr "无法创建目录‘%s’：%s\n"
 
-#: agent/gpg-agent.c:2303 agent/gpg-agent.c:2348 g10/openfile.c:398
+#: agent/gpg-agent.c:2304 agent/gpg-agent.c:2349 g10/openfile.c:398
 #: g10/openfile.c:418 sm/keydb.c:103
 #, c-format
 msgid "directory '%s' created\n"
 msgstr "目录‘%s’已创建\n"
 
-#: agent/gpg-agent.c:2354
+#: agent/gpg-agent.c:2355
 #, c-format
 msgid "stat() failed for '%s': %s\n"
 msgstr "‘%s’的 stat() 方法失败：%s\n"
 
-#: agent/gpg-agent.c:2358
+#: agent/gpg-agent.c:2359
 #, c-format
 msgid "can't use '%s' as home directory\n"
 msgstr "无法使用‘%s’作为家目录\n"
 
-#: agent/gpg-agent.c:2516 scd/scdaemon.c:1193 dirmngr/dirmngr.c:2049
+#: agent/gpg-agent.c:2517 scd/scdaemon.c:1194 dirmngr/dirmngr.c:2051
 #, c-format
 msgid "error reading nonce on fd %d: %s\n"
 msgstr "在读取 fd %d 上的 nonce 时出现错误： %s\n"
 
-#: agent/gpg-agent.c:2723
+#: agent/gpg-agent.c:2724
 #, c-format
 msgid "handler 0x%lx for fd %d started\n"
 msgstr "句柄 0x%lx 于文件描述符 %d 启动\n"
 
-#: agent/gpg-agent.c:2728
+#: agent/gpg-agent.c:2729
 #, c-format
 msgid "handler 0x%lx for fd %d terminated\n"
 msgstr "句柄 0x%lx 于文件描述符 %d 终止\n"
 
-#: agent/gpg-agent.c:2803
+#: agent/gpg-agent.c:2804
 #, c-format
 msgid "ssh handler 0x%lx for fd %d started\n"
 msgstr "ssh 句柄 0x%lx 于文件描述符 %d 启动\n"
 
-#: agent/gpg-agent.c:2808
+#: agent/gpg-agent.c:2809
 #, c-format
 msgid "ssh handler 0x%lx for fd %d terminated\n"
 msgstr "ssh 句柄 0x%lx 于文件描述符 %d 终止\n"
 
-#: agent/gpg-agent.c:3030 scd/scdaemon.c:1383 dirmngr/dirmngr.c:2263
+#: agent/gpg-agent.c:3031 scd/scdaemon.c:1384 dirmngr/dirmngr.c:2265
 #, c-format
 msgid "npth_pselect failed: %s - waiting 1s\n"
 msgstr "npth_pselect 方法失败：%s - 等待 1s\n"
 
-#: agent/gpg-agent.c:3118 scd/scdaemon.c:1448
+#: agent/gpg-agent.c:3119 scd/scdaemon.c:1449
 #, c-format
 msgid "%s %s stopped\n"
 msgstr "%s %s 已停止\n"
 
-#: agent/gpg-agent.c:3256 common/simple-pwquery.c:247 g10/call-agent.c:260
+#: agent/gpg-agent.c:3257 common/simple-pwquery.c:247 g10/call-agent.c:260
 #: sm/call-agent.c:156 tools/gpg-connect-agent.c:2248
 #, c-format
 msgid "no gpg-agent running in this session\n"
 msgstr "此会话中没有 gpg-agent 实例运行\n"
 
-#: agent/preset-passphrase.c:100
+#: agent/preset-passphrase.c:101
 msgid "Usage: gpg-preset-passphrase [options] KEYGRIP (-h for help)\n"
 msgstr "用法： gpg-preset-passphrase [选项] KEYGRIP (-h 获取帮助)\n"
 
-#: agent/preset-passphrase.c:103
+#: agent/preset-passphrase.c:104
 msgid ""
 "Syntax: gpg-preset-passphrase [options] KEYGRIP\n"
 "Password cache maintenance\n"
@@ -653,8 +655,8 @@
 "语法： gpg-preset-passphrase [options] KEYGRIP\n"
 "密码缓存管理\n"
 
-#: agent/protect-tool.c:106 g10/gpg.c:432 kbx/kbxutil.c:71 sm/gpgsm.c:200
-#: dirmngr/dirmngr.c:162 tools/gpgconf.c:74
+#: agent/protect-tool.c:107 g10/gpg.c:438 kbx/kbxutil.c:71 sm/gpgsm.c:202
+#: dirmngr/dirmngr.c:163 tools/gpgconf.c:75
 msgid ""
 "@Commands:\n"
 " "
@@ -662,9 +664,9 @@
 "@命令：\n"
 " "
 
-#: agent/protect-tool.c:115 g10/gpg.c:543 g10/gpgv.c:74 kbx/kbxutil.c:81
-#: sm/gpgsm.c:248 dirmngr/dirmngr.c:177 tools/gpg-connect-agent.c:75
-#: tools/gpgconf.c:99 tools/symcryptrun.c:171
+#: agent/protect-tool.c:116 g10/gpg.c:549 g10/gpgv.c:74 kbx/kbxutil.c:81
+#: sm/gpgsm.c:250 dirmngr/dirmngr.c:178 tools/gpg-connect-agent.c:75
+#: tools/gpgconf.c:100 tools/symcryptrun.c:171
 msgid ""
 "@\n"
 "Options:\n"
@@ -674,11 +676,11 @@
 "选项：\n"
 " "
 
-#: agent/protect-tool.c:154
+#: agent/protect-tool.c:155
 msgid "Usage: gpg-protect-tool [options] (-h for help)\n"
 msgstr "用法： gpg-protect-tool [选项] (-h 获取帮助)\n"
 
-#: agent/protect-tool.c:156
+#: agent/protect-tool.c:157
 msgid ""
 "Syntax: gpg-protect-tool [options] [args]\n"
 "Secret key maintenance tool\n"
@@ -686,21 +688,21 @@
 "语法：gpg-protect-tool [options] [args]\n"
 "私钥管理工具\n"
 
-#: agent/protect-tool.c:693
+#: agent/protect-tool.c:694
 msgid "Please enter the passphrase to unprotect the PKCS#12 object."
 msgstr "请输入密码以解密 PKCS#12 对象。"
 
-#: agent/protect-tool.c:698
+#: agent/protect-tool.c:699
 msgid "Please enter the passphrase to protect the new PKCS#12 object."
 msgstr "请输入密码以保护新的 PKCS#12 对象。"
 
-#: agent/protect-tool.c:704
+#: agent/protect-tool.c:705
 msgid ""
 "Please enter the passphrase to protect the imported object within the GnuPG "
 "system."
 msgstr "请输入密码以在 GnuPG 系统内部保护已导入的对象。"
 
-#: agent/protect-tool.c:709
+#: agent/protect-tool.c:710
 msgid ""
 "Please enter the passphrase or the PIN\n"
 "needed to complete this operation."
@@ -708,18 +710,18 @@
 "请输入所需的密码或者 PIN\n"
 "以完成这一操作。"
 
-#: agent/protect-tool.c:720 tools/symcryptrun.c:462
+#: agent/protect-tool.c:721 tools/symcryptrun.c:462
 #, c-format
 msgid "cancelled\n"
 msgstr "已取消\n"
 
-#: agent/protect-tool.c:722 tools/symcryptrun.c:458
+#: agent/protect-tool.c:723 tools/symcryptrun.c:458
 #, c-format
 msgid "error while asking for the passphrase: %s\n"
 msgstr "请求密码时出现错误： %s\n"
 
-#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1635
-#: tools/gpgconf.c:393
+#: agent/trustlist.c:154 agent/trustlist.c:362 dirmngr/dirmngr.c:1636
+#: tools/gpgconf.c:408
 #, c-format
 msgid "error opening '%s': %s\n"
 msgstr "打开‘%s’时出现错误：%s\n"
@@ -873,7 +875,7 @@
 msgid "secret key parts are not available\n"
 msgstr "私钥部分不可用\n"
 
-#: agent/cvt-openpgp.c:344 g10/card-util.c:1546
+#: agent/cvt-openpgp.c:344 g10/card-util.c:1577
 #, c-format
 msgid "public key algorithm %d (%s) is not supported\n"
 msgstr "公钥算法 %d (%s) 不被支持\n"
@@ -902,7 +904,7 @@
 msgstr "为管道创建流时出现错误： %s\n"
 
 #: common/exechelp-posix.c:495 common/exechelp-posix.c:570
-#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1311
+#: common/exechelp-posix.c:850 dirmngr/dirmngr.c:1312
 #, c-format
 msgid "error forking process: %s\n"
 msgstr "在 fork 进程时出现错误： %s\n"
@@ -1028,7 +1030,7 @@
 msgid "out of core while allocating %lu bytes"
 msgstr ""
 
-#: common/miscellaneous.c:115 g10/card-util.c:900 tools/no-libgcrypt.c:30
+#: common/miscellaneous.c:115 g10/card-util.c:933 tools/no-libgcrypt.c:30
 #, c-format
 msgid "error allocating enough memory: %s\n"
 msgstr ""
@@ -1149,7 +1151,7 @@
 msgstr "算法： %s"
 
 #: common/audit.c:774 common/audit.c:776 common/audit.c:921 common/audit.c:923
-#: scd/app-openpgp.c:3401
+#: scd/app-openpgp.c:3451
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "不支持的算法：%s"
@@ -1224,11 +1226,11 @@
 msgid "Root certificate trustworthy"
 msgstr "根证书可靠"
 
-#: common/audit.c:1111 sm/certchain.c:1009
+#: common/audit.c:1111 sm/certchain.c:1079
 msgid "no CRL found for certificate"
 msgstr "未找到该证书的证书吊销列表（CRL）"
 
-#: common/audit.c:1114 sm/certchain.c:1019
+#: common/audit.c:1114 sm/certchain.c:1089
 msgid "the available CRL is too old"
 msgstr "可用的证书吊销列表（CRL）太旧"
 
@@ -1269,7 +1271,7 @@
 msgid "[none]"
 msgstr "[未设定]"
 
-#: common/ksba-io-support.c:338
+#: common/ksba-io-support.c:347
 #, c-format
 msgid "invalid radix64 character %02x skipped\n"
 msgstr "无效的 radix64 字符 %02x 已被跳过\n"
@@ -1315,7 +1317,7 @@
 msgid "missing argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s” 的参数缺失\n"
 
-#: common/argparse.c:391 g10/gpg.c:3517
+#: common/argparse.c:391 g10/gpg.c:3543
 #, c-format
 msgid "invalid argument for option \"%.50s\"\n"
 msgstr "选项 “%.50s” 的参数无效\n"
@@ -1340,7 +1342,7 @@
 msgid "command \"%.50s\" is ambiguous\n"
 msgstr "命令 “%.50s” 含义模糊\n"
 
-#: common/argparse.c:401 dirmngr/dirmngr.c:1329
+#: common/argparse.c:401 dirmngr/dirmngr.c:1330
 #, c-format
 msgid "out of core\n"
 msgstr "out of core\n"
@@ -1399,8 +1401,8 @@
 msgid "waiting for lock %s...\n"
 msgstr "等待锁 %s...\n"
 
-#: common/init.c:185 sm/gpgsm.c:940 dirmngr/dirmngr.c:857
-#: dirmngr/dirmngr.c:866
+#: common/init.c:185 sm/gpgsm.c:942 dirmngr/dirmngr.c:858
+#: dirmngr/dirmngr.c:867
 #, c-format
 msgid "%s is too old (need %s, have %s)\n"
 msgstr "%s 太旧 （需要 %s，拥有 %s）\n"
@@ -1547,71 +1549,76 @@
 msgid "Enter passphrase: "
 msgstr "输入密码： "
 
-#: g10/call-agent.c:199 sm/call-agent.c:98 sm/call-dirmngr.c:165
+#: g10/call-agent.c:199 g10/call-dirmngr.c:153 sm/call-agent.c:98
+#: sm/call-dirmngr.c:165
 #, c-format
 msgid "error getting version from '%s': %s\n"
 msgstr "从 ‘%s’ 获取版本时出现错误: %s\n"
 
-#: g10/call-agent.c:205 sm/call-agent.c:104 sm/call-dirmngr.c:171
+#: g10/call-agent.c:205 g10/call-dirmngr.c:159 sm/call-agent.c:104
+#: sm/call-dirmngr.c:171
 #, c-format
 msgid "server '%s' is older than us (%s < %s)"
 msgstr "服务器 ‘%s’ 比我们的版本更老 （%s < %s）"
 
-#: g10/call-agent.c:211 sm/call-agent.c:110 sm/call-dirmngr.c:177
+#: g10/call-agent.c:211 g10/call-dirmngr.c:165 g10/call-dirmngr.c:439
+#: sm/call-agent.c:110 sm/call-dirmngr.c:177
 #, c-format
 msgid "WARNING: %s\n"
 msgstr "警告：%s\n"
 
-#: g10/call-agent.c:214 sm/call-agent.c:113 sm/call-dirmngr.c:180
+#: g10/call-agent.c:214 g10/call-dirmngr.c:168 sm/call-agent.c:113
+#: sm/call-dirmngr.c:180
 #, c-format
 msgid "Note: Outdated servers may lack important security fixes.\n"
 msgstr "注意： 过时的服务器可能缺少重要的安全修复。\n"
 
-#: g10/call-agent.c:216 sm/call-agent.c:115 sm/call-dirmngr.c:182
+#: g10/call-agent.c:216 g10/call-dirmngr.c:170 sm/call-agent.c:115
+#: sm/call-dirmngr.c:182
 #, c-format
 msgid "Note: Use the command \"%s\" to restart them.\n"
 msgstr "注意： 使用 “%s” 来重启他们。\n"
 
-#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:304
+#: g10/call-agent.c:318 g10/encrypt.c:154 g10/encrypt.c:604 g10/sign.c:411
 #: sm/call-agent.c:205 sm/encrypt.c:425 sm/sign.c:345
 #, c-format
 msgid "%s is not compliant with %s mode\n"
 msgstr "%s 与 %s 模式不兼容\n"
 
-#: g10/card-util.c:86 g10/card-util.c:403 g10/card-util.c:1902
+#: g10/card-util.c:86 g10/card-util.c:405 g10/card-util.c:1933
 #, c-format
 msgid "OpenPGP card not available: %s\n"
 msgstr "OpenPGP 卡不可用：%s\n"
 
-#: g10/card-util.c:91 g10/card-util.c:1908
+#: g10/card-util.c:91 g10/card-util.c:1939
 #, c-format
 msgid "OpenPGP card no. %s detected\n"
 msgstr "检测到 OpenPGP 卡，号码为 %s\n"
 
-#: g10/card-util.c:99 g10/card-util.c:2227 g10/delkey.c:159 g10/keyedit.c:1422
-#: g10/keygen.c:4155 g10/revoke.c:214 g10/revoke.c:636
+#: g10/card-util.c:97 g10/card-util.c:2260 g10/delkey.c:160 g10/keyedit.c:1422
+#: g10/keygen.c:4462 g10/revoke.c:214 g10/revoke.c:636
 #, c-format
 msgid "can't do this in batch mode\n"
 msgstr "在批处理模式中无法完成此操作\n"
 
-#: g10/card-util.c:107
+#: g10/card-util.c:105
 #, c-format
 msgid "This command is only available for version 2 cards\n"
 msgstr "这一命令只在版本 2 的卡上可用\n"
 
-#: g10/card-util.c:109 scd/app-openpgp.c:2729
+#: g10/card-util.c:107 scd/app-openpgp.c:2779
 #, c-format
 msgid "Reset Code not or not anymore available\n"
 msgstr "重置代码不可用或不再可用\n"
 
-#: g10/card-util.c:142 g10/card-util.c:1432 g10/card-util.c:1694
-#: g10/card-util.c:1786 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
-#: g10/keygen.c:1802 g10/keygen.c:1963 g10/keygen.c:2331
-#: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:269 sm/certreqgen-ui.c:303
+#: g10/card-util.c:140 g10/card-util.c:1463 g10/card-util.c:1725
+#: g10/card-util.c:1817 g10/keyedit.c:394 g10/keyedit.c:415 g10/keyedit.c:429
+#: g10/keygen.c:1809 g10/keygen.c:1981 g10/keygen.c:2183 g10/keygen.c:2474
+#: sm/certreqgen-ui.c:165 sm/certreqgen-ui.c:291 sm/certreqgen-ui.c:325
 msgid "Your selection? "
 msgstr "您的选择是？ "
 
-#: g10/card-util.c:298 g10/card-util.c:349
+#: g10/card-util.c:300 g10/card-util.c:351
 msgid "[not set]"
 msgstr "[未设定]"
 
@@ -1627,74 +1634,74 @@
 msgid "unspecified"
 msgstr "未定义"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:610
 msgid "not forced"
 msgstr "非强制"
 
-#: g10/card-util.c:590
+#: g10/card-util.c:610
 msgid "forced"
 msgstr "强制"
 
-#: g10/card-util.c:753
+#: g10/card-util.c:786
 msgid "Error: Only plain ASCII is currently allowed.\n"
 msgstr "错误：目前只允许使用纯 ASCII 字符。\n"
 
-#: g10/card-util.c:755
+#: g10/card-util.c:788
 msgid "Error: The \"<\" character may not be used.\n"
 msgstr "错误：不能使用字符 “<”。\n"
 
-#: g10/card-util.c:757
+#: g10/card-util.c:790
 msgid "Error: Double spaces are not allowed.\n"
 msgstr "错误：不允许出现两个空格。\n"
 
-#: g10/card-util.c:774
+#: g10/card-util.c:807
 msgid "Cardholder's surname: "
 msgstr "卡片持有人的姓： "
 
-#: g10/card-util.c:776
+#: g10/card-util.c:809
 msgid "Cardholder's given name: "
 msgstr "卡片持有人的名： "
 
-#: g10/card-util.c:794
+#: g10/card-util.c:827
 #, c-format
 msgid "Error: Combined name too long (limit is %d characters).\n"
 msgstr "错误：合成后的姓名太长（至多 %d 个字符）。\n"
 
-#: g10/card-util.c:815
+#: g10/card-util.c:848
 msgid "URL to retrieve public key: "
 msgstr "拉取公钥的 URL： "
 
-#: g10/card-util.c:909 g10/decrypt-data.c:253 g10/import.c:375
-#: g10/import.c:688 g10/import.c:740 dirmngr/crlcache.c:659
+#: g10/card-util.c:942 g10/decrypt-data.c:253 g10/import.c:387
+#: g10/import.c:734 g10/import.c:786 dirmngr/crlcache.c:659
 #: dirmngr/crlcache.c:664 dirmngr/crlcache.c:918 dirmngr/crlcache.c:924
-#: dirmngr/dirmngr.c:1674 tools/gpgconf.c:406 tools/gpgconf.c:452
+#: dirmngr/dirmngr.c:1675 tools/gpgconf.c:421 tools/gpgconf.c:467
 #, c-format
 msgid "error reading '%s': %s\n"
 msgstr "读取 ‘%s’ 时出现错误：%s\n"
 
-#: g10/card-util.c:942 g10/decrypt-data.c:256 g10/export.c:2417
+#: g10/card-util.c:975 g10/decrypt-data.c:256 g10/export.c:2467
 #: dirmngr/crlcache.c:929
 #, c-format
 msgid "error writing '%s': %s\n"
 msgstr "写入 ‘%s’ 时出现错误： %s\n"
 
-#: g10/card-util.c:969
+#: g10/card-util.c:1002
 msgid "Login data (account name): "
 msgstr "登录数据（帐户名）： "
 
-#: g10/card-util.c:1007
+#: g10/card-util.c:1040
 msgid "Private DO data: "
 msgstr "个人 DO 数据： "
 
-#: g10/card-util.c:1092
+#: g10/card-util.c:1125
 msgid "Language preferences: "
 msgstr "语言偏好： "
 
-#: g10/card-util.c:1100
+#: g10/card-util.c:1133
 msgid "Error: invalid length of preference string.\n"
 msgstr "错误：偏好字符串长度无效。\n"
 
-#: g10/card-util.c:1109
+#: g10/card-util.c:1142
 msgid "Error: invalid characters in preference string.\n"
 msgstr "错误：偏好字符串中存在无效字符。\n"
 
@@ -1702,37 +1709,37 @@
 msgid "Sex ((M)ale, (F)emale or space): "
 msgstr "性别(男性输入 M，女性输入 F，不指定输入空格)： "
 
-#: g10/card-util.c:1145
+#: g10/card-util.c:1178
 msgid "Error: invalid response.\n"
 msgstr "错误：无效的响应。\n"
 
-#: g10/card-util.c:1167
+#: g10/card-util.c:1200
 msgid "CA fingerprint: "
 msgstr "CA 指纹： "
 
-#: g10/card-util.c:1190
+#: g10/card-util.c:1223
 msgid "Error: invalid formatted fingerprint.\n"
 msgstr "错误：指纹格式无效。\n"
 
-#: g10/card-util.c:1240
+#: g10/card-util.c:1273
 #, c-format
 msgid "key operation not possible: %s\n"
 msgstr "密钥操作无法实现：%s\n"
 
-#: g10/card-util.c:1241
+#: g10/card-util.c:1274
 msgid "not an OpenPGP card"
 msgstr "不是一个 OpenPGP 卡"
 
-#: g10/card-util.c:1254 g10/keygen.c:4175 g10/keygen.c:5212
+#: g10/card-util.c:1287 g10/keygen.c:4482 g10/keygen.c:5561
 #, c-format
 msgid "error getting current key info: %s\n"
 msgstr "取得当前密钥信息时出错：%s\n"
 
-#: g10/card-util.c:1341
+#: g10/card-util.c:1372
 msgid "Replace existing key? (y/N) "
 msgstr "替换现存的密钥？(y/N) "
 
-#: g10/card-util.c:1358
+#: g10/card-util.c:1389
 msgid ""
 "Note: There is no guarantee that the card supports the requested size.\n"
 "      If the key generation does not succeed, please check the\n"
@@ -1754,23 +1761,23 @@
 msgid "What keysize do you want for the Authentication key? (%u) "
 msgstr ""
 
-#: g10/card-util.c:1517
+#: g10/card-util.c:1548
 #, c-format
 msgid "The card will now be re-configured to generate a key of type: %s\n"
 msgstr "此卡片将会被重新配置以生成一个以下类型的密钥： %s\n"
 
-#: g10/card-util.c:1390 g10/keygen.c:2140 g10/keygen.c:2172
+#: g10/card-util.c:1421 g10/keygen.c:2283 g10/keygen.c:2315
 #: sm/certreqgen-ui.c:194
 #, c-format
 msgid "rounded up to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/card-util.c:1398 g10/keygen.c:2225 sm/certreqgen-ui.c:184
+#: g10/card-util.c:1429 g10/keygen.c:2368 sm/certreqgen-ui.c:184
 #, c-format
 msgid "%s keysizes must be in the range %u-%u\n"
 msgstr "%s 密钥长度必须在 %u 与 %u 间\n"
 
-#: g10/card-util.c:1512
+#: g10/card-util.c:1543
 #, c-format
 msgid "The card will now be re-configured to generate a key of %u bits\n"
 msgstr "此卡片将会被重新配置以生成一个 %u 位的新密钥\n"
@@ -1780,20 +1787,20 @@
 msgid "error changing size of key %d to %u bits: %s\n"
 msgstr ""
 
-#: g10/card-util.c:1621
+#: g10/card-util.c:1652
 msgid "Make off-card backup of encryption key? (Y/n) "
 msgstr "创建加密密钥的离卡备份？ (Y/n) "
 
-#: g10/card-util.c:1635
+#: g10/card-util.c:1666
 #, c-format
 msgid "Note: keys are already stored on the card!\n"
 msgstr "注意： 已有密钥被存储于卡片上！\n"
 
-#: g10/card-util.c:1638
+#: g10/card-util.c:1669
 msgid "Replace existing keys? (y/N) "
 msgstr "替换现存的密钥？(y/N) "
 
-#: g10/card-util.c:1650
+#: g10/card-util.c:1681
 #, c-format
 msgid ""
 "Please note that the factory settings of the PINs are\n"
@@ -1804,88 +1811,88 @@
 "  PIN = ‘%s’    管理员 PIN = ‘%s’\n"
 "您应当使用 --change-pin 命令来更改它们\n"
 
-#: g10/card-util.c:1685
+#: g10/card-util.c:1716
 msgid "Please select the type of key to generate:\n"
 msgstr "请选择您要生成的密钥类型：\n"
 
-#: g10/card-util.c:1687 g10/card-util.c:1777
+#: g10/card-util.c:1718 g10/card-util.c:1808
 msgid "   (1) Signature key\n"
 msgstr "   (1) 签名密钥\n"
 
-#: g10/card-util.c:1688 g10/card-util.c:1779
+#: g10/card-util.c:1719 g10/card-util.c:1810
 msgid "   (2) Encryption key\n"
 msgstr "   (2) 加密密钥\n"
 
-#: g10/card-util.c:1689 g10/card-util.c:1781
+#: g10/card-util.c:1720 g10/card-util.c:1812
 msgid "   (3) Authentication key\n"
 msgstr "   (3) 身份验证密钥\n"
 
-#: g10/card-util.c:1439 g10/card-util.c:1706 g10/card-util.c:1806
-#: g10/keyedit.c:899 g10/keygen.c:1828 g10/keygen.c:1856 g10/keygen.c:1970
-#: g10/keygen.c:2078 g10/keygen.c:2359 g10/revoke.c:838
+#: g10/card-util.c:1470 g10/card-util.c:1737 g10/card-util.c:1837
+#: g10/keyedit.c:899 g10/keygen.c:1835 g10/keygen.c:1863 g10/keygen.c:1988
+#: g10/keygen.c:2219 g10/keygen.c:2502 g10/revoke.c:838
 msgid "Invalid selection.\n"
 msgstr "无效的选择。\n"
 
-#: g10/card-util.c:1774
+#: g10/card-util.c:1805
 msgid "Please select where to store the key:\n"
 msgstr "请选择在哪里存储密钥：\n"
 
-#: g10/card-util.c:1820
+#: g10/card-util.c:1851
 #, c-format
 msgid "KEYTOCARD failed: %s\n"
 msgstr "KEYTOCARD 失败： %s\n"
 
-#: g10/card-util.c:1575 g10/card-util.c:1914 g10/card-util.c:2088
+#: g10/card-util.c:1606 g10/card-util.c:1945 g10/card-util.c:2119
 #, c-format
 msgid "This command is not supported by this card\n"
 msgstr "此命令不被此卡片支持\n"
 
-#: g10/card-util.c:1919
+#: g10/card-util.c:1950
 #, c-format
 msgid "Note: This command destroys all keys stored on the card!\n"
 msgstr "注意： 这一命令将会销毁所有储存于卡片上的密钥！\n"
 
-#: g10/card-util.c:1922
+#: g10/card-util.c:1953
 msgid "Continue? (y/N) "
 msgstr "继续？ (y/N) "
 
-#: g10/card-util.c:1927
+#: g10/card-util.c:1958
 msgid "Really do a factory reset? (enter \"yes\") "
 msgstr "真的要执行恢复出厂设置吗？ (输入“yes”) "
 
-#: g10/card-util.c:2133 g10/keyedit.c:1259
+#: g10/card-util.c:2165 g10/keyedit.c:1259
 msgid "quit this menu"
 msgstr "退出此菜单"
 
-#: g10/card-util.c:2135
+#: g10/card-util.c:2167
 msgid "show admin commands"
 msgstr "显示管理员命令"
 
-#: g10/card-util.c:2136 g10/keyedit.c:1262
+#: g10/card-util.c:2168 g10/keyedit.c:1262
 msgid "show this help"
 msgstr "显示此帮助"
 
-#: g10/card-util.c:2138
+#: g10/card-util.c:2170
 msgid "list all available data"
 msgstr "列出所有可用数据"
 
-#: g10/card-util.c:2141
+#: g10/card-util.c:2173
 msgid "change card holder's name"
 msgstr "更改卡持有人的姓名"
 
-#: g10/card-util.c:2142
+#: g10/card-util.c:2174
 msgid "change URL to retrieve key"
 msgstr "更改拉取密钥的 URL"
 
-#: g10/card-util.c:2143
+#: g10/card-util.c:2175
 msgid "fetch the key specified in the card URL"
 msgstr "根据卡中指定的 URL 获取密钥"
 
-#: g10/card-util.c:2144
+#: g10/card-util.c:2176
 msgid "change the login name"
 msgstr "更改登录名"
 
-#: g10/card-util.c:2145
+#: g10/card-util.c:2177
 msgid "change the language preferences"
 msgstr "更改语言偏好"
 
@@ -1893,51 +1900,51 @@
 msgid "change card holder's sex"
 msgstr "更改卡持有人的性别"
 
-#: g10/card-util.c:2147
+#: g10/card-util.c:2180
 msgid "change a CA fingerprint"
 msgstr "更改一个 CA 指纹"
 
-#: g10/card-util.c:2148
+#: g10/card-util.c:2181
 msgid "toggle the signature force PIN flag"
 msgstr "开关签名的强制 PIN 设置"
 
-#: g10/card-util.c:2149
+#: g10/card-util.c:2182
 msgid "generate new keys"
 msgstr "生成新的密钥"
 
-#: g10/card-util.c:2150
+#: g10/card-util.c:2183
 msgid "menu to change or unblock the PIN"
 msgstr "更改或解锁 PIN 的菜单"
 
-#: g10/card-util.c:2151
+#: g10/card-util.c:2184
 msgid "verify the PIN and list all data"
 msgstr "验证 PIN 并列出所有数据"
 
-#: g10/card-util.c:2152
+#: g10/card-util.c:2185
 msgid "unblock the PIN using a Reset Code"
 msgstr "使用重置代码解锁 PIN"
 
-#: g10/card-util.c:2153
+#: g10/card-util.c:2186
 msgid "destroy all keys and data"
 msgstr "销毁所有密钥和数据"
 
-#: g10/card-util.c:2279
+#: g10/card-util.c:2312
 msgid "gpg/card> "
 msgstr "gpg/card> "
 
-#: g10/card-util.c:2320
+#: g10/card-util.c:2353
 msgid "Admin-only command\n"
 msgstr "仅供管理员使用的命令\n"
 
-#: g10/card-util.c:2351
+#: g10/card-util.c:2384
 msgid "Admin commands are allowed\n"
 msgstr "管理员命令可用\n"
 
-#: g10/card-util.c:2353
+#: g10/card-util.c:2386
 msgid "Admin commands are not allowed\n"
 msgstr "管理员命令不可用\n"
 
-#: g10/card-util.c:2456 g10/keyedit.c:2228
+#: g10/card-util.c:2489 g10/keyedit.c:2228
 msgid "Invalid command  (try \"help\")\n"
 msgstr "无效的命令  （尝试“help”）\n"
 
@@ -1946,83 +1953,83 @@
 msgid "--output doesn't work for this command\n"
 msgstr "--output 在这个命令中不起作用\n"
 
-#: g10/decrypt.c:247 g10/gpg.c:5077 g10/keyring.c:399 g10/keyring.c:747
+#: g10/decrypt.c:247 g10/gpg.c:5121 g10/keyring.c:399 g10/keyring.c:750
 #, c-format
 msgid "can't open '%s'\n"
 msgstr "无法打开 ‘%s’\n"
 
-#: g10/delkey.c:82 g10/export.c:1897 g10/export.c:2180 g10/export.c:2301
-#: g10/getkey.c:1871 g10/gpg.c:5022 g10/keyedit.c:1444 g10/keyedit.c:2334
-#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:668
+#: g10/delkey.c:83 g10/export.c:1947 g10/export.c:2230 g10/export.c:2351
+#: g10/getkey.c:1957 g10/gpg.c:5066 g10/keyedit.c:1444 g10/keyedit.c:2334
+#: g10/keyedit.c:2580 g10/keyedit.c:4283 g10/keylist.c:689
 #: g10/keyserver.c:1244 g10/revoke.c:230 g10/tofu.c:2165
 #, c-format
 msgid "key \"%s\" not found: %s\n"
 msgstr "未找到密钥 ‘%s’：%s\n"
 
-#: g10/delkey.c:91 g10/export.c:1965 g10/getkey.c:1879 g10/getkey.c:4380
-#: g10/gpg.c:5031 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
+#: g10/delkey.c:92 g10/export.c:2015 g10/getkey.c:1965 g10/getkey.c:4320
+#: g10/gpg.c:5075 g10/keyedit.c:2307 g10/keyserver.c:1262 g10/revoke.c:236
 #: g10/revoke.c:663 g10/tofu.c:2173
 #, c-format
 msgid "error reading keyblock: %s\n"
 msgstr "读取密钥块时出现错误： %s\n"
 
-#: g10/delkey.c:149
+#: g10/delkey.c:150
 #, c-format
 msgid "key \"%s\" not found\n"
 msgstr "未找到密钥 “%s”\n"
 
-#: g10/delkey.c:160 g10/delkey.c:167
+#: g10/delkey.c:161 g10/delkey.c:168
 #, c-format
 msgid "(unless you specify the key by fingerprint)\n"
 msgstr "（除非您用指纹指定密钥）\n"
 
-#: g10/delkey.c:166
+#: g10/delkey.c:167
 #, c-format
 msgid "can't do this in batch mode without \"--yes\"\n"
 msgstr "无法于批处理模式中在没有“--yes”的情况下完成此操作\n"
 
-#: g10/delkey.c:205
+#: g10/delkey.c:206
 msgid "Delete this key from the keyring? (y/N) "
 msgstr "要从钥匙环里删除这个密钥吗？(y/N) "
 
-#: g10/delkey.c:215
+#: g10/delkey.c:216
 msgid "This is a secret key! - really delete? (y/N) "
 msgstr "这是一个私钥！- 真的要删除吗？(y/N) "
 
-#: g10/delkey.c:262
+#: g10/delkey.c:263
 #, c-format
 msgid "deleting secret %s failed: %s\n"
 msgstr "删除私钥 %s 时失败： %s\n"
 
-#: g10/delkey.c:264
+#: g10/delkey.c:265
 msgid "key"
 msgstr "密钥"
 
-#: g10/delkey.c:264
+#: g10/delkey.c:265
 msgid "subkey"
 msgstr "子密钥"
 
-#: g10/delkey.c:316
+#: g10/delkey.c:308
 #, c-format
 msgid "deleting keyblock failed: %s\n"
 msgstr "删除密钥块时失败：%s\n"
 
-#: g10/delkey.c:330
+#: g10/delkey.c:322
 #, c-format
 msgid "ownertrust information cleared\n"
 msgstr "所有者信任信息已被清除\n"
 
-#: g10/delkey.c:367
+#: g10/delkey.c:359
 #, c-format
 msgid "there is a secret key for public key \"%s\"!\n"
 msgstr "存在一个私钥对应于公钥 “%s”！\n"
 
-#: g10/delkey.c:369
+#: g10/delkey.c:361
 #, c-format
 msgid "use option \"--delete-secret-keys\" to delete it first.\n"
 msgstr "请先使用“--delete-secret-keys”选项来删除它。\n"
 
-#: g10/encrypt.c:207 g10/sign.c:1336
+#: g10/encrypt.c:207 g10/sign.c:1447
 #, c-format
 msgid "error creating passphrase: %s\n"
 msgstr "创建密码时出现错误：%s\n"
@@ -2042,7 +2049,7 @@
 msgid "'%s' already compressed\n"
 msgstr "‘%s’已被压缩\n"
 
-#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:643
+#: g10/encrypt.c:295 g10/encrypt.c:688 g10/sign.c:750
 #, c-format
 msgid "WARNING: '%s' is an empty file\n"
 msgstr "警告：‘%s’是一个空文件\n"
@@ -2058,8 +2065,8 @@
 "WARNING: forcing symmetric cipher %s (%d) violates recipient preferences\n"
 msgstr "警告： 强制对称密文 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3925 g10/gpg.c:3965
-#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1646
+#: g10/encrypt.c:594 g10/decrypt-data.c:105 g10/gpg.c:3959 g10/gpg.c:3999
+#: sm/decrypt.c:364 sm/encrypt.c:415 sm/gpgsm.c:1648
 #, c-format
 msgid "cipher algorithm '%s' may not be used in %s mode\n"
 msgstr "密文算法 ‘%s’ 可能不能被用于 %s 模式\n"
@@ -2069,7 +2076,7 @@
 msgid "WARNING: key %s is not suitable for encryption in %s mode\n"
 msgstr "警告： 密钥 %s 在 %s 模式下不适用于加密\n"
 
-#: g10/encrypt.c:735 g10/sign.c:1028
+#: g10/encrypt.c:735 g10/sign.c:1139
 #, c-format
 msgid ""
 "WARNING: forcing compression algorithm %s (%d) violates recipient "
@@ -2091,12 +2098,12 @@
 msgid "option '%s' may not be used in %s mode\n"
 msgstr "选项 ‘%s’ 可能不能用于 %s 模式\n"
 
-#: g10/decrypt-data.c:94 g10/mainproc.c:319
+#: g10/decrypt-data.c:94 g10/mainproc.c:320
 #, c-format
 msgid "%s encrypted data\n"
 msgstr "%s 加密过的数据\n"
 
-#: g10/decrypt-data.c:97 g10/mainproc.c:323
+#: g10/decrypt-data.c:97 g10/mainproc.c:324
 #, c-format
 msgid "encrypted with unknown algorithm %d\n"
 msgstr "以未知的算法 %d 加密\n"
@@ -2169,61 +2176,61 @@
 msgid "WARNING: unable to remove temp directory '%s': %s\n"
 msgstr "警告：无法删除临时目录‘%s’：%s\n"
 
-#: g10/export.c:108
+#: g10/export.c:119
 msgid "export signatures that are marked as local-only"
 msgstr "导出被标记为“仅限本地”的签名"
 
-#: g10/export.c:110
+#: g10/export.c:121
 msgid "export attribute user IDs (generally photo IDs)"
 msgstr "导出附属用户标识（一般为照片标识）"
 
-#: g10/export.c:112
+#: g10/export.c:123
 msgid "export revocation keys marked as \"sensitive\""
 msgstr "导出被标记为“敏感”的吊销用密钥"
 
-#: g10/export.c:114
+#: g10/export.c:125
 msgid "remove unusable parts from key during export"
 msgstr "导出时移除密钥中未使用的部分"
 
-#: g10/export.c:116
+#: g10/export.c:127
 msgid "remove as much as possible from key during export"
 msgstr "导出时尽可能移除密钥中的可选部分"
 
-#: g10/export.c:122
+#: g10/export.c:133
 msgid "use the GnuPG key backup format"
 msgstr "使用 GnuPG 密钥备份格式"
 
-#: g10/export.c:1241
+#: g10/export.c:1291
 msgid " - skipped"
 msgstr " - 已跳过"
 
-#: g10/export.c:1274 g10/import.c:2018 g10/openfile.c:200 g10/openfile.c:294
-#: g10/sign.c:889 g10/sign.c:1192
+#: g10/export.c:1324 g10/import.c:2073 g10/openfile.c:200 g10/openfile.c:294
+#: g10/sign.c:1000 g10/sign.c:1303
 #, c-format
 msgid "writing to '%s'\n"
 msgstr "正在写入‘%s’\n"
 
-#: g10/export.c:1719
+#: g10/export.c:1769
 #, c-format
 msgid "key %s: key material on-card - skipped\n"
 msgstr "密钥 %s：密钥在卡片上 - 已跳过\n"
 
-#: g10/export.c:1914
+#: g10/export.c:1964
 #, c-format
 msgid "exporting secret keys not allowed\n"
 msgstr "不允许导出私钥\n"
 
-#: g10/export.c:1991
+#: g10/export.c:2041
 #, c-format
 msgid "key %s: PGP 2.x style key - skipped\n"
 msgstr "密钥 %s：PGP 2.x 样式的密钥 - 已跳过\n"
 
-#: g10/export.c:2085
+#: g10/export.c:2135
 #, c-format
 msgid "WARNING: nothing exported\n"
 msgstr "警告：没有导出任何东西\n"
 
-#: g10/export.c:2382 g10/plaintext.c:153 g10/plaintext.c:162
+#: g10/export.c:2432 g10/plaintext.c:153 g10/plaintext.c:162
 #: g10/plaintext.c:168 g10/plaintext.c:191
 #, c-format
 msgid "error creating '%s': %s\n"
@@ -2233,7 +2240,7 @@
 msgid "[User ID not found]"
 msgstr "[用户标识未找到]"
 
-#: g10/getkey.c:1851 g10/pkclist.c:988
+#: g10/getkey.c:1937 g10/pkclist.c:988
 #, c-format
 msgid "(check argument of option '%s')\n"
 msgstr "（检查选项 ‘%s’ 的参数）\n"
@@ -2253,252 +2260,252 @@
 msgid "Warning: %s appears in the keyring %d times\n"
 msgstr ""
 
-#: g10/getkey.c:1271
+#: g10/getkey.c:1290
 #, c-format
 msgid "automatically retrieved '%s' via %s\n"
 msgstr "自动拉取‘%s’，通过 %s\n"
 
-#: g10/getkey.c:1277
+#: g10/getkey.c:1296
 #, c-format
 msgid "error retrieving '%s' via %s: %s\n"
 msgstr "拉取‘%s’通过 %s 时出现错误： %s\n"
 
-#: g10/getkey.c:1279
+#: g10/getkey.c:1298
 msgid "No fingerprint"
 msgstr "无指纹"
 
-#: g10/getkey.c:1848 g10/revoke.c:655 g10/revoke.c:720
+#: g10/getkey.c:1934 g10/revoke.c:655 g10/revoke.c:720
 #, c-format
 msgid "secret key \"%s\" not found: %s\n"
 msgstr "找不到私钥 “%s”：%s\n"
 
-#: g10/getkey.c:1931
+#: g10/getkey.c:2013
 #, c-format
 msgid "Warning: not using '%s' as default key: %s\n"
 msgstr "警告：未使用‘%s’作为默认密钥：%s\n"
 
-#: g10/getkey.c:1939
+#: g10/getkey.c:2021
 #, c-format
 msgid "using \"%s\" as default secret key for signing\n"
 msgstr "使用 “%s” 作为默认签名用私钥\n"
 
-#: g10/getkey.c:1946
+#: g10/getkey.c:2028
 #, c-format
 msgid "all values passed to '%s' ignored\n"
 msgstr "传递给‘%s’的所有值被忽略\n"
 
-#: g10/getkey.c:2775
+#: g10/getkey.c:2859
 #, c-format
 msgid "Invalid key %s made valid by --allow-non-selfsigned-uid\n"
 msgstr "无效的密钥 %s 通过 --allow-non-selfsigned-uid 生效\n"
 
-#: g10/getkey.c:3620
+#: g10/getkey.c:3706
 #, c-format
 msgid "using subkey %s instead of primary key %s\n"
 msgstr "使用子密钥 %s 而非主密钥 %s\n"
 
-#: g10/getkey.c:4309 g10/gpg.c:2078
+#: g10/getkey.c:4249 g10/gpg.c:2099
 #, c-format
 msgid "valid values for option '%s':\n"
 msgstr "选项 ‘%s’ 的有效值:\n"
 
-#: g10/gpg.c:434 sm/gpgsm.c:202
+#: g10/gpg.c:440 sm/gpgsm.c:204
 msgid "make a signature"
 msgstr "生成一份签名"
 
-#: g10/gpg.c:435
+#: g10/gpg.c:441
 msgid "make a clear text signature"
 msgstr "生成一份明文签名"
 
-#: g10/gpg.c:437 sm/gpgsm.c:204
+#: g10/gpg.c:443 sm/gpgsm.c:206
 msgid "make a detached signature"
 msgstr "生成一份分离的签名"
 
-#: g10/gpg.c:438 sm/gpgsm.c:205
+#: g10/gpg.c:444 sm/gpgsm.c:207
 msgid "encrypt data"
 msgstr "加密数据"
 
-#: g10/gpg.c:440
+#: g10/gpg.c:446
 msgid "encryption only with symmetric cipher"
 msgstr "仅使用对称密文加密"
 
-#: g10/gpg.c:442 sm/gpgsm.c:207
+#: g10/gpg.c:448 sm/gpgsm.c:209
 msgid "decrypt data (default)"
 msgstr "解密数据（默认）"
 
-#: g10/gpg.c:444 sm/gpgsm.c:208
+#: g10/gpg.c:450 sm/gpgsm.c:210
 msgid "verify a signature"
 msgstr "验证签名"
 
-#: g10/gpg.c:446 sm/gpgsm.c:209
+#: g10/gpg.c:452 sm/gpgsm.c:211
 msgid "list keys"
 msgstr "列出密钥"
 
-#: g10/gpg.c:448
+#: g10/gpg.c:454
 msgid "list keys and signatures"
 msgstr "列出密钥和签名"
 
-#: g10/gpg.c:451
+#: g10/gpg.c:457
 msgid "list and check key signatures"
 msgstr "列出并检查密钥签名"
 
-#: g10/gpg.c:453 sm/gpgsm.c:214
+#: g10/gpg.c:459 sm/gpgsm.c:216
 msgid "list keys and fingerprints"
 msgstr "列出密钥和指纹"
 
-#: g10/gpg.c:454 sm/gpgsm.c:212
+#: g10/gpg.c:460 sm/gpgsm.c:214
 msgid "list secret keys"
 msgstr "列出私钥"
 
-#: g10/gpg.c:456 sm/gpgsm.c:215
+#: g10/gpg.c:462 sm/gpgsm.c:217
 msgid "generate a new key pair"
 msgstr "生成一个新的密钥对"
 
-#: g10/gpg.c:459
+#: g10/gpg.c:465
 msgid "quickly generate a new key pair"
 msgstr "快速生成一个新的密钥对"
 
-#: g10/gpg.c:462
+#: g10/gpg.c:468
 msgid "quickly add a new user-id"
 msgstr "快速添加一个新的用户标识"
 
-#: g10/gpg.c:467
+#: g10/gpg.c:473
 msgid "quickly revoke a user-id"
 msgstr "快速吊销一个用户标识"
 
-#: g10/gpg.c:470
+#: g10/gpg.c:476
 msgid "quickly set a new expiration date"
 msgstr "快速设置一个过期日期"
 
-#: g10/gpg.c:473
+#: g10/gpg.c:479
 msgid "full featured key pair generation"
 msgstr "完整功能的密钥对生成"
 
-#: g10/gpg.c:476
+#: g10/gpg.c:482
 msgid "generate a revocation certificate"
 msgstr "生成一份吊销证书"
 
-#: g10/gpg.c:479 sm/gpgsm.c:218
+#: g10/gpg.c:485 sm/gpgsm.c:220
 msgid "remove keys from the public keyring"
 msgstr "从公钥钥匙环里删除密钥"
 
-#: g10/gpg.c:481
+#: g10/gpg.c:487
 msgid "remove keys from the secret keyring"
 msgstr "从私钥钥匙环里删除密钥"
 
-#: g10/gpg.c:483
+#: g10/gpg.c:489
 msgid "quickly sign a key"
 msgstr "快速签名一个密钥"
 
-#: g10/gpg.c:485
+#: g10/gpg.c:491
 msgid "quickly sign a key locally"
 msgstr "快速本地签名一个密钥"
 
-#: g10/gpg.c:486
+#: g10/gpg.c:492
 msgid "sign a key"
 msgstr "签名一个密钥"
 
-#: g10/gpg.c:487
+#: g10/gpg.c:493
 msgid "sign a key locally"
 msgstr "本地签名一个密钥"
 
-#: g10/gpg.c:488
+#: g10/gpg.c:494
 msgid "sign or edit a key"
 msgstr "签名或编辑一个密钥"
 
-#: g10/gpg.c:490 sm/gpgsm.c:236
+#: g10/gpg.c:496 sm/gpgsm.c:238
 msgid "change a passphrase"
 msgstr "更改密码"
 
-#: g10/gpg.c:494
+#: g10/gpg.c:500
 msgid "export keys"
 msgstr "导出密钥"
 
-#: g10/gpg.c:495
+#: g10/gpg.c:501
 msgid "export keys to a keyserver"
 msgstr "个密钥导出到一个公钥服务器上"
 
-#: g10/gpg.c:496
+#: g10/gpg.c:502
 msgid "import keys from a keyserver"
 msgstr "从公钥服务器上导入密钥"
 
-#: g10/gpg.c:499
+#: g10/gpg.c:505
 msgid "search for keys on a keyserver"
 msgstr "在公钥服务器上搜索密钥"
 
-#: g10/gpg.c:501
+#: g10/gpg.c:507
 msgid "update all keys from a keyserver"
 msgstr "从公钥服务器更新所有密钥"
 
-#: g10/gpg.c:509
+#: g10/gpg.c:515
 msgid "import/merge keys"
 msgstr "导入/合并密钥"
 
-#: g10/gpg.c:512
+#: g10/gpg.c:518
 msgid "print the card status"
 msgstr "打印卡片状态"
 
-#: g10/gpg.c:513
+#: g10/gpg.c:519
 msgid "change data on a card"
 msgstr "更改卡片上的数据"
 
-#: g10/gpg.c:515
+#: g10/gpg.c:521
 msgid "change a card's PIN"
 msgstr "更改卡片的 PIN"
 
-#: g10/gpg.c:527
+#: g10/gpg.c:533
 msgid "update the trust database"
 msgstr "更新信任数据库"
 
-#: g10/gpg.c:536
+#: g10/gpg.c:542
 msgid "print message digests"
 msgstr "打印消息摘要"
 
-#: g10/gpg.c:539 sm/gpgsm.c:231
+#: g10/gpg.c:545 sm/gpgsm.c:233
 msgid "run in server mode"
 msgstr "以服务器模式运行"
 
-#: g10/gpg.c:541
+#: g10/gpg.c:547
 msgid "|VALUE|set the TOFU policy for a key"
 msgstr "|VALUE|设置一个密钥的 TOFU 政策"
 
-#: g10/gpg.c:545 sm/gpgsm.c:250
+#: g10/gpg.c:551 sm/gpgsm.c:252
 msgid "create ascii armored output"
 msgstr "创建 ASCII 字符封装的输出"
 
-#: g10/gpg.c:548 sm/gpgsm.c:267
+#: g10/gpg.c:554 sm/gpgsm.c:269
 msgid "|USER-ID|encrypt for USER-ID"
 msgstr "|USER-ID|为 USER-ID 加密"
 
-#: g10/gpg.c:564 sm/gpgsm.c:303
+#: g10/gpg.c:570 sm/gpgsm.c:305
 msgid "|USER-ID|use USER-ID to sign or decrypt"
 msgstr "|USER-ID|使用 USER-ID 来签名或者解密"
 
-#: g10/gpg.c:570
+#: g10/gpg.c:576
 msgid "|N|set compress level to N (0 disables)"
 msgstr "|N|设置压缩等级为 N （0 为禁用）"
 
-#: g10/gpg.c:577
+#: g10/gpg.c:583
 msgid "use canonical text mode"
 msgstr "使用规范的文本模式"
 
-#: g10/gpg.c:594 g10/gpgv.c:80 sm/gpgsm.c:305
+#: g10/gpg.c:600 g10/gpgv.c:80 sm/gpgsm.c:307
 msgid "|FILE|write output to FILE"
 msgstr "|FILE|写输出到 FILE"
 
-#: g10/gpg.c:604 kbx/kbxutil.c:90 sm/gpgsm.c:317 tools/gpgconf.c:104
+#: g10/gpg.c:610 kbx/kbxutil.c:90 sm/gpgsm.c:319 tools/gpgconf.c:105
 msgid "do not make any changes"
 msgstr "不做任何更改"
 
-#: g10/gpg.c:605
+#: g10/gpg.c:611
 msgid "prompt before overwriting"
 msgstr "覆盖前提示"
 
-#: g10/gpg.c:655
+#: g10/gpg.c:661
 msgid "use strict OpenPGP behavior"
 msgstr "使用严格的 OpenPGP 行为"
 
-#: g10/gpg.c:682 sm/gpgsm.c:360
+#: g10/gpg.c:688 sm/gpgsm.c:362
 msgid ""
 "@\n"
 "(See the man page for a complete listing of all commands and options)\n"
@@ -2506,7 +2513,7 @@
 "@\n"
 "（请参考手册页以获得所有命令和选项的完整列表）\n"
 
-#: g10/gpg.c:685
+#: g10/gpg.c:691
 msgid ""
 "@\n"
 "Examples:\n"
@@ -2526,11 +2533,11 @@
 " --list-keys [names]        列出密钥\n"
 " --fingerprint [names]      显示指纹\n"
 
-#: g10/gpg.c:1065
+#: g10/gpg.c:1084
 msgid "Usage: @GPG@ [options] [files] (-h for help)"
 msgstr "用法： @GPG@ [options] [files] (-h 获取帮助)"
 
-#: g10/gpg.c:1068
+#: g10/gpg.c:1087
 msgid ""
 "Syntax: @GPG@ [options] [files]\n"
 "Sign, check, encrypt or decrypt\n"
@@ -2540,7 +2547,7 @@
 "签名、检查、加密或解密\n"
 "默认的操作依输入数据而定\n"
 
-#: g10/gpg.c:1079 sm/gpgsm.c:583
+#: g10/gpg.c:1098 sm/gpgsm.c:585
 msgid ""
 "\n"
 "Supported algorithms:\n"
@@ -2548,538 +2555,538 @@
 "\n"
 "支持的算法：\n"
 
-#: g10/gpg.c:1082
+#: g10/gpg.c:1101
 msgid "Pubkey: "
 msgstr "公钥： "
 
-#: g10/gpg.c:1089 g10/keyedit.c:3047
+#: g10/gpg.c:1108 g10/keyedit.c:3047
 msgid "Cipher: "
 msgstr "密文： "
 
-#: g10/gpg.c:1096
+#: g10/gpg.c:1115
 msgid "Hash: "
 msgstr "散列： "
 
-#: g10/gpg.c:1103 g10/keyedit.c:3096
+#: g10/gpg.c:1122 g10/keyedit.c:3096
 msgid "Compression: "
 msgstr "压缩： "
 
-#: g10/gpg.c:1172 sm/gpgsm.c:657
+#: g10/gpg.c:1191 sm/gpgsm.c:659
 #, c-format
 msgid "usage: %s [options] %s\n"
 msgstr "用法： %s [选项] %s\n"
 
-#: g10/gpg.c:1361 sm/gpgsm.c:746
+#: g10/gpg.c:1380 sm/gpgsm.c:748
 #, c-format
 msgid "conflicting commands\n"
 msgstr "冲突的指令\n"
 
-#: g10/gpg.c:1379
+#: g10/gpg.c:1398
 #, c-format
 msgid "no = sign found in group definition '%s'\n"
 msgstr "群组定义 ‘%s’ 中找不到 = 标志\n"
 
-#: g10/gpg.c:1577
+#: g10/gpg.c:1596
 #, c-format
 msgid "WARNING: unsafe ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1580
+#: g10/gpg.c:1599
 #, c-format
 msgid "WARNING: unsafe ownership on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1583
+#: g10/gpg.c:1602
 #, c-format
 msgid "WARNING: unsafe ownership on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的所有权不安全\n"
 
-#: g10/gpg.c:1589
+#: g10/gpg.c:1608
 #, c-format
 msgid "WARNING: unsafe permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1592
+#: g10/gpg.c:1611
 #, c-format
 msgid "WARNING: unsafe permissions on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1595
+#: g10/gpg.c:1614
 #, c-format
 msgid "WARNING: unsafe permissions on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的权限位不安全\n"
 
-#: g10/gpg.c:1601
+#: g10/gpg.c:1620
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1604
+#: g10/gpg.c:1623
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory ownership on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1607
+#: g10/gpg.c:1626
 #, c-format
 msgid "WARNING: unsafe enclosing directory ownership on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的上级目录所有权不安全\n"
 
-#: g10/gpg.c:1613
+#: g10/gpg.c:1632
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on homedir '%s'\n"
 msgstr "警告：家目录‘%s’的上级目录权限位不安全\n"
 
-#: g10/gpg.c:1616
+#: g10/gpg.c:1635
 #, c-format
 msgid ""
 "WARNING: unsafe enclosing directory permissions on configuration file '%s'\n"
 msgstr "警告：配置文件‘%s’的上级目录权限不安全\n"
 
-#: g10/gpg.c:1619
+#: g10/gpg.c:1638
 #, c-format
 msgid "WARNING: unsafe enclosing directory permissions on extension '%s'\n"
 msgstr "警告：扩展模块‘%s’的上级目录权限位不安全\n"
 
-#: g10/gpg.c:1835
+#: g10/gpg.c:1854
 #, c-format
 msgid "unknown configuration item '%s'\n"
 msgstr "未知的配置项‘%s’\n"
 
-#: g10/gpg.c:1950
+#: g10/gpg.c:1971
 msgid "display photo IDs during key listings"
 msgstr "列出密钥时显示照片标识"
 
-#: g10/gpg.c:1952
+#: g10/gpg.c:1973
 msgid "show key usage information during key listings"
 msgstr "列出密钥时显示用途信息"
 
-#: g10/gpg.c:1954
+#: g10/gpg.c:1975
 msgid "show policy URLs during signature listings"
 msgstr "列出签名时显示策略 URL"
 
-#: g10/gpg.c:1956
+#: g10/gpg.c:1977
 msgid "show all notations during signature listings"
 msgstr "列出签名时显示所有注记"
 
-#: g10/gpg.c:1958
+#: g10/gpg.c:1979
 msgid "show IETF standard notations during signature listings"
 msgstr "列出签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:1962
+#: g10/gpg.c:1983
 msgid "show user-supplied notations during signature listings"
 msgstr "列出签名时显示用户提供的注记"
 
-#: g10/gpg.c:1964
+#: g10/gpg.c:1985
 msgid "show preferred keyserver URLs during signature listings"
 msgstr "列出签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:1966
+#: g10/gpg.c:1987
 msgid "show user ID validity during key listings"
 msgstr "列出密钥时显示用户标识的有效性"
 
-#: g10/gpg.c:1968
+#: g10/gpg.c:1989
 msgid "show revoked and expired user IDs in key listings"
 msgstr "列出密钥时显示已吊销或已过期的用户标识"
 
-#: g10/gpg.c:1970
+#: g10/gpg.c:1991
 msgid "show revoked and expired subkeys in key listings"
 msgstr "列出密钥时显示已吊销或已过期的子密钥"
 
-#: g10/gpg.c:1972
+#: g10/gpg.c:1993
 msgid "show the keyring name in key listings"
 msgstr "列出密钥时显示钥匙环的名称"
 
-#: g10/gpg.c:1974
+#: g10/gpg.c:1995
 msgid "show expiration dates during signature listings"
 msgstr "列出签名时显示过期日期"
 
-#: g10/gpg.c:2089
+#: g10/gpg.c:2110
 #, c-format
 msgid "unknown TOFU policy '%s'\n"
 msgstr "未知的 TOFU 政策‘%s’\n"
 
-#: g10/gpg.c:2091
+#: g10/gpg.c:2112
 #, c-format
 msgid "(use \"help\" to list choices)\n"
 msgstr "（使用“help”来列出选择）\n"
 
-#: g10/gpg.c:2241
+#: g10/gpg.c:2262
 #, c-format
 msgid "Note: old default options file '%s' ignored\n"
 msgstr "注意：旧的默认配置文件‘%s’已被忽略\n"
 
-#: g10/gpg.c:2872 g10/gpg.c:3695 g10/gpg.c:3707
+#: g10/gpg.c:2893 g10/gpg.c:3729 g10/gpg.c:3741
 #, c-format
 msgid "Note: %s is not for normal use!\n"
 msgstr "注意：%s 不适用于一般使用！\n"
 
-#: g10/gpg.c:3047 g10/gpg.c:3059
+#: g10/gpg.c:3070 g10/gpg.c:3082
 #, c-format
 msgid "'%s' is not a valid signature expiration\n"
 msgstr "‘%s’不是一个有效的签名过期日期\n"
 
-#: g10/gpg.c:3081
+#: g10/gpg.c:3104
 #, c-format
 msgid "\"%s\" is not a proper mail address\n"
 msgstr "“%s” 不是一个合适的邮件地址\n"
 
-#: g10/gpg.c:3113 sm/gpgsm.c:1162
+#: g10/gpg.c:3136 sm/gpgsm.c:1164
 #, c-format
 msgid "invalid pinentry mode '%s'\n"
 msgstr "无效的 pinentry 模式‘%s’\n"
 
-#: g10/gpg.c:3173
+#: g10/gpg.c:3196
 #, c-format
 msgid "'%s' is not a valid character set\n"
 msgstr "‘%s’不是一个有效的字符集\n"
 
-#: g10/gpg.c:3195 g10/gpg.c:3402 g10/keyedit.c:5021
+#: g10/gpg.c:3218 g10/gpg.c:3428 g10/keyedit.c:5021
 #, c-format
 msgid "could not parse keyserver URL\n"
 msgstr "无法解析公钥服务器 URL\n"
 
-#: g10/gpg.c:3213
+#: g10/gpg.c:3236
 #, c-format
 msgid "%s:%d: invalid keyserver options\n"
 msgstr "%s：%d：无效的公钥服务器选项\n"
 
-#: g10/gpg.c:3216
+#: g10/gpg.c:3239
 #, c-format
 msgid "invalid keyserver options\n"
 msgstr "无效的公钥服务器选项\n"
 
-#: g10/gpg.c:3223
+#: g10/gpg.c:3246
 #, c-format
 msgid "%s:%d: invalid import options\n"
 msgstr "%s：%d：无效的导入选项\n"
 
-#: g10/gpg.c:3226
+#: g10/gpg.c:3249
 #, c-format
 msgid "invalid import options\n"
 msgstr "无效的导入选项\n"
 
-#: g10/gpg.c:3232 g10/gpg.c:3247
+#: g10/gpg.c:3255 g10/gpg.c:3270
 #, c-format
 msgid "invalid filter option: %s\n"
 msgstr "无效的过滤选项：%s\n"
 
-#: g10/gpg.c:3238
+#: g10/gpg.c:3261
 #, c-format
 msgid "%s:%d: invalid export options\n"
 msgstr "%s：%d：无效的导出选项\n"
 
-#: g10/gpg.c:3241
+#: g10/gpg.c:3264
 #, c-format
 msgid "invalid export options\n"
 msgstr "无效的导出选项\n"
 
-#: g10/gpg.c:3253
+#: g10/gpg.c:3276
 #, c-format
 msgid "%s:%d: invalid list options\n"
 msgstr "%s：%d：无效的列表选项\n"
 
-#: g10/gpg.c:3256
+#: g10/gpg.c:3279
 #, c-format
 msgid "invalid list options\n"
 msgstr "无效的列表选项\n"
 
-#: g10/gpg.c:3264
+#: g10/gpg.c:3287
 msgid "display photo IDs during signature verification"
 msgstr "验证签名时显示照片标识"
 
-#: g10/gpg.c:3266
+#: g10/gpg.c:3289
 msgid "show policy URLs during signature verification"
 msgstr "验证签名时显示策略 URL"
 
-#: g10/gpg.c:3268
+#: g10/gpg.c:3291
 msgid "show all notations during signature verification"
 msgstr "验证签名时显示所有注记"
 
-#: g10/gpg.c:3270
+#: g10/gpg.c:3293
 msgid "show IETF standard notations during signature verification"
 msgstr "验证签名时显示 IETF 标准注记"
 
-#: g10/gpg.c:3274
+#: g10/gpg.c:3297
 msgid "show user-supplied notations during signature verification"
 msgstr "验证签名时显示用户提供的注记"
 
-#: g10/gpg.c:3276
+#: g10/gpg.c:3299
 msgid "show preferred keyserver URLs during signature verification"
 msgstr "验证签名时显示首选公钥服务器 URL"
 
-#: g10/gpg.c:3278
+#: g10/gpg.c:3301
 msgid "show user ID validity during signature verification"
 msgstr "验证签名时显示用户标识的有效性"
 
-#: g10/gpg.c:3280
+#: g10/gpg.c:3303
 msgid "show revoked and expired user IDs in signature verification"
 msgstr "验证密钥时显示已吊销或已过期的子钥"
 
-#: g10/gpg.c:3282
+#: g10/gpg.c:3305
 msgid "show only the primary user ID in signature verification"
 msgstr "在签名验证中只显示主要用户标识"
 
-#: g10/gpg.c:3284
+#: g10/gpg.c:3307
 msgid "validate signatures with PKA data"
 msgstr "使用 PKA 数据验证签名"
 
-#: g10/gpg.c:3286
+#: g10/gpg.c:3309
 msgid "elevate the trust of signatures with valid PKA data"
 msgstr "提升带有有效 PKA 数据的签名的信任度"
 
-#: g10/gpg.c:3293
+#: g10/gpg.c:3316
 #, c-format
 msgid "%s:%d: invalid verify options\n"
 msgstr "%s:%d: 无效的验证选项\n"
 
-#: g10/gpg.c:3296
+#: g10/gpg.c:3319
 #, c-format
 msgid "invalid verify options\n"
 msgstr "无效的验证选项\n"
 
-#: g10/gpg.c:3303
+#: g10/gpg.c:3326
 #, c-format
 msgid "unable to set exec-path to %s\n"
 msgstr "无法设置运行路径为 %s\n"
 
-#: g10/gpg.c:3505
+#: g10/gpg.c:3531
 #, c-format
 msgid "%s:%d: invalid auto-key-locate list\n"
 msgstr "%s%d: 无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3508
+#: g10/gpg.c:3534
 #, c-format
 msgid "invalid auto-key-locate list\n"
 msgstr "无效的 auto-key-locate 列表\n"
 
-#: g10/gpg.c:3677 sm/gpgsm.c:1532
+#: g10/gpg.c:3711 sm/gpgsm.c:1534
 #, c-format
 msgid "WARNING: program may create a core file!\n"
 msgstr "警告：程序可能会创建核心内存转储文件！\n"
 
-#: g10/gpg.c:3688
+#: g10/gpg.c:3722
 #, c-format
 msgid "WARNING: %s overrides %s\n"
 msgstr "警告：%s 覆盖了 %s\n"
 
-#: g10/gpg.c:3697
+#: g10/gpg.c:3731
 #, c-format
 msgid "%s not allowed with %s!\n"
 msgstr "%s 不允许与 %s 并用\n"
 
-#: g10/gpg.c:3700
+#: g10/gpg.c:3734
 #, c-format
 msgid "%s makes no sense with %s!\n"
 msgstr "%s 与 %s 并用时不起作用\n"
 
-#: g10/gpg.c:3715 sm/gpgsm.c:1549 dirmngr/dirmngr.c:1087
+#: g10/gpg.c:3749 sm/gpgsm.c:1551 dirmngr/dirmngr.c:1088
 #, c-format
 msgid "WARNING: running with faked system time: "
 msgstr "警告：正在以虚假的系统时间运行： "
 
-#: g10/gpg.c:3736
+#: g10/gpg.c:3770
 #, c-format
 msgid "will not run with insecure memory due to %s\n"
 msgstr "不会在内存不安全的情况下运行，原因是 %s\n"
 
-#: g10/gpg.c:3771 g10/gpg.c:3795 sm/gpgsm.c:1616
+#: g10/gpg.c:3805 g10/gpg.c:3829 sm/gpgsm.c:1618
 #, c-format
 msgid "selected cipher algorithm is invalid\n"
 msgstr "所选的密文算法无效\n"
 
-#: g10/gpg.c:3783
+#: g10/gpg.c:3817
 #, c-format
 msgid "selected compression algorithm is invalid\n"
 msgstr "所选的压缩算法无效\n"
 
-#: g10/gpg.c:3789
+#: g10/gpg.c:3823
 #, c-format
 msgid "selected certification digest algorithm is invalid\n"
 msgstr "所选的证书散列算法无效\n"
 
-#: g10/gpg.c:3804
+#: g10/gpg.c:3838
 #, c-format
 msgid "completes-needed must be greater than 0\n"
 msgstr "需要的完全可信签名数一定要大于 0\n"
 
-#: g10/gpg.c:3806
+#: g10/gpg.c:3840
 #, c-format
 msgid "marginals-needed must be greater than 1\n"
 msgstr "需要的勉强可信签名数一定要大于 1\n"
 
-#: g10/gpg.c:3808
+#: g10/gpg.c:3842
 #, c-format
 msgid "max-cert-depth must be in the range from 1 to 255\n"
 msgstr "最大证书链深度（max-cert-depth）一定要介于 1 和 255 之间\n"
 
-#: g10/gpg.c:3810
+#: g10/gpg.c:3844
 #, c-format
 msgid "invalid default-cert-level; must be 0, 1, 2, or 3\n"
 msgstr "无效的默认认证级别（default-cert-level）；必须为 0，1，2 或 3\n"
 
-#: g10/gpg.c:3812
+#: g10/gpg.c:3846
 #, c-format
 msgid "invalid min-cert-level; must be 1, 2, or 3\n"
 msgstr "无效的最小认证级别（default-cert-level）；必须为 1，2 或 3\n"
 
-#: g10/gpg.c:3815
+#: g10/gpg.c:3849
 #, c-format
 msgid "Note: simple S2K mode (0) is strongly discouraged\n"
 msgstr "注意：强烈不建议使用简单的 S2K 模式 (0)\n"
 
-#: g10/gpg.c:3819
+#: g10/gpg.c:3853
 #, c-format
 msgid "invalid S2K mode; must be 0, 1 or 3\n"
 msgstr "无效的 S2K 模式；必须是 0，1 或 3\n"
 
-#: g10/gpg.c:3826
+#: g10/gpg.c:3860
 #, c-format
 msgid "invalid default preferences\n"
 msgstr "无效的默认偏好设置\n"
 
-#: g10/gpg.c:3830
+#: g10/gpg.c:3864
 #, c-format
 msgid "invalid personal cipher preferences\n"
 msgstr "无效的个人密文偏好设置\n"
 
-#: g10/gpg.c:3834
+#: g10/gpg.c:3868
 #, c-format
 msgid "invalid personal digest preferences\n"
 msgstr "无效的个人摘要算法偏好设置\n"
 
-#: g10/gpg.c:3838
+#: g10/gpg.c:3872
 #, c-format
 msgid "invalid personal compress preferences\n"
 msgstr "无效的个人压缩算法首选项\n"
 
-#: g10/gpg.c:3874
+#: g10/gpg.c:3908
 #, c-format
 msgid "%s does not yet work with %s\n"
 msgstr "%s 尚不能和 %s 并用\n"
 
-#: g10/gpg.c:3931 g10/gpg.c:3977 g10/sig-check.c:141 g10/sign.c:284
-#: sm/gpgsm.c:1656 sm/gpgsm.c:1666 sm/sign.c:478 sm/verify.c:473
+#: g10/gpg.c:3965 g10/gpg.c:4011 g10/sig-check.c:146 g10/sign.c:391
+#: sm/gpgsm.c:1658 sm/gpgsm.c:1668 sm/sign.c:478 sm/verify.c:473
 #, c-format
 msgid "digest algorithm '%s' may not be used in %s mode\n"
 msgstr "摘要算法‘%s’不能在 %s 模式下使用\n"
 
-#: g10/gpg.c:3937
+#: g10/gpg.c:3971
 #, c-format
 msgid "compression algorithm '%s' may not be used in %s mode\n"
 msgstr "压缩算法‘%s’不能在 %s 模式下使用\n"
 
-#: g10/gpg.c:4080
+#: g10/gpg.c:4114
 #, c-format
 msgid "failed to initialize the TrustDB: %s\n"
 msgstr "初始化信任度数据库失败：%s\n"
 
-#: g10/gpg.c:4092
+#: g10/gpg.c:4126
 #, c-format
 msgid "WARNING: recipients (-r) given without using public key encryption\n"
 msgstr "警告：给定了接收者（-r）但并未使用公钥加密\n"
 
-#: g10/gpg.c:4164
+#: g10/gpg.c:4198
 #, c-format
 msgid "symmetric encryption of '%s' failed: %s\n"
 msgstr "对称加密‘%s’失败：%s\n"
 
-#: g10/gpg.c:4193
+#: g10/gpg.c:4227
 #, c-format
 msgid "you cannot use --symmetric --encrypt with --s2k-mode 0\n"
 msgstr "您不能在使用 --symmetric --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4196
+#: g10/gpg.c:4230
 #, c-format
 msgid "you cannot use --symmetric --encrypt in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric -encrypt\n"
 
-#: g10/gpg.c:4254
+#: g10/gpg.c:4288
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt with --s2k-mode 0\n"
 msgstr "您不能在使用 --symmetric --sign --encrypt 时使用 --s2k-mode 0\n"
 
-#: g10/gpg.c:4257
+#: g10/gpg.c:4291
 #, c-format
 msgid "you cannot use --symmetric --sign --encrypt in %s mode\n"
 msgstr "您不能在 %s 模式下使用 --symmetric --sign -encrypt\n"
 
-#: g10/gpg.c:4616 g10/keyserver.c:1846
+#: g10/gpg.c:4660 g10/keyserver.c:1847
 #, c-format
 msgid "keyserver send failed: %s\n"
 msgstr "发送至公钥服务器失败：%s\n"
 
-#: g10/gpg.c:4621
+#: g10/gpg.c:4665
 #, c-format
 msgid "keyserver receive failed: %s\n"
 msgstr "从公钥服务器接收失败：%s\n"
 
-#: g10/gpg.c:4627
+#: g10/gpg.c:4671
 #, c-format
 msgid "key export failed: %s\n"
 msgstr "导出密钥失败：%s\n"
 
-#: g10/gpg.c:4640
+#: g10/gpg.c:4684
 #, c-format
 msgid "export as ssh key failed: %s\n"
 msgstr "作为 ssh 密钥导出失败：%s\n"
 
-#: g10/gpg.c:4652
+#: g10/gpg.c:4696
 #, c-format
 msgid "keyserver search failed: %s\n"
 msgstr "公钥服务器搜索失败：%s\n"
 
-#: g10/gpg.c:4665
+#: g10/gpg.c:4709
 #, c-format
 msgid "keyserver refresh failed: %s\n"
 msgstr "公钥服务器刷新失败：%s\n"
 
-#: g10/gpg.c:4732
+#: g10/gpg.c:4776
 #, c-format
 msgid "dearmoring failed: %s\n"
 msgstr "解开字符封装时失败：%s\n"
 
-#: g10/gpg.c:4743
+#: g10/gpg.c:4787
 #, c-format
 msgid "enarmoring failed: %s\n"
 msgstr "进行字符封装时失败：%s\n"
 
-#: g10/gpg.c:4835
+#: g10/gpg.c:4879
 #, c-format
 msgid "invalid hash algorithm '%s'\n"
 msgstr "无效的散列算法‘%s’\n"
 
-#: g10/gpg.c:4987 g10/tofu.c:2153
+#: g10/gpg.c:5031 g10/tofu.c:2153
 #, c-format
 msgid "error parsing key specification '%s': %s\n"
 msgstr "解析密钥指定‘%s’时出现错误：%s\n"
 
-#: g10/gpg.c:5000
+#: g10/gpg.c:5044
 #, c-format
 msgid "'%s' does not appear to be a valid key ID, fingerprint or keygrip\n"
 msgstr "‘%s’不像是一个有效的密钥标识、指纹或者 keygrip\n"
 
-#: g10/gpg.c:5056
+#: g10/gpg.c:5100
 #, c-format
 msgid "WARNING: no command supplied.  Trying to guess what you mean ...\n"
 msgstr "警告：没有提供命令。正在尝试猜测您的意图...\n"
 
-#: g10/gpg.c:5067
+#: g10/gpg.c:5111
 #, c-format
 msgid "Go ahead and type your message ...\n"
 msgstr "请开始输入您的消息…\n"
 
-#: g10/gpg.c:5412
+#: g10/gpg.c:5456
 #, c-format
 msgid "the given certification policy URL is invalid\n"
 msgstr "给定的的证书策略 URL 无效\n"
 
-#: g10/gpg.c:5414
+#: g10/gpg.c:5458
 #, c-format
 msgid "the given signature policy URL is invalid\n"
 msgstr "给定的签名策略 URL 无效\n"
 
-#: g10/gpg.c:5447
+#: g10/gpg.c:5491
 #, c-format
 msgid "the given preferred keyserver URL is invalid\n"
 msgstr "给定的首选公钥服务器 URL 无效\n"
@@ -3092,7 +3099,7 @@
 msgid "make timestamp conflicts only a warning"
 msgstr "把时间戳冲突仅视为警告"
 
-#: g10/gpgv.c:84 sm/gpgsm.c:350 tools/gpgconf.c:106
+#: g10/gpgv.c:84 sm/gpgsm.c:352 tools/gpgconf.c:107
 msgid "|FD|write status info to this FD"
 msgstr "|FD|把状态信息写入文件描述符 FD"
 
@@ -3165,97 +3172,97 @@
 msgid "repair keys on import"
 msgstr "在导入期间修复密钥"
 
-#: g10/import.c:368 g10/import.c:653
+#: g10/import.c:380 g10/import.c:699
 #, c-format
 msgid "skipping block of type %d\n"
 msgstr "跳过 %d 类型的块\n"
 
-#: g10/import.c:670
+#: g10/import.c:716
 #, c-format
 msgid "%lu keys processed so far\n"
 msgstr "目前已处理 %lu 个密钥\n"
 
-#: g10/import.c:756
+#: g10/import.c:802
 #, c-format
 msgid "Total number processed: %lu\n"
 msgstr "处理的总数：%lu\n"
 
-#: g10/import.c:759
+#: g10/import.c:805
 #, c-format
 msgid "    skipped PGP-2 keys: %lu\n"
 msgstr "    已跳过的 PGP-2 密钥：%lu\n"
 
-#: g10/import.c:761
+#: g10/import.c:807
 #, c-format
 msgid "      skipped new keys: %lu\n"
 msgstr "      已跳过的新密钥：%lu\n"
 
-#: g10/import.c:764
+#: g10/import.c:810
 #, c-format
 msgid "          w/o user IDs: %lu\n"
 msgstr "          缺少用户标识：%lu\n"
 
-#: g10/import.c:767 sm/import.c:130
+#: g10/import.c:813 sm/import.c:130
 #, c-format
 msgid "              imported: %lu"
 msgstr "              已导入：%lu"
 
-#: g10/import.c:771 sm/import.c:134
+#: g10/import.c:817 sm/import.c:134
 #, c-format
 msgid "             unchanged: %lu\n"
 msgstr "             未改变：%lu\n"
 
-#: g10/import.c:773
+#: g10/import.c:819
 #, c-format
 msgid "          new user IDs: %lu\n"
 msgstr "          新用户标识：%lu\n"
 
-#: g10/import.c:775
+#: g10/import.c:821
 #, c-format
 msgid "           new subkeys: %lu\n"
 msgstr "           新的子密钥：%lu\n"
 
-#: g10/import.c:777
+#: g10/import.c:823
 #, c-format
 msgid "        new signatures: %lu\n"
 msgstr "        新的签名：%lu\n"
 
-#: g10/import.c:779
+#: g10/import.c:825
 #, c-format
 msgid "   new key revocations: %lu\n"
 msgstr "   新的密钥吊销：%lu\n"
 
-#: g10/import.c:781 sm/import.c:136
+#: g10/import.c:827 sm/import.c:136
 #, c-format
 msgid "      secret keys read: %lu\n"
 msgstr "      读取的私钥：%lu\n"
 
-#: g10/import.c:783 sm/import.c:138
+#: g10/import.c:829 sm/import.c:138
 #, c-format
 msgid "  secret keys imported: %lu\n"
 msgstr "  导入的私钥：%lu\n"
 
-#: g10/import.c:785 sm/import.c:140
+#: g10/import.c:831 sm/import.c:140
 #, c-format
 msgid " secret keys unchanged: %lu\n"
 msgstr " 未改变的私钥：%lu\n"
 
-#: g10/import.c:787 sm/import.c:142
+#: g10/import.c:833 sm/import.c:142
 #, c-format
 msgid "          not imported: %lu\n"
 msgstr "          未被导入：%lu\n"
 
-#: g10/import.c:789
+#: g10/import.c:835
 #, c-format
 msgid "    signatures cleaned: %lu\n"
 msgstr "    清理的签名：%lu\n"
 
-#: g10/import.c:791
+#: g10/import.c:837
 #, c-format
 msgid "      user IDs cleaned: %lu\n"
 msgstr "      清理的用户标识：%lu\n"
 
-#: g10/import.c:1214
+#: g10/import.c:1264
 #, c-format
 msgid ""
 "WARNING: key %s contains preferences for unavailable\n"
@@ -3264,183 +3271,183 @@
 "警告：密钥 %s 包含了不可用算法的偏好设置\n"
 "于下列用户标识上：\n"
 
-#: g10/import.c:1256
+#: g10/import.c:1306
 #, c-format
 msgid "         \"%s\": preference for cipher algorithm %s\n"
 msgstr "         “%s”：密文算法 %s 的首选项\n"
 
-#: g10/import.c:1271
+#: g10/import.c:1321
 #, c-format
 msgid "         \"%s\": preference for digest algorithm %s\n"
 msgstr "         “%s”：散列算法 %s 对应首选项\n"
 
-#: g10/import.c:1283
+#: g10/import.c:1333
 #, c-format
 msgid "         \"%s\": preference for compression algorithm %s\n"
 msgstr "         “%s”：压缩算法 %s 对应首选项\n"
 
-#: g10/import.c:1296
+#: g10/import.c:1346
 #, c-format
 msgid "it is strongly suggested that you update your preferences and\n"
 msgstr "强烈建议您更新您的偏好设置并重新分发这个密钥\n"
 
-#: g10/import.c:1298
+#: g10/import.c:1348
 #, c-format
 msgid ""
 "re-distribute this key to avoid potential algorithm mismatch problems\n"
 msgstr "以避免可能的算法不匹配问题\n"
 
-#: g10/import.c:1323
+#: g10/import.c:1373
 #, c-format
 msgid ""
 "you can update your preferences with: gpg --edit-key %s updpref save\n"
 msgstr "您可以这样更新您的偏好设置：gpg --edit-key %s updpref save\n"
 
-#: g10/import.c:1832 g10/import.c:2938
+#: g10/import.c:1887 g10/import.c:3000
 #, c-format
 msgid "key %s: no user ID\n"
 msgstr "密钥 %s：没有用户标识\n"
 
-#: g10/import.c:1838
+#: g10/import.c:1893
 #, c-format
 msgid "key %s: %s\n"
 msgstr "密钥 %s： %s\n"
 
-#: g10/import.c:1839 g10/import.c:2910
+#: g10/import.c:1894 g10/import.c:2972
 msgid "rejected by import screener"
 msgstr "被导入筛查器拒绝"
 
-#: g10/import.c:1883
+#: g10/import.c:1938
 #, c-format
 msgid "key %s: PKS subkey corruption repaired\n"
 msgstr "密钥%s：PKS 子密钥破损已修复\n"
 
-#: g10/import.c:1904
+#: g10/import.c:1959
 #, c-format
 msgid "key %s: accepted non self-signed user ID \"%s\"\n"
 msgstr "密钥 %s：已接受不含自签名的用户标识 “%s”\n"
 
-#: g10/import.c:1914 g10/import.c:1945
+#: g10/import.c:1969 g10/import.c:2000
 #, c-format
 msgid "key %s: no valid user IDs\n"
 msgstr "密钥 %s：没有有效的用户标识\n"
 
-#: g10/import.c:1916
+#: g10/import.c:1971
 #, c-format
 msgid "this may be caused by a missing self-signature\n"
 msgstr "这可能由于遗失自签名所致\n"
 
-#: g10/import.c:1995 g10/import.c:3324
+#: g10/import.c:2050 g10/import.c:3386
 #, c-format
 msgid "key %s: public key not found: %s\n"
 msgstr "密钥 %s：找不到公钥：%s\n"
 
-#: g10/import.c:2001
+#: g10/import.c:2056
 #, c-format
 msgid "key %s: new key - skipped\n"
 msgstr "密钥 %s：新密钥 - 已跳过\n"
 
-#: g10/import.c:2013
+#: g10/import.c:2068
 #, c-format
 msgid "no writable keyring found: %s\n"
 msgstr "找不到可写的钥匙环：%s\n"
 
-#: g10/import.c:2045 g10/import.c:2144 g10/import.c:3401
+#: g10/import.c:2100 g10/import.c:2202 g10/import.c:3463
 #, c-format
 msgid "error writing keyring '%s': %s\n"
 msgstr "写入钥匙环 ‘%s’ 时出现错误： %s\n"
 
-#: g10/import.c:2068
+#: g10/import.c:2123
 #, c-format
 msgid "key %s: public key \"%s\" imported\n"
 msgstr "密钥 %s：公钥 “%s” 已导入\n"
 
-#: g10/import.c:2095
+#: g10/import.c:2150
 #, c-format
 msgid "key %s: doesn't match our copy\n"
 msgstr "密钥 %s：与我们的副本不符合\n"
 
-#: g10/import.c:2160
+#: g10/import.c:2218
 #, c-format
 msgid "key %s: \"%s\" 1 new user ID\n"
 msgstr "密钥 %s：“%s” 1 个新的用户标识\n"
 
-#: g10/import.c:2163
+#: g10/import.c:2221
 #, c-format
 msgid "key %s: \"%s\" %d new user IDs\n"
 msgstr "密钥 %s：“%s” %d 个新的用户标识\n"
 
-#: g10/import.c:2166
+#: g10/import.c:2224
 #, c-format
 msgid "key %s: \"%s\" 1 new signature\n"
 msgstr "密钥 %s：“%s” 1 个新的签名\n"
 
-#: g10/import.c:2169
+#: g10/import.c:2227
 #, c-format
 msgid "key %s: \"%s\" %d new signatures\n"
 msgstr "密钥 %s：“%s” %d 个新的签名\n"
 
-#: g10/import.c:2172
+#: g10/import.c:2230
 #, c-format
 msgid "key %s: \"%s\" 1 new subkey\n"
 msgstr "密钥 %s：“%s” 1 个新的子密钥\n"
 
-#: g10/import.c:2175
+#: g10/import.c:2233
 #, c-format
 msgid "key %s: \"%s\" %d new subkeys\n"
 msgstr "密钥 %s：“%s” %d 个新的子密钥\n"
 
-#: g10/import.c:2178
+#: g10/import.c:2236
 #, c-format
 msgid "key %s: \"%s\" %d signature cleaned\n"
 msgstr "密钥 %s：“%s” %d 个签名被清理\n"
 
-#: g10/import.c:2181
+#: g10/import.c:2239
 #, c-format
 msgid "key %s: \"%s\" %d signatures cleaned\n"
 msgstr "密钥 %s：“%s” %d 个签名被清理\n"
 
-#: g10/import.c:2184
+#: g10/import.c:2242
 #, c-format
 msgid "key %s: \"%s\" %d user ID cleaned\n"
 msgstr "密钥 %s：“%s” %d 个用户标识被清理\n"
 
-#: g10/import.c:2187
+#: g10/import.c:2245
 #, c-format
 msgid "key %s: \"%s\" %d user IDs cleaned\n"
 msgstr "密钥 %s：“%s” %d 个用户标识被清理\n"
 
-#: g10/import.c:2223
+#: g10/import.c:2281
 #, c-format
 msgid "key %s: \"%s\" not changed\n"
 msgstr "密钥 %s：“%s” 未改变\n"
 
-#: g10/import.c:2581 g10/import.c:2772
+#: g10/import.c:2639 g10/import.c:2834
 #, c-format
 msgid "key %s: secret key imported\n"
 msgstr "密钥 %s：私钥已导入\n"
 
-#: g10/import.c:2589
+#: g10/import.c:2647
 #, c-format
 msgid "key %s: secret key already exists\n"
 msgstr "密钥 %s：私钥已存在\n"
 
-#: g10/import.c:2597
+#: g10/import.c:2655
 #, c-format
 msgid "key %s: error sending to agent: %s\n"
 msgstr "密钥 %s：发送至代理人程序时出现错误：%s\n"
 
-#: g10/import.c:2909
+#: g10/import.c:2971
 #, c-format
 msgid "secret key %s: %s\n"
 msgstr "私钥 %s：%s\n"
 
-#: g10/import.c:2930 g10/import.c:2969
+#: g10/import.c:2992 g10/import.c:3031
 #, c-format
 msgid "importing secret keys not allowed\n"
 msgstr "私钥导入被禁止\n"
 
-#: g10/import.c:2957
+#: g10/import.c:3019
 #, c-format
 msgid "key %s: secret key with invalid cipher %d - skipped\n"
 msgstr "密钥 %s：私钥使用了无效的密文算法 %d - 已跳过\n"
@@ -3453,147 +3460,147 @@
 #. * Instead, user should be suggested to run 'gpg --card-status',
 #. * then, references to a card will be automatically created
 #. * again.
-#: g10/import.c:2762
+#: g10/import.c:2824
 #, c-format
 msgid "To migrate '%s', with each smartcard, run: %s\n"
 msgstr "要迁移 ‘%s’，对每一张智能卡，执行：%s\n"
 
-#: g10/import.c:3317
+#: g10/import.c:3379
 #, c-format
 msgid "key %s: no public key - can't apply revocation certificate\n"
 msgstr "密钥 %s：没有公钥 - 无法应用吊销证书\n"
 
-#: g10/import.c:3348
+#: g10/import.c:3410
 #, c-format
 msgid "key %s: can't locate original keyblock: %s\n"
 msgstr "密钥 %s：无法定位原始的密钥区块：%s\n"
 
-#: g10/import.c:3355
+#: g10/import.c:3417
 #, c-format
 msgid "key %s: can't read original keyblock: %s\n"
 msgstr "密钥 %s：无法读取原始的密钥区块：%s\n"
 
-#: g10/import.c:3375
+#: g10/import.c:3437
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - rejected\n"
 msgstr "密钥 %s：无效的吊销证书：%s - 已拒绝\n"
 
-#: g10/import.c:3410
+#: g10/import.c:3472
 #, c-format
 msgid "key %s: \"%s\" revocation certificate imported\n"
 msgstr "密钥 %s：“%s” 吊销证书已被导入\n"
 
-#: g10/import.c:3496
+#: g10/import.c:3558
 #, c-format
 msgid "key %s: no user ID for signature\n"
 msgstr "密钥 %s：签名没有用户标识\n"
 
-#: g10/import.c:3513
+#: g10/import.c:3575
 #, c-format
 msgid "key %s: unsupported public key algorithm on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s” 使用了不支持的公钥算法\n"
 
-#: g10/import.c:3515
+#: g10/import.c:3577
 #, c-format
 msgid "key %s: invalid self-signature on user ID \"%s\"\n"
 msgstr "密钥 %s：用户标识 “%s” 自身签名无效\n"
 
-#: g10/import.c:3532 g10/import.c:3560 g10/import.c:3616
+#: g10/import.c:3594 g10/import.c:3622 g10/import.c:3678
 #, c-format
 msgid "key %s: unsupported public key algorithm\n"
 msgstr "密钥 %s：不支持的公钥算法\n"
 
-#: g10/import.c:3533
+#: g10/import.c:3595
 #, c-format
 msgid "key %s: invalid direct key signature\n"
 msgstr "密钥 %s：无效的直接密钥签名\n"
 
-#: g10/import.c:3547
+#: g10/import.c:3609
 #, c-format
 msgid "key %s: no subkey for key binding\n"
 msgstr "密钥 %s：没有可供绑定的子密钥\n"
 
-#: g10/import.c:3562
+#: g10/import.c:3624
 #, c-format
 msgid "key %s: invalid subkey binding\n"
 msgstr "密钥 %s：无效的子密钥绑定\n"
 
-#: g10/import.c:3581
+#: g10/import.c:3643
 #, c-format
 msgid "key %s: removed multiple subkey binding\n"
 msgstr "密钥 %s：已删除多重子密钥绑定\n"
 
-#: g10/import.c:3605
+#: g10/import.c:3667
 #, c-format
 msgid "key %s: no subkey for key revocation\n"
 msgstr "密钥 %s：没有用于密钥吊销用的子密钥\n"
 
-#: g10/import.c:3618
+#: g10/import.c:3680
 #, c-format
 msgid "key %s: invalid subkey revocation\n"
 msgstr "密钥 %s：无效的子密钥吊销\n"
 
-#: g10/import.c:3633
+#: g10/import.c:3695
 #, c-format
 msgid "key %s: removed multiple subkey revocation\n"
 msgstr "密钥 %s：已删除多重子密钥吊销\n"
 
-#: g10/import.c:3677
+#: g10/import.c:3739
 #, c-format
 msgid "key %s: skipped user ID \"%s\"\n"
 msgstr "密钥 %s：已跳过用户标识 “%s”\n"
 
-#: g10/import.c:3704
+#: g10/import.c:3766
 #, c-format
 msgid "key %s: skipped subkey\n"
 msgstr "密钥 %s：已跳过子密钥\n"
 
-#: g10/import.c:3735
+#: g10/import.c:3797
 #, c-format
 msgid "key %s: non exportable signature (class 0x%02X) - skipped\n"
 msgstr "密钥 %s：非可导出签名（验证级别 0x%02X）- 已跳过\n"
 
-#: g10/import.c:3746
+#: g10/import.c:3808
 #, c-format
 msgid "key %s: revocation certificate at wrong place - skipped\n"
 msgstr "密钥 %s：吊销证书位置错误――已跳过\n"
 
-#: g10/import.c:3764
+#: g10/import.c:3826
 #, c-format
 msgid "key %s: invalid revocation certificate: %s - skipped\n"
 msgstr "密钥 %s：无效的吊销证书：%s――已跳过\n"
 
-#: g10/import.c:3778
+#: g10/import.c:3840
 #, c-format
 msgid "key %s: subkey signature in wrong place - skipped\n"
 msgstr "密钥 %s：子钥签名位置错误 - 已跳过\n"
 
-#: g10/import.c:3786
+#: g10/import.c:3848
 #, c-format
 msgid "key %s: unexpected signature class (0x%02X) - skipped\n"
 msgstr "密钥 %s：与预期不符的签名级别（0x%02X） - 已跳过\n"
 
-#: g10/import.c:3959
+#: g10/import.c:4021
 #, c-format
 msgid "key %s: duplicated user ID detected - merged\n"
 msgstr "密钥 %s：检测到重复的用户标识 - 已合并\n"
 
-#: g10/import.c:4024
+#: g10/import.c:4086
 #, c-format
 msgid "WARNING: key %s may be revoked: fetching revocation key %s\n"
 msgstr "警告：密钥 %s 可能已被吊销：正在取回吊销用密钥 %s\n"
 
-#: g10/import.c:4040
+#: g10/import.c:4102
 #, c-format
 msgid "WARNING: key %s may be revoked: revocation key %s not present.\n"
 msgstr "警告：密钥 %s 可能已被吊销：吊销用密钥 %s 不存在。\n"
 
-#: g10/import.c:4106
+#: g10/import.c:4168
 #, c-format
 msgid "key %s: \"%s\" revocation certificate added\n"
 msgstr "密钥 %s：已添加吊销证书 “%s”\n"
 
-#: g10/import.c:4144
+#: g10/import.c:4206
 #, c-format
 msgid "key %s: direct key signature added\n"
 msgstr "密钥 %s：已添加直接密钥签名\n"
@@ -3618,17 +3625,17 @@
 msgid "keyring '%s' created\n"
 msgstr "钥匙环‘%s’已创建\n"
 
-#: g10/keydb.c:848
+#: g10/keydb.c:861
 #, c-format
 msgid "keyblock resource '%s': %s\n"
 msgstr "密钥区块资源‘%s’：%s\n"
 
-#: g10/keydb.c:954
+#: g10/keydb.c:967
 #, c-format
 msgid "error opening key DB: %s\n"
 msgstr "打开密钥数据库时出现错误：%s\n"
 
-#: g10/keydb.c:1780
+#: g10/keydb.c:1793
 #, c-format
 msgid "failed to rebuild keyring cache: %s\n"
 msgstr "重新建立钥匙环缓存失败： %s\n"
@@ -3862,7 +3869,7 @@
 msgstr "真的要签名吗？(y/N) "
 
 #: g10/keyedit.c:1030 g10/keyedit.c:5894 g10/keyedit.c:5977 g10/keyedit.c:6106
-#: g10/keyedit.c:6168 g10/sign.c:357
+#: g10/keyedit.c:6168 g10/sign.c:464
 #, c-format
 msgid "signing failed: %s\n"
 msgstr "签名时失败： %s\n"
@@ -4179,7 +4186,7 @@
 msgid "Quit without saving? (y/N) "
 msgstr "要不保存而退出吗？(y/N) "
 
-#: g10/delkey.c:307 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
+#: g10/delkey.c:299 g10/keyedit.c:2200 g10/keyedit.c:2210 g10/keyedit.c:2387
 #: g10/keyedit.c:2461 g10/keyedit.c:2532 g10/keyedit.c:2757 g10/keyedit.c:2822
 #: g10/keyedit.c:2973
 #, c-format
@@ -4287,17 +4294,17 @@
 msgid "created: %s"
 msgstr "创建于：%s"
 
-#: g10/keyedit.c:3556 g10/keylist.c:2083
+#: g10/keyedit.c:3556 g10/keylist.c:2104
 #, c-format
 msgid "revoked: %s"
 msgstr "吊销于：%s"
 
-#: g10/keyedit.c:3558 g10/keylist.c:2089
+#: g10/keyedit.c:3558 g10/keylist.c:2110
 #, c-format
 msgid "expired: %s"
 msgstr "过期于：%s"
 
-#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2095
+#: g10/keyedit.c:3560 g10/keyedit.c:3702 g10/keylist.c:266 g10/keylist.c:2116
 #: g10/keyserver.c:544
 #, c-format
 msgid "expires: %s"
@@ -4333,12 +4340,12 @@
 msgstr "请注意，在您重启程序之前，所显示的密钥有效性不一定正确。\n"
 
 #: g10/keyedit.c:3719 g10/keyedit.c:4150 g10/keyserver.c:548
-#: g10/mainproc.c:2210 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
+#: g10/mainproc.c:2256 g10/tofu.c:1787 g10/trust.c:437 dirmngr/ocsp.c:791
 msgid "revoked"
 msgstr "已吊销"
 
 #: g10/keyedit.c:3721 g10/keyedit.c:4152 g10/keyserver.c:552
-#: g10/mainproc.c:2212 g10/tofu.c:1792 g10/trust.c:124
+#: g10/mainproc.c:2258 g10/tofu.c:1792 g10/trust.c:124
 msgid "expired"
 msgstr "已过期"
 
@@ -4378,7 +4385,7 @@
 msgid "You may not add a photo ID to a PGP2-style key.\n"
 msgstr "您不可以把照片标识增加到 PGP2 样式的密钥里。\n"
 
-#: g10/keyedit.c:3976 g10/keygen.c:2753
+#: g10/keyedit.c:3976 g10/keygen.c:2896
 msgid "Such a user ID already exists on this key!\n"
 msgstr "这样的用户标识已经存在于这个密钥上了！\n"
 
@@ -4648,238 +4655,238 @@
 msgid "Displaying %s photo ID of size %ld for key %s (uid %d)\n"
 msgstr "正在显示 %s 的照片标识，大小 %ld，属于密钥 %s （用户标识 %d）\n"
 
-#: g10/keygen.c:169
+#: g10/keygen.c:170
 #, c-format
 msgid "invalid value for option '%s'\n"
 msgstr "选项‘%s’有无效的值\n"
 
-#: g10/keygen.c:322
+#: g10/keygen.c:323
 #, c-format
 msgid "preference '%s' duplicated\n"
 msgstr "偏好设置‘%s’重复\n"
 
-#: g10/keygen.c:329
+#: g10/keygen.c:330
 #, c-format
 msgid "too many cipher preferences\n"
 msgstr "过多的密文偏好设置\n"
 
-#: g10/keygen.c:331
+#: g10/keygen.c:332
 #, c-format
 msgid "too many digest preferences\n"
 msgstr "过多的散列算法偏好设置\n"
 
-#: g10/keygen.c:333
+#: g10/keygen.c:334
 #, c-format
 msgid "too many compression preferences\n"
 msgstr "过多的压缩算法偏好设置\n"
 
-#: g10/keygen.c:493
+#: g10/keygen.c:494
 #, c-format
 msgid "invalid item '%s' in preference string\n"
 msgstr "首选项字符串里有无效项‘%s’\n"
 
-#: g10/keygen.c:972
+#: g10/keygen.c:973
 #, c-format
 msgid "writing direct signature\n"
 msgstr "正在写入直接签名\n"
 
-#: g10/keygen.c:1018
+#: g10/keygen.c:1019
 #, c-format
 msgid "writing self signature\n"
 msgstr "正在写入自签名\n"
 
-#: g10/keygen.c:1075
+#: g10/keygen.c:1076
 #, c-format
 msgid "writing key binding signature\n"
 msgstr "正在写入密钥绑定签名\n"
 
-#: g10/keygen.c:1440 g10/keygen.c:1445 g10/keygen.c:1497 g10/keygen.c:1502
-#: g10/keygen.c:1656 g10/keygen.c:1661
+#: g10/keygen.c:1441 g10/keygen.c:1446 g10/keygen.c:1498 g10/keygen.c:1503
+#: g10/keygen.c:1657 g10/keygen.c:1662
 #, c-format
 msgid "keysize invalid; using %u bits\n"
 msgstr "密钥尺寸无效；改用 %u 位\n"
 
-#: g10/keygen.c:1451 g10/keygen.c:1508 g10/keygen.c:1516 g10/keygen.c:1667
+#: g10/keygen.c:1452 g10/keygen.c:1509 g10/keygen.c:1517 g10/keygen.c:1668
 #, c-format
 msgid "keysize rounded up to %u bits\n"
 msgstr "密钥尺寸舍入到 %u 位\n"
 
-#: g10/keygen.c:1542
+#: g10/keygen.c:1543
 #, c-format
 msgid ""
 "WARNING: some OpenPGP programs can't handle a DSA key with this digest size\n"
 msgstr "警告：一些 OpenPGP 程序不能处理具有此摘要长度的 DSA 密钥\n"
 
-#: g10/keygen.c:1723
+#: g10/keygen.c:1724
 msgid "Sign"
 msgstr "签名（Sign）"
 
-#: g10/keygen.c:1726
+#: g10/keygen.c:1727
 msgid "Certify"
 msgstr "认证（Certify）"
 
-#: g10/keygen.c:1729
+#: g10/keygen.c:1730
 msgid "Encrypt"
 msgstr "加密（Encrypt）"
 
-#: g10/keygen.c:1732
+#: g10/keygen.c:1733
 msgid "Authenticate"
 msgstr "身份验证（Authenticate）"
 
 #. TRANSLATORS: Please use only plain ASCII characters for the
-#. translation.  If this is not possible use single digits.  The
-#. string needs to 8 bytes long. Here is a description of the
-#. functions:
+#. * translation.  If this is not possible use single digits.  The
+#. * string needs to 8 bytes long. Here is a description of the
+#. * functions:
+#. *
+#. *   s = Toggle signing capability
+#. *   e = Toggle encryption capability
+#. *   a = Toggle authentication capability
+#. *   q = Finish
 #. 
-#. s = Toggle signing capability
-#. e = Toggle encryption capability
-#. a = Toggle authentication capability
-#. q = Finish
-#. 
-#: g10/keygen.c:1751
+#: g10/keygen.c:1754
 msgid "SsEeAaQq"
 msgstr "SsEeAaQq"
 
-#: g10/keygen.c:1778
+#: g10/keygen.c:1785
 #, c-format
 msgid "Possible actions for a %s key: "
 msgstr "%s 密钥的可实现的功能： "
 
-#: g10/keygen.c:1784
+#: g10/keygen.c:1791
 msgid "Current allowed actions: "
 msgstr "目前启用的功能： "
 
-#: g10/keygen.c:1789
+#: g10/keygen.c:1796
 #, c-format
 msgid "   (%c) Toggle the sign capability\n"
 msgstr "   (%c) 签名功能开关\n"
 
-#: g10/keygen.c:1792
+#: g10/keygen.c:1799
 #, c-format
 msgid "   (%c) Toggle the encrypt capability\n"
 msgstr "   (%c) 加密功能开关\n"
 
-#: g10/keygen.c:1795
+#: g10/keygen.c:1802
 #, c-format
 msgid "   (%c) Toggle the authenticate capability\n"
 msgstr "   (%c) 身份验证功能开关\n"
 
-#: g10/keygen.c:1798
+#: g10/keygen.c:1805
 #, c-format
 msgid "   (%c) Finished\n"
 msgstr "   (%c) 已完成\n"
 
-#: g10/card-util.c:1425 g10/keygen.c:1911 sm/certreqgen-ui.c:157
+#: g10/card-util.c:1456 g10/keygen.c:1927 sm/certreqgen-ui.c:157
 msgid "Please select what kind of key you want:\n"
 msgstr "请选择您要使用的密钥类型：\n"
 
-#: g10/keygen.c:1915
+#: g10/keygen.c:1931
 #, c-format
 msgid "   (%d) RSA and RSA (default)\n"
 msgstr "   (%d) RSA 和 RSA （默认）\n"
 
-#: g10/keygen.c:1919
+#: g10/keygen.c:1935
 #, c-format
 msgid "   (%d) DSA and Elgamal\n"
 msgstr "   (%d) DSA 和 Elgamal\n"
 
-#: g10/keygen.c:1922
+#: g10/keygen.c:1938
 #, c-format
 msgid "   (%d) DSA (sign only)\n"
 msgstr "   (%d) DSA（仅用于签名）\n"
 
-#: g10/keygen.c:1924
+#: g10/keygen.c:1940
 #, c-format
 msgid "   (%d) RSA (sign only)\n"
 msgstr "   (%d) RSA（仅用于签名）\n"
 
-#: g10/keygen.c:1930
+#: g10/keygen.c:1946
 #, c-format
 msgid "   (%d) Elgamal (encrypt only)\n"
 msgstr "   (%d) ElGamal（仅用于加密）\n"
 
-#: g10/keygen.c:1932
+#: g10/keygen.c:1948
 #, c-format
 msgid "   (%d) RSA (encrypt only)\n"
 msgstr "   (%d) RSA（仅用于加密）\n"
 
-#: g10/keygen.c:1938
+#: g10/keygen.c:1954
 #, c-format
 msgid "   (%d) DSA (set your own capabilities)\n"
 msgstr "   (%d) DSA（自定义用途）\n"
 
-#: g10/keygen.c:1940
+#: g10/keygen.c:1956
 #, c-format
 msgid "   (%d) RSA (set your own capabilities)\n"
 msgstr "   (%d) RSA（自定义用途）\n"
 
-#: g10/keygen.c:1946
+#: g10/keygen.c:1962
 #, c-format
 msgid "   (%d) ECC and ECC\n"
 msgstr "   (%d) ECC 和 ECC\n"
 
-#: g10/keygen.c:1948
+#: g10/keygen.c:1964
 #, c-format
 msgid "  (%d) ECC (sign only)\n"
 msgstr "  (%d) ECC（仅用于签名）\n"
 
-#: g10/keygen.c:1950
+#: g10/keygen.c:1966
 #, c-format
 msgid "  (%d) ECC (set your own capabilities)\n"
 msgstr "  (%d) ECC（自定义用途）\n"
 
-#: g10/keygen.c:1952
+#: g10/keygen.c:1968
 #, c-format
 msgid "  (%d) ECC (encrypt only)\n"
 msgstr "  (%d) ECC（仅用于加密）\n"
 
-#: g10/keygen.c:1956
+#: g10/keygen.c:1972
 #, c-format
 msgid "  (%d) Existing key\n"
 msgstr "  (%d) 现存的密钥\n"
 
-#: g10/keygen.c:2052 sm/certreqgen-ui.c:202
+#: g10/keygen.c:2070 sm/certreqgen-ui.c:202
 msgid "Enter the keygrip: "
 msgstr "输入 keygrip： "
 
-#: g10/keygen.c:2065 sm/certreqgen-ui.c:210
+#: g10/keygen.c:2083 sm/certreqgen-ui.c:210
 msgid "Not a valid keygrip (expecting 40 hex digits)\n"
 msgstr "不是一个有效的 keygrip （需要 40 位十六进制数）\n"
 
-#: g10/keygen.c:2067 sm/certreqgen-ui.c:212
+#: g10/keygen.c:2085 sm/certreqgen-ui.c:212
 msgid "No key with this keygrip\n"
 msgstr "没有此 keygrip 关联的密钥\n"
 
-#: g10/keygen.c:2151 g10/keygen.c:2165
+#: g10/keygen.c:2294 g10/keygen.c:2308
 #, c-format
 msgid "rounded to %u bits\n"
 msgstr "舍入到 %u 位\n"
 
-#: g10/keygen.c:2206
+#: g10/keygen.c:2349
 #, c-format
 msgid "%s keys may be between %u and %u bits long.\n"
 msgstr "%s 密钥的长度应在 %u 位与 %u 位之间。\n"
 
-#: g10/keygen.c:2214
+#: g10/keygen.c:2357
 #, c-format
 msgid "What keysize do you want for the subkey? (%u) "
 msgstr "您想要为此子密钥使用的密钥长度？(%u) "
 
-#: g10/card-util.c:1380 g10/keygen.c:2217 sm/certreqgen-ui.c:179
+#: g10/card-util.c:1411 g10/keygen.c:2360 sm/certreqgen-ui.c:179
 #, c-format
 msgid "What keysize do you want? (%u) "
 msgstr "您想要使用的密钥长度？(%u) "
 
-#: g10/keygen.c:2231 sm/certreqgen-ui.c:189
+#: g10/keygen.c:2374 sm/certreqgen-ui.c:189
 #, c-format
 msgid "Requested keysize is %u bits\n"
 msgstr "请求的密钥长度是 %u 位\n"
 
-#: g10/keygen.c:2277
+#: g10/keygen.c:2420
 msgid "Please select which elliptic curve you want:\n"
 msgstr "请选择您想要使用的椭圆曲线：\n"
 
-#: g10/keygen.c:2465
+#: g10/keygen.c:2608
 msgid ""
 "Please specify how long the key should be valid.\n"
 "         0 = key does not expire\n"
@@ -4895,7 +4902,7 @@
 "      <n>m = 密钥在 n 月后过期\n"
 "      <n>y = 密钥在 n 年后过期\n"
 
-#: g10/keygen.c:2476
+#: g10/keygen.c:2619
 msgid ""
 "Please specify how long the signature should be valid.\n"
 "         0 = signature does not expire\n"
@@ -4911,38 +4918,38 @@
 "      <n>m = 签名在 n 月后过期\n"
 "      <n>y = 签名在 n 年后过期\n"
 
-#: g10/keygen.c:2499
+#: g10/keygen.c:2642
 msgid "Key is valid for? (0) "
 msgstr "密钥的有效期限是？(0) "
 
-#: g10/keygen.c:2504
+#: g10/keygen.c:2647
 #, c-format
 msgid "Signature is valid for? (%s) "
 msgstr "签名的有效期限是？(%s) "
 
-#: g10/keygen.c:2517 g10/keygen.c:2542
+#: g10/keygen.c:2660 g10/keygen.c:2685
 msgid "invalid value\n"
 msgstr "无效的值\n"
 
-#: g10/keygen.c:2524
+#: g10/keygen.c:2667
 msgid "Key does not expire at all\n"
 msgstr "密钥永远不会过期\n"
 
-#: g10/keygen.c:2525
+#: g10/keygen.c:2668
 msgid "Signature does not expire at all\n"
 msgstr "签名永远不会过期\n"
 
-#: g10/keygen.c:2530
+#: g10/keygen.c:2673
 #, c-format
 msgid "Key expires at %s\n"
 msgstr "密钥于 %s 过期\n"
 
-#: g10/keygen.c:2531
+#: g10/keygen.c:2674
 #, c-format
 msgid "Signature expires at %s\n"
 msgstr "签名于 %s 过期\n"
 
-#: g10/keygen.c:2535
+#: g10/keygen.c:2678
 msgid ""
 "Your system can't display dates beyond 2038.\n"
 "However, it will be correctly handled up to 2106.\n"
@@ -4950,11 +4957,11 @@
 "您的系统无法显示 2038 年以后的日期。\n"
 "然而，它可以正确地处理到 2106 年之前的日期。\n"
 
-#: g10/keygen.c:2548
+#: g10/keygen.c:2691
 msgid "Is this correct? (y/N) "
 msgstr "这些内容正确吗？ (y/N) "
 
-#: g10/keygen.c:2616
+#: g10/keygen.c:2759
 msgid ""
 "\n"
 "GnuPG needs to construct a user ID to identify your key.\n"
@@ -4968,7 +4975,7 @@
 #. but you should keep your existing translation.  In case
 #. the new string is not translated this old string will
 #. be used.
-#: g10/keygen.c:2631
+#: g10/keygen.c:2774
 msgid ""
 "\n"
 "You need a user ID to identify your key; the software constructs the user "
@@ -4983,49 +4990,49 @@
 "    “Heinrich Heine (Der Dichter) <heinrichh@duesseldorf.de>”\n"
 "\n"
 
-#: g10/keygen.c:2650
+#: g10/keygen.c:2793
 msgid "Real name: "
 msgstr "真实姓名： "
 
-#: g10/keygen.c:2659
+#: g10/keygen.c:2802
 msgid "Invalid character in name\n"
 msgstr "姓名含有无效的字符\n"
 
-#: g10/keygen.c:2660
+#: g10/keygen.c:2803
 #, c-format
 msgid "The characters '%s' and '%s' may not appear in name\n"
 msgstr "字符‘%s’和‘%s’不能出现在姓名中\n"
 
-#: g10/keygen.c:2664
+#: g10/keygen.c:2807
 msgid "Name may not start with a digit\n"
 msgstr "姓名不可以用数字开头\n"
 
-#: g10/keygen.c:2667
+#: g10/keygen.c:2810
 msgid "Name must be at least 5 characters long\n"
 msgstr "姓名至少要有五个字符长\n"
 
-#: g10/keygen.c:2677
+#: g10/keygen.c:2820
 msgid "Email address: "
 msgstr "电子邮件地址： "
 
-#: g10/keygen.c:2683
+#: g10/keygen.c:2826
 msgid "Not a valid email address\n"
 msgstr "电子邮件地址无效\n"
 
-#: g10/keygen.c:2692
+#: g10/keygen.c:2835
 msgid "Comment: "
 msgstr "注释： "
 
-#: g10/keygen.c:2698
+#: g10/keygen.c:2841
 msgid "Invalid character in comment\n"
 msgstr "注释含有无效的字符\n"
 
-#: g10/keygen.c:2734
+#: g10/keygen.c:2877
 #, c-format
 msgid "You are using the '%s' character set.\n"
 msgstr "您正在使用‘%s’字符集。\n"
 
-#: g10/keygen.c:2740
+#: g10/keygen.c:2883
 #, c-format
 msgid ""
 "You selected this USER-ID:\n"
@@ -5036,7 +5043,7 @@
 "    “%s”\n"
 "\n"
 
-#: g10/keygen.c:2745
+#: g10/keygen.c:2888
 msgid ""
 "Please don't put the email address into the real name or the comment\n"
 msgstr "请不要把电子邮件地址放进您的真实姓名或注释里\n"
@@ -5052,31 +5059,31 @@
 #. o = Okay (ready, continue)
 #. q = Quit
 #. 
-#: g10/keygen.c:2770
+#: g10/keygen.c:2913
 msgid "NnCcEeOoQq"
 msgstr "NnCcEeOoQq"
 
-#: g10/keygen.c:2780
+#: g10/keygen.c:2923
 msgid "Change (N)ame, (C)omment, (E)mail or (Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ "
 
-#: g10/keygen.c:2781
+#: g10/keygen.c:2924
 msgid "Change (N)ame, (C)omment, (E)mail or (O)kay/(Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:2786
+#: g10/keygen.c:2929
 msgid "Change (N)ame, (E)mail, or (Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或退出（Q）？ "
 
-#: g10/keygen.c:2787
+#: g10/keygen.c:2930
 msgid "Change (N)ame, (E)mail, or (O)kay/(Q)uit? "
 msgstr "更改姓名（N）、注释（C）、电子邮件地址（E）或确定（O）/退出（Q）？ "
 
-#: g10/keygen.c:2806
+#: g10/keygen.c:2949
 msgid "Please correct the error first\n"
 msgstr "请先改正错误\n"
 
-#: g10/keygen.c:2852
+#: g10/keygen.c:2995
 msgid ""
 "We need to generate a lot of random bytes. It is a good idea to perform\n"
 "some other action (type on the keyboard, move the mouse, utilize the\n"
@@ -5087,13 +5094,13 @@
 "、移动鼠标、读写硬盘之类的）将会是一个不错的主意；这会让随机数\n"
 "发生器有更好的机会获得足够的熵。\n"
 
-#: g10/keygen.c:3979 g10/keygen.c:4047 g10/keygen.c:4064 g10/keygen.c:4087
-#: g10/keygen.c:4425 g10/keygen.c:4922 g10/keygen.c:5184 g10/keygen.c:5289
+#: g10/keygen.c:4274 g10/keygen.c:4345 g10/keygen.c:4363 g10/keygen.c:4391
+#: g10/keygen.c:4735 g10/keygen.c:5238 g10/keygen.c:5533 g10/keygen.c:5638
 #, c-format
 msgid "Key generation failed: %s\n"
 msgstr "密钥生成失败：%s\n"
 
-#: g10/keygen.c:3988
+#: g10/keygen.c:4283
 #, c-format
 msgid ""
 "About to create a key for:\n"
@@ -5104,64 +5111,64 @@
 "    \"%s\"\n"
 "\n"
 
-#: g10/keygen.c:3990
+#: g10/keygen.c:4285
 msgid "Continue? (Y/n) "
 msgstr "继续吗？ (Y/n) "
 
-#: g10/keygen.c:4011
+#: g10/keygen.c:4306
 #, c-format
 msgid "A key for \"%s\" already exists\n"
 msgstr "一个 \"%s\" 的密钥已经存在\n"
 
-#: g10/keygen.c:4016
+#: g10/keygen.c:4311
 msgid "Create anyway? (y/N) "
 msgstr "无论如何都要创建吗？(y/N) "
 
-#: g10/keygen.c:4022
+#: g10/keygen.c:4317
 #, c-format
 msgid "creating anyway\n"
 msgstr "无论如何都创建\n"
 
-#: g10/keygen.c:4410
+#: g10/keygen.c:4718
 #, c-format
 msgid "Note: Use \"%s %s\" for a full featured key generation dialog.\n"
 msgstr "注意：使用 “%s %s” 以获得一个功能完整的密钥产生对话框。\n"
 
-#: g10/keygen.c:4453
+#: g10/keygen.c:4767
 #, c-format
 msgid "Key generation canceled.\n"
 msgstr "密钥生成已取消。\n"
 
-#: g10/keygen.c:4513
+#: g10/keygen.c:4827
 #, c-format
 msgid "can't create backup file '%s': %s\n"
 msgstr "不能创建备份文件‘%s’：%s\n"
 
-#: g10/keygen.c:4533
+#: g10/keygen.c:4847
 #, c-format
 msgid "Note: backup of card key saved to '%s'\n"
 msgstr "注意：卡片密钥的备份已保存到‘%s’\n"
 
-#: g10/keygen.c:4692 g10/keygen.c:4853
+#: g10/keygen.c:5006 g10/keygen.c:5168
 #, c-format
 msgid "writing public key to '%s'\n"
 msgstr "正在将公钥写至‘%s’\n"
 
-#: g10/keygen.c:4847
+#: g10/keygen.c:5162
 #, c-format
 msgid "no writable public keyring found: %s\n"
 msgstr "无可写的公钥钥匙环：%s\n"
 
-#: g10/keygen.c:4861
+#: g10/keygen.c:5176
 #, c-format
 msgid "error writing public keyring '%s': %s\n"
 msgstr "写入公钥钥匙环‘%s’时发生错误： %s\n"
 
-#: g10/keygen.c:4894
+#: g10/keygen.c:5209
 msgid "public and secret key created and signed.\n"
 msgstr "公钥和私钥已经生成并被签名。\n"
 
-#: g10/keygen.c:4909
+#: g10/keygen.c:5225
 msgid ""
 "Note that this key cannot be used for encryption.  You may want to use\n"
 "the command \"--edit-key\" to generate a subkey for this purpose.\n"
@@ -5169,34 +5176,34 @@
 "请注意这个密钥不能用于加密。您可能想要使用“--edit-key”命令来\n"
 "生成一个用于此用途的子密钥。\n"
 
-#: g10/keygen.c:5052 g10/keygen.c:5240
+#: g10/keygen.c:5400 g10/keygen.c:5589
 #, c-format
 msgid ""
 "key has been created %lu second in future (time warp or clock problem)\n"
 msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5054 g10/keygen.c:5242
+#: g10/keygen.c:5402 g10/keygen.c:5591
 #, c-format
 msgid ""
 "key has been created %lu seconds in future (time warp or clock problem)\n"
 msgstr "密钥已经在 %lu 秒后的未来生成（可能是因为时空扭曲或时钟的问题）\n"
 
-#: g10/keygen.c:5065 g10/keygen.c:5253
+#: g10/keygen.c:5413 g10/keygen.c:5602
 #, c-format
 msgid "Note: creating subkeys for v3 keys is not OpenPGP compliant\n"
 msgstr "注意：为 v3 密钥创建子密钥是不与 OpenPGP 兼容的\n"
 
-#: g10/keygen.c:5077 g10/keygen.c:5079
+#: g10/keygen.c:5425 g10/keygen.c:5427
 #, c-format
 msgid "Secret parts of primary key are not available.\n"
 msgstr "主密钥的私钥部分不可用。\n"
 
-#: g10/keygen.c:5086 g10/keygen.c:5088
+#: g10/keygen.c:5434 g10/keygen.c:5436
 #, c-format
 msgid "Secret parts of primary key are stored on-card.\n"
 msgstr "主密钥的私钥部分存储在卡上。\n"
 
-#: g10/keygen.c:5107 g10/keygen.c:5267
+#: g10/keygen.c:5455 g10/keygen.c:5616
 msgid "Really create? (y/N) "
 msgstr "真的要创建吗？(y/N) "
 
@@ -5248,67 +5255,67 @@
 msgid_plural "%d signatures not checked due to errors\n"
 msgstr[0] "%d 个签名因错误而未被检查\n"
 
-#: g10/keylist.c:572
+#: g10/keylist.c:576
 #, c-format
 msgid "Warning: %lu key skipped due to its large size\n"
 msgid_plural "Warning: %lu keys skipped due to their large sizes\n"
 msgstr[0] "警告：%lu 把密钥因尺寸大而被跳过\n"
 
-#: g10/keylist.c:594
+#: g10/keylist.c:599
 msgid "Keyring"
 msgstr "钥匙环"
 
-#: g10/keylist.c:1942
+#: g10/keylist.c:1963
 msgid "Primary key fingerprint:"
 msgstr "主密钥指纹："
 
-#: g10/keylist.c:1944
+#: g10/keylist.c:1965
 msgid "     Subkey fingerprint:"
 msgstr "     子密钥指纹："
 
 #. TRANSLATORS: this should fit into 24 bytes so that the
 #. * fingerprint data is properly aligned with the user ID
-#: g10/keylist.c:1952
+#: g10/keylist.c:1973
 msgid " Primary key fingerprint:"
 msgstr " 主密钥指纹："
 
-#: g10/keylist.c:1954 g10/keylist.c:1964
+#: g10/keylist.c:1975 g10/keylist.c:1985
 msgid "      Subkey fingerprint:"
 msgstr "      子密钥指纹："
 
 #  use tty
-#: g10/keylist.c:1959 g10/keylist.c:1975
+#: g10/keylist.c:1980 g10/keylist.c:1996
 msgid "      Key fingerprint ="
 msgstr "      密钥指纹 ="
 
-#: g10/keylist.c:2026
+#: g10/keylist.c:2047
 msgid "      Card serial no. ="
 msgstr "      卡片序列号 ="
 
-#: g10/keyring.c:1467
+#: g10/keyring.c:1470
 #, c-format
 msgid "caching keyring '%s'\n"
 msgstr "正在缓存钥匙环‘%s’\n"
 
-#: g10/keyring.c:1543
+#: g10/keyring.c:1546
 #, c-format
 msgid "%lu keys cached so far (%lu signature)\n"
 msgid_plural "%lu keys cached so far (%lu signatures)\n"
 msgstr[0] "当前有 %lu 把密钥已缓存 （%lu 个签名）\n"
 
-#: g10/keyring.c:1559
+#: g10/keyring.c:1562
 #, c-format
 msgid "%lu key cached"
 msgid_plural "%lu keys cached"
 msgstr[0] "%lu 把密钥已缓存"
 
-#: g10/keyring.c:1561
+#: g10/keyring.c:1564
 #, c-format
 msgid " (%lu signature)\n"
 msgid_plural " (%lu signatures)\n"
 msgstr[0] " (%lu 个签名)\n"
 
-#: g10/keyring.c:1637
+#: g10/keyring.c:1640
 #, c-format
 msgid "%s: keyring created\n"
 msgstr "%s：钥匙环已创建\n"
@@ -5395,7 +5402,7 @@
 msgid "requesting key %s from %s\n"
 msgstr "正在请求密钥 %s 从 %s\n"
 
-#: g10/keyserver.c:1818 g10/keyserver.c:1996
+#: g10/keyserver.c:1818 g10/keyserver.c:1997
 #, c-format
 msgid "no keyserver known\n"
 msgstr "无已知的公钥服务器\n"
@@ -5405,254 +5412,254 @@
 msgid "skipped \"%s\": %s\n"
 msgstr "已跳过 “%s”： %s\n"
 
-#: g10/keyserver.c:1836
+#: g10/keyserver.c:1837
 #, c-format
 msgid "sending key %s to %s\n"
 msgstr "正在发送密钥 %s 到 %s\n"
 
-#: g10/keyserver.c:1877
+#: g10/keyserver.c:1878
 #, c-format
 msgid "requesting key from '%s'\n"
 msgstr "正在从 %s 请求密钥\n"
 
-#: g10/keyserver.c:1893
+#: g10/keyserver.c:1894
 #, c-format
 msgid "WARNING: unable to fetch URI %s: %s\n"
 msgstr "警告：无法获取 URI %s：%s\n"
 
-#: g10/mainproc.c:261
+#: g10/mainproc.c:262
 #, c-format
 msgid "weird size for an encrypted session key (%d)\n"
 msgstr "奇怪的加密会话密钥长度（%d）\n"
 
-#: g10/mainproc.c:317
+#: g10/mainproc.c:318
 #, c-format
 msgid "%s encrypted session key\n"
 msgstr "%s 加密过的会话密钥\n"
 
-#: g10/mainproc.c:327
+#: g10/mainproc.c:328
 #, c-format
 msgid "passphrase generated with unknown digest algorithm %d\n"
 msgstr "密码由未知的散列算法 %d 生成\n"
 
-#: g10/mainproc.c:400
+#: g10/mainproc.c:401
 #, c-format
 msgid "public key is %s\n"
 msgstr "公钥是 %s\n"
 
-#: g10/mainproc.c:476
+#: g10/mainproc.c:477
 #, c-format
 msgid "public key encrypted data: good DEK\n"
 msgstr "公钥加密数据：完好的数据加密密钥（DEK）\n"
 
-#: g10/mainproc.c:509
+#: g10/mainproc.c:510
 #, c-format
 msgid "encrypted with %u-bit %s key, ID %s, created %s\n"
 msgstr "由 %u 位的 %s 密钥加密，标识为 %s，生成于 %s\n"
 
-#: g10/mainproc.c:513 g10/pkclist.c:228
+#: g10/mainproc.c:514 g10/pkclist.c:228
 #, c-format
 msgid "      \"%s\"\n"
 msgstr "      “%s”\n"
 
-#: g10/mainproc.c:517
+#: g10/mainproc.c:518
 #, c-format
 msgid "encrypted with %s key, ID %s\n"
 msgstr "由 %s 密钥加密、密钥号为 %s\n"
 
-#: g10/mainproc.c:538
+#: g10/mainproc.c:539
 #, c-format
 msgid "public key decryption failed: %s\n"
 msgstr "公钥解密失败：%s\n"
 
-#: g10/mainproc.c:562
+#: g10/mainproc.c:563
 #, c-format
 msgid "encrypted with %lu passphrases\n"
 msgstr "以 %lu 个密码加密\n"
 
-#: g10/mainproc.c:564
+#: g10/mainproc.c:565
 #, c-format
 msgid "encrypted with 1 passphrase\n"
 msgstr "以 1 个密码加密\n"
 
-#: g10/mainproc.c:598 g10/mainproc.c:619
+#: g10/mainproc.c:599 g10/mainproc.c:620
 #, c-format
 msgid "assuming %s encrypted data\n"
 msgstr "假定 %s 为加密过的数据\n"
 
-#: g10/mainproc.c:605
+#: g10/mainproc.c:606
 #, c-format
 msgid ""
 "IDEA cipher unavailable, optimistically attempting to use %s instead\n"
 msgstr "IDEA 密文算法不可用，尝试使用 %s 代替\n"
 
-#: g10/mainproc.c:691 g10/mainproc.c:722
+#: g10/mainproc.c:692 g10/mainproc.c:723
 #, c-format
 msgid "WARNING: message was not integrity protected\n"
 msgstr "警告：消息未受到完整性保护\n"
 
-#: g10/mainproc.c:718
+#: g10/mainproc.c:719
 #, c-format
 msgid "decryption okay\n"
 msgstr "解密成功\n"
 
-#: g10/mainproc.c:727
+#: g10/mainproc.c:728
 #, c-format
 msgid "WARNING: encrypted message has been manipulated!\n"
 msgstr "警告：加密过的报文已经变造！\n"
 
-#: g10/mainproc.c:744
+#: g10/mainproc.c:745
 #, c-format
 msgid "decryption failed: %s\n"
 msgstr "解密失败：%s\n"
 
-#: g10/mainproc.c:774
+#: g10/mainproc.c:775
 #, c-format
 msgid "Note: sender requested \"for-your-eyes-only\"\n"
 msgstr "注意：发送者要求您“只阅读不存盘”\n"
 
-#: g10/mainproc.c:781
+#: g10/mainproc.c:782
 #, c-format
 msgid "original file name='%.*s'\n"
 msgstr "原始文件名 =‘%.*s’\n"
 
-#: g10/mainproc.c:554 g10/mainproc.c:858
+#: g10/mainproc.c:555 g10/mainproc.c:859
 #, c-format
 msgid "WARNING: multiple plaintexts seen\n"
 msgstr "警告： 检测到多重纯文本\n"
 
-#: g10/mainproc.c:1033
+#: g10/mainproc.c:1037
 #, c-format
 msgid "standalone revocation - use \"gpg --import\" to apply\n"
 msgstr "独立的吊销证书 - 请使用“gpg --import”来应用\n"
 
-#: g10/mainproc.c:1333 g10/mainproc.c:1376
+#: g10/mainproc.c:1341 g10/mainproc.c:1384
 #, c-format
 msgid "no signature found\n"
 msgstr "未找到签名\n"
 
-#: g10/mainproc.c:1729
+#: g10/mainproc.c:1737
 #, c-format
 msgid "BAD signature from \"%s\""
 msgstr "已损坏的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1731
+#: g10/mainproc.c:1739
 #, c-format
 msgid "Expired signature from \"%s\""
 msgstr "过期的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1733
+#: g10/mainproc.c:1741
 #, c-format
 msgid "Good signature from \"%s\""
 msgstr "完好的签名，来自于 “%s”"
 
-#: g10/mainproc.c:1752
+#: g10/mainproc.c:1761
 #, c-format
 msgid "signature verification suppressed\n"
 msgstr "签名验证已被抑制\n"
 
-#: g10/mainproc.c:1861
+#: g10/mainproc.c:1870
 #, c-format
 msgid "can't handle this ambiguous signature data\n"
 msgstr "无法处理此有歧义的签名数据\n"
 
-#: g10/mainproc.c:1877 g10/mainproc.c:1884
+#: g10/mainproc.c:1886 g10/mainproc.c:1893
 #, c-format
 msgid "Signature made %s\n"
 msgstr "签名建立于 %s\n"
 
-#: g10/mainproc.c:1878 g10/mainproc.c:1885
+#: g10/mainproc.c:1887 g10/mainproc.c:1894
 #, c-format
 msgid "               using %s key %s\n"
 msgstr "               使用 %s 密钥 %s\n"
 
-#: g10/mainproc.c:1889
+#: g10/mainproc.c:1898
 #, c-format
 msgid "Signature made %s using %s key ID %s\n"
 msgstr "于 %s 创建的签名，使用 %s，密钥号 %s\n"
 
-#: g10/mainproc.c:1895
+#: g10/mainproc.c:1904
 #, c-format
 msgid "               issuer \"%s\"\n"
 msgstr "               签发者 \"%s\"\n"
 
-#: g10/mainproc.c:1917
+#: g10/mainproc.c:1955
 #, c-format
 msgid "Key available at: "
 msgstr "密钥在以下地方可用： "
 
-#: g10/mainproc.c:2164
+#: g10/mainproc.c:2210
 msgid "[uncertain]"
 msgstr "[不确定]"
 
-#: g10/mainproc.c:2202
+#: g10/mainproc.c:2248
 #, c-format
 msgid "                aka \"%s\""
 msgstr "                亦即 “%s”"
 
-#: g10/mainproc.c:2277
+#: g10/mainproc.c:2323
 #, c-format
 msgid "WARNING: This key is not suitable for signing in %s mode\n"
 msgstr "警告： 此密钥在 %s 模式下不适用于签名\n"
 
-#: g10/mainproc.c:2295
+#: g10/mainproc.c:2341
 #, c-format
 msgid "Signature expired %s\n"
 msgstr "这份签名已于 %s 过期。\n"
 
-#: g10/mainproc.c:2299
+#: g10/mainproc.c:2345
 #, c-format
 msgid "Signature expires %s\n"
 msgstr "这份签名在 %s 过期。\n"
 
-#: g10/mainproc.c:2310
+#: g10/mainproc.c:2356
 #, c-format
 msgid "%s signature, digest algorithm %s%s%s\n"
 msgstr "%s 签名，摘要算法 %s%s%s\n"
 
-#: g10/mainproc.c:2311
+#: g10/mainproc.c:2357
 msgid "binary"
 msgstr "二进制"
 
-#: g10/mainproc.c:2312
+#: g10/mainproc.c:2358
 msgid "textmode"
 msgstr "文本模式"
 
-#: g10/mainproc.c:2312 g10/trust.c:123 dirmngr/ocsp.c:792
+#: g10/mainproc.c:2358 g10/trust.c:123 dirmngr/ocsp.c:792
 msgid "unknown"
 msgstr "未知"
 
-#: g10/mainproc.c:2314
+#: g10/mainproc.c:2360
 msgid ", key algorithm "
 msgstr "，密钥算法 "
 
-#: g10/mainproc.c:2349
+#: g10/mainproc.c:2395
 #, c-format
 msgid "WARNING: not a detached signature; file '%s' was NOT verified!\n"
 msgstr "警告：不是一个分离签名；文件‘%s’没有被验证！\n"
 
-#: g10/mainproc.c:2387
+#: g10/mainproc.c:2433
 #, c-format
 msgid "Can't check signature: %s\n"
 msgstr "无法检查签名：%s\n"
 
-#: g10/mainproc.c:2482 g10/mainproc.c:2501 g10/mainproc.c:2625
+#: g10/mainproc.c:2529 g10/mainproc.c:2548 g10/mainproc.c:2672
 #, c-format
 msgid "not a detached signature\n"
 msgstr "不是一份分离的签名\n"
 
-#: g10/mainproc.c:2535
+#: g10/mainproc.c:2582
 #, c-format
 msgid ""
 "WARNING: multiple signatures detected.  Only the first will be checked.\n"
 msgstr "警告：检测到多重签名。只检查第一个签名。\n"
 
-#: g10/mainproc.c:2544
+#: g10/mainproc.c:2591
 #, c-format
 msgid "standalone signature of class 0x%02x\n"
 msgstr "等级 0x%02x 的独立签名\n"
 
-#: g10/mainproc.c:2629
+#: g10/mainproc.c:2676
 #, c-format
 msgid "old style (PGP 2.x) signature\n"
 msgstr "旧式（PGP 2.x）签名\n"
@@ -5697,83 +5704,83 @@
 msgid "Note: signatures using the %s algorithm are rejected\n"
 msgstr "注意：使用 %s 算法的签名已被拒绝\n"
 
-#: g10/misc.c:376
+#: g10/misc.c:394
 #, c-format
 msgid "(reported error: %s)\n"
 msgstr "（已报告错误：%s）\n"
 
-#: g10/misc.c:379
+#: g10/misc.c:397
 #, c-format
 msgid "(reported error: %s <%s>)\n"
 msgstr "（已报告错误：%s <%s>）\n"
 
-#: g10/misc.c:398
+#: g10/misc.c:416
 #, c-format
 msgid "(further info: "
 msgstr "（更多信息： "
 
-#: g10/misc.c:1068
+#: g10/misc.c:1086
 #, c-format
 msgid "%s:%d: deprecated option \"%s\"\n"
 msgstr "%s:%d：被弃用的选项 “%s”\n"
 
-#: g10/misc.c:1072
+#: g10/misc.c:1090
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated option\n"
 msgstr "警告：“%s” 是一个已被弃用的选项\n"
 
-#: g10/misc.c:1074
+#: g10/misc.c:1092
 #, c-format
 msgid "please use \"%s%s\" instead\n"
 msgstr "请用“%s%s”代替\n"
 
-#: g10/misc.c:1081
+#: g10/misc.c:1099
 #, c-format
 msgid "WARNING: \"%s\" is a deprecated command - do not use it\n"
 msgstr "警告：“%s” 命令已被弃用 - 不要使用它\n"
 
-#: g10/misc.c:1091
+#: g10/misc.c:1109
 #, c-format
 msgid "%s:%u: \"%s\" is obsolete in this file - it only has effect in %s\n"
 msgstr "%s:%u: “%s” 在此文件中已被淘汰 - 其仅在 %s 中起作用\n"
 
-#: g10/misc.c:1095
+#: g10/misc.c:1113
 #, c-format
 msgid ""
 "WARNING: \"%s%s\" is an obsolete option - it has no effect except on %s\n"
 msgstr "警告：“%s%s”是一个已经被淘汰的选项 - 它除了在 %s 上之外不起作用\n"
 
-#: g10/misc.c:1159
+#: g10/misc.c:1177
 msgid "Uncompressed"
 msgstr "不压缩"
 
 #. TRANSLATORS: See doc/TRANSLATE about this string.
-#: g10/misc.c:1184
+#: g10/misc.c:1202
 msgid "uncompressed|none"
 msgstr "未压缩|无"
 
-#: g10/misc.c:1291
+#: g10/misc.c:1309
 #, c-format
 msgid "this message may not be usable by %s\n"
 msgstr "此消息可能不能被 %s 使用\n"
 
-#: g10/misc.c:1466
+#: g10/misc.c:1484
 #, c-format
 msgid "ambiguous option '%s'\n"
 msgstr "有歧义的选项‘%s’\n"
 
-#: g10/misc.c:1491
+#: g10/misc.c:1509
 #, c-format
 msgid "unknown option '%s'\n"
 msgstr "未知的选项 '%s'\n"
 
-#: g10/misc.c:1729
+#: g10/misc.c:1747
 #, c-format
 msgid ""
 "ECDSA public key is expected to be in SEC encoding multiple of 8 bits\n"
 msgstr "ECDSA 公钥需要以 8 位的倍数的 SEC 进行编码\n"
 
-#: g10/misc.c:1751
+#: g10/misc.c:1769
 #, c-format
 msgid "unknown weak digest '%s'\n"
 msgstr "未知的弱摘要‘%s’\n"
@@ -5816,7 +5823,7 @@
 msgid "WARNING: potentially insecure symmetrically encrypted session key\n"
 msgstr "警告：潜在不安全的对称加密会话密钥\n"
 
-#: g10/parse-packet.c:1765
+#: g10/parse-packet.c:1795
 #, c-format
 msgid "subpacket of type %d has critical bit set\n"
 msgstr "%d 类型的子包设定了紧急位\n"
@@ -5925,32 +5932,32 @@
 msgid "unable to display photo ID!\n"
 msgstr "无法显示照片标识！\n"
 
-#: g10/import.c:3119 g10/pkclist.c:72 g10/revoke.c:776
+#: g10/import.c:3181 g10/pkclist.c:72 g10/revoke.c:776
 msgid "No reason specified"
 msgstr "未指定原因"
 
-#: g10/import.c:3120 g10/pkclist.c:74 g10/revoke.c:778
+#: g10/import.c:3182 g10/pkclist.c:74 g10/revoke.c:778
 msgid "Key is superseded"
 msgstr "密钥被替换"
 
-#: g10/import.c:3121 g10/pkclist.c:76 g10/revoke.c:777
+#: g10/import.c:3183 g10/pkclist.c:76 g10/revoke.c:777
 msgid "Key has been compromised"
 msgstr "密钥已泄漏"
 
-#: g10/import.c:3122 g10/pkclist.c:78 g10/revoke.c:779
+#: g10/import.c:3184 g10/pkclist.c:78 g10/revoke.c:779
 msgid "Key is no longer used"
 msgstr "密钥不再使用"
 
-#: g10/import.c:3123 g10/pkclist.c:80 g10/revoke.c:780
+#: g10/import.c:3185 g10/pkclist.c:80 g10/revoke.c:780
 msgid "User ID is no longer valid"
 msgstr "用户标识不再有效"
 
-#: g10/import.c:3248 g10/keylist.c:1188 g10/pkclist.c:84
+#: g10/import.c:3310 g10/keylist.c:1209 g10/pkclist.c:84
 #, c-format
 msgid "reason for revocation: "
 msgstr "吊销原因： "
 
-#: g10/import.c:3267 g10/keylist.c:1207 g10/pkclist.c:100
+#: g10/import.c:3329 g10/keylist.c:1228 g10/pkclist.c:100
 #, c-format
 msgid "revocation comment: "
 msgstr "吊销注释： "
@@ -6304,27 +6311,27 @@
 msgid "okay, we are the anonymous recipient.\n"
 msgstr "很好，我们就是匿名接收者。\n"
 
-#: g10/pubkey-enc.c:310
+#: g10/pubkey-enc.c:324
 #, c-format
 msgid "old encoding of the DEK is not supported\n"
 msgstr "不支持旧式的 DEK 编码\n"
 
-#: g10/pubkey-enc.c:338
+#: g10/pubkey-enc.c:352
 #, c-format
 msgid "cipher algorithm %d%s is unknown or disabled\n"
 msgstr "密文算法 %d%s 未知或已停用\n"
 
-#: g10/pubkey-enc.c:382
+#: g10/pubkey-enc.c:396
 #, c-format
 msgid "WARNING: cipher algorithm %s not found in recipient preferences\n"
 msgstr "注意：接收者的偏好设置中找不到密文算法 %s\n"
 
-#: g10/pubkey-enc.c:415
+#: g10/pubkey-enc.c:429
 #, c-format
 msgid "Note: secret key %s expired at %s\n"
 msgstr "注意：私钥 %s 已于 %s 过期\n"
 
-#: g10/pubkey-enc.c:422
+#: g10/pubkey-enc.c:436
 #, c-format
 msgid "Note: key has been revoked"
 msgstr "注意：密钥已被吊销"
@@ -6506,44 +6513,44 @@
 msgid "%s key %s requires a %zu bit or larger hash (hash is %s)\n"
 msgstr "%s 密钥 %s 要求一个 %zu 位或更长的散列（散列是 %s）\n"
 
-#: g10/sig-check.c:156
+#: g10/sig-check.c:161
 #, c-format
 msgid "WARNING: signature digest conflict in message\n"
 msgstr "警告：签名散列值与报文不一致\n"
 
-#: g10/sig-check.c:167 g10/sign.c:294 sm/sign.c:496 sm/verify.c:465
+#: g10/sig-check.c:172 g10/sign.c:401 sm/sign.c:496 sm/verify.c:465
 #, c-format
 msgid "key %s may not be used for signing in %s mode\n"
 msgstr "密钥 %s 在 %s 模式中不适用于签名\n"
 
-#: g10/sig-check.c:194
+#: g10/sig-check.c:199
 #, c-format
 msgid "WARNING: signing subkey %s is not cross-certified\n"
 msgstr "警告：签名的子密钥 %s 未经交叉验证\n"
 
-#: g10/sig-check.c:196
+#: g10/sig-check.c:201
 #, c-format
 msgid "please see %s for more information\n"
 msgstr "请参见 %s 以得到更多信息。\n"
 
-#: g10/sig-check.c:205
+#: g10/sig-check.c:210
 #, c-format
 msgid "WARNING: signing subkey %s has an invalid cross-certification\n"
 msgstr "警告：签名的子密钥 %s 具有无效的交叉验证\n"
 
-#: g10/sig-check.c:326
+#: g10/sig-check.c:331
 #, c-format
 msgid "public key %s is %lu second newer than the signature\n"
 msgid_plural "public key %s is %lu seconds newer than the signature\n"
 msgstr[0] "公钥 %s 在其签名之后的 %lu 秒生成\n"
 
-#: g10/sig-check.c:334
+#: g10/sig-check.c:339
 #, c-format
 msgid "public key %s is %lu day newer than the signature\n"
 msgid_plural "public key %s is %lu days newer than the signature\n"
 msgstr[0] "公钥 %s 在其签名之后的 %lu 天生成\n"
 
-#: g10/sig-check.c:348 g10/sign.c:267
+#: g10/sig-check.c:353 g10/sign.c:361
 #, c-format
 msgid ""
 "key %s was created %lu second in the future (time warp or clock problem)\n"
@@ -6551,7 +6558,7 @@
 "key %s was created %lu seconds in the future (time warp or clock problem)\n"
 msgstr[0] "密钥 %s 生成于未来的 %lu 秒后（可能是因为时空扭曲或系统时钟的问题）\n"
 
-#: g10/sig-check.c:357
+#: g10/sig-check.c:362
 #, c-format
 msgid ""
 "key %s was created %lu day in the future (time warp or clock problem)\n"
@@ -6559,67 +6566,67 @@
 "key %s was created %lu days in the future (time warp or clock problem)\n"
 msgstr[0] "密钥 %s 生成于未来的 %lu 天后（可能是因为时空扭曲或系统时钟的问题）\n"
 
-#: g10/sig-check.c:375
+#: g10/sig-check.c:380
 #, c-format
 msgid "Note: signature key %s expired %s\n"
 msgstr "注意：签名密钥 %s 已于 %s 过期\n"
 
-#: g10/sig-check.c:386
+#: g10/sig-check.c:391
 #, c-format
 msgid "Note: signature key %s has been revoked\n"
 msgstr "注意：签名密钥 %s 已被吊销\n"
 
-#: g10/sig-check.c:556
+#: g10/sig-check.c:561
 #, c-format
 msgid "assuming bad signature from key %s due to an unknown critical bit\n"
 msgstr "假定密钥 %s 的签名由于某个未知的关键位出错而损坏\n"
 
-#: g10/sig-check.c:1139
+#: g10/sig-check.c:1158
 #, c-format
 msgid "key %s: no subkey for subkey revocation signature\n"
 msgstr "密钥 %s：没有用于子密钥吊销签名的子密钥\n"
 
-#: g10/sig-check.c:1142
+#: g10/sig-check.c:1161
 #, c-format
 msgid "key %s: no subkey for subkey binding signature\n"
 msgstr "密钥 %s：没有用于子密钥绑定签名的子密钥\n"
 
-#: g10/sign.c:89
+#: g10/sign.c:96
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand notation (too large).  Using unexpanded.\n"
 msgstr "警告：注记 %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:115
+#: g10/sign.c:122
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand policy URL (too large).  Using unexpanded.\n"
 msgstr "警告：策略 URL  %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:138
+#: g10/sign.c:145
 #, c-format
 msgid ""
 "WARNING: unable to %%-expand preferred keyserver URL (too large).  Using "
 "unexpanded.\n"
 msgstr "警告：首选公钥服务器 URL %% 无法扩展（过大）。现在使用未扩展的。\n"
 
-#: g10/sign.c:363
+#: g10/sign.c:470
 #, c-format
 msgid "%s/%s signature from: \"%s\"\n"
 msgstr "%s/%s 签名来自：“%s”\n"
 
-#: g10/sign.c:922
+#: g10/sign.c:1033
 #, c-format
 msgid ""
 "WARNING: forcing digest algorithm %s (%d) violates recipient preferences\n"
 msgstr "警告：强制摘要算法 %s (%d) 与接收者的偏好设置冲突\n"
 
-#: g10/sign.c:1053
+#: g10/sign.c:1164
 #, c-format
 msgid "signing:"
 msgstr "正在签名："
 
-#: g10/sign.c:1330
+#: g10/sign.c:1441
 #, c-format
 msgid "%s encryption will be used\n"
 msgstr "%s 加密将被采用\n"
@@ -6644,7 +6651,7 @@
 "this is a PGP generated Elgamal key which is not secure for signatures!"
 msgstr "这是一个由 PGP 生成的 ElGamal 密钥，其用于签名时不安全！"
 
-#: g10/tdbdump.c:57 g10/trustdb.c:370
+#: g10/tdbdump.c:57 g10/trustdb.c:384
 #, c-format
 msgid "trust record %lu, type %d: write failed: %s\n"
 msgstr "信任记录 %lu，类别 %d：写入失败：%s\n"
@@ -6689,7 +6696,7 @@
 msgid "read error in '%s': %s\n"
 msgstr "读取‘%s’时出现错误：%s\n"
 
-#: g10/tdbdump.c:234 g10/trustdb.c:385
+#: g10/tdbdump.c:234 g10/trustdb.c:399
 #, c-format
 msgid "trustdb: sync failed: %s\n"
 msgstr "信任度数据库：sync 失败：%s\n"
@@ -6724,7 +6731,7 @@
 msgid "%s: directory does not exist!\n"
 msgstr "%s：目录不存在！\n"
 
-#: g10/tdbio.c:739 dirmngr/http.c:593 dirmngr/http.c:622
+#: g10/tdbio.c:739 dirmngr/http.c:594 dirmngr/http.c:623
 #, c-format
 msgid "can't access '%s': %s\n"
 msgstr "无法访问‘%s’：%s\n"
@@ -7203,125 +7210,125 @@
 msgid "error setting policy for key %s, user id \"%s\": %s"
 msgstr "设置密钥 %s 的策略时出现错误， 用户标识 “%s”：%s"
 
-#: g10/trustdb.c:217
+#: g10/trustdb.c:232
 #, c-format
 msgid "'%s' is not a valid long keyID\n"
 msgstr "‘%s’不是一个有效的长格式 keyID\n"
 
-#: g10/trustdb.c:243
+#: g10/trustdb.c:255
 #, c-format
 msgid "key %s: accepted as trusted key\n"
 msgstr "密钥 %s：接受为受信任的密钥\n"
 
-#: g10/trustdb.c:281
+#: g10/trustdb.c:293
 #, c-format
 msgid "key %s occurs more than once in the trustdb\n"
 msgstr "密钥 %s 在信任度数据库中出现多于一次\n"
 
-#: g10/trustdb.c:296
+#: g10/trustdb.c:308
 #, c-format
 msgid "key %s: no public key for trusted key - skipped\n"
 msgstr "密钥 %s：受信任的密钥没有公钥 - 已跳过\n"
 
-#: g10/trustdb.c:306
+#: g10/trustdb.c:319
 #, c-format
 msgid "key %s marked as ultimately trusted\n"
 msgstr "密钥 %s 被标记为绝对信任\n"
 
-#: g10/trustdb.c:349
+#: g10/trustdb.c:363
 #, c-format
 msgid "trust record %lu, req type %d: read failed: %s\n"
 msgstr "信任记录 %lu，请求类别 %d：读取失败：%s\n"
 
-#: g10/trustdb.c:355
+#: g10/trustdb.c:369
 #, c-format
 msgid "trust record %lu is not of requested type %d\n"
 msgstr "信任记录 %lu 不属于所请求的类别 %d\n"
 
-#: g10/trustdb.c:430
+#: g10/trustdb.c:444
 #, c-format
 msgid "You may try to re-create the trustdb using the commands:\n"
 msgstr "您可以通过下列命令尝试重建信任度数据库：\n"
 
-#: g10/trustdb.c:439
+#: g10/trustdb.c:453
 #, c-format
 msgid "If that does not work, please consult the manual\n"
 msgstr "如果那样不起作用，请查阅手册。\n"
 
-#: g10/trustdb.c:489
+#: g10/trustdb.c:503
 #, c-format
 msgid "unable to use unknown trust model (%d) - assuming %s trust model\n"
 msgstr "无法使用未知的信任模型（%d）- 假定为 %s 信任模型\n"
 
-#: g10/trustdb.c:495
+#: g10/trustdb.c:509
 #, c-format
 msgid "using %s trust model\n"
 msgstr "使用 %s 信任模型\n"
 
-#: g10/trustdb.c:544
+#: g10/trustdb.c:558
 #, c-format
 msgid "no need for a trustdb check\n"
 msgstr "不需要检查信任度数据库\n"
 
-#: g10/trustdb.c:550 g10/trustdb.c:2241
+#: g10/trustdb.c:564 g10/trustdb.c:2255
 #, c-format
 msgid "next trustdb check due at %s\n"
 msgstr "下次信任度数据库检查将于 %s 进行\n"
 
-#: g10/trustdb.c:559
+#: g10/trustdb.c:573
 #, c-format
 msgid "no need for a trustdb check with '%s' trust model\n"
 msgstr "在‘%s’信任模型下无需进行 trustdb 检查\n"
 
-#: g10/trustdb.c:575
+#: g10/trustdb.c:589
 #, c-format
 msgid "no need for a trustdb update with '%s' trust model\n"
 msgstr "在‘%s’信任模型下无需进行 trustdb 更新\n"
 
-#: g10/trustdb.c:799 g10/trustdb.c:1386
+#: g10/trustdb.c:813 g10/trustdb.c:1400
 #, c-format
 msgid "public key %s not found: %s\n"
 msgstr "公钥 %s 未找到：%s\n"
 
-#: g10/trustdb.c:1019
+#: g10/trustdb.c:1033
 #, c-format
 msgid "please do a --check-trustdb\n"
 msgstr "请执行一次 --check-trustdb\n"
 
-#: g10/trustdb.c:1024
+#: g10/trustdb.c:1038
 #, c-format
 msgid "checking the trustdb\n"
 msgstr "正在检查信任度数据库\n"
 
-#: g10/trustdb.c:1962
+#: g10/trustdb.c:1976
 #, c-format
 msgid "%d key processed"
 msgid_plural "%d keys processed"
 msgstr[0] "已处理 %d 把密钥"
 
-#: g10/trustdb.c:1965
+#: g10/trustdb.c:1979
 #, c-format
 msgid " (%d validity count cleared)\n"
 msgid_plural " (%d validity counts cleared)\n"
 msgstr[0] " （%d 个有效计数已被清除）\n"
 
-#: g10/trustdb.c:2035
+#: g10/trustdb.c:2049
 #, c-format
 msgid "no ultimately trusted keys found\n"
 msgstr "未找到任何绝对信任的密钥\n"
 
-#: g10/trustdb.c:2049
+#: g10/trustdb.c:2063
 #, c-format
 msgid "public key of ultimately trusted key %s not found\n"
 msgstr "绝对信任密钥 %s 的公钥未找到\n"
 
-#: g10/trustdb.c:2167
+#: g10/trustdb.c:2181
 #, c-format
 msgid ""
 "depth: %d  valid: %3d  signed: %3d  trust: %d-, %dq, %dn, %dm, %df, %du\n"
 msgstr "深度：%d  有效性：%3d  已签名：%3d  信任度：%d-，%dq，%dn，%dm，%df，%du\n"
 
-#: g10/trustdb.c:2248
+#: g10/trustdb.c:2262
 #, c-format
 msgid "unable to update trustdb version record: write failed: %s\n"
 msgstr "无法更新信任度数据库版本记录：写入失败：%s\n"
@@ -7401,12 +7408,12 @@
 "请记住签名文件（.sig 或 .asc）应该是\n"
 "在命令行中第一个给定的文件。\n"
 
-#: g10/verify.c:203
+#: g10/verify.c:204
 #, c-format
 msgid "input line %u too long or missing LF\n"
 msgstr "输入行 %u 太长或者行末的 LF 缺失\n"
 
-#: g10/verify.c:252
+#: g10/verify.c:260
 #, c-format
 msgid "can't open fd %d: %s\n"
 msgstr ""
@@ -7431,106 +7438,106 @@
 "语法：kbxutil [选项] [文件]\n"
 "列出、导出或导入钥匙箱数据\n"
 
-#: scd/app-nks.c:718 scd/app-openpgp.c:3510
+#: scd/app-nks.c:745 scd/app-openpgp.c:3560
 #, c-format
 msgid "RSA modulus missing or not of size %d bits\n"
 msgstr "RSA 余数缺失或者不是 %d 位长\n"
 
-#: scd/app-nks.c:726 scd/app-openpgp.c:3522
+#: scd/app-nks.c:753 scd/app-openpgp.c:3572
 #, c-format
 msgid "RSA public exponent missing or larger than %d bits\n"
 msgstr "RSA 公钥指数缺失或长于 %d 位\n"
 
-#: scd/app-nks.c:806 scd/app-openpgp.c:2206 scd/app-openpgp.c:2225
-#: scd/app-openpgp.c:2380 scd/app-openpgp.c:2398 scd/app-openpgp.c:2692
-#: scd/app-openpgp.c:2739 scd/app-openpgp.c:2854 scd/app-dinsig.c:303
+#: scd/app-nks.c:833 scd/app-openpgp.c:2250 scd/app-openpgp.c:2269
+#: scd/app-openpgp.c:2424 scd/app-openpgp.c:2442 scd/app-openpgp.c:2742
+#: scd/app-openpgp.c:2789 scd/app-openpgp.c:2904 scd/app-dinsig.c:303
 #, c-format
 msgid "PIN callback returned error: %s\n"
 msgstr "PIN 回调返回错误：%s\n"
 
-#: scd/app-nks.c:839
+#: scd/app-nks.c:866
 #, c-format
 msgid "the NullPIN has not yet been changed\n"
 msgstr "尚未变更 NullPIN\n"
 
-#: scd/app-nks.c:1100
+#: scd/app-nks.c:1127
 msgid "|N|Please enter a new PIN for the standard keys."
 msgstr "|N|请为标准密钥输入一个新的 PIN。"
 
-#: scd/app-nks.c:1101
+#: scd/app-nks.c:1128
 msgid "||Please enter the PIN for the standard keys."
 msgstr "||请输入标准密钥的 PIN。"
 
-#: scd/app-nks.c:1107
+#: scd/app-nks.c:1134
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请为标准密钥输入一个新的 PIN 解锁码（PUK）。"
 
-#: scd/app-nks.c:1109
+#: scd/app-nks.c:1136
 msgid "|P|Please enter the PIN Unblocking Code (PUK) for the standard keys."
 msgstr "|NP|请输入标准密钥的 PIN 解锁码（PUK）。"
 
-#: scd/app-nks.c:1117
+#: scd/app-nks.c:1144
 msgid "|N|Please enter a new PIN for the key to create qualified signatures."
 msgstr "|N|请为这个密钥输入一个新的 PIN 以创建合格的签名。"
 
-#: scd/app-nks.c:1119
+#: scd/app-nks.c:1146
 msgid "||Please enter the PIN for the key to create qualified signatures."
 msgstr "||请为这个密钥输入 PIN 以创建合格的签名。"
 
-#: scd/app-nks.c:1127
+#: scd/app-nks.c:1154
 msgid ""
 "|NP|Please enter a new PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|NP|请为这个密钥输入一个新的 PIN 解锁码（PUK）以创建合格的签名。"
 
-#: scd/app-nks.c:1129
+#: scd/app-nks.c:1156
 msgid ""
 "|P|Please enter the PIN Unblocking Code (PUK) for the key to create "
 "qualified signatures."
 msgstr "|P|请为这个密钥输入 PIN 解锁码（PUK）以创建合格的签名。"
 
-#: scd/app-nks.c:1236 scd/app-openpgp.c:2773 scd/app-dinsig.c:531
+#: scd/app-nks.c:1263 scd/app-openpgp.c:2823 scd/app-dinsig.c:531
 #, c-format
 msgid "error getting new PIN: %s\n"
 msgstr "获取新 PIN 时出现错误：%s\n"
 
-#: scd/app-openpgp.c:823
+#: scd/app-openpgp.c:827
 #, c-format
 msgid "failed to store the fingerprint: %s\n"
 msgstr "存储指纹失败：%s\n"
 
-#: scd/app-openpgp.c:836
+#: scd/app-openpgp.c:840
 #, c-format
 msgid "failed to store the creation date: %s\n"
 msgstr "存储创建日期失败：%s\n"
 
-#: scd/app-openpgp.c:1197 scd/app-openpgp.c:2720 scd/app-openpgp.c:4887
+#: scd/app-openpgp.c:1231 scd/app-openpgp.c:2770 scd/app-openpgp.c:4936
 #, c-format
 msgid "error retrieving CHV status from card\n"
 msgstr "从卡片中拉取 CHV 状态时出现错误\n"
 
-#: scd/app-openpgp.c:1359
+#: scd/app-openpgp.c:1393
 #, c-format
 msgid "response does not contain the RSA modulus\n"
 msgstr "响应不包含 RSA 余数\n"
 
-#: scd/app-openpgp.c:1366
+#: scd/app-openpgp.c:1400
 #, c-format
 msgid "response does not contain the RSA public exponent\n"
 msgstr "响应不包含 RSA 公钥指数\n"
 
-#: scd/app-openpgp.c:1476
+#: scd/app-openpgp.c:1510
 #, c-format
 msgid "response does not contain the EC public key\n"
 msgstr "响应不包含 EC 公钥\n"
 
-#: scd/app-openpgp.c:1576 scd/app-openpgp.c:4128
+#: scd/app-openpgp.c:1610 scd/app-openpgp.c:4178
 #, c-format
 msgid "response does not contain the public key data\n"
 msgstr "响应不包含公钥数据\n"
 
-#: scd/app-openpgp.c:1676
+#: scd/app-openpgp.c:1710
 #, c-format
 msgid "reading public key failed: %s\n"
 msgstr "读取公钥失败：%s\n"
@@ -7538,54 +7545,54 @@
 #. TRANSLATORS: Put a \x1f right before a colon.  This can be
 #. * used by pinentry to nicely align the names and values.  Keep
 #. * the %s at the start and end of the string.
-#: scd/app-openpgp.c:2017
+#: scd/app-openpgp.c:2064
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%%0ACounter: %lu%s"
 msgstr "%s数字: %s%%0A持有者: %s%%0A计数: %lu%s"
 
-#: scd/app-openpgp.c:2030
+#: scd/app-openpgp.c:2077
 #, c-format
 msgid "%sNumber: %s%%0AHolder: %s%s"
 msgstr "%s数字: %s%%0A持有者: %s%s"
 
 #. TRANSLATORS: This is the number of remaining attempts to
 #. * enter a PIN.  Use %%0A (double-percent,0A) for a linefeed.
-#: scd/app-openpgp.c:2046
+#: scd/app-openpgp.c:2093
 #, c-format
 msgid "Remaining attempts: %d"
 msgstr "剩余尝试：%d"
 
-#: scd/app-openpgp.c:2160
+#: scd/app-openpgp.c:2204
 #, c-format
 msgid "using default PIN as %s\n"
 msgstr "使用默认 PIN 作为 %s\n"
 
-#: scd/app-openpgp.c:2167
+#: scd/app-openpgp.c:2211
 #, c-format
 msgid "failed to use default PIN as %s: %s - disabling further default use\n"
 msgstr "使用默认 PIN 作为 %s 失败：%s - 禁用进一步的默认使用\n"
 
-#: scd/app-openpgp.c:2180
+#: scd/app-openpgp.c:2224
 msgid "||Please unlock the card"
 msgstr "||请解锁卡片"
 
-#: scd/app-openpgp.c:2232 scd/app-openpgp.c:2405 scd/app-openpgp.c:2699
+#: scd/app-openpgp.c:2276 scd/app-openpgp.c:2449 scd/app-openpgp.c:2749
 #, c-format
 msgid "PIN for CHV%d is too short; minimum length is %d\n"
 msgstr "CHV%d 的 PIN 太短；最小长度为 %d\n"
 
-#: scd/app-openpgp.c:2246 scd/app-openpgp.c:2286 scd/app-openpgp.c:2419
-#: scd/app-openpgp.c:4430
+#: scd/app-openpgp.c:2290 scd/app-openpgp.c:2330 scd/app-openpgp.c:2463
+#: scd/app-openpgp.c:4479
 #, c-format
 msgid "verify CHV%d failed: %s\n"
 msgstr "验证 CHV%d 失败：%s\n"
 
-#: scd/app-openpgp.c:2315 scd/app-openpgp.c:4896
+#: scd/app-openpgp.c:2359 scd/app-openpgp.c:4945
 #, c-format
 msgid "card is permanently locked!\n"
 msgstr "卡片被永久锁定！\n"
 
-#: scd/app-openpgp.c:2319
+#: scd/app-openpgp.c:2363
 #, c-format
 msgid "%d Admin PIN attempt remaining before card is permanently locked\n"
 msgid_plural ""
@@ -7594,24 +7601,24 @@
 
 #. TRANSLATORS: Do not translate the "|A|" prefix but keep it at
 #. the start of the string.  Use %0A (single percent) for a linefeed.
-#: scd/app-openpgp.c:2329
+#: scd/app-openpgp.c:2373
 msgid "|A|Please enter the Admin PIN"
 msgstr "|A|请输入管理员 PIN"
 
-#: scd/app-openpgp.c:2351
+#: scd/app-openpgp.c:2395
 #, c-format
 msgid "access to admin commands is not configured\n"
 msgstr "未配置到管理员命令的访问\n"
 
-#: scd/app-openpgp.c:2686
+#: scd/app-openpgp.c:2736
 msgid "||Please enter the PIN"
 msgstr "||请输入 PIN"
 
-#: scd/app-openpgp.c:2735
+#: scd/app-openpgp.c:2785
 msgid "||Please enter the Reset Code for the card"
 msgstr "||请输入卡片的重置代码"
 
-#: scd/app-openpgp.c:2745 scd/app-openpgp.c:2806
+#: scd/app-openpgp.c:2795 scd/app-openpgp.c:2856
 #, c-format
 msgid "Reset Code is too short; minimum length is %d\n"
 msgstr "重置代码太短；最小长度为 %d\n"
@@ -7619,119 +7626,119 @@
 #. TRANSLATORS: Do not translate the "|*|" prefixes but
 #. keep it at the start of the string.  We need this elsewhere
 #. to get some infos on the string.
-#: scd/app-openpgp.c:2768
+#: scd/app-openpgp.c:2818
 msgid "|RN|New Reset Code"
 msgstr "|RN|新的重置代码"
 
-#: scd/app-openpgp.c:2769
+#: scd/app-openpgp.c:2819
 msgid "|AN|New Admin PIN"
 msgstr "|AN|新的管理员 PIN"
 
-#: scd/app-openpgp.c:2769
+#: scd/app-openpgp.c:2819
 msgid "|N|New PIN"
 msgstr "|N|新的 PIN"
 
-#: scd/app-openpgp.c:2850
+#: scd/app-openpgp.c:2900
 msgid "||Please enter the Admin PIN and New Admin PIN"
 msgstr "||请输入原管理员 PIN 和新管理员 PIN"
 
-#: scd/app-openpgp.c:2851
+#: scd/app-openpgp.c:2901
 msgid "||Please enter the PIN and New PIN"
 msgstr "||请输入原 PIN 和新 PIN"
 
-#: scd/app-openpgp.c:2913 scd/app-openpgp.c:4188
+#: scd/app-openpgp.c:2963 scd/app-openpgp.c:4238
 #, c-format
 msgid "error reading application data\n"
 msgstr "读取应用程序数据时出错\n"
 
-#: scd/app-openpgp.c:2919 scd/app-openpgp.c:4195
+#: scd/app-openpgp.c:2969 scd/app-openpgp.c:4245
 #, c-format
 msgid "error reading fingerprint DO\n"
 msgstr "读取指纹 DO 时出现错误\n"
 
-#: scd/app-openpgp.c:2929
+#: scd/app-openpgp.c:2979
 #, c-format
 msgid "key already exists\n"
 msgstr "密钥已存在\n"
 
-#: scd/app-openpgp.c:2933
+#: scd/app-openpgp.c:2983
 #, c-format
 msgid "existing key will be replaced\n"
 msgstr "现有的密钥将被替换\n"
 
-#: scd/app-openpgp.c:2935
+#: scd/app-openpgp.c:2985
 #, c-format
 msgid "generating new key\n"
 msgstr "生成新密钥\n"
 
-#: scd/app-openpgp.c:2937
+#: scd/app-openpgp.c:2987
 #, c-format
 msgid "writing new key\n"
 msgstr "正在写入新密钥\n"
 
-#: scd/app-openpgp.c:3491 scd/app-openpgp.c:3842
+#: scd/app-openpgp.c:3541 scd/app-openpgp.c:3892
 #, c-format
 msgid "creation timestamp missing\n"
 msgstr "缺少创建时间戳\n"
 
-#: scd/app-openpgp.c:3532 scd/app-openpgp.c:3540
+#: scd/app-openpgp.c:3582 scd/app-openpgp.c:3590
 #, c-format
 msgid "RSA prime %s missing or not of size %d bits\n"
 msgstr "RSA 质数 %s 缺失或者不是 %d 位长\n"
 
-#: scd/app-openpgp.c:3673 scd/app-openpgp.c:3948
+#: scd/app-openpgp.c:3723 scd/app-openpgp.c:3998
 #, c-format
 msgid "failed to store the key: %s\n"
 msgstr "存储密钥失败：%s\n"
 
-#: scd/app-openpgp.c:3836
+#: scd/app-openpgp.c:3886
 #, c-format
 msgid "unsupported curve\n"
 msgstr "不支持的曲线\n"
 
-#: scd/app-openpgp.c:4105
+#: scd/app-openpgp.c:4155
 #, c-format
 msgid "please wait while key is being generated ...\n"
 msgstr "请等待密钥生成…\n"
 
-#: scd/app-openpgp.c:4113
+#: scd/app-openpgp.c:4163
 #, c-format
 msgid "generating key failed\n"
 msgstr "生成密钥失败\n"
 
-#: scd/app-openpgp.c:4119
+#: scd/app-openpgp.c:4169
 #, c-format
 msgid "key generation completed (%d second)\n"
 msgid_plural "key generation completed (%d seconds)\n"
 msgstr[0] "密钥生成完成（%d 秒）\n"
 
-#: scd/app-openpgp.c:4153
+#: scd/app-openpgp.c:4203
 #, c-format
 msgid "invalid structure of OpenPGP card (DO 0x93)\n"
 msgstr "无效的 OpenPGP 卡结构（DO 0x93）\n"
 
-#: scd/app-openpgp.c:4203
+#: scd/app-openpgp.c:4253
 #, c-format
 msgid "fingerprint on card does not match requested one\n"
 msgstr "卡片上的指纹与请求的不匹配\n"
 
-#: scd/app-openpgp.c:4319
+#: scd/app-openpgp.c:4368
 #, c-format
 msgid "card does not support digest algorithm %s\n"
 msgstr "卡片不支持摘要算法 %s\n"
 
-#: scd/app-openpgp.c:4404
+#: scd/app-openpgp.c:4453
 #, c-format
 msgid "signatures created so far: %lu\n"
 msgstr "目前已创建的签名：%lu\n"
 
-#: scd/app-openpgp.c:4901
+#: scd/app-openpgp.c:4950
 #, c-format
 msgid ""
 "verification of Admin PIN is currently prohibited through this command\n"
 msgstr "目前禁止通过此命令验证管理员 PIN\n"
 
-#: scd/app-openpgp.c:5213 scd/app-openpgp.c:5224
+#: scd/app-openpgp.c:5262 scd/app-openpgp.c:5273
 #, c-format
 msgid "can't access %s - invalid OpenPGP card?\n"
 msgstr "不能访问 %s - 无效的 OpenPGP 卡？\n"
@@ -7747,55 +7754,55 @@
 msgid "|N|Initial New PIN"
 msgstr "|N|初始化新 PIN"
 
-#: scd/scdaemon.c:117
+#: scd/scdaemon.c:118
 msgid "run in multi server mode (foreground)"
 msgstr "正在以多服务器模式运行（前台）"
 
-#: scd/scdaemon.c:127 sm/gpgsm.c:341 dirmngr/dirmngr.c:185
+#: scd/scdaemon.c:128 sm/gpgsm.c:343 dirmngr/dirmngr.c:186
 msgid "|LEVEL|set the debugging level to LEVEL"
 msgstr "|LEVEL|设置调试级别至 LEVEL"
 
-#: scd/scdaemon.c:134 tools/gpgconf-comp.c:664
+#: scd/scdaemon.c:135 tools/gpgconf-comp.c:664
 msgid "|FILE|write a log to FILE"
 msgstr "|FILE|将日志写入 FILE"
 
-#: scd/scdaemon.c:136
+#: scd/scdaemon.c:137
 msgid "|N|connect to reader at port N"
 msgstr "|N|连接到端口 N 上的读卡器"
 
-#: scd/scdaemon.c:138
+#: scd/scdaemon.c:139
 msgid "|NAME|use NAME as ct-API driver"
 msgstr "|NAME|使用 NAME 作为 ct-API 驱动"
 
-#: scd/scdaemon.c:140
+#: scd/scdaemon.c:141
 msgid "|NAME|use NAME as PC/SC driver"
 msgstr "|NAME|使用 NAME 作为 PC/SC 驱动"
 
-#: scd/scdaemon.c:143
+#: scd/scdaemon.c:144
 msgid "do not use the internal CCID driver"
 msgstr "不使用内置的 CCID 驱动"
 
-#: scd/scdaemon.c:149
+#: scd/scdaemon.c:150
 msgid "|N|disconnect the card after N seconds of inactivity"
 msgstr "|N|在 N 秒的不活跃之后断开卡片的连接"
 
-#: scd/scdaemon.c:152
+#: scd/scdaemon.c:153
 msgid "do not use a reader's pinpad"
 msgstr "不使用读卡器的小键盘"
 
-#: scd/scdaemon.c:157
+#: scd/scdaemon.c:158
 msgid "deny the use of admin card commands"
 msgstr "拒绝使用卡片的管理员命令"
 
-#: scd/scdaemon.c:160
+#: scd/scdaemon.c:161
 msgid "use variable length input for pinpad"
 msgstr "使用小键盘的变长输入"
 
-#: scd/scdaemon.c:306
+#: scd/scdaemon.c:307
 msgid "Usage: @SCDAEMON@ [options] (-h for help)"
 msgstr "用法：@SCDAEMON@ [选项] (-h 获取帮助)"
 
-#: scd/scdaemon.c:308
+#: scd/scdaemon.c:309
 msgid ""
 "Syntax: scdaemon [options] [command [args]]\n"
 "Smartcard daemon for @GNUPG@\n"
@@ -7803,23 +7810,23 @@
 "语法：scdaemon [选项] [命令 [参数]]\n"
 "@GNUPG@ 智能卡守护进程\n"
 
-#: scd/scdaemon.c:829
+#: scd/scdaemon.c:830
 #, c-format
 msgid ""
 "please use the option '--daemon' to run the program in the background\n"
 msgstr "请使用‘--daemon’选项以在后台运行此程序\n"
 
-#: scd/scdaemon.c:1204 dirmngr/dirmngr.c:2084
+#: scd/scdaemon.c:1205 dirmngr/dirmngr.c:2086
 #, c-format
 msgid "handler for fd %d started\n"
 msgstr "fd %d 的句柄已启动\n"
 
-#: scd/scdaemon.c:1216 dirmngr/dirmngr.c:2092
+#: scd/scdaemon.c:1217 dirmngr/dirmngr.c:2094
 #, c-format
 msgid "handler for fd %d terminated\n"
 msgstr "fd %d 的句柄已关闭\n"
 
-#: sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
+#: g10/call-dirmngr.c:209 sm/call-dirmngr.c:268 tools/gpg-connect-agent.c:2247
 #, c-format
 msgid "no dirmngr running in this session\n"
 msgstr "此会话中没有正在运行的 dirmngr\n"
@@ -7829,11 +7836,11 @@
 msgid "validation model requested by certificate: %s"
 msgstr "证书所请求的验证模型：%s"
 
-#: sm/certchain.c:195 sm/certchain.c:1937
+#: sm/certchain.c:195 sm/certchain.c:2008
 msgid "chain"
 msgstr "链"
 
-#: sm/certchain.c:196 sm/certchain.c:1937
+#: sm/certchain.c:196 sm/certchain.c:2008
 msgid "shell"
 msgstr "外壳"
 
@@ -7866,214 +7873,214 @@
 msgid "certificate policy not allowed"
 msgstr "证书策略不被允许"
 
-#: sm/certchain.c:538
+#: sm/certchain.c:608
 #, c-format
 msgid "looking up issuer at external location\n"
 msgstr "在外部位置查找签发者\n"
 
-#: sm/certchain.c:558
+#: sm/certchain.c:628
 #, c-format
 msgid "number of issuers matching: %d\n"
 msgstr "匹配的签发者数目：%d\n"
 
-#: sm/certchain.c:606
+#: sm/certchain.c:676
 #, c-format
 msgid "looking up issuer from the Dirmngr cache\n"
 msgstr "在 Dirmngr 缓存中查找签发者\n"
 
-#: sm/certchain.c:631
+#: sm/certchain.c:701
 #, c-format
 msgid "number of matching certificates: %d\n"
 msgstr "匹配的证书数：%d\n"
 
-#: sm/certchain.c:634
+#: sm/certchain.c:704
 #, c-format
 msgid "dirmngr cache-only key lookup failed: %s\n"
 msgstr "dirmngr 仅缓存的密钥查找失败：%s\n"
 
-#: sm/certchain.c:833 sm/certchain.c:1327 sm/certchain.c:1965 sm/decrypt.c:265
+#: sm/certchain.c:903 sm/certchain.c:1398 sm/certchain.c:2036 sm/decrypt.c:265
 #: sm/encrypt.c:344 sm/import.c:415 sm/keydb.c:1133 sm/keydb.c:1219
 #: sm/sign.c:337 sm/verify.c:115
 #, c-format
 msgid "failed to allocate keyDB handle\n"
 msgstr "分配 keyDB 句柄时失败\n"
 
-#: sm/certchain.c:999
+#: sm/certchain.c:1069
 msgid "certificate has been revoked"
 msgstr "证书已被吊销"
 
-#: sm/certchain.c:1014
+#: sm/certchain.c:1084
 msgid "the status of the certificate is unknown"
 msgstr "证书的状态未知"
 
-#: sm/certchain.c:1021
+#: sm/certchain.c:1091
 #, c-format
 msgid "please make sure that the \"dirmngr\" is properly installed\n"
 msgstr "请确定“dirmngr”被正确安装\n"
 
-#: sm/certchain.c:1027
+#: sm/certchain.c:1097
 #, c-format
 msgid "checking the CRL failed: %s"
 msgstr "检查 CRL 时失败：%s"
 
-#: sm/certchain.c:1056 sm/certchain.c:1124 dirmngr/validate.c:497
+#: sm/certchain.c:1126 sm/certchain.c:1194 dirmngr/validate.c:497
 #, c-format
 msgid "certificate with invalid validity: %s"
 msgstr "证书的有效期无效：%s"
 
-#: sm/certchain.c:1071 sm/certchain.c:1156 dirmngr/validate.c:515
+#: sm/certchain.c:1141 sm/certchain.c:1226 dirmngr/validate.c:515
 #, c-format
 msgid "certificate not yet valid"
 msgstr "证书尚未验证"
 
-#: sm/certchain.c:1072 sm/certchain.c:1157
+#: sm/certchain.c:1142 sm/certchain.c:1227
 msgid "root certificate not yet valid"
 msgstr "根证书尚未验证"
 
-#: sm/certchain.c:1073 sm/certchain.c:1158
+#: sm/certchain.c:1143 sm/certchain.c:1228
 msgid "intermediate certificate not yet valid"
 msgstr "中间证书尚未验证"
 
-#: sm/certchain.c:1086 dirmngr/validate.c:526
+#: sm/certchain.c:1156 dirmngr/validate.c:526
 #, c-format
 msgid "certificate has expired"
 msgstr "证书已过期"
 
-#: sm/certchain.c:1087
+#: sm/certchain.c:1157
 msgid "root certificate has expired"
 msgstr "根证书已过期"
 
-#: sm/certchain.c:1088
+#: sm/certchain.c:1158
 msgid "intermediate certificate has expired"
 msgstr "中间证书已过期"
 
-#: sm/certchain.c:1130
+#: sm/certchain.c:1200
 #, c-format
 msgid "required certificate attributes missing: %s%s%s"
 msgstr "请求的证书属性缺失：%s%s%s"
 
-#: sm/certchain.c:1139
+#: sm/certchain.c:1209
 msgid "certificate with invalid validity"
 msgstr "证书有效期无效"
 
-#: sm/certchain.c:1176
+#: sm/certchain.c:1246
 msgid "signature not created during lifetime of certificate"
 msgstr "签名不是在证书的有效期内被创建的"
 
-#: sm/certchain.c:1178
+#: sm/certchain.c:1248
 msgid "certificate not created during lifetime of issuer"
 msgstr "签名不是在签发者的有效期内被创建的"
 
-#: sm/certchain.c:1179
+#: sm/certchain.c:1249
 msgid "intermediate certificate not created during lifetime of issuer"
 msgstr "中间证书不是在签发者的有效期内被创建的"
 
-#: sm/certchain.c:1183
+#: sm/certchain.c:1253
 #, c-format
 msgid "  (  signature created at "
 msgstr "  （  签名创建于 "
 
-#: sm/certchain.c:1184
+#: sm/certchain.c:1254
 #, c-format
 msgid "  (certificate created at "
 msgstr "  （证书创建于 "
 
-#: sm/certchain.c:1187
+#: sm/certchain.c:1257
 #, c-format
 msgid "  (certificate valid from "
 msgstr "  （证书有效期从 "
 
-#: sm/certchain.c:1188
+#: sm/certchain.c:1258
 #, c-format
 msgid "  (     issuer valid from "
 msgstr "  （    签发者有效期从 "
 
-#: sm/certchain.c:1218 dirmngr/validate.c:577
+#: sm/certchain.c:1288 dirmngr/validate.c:577
 #, c-format
 msgid "fingerprint=%s\n"
 msgstr "指纹 = %s\n"
 
-#: sm/certchain.c:1227
+#: sm/certchain.c:1297
 #, c-format
 msgid "root certificate has now been marked as trusted\n"
 msgstr "根证书现已被标记为信任\n"
 
-#: sm/certchain.c:1240
+#: sm/certchain.c:1310
 #, c-format
 msgid "interactive marking as trusted not enabled in gpg-agent\n"
 msgstr "交互式标记为信任未在 gpg-agent 中开启\n"
 
-#: sm/certchain.c:1246
+#: sm/certchain.c:1316
 #, c-format
 msgid "interactive marking as trusted disabled for this session\n"
 msgstr "交互式标记为信任在此会话中被关闭\n"
 
-#: sm/certchain.c:1304
+#: sm/certchain.c:1375
 msgid "WARNING: creation time of signature not known - assuming current time"
 msgstr "警告：签名的创建时间未知 - 猜测为当前时间"
 
-#: sm/certchain.c:1368
+#: sm/certchain.c:1439
 msgid "no issuer found in certificate"
 msgstr "证书中没有找到签发者"
 
-#: sm/certchain.c:1446
+#: sm/certchain.c:1517
 msgid "self-signed certificate has a BAD signature"
 msgstr "自签名证书具有损坏的签名"
 
-#: sm/certchain.c:1515 dirmngr/validate.c:575
+#: sm/certchain.c:1586 dirmngr/validate.c:575
 #, c-format
 msgid "root certificate is not marked trusted"
 msgstr "根证书未被标记为信任"
 
-#: sm/certchain.c:1531
+#: sm/certchain.c:1602
 #, c-format
 msgid "checking the trust list failed: %s\n"
 msgstr "检查信任列表时失败：%s\n"
 
-#: sm/certchain.c:1562 sm/import.c:176 dirmngr/validate.c:630
+#: sm/certchain.c:1633 sm/import.c:176 dirmngr/validate.c:630
 #, c-format
 msgid "certificate chain too long\n"
 msgstr "证书链过长\n"
 
-#: sm/certchain.c:1574 dirmngr/validate.c:642
+#: sm/certchain.c:1645 dirmngr/validate.c:642
 #, c-format
 msgid "issuer certificate not found"
 msgstr "签发者证书未找到"
 
-#: sm/certchain.c:1607 dirmngr/validate.c:668
+#: sm/certchain.c:1678 dirmngr/validate.c:668
 #, c-format
 msgid "certificate has a BAD signature"
 msgstr "证书具有损坏的签名"
 
-#: sm/certchain.c:1639 dirmngr/validate.c:692
+#: sm/certchain.c:1710 dirmngr/validate.c:692
 msgid "found another possible matching CA certificate - trying again"
 msgstr "找到另一个可能匹配的 CA 证书 - 正在重试"
 
-#: sm/certchain.c:1698 dirmngr/validate.c:717
+#: sm/certchain.c:1769 dirmngr/validate.c:717
 #, c-format
 msgid "certificate chain longer than allowed by CA (%d)"
 msgstr "证书链长于 CA 允许的长度（%d）"
 
-#: sm/certchain.c:1740 sm/certchain.c:2036 dirmngr/validate.c:747
+#: sm/certchain.c:1811 sm/certchain.c:2107 dirmngr/validate.c:747
 #, c-format
 msgid "certificate is good\n"
 msgstr "证书有效\n"
 
-#: sm/certchain.c:1741
+#: sm/certchain.c:1812
 #, c-format
 msgid "intermediate certificate is good\n"
 msgstr "中间证书有效\n"
 
-#: sm/certchain.c:1742
+#: sm/certchain.c:1813
 #, c-format
 msgid "root certificate is good\n"
 msgstr "根证书良好\n"
 
-#: sm/certchain.c:1924
+#: sm/certchain.c:1995
 msgid "switching to chain model"
 msgstr "正在切换为链模型"
 
-#: sm/certchain.c:1933
+#: sm/certchain.c:2004
 #, c-format
 msgid "validation model used: %s"
 msgstr "使用的验证模型：%s"
@@ -8258,7 +8265,7 @@
 "you just created once more.\n"
 msgstr "要完成此证书请求，请再次输入您刚才创建的密钥的密码\n"
 
-#: g10/card-util.c:1426 sm/certreqgen-ui.c:158
+#: g10/card-util.c:1457 sm/certreqgen-ui.c:158
 #, c-format
 msgid "   (%d) RSA\n"
 msgstr "   (%d) RSA\n"
@@ -8273,49 +8280,50 @@
 msgid "   (%d) Existing key from card\n"
 msgstr "   (%d) 卡片上现存的密钥\n"
 
+#: g10/keygen.c:2104 g10/keygen.c:2114 g10/keygen.c:3213 g10/keygen.c:3224
 #: sm/certreqgen-ui.c:230 sm/certreqgen-ui.c:239
 #, c-format
 msgid "error reading the card: %s\n"
 msgstr "读取卡片时出现错误：%s\n"
 
-#: sm/certreqgen-ui.c:233
+#: g10/keygen.c:2108 g10/keygen.c:3217 sm/certreqgen-ui.c:233
 #, c-format
 msgid "Serial number of the card: %s\n"
 msgstr "卡片的序列号：%s\n"
 
-#: sm/certreqgen-ui.c:245
+#: g10/keygen.c:2121 sm/certreqgen-ui.c:245
 msgid "Available keys:\n"
 msgstr "可用的密钥：\n"
 
-#: sm/certreqgen-ui.c:296
+#: sm/certreqgen-ui.c:318
 #, c-format
 msgid "Possible actions for a %s key:\n"
 msgstr "%s 密钥可能的操作：\n"
 
-#: sm/certreqgen-ui.c:297
+#: sm/certreqgen-ui.c:319
 #, c-format
 msgid "   (%d) sign, encrypt\n"
 msgstr "   (%d) 签名，加密\n"
 
-#: sm/certreqgen-ui.c:298
+#: sm/certreqgen-ui.c:320
 #, c-format
 msgid "   (%d) sign\n"
 msgstr "   (%d) 签名\n"
 
-#: sm/certreqgen-ui.c:299
+#: sm/certreqgen-ui.c:321
 #, c-format
 msgid "   (%d) encrypt\n"
 msgstr "   (%d) 加密\n"
 
-#: sm/certreqgen-ui.c:323
+#: sm/certreqgen-ui.c:345
 msgid "Enter the X.509 subject name: "
 msgstr "输入 X.509 主题名称： "
 
-#: sm/certreqgen-ui.c:327
+#: sm/certreqgen-ui.c:349
 msgid "No subject name given\n"
 msgstr "未指定主题名称\n"
 
-#: sm/certreqgen-ui.c:331
+#: sm/certreqgen-ui.c:353
 #, c-format
 msgid "Invalid subject name label '%.*s'\n"
 msgstr "无效的主题名称标签‘%.*s’\n"
@@ -8325,64 +8333,64 @@
 #. adjust it do the length of your translation.  The
 #. second string is merely passed to atoi so you can
 #. drop everything after the number.
-#: sm/certreqgen-ui.c:340
+#: sm/certreqgen-ui.c:362
 #, c-format
 msgid "Invalid subject name '%s'\n"
 msgstr "无效的主题名称‘%s’\n"
 
-#: sm/certreqgen-ui.c:342
+#: sm/certreqgen-ui.c:364
 msgid "22 translator: see certreg-ui.c:gpgsm_gencertreq_tty"
 msgstr ""
 
-#: sm/certreqgen-ui.c:354
+#: sm/certreqgen-ui.c:376
 msgid "Enter email addresses"
 msgstr "输入电子邮件地址"
 
-#: sm/certreqgen-ui.c:355
+#: sm/certreqgen-ui.c:377
 msgid " (end with an empty line):\n"
 msgstr " （以空白行结束）：\n"
 
-#: sm/certreqgen-ui.c:359
+#: sm/certreqgen-ui.c:381
 msgid "Enter DNS names"
 msgstr "输入 DNS 名称"
 
-#: sm/certreqgen-ui.c:360 sm/certreqgen-ui.c:365
+#: sm/certreqgen-ui.c:382 sm/certreqgen-ui.c:387
 msgid " (optional; end with an empty line):\n"
 msgstr " （可选；以空白行结束）：\n"
 
-#: sm/certreqgen-ui.c:364
+#: sm/certreqgen-ui.c:386
 msgid "Enter URIs"
 msgstr "输入 URI"
 
-#: sm/certreqgen-ui.c:371
+#: sm/certreqgen-ui.c:393
 msgid "Create self-signed certificate? (y/N) "
 msgstr "创建自签名证书？ (y/N) "
 
-#: sm/certreqgen-ui.c:398
+#: sm/certreqgen-ui.c:420
 msgid "These parameters are used:\n"
 msgstr "这些参数被使用：\n"
 
-#: sm/certreqgen-ui.c:416
+#: sm/certreqgen-ui.c:438
 msgid "Now creating self-signed certificate.  "
 msgstr "现在正在创建自签名证书。  "
 
-#: sm/certreqgen-ui.c:418
+#: sm/certreqgen-ui.c:440
 msgid "Now creating certificate request.  "
 msgstr "已创建证书请求。  "
 
-#: sm/certreqgen-ui.c:419
+#: sm/certreqgen-ui.c:441
 msgid "This may take a while ...\n"
 msgstr "这可能需要等一会儿...\n"
 
-#: sm/certreqgen-ui.c:430
+#: sm/certreqgen-ui.c:452
 msgid "Ready.\n"
 msgstr "就绪。\n"
 
-#: sm/certreqgen-ui.c:433
+#: sm/certreqgen-ui.c:455
 msgid "Ready.  You should now send this request to your CA.\n"
 msgstr "就绪。您现在应该将此请求发送给您的 CA。\n"
 
-#: sm/certreqgen-ui.c:439
+#: sm/certreqgen-ui.c:461
 #, c-format
 msgid "resource problem: out of core\n"
 msgstr ""
@@ -8427,123 +8435,123 @@
 msgid "no valid recipients given\n"
 msgstr "未指定有效的接收者\n"
 
-#: sm/gpgsm.c:211
+#: sm/gpgsm.c:213
 msgid "list external keys"
 msgstr "列出外部密钥"
 
-#: sm/gpgsm.c:213
+#: sm/gpgsm.c:215
 msgid "list certificate chain"
 msgstr "列出证书链"
 
-#: sm/gpgsm.c:221
+#: sm/gpgsm.c:223
 msgid "import certificates"
 msgstr "导入证书"
 
-#: sm/gpgsm.c:222
+#: sm/gpgsm.c:224
 msgid "export certificates"
 msgstr "导出证书"
 
-#: sm/gpgsm.c:230
+#: sm/gpgsm.c:232
 msgid "register a smartcard"
 msgstr "注册一张智能卡"
 
-#: sm/gpgsm.c:233
+#: sm/gpgsm.c:235
 msgid "pass a command to the dirmngr"
 msgstr "传递一条命令给 dirmngr"
 
-#: sm/gpgsm.c:235
+#: sm/gpgsm.c:237
 msgid "invoke gpg-protect-tool"
 msgstr "调用 gpg-protect-tool"
 
-#: sm/gpgsm.c:252
+#: sm/gpgsm.c:254
 msgid "create base-64 encoded output"
 msgstr "创建 base-64 编码的输出"
 
-#: sm/gpgsm.c:261
+#: sm/gpgsm.c:263
 msgid "assume input is in PEM format"
 msgstr "假定输入的是 PEM 格式"
 
-#: sm/gpgsm.c:263
+#: sm/gpgsm.c:265
 msgid "assume input is in base-64 format"
 msgstr "假定输入的是 base-64 格式"
 
-#: sm/gpgsm.c:265
+#: sm/gpgsm.c:267
 msgid "assume input is in binary format"
 msgstr "假定输入的是二进制格式"
 
-#: sm/gpgsm.c:272
+#: sm/gpgsm.c:274
 msgid "never consult a CRL"
 msgstr "从不查询 CRL"
 
-#: sm/gpgsm.c:282
+#: sm/gpgsm.c:284
 msgid "check validity using OCSP"
 msgstr "使用 OCSP 检查有效性"
 
-#: sm/gpgsm.c:287
+#: sm/gpgsm.c:289
 msgid "|N|number of certificates to include"
 msgstr "|N|要包含的证书数目"
 
-#: sm/gpgsm.c:290
+#: sm/gpgsm.c:292
 msgid "|FILE|take policy information from FILE"
 msgstr "|FILE|从 FILE 处获取策略信息"
 
-#: sm/gpgsm.c:293
+#: sm/gpgsm.c:295
 msgid "do not check certificate policies"
 msgstr "不检查证书策略"
 
-#: sm/gpgsm.c:297
+#: sm/gpgsm.c:299
 msgid "fetch missing issuer certificates"
 msgstr "获取缺失的签发者证书"
 
-#: sm/gpgsm.c:308
+#: sm/gpgsm.c:310
 msgid "don't use the terminal at all"
 msgstr "始终不使用终端"
 
-#: sm/gpgsm.c:310
+#: sm/gpgsm.c:312
 msgid "|FILE|write a server mode log to FILE"
 msgstr "|FILE|将服务器模式的日志写入到 FILE"
 
-#: sm/gpgsm.c:315
+#: sm/gpgsm.c:317
 msgid "|FILE|write an audit log to FILE"
 msgstr "|FILE|将审计日志写入 FILE"
 
-#: sm/gpgsm.c:318
+#: sm/gpgsm.c:320
 msgid "batch mode: never ask"
 msgstr "批处理模式：永不询问"
 
-#: sm/gpgsm.c:319
+#: sm/gpgsm.c:321
 msgid "assume yes on most questions"
 msgstr "在多数问题上假定回答为是"
 
-#: sm/gpgsm.c:320
+#: sm/gpgsm.c:322
 msgid "assume no on most questions"
 msgstr "在多数问题上假定回答为否"
 
-#: sm/gpgsm.c:323
+#: sm/gpgsm.c:325
 msgid "|FILE|add keyring to the list of keyrings"
 msgstr "|FILE|添加钥匙环到钥匙环列表"
 
-#: sm/gpgsm.c:326
+#: sm/gpgsm.c:328
 msgid "|USER-ID|use USER-ID as default secret key"
 msgstr "|USER-ID|使用 USER-ID 作为默认的私钥"
 
-#: sm/gpgsm.c:336 tools/gpgconf-comp.c:831
+#: sm/gpgsm.c:338 tools/gpgconf-comp.c:837
 msgid "|SPEC|use this keyserver to lookup keys"
 msgstr "|SPEC|使用此公钥服务器来查找密钥"
 
-#: sm/gpgsm.c:353
+#: sm/gpgsm.c:355
 msgid "|NAME|use cipher algorithm NAME"
 msgstr "|NAME|使用名称为 NAME 的密文算法"
 
-#: sm/gpgsm.c:355
+#: sm/gpgsm.c:357
 msgid "|NAME|use message digest algorithm NAME"
 msgstr "|NAME|使用以 NAME 命名的信息摘要算法"
 
-#: sm/gpgsm.c:562
+#: sm/gpgsm.c:564
 msgid "Usage: @GPGSM@ [options] [files] (-h for help)"
 msgstr "用法：@GPGSM@ [选项] [文件] (-h 获取帮助)"
 
-#: sm/gpgsm.c:565
+#: sm/gpgsm.c:567
 msgid ""
 "Syntax: @GPGSM@ [options] [files]\n"
 "Sign, check, encrypt or decrypt using the S/MIME protocol\n"
@@ -8553,47 +8561,47 @@
 "使用 S/MIME 协议以签名、检查、加密或者解密\n"
 "默认操作取决于输入的数据\n"
 
-#: sm/gpgsm.c:769
+#: sm/gpgsm.c:771
 #, c-format
 msgid "Note: won't be able to encrypt to '%s': %s\n"
 msgstr "注意：将不加密给‘%s’：%s\n"
 
-#: sm/gpgsm.c:780
+#: sm/gpgsm.c:782
 #, c-format
 msgid "unknown validation model '%s'\n"
 msgstr "未知的验证模型‘%s’\n"
 
-#: sm/gpgsm.c:831 dirmngr/ldapserver.c:86
+#: sm/gpgsm.c:833 dirmngr/ldapserver.c:86
 #, c-format
 msgid "%s:%u: no hostname given\n"
 msgstr "%s:%u: 未指定主机名\n"
 
-#: sm/gpgsm.c:850 dirmngr/ldapserver.c:105
+#: sm/gpgsm.c:852 dirmngr/ldapserver.c:105
 #, c-format
 msgid "%s:%u: password given without user\n"
 msgstr "%s:%u: 给定密码但未给定用户\n"
 
-#: sm/gpgsm.c:871 dirmngr/ldapserver.c:126
+#: sm/gpgsm.c:873 dirmngr/ldapserver.c:126
 #, c-format
 msgid "%s:%u: skipping this line\n"
 msgstr "%s:%u: 正在跳过此行\n"
 
-#: sm/gpgsm.c:1441
+#: sm/gpgsm.c:1443
 #, c-format
 msgid "could not parse keyserver\n"
 msgstr "无法解析公钥服务器\n"
 
-#: sm/gpgsm.c:1703
+#: sm/gpgsm.c:1705
 #, c-format
 msgid "importing common certificates '%s'\n"
 msgstr "正在导入通用证书‘%s’\n"
 
-#: sm/gpgsm.c:1746
+#: sm/gpgsm.c:1748
 #, c-format
 msgid "can't sign using '%s': %s\n"
 msgstr "无法使用‘%s’签名：%s\n"
 
-#: sm/gpgsm.c:2113
+#: sm/gpgsm.c:2115
 #, c-format
 msgid "invalid command (there is no implicit command)\n"
 msgstr "无效的命令（不存在隐式的命令）\n"
@@ -8866,17 +8874,17 @@
 msgid "error fetching certificate by S/N: %s\n"
 msgstr "通过 S/N 获取证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1542 dirmngr/certcache.c:1551
+#: dirmngr/certcache.c:1576 dirmngr/certcache.c:1585
 #, c-format
 msgid "error fetching certificate by subject: %s\n"
 msgstr "通过主题获取证书时出现错误：%s\n"
 
-#: dirmngr/certcache.c:1657 dirmngr/validate.c:483
+#: dirmngr/certcache.c:1691 dirmngr/validate.c:483
 #, c-format
 msgid "no issuer found in certificate\n"
 msgstr "没有找到证书的签发者\n"
 
-#: dirmngr/certcache.c:1667
+#: dirmngr/certcache.c:1701
 #, c-format
 msgid "error getting authorityKeyIdentifier: %s\n"
 msgstr "获取 authorityKeyIdentifier 时出现错误：%s\n"
@@ -9374,12 +9382,12 @@
 msgid "error initializing reader object: %s\n"
 msgstr "初始化读取对象时出现错误：%s\n"
 
-#: dirmngr/http.c:3602 dirmngr/ocsp.c:229
+#: dirmngr/http.c:3609 dirmngr/ocsp.c:229
 #, c-format
 msgid "URL '%s' redirected to '%s' (%u)\n"
 msgstr "URL '%s' 重定向到 '%s' (%u)\n"
 
-#: dirmngr/http.c:3608 dirmngr/ocsp.c:246
+#: dirmngr/http.c:3615 dirmngr/ocsp.c:246
 #, c-format
 msgid "too many redirections\n"
 msgstr "过多重定向\n"
@@ -9545,112 +9553,112 @@
 msgid "looking up '%s'\n"
 msgstr "正在查找‘%s’\n"
 
-#: dirmngr/dirmngr.c:169
+#: dirmngr/dirmngr.c:170
 msgid "list the contents of the CRL cache"
 msgstr "列出 CRL 缓存的内容"
 
-#: dirmngr/dirmngr.c:170
+#: dirmngr/dirmngr.c:171
 msgid "|FILE|load CRL from FILE into cache"
 msgstr "|FILE|从 FILE 中加载 CRL 到缓存"
 
-#: dirmngr/dirmngr.c:171
+#: dirmngr/dirmngr.c:172
 msgid "|URL|fetch a CRL from URL"
 msgstr "|URL|从 URL 处获取 CRL"
 
-#: dirmngr/dirmngr.c:172
+#: dirmngr/dirmngr.c:173
 msgid "shutdown the dirmngr"
 msgstr "关闭 dirmngr"
 
-#: dirmngr/dirmngr.c:173
+#: dirmngr/dirmngr.c:174
 msgid "flush the cache"
 msgstr "刷新缓存"
 
-#: dirmngr/dirmngr.c:188 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
-#: tools/gpgconf-comp.c:848 tools/gpgconf-comp.c:944
+#: dirmngr/dirmngr.c:189 tools/gpgconf-comp.c:522 tools/gpgconf-comp.c:741
+#: tools/gpgconf-comp.c:854 tools/gpgconf-comp.c:950
 msgid "|FILE|write server mode logs to FILE"
 msgstr "|FILE|将服务器模式的日志写入到 FILE"
 
-#: dirmngr/dirmngr.c:189
+#: dirmngr/dirmngr.c:190
 msgid "run without asking a user"
 msgstr "在不询问用户的情况下运行"
 
-#: dirmngr/dirmngr.c:190
+#: dirmngr/dirmngr.c:191
 msgid "force loading of outdated CRLs"
 msgstr "强制载入过期的 CRLs"
 
-#: dirmngr/dirmngr.c:191
+#: dirmngr/dirmngr.c:192
 msgid "allow sending OCSP requests"
 msgstr "允许发送 OCSP 请求"
 
-#: dirmngr/dirmngr.c:193
+#: dirmngr/dirmngr.c:194
 msgid "allow online software version check"
 msgstr "允许在线软件版本检查"
 
-#: dirmngr/dirmngr.c:194
+#: dirmngr/dirmngr.c:195
 msgid "inhibit the use of HTTP"
 msgstr "抑制 HTTP 的使用"
 
-#: dirmngr/dirmngr.c:195
+#: dirmngr/dirmngr.c:196
 msgid "inhibit the use of LDAP"
 msgstr "抑制 LDAP 的使用"
 
-#: dirmngr/dirmngr.c:197
+#: dirmngr/dirmngr.c:198
 msgid "ignore HTTP CRL distribution points"
 msgstr "忽略 HTTP CRL 分发点"
 
-#: dirmngr/dirmngr.c:199
+#: dirmngr/dirmngr.c:200
 msgid "ignore LDAP CRL distribution points"
 msgstr "忽略 LDAP CRL 分发点"
 
-#: dirmngr/dirmngr.c:201
+#: dirmngr/dirmngr.c:202
 msgid "ignore certificate contained OCSP service URLs"
 msgstr "忽略证书包含的 OCSP 服务 URLs"
 
-#: dirmngr/dirmngr.c:204
+#: dirmngr/dirmngr.c:205
 msgid "|URL|redirect all HTTP requests to URL"
 msgstr "|URL|重定向 HTTP 请求到 URL"
 
-#: dirmngr/dirmngr.c:206
+#: dirmngr/dirmngr.c:207
 msgid "|HOST|use HOST for LDAP queries"
 msgstr "|HOST|使用 HOST 进行 LDAP 查询"
 
-#: dirmngr/dirmngr.c:208
+#: dirmngr/dirmngr.c:209
 msgid "do not use fallback hosts with --ldap-proxy"
 msgstr "使用 --ldap-proxy 选项以不使用回退主机"
 
-#: dirmngr/dirmngr.c:211
+#: dirmngr/dirmngr.c:212
 msgid "|FILE|read LDAP server list from FILE"
 msgstr "|FILE|从 FILE 中读取 LDAP 服务器列表"
 
-#: dirmngr/dirmngr.c:213
+#: dirmngr/dirmngr.c:214
 msgid "add new servers discovered in CRL distribution points to serverlist"
 msgstr "添加从 CRL 分发点发现的新服务器到服务器列表"
 
-#: dirmngr/dirmngr.c:216 dirmngr/dirmngr_ldap.c:136
+#: dirmngr/dirmngr.c:217 dirmngr/dirmngr_ldap.c:136
 msgid "|N|set LDAP timeout to N seconds"
 msgstr "|N|设置 LDAP 超时时间为 N 秒"
 
-#: dirmngr/dirmngr.c:219
+#: dirmngr/dirmngr.c:220
 msgid "|URL|use OCSP responder at URL"
 msgstr "|URL|使用 URL 处的 OCSP 响应者"
 
-#: dirmngr/dirmngr.c:221
+#: dirmngr/dirmngr.c:222
 msgid "|FPR|OCSP response signed by FPR"
 msgstr "|FPR|OCSP 响应由 FPR 签名"
 
-#: dirmngr/dirmngr.c:227
+#: dirmngr/dirmngr.c:228
 msgid "|N|do not return more than N items in one query"
 msgstr "|N|在一次查询中最多返回 N 个项目"
 
-#: dirmngr/dirmngr.c:232
+#: dirmngr/dirmngr.c:233
 msgid "|FILE|use the CA certificates in FILE for HKP over TLS"
 msgstr "|FILE|为承载 HKP 的 TLS 使用 FILE 中的 CA 证书"
 
-#: dirmngr/dirmngr.c:234
+#: dirmngr/dirmngr.c:235
 msgid "route all network traffic via Tor"
 msgstr "通过 Tor 转发所有网络流量"
 
-#: dirmngr/dirmngr.c:262
+#: dirmngr/dirmngr.c:263
 msgid ""
 "@\n"
 "(See the \"info\" manual for a complete listing of all commands and "
@@ -9659,11 +9667,11 @@
 "@\n"
 "(参阅 \"info\" 手册以获取一份所有命令及选项的完整列表)\n"
 
-#: dirmngr/dirmngr.c:400
+#: dirmngr/dirmngr.c:401
 msgid "Usage: @DIRMNGR@ [options] (-h for help)"
 msgstr "用法：@DIRMNGR@ [选项] (-h 获取帮助)"
 
-#: dirmngr/dirmngr.c:402
+#: dirmngr/dirmngr.c:403
 msgid ""
 "Syntax: @DIRMNGR@ [options] [command [args]]\n"
 "Keyserver, CRL, and OCSP access for @GNUPG@\n"
@@ -9671,83 +9679,83 @@
 "语法：@DIRMNGR@ [选项] [命令 [参数]]\n"
 "@GNUPG@ 的公钥服务器、CRL 和 OCSP 访问\n"
 
-#: dirmngr/dirmngr.c:482
+#: dirmngr/dirmngr.c:483
 #, c-format
 msgid "valid debug levels are: %s\n"
 msgstr "有效的调试等级为：%s\n"
 
-#: dirmngr/dirmngr.c:568 tools/gpgconf.c:622 tools/gpgconf.c:657
-#: tools/gpgconf.c:755
+#: dirmngr/dirmngr.c:569 tools/gpgconf.c:637 tools/gpgconf.c:672
+#: tools/gpgconf.c:770
 #, c-format
 msgid "usage: %s [options] "
 msgstr "用法：%s [选项] "
 
-#: dirmngr/dirmngr.c:1217
+#: dirmngr/dirmngr.c:1218
 #, c-format
 msgid "colons are not allowed in the socket name\n"
 msgstr "套接字名称中不允许使用冒号\n"
 
-#: dirmngr/dirmngr.c:1449 dirmngr/server.c:1823
+#: dirmngr/dirmngr.c:1450 dirmngr/server.c:1824
 #, c-format
 msgid "fetching CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处获取 CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1455 dirmngr/server.c:1829
+#: dirmngr/dirmngr.c:1456 dirmngr/server.c:1830
 #, c-format
 msgid "processing CRL from '%s' failed: %s\n"
 msgstr "从‘%s’处处理 CRL 时失败：%s\n"
 
-#: dirmngr/dirmngr.c:1651
+#: dirmngr/dirmngr.c:1652
 #, c-format
 msgid "%s:%u: line too long - skipped\n"
 msgstr "%s:%u: 行太长 - 跳过\n"
 
-#: dirmngr/dirmngr.c:1706 dirmngr/dirmngr.c:1790
+#: dirmngr/dirmngr.c:1707 dirmngr/dirmngr.c:1791
 #, c-format
 msgid "%s:%u: invalid fingerprint detected\n"
 msgstr "%s:%u: 检测到无效指纹\n"
 
-#: dirmngr/dirmngr.c:1742 dirmngr/dirmngr.c:1768 tools/gpgconf-comp.c:4166
+#: dirmngr/dirmngr.c:1743 dirmngr/dirmngr.c:1769 tools/gpgconf-comp.c:4190
 #, c-format
 msgid "%s:%u: read error: %s\n"
 msgstr "%s:%u: 读取错误：%s\n"
 
-#: dirmngr/dirmngr.c:1797
+#: dirmngr/dirmngr.c:1798
 #, c-format
 msgid "%s:%u: garbage at end of line ignored\n"
 msgstr "%s:%u: 已忽略行尾部的垃圾数据\n"
 
-#: dirmngr/dirmngr.c:1863
+#: dirmngr/dirmngr.c:1864
 #, c-format
 msgid "SIGHUP received - re-reading configuration and flushing caches\n"
 msgstr "接收到 SIGHUP 信号 -正在重新读取配置文件并刷新缓存\n"
 
-#: dirmngr/dirmngr.c:1903
+#: dirmngr/dirmngr.c:1904
 #, c-format
 msgid "SIGUSR2 received - no action defined\n"
 msgstr "接收到 SIGUSR2 信号 - 未定义要进行的操作\n"
 
-#: dirmngr/dirmngr.c:1908
+#: dirmngr/dirmngr.c:1909
 #, c-format
 msgid "SIGTERM received - shutting down ...\n"
 msgstr "接收到 SIGTERM 信号 - 正在关闭...\n"
 
-#: dirmngr/dirmngr.c:1910
+#: dirmngr/dirmngr.c:1911
 #, c-format
 msgid "SIGTERM received - still %d active connections\n"
 msgstr "接收到 SIGTERM 信号 - 仍然有 %d 个活动的连接\n"
 
-#: dirmngr/dirmngr.c:1915
+#: dirmngr/dirmngr.c:1916
 #, c-format
 msgid "shutdown forced\n"
 msgstr "强制关闭\n"
 
-#: dirmngr/dirmngr.c:1923
+#: dirmngr/dirmngr.c:1924
 #, c-format
 msgid "SIGINT received - immediate shutdown\n"
 msgstr "收到 SIGINT 信号 - 立即关闭\n"
 
-#: dirmngr/dirmngr.c:1930
+#: dirmngr/dirmngr.c:1931
 #, c-format
 msgid "signal %d received - no action defined\n"
 msgstr "收到 %d 信号 - 未定义要进行的操作\n"
@@ -9918,7 +9926,7 @@
 msgid "'%s' is an invalid LDAP URL\n"
 msgstr "‘%s’是一个无效的 LDAP URL\n"
 
-#: dirmngr/http.c:1981 dirmngr/ocsp.c:255
+#: dirmngr/http.c:1984 dirmngr/ocsp.c:255
 #, c-format
 msgid "error accessing '%s': http status %u\n"
 msgstr "访问‘%s’时出现错误：http 状态码 %u\n"
@@ -10193,71 +10201,71 @@
 msgid "assuan_inquire(%s) failed: %s\n"
 msgstr "assuan_inquire(%s) 方法失败：%s\n"
 
-#: dirmngr/server.c:1157
+#: dirmngr/server.c:1158
 msgid "ldapserver missing"
 msgstr "ldapserver 缺失"
 
-#: dirmngr/server.c:1223
+#: dirmngr/server.c:1224
 msgid "serialno missing in cert ID"
 msgstr "证书 ID 中的序列号缺失"
 
-#: dirmngr/server.c:1386 dirmngr/server.c:1472 dirmngr/server.c:1908
-#: dirmngr/server.c:1979 dirmngr/server.c:2551 dirmngr/server.c:2567
+#: dirmngr/server.c:1387 dirmngr/server.c:1473 dirmngr/server.c:1909
+#: dirmngr/server.c:1980 dirmngr/server.c:2552 dirmngr/server.c:2568
 #, c-format
 msgid "assuan_inquire failed: %s\n"
 msgstr "assuan_inquire 方法失败：%s\n"
 
-#: dirmngr/server.c:1515
+#: dirmngr/server.c:1516
 #, c-format
 msgid "fetch_cert_by_url failed: %s\n"
 msgstr "fetch_cert_by_url 方法失败：%s\n"
 
-#: dirmngr/server.c:1527 dirmngr/server.c:1558 dirmngr/server.c:1717
+#: dirmngr/server.c:1528 dirmngr/server.c:1559 dirmngr/server.c:1718
 #, c-format
 msgid "error sending data: %s\n"
 msgstr "发送数据时出现错误：%s\n"
 
-#: dirmngr/server.c:1665
+#: dirmngr/server.c:1666
 #, c-format
 msgid "start_cert_fetch failed: %s\n"
 msgstr "start_cert_fetch 方法失败：%s\n"
 
-#: dirmngr/server.c:1698
+#: dirmngr/server.c:1699
 #, c-format
 msgid "fetch_next_cert failed: %s\n"
 msgstr "fetch_next_cert 方法失败：%s\n"
 
-#: dirmngr/server.c:1725
+#: dirmngr/server.c:1726
 #, c-format
 msgid "max_replies %d exceeded\n"
 msgstr "超过设置的 max_replies %d\n"
 
-#: dirmngr/server.c:2856
+#: dirmngr/server.c:2857
 #, c-format
 msgid "can't allocate control structure: %s\n"
 msgstr "无法分配控制结构：%s\n"
 
-#: dirmngr/server.c:2867
+#: dirmngr/server.c:2868
 #, c-format
 msgid "failed to allocate assuan context: %s\n"
 msgstr "分配 assuan 上下文时失败：%s\n"
 
-#: dirmngr/server.c:2888
+#: dirmngr/server.c:2889
 #, c-format
 msgid "failed to initialize the server: %s\n"
 msgstr "初始化服务器时失败：%s\n"
 
-#: dirmngr/server.c:2896
+#: dirmngr/server.c:2897
 #, c-format
 msgid "failed to the register commands with Assuan: %s\n"
 msgstr "向 Assuan 注册命令时失败：%s\n"
 
-#: dirmngr/server.c:2929
+#: dirmngr/server.c:2930
 #, c-format
 msgid "Assuan accept problem: %s\n"
 msgstr "Assuan 接受出现问题：%s\n"
 
-#: dirmngr/server.c:2948
+#: dirmngr/server.c:2949
 #, c-format
 msgid "Assuan processing failed: %s\n"
 msgstr "Assuan 处理时失败：%s\n"
@@ -10300,7 +10308,7 @@
 msgid "certificate should not have been used for CRL signing\n"
 msgstr "证书本不应被用于 CRL 签名\n"
 
-#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:103 tools/symcryptrun.c:179
+#: tools/gpg-connect-agent.c:78 tools/gpgconf.c:104 tools/symcryptrun.c:179
 msgid "quiet"
 msgstr "静默"
 
@@ -10394,21 +10402,21 @@
 msgstr ""
 
 #: tools/gpgconf-comp.c:481 tools/gpgconf-comp.c:617 tools/gpgconf-comp.c:692
-#: tools/gpgconf-comp.c:798 tools/gpgconf-comp.c:900
+#: tools/gpgconf-comp.c:804 tools/gpgconf-comp.c:906
 msgid "Options controlling the diagnostic output"
 msgstr "控制诊断输出的选项"
 
 #: tools/gpgconf-comp.c:494 tools/gpgconf-comp.c:630 tools/gpgconf-comp.c:705
-#: tools/gpgconf-comp.c:811 tools/gpgconf-comp.c:923
+#: tools/gpgconf-comp.c:817 tools/gpgconf-comp.c:929
 msgid "Options controlling the configuration"
 msgstr "控制配置的选项"
 
 #: tools/gpgconf-comp.c:517 tools/gpgconf-comp.c:659 tools/gpgconf-comp.c:736
-#: tools/gpgconf-comp.c:843 tools/gpgconf-comp.c:936
+#: tools/gpgconf-comp.c:849 tools/gpgconf-comp.c:942
 msgid "Options useful for debugging"
 msgstr "对调试有用的选项"
 
-#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:856
+#: tools/gpgconf-comp.c:530 tools/gpgconf-comp.c:669 tools/gpgconf-comp.c:862
 msgid "Options controlling the security"
 msgstr "控制安全的选项"
 
@@ -10456,11 +10464,11 @@
 msgid "|N|set the Pinentry timeout to N seconds"
 msgstr "|N|设置 Pinentry 的超时时间为 N 秒"
 
-#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:813
+#: tools/gpgconf-comp.c:707 tools/gpgconf-comp.c:819
 msgid "|NAME|use NAME as default secret key"
 msgstr "|NAME|使用 NAME 作为默认的私钥"
 
-#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:816
+#: tools/gpgconf-comp.c:710 tools/gpgconf-comp.c:822
 msgid "|NAME|encrypt to user ID NAME as well"
 msgstr "|NAME|同时给以 NAME 为名称的用户标识加密"
 
@@ -10468,11 +10476,11 @@
 msgid "|SPEC|set up email aliases"
 msgstr "|SPEC|设置电子邮件别名"
 
-#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:975
+#: tools/gpgconf-comp.c:749 tools/gpgconf-comp.c:981
 msgid "Configuration for Keyservers"
 msgstr "公钥服务器的配置"
 
-#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:977
+#: tools/gpgconf-comp.c:751 tools/gpgconf-comp.c:983
 msgid "|URL|use keyserver at URL"
 msgstr "|URL|使用 URL 处的密钥服务器"
 
@@ -10484,166 +10492,166 @@
 msgid "|MECHANISMS|use MECHANISMS to locate keys by mail address"
 msgstr "|MECHANISMS|通过邮件地址定位密钥时使用机制 MECHANISMS"
 
-#: tools/gpgconf-comp.c:764 tools/gpgconf-comp.c:825
+#: tools/gpgconf-comp.c:770 tools/gpgconf-comp.c:831
 msgid "disable all access to the dirmngr"
 msgstr "禁用对 dirmngr 的所有访问"
 
-#: tools/gpgconf-comp.c:828
+#: tools/gpgconf-comp.c:834
 msgid "|NAME|use encoding NAME for PKCS#12 passphrases"
 msgstr "|NAME|对 PKCS#12 密码使用名为 NAME 的编码"
 
-#: tools/gpgconf-comp.c:864
+#: tools/gpgconf-comp.c:870
 msgid "do not check CRLs for root certificates"
 msgstr "不对根证书检查 CRLs"
 
-#: tools/gpgconf-comp.c:913
+#: tools/gpgconf-comp.c:919
 msgid "Options controlling the format of the output"
 msgstr "控制输出格式的选项"
 
-#: tools/gpgconf-comp.c:955
+#: tools/gpgconf-comp.c:961
 msgid "Options controlling the interactivity and enforcement"
 msgstr "控制交互性和执行的选项"
 
-#: tools/gpgconf-comp.c:968
+#: tools/gpgconf-comp.c:974
 msgid "Options controlling the use of Tor"
 msgstr "控制使用 Tor 的选项"
 
-#: tools/gpgconf-comp.c:982
+#: tools/gpgconf-comp.c:988
 msgid "Configuration for HTTP servers"
 msgstr "对 HTTP 服务器的配置"
 
-#: tools/gpgconf-comp.c:993
+#: tools/gpgconf-comp.c:999
 msgid "use system's HTTP proxy setting"
 msgstr "使用系统的 HTTP 代理设置"
 
-#: tools/gpgconf-comp.c:998
+#: tools/gpgconf-comp.c:1004
 msgid "Configuration of LDAP servers to use"
 msgstr "对要使用的 LDAP 服务器的配置"
 
-#: tools/gpgconf-comp.c:1027
+#: tools/gpgconf-comp.c:1033
 msgid "LDAP server list"
 msgstr "LDAP 服务器列表"
 
-#: tools/gpgconf-comp.c:1035
+#: tools/gpgconf-comp.c:1041
 msgid "Configuration for OCSP"
 msgstr "对于 OCSP 的配置"
 
-#: tools/gpgconf-comp.c:1088
+#: tools/gpgconf-comp.c:1094
 msgid "OpenPGP"
 msgstr "OpenPGP"
 
-#: tools/gpgconf-comp.c:1089
+#: tools/gpgconf-comp.c:1095
 msgid "Private Keys"
 msgstr "私钥"
 
-#: tools/gpgconf-comp.c:1090
+#: tools/gpgconf-comp.c:1096
 msgid "Smartcards"
 msgstr "智能卡"
 
-#: tools/gpgconf-comp.c:1091
+#: tools/gpgconf-comp.c:1097
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: tools/gpgconf-comp.c:1092
+#: tools/gpgconf-comp.c:1098
 msgid "Network"
 msgstr "网络"
 
-#: tools/gpgconf-comp.c:1093
+#: tools/gpgconf-comp.c:1099
 msgid "Passphrase Entry"
 msgstr "密码条目"
 
-#: tools/gpgconf-comp.c:1272
+#: tools/gpgconf-comp.c:1278
 msgid "Component not suitable for launching"
 msgstr "组件不适合启动"
 
-#: tools/gpgconf-comp.c:3421
+#: tools/gpgconf-comp.c:3445
 #, c-format
 msgid "External verification of component %s failed"
 msgstr "组件 %s 的外部验证失败"
 
-#: tools/gpgconf-comp.c:3572
+#: tools/gpgconf-comp.c:3596
 msgid "Note that group specifications are ignored\n"
 msgstr "注意，群组规范已被忽略\n"
 
-#: tools/gpgconf-comp.c:4170
+#: tools/gpgconf-comp.c:4194
 #, c-format
 msgid "error closing '%s'\n"
 msgstr "关闭‘%s’时出现错误\n"
 
-#: tools/gpgconf-comp.c:4172
+#: tools/gpgconf-comp.c:4196
 #, c-format
 msgid "error parsing '%s'\n"
 msgstr "处理‘%s’时出现错误\n"
 
-#: tools/gpgconf.c:76
+#: tools/gpgconf.c:77
 msgid "list all components"
 msgstr "列出所有组件"
 
-#: tools/gpgconf.c:77
+#: tools/gpgconf.c:78
 msgid "check all programs"
 msgstr "检查所有程序"
 
-#: tools/gpgconf.c:78
+#: tools/gpgconf.c:79
 msgid "|COMPONENT|list options"
 msgstr "|COMPONENT|列出选项"
 
-#: tools/gpgconf.c:79
+#: tools/gpgconf.c:80
 msgid "|COMPONENT|change options"
 msgstr "|COMPONENT|变更选项"
 
-#: tools/gpgconf.c:80
+#: tools/gpgconf.c:81
 msgid "|COMPONENT|check options"
 msgstr "|COMPONENT|检查选项"
 
-#: tools/gpgconf.c:82
+#: tools/gpgconf.c:83
 msgid "apply global default values"
 msgstr "应用全局默认值"
 
-#: tools/gpgconf.c:84
+#: tools/gpgconf.c:85
 msgid "|FILE|update configuration files using FILE"
 msgstr "|FILE|使用 FILE 更新配置文件"
 
-#: tools/gpgconf.c:86
+#: tools/gpgconf.c:87
 msgid "get the configuration directories for @GPGCONF@"
 msgstr "为 @GPGCONF@ 获取配置目录"
 
-#: tools/gpgconf.c:88
+#: tools/gpgconf.c:89
 msgid "list global configuration file"
 msgstr "列出全局配置文件"
 
-#: tools/gpgconf.c:90
+#: tools/gpgconf.c:91
 msgid "check global configuration file"
 msgstr "检查全局配置文件"
 
-#: tools/gpgconf.c:92
+#: tools/gpgconf.c:93
 msgid "query the software version database"
 msgstr "查询软件版本数据库"
 
-#: tools/gpgconf.c:93
+#: tools/gpgconf.c:94
 msgid "reload all or a given component"
 msgstr "重新载入全部或者给定的组件"
 
-#: tools/gpgconf.c:94
+#: tools/gpgconf.c:95
 msgid "launch a given component"
 msgstr "启动一个给定的组件"
 
-#: tools/gpgconf.c:95
+#: tools/gpgconf.c:96
 msgid "kill a given component"
 msgstr "关闭一个给定的组件"
 
-#: tools/gpgconf.c:101
+#: tools/gpgconf.c:102
 msgid "use as output file"
 msgstr "指定输出文件"
 
-#: tools/gpgconf.c:105
+#: tools/gpgconf.c:106
 msgid "activate changes at runtime, if possible"
 msgstr "若可能，在运行时激活变更"
 
-#: tools/gpgconf.c:138
+#: tools/gpgconf.c:139
 msgid "Usage: @GPGCONF@ [options] (-h for help)"
 msgstr "用法：@GPGCONF@ [选项] (-h 获取帮助)"
 
-#: tools/gpgconf.c:141
+#: tools/gpgconf.c:142
 msgid ""
 "Syntax: @GPGCONF@ [options]\n"
 "Manage configuration options for tools of the @GNUPG@ system\n"
@@ -10651,15 +10659,15 @@
 "语法 @GPGCONF@ [选项]\n"
 "管理 @GNUPG@ 系统的工具的配置选项\n"
 
-#: tools/gpgconf.c:624 tools/gpgconf.c:659
+#: tools/gpgconf.c:639 tools/gpgconf.c:674
 msgid "Need one component argument"
 msgstr "需要一个组件参数"
 
-#: tools/gpgconf.c:633 tools/gpgconf.c:683 tools/gpgconf.c:731
+#: tools/gpgconf.c:648 tools/gpgconf.c:698 tools/gpgconf.c:746
 msgid "Component not found"
 msgstr "组件未找到"
 
-#: tools/gpgconf.c:757
+#: tools/gpgconf.c:772
 msgid "No argument allowed"
 msgstr "没有参数被允许"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gold.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gold.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gold.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gold.po	2020-07-08 13:53:54.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:37+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:34+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
@@ -2407,7 +2407,7 @@
 "pointers are definitely not taken"
 msgstr ""
 
-#: options.h:949
+#: options.h:945
 msgid "Number of iterations of ICF (default 2)"
 msgstr ""
 
@@ -3441,7 +3441,7 @@
 msgid "** glink"
 msgstr ""
 
-#: powerpc.cc:5427 powerpc.cc:5874
+#: powerpc.cc:5215 powerpc.cc:5682
 #, c-format
 msgid "%s: linkage table error against `%s'"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gprof.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gprof.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/gprof.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/gprof.po	2020-07-08 13:53:56.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:37+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:34+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: alpha.c:102 mips.c:54
 msgid "<indirect child>"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/grep.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/grep.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/grep.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/grep.po	2020-07-08 13:53:59.000000000 +0000
@@ -13,62 +13,62 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:59+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:51+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: lib/argmatch.c:134
+#: lib/argmatch.c:132
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "%2$s 的参数 %1$s 无效"
 
-#: lib/argmatch.c:135
+#: lib/argmatch.c:133
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "%2$s 的参数 %1$s 有歧义"
 
-#: lib/argmatch.c:154
+#: lib/argmatch.c:152 lib/argmatch.h:223
 msgid "Valid arguments are:"
 msgstr "有效参数是:"
 
-#: lib/closeout.c:122 src/grep.c:1274
+#: lib/closeout.c:122 src/grep.c:1278
 msgid "write error"
 msgstr "写错误"
 
-#: lib/dfa.c:958
+#: lib/dfa.c:923
 msgid "unbalanced ["
 msgstr "有未匹配的 ["
 
-#: lib/dfa.c:1079
+#: lib/dfa.c:1044
 msgid "invalid character class"
 msgstr "无效的字符类名"
 
-#: lib/dfa.c:1205
+#: lib/dfa.c:1170
 msgid "character class syntax is [[:space:]], not [:space:]"
 msgstr "字符类的语法是 [[:space:]],而非 [:space:]"
 
-#: lib/dfa.c:1272
+#: lib/dfa.c:1237
 msgid "unfinished \\ escape"
 msgstr "未做好 \\ 转义"
 
-#: lib/dfa.c:1433
+#: lib/dfa.c:1398
 msgid "invalid content of \\{\\}"
 msgstr "\\{\\}中内容无效"
 
-#: lib/dfa.c:1436
+#: lib/dfa.c:1401
 msgid "regular expression too big"
 msgstr "正则表达式太长"
 
-#: lib/dfa.c:1850
+#: lib/dfa.c:1872
 msgid "unbalanced ("
 msgstr "有未匹配的 ("
 
-#: lib/dfa.c:1968
+#: lib/dfa.c:1989
 msgid "no syntax specified"
 msgstr "未指定语法"
 
-#: lib/dfa.c:1976
+#: lib/dfa.c:2000
 msgid "unbalanced )"
 msgstr "有未匹配的 )"
 
@@ -104,14 +104,14 @@
 #: lib/getopt.c:621
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
-msgstr "%s: 无效选项 -- '%c'\n"
+msgstr "%s：无效选项 -- “%c”\n"
 
 #: lib/getopt.c:636 lib/getopt.c:682
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
-msgstr "%s: 选项必须带有一个参数 -- '%c'\n"
+msgstr "%s：选项需要一个参数 -- “%c”\n"
 
-#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:291
+#: lib/obstack.c:338 lib/obstack.c:340 lib/xalloc-die.c:34 src/pcresearch.c:300
 msgid "memory exhausted"
 msgstr "内存耗尽"
 
@@ -149,7 +149,7 @@
 #. for your locale.
 #. 
 #. If you don't know what to put here, please see
-#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
 #: lib/quotearg.c:362
 msgid "`"
@@ -227,16 +227,16 @@
 msgid "Unmatched ) or \\)"
 msgstr ") 或 \\) 不匹配"
 
-#: lib/regcomp.c:687
+#: lib/regcomp.c:676
 msgid "No previous regular expression"
 msgstr "没有之前的正则表达式"
 
-#: lib/version-etc.c:74
+#: lib/version-etc.c:73
 #, c-format
 msgid "Packaged by %s (%s)\n"
 msgstr "由 %s 打包 (%s)\n"
 
-#: lib/version-etc.c:77
+#: lib/version-etc.c:76
 #, c-format
 msgid "Packaged by %s\n"
 msgstr "由 %s 打包\n"
@@ -244,7 +244,7 @@
 #. TRANSLATORS: Translate "(C)" to the copyright symbol
 #. (C-in-a-circle), if this symbol is available in the user's
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.
-#: lib/version-etc.c:84
+#: lib/version-etc.c:83
 msgid "(C)"
 msgstr "©"
 
@@ -264,19 +264,19 @@
 "\n"
 
 #. TRANSLATORS: %s denotes an author name.
-#: lib/version-etc.c:102
+#: lib/version-etc.c:105
 #, c-format
 msgid "Written by %s.\n"
 msgstr "作者 %s。\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:106
+#: lib/version-etc.c:109
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "作者 %s 和 %s。\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:110
+#: lib/version-etc.c:113
 #, c-format
 msgid "Written by %s, %s, and %s.\n"
 msgstr "作者 %s, %s 及 %s。\n"
@@ -284,7 +284,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:117
+#: lib/version-etc.c:120
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -296,7 +296,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:124
+#: lib/version-etc.c:127
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -308,7 +308,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:131
+#: lib/version-etc.c:134
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -320,7 +320,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:139
+#: lib/version-etc.c:142
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -332,7 +332,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:147
+#: lib/version-etc.c:150
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -346,7 +346,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:156
+#: lib/version-etc.c:159
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -360,7 +360,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:167
+#: lib/version-etc.c:170
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -384,12 +384,12 @@
 "\n"
 "请将错误报告给: %s。翻译问题请报告至:Chinese (simplified) <i18n-zh@googlegroups.com>。\n"
 
-#: lib/version-etc.c:247
+#: lib/version-etc.c:251
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr "请将 %s 错误报告给: %s\n"
 
-#: lib/version-etc.c:251
+#: lib/version-etc.c:255 lib/version-etc.c:257
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 主页: <%s>\n"
@@ -416,7 +416,7 @@
 #: lib/xstrtol-error.c:72
 #, c-format
 msgid "%s%s argument '%s' too large"
-msgstr "%s%s 参数'%s' 过多"
+msgstr "%s%s 参数“%s”过大"
 
 #. This is a proper name. See the gettext manual, section Names.
 #: src/grep.c:59
@@ -427,33 +427,33 @@
 msgid "others, see <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>"
 msgstr "其余作者请参看 <http://git.sv.gnu.org/cgit/grep.git/tree/AUTHORS>"
 
-#: src/grep.c:585
+#: src/grep.c:584
 msgid "(standard input)"
-msgstr "(标准输入)"
+msgstr "（标准输入）"
 
-#: src/grep.c:765
+#: src/grep.c:764
 msgid "invalid context length argument"
 msgstr "无效的文本长度参数"
 
-#: src/grep.c:828
+#: src/grep.c:829
 msgid "input is too large to count"
 msgstr "输入太多无法计数"
 
-#: src/grep.c:1579
+#: src/grep.c:1583
 #, c-format
 msgid "Binary file %s matches\n"
 msgstr "匹配到二进制文件 %s\n"
 
-#: src/grep.c:1627
+#: src/grep.c:1624
 #, c-format
 msgid "warning: %s: %s"
 msgstr "警告: %s: %s"
 
-#: src/grep.c:1628
+#: src/grep.c:1625
 msgid "recursive directory loop"
 msgstr "嵌套目录循环"
 
-#: src/grep.c:1844
+#: src/grep.c:1845
 #, c-format
 msgid "input file %s is also the output"
 msgstr "输入文件 %s 同时也作输出"
@@ -463,10 +463,10 @@
 msgid "Usage: %s [OPTION]... PATTERN [FILE]...\n"
 msgstr "用法: %s [选项]... PATTERN [FILE]...\n"
 
-#: src/grep.c:1909
+#: src/grep.c:1910
 #, c-format
 msgid "Try '%s --help' for more information.\n"
-msgstr "试用'%s --help' 来获得更多信息。\n"
+msgstr "尝试使用 '%s --help' 来获得更多信息。\n"
 
 #: src/grep.c:1915
 #, c-format
@@ -507,7 +507,7 @@
 "  -x, --line-regexp         强制 PATTERN 仅完全匹配一行\n"
 "  -z, --null-data           一个 0 字节的数据行，但不是空行\n"
 
-#: src/grep.c:1933
+#: src/grep.c:1936
 #, c-format
 msgid ""
 "\n"
@@ -524,7 +524,7 @@
 "  -V, --version             显示版本信息并退出\n"
 "      --help                显示此帮助并退出\n"
 
-#: src/grep.c:1940
+#: src/grep.c:1943
 #, c-format
 msgid ""
 "\n"
@@ -563,7 +563,7 @@
 "                            TYPE 可以是`binary', `text', 或`without-match'\n"
 "  -a, --text                等同于 --binary-files=text\n"
 
-#: src/grep.c:1958
+#: src/grep.c:1961
 #, c-format
 msgid ""
 "  -I                        equivalent to --binary-files=without-match\n"
@@ -597,7 +597,7 @@
 "      --exclude-from=FILE   跳过所有除FILE 以外的文件\n"
 "      --exclude-dir=PATTERN  跳过所有匹配PATTERN 的目录。\n"
 
-#: src/grep.c:1974
+#: src/grep.c:1977
 #, c-format
 msgid ""
 "  -L, --files-without-match  print only names of FILEs with no selected "
@@ -613,7 +613,7 @@
 "  -T, --initial-tab         行首制表符对齐（如有必要）\n"
 "  -Z, --null                在<文件>名最后打印空字符\n"
 
-#: src/grep.c:1980
+#: src/grep.c:1983
 #, c-format
 msgid ""
 "\n"
@@ -628,7 +628,7 @@
 "  -A, --after-context=NUM   打印文本及其后面NUM 行\n"
 "  -C, --context=NUM         打印NUM 行输出文本\n"
 
-#: src/grep.c:1987
+#: src/grep.c:1990
 #, c-format
 msgid ""
 "  -NUM                      same as --context=NUM\n"
@@ -655,35 +655,35 @@
 "if any error occurs and -q is not given, the exit status is 2.\n"
 msgstr ""
 
-#: src/grep.c:2034
+#: src/grep.c:2039
 msgid "conflicting matchers specified"
 msgstr "指定了互相冲突的比较程序"
 
-#: src/grep.c:2038
+#: src/grep.c:2048
 #, c-format
 msgid "invalid matcher %s"
 msgstr "无效匹配 %s"
 
-#: src/grep.c:2458
+#: src/grep.c:2472
 #, c-format
 msgid "warning: GREP_OPTIONS is deprecated; please use an alias or script"
-msgstr "警告: GREP_OPTIONS 已被废除; 请使用别名或脚本"
+msgstr "警告: GREP_OPTIONS 已被废弃；请使用别名或脚本"
 
-#: src/grep.c:2485
+#: src/grep.c:2499
 msgid "unknown devices method"
 msgstr "未知的设备处理方式"
 
-#: src/grep.c:2629
+#: src/grep.c:2645
 msgid "invalid max count"
 msgstr "无效的最大计数"
 
-#: src/grep.c:2687
+#: src/grep.c:2703
 msgid "unknown binary-files type"
 msgstr "未知的二进制文件类型"
 
-#: src/pcresearch.c:80
+#: src/pcresearch.c:85
 msgid "failed to allocate memory for the PCRE JIT stack"
-msgstr "为PCRE JIT 栈分配内存时出错"
+msgstr "为 PCRE JIT 栈分配内存时出错"
 
 #: src/pcresearch.c:97
 msgid ""
@@ -691,35 +691,35 @@
 "binary"
 msgstr "-P 选项的支持未编译入 --disable-perl-regexp binary"
 
-#: src/pcresearch.c:119
+#: src/pcresearch.c:132
 msgid "-P supports only unibyte and UTF-8 locales"
-msgstr "-P 仅支持单字节及UTF-8 语言环境"
+msgstr "-P 仅支持单字节及 UTF-8 语言环境"
 
-#: src/pcresearch.c:125
+#: src/pcresearch.c:138
 msgid "the -P option only supports a single pattern"
 msgstr "-P 选项仅支持单一匹配字词"
 
-#: src/pcresearch.c:167
+#: src/pcresearch.c:181
 msgid "internal error (should never happen)"
-msgstr "内部错误(本应不可能发生)"
+msgstr "内部错误（永远不应该发生）"
 
 #: src/pcresearch.c:192
 msgid "internal error"
 msgstr "内部错误"
 
-#: src/pcresearch.c:215
+#: src/pcresearch.c:224
 msgid "exceeded PCRE's line length limit"
-msgstr "超过PCRE 的行长度限制"
+msgstr "超过 PCRE 的行长度限制"
 
-#: src/pcresearch.c:295
+#: src/pcresearch.c:304
 msgid "exhausted PCRE JIT stack"
-msgstr "PCRE JIT栈已经用尽"
+msgstr "PCRE JIT 栈已经用尽"
 
-#: src/pcresearch.c:299
+#: src/pcresearch.c:308
 msgid "exceeded PCRE's backtracking limit"
-msgstr "超过PCRE 的回溯限制"
+msgstr "超过 PCRE 的回溯限制"
 
-#: src/pcresearch.c:306
+#: src/pcresearch.c:315
 #, c-format
 msgid "internal PCRE error: %d"
-msgstr "内部PCRE 错误: %d"
+msgstr "PCRE 内部错误：%d"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/grub.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/grub.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/grub.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/grub.po	2020-07-08 13:53:58.000000000 +0000
@@ -10,18 +10,19 @@
 msgstr ""
 "Project-Id-Version: grub 1.97+20110101\n"
 "Report-Msgid-Bugs-To: bug-grub@gnu.org\n"
-"POT-Creation-Date: 2019-11-22 11:21+0000\n"
-"PO-Revision-Date: 2019-11-23 00:11+0000\n"
+"POT-Creation-Date: 2020-03-12 17:34+0000\n"
+"PO-Revision-Date: 2020-03-19 15:57+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:21+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:10+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:469
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:1147
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:466
 #: grub-core/loader/i386/bsd.c:1148 grub-core/loader/i386/linux.c:469
@@ -29,6 +30,12 @@
 msgid "Booting in blind mode"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:86
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:173
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:694
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1093
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:87
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:174
 #: .pc/disable-floppies.patch/grub-core/kern/emu/hostdisk.c:519
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:364
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:409
@@ -70,8 +77,8 @@
 #: grub-core/loader/efi/chainloader.c:900 grub-core/loader/i386/bsd.c:1463
 #: grub-core/loader/i386/bsd.c:1808 grub-core/loader/i386/bsd.c:2086
 #: grub-core/loader/i386/coreboot/chainloader.c:438
-#: grub-core/loader/i386/efi/linux.c:86 grub-core/loader/i386/efi/linux.c:173
-#: grub-core/loader/i386/linux.c:694 grub-core/loader/i386/linux.c:1093
+#: grub-core/loader/i386/efi/linux.c:87 grub-core/loader/i386/efi/linux.c:174
+#: grub-core/loader/i386/linux.c:699 grub-core/loader/i386/linux.c:1098
 #: grub-core/loader/i386/pc/chainloader.c:290
 #: grub-core/loader/i386/pc/freedos.c:105 grub-core/loader/i386/pc/linux.c:140
 #: grub-core/loader/i386/pc/linux.c:410 grub-core/loader/i386/pc/ntldr.c:85
@@ -95,11 +102,17 @@
 msgid "filename expected"
 msgstr "需要文件名"
 
-#: grub-core/loader/i386/efi/linux.c:187 grub-core/loader/i386/linux.c:706
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:187
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:706
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:188
+#: grub-core/loader/i386/efi/linux.c:188 grub-core/loader/i386/linux.c:711
 #: grub-core/loader/i386/pc/linux.c:152
 msgid "cannot allocate kernel buffer"
 msgstr ""
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:130
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:713
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:131
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:319
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/efi/fdt.c:138
 #: .pc/ubuntu-efi-allow-loopmount-chainload.patch/grub-core/loader/efi/chainloader.c:985
@@ -144,7 +157,7 @@
 #: grub-core/loader/i386/coreboot/chainloader.c:112
 #: grub-core/loader/i386/coreboot/chainloader.c:148
 #: grub-core/loader/i386/coreboot/chainloader.c:170
-#: grub-core/loader/i386/efi/linux.c:130 grub-core/loader/i386/linux.c:713
+#: grub-core/loader/i386/efi/linux.c:131 grub-core/loader/i386/linux.c:718
 #: grub-core/loader/i386/multiboot_mbi.c:171
 #: grub-core/loader/i386/pc/chainloader.c:202
 #: grub-core/loader/i386/pc/linux.c:159 grub-core/loader/i386/pc/plan9.c:457
@@ -170,16 +183,20 @@
 msgid "premature end of file %s"
 msgstr "文件 %s 过早结束"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:922
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:876
-#: grub-core/loader/i386/linux.c:922
+#: grub-core/loader/i386/linux.c:927
 msgid "Legacy `ask' parameter no longer supported."
 msgstr "过时的“ask”参数已不再被支持。"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:938
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:948
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:978
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:892
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:902
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:932
-#: grub-core/loader/i386/linux.c:938 grub-core/loader/i386/linux.c:948
-#: grub-core/loader/i386/linux.c:978
+#: grub-core/loader/i386/linux.c:943 grub-core/loader/i386/linux.c:953
+#: grub-core/loader/i386/linux.c:983
 #, c-format
 msgid ""
 "%s is deprecated. Use set gfxpayload=%s before linux command instead.\n"
@@ -187,8 +204,9 @@
 
 #. TRANSLATORS: "x" has to be entered in, like an identifier,
 #. so please don't use better Unicode codepoints.
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:961
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:915
-#: grub-core/loader/i386/linux.c:961
+#: grub-core/loader/i386/linux.c:966
 #, c-format
 msgid ""
 "%s is deprecated. VGA mode %d isn't recognized. Use set "
@@ -196,6 +214,9 @@
 msgstr ""
 "%s 已弃用。VGA 模式 %d 无法识别。请改为在 linux 命令前使用 set gfxpayload=WIDTHxHEIGHT[xDEPTH]。\n"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:92
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1099
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:93
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/arm64/linux.c:250
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:1799
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:1900
@@ -217,8 +238,8 @@
 #: grub-core/commands/legacycfg.c:574 grub-core/loader/arm64/linux.c:258
 #: grub-core/loader/i386/bsd.c:1800 grub-core/loader/i386/bsd.c:1901
 #: grub-core/loader/i386/bsd.c:2008 grub-core/loader/i386/bsd.c:2041
-#: grub-core/loader/i386/bsd.c:2090 grub-core/loader/i386/efi/linux.c:92
-#: grub-core/loader/i386/linux.c:1099 grub-core/loader/i386/pc/linux.c:416
+#: grub-core/loader/i386/bsd.c:2090 grub-core/loader/i386/efi/linux.c:93
+#: grub-core/loader/i386/linux.c:1104 grub-core/loader/i386/pc/linux.c:416
 #: grub-core/loader/i386/xen.c:775 grub-core/loader/i386/xen.c:859
 #: grub-core/loader/ia64/efi/linux.c:545 grub-core/loader/mips/linux.c:432
 #: grub-core/loader/multiboot.c:389
@@ -231,12 +252,15 @@
 msgid "you need to load the kernel first"
 msgstr "您需要先加载内核"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:368
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1177
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:372
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:493
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/arm64/linux.c:383
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:1125
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/pc/linux.c:479
 #: grub-core/loader/arm/linux.c:505 grub-core/loader/arm64/linux.c:399
-#: grub-core/loader/i386/efi/linux.c:368 grub-core/loader/i386/linux.c:1177
+#: grub-core/loader/i386/efi/linux.c:372 grub-core/loader/i386/linux.c:1182
 #: grub-core/loader/i386/pc/linux.c:492 grub-core/loader/i386/xen.c:962
 #: grub-core/loader/i386/xen.c:964 grub-core/loader/ia64/efi/linux.c:591
 #: grub-core/loader/mips/linux.c:501
@@ -246,12 +270,15 @@
 msgid "Load Linux."
 msgstr "载入 Linux。"
 
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:371
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/linux.c:1179
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:375
 #: .pc/no-devicetree-if-secure-boot.patch/grub-core/loader/arm/linux.c:495
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/arm64/linux.c:385
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/linux.c:1127
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/pc/linux.c:482
 #: grub-core/loader/arm/linux.c:507 grub-core/loader/arm64/linux.c:401
-#: grub-core/loader/i386/efi/linux.c:371 grub-core/loader/i386/linux.c:1179
+#: grub-core/loader/i386/efi/linux.c:375 grub-core/loader/i386/linux.c:1184
 #: grub-core/loader/i386/pc/linux.c:495 grub-core/loader/i386/xen.c:966
 #: grub-core/loader/ia64/efi/linux.c:594 grub-core/loader/mips/linux.c:503
 #: grub-core/loader/powerpc/ieee1275/linux.c:385
@@ -276,16 +303,21 @@
 msgstr "载入 DTB 文件。"
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:418
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/basic/no_platform.c:30
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:424
 #: grub-core/osdep/basic/no_platform.c:30
 #: grub-core/osdep/windows/platform.c:424
 msgid "no IEEE1275 routines are available for your platform"
 msgstr ""
 
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/basic/no_platform.c:38
 #: grub-core/osdep/basic/no_platform.c:38
 msgid "no EFI routines are available for your platform"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:425
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/basic/no_platform.c:45
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:431
 #: grub-core/osdep/basic/no_platform.c:45
 #: grub-core/osdep/windows/platform.c:431
 msgid "no SGI routines are available for your platform"
@@ -293,6 +325,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:77
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:77
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:74
 #: grub-core/osdep/unix/platform.c:74
 #, c-format
 msgid ""
@@ -323,12 +356,14 @@
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:189
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:149
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:189
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:103
 #: grub-core/osdep/unix/platform.c:103
 #, c-format
 msgid "%s: not found"
 msgstr "%s：未找到"
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:228
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:142
 #: grub-core/osdep/unix/platform.c:142
 #, c-format
 msgid ""
@@ -340,6 +375,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:240
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:225
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:154
 #: grub-core/osdep/unix/platform.c:154
 #, c-format
 msgid ""
@@ -354,26 +390,31 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/grub-core/osdep/unix/platform.c:256
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/unix/platform.c:240
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/unix/platform.c:170
 #: grub-core/osdep/unix/platform.c:170
 msgid "You will have to set `SystemPartition' and `OSLoader' manually."
 msgstr "您必须手动设置“SystemPartition”和“OSLoader”。"
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:97
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:97
 #: grub-core/osdep/windows/platform.c:97
 msgid "Insufficient privileges to access firmware, assuming BIOS"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:225
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:231
 #: grub-core/osdep/windows/platform.c:231
 msgid "no EFI routines are available when running in BIOS mode"
 msgstr ""
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:240
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:246
 #: grub-core/osdep/windows/platform.c:246
 msgid "unexpected EFI error"
 msgstr "意外的 EFI 错误"
 
 #: .pc/install-powerpc-machtypes.patch/grub-core/osdep/windows/platform.c:315
+#: .pc/ubuntu-resilient-boot-boot-order.patch/grub-core/osdep/windows/platform.c:321
 #: grub-core/osdep/windows/platform.c:321
 msgid "Couldn't find a free BootNNNN slot"
 msgstr ""
@@ -382,30 +423,36 @@
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:35
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:30
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:35
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:30
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:35
 #: include/grub/util/install.h:30 include/grub/util/install.h:35
 msgid "MODULES"
 msgstr "模块"
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:31
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:31
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:31
 #: include/grub/util/install.h:31
 msgid "pre-load specified modules MODULES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:36
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:36
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:36
 #: include/grub/util/install.h:36
 msgid "install only MODULES and their dependencies [default=all]"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:37
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:37
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:37
 #: include/grub/util/install.h:37
 msgid "THEMES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:38
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:38
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:38
 #: include/grub/util/install.h:38
 #, c-format
 msgid "install THEMES [default=%s]"
@@ -413,12 +460,14 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:39
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:39
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:39
 #: include/grub/util/install.h:39
 msgid "FONTS"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:40
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:40
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:40
 #: include/grub/util/install.h:40
 #, c-format
 msgid "install FONTS [default=%s]"
@@ -426,24 +475,28 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:41
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:41
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:41
 #: include/grub/util/install.h:41
 msgid "LOCALES"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:42
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:42
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:42
 #: include/grub/util/install.h:42
 msgid "install only LOCALES [default=all]"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:45
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:45
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:45
 #: include/grub/util/install.h:45
 msgid "compress GRUB files [optional]"
 msgstr "压缩 GRUB 文件 [可选]"
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:48
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:48
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:48
 #: include/grub/util/install.h:48 util/grub-mkimage.c:83
 msgid "choose the compression to use for core image"
 msgstr ""
@@ -486,6 +539,14 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:253
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:298
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:300
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:50
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:53
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:56
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:59
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:270
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:272
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:318
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:320
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:268
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:270
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:315
@@ -504,6 +565,7 @@
 #: util/grub-mknetdir.c:46 util/grub-mknetdir.c:48 util/grub-mkrescue.c:99
 #: util/grub-setup.c:82 util/grub-syslinux2cfg.c:63 util/grub-syslinux2cfg.c:65
 #: util/grub-syslinux2cfg.c:67 util/grub-syslinux2cfg.c:71
+#: util/grub-reboot.in:54 util/grub-set-default.in:54
 msgid "DIR"
 msgstr "DIR"
 
@@ -512,6 +574,8 @@
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:54
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:51
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:54
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:51
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:54
 #: include/grub/util/install.h:51 include/grub/util/install.h:54
 #: util/grub-mkimage.c:66
 #, c-format
@@ -520,6 +584,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:57
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:57
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:57
 #: include/grub/util/install.h:57
 #, c-format
 msgid "use translations under DIR [default=%s]"
@@ -527,6 +592,7 @@
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:60
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:60
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:60
 #: include/grub/util/install.h:60
 #, c-format
 msgid "use themes under DIR [default=%s]"
@@ -559,6 +625,10 @@
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:2137
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:2140
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:2143
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:32
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:64
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:274
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:322
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:272
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:319
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:272
@@ -589,18 +659,21 @@
 #: util/grub-probe.c:732 util/grub-render-label.c:59
 #: util/grub-render-label.c:70 util/grub-render-label.c:72 util/grub-setup.c:78
 #: util/grub-setup.c:80 util/grub-setup.c:84 util/grub-syslinux2cfg.c:74
-#: util/grub-syslinux2cfg.c:147
+#: util/grub-syslinux2cfg.c:147 util/grub-kbdcomp.in:29
+#: util/grub-mkconfig.in:60
 msgid "FILE"
 msgstr "文件"
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:65
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:65
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:65
 #: include/grub/util/install.h:65 util/grub-mkimage.c:78
 msgid "embed FILE as public key for signature checking"
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/include/grub/util/install.h:67
 #: .pc/install-powerpc-machtypes.patch/include/grub/util/install.h:67
+#: .pc/ubuntu-resilient-boot-boot-order.patch/include/grub/util/install.h:67
 #: grub-core/kern/emu/main.c:108 include/grub/util/install.h:67
 #: util/grub-editenv.c:58 util/grub-fstest.c:525 util/grub-glue-efi.c:58
 #: util/grub-macbless.c:104 util/grub-mkfont.c:962 util/grub-mkimage.c:84
@@ -617,6 +690,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:238
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:250
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:239
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:258
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:256
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:256
 #: util/grub-install.c:258
@@ -630,6 +704,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:251
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:263
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:252
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:271
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:269
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:269
 #: util/grub-install.c:271
@@ -645,6 +720,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:256
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:268
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:257
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:276
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:274
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:274
 #: util/grub-install.c:276 util/grub-probe.c:734
@@ -659,6 +735,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:258
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:270
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:259
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:278
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:276
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:276
 #: util/grub-install.c:278
@@ -677,6 +754,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:267
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:279
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:268
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:287
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:285
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:285
 #: util/grub-install.c:287 util/grub-setup.c:94
@@ -692,6 +770,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:270
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:282
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:271
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:290
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:288
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:288
 #: util/grub-install.c:290
@@ -705,6 +784,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:272
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:284
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:273
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:292
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:290
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:290
 #: util/grub-install.c:292 util/grub-setup.c:87
@@ -718,6 +798,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:274
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:286
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:275
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:294
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:292
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:292
 #: util/grub-install.c:294
@@ -731,6 +812,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:275
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:287
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:276
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:295
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:293
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:293
 #: grub-core/commands/minicmd.c:207 grub-core/kern/corecmd.c:188
@@ -745,6 +827,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:276
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:288
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:277
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:296
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:294
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:294
 #: util/grub-install.c:296
@@ -760,6 +843,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:279
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:291
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:280
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:299
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:297
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:297
 #: util/grub-install.c:299
@@ -775,6 +859,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:282
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:294
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:283
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:303
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:300
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:300
 #: util/grub-install.c:303 util/grub-setup.c:89
@@ -788,6 +873,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:284
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:296
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:285
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:305
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:302
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:302
 #: util/grub-install.c:305
@@ -801,6 +887,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:286
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:298
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:287
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:307
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:304
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:304
 #: util/grub-install.c:307 util/grub-setup.c:96
@@ -826,6 +913,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:316
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:292
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:305
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:312
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:325
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:309
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:322
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:309
@@ -845,6 +934,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:293
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:305
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:294
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:314
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:311
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:311
 #: util/grub-install.c:314
@@ -859,6 +949,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:295
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:307
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:296
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:316
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:313
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:313
 #: util/grub-install.c:316
@@ -872,6 +963,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:296
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:308
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:297
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:317
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:314
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:314
 #: util/grub-install.c:317
@@ -885,6 +977,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:298
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:310
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:299
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:319
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:316
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:316
 #: util/grub-install.c:319
@@ -898,6 +991,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:300
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:312
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:301
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:321
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:318
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:318
 #: util/grub-install.c:321
@@ -912,6 +1006,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:106
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:313
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:302
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:322
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:319
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:319
 #: util/grub-install.c:322 util/grub-mkrescue.c:106
@@ -934,6 +1029,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:315
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:303
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:304
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:323
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:324
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:320
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:321
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:320
@@ -952,6 +1049,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:107
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:314
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:303
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:323
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:320
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:320
 #: util/grub-install.c:323 util/grub-mkrescue.c:107
@@ -966,6 +1064,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:108
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:315
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:304
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:324
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:321
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:321
 #: util/grub-install.c:324 util/grub-mkrescue.c:108
@@ -980,6 +1079,7 @@
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:110
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:316
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:305
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:325
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:322
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:322
 #: util/grub-install.c:325 util/grub-mkrescue.c:110
@@ -991,6 +1091,7 @@
 #: .pc/install-efi-ubuntu-flavours.patch/util/grub-install.c:318
 #: .pc/install-powerpc-machtypes.patch/util/grub-install.c:318
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:318
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:327
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:324
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:324
 #: util/grub-install.c:327
@@ -1004,6 +1105,7 @@
 #: .pc/install-efi-ubuntu-flavours.patch/util/grub-install.c:322
 #: .pc/install-powerpc-machtypes.patch/util/grub-install.c:322
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:322
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:331
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:328
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:328
 #: util/grub-install.c:331
@@ -1013,6 +1115,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:332
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:335
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:332
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:332
 #: util/grub-install.c:335
@@ -1028,6 +1131,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:361
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:381
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:362
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:393
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:390
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:390
 #: util/grub-install.c:393
@@ -1041,6 +1145,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:362
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:382
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:363
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:394
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:391
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:391
 #: util/grub-install.c:394
@@ -1054,6 +1159,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:363
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:383
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:364
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:395
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:392
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:392
 #: util/grub-install.c:395
@@ -1071,6 +1177,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:570
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:590
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:571
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:602
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:599
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:599
 #: grub-core/osdep/windows/hostdisk.c:501 util/grub-install.c:602
@@ -1084,6 +1191,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:672
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:692
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:673
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:704
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:701
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:701
 #: util/grub-install.c:704
@@ -1101,6 +1209,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:774
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:794
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:775
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:806
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:803
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:803
 #: .pc/zpool-full-device-name.patch/grub-core/osdep/unix/getroot.c:551
@@ -1117,6 +1226,7 @@
 #: .pc/install-locale-langpack.patch/util/grub-install-common.c:552
 #: .pc/install-locale-langpack.patch/util/grub-install-common.c:579
 #: .pc/install-locale-langpack.patch/util/grub-install-common.c:621
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:869
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:866
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:866
 #: util/grub-install-common.c:196 util/grub-install-common.c:552
@@ -1127,6 +1237,7 @@
 msgstr "无法打开目录“%s”：%s"
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:898
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:901
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:898
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:898
 #: util/grub-install.c:901
@@ -1134,6 +1245,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:900
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:903
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:900
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:900
 #: util/grub-install.c:903
@@ -1141,6 +1253,7 @@
 msgstr ""
 
 #: .pc/efi-variable-storage-minimise-writes.patch/util/grub-install.c:1012
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1015
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1012
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1012
 #: util/grub-install.c:1015
@@ -1154,6 +1267,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:878
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:899
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:879
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1025
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1022
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1022
 #: util/grub-install.c:1025
@@ -1167,6 +1281,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:891
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:912
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:892
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1038
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1035
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1035
 #: util/grub-install.c:1038
@@ -1181,6 +1296,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:939
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:960
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:940
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1086
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1083
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1083
 #: util/grub-install.c:1086
@@ -1201,6 +1317,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1348
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:985
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1332
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1131
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1476
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1128
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1473
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1128
@@ -1221,6 +1339,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1057
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1078
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1058
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1204
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1201
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1201
 #: util/grub-install.c:1204
@@ -1249,6 +1368,9 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1061
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1210
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1255
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1207
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1354
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1399
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1204
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1351
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1396
@@ -1289,6 +1411,10 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1218
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1271
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1366
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1216
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1362
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1415
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1510
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1213
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1359
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1412
@@ -1310,6 +1436,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1087
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1108
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1088
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1234
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1231
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1231
 #: util/grub-install.c:1234
@@ -1331,6 +1458,8 @@
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1658
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1130
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1615
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1290
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1803
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1287
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1800
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1287
@@ -1346,6 +1475,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1231
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1248
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1232
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1376
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1373
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1373
 #: util/grub-install.c:1376
@@ -1360,6 +1490,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1299
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1316
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1300
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1444
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1441
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1441
 #: util/grub-install.c:1444
@@ -1390,6 +1521,9 @@
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1411
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1786
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1886
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1599
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1974
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2074
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1596
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1971
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2071
@@ -1408,6 +1542,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1491
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1535
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1492
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1680
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1677
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1660
 #: util/grub-install.c:1680
@@ -1423,6 +1558,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1702
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1746
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1703
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:1891
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:1888
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1871
 #: util/grub-install.c:1891
@@ -1436,6 +1572,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1806
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1863
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1820
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2008
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2005
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1988
 #: util/grub-install.c:2008
@@ -1449,6 +1586,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1811
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1868
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1825
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2013
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2010
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1993
 #: util/grub-install.c:2013
@@ -1462,6 +1600,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1816
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:1873
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1830
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2018
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2015
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:1998
 #: util/grub-install.c:2018
@@ -1498,6 +1637,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1916
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:2040
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1930
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2191
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2188
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:2171
 #: util/grub-install.c:2191
@@ -1511,6 +1651,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1950
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:2094
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1964
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2245
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2242
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:2225
 #: util/grub-install.c:2245
@@ -1524,6 +1665,7 @@
 #: .pc/install-stage2-confusion.patch/util/grub-install.c:1957
 #: .pc/ubuntu-grub-install-extra-removable.patch/util/grub-install.c:2101
 #: .pc/ubuntu-install-signed.patch/util/grub-install.c:1971
+#: .pc/ubuntu-resilient-boot-boot-order.patch/util/grub-install.c:2252
 #: .pc/ubuntu-temp-keep-auto-nvram.patch/util/grub-install.c:2249
 #: .pc/uefi-secure-boot-cryptomount.patch/util/grub-install.c:2232
 #: util/grub-install.c:2252
@@ -2170,49 +2312,71 @@
 msgid "Load another boot loader."
 msgstr "载入其他引导程序。"
 
-#: grub-core/loader/i386/efi/linux.c:113
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:113
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:114
+#: grub-core/loader/i386/efi/linux.c:114
 msgid "can't allocate initrd"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:193
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:193
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:194
+#: grub-core/loader/i386/efi/linux.c:194
 #, c-format
 msgid "Can't read kernel %s"
 msgstr ""
 
-#: grub-core/loader/arm64/linux.c:348 grub-core/loader/i386/efi/linux.c:201
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:201
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:204
+#: grub-core/loader/arm64/linux.c:348 grub-core/loader/i386/efi/linux.c:204
 #, c-format
 msgid "%s has invalid signature"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:232
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:232
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:236
+#: grub-core/loader/i386/efi/linux.c:236
 msgid "invalid magic number"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:239
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:239
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:243
+#: grub-core/loader/i386/efi/linux.c:243
 msgid "too many setup sectors"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:246
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:246
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:250
+#: grub-core/loader/i386/efi/linux.c:250
 msgid "kernel too old"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:253
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:253
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:257
+#: grub-core/loader/i386/efi/linux.c:257
 msgid "kernel doesn't support EFI handover"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:261
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:261
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:265
+#: grub-core/loader/i386/efi/linux.c:265
 msgid "kernel doesn't support 64-bit CPUs"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:271
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:271
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:275
+#: grub-core/loader/i386/efi/linux.c:275
 msgid "kernel doesn't support 32-bit handover"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:281
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:281
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:285
+#: grub-core/loader/i386/efi/linux.c:285
 msgid "can't allocate cmdline"
 msgstr ""
 
-#: grub-core/loader/i386/efi/linux.c:311
+#: .pc/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch/grub-core/loader/i386/efi/linux.c:311
+#: .pc/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch/grub-core/loader/i386/efi/linux.c:315
+#: grub-core/loader/i386/efi/linux.c:315
 msgid "can't allocate kernel"
 msgstr ""
 
@@ -2527,9 +2691,10 @@
 msgid "name"
 msgstr "名称"
 
+#: .pc/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch/grub-core/commands/smbios.c:182
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:489
 #: .pc/ubuntu-linuxefi.patch/grub-core/loader/i386/bsd.c:555
-#: grub-core/commands/smbios.c:182 grub-core/loader/i386/bsd.c:490
+#: grub-core/commands/smbios.c:198 grub-core/loader/i386/bsd.c:490
 #: grub-core/loader/i386/bsd.c:556
 msgid "type"
 msgstr "类型"
@@ -2848,6 +3013,7 @@
 
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:98
 #: util/grub-mkfont.c:936 util/grub-mkrescue.c:98 util/grub-mkstandalone.c:48
+#: util/grub-kbdcomp.in:29
 msgid "save output in FILE [required]"
 msgstr "将输出保存到指定文件 [必需]"
 
@@ -2921,7 +3087,7 @@
 
 #: .pc/mkrescue-efi-modules.patch/util/grub-mkrescue.c:483
 #: util/grub-mkfont.c:1182 util/grub-mkrescue.c:483
-#: util/grub-mkstandalone.c:306
+#: util/grub-mkstandalone.c:306 util/grub-kbdcomp.in:70
 msgid "output file must be specified"
 msgstr "必须指定输出文件"
 
@@ -7751,16 +7917,16 @@
 msgid "%s: Not found.\\n"
 msgstr "%s：未找到。\\n"
 
-#: util/grub-mkconfig.in:158 util/grub-mkconfig.in:163
+#: util/grub-mkconfig.in:165 util/grub-mkconfig.in:170
 msgid "Sourcing file `%s'\\n"
 msgstr ""
 
-#: util/grub-mkconfig.in:260
+#: util/grub-mkconfig.in:271
 msgid "Generating grub configuration file ..."
 msgstr "正在生成 grub 配置文件 ..."
 
 #. TRANSLATORS: %s is replaced by filename
-#: util/grub-mkconfig.in:297
+#: util/grub-mkconfig.in:308
 msgid ""
 "Syntax errors are detected in generated GRUB config file.\n"
 "Ensure that there are no errors in /etc/default/grub\n"
@@ -7768,7 +7934,7 @@
 "%s file attached."
 msgstr ""
 
-#: util/grub-mkconfig.in:309
+#: util/grub-mkconfig.in:320
 msgid "done"
 msgstr "完成"
 
@@ -7877,8 +8043,8 @@
 msgstr "%s，Hurd %s"
 
 #: util/grub.d/10_hurd.in:100 util/grub.d/10_kfreebsd.in:87
-#: util/grub.d/10_linux.in:134 util/grub.d/10_netbsd.in:113
-#: util/grub.d/20_linux_xen.in:109 util/grub.d/30_os-prober.in:316
+#: util/grub.d/10_linux.in:189 util/grub.d/10_netbsd.in:113
+#: util/grub.d/20_linux_xen.in:119 util/grub.d/30_os-prober.in:316
 msgid ""
 "Please don't use old title `%s' for GRUB_DEFAULT, use `%s' (for versions "
 "before 2.00) or `%s' (for 2.00 or later)"
@@ -7894,8 +8060,8 @@
 
 #. TRANSLATORS: %s is replaced with an OS name
 #: util/grub.d/10_hurd.in:164 util/grub.d/10_kfreebsd.in:225
-#: util/grub.d/10_linux.in:376 util/grub.d/10_netbsd.in:168
-#: util/grub.d/30_os-prober.in:292
+#: util/grub.d/10_linux.in:476 util/grub.d/10_linux_zfs.in:988
+#: util/grub.d/10_netbsd.in:168 util/grub.d/30_os-prober.in:292
 msgid "Advanced options for %s"
 msgstr "%s 的高级选项"
 
@@ -7923,28 +8089,30 @@
 msgid "Found kernel module directory: %s\\n"
 msgstr "找到内核模块目录：%s\\n"
 
-#: util/grub.d/10_linux.in:124 util/grub.d/10_linux.in:126
+#: util/grub.d/10_linux.in:179 util/grub.d/10_linux.in:181
 msgid "%s, with Linux %s (%s)"
 msgstr ""
 
-#: util/grub.d/10_linux.in:128
+#: util/grub.d/10_linux.in:183
 msgid "%s, with Linux %s"
 msgstr "%s，Linux %s"
 
-#: util/grub.d/10_linux.in:176 util/grub.d/20_linux_xen.in:125
+#: util/grub.d/10_linux.in:231 util/grub.d/10_linux_zfs.in:852
+#: util/grub.d/20_linux_xen.in:135
 msgid "Loading Linux %s ..."
 msgstr "载入 Linux %s ..."
 
 #. TRANSLATORS: ramdisk isn't identifier. Should be translated.
-#: util/grub.d/10_linux.in:192 util/grub.d/20_linux_xen.in:139
+#: util/grub.d/10_linux.in:247 util/grub.d/10_linux_zfs.in:863
+#: util/grub.d/20_linux_xen.in:149
 msgid "Loading initial ramdisk ..."
 msgstr "载入初始化内存盘..."
 
-#: util/grub.d/10_linux.in:322 util/grub.d/20_linux_xen.in:226
+#: util/grub.d/10_linux.in:388 util/grub.d/20_linux_xen.in:254
 msgid "Found linux image: %s\\n"
 msgstr "找到 Linux 镜像：%s\\n"
 
-#: util/grub.d/10_linux.in:359 util/grub.d/20_linux_xen.in:249
+#: util/grub.d/10_linux.in:430 util/grub.d/20_linux_xen.in:285
 msgid "Found initrd image: %s\\n"
 msgstr "找到 initrd 镜像：%s\\n"
 
@@ -7990,28 +8158,28 @@
 msgid "(on %s)"
 msgstr "(在 %s)"
 
-#: util/grub.d/20_linux_xen.in:99 util/grub.d/20_linux_xen.in:101
+#: util/grub.d/20_linux_xen.in:109 util/grub.d/20_linux_xen.in:111
 msgid "%s, with Xen %s and Linux %s (%s)"
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:103
+#: util/grub.d/20_linux_xen.in:113
 msgid "%s, with Xen %s and Linux %s"
 msgstr "%s，Xen %s 和 Linux %s"
 
-#: util/grub.d/20_linux_xen.in:113
+#: util/grub.d/20_linux_xen.in:123
 msgid "%s, with Xen hypervisor"
 msgstr ""
 
-#: util/grub.d/20_linux_xen.in:124
+#: util/grub.d/20_linux_xen.in:134
 msgid "Loading Xen %s ..."
 msgstr "载入 Xen %s ..."
 
-#: util/grub.d/20_linux_xen.in:215 util/grub.d/20_linux_xen.in:266
+#: util/grub.d/20_linux_xen.in:229 util/grub.d/20_linux_xen.in:310
 msgid "Xen hypervisor, version %s"
 msgstr ""
 
 #. TRANSLATORS: %s is replaced with an OS name
-#: util/grub.d/20_linux_xen.in:265
+#: util/grub.d/20_linux_xen.in:309
 msgid "Advanced options for %s (with Xen hypervisor)"
 msgstr "%s 高级选项 (使用 Xen 虚拟机管理程序)"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/hello.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/hello.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/hello.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/hello.po	2020-07-08 13:53:56.000000000 +0000
@@ -0,0 +1,214 @@
+# Simplified Chinese(zh-CN) messages for GNU Hello
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# This file is distributed under the same license as the hello package.
+# Meng Jie <zuxyhere@eastday.com>, 2004.
+# Ji ZhengYu <zhengyuji@gmail.com>, 2008, 2009, 2010, 2011, 2012
+msgid ""
+msgstr ""
+"Project-Id-Version: hello 2.8\n"
+"Report-Msgid-Bugs-To: bug-hello@gnu.org\n"
+"POT-Creation-Date: 2014-11-16 11:53+0000\n"
+"PO-Revision-Date: 2020-02-13 17:23+0000\n"
+"Last-Translator: Ji ZhengYu <Unknown>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:10+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
+"Language: zh_CN\n"
+
+#: src/hello.c:60
+msgid "Hello, world!"
+msgstr "世界你好！"
+
+#: src/hello.c:84
+msgid "hello, world"
+msgstr ""
+
+#: src/hello.c:94
+msgid "extra operand"
+msgstr ""
+
+#: src/hello.c:100
+#, c-format
+msgid "conversion to a multibyte string failed"
+msgstr ""
+
+#  TRANSLATORS: --help output 2
+#  no-wrap
+#. TRANSLATORS: --help output 1 (synopsis)
+#. no-wrap
+#: src/hello.c:121
+#, c-format
+msgid "Usage: %s [OPTION]...\n"
+msgstr "用法：%s [选项]\n"
+
+#. TRANSLATORS: --help output 2 (brief description)
+#. no-wrap
+#: src/hello.c:126
+msgid "Print a friendly, customizable greeting.\n"
+msgstr "输出一个友好且自定义的问候词。\n"
+
+#  TRANSLATORS: --help output 3 : options 1/2
+#  no-wrap
+#. TRANSLATORS: --help output 3: options 1/2
+#. no-wrap
+#: src/hello.c:132
+msgid ""
+"  -h, --help          display this help and exit\n"
+"  -v, --version       display version information and exit\n"
+msgstr ""
+"  -h，--help         显示此帮助并退出\n"
+"  -v，--version      显示版本信息并退出\n"
+
+#. TRANSLATORS: --help output 4: options 2/2
+#. no-wrap
+#: src/hello.c:139
+msgid ""
+"  -t, --traditional       use traditional greeting\n"
+"  -g, --greeting=TEXT     use TEXT as the greeting message\n"
+msgstr ""
+
+#  TRANSLATORS: --help output 5 (end)
+#  TRANSLATORS, please don't forget to add the contact address for
+#  your translation!
+#  no-wrap
+#. TRANSLATORS: --help output 5+ (reports)
+#. TRANSLATORS: the placeholder indicates the bug-reporting address
+#. for this application.  Please add _another line_ with the
+#. address for translation bugs.
+#. no-wrap
+#: src/hello.c:149
+#, c-format
+msgid "Report bugs to: %s\n"
+msgstr "将程序缺陷报告给: %s\n"
+
+#  TRANSLATORS: --help output 5 (end)
+#  TRANSLATORS, please don't forget to add the contact address for
+#  your translation!
+#  no-wrap
+#: src/hello.c:152
+#, c-format
+msgid "Report %s bugs to: %s\n"
+msgstr "将 %s 缺陷报告给: %s。\n"
+
+#: src/hello.c:156
+#, c-format
+msgid "%s home page: <%s>\n"
+msgstr "%s 主页: <%s>\n"
+
+#: src/hello.c:158
+#, c-format
+msgid "%s home page: <http://www.gnu.org/software/%s/>\n"
+msgstr "%s 主页: <http://www.gnu.org/software/%s/>\n"
+
+#: src/hello.c:161
+msgid "General help using GNU software: <http://www.gnu.org/gethelp/>\n"
+msgstr "使用GNU 软件的通用帮助: <http://www.gnu.org/gethelp/>\n"
+
+#: src/hello.c:179
+#, c-format
+msgid ""
+"Copyright (C) %d Free Software Foundation, Inc.\n"
+"License GPLv3+: GNU GPL version 3 or later "
+"<http://gnu.org/licenses/gpl.html>\n"
+"This is free software: you are free to change and redistribute it.\n"
+"There is NO WARRANTY, to the extent permitted by law.\n"
+msgstr ""
+
+#: lib/error.c:191
+msgid "Unknown system error"
+msgstr "未知的系统错误"
+
+#: lib/getopt.c:547 lib/getopt.c:576
+#, c-format
+msgid "%s: option '%s' is ambiguous; possibilities:"
+msgstr "%s: 选项\"%s\"有歧义；可能是："
+
+#: lib/getopt.c:624 lib/getopt.c:628
+#, c-format
+msgid "%s: option '--%s' doesn't allow an argument\n"
+msgstr "%s: 选项\"--%s\"不要参数\n"
+
+#: lib/getopt.c:637 lib/getopt.c:642
+#, c-format
+msgid "%s: option '%c%s' doesn't allow an argument\n"
+msgstr "%s: 选项\"%c%s\"不要参数\n"
+
+#: lib/getopt.c:685 lib/getopt.c:704
+#, c-format
+msgid "%s: option '--%s' requires an argument\n"
+msgstr "%s: 选项\"--%s\" 必须带参数。\n"
+
+#: lib/getopt.c:742 lib/getopt.c:745
+#, c-format
+msgid "%s: unrecognized option '--%s'\n"
+msgstr "%s: 无法识别的选项\"--%s\"\n"
+
+#: lib/getopt.c:753 lib/getopt.c:756
+#, c-format
+msgid "%s: unrecognized option '%c%s'\n"
+msgstr "%s: 无法识别的选项\"%c%s\"\n"
+
+#: lib/getopt.c:805 lib/getopt.c:808
+#, c-format
+msgid "%s: invalid option -- '%c'\n"
+msgstr "%s: 选项无效 -- \"%c\"\n"
+
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
+#, c-format
+msgid "%s: option requires an argument -- '%c'\n"
+msgstr "%s: 选项必须带参数 -- \"%c\"\n"
+
+#: lib/getopt.c:934 lib/getopt.c:950
+#, c-format
+msgid "%s: option '-W %s' is ambiguous\n"
+msgstr "%s: 选项\"-W %s\"有歧义\n"
+
+#: lib/getopt.c:974 lib/getopt.c:992
+#, c-format
+msgid "%s: option '-W %s' doesn't allow an argument\n"
+msgstr "%s: 选项\"-W %s\"不要参数\n"
+
+#: lib/getopt.c:1013 lib/getopt.c:1031
+#, c-format
+msgid "%s: option '-W %s' requires an argument\n"
+msgstr "%s: 选项\"-W %s\" 必须带参数。\n"
+
+#: lib/closeout.c:112
+msgid "write error"
+msgstr "写错误"
+
+#. TRANSLATORS:
+#. Get translations for open and closing quotation marks.
+#. The message catalog should translate "`" to a left
+#. quotation mark suitable for the locale, and similarly for
+#. "'".  For example, a French Unicode local should translate
+#. these to U+00AB (LEFT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), and U+00BB (RIGHT-POINTING DOUBLE ANGLE
+#. QUOTATION MARK), respectively.
+#. 
+#. If the catalog has no translation, we will try to
+#. use Unicode U+2018 (LEFT SINGLE QUOTATION MARK) and
+#. Unicode U+2019 (RIGHT SINGLE QUOTATION MARK).  If the
+#. current locale is not Unicode, locale_quoting_style
+#. will quote 'like this', and clocale_quoting_style will
+#. quote "like this".  You should always include translations
+#. for "`" and "'" even if U+2018 and U+2019 are appropriate
+#. for your locale.
+#. 
+#. If you don't know what to put here, please see
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. and use glyphs suitable for your language.
+#: lib/quotearg.c:312
+msgid "`"
+msgstr "‘"
+
+#: lib/quotearg.c:313
+msgid "'"
+msgstr "’"
+
+#: lib/xalloc-die.c:34
+msgid "memory exhausted"
+msgstr "虚拟内存已耗尽"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/im-config.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/im-config.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/im-config.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/im-config.po	2020-07-08 13:54:02.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:07+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:47+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: \n"
 
 #: im-config:15
@@ -45,7 +45,7 @@
 "See im-config(8) and /usr/share/doc/im-config/README.Debian.gz for more."
 msgstr ""
 "$IM_CONFIG_RTFM\n"
-"请参考 im-config(8) 和 /usr/share/doc/im-config/README.Debian.gz"
+"请参考 im-config(8) 和 /usr/share/doc/im-config/README.Debian.gz。"
 
 #: im-config:47
 #, sh-format
@@ -61,7 +61,7 @@
 msgstr ""
 "$IM_CONFIG_ID\n"
 "(c) 青木 修 <osamu@debian.org>, GPL-2+\n"
-"请参考 im-config(8) 与 /usr/share/doc/im-config/README.Debian.gz"
+"请参考 im-config(8) 与 /usr/share/doc/im-config/README.Debian.gz。"
 
 #: im-config:132
 #, sh-format
@@ -235,7 +235,7 @@
 "$IM_CONFIG_ACTIVE."
 msgstr ""
 "保留 $IM_CONFIG_XINPUTRC_TYPE $IM_CONFIG_XINPUTRC 不变，仍为 \n"
-"$IM_CONFIG_ACTIVE"
+"$IM_CONFIG_ACTIVE。"
 
 #: im-config:259
 #, sh-format
@@ -576,7 +576,7 @@
 #: data/79_xim.conf:4
 msgid ""
 "This activates the bare XIM with the X Keyboard Extension for all softwares."
-msgstr "这个选项使用 X 键盘扩展为所有软件激活纯 XIM 支持"
+msgstr "这个选项使用 X 键盘扩展为所有软件激活纯 XIM 支持。"
 
 #: data/80_kinput2.conf:2
 msgid "activate XIM for Japanese with kinput2"
@@ -657,4 +657,4 @@
 #: share/xinputrc.common:42 share/xinputrc.common.in:42
 #, sh-format
 msgid "E: Script for $IM_CONFIG_NAME not found at $IM_CONFIG_CODE."
-msgstr "E: $IM_CONFIG_NAME 使用的 script 在 $IM_CONFIG_CODE 找不到"
+msgstr "E: $IM_CONFIG_NAME 使用的 script 在 $IM_CONFIG_CODE 找不到。"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/JabberBot.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/JabberBot.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/JabberBot.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/JabberBot.po	2020-07-08 13:53:58.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:58+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #, python-format
 msgid ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/kbd.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/kbd.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/kbd.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/kbd.po	2020-07-08 13:53:58.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:21+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:10+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
@@ -87,7 +87,7 @@
 "\t\t\t    interpret character action codes to be from the\n"
 "\t\t\t    specified character set\n"
 msgstr ""
-"\t\t\t    翻译来自指定字符集的\n"
+"\t\t\t    解释来自指定字符集的\n"
 "\t\t\t    字符动作代码\n"
 
 #: src/dumpkeys.c:54
@@ -173,7 +173,7 @@
 #: src/getkeycodes.c:66
 #, c-format
 msgid "for 1-%d (0x01-0x%02x) scancode equals keycode\n"
-msgstr "从 1-%d (0x01-0x%02x) 的扫描码等于键码\n"
+msgstr "对于 1-%d (0x01-0x%02x) 的扫描码等于键码\n"
 
 #: src/getkeycodes.c:72
 #, c-format
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/keystone.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/keystone.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/keystone.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/keystone.po	2020-07-08 13:53:59.000000000 +0000
@@ -22,8 +22,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:48+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh-CN\n"
 "Generated-By: Babel 2.0\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/language-selector.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/language-selector.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/language-selector.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/language-selector.po	2020-07-08 13:53:54.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:22+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:11+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #. Hack for Chinese langpack split
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ld.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ld.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ld.po	2020-01-23 16:51:56.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ld.po	2020-07-08 13:53:56.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:38+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:35+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/lftp.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/lftp.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/lftp.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/lftp.po	2020-07-08 13:53:53.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:59+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:52+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "X-Poedit-Country: CHINA\n"
 "X-Poedit-Language: Chinese\n"
 "X-Poedit-SourceCharset: utf-8\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libapt-inst2.0.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libapt-inst2.0.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libapt-inst2.0.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libapt-inst2.0.po	2020-07-08 13:53:54.000000000 +0000
@@ -11,179 +11,175 @@
 msgstr ""
 "Project-Id-Version: apt 1.7.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
-"PO-Revision-Date: 2019-09-12 15:55+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
+"PO-Revision-Date: 2020-05-14 05:19+0000\n"
 "Last-Translator: Mo Zhou <Unknown>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: apt-inst/contrib/arfile.cc:75
+#: apt-inst/contrib/arfile.cc:76
 msgid "Invalid archive signature"
 msgstr "无效的归档签名"
 
-#: apt-inst/contrib/arfile.cc:83
+#: apt-inst/contrib/arfile.cc:84
 msgid "Error reading archive member header"
 msgstr "读取归档成员文件头出错"
 
-#: apt-inst/contrib/arfile.cc:95
-#, c-format
-msgid "Invalid archive member header %s"
-msgstr "归档文件中成员文件头 %s 无效"
-
-#: apt-inst/contrib/arfile.cc:107
+#: apt-inst/contrib/arfile.cc:96 apt-inst/contrib/arfile.cc:108
+#: apt-inst/contrib/arfile.cc:128
 msgid "Invalid archive member header"
 msgstr "归档文件中成员文件头无效"
 
-#: apt-inst/contrib/arfile.cc:136
+#: apt-inst/contrib/arfile.cc:144
 msgid "Archive is too short"
 msgstr "归档文件太短"
 
-#: apt-inst/contrib/arfile.cc:140
+#: apt-inst/contrib/arfile.cc:148
 msgid "Failed to read the archive headers"
 msgstr "无法读取归档文件的数据头"
 
-#: apt-inst/contrib/extracttar.cc:109
+#: apt-inst/contrib/extracttar.cc:110
 #, c-format
 msgid "Cannot find a configured compressor for '%s'"
 msgstr "找不到对应于 '%s' 的已配置压缩工具"
 
-#: apt-inst/contrib/extracttar.cc:141 apt-inst/contrib/extracttar.cc:171
+#: apt-inst/contrib/extracttar.cc:142 apt-inst/contrib/extracttar.cc:172
 msgid "Corrupted archive"
 msgstr "包文件已被损坏"
 
-#: apt-inst/contrib/extracttar.cc:156
+#: apt-inst/contrib/extracttar.cc:157
 msgid "Tar checksum failed, archive corrupted"
 msgstr "Tar 的校验和不符，文件已损坏"
 
-#: apt-inst/contrib/extracttar.cc:261
+#: apt-inst/contrib/extracttar.cc:262
 #, c-format
-msgid "Unknown TAR header type %u, member %s"
-msgstr "未知的 TAR 数据头类型 %u，成员 %s"
+msgid "Unknown TAR header type %u"
+msgstr ""
 
-#: apt-inst/deb/debfile.cc:46 apt-inst/deb/debfile.cc:55
-#: apt-inst/deb/debfile.cc:66
+#: apt-inst/deb/debfile.cc:47 apt-inst/deb/debfile.cc:56
+#: apt-inst/deb/debfile.cc:67
 #, c-format
 msgid "This is not a valid DEB archive, missing '%s' member"
 msgstr "这不是一个有效的 DEB 包文件，其包内遗漏了“%s”"
 
-#: apt-inst/deb/debfile.cc:135
+#: apt-inst/deb/debfile.cc:136
 #, c-format
 msgid "Internal error, could not locate member %s"
 msgstr "内部错误，无法定位包内文件 %s"
 
-#: apt-inst/deb/debfile.cc:230
+#: apt-inst/deb/debfile.cc:231
 msgid "Unparsable control file"
 msgstr "不能解析的主控文件"
 
-#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:48 apt-inst/dirstream.cc:53
+#: apt-inst/dirstream.cc:42 apt-inst/dirstream.cc:49 apt-inst/dirstream.cc:54
 #, c-format
 msgid "Failed to write file %s"
 msgstr "无法写入文件 %s"
 
-#: apt-inst/dirstream.cc:103
+#: apt-inst/dirstream.cc:104
 #, c-format
 msgid "Failed to close file %s"
 msgstr "无法关闭文件 %s"
 
-#: apt-inst/extract.cc:99 apt-inst/extract.cc:170
+#: apt-inst/extract.cc:100 apt-inst/extract.cc:171
 #, c-format
 msgid "The path %s is too long"
 msgstr "路径名 %s 太长"
 
-#: apt-inst/extract.cc:130
+#: apt-inst/extract.cc:131
 #, c-format
 msgid "Unpacking %s more than once"
 msgstr "%s 被解压了不只一次"
 
-#: apt-inst/extract.cc:140
+#: apt-inst/extract.cc:141
 #, c-format
 msgid "The directory %s is diverted"
 msgstr "目录 %s 已被转移"
 
-#: apt-inst/extract.cc:150
+#: apt-inst/extract.cc:151
 #, c-format
 msgid "The package is trying to write to the diversion target %s/%s"
 msgstr "该软件包正尝试写入转移对象 %s/%s"
 
-#: apt-inst/extract.cc:160 apt-inst/extract.cc:304
+#: apt-inst/extract.cc:161 apt-inst/extract.cc:305
 msgid "The diversion path is too long"
 msgstr "该转移路径太长"
 
-#: apt-inst/extract.cc:184 apt-inst/extract.cc:197 apt-inst/extract.cc:214
+#: apt-inst/extract.cc:185 apt-inst/extract.cc:198 apt-inst/extract.cc:215
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 
-#: apt-inst/extract.cc:192
+#: apt-inst/extract.cc:193
 #, c-format
 msgid "Failed to rename %s to %s"
 msgstr "无法将 %s 重命名为 %s"
 
-#: apt-inst/extract.cc:247
+#: apt-inst/extract.cc:248
 #, c-format
 msgid "The directory %s is being replaced by a non-directory"
 msgstr "目录 %s 要被一个非目录的文件替换"
 
-#: apt-inst/extract.cc:287
+#: apt-inst/extract.cc:288
 msgid "Failed to locate node in its hash bucket"
 msgstr "无法在其散列桶中分配节点"
 
-#: apt-inst/extract.cc:291
+#: apt-inst/extract.cc:292
 msgid "The path is too long"
 msgstr "路径名太长"
 
-#: apt-inst/extract.cc:419
+#: apt-inst/extract.cc:420
 #, c-format
 msgid "Overwrite package match with no version for %s"
 msgstr "用来覆盖的软件包不属于 %s 的任何版本"
 
-#: apt-inst/extract.cc:436
+#: apt-inst/extract.cc:437
 #, c-format
 msgid "File %s/%s overwrites the one in the package %s"
 msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件"
 
-#: apt-inst/extract.cc:469
+#: apt-inst/extract.cc:470
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: apt-inst/extract.cc:496
+#: apt-inst/extract.cc:497
 #, c-format
 msgid "Unable to stat %s"
 msgstr "无法读取 %s 的状态"
 
-#: apt-inst/filelist.cc:379
+#: apt-inst/filelist.cc:380
 msgid "DropNode called on still linked node"
 msgstr "把 DropNode 用在了仍在链表中的节点上"
 
-#: apt-inst/filelist.cc:411
+#: apt-inst/filelist.cc:412
 msgid "Failed to locate the hash element!"
 msgstr "无法定位哈希表元素！"
 
-#: apt-inst/filelist.cc:458
+#: apt-inst/filelist.cc:459
 msgid "Failed to allocate diversion"
 msgstr "无法分配转移项"
 
-#: apt-inst/filelist.cc:463
+#: apt-inst/filelist.cc:464
 msgid "Internal error in AddDiversion"
 msgstr "内部错误，出现在 AddDiversion"
 
-#: apt-inst/filelist.cc:476
+#: apt-inst/filelist.cc:477
 #, c-format
 msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
 msgstr "尝试覆盖一个转移项，%s -> %s 和 %s/%s"
 
-#: apt-inst/filelist.cc:505
+#: apt-inst/filelist.cc:506
 #, c-format
 msgid "Double add of diversion %s -> %s"
 msgstr "添加了两个转移项 %s-> %s"
 
-#: apt-inst/filelist.cc:548
+#: apt-inst/filelist.cc:549
 #, c-format
 msgid "Duplicate conf file %s/%s"
 msgstr "重复的配置文件 %s/%s"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libapt-pkg5.0.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libapt-pkg5.0.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libapt-pkg5.0.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libapt-pkg5.0.po	2020-07-08 13:53:59.000000000 +0000
@@ -11,110 +11,110 @@
 msgstr ""
 "Project-Id-Version: apt 1.7.x\n"
 "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n"
-"POT-Creation-Date: 2019-09-05 12:01+0000\n"
-"PO-Revision-Date: 2019-09-12 15:53+0000\n"
+"POT-Creation-Date: 2020-05-13 13:17+0000\n"
+"PO-Revision-Date: 2020-05-14 05:19+0000\n"
 "Last-Translator: Mo Zhou <Unknown>\n"
 "Language-Team: Chinese (simplified) <debian-l10n-chinese@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:31+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: apt-pkg/acquire-item.cc:177
+#: apt-pkg/acquire-item.cc:176
 msgid ""
 "Updating from such a repository can't be done securely, and is therefore "
 "disabled by default."
 msgstr "无法安全地用该源进行更新，所以默认禁用该源。"
 
-#: apt-pkg/acquire-item.cc:182
+#: apt-pkg/acquire-item.cc:181
 msgid ""
 "Data from such a repository can't be authenticated and is therefore "
 "potentially dangerous to use."
 msgstr "无法认证来自该源的数据，所以使用它会带来潜在风险。"
 
-#: apt-pkg/acquire-item.cc:184
+#: apt-pkg/acquire-item.cc:183
 msgid ""
 "See apt-secure(8) manpage for repository creation and user configuration "
 "details."
 msgstr "参见 apt-secure(8) 手册以了解仓库创建和用户配置方面的细节。"
 
-#: apt-pkg/acquire-item.cc:225
+#: apt-pkg/acquire-item.cc:224
 #, c-format
 msgid "The repository '%s' is no longer signed."
 msgstr "仓库 “%s” 的签名不再生效。"
 
-#: apt-pkg/acquire-item.cc:226
+#: apt-pkg/acquire-item.cc:225
 #, c-format
 msgid "The repository '%s' no longer has a Release file."
 msgstr "仓库 “%s” 不再含有 Release 文件。"
 
-#: apt-pkg/acquire-item.cc:235
+#: apt-pkg/acquire-item.cc:234
 msgid ""
 "This is normally not allowed, but the option "
 "Acquire::AllowDowngradeToInsecureRepositories was given to override it."
 msgstr ""
 "一般不可以这样做，但选项 Acquire:: AllowDowngradeToInsecureRepositories 可以用于覆盖默认设置。"
 
-#: apt-pkg/acquire-item.cc:253
+#: apt-pkg/acquire-item.cc:252
 #, c-format
 msgid "The repository '%s' is not signed."
 msgstr "仓库 “%s” 没有数字签名。"
 
-#: apt-pkg/acquire-item.cc:254
+#: apt-pkg/acquire-item.cc:253
 #, c-format
 msgid "The repository '%s' does not have a Release file."
 msgstr "仓库 “%s” 没有 Release 文件。"
 
-#: apt-pkg/acquire-item.cc:255
+#: apt-pkg/acquire-item.cc:254
 #, c-format
 msgid "The repository '%s' provides only weak security information."
 msgstr "仓库 '%s' 只提供了低强度的安全信息。"
 
-#: apt-pkg/acquire-item.cc:590
+#: apt-pkg/acquire-item.cc:543
 #, c-format
 msgid "Failed to readlink %s"
 msgstr "无法读取符号链接 %s"
 
-#: apt-pkg/acquire-item.cc:599
+#: apt-pkg/acquire-item.cc:552
 #, c-format
 msgid "Failed to stat %s"
 msgstr "无法获得 %s 的状态"
 
-#: apt-pkg/acquire-item.cc:949 apt-pkg/acquire-item.cc:1089
+#: apt-pkg/acquire-item.cc:864 apt-pkg/acquire-item.cc:1004
 msgid "Hash Sum mismatch"
 msgstr "Hash 校验和不符"
 
-#: apt-pkg/acquire-item.cc:952
+#: apt-pkg/acquire-item.cc:867
 msgid "Insufficient information available to perform this download securely"
 msgstr "可用信息不足，不能安全执行本次下载"
 
-#: apt-pkg/acquire-item.cc:1064 apt-pkg/contrib/fileutl.cc:3149
+#: apt-pkg/acquire-item.cc:979 apt-pkg/contrib/fileutl.cc:3143
 #, c-format
 msgid "rename failed, %s (%s -> %s)."
 msgstr "无法重命名文件，%s (%s -> %s)。"
 
-#: apt-pkg/acquire-item.cc:1092
+#: apt-pkg/acquire-item.cc:1007
 msgid "Size mismatch"
 msgstr "大小不符"
 
-#: apt-pkg/acquire-item.cc:1096
+#: apt-pkg/acquire-item.cc:1011
 msgid "Invalid file format"
 msgstr "无效的文件格式 %s"
 
-#: apt-pkg/acquire-item.cc:1101
+#: apt-pkg/acquire-item.cc:1016
 msgid "Signature error"
 msgstr "数字签名错误"
 
-#: apt-pkg/acquire-item.cc:1105
+#: apt-pkg/acquire-item.cc:1020
 #, c-format
 msgid ""
 "Clearsigned file isn't valid, got '%s' (does the network require "
 "authentication?)"
 msgstr "明文签署文件不可用，结果为‘%s’（您的网络需要认证吗？）"
 
-#: apt-pkg/acquire-item.cc:1354
+#: apt-pkg/acquire-item.cc:1269
 #, c-format
 msgid ""
 "An error occurred during the signature verification. The repository is not "
@@ -122,12 +122,12 @@
 msgstr "校验数字签名时出错。此仓库未被更新，所以仍然使用此前的索引文件。GPG 错误：%s: %s"
 
 #. Invalid signature file, reject (LP: #346386) (Closes: #627642)
-#: apt-pkg/acquire-item.cc:1363 apt-pkg/acquire-item.cc:1369
+#: apt-pkg/acquire-item.cc:1278 apt-pkg/acquire-item.cc:1284
 #, c-format
 msgid "GPG error: %s: %s"
 msgstr "GPG 错误：%s: %s"
 
-#: apt-pkg/acquire-item.cc:1604
+#: apt-pkg/acquire-item.cc:1494
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't have the "
@@ -135,21 +135,21 @@
 msgstr ""
 "鉴于仓库 '%2$s' 不含有 '%3$s' 组件，跳过配置文件 '%1$s' 的获取。(sources.list 中的组件名称是否拼写错误？)"
 
-#: apt-pkg/acquire-item.cc:1623
+#: apt-pkg/acquire-item.cc:1513
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' doesn't support "
 "architecture '%s'"
 msgstr "鉴于仓库 '%2$s' 不支持 '%3$s' 体系结构，跳过配置文件 '%1$s' 的获取。"
 
-#: apt-pkg/acquire-item.cc:1640
+#: apt-pkg/acquire-item.cc:1530
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' does not seem to "
 "provide it (sources.list entry misspelt?)"
 msgstr "鉴于仓库 '%2$s' 不提供配置文件 '%1$s' ，跳过其获取过程。(sources.list 中是否有拼写错误？)"
 
-#: apt-pkg/acquire-item.cc:1658
+#: apt-pkg/acquire-item.cc:1548
 #, c-format
 msgid ""
 "Skipping acquire of configured file '%s' as repository '%s' provides only "
@@ -159,7 +159,7 @@
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time since then the file is invalid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1760
+#: apt-pkg/acquire-item.cc:1659
 #, c-format
 msgid ""
 "Release file for %s is expired (invalid since %s). Updates for this "
@@ -169,92 +169,92 @@
 #. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
 #. the time until the file will be valid - formatted in the same way as in
 #. the download progress display (e.g. 7d 3h 42min 1s)
-#: apt-pkg/acquire-item.cc:1779
+#: apt-pkg/acquire-item.cc:1678
 #, c-format
 msgid ""
 "Release file for %s is not valid yet (invalid for another %s). Updates for "
 "this repository will not be applied."
 msgstr "%s 的 Release 文件已经过期(已经过期了 %s)。该仓库的更新将不会应用。"
 
-#: apt-pkg/acquire-item.cc:1814
+#: apt-pkg/acquire-item.cc:1713
 #, c-format
 msgid "Conflicting distribution: %s (expected %s but got %s)"
 msgstr "冲突的发行版：%s (期望 %s 但得到 %s)"
 
-#: apt-pkg/acquire-item.cc:1844
+#: apt-pkg/acquire-item.cc:1743
 #, c-format
 msgid "Repository '%s' changed its '%s' value from '%s' to '%s'"
 msgstr "仓库'%s'将其'%s'值从'%s'修改到了'%s'"
 
-#: apt-pkg/acquire-item.cc:1860
+#: apt-pkg/acquire-item.cc:1759
 #, c-format
 msgid "Repository '%s' changed its default priority for %s from %hi to %hi."
 msgstr "仓库'%s'将其'%s'的默认优先级从'%hi'修改到了'%hi'。"
 
 #. TRANSLATOR: the "this" refers to changes in the repository like a new release or owner change
-#: apt-pkg/acquire-item.cc:1873
+#: apt-pkg/acquire-item.cc:1772
 #, c-format
 msgid ""
 "More information about this can be found online in the Release notes at: %s"
 msgstr "更多有关细节可以阅览在线发行注记：%s"
 
 #. TRANSLATOR: %s is the name of the manpage in question, e.g. apt-secure(8)
-#: apt-pkg/acquire-item.cc:1880
+#: apt-pkg/acquire-item.cc:1779
 #, c-format
 msgid ""
 "This must be accepted explicitly before updates for this repository can be "
 "applied. See %s manpage for details."
 msgstr "为了让这个仓库能够应用，这必须在更新之前显式接受。更多细节请参阅 %s 手册。"
 
-#: apt-pkg/acquire-item.cc:2011 apt-pkg/update.cc:93 apt-pkg/update.cc:96
+#: apt-pkg/acquire-item.cc:1910 apt-pkg/update.cc:93 apt-pkg/update.cc:96
 #, c-format
 msgid "Failed to fetch %s  %s"
 msgstr "无法下载 %s  %s"
 
-#: apt-pkg/acquire-item.cc:3358
+#: apt-pkg/acquire-item.cc:3338
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr "无法找到 %s 软件包的一个文件。这可能意味着您需要手动修复该软件包。(由于缺失的体系)"
 
-#: apt-pkg/acquire-item.cc:3491
+#: apt-pkg/acquire-item.cc:3471
 #, c-format
 msgid "Can't find a source to download version '%s' of '%s'"
 msgstr "没有源可以用来下载 %s 版本的 %s"
 
 #. TRANSLATOR: %s=%s is sourcename=sourceversion, e.g. apt=1.1
-#: apt-pkg/acquire-item.cc:3643 apt-pkg/acquire-item.cc:3832
+#: apt-pkg/acquire-item.cc:3623 apt-pkg/acquire-item.cc:3812
 #, c-format
 msgid "Changelog unavailable for %s=%s"
 msgstr "%s=%s 的 Changelog 不可用"
 
-#: apt-pkg/acquire-worker.cc:109
+#: apt-pkg/acquire-worker.cc:108
 #, c-format
 msgid "The method '%s' is explicitly disabled via configuration."
 msgstr "方法‘%s’已经被显式设置为禁用。"
 
-#: apt-pkg/acquire-worker.cc:111
+#: apt-pkg/acquire-worker.cc:110
 #, c-format
 msgid "If you meant to use Tor remember to use %s instead of %s."
 msgstr "如果您需要使用Tor，请确认使用%s而不是%s。"
 
-#: apt-pkg/acquire-worker.cc:114
+#: apt-pkg/acquire-worker.cc:113
 #, c-format
 msgid "The method driver %s could not be found."
 msgstr "无法找到获取软件包的渠道 %s 所需的驱动程序。"
 
-#: apt-pkg/acquire-worker.cc:118
+#: apt-pkg/acquire-worker.cc:117
 #, c-format
 msgid "Is the package %s installed?"
 msgstr "是否安装了 %s 软件包？"
 
-#: apt-pkg/acquire-worker.cc:173
+#: apt-pkg/acquire-worker.cc:172
 #, c-format
 msgid "Method %s did not start correctly"
 msgstr "获取软件包的渠道 %s 所需的驱动程序没有正常启动"
 
-#: apt-pkg/acquire-worker.cc:690
+#: apt-pkg/acquire-worker.cc:677
 #, c-format
 msgid ""
 "Please insert the disc labeled: '%s' in the drive '%s' and press [Enter]."
@@ -287,59 +287,61 @@
 "by user '%s'."
 msgstr "由于文件'%s'无法被用户'%s'访问，已脱离沙盒并提权为根用户来进行下载。"
 
-#: apt-pkg/acquire.cc:789 apt-pkg/clean.cc:39
+#: apt-pkg/acquire.cc:789 apt-pkg/clean.cc:40
 #, c-format
 msgid "Clean of %s is not supported"
 msgstr "%s 的 Clean (清理)不被支持"
 
 #. Only warn if there are no sources.list.d.
 #. Only warn if there is no sources.list file.
-#: apt-pkg/acquire.cc:793 apt-pkg/acquire.cc:796 apt-pkg/clean.cc:49
-#: apt-pkg/clean.cc:59 apt-pkg/contrib/cdromutl.cc:189
-#: apt-pkg/contrib/cdromutl.cc:211 apt-pkg/contrib/fileutl.cc:416
+#: apt-pkg/acquire.cc:793 apt-pkg/acquire.cc:796 apt-pkg/clean.cc:50
+#: apt-pkg/clean.cc:60 apt-pkg/contrib/cdromutl.cc:190
+#: apt-pkg/contrib/cdromutl.cc:212 apt-pkg/contrib/fileutl.cc:416
 #: apt-pkg/contrib/fileutl.cc:418 apt-pkg/contrib/fileutl.cc:531
-#: apt-pkg/contrib/fileutl.cc:3391 apt-pkg/deb/dpkgpm.cc:1394
-#: apt-pkg/init.cc:223 apt-pkg/init.cc:231 apt-pkg/policy.cc:327
-#: apt-pkg/sourcelist.cc:320 apt-pkg/sourcelist.cc:327
+#: apt-pkg/contrib/fileutl.cc:3385 apt-pkg/deb/dpkgpm.cc:1394
+#: apt-pkg/init.cc:223 apt-pkg/init.cc:231 apt-pkg/policy.cc:328
+#: apt-pkg/sourcelist.cc:321 apt-pkg/sourcelist.cc:328
 #, c-format
 msgid "Unable to read %s"
 msgstr "无法读取 %s"
 
-#: apt-pkg/acquire.cc:1384
+#. only show the ETA if it makes sense
+#. two days
+#: apt-pkg/acquire.cc:1376
 #, c-format
 msgid "Retrieving file %li of %li (%s remaining)"
 msgstr "正在下载第 %li 个文件，共 %li 个(还剩 %s)"
 
-#: apt-pkg/acquire.cc:1386
+#: apt-pkg/acquire.cc:1378
 #, c-format
 msgid "Retrieving file %li of %li"
 msgstr "正在下载第 %li 个文件，共 %li 个"
 
-#: apt-pkg/algorithms.cc:322
+#: apt-pkg/algorithms.cc:323
 #, c-format
 msgid ""
 "The package %s needs to be reinstalled, but I can't find an archive for it."
 msgstr "软件包 %s 需要重新安装，但是我无法找到相应的安装文件。"
 
-#: apt-pkg/algorithms.cc:1137
+#: apt-pkg/algorithms.cc:1138
 msgid ""
 "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by "
 "held packages."
 msgstr "错误，pkgProblemResolver::Resolve 发生故障，这可能是有软件包被要求保持现状的缘故。"
 
-#: apt-pkg/algorithms.cc:1139
+#: apt-pkg/algorithms.cc:1140
 msgid "Unable to correct problems, you have held broken packages."
 msgstr "无法修正错误，因为您要求某些软件包保持现状，就是它们破坏了软件包间的依赖关系。"
 
-#: apt-pkg/cachefile.cc:129
+#: apt-pkg/cachefile.cc:130
 msgid "The package lists or status file could not be parsed or opened."
 msgstr "无法解析或打开软件包的列表或是状态文件。"
 
-#: apt-pkg/cachefile.cc:133
+#: apt-pkg/cachefile.cc:134
 msgid "You may want to run apt-get update to correct these problems"
 msgstr "您可能需要运行 apt-get update 来解决这些问题"
 
-#: apt-pkg/cachefile.cc:156
+#: apt-pkg/cachefile.cc:157
 msgid "The list of sources could not be read."
 msgstr "无法读取源列表。"
 
@@ -483,122 +485,122 @@
 msgid "Source list entries for this disc are:\n"
 msgstr "对应于该盘片的软件源设置项是：\n"
 
-#: apt-pkg/clean.cc:55 apt-pkg/clean.cc:145
+#: apt-pkg/clean.cc:56 apt-pkg/clean.cc:146
 #, c-format
 msgid "Unable to change to %s"
 msgstr "无法切换工作目录到 %s"
 
-#: apt-pkg/clean.cc:75
+#: apt-pkg/clean.cc:76
 #, c-format
 msgid "Unable to stat %s."
 msgstr "无法读取 %s 的状态。"
 
-#: apt-pkg/contrib/cdromutl.cc:64
+#: apt-pkg/contrib/cdromutl.cc:65
 #, c-format
 msgid "Unable to stat the mount point %s"
 msgstr "无法读取文件系统挂载点 %s 的状态"
 
-#: apt-pkg/contrib/cdromutl.cc:244
+#: apt-pkg/contrib/cdromutl.cc:245
 msgid "Failed to stat the cdrom"
 msgstr "无法读取盘片的状态"
 
-#: apt-pkg/contrib/cmndline.cc:126
+#: apt-pkg/contrib/cmndline.cc:127
 #, c-format
 msgid ""
 "Command line option '%c' [from %s] is not understood in combination with the "
 "other options."
 msgstr "不能理解命令行选项 “%c” [来自 %s] 与其他选项的搭配。"
 
-#: apt-pkg/contrib/cmndline.cc:151 apt-pkg/contrib/cmndline.cc:160
-#: apt-pkg/contrib/cmndline.cc:168
+#: apt-pkg/contrib/cmndline.cc:152 apt-pkg/contrib/cmndline.cc:161
+#: apt-pkg/contrib/cmndline.cc:169
 #, c-format
 msgid ""
 "Command line option %s is not understood in combination with the other "
 "options"
 msgstr "不能理解命令行选项 “%s” 与其他选项的搭配"
 
-#: apt-pkg/contrib/cmndline.cc:173
+#: apt-pkg/contrib/cmndline.cc:174
 #, c-format
 msgid "Command line option %s is not boolean"
 msgstr "命令行选项 %s 不是布尔值"
 
-#: apt-pkg/contrib/cmndline.cc:229
+#: apt-pkg/contrib/cmndline.cc:230
 #, c-format
 msgid "Option %s requires an argument."
 msgstr "选项 %s 要求有一个参数。"
 
-#: apt-pkg/contrib/cmndline.cc:242
+#: apt-pkg/contrib/cmndline.cc:243
 #, c-format
 msgid "Option %s: Configuration item specification must have an =<val>."
 msgstr "选项 %s：配置项后必须包含有形如“=<变量>”的具体指定。"
 
-#: apt-pkg/contrib/cmndline.cc:268
+#: apt-pkg/contrib/cmndline.cc:269
 #, c-format
 msgid "Option %s requires an integer argument, not '%s'"
 msgstr "选项 %s 要求有一个整数作为参数，而不是“%s”"
 
-#: apt-pkg/contrib/cmndline.cc:299
+#: apt-pkg/contrib/cmndline.cc:300
 #, c-format
 msgid "Option '%s' is too long"
 msgstr "选项“%s”太长"
 
-#: apt-pkg/contrib/cmndline.cc:331
+#: apt-pkg/contrib/cmndline.cc:332
 #, c-format
 msgid "Sense %s is not understood, try true or false."
 msgstr "不能识别参数 %s，请用 true 或 false。"
 
-#: apt-pkg/contrib/cmndline.cc:379
+#: apt-pkg/contrib/cmndline.cc:380
 #, c-format
 msgid "Invalid operation %s"
 msgstr "无效的操作 %s"
 
-#: apt-pkg/contrib/configuration.cc:720
+#: apt-pkg/contrib/configuration.cc:721
 #, c-format
 msgid "Unrecognized type abbreviation: '%c'"
 msgstr "无法识别的类型缩写：“%c”"
 
-#: apt-pkg/contrib/configuration.cc:1001
+#: apt-pkg/contrib/configuration.cc:1002
 #, c-format
 msgid "Syntax error %s:%u: Block starts with no name."
 msgstr "语法错误 %s:%u：配置小节没有以名字开头。"
 
-#: apt-pkg/contrib/configuration.cc:1015
+#: apt-pkg/contrib/configuration.cc:1016
 #, c-format
 msgid "Syntax error %s:%u: Malformed tag"
 msgstr "语法错误 %s:%u：标签格式有误"
 
-#: apt-pkg/contrib/configuration.cc:1032
+#: apt-pkg/contrib/configuration.cc:1033
 #, c-format
 msgid "Syntax error %s:%u: Extra junk after value"
 msgstr "语法错误 %s:%u：配置值后有多余的无意义数据"
 
-#: apt-pkg/contrib/configuration.cc:1070
+#: apt-pkg/contrib/configuration.cc:1071
 #, c-format
 msgid "Syntax error %s:%u: Directives can only be done at the top level"
 msgstr "语法错误 %s:%u：只能在顶层配置文件中使用指示"
 
-#: apt-pkg/contrib/configuration.cc:1077
+#: apt-pkg/contrib/configuration.cc:1078
 #, c-format
 msgid "Syntax error %s:%u: Too many nested includes"
 msgstr "语法错误 %s:%u：太多的嵌套 include 命令"
 
-#: apt-pkg/contrib/configuration.cc:1081 apt-pkg/contrib/configuration.cc:1086
+#: apt-pkg/contrib/configuration.cc:1082 apt-pkg/contrib/configuration.cc:1087
 #, c-format
 msgid "Syntax error %s:%u: Included from here"
 msgstr "语法错误 %s:%u：Included from here"
 
-#: apt-pkg/contrib/configuration.cc:1095
+#: apt-pkg/contrib/configuration.cc:1096
 #, c-format
 msgid "Syntax error %s:%u: Unsupported directive '%s'"
 msgstr "语法错误 %s:%u：不支持的指令“%s”"
 
-#: apt-pkg/contrib/configuration.cc:1098
+#: apt-pkg/contrib/configuration.cc:1099
 #, c-format
 msgid ""
 "Syntax error %s:%u: clear directive requires an option tree as argument"
 msgstr "语法错误 %s:%u：clean 指令需要一个选项树作为参数"
 
-#: apt-pkg/contrib/configuration.cc:1142
+#: apt-pkg/contrib/configuration.cc:1143
 #, c-format
 msgid "Syntax error %s:%u: Extra junk at end of file"
 msgstr "语法错误 %s:%u：文件尾部有多余的无意义的数据"
@@ -649,8 +651,8 @@
 "Ignoring file '%s' in directory '%s' as it has an invalid filename extension"
 msgstr "忽略‘%s’(于目录‘%s’)，鉴于它的文件扩展名无效"
 
-#: apt-pkg/contrib/fileutl.cc:912 apt-pkg/contrib/gpgv.cc:407
-#: apt-pkg/deb/debsystem.cc:434
+#: apt-pkg/contrib/fileutl.cc:912 apt-pkg/contrib/gpgv.cc:265
+#: apt-pkg/deb/debsystem.cc:431
 #, c-format
 msgid "Waited for %s but it wasn't there"
 msgstr "等待子进程 %s 的退出，但是它并不存在"
@@ -666,12 +668,12 @@
 msgstr "子进程 %s 收到信号 %u。"
 
 #. we forward the statuscode, so don't generate a message on the fd in this case
-#: apt-pkg/contrib/fileutl.cc:930 apt-pkg/contrib/gpgv.cc:422
+#: apt-pkg/contrib/fileutl.cc:930 apt-pkg/contrib/gpgv.cc:280
 #, c-format
 msgid "Sub-process %s returned an error code (%u)"
 msgstr "子进程 %s 返回了一个错误号 (%u)"
 
-#: apt-pkg/contrib/fileutl.cc:932 apt-pkg/contrib/gpgv.cc:414
+#: apt-pkg/contrib/fileutl.cc:932 apt-pkg/contrib/gpgv.cc:272
 #, c-format
 msgid "Sub-process %s exited unexpectedly"
 msgstr "子进程 %s 异常退出"
@@ -699,7 +701,7 @@
 msgid "Unexpected end of file"
 msgstr "未预期的文件结束符"
 
-#: apt-pkg/contrib/fileutl.cc:2186 apt-pkg/contrib/fileutl.cc:3174
+#: apt-pkg/contrib/fileutl.cc:2186 apt-pkg/contrib/fileutl.cc:3168
 msgid "Failed to create subprocess IPC"
 msgstr "无法创建子进程的 IPC 管道"
 
@@ -741,112 +743,112 @@
 msgid "Problem syncing the file"
 msgstr "同步文件出错"
 
-#: apt-pkg/contrib/fileutl.cc:3128
+#: apt-pkg/contrib/fileutl.cc:3124
 #, c-format
 msgid "Unable to mkstemp %s"
 msgstr "无法建立临时文件(mkstemp) %s"
 
-#: apt-pkg/contrib/fileutl.cc:3135
+#: apt-pkg/contrib/fileutl.cc:3131
 #, c-format
 msgid "Unable to write to %s"
 msgstr "无法写入 %s"
 
-#: apt-pkg/contrib/mmap.cc:77
+#: apt-pkg/contrib/mmap.cc:78
 msgid "Can't mmap an empty file"
 msgstr "无法 mmap 一个空文件"
 
-#: apt-pkg/contrib/mmap.cc:86 apt-pkg/contrib/mmap.cc:106
-#: apt-pkg/contrib/mmap.cc:117 apt-pkg/contrib/mmap.cc:123
+#: apt-pkg/contrib/mmap.cc:87 apt-pkg/contrib/mmap.cc:107
+#: apt-pkg/contrib/mmap.cc:118 apt-pkg/contrib/mmap.cc:124
 #, c-format
 msgid "Couldn't make mmap of %llu bytes"
 msgstr "无法 mmap %llu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:113
+#: apt-pkg/contrib/mmap.cc:114
 #, c-format
 msgid "Couldn't duplicate file descriptor %i"
 msgstr "无法为复制文件描述符 %i"
 
-#: apt-pkg/contrib/mmap.cc:149
+#: apt-pkg/contrib/mmap.cc:150
 msgid "Unable to close mmap"
 msgstr "无法关闭 mmap"
 
-#: apt-pkg/contrib/mmap.cc:177 apt-pkg/contrib/mmap.cc:205
+#: apt-pkg/contrib/mmap.cc:178 apt-pkg/contrib/mmap.cc:206
 msgid "Unable to synchronize mmap"
 msgstr "无法同步 mmap"
 
-#: apt-pkg/contrib/mmap.cc:287
+#: apt-pkg/contrib/mmap.cc:288
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "无法 mmap %lu 字节的数据"
 
-#: apt-pkg/contrib/mmap.cc:319
+#: apt-pkg/contrib/mmap.cc:320
 msgid "Failed to truncate file"
 msgstr "无法截断文件"
 
-#: apt-pkg/contrib/mmap.cc:338
+#: apt-pkg/contrib/mmap.cc:339
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Start. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr "动态 MMap 没有空间了。请增大 APT::Cache-Start 的大小。当前值：%lu。(man 5 apt.conf)"
 
-#: apt-pkg/contrib/mmap.cc:456
+#: apt-pkg/contrib/mmap.cc:457
 #, c-format
 msgid ""
 "Unable to increase the size of the MMap as the limit of %lu bytes is already "
 "reached."
 msgstr "无法增加 MMap 的大小，因为已经达到 %lu 字节的限制。"
 
-#: apt-pkg/contrib/mmap.cc:459
+#: apt-pkg/contrib/mmap.cc:460
 msgid ""
 "Unable to increase size of the MMap as automatic growing is disabled by user."
 msgstr "无法增加 MMap 大小，因为用户已禁用自动增加。"
 
-#: apt-pkg/contrib/progress.cc:155
+#: apt-pkg/contrib/progress.cc:149
 #, c-format
 msgid "%c%s... Error!"
 msgstr "%c%s... 有错误！"
 
-#: apt-pkg/contrib/progress.cc:157
+#: apt-pkg/contrib/progress.cc:151
 #, c-format
 msgid "%c%s... Done"
 msgstr "%c%s... 完成"
 
-#: apt-pkg/contrib/progress.cc:188
+#: apt-pkg/contrib/progress.cc:182
 msgid "..."
 msgstr "..."
 
 #. Print the spinner
-#: apt-pkg/contrib/progress.cc:204
+#: apt-pkg/contrib/progress.cc:198
 #, c-format
 msgid "%c%s... %u%%"
 msgstr "%c%s... %u%%"
 
 #. TRANSLATOR: d means days, h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:435
+#: apt-pkg/contrib/strutl.cc:436
 #, c-format
 msgid "%lid %lih %limin %lis"
 msgstr "%li天 %li小时 %li分 %li秒"
 
 #. TRANSLATOR: h means hours, min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:440
+#: apt-pkg/contrib/strutl.cc:441
 #, c-format
 msgid "%lih %limin %lis"
 msgstr "%li小时 %li分 %li秒"
 
 #. TRANSLATOR: min means minutes, s means seconds
-#: apt-pkg/contrib/strutl.cc:445
+#: apt-pkg/contrib/strutl.cc:446
 #, c-format
 msgid "%limin %lis"
 msgstr "%li分 %li秒"
 
 #. TRANSLATOR: s means seconds
-#: apt-pkg/contrib/strutl.cc:450
+#: apt-pkg/contrib/strutl.cc:451
 #, c-format
 msgid "%lis"
 msgstr "%li秒"
 
-#: apt-pkg/contrib/strutl.cc:1434
+#: apt-pkg/contrib/strutl.cc:1435
 #, c-format
 msgid "Selection %s not found"
 msgstr "找不到您选则的 %s"
@@ -854,7 +856,7 @@
 #. TRANSLATOR: an identifier like Packages; Releasefile key indicating
 #. a file like main/binary-amd64/Packages; another identifier like Contents;
 #. filename and linenumber of the sources.list entry currently parsed
-#: apt-pkg/deb/debmetaindex.cc:314
+#: apt-pkg/deb/debmetaindex.cc:263
 #, c-format
 msgid "Target %s wants to acquire the same file (%s) as %s from source %s"
 msgstr "目标 %1$s 想要捕获与 %3$s (来自软件源 %4$s) 相同的文件 (%2$s)"
@@ -862,163 +864,164 @@
 #. TRANSLATOR: an identifier like Packages; Releasefile key indicating
 #. a file like main/binary-amd64/Packages; filename and linenumber of
 #. two sources.list entries
-#: apt-pkg/deb/debmetaindex.cc:335
+#: apt-pkg/deb/debmetaindex.cc:284
 #, c-format
 msgid "Target %s (%s) is configured multiple times in %s and %s"
 msgstr "目标 %s (%s) 在 %s 和 %s 中被配置了多次"
 
-#: apt-pkg/deb/debmetaindex.cc:435
+#: apt-pkg/deb/debmetaindex.cc:384
 #, c-format
 msgid "Unable to parse Release file %s"
 msgstr "无法解析软件包仓库 Release 文件 %s"
 
-#: apt-pkg/deb/debmetaindex.cc:444
+#: apt-pkg/deb/debmetaindex.cc:393
 #, c-format
 msgid "No sections in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无组件章节信息"
 
-#: apt-pkg/deb/debmetaindex.cc:527
+#: apt-pkg/deb/debmetaindex.cc:476
 #, c-format
 msgid "No Hash entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %s 内无哈希条目"
 
-#: apt-pkg/deb/debmetaindex.cc:529
+#: apt-pkg/deb/debmetaindex.cc:478
 #, c-format
 msgid ""
 "No Hash entry in Release file %s which is considered strong enough for "
 "security purposes"
 msgstr "Release 文件 %s 中不含散列项，该文件用于保证足够的安全性。"
 
-#: apt-pkg/deb/debmetaindex.cc:536 apt-pkg/deb/debmetaindex.cc:576
-#: apt-pkg/deb/debmetaindex.cc:622
+#: apt-pkg/deb/debmetaindex.cc:485 apt-pkg/deb/debmetaindex.cc:525
+#: apt-pkg/deb/debmetaindex.cc:578
 #, c-format
 msgid "Invalid '%s' entry in Release file %s"
 msgstr "软件包仓库 Release 文件 %2$s 内 %1$s 条目无效"
 
 #. TRANSLATOR: The first is an option name from sources.list manpage, the other two URI and Suite
-#: apt-pkg/deb/debmetaindex.cc:727 apt-pkg/deb/debmetaindex.cc:735
-#: apt-pkg/deb/debmetaindex.cc:743 apt-pkg/deb/debmetaindex.cc:751
-#: apt-pkg/deb/debmetaindex.cc:759 apt-pkg/deb/debmetaindex.cc:767
-#: apt-pkg/deb/debmetaindex.cc:1117 apt-pkg/deb/debmetaindex.cc:1119
-#: apt-pkg/deb/debmetaindex.cc:1124 apt-pkg/deb/debmetaindex.cc:1126
-#: apt-pkg/deb/debmetaindex.cc:1135
+#: apt-pkg/deb/debmetaindex.cc:693 apt-pkg/deb/debmetaindex.cc:701
+#: apt-pkg/deb/debmetaindex.cc:709 apt-pkg/deb/debmetaindex.cc:717
+#: apt-pkg/deb/debmetaindex.cc:725 apt-pkg/deb/debmetaindex.cc:733
+#: apt-pkg/deb/debmetaindex.cc:1105 apt-pkg/deb/debmetaindex.cc:1107
+#: apt-pkg/deb/debmetaindex.cc:1112 apt-pkg/deb/debmetaindex.cc:1114
+#: apt-pkg/deb/debmetaindex.cc:1123
 #, c-format
 msgid "Conflicting values set for option %s regarding source %s %s"
 msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值"
 
-#: apt-pkg/deb/debmetaindex.cc:776
+#: apt-pkg/deb/debmetaindex.cc:752
 #, c-format
 msgid "Invalid value set for option %s regarding source %s %s (%s)"
 msgstr "软件源 %2$s %3$s (%4$s) 的选项 %1$s 中含有无效值"
 
-#: apt-pkg/deb/debmetaindex.cc:782
+#: apt-pkg/deb/debmetaindex.cc:771
 #, c-format
 msgid "Conflicting values set for option %s regarding source %s %s: %s != %s"
 msgstr "软件源 %2$s %3$s 的选项 %1$s 中含有互相冲突的值：%4$s != %5$s"
 
-#: apt-pkg/deb/debrecords.cc:219 apt-pkg/tagfile.cc:217 apt-pkg/tagfile.cc:468
+#: apt-pkg/deb/debrecords.cc:220 apt-pkg/tagfile.cc:218 apt-pkg/tagfile.cc:465
 #, c-format
 msgid "Unable to parse package file %s (%d)"
 msgstr "无法解析软件包文件 %s (%d)"
 
-#: apt-pkg/deb/debsystem.cc:94
+#: apt-pkg/deb/debsystem.cc:95
 #, c-format
 msgid ""
 "Unable to acquire the dpkg frontend lock (%s), is another process using it?"
 msgstr "无法获取 dpkg 前端锁 (%s)，是否有其他进程正占用它？"
 
-#: apt-pkg/deb/debsystem.cc:97
+#: apt-pkg/deb/debsystem.cc:98
 #, c-format
 msgid "Unable to acquire the dpkg frontend lock (%s), are you root?"
 msgstr "无法获取 dpkg 前端锁 (%s)，请查看您是否正以 root 用户运行？"
 
 #. TRANSLATORS: the %s contains the recovery command, usually
 #. dpkg --configure -a
-#: apt-pkg/deb/debsystem.cc:120
+#: apt-pkg/deb/debsystem.cc:121
 #, c-format
 msgid ""
 "dpkg was interrupted, you must manually run '%s' to correct the problem. "
 msgstr "dpkg 被中断，您必须手工运行 ‘%s’ 解决此问题。 "
 
-#: apt-pkg/deb/debsystem.cc:135
+#: apt-pkg/deb/debsystem.cc:136
 #, c-format
 msgid ""
 "Unable to lock the administration directory (%s), is another process using "
 "it?"
 msgstr "无法锁定管理目录(%s)，是否有其他进程正占用它？"
 
-#: apt-pkg/deb/debsystem.cc:138
+#: apt-pkg/deb/debsystem.cc:139
 #, c-format
 msgid "Unable to lock the administration directory (%s), are you root?"
 msgstr "无法对状态列表目录加锁(%s)，请查看您是否正以 root 用户运行？"
 
-#: apt-pkg/deb/debsystem.cc:153
+#: apt-pkg/deb/debsystem.cc:154
 msgid "Not locked"
 msgstr "未锁定"
 
-#: apt-pkg/deb/dpkgpm.cc:1164
+#. we don't care for the difference
+#: apt-pkg/deb/dpkgpm.cc:144 apt-pkg/deb/dpkgpm.cc:146
 #, c-format
 msgid "Installing %s"
 msgstr "正在安装 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:870 apt-pkg/deb/dpkgpm.cc:1168
+#: apt-pkg/deb/dpkgpm.cc:147 apt-pkg/deb/dpkgpm.cc:869
+#: apt-pkg/deb/dpkgpm.cc:1161
 #, c-format
 msgid "Configuring %s"
 msgstr "正在配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1173 apt-pkg/deb/dpkgpm.cc:1174
+#: apt-pkg/deb/dpkgpm.cc:148 apt-pkg/deb/dpkgpm.cc:1167
 #, c-format
 msgid "Removing %s"
 msgstr "正在删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1178
+#: apt-pkg/deb/dpkgpm.cc:149
 #, c-format
 msgid "Completely removing %s"
 msgstr "完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:151
+#: apt-pkg/deb/dpkgpm.cc:150
 #, c-format
 msgid "Noting disappearance of %s"
 msgstr "注意到 %s 已经消失"
 
-#: apt-pkg/deb/dpkgpm.cc:152
+#: apt-pkg/deb/dpkgpm.cc:151
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "执行安装后执行的触发器 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:869 apt-pkg/deb/dpkgpm.cc:1169
+#: apt-pkg/deb/dpkgpm.cc:868 apt-pkg/deb/dpkgpm.cc:1162
 #, c-format
 msgid "Installed %s"
 msgstr "已安装 %s"
 
 #. FIXME: use a better string after freeze
-#: apt-pkg/deb/dpkgpm.cc:1018 apt-pkg/deb/dpkgpm.cc:1051
+#: apt-pkg/deb/dpkgpm.cc:1009 apt-pkg/deb/dpkgpm.cc:1042
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "目录 %s 缺失"
 
-#: apt-pkg/deb/dpkgpm.cc:1032 apt-pkg/deb/dpkgpm.cc:1056 apt-pkg/edsp.cc:1049
+#: apt-pkg/deb/dpkgpm.cc:1023 apt-pkg/deb/dpkgpm.cc:1047 apt-pkg/edsp.cc:1049
 #, c-format
 msgid "Could not open file '%s'"
 msgstr "无法打开文件“%s”"
 
-#. we don't care for the difference
-#: apt-pkg/deb/dpkgpm.cc:145 apt-pkg/deb/dpkgpm.cc:147
+#: apt-pkg/deb/dpkgpm.cc:1154
 #, c-format
 msgid "Preparing %s"
 msgstr "正在准备 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1163
+#: apt-pkg/deb/dpkgpm.cc:1155
 #, c-format
 msgid "Unpacking %s"
 msgstr "正在解压缩 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:148
+#: apt-pkg/deb/dpkgpm.cc:1160
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "正在准备配置 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:149
+#: apt-pkg/deb/dpkgpm.cc:1166
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "正在准备 %s 的删除操作"
@@ -1028,12 +1031,12 @@
 msgid "Removed %s"
 msgstr "已删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:150
+#: apt-pkg/deb/dpkgpm.cc:1172
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "正在准备完全删除 %s"
 
-#: apt-pkg/deb/dpkgpm.cc:1179
+#: apt-pkg/deb/dpkgpm.cc:1173
 #, c-format
 msgid "Completely removed %s"
 msgstr "完全删除了 %s"
@@ -1047,70 +1050,70 @@
 msgid "Is /dev/pts mounted?"
 msgstr "/dev/pts 挂载了吗？"
 
-#: apt-pkg/deb/dpkgpm.cc:2177
+#: apt-pkg/deb/dpkgpm.cc:2161
 msgid "Operation was interrupted before it could finish"
 msgstr "操作在完成之前被打断"
 
-#: apt-pkg/deb/dpkgpm.cc:2262
+#: apt-pkg/deb/dpkgpm.cc:2246
 msgid "No apport report written because MaxReports is reached already"
 msgstr "由于已经达到 MaxReports 限制，没有写入 apport 报告。"
 
 #. check if its not a follow up error
-#: apt-pkg/deb/dpkgpm.cc:2267
+#: apt-pkg/deb/dpkgpm.cc:2251
 msgid "dependency problems - leaving unconfigured"
 msgstr "依赖问题 - 保持未配置"
 
-#: apt-pkg/deb/dpkgpm.cc:2269
+#: apt-pkg/deb/dpkgpm.cc:2253
 msgid ""
 "No apport report written because the error message indicates its a followup "
 "error from a previous failure."
 msgstr "因为错误消息指示这是由于上一个问题导致的错误，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:2275
+#: apt-pkg/deb/dpkgpm.cc:2259
 msgid ""
 "No apport report written because the error message indicates a disk full "
 "error"
 msgstr "因为错误消息指示这是由于磁盘已满，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:2282
+#: apt-pkg/deb/dpkgpm.cc:2266
 msgid ""
 "No apport report written because the error message indicates a out of memory "
 "error"
 msgstr "因为错误消息指示这是由于内存不足，没有写入 apport 报告。"
 
-#: apt-pkg/deb/dpkgpm.cc:2289 apt-pkg/deb/dpkgpm.cc:2295
+#: apt-pkg/deb/dpkgpm.cc:2273 apt-pkg/deb/dpkgpm.cc:2279
 msgid ""
 "No apport report written because the error message indicates an issue on the "
 "local system"
 msgstr "错误信息显示本地系统有一些问题，因此没有写入 apport 报告"
 
-#: apt-pkg/deb/dpkgpm.cc:2317
+#: apt-pkg/deb/dpkgpm.cc:2301
 msgid ""
 "No apport report written because the error message indicates a dpkg I/O error"
 msgstr "因为错误消息指示这是一个 dpkg I/O 错误，没有写入 apport 报告。"
 
-#: apt-pkg/depcache.cc:139 apt-pkg/depcache.cc:167
+#: apt-pkg/depcache.cc:140 apt-pkg/depcache.cc:168
 msgid "Building dependency tree"
 msgstr "正在分析软件包的依赖关系树"
 
-#: apt-pkg/depcache.cc:140
+#: apt-pkg/depcache.cc:141
 msgid "Candidate versions"
 msgstr "候选版本"
 
-#: apt-pkg/depcache.cc:168
+#: apt-pkg/depcache.cc:169
 msgid "Dependency generation"
 msgstr "生成依赖关系"
 
-#: apt-pkg/depcache.cc:188 apt-pkg/depcache.cc:221 apt-pkg/depcache.cc:225
+#: apt-pkg/depcache.cc:189 apt-pkg/depcache.cc:222 apt-pkg/depcache.cc:226
 msgid "Reading state information"
 msgstr "正在读取状态信息"
 
-#: apt-pkg/depcache.cc:252
+#: apt-pkg/depcache.cc:253
 #, c-format
 msgid "Failed to open StateFile %s"
 msgstr "无法打开状态文件 %s"
 
-#: apt-pkg/depcache.cc:257
+#: apt-pkg/depcache.cc:258
 #, c-format
 msgid "Failed to write temporary StateFile %s"
 msgstr "无法写入临时状态文件 %s"
@@ -1152,32 +1155,32 @@
 msgid "External planner failed without a proper error message"
 msgstr "外部安装顺序规划器出错，错误信息不恰当"
 
-#: apt-pkg/indexcopy.cc:226 apt-pkg/indexcopy.cc:765
+#: apt-pkg/indexcopy.cc:227 apt-pkg/indexcopy.cc:766
 #, c-format
 msgid "Wrote %i records.\n"
 msgstr "已写入 %i 条记录。\n"
 
-#: apt-pkg/indexcopy.cc:228 apt-pkg/indexcopy.cc:767
+#: apt-pkg/indexcopy.cc:229 apt-pkg/indexcopy.cc:768
 #, c-format
 msgid "Wrote %i records with %i missing files.\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件缺失。\n"
 
-#: apt-pkg/indexcopy.cc:231 apt-pkg/indexcopy.cc:770
+#: apt-pkg/indexcopy.cc:232 apt-pkg/indexcopy.cc:771
 #, c-format
 msgid "Wrote %i records with %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:234 apt-pkg/indexcopy.cc:773
+#: apt-pkg/indexcopy.cc:235 apt-pkg/indexcopy.cc:774
 #, c-format
 msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr "已写入 %i 条记录，并有 %i 个缺失，以及 %i 个文件不匹配\n"
 
-#: apt-pkg/indexcopy.cc:510
+#: apt-pkg/indexcopy.cc:511
 #, c-format
 msgid "Can't find authentication record for: %s"
 msgstr "无法找到认证记录：%s"
 
-#: apt-pkg/indexcopy.cc:516
+#: apt-pkg/indexcopy.cc:517
 #, c-format
 msgid "Hash mismatch for: %s"
 msgstr "Hash 校验和不符：%s"
@@ -1201,19 +1204,19 @@
 msgid "Running dpkg"
 msgstr "正在运行 dpkg"
 
-#: apt-pkg/packagemanager.cc:330 apt-pkg/packagemanager.cc:1018
+#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:1019
 #, c-format
 msgid ""
 "Could not perform immediate configuration on '%s'. Please see man 5 apt.conf "
 "under APT::Immediate-Configure for details. (%d)"
 msgstr "无法立即对 %s 进行配置。请查看 man 5 apt.conf 中的 APT::Immediate-Configure (%d)"
 
-#: apt-pkg/packagemanager.cc:589 apt-pkg/packagemanager.cc:627
+#: apt-pkg/packagemanager.cc:590 apt-pkg/packagemanager.cc:628
 #, c-format
 msgid "Could not configure '%s'. "
 msgstr "无法配置 %s。 "
 
-#: apt-pkg/packagemanager.cc:677
+#: apt-pkg/packagemanager.cc:678
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -1223,209 +1226,209 @@
 "由于这次安装存在着一个 Conflicts/Pre-Depends 循环，因而需要暂时删除一个必不可少的软件包 "
 "%s。通常并不建议这样做，但是如果您确实希望如此，可以打开 APT::Force-LoopBreak 选项。"
 
-#: apt-pkg/pkgcache.cc:164
+#: apt-pkg/pkgcache.cc:165
 msgid "Empty package cache"
 msgstr "软件包缓存区是空的"
 
-#: apt-pkg/pkgcache.cc:170 apt-pkg/pkgcache.cc:178
+#: apt-pkg/pkgcache.cc:171 apt-pkg/pkgcache.cc:179
 msgid "The package cache file is corrupted"
 msgstr "软件包缓存文件损坏了"
 
-#: apt-pkg/pkgcache.cc:175
+#: apt-pkg/pkgcache.cc:176
 msgid "The package cache file is an incompatible version"
 msgstr "软件包缓存区文件的版本不兼容"
 
-#: apt-pkg/pkgcache.cc:182
+#: apt-pkg/pkgcache.cc:183
 #, c-format
 msgid "This APT does not support the versioning system '%s'"
 msgstr "本程序目前不支持“%s”版本系统"
 
-#: apt-pkg/pkgcache.cc:194
+#: apt-pkg/pkgcache.cc:195
 #, c-format
 msgid "The package cache was built for different architectures: %s vs %s"
 msgstr "软件包缓存是为其它架构的硬件构建的: %s vs %s"
 
-#: apt-pkg/pkgcache.cc:201
+#: apt-pkg/pkgcache.cc:202
 msgid "The package cache file is corrupted, it has the wrong hash"
 msgstr "软件包缓存文件损坏，散列值错误"
 
-#: apt-pkg/pkgcache.cc:398
+#: apt-pkg/pkgcache.cc:351
 msgid "Depends"
 msgstr "依赖"
 
-#: apt-pkg/pkgcache.cc:398
+#: apt-pkg/pkgcache.cc:351
 msgid "PreDepends"
 msgstr "预依赖"
 
-#: apt-pkg/pkgcache.cc:398
+#: apt-pkg/pkgcache.cc:351
 msgid "Suggests"
 msgstr "建议"
 
-#: apt-pkg/pkgcache.cc:399
+#: apt-pkg/pkgcache.cc:352
 msgid "Conflicts"
 msgstr "冲突"
 
-#: apt-pkg/pkgcache.cc:399
+#: apt-pkg/pkgcache.cc:352
 msgid "Recommends"
 msgstr "推荐"
 
-#: apt-pkg/pkgcache.cc:399
+#: apt-pkg/pkgcache.cc:352
 msgid "Replaces"
 msgstr "替换"
 
-#: apt-pkg/pkgcache.cc:400
+#: apt-pkg/pkgcache.cc:353
 msgid "Breaks"
 msgstr "破坏"
 
-#: apt-pkg/pkgcache.cc:400
+#: apt-pkg/pkgcache.cc:353
 msgid "Enhances"
 msgstr "增强"
 
-#: apt-pkg/pkgcache.cc:400
+#: apt-pkg/pkgcache.cc:353
 msgid "Obsoletes"
 msgstr "废弃"
 
-#: apt-pkg/pkgcache.cc:411
+#: apt-pkg/pkgcache.cc:364
 msgid "important"
 msgstr "重要"
 
-#: apt-pkg/pkgcache.cc:411
+#: apt-pkg/pkgcache.cc:364
 msgid "required"
 msgstr "必需"
 
-#: apt-pkg/pkgcache.cc:411
+#: apt-pkg/pkgcache.cc:364
 msgid "standard"
 msgstr "标准"
 
-#: apt-pkg/pkgcache.cc:412
+#: apt-pkg/pkgcache.cc:365
 msgid "extra"
 msgstr "额外"
 
-#: apt-pkg/pkgcache.cc:412
+#: apt-pkg/pkgcache.cc:365
 msgid "optional"
 msgstr "可选"
 
-#: apt-pkg/pkgcachegen.cc:121
+#: apt-pkg/pkgcachegen.cc:122
 msgid "Cache has an incompatible versioning system"
 msgstr "软件包暂存区使用的是不兼容的版本控制系统"
 
 #. TRANSLATOR: The first placeholder is a package name,
 #. the other two should be copied verbatim as they include debug info
-#: apt-pkg/pkgcachegen.cc:277 apt-pkg/pkgcachegen.cc:339
-#: apt-pkg/pkgcachegen.cc:418 apt-pkg/pkgcachegen.cc:422
-#: apt-pkg/pkgcachegen.cc:439 apt-pkg/pkgcachegen.cc:447
-#: apt-pkg/pkgcachegen.cc:451 apt-pkg/pkgcachegen.cc:455
-#: apt-pkg/pkgcachegen.cc:476 apt-pkg/pkgcachegen.cc:481
-#: apt-pkg/pkgcachegen.cc:525 apt-pkg/pkgcachegen.cc:539
+#: apt-pkg/pkgcachegen.cc:278 apt-pkg/pkgcachegen.cc:340
+#: apt-pkg/pkgcachegen.cc:419 apt-pkg/pkgcachegen.cc:423
+#: apt-pkg/pkgcachegen.cc:440 apt-pkg/pkgcachegen.cc:448
+#: apt-pkg/pkgcachegen.cc:452 apt-pkg/pkgcachegen.cc:456
+#: apt-pkg/pkgcachegen.cc:477 apt-pkg/pkgcachegen.cc:482
+#: apt-pkg/pkgcachegen.cc:526 apt-pkg/pkgcachegen.cc:540
 #, c-format
 msgid "Error occurred while processing %s (%s%d)"
 msgstr "处理 %s (%s%d) 时出错"
 
-#: apt-pkg/pkgcachegen.cc:297
+#: apt-pkg/pkgcachegen.cc:298
 msgid "Wow, you exceeded the number of package names this APT is capable of."
 msgstr "哇，软件包数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:300
+#: apt-pkg/pkgcachegen.cc:301
 msgid "Wow, you exceeded the number of versions this APT is capable of."
 msgstr "哇，软件包版本数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:303
+#: apt-pkg/pkgcachegen.cc:304
 msgid "Wow, you exceeded the number of descriptions this APT is capable of."
 msgstr "哇，软件包说明数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:306
+#: apt-pkg/pkgcachegen.cc:307
 msgid "Wow, you exceeded the number of dependencies this APT is capable of."
 msgstr "哇，依赖关系数量超出了本 APT 的处理能力。"
 
-#: apt-pkg/pkgcachegen.cc:1546 apt-pkg/pkgcachegen.cc:1683
-#: apt-pkg/pkgcachegen.cc:1712 apt-pkg/pkgcachegen.cc:1830
+#: apt-pkg/pkgcachegen.cc:1547 apt-pkg/pkgcachegen.cc:1684
+#: apt-pkg/pkgcachegen.cc:1713 apt-pkg/pkgcachegen.cc:1831
 msgid "Reading package lists"
 msgstr "正在读取软件包列表"
 
-#: apt-pkg/pkgcachegen.cc:1617 apt-pkg/pkgcachegen.cc:1624
+#: apt-pkg/pkgcachegen.cc:1618 apt-pkg/pkgcachegen.cc:1625
 msgid "IO Error saving source cache"
 msgstr "无法读取或写入软件源缓存"
 
-#: apt-pkg/pkgrecords.cc:36
+#: apt-pkg/pkgrecords.cc:37
 #, c-format
 msgid "Index file type '%s' is not supported"
 msgstr "不支持索引文件类型“%s”"
 
-#: apt-pkg/policy.cc:80
+#: apt-pkg/policy.cc:81
 #, c-format
 msgid ""
 "The value '%s' is invalid for APT::Default-Release as such a release is not "
 "available in the sources"
 msgstr "'%s' 这个值对 APT::Default-Release 是无效的，因为在源里找不到这样的发行"
 
-#: apt-pkg/policy.cc:376
+#: apt-pkg/policy.cc:377
 #, c-format
 msgid "Invalid record in the preferences file %s, no Package header"
 msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头"
 
-#: apt-pkg/policy.cc:398
+#: apt-pkg/policy.cc:399
 #, c-format
 msgid "Did not understand pin type %s"
 msgstr "无法识别锁定的类型 %s"
 
-#: apt-pkg/policy.cc:410
+#: apt-pkg/policy.cc:411
 #, c-format
 msgid ""
 "%s: The special 'Pin-Priority: %s' can only be used for 'Package: *' records"
 msgstr ""
 
-#: apt-pkg/policy.cc:418
+#: apt-pkg/policy.cc:419
 #, c-format
 msgid "%s: Value %s is outside the range of valid pin priorities (%d to %d)"
 msgstr "%s: 值 %s 超出锁定优先级有效范围 (%d 到 %d)"
 
-#: apt-pkg/policy.cc:425
+#: apt-pkg/policy.cc:426
 msgid "No priority (or zero) specified for pin"
 msgstr "没有为版本锁定指定优先级(或为零)"
 
 #. TRANSLATOR: %u is a line number, the first %s is a filename of a file with the extension "second %s" and the third %s is a unique identifier for bugreports
-#: apt-pkg/sourcelist.cc:157 apt-pkg/sourcelist.cc:160
-#: apt-pkg/sourcelist.cc:165 apt-pkg/sourcelist.cc:172
-#: apt-pkg/sourcelist.cc:179 apt-pkg/sourcelist.cc:218
-#: apt-pkg/sourcelist.cc:221 apt-pkg/sourcelist.cc:232
-#: apt-pkg/sourcelist.cc:238 apt-pkg/sourcelist.cc:241
-#: apt-pkg/sourcelist.cc:254 apt-pkg/sourcelist.cc:256
-#: apt-pkg/sourcelist.cc:259 apt-pkg/sourcelist.cc:265
-#: apt-pkg/sourcelist.cc:272
+#: apt-pkg/sourcelist.cc:158 apt-pkg/sourcelist.cc:161
+#: apt-pkg/sourcelist.cc:166 apt-pkg/sourcelist.cc:173
+#: apt-pkg/sourcelist.cc:180 apt-pkg/sourcelist.cc:219
+#: apt-pkg/sourcelist.cc:222 apt-pkg/sourcelist.cc:233
+#: apt-pkg/sourcelist.cc:239 apt-pkg/sourcelist.cc:242
+#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:257
+#: apt-pkg/sourcelist.cc:260 apt-pkg/sourcelist.cc:266
+#: apt-pkg/sourcelist.cc:273
 #, c-format
 msgid "Malformed entry %u in %s file %s (%s)"
 msgstr "文件 %2$s 第 %1$u 行的记录格式有误 %3$s (%4$s)"
 
-#: apt-pkg/sourcelist.cc:408
+#: apt-pkg/sourcelist.cc:409
 #, c-format
 msgid "Malformed line %u in source list %s (type)"
 msgstr "在源列表 %2$s 中第 %1$u 行有误 (类型)"
 
-#: apt-pkg/sourcelist.cc:412
+#: apt-pkg/sourcelist.cc:413
 #, c-format
 msgid "Type '%s' is not known on line %u in source list %s"
 msgstr "软件源列表 %3$s 第 %2$u 行中的类别 “%1$s” 无法识别"
 
-#: apt-pkg/sourcelist.cc:431 apt-pkg/sourcelist.cc:440
+#: apt-pkg/sourcelist.cc:432 apt-pkg/sourcelist.cc:441
 #, c-format
 msgid "Malformed stanza %u in source list %s (type)"
 msgstr "软件源列表 %2$s 中第 %1$u 行的小节格式有误 (类型)"
 
-#: apt-pkg/sourcelist.cc:447
+#: apt-pkg/sourcelist.cc:448
 #, c-format
 msgid "Type '%s' is not known on stanza %u in source list %s"
 msgstr "软件源列表 %3$s 第 %2$u 小节的类别 “%1$s” 无法识别"
 
-#: apt-pkg/sourcelist.cc:620 apt-pkg/sourcelist.cc:637
+#: apt-pkg/sourcelist.cc:621 apt-pkg/sourcelist.cc:638
 #, c-format
 msgid "Unsupported file %s given on commandline"
 msgstr "命令行中有不支持的文件 %s"
 
-#: apt-pkg/srcrecords.cc:55
+#: apt-pkg/srcrecords.cc:56
 msgid "You must put some 'source' URIs in your sources.list"
 msgstr "您必须在 sources.list 中指定代码源(deb-src) URI"
 
-#: apt-pkg/tagfile.cc:764
+#: apt-pkg/tagfile.cc:761
 #, c-format
 msgid "Cannot convert %s to integer: out of range"
 msgstr "无法将 %s 转换为整数：超出范围"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libexif-12.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libexif-12.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libexif-12.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libexif-12.po	2020-07-08 13:53:57.000000000 +0000
@@ -0,0 +1,5424 @@
+# Chinese (China) translation for libexif
+# Copyright (c) 2007 Rosetta Contributors and Canonical Ltd 2007
+# This file is distributed under the same license as the libexif package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libexif\n"
+"Report-Msgid-Bugs-To: libexif-devel@lists.sourceforge.net\n"
+"POT-Creation-Date: 2012-07-12 20:41+0200\n"
+"PO-Revision-Date: 2011-05-18 08:44+0000\n"
+"Last-Translator: Lyricz <flyhigher@gmail.com>\n"
+"Language-Team: Chinese (China) <zh_CN@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:52+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
+"Language: \n"
+
+#: libexif/canon/mnote-canon-entry.c:40 libexif/fuji/mnote-fuji-entry.c:35
+#: libexif/olympus/mnote-olympus-entry.c:37
+#: libexif/pentax/mnote-pentax-entry.c:39
+#, c-format
+msgid "Invalid format '%s', expected '%s'."
+msgstr "无效格式 '%s'，期望'%s'。"
+
+#: libexif/canon/mnote-canon-entry.c:52 libexif/fuji/mnote-fuji-entry.c:47
+#: libexif/olympus/mnote-olympus-entry.c:62
+#: libexif/pentax/mnote-pentax-entry.c:51
+#, c-format
+msgid "Invalid number of components (%i, expected %i)."
+msgstr "无效的组件数（%i，期望%i）。"
+
+#: libexif/canon/mnote-canon-entry.c:61
+#: libexif/olympus/mnote-olympus-entry.c:72
+#: libexif/pentax/mnote-pentax-entry.c:61
+#, c-format
+msgid "Invalid number of components (%i, expected %i or %i)."
+msgstr "无效的组件数（%i，期望%i或者%i）。"
+
+#: libexif/canon/mnote-canon-entry.c:76 libexif/canon/mnote-canon-entry.c:130
+#: libexif/canon/mnote-canon-entry.c:182 libexif/exif-entry.c:816
+#: libexif/olympus/mnote-olympus-entry.c:199
+#: libexif/olympus/mnote-olympus-tag.c:108
+#: libexif/pentax/mnote-pentax-entry.c:174
+#: libexif/pentax/mnote-pentax-entry.c:209
+#: libexif/pentax/mnote-pentax-entry.c:297
+msgid "Macro"
+msgstr "宏"
+
+#: libexif/canon/mnote-canon-entry.c:77 libexif/canon/mnote-canon-entry.c:79
+#: libexif/canon/mnote-canon-entry.c:157 libexif/canon/mnote-canon-entry.c:160
+#: libexif/canon/mnote-canon-entry.c:163 libexif/exif-entry.c:694
+#: libexif/exif-entry.c:697 libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/exif-entry.c:765 libexif/fuji/mnote-fuji-entry.c:64
+#: libexif/olympus/mnote-olympus-entry.c:121
+#: libexif/olympus/mnote-olympus-entry.c:198
+#: libexif/olympus/mnote-olympus-entry.c:206
+#: libexif/olympus/mnote-olympus-entry.c:216
+#: libexif/olympus/mnote-olympus-entry.c:592
+#: libexif/pentax/mnote-pentax-entry.c:105
+#: libexif/pentax/mnote-pentax-entry.c:110
+#: libexif/pentax/mnote-pentax-entry.c:115
+#: libexif/pentax/mnote-pentax-entry.c:208
+msgid "Normal"
+msgstr "普通"
+
+#: libexif/canon/mnote-canon-entry.c:78
+msgid "Economy"
+msgstr "经济"
+
+#: libexif/canon/mnote-canon-entry.c:80
+msgid "Fine"
+msgstr "高质量"
+
+#: libexif/canon/mnote-canon-entry.c:81 libexif/fuji/mnote-fuji-entry.c:178
+#: libexif/pentax/mnote-pentax-entry.c:141
+msgid "RAW"
+msgstr "RAW"
+
+#: libexif/canon/mnote-canon-entry.c:82
+msgid "Superfine"
+msgstr "精细"
+
+#: libexif/canon/mnote-canon-entry.c:83 libexif/canon/mnote-canon-entry.c:304
+#: libexif/canon/mnote-canon-entry.c:307 libexif/canon/mnote-canon-entry.c:315
+#: libexif/canon/mnote-canon-entry.c:348 libexif/canon/mnote-canon-entry.c:360
+#: libexif/canon/mnote-canon-entry.c:373 libexif/canon/mnote-canon-entry.c:375
+#: libexif/canon/mnote-canon-entry.c:577 libexif/canon/mnote-canon-entry.c:674
+#: libexif/fuji/mnote-fuji-entry.c:70 libexif/fuji/mnote-fuji-entry.c:103
+#: libexif/fuji/mnote-fuji-entry.c:107 libexif/fuji/mnote-fuji-entry.c:115
+#: libexif/fuji/mnote-fuji-entry.c:142
+#: libexif/olympus/mnote-olympus-entry.c:181
+#: libexif/olympus/mnote-olympus-entry.c:189
+#: libexif/olympus/mnote-olympus-entry.c:254
+#: libexif/olympus/mnote-olympus-entry.c:536
+#: libexif/olympus/mnote-olympus-entry.c:553
+#: libexif/pentax/mnote-pentax-entry.c:195
+#: libexif/pentax/mnote-pentax-entry.c:260
+msgid "Off"
+msgstr "关闭"
+
+#: libexif/canon/mnote-canon-entry.c:84 libexif/canon/mnote-canon-entry.c:167
+#: libexif/canon/mnote-canon-entry.c:180 libexif/canon/mnote-canon-entry.c:331
+#: libexif/canon/mnote-canon-entry.c:403 libexif/fuji/mnote-fuji-entry.c:73
+#: libexif/fuji/mnote-fuji-entry.c:101 libexif/fuji/mnote-fuji-entry.c:111
+#: libexif/fuji/mnote-fuji-entry.c:119
+#: libexif/olympus/mnote-olympus-entry.c:134
+#: libexif/olympus/mnote-olympus-entry.c:186
+#: libexif/olympus/mnote-olympus-entry.c:202
+#: libexif/olympus/mnote-olympus-entry.c:247
+#: libexif/pentax/mnote-pentax-entry.c:77
+#: libexif/pentax/mnote-pentax-entry.c:88
+#: libexif/pentax/mnote-pentax-entry.c:91
+#: libexif/pentax/mnote-pentax-entry.c:97
+#: libexif/pentax/mnote-pentax-entry.c:131
+#: libexif/pentax/mnote-pentax-entry.c:229
+#: libexif/pentax/mnote-pentax-entry.c:245
+#: libexif/pentax/mnote-pentax-entry.c:290
+msgid "Auto"
+msgstr "自动"
+
+#: libexif/canon/mnote-canon-entry.c:85 libexif/canon/mnote-canon-entry.c:305
+#: libexif/canon/mnote-canon-entry.c:350 libexif/canon/mnote-canon-entry.c:364
+#: libexif/canon/mnote-canon-entry.c:374 libexif/fuji/mnote-fuji-entry.c:102
+#: libexif/fuji/mnote-fuji-entry.c:108 libexif/fuji/mnote-fuji-entry.c:116
+#: libexif/fuji/mnote-fuji-entry.c:143
+#: libexif/olympus/mnote-olympus-entry.c:182
+#: libexif/olympus/mnote-olympus-entry.c:539
+#: libexif/olympus/mnote-olympus-entry.c:556
+#: libexif/pentax/mnote-pentax-entry.c:198
+#: libexif/pentax/mnote-pentax-entry.c:261
+msgid "On"
+msgstr "打开"
+
+#: libexif/canon/mnote-canon-entry.c:86 libexif/fuji/mnote-fuji-entry.c:104
+#: libexif/olympus/mnote-olympus-entry.c:187
+#: libexif/pentax/mnote-pentax-entry.c:94
+msgid "Red-eye reduction"
+msgstr "红眼消除"
+
+#: libexif/canon/mnote-canon-entry.c:87
+msgid "Slow synchro"
+msgstr "慢速同步"
+
+#: libexif/canon/mnote-canon-entry.c:88
+msgid "Auto, red-eye reduction"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:89
+#: libexif/pentax/mnote-pentax-entry.c:200
+msgid "On, red-eye reduction"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:90
+msgid "External flash"
+msgstr "外置闪光灯"
+
+#: libexif/canon/mnote-canon-entry.c:91 libexif/canon/mnote-canon-entry.c:101
+#: libexif/canon/mnote-canon-entry.c:297
+msgid "Single"
+msgstr "单一"
+
+#: libexif/canon/mnote-canon-entry.c:92 libexif/canon/mnote-canon-entry.c:102
+#: libexif/canon/mnote-canon-entry.c:298
+msgid "Continuous"
+msgstr "连续"
+
+#: libexif/canon/mnote-canon-entry.c:93
+msgid "Movie"
+msgstr "电影"
+
+#: libexif/canon/mnote-canon-entry.c:94
+msgid "Continuous, speed priority"
+msgstr "连续，速度优先"
+
+#: libexif/canon/mnote-canon-entry.c:95
+msgid "Continuous, low"
+msgstr "连续，低"
+
+#: libexif/canon/mnote-canon-entry.c:96
+msgid "Continuous, high"
+msgstr "连续，高"
+
+#: libexif/canon/mnote-canon-entry.c:97
+msgid "One-shot AF"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:98
+msgid "AI servo AF"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:99
+msgid "AI focus AF"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:100 libexif/canon/mnote-canon-entry.c:103
+msgid "Manual focus"
+msgstr "手动对焦"
+
+#: libexif/canon/mnote-canon-entry.c:104 libexif/canon/mnote-canon-entry.c:132
+#: libexif/canon/mnote-canon-entry.c:187
+#: libexif/pentax/mnote-pentax-entry.c:212
+msgid "Pan focus"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:105
+msgid "JPEG"
+msgstr "JPEG"
+
+#: libexif/canon/mnote-canon-entry.c:106
+msgid "CRW+THM"
+msgstr "CRW+THM"
+
+#: libexif/canon/mnote-canon-entry.c:107
+msgid "AVI+THM"
+msgstr "AVI+THM"
+
+#: libexif/canon/mnote-canon-entry.c:108
+msgid "TIF"
+msgstr "TIF"
+
+#: libexif/canon/mnote-canon-entry.c:109
+msgid "TIF+JPEG"
+msgstr "TIF+JPEG"
+
+#: libexif/canon/mnote-canon-entry.c:110
+msgid "CR2"
+msgstr "CR2"
+
+#: libexif/canon/mnote-canon-entry.c:111
+msgid "CR2+JPEG"
+msgstr "CR2+JPEG"
+
+#: libexif/canon/mnote-canon-entry.c:112
+msgid "Large"
+msgstr "大"
+
+#: libexif/canon/mnote-canon-entry.c:113
+msgid "Medium"
+msgstr "中"
+
+#: libexif/canon/mnote-canon-entry.c:114
+msgid "Small"
+msgstr "小"
+
+#: libexif/canon/mnote-canon-entry.c:115
+msgid "Medium 1"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:116
+msgid "Medium 2"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:117
+msgid "Medium 3"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:118
+msgid "Postcard"
+msgstr "明信片"
+
+#: libexif/canon/mnote-canon-entry.c:119
+msgid "Widescreen"
+msgstr "宽屏"
+
+#: libexif/canon/mnote-canon-entry.c:120
+msgid "Full auto"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:121 libexif/canon/mnote-canon-entry.c:179
+#: libexif/canon/mnote-canon-entry.c:201 libexif/canon/mnote-canon-entry.c:288
+#: libexif/canon/mnote-canon-entry.c:395 libexif/exif-entry.c:764
+#: libexif/fuji/mnote-fuji-entry.c:112
+#: libexif/olympus/mnote-olympus-entry.c:93
+#: libexif/olympus/mnote-olympus-entry.c:203
+#: libexif/pentax/mnote-pentax-entry.c:79
+#: libexif/pentax/mnote-pentax-entry.c:102
+#: libexif/pentax/mnote-pentax-entry.c:133
+#: libexif/pentax/mnote-pentax-entry.c:165
+#: libexif/pentax/mnote-pentax-entry.c:211
+#: libexif/pentax/mnote-pentax-entry.c:250
+msgid "Manual"
+msgstr "手动"
+
+#: libexif/canon/mnote-canon-entry.c:122 libexif/canon/mnote-canon-entry.c:433
+#: libexif/exif-entry.c:691 libexif/exif-entry.c:775
+#: libexif/fuji/mnote-fuji-entry.c:121 libexif/pentax/mnote-pentax-entry.c:167
+#: libexif/pentax/mnote-pentax-entry.c:301
+msgid "Landscape"
+msgstr "风景"
+
+#: libexif/canon/mnote-canon-entry.c:123
+msgid "Fast shutter"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:124
+msgid "Slow shutter"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:125 libexif/fuji/mnote-fuji-entry.c:123
+#: libexif/olympus/mnote-olympus-entry.c:257
+msgid "Night"
+msgstr "夜景"
+
+#: libexif/canon/mnote-canon-entry.c:126
+msgid "Grayscale"
+msgstr "灰阶"
+
+#: libexif/canon/mnote-canon-entry.c:127 libexif/canon/mnote-canon-entry.c:311
+#: libexif/pentax/mnote-pentax-entry.c:128
+msgid "Sepia"
+msgstr "棕褐色"
+
+#: libexif/canon/mnote-canon-entry.c:128 libexif/canon/mnote-canon-entry.c:432
+#: libexif/exif-entry.c:691 libexif/exif-entry.c:773
+#: libexif/fuji/mnote-fuji-entry.c:120 libexif/pentax/mnote-pentax-entry.c:166
+#: libexif/pentax/mnote-pentax-entry.c:291
+#: libexif/pentax/mnote-pentax-entry.c:294
+#: libexif/pentax/mnote-pentax-entry.c:300
+msgid "Portrait"
+msgstr "肖像模式"
+
+#: libexif/canon/mnote-canon-entry.c:129 libexif/fuji/mnote-fuji-entry.c:122
+msgid "Sports"
+msgstr "运动模式"
+
+#: libexif/canon/mnote-canon-entry.c:131 libexif/canon/mnote-canon-entry.c:312
+#: libexif/canon/mnote-canon-entry.c:338 libexif/canon/mnote-canon-entry.c:410
+#: libexif/fuji/mnote-fuji-entry.c:89 libexif/pentax/mnote-pentax-entry.c:127
+msgid "Black & white"
+msgstr "黑白"
+
+#: libexif/canon/mnote-canon-entry.c:133 libexif/canon/mnote-canon-entry.c:308
+msgid "Vivid"
+msgstr "鲜艳"
+
+#: libexif/canon/mnote-canon-entry.c:134 libexif/canon/mnote-canon-entry.c:309
+#: libexif/canon/mnote-canon-entry.c:434
+msgid "Neutral"
+msgstr "中性"
+
+#: libexif/canon/mnote-canon-entry.c:135
+#: libexif/pentax/mnote-pentax-entry.c:93
+msgid "Flash off"
+msgstr "闪光灯关闭"
+
+#: libexif/canon/mnote-canon-entry.c:136
+msgid "Long shutter"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:137 libexif/canon/mnote-canon-entry.c:188
+#: libexif/olympus/mnote-olympus-entry.c:174
+msgid "Super macro"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:138
+msgid "Foliage"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:139
+msgid "Indoor"
+msgstr "室内"
+
+#: libexif/canon/mnote-canon-entry.c:140 libexif/fuji/mnote-fuji-entry.c:135
+#: libexif/pentax/mnote-pentax-entry.c:175
+msgid "Fireworks"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:141 libexif/fuji/mnote-fuji-entry.c:133
+msgid "Beach"
+msgstr "海滩"
+
+#: libexif/canon/mnote-canon-entry.c:142 libexif/canon/mnote-canon-entry.c:347
+#: libexif/canon/mnote-canon-entry.c:419 libexif/fuji/mnote-fuji-entry.c:136
+#: libexif/pentax/mnote-pentax-entry.c:187
+#: libexif/pentax/mnote-pentax-entry.c:292
+#: libexif/pentax/mnote-pentax-entry.c:298
+msgid "Underwater"
+msgstr "水下"
+
+#: libexif/canon/mnote-canon-entry.c:143 libexif/fuji/mnote-fuji-entry.c:134
+msgid "Snow"
+msgstr "雪景"
+
+#: libexif/canon/mnote-canon-entry.c:144
+msgid "Kids & pets"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:145
+msgid "Night snapshot"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:146
+msgid "Digital macro"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:147
+msgid "My colors"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:148
+msgid "Still image"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:149
+msgid "Color accent"
+msgstr "色调"
+
+#: libexif/canon/mnote-canon-entry.c:150
+msgid "Color swap"
+msgstr "颜色交换"
+
+#: libexif/canon/mnote-canon-entry.c:151
+msgid "Aquarium"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:152
+msgid "ISO 3200"
+msgstr "ISO 3200"
+
+#: libexif/canon/mnote-canon-entry.c:153 libexif/canon/mnote-canon-entry.c:351
+#: libexif/canon/mnote-canon-entry.c:368 libexif/canon/mnote-canon-entry.c:420
+#: libexif/olympus/mnote-olympus-entry.c:192
+#: libexif/olympus/mnote-olympus-entry.c:229
+#: libexif/olympus/mnote-olympus-entry.c:457
+#: libexif/pentax/mnote-pentax-entry.c:242
+msgid "None"
+msgstr "无"
+
+#: libexif/canon/mnote-canon-entry.c:154
+msgid "2x"
+msgstr "2x"
+
+#: libexif/canon/mnote-canon-entry.c:155
+msgid "4x"
+msgstr "4x"
+
+#: libexif/canon/mnote-canon-entry.c:156 libexif/exif-entry.c:722
+#: libexif/exif-entry.c:752
+msgid "Other"
+msgstr "其它"
+
+#: libexif/canon/mnote-canon-entry.c:158 libexif/canon/mnote-canon-entry.c:161
+#: libexif/canon/mnote-canon-entry.c:164 libexif/canon/mnote-canon-entry.c:401
+#: libexif/fuji/mnote-fuji-entry.c:86 libexif/pentax/mnote-pentax-entry.c:112
+#: libexif/pentax/mnote-pentax-entry.c:117
+msgid "High"
+msgstr "高"
+
+#: libexif/canon/mnote-canon-entry.c:159 libexif/canon/mnote-canon-entry.c:162
+#: libexif/canon/mnote-canon-entry.c:165 libexif/canon/mnote-canon-entry.c:399
+#: libexif/pentax/mnote-pentax-entry.c:111
+#: libexif/pentax/mnote-pentax-entry.c:116
+msgid "Low"
+msgstr "低"
+
+#: libexif/canon/mnote-canon-entry.c:166
+msgid "Auto high"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:168
+msgid "50"
+msgstr "50"
+
+#: libexif/canon/mnote-canon-entry.c:169
+#: libexif/pentax/mnote-pentax-entry.c:120
+#: libexif/pentax/mnote-pentax-entry.c:122
+msgid "100"
+msgstr "100"
+
+#: libexif/canon/mnote-canon-entry.c:170
+#: libexif/pentax/mnote-pentax-entry.c:121
+#: libexif/pentax/mnote-pentax-entry.c:123
+msgid "200"
+msgstr "200"
+
+#: libexif/canon/mnote-canon-entry.c:171
+msgid "400"
+msgstr "400"
+
+#: libexif/canon/mnote-canon-entry.c:172
+msgid "800"
+msgstr "800"
+
+#: libexif/canon/mnote-canon-entry.c:173
+msgid "Default"
+msgstr "默认"
+
+#: libexif/canon/mnote-canon-entry.c:174 libexif/exif-entry.c:718
+msgid "Spot"
+msgstr "点"
+
+#: libexif/canon/mnote-canon-entry.c:175 libexif/exif-entry.c:716
+msgid "Average"
+msgstr "平均"
+
+#: libexif/canon/mnote-canon-entry.c:176
+msgid "Evaluative"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:177 libexif/exif-entry.c:721
+msgid "Partial"
+msgstr "局部"
+
+#: libexif/canon/mnote-canon-entry.c:178 libexif/exif-entry.c:717
+msgid "Center-weighted average"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:181
+msgid "Not known"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:183
+msgid "Very close"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:184 libexif/exif-entry.c:817
+msgid "Close"
+msgstr "关闭"
+
+#: libexif/canon/mnote-canon-entry.c:185
+msgid "Middle range"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:186
+msgid "Far range"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:189
+#: libexif/pentax/mnote-pentax-entry.c:210
+msgid "Infinity"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:190
+msgid "Manual AF point selection"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:191 libexif/canon/mnote-canon-entry.c:352
+msgid "None (MF)"
+msgstr "无 (MF)"
+
+#: libexif/canon/mnote-canon-entry.c:192
+msgid "Auto-selected"
+msgstr "自动选择"
+
+#: libexif/canon/mnote-canon-entry.c:193 libexif/canon/mnote-canon-entry.c:353
+#: libexif/pentax/mnote-pentax-entry.c:224
+#: libexif/pentax/mnote-pentax-entry.c:238
+msgid "Right"
+msgstr "右"
+
+#: libexif/canon/mnote-canon-entry.c:194 libexif/canon/mnote-canon-entry.c:354
+#: libexif/pentax/mnote-pentax-entry.c:222
+#: libexif/pentax/mnote-pentax-entry.c:237
+msgid "Center"
+msgstr "中"
+
+#: libexif/canon/mnote-canon-entry.c:195 libexif/canon/mnote-canon-entry.c:356
+#: libexif/pentax/mnote-pentax-entry.c:220
+#: libexif/pentax/mnote-pentax-entry.c:236
+msgid "Left"
+msgstr "左"
+
+#: libexif/canon/mnote-canon-entry.c:196
+msgid "Auto AF point selection"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:197
+msgid "Easy shooting"
+msgstr "简易拍摄"
+
+#: libexif/canon/mnote-canon-entry.c:198
+#: libexif/pentax/mnote-pentax-entry.c:163
+msgid "Program"
+msgstr "程序"
+
+#: libexif/canon/mnote-canon-entry.c:199
+msgid "Tv-priority"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:200
+msgid "Av-priority"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:202
+msgid "A-DEP"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:203
+msgid "M-DEP"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:204
+msgid "Canon EF 50mm f/1.8"
+msgstr "佳能 EF 50mm f/1.8"
+
+#: libexif/canon/mnote-canon-entry.c:205
+msgid "Canon EF 28mm f/2.8"
+msgstr "佳能 EF 28mm f/2.8"
+
+#: libexif/canon/mnote-canon-entry.c:206
+msgid "Sigma UC Zoom 35-135mm f/4-5.6"
+msgstr "适马 UC Zoom 35-135mm f/4-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:207
+msgid "Tokina AF193-2 19-35mm f/3.5-4.5"
+msgstr "图丽 AF193-2 19-35mm f/3.5-4.5"
+
+#: libexif/canon/mnote-canon-entry.c:208
+msgid "Canon EF 100-300mm F5.6L"
+msgstr "佳能 EF 100-300mm F5.6L"
+
+#: libexif/canon/mnote-canon-entry.c:209
+msgid "Sigma 50mm f/2.8 EX or 28mm f/1.8"
+msgstr "适马 50mm f/2.8 EX or 28mm f/1.8"
+
+#: libexif/canon/mnote-canon-entry.c:210
+msgid "Canon EF 35mm f/2"
+msgstr "佳能 EF 35mm f/2"
+
+#: libexif/canon/mnote-canon-entry.c:211
+msgid "Canon EF 15mm f/2.8"
+msgstr "佳能 EF 15mm f/2.8"
+
+#: libexif/canon/mnote-canon-entry.c:212
+msgid "Canon EF 80-200mm f/2.8L"
+msgstr "佳能 EF 80-200mm f/2.8L"
+
+#: libexif/canon/mnote-canon-entry.c:213
+msgid "Tokina AT-X280AF PRO 28-80mm F2.8 Aspherical"
+msgstr "图丽 AT-X280AF PRO 28-80mm F2.8 Aspherical"
+
+#: libexif/canon/mnote-canon-entry.c:214
+msgid "Cosina 100mm f/3.5 Macro AF"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:215
+msgid "Tamron AF Aspherical 28-200mm f/3.8-5.6"
+msgstr "腾龙 AF Aspherical 28-200mm f/3.8-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:216
+msgid "Canon EF 50mm f/1.8 MkII"
+msgstr "佳能 EF 50mm f/1.8 MkII"
+
+#: libexif/canon/mnote-canon-entry.c:217
+msgid "Tamron SP AF 300mm f/2.8 LD IF"
+msgstr "腾龙 SP AF 300mm f/2.8 LD IF"
+
+#: libexif/canon/mnote-canon-entry.c:218
+msgid "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
+msgstr "佳能 EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye"
+
+#: libexif/canon/mnote-canon-entry.c:219
+msgid "Canon EF 35-80mm f/4-5.6"
+msgstr "佳能 EF 35-80mm f/4-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:220
+msgid "Canon EF 75-300mm f/4-5.6"
+msgstr "佳能 EF 75-300mm f/4-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:221
+msgid "Canon EF 28-80mm f/3.5-5.6"
+msgstr "佳能 EF 28-80mm f/3.5-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:222
+msgid "Canon EF 28-105mm f/4-5.6"
+msgstr "佳能 EF 28-105mm f/4-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:223
+msgid "Canon EF-S 18-55mm f/3.5-5.6"
+msgstr "佳能 EF-S 18-55mm f/3.5-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:224
+msgid "Canon EF-S 18-55mm f/3.5-5.6 IS II"
+msgstr "佳能 EF-S 18-55mm f/3.5-5.6 IS II"
+
+#: libexif/canon/mnote-canon-entry.c:225
+msgid "Canon MP-E 65mm f/2.8 1-5x Macro Photo"
+msgstr "佳能 MP-E 65mm f/2.8 1-5x Macro Photo"
+
+#: libexif/canon/mnote-canon-entry.c:226
+msgid "Canon TS-E 24mm f/3.5L"
+msgstr "佳能 TS-E 24mm f/3.5L"
+
+#: libexif/canon/mnote-canon-entry.c:227
+msgid "Canon TS-E 45mm f/2.8"
+msgstr "佳能 TS-E 45mm f/2.8"
+
+#: libexif/canon/mnote-canon-entry.c:228
+msgid "Canon TS-E 90mm f/2.8"
+msgstr "佳能 TS-E 90mm f/2.8"
+
+#: libexif/canon/mnote-canon-entry.c:229
+msgid "Canon EF 50mm f/1.0L"
+msgstr "佳能 EF 50mm f/1.0L"
+
+#: libexif/canon/mnote-canon-entry.c:230
+msgid "Sigma 17-35mm f2.8-4 EX Aspherical HSM"
+msgstr "适马 17-35mm f2.8-4 EX Aspherical HSM"
+
+#: libexif/canon/mnote-canon-entry.c:231
+msgid "Canon EF 600mm f/4L IS"
+msgstr "佳能 EF 600mm f/4L IS"
+
+#: libexif/canon/mnote-canon-entry.c:232
+msgid "Canon EF 200mm f/1.8L"
+msgstr "佳能 EF 200mm f/1.8L"
+
+#: libexif/canon/mnote-canon-entry.c:233
+msgid "Canon EF 300mm f/2.8L"
+msgstr "佳能 EF 300mm f/2.8L"
+
+#: libexif/canon/mnote-canon-entry.c:234
+msgid "Canon EF 85mm f/1.2L"
+msgstr "佳能 EF 85mm f/1.2L"
+
+#: libexif/canon/mnote-canon-entry.c:235
+msgid "Canon EF 400mm f/2.8L"
+msgstr "佳能 EF 400mm f/2.8L"
+
+#: libexif/canon/mnote-canon-entry.c:236
+msgid "Canon EF 500mm f/4.5L"
+msgstr "佳能 EF 500mm f/4.5L"
+
+#: libexif/canon/mnote-canon-entry.c:237
+msgid "Canon EF 300mm f/2.8L IS"
+msgstr "佳能 EF 300mm f/2.8L IS"
+
+#: libexif/canon/mnote-canon-entry.c:238
+msgid "Canon EF 500mm f/4L IS"
+msgstr "佳能 EF 500mm f/4L IS"
+
+#: libexif/canon/mnote-canon-entry.c:239
+msgid "Canon EF 100mm f/2"
+msgstr "佳能 EF 100mm f/2"
+
+#: libexif/canon/mnote-canon-entry.c:240
+msgid "Sigma 20mm EX f/1.8"
+msgstr "适马 20mm EX f/1.8"
+
+#: libexif/canon/mnote-canon-entry.c:241
+msgid "Canon EF 200mm f/2.8L"
+msgstr "佳能 EF 200mm f/2.8L"
+
+#: libexif/canon/mnote-canon-entry.c:242
+msgid "Sigma 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
+msgstr "适马 10-20mm F4-5.6 or 12-24mm f/4.5-5.6 or 14mm f/2.8"
+
+#: libexif/canon/mnote-canon-entry.c:243
+msgid "Canon EF 35-350mm f/3.5-5.6L"
+msgstr "佳能 EF 35-350mm f/3.5-5.6L"
+
+#: libexif/canon/mnote-canon-entry.c:244
+msgid "Canon EF 85mm f/1.8 USM"
+msgstr "佳能 EF 85mm f/1.8 USM"
+
+#: libexif/canon/mnote-canon-entry.c:245
+msgid "Canon EF 28-105mm f/3.5-4.5 USM"
+msgstr "佳能 EF 28-105mm f/3.5-4.5 USM"
+
+#: libexif/canon/mnote-canon-entry.c:246
+msgid "Canon EF 20-35mm f/3.5-4.5 USM"
+msgstr "佳能 EF 20-35mm f/3.5-4.5 USM"
+
+#: libexif/canon/mnote-canon-entry.c:247
+msgid "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
+msgstr "佳能 EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8"
+
+#: libexif/canon/mnote-canon-entry.c:248
+msgid "Canon EF 70-200mm f/2.8 L"
+msgstr "佳能 EF 70-200mm f/2.8 L"
+
+#: libexif/canon/mnote-canon-entry.c:249
+msgid "Canon EF 70-200mm f/2.8 L + x1.4"
+msgstr "佳能 EF 70-200mm f/2.8 L + x1.4"
+
+#: libexif/canon/mnote-canon-entry.c:250
+msgid "Canon EF 70-200mm f/2.8 L + x2"
+msgstr "佳能 EF 70-200mm f/2.8 L + x2"
+
+#: libexif/canon/mnote-canon-entry.c:251
+msgid "Canon EF 28mm f/1.8 USM"
+msgstr "佳能 EF 28mm f/1.8 USM"
+
+#: libexif/canon/mnote-canon-entry.c:252
+msgid "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"
+msgstr "适马 15-30mm f/3.5-4.5 EX DG Aspherical"
+
+#: libexif/canon/mnote-canon-entry.c:253
+msgid "Canon EF 200mm f/2.8L II"
+msgstr "佳能 EF 200mm f/2.8L II"
+
+#: libexif/canon/mnote-canon-entry.c:254
+msgid "Canon EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
+msgstr "佳能 EF 180mm Macro f/3.5L or Sigma 180mm EX HSM Macro f/3.5"
+
+#: libexif/canon/mnote-canon-entry.c:255
+msgid "Canon EF 135mm f/2L"
+msgstr "佳能 EF 135mm f/2L"
+
+#: libexif/canon/mnote-canon-entry.c:256
+msgid "Canon EF 24-85mm f/3.5-4.5 USM"
+msgstr "佳能 EF 24-85mm f/3.5-4.5 USM"
+
+#: libexif/canon/mnote-canon-entry.c:257
+msgid "Canon EF 300mm f/4L IS"
+msgstr "佳能 EF 300mm f/4L IS"
+
+#: libexif/canon/mnote-canon-entry.c:258
+msgid "Canon EF 28-135mm f/3.5-5.6 IS"
+msgstr "佳能 EF 28-135mm f/3.5-5.6 IS"
+
+#: libexif/canon/mnote-canon-entry.c:259
+msgid "Canon EF 35mm f/1.4L"
+msgstr "佳能 EF 35mm f/1.4L"
+
+#: libexif/canon/mnote-canon-entry.c:260
+msgid "Canon EF 100-400mm f/4.5-5.6L IS + x1.4"
+msgstr "佳能 EF 100-400mm f/4.5-5.6L IS + x1.4"
+
+#: libexif/canon/mnote-canon-entry.c:261
+msgid "Canon EF 100-400mm f/4.5-5.6L IS + x2"
+msgstr "佳能 EF 100-400mm f/4.5-5.6L IS + x2"
+
+#: libexif/canon/mnote-canon-entry.c:262
+msgid "Canon EF 100-400mm f/4.5-5.6L IS"
+msgstr "佳能 EF 100-400mm f/4.5-5.6L IS"
+
+#: libexif/canon/mnote-canon-entry.c:263
+msgid "Canon EF 400mm f/2.8L + x2"
+msgstr "佳能 EF 400mm f/2.8L + x2"
+
+#: libexif/canon/mnote-canon-entry.c:264
+msgid "Canon EF 70-200mm f/4L"
+msgstr "佳能 EF 70-200mm f/4L"
+
+#: libexif/canon/mnote-canon-entry.c:265
+msgid "Canon EF 100mm f/2.8 Macro"
+msgstr "佳能 EF 100mm f/2.8 Macro"
+
+#: libexif/canon/mnote-canon-entry.c:266
+msgid "Canon EF 400mm f/4 DO IS"
+msgstr "佳能 EF 400mm f/4 DO IS"
+
+#: libexif/canon/mnote-canon-entry.c:267
+msgid "Canon EF 75-300mm f/4-5.6 IS"
+msgstr "佳能 EF 75-300mm f/4-5.6 IS"
+
+#: libexif/canon/mnote-canon-entry.c:268
+msgid "Canon EF 50mm f/1.4"
+msgstr "佳能 EF 50mm f/1.4"
+
+#: libexif/canon/mnote-canon-entry.c:269
+msgid "Canon EF 28-80 f/3.5-5.6 USM IV"
+msgstr "佳能 EF 28-80 f/3.5-5.6 USM IV"
+
+#: libexif/canon/mnote-canon-entry.c:270
+msgid "Canon EF 28-200mm f/3.5-5.6"
+msgstr "佳能 EF 28-200mm f/3.5-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:271
+msgid "Canon EF 90-300mm f/4.5-5.6"
+msgstr "佳能 EF 90-300mm f/4.5-5.6"
+
+#: libexif/canon/mnote-canon-entry.c:272
+msgid "Canon EF-S 18-55mm f/3.5-4.5 USM"
+msgstr "佳能 EF-S 18-55mm f/3.5-4.5 USM"
+
+#: libexif/canon/mnote-canon-entry.c:273
+msgid "Canon EF 70-200mm f/2.8L IS USM"
+msgstr "佳能 EF 70-200mm f/2.8L IS USM"
+
+#: libexif/canon/mnote-canon-entry.c:274
+msgid "Canon EF 70-200mm f/2.8L IS USM + x1.4"
+msgstr "佳能 EF 70-200mm f/2.8L IS USM + x1.4"
+
+#: libexif/canon/mnote-canon-entry.c:275
+msgid "Canon EF 70-200mm f/2.8L IS USM + x2"
+msgstr "佳能 EF 70-200mm f/2.8L IS USM + x2"
+
+#: libexif/canon/mnote-canon-entry.c:276
+msgid "Canon EF 16-35mm f/2.8L"
+msgstr "佳能 EF 16-35mm f/2.8L"
+
+#: libexif/canon/mnote-canon-entry.c:277
+msgid "Canon EF 24-70mm f/2.8L"
+msgstr "佳能 EF 24-70mm f/2.8L"
+
+#: libexif/canon/mnote-canon-entry.c:278
+msgid "Canon EF 17-40mm f/4L"
+msgstr "佳能 EF 17-40mm f/4L"
+
+#: libexif/canon/mnote-canon-entry.c:279
+msgid "Canon EF 70-300mm f/4.5-5.6 DO IS USM"
+msgstr "佳能 EF 70-300mm f/4.5-5.6 DO IS USM"
+
+#: libexif/canon/mnote-canon-entry.c:280
+msgid "Canon EF-S 17-85mm f4-5.6 IS USM"
+msgstr "佳能 EF-S 17-85mm f4-5.6 IS USM"
+
+#: libexif/canon/mnote-canon-entry.c:281
+msgid "Canon EF-S10-22mm F3.5-4.5 USM"
+msgstr "佳能 EF-S10-22mm F3.5-4.5 USM"
+
+#: libexif/canon/mnote-canon-entry.c:282
+msgid "Canon EF-S60mm F2.8 Macro USM"
+msgstr "佳能 EF-S60mm F2.8 Macro USM"
+
+#: libexif/canon/mnote-canon-entry.c:283
+msgid "Canon EF 24-105mm f/4L IS"
+msgstr "佳能 EF 24-105mm f/4L IS"
+
+#: libexif/canon/mnote-canon-entry.c:284
+msgid "Canon EF 70-300mm F4-5.6 IS USM"
+msgstr "佳能 EF 70-300mm F4-5.6 IS USM"
+
+#: libexif/canon/mnote-canon-entry.c:285
+msgid "Canon EF 50mm F1.2L USM"
+msgstr "佳能 EF 50mm F1.2L USM"
+
+#: libexif/canon/mnote-canon-entry.c:286
+msgid "Canon EF 70-200mm f/4L IS USM"
+msgstr "佳能 EF 70-200mm f/4L IS USM"
+
+#: libexif/canon/mnote-canon-entry.c:287
+msgid "Canon EF 70-200mm f/2.8L IS II USM"
+msgstr "佳能 EF 70-200mm f/2.8L IS II USM"
+
+#: libexif/canon/mnote-canon-entry.c:289
+msgid "TTL"
+msgstr "TTL"
+
+#: libexif/canon/mnote-canon-entry.c:290
+msgid "A-TTL"
+msgstr "A-TTL"
+
+#: libexif/canon/mnote-canon-entry.c:291
+msgid "E-TTL"
+msgstr "E-TTL"
+
+#: libexif/canon/mnote-canon-entry.c:292
+msgid "FP sync enabled"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:293
+msgid "2nd-curtain sync used"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:294
+msgid "FP sync used"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:295
+#: libexif/olympus/mnote-olympus-entry.c:193
+msgid "Internal"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:296
+#: libexif/olympus/mnote-olympus-entry.c:194
+msgid "External"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:299
+msgid "Normal AE"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:300
+msgid "Exposure compensation"
+msgstr "曝光补偿"
+
+#: libexif/canon/mnote-canon-entry.c:301
+msgid "AE lock"
+msgstr "AE 锁"
+
+#: libexif/canon/mnote-canon-entry.c:302
+msgid "AE lock + exposure compensation"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:303
+msgid "No AE"
+msgstr "无 AE"
+
+#: libexif/canon/mnote-canon-entry.c:306
+msgid "On, shot only"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:310
+msgid "Smooth"
+msgstr "平滑"
+
+#: libexif/canon/mnote-canon-entry.c:313 libexif/canon/mnote-canon-entry.c:337
+#: libexif/canon/mnote-canon-entry.c:396 libexif/canon/mnote-canon-entry.c:409
+#: libexif/fuji/mnote-fuji-entry.c:81 libexif/pentax/mnote-pentax-entry.c:87
+msgid "Custom"
+msgstr "自定义"
+
+#: libexif/canon/mnote-canon-entry.c:314
+msgid "My color data"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:316 libexif/canon/mnote-canon-entry.c:378
+#: libexif/pentax/mnote-pentax-entry.c:126
+#: libexif/pentax/mnote-pentax-entry.c:145
+msgid "Full"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:317 libexif/canon/mnote-canon-entry.c:377
+msgid "2/3"
+msgstr "2/3"
+
+#: libexif/canon/mnote-canon-entry.c:318 libexif/canon/mnote-canon-entry.c:376
+msgid "1/3"
+msgstr "1/3"
+
+#: libexif/canon/mnote-canon-entry.c:324
+msgid "Fixed"
+msgstr "已修复"
+
+#: libexif/canon/mnote-canon-entry.c:325 libexif/pentax/mnote-pentax-tag.c:44
+msgid "Zoom"
+msgstr "缩放"
+
+#: libexif/canon/mnote-canon-entry.c:332
+msgid "Sunny"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:333 libexif/canon/mnote-canon-entry.c:405
+#: libexif/exif-entry.c:739 libexif/fuji/mnote-fuji-entry.c:75
+#: libexif/olympus/mnote-olympus-entry.c:139
+#: libexif/pentax/mnote-pentax-entry.c:255
+msgid "Cloudy"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:334 libexif/canon/mnote-canon-entry.c:406
+#: libexif/exif-entry.c:736 libexif/pentax/mnote-pentax-entry.c:100
+#: libexif/pentax/mnote-pentax-entry.c:249
+msgid "Tungsten"
+msgstr "钨灯"
+
+#: libexif/canon/mnote-canon-entry.c:335 libexif/canon/mnote-canon-entry.c:407
+#: libexif/exif-entry.c:735 libexif/pentax/mnote-pentax-entry.c:101
+#: libexif/pentax/mnote-pentax-entry.c:248
+msgid "Fluorescent"
+msgstr "荧光灯"
+
+#: libexif/canon/mnote-canon-entry.c:336 libexif/canon/mnote-canon-entry.c:408
+#: libexif/exif-entry.c:737 libexif/exif-entry.c:779 libexif/exif-tag.c:577
+#: libexif/fuji/mnote-fuji-entry.c:80 libexif/pentax/mnote-pentax-entry.c:254
+msgid "Flash"
+msgstr "闪光灯"
+
+#: libexif/canon/mnote-canon-entry.c:339 libexif/canon/mnote-canon-entry.c:411
+#: libexif/exif-entry.c:740 libexif/pentax/mnote-pentax-entry.c:99
+#: libexif/pentax/mnote-pentax-entry.c:247
+msgid "Shade"
+msgstr "阴影"
+
+#: libexif/canon/mnote-canon-entry.c:340 libexif/canon/mnote-canon-entry.c:412
+msgid "Manual temperature (Kelvin)"
+msgstr "手动色温(开氏)"
+
+#: libexif/canon/mnote-canon-entry.c:341 libexif/canon/mnote-canon-entry.c:413
+msgid "PC set 1"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:342 libexif/canon/mnote-canon-entry.c:414
+msgid "PC set 2"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:343 libexif/canon/mnote-canon-entry.c:415
+msgid "PC set 3"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:344 libexif/canon/mnote-canon-entry.c:416
+#: libexif/exif-entry.c:741 libexif/fuji/mnote-fuji-entry.c:76
+#: libexif/pentax/mnote-pentax-entry.c:251
+msgid "Daylight fluorescent"
+msgstr "日光色荧光灯"
+
+#: libexif/canon/mnote-canon-entry.c:345 libexif/canon/mnote-canon-entry.c:417
+msgid "Custom 1"
+msgstr "自定义 1"
+
+#: libexif/canon/mnote-canon-entry.c:346 libexif/canon/mnote-canon-entry.c:418
+msgid "Custom 2"
+msgstr "自定义 2"
+
+#: libexif/canon/mnote-canon-entry.c:349 libexif/exif-entry.c:692
+#: libexif/pentax/mnote-pentax-entry.c:78
+#: libexif/pentax/mnote-pentax-entry.c:132
+#: libexif/pentax/mnote-pentax-entry.c:169
+#: libexif/pentax/mnote-pentax-entry.c:295
+msgid "Night scene"
+msgstr "夜景"
+
+#: libexif/canon/mnote-canon-entry.c:355
+msgid "Center-right"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:357
+msgid "Left-right"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:358
+msgid "Left-center"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:359
+msgid "All"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:361
+msgid "On (shot 1)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:362
+msgid "On (shot 2)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:363
+msgid "On (shot 3)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:365
+msgid "EOS high-end"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:366
+msgid "Compact"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:367
+msgid "EOS mid-range"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:369
+msgid "Rotate 90 CW"
+msgstr "逆时针旋转90度"
+
+#: libexif/canon/mnote-canon-entry.c:370
+msgid "Rotate 180"
+msgstr "旋转180度"
+
+#: libexif/canon/mnote-canon-entry.c:371
+msgid "Rotate 270 CW"
+msgstr "逆时针旋转270度"
+
+#: libexif/canon/mnote-canon-entry.c:372
+msgid "Rotated by software"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:384
+#: libexif/olympus/mnote-olympus-entry.c:612
+msgid "Left to right"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:385
+#: libexif/olympus/mnote-olympus-entry.c:615
+msgid "Right to left"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:386
+#: libexif/olympus/mnote-olympus-entry.c:618
+msgid "Bottom to top"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:387
+#: libexif/olympus/mnote-olympus-entry.c:621
+msgid "Top to bottom"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:388
+msgid "2x2 matrix (clockwise)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:394 libexif/canon/mnote-canon-entry.c:400
+#: libexif/canon/mnote-canon-entry.c:421 libexif/canon/mnote-canon-entry.c:431
+#: libexif/exif-entry.c:691 libexif/fuji/mnote-fuji-entry.c:84
+#: libexif/fuji/mnote-fuji-entry.c:93 libexif/fuji/mnote-fuji-entry.c:163
+#: libexif/olympus/mnote-olympus-entry.c:230
+msgid "Standard"
+msgstr "标准"
+
+#: libexif/canon/mnote-canon-entry.c:397
+msgid "N/A"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:398
+msgid "Lowest"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:402
+msgid "Highest"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:404 libexif/exif-entry.c:734
+#: libexif/fuji/mnote-fuji-entry.c:74
+#: libexif/olympus/mnote-olympus-entry.c:136
+#: libexif/pentax/mnote-pentax-entry.c:98
+#: libexif/pentax/mnote-pentax-entry.c:246
+msgid "Daylight"
+msgstr "日光"
+
+#: libexif/canon/mnote-canon-entry.c:422
+msgid "Set 1"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:423
+msgid "Set 2"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:424
+msgid "Set 3"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:425
+msgid "User def. 1"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:426
+msgid "User def. 2"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:427
+msgid "User def. 3"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:428
+msgid "External 1"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:429
+msgid "External 2"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:430
+msgid "External 3"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:435
+msgid "Faithful"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:436
+#: libexif/olympus/mnote-olympus-entry.c:118
+msgid "Monochrome"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:494
+msgid ", "
+msgstr ", "
+
+#: libexif/canon/mnote-canon-entry.c:580 libexif/canon/mnote-canon-entry.c:677
+#, c-format
+msgid "%i (ms)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:624
+#, c-format
+msgid "%.2f mm"
+msgstr "%.2f mm"
+
+#: libexif/canon/mnote-canon-entry.c:648
+#, c-format
+msgid "%.2f EV"
+msgstr "%.2f EV"
+
+#: libexif/canon/mnote-canon-entry.c:658 libexif/exif-entry.c:1089
+#, c-format
+msgid "1/%i"
+msgstr ""
+
+#: libexif/canon/mnote-canon-entry.c:670
+#, c-format
+msgid "%u mm"
+msgstr "%u mm"
+
+#: libexif/canon/mnote-canon-tag.c:35
+msgid "Settings (First Part)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:36 libexif/canon/mnote-canon-tag.c:92
+#: libexif/exif-tag.c:581 libexif/pentax/mnote-pentax-tag.c:88
+msgid "Focal Length"
+msgstr "焦距"
+
+#: libexif/canon/mnote-canon-tag.c:37
+msgid "Settings (Second Part)"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:38
+#: libexif/olympus/mnote-olympus-entry.c:601
+#: libexif/pentax/mnote-pentax-entry.c:177
+msgid "Panorama"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:39
+msgid "Image Type"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:40 libexif/olympus/mnote-olympus-tag.c:37
+#: libexif/olympus/mnote-olympus-tag.c:113
+msgid "Firmware Version"
+msgstr "固件版本"
+
+#: libexif/canon/mnote-canon-tag.c:41
+msgid "Image Number"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:42
+msgid "Owner Name"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:43
+msgid "Color Information"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:44 libexif/fuji/mnote-fuji-tag.c:37
+#: libexif/olympus/mnote-olympus-tag.c:81
+#: libexif/olympus/mnote-olympus-tag.c:146
+msgid "Serial Number"
+msgstr "序列号"
+
+#: libexif/canon/mnote-canon-tag.c:45
+msgid "Custom Functions"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:56 libexif/fuji/mnote-fuji-tag.c:45
+msgid "Macro Mode"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:57 libexif/canon/mnote-canon-tag.c:117
+#: libexif/olympus/mnote-olympus-tag.c:175
+#: libexif/pentax/mnote-pentax-tag.c:128
+msgid "Self-timer"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:58 libexif/fuji/mnote-fuji-tag.c:38
+#: libexif/olympus/mnote-olympus-tag.c:40
+#: libexif/olympus/mnote-olympus-tag.c:94
+#: libexif/olympus/mnote-olympus-tag.c:107
+msgid "Quality"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:59 libexif/fuji/mnote-fuji-tag.c:43
+#: libexif/olympus/mnote-olympus-tag.c:45
+#: libexif/olympus/mnote-olympus-tag.c:127
+#: libexif/pentax/mnote-pentax-tag.c:38 libexif/pentax/mnote-pentax-tag.c:73
+msgid "Flash Mode"
+msgstr "闪光模式"
+
+#: libexif/canon/mnote-canon-tag.c:60 libexif/pentax/mnote-pentax-tag.c:101
+msgid "Drive Mode"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:61 libexif/canon/mnote-canon-tag.c:82
+#: libexif/olympus/mnote-olympus-tag.c:43
+#: libexif/olympus/mnote-olympus-tag.c:134
+#: libexif/olympus/mnote-olympus-tag.c:173
+#: libexif/pentax/mnote-pentax-tag.c:37 libexif/pentax/mnote-pentax-tag.c:74
+#: libexif/pentax/mnote-pentax-tag.c:130
+msgid "Focus Mode"
+msgstr "对焦模式"
+
+#: libexif/canon/mnote-canon-tag.c:62 libexif/pentax/mnote-pentax-tag.c:127
+msgid "Record Mode"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:63 libexif/pentax/mnote-pentax-tag.c:71
+msgid "Image Size"
+msgstr "图片尺寸"
+
+#: libexif/canon/mnote-canon-tag.c:64
+msgid "Easy Shooting Mode"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:65 libexif/olympus/mnote-olympus-tag.c:64
+#: libexif/olympus/mnote-olympus-tag.c:101
+#: libexif/olympus/mnote-olympus-tag.c:110
+#: libexif/olympus/mnote-olympus-tag.c:180
+#: libexif/pentax/mnote-pentax-tag.c:89
+msgid "Digital Zoom"
+msgstr "数码变焦"
+
+#: libexif/canon/mnote-canon-tag.c:66 libexif/exif-tag.c:828
+#: libexif/fuji/mnote-fuji-tag.c:42 libexif/pentax/mnote-pentax-tag.c:46
+#: libexif/pentax/mnote-pentax-tag.c:91
+msgid "Contrast"
+msgstr "对比度"
+
+#: libexif/canon/mnote-canon-tag.c:67 libexif/exif-tag.c:832
+#: libexif/olympus/mnote-olympus-tag.c:75
+#: libexif/olympus/mnote-olympus-tag.c:87 libexif/pentax/mnote-pentax-tag.c:47
+#: libexif/pentax/mnote-pentax-tag.c:90
+msgid "Saturation"
+msgstr "饱和度"
+
+#: libexif/canon/mnote-canon-tag.c:68 libexif/exif-tag.c:836
+#: libexif/fuji/mnote-fuji-tag.c:39 libexif/pentax/mnote-pentax-tag.c:45
+#: libexif/pentax/mnote-pentax-tag.c:92
+msgid "Sharpness"
+msgstr "锐度"
+
+#: libexif/canon/mnote-canon-tag.c:69
+msgid "ISO"
+msgstr "ISO"
+
+#: libexif/canon/mnote-canon-tag.c:70 libexif/exif-tag.c:571
+#: libexif/pentax/mnote-pentax-tag.c:82
+msgid "Metering Mode"
+msgstr "测距模式"
+
+#: libexif/canon/mnote-canon-tag.c:71 libexif/olympus/mnote-olympus-tag.c:133
+msgid "Focus Range"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:72 libexif/canon/mnote-canon-tag.c:105
+msgid "AF Point"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:73 libexif/exif-tag.c:795
+msgid "Exposure Mode"
+msgstr "曝光模式"
+
+#: libexif/canon/mnote-canon-tag.c:74 libexif/olympus/mnote-olympus-tag.c:61
+#: libexif/pentax/mnote-pentax-tag.c:106
+msgid "Lens Type"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:75
+msgid "Long Focal Length of Lens"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:76
+msgid "Short Focal Length of Lens"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:77
+msgid "Focal Units per mm"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:78
+msgid "Maximal Aperture"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:79
+msgid "Minimal Aperture"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:80
+msgid "Flash Activity"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:81
+msgid "Flash Details"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:83
+msgid "AE Setting"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:84
+msgid "Image Stabilization"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:85
+msgid "Display Aperture"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:86
+msgid "Zoom Source Width"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:87
+msgid "Zoom Target Width"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:88
+msgid "Photo Effect"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:89 libexif/canon/mnote-canon-tag.c:118
+msgid "Manual Flash Output"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:90
+msgid "Color Tone"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:91
+msgid "Focal Type"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:93
+msgid "Focal Plane X Size"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:94
+msgid "Focal Plane Y Size"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:95
+msgid "Auto ISO"
+msgstr "自动 ISO"
+
+#: libexif/canon/mnote-canon-tag.c:96
+msgid "Shot ISO"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:97
+msgid "Measured EV"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:98
+msgid "Target Aperture"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:99
+msgid "Target Exposure Time"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:100 libexif/olympus/mnote-olympus-tag.c:129
+#: libexif/pentax/mnote-pentax-tag.c:81
+msgid "Exposure Compensation"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:101 libexif/canon/mnote-canon-tag.c:123
+#: libexif/exif-tag.c:800 libexif/fuji/mnote-fuji-tag.c:40
+#: libexif/olympus/mnote-olympus-tag.c:41
+#: libexif/olympus/mnote-olympus-tag.c:98 libexif/pentax/mnote-pentax-tag.c:41
+#: libexif/pentax/mnote-pentax-tag.c:84 libexif/pentax/mnote-pentax-tag.c:124
+msgid "White Balance"
+msgstr "白平衡"
+
+#: libexif/canon/mnote-canon-tag.c:102
+msgid "Slow Shutter"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:103
+msgid "Sequence Number"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:104
+msgid "Flash Guide Number"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:106 libexif/olympus/mnote-olympus-tag.c:52
+#: libexif/pentax/mnote-pentax-tag.c:109
+msgid "Flash Exposure Compensation"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:107
+msgid "AE Bracketing"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:108
+msgid "AE Bracket Value"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:109
+msgid "Focus Distance Upper"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:110
+msgid "Focus Distance Lower"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:111
+msgid "FNumber"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:112 libexif/exif-tag.c:466
+#: libexif/pentax/mnote-pentax-tag.c:78
+msgid "Exposure Time"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:113
+msgid "Bulb Duration"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:114
+msgid "Camera Type"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:115
+msgid "Auto Rotate"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:116
+msgid "ND Filter"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:119
+msgid "Panorama Frame"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:120
+msgid "Panorama Direction"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:121
+msgid "Tone Curve"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:122
+msgid "Sharpness Frequency"
+msgstr ""
+
+#: libexif/canon/mnote-canon-tag.c:124
+msgid "Picture Style"
+msgstr ""
+
+#: libexif/exif-byte-order.c:33
+msgid "Motorola"
+msgstr "摩托罗拉"
+
+#: libexif/exif-byte-order.c:35
+msgid "Intel"
+msgstr "英特尔"
+
+#: libexif/exif-data.c:780
+msgid "Size of data too small to allow for EXIF data."
+msgstr ""
+
+#: libexif/exif-data.c:841
+msgid "EXIF marker not found."
+msgstr ""
+
+#: libexif/exif-data.c:868
+msgid "EXIF header not found."
+msgstr ""
+
+#: libexif/exif-data.c:893
+msgid "Unknown encoding."
+msgstr ""
+
+#: libexif/exif-data.c:1178
+msgid "Ignore unknown tags"
+msgstr ""
+
+#: libexif/exif-data.c:1179
+msgid "Ignore unknown tags when loading EXIF data."
+msgstr ""
+
+#: libexif/exif-data.c:1180
+msgid "Follow specification"
+msgstr ""
+
+#: libexif/exif-data.c:1181
+msgid ""
+"Add, correct and remove entries to get EXIF data that follows the "
+"specification."
+msgstr ""
+
+#: libexif/exif-data.c:1183
+msgid "Do not change maker note"
+msgstr ""
+
+#: libexif/exif-data.c:1184
+msgid ""
+"When loading and resaving Exif data, save the maker note unmodified. Be "
+"aware that the maker note can get corrupted."
+msgstr ""
+
+#: libexif/exif-entry.c:234 libexif/exif-entry.c:303 libexif/exif-entry.c:336
+#, c-format
+msgid ""
+"Tag '%s' was of format '%s' (which is against specification) and has been "
+"changed to format '%s'."
+msgstr ""
+
+#: libexif/exif-entry.c:271
+#, c-format
+msgid ""
+"Tag '%s' is of format '%s' (which is against specification) but cannot be "
+"changed to format '%s'."
+msgstr ""
+
+#: libexif/exif-entry.c:354
+#, c-format
+msgid ""
+"Tag 'UserComment' had invalid format '%s'. Format has been set to "
+"'undefined'."
+msgstr ""
+
+#: libexif/exif-entry.c:381
+msgid ""
+"Tag 'UserComment' has been expanded to at least 8 bytes in order to follow "
+"the specification."
+msgstr ""
+
+#: libexif/exif-entry.c:396
+msgid ""
+"Tag 'UserComment' is not empty but does not start with a format identifier. "
+"This has been fixed."
+msgstr ""
+
+#: libexif/exif-entry.c:424
+msgid ""
+"Tag 'UserComment' did not start with a format identifier. This has been "
+"fixed."
+msgstr ""
+
+#: libexif/exif-entry.c:462
+#, c-format
+msgid "%i bytes undefined data"
+msgstr ""
+
+#: libexif/exif-entry.c:585
+#, c-format
+msgid "%i bytes unsupported data type"
+msgstr ""
+
+#: libexif/exif-entry.c:642
+#, c-format
+msgid ""
+"The tag '%s' contains data of an invalid format ('%s', expected '%s')."
+msgstr "标记'%s'包含无效格式的数据（'%s，期望'%s'）。"
+
+#: libexif/exif-entry.c:655
+#, c-format
+msgid ""
+"The tag '%s' contains an invalid number of components (%i, expected %i)."
+msgstr "标记'%s'包含无效数量的组件（%i，期望%i）。"
+
+#: libexif/exif-entry.c:669
+msgid "Chunky format"
+msgstr ""
+
+#: libexif/exif-entry.c:669
+msgid "Planar format"
+msgstr ""
+
+#: libexif/exif-entry.c:671 libexif/exif-entry.c:763
+#: test/nls/test-codeset.c:54
+msgid "Not defined"
+msgstr "未定义"
+
+#: libexif/exif-entry.c:671
+msgid "One-chip color area sensor"
+msgstr "单芯片色彩区域传感器"
+
+#: libexif/exif-entry.c:672
+msgid "Two-chip color area sensor"
+msgstr "双芯片色彩区域传感器"
+
+#: libexif/exif-entry.c:672
+msgid "Three-chip color area sensor"
+msgstr "三芯片色彩区域传感器"
+
+#: libexif/exif-entry.c:673
+msgid "Color sequential area sensor"
+msgstr "颜色连续区域传感器"
+
+#: libexif/exif-entry.c:673
+msgid "Trilinear sensor"
+msgstr "三线性传感器"
+
+#: libexif/exif-entry.c:674
+msgid "Color sequential linear sensor"
+msgstr "颜色连续线性传感器"
+
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:233
+msgid "Top-left"
+msgstr ""
+
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:235
+msgid "Top-right"
+msgstr ""
+
+#: libexif/exif-entry.c:676 libexif/pentax/mnote-pentax-entry.c:241
+msgid "Bottom-right"
+msgstr ""
+
+#: libexif/exif-entry.c:677 libexif/pentax/mnote-pentax-entry.c:239
+msgid "Bottom-left"
+msgstr ""
+
+#: libexif/exif-entry.c:677
+msgid "Left-top"
+msgstr ""
+
+#: libexif/exif-entry.c:677
+msgid "Right-top"
+msgstr ""
+
+#: libexif/exif-entry.c:678
+msgid "Right-bottom"
+msgstr ""
+
+#: libexif/exif-entry.c:678
+msgid "Left-bottom"
+msgstr ""
+
+#: libexif/exif-entry.c:680
+msgid "Centered"
+msgstr ""
+
+#: libexif/exif-entry.c:680
+msgid "Co-sited"
+msgstr ""
+
+#: libexif/exif-entry.c:682
+msgid "Reversed mono"
+msgstr ""
+
+#: libexif/exif-entry.c:682
+msgid "Normal mono"
+msgstr ""
+
+#: libexif/exif-entry.c:682
+msgid "RGB"
+msgstr "RGB"
+
+#: libexif/exif-entry.c:682
+msgid "Palette"
+msgstr "色板"
+
+#: libexif/exif-entry.c:683
+msgid "CMYK"
+msgstr "CMYK"
+
+#: libexif/exif-entry.c:683
+msgid "YCbCr"
+msgstr "YCbCr"
+
+#: libexif/exif-entry.c:683
+msgid "CieLAB"
+msgstr "CieLAB"
+
+#: libexif/exif-entry.c:685
+msgid "Normal process"
+msgstr "正常过程"
+
+#: libexif/exif-entry.c:685
+msgid "Custom process"
+msgstr "自定义过程"
+
+#: libexif/exif-entry.c:687
+msgid "Auto exposure"
+msgstr "自动曝光"
+
+#: libexif/exif-entry.c:687 libexif/fuji/mnote-fuji-entry.c:139
+msgid "Manual exposure"
+msgstr "手动曝光"
+
+#: libexif/exif-entry.c:687
+msgid "Auto bracket"
+msgstr ""
+
+#: libexif/exif-entry.c:689
+msgid "Auto white balance"
+msgstr "自动白平衡"
+
+#: libexif/exif-entry.c:689
+msgid "Manual white balance"
+msgstr "手动白平衡"
+
+#: libexif/exif-entry.c:694
+msgid "Low gain up"
+msgstr "低增益"
+
+#: libexif/exif-entry.c:694
+msgid "High gain up"
+msgstr "高增益"
+
+#: libexif/exif-entry.c:695
+msgid "Low gain down"
+msgstr "低衰减"
+
+#: libexif/exif-entry.c:695
+msgid "High gain down"
+msgstr "高衰减"
+
+#: libexif/exif-entry.c:697
+msgid "Low saturation"
+msgstr "低饱和度"
+
+#: libexif/exif-entry.c:697 test/nls/test-codeset.c:48
+#: test/nls/test-codeset.c:61
+msgid "High saturation"
+msgstr "高饱和度"
+
+#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/fuji/mnote-fuji-entry.c:63
+#: libexif/olympus/mnote-olympus-entry.c:208
+#: libexif/olympus/mnote-olympus-entry.c:217
+#: libexif/pentax/mnote-pentax-entry.c:106
+#: libexif/pentax/mnote-pentax-entry.c:170
+msgid "Soft"
+msgstr "柔和"
+
+#: libexif/exif-entry.c:698 libexif/exif-entry.c:699
+#: libexif/fuji/mnote-fuji-entry.c:65 libexif/fuji/mnote-fuji-entry.c:95
+#: libexif/olympus/mnote-olympus-entry.c:207
+#: libexif/olympus/mnote-olympus-entry.c:215
+#: libexif/pentax/mnote-pentax-entry.c:107
+msgid "Hard"
+msgstr "锐利"
+
+#: libexif/exif-entry.c:715 libexif/exif-entry.c:733 libexif/exif-entry.c:815
+#: libexif/olympus/mnote-olympus-entry.c:595
+#: libexif/olympus/mnote-olympus-entry.c:689
+#: libexif/olympus/mnote-olympus-entry.c:744
+#: libexif/pentax/mnote-pentax-entry.c:256
+msgid "Unknown"
+msgstr "未知"
+
+#: libexif/exif-entry.c:716
+msgid "Avg"
+msgstr ""
+
+#: libexif/exif-entry.c:717
+msgid "Center-weight"
+msgstr ""
+
+#: libexif/exif-entry.c:719
+msgid "Multi spot"
+msgstr ""
+
+#: libexif/exif-entry.c:720
+msgid "Pattern"
+msgstr "样式"
+
+#: libexif/exif-entry.c:725
+msgid "Uncompressed"
+msgstr "未压缩"
+
+#: libexif/exif-entry.c:726
+msgid "LZW compression"
+msgstr "LZW压缩"
+
+#: libexif/exif-entry.c:727 libexif/exif-entry.c:728
+msgid "JPEG compression"
+msgstr "JPEG 压缩"
+
+#: libexif/exif-entry.c:729
+msgid "Deflate/ZIP compression"
+msgstr ""
+
+#: libexif/exif-entry.c:730
+msgid "PackBits compression"
+msgstr ""
+
+#: libexif/exif-entry.c:736
+msgid "Tungsten incandescent light"
+msgstr "碘钨灯"
+
+#: libexif/exif-entry.c:738
+msgid "Fine weather"
+msgstr "天气良好"
+
+#: libexif/exif-entry.c:739
+msgid "Cloudy weather"
+msgstr ""
+
+#: libexif/exif-entry.c:742 libexif/fuji/mnote-fuji-entry.c:77
+#: libexif/pentax/mnote-pentax-entry.c:252
+msgid "Day white fluorescent"
+msgstr "日光白色荧光灯"
+
+#: libexif/exif-entry.c:743
+msgid "Cool white fluorescent"
+msgstr "冷白色荧光灯"
+
+#: libexif/exif-entry.c:744 libexif/fuji/mnote-fuji-entry.c:78
+#: libexif/pentax/mnote-pentax-entry.c:253
+msgid "White fluorescent"
+msgstr "白色荧光灯"
+
+#: libexif/exif-entry.c:745
+msgid "Standard light A"
+msgstr "标准光 A"
+
+#: libexif/exif-entry.c:746
+msgid "Standard light B"
+msgstr "标准光 B"
+
+#: libexif/exif-entry.c:747
+msgid "Standard light C"
+msgstr "标准光 C"
+
+#: libexif/exif-entry.c:748
+msgid "D55"
+msgstr "D55"
+
+#: libexif/exif-entry.c:749
+msgid "D65"
+msgstr "D65"
+
+#: libexif/exif-entry.c:750
+msgid "D75"
+msgstr "D75"
+
+#: libexif/exif-entry.c:751
+msgid "ISO studio tungsten"
+msgstr "标准工作室钨灯"
+
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+msgid "Inch"
+msgstr "英寸"
+
+#: libexif/exif-entry.c:755 libexif/exif-entry.c:759
+msgid "in"
+msgstr "属于"
+
+#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+msgid "Centimeter"
+msgstr "厘米"
+
+#: libexif/exif-entry.c:756 libexif/exif-entry.c:760
+msgid "cm"
+msgstr "cm"
+
+#: libexif/exif-entry.c:765
+msgid "Normal program"
+msgstr "普通模式"
+
+#: libexif/exif-entry.c:766
+msgid "Aperture priority"
+msgstr "光圈优先"
+
+#: libexif/exif-entry.c:766 libexif/exif-tag.c:550
+msgid "Aperture"
+msgstr "光圈"
+
+#: libexif/exif-entry.c:767
+msgid "Shutter priority"
+msgstr "快门优先"
+
+#: libexif/exif-entry.c:767
+msgid "Shutter"
+msgstr "快门"
+
+#: libexif/exif-entry.c:768
+msgid "Creative program (biased toward depth of field)"
+msgstr ""
+
+#: libexif/exif-entry.c:769
+msgid "Creative"
+msgstr ""
+
+#: libexif/exif-entry.c:770
+msgid "Creative program (biased toward fast shutter speed)"
+msgstr ""
+
+#: libexif/exif-entry.c:771
+msgid "Action"
+msgstr "动作"
+
+#: libexif/exif-entry.c:772
+msgid "Portrait mode (for closeup photos with the background out of focus)"
+msgstr "肖像模式（特写照片，使背景处于焦外）"
+
+#: libexif/exif-entry.c:774
+msgid "Landscape mode (for landscape photos with the background in focus)"
+msgstr "风景模式（风景照片，使背景处于焦内）"
+
+#: libexif/exif-entry.c:778 libexif/exif-entry.c:783
+#: libexif/olympus/mnote-olympus-entry.c:100
+msgid "Flash did not fire"
+msgstr "未闪光"
+
+#: libexif/exif-entry.c:778
+msgid "No flash"
+msgstr ""
+
+#: libexif/exif-entry.c:779
+msgid "Flash fired"
+msgstr ""
+
+#: libexif/exif-entry.c:779 libexif/olympus/mnote-olympus-entry.c:173
+#: libexif/olympus/mnote-olympus-entry.c:178
+#: libexif/olympus/mnote-olympus-entry.c:212
+#: libexif/olympus/mnote-olympus-entry.c:221
+#: libexif/olympus/mnote-olympus-entry.c:244
+msgid "Yes"
+msgstr "是"
+
+#: libexif/exif-entry.c:780
+msgid "Strobe return light not detected"
+msgstr ""
+
+#: libexif/exif-entry.c:780
+msgid "Without strobe"
+msgstr ""
+
+#: libexif/exif-entry.c:782
+msgid "Strobe return light detected"
+msgstr ""
+
+#: libexif/exif-entry.c:782
+msgid "With strobe"
+msgstr ""
+
+#: libexif/exif-entry.c:784
+msgid "Flash fired, compulsory flash mode"
+msgstr ""
+
+#: libexif/exif-entry.c:785
+msgid "Flash fired, compulsory flash mode, return light not detected"
+msgstr ""
+
+#: libexif/exif-entry.c:787
+msgid "Flash fired, compulsory flash mode, return light detected"
+msgstr ""
+
+#: libexif/exif-entry.c:789
+msgid "Flash did not fire, compulsory flash mode"
+msgstr ""
+
+#: libexif/exif-entry.c:790
+msgid "Flash did not fire, auto mode"
+msgstr ""
+
+#: libexif/exif-entry.c:791
+msgid "Flash fired, auto mode"
+msgstr ""
+
+#: libexif/exif-entry.c:792
+msgid "Flash fired, auto mode, return light not detected"
+msgstr ""
+
+#: libexif/exif-entry.c:794
+msgid "Flash fired, auto mode, return light detected"
+msgstr ""
+
+#: libexif/exif-entry.c:795
+msgid "No flash function"
+msgstr ""
+
+#: libexif/exif-entry.c:796
+msgid "Flash fired, red-eye reduction mode"
+msgstr ""
+
+#: libexif/exif-entry.c:797
+msgid "Flash fired, red-eye reduction mode, return light not detected"
+msgstr ""
+
+#: libexif/exif-entry.c:799
+msgid "Flash fired, red-eye reduction mode, return light detected"
+msgstr ""
+
+#: libexif/exif-entry.c:801
+msgid "Flash fired, compulsory flash mode, red-eye reduction mode"
+msgstr ""
+
+#: libexif/exif-entry.c:803
+msgid ""
+"Flash fired, compulsory flash mode, red-eye reduction mode, return light not "
+"detected"
+msgstr ""
+
+#: libexif/exif-entry.c:805
+msgid ""
+"Flash fired, compulsory flash mode, red-eye reduction mode, return light "
+"detected"
+msgstr ""
+
+#: libexif/exif-entry.c:807
+msgid "Flash did not fire, auto mode, red-eye reduction mode"
+msgstr "闪光灯未闪光，自动模式，红眼消除模式。"
+
+#: libexif/exif-entry.c:808
+msgid "Flash fired, auto mode, red-eye reduction mode"
+msgstr "闪光灯闪光，自动模式，红眼消除模式"
+
+#: libexif/exif-entry.c:809
+msgid ""
+"Flash fired, auto mode, return light not detected, red-eye reduction mode"
+msgstr ""
+
+#: libexif/exif-entry.c:811
+msgid "Flash fired, auto mode, return light detected, red-eye reduction mode"
+msgstr ""
+
+#: libexif/exif-entry.c:815
+msgid "?"
+msgstr ""
+
+#: libexif/exif-entry.c:817
+msgid "Close view"
+msgstr "近景"
+
+#: libexif/exif-entry.c:818
+msgid "Distant view"
+msgstr "远景"
+
+#: libexif/exif-entry.c:818
+msgid "Distant"
+msgstr ""
+
+#: libexif/exif-entry.c:821
+msgid "sRGB"
+msgstr "sRGB"
+
+#: libexif/exif-entry.c:822
+msgid "Adobe RGB"
+msgstr ""
+
+#: libexif/exif-entry.c:823
+msgid "Uncalibrated"
+msgstr "未校准的"
+
+#: libexif/exif-entry.c:878
+#, c-format
+msgid "Invalid size of entry (%i, expected %li x %i)."
+msgstr "无效的入口尺寸（%i，期望%li x %i）。"
+
+#: libexif/exif-entry.c:911
+msgid "Unsupported UNICODE string"
+msgstr "不支持的UNICODE字符串"
+
+#: libexif/exif-entry.c:919
+msgid "Unsupported JIS string"
+msgstr "不支持的JIS字符串"
+
+#: libexif/exif-entry.c:935
+msgid "Tag UserComment contains data but is against specification."
+msgstr ""
+
+#: libexif/exif-entry.c:939
+#, c-format
+msgid "Byte at position %i: 0x%02x"
+msgstr ""
+
+#: libexif/exif-entry.c:947
+msgid "Unknown Exif Version"
+msgstr "未知的Exif版本"
+
+#: libexif/exif-entry.c:951
+#, c-format
+msgid "Exif Version %d.%d"
+msgstr "Exif版本%d.%d"
+
+#: libexif/exif-entry.c:962
+msgid "FlashPix Version 1.0"
+msgstr "FlashPix版本 1.0"
+
+#: libexif/exif-entry.c:964
+msgid "FlashPix Version 1.01"
+msgstr "FlashPix版本 1.01"
+
+#: libexif/exif-entry.c:966
+msgid "Unknown FlashPix Version"
+msgstr "未知的FlashPix版本"
+
+#: libexif/exif-entry.c:979 libexif/exif-entry.c:998 libexif/exif-entry.c:1666
+#: libexif/exif-entry.c:1671 libexif/exif-entry.c:1675
+#: libexif/exif-entry.c:1680 libexif/exif-entry.c:1681
+msgid "[None]"
+msgstr "[无]"
+
+#: libexif/exif-entry.c:981
+msgid "(Photographer)"
+msgstr "（摄影师）"
+
+#: libexif/exif-entry.c:1000
+msgid "(Editor)"
+msgstr ""
+
+#: libexif/exif-entry.c:1024 libexif/exif-entry.c:1104
+#: libexif/exif-entry.c:1121 libexif/exif-entry.c:1165
+#, c-format
+msgid "%.02f EV"
+msgstr ""
+
+#: libexif/exif-entry.c:1025
+#, c-format
+msgid " (f/%.01f)"
+msgstr ""
+
+#: libexif/exif-entry.c:1059
+#, c-format
+msgid " (35 equivalent: %d mm)"
+msgstr ""
+
+#: libexif/exif-entry.c:1092 libexif/exif-entry.c:1093
+msgid " sec."
+msgstr ""
+
+#: libexif/exif-entry.c:1107
+#, c-format
+msgid " (1/%d sec.)"
+msgstr ""
+
+#: libexif/exif-entry.c:1109
+#, c-format
+msgid " (%d sec.)"
+msgstr ""
+
+#: libexif/exif-entry.c:1122
+#, c-format
+msgid " (%.02f cd/m^2)"
+msgstr ""
+
+#: libexif/exif-entry.c:1132
+msgid "DSC"
+msgstr ""
+
+#: libexif/exif-entry.c:1134 libexif/exif-entry.c:1174
+#: libexif/exif-entry.c:1261 libexif/exif-entry.c:1312
+#: libexif/exif-entry.c:1321 libexif/exif-entry.c:1357
+#: libexif/fuji/mnote-fuji-entry.c:236 libexif/fuji/mnote-fuji-entry.c:245
+#: libexif/pentax/mnote-pentax-entry.c:350
+#: libexif/pentax/mnote-pentax-entry.c:359
+#, c-format
+msgid "Internal error (unknown value %i)"
+msgstr ""
+
+#: libexif/exif-entry.c:1142
+msgid "-"
+msgstr ""
+
+#: libexif/exif-entry.c:1143
+msgid "Y"
+msgstr ""
+
+#: libexif/exif-entry.c:1144
+msgid "Cb"
+msgstr ""
+
+#: libexif/exif-entry.c:1145
+msgid "Cr"
+msgstr ""
+
+#: libexif/exif-entry.c:1146
+msgid "R"
+msgstr ""
+
+#: libexif/exif-entry.c:1147
+msgid "G"
+msgstr ""
+
+#: libexif/exif-entry.c:1148
+msgid "B"
+msgstr ""
+
+#: libexif/exif-entry.c:1149
+msgid "Reserved"
+msgstr ""
+
+#: libexif/exif-entry.c:1172
+msgid "Directly photographed"
+msgstr ""
+
+#: libexif/exif-entry.c:1185
+msgid "YCbCr4:2:2"
+msgstr ""
+
+#: libexif/exif-entry.c:1187
+msgid "YCbCr4:2:0"
+msgstr ""
+
+#: libexif/exif-entry.c:1204
+#, c-format
+msgid "Within distance %i of (x,y) = (%i,%i)"
+msgstr ""
+
+#: libexif/exif-entry.c:1213
+#, c-format
+msgid "Within rectangle (width %i, height %i) around (x,y) = (%i,%i)"
+msgstr ""
+
+#: libexif/exif-entry.c:1219
+#, c-format
+msgid "Unexpected number of components (%li, expected 2, 3, or 4)."
+msgstr ""
+
+#: libexif/exif-entry.c:1257
+msgid "Sea level"
+msgstr ""
+
+#: libexif/exif-entry.c:1259
+msgid "Sea level reference"
+msgstr ""
+
+#: libexif/exif-entry.c:1367
+#, c-format
+msgid "Unknown value %i"
+msgstr ""
+
+#: libexif/exif-format.c:37
+msgid "Short"
+msgstr ""
+
+#: libexif/exif-format.c:38
+msgid "Rational"
+msgstr ""
+
+#: libexif/exif-format.c:39
+msgid "SRational"
+msgstr ""
+
+#: libexif/exif-format.c:40
+msgid "Undefined"
+msgstr ""
+
+#: libexif/exif-format.c:41
+msgid "ASCII"
+msgstr ""
+
+#: libexif/exif-format.c:42
+msgid "Long"
+msgstr ""
+
+#: libexif/exif-format.c:43
+msgid "Byte"
+msgstr ""
+
+#: libexif/exif-format.c:44
+msgid "SByte"
+msgstr ""
+
+#: libexif/exif-format.c:45
+msgid "SShort"
+msgstr ""
+
+#: libexif/exif-format.c:46
+msgid "SLong"
+msgstr ""
+
+#: libexif/exif-format.c:47
+msgid "Float"
+msgstr ""
+
+#: libexif/exif-format.c:48
+msgid "Double"
+msgstr ""
+
+#: libexif/exif-loader.c:119
+#, c-format
+msgid "The file '%s' could not be opened."
+msgstr ""
+
+#: libexif/exif-loader.c:300
+msgid "The data supplied does not seem to contain EXIF data."
+msgstr ""
+
+#: libexif/exif-log.c:43
+msgid "Debugging information"
+msgstr ""
+
+#: libexif/exif-log.c:44
+msgid "Debugging information is available."
+msgstr ""
+
+#: libexif/exif-log.c:45
+msgid "Not enough memory"
+msgstr ""
+
+#: libexif/exif-log.c:46
+msgid "The system cannot provide enough memory."
+msgstr ""
+
+#: libexif/exif-log.c:47
+msgid "Corrupt data"
+msgstr ""
+
+#: libexif/exif-log.c:48
+msgid "The data provided does not follow the specification."
+msgstr ""
+
+#: libexif/exif-tag.c:62
+msgid "GPS Tag Version"
+msgstr ""
+
+#: libexif/exif-tag.c:63
+msgid ""
+"Indicates the version of <GPSInfoIFD>. The version is given as 2.0.0.0. This "
+"tag is mandatory when <GPSInfo> tag is present. (Note: The <GPSVersionID> "
+"tag is given in bytes, unlike the <ExifVersion> tag. When the version is "
+"2.0.0.0, the tag value is 02000000.H)."
+msgstr ""
+
+#: libexif/exif-tag.c:69
+msgid "Interoperability Index"
+msgstr ""
+
+#: libexif/exif-tag.c:70
+msgid ""
+"Indicates the identification of the Interoperability rule. Use \"R98\" for "
+"stating ExifR98 Rules. Four bytes used including the termination code "
+"(NULL). see the separate volume of Recommended Exif Interoperability Rules "
+"(ExifR98) for other tags used for ExifR98."
+msgstr ""
+
+#: libexif/exif-tag.c:76
+msgid "North or South Latitude"
+msgstr ""
+
+#: libexif/exif-tag.c:77
+msgid ""
+"Indicates whether the latitude is north or south latitude. The ASCII value "
+"'N' indicates north latitude, and 'S' is south latitude."
+msgstr ""
+
+#: libexif/exif-tag.c:81
+msgid "Interoperability Version"
+msgstr ""
+
+#: libexif/exif-tag.c:83
+msgid "Latitude"
+msgstr ""
+
+#: libexif/exif-tag.c:84
+msgid ""
+"Indicates the latitude. The latitude is expressed as three RATIONAL values "
+"giving the degrees, minutes, and seconds, respectively. When degrees, "
+"minutes and seconds are expressed, the format is dd/1,mm/1,ss/1. When "
+"degrees and minutes are used and, for example, fractions of minutes are "
+"given up to two decimal places, the format is dd/1,mmmm/100,0/1."
+msgstr ""
+
+#: libexif/exif-tag.c:91
+msgid "East or West Longitude"
+msgstr ""
+
+#: libexif/exif-tag.c:92
+msgid ""
+"Indicates whether the longitude is east or west longitude. ASCII 'E' "
+"indicates east longitude, and 'W' is west longitude."
+msgstr ""
+
+#: libexif/exif-tag.c:95
+msgid "Longitude"
+msgstr ""
+
+#: libexif/exif-tag.c:96
+msgid ""
+"Indicates the longitude. The longitude is expressed as three RATIONAL values "
+"giving the degrees, minutes, and seconds, respectively. When degrees, "
+"minutes and seconds are expressed, the format is ddd/1,mm/1,ss/1. When "
+"degrees and minutes are used and, for example, fractions of minutes are "
+"given up to two decimal places, the format is ddd/1,mmmm/100,0/1."
+msgstr ""
+
+#: libexif/exif-tag.c:103
+msgid "Altitude Reference"
+msgstr ""
+
+#: libexif/exif-tag.c:104
+msgid ""
+"Indicates the altitude used as the reference altitude. If the reference is "
+"sea level and the altitude is above sea level, 0 is given. If the altitude "
+"is below sea level, a value of 1 is given and the altitude is indicated as "
+"an absolute value in the GSPAltitude tag. The reference unit is meters. Note "
+"that this tag is BYTE type, unlike other reference tags."
+msgstr ""
+
+#: libexif/exif-tag.c:110
+msgid "Altitude"
+msgstr ""
+
+#: libexif/exif-tag.c:111
+msgid ""
+"Indicates the altitude based on the reference in GPSAltitudeRef. Altitude is "
+"expressed as one RATIONAL value. The reference unit is meters."
+msgstr ""
+
+#: libexif/exif-tag.c:114
+msgid "GPS Time (Atomic Clock)"
+msgstr ""
+
+#: libexif/exif-tag.c:115
+msgid ""
+"Indicates the time as UTC (Coordinated Universal Time). TimeStamp is "
+"expressed as three RATIONAL values giving the hour, minute, and second."
+msgstr ""
+
+#: libexif/exif-tag.c:118
+msgid "GPS Satellites"
+msgstr ""
+
+#: libexif/exif-tag.c:119
+msgid ""
+"Indicates the GPS satellites used for measurements. This tag can be used to "
+"describe the number of satellites, their ID number, angle of elevation, "
+"azimuth, SNR and other information in ASCII notation. The format is not "
+"specified. If the GPS receiver is incapable of taking measurements, value of "
+"the tag shall be set to NULL."
+msgstr ""
+
+#: libexif/exif-tag.c:125
+msgid "GPS Receiver Status"
+msgstr ""
+
+#: libexif/exif-tag.c:126
+msgid ""
+"Indicates the status of the GPS receiver when the image is recorded. 'A' "
+"means measurement is in progress, and 'V' means the measurement is "
+"Interoperability."
+msgstr ""
+
+#: libexif/exif-tag.c:129
+msgid "GPS Measurement Mode"
+msgstr ""
+
+#: libexif/exif-tag.c:130
+msgid ""
+"Indicates the GPS measurement mode. '2' means two-dimensional measurement "
+"and '3' means three-dimensional measurement is in progress."
+msgstr ""
+
+#: libexif/exif-tag.c:133
+msgid "Measurement Precision"
+msgstr ""
+
+#: libexif/exif-tag.c:134
+msgid ""
+"Indicates the GPS DOP (data degree of precision). An HDOP value is written "
+"during two-dimensional measurement, and PDOP during three-dimensional "
+"measurement."
+msgstr ""
+
+#: libexif/exif-tag.c:137
+msgid "Speed Unit"
+msgstr ""
+
+#: libexif/exif-tag.c:138
+msgid ""
+"Indicates the unit used to express the GPS receiver speed of movement. 'K', "
+"'M' and 'N' represent kilometers per hour, miles per hour, and knots."
+msgstr ""
+
+#: libexif/exif-tag.c:141
+msgid "Speed of GPS Receiver"
+msgstr ""
+
+#: libexif/exif-tag.c:142
+msgid "Indicates the speed of GPS receiver movement."
+msgstr ""
+
+#: libexif/exif-tag.c:143
+msgid "Reference for direction of movement"
+msgstr ""
+
+#: libexif/exif-tag.c:144
+msgid ""
+"Indicates the reference for giving the direction of GPS receiver movement. "
+"'T' denotes true direction and 'M' is magnetic direction."
+msgstr ""
+
+#: libexif/exif-tag.c:147
+msgid "Direction of Movement"
+msgstr ""
+
+#: libexif/exif-tag.c:148
+msgid ""
+"Indicates the direction of GPS receiver movement. The range of values is "
+"from 0.00 to 359.99."
+msgstr ""
+
+#: libexif/exif-tag.c:150
+msgid "GPS Image Direction Reference"
+msgstr ""
+
+#: libexif/exif-tag.c:151
+msgid ""
+"Indicates the reference for giving the direction of the image when it is "
+"captured. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr ""
+
+#: libexif/exif-tag.c:153
+msgid "GPS Image Direction"
+msgstr ""
+
+#: libexif/exif-tag.c:154
+msgid ""
+"Indicates the direction of the image when it was captured. The range of "
+"values is from 0.00 to 359.99."
+msgstr ""
+
+#: libexif/exif-tag.c:156
+msgid "Geodetic Survey Data Used"
+msgstr ""
+
+#: libexif/exif-tag.c:157
+msgid ""
+"Indicates the geodetic survey data used by the GPS receiver. If the survey "
+"data is restricted to Japan, the value of this tag is 'TOKYO' or 'WGS-84'. "
+"If a GPS Info tag is recorded, it is strongly recommended that this tag be "
+"recorded."
+msgstr ""
+
+#: libexif/exif-tag.c:161
+msgid "Reference For Latitude of Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:162
+msgid ""
+"Indicates whether the latitude of the destination point is north or south "
+"latitude. The ASCII value 'N' indicates north latitude, and 'S' is south "
+"latitude."
+msgstr ""
+
+#: libexif/exif-tag.c:165
+msgid "Latitude of Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:166
+msgid ""
+"Indicates the latitude of the destination point. The latitude is expressed "
+"as three RATIONAL values giving the degrees, minutes, and seconds, "
+"respectively. If latitude is expressed as degrees, minutes and seconds, a "
+"typical format would be dd/1,mm/1,ss/1. When degrees and minutes are used "
+"and, for example, fractions of minutes are given up to two decimal places, "
+"the format would be dd/1,mmmm/100,0/1."
+msgstr ""
+
+#: libexif/exif-tag.c:173
+msgid "Reference for Longitude of Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:174
+msgid ""
+"Indicates whether the longitude of the destination point is east or west "
+"longitude. ASCII 'E' indicates east longitude, and 'W' is west longitude."
+msgstr ""
+
+#: libexif/exif-tag.c:177
+msgid "Longitude of Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:178
+msgid ""
+"Indicates the longitude of the destination point. The longitude is expressed "
+"as three RATIONAL values giving the degrees, minutes, and seconds, "
+"respectively. If longitude is expressed as degrees, minutes and seconds, a "
+"typical format would be ddd/1,mm/1,ss/1. When degrees and minutes are used "
+"and, for example, fractions of minutes are given up to two decimal places, "
+"the format would be ddd/1,mmmm/100,0/1."
+msgstr ""
+
+#: libexif/exif-tag.c:186
+msgid "Reference for Bearing of Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:187
+msgid ""
+"Indicates the reference used for giving the bearing to the destination "
+"point. 'T' denotes true direction and 'M' is magnetic direction."
+msgstr ""
+
+#: libexif/exif-tag.c:190
+msgid "Bearing of Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:191
+msgid ""
+"Indicates the bearing to the destination point. The range of values is from "
+"0.00 to 359.99."
+msgstr ""
+
+#: libexif/exif-tag.c:193
+msgid "Reference for Distance to Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:194
+msgid ""
+"Indicates the unit used to express the distance to the destination point. "
+"'K', 'M' and 'N' represent kilometers, miles and nautical miles."
+msgstr ""
+
+#: libexif/exif-tag.c:197
+msgid "Distance to Destination"
+msgstr ""
+
+#: libexif/exif-tag.c:198
+msgid "Indicates the distance to the destination point."
+msgstr ""
+
+#: libexif/exif-tag.c:199
+msgid "Name of GPS Processing Method"
+msgstr ""
+
+#: libexif/exif-tag.c:200
+msgid ""
+"A character string recording the name of the method used for location "
+"finding. The first byte indicates the character code used, and this is "
+"followed by the name of the method. Since the Type is not ASCII, NULL "
+"termination is not necessary."
+msgstr ""
+
+#: libexif/exif-tag.c:205
+msgid "Name of GPS Area"
+msgstr ""
+
+#: libexif/exif-tag.c:206
+msgid ""
+"A character string recording the name of the GPS area. The first byte "
+"indicates the character code used, and this is followed by the name of the "
+"GPS area. Since the Type is not ASCII, NULL termination is not necessary."
+msgstr ""
+
+#: libexif/exif-tag.c:210
+msgid "GPS Date"
+msgstr ""
+
+#: libexif/exif-tag.c:211
+msgid ""
+"A character string recording date and time information relative to UTC "
+"(Coordinated Universal Time). The format is \"YYYY:MM:DD\". The length of "
+"the string is 11 bytes including NULL."
+msgstr ""
+
+#: libexif/exif-tag.c:215
+msgid "GPS Differential Correction"
+msgstr ""
+
+#: libexif/exif-tag.c:216
+msgid ""
+"Indicates whether differential correction is applied to the GPS receiver."
+msgstr ""
+
+#: libexif/exif-tag.c:220
+msgid "New Subfile Type"
+msgstr ""
+
+#: libexif/exif-tag.c:220
+msgid "A general indication of the kind of data contained in this subfile."
+msgstr ""
+
+#: libexif/exif-tag.c:222
+msgid "Image Width"
+msgstr ""
+
+#: libexif/exif-tag.c:223
+msgid ""
+"The number of columns of image data, equal to the number of pixels per row. "
+"In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr ""
+
+#: libexif/exif-tag.c:227
+msgid "Image Length"
+msgstr ""
+
+#: libexif/exif-tag.c:228
+msgid ""
+"The number of rows of image data. In JPEG compressed data a JPEG marker is "
+"used instead of this tag."
+msgstr ""
+
+#: libexif/exif-tag.c:231
+msgid "Bits per Sample"
+msgstr ""
+
+#: libexif/exif-tag.c:232
+msgid ""
+"The number of bits per image component. In this standard each component of "
+"the image is 8 bits, so the value for this tag is 8. See also "
+"<SamplesPerPixel>. In JPEG compressed data a JPEG marker is used instead of "
+"this tag."
+msgstr ""
+
+#: libexif/exif-tag.c:237
+msgid "Compression"
+msgstr ""
+
+#: libexif/exif-tag.c:238
+msgid ""
+"The compression scheme used for the image data. When a primary image is JPEG "
+"compressed, this designation is not necessary and is omitted. When "
+"thumbnails use JPEG compression, this tag value is set to 6."
+msgstr ""
+
+#: libexif/exif-tag.c:244
+msgid "Photometric Interpretation"
+msgstr ""
+
+#: libexif/exif-tag.c:245
+msgid ""
+"The pixel composition. In JPEG compressed data a JPEG marker is used instead "
+"of this tag."
+msgstr ""
+
+#: libexif/exif-tag.c:249
+msgid "Fill Order"
+msgstr ""
+
+#: libexif/exif-tag.c:251
+msgid "Document Name"
+msgstr ""
+
+#: libexif/exif-tag.c:253
+msgid "Image Description"
+msgstr ""
+
+#: libexif/exif-tag.c:254
+msgid ""
+"A character string giving the title of the image. It may be a comment such "
+"as \"1988 company picnic\" or the like. Two-bytes character codes cannot be "
+"used. When a 2-bytes code is necessary, the Exif Private tag <UserComment> "
+"is to be used."
+msgstr ""
+
+#: libexif/exif-tag.c:260
+msgid "Manufacturer"
+msgstr ""
+
+#: libexif/exif-tag.c:261
+msgid ""
+"The manufacturer of the recording equipment. This is the manufacturer of the "
+"DSC, scanner, video digitizer or other equipment that generated the image. "
+"When the field is left blank, it is treated as unknown."
+msgstr ""
+
+#: libexif/exif-tag.c:267
+msgid "Model"
+msgstr ""
+
+#: libexif/exif-tag.c:268
+msgid ""
+"The model name or model number of the equipment. This is the model name or "
+"number of the DSC, scanner, video digitizer or other equipment that "
+"generated the image. When the field is left blank, it is treated as unknown."
+msgstr ""
+
+#: libexif/exif-tag.c:273
+msgid "Strip Offsets"
+msgstr ""
+
+#: libexif/exif-tag.c:274
+msgid ""
+"For each strip, the byte offset of that strip. It is recommended that this "
+"be selected so the number of strip bytes does not exceed 64 Kbytes. With "
+"JPEG compressed data this designation is not needed and is omitted. See also "
+"<RowsPerStrip> and <StripByteCounts>."
+msgstr ""
+
+#: libexif/exif-tag.c:280
+msgid "Orientation"
+msgstr ""
+
+#: libexif/exif-tag.c:281
+msgid "The image orientation viewed in terms of rows and columns."
+msgstr ""
+
+#: libexif/exif-tag.c:284
+msgid "Samples per Pixel"
+msgstr ""
+
+#: libexif/exif-tag.c:285
+msgid ""
+"The number of components per pixel. Since this standard applies to RGB and "
+"YCbCr images, the value set for this tag is 3. In JPEG compressed data a "
+"JPEG marker is used instead of this tag."
+msgstr ""
+
+#: libexif/exif-tag.c:290
+msgid "Rows per Strip"
+msgstr ""
+
+#: libexif/exif-tag.c:291
+msgid ""
+"The number of rows per strip. This is the number of rows in the image of one "
+"strip when an image is divided into strips. With JPEG compressed data this "
+"designation is not needed and is omitted. See also <StripOffsets> and "
+"<StripByteCounts>."
+msgstr ""
+
+#: libexif/exif-tag.c:297
+msgid "Strip Byte Count"
+msgstr ""
+
+#: libexif/exif-tag.c:298
+msgid ""
+"The total number of bytes in each strip. With JPEG compressed data this "
+"designation is not needed and is omitted."
+msgstr ""
+
+#: libexif/exif-tag.c:301
+msgid "X-Resolution"
+msgstr ""
+
+#: libexif/exif-tag.c:302
+msgid ""
+"The number of pixels per <ResolutionUnit> in the <ImageWidth> direction. "
+"When the image resolution is unknown, 72 [dpi] is designated."
+msgstr ""
+
+#: libexif/exif-tag.c:306
+msgid "Y-Resolution"
+msgstr ""
+
+#: libexif/exif-tag.c:307
+msgid ""
+"The number of pixels per <ResolutionUnit> in the <ImageLength> direction. "
+"The same value as <XResolution> is designated."
+msgstr ""
+
+#: libexif/exif-tag.c:311
+msgid "Planar Configuration"
+msgstr ""
+
+#: libexif/exif-tag.c:312
+msgid ""
+"Indicates whether pixel components are recorded in a chunky or planar "
+"format. In JPEG compressed files a JPEG marker is used instead of this tag. "
+"If this field does not exist, the TIFF default of 1 (chunky) is assumed."
+msgstr ""
+
+#: libexif/exif-tag.c:317
+msgid "Resolution Unit"
+msgstr ""
+
+#: libexif/exif-tag.c:318
+msgid ""
+"The unit for measuring <XResolution> and <YResolution>. The same unit is "
+"used for both <XResolution> and <YResolution>. If the image resolution is "
+"unknown, 2 (inches) is designated."
+msgstr ""
+
+#: libexif/exif-tag.c:323
+msgid "Transfer Function"
+msgstr ""
+
+#: libexif/exif-tag.c:324
+msgid ""
+"A transfer function for the image, described in tabular style. Normally this "
+"tag is not necessary, since color space is specified in the color space "
+"information tag (<ColorSpace>)."
+msgstr ""
+
+#: libexif/exif-tag.c:328
+msgid "Software"
+msgstr ""
+
+#: libexif/exif-tag.c:329
+msgid ""
+"This tag records the name and version of the software or firmware of the "
+"camera or image input device used to generate the image. The detailed format "
+"is not specified, but it is recommended that the example shown below be "
+"followed. When the field is left blank, it is treated as unknown."
+msgstr ""
+
+#: libexif/exif-tag.c:336
+msgid "Date and Time"
+msgstr ""
+
+#: libexif/exif-tag.c:337
+msgid ""
+"The date and time of image creation. In this standard (EXIF-2.1) it is the "
+"date and time the file was changed."
+msgstr ""
+
+#: libexif/exif-tag.c:340
+msgid "Artist"
+msgstr ""
+
+#: libexif/exif-tag.c:341
+msgid ""
+"This tag records the name of the camera owner, photographer or image "
+"creator. The detailed format is not specified, but it is recommended that "
+"the information be written as in the example below for ease of "
+"Interoperability. When the field is left blank, it is treated as unknown."
+msgstr ""
+
+#: libexif/exif-tag.c:347 libexif/pentax/mnote-pentax-tag.c:113
+msgid "White Point"
+msgstr ""
+
+#: libexif/exif-tag.c:348
+msgid ""
+"The chromaticity of the white point of the image. Normally this tag is not "
+"necessary, since color space is specified in the color space information tag "
+"(<ColorSpace>)."
+msgstr ""
+
+#: libexif/exif-tag.c:353
+msgid "Primary Chromaticities"
+msgstr ""
+
+#: libexif/exif-tag.c:354
+msgid ""
+"The chromaticity of the three primary colors of the image. Normally this tag "
+"is not necessary, since color space is specified in the color space "
+"information tag (<ColorSpace>)."
+msgstr ""
+
+#: libexif/exif-tag.c:359
+msgid "Defined by Adobe Corporation to enable TIFF Trees within a TIFF file."
+msgstr ""
+
+#: libexif/exif-tag.c:362
+msgid "Transfer Range"
+msgstr ""
+
+#: libexif/exif-tag.c:366
+msgid "JPEG Interchange Format"
+msgstr ""
+
+#: libexif/exif-tag.c:367
+msgid ""
+"The offset to the start byte (SOI) of JPEG compressed thumbnail data. This "
+"is not used for primary image JPEG data."
+msgstr ""
+
+#: libexif/exif-tag.c:372
+msgid "JPEG Interchange Format Length"
+msgstr ""
+
+#: libexif/exif-tag.c:373
+msgid ""
+"The number of bytes of JPEG compressed thumbnail data. This is not used for "
+"primary image JPEG data. JPEG thumbnails are not divided but are recorded as "
+"a continuous JPEG bitstream from SOI to EOI. Appn and COM markers should not "
+"be recorded. Compressed thumbnails must be recorded in no more than 64 "
+"Kbytes, including all other data to be recorded in APP1."
+msgstr ""
+
+#: libexif/exif-tag.c:382
+msgid "YCbCr Coefficients"
+msgstr ""
+
+#: libexif/exif-tag.c:383
+msgid ""
+"The matrix coefficients for transformation from RGB to YCbCr image data. No "
+"default is given in TIFF; but here the value given in \"Color Space "
+"Guidelines\", is used as the default. The color space is declared in a color "
+"space information tag, with the default being the value that gives the "
+"optimal image characteristics Interoperability this condition."
+msgstr ""
+
+#: libexif/exif-tag.c:392
+msgid "YCbCr Sub-Sampling"
+msgstr ""
+
+#: libexif/exif-tag.c:393
+msgid ""
+"The sampling ratio of chrominance components in relation to the luminance "
+"component. In JPEG compressed data a JPEG marker is used instead of this tag."
+msgstr ""
+
+#: libexif/exif-tag.c:398
+msgid "YCbCr Positioning"
+msgstr ""
+
+#: libexif/exif-tag.c:399
+msgid ""
+"The position of chrominance components in relation to the luminance "
+"component. This field is designated only for JPEG compressed data or "
+"uncompressed YCbCr data. The TIFF default is 1 (centered); but when Y:Cb:Cr "
+"= 4:2:2 it is recommended in this standard that 2 (co-sited) be used to "
+"record data, in order to improve the image quality when viewed on TV "
+"systems. When this field does not exist, the reader shall assume the TIFF "
+"default. In the case of Y:Cb:Cr = 4:2:0, the TIFF default (centered) is "
+"recommended. If the reader does not have the capability of supporting both "
+"kinds of <YCbCrPositioning>, it shall follow the TIFF default regardless of "
+"the value in this field. It is preferable that readers be able to support "
+"both centered and co-sited positioning."
+msgstr ""
+
+#: libexif/exif-tag.c:414
+msgid "Reference Black/White"
+msgstr ""
+
+#: libexif/exif-tag.c:415
+msgid ""
+"The reference black point value and reference white point value. No defaults "
+"are given in TIFF, but the values below are given as defaults here. The "
+"color space is declared in a color space information tag, with the default "
+"being the value that gives the optimal image characteristics "
+"Interoperability these conditions."
+msgstr ""
+
+#: libexif/exif-tag.c:423
+msgid "XML Packet"
+msgstr ""
+
+#: libexif/exif-tag.c:423
+msgid "XMP Metadata"
+msgstr ""
+
+#: libexif/exif-tag.c:438 libexif/exif-tag.c:784
+msgid "CFA Pattern"
+msgstr ""
+
+#: libexif/exif-tag.c:439 libexif/exif-tag.c:785
+msgid ""
+"Indicates the color filter array (CFA) geometric pattern of the image sensor "
+"when a one-chip color area sensor is used. It does not apply to all sensing "
+"methods."
+msgstr ""
+
+#: libexif/exif-tag.c:443
+msgid "Battery Level"
+msgstr ""
+
+#: libexif/exif-tag.c:444
+msgid "Copyright"
+msgstr ""
+
+#: libexif/exif-tag.c:445
+msgid ""
+"Copyright information. In this standard the tag is used to indicate both the "
+"photographer and editor copyrights. It is the copyright notice of the person "
+"or organization claiming rights to the image. The Interoperability copyright "
+"statement including date and rights should be written in this field; e.g., "
+"\"Copyright, John Smith, 19xx. All rights reserved.\". In this standard the "
+"field records both the photographer and editor copyrights, with each "
+"recorded in a separate part of the statement. When there is a clear "
+"distinction between the photographer and editor copyrights, these are to be "
+"written in the order of photographer followed by editor copyright, separated "
+"by NULL (in this case, since the statement also ends with a NULL, there are "
+"two NULL codes) (see example 1). When only the photographer is given, it is "
+"terminated by one NULL code (see example 2). When only the editor copyright "
+"is given, the photographer copyright part consists of one space followed by "
+"a terminating NULL code, then the editor copyright is given (see example 3). "
+"When the field is left blank, it is treated as unknown."
+msgstr ""
+
+#: libexif/exif-tag.c:467
+msgid "Exposure time, given in seconds (sec)."
+msgstr ""
+
+#: libexif/exif-tag.c:469 libexif/pentax/mnote-pentax-tag.c:79
+msgid "F-Number"
+msgstr ""
+
+#: libexif/exif-tag.c:470
+msgid "The F number."
+msgstr ""
+
+#: libexif/exif-tag.c:475
+msgid "Image Resources Block"
+msgstr ""
+
+#: libexif/exif-tag.c:477
+msgid ""
+"A pointer to the Exif IFD. Interoperability, Exif IFD has the same structure "
+"as that of the IFD specified in TIFF. ordinarily, however, it does not "
+"contain image data as in the case of TIFF."
+msgstr ""
+
+#: libexif/exif-tag.c:485
+msgid "Exposure Program"
+msgstr ""
+
+#: libexif/exif-tag.c:486
+msgid ""
+"The class of the program used by the camera to set exposure when the picture "
+"is taken."
+msgstr ""
+
+#: libexif/exif-tag.c:490
+msgid "Spectral Sensitivity"
+msgstr ""
+
+#: libexif/exif-tag.c:491
+msgid ""
+"Indicates the spectral sensitivity of each channel of the camera used. The "
+"tag value is an ASCII string compatible with the standard developed by the "
+"ASTM Technical Committee."
+msgstr ""
+
+#: libexif/exif-tag.c:496
+msgid "GPS Info IFD Pointer"
+msgstr ""
+
+#: libexif/exif-tag.c:497
+msgid ""
+"A pointer to the GPS Info IFD. The Interoperability structure of the GPS "
+"Info IFD, like that of Exif IFD, has no image data."
+msgstr ""
+
+#: libexif/exif-tag.c:503
+msgid "ISO Speed Ratings"
+msgstr ""
+
+#: libexif/exif-tag.c:504
+msgid ""
+"Indicates the ISO Speed and ISO Latitude of the camera or input device as "
+"specified in ISO 12232."
+msgstr ""
+
+#: libexif/exif-tag.c:507
+msgid "Opto-Electronic Conversion Function"
+msgstr ""
+
+#: libexif/exif-tag.c:508
+msgid ""
+"Indicates the Opto-Electronic Conversion Function (OECF) specified in ISO "
+"14524. <OECF> is the relationship between the camera optical input and the "
+"image values."
+msgstr ""
+
+#: libexif/exif-tag.c:513
+msgid "Time Zone Offset"
+msgstr ""
+
+#: libexif/exif-tag.c:514
+msgid "Encodes time zone of camera clock relative to GMT."
+msgstr ""
+
+#: libexif/exif-tag.c:515
+msgid "Exif Version"
+msgstr ""
+
+#: libexif/exif-tag.c:516
+msgid ""
+"The version of this standard supported. Nonexistence of this field is taken "
+"to mean nonconformance to the standard."
+msgstr ""
+
+#: libexif/exif-tag.c:520
+msgid "Date and Time (Original)"
+msgstr ""
+
+#: libexif/exif-tag.c:521
+msgid ""
+"The date and time when the original image data was generated. For a digital "
+"still camera the date and time the picture was taken are recorded."
+msgstr ""
+
+#: libexif/exif-tag.c:526
+msgid "Date and Time (Digitized)"
+msgstr ""
+
+#: libexif/exif-tag.c:527
+msgid "The date and time when the image was stored as digital data."
+msgstr ""
+
+#: libexif/exif-tag.c:530
+msgid "Components Configuration"
+msgstr ""
+
+#: libexif/exif-tag.c:531
+msgid ""
+"Information specific to compressed data. The channels of each component are "
+"arranged in order from the 1st component to the 4th. For uncompressed data "
+"the data arrangement is given in the <PhotometricInterpretation> tag. "
+"However, since <PhotometricInterpretation> can only express the order of Y, "
+"Cb and Cr, this tag is provided for cases when compressed data uses "
+"components other than Y, Cb, and Cr and to enable support of other sequences."
+msgstr ""
+
+#: libexif/exif-tag.c:541
+msgid "Compressed Bits per Pixel"
+msgstr ""
+
+#: libexif/exif-tag.c:542
+msgid ""
+"Information specific to compressed data. The compression mode used for a "
+"compressed image is indicated in unit bits per pixel."
+msgstr ""
+
+#: libexif/exif-tag.c:546 libexif/olympus/mnote-olympus-tag.c:123
+msgid "Shutter Speed"
+msgstr ""
+
+#: libexif/exif-tag.c:547
+msgid ""
+"Shutter speed. The unit is the APEX (Additive System of Photographic "
+"Exposure) setting."
+msgstr ""
+
+#: libexif/exif-tag.c:551
+msgid "The lens aperture. The unit is the APEX value."
+msgstr ""
+
+#: libexif/exif-tag.c:553
+msgid "Brightness"
+msgstr "亮度"
+
+#: libexif/exif-tag.c:554
+msgid ""
+"The value of brightness. The unit is the APEX value. Ordinarily it is given "
+"in the range of -99.99 to 99.99."
+msgstr ""
+
+#: libexif/exif-tag.c:558
+msgid "Exposure Bias"
+msgstr "曝光偏差"
+
+#: libexif/exif-tag.c:559
+msgid ""
+"The exposure bias. The units is the APEX value. Ordinarily it is given in "
+"the range of -99.99 to 99.99."
+msgstr ""
+
+#: libexif/exif-tag.c:562
+msgid "Maximum Aperture Value"
+msgstr ""
+
+#: libexif/exif-tag.c:563
+msgid ""
+"The smallest F number of the lens. The unit is the APEX value. Ordinarily it "
+"is given in the range of 00.00 to 99.99, but it is not limited to this range."
+msgstr ""
+
+#: libexif/exif-tag.c:568
+msgid "Subject Distance"
+msgstr "主体距离"
+
+#: libexif/exif-tag.c:569
+msgid "The distance to the subject, given in meters."
+msgstr "被摄主体的距离，单位为米。"
+
+#: libexif/exif-tag.c:572
+msgid "The metering mode."
+msgstr "测距模式"
+
+#: libexif/exif-tag.c:574
+msgid "Light Source"
+msgstr "光源"
+
+#: libexif/exif-tag.c:575
+msgid "The kind of light source."
+msgstr ""
+
+#: libexif/exif-tag.c:578
+msgid ""
+"This tag is recorded when an image is taken using a strobe light (flash)."
+msgstr ""
+
+#: libexif/exif-tag.c:582
+msgid ""
+"The actual focal length of the lens, in mm. Conversion is not made to the "
+"focal length of a 35 mm film camera."
+msgstr ""
+
+#: libexif/exif-tag.c:585
+msgid "Subject Area"
+msgstr ""
+
+#: libexif/exif-tag.c:586
+msgid ""
+"This tag indicates the location and area of the main subject in the overall "
+"scene."
+msgstr ""
+
+#: libexif/exif-tag.c:590
+msgid "TIFF/EP Standard ID"
+msgstr "TIFF/EP 标准 ID"
+
+#: libexif/exif-tag.c:591
+msgid "Maker Note"
+msgstr "制作者备忘"
+
+#: libexif/exif-tag.c:592
+msgid ""
+"A tag for manufacturers of Exif writers to record any desired information. "
+"The contents are up to the manufacturer."
+msgstr ""
+
+#: libexif/exif-tag.c:595
+msgid "User Comment"
+msgstr "用户备注"
+
+#: libexif/exif-tag.c:596
+msgid ""
+"A tag for Exif users to write keywords or comments on the image besides "
+"those in <ImageDescription>, and without the character code limitations of "
+"the <ImageDescription> tag. The character code used in the <UserComment> tag "
+"is identified based on an ID code in a fixed 8-byte area at the start of the "
+"tag data area. The unused portion of the area is padded with NULL "
+"(\"00.h\"). ID codes are assigned by means of registration. The designation "
+"method and references for each character code are defined in the "
+"specification. The value of CountN is determined based on the 8 bytes in the "
+"character code area and the number of bytes in the user comment part. Since "
+"the TYPE is not ASCII, NULL termination is not necessary. The ID code for "
+"the <UserComment> area may be a Defined code such as JIS or ASCII, or may be "
+"Undefined. The Undefined name is UndefinedText, and the ID code is filled "
+"with 8 bytes of all \"NULL\" (\"00.H\"). An Exif reader that reads the "
+"<UserComment> tag must have a function for determining the ID code. This "
+"function is not required in Exif readers that do not use the <UserComment> "
+"tag. When a <UserComment> area is set aside, it is recommended that the ID "
+"code be ASCII and that the following user comment part be filled with blank "
+"characters [20.H]."
+msgstr ""
+
+#: libexif/exif-tag.c:619
+msgid "Sub-second Time"
+msgstr ""
+
+#: libexif/exif-tag.c:620
+msgid "A tag used to record fractions of seconds for the <DateTime> tag."
+msgstr ""
+
+#: libexif/exif-tag.c:624
+msgid "Sub-second Time (Original)"
+msgstr ""
+
+#: libexif/exif-tag.c:625
+msgid ""
+"A tag used to record fractions of seconds for the <DateTimeOriginal> tag."
+msgstr ""
+
+#: libexif/exif-tag.c:629
+msgid "Sub-second Time (Digitized)"
+msgstr ""
+
+#: libexif/exif-tag.c:630
+msgid ""
+"A tag used to record fractions of seconds for the <DateTimeDigitized> tag."
+msgstr ""
+
+#: libexif/exif-tag.c:634
+msgid "XP Title"
+msgstr ""
+
+#: libexif/exif-tag.c:635
+msgid ""
+"A character string giving the title of the image, encoded in UTF-16LE."
+msgstr ""
+
+#: libexif/exif-tag.c:639
+msgid "XP Comment"
+msgstr ""
+
+#: libexif/exif-tag.c:640
+msgid ""
+"A character string containing a comment about the image, encoded in UTF-16LE."
+msgstr ""
+
+#: libexif/exif-tag.c:644
+msgid "XP Author"
+msgstr ""
+
+#: libexif/exif-tag.c:645
+msgid ""
+"A character string containing the name of the image creator, encoded in UTF-"
+"16LE."
+msgstr ""
+
+#: libexif/exif-tag.c:649
+msgid "XP Keywords"
+msgstr ""
+
+#: libexif/exif-tag.c:650
+msgid ""
+"A character string containing key words describing the image, encoded in UTF-"
+"16LE."
+msgstr ""
+
+#: libexif/exif-tag.c:654
+msgid "XP Subject"
+msgstr ""
+
+#: libexif/exif-tag.c:655
+msgid "A character string giving the image subject, encoded in UTF-16LE."
+msgstr ""
+
+#: libexif/exif-tag.c:659
+msgid "The FlashPix format version supported by a FPXR file."
+msgstr ""
+
+#: libexif/exif-tag.c:661 libexif/pentax/mnote-pentax-tag.c:102
+msgid "Color Space"
+msgstr "色彩空间"
+
+#: libexif/exif-tag.c:662
+msgid ""
+"The color space information tag is always recorded as the color space "
+"specifier. Normally sRGB (=1) is used to define the color space based on the "
+"PC monitor conditions and environment. If a color space other than sRGB is "
+"used, Uncalibrated (=FFFF.H) is set. Image data recorded as Uncalibrated can "
+"be treated as sRGB when it is converted to FlashPix."
+msgstr ""
+
+#: libexif/exif-tag.c:670
+msgid "Pixel X Dimension"
+msgstr ""
+
+#: libexif/exif-tag.c:671
+msgid ""
+"Information specific to compressed data. When a compressed file is recorded, "
+"the valid width of the meaningful image must be recorded in this tag, "
+"whether or not there is padding data or a restart marker. This tag should "
+"not exist in an uncompressed file."
+msgstr ""
+
+#: libexif/exif-tag.c:677
+msgid "Pixel Y Dimension"
+msgstr ""
+
+#: libexif/exif-tag.c:678
+msgid ""
+"Information specific to compressed data. When a compressed file is recorded, "
+"the valid height of the meaningful image must be recorded in this tag, "
+"whether or not there is padding data or a restart marker. This tag should "
+"not exist in an uncompressed file. Since data padding is unnecessary in the "
+"vertical direction, the number of lines recorded in this valid image height "
+"tag will in fact be the same as that recorded in the SOF."
+msgstr ""
+
+#: libexif/exif-tag.c:688
+msgid "Related Sound File"
+msgstr ""
+
+#: libexif/exif-tag.c:689
+msgid ""
+"This tag is used to record the name of an audio file related to the image "
+"data. The only relational information recorded here is the Exif audio file "
+"name and extension (an ASCII string consisting of 8 characters + '.' + 3 "
+"characters). The path is not recorded. Stipulations on audio and file naming "
+"conventions are defined in the specification. When using this tag, audio "
+"files must be recorded in conformance to the Exif audio format. Writers are "
+"also allowed to store the data such as Audio within APP2 as FlashPix "
+"extension stream data. The mapping of Exif image files and audio files is "
+"done in any of three ways, [1], [2] and [3]. If multiple files are mapped to "
+"one file as in [2] or [3], the above format is used to record just one audio "
+"file name. If there are multiple audio files, the first recorded file is "
+"given. In the case of [3], for example, for the Exif image file "
+"\"DSC00001.JPG\" only  \"SND00001.WAV\" is given as the related Exif audio "
+"file. When there are three Exif audio files \"SND00001.WAV\", "
+"\"SND00002.WAV\" and \"SND00003.WAV\", the Exif image file name for each of "
+"them, \"DSC00001.JPG\", is indicated. By combining multiple relational "
+"information, a variety of playback possibilities can be supported. The "
+"method of using relational information is left to the implementation on the "
+"playback side. Since this information is an ASCII character string, it is "
+"terminated by NULL. When this tag is used to map audio files, the relation "
+"of the audio file to image data must also be indicated on the audio file end."
+msgstr ""
+
+#: libexif/exif-tag.c:719
+msgid "Interoperability IFD Pointer"
+msgstr ""
+
+#: libexif/exif-tag.c:720
+msgid ""
+"Interoperability IFD is composed of tags which stores the information to "
+"ensure the Interoperability and pointed by the following tag located in Exif "
+"IFD. The Interoperability structure of Interoperability IFD is the same as "
+"TIFF defined IFD structure but does not contain the image data "
+"characteristically compared with normal TIFF IFD."
+msgstr ""
+
+#: libexif/exif-tag.c:729
+msgid "Flash Energy"
+msgstr ""
+
+#: libexif/exif-tag.c:730
+msgid ""
+"Indicates the strobe energy at the time the image is captured, as measured "
+"in Beam Candle Power Seconds (BCPS)."
+msgstr ""
+
+#: libexif/exif-tag.c:734
+msgid "Spatial Frequency Response"
+msgstr ""
+
+#: libexif/exif-tag.c:735
+msgid ""
+"This tag records the camera or input device spatial frequency table and SFR "
+"values in the direction of image width, image height, and diagonal "
+"direction, as specified in ISO 12233."
+msgstr ""
+
+#: libexif/exif-tag.c:741
+msgid "Focal Plane X-Resolution"
+msgstr ""
+
+#: libexif/exif-tag.c:742
+msgid ""
+"Indicates the number of pixels in the image width (X) direction per "
+"<FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr ""
+
+#: libexif/exif-tag.c:746
+msgid "Focal Plane Y-Resolution"
+msgstr ""
+
+#: libexif/exif-tag.c:747
+msgid ""
+"Indicates the number of pixels in the image height (V) direction per "
+"<FocalPlaneResolutionUnit> on the camera focal plane."
+msgstr ""
+
+#: libexif/exif-tag.c:751
+msgid "Focal Plane Resolution Unit"
+msgstr "焦平面分辨率单位"
+
+#: libexif/exif-tag.c:752
+msgid ""
+"Indicates the unit for measuring <FocalPlaneXResolution> and "
+"<FocalPlaneYResolution>. This value is the same as the <ResolutionUnit>."
+msgstr ""
+
+#: libexif/exif-tag.c:757
+msgid "Subject Location"
+msgstr ""
+
+#: libexif/exif-tag.c:758
+msgid ""
+"Indicates the location of the main subject in the scene. The value of this "
+"tag represents the pixel at the center of the main subject relative to the "
+"left edge, prior to rotation processing as per the <Rotation> tag. The first "
+"value indicates the X column number and the second indicates the Y row "
+"number."
+msgstr ""
+
+#: libexif/exif-tag.c:765
+msgid "Exposure Index"
+msgstr ""
+
+#: libexif/exif-tag.c:766
+msgid ""
+"Indicates the exposure index selected on the camera or input device at the "
+"time the image is captured."
+msgstr ""
+
+#: libexif/exif-tag.c:769
+msgid "Sensing Method"
+msgstr "传感方式"
+
+#: libexif/exif-tag.c:770
+msgid "Indicates the image sensor type on the camera or input device."
+msgstr ""
+
+#: libexif/exif-tag.c:773 libexif/fuji/mnote-fuji-tag.c:64
+msgid "File Source"
+msgstr ""
+
+#: libexif/exif-tag.c:774
+msgid ""
+"Indicates the image source. If a DSC recorded the image, the tag value of "
+"this tag always be set to 3, indicating that the image was recorded on a DSC."
+msgstr ""
+
+#: libexif/exif-tag.c:778
+msgid "Scene Type"
+msgstr "场景类型"
+
+#: libexif/exif-tag.c:779
+msgid ""
+"Indicates the type of scene. If a DSC recorded the image, this tag value "
+"must always be set to 1, indicating that the image was directly photographed."
+msgstr ""
+
+#: libexif/exif-tag.c:789
+msgid "Custom Rendered"
+msgstr ""
+
+#: libexif/exif-tag.c:790
+msgid ""
+"This tag indicates the use of special processing on image data, such as "
+"rendering geared to output. When special processing is performed, the reader "
+"is expected to disable or minimize any further processing."
+msgstr ""
+
+#: libexif/exif-tag.c:796
+msgid ""
+"This tag indicates the exposure mode set when the image was shot. In auto-"
+"bracketing mode, the camera shoots a series of frames of the same scene at "
+"different exposure settings."
+msgstr ""
+
+#: libexif/exif-tag.c:801
+msgid ""
+"This tag indicates the white balance mode set when the image was shot."
+msgstr ""
+
+#: libexif/exif-tag.c:805
+msgid "Digital Zoom Ratio"
+msgstr "数码变焦倍率"
+
+#: libexif/exif-tag.c:806
+msgid ""
+"This tag indicates the digital zoom ratio when the image was shot. If the "
+"numerator of the recorded value is 0, this indicates that digital zoom was "
+"not used."
+msgstr ""
+
+#: libexif/exif-tag.c:811
+msgid "Focal Length in 35mm Film"
+msgstr ""
+
+#: libexif/exif-tag.c:812
+msgid ""
+"This tag indicates the equivalent focal length assuming a 35mm film camera, "
+"in mm. A value of 0 means the focal length is unknown. Note that this tag "
+"differs from the FocalLength tag."
+msgstr ""
+
+#: libexif/exif-tag.c:818
+msgid "Scene Capture Type"
+msgstr "场景捕获类型"
+
+#: libexif/exif-tag.c:819
+msgid ""
+"This tag indicates the type of scene that was shot. It can also be used to "
+"record the mode in which the image was shot. Note that this differs from the "
+"scene type <SceneType> tag."
+msgstr ""
+
+#: libexif/exif-tag.c:824
+msgid "Gain Control"
+msgstr "增益控制"
+
+#: libexif/exif-tag.c:825
+msgid "This tag indicates the degree of overall image gain adjustment."
+msgstr ""
+
+#: libexif/exif-tag.c:829
+msgid ""
+"This tag indicates the direction of contrast processing applied by the "
+"camera when the image was shot."
+msgstr ""
+
+#: libexif/exif-tag.c:833
+msgid ""
+"This tag indicates the direction of saturation processing applied by the "
+"camera when the image was shot."
+msgstr ""
+
+#: libexif/exif-tag.c:837
+msgid ""
+"This tag indicates the direction of sharpness processing applied by the "
+"camera when the image was shot."
+msgstr ""
+
+#: libexif/exif-tag.c:841
+msgid "Device Setting Description"
+msgstr ""
+
+#: libexif/exif-tag.c:842
+msgid ""
+"This tag indicates information on the picture-taking conditions of a "
+"particular camera model. The tag is used only to indicate the picture-taking "
+"conditions in the reader."
+msgstr ""
+
+#: libexif/exif-tag.c:848
+msgid "Subject Distance Range"
+msgstr ""
+
+#: libexif/exif-tag.c:849
+msgid "This tag indicates the distance to the subject."
+msgstr ""
+
+#: libexif/exif-tag.c:851
+msgid "Image Unique ID"
+msgstr "图像唯一 ID"
+
+#: libexif/exif-tag.c:852
+msgid ""
+"This tag indicates an identifier assigned uniquely to each image. It is "
+"recorded as an ASCII string equivalent to hexadecimal notation and 128-bit "
+"fixed length."
+msgstr ""
+
+#: libexif/exif-tag.c:857
+msgid "Gamma"
+msgstr "伽玛"
+
+#: libexif/exif-tag.c:858
+msgid "Indicates the value of coefficient gamma."
+msgstr ""
+
+#: libexif/exif-tag.c:860
+msgid "PRINT Image Matching"
+msgstr ""
+
+#: libexif/exif-tag.c:861
+msgid "Related to Epson's PRINT Image Matching technology"
+msgstr ""
+
+#: libexif/exif-tag.c:863
+msgid "Padding"
+msgstr ""
+
+#: libexif/exif-tag.c:864
+msgid ""
+"This tag reserves space that can be reclaimed later when additional metadata "
+"are added. New metadata can be written in place by replacing this tag with a "
+"smaller data element and using the reclaimed space to store the new or "
+"expanded metadata tags."
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:62
+msgid "Softest"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:66
+msgid "Hardest"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:67 libexif/fuji/mnote-fuji-entry.c:96
+msgid "Medium soft"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:68 libexif/fuji/mnote-fuji-entry.c:94
+msgid "Medium hard"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:69 libexif/fuji/mnote-fuji-entry.c:90
+#: libexif/fuji/mnote-fuji-entry.c:98 libexif/fuji/mnote-fuji-entry.c:182
+msgid "Film simulation mode"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:79
+msgid "Incandescent"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:85
+msgid "Medium high"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:87
+msgid "Medium low"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:88 libexif/fuji/mnote-fuji-entry.c:97
+msgid "Original"
+msgstr "初始"
+
+#: libexif/fuji/mnote-fuji-entry.c:124 libexif/pentax/mnote-pentax-entry.c:164
+#: libexif/pentax/mnote-pentax-entry.c:299
+msgid "Program AE"
+msgstr "程序 AE"
+
+#: libexif/fuji/mnote-fuji-entry.c:125
+msgid "Natural photo"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:126
+msgid "Vibration reduction"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:127
+msgid "Sunset"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:128 libexif/pentax/mnote-pentax-entry.c:181
+msgid "Museum"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:129
+msgid "Party"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:130
+msgid "Flower"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:131 libexif/pentax/mnote-pentax-entry.c:176
+msgid "Text"
+msgstr "文本"
+
+#: libexif/fuji/mnote-fuji-entry.c:132
+msgid "NP & flash"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:137
+msgid "Aperture priority AE"
+msgstr "光圈优先 AE"
+
+#: libexif/fuji/mnote-fuji-entry.c:138
+msgid "Shutter priority AE"
+msgstr "快门优先 AE"
+
+#: libexif/fuji/mnote-fuji-entry.c:146
+msgid "F-Standard"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:147
+msgid "F-Chrome"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:148
+msgid "F-B&W"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:151
+msgid "No blur"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:152
+msgid "Blur warning"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:155
+msgid "Focus good"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:156
+msgid "Out of focus"
+msgstr "焦外"
+
+#: libexif/fuji/mnote-fuji-entry.c:159
+msgid "AE good"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:160
+msgid "Over exposed"
+msgstr "过曝"
+
+#: libexif/fuji/mnote-fuji-entry.c:164
+msgid "Wide"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:167
+msgid "F0/Standard"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:168
+msgid "F1/Studio portrait"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:169
+msgid "F1a/Professional portrait"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:170
+msgid "F1b/Professional portrait"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:171
+msgid "F1c/Professional portrait"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:172
+msgid "F2/Fujichrome"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:173
+msgid "F3/Studio portrait Ex"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:174
+msgid "F4/Velvia"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:177
+msgid "Auto (100-400%)"
+msgstr "自动 (100-400%)"
+
+#: libexif/fuji/mnote-fuji-entry.c:179
+msgid "Standard (100%)"
+msgstr "标准（100％）"
+
+#: libexif/fuji/mnote-fuji-entry.c:180
+msgid "Wide1 (230%)"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:181
+msgid "Wide2 (400%)"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-entry.c:263
+#, c-format
+msgid "%2.2f mm"
+msgstr "%2.2f mm"
+
+#: libexif/fuji/mnote-fuji-entry.c:298 libexif/pentax/mnote-pentax-entry.c:399
+#: libexif/pentax/mnote-pentax-entry.c:451
+#, c-format
+msgid "%i bytes unknown data"
+msgstr "%i 字节未知数据"
+
+#: libexif/fuji/mnote-fuji-tag.c:36
+msgid "Maker Note Version"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:37
+msgid "This number is unique and based on the date of manufacture."
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:41
+msgid "Chromaticity Saturation"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:44
+msgid "Flash Firing Strength Compensation"
+msgstr "闪光灯补光强度"
+
+#: libexif/fuji/mnote-fuji-tag.c:46
+msgid "Focusing Mode"
+msgstr "对焦模式"
+
+#: libexif/fuji/mnote-fuji-tag.c:47
+msgid "Focus Point"
+msgstr "焦点"
+
+#: libexif/fuji/mnote-fuji-tag.c:48
+msgid "Slow Synchro Mode"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:49 libexif/pentax/mnote-pentax-tag.c:72
+msgid "Picture Mode"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:50
+msgid "Continuous Taking"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:51
+msgid "Continuous Sequence Number"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:52
+msgid "FinePix Color"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:53
+msgid "Blur Check"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:54
+msgid "Auto Focus Check"
+msgstr "自动焦点检测"
+
+#: libexif/fuji/mnote-fuji-tag.c:55
+msgid "Auto Exposure Check"
+msgstr "自动曝光检测"
+
+#: libexif/fuji/mnote-fuji-tag.c:56
+msgid "Dynamic Range"
+msgstr "动态范围"
+
+#: libexif/fuji/mnote-fuji-tag.c:57
+msgid "Film Simulation Mode"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:58
+msgid "Dynamic Range Wide Mode"
+msgstr "大动态范围模式"
+
+#: libexif/fuji/mnote-fuji-tag.c:59
+msgid "Development Dynamic Range Wide Mode"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:60
+msgid "Minimum Focal Length"
+msgstr "最小焦距"
+
+#: libexif/fuji/mnote-fuji-tag.c:61
+msgid "Maximum Focal Length"
+msgstr "最大焦距"
+
+#: libexif/fuji/mnote-fuji-tag.c:62
+msgid "Maximum Aperture at Minimum Focal"
+msgstr "最小焦距时的最大光圈"
+
+#: libexif/fuji/mnote-fuji-tag.c:63
+msgid "Maximum Aperture at Maximum Focal"
+msgstr "最大焦距时的最大光圈"
+
+#: libexif/fuji/mnote-fuji-tag.c:65
+msgid "Order Number"
+msgstr ""
+
+#: libexif/fuji/mnote-fuji-tag.c:66 libexif/pentax/mnote-pentax-tag.c:98
+msgid "Frame Number"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:49
+#, c-format
+msgid "Invalid format '%s', expected '%s' or '%s'."
+msgstr "无效格式 '%s'，预期 '%s' 或 '%s'。"
+
+#: libexif/olympus/mnote-olympus-entry.c:92
+msgid "AF non D lens"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:94
+msgid "AF-D or AF-S lens"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:95
+msgid "AF-D G lens"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:96
+msgid "AF-D VR lens"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:97
+msgid "AF-D G VR lens"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:101
+msgid "Flash unit unknown"
+msgstr "未知闪光单元"
+
+#: libexif/olympus/mnote-olympus-entry.c:102
+msgid "Flash is external"
+msgstr "外置闪光灯"
+
+#: libexif/olympus/mnote-olympus-entry.c:103
+msgid "Flash is on camera"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:106
+msgid "VGA basic"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:107
+msgid "VGA normal"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:108
+msgid "VGA fine"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:109
+msgid "SXGA basic"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:110
+msgid "SXGA normal"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:111
+msgid "SXGA fine"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:112
+msgid "2 Mpixel basic"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:113
+msgid "2 Mpixel normal"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:114
+msgid "2 Mpixel fine"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:117
+msgid "Color"
+msgstr "颜色"
+
+#: libexif/olympus/mnote-olympus-entry.c:122
+msgid "Bright+"
+msgstr "亮度+"
+
+#: libexif/olympus/mnote-olympus-entry.c:123
+msgid "Bright-"
+msgstr "亮度-"
+
+#: libexif/olympus/mnote-olympus-entry.c:124
+msgid "Contrast+"
+msgstr "对比度+"
+
+#: libexif/olympus/mnote-olympus-entry.c:125
+msgid "Contrast-"
+msgstr "对比度-"
+
+#: libexif/olympus/mnote-olympus-entry.c:128
+msgid "ISO 80"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:129
+msgid "ISO 160"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:130
+msgid "ISO 320"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:131
+#: libexif/olympus/mnote-olympus-entry.c:249
+msgid "ISO 100"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:135
+msgid "Preset"
+msgstr "预设"
+
+#: libexif/olympus/mnote-olympus-entry.c:137
+msgid "Incandescence"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:138
+msgid "Fluorescence"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:140
+msgid "SpeedLight"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:143
+msgid "No fisheye"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:144
+msgid "Fisheye on"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:147
+msgid "Normal, SQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:148
+msgid "Normal, HQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:149
+msgid "Normal, SHQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:150
+msgid "Normal, RAW"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:151
+msgid "Normal, SQ1"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:152
+msgid "Normal, SQ2"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:153
+msgid "Normal, super high"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:154
+msgid "Normal, standard"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:155
+msgid "Fine, SQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:156
+msgid "Fine, HQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:157
+msgid "Fine, SHQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:158
+msgid "Fine, RAW"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:159
+msgid "Fine, SQ1"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:160
+msgid "Fine, SQ2"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:161
+msgid "Fine, super high"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:162
+msgid "Super fine, SQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:163
+msgid "Super fine, HQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:164
+msgid "Super fine, SHQ"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:165
+msgid "Super fine, RAW"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:166
+msgid "Super fine, SQ1"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:167
+msgid "Super fine, SQ2"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:168
+msgid "Super fine, super high"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:169
+msgid "Super fine, high"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:172
+#: libexif/olympus/mnote-olympus-entry.c:177
+#: libexif/olympus/mnote-olympus-entry.c:211
+#: libexif/olympus/mnote-olympus-entry.c:220
+#: libexif/olympus/mnote-olympus-entry.c:243
+msgid "No"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:183
+msgid "On (Preset)"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:188
+msgid "Fill"
+msgstr "填充"
+
+#: libexif/olympus/mnote-olympus-entry.c:195
+msgid "Internal + external"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:224
+msgid "Interlaced"
+msgstr "交错"
+
+#: libexif/olympus/mnote-olympus-entry.c:225
+msgid "Progressive"
+msgstr "渐进"
+
+#: libexif/olympus/mnote-olympus-entry.c:231
+#: libexif/pentax/mnote-pentax-entry.c:85
+#: libexif/pentax/mnote-pentax-entry.c:139
+msgid "Best"
+msgstr "最好"
+
+#: libexif/olympus/mnote-olympus-entry.c:232
+msgid "Adjust exposure"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:235
+msgid "Spot focus"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:236
+msgid "Normal focus"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:239
+msgid "Record while down"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:240
+msgid "Press start, press stop"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:248
+msgid "ISO 50"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:250
+msgid "ISO 200"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:251
+msgid "ISO 400"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:255
+#: libexif/pentax/mnote-pentax-entry.c:168
+msgid "Sport"
+msgstr "运动"
+
+#: libexif/olympus/mnote-olympus-entry.c:256
+msgid "TV"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:258
+msgid "User 1"
+msgstr "用户 1"
+
+#: libexif/olympus/mnote-olympus-entry.c:259
+msgid "User 2"
+msgstr "用户 2"
+
+#: libexif/olympus/mnote-olympus-entry.c:260
+msgid "Lamp"
+msgstr "灯"
+
+#: libexif/olympus/mnote-olympus-entry.c:263
+msgid "5 frames/sec"
+msgstr "5 帧/秒"
+
+#: libexif/olympus/mnote-olympus-entry.c:264
+msgid "10 frames/sec"
+msgstr "10 帧/秒"
+
+#: libexif/olympus/mnote-olympus-entry.c:265
+msgid "15 frames/sec"
+msgstr "15 帧/秒"
+
+#: libexif/olympus/mnote-olympus-entry.c:266
+msgid "20 frames/sec"
+msgstr "20 帧/秒"
+
+#: libexif/olympus/mnote-olympus-entry.c:381
+#, c-format
+msgid "Red Correction %f, blue Correction %f"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:388
+msgid "No manual focus selection"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:391
+#, c-format
+msgid "%2.2f meters"
+msgstr "%2.2f 米"
+
+#: libexif/olympus/mnote-olympus-entry.c:417
+msgid "AF position: center"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:418
+msgid "AF position: top"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:419
+msgid "AF position: bottom"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:420
+msgid "AF position: left"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:421
+msgid "AF position: right"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:422
+msgid "AF position: upper-left"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:423
+msgid "AF position: upper-right"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:424
+msgid "AF position: lower-left"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:425
+msgid "AF position: lower-right"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:426
+msgid "AF position: far left"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:427
+msgid "AF position: far right"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:428
+msgid "Unknown AF position"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:439
+#: libexif/olympus/mnote-olympus-entry.c:509
+#, c-format
+msgid "Internal error (unknown value %hi)"
+msgstr "内部错误 (未知值 %hi)"
+
+#: libexif/olympus/mnote-olympus-entry.c:447
+#: libexif/olympus/mnote-olympus-entry.c:517
+#, c-format
+msgid "Unknown value %hi"
+msgstr "未知值 %hi"
+
+#: libexif/olympus/mnote-olympus-entry.c:542
+#: libexif/olympus/mnote-olympus-entry.c:562
+#, c-format
+msgid "Unknown %hu"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:559
+msgid "2 sec."
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:598
+msgid "Fast"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:702
+msgid "Automatic"
+msgstr "自动"
+
+#: libexif/olympus/mnote-olympus-entry.c:732
+#, c-format
+msgid "Manual: %liK"
+msgstr "手动： %liK"
+
+#: libexif/olympus/mnote-olympus-entry.c:735
+msgid "Manual: unknown"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:741
+msgid "One-touch"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:797
+#: libexif/olympus/mnote-olympus-entry.c:807
+msgid "Infinite"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-entry.c:815
+#, c-format
+msgid "%i bytes unknown data: "
+msgstr "%i 字节未知数据： "
+
+#: libexif/olympus/mnote-olympus-tag.c:38
+#: libexif/olympus/mnote-olympus-tag.c:53
+msgid "ISO Setting"
+msgstr "ISO 设置"
+
+#: libexif/olympus/mnote-olympus-tag.c:39
+msgid "Color Mode (?)"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:42
+msgid "Image Sharpening"
+msgstr "图像锐化"
+
+#: libexif/olympus/mnote-olympus-tag.c:44
+msgid "Flash Setting"
+msgstr "闪光灯设置"
+
+#: libexif/olympus/mnote-olympus-tag.c:46
+msgid "White Balance Fine Adjustment"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:47
+msgid "White Balance RB"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:49
+msgid "ISO Selection"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:50
+msgid "Preview Image IFD"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:50
+msgid "Offset of the preview image directory (IFD) inside the file."
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:51
+msgid "Exposurediff ?"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:54
+msgid "Image Boundary"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:56
+msgid "Flash Exposure Bracket Value"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:57
+msgid "Exposure Bracket Value"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:58
+#: libexif/olympus/mnote-olympus-tag.c:96
+msgid "Image Adjustment"
+msgstr "图像调整"
+
+#: libexif/olympus/mnote-olympus-tag.c:59
+msgid "Tone Compensation"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:60
+msgid "Adapter"
+msgstr "适配器"
+
+#: libexif/olympus/mnote-olympus-tag.c:62
+msgid "Lens"
+msgstr "镜头"
+
+#: libexif/olympus/mnote-olympus-tag.c:63
+#: libexif/olympus/mnote-olympus-tag.c:135
+#: libexif/olympus/mnote-olympus-tag.c:185
+msgid "Manual Focus Distance"
+msgstr "手动对焦"
+
+#: libexif/olympus/mnote-olympus-tag.c:65
+msgid "Flash Used"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:66
+msgid "AF Focus Position"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:67
+msgid "Bracketing"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:69
+msgid "Lens F Stops"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:70
+msgid "Contrast Curve"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:71
+#: libexif/olympus/mnote-olympus-tag.c:95
+#: libexif/pentax/mnote-pentax-tag.c:134
+msgid "Color Mode"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:72
+msgid "Light Type"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:74
+msgid "Hue Adjustment"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:76
+#: libexif/olympus/mnote-olympus-tag.c:163
+#: libexif/pentax/mnote-pentax-tag.c:108
+msgid "Noise Reduction"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:79
+msgid "Sensor Pixel Size"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:82
+msgid "Image Data Size"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:82
+msgid "Size of compressed image data in bytes."
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:84
+msgid "Total Number of Pictures Taken"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:86
+msgid "Optimize Image"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:88
+msgid "Vari Program"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:89
+msgid "Capture Editor Data"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:90
+msgid "Capture Editor Version"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:97
+#: libexif/olympus/mnote-olympus-tag.c:183
+msgid "CCD Sensitivity"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:99
+msgid "Focus"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:102
+msgid "Converter"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:105
+msgid "Thumbnail Image"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:106
+msgid "Speed/Sequence/Panorama Direction"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:109
+msgid "Black & White Mode"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:111
+msgid "Focal Plane Diagonal"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:112
+msgid "Lens Distortion Parameters"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:114
+msgid "Info"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:115
+msgid "Camera ID"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:116
+msgid "Precapture Frames"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:117
+msgid "White Board"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:118
+msgid "One Touch White Balance"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:119
+msgid "White Balance Bracket"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:120
+#: libexif/pentax/mnote-pentax-tag.c:123
+msgid "White Balance Bias"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:121
+msgid "Data Dump"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:124
+msgid "ISO Value"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:125
+msgid "Aperture Value"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:126
+msgid "Brightness Value"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:128
+msgid "Flash Device"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:130
+msgid "Sensor Temperature"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:131
+msgid "Lens Temperature"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:132
+msgid "Light Condition"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:136
+msgid "Zoom Step Count"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:137
+msgid "Focus Step Count"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:138
+msgid "Sharpness Setting"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:139
+msgid "Flash Charge Level"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:140
+msgid "Color Matrix"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:141
+msgid "Black Level"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:142
+msgid "White Balance Setting"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:143
+#: libexif/pentax/mnote-pentax-tag.c:87
+msgid "Red Balance"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:144
+#: libexif/pentax/mnote-pentax-tag.c:86
+msgid "Blue Balance"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:145
+msgid "Color Matrix Number"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:147
+msgid "Flash Exposure Comp"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:148
+msgid "Internal Flash Table"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:149
+msgid "External Flash G Value"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:150
+msgid "External Flash Bounce"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:151
+msgid "External Flash Zoom"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:152
+msgid "External Flash Mode"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:153
+msgid "Contrast Setting"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:154
+msgid "Sharpness Factor"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:155
+msgid "Color Control"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:156
+msgid "Olympus Image Width"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:157
+msgid "Olympus Image Height"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:158
+msgid "Scene Detect"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:159
+msgid "Compression Ratio"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:160
+msgid "Preview Image Valid"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:161
+msgid "AF Result"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:162
+msgid "CCD Scan Mode"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:164
+msgid "Infinity Lens Step"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:165
+msgid "Near Lens Step"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:166
+msgid "Light Value Center"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:167
+msgid "Light Value Periphery"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:170
+msgid "Sequential Shot"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:171
+msgid "Wide Range"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:172
+msgid "Color Adjustment Mode"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:174
+msgid "Quick Shot"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:176
+msgid "Voice Memo"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:177
+msgid "Record Shutter Release"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:178
+msgid "Flicker Reduce"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:179
+msgid "Optical Zoom"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:181
+msgid "Light Source Special"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:182
+msgid "Resaved"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:184
+msgid "Scene Select"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:186
+msgid "Sequence Shot Interval"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:189
+msgid "Epson Image Width"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:190
+msgid "Epson Image Height"
+msgstr ""
+
+#: libexif/olympus/mnote-olympus-tag.c:191
+msgid "Epson Software Version"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:80
+#: libexif/pentax/mnote-pentax-entry.c:134
+msgid "Multi-exposure"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:83
+#: libexif/pentax/mnote-pentax-entry.c:137
+msgid "Good"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:84
+#: libexif/pentax/mnote-pentax-entry.c:138
+msgid "Better"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:92
+msgid "Flash on"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:140
+msgid "TIFF"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:150
+msgid "2560x1920 or 2304x1728"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:156
+msgid "2304x1728 or 2592x1944"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:158
+msgid "2816x2212 or 2816x2112"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:171
+msgid "Surf & snow"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:172
+msgid "Sunset or candlelight"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:173
+msgid "Autumn"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:178
+msgid "Self portrait"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:179
+msgid "Illustrations"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:180
+msgid "Digital filter"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:182
+msgid "Food"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:183
+msgid "Green mode"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:184
+msgid "Light pet"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:185
+msgid "Dark pet"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:186
+msgid "Medium pet"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:188
+#: libexif/pentax/mnote-pentax-entry.c:296
+msgid "Candlelight"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:189
+msgid "Natural skin tone"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:190
+msgid "Synchro sound record"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:191
+msgid "Frame composite"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:194
+msgid "Auto, did not fire"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:196
+msgid "Auto, did not fire, red-eye reduction"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:197
+msgid "Auto, fired"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:199
+msgid "Auto, fired, red-eye reduction"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:201
+msgid "On, wireless"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:202
+msgid "On, soft"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:203
+msgid "On, slow-sync"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:204
+msgid "On, slow-sync, red-eye reduction"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:205
+msgid "On, trailing-curtain sync"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:213
+msgid "AF-S"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:214
+msgid "AF-C"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:217
+msgid "Upper-left"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:218
+msgid "Top"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:219
+msgid "Upper-right"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:221
+msgid "Mid-left"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:223
+msgid "Mid-right"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:225
+msgid "Lower-left"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:226
+msgid "Bottom"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:227
+msgid "Lower-right"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:228
+msgid "Fixed center"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:232
+msgid "Multiple"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:234
+msgid "Top-center"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:240
+msgid "Bottom-center"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:257
+msgid "User selected"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:282
+msgid "3008x2008 or 3040x2024"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:293
+msgid "Digital filter?"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-entry.c:374
+#: libexif/pentax/mnote-pentax-entry.c:383
+#, c-format
+msgid "Internal error (unknown value %i %i)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:35 libexif/pentax/mnote-pentax-tag.c:63
+msgid "Capture Mode"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:36 libexif/pentax/mnote-pentax-tag.c:70
+#: libexif/pentax/mnote-pentax-tag.c:129
+msgid "Quality Level"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:54
+msgid "ISO Speed"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:56
+msgid "Colors"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:59
+msgid "PrintIM Settings"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:60 libexif/pentax/mnote-pentax-tag.c:131
+msgid "Time Zone"
+msgstr "时区"
+
+#: libexif/pentax/mnote-pentax-tag.c:61
+msgid "Daylight Savings"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:64
+msgid "Preview Size"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:65
+msgid "Preview Length"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:66 libexif/pentax/mnote-pentax-tag.c:122
+msgid "Preview Start"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:67
+msgid "Model Identification"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:68
+msgid "Date"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:69
+msgid "Time"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:75
+msgid "AF Point Selected"
+msgstr "AF 点选择"
+
+#: libexif/pentax/mnote-pentax-tag.c:76
+msgid "Auto AF Point"
+msgstr "自动 AF 点"
+
+#: libexif/pentax/mnote-pentax-tag.c:77
+msgid "Focus Position"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:80
+msgid "ISO Number"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:83
+msgid "Auto Bracketing"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:85
+msgid "White Balance Mode"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:93
+msgid "World Time Location"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:94
+msgid "Hometown City"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:95
+msgid "Destination City"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:96
+msgid "Hometown DST"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:96
+msgid "Home Daylight Savings Time"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:97
+msgid "Destination DST"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:97
+msgid "Destination Daylight Savings Time"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:99
+msgid "Image Processing"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:100
+msgid "Picture Mode (2)"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:103
+msgid "Image Area Offset"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:104
+msgid "Raw Image Size"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:105
+msgid "Autofocus Points Used"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:107
+msgid "Camera Temperature"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:110
+msgid "Image Tone"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:111
+msgid "Shake Reduction Info"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:112
+msgid "Black Point"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:114
+msgid "AE Info"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:115
+msgid "Lens Info"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:116
+msgid "Flash Info"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:117
+msgid "Camera Info"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:118
+msgid "Battery Info"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:119
+msgid "Hometown City Code"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:120
+msgid "Destination City Code"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:125
+msgid "Object Distance"
+msgstr "目标距离"
+
+#: libexif/pentax/mnote-pentax-tag.c:125
+msgid "Distance of photographed object in millimeters."
+msgstr "距被摄目标毫米数。"
+
+#: libexif/pentax/mnote-pentax-tag.c:126
+msgid "Flash Distance"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:132
+msgid "Bestshot Mode"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:133
+msgid "CCS ISO Sensitivity"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:135
+msgid "Enhancement"
+msgstr ""
+
+#: libexif/pentax/mnote-pentax-tag.c:136
+msgid "Finer"
+msgstr ""
+
+#: test/nls/test-nls.c:20 test/nls/test-nls.c:23 test/nls/test-nls.c:24
+msgid "[DO_NOT_TRANSLATE_THIS_MARKER]"
+msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libidn2.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libidn2.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libidn2.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libidn2.po	2020-07-08 13:53:54.000000000 +0000
@@ -14,106 +14,106 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:21+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:58+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
-#: lib/error.c:56
+#: lib/error.c:53
 msgid "success"
 msgstr ""
 
-#: lib/error.c:60
+#: lib/error.c:54
 msgid "out of memory"
 msgstr ""
 
-#: lib/error.c:64
+#: lib/error.c:55
 msgid "could not determine locale encoding format"
 msgstr ""
 
-#: lib/error.c:68
+#: lib/error.c:56
 msgid "could not convert string to UTF-8"
 msgstr ""
 
-#: lib/error.c:72
+#: lib/error.c:57
 msgid "string encoding error"
 msgstr ""
 
-#: lib/error.c:76
+#: lib/error.c:58
 msgid "string could not be NFC normalized"
 msgstr ""
 
-#: lib/error.c:80
+#: lib/error.c:59
 msgid "string contains invalid punycode data"
 msgstr ""
 
-#: lib/error.c:84
+#: lib/error.c:60
 msgid "punycode encoded data will be too large"
 msgstr ""
 
-#: lib/error.c:88
+#: lib/error.c:61
 msgid "punycode conversion resulted in overflow"
 msgstr ""
 
-#: lib/error.c:92
+#: lib/error.c:62
 msgid "domain name longer than 255 characters"
 msgstr ""
 
-#: lib/error.c:96
+#: lib/error.c:63
 msgid "domain label longer than 63 characters"
 msgstr ""
 
-#: lib/error.c:100
+#: lib/error.c:64
 msgid "input A-label is not valid"
 msgstr ""
 
-#: lib/error.c:104
+#: lib/error.c:65
 msgid "input A-label and U-label does not match"
 msgstr ""
 
-#: lib/error.c:108
+#: lib/error.c:66
 msgid "string is not in Unicode NFC format"
 msgstr ""
 
-#: lib/error.c:112
+#: lib/error.c:67
 msgid "string contains forbidden two hyphens pattern"
 msgstr ""
 
-#: lib/error.c:116
+#: lib/error.c:68
 msgid "string start/ends with forbidden hyphen"
 msgstr ""
 
-#: lib/error.c:120
+#: lib/error.c:69
 msgid "string contains a forbidden leading combining character"
 msgstr ""
 
-#: lib/error.c:124
+#: lib/error.c:70
 msgid "string contains a disallowed character"
 msgstr ""
 
-#: lib/error.c:128
+#: lib/error.c:71
 msgid "string contains a forbidden context-j character"
 msgstr ""
 
-#: lib/error.c:132
+#: lib/error.c:72
 msgid "string contains a context-j character with null rule"
 msgstr ""
 
-#: lib/error.c:136
+#: lib/error.c:73
 msgid "string contains a forbidden context-o character"
 msgstr ""
 
-#: lib/error.c:140
+#: lib/error.c:74
 msgid "string contains a context-o character with null rule"
 msgstr ""
 
-#: lib/error.c:144
+#: lib/error.c:75
 msgid "string contains unassigned code point"
 msgstr ""
 
-#: lib/error.c:148
+#: lib/error.c:76
 msgid "string has forbidden bi-directional properties"
 msgstr ""
 
-#: lib/error.c:152
+#: lib/error.c:81
 msgid "Unknown error"
 msgstr "未知错误"
 
@@ -175,17 +175,17 @@
 "      --quiet              Silent operation\n"
 msgstr ""
 
-#: src/idn2.c:216
+#: src/idn2.c:217
 #, c-format
 msgid "Charset: %s\n"
 msgstr ""
 
-#: src/idn2.c:220
+#: src/idn2.c:221
 msgid ""
 "Type each input string on a line by itself, terminated by a newline "
 "character.\n"
 msgstr "输入时，每个字符串单占一行。\n"
 
-#: src/idn2.c:248
+#: src/idn2.c:252
 msgid "input error"
 msgstr "输入错误"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libidn.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libidn.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libidn.po	2020-01-23 16:52:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libidn.po	2020-07-08 13:54:01.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:02+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:53+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: lib/strerror-idna.c:82 lib/strerror-pr29.c:66 lib/strerror-punycode.c:66
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libstdc++.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libstdc++.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/libstdc++.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/libstdc++.po	2020-07-08 13:54:00.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:19+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:57+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: string_literals.cc:23
 msgid "please"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/Linux-PAM.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/Linux-PAM.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/Linux-PAM.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/Linux-PAM.po	2020-07-08 13:54:02.000000000 +0000
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:05+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:55+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: libpam_misc/misc_conv.c:33
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/lvm2.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/lvm2.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/lvm2.po	2020-01-23 16:51:54.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/lvm2.po	2020-07-08 13:53:54.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:57+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: activate/activate.c:44
 msgid "LVM1 proc global snprintf failed"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/mailman.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/mailman.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/mailman.po	1970-01-01 00:00:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/mailman.po	2020-07-08 13:54:03.000000000 +0000
@@ -0,0 +1,11799 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: mailman\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-01-30 08:13+0000\n"
+"PO-Revision-Date: 2011-02-24 00:27+0000\n"
+"Last-Translator: Dai Xiaoguang <Unknown>\n"
+"Language-Team: <mailman-cn@mail.cs.hit.edu.cn>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:58+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
+"Generated-By: pygettext.py 1.4\n"
+
+#: Mailman/Archiver/HyperArch.py:123
+msgid "size not available"
+msgstr "不被允许的大小"
+
+#: Mailman/Archiver/HyperArch.py:129
+msgid " %(size)i bytes "
+msgstr " %(size)i 字节 "
+
+#: Mailman/Archiver/HyperArch.py:275 Mailman/Archiver/pipermail.py:181
+#: Mailman/Archiver/pipermail.py:182
+msgid "No subject"
+msgstr "无主题"
+
+#: Mailman/Archiver/HyperArch.py:291 Mailman/Archiver/HyperArch.py:294
+#: Mailman/Archiver/HyperArch.py:425 Mailman/Archiver/HyperArch.py:483
+#: Mailman/Archiver/HyperArch.py:592 Mailman/Archiver/HyperArch.py:1066
+#: Mailman/Archiver/HyperArch.py:1195
+msgid " at "
+msgstr " 在 "
+
+#: Mailman/Archiver/HyperArch.py:512
+msgid "Previous message (by thread):"
+msgstr ""
+
+#: Mailman/Archiver/HyperArch.py:534
+msgid "Next message (by thread):"
+msgstr ""
+
+#: Mailman/Archiver/HyperArch.py:707 Mailman/Archiver/HyperArch.py:743
+msgid "thread"
+msgstr "线索"
+
+#: Mailman/Archiver/HyperArch.py:708 Mailman/Archiver/HyperArch.py:744
+msgid "subject"
+msgstr "主题"
+
+#: Mailman/Archiver/HyperArch.py:709 Mailman/Archiver/HyperArch.py:745
+msgid "author"
+msgstr "作者"
+
+#: Mailman/Archiver/HyperArch.py:710 Mailman/Archiver/HyperArch.py:746
+msgid "date"
+msgstr "日期"
+
+#: Mailman/Archiver/HyperArch.py:782
+msgid "<P>Currently, there are no archives. </P>"
+msgstr "<P>目前没有归档文件 </P>"
+
+#: Mailman/Archiver/HyperArch.py:820
+msgid "Gzip'd Text%(sz)s"
+msgstr "Gzip压缩文本大小为 %(sz)s"
+
+#: Mailman/Archiver/HyperArch.py:825
+msgid "Text%(sz)s"
+msgstr "文本大小为 %(sz)s"
+
+#: Mailman/Archiver/HyperArch.py:915
+msgid "figuring article archives\n"
+msgstr "处理文章存档\n"
+
+#: Mailman/Archiver/HyperArch.py:925
+msgid "April"
+msgstr "四月"
+
+#: Mailman/Archiver/HyperArch.py:925
+msgid "February"
+msgstr "二月"
+
+#: Mailman/Archiver/HyperArch.py:925
+msgid "January"
+msgstr "一月"
+
+#: Mailman/Archiver/HyperArch.py:925
+msgid "March"
+msgstr "三月"
+
+#: Mailman/Archiver/HyperArch.py:926
+msgid "August"
+msgstr "八月"
+
+#: Mailman/Archiver/HyperArch.py:926
+msgid "July"
+msgstr "七月"
+
+#: Mailman/Archiver/HyperArch.py:926
+msgid "June"
+msgstr "六月"
+
+#: Mailman/Archiver/HyperArch.py:926 Mailman/i18n.py:137
+msgid "May"
+msgstr "五月"
+
+#: Mailman/Archiver/HyperArch.py:927
+msgid "December"
+msgstr "十二月"
+
+#: Mailman/Archiver/HyperArch.py:927
+msgid "November"
+msgstr "十一月"
+
+#: Mailman/Archiver/HyperArch.py:927
+msgid "October"
+msgstr "十月"
+
+#: Mailman/Archiver/HyperArch.py:927
+msgid "September"
+msgstr "九月"
+
+#: Mailman/Archiver/HyperArch.py:935
+msgid "First"
+msgstr "第一"
+
+#: Mailman/Archiver/HyperArch.py:935
+msgid "Fourth"
+msgstr "第四"
+
+#: Mailman/Archiver/HyperArch.py:935
+msgid "Second"
+msgstr "第二"
+
+#: Mailman/Archiver/HyperArch.py:935
+msgid "Third"
+msgstr "第三"
+
+#: Mailman/Archiver/HyperArch.py:937
+msgid "%(ord)s quarter %(year)i"
+msgstr "%(year)i 的第 %(ord)s 季度"
+
+#: Mailman/Archiver/HyperArch.py:944
+msgid "%(month)s %(year)i"
+msgstr "%(month)s 月 %(year)i 年"
+
+#: Mailman/Archiver/HyperArch.py:949
+msgid "The Week Of Monday %(day)i %(month)s %(year)i"
+msgstr ""
+
+#: Mailman/Archiver/HyperArch.py:953
+msgid "%(day)i %(month)s %(year)i"
+msgstr "%(day)i 日 %(month)s 月 %(year)i 年"
+
+#: Mailman/Archiver/HyperArch.py:1053
+msgid "Computing threaded index\n"
+msgstr "计算索引\n"
+
+#: Mailman/Archiver/HyperArch.py:1318
+msgid "Updating HTML for article %(seq)s"
+msgstr "为文章 %(seq)s 更新HTML"
+
+#: Mailman/Archiver/HyperArch.py:1325
+msgid "article file %(filename)s is missing!"
+msgstr "文章文件 %(filename)s 丢失"
+
+#: Mailman/Archiver/pipermail.py:298
+msgid "Creating archive directory "
+msgstr "创建归档目录 "
+
+#: Mailman/Archiver/pipermail.py:310
+msgid "Reloading pickled archive state"
+msgstr ""
+
+#: Mailman/Archiver/pipermail.py:337
+msgid "Pickling archive state into "
+msgstr ""
+
+#: Mailman/Archiver/pipermail.py:449
+msgid "Updating index files for archive [%(archive)s]"
+msgstr "为归档 [%(archive)s] 更新索引文件"
+
+#: Mailman/Archiver/pipermail.py:482
+msgid "  Thread"
+msgstr "  线索"
+
+#: Mailman/Archiver/pipermail.py:593
+msgid "#%(counter)05d %(msgid)s"
+msgstr ""
+
+#: Mailman/Bouncer.py:45
+msgid "due to excessive bounces"
+msgstr "因为过多的退信"
+
+#: Mailman/Bouncer.py:46
+msgid "by yourself"
+msgstr "(由)您自己"
+
+#: Mailman/Bouncer.py:47
+msgid "by the list administrator"
+msgstr "(由)列表管理员"
+
+#: Mailman/Bouncer.py:48 Mailman/Bouncer.py:293
+#: Mailman/Commands/cmd_set.py:182
+msgid "for unknown reasons"
+msgstr "因为未知原因"
+
+#: Mailman/Bouncer.py:198
+msgid "bounce score incremented"
+msgstr ""
+
+#: Mailman/Bouncer.py:228
+msgid "disabled"
+msgstr "禁止"
+
+#: Mailman/Bouncer.py:245
+msgid "Bounce action notification"
+msgstr "退信行为通告"
+
+#: Mailman/Bouncer.py:300
+msgid " The last bounce received from you was dated %(date)s"
+msgstr " 您最后的退信日期为 %(date)s"
+
+#: Mailman/Bouncer.py:329 Mailman/Deliverer.py:146
+#: Mailman/Handlers/Acknowledge.py:44 Mailman/Handlers/CookHeaders.py:435
+#: Mailman/Handlers/Hold.py:215 Mailman/Handlers/ToDigest.py:251
+#: Mailman/ListAdmin.py:223
+msgid "(no subject)"
+msgstr "(无主题)"
+
+#: Mailman/Bouncer.py:333
+msgid "[No bounce details are available]"
+msgstr "[无退信的细节信息]"
+
+#: Mailman/Cgi/Auth.py:48
+msgid "Moderator"
+msgstr "主持人"
+
+#: Mailman/Cgi/Auth.py:50
+msgid "Administrator"
+msgstr "管理员"
+
+#: Mailman/Cgi/admin.py:80 Mailman/Cgi/admindb.py:121
+#: Mailman/Cgi/confirm.py:62 Mailman/Cgi/edithtml.py:86
+#: Mailman/Cgi/listinfo.py:56 Mailman/Cgi/options.py:98
+#: Mailman/Cgi/private.py:108 Mailman/Cgi/rmlist.py:75
+#: Mailman/Cgi/roster.py:59 Mailman/Cgi/subscribe.py:67
+msgid "No such list <em>%(safelistname)s</em>"
+msgstr "没有类似的列表 <em>%(safelistname)s</em>"
+
+#: Mailman/Cgi/admin.py:95 Mailman/Cgi/admindb.py:136
+#: Mailman/Cgi/confirm.py:80 Mailman/Cgi/create.py:50
+#: Mailman/Cgi/edithtml.py:103 Mailman/Cgi/listinfo.py:68
+#: Mailman/Cgi/options.py:117 Mailman/Cgi/private.py:125
+#: Mailman/Cgi/rmlist.py:48 Mailman/Cgi/roster.py:72 Mailman/Cgi/roster.py:146
+#: Mailman/Cgi/roster.py:147 Mailman/Cgi/subscribe.py:55
+#: Mailman/Cgi/subscribe.py:66 Mailman/Cgi/subscribe.py:81
+msgid "Error"
+msgstr "错误"
+
+#: Mailman/Cgi/admin.py:96 Mailman/Cgi/admindb.py:137
+#: Mailman/Cgi/confirm.py:81 Mailman/Cgi/create.py:51
+#: Mailman/Cgi/edithtml.py:104 Mailman/Cgi/listinfo.py:69
+#: Mailman/Cgi/options.py:81 Mailman/Cgi/options.py:118
+#: Mailman/Cgi/private.py:126 Mailman/Cgi/rmlist.py:49
+#: Mailman/Cgi/roster.py:73 Mailman/Cgi/subscribe.py:82
+msgid "Invalid options to CGI script."
+msgstr "无效的CGI脚本选项"
+
+#: Mailman/Cgi/admin.py:121 Mailman/Cgi/admindb.py:161
+#: Mailman/Cgi/edithtml.py:128 Mailman/Cgi/private.py:144
+msgid "Authorization failed."
+msgstr "认证失败"
+
+#: Mailman/Cgi/admin.py:212 Mailman/Cgi/admindb.py:236
+#: Mailman/Cgi/edithtml.py:170 Mailman/Cgi/options.py:338
+msgid "The form lifetime has expired. (request forgery check)"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:218
+msgid ""
+"You have turned off delivery of both digest and\n"
+"                non-digest messages.  This is an incompatible state of\n"
+"                affairs.  You must turn on either digest delivery or\n"
+"                non-digest delivery or your mailing list will basically be\n"
+"                unusable."
+msgstr ""
+"您关闭了摘要与非摘要信息的发送\n"
+"这是不兼容状态。您必须从两者之中选择其一，\n"
+"不然你的邮件列表基本是无法使用的。"
+
+#: Mailman/Cgi/admin.py:222 Mailman/Cgi/admin.py:230 Mailman/Cgi/admin.py:237
+#: Mailman/Cgi/admin.py:1648 Mailman/Gui/GUIBase.py:208
+msgid "Warning: "
+msgstr "警告： "
+
+#: Mailman/Cgi/admin.py:227
+msgid ""
+"You have digest members, but digests are turned\n"
+"                off. Those people will not receive mail.\n"
+"                Affected member(s) %(dm)r."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:234
+msgid ""
+"You have regular list members but non-digestified mail is\n"
+"                turned off.  They will receive non-digestified mail until "
+"you\n"
+"                fix this problem. Affected member(s) %(rm)r."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:259
+msgid "%(hostname)s mailing lists - Admin Links"
+msgstr "%(hostname)s 的邮件列表 - 管理链接"
+
+#: Mailman/Cgi/admin.py:294 Mailman/Cgi/listinfo.py:122
+msgid "Welcome!"
+msgstr "欢迎！"
+
+#: Mailman/Cgi/admin.py:297 Mailman/Cgi/listinfo.py:125
+msgid "Mailman"
+msgstr "Mailman"
+
+#: Mailman/Cgi/admin.py:301
+msgid ""
+"<p>There currently are no publicly-advertised %(mailmanlink)s\n"
+"            mailing lists on %(hostname)s."
+msgstr ""
+"<p>目前在 %(hostname)s 上无公开的 %(mailmanlink)s\n"
+"          邮件列表。"
+
+#: Mailman/Cgi/admin.py:307
+msgid ""
+"<p>Below is the collection of publicly-advertised\n"
+"            %(mailmanlink)s mailing lists on %(hostname)s.  Click on a list\n"
+"            name to visit the configuration pages for that list."
+msgstr ""
+"<p>下面是 %(hostname)s 上公开的\n"
+"            %(mailmanlink)s 邮件列表。  点击一个列表\n"
+"            名称可以访问此列表的配置页面"
+
+#: Mailman/Cgi/admin.py:314
+msgid "right "
+msgstr "正确 "
+
+#: Mailman/Cgi/admin.py:316
+msgid ""
+"To visit the administrators configuration page for an\n"
+"        unadvertised list, open a URL similar to this one, but with a '/' "
+"and\n"
+"        the %(extra)slist name appended.  If you have the proper authority,\n"
+"        you can also <a href=\"%(creatorurl)s\">create a new mailing "
+"list</a>.\n"
+"\n"
+"        <p>General list information can be found at "
+msgstr ""
+"要访问未公开列表的管理员配置页面\n"
+"        , 打开一个与此相似的链接, 但是附加一个 '/' 和\n"
+"         %(extra)s列表名。  如果您有权限,\n"
+"        你还可以 <a href=\"%(creatorurl)s\">创建一个新的邮件列表</a>.\n"
+"\n"
+"        <p>列表常规信息可在这里找到 "
+
+#: Mailman/Cgi/admin.py:323
+msgid "the mailing list overview page"
+msgstr "邮件列表简介页"
+
+#: Mailman/Cgi/admin.py:325
+msgid "<p>(Send questions and comments to "
+msgstr "<p>(发送问题和评论到 "
+
+#: Mailman/Cgi/admin.py:335 Mailman/Cgi/listinfo.py:157 cron/mailpasswds:216
+msgid "List"
+msgstr "列表"
+
+#: Mailman/Cgi/admin.py:336 Mailman/Cgi/admin.py:604
+#: Mailman/Cgi/listinfo.py:158
+msgid "Description"
+msgstr "描述"
+
+#: Mailman/Cgi/admin.py:342 Mailman/Cgi/listinfo.py:164 bin/list_lists:130
+msgid "[no description available]"
+msgstr "[没有描述]"
+
+#: Mailman/Cgi/admin.py:376
+msgid "No valid variable name found."
+msgstr "找不到有效的变量名。"
+
+#: Mailman/Cgi/admin.py:386
+msgid ""
+"%(realname)s Mailing list Configuration Help\n"
+"    <br><em>%(varname)s</em> Option"
+msgstr ""
+"%(realname)s 邮件列表配置帮助\n"
+"    <br><em>%(varname)s</em> 选项"
+
+#: Mailman/Cgi/admin.py:393
+msgid "Mailman %(varname)s List Option Help"
+msgstr "Mailman %(varname)s 列表选项帮助"
+
+#: Mailman/Cgi/admin.py:411
+msgid ""
+"<em><strong>Warning:</strong> changing this option here\n"
+"    could cause other screens to be out-of-sync.  Be sure to reload any "
+"other\n"
+"    pages that are displaying this option for this mailing list.  You can "
+"also\n"
+"    "
+msgstr ""
+"<em><strong>警告:</strong> 更改此选项\n"
+"   可能引起其他窗口的不同步。确保重新载入邮件列表中所有使用该选项的页。\n"
+"    您也可以\n"
+"    "
+
+#: Mailman/Cgi/admin.py:422
+msgid "return to the %(categoryname)s options page."
+msgstr "返回 %(categoryname)s 选项页面."
+
+#: Mailman/Cgi/admin.py:437
+msgid "%(realname)s Administration (%(label)s)"
+msgstr "%(realname)s 管理员 (%(label)s)"
+
+#: Mailman/Cgi/admin.py:438
+msgid "%(realname)s mailing list administration<br>%(label)s Section"
+msgstr "%(realname)s 邮件列表管理员n<br>%(label)s 部分"
+
+#: Mailman/Cgi/admin.py:455
+msgid "Configuration Categories"
+msgstr "配置目录"
+
+#: Mailman/Cgi/admin.py:456
+msgid "Other Administrative Activities"
+msgstr "其他管理事件"
+
+#: Mailman/Cgi/admin.py:460
+msgid "Tend to pending moderator requests"
+msgstr "处理待裁决请求"
+
+#: Mailman/Cgi/admin.py:462
+msgid "Go to the general list information page"
+msgstr "前往列表常规信息页"
+
+#: Mailman/Cgi/admin.py:464
+msgid "Edit the public HTML pages and text files"
+msgstr "编辑公开的HTML页和文本文件"
+
+#: Mailman/Cgi/admin.py:466
+msgid "Go to list archives"
+msgstr "前往列表归档"
+
+#: Mailman/Cgi/admin.py:472
+msgid "Delete this mailing list"
+msgstr "删除邮件列表"
+
+#: Mailman/Cgi/admin.py:473
+msgid " (requires confirmation)<br>&nbsp;<br>"
+msgstr " (请求确认)<br>&nbsp;<br>"
+
+#: Mailman/Cgi/admin.py:479 Mailman/Cgi/admindb.py:251
+#: Mailman/Cgi/admindb.py:333
+msgid "Logout"
+msgstr "注销"
+
+#: Mailman/Cgi/admin.py:523
+msgid "Emergency moderation of all list traffic is enabled"
+msgstr "所有列表通讯的紧急缓存被设置"
+
+#: Mailman/Cgi/admin.py:534
+msgid ""
+"Make your changes in the following section, then submit them\n"
+"        using the <em>Submit Your Changes</em> button below."
+msgstr ""
+"修改以下部分, 然后用\n"
+"        <em>提交您的修改</em>按钮提交它们。"
+
+#: Mailman/Cgi/admin.py:552
+msgid "Additional Member Tasks"
+msgstr "额外的成员任务"
+
+#: Mailman/Cgi/admin.py:558
+msgid ""
+"<li>Set everyone's moderation bit, including\n"
+"            those members not currently visible"
+msgstr ""
+"<li>设置每位成员的节制位，包括\n"
+"            目前不可见的用户"
+
+#: Mailman/Cgi/admin.py:562
+msgid "Off"
+msgstr "关"
+
+#: Mailman/Cgi/admin.py:562
+msgid "On"
+msgstr "开"
+
+#: Mailman/Cgi/admin.py:564
+msgid "Set"
+msgstr "设置"
+
+#: Mailman/Cgi/admin.py:605
+msgid "Value"
+msgstr "值"
+
+#: Mailman/Cgi/admin.py:659
+msgid ""
+"Badly formed options entry:\n"
+" %(record)s"
+msgstr ""
+"错误形式选项入口:\n"
+" %(record)s"
+
+#: Mailman/Cgi/admin.py:717
+msgid "<em>Enter the text below, or...</em><br>"
+msgstr "<em>输入以下文本, 或者...</em><br>"
+
+#: Mailman/Cgi/admin.py:719
+msgid "<br><em>...specify a file to upload</em><br>"
+msgstr "<br><em>...指定一个上传的文件</em><br>"
+
+#: Mailman/Cgi/admin.py:745 Mailman/Cgi/admin.py:748
+msgid "Topic %(i)d"
+msgstr "主题 %(i)d"
+
+#: Mailman/Cgi/admin.py:749 Mailman/Cgi/admin.py:799
+msgid "Delete"
+msgstr "删除"
+
+#: Mailman/Cgi/admin.py:750
+msgid "Topic name:"
+msgstr "主题名"
+
+#: Mailman/Cgi/admin.py:752
+msgid "Regexp:"
+msgstr "正则表达式"
+
+#: Mailman/Cgi/admin.py:755 Mailman/Cgi/options.py:1139
+msgid "Description:"
+msgstr "描述"
+
+#: Mailman/Cgi/admin.py:759 Mailman/Cgi/admin.py:817
+msgid "Add new item..."
+msgstr "增加新选项"
+
+#: Mailman/Cgi/admin.py:761 Mailman/Cgi/admin.py:819
+msgid "...before this one."
+msgstr "在这个之前"
+
+#: Mailman/Cgi/admin.py:762 Mailman/Cgi/admin.py:820
+msgid "...after this one."
+msgstr "...在这个之后"
+
+#: Mailman/Cgi/admin.py:795 Mailman/Cgi/admin.py:798
+msgid "Spam Filter Rule %(i)d"
+msgstr "垃圾邮件过滤规则 %(i)d"
+
+#: Mailman/Cgi/admin.py:800
+msgid "Spam Filter Regexp:"
+msgstr "垃圾邮件过滤正则表达式"
+
+#: Mailman/Cgi/admin.py:811 Mailman/Cgi/admindb.py:391
+#: Mailman/Cgi/admindb.py:455 Mailman/Cgi/admindb.py:509
+#: Mailman/Cgi/admindb.py:753
+msgid "Defer"
+msgstr "延期"
+
+#: Mailman/Cgi/admin.py:811 Mailman/Cgi/admindb.py:393
+#: Mailman/Cgi/admindb.py:457 Mailman/Cgi/admindb.py:509
+#: Mailman/Cgi/admindb.py:753 Mailman/Gui/ContentFilter.py:37
+#: Mailman/Gui/Privacy.py:265 Mailman/Gui/Privacy.py:288
+#: Mailman/Gui/Privacy.py:459
+msgid "Reject"
+msgstr "拒绝"
+
+#: Mailman/Cgi/admin.py:811 Mailman/Gui/Privacy.py:265
+#: Mailman/Gui/Privacy.py:459
+msgid "Hold"
+msgstr "滞留"
+
+#: Mailman/Cgi/admin.py:812 Mailman/Cgi/admindb.py:394
+#: Mailman/Cgi/admindb.py:458 Mailman/Cgi/admindb.py:509
+#: Mailman/Cgi/admindb.py:753 Mailman/Commands/cmd_confirm.py:93
+#: Mailman/Gui/ContentFilter.py:37 Mailman/Gui/Privacy.py:265
+#: Mailman/Gui/Privacy.py:289 Mailman/Gui/Privacy.py:459
+msgid "Discard"
+msgstr "丢弃"
+
+#: Mailman/Cgi/admin.py:812 Mailman/Cgi/admindb.py:509
+#: Mailman/Gui/Privacy.py:288 Mailman/Gui/Privacy.py:459
+msgid "Accept"
+msgstr "接受"
+
+#: Mailman/Cgi/admin.py:815 Mailman/Cgi/admindb.py:757
+msgid "Action:"
+msgstr "动作"
+
+#: Mailman/Cgi/admin.py:827
+msgid "Move rule up"
+msgstr "上移规则"
+
+#: Mailman/Cgi/admin.py:828
+msgid "Move rule down"
+msgstr "下移规则"
+
+#: Mailman/Cgi/admin.py:861
+msgid "<br>(Edit <b>%(varname)s</b>)"
+msgstr "<br>(编辑 <b>%(varname)s</b>)"
+
+#: Mailman/Cgi/admin.py:863
+msgid "<br>(Details for <b>%(varname)s</b>)"
+msgstr "<br>(<b>%(varname)s</b>的细节)"
+
+#: Mailman/Cgi/admin.py:870
+msgid ""
+"<br><em><strong>Note:</strong>\n"
+"        setting this value performs an immediate action but does not modify\n"
+"        permanent state.</em>"
+msgstr ""
+"<br><em><strong>注释:</strong>\n"
+"        设置此值会在当前环境立刻生效，但此值不会被保存。</em>"
+
+#: Mailman/Cgi/admin.py:884
+msgid "Mass Subscriptions"
+msgstr "批量订阅"
+
+#: Mailman/Cgi/admin.py:891
+msgid "Mass Removals"
+msgstr "批量删除"
+
+#: Mailman/Cgi/admin.py:898
+msgid "Address Change"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:905
+msgid "Membership List"
+msgstr "成员列表"
+
+#: Mailman/Cgi/admin.py:913
+msgid "(help)"
+msgstr "(帮助)"
+
+#: Mailman/Cgi/admin.py:914
+msgid "Find member %(link)s:"
+msgstr "查找 %(link)s 的成员"
+
+#: Mailman/Cgi/admin.py:917
+msgid "Search..."
+msgstr "搜索..."
+
+#: Mailman/Cgi/admin.py:943
+msgid "Bad regular expression: "
+msgstr "错误的正则表达式 "
+
+#: Mailman/Cgi/admin.py:997
+msgid "%(allcnt)s members total, %(membercnt)s shown"
+msgstr "成员总数 %(allcnt)s, 显示了 %(membercnt)s"
+
+#: Mailman/Cgi/admin.py:1000
+msgid "%(allcnt)s members total"
+msgstr "成员总数 %(allcnt)s"
+
+#: Mailman/Cgi/admin.py:1027 Mailman/Cgi/admin.py:1059
+msgid "unsub"
+msgstr "取消订阅"
+
+#: Mailman/Cgi/admin.py:1028
+msgid "member address<br>member name"
+msgstr "成员地址<br>成员姓名"
+
+#: Mailman/Cgi/admin.py:1029 Mailman/Cgi/admin.py:1073
+msgid "mod"
+msgstr "修改"
+
+#: Mailman/Cgi/admin.py:1029 Mailman/Cgi/admin.py:1075
+msgid "hide"
+msgstr "隐藏"
+
+#: Mailman/Cgi/admin.py:1030
+msgid "nomail<br>[reason]"
+msgstr "没有邮件<br>[原因]"
+
+#: Mailman/Cgi/admin.py:1031
+msgid "not metoo"
+msgstr "除了我"
+
+#: Mailman/Cgi/admin.py:1031 Mailman/Cgi/admin.py:1075
+msgid "ack"
+msgstr "承认"
+
+#: Mailman/Cgi/admin.py:1032 Mailman/Cgi/admin.py:1075
+msgid "nodupes"
+msgstr "无副本"
+
+#: Mailman/Cgi/admin.py:1033 Mailman/Cgi/admin.py:1099
+#: Mailman/Cgi/options.py:382
+msgid "digest"
+msgstr "摘要"
+
+#: Mailman/Cgi/admin.py:1033 Mailman/Cgi/admin.py:1114
+msgid "plain"
+msgstr "纯文本"
+
+#: Mailman/Cgi/admin.py:1034
+msgid "language"
+msgstr "语言"
+
+#: Mailman/Cgi/admin.py:1045
+msgid "?"
+msgstr "?"
+
+#: Mailman/Cgi/admin.py:1046
+msgid "U"
+msgstr "U"
+
+#: Mailman/Cgi/admin.py:1047
+msgid "A"
+msgstr "A"
+
+#: Mailman/Cgi/admin.py:1048
+msgid "B"
+msgstr "B"
+
+#: Mailman/Cgi/admin.py:1075
+msgid "notmetoo"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1075 Mailman/Cgi/options.py:380
+msgid "nomail"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1129
+msgid "<b>unsub</b> -- Click on this to unsubscribe the member."
+msgstr "<b>取消订阅</b> -- 点击此处退出成员列表."
+
+#: Mailman/Cgi/admin.py:1131
+msgid ""
+"<b>mod</b> -- The user's personal moderation flag.  If this is\n"
+"        set, postings from them will be moderated, otherwise they will be\n"
+"        approved."
+msgstr ""
+"<b>mod</b> -- 用户的个人节制标志.  如果设置该值,\n"
+"        用户发出的信件将被缓存, 否则将被发送。"
+
+#: Mailman/Cgi/admin.py:1135
+msgid ""
+"<b>hide</b> -- Is the member's address concealed on\n"
+"        the list of subscribers?"
+msgstr "<b>隐藏</b> -- 用户的地址在订阅者列表中是隐藏的吗?"
+
+#: Mailman/Cgi/admin.py:1137
+msgid ""
+"<b>nomail</b> -- Is delivery to the member disabled?  If so, an\n"
+"        abbreviation will be given describing the reason for the disabled\n"
+"        delivery:\n"
+"            <ul><li><b>U</b> -- Delivery was disabled by the user via their\n"
+"                    personal options page.\n"
+"                <li><b>A</b> -- Delivery was disabled by the list\n"
+"                    administrators.\n"
+"                <li><b>B</b> -- Delivery was disabled by the system due to\n"
+"                    excessive bouncing from the member's address.\n"
+"                <li><b>?</b> -- The reason for disabled delivery isn't "
+"known.\n"
+"                    This is the case for all memberships which were "
+"disabled\n"
+"                    in older versions of Mailman.\n"
+"            </ul>"
+msgstr ""
+"<b>没有邮件</b> -- 向用户的投递失效了么?  如果是这样, \n"
+"        将给出一个简短的信息描述投递失效的原因:\n"
+"            <ul><li><b>U</b> -- 用户在个人选项页面中禁止了投递.\n"
+"                <li><b>A</b> -- 列表管理员禁止了投递.\n"
+"                <li><b>B</b> -- 由于该用户地址过多的退信,系统禁止了投递.\n"
+"                <li><b>?</b> -- 投递失效的原因未知.\n"
+"                    在Mailman的早些版本中这是对所有被禁止成员投递信息时出现的情况.\n"
+"            </ul>"
+
+#: Mailman/Cgi/admin.py:1152
+msgid ""
+"<b>ack</b> -- Does the member get acknowledgements of their\n"
+"        posts?"
+msgstr "<b>确认</b> -- 用户收到对他们邮件的确认信了吗?"
+
+#: Mailman/Cgi/admin.py:1155
+msgid ""
+"<b>not metoo</b> -- Does the member want to avoid copies of their\n"
+"        own postings?"
+msgstr "<b>除了我</b> -- 用户是否想避免收到自己信件的副本?"
+
+#: Mailman/Cgi/admin.py:1158
+msgid ""
+"<b>nodupes</b> -- Does the member want to avoid duplicates of the\n"
+"        same message?"
+msgstr "<b>无副本</b> -- 用户是否想避免收到同一信件的副本?"
+
+#: Mailman/Cgi/admin.py:1161
+msgid ""
+"<b>digest</b> -- Does the member get messages in digests?\n"
+"        (otherwise, individual messages)"
+msgstr ""
+"<b>摘要</b> -- 用户是否要以摘要的形式接受信件?\n"
+"        (否则, 单个的信件)"
+
+#: Mailman/Cgi/admin.py:1164
+msgid ""
+"<b>plain</b> -- If getting digests, does the member get plain\n"
+"        text digests?  (otherwise, MIME)"
+msgstr ""
+"<b>纯文本</b> -- 如果接收摘要,是纯文本形式的摘要么?\n"
+"        (否则, 使用多用途的网际邮件扩充协议MIME)"
+
+#: Mailman/Cgi/admin.py:1166
+msgid "<b>language</b> -- Language preferred by the user"
+msgstr "<b>语言</b> -- 用户偏好的语言"
+
+#: Mailman/Cgi/admin.py:1180
+msgid "Click here to hide the legend for this table."
+msgstr "点击这里隐藏图表的图例."
+
+#: Mailman/Cgi/admin.py:1184
+msgid "Click here to include the legend for this table."
+msgstr "点击这里包含图表的图例."
+
+#: Mailman/Cgi/admin.py:1191
+msgid ""
+"<p><em>To view more members, click on the appropriate\n"
+"        range listed below:</em>"
+msgstr ""
+"<p><em>想要查看更多的成员, 点击下面列出来的合适的区间:\n"
+"        </em>"
+
+#: Mailman/Cgi/admin.py:1205
+msgid "from %(start)s to %(end)s"
+msgstr "从 %(start)s 到 %(end)s"
+
+#: Mailman/Cgi/admin.py:1218
+msgid "Subscribe these users now or invite them?"
+msgstr "替这些用户订阅或者邀请他们"
+
+#: Mailman/Cgi/admin.py:1220
+msgid "Invite"
+msgstr "邀请"
+
+#: Mailman/Cgi/admin.py:1220 Mailman/Cgi/listinfo.py:200
+msgid "Subscribe"
+msgstr "订阅"
+
+#: Mailman/Cgi/admin.py:1227
+msgid "Send welcome messages to new subscribers?"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1229 Mailman/Cgi/admin.py:1238
+#: Mailman/Cgi/admin.py:1271 Mailman/Cgi/admin.py:1279
+#: Mailman/Cgi/confirm.py:304 Mailman/Cgi/create.py:364
+#: Mailman/Cgi/create.py:399 Mailman/Cgi/create.py:437
+#: Mailman/Cgi/rmlist.py:241 Mailman/Gui/Archive.py:33
+#: Mailman/Gui/Autoresponse.py:54 Mailman/Gui/Autoresponse.py:62
+#: Mailman/Gui/Autoresponse.py:71 Mailman/Gui/Bounce.py:77
+#: Mailman/Gui/Bounce.py:120 Mailman/Gui/Bounce.py:146
+#: Mailman/Gui/Bounce.py:155 Mailman/Gui/Bounce.py:164
+#: Mailman/Gui/ContentFilter.py:74 Mailman/Gui/ContentFilter.py:116
+#: Mailman/Gui/ContentFilter.py:120 Mailman/Gui/Digest.py:46
+#: Mailman/Gui/Digest.py:62 Mailman/Gui/Digest.py:84 Mailman/Gui/Digest.py:89
+#: Mailman/Gui/General.py:158 Mailman/Gui/General.py:223
+#: Mailman/Gui/General.py:229 Mailman/Gui/General.py:307
+#: Mailman/Gui/General.py:334 Mailman/Gui/General.py:361
+#: Mailman/Gui/General.py:372 Mailman/Gui/General.py:375
+#: Mailman/Gui/General.py:385 Mailman/Gui/General.py:390
+#: Mailman/Gui/General.py:396 Mailman/Gui/General.py:416
+#: Mailman/Gui/General.py:448 Mailman/Gui/General.py:471
+#: Mailman/Gui/General.py:488 Mailman/Gui/NonDigest.py:45
+#: Mailman/Gui/NonDigest.py:53 Mailman/Gui/NonDigest.py:140
+#: Mailman/Gui/NonDigest.py:162 Mailman/Gui/Privacy.py:111
+#: Mailman/Gui/Privacy.py:129 Mailman/Gui/Privacy.py:162
+#: Mailman/Gui/Privacy.py:215 Mailman/Gui/Privacy.py:317
+#: Mailman/Gui/Privacy.py:334 Mailman/Gui/Privacy.py:474
+#: Mailman/Gui/Privacy.py:493 Mailman/Gui/Usenet.py:52
+#: Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
+msgid "No"
+msgstr "不"
+
+#: Mailman/Cgi/admin.py:1229 Mailman/Cgi/admin.py:1238
+#: Mailman/Cgi/admin.py:1271 Mailman/Cgi/admin.py:1279
+#: Mailman/Cgi/confirm.py:304 Mailman/Cgi/create.py:364
+#: Mailman/Cgi/create.py:399 Mailman/Cgi/create.py:437
+#: Mailman/Cgi/rmlist.py:241 Mailman/Gui/Archive.py:33
+#: Mailman/Gui/Autoresponse.py:54 Mailman/Gui/Autoresponse.py:62
+#: Mailman/Gui/Bounce.py:77 Mailman/Gui/Bounce.py:120
+#: Mailman/Gui/Bounce.py:146 Mailman/Gui/Bounce.py:155
+#: Mailman/Gui/Bounce.py:164 Mailman/Gui/ContentFilter.py:74
+#: Mailman/Gui/ContentFilter.py:116 Mailman/Gui/ContentFilter.py:120
+#: Mailman/Gui/Digest.py:46 Mailman/Gui/Digest.py:62 Mailman/Gui/Digest.py:84
+#: Mailman/Gui/Digest.py:89 Mailman/Gui/General.py:223
+#: Mailman/Gui/General.py:229 Mailman/Gui/General.py:307
+#: Mailman/Gui/General.py:334 Mailman/Gui/General.py:361
+#: Mailman/Gui/General.py:372 Mailman/Gui/General.py:375
+#: Mailman/Gui/General.py:385 Mailman/Gui/General.py:390
+#: Mailman/Gui/General.py:396 Mailman/Gui/General.py:416
+#: Mailman/Gui/General.py:448 Mailman/Gui/General.py:471
+#: Mailman/Gui/General.py:488 Mailman/Gui/NonDigest.py:45
+#: Mailman/Gui/NonDigest.py:53 Mailman/Gui/NonDigest.py:140
+#: Mailman/Gui/NonDigest.py:162 Mailman/Gui/Privacy.py:111
+#: Mailman/Gui/Privacy.py:129 Mailman/Gui/Privacy.py:162
+#: Mailman/Gui/Privacy.py:215 Mailman/Gui/Privacy.py:317
+#: Mailman/Gui/Privacy.py:334 Mailman/Gui/Privacy.py:474
+#: Mailman/Gui/Privacy.py:493 Mailman/Gui/Usenet.py:52
+#: Mailman/Gui/Usenet.py:56 Mailman/Gui/Usenet.py:93 Mailman/Gui/Usenet.py:105
+msgid "Yes"
+msgstr "是"
+
+#: Mailman/Cgi/admin.py:1236
+msgid "Send notifications of new subscriptions to the list owner?"
+msgstr "向列表管理员发送出现新订阅的通知?"
+
+#: Mailman/Cgi/admin.py:1244 Mailman/Cgi/admin.py:1285
+msgid "Enter one address per line below..."
+msgstr "在下面的每一行填写地址..."
+
+#: Mailman/Cgi/admin.py:1249 Mailman/Cgi/admin.py:1290
+msgid "...or specify a file to upload:"
+msgstr "...指定一个上传的文件:"
+
+#: Mailman/Cgi/admin.py:1254
+msgid ""
+"Below, enter additional text to be added to the\n"
+"    top of your invitation or the subscription notification.  Include at "
+"least\n"
+"    one blank line at the end..."
+msgstr ""
+"下面, 在您的邀请或者订阅通知的头部中添加附加文字.\n"
+"    结尾至少包含一个空白行..."
+
+#: Mailman/Cgi/admin.py:1269
+msgid "Send unsubscription acknowledgement to the user?"
+msgstr "向用户发送取消订阅的确认"
+
+#: Mailman/Cgi/admin.py:1277
+msgid "Send notifications to the list owner?"
+msgstr "向列表拥有者发送通知"
+
+#: Mailman/Cgi/admin.py:1300
+msgid ""
+"To change a list member's address, enter the\n"
+"    member's current and new addresses below. Use the check boxes to send\n"
+"    notice of the change to the old and/or new address(es)."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1305
+msgid "Member's current address"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1309 Mailman/Cgi/admin.py:1319
+msgid "Send notice"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1315
+msgid "Address to change to"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1331
+msgid "Change list ownership passwords"
+msgstr "更改列表拥有者的密码"
+
+#: Mailman/Cgi/admin.py:1334
+msgid ""
+"The <em>list administrators</em> are the people who have ultimate control "
+"over\n"
+"all parameters of this mailing list.  They are able to change any list\n"
+"configuration variable available through these administration web pages.\n"
+"\n"
+"<p>The <em>list moderators</em> have more limited permissions; they are not\n"
+"able to change any list configuration variable, but they are allowed to "
+"tend\n"
+"to pending administration requests, including approving or rejecting held\n"
+"subscription requests, and disposing of held postings.  Of course, the\n"
+"<em>list administrators</em> can also tend to pending requests.\n"
+"\n"
+"<p>In order to split the list ownership duties into administrators and\n"
+"moderators, you must set a separate moderator password in the fields below,\n"
+"and also provide the email addresses of the list moderators in the\n"
+"<a href=\"%(adminurl)s/general\">general options section</a>."
+msgstr ""
+"<em>列表管理员</em>拥有所有邮件列表参数的最终控制权.\n"
+"他们可以更改在管理员页面上列出的所有配置变量.\n"
+"\n"
+"<p><em>列表主持者</em> 有受限的权限; \n"
+"他们不能改变任何列表的参数, 但是他们可以挂起管理请求.\n"
+"包括批准或者拒绝滞留订阅请求,清理滞留邮件.当然\n"
+"<em>l列表管理员</em> 也可以挂起请求.\n"
+"\n"
+"<p>为了在列表管理员和列表主持者之间分配管理员职责\n"
+"您必须在下面的域中设置单独的列表主持者密码,\n"
+"并在<a href=\"%(adminurl)s/general\">常规选项部分</a>中提供列表主持者的邮件地址."
+
+#: Mailman/Cgi/admin.py:1353
+msgid "Enter new administrator password:"
+msgstr "输入新的管理员密码:"
+
+#: Mailman/Cgi/admin.py:1355
+msgid "Confirm administrator password:"
+msgstr "确认管理员密码:"
+
+#: Mailman/Cgi/admin.py:1360
+msgid "Enter new moderator password:"
+msgstr "输入新的列表主持者密码:"
+
+#: Mailman/Cgi/admin.py:1362
+msgid "Confirm moderator password:"
+msgstr "确认主持者密码:"
+
+#: Mailman/Cgi/admin.py:1366
+msgid ""
+"In addition to the above passwords you may specify a password for\n"
+"pre-approving posts to the list. Either of the above two passwords can\n"
+"be used in an Approved: header or first body line pseudo-header to\n"
+"pre-approve a post that would otherwise be held for moderation. In\n"
+"addition, the password below, if set, can be used for that purpose and\n"
+"no other."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1377
+msgid "Enter new poster password:"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1379
+msgid "Confirm poster password:"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1388
+msgid "Submit Your Changes"
+msgstr "提交您的修改"
+
+#: Mailman/Cgi/admin.py:1411
+msgid "Moderator passwords did not match"
+msgstr "主持者密码不匹配"
+
+#: Mailman/Cgi/admin.py:1422
+msgid "Poster passwords did not match"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1432
+msgid "Administrator passwords did not match"
+msgstr "管理员密码不匹配"
+
+#: Mailman/Cgi/admin.py:1482
+msgid "Already a member"
+msgstr "已经是成员了"
+
+#: Mailman/Cgi/admin.py:1485
+msgid "&lt;blank line&gt;"
+msgstr "&lt;空行&gt;"
+
+#: Mailman/Cgi/admin.py:1486 Mailman/Cgi/admin.py:1489
+#: Mailman/Cgi/admindb.py:970
+msgid "Bad/Invalid email address"
+msgstr "错误/无效的邮件地址"
+
+#: Mailman/Cgi/admin.py:1492
+msgid "Hostile address (illegal characters)"
+msgstr "不合法的地址(含有非法的字符)"
+
+#: Mailman/Cgi/admin.py:1495 bin/add_members:150 bin/clone_member:136
+#: bin/sync_members:268
+msgid "Banned address (matched %(pattern)s)"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1501
+msgid "Successfully invited:"
+msgstr "成功邀请:"
+
+#: Mailman/Cgi/admin.py:1503
+msgid "Successfully subscribed:"
+msgstr "成功订阅:"
+
+#: Mailman/Cgi/admin.py:1508
+msgid "Error inviting:"
+msgstr "错误邀请:"
+
+#: Mailman/Cgi/admin.py:1510
+msgid "Error subscribing:"
+msgstr "错误订阅:"
+
+#: Mailman/Cgi/admin.py:1541
+msgid "Successfully Unsubscribed:"
+msgstr "成功取消订阅:"
+
+#: Mailman/Cgi/admin.py:1546
+msgid "Cannot unsubscribe non-members:"
+msgstr "不能取消非成员的订阅:"
+
+#: Mailman/Cgi/admin.py:1559
+msgid "You must provide both current and new addresses."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1561
+msgid "Current and new addresses must be different."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1565
+msgid "%(schange_to)s is already a list member."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1570
+msgid "%(schange_to)s is not a valid email address."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1578
+msgid "%(schange_from)s is not a member"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1580
+msgid "%(schange_to)s is already a member"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1583
+msgid "%(schange_to)s matches banned pattern %(spat)s"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1585
+msgid "Address %(schange_from)s changed to %(schange_to)s"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1592
+msgid ""
+"The member address %(change_from)s on the\n"
+"%(list_name)s list has been changed to %(change_to)s.\n"
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1595
+msgid "%(list_name)s address change notice."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1606
+msgid "Notification sent to %(schange_from)s."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1616
+msgid "Notification sent to %(schange_to)s."
+msgstr ""
+
+#: Mailman/Cgi/admin.py:1622
+msgid "Bad moderation flag value"
+msgstr "错误的节制标记变量"
+
+#: Mailman/Cgi/admin.py:1644
+msgid "Not subscribed"
+msgstr "没有订阅"
+
+#: Mailman/Cgi/admin.py:1647
+msgid "Ignoring changes to deleted member: %(user)s"
+msgstr "忽略对已删除用户的更改: %(user)s"
+
+#: Mailman/Cgi/admin.py:1687
+msgid "Successfully Removed:"
+msgstr "成功删除:"
+
+#: Mailman/Cgi/admin.py:1691
+msgid "Error Unsubscribing:"
+msgstr "错误取消订阅:"
+
+#: Mailman/Cgi/admindb.py:228 Mailman/Cgi/admindb.py:241
+msgid "%(realname)s Administrative Database"
+msgstr "%(realname)s 管理数据库"
+
+#: Mailman/Cgi/admindb.py:231
+msgid "%(realname)s Administrative Database Results"
+msgstr "%(realname)s 管理数据库结果"
+
+#: Mailman/Cgi/admindb.py:244
+msgid "There are no pending requests."
+msgstr "没有挂起的请求."
+
+#: Mailman/Cgi/admindb.py:247
+msgid "Click here to reload this page."
+msgstr "点击此处以重新加载页面."
+
+#: Mailman/Cgi/admindb.py:262
+msgid "Detailed instructions for the administrative database"
+msgstr "详细的管理数据库的指南"
+
+#: Mailman/Cgi/admindb.py:266
+msgid "Administrative requests for mailing list:"
+msgstr "对邮件列表的管理请求"
+
+#: Mailman/Cgi/admindb.py:269 Mailman/Cgi/admindb.py:329
+msgid "Submit All Data"
+msgstr "提交所有的数据"
+
+#: Mailman/Cgi/admindb.py:276 Mailman/Cgi/admindb.py:326
+msgid "Discard all messages marked <em>Defer</em>"
+msgstr "丢弃所有标记有 <em>推迟</em>的信息"
+
+#: Mailman/Cgi/admindb.py:291
+msgid "all of %(esender)s's held messages."
+msgstr "所有的 %(esender)s's 滞留信息."
+
+#: Mailman/Cgi/admindb.py:296
+msgid "a single held message."
+msgstr "仅一个滞留信息."
+
+#: Mailman/Cgi/admindb.py:301
+msgid "all held messages."
+msgstr "全部滞留信息."
+
+#: Mailman/Cgi/admindb.py:349
+msgid "Mailman Administrative Database Error"
+msgstr "Mailman 管理数据库 错误"
+
+#: Mailman/Cgi/admindb.py:354
+msgid "list of available mailing lists."
+msgstr "可用的邮件列表的清单"
+
+#: Mailman/Cgi/admindb.py:355
+msgid "You must specify a list name.  Here is the %(link)s"
+msgstr "您必须给出一个列表名称.  这里是 %(link)s"
+
+#: Mailman/Cgi/admindb.py:368
+msgid "Subscription Requests"
+msgstr "订阅请求"
+
+#: Mailman/Cgi/admindb.py:370
+msgid "Address/name/time"
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:371 Mailman/Cgi/admindb.py:428
+msgid "Your decision"
+msgstr "您的决定"
+
+#: Mailman/Cgi/admindb.py:372 Mailman/Cgi/admindb.py:429
+msgid "Reason for refusal"
+msgstr "拒绝的原因"
+
+#: Mailman/Cgi/admindb.py:392 Mailman/Cgi/admindb.py:456
+#: Mailman/Cgi/admindb.py:753 Mailman/Commands/cmd_confirm.py:90
+msgid "Approve"
+msgstr "批准"
+
+#: Mailman/Cgi/admindb.py:403
+msgid "Permanently ban from this list"
+msgstr "永久拒绝这个列表"
+
+#: Mailman/Cgi/admindb.py:427
+msgid "User address/name"
+msgstr "用户 地址/姓名"
+
+#: Mailman/Cgi/admindb.py:468
+msgid "Unsubscription Requests"
+msgstr "取消订阅的请求"
+
+#: Mailman/Cgi/admindb.py:480
+msgid "Held Messages"
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:483
+msgid "Show this list grouped/sorted by"
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:486
+msgid "sender/sender"
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:486
+msgid "sender/time"
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:486
+msgid "ungrouped/time"
+msgstr ""
+
+#: Mailman/Cgi/admindb.py:502 Mailman/Cgi/admindb.py:740
+msgid "From:"
+msgstr "来自:"
+
+#: Mailman/Cgi/admindb.py:505
+msgid "Action to take on all these held messages:"
+msgstr "对所有这些滞留的信息的动作:"
+
+#: Mailman/Cgi/admindb.py:518
+msgid "Preserve messages for the site administrator"
+msgstr "为站点管理员保存信息"
+
+#: Mailman/Cgi/admindb.py:526
+msgid "Forward messages (individually) to:"
+msgstr "发送信息(分别)给:"
+
+#: Mailman/Cgi/admindb.py:546
+msgid "Clear this member's <em>moderate</em> flag"
+msgstr "清除这个用户的 <em>节制</em> 标记"
+
+#: Mailman/Cgi/admindb.py:551
+msgid "<em>The sender is now a member of this list</em>"
+msgstr "<em>这个发送者现在是这个列表的成员了</em>"
+
+#: Mailman/Cgi/admindb.py:561
+msgid "Add <b>%(esender)s</b> to one of these sender filters:"
+msgstr "把<b>%(esender)s</b> 加到这些发送过滤器中:"
+
+#: Mailman/Cgi/admindb.py:567
+msgid "Accepts"
+msgstr "接受"
+
+#: Mailman/Cgi/admindb.py:567
+msgid "Discards"
+msgstr "放弃"
+
+#: Mailman/Cgi/admindb.py:567
+msgid "Holds"
+msgstr "滞留"
+
+#: Mailman/Cgi/admindb.py:567
+msgid "Rejects"
+msgstr "拒绝"
+
+#: Mailman/Cgi/admindb.py:577
+msgid ""
+"Ban <b>%(esender)s</b> from ever subscribing to this\n"
+"                    mailing list"
+msgstr "禁止 <b>%(esender)s</b> 订阅这个列表"
+
+#: Mailman/Cgi/admindb.py:582
+msgid ""
+"Click on the message number to view the individual\n"
+"            message, or you can "
+msgstr "点击信息序号来查看分别的信息，或者您可以 "
+
+#: Mailman/Cgi/admindb.py:584
+msgid "view all messages from %(esender)s"
+msgstr "查看来自 %(esender)s 所有的信息"
+
+#: Mailman/Cgi/admindb.py:606 Mailman/Cgi/admindb.py:743
+msgid "Subject:"
+msgstr "主题:"
+
+#: Mailman/Cgi/admindb.py:609
+msgid " bytes"
+msgstr " 字节"
+
+#: Mailman/Cgi/admindb.py:609
+msgid "Size:"
+msgstr "大小:"
+
+#: Mailman/Cgi/admindb.py:613 Mailman/Handlers/Scrubber.py:203
+#: Mailman/Handlers/Scrubber.py:301 Mailman/Handlers/Scrubber.py:303
+msgid "not available"
+msgstr "不可用"
+
+#: Mailman/Cgi/admindb.py:614 Mailman/Cgi/admindb.py:746
+msgid "Reason:"
+msgstr "原因:"
+
+#: Mailman/Cgi/admindb.py:618 Mailman/Cgi/admindb.py:750
+msgid "Received:"
+msgstr "接收:"
+
+#: Mailman/Cgi/admindb.py:674
+msgid "Posting Held for Approval"
+msgstr "待批准邮件"
+
+#: Mailman/Cgi/admindb.py:676
+msgid " (%(count)d of %(total)d)"
+msgstr " ( %(total)d 的 %(count)d"
+
+#: Mailman/Cgi/admindb.py:687
+msgid "<em>Message with id #%(id)d was lost."
+msgstr "<em>ID号为 #%(id)d 的消息丢失了."
+
+#: Mailman/Cgi/admindb.py:696
+msgid "<em>Message with id #%(id)d is corrupted."
+msgstr "<em>ID号为 #%(id)d 的消息损坏了."
+
+#: Mailman/Cgi/admindb.py:762
+msgid "Preserve message for site administrator"
+msgstr "为站点管理员保留信息"
+
+#: Mailman/Cgi/admindb.py:768
+msgid "Additionally, forward this message to: "
+msgstr "另外，发送这条消息给: "
+
+#: Mailman/Cgi/admindb.py:773 Mailman/Cgi/admindb.py:842
+#: Mailman/Cgi/admindb.py:919 Mailman/Cgi/admindb.py:921
+msgid "[No explanation given]"
+msgstr "[没有给出原因]"
+
+#: Mailman/Cgi/admindb.py:775
+msgid "If you reject this post,<br>please explain (optional):"
+msgstr "如果您拒绝了这个邮件,<br>请给出原因 (可选l):"
+
+#: Mailman/Cgi/admindb.py:781
+msgid "Message Headers:"
+msgstr "消息头部:"
+
+#: Mailman/Cgi/admindb.py:786
+msgid "Message Excerpt:"
+msgstr "消息摘要:"
+
+#: Mailman/Cgi/admindb.py:958
+msgid "Database Updated..."
+msgstr "数据库升级中..."
+
+#: Mailman/Cgi/admindb.py:962
+msgid " is already a member"
+msgstr " 已经是成员了"
+
+#: Mailman/Cgi/admindb.py:966
+msgid "%(addr)s is banned (matched: %(patt)s)"
+msgstr ""
+
+#: Mailman/Cgi/confirm.py:88
+msgid "Confirmation string was empty."
+msgstr "验证字符串为空."
+
+#: Mailman/Cgi/confirm.py:108
+msgid ""
+"<b>Invalid confirmation string:</b>\n"
+"    %(safecookie)s.\n"
+"\n"
+"    <p>Note that confirmation strings expire approximately\n"
+"    %(days)s days after the initial request.  They also expire if the\n"
+"    request has already been handled in some way.  If your confirmation\n"
+"    has expired, please try to re-submit your request.\n"
+"    Otherwise, <a href=\"%(confirmurl)s\">re-enter</a> your confirmation\n"
+"    string."
+msgstr ""
+
+#: Mailman/Cgi/confirm.py:142
+msgid ""
+"The address requesting unsubscription is not\n"
+"                a member of the mailing list.  Perhaps you have already "
+"been\n"
+"                unsubscribed, e.g. by the list administrator?"
+msgstr ""
+"要求取消订阅的地址不是邮件列表中的成员.\n"
+"                可能您已经取消了订阅,比如说被邮件列表的管理员取消?"
+
+#: Mailman/Cgi/confirm.py:158
+msgid ""
+"The address requesting to be changed has\n"
+"                    been subsequently unsubscribed.  This request has been\n"
+"                    cancelled."
+msgstr ""
+"要求更改的地址后来取消了订阅.\n"
+"                    这次请求被撤销了."
+
+#: Mailman/Cgi/confirm.py:178
+msgid "System error, bad content: %(content)s"
+msgstr "系统错误, 错误的内容: %(content)s"
+
+#: Mailman/Cgi/confirm.py:188
+msgid "Bad confirmation string"
+msgstr "错误的验证字符串"
+
+#: Mailman/Cgi/confirm.py:207
+msgid "Enter confirmation cookie"
+msgstr "输入验证cookie"
+
+#: Mailman/Cgi/confirm.py:220
+msgid ""
+"Please enter the confirmation string\n"
+"    (i.e. <em>cookie</em>) that you received in your email message, in the "
+"box\n"
+"    below.  Then hit the <em>Submit</em> button to proceed to the next\n"
+"    confirmation step."
+msgstr ""
+"请输入您的验证字符串\n"
+"    (也就是说在下面的方框中您以邮件信息的方式收到的<em>cookie</em>) \n"
+"    然后点击 <em>提交</em> 按钮，以进行下一步的验证."
+
+#: Mailman/Cgi/confirm.py:225
+msgid "Confirmation string:"
+msgstr "验证字符串:"
+
+#: Mailman/Cgi/confirm.py:227
+msgid "Submit"
+msgstr "提交"
+
+#: Mailman/Cgi/confirm.py:244
+msgid "Confirm subscription request"
+msgstr "确认订阅请求"
+
+#: Mailman/Cgi/confirm.py:259
+msgid ""
+"Your confirmation is required in order to complete the\n"
+"    subscription request to the mailing list <em>%(listname)s</em>.  Your\n"
+"    subscription settings are shown below; make any necessary changes and "
+"hit\n"
+"    <em>Subscribe</em> to complete the confirmation process.  Once you've\n"
+"    confirmed your subscription request, you will be shown your account\n"
+"    options page which you can use to further customize your membership\n"
+"    options.\n"
+"\n"
+"    <p>Note: your password will be emailed to you once your subscription is\n"
+"    confirmed.  You can change it by visiting your personal options page.\n"
+"\n"
+"    <p>Or hit <em>Cancel my subscription request</em> if you no longer want "
+"to\n"
+"    subscribe to this list."
+msgstr ""
+"为了完成对邮件列表<em>%(listname)s</em>的订阅请求,您必须完成验证.您的订阅设置如下;\n"
+"    可以做任何任何必要的修改,然后点击<em>订阅</em>完成验证.\n"
+"    一旦您完成了订阅请求的验证,您将看到您的帐户的选项页,您可以通过它进一步\n"
+"    定制您的成员选项.\n"
+"\n"
+"    <p>注意: 如果您的订阅完成了验证,您的密码会发送到您的邮箱里.您可以\n"
+"    通过访问您的个人选项页修改它.\n"
+"\n"
+"    <p>或者,如果您不想订阅这个列表，可以点击<em>取消我的订阅请求</em>"
+
+#: Mailman/Cgi/confirm.py:275
+msgid ""
+"Your confirmation is required in order to continue with\n"
+"        the subscription request to the mailing list <em>%(listname)s</em>.\n"
+"        Your subscription settings are shown below; make any necessary "
+"changes\n"
+"        and hit <em>Subscribe to list ...</em> to complete the confirmation\n"
+"        process.  Once you've confirmed your subscription request, the\n"
+"        moderator must approve or reject your membership request.  You will\n"
+"        receive notice of their decision.\n"
+"\n"
+"        <p>Note: your password will be emailed to you once your "
+"subscription\n"
+"        is confirmed.  You can change it by visiting your personal options\n"
+"        page.\n"
+"\n"
+"        <p>Or, if you've changed your mind and do not want to subscribe to\n"
+"        this mailing list, you can hit <em>Cancel my subscription\n"
+"        request</em>."
+msgstr ""
+"为了继续对邮件列表<em>%(listname)s</em>的订阅请求,您必须完成验证.您的订阅设置如下;\n"
+"    你可以做任何必要的修改,然后点击<em>订阅这个列表...</em>完成验证.\n"
+"    一旦您完成了订阅请求的验证,列表主持者会批准或者拒绝您的成员请求,您将收到他(们)\n"
+"    决定结果。\n"
+"\n"
+"    <p>注意: 如果您的订阅完成了验证,您的密码会发送到您的邮箱里.您可以\n"
+"    通过访问您的个人选项页修改它.\n"
+"\n"
+"        <p>或者,如果您改变了主意，不想订阅这个邮件列表,\n"
+"        您可以点击 <em>取消我的订阅请求</em>."
+
+#: Mailman/Cgi/confirm.py:293
+msgid "Your email address:"
+msgstr "您的邮件地址:"
+
+#: Mailman/Cgi/confirm.py:294
+msgid "Your real name:"
+msgstr "您的真实姓名:"
+
+#: Mailman/Cgi/confirm.py:303
+msgid "Receive digests?"
+msgstr "接收文摘吗?"
+
+#: Mailman/Cgi/confirm.py:312
+msgid "Preferred language:"
+msgstr "喜欢的语言"
+
+#: Mailman/Cgi/confirm.py:317
+msgid "Subscribe to list %(listname)s"
+msgstr "订阅邮件列表 %(listname)s"
+
+#: Mailman/Cgi/confirm.py:318
+msgid "Cancel my subscription request"
+msgstr "取消我的订阅请求"
+
+#: Mailman/Cgi/confirm.py:335
+msgid "You have canceled your subscription request."
+msgstr "您已经取消了您的订阅请求."
+
+#: Mailman/Cgi/confirm.py:373
+msgid "Awaiting moderator approval"
+msgstr "等待列表主持者的批准"
+
+#: Mailman/Cgi/confirm.py:376
+msgid ""
+"            You have successfully confirmed your subscription request to "
+"the\n"
+"            mailing list %(listname)s, however final approval is required "
+"from\n"
+"            the list moderator before you will be subscribed.  Your request\n"
+"            has been forwarded to the list moderator, and you will be "
+"notified\n"
+"            of the moderator's decision."
+msgstr ""
+"            您已经成功地确认了%(listname)s 你的订阅请求,\n"
+"            但是在您能收到订阅之前,还需要列表主持者的最终批准.\n"
+"            您的请求已经发给列表主持者了, 您将收到列表主持者的决定的通知."
+
+#: Mailman/Cgi/confirm.py:383 Mailman/Cgi/confirm.py:448
+#: Mailman/Cgi/confirm.py:537 Mailman/Cgi/confirm.py:774
+msgid ""
+"Invalid confirmation string.  It is\n"
+"            possible that you are attempting to confirm a request for an\n"
+"            address that has already been unsubscribed."
+msgstr ""
+"无效的验证字符串.  \n"
+"            可能你在尝试为已经取消订阅的地址确认请求."
+
+#: Mailman/Cgi/confirm.py:387
+msgid "You are already a member of this mailing list!"
+msgstr "您已经是这个邮件列表的成员了!"
+
+#: Mailman/Cgi/confirm.py:390
+msgid ""
+"You are currently banned from subscribing to\n"
+"            this list.  If you think this restriction is erroneous, please\n"
+"            contact the list owners at %(owneraddr)s."
+msgstr ""
+
+#: Mailman/Cgi/confirm.py:394
+msgid ""
+"            You were not invited to this mailing list.  The invitation has\n"
+"            been discarded, and both list administrators have been\n"
+"            alerted."
+msgstr ""
+"            这个邮件列表还没有邀请您.  \n"
+"            邀请函已经被丢弃, 而且列表管理员已经收到了警告."
+
+#: Mailman/Cgi/confirm.py:404
+msgid "Subscription request confirmed"
+msgstr "订阅请求已经确认"
+
+#: Mailman/Cgi/confirm.py:408
+msgid ""
+"            You have successfully confirmed your subscription request for\n"
+"            \"%(addr)s\" to the %(listname)s mailing list.  A separate\n"
+"            confirmation message will be sent to your email address, along\n"
+"            with your password, and other useful information and links.\n"
+"\n"
+"            <p>You can now\n"
+"            <a href=\"%(optionsurl)s\">proceed to your membership login\n"
+"            page</a>."
+msgstr ""
+"            您已经成功地确认对邮件列表 %(listname)s 发出订阅请求的地址\n"
+"            \"%(addr)s\" .  一个单独的验证信息将发送到您的电子邮箱里,\n"
+"            同时还有您的密码和其他一些有用的信息和链接.\n"
+"\n"
+"            <p>现在,您就可以\n"
+"            <a href=\"%(optionsurl)s\">进入您的成员登陆页面</a>."
+
+#: Mailman/Cgi/confirm.py:426
+msgid "You have canceled your unsubscription request."
+msgstr "您已经撤消了您取消订阅的请求."
+
+#: Mailman/Cgi/confirm.py:454
+msgid "Unsubscription request confirmed"
+msgstr "取消订阅通过了验证"
+
+#: Mailman/Cgi/confirm.py:458
+msgid ""
+"            You have successfully unsubscribed from the %(listname)s "
+"mailing\n"
+"            list.  You can now <a href=\"%(listinfourl)s\">visit the list's "
+"main\n"
+"            information page</a>."
+msgstr ""
+"            您已经成功地取消了对邮件列表 %(listname)s 的订阅.\n"
+"           现在您就可以 <a href=\"%(listinfourl)s\">访问列表的主要信息页面</a>."
+
+#: Mailman/Cgi/confirm.py:469
+msgid "Confirm unsubscription request"
+msgstr "确认取消订阅请求"
+
+#: Mailman/Cgi/confirm.py:484 Mailman/Cgi/confirm.py:586
+msgid "<em>Not available</em>"
+msgstr "<em>不可用</em>"
+
+#: Mailman/Cgi/confirm.py:487
+msgid ""
+"Your confirmation is required in order to complete the\n"
+"    unsubscription request from the mailing list <em>%(listname)s</em>.  "
+"You\n"
+"    are currently subscribed with\n"
+"\n"
+"    <ul><li><b>Real name:</b> %(fullname)s\n"
+"        <li><b>Email address:</b> %(addr)s\n"
+"    </ul>\n"
+"\n"
+"    Hit the <em>Unsubscribe</em> button below to complete the confirmation\n"
+"    process.\n"
+"\n"
+"    <p>Or hit <em>Cancel and discard</em> to cancel this unsubscription\n"
+"    request."
+msgstr ""
+"为了完成对 <em>%(listname)s</em> 的取消订阅请求,您必须确认.\n"
+"    当前,您订阅的身份是:\n"
+"\n"
+"    <ul><li><b>真实姓名:</b> %(fullname)s\n"
+"        <li><b>邮件地址:</b> %(addr)s\n"
+"    </ul>\n"
+"\n"
+"    点击下面的 <em>取消订阅</em> 按钮，来完成确认.\n"
+"\n"
+"    <p>或者点击 <em>取消并且删除</em> 来撤销您的取消订阅请求."
+
+#: Mailman/Cgi/confirm.py:503 Mailman/Cgi/options.py:849
+#: Mailman/Cgi/options.py:996 Mailman/Cgi/options.py:1006
+msgid "Unsubscribe"
+msgstr "取消订阅"
+
+#: Mailman/Cgi/confirm.py:504 Mailman/Cgi/confirm.py:615
+msgid "Cancel and discard"
+msgstr "取消并且删除"
+
+#: Mailman/Cgi/confirm.py:514
+msgid "You have canceled your change of address request."
+msgstr "您已经取消了对地址请求的修改."
+
+#: Mailman/Cgi/confirm.py:543
+msgid ""
+"%(newaddr)s is banned from subscribing to the\n"
+"            %(realname)s list.  If you think this restriction is erroneous,\n"
+"            please contact the list owners at %(owneraddr)s."
+msgstr ""
+
+#: Mailman/Cgi/confirm.py:548
+msgid ""
+"%(newaddr)s is already a member of\n"
+"            the %(realname)s list.  It is possible that you are attempting\n"
+"            to confirm a request for an address that has already been\n"
+"            subscribed."
+msgstr ""
+
+#: Mailman/Cgi/confirm.py:555
+msgid "Change of address request confirmed"
+msgstr "对地址请求的修改已经确认"
+
+#: Mailman/Cgi/confirm.py:559
+msgid ""
+"            You have successfully changed your address on the %(listname)s\n"
+"            mailing list from <b>%(oldaddr)s</b> to <b>%(newaddr)s</b>.  "
+"You\n"
+"            can now <a href=\"%(optionsurl)s\">proceed to your membership\n"
+"            login page</a>."
+msgstr ""
+"            在邮件列表 %(listname)s 中,您已经成功地将邮件地址从\n"
+"            <b>%(oldaddr)s</b> 修改为 <b>%(newaddr)s</b>.  \n"
+"            现在您可以 <a href=\"%(optionsurl)s\">进入您的成员登陆页面了</a>."
+
+#: Mailman/Cgi/confirm.py:571
+msgid "Confirm change of address request"
+msgstr "确认修改地址的请求"
+
+#: Mailman/Cgi/confirm.py:590
+msgid "globally"
+msgstr "全局地"
+
+#: Mailman/Cgi/confirm.py:593
+msgid ""
+"Your confirmation is required in order to complete the\n"
+"    change of address request for the mailing list <em>%(listname)s</em>.  "
+"You\n"
+"    are currently subscribed with\n"
+"\n"
+"    <ul><li><b>Real name:</b> %(fullname)s\n"
+"        <li><b>Old email address:</b> %(oldaddr)s\n"
+"    </ul>\n"
+"\n"
+"    and you have requested to %(globallys)s change your email address to\n"
+"\n"
+"    <ul><li><b>New email address:</b> %(newaddr)s\n"
+"    </ul>\n"
+"\n"
+"    Hit the <em>Change address</em> button below to complete the "
+"confirmation\n"
+"    process.\n"
+"\n"
+"    <p>Or hit <em>Cancel and discard</em> to cancel this change of address\n"
+"    request."
+msgstr ""
+"为了完成对邮件列表<em> %(listname)s </em>的地址请求的修改,\n"
+"    您必须通过验证.  您的订阅身份是:\n"
+"\n"
+"    <ul><li><b>真实姓名:</b> %(fullname)s\n"
+"        <li><b>旧的邮件地址:</b> %(oldaddr)s\n"
+"    </ul>\n"
+"\n"
+"    您已经请求 %(globallys)s 更改您的邮件地址为\n"
+"\n"
+"    <ul><li><b>新的邮件地址:</b> %(newaddr)s\n"
+"    </ul>\n"
+"\n"
+"    点击下面的 <em>更改地址</em>来完成验证过程\n"
+"\n"
+"    <p>或者点击 <em>取消并且删除</em> 来取消对地址的更改请求."
+
+#: Mailman/Cgi/confirm.py:614
+msgid "Change address"
+msgstr "更改地址"
+
+#: Mailman/Cgi/confirm.py:623 Mailman/Cgi/confirm.py:739
+msgid "Continue awaiting approval"
+msgstr "继续等待批准"
+
+#: Mailman/Cgi/confirm.py:631
+msgid ""
+"Okay, the list moderator will still have the\n"
+"    opportunity to approve or reject this message."
+msgstr "OK, 列表主持者仍然有机会批准或者拒绝这条信息."
+
+#: Mailman/Cgi/confirm.py:659
+msgid "Sender discarded message via web."
+msgstr "寄件人通过web删除了信件"
+
+#: Mailman/Cgi/confirm.py:661
+msgid ""
+"The held message with the Subject:\n"
+"            header <em>%(subject)s</em> could not be found.  The most "
+"likely\n"
+"            reason for this is that the list moderator has already approved "
+"or\n"
+"            rejected the message.  You were not able to cancel it in\n"
+"            time."
+msgstr ""
+"找不到主题头部为 <em>%(subject)s</em> 的滞留信件。\n"
+"            最有可能的原因是\n"
+"            列表主持者已经批准或者拒绝了这条信件.\n"
+"            你不能及时地取消这条信件."
+
+#: Mailman/Cgi/confirm.py:669
+msgid "Posted message canceled"
+msgstr "发送的信件已经取消"
+
+#: Mailman/Cgi/confirm.py:672
+msgid ""
+"            You have successfully canceled the posting of your message with\n"
+"            the Subject: header <em>%(subject)s</em> to the mailing list\n"
+"            %(listname)s."
+msgstr ""
+"            您已经成功地取消了发送标题头部为 <em>%(subject)s</em> \n"
+"            的信息到 %(listname)s 这个邮件列表."
+
+#: Mailman/Cgi/confirm.py:683
+msgid "Cancel held message posting"
+msgstr "取消对滞留信件的发送"
+
+#: Mailman/Cgi/confirm.py:708
+msgid ""
+"The held message you were referred to has\n"
+"        already been handled by the list administrator."
+msgstr "提交给你的滞留信件已经由列表管理员处理了."
+
+#: Mailman/Cgi/confirm.py:722
+msgid ""
+"Your confirmation is required in order to cancel the\n"
+"    posting of your message to the mailing list <em>%(listname)s</em>:\n"
+"\n"
+"    <ul><li><b>Sender:</b> %(sender)s\n"
+"        <li><b>Subject:</b> %(subject)s\n"
+"        <li><b>Reason:</b> %(reason)s\n"
+"    </ul>\n"
+"\n"
+"    Hit the <em>Cancel posting</em> button to discard the posting.\n"
+"\n"
+"    <p>Or hit the <em>Continue awaiting approval</em> button to continue to\n"
+"    allow the list moderator to approve or reject the message."
+msgstr ""
+"为了取消向邮件列表<em>%(listname)s</em>发送信件,您需要通过验证.\n"
+"\n"
+"    <ul><li><b>发送者:</b> %(sender)s\n"
+"        <li><b>主题:</b> %(subject)s\n"
+"        <li><b>原因:</b> %(reason)s\n"
+"    </ul>\n"
+"\n"
+"    点击 <em>取消发送</em>按钮来取消发送.\n"
+"\n"
+"    <p>或者点击 <em>继续等待批准</em> 按钮,继续允许列表主持者批准或者拒绝信件."
+
+#: Mailman/Cgi/confirm.py:738
+msgid "Cancel posting"
+msgstr "取消发送"
+
+#: Mailman/Cgi/confirm.py:750
+msgid ""
+"You have canceled the re-enabling of your membership.  If\n"
+"    we continue to receive bounces from your address, it could be deleted "
+"from\n"
+"    this mailing list."
+msgstr ""
+"您已经取消重新设置您的成员资格有效. \n"
+"    如果我们持续从你的地址收到退信,你地址将被从列表中删除."
+
+#: Mailman/Cgi/confirm.py:780
+msgid "Membership re-enabled."
+msgstr "成员重新有效"
+
+#: Mailman/Cgi/confirm.py:784
+msgid ""
+"            You have successfully re-enabled your membership in the\n"
+"            %(listname)s mailing list.  You can now <a\n"
+"            href=\"%(optionsurl)s\">visit your member options page</a>.\n"
+"            "
+msgstr ""
+"            您已经成功的在邮件列表 %(listname)s 中重新设置您的成员资格有效.\n"
+"           现在您可以 <a href=\"%(optionsurl)s\">访问您的成员选项页</a>.\n"
+"            "
+
+#: Mailman/Cgi/confirm.py:796
+msgid "Re-enable mailing list membership"
+msgstr "重新设置邮件列表成员有效"
+
+#: Mailman/Cgi/confirm.py:813
+msgid ""
+"We're sorry, but you have already been unsubscribed\n"
+"        from this mailing list.  To re-subscribe, please visit the\n"
+"        <a href=\"%(listinfourl)s\">list information page</a>."
+msgstr ""
+"非常抱歉, 但是您已经取消了订阅这个邮件列表.\n"
+"        如果您想要重新订阅，请访问\n"
+"        <a href=\"%(listinfourl)s\">列表信息页面</a>."
+
+#: Mailman/Cgi/confirm.py:828
+msgid "<em>not available</em>"
+msgstr "<em>不可用</em>"
+
+#: Mailman/Cgi/confirm.py:832
+msgid ""
+"Your membership in the %(realname)s mailing list is\n"
+"    currently disabled due to excessive bounces.  Your confirmation is\n"
+"    required in order to re-enable delivery to your address.  We have the\n"
+"    following information on file:\n"
+"\n"
+"    <ul><li><b>Member address:</b> %(member)s\n"
+"        <li><b>Member name:</b> %(username)s\n"
+"        <li><b>Last bounce received on:</b> %(date)s\n"
+"        <li><b>Approximate number of days before you are permanently "
+"removed\n"
+"               from this list:</b> %(daysleft)s\n"
+"    </ul>\n"
+"\n"
+"    Hit the <em>Re-enable membership</em> button to resume receiving "
+"postings\n"
+"    from the mailing list.  Or hit the <em>Cancel</em> button to defer\n"
+"    re-enabling your membership.\n"
+"    "
+msgstr ""
+"您在邮件列表 %(realname)s 当中的成员资格由于您过多的退信被禁止了.\n"
+"    如果您希望能够重新向您的地址发送消息,您必须通过验证.\n"
+"    下面是我们的文本信息:\n"
+"\n"
+"    <ul><li><b>成员地址:</b> %(member)s\n"
+"        <li><b>成员姓名:</b> %(username)s\n"
+"        <li><b>收到最后一次退信的时间</b> %(date)s\n"
+"        <li><b>在您被永久的从这个邮件列表中删除之前还剩下大约的天数:</b> %(daysleft)s\n"
+"    </ul>\n"
+"\n"
+"    点击 <em>重新设置您的成员资格有效</em> 按钮以继续接收来自这个邮件列表的信件.\n"
+"    或者点击<em>取消</em> 按钮 推迟重新设置有效您的成员资格.\n"
+"    "
+
+#: Mailman/Cgi/confirm.py:852
+msgid "Re-enable membership"
+msgstr "重新设置成员资格为有效"
+
+#: Mailman/Cgi/confirm.py:853
+msgid "Cancel"
+msgstr "取消"
+
+#: Mailman/Cgi/create.py:60 Mailman/Cgi/rmlist.py:59
+msgid "Bad URL specification"
+msgstr "错误的URL细则"
+
+#: Mailman/Cgi/create.py:75 Mailman/Cgi/rmlist.py:189
+msgid "Return to the "
+msgstr "返回到 "
+
+#: Mailman/Cgi/create.py:77 Mailman/Cgi/rmlist.py:191
+msgid "general list overview"
+msgstr "通用列表概览"
+
+#: Mailman/Cgi/create.py:78 Mailman/Cgi/rmlist.py:192
+msgid "<br>Return to the "
+msgstr "<br>返回到 "
+
+#: Mailman/Cgi/create.py:80 Mailman/Cgi/rmlist.py:194
+msgid "administrative list overview"
+msgstr "管理列表概览"
+
+#: Mailman/Cgi/create.py:115
+msgid "List name must not include \"@\": %(safelistname)s"
+msgstr "列表名称不能包含 \"@\": %(safelistname)s"
+
+#: Mailman/Cgi/create.py:122
+msgid "List already exists: %(safelistname)s"
+msgstr "列表已经存在: %(safelistname)s"
+
+#: Mailman/Cgi/create.py:126
+msgid "You forgot to enter the list name"
+msgstr "您忘记了输入列表名称"
+
+#: Mailman/Cgi/create.py:130
+msgid "You forgot to specify the list owner"
+msgstr "您忘记了确定列表拥有者"
+
+#: Mailman/Cgi/create.py:137
+msgid ""
+"Leave the initial password (and confirmation) fields\n"
+"                blank if you want Mailman to autogenerate the list\n"
+"                passwords."
+msgstr "如果您想让 Mailman 自动生成列表密码,请将初始密码域(和验证域)置空."
+
+#: Mailman/Cgi/create.py:146
+msgid "Initial list passwords do not match"
+msgstr "初始列表密码不匹配"
+
+#: Mailman/Cgi/create.py:155
+msgid "The list password cannot be empty<!-- ignore -->"
+msgstr "列表密码不能为空<!-- ignore -->"
+
+#: Mailman/Cgi/create.py:167
+msgid "You are not authorized to create new mailing lists"
+msgstr "您没有创建新邮件列表的权限"
+
+#: Mailman/Cgi/create.py:175
+msgid "Unknown virtual host: %(safehostname)s"
+msgstr "未知的虚拟主机: %(safehostname)s"
+
+#: Mailman/Cgi/create.py:211 bin/newlist:219
+msgid "Bad owner email address: %(s)s"
+msgstr "错误的拥有者邮件地址:  %(s)s"
+
+#: Mailman/Cgi/create.py:216 bin/newlist:182 bin/newlist:223
+msgid "List already exists: %(listname)s"
+msgstr "列表已经存在: %(listname)s"
+
+#: Mailman/Cgi/create.py:224 bin/newlist:217
+msgid "Illegal list name: %(s)s"
+msgstr "非法的列表名称: %(s)s"
+
+#: Mailman/Cgi/create.py:229
+msgid ""
+"Some unknown error occurred while creating the list.\n"
+"                Please contact the site administrator for assistance."
+msgstr ""
+"在创建列表的时候发生了未知的错误.\n"
+"                请联系站点管理员以获得帮助."
+
+#: Mailman/Cgi/create.py:266 bin/newlist:265
+msgid "Your new mailing list: %(listname)s"
+msgstr "您新建的邮件列表: %(listname)s"
+
+#: Mailman/Cgi/create.py:275
+msgid "Mailing list creation results"
+msgstr "创建邮件列表的结果"
+
+#: Mailman/Cgi/create.py:281
+msgid ""
+"You have successfully created the mailing list\n"
+"    <b>%(listname)s</b> and notification has been sent to the list owner\n"
+"    <b>%(owner)s</b>.  You can now:"
+msgstr ""
+"您已经成功地创建了邮件列表 <b>%(listname)s</b>\n"
+"    同时,通知已经发送到给了列表拥有者 <b>%(owner)s</b>.\n"
+"    现在您可以:"
+
+#: Mailman/Cgi/create.py:285
+msgid "Visit the list's info page"
+msgstr "访问列表信息页面"
+
+#: Mailman/Cgi/create.py:286
+msgid "Visit the list's admin page"
+msgstr "访问列表管理页面"
+
+#: Mailman/Cgi/create.py:287
+msgid "Create another list"
+msgstr "创建另一个列表"
+
+#: Mailman/Cgi/create.py:305
+msgid "Create a %(hostname)s Mailing List"
+msgstr "创建一个 %(hostname)s 邮件列表"
+
+#: Mailman/Cgi/create.py:314 Mailman/Cgi/rmlist.py:212
+#: Mailman/Gui/Bounce.py:196 Mailman/htmlformat.py:360
+msgid "Error: "
+msgstr "错误: "
+
+#: Mailman/Cgi/create.py:316
+msgid ""
+"You can create a new mailing list by entering the\n"
+"    relevant information into the form below.  The name of the mailing list\n"
+"    will be used as the primary address for posting messages to the list, "
+"so\n"
+"    it should be lowercased.  You will not be able to change this once the\n"
+"    list is created.\n"
+"\n"
+"    <p>You also need to enter the email address of the initial list owner.\n"
+"    Once the list is created, the list owner will be given notification, "
+"along\n"
+"    with the initial list password.  The list owner will then be able to\n"
+"    modify the password and add or remove additional list owners.\n"
+"\n"
+"    <p>If you want Mailman to automatically generate the initial list admin\n"
+"    password, click on `Yes' in the autogenerate field below, and leave the\n"
+"    initial list password fields empty.\n"
+"\n"
+"    <p>You must have the proper authorization to create new mailing lists.\n"
+"    Each site should have a <em>list creator's</em> password, which you can\n"
+"    enter in the field at the bottom.  Note that the site administrator's\n"
+"    password can also be used for authentication.\n"
+"    "
+msgstr ""
+"在下面的表格中填入相关的信息,您就可以创建新的邮件列表了.\n"
+"    邮件列表的名称将用作向这个列表发送信息的主要地址,\n"
+"    它应该小写.\n"
+"    但列表创建之后,您不能对其进行修改.\n"
+"\n"
+"    <p>您还需要输入初始的列表拥有者的邮件地址.\n"
+"    当列表被创建后,列表的拥有者将收到通知和初始的列表密码.\n"
+"    列表的拥有者能够修改密码,以及添加或删除附加的列表拥有者. \n"
+"\n"
+"    <p>如果您想要让 Mailman 自动生成初始的列表管理密码,在下面的自动生成域点击'是',\n"
+"    并将初始列表密码置为空.\n"
+"\n"
+"    <p>为了创建新的邮件列表,您需要适当的权限.\n"
+"    每个站点应该有一个 <em>列表创建者</em> 的密码,\n"
+"    您可以在下面的域中输入这个密码.请注意站点管理员的密码\n"
+"    同样可以作为认证信息.\n"
+"    "
+
+#: Mailman/Cgi/create.py:342
+msgid "List Identity"
+msgstr "列表身份"
+
+#: Mailman/Cgi/create.py:347
+msgid "Name of list:"
+msgstr "列表名称:"
+
+#: Mailman/Cgi/create.py:354
+msgid "Initial list owner address:"
+msgstr "初始的列表拥有者地址:"
+
+#: Mailman/Cgi/create.py:363
+msgid "Auto-generate initial list password?"
+msgstr "自动生成列表初始密码吗?"
+
+#: Mailman/Cgi/create.py:371
+msgid "Initial list password:"
+msgstr "初始列表密码:"
+
+#: Mailman/Cgi/create.py:377
+msgid "Confirm initial password:"
+msgstr "确认初始密码:"
+
+#: Mailman/Cgi/create.py:392
+msgid "List Characteristics"
+msgstr "列表特性"
+
+#: Mailman/Cgi/create.py:396
+msgid ""
+"Should new members be quarantined before they\n"
+"    are allowed to post unmoderated to this list?  Answer <em>Yes</em> to "
+"hold\n"
+"    new member postings for moderator approval by default."
+msgstr ""
+"新加入的成员在允许向这个列表发送没有经过缓冲的信息前需要被隔离吗?\n"
+"    回答 <em>是</em> 会将\n"
+"    新成员发送的信息滞留起来,等待主持者的批准(默认)."
+
+#: Mailman/Cgi/create.py:425
+msgid ""
+"Initial list of supported languages.  <p>Note that if you do not\n"
+"        select at least one initial language, the list will use the server\n"
+"        default language of %(deflang)s"
+msgstr ""
+"支持语言的初始列表.  <p>请注意:如果您\n"
+"        没有选择初始语言, 邮件列表将采用服务器\n"
+"        默认的语言 %(deflang)s"
+
+#: Mailman/Cgi/create.py:436
+msgid "Send \"list created\" email to list owner?"
+msgstr "向列表拥有者发送\"列表已创建\"的信件吗?"
+
+#: Mailman/Cgi/create.py:445
+msgid "List creator's (authentication) password:"
+msgstr "列出创建者的(认证)密码:"
+
+#: Mailman/Cgi/create.py:450
+msgid "Create List"
+msgstr "创建列表"
+
+#: Mailman/Cgi/create.py:451
+msgid "Clear Form"
+msgstr "清除表格"
+
+#: Mailman/Cgi/edithtml.py:48
+msgid "General list information page"
+msgstr "通用列表信息页面"
+
+#: Mailman/Cgi/edithtml.py:49
+msgid "Subscribe results page"
+msgstr "订阅结果页面"
+
+#: Mailman/Cgi/edithtml.py:50
+msgid "User specific options page"
+msgstr "用户定制的选项页面"
+
+#: Mailman/Cgi/edithtml.py:51
+msgid "Welcome email text file"
+msgstr "邮件的欢迎文本信息"
+
+#: Mailman/Cgi/edithtml.py:52
+msgid "Digest masthead"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:53
+msgid "User notice of held post"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:54
+msgid "User notice of held subscription"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:55
+msgid "Notice of post refused by moderator"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:56
+msgid "Invitation to join list"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:57
+msgid "Request to confirm subscription"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:58
+msgid "Request to confirm unsubscription"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:59
+msgid "User notice of autoresponse limit"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:60
+msgid "User post acknowledgement"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:61
+msgid "Subscription disabled by bounce warning"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:62
+msgid "Admin/moderator login page"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:63
+msgid "Private archive login page"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:64
+msgid "On demand password reminder"
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:76
+msgid "List name is required."
+msgstr "列表名称是必需的."
+
+#: Mailman/Cgi/edithtml.py:140
+msgid "%(realname)s -- Edit html for %(template_info)s"
+msgstr "%(realname)s -- 为 %(template_info)s 编辑html"
+
+#: Mailman/Cgi/edithtml.py:146
+msgid "Edit HTML : Error"
+msgstr "编辑HTML : 错误"
+
+#: Mailman/Cgi/edithtml.py:147
+msgid "%(safetemplatename)s: Invalid template"
+msgstr "%(safetemplatename)s: 无效的模版"
+
+#: Mailman/Cgi/edithtml.py:152 Mailman/Cgi/edithtml.py:153
+msgid "%(realname)s -- HTML Page Editing"
+msgstr "%(realname)s -- HTML 页面编辑"
+
+#: Mailman/Cgi/edithtml.py:154
+msgid "Select page to edit:"
+msgstr "选择您要编辑的页面:"
+
+#: Mailman/Cgi/edithtml.py:184
+msgid "View or edit the list configuration information."
+msgstr "查看或编辑列表的配置信息."
+
+#: Mailman/Cgi/edithtml.py:194
+msgid "When you are done making changes..."
+msgstr "当您正要完成更改时..."
+
+#: Mailman/Cgi/edithtml.py:195
+msgid "Submit Changes"
+msgstr "提交更改"
+
+#: Mailman/Cgi/edithtml.py:202
+msgid "Can't have empty html page."
+msgstr "不能有空的html页面."
+
+#: Mailman/Cgi/edithtml.py:203
+msgid "HTML Unchanged."
+msgstr "HTML 没有改变."
+
+#: Mailman/Cgi/edithtml.py:209
+msgid ""
+"The page you saved contains suspicious HTML that could\n"
+"potentially expose your users to cross-site scripting attacks.  This change\n"
+"has therefore been rejected.  If you still want to make these changes, you\n"
+"must have shell access to your Mailman server.\n"
+"             "
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:214
+msgid "See "
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:217
+msgid "FAQ 4.48."
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:218
+msgid "Page Unchanged."
+msgstr ""
+
+#: Mailman/Cgi/edithtml.py:236
+msgid "HTML successfully updated."
+msgstr "HTML更新成功."
+
+#: Mailman/Cgi/listinfo.py:90
+msgid "%(hostname)s Mailing Lists"
+msgstr "%(hostname)s 邮件列表"
+
+#: Mailman/Cgi/listinfo.py:128
+msgid ""
+"<p>There currently are no publicly-advertised\n"
+"            %(mailmanlink)s mailing lists on %(hostname)s."
+msgstr "<p>目前在 %(hostname)s 上没有公开的 %(mailmanlink)s 邮件列表."
+
+#: Mailman/Cgi/listinfo.py:132
+msgid ""
+"<p>Below is a listing of all the public mailing lists on\n"
+"            %(hostname)s.  Click on a list name to get more information "
+"about\n"
+"            the list, or to subscribe, unsubscribe, and change the "
+"preferences\n"
+"            on your subscription."
+msgstr ""
+"<p>下面是 %(hostname)s 上所有公开的列表地址.\n"
+"           点击列表名称以获得关于该列表更多的信息,或者订阅,取消订阅,更改您订阅的偏好设置."
+
+#: Mailman/Cgi/listinfo.py:138
+msgid "right"
+msgstr "正确"
+
+#: Mailman/Cgi/listinfo.py:141
+msgid ""
+" To visit the general information page for an unadvertised list,\n"
+"        open a URL similar to this one, but with a '/' and the %(adj)s\n"
+"        list name appended.\n"
+"        <p>List administrators, you can visit "
+msgstr ""
+" 要访问没有发布的列表的通用信息,\n"
+"        打开类似的 URL , 但是在列表名后附加上 '/' 和 %(adj)s .\n"
+"        <p>如果你是列表管理员,您可以访问 "
+
+#: Mailman/Cgi/listinfo.py:146
+msgid "the list admin overview page"
+msgstr "列表管理概览页面"
+
+#: Mailman/Cgi/listinfo.py:147
+msgid ""
+" to find the management interface for your list.\n"
+"         <p>If you are having trouble using the lists, please contact "
+msgstr ""
+" 以找到您的列表管理接口.\n"
+"         <p>如果您在使用列表时碰到的麻烦,请与我们联系 "
+
+#: Mailman/Cgi/listinfo.py:236
+msgid "Edit Options"
+msgstr "编辑选项"
+
+#: Mailman/Cgi/listinfo.py:243 Mailman/Cgi/options.py:961
+#: Mailman/Cgi/roster.py:130
+msgid "View this page in"
+msgstr "选择本页所用的语言："
+
+#: Mailman/Cgi/options.py:65 Mailman/Cgi/options.py:78
+#: Mailman/Cgi/options.py:95
+msgid "CGI script error"
+msgstr "CGI脚本错误"
+
+#: Mailman/Cgi/options.py:68
+msgid "Invalid request method: %(method)s"
+msgstr ""
+
+#: Mailman/Cgi/options.py:152
+msgid "No address given"
+msgstr "没有给出地址"
+
+#: Mailman/Cgi/options.py:172
+msgid "Illegal Email Address: %(safeuser)s"
+msgstr "非法的邮件地址: %(safeuser)s"
+
+#: Mailman/Cgi/options.py:179 Mailman/Cgi/options.py:247
+#: Mailman/Cgi/options.py:271 Mailman/Cgi/private.py:163
+msgid "No such member: %(safeuser)s."
+msgstr "不存在 %(safeuser)s 这个成员."
+
+#: Mailman/Cgi/options.py:218
+msgid "If you are a list member, a confirmation email has been sent."
+msgstr ""
+
+#: Mailman/Cgi/options.py:219
+msgid ""
+"If you are a list member, your unsubscription request has been\n"
+"             forwarded to the list administrator for approval."
+msgstr ""
+
+#: Mailman/Cgi/options.py:261
+msgid ""
+"If you are a list member,\n"
+"            your password has been emailed to you."
+msgstr ""
+
+#: Mailman/Cgi/options.py:304
+msgid "Authentication failed."
+msgstr "认证失败"
+
+#: Mailman/Cgi/options.py:353
+msgid "A reminder of your password has been emailed to you."
+msgstr "您的密码提示已经发送到您的电子信箱了"
+
+#: Mailman/Cgi/options.py:360
+msgid ""
+"The list administrator may not view the other\n"
+"            subscriptions for this user."
+msgstr ""
+
+#: Mailman/Cgi/options.py:361 Mailman/Cgi/options.py:410
+#: Mailman/Cgi/options.py:538 Mailman/Cgi/options.py:761
+msgid "Note: "
+msgstr "注： "
+
+#: Mailman/Cgi/options.py:366
+msgid "List subscriptions for %(safeuser)s on %(hostname)s"
+msgstr "为 %(safeuser)s 列出在 %(hostname)s 上的订阅"
+
+#: Mailman/Cgi/options.py:369
+msgid ""
+"Click on a link to visit your options page for the\n"
+"        requested mailing list."
+msgstr "点击连接以访问您请求的邮件列表的选项页面"
+
+#: Mailman/Cgi/options.py:407
+msgid ""
+"The list administrator may not change the names\n"
+"            or addresses for this user's other subscriptions.  However, the\n"
+"            subscription for this mailing list has been changed."
+msgstr ""
+
+#: Mailman/Cgi/options.py:430
+msgid "Addresses did not match!"
+msgstr "地址不匹配!"
+
+#: Mailman/Cgi/options.py:435
+msgid "You are already using that email address"
+msgstr "您已经使用了那个邮件地址"
+
+#: Mailman/Cgi/options.py:447
+msgid ""
+"The new address you requested %(newaddr)s is already a member of the\n"
+"%(listname)s mailing list, however you have also requested a global change "
+"of\n"
+"address.  Upon confirmation, any other mailing list containing the address\n"
+"%(safeuser)s will be changed. "
+msgstr ""
+"您请求的新地址 %(newaddr)s 已经是邮件列表 %(listname)s 的成员了,\n"
+"但是您仍然请求对这个地址进行全局的修改.\n"
+"确认后, 其他包含 %(safeuser)s 这个地址的邮件列表将被修改. "
+
+#: Mailman/Cgi/options.py:456
+msgid "The new address is already a member: %(newaddr)s"
+msgstr "新的地址 %(newaddr)s 已经是成员了"
+
+#: Mailman/Cgi/options.py:462
+msgid "Addresses may not be blank"
+msgstr "地址不能为空"
+
+#: Mailman/Cgi/options.py:476
+msgid "A confirmation message has been sent to %(newaddr)s. "
+msgstr "确认信息已经发送到了 %(newaddr)s . "
+
+#: Mailman/Cgi/options.py:485
+msgid "Bad email address provided"
+msgstr "提供了错误的邮件地址"
+
+#: Mailman/Cgi/options.py:487
+msgid "Illegal email address provided"
+msgstr "提供了非法的邮件地址"
+
+#: Mailman/Cgi/options.py:489
+msgid "%(newaddr)s is already a member of the list."
+msgstr "%(newaddr)s 已经是列表的成员."
+
+#: Mailman/Cgi/options.py:492
+msgid ""
+"%(newaddr)s is banned from this list.  If you\n"
+"                      think this restriction is erroneous, please contact\n"
+"                      the list owners at %(owneraddr)s."
+msgstr ""
+
+#: Mailman/Cgi/options.py:503
+msgid "Member name successfully changed. "
+msgstr "成员姓名修改成功 "
+
+#: Mailman/Cgi/options.py:513
+msgid ""
+"The list administrator may not change the\n"
+"                    password for a user."
+msgstr ""
+
+#: Mailman/Cgi/options.py:522
+msgid "Passwords may not be blank"
+msgstr "密码不能为空"
+
+#: Mailman/Cgi/options.py:527
+msgid "Passwords did not match!"
+msgstr "密码不匹配!"
+
+#: Mailman/Cgi/options.py:535
+msgid ""
+"The list administrator may not change the\n"
+"            password for this user's other subscriptions.  However, the\n"
+"            password for this mailing list has been changed."
+msgstr ""
+
+#: Mailman/Cgi/options.py:552 Mailman/Commands/cmd_password.py:83
+#: Mailman/Commands/cmd_password.py:109
+msgid "Password successfully changed."
+msgstr "密码修改成功"
+
+#: Mailman/Cgi/options.py:561
+msgid ""
+"You must confirm your unsubscription request by turning\n"
+"                on the checkbox below the <em>Unsubscribe</em> button.  You\n"
+"                have not been unsubscribed!"
+msgstr ""
+"为了确认您取消订阅的请求,您必须选中复选框中 <em>取消订阅</em> \n"
+"                这一项.  您还没有取消订阅!"
+
+#: Mailman/Cgi/options.py:600
+msgid "Unsubscription results"
+msgstr "退订结果"
+
+#: Mailman/Cgi/options.py:604
+msgid ""
+"Your unsubscription request has been received and\n"
+"            forwarded on to the list moderators for approval.  You will\n"
+"            receive notification once the list moderators have made their\n"
+"            decision."
+msgstr ""
+"您的退订请求已被收到并转发给列表管理员以待其核准。\n"
+"            管理员作出决定后您将受到一封邮件通知。"
+
+#: Mailman/Cgi/options.py:609
+msgid ""
+"You have been successfully unsubscribed from the\n"
+"            mailing list %(fqdn_listname)s.  If you were receiving digest\n"
+"            deliveries you may get one more digest.  If you have any "
+"questions\n"
+"            about your unsubscription, please contact the list owners at\n"
+"            %(owneraddr)s."
+msgstr ""
+"您已经成功地退订了邮件列表 %(fqdn_listname)s。如果\n"
+"            您接收摘要投递的话，您还将收到一封摘要信息。如果您对于退订有任何的\n"
+"            问题，请联系列表管理员： %(owneraddr)s。"
+
+#: Mailman/Cgi/options.py:758
+msgid ""
+"The list administrator may not change the\n"
+"                options for this user's other subscriptions.  However the\n"
+"                options for this mailing list subscription has been\n"
+"                changed."
+msgstr ""
+
+#: Mailman/Cgi/options.py:768
+msgid ""
+"The list administrator has disabled digest delivery for\n"
+"            this list, so your delivery option has not been set.  However "
+"your\n"
+"            other options have been set successfully."
+msgstr ""
+"列表管理员已经禁止了此列表的摘要投递功能，所以您的\n"
+"            投递选项没有被设置，但是您的其他选项都已成功地设置。"
+
+#: Mailman/Cgi/options.py:772
+msgid ""
+"The list administrator has disabled non-digest delivery\n"
+"            for this list, so your delivery option has not been set.  "
+"However\n"
+"            your other options have been set successfully."
+msgstr ""
+"列表管理员已经禁止了此列表的非摘要投递功能，所以您的\n"
+"            投递选项没有被设置，但是您的其他选项都已成功地设置。"
+
+#: Mailman/Cgi/options.py:776
+msgid "You have successfully set your options."
+msgstr "您已经成功设置您的选项。"
+
+#: Mailman/Cgi/options.py:779
+msgid "You may get one last digest."
+msgstr "您可能会收到最后一封摘要。"
+
+#: Mailman/Cgi/options.py:851
+msgid "<em>Yes, I really want to unsubscribe</em>"
+msgstr "<em>是的，我确实想要退订</em>"
+
+#: Mailman/Cgi/options.py:855
+msgid "Change My Password"
+msgstr "修改我的口令"
+
+#: Mailman/Cgi/options.py:858
+msgid "List my other subscriptions"
+msgstr "列出我的所有订阅"
+
+#: Mailman/Cgi/options.py:865
+msgid "Email My Password To Me"
+msgstr "把我的口令邮寄给我"
+
+#: Mailman/Cgi/options.py:867
+msgid "password"
+msgstr "口令"
+
+#: Mailman/Cgi/options.py:869
+msgid "Log out"
+msgstr "退出登录"
+
+#: Mailman/Cgi/options.py:871
+msgid "Submit My Changes"
+msgstr "提交我的修改"
+
+#: Mailman/Cgi/options.py:883
+msgid "days"
+msgstr "天"
+
+#: Mailman/Cgi/options.py:885
+msgid "day"
+msgstr "天"
+
+#: Mailman/Cgi/options.py:886
+msgid "%(days)d %(units)s"
+msgstr "%(days)d %(units)s"
+
+#: Mailman/Cgi/options.py:892
+msgid "Change My Address and Name"
+msgstr "修改我的地址和姓名"
+
+#: Mailman/Cgi/options.py:918
+msgid "<em>No topics defined</em>"
+msgstr "<em>没有已定义的主题</em>"
+
+#: Mailman/Cgi/options.py:926
+msgid ""
+"\n"
+"You are subscribed to this list with the case-preserved address\n"
+"<em>%(cpuser)s</em>."
+msgstr ""
+"\n"
+"您使用大小写相关的地址订阅了此列表\n"
+"<em>%(cpuser)s</em>."
+
+#: Mailman/Cgi/options.py:942
+msgid "%(realname)s list: member options login page"
+msgstr "%(realname)s 列表： 成员选项登录页"
+
+#: Mailman/Cgi/options.py:943
+msgid "email address and "
+msgstr "邮件地址和 "
+
+#: Mailman/Cgi/options.py:946
+msgid "%(realname)s list: member options for user %(safeuser)s"
+msgstr "%(realname)s 列表： 用户 %(safeuser)s 的成员选项信息"
+
+#: Mailman/Cgi/options.py:972
+msgid ""
+"In order to change your membership option, you must\n"
+"    first log in by giving your %(extra)smembership password in the section\n"
+"    below.  If you don't remember your membership password, you can have it\n"
+"    emailed to you by clicking on the button below.  If you just want to\n"
+"    unsubscribe from this list, click on the <em>Unsubscribe</em> button and "
+"a\n"
+"    confirmation message will be sent to you.\n"
+"\n"
+"    <p><strong><em>Important:</em></strong> From this point on, you must "
+"have\n"
+"    cookies enabled in your browser, otherwise none of your changes will "
+"take\n"
+"    effect.\n"
+"    "
+msgstr ""
+"为了修改您的选项，您必须首先在下面的部分中使用您的 %(extra)s 成员口令进行登录。\n"
+"    如果您忘记了您的口令，您可以通过点击下面的按钮来把它邮寄给您。如果您只是想\n"
+"    退订此列表，请点击<em>退订</em>按钮，然后一封确认函将投递给您。\n"
+"\n"
+"    <p><strong><em>重要：</em></strong>从此处起，您必须在您的浏览器中启用cookies，\n"
+"    否则您做的所有修改都将不起作用。\n"
+"    "
+
+#: Mailman/Cgi/options.py:986
+msgid "Email address:"
+msgstr "邮件地址："
+
+#: Mailman/Cgi/options.py:990
+msgid "Password:"
+msgstr "口令："
+
+#: Mailman/Cgi/options.py:992
+msgid "Log in"
+msgstr "登录"
+
+#: Mailman/Cgi/options.py:1000
+msgid ""
+"By clicking on the <em>Unsubscribe</em> button, a\n"
+"    confirmation message will be emailed to you.  This message will have a\n"
+"    link that you should click on to complete the removal process (you can\n"
+"    also confirm by email; see the instructions in the confirmation\n"
+"    message)."
+msgstr ""
+"通过点击<em>退订</em>按钮，一封确认函将被投递给您。\n"
+"    您需要点击确认函中的一个链接来完成整个退订过程(您也可以通过邮件来确认，\n"
+"    请参考确认函中的具体信息)。"
+
+#: Mailman/Cgi/options.py:1008
+msgid "Password reminder"
+msgstr "口令提示函"
+
+#: Mailman/Cgi/options.py:1012
+msgid ""
+"By clicking on the <em>Remind</em> button, your\n"
+"    password will be emailed to you."
+msgstr "通过点击<em>提示</em>按钮，您的口令将被邮寄给您。"
+
+#: Mailman/Cgi/options.py:1015
+msgid "Remind"
+msgstr "提示"
+
+#: Mailman/Cgi/options.py:1115 Mailman/ListAdmin.py:225
+msgid "<missing>"
+msgstr "<丢失>"
+
+#: Mailman/Cgi/options.py:1126
+msgid "Requested topic is not valid: %(topicname)s"
+msgstr "请求的主题不存在: %(topicname)s"
+
+#: Mailman/Cgi/options.py:1131
+msgid "Topic filter details"
+msgstr "主题过滤器详情"
+
+#: Mailman/Cgi/options.py:1134
+msgid "Name:"
+msgstr "名字："
+
+#: Mailman/Cgi/options.py:1136
+msgid "Pattern (as regexp):"
+msgstr "模式(正则表达式)"
+
+#: Mailman/Cgi/private.py:64
+msgid "Private Archive Error"
+msgstr "内部存档错误"
+
+#: Mailman/Cgi/private.py:65
+msgid "You must specify a list."
+msgstr "您必须指定一个列表。"
+
+#: Mailman/Cgi/private.py:72
+msgid "Private archive - \"./\" and \"../\" not allowed in URL."
+msgstr ""
+
+#: Mailman/Cgi/private.py:109
+msgid "Private Archive Error - %(msg)s"
+msgstr "内部存档错误 - %(msg)s"
+
+#: Mailman/Cgi/private.py:150
+msgid ""
+"If you are a list member,\n"
+"                          your password has been emailed to you."
+msgstr ""
+
+#: Mailman/Cgi/private.py:154
+msgid "Please enter your email address"
+msgstr ""
+
+#: Mailman/Cgi/private.py:215
+msgid "Private archive file not found"
+msgstr "没有找到内部存档文件"
+
+#: Mailman/Cgi/rmlist.py:76
+msgid "No such list %(safelistname)s"
+msgstr ""
+
+#: Mailman/Cgi/rmlist.py:94
+msgid "You're being a sneaky list owner!"
+msgstr "您将成为一个隐蔽的列表属主！"
+
+#: Mailman/Cgi/rmlist.py:132
+msgid "You are not authorized to delete this mailing list"
+msgstr "您没有删除此邮件列表的授权"
+
+#: Mailman/Cgi/rmlist.py:173
+msgid "Mailing list deletion results"
+msgstr "邮件列表删除结果"
+
+#: Mailman/Cgi/rmlist.py:180
+msgid ""
+"You have successfully deleted the mailing list\n"
+"    <b>%(listname)s</b>."
+msgstr ""
+"您成功地删除了邮件列表\n"
+"    <b>%(listname)s</b>."
+
+#: Mailman/Cgi/rmlist.py:184
+msgid ""
+"There were some problems deleting the mailing list\n"
+"        <b>%(listname)s</b>.  Contact your site administrator at "
+"%(sitelist)s\n"
+"        for details."
+msgstr ""
+"在删除邮件列表<b>%(listname)s</b>时出现了一些问题。\n"
+"        联系您的站点管理员 %(sitelist)s 以获取详情。"
+
+#: Mailman/Cgi/rmlist.py:201
+msgid "Permanently remove mailing list <em>%(realname)s</em>"
+msgstr "永久删除邮件列表<em>%(realname)s</em>"
+
+#: Mailman/Cgi/rmlist.py:202
+msgid "Permanently remove mailing list %(realname)s"
+msgstr ""
+
+#: Mailman/Cgi/rmlist.py:215
+msgid ""
+"This page allows you as the list owner, to permanently\n"
+"    remove this mailing list from the system.  <strong>This action is not\n"
+"    undoable</strong> so you should undertake it only if you are absolutely\n"
+"    sure this mailing list has served its purpose and is no longer "
+"necessary.\n"
+"\n"
+"    <p>Note that no warning will be sent to your list members and after "
+"this\n"
+"    action, any subsequent messages sent to the mailing list, or any of its\n"
+"    administrative addreses will bounce.\n"
+"\n"
+"    <p>You also have the option of removing the archives for this mailing "
+"list\n"
+"    at this time.  It is almost always recommended that you do\n"
+"    <strong>not</strong> remove the archives, since they serve as the\n"
+"    historical record of your mailing list.\n"
+"\n"
+"    <p>For your safety, you will be asked to reconfirm the list password.\n"
+"    "
+msgstr ""
+"这个页面允许列表属主从系统中永久性地删除此邮件列表。\n"
+"    <strong>此动作是不可撤销的</strong>，所以在确认删除之前请您三思。\n"
+"\n"
+"    <p>注意，将不会向列表成员发送任何的警告信息，并且在删除列表后，所有发送给\n"
+"    此列表或者列表管理员的信件都将被退回。\n"
+"\n"
+"    <p>您可以在删除列表的同时也删除列表的邮件存档。但是我们强烈建议您<strong>\n"
+"    不要</strong>删除这些存档，因为它们是您的邮件列表的历史记录。\n"
+"\n"
+"    <p>为安全起见，您将被要求再次确认列表管理口令。\n"
+"    "
+
+#: Mailman/Cgi/rmlist.py:236
+msgid "List password:"
+msgstr "列表管理口令："
+
+#: Mailman/Cgi/rmlist.py:240
+msgid "Also delete archives?"
+msgstr "同时删除邮件归档？"
+
+#: Mailman/Cgi/rmlist.py:248
+msgid "<b>Cancel</b> and return to list administration"
+msgstr "<b>取消</b>并返回到列表管理页"
+
+#: Mailman/Cgi/rmlist.py:251
+msgid "Delete this list"
+msgstr "删除此列表"
+
+#: Mailman/Cgi/roster.py:48 Mailman/Cgi/subscribe.py:56
+msgid "Invalid options to CGI script"
+msgstr "无效的CGI脚本参数"
+
+#: Mailman/Cgi/roster.py:118
+msgid "%(realname)s roster authentication failed."
+msgstr "%(realname)s身份验证失败"
+
+#: Mailman/Cgi/subscribe.py:128
+msgid "You must supply a valid email address."
+msgstr "您必须提供一个有效的电子邮件地址。"
+
+#: Mailman/Cgi/subscribe.py:153
+msgid "reCAPTCHA validation failed: %(e_codes)s"
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:156
+msgid "reCAPTCHA could not be validated: %(e_reason)s"
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:181
+msgid "The form is too old.  Please GET it again."
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:184
+msgid "Please take a few seconds to fill out the form before submitting it."
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:187
+msgid "The hidden token didn't match.  Did your IP change?"
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:190
+msgid "There was no hidden token in your submission or it was corrupted."
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:191
+msgid "You must GET the form before submitting it."
+msgstr ""
+
+#: Mailman/Cgi/subscribe.py:195
+msgid "You may not subscribe a list to itself!"
+msgstr "您不能让一个邮件列表订阅它自身！"
+
+#: Mailman/Cgi/subscribe.py:203
+msgid "If you supply a password, you must confirm it."
+msgstr "如果您提供一个口令，您必须对它进行确认。"
+
+#: Mailman/Cgi/subscribe.py:205
+msgid "Your passwords did not match."
+msgstr "您的口令不匹配。"
+
+#: Mailman/Cgi/subscribe.py:239
+msgid ""
+"Your subscription request has been received, and will soon be acted upon.\n"
+"Depending on the configuration of this mailing list, your subscription "
+"request\n"
+"may have to be first confirmed by you via email, or approved by the list\n"
+"moderator.  If confirmation is required, you will soon get a confirmation\n"
+"email which contains further instructions."
+msgstr ""
+"您的订阅请求已经被收到，并将很快被处理。依赖于此列表的配置，您的注册请求\n"
+"可能需要您通过邮件进行确认，或者需要由列表管理员批准。如果需要进行确认的\n"
+"话，很快您就将收到一封确认函，确认函里将包含更进一步的指导信息。"
+
+#: Mailman/Cgi/subscribe.py:253
+msgid ""
+"The email address you supplied is banned from this\n"
+"        mailing list.  If you think this restriction is erroneous, please\n"
+"        contact the list owners at %(listowner)s."
+msgstr ""
+"您提供的邮件地址被此邮件列表禁止了。若您认为这是错误的，请联系列表管理员\n"
+"         %(listowner)s。"
+
+#: Mailman/Cgi/subscribe.py:257
+msgid ""
+"The email address you supplied is not valid.  (E.g. it must contain an\n"
+"`@'.)"
+msgstr "您提供的邮件地址是无效的。(例如，它必须包含一个`@'。)"
+
+#: Mailman/Cgi/subscribe.py:261
+msgid ""
+"Your subscription is not allowed because the email address you gave is\n"
+"insecure."
+msgstr "您的订阅请求被拒绝了，因为您提供的邮件地址是不可靠的。"
+
+#: Mailman/Cgi/subscribe.py:269
+msgid ""
+"Confirmation from your email address is required, to prevent anyone from\n"
+"subscribing you without permission.  Instructions are being sent to you at\n"
+"%(email)s.  Please note your subscription will not start until you confirm\n"
+"your subscription."
+msgstr ""
+"为了防止其他人在未经您允许的情况下替您订阅列表，需要从您的邮件地址发送的确\n"
+"认函。将会有一些指导信息被投递到您的信箱 %(email)s 中。请注意，除非您确认了\n"
+"您的订阅请求，否则您的订阅将不会生效。"
+
+#: Mailman/Cgi/subscribe.py:281
+msgid ""
+"Your subscription request was deferred because %(x)s.  Your request has "
+"been\n"
+"forwarded to the list moderator.  You will receive email informing you of "
+"the\n"
+"moderator's decision when they get to your request."
+msgstr ""
+"因为 %(x)s ，您的订阅请求被搁置了。您的请求已经被转发给列表管理员。在列表管理\n"
+"对您的请求作出决定后，您将会收到邮件通知。"
+
+#: Mailman/Cgi/subscribe.py:288 Mailman/Commands/cmd_confirm.py:61
+msgid "You are already subscribed."
+msgstr "您已经订阅过了。"
+
+#: Mailman/Cgi/subscribe.py:302
+msgid "Mailman privacy alert"
+msgstr "Mailman内部警告"
+
+#: Mailman/Cgi/subscribe.py:303
+msgid ""
+"An attempt was made to subscribe your address to the mailing list\n"
+"%(listaddr)s.  You are already subscribed to this mailing list.\n"
+"\n"
+"Note that the list membership is not public, so it is possible that a bad\n"
+"person was trying to probe the list for its membership.  This would be a\n"
+"privacy violation if we let them do this, but we didn't.\n"
+"\n"
+"If you submitted the subscription request and forgot that you were already\n"
+"subscribed to the list, then you can ignore this message.  If you suspect "
+"that\n"
+"an attempt is being made to covertly discover whether you are a member of "
+"this\n"
+"list, and you are worried about your privacy, then feel free to send a "
+"message\n"
+"to the list administrator at %(listowner)s.\n"
+msgstr ""
+"有人尝试用您的地址订阅邮件列表 %(listaddr)s。您已经订阅了此列表。\n"
+"\n"
+"注意，列表成员不是公开的，所以可能是有些不怀好意的人在试探列表的成员地址。\n"
+"我们不会让他们得逞，因为这样他们将侵犯您的隐私。\n"
+"\n"
+"如果您忘记了您已经订阅了此列表，所以又提交了此订阅请求的话，您可以忽略此信息。\n"
+"如果您认为这是对判断您是否是此列表成员的一次秘密试探，并且担心这将暴露您的隐私，\n"
+"请不要拘束，发送一封邮件到 %(listowner)s 告诉列表管理员。\n"
+
+#: Mailman/Cgi/subscribe.py:322
+msgid "This list does not support digest delivery."
+msgstr "此列表不支持定期投递摘要。"
+
+#: Mailman/Cgi/subscribe.py:324
+msgid "This list only supports digest delivery."
+msgstr "此列表仅支持投递定期摘要。"
+
+#: Mailman/Cgi/subscribe.py:331
+msgid ""
+"You have been successfully subscribed to the %(realname)s mailing list."
+msgstr "您已经成功地订阅了 %(realname)s 邮件列表。"
+
+#: Mailman/Commands/cmd_confirm.py:18
+#, docstring
+msgid ""
+"\n"
+"    confirm <confirmation-string>\n"
+"        Confirm an action.  The confirmation-string is required and should "
+"be\n"
+"        supplied by a mailback confirmation notice.\n"
+msgstr ""
+"\n"
+"    confirm <confirmation-string>\n"
+"        确认某个动作。confirmation-string会在在此之前邮寄给你的相应的确认通知中提供。\n"
+
+#: Mailman/Commands/cmd_confirm.py:41 Mailman/Commands/cmd_lists.py:40
+#: Mailman/Commands/cmd_set.py:133 Mailman/Commands/cmd_subscribe.py:69
+#: Mailman/Commands/cmd_unsubscribe.py:52 Mailman/Commands/cmd_who.py:67
+msgid "Usage:"
+msgstr "用法："
+
+#: Mailman/Commands/cmd_confirm.py:50
+msgid ""
+"Invalid confirmation string.  Note that confirmation strings expire\n"
+"approximately %(days)s days after the initial request.  They also expire if\n"
+"the request has already been handled in some way.  If your confirmation has\n"
+"expired, please try to re-submit your original request or message."
+msgstr ""
+
+#: Mailman/Commands/cmd_confirm.py:56
+msgid "Your request has been forwarded to the list moderator for approval."
+msgstr "您的请求已经被转发给列表管理员以待核准。"
+
+#: Mailman/Commands/cmd_confirm.py:64
+msgid ""
+"You are not currently a member.  Have you already unsubscribed or changed\n"
+"your email address?"
+msgstr "您还不是列表的成员。您是否已经退订了列表，或者修改了您的邮件地址？"
+
+#: Mailman/Commands/cmd_confirm.py:69
+msgid ""
+"You are currently banned from subscribing to this list.  If you think this\n"
+"restriction is erroneous, please contact the list owners at\n"
+"%(owneraddr)s."
+msgstr ""
+
+#: Mailman/Commands/cmd_confirm.py:74
+msgid ""
+"You were not invited to this mailing list.  The invitation has been "
+"discarded,\n"
+"and both list administrators have been alerted."
+msgstr "您没有被邀请加入此邮件列表。邀请已被废弃，列表的所有管理员都将收到此警告。"
+
+#: Mailman/Commands/cmd_confirm.py:78
+msgid "Bad approval password given.  Held message is still being held."
+msgstr "错误的核准口令。保存的信息仍然被保存着。"
+
+#: Mailman/Commands/cmd_confirm.py:89 Mailman/Commands/cmd_confirm.py:92
+#: Mailman/Commands/cmd_confirm.py:95
+msgid "Confirmation succeeded"
+msgstr "确认成功"
+
+#: Mailman/Commands/cmd_echo.py:17
+#, docstring
+msgid ""
+"\n"
+"    echo [args]\n"
+"        Simply echo an acknowledgement.  Args are echoed back unchanged.\n"
+msgstr ""
+"\n"
+"    echo [args]\n"
+"        简单地回复一个应答。args被原封不动的返回。\n"
+
+#: Mailman/Commands/cmd_end.py:17
+#, docstring
+msgid ""
+"\n"
+"    end\n"
+"        Stop processing commands.  Use this if your mail program "
+"automatically\n"
+"        adds a signature file.\n"
+msgstr ""
+"\n"
+"    end\n"
+"       停止处理命令。如果您的邮件程序自动的在您的邮件后面添加签名文件，就可以使\n"
+"       用此命令。\n"
+
+#: Mailman/Commands/cmd_help.py:17
+#, docstring
+msgid ""
+"\n"
+"    help\n"
+"        Print this help message.\n"
+msgstr ""
+"\n"
+"    help\n"
+"        打印此帮助信息。\n"
+
+#: Mailman/Commands/cmd_help.py:47
+msgid "You can access your personal options via the following url:"
+msgstr "您可以通过下面的url访问您的个人选项："
+
+#: Mailman/Commands/cmd_info.py:17
+#, docstring
+msgid ""
+"\n"
+"    info\n"
+"        Get information about this mailing list.\n"
+msgstr ""
+"\n"
+"    info\n"
+"        获取此邮件列表的相关信息。\n"
+
+#: Mailman/Commands/cmd_info.py:39 Mailman/Commands/cmd_lists.py:62
+msgid "n/a"
+msgstr "n/a"
+
+#: Mailman/Commands/cmd_info.py:44
+msgid "List name:    %(listname)s"
+msgstr "列表名：    %(listname)s"
+
+#: Mailman/Commands/cmd_info.py:45
+msgid "Description:  %(description)s"
+msgstr "描述：  %(description)s"
+
+#: Mailman/Commands/cmd_info.py:46
+msgid "Postings to:  %(postaddr)s"
+msgstr "投递到：  %(postaddr)s"
+
+#: Mailman/Commands/cmd_info.py:47
+msgid "List Helpbot: %(requestaddr)s"
+msgstr "列表帮助机器人： %(requestaddr)s"
+
+#: Mailman/Commands/cmd_info.py:48
+msgid "List Owners:  %(owneraddr)s"
+msgstr "列表属主：  %(owneraddr)s"
+
+#: Mailman/Commands/cmd_info.py:49
+msgid "More information: %(listurl)s"
+msgstr "更多信息： %(listurl)s"
+
+#: Mailman/Commands/cmd_join.py:17
+#, docstring
+msgid "The `join' command is synonymous with `subscribe'.\n"
+msgstr "`join'命令和`subscribe'命令是相同的。\n"
+
+#: Mailman/Commands/cmd_leave.py:17
+#, docstring
+msgid "The `leave' command is synonymous with `unsubscribe'.\n"
+msgstr "`leave'命令和`unsubscribe'命令是相同的。\n"
+
+#: Mailman/Commands/cmd_lists.py:17
+#, docstring
+msgid ""
+"\n"
+"    lists\n"
+"        See a list of the public mailing lists on this GNU Mailman server.\n"
+msgstr ""
+"\n"
+"    lists\n"
+"        查看这个GNU Mailman邮件列表服务器上所有公共邮件列表的清单。\n"
+
+#: Mailman/Commands/cmd_lists.py:44
+msgid "Public mailing lists at %(hostname)s:"
+msgstr "%(hostname)s 上的公共邮件列表："
+
+#: Mailman/Commands/cmd_lists.py:66
+msgid "%(i)3d. List name:   %(realname)s"
+msgstr "%(i)3d. 列表名：   %(realname)s"
+
+#: Mailman/Commands/cmd_lists.py:67
+msgid "     Description: %(description)s"
+msgstr "     描述： %(description)s"
+
+#: Mailman/Commands/cmd_lists.py:68
+msgid "     Requests to: %(requestaddr)s"
+msgstr "     请求发送到地址: %(requestaddr)s"
+
+#: Mailman/Commands/cmd_password.py:17
+#, docstring
+msgid ""
+"\n"
+"    password [<oldpassword> <newpassword>] [address=<address>]\n"
+"        Retrieve or change your password.  With no arguments, this returns\n"
+"        your current password.  With arguments <oldpassword> and "
+"<newpassword>\n"
+"        you can change your password.\n"
+"\n"
+"        If you're posting from an address other than your membership "
+"address,\n"
+"        specify your membership address with `address=<address>' (no "
+"brackets\n"
+"        around the email address, and no quotes!).  Note that in this case "
+"the\n"
+"        response is always sent to the subscribed address.\n"
+msgstr ""
+"\n"
+"    password [<oldpassword> <newpassword>] [address=<address>]\n"
+"        取回或者更改您的密码.  当您不使用参数时，此命令返回您的当前密码。\n"
+"        当您提供 <oldpassword> 和 <newpassword>时，就能修改您的密码。\n"
+"\n"
+"        如果您当前发信的地址不是您的成员地址，请指定您的成员地址：\n"
+"        \"address=<address>\" (注意在email地址前后不用括号和引号。)\n"
+"         此时回信将会发送到您订阅时注册的地址。\n"
+
+#: Mailman/Commands/cmd_password.py:51 Mailman/Commands/cmd_password.py:66
+msgid "Your password is: %(password)s"
+msgstr "您的密码是: %(password)s"
+
+#: Mailman/Commands/cmd_password.py:57 Mailman/Commands/cmd_password.py:72
+#: Mailman/Commands/cmd_password.py:95 Mailman/Commands/cmd_password.py:121
+#: Mailman/Commands/cmd_set.py:149 Mailman/Commands/cmd_set.py:219
+msgid "You are not a member of the %(listname)s mailing list"
+msgstr "您不是邮件列表 %(listname)s 的成员"
+
+#: Mailman/Commands/cmd_password.py:85 Mailman/Commands/cmd_password.py:111
+msgid ""
+"You did not give the correct old password, so your password has not been\n"
+"changed.  Use the no argument version of the password command to retrieve "
+"your\n"
+"current password, then try again."
+msgstr ""
+"您没有提供正确的密码, 所以您的密码没有被改变\n"
+"您可以先取回您的密码(不使用参数)，然后再试一次。"
+
+#: Mailman/Commands/cmd_password.py:89 Mailman/Commands/cmd_password.py:115
+msgid ""
+"\n"
+"Usage:"
+msgstr ""
+"\n"
+"用法:"
+
+#: Mailman/Commands/cmd_remove.py:17
+#, docstring
+msgid "The `remove' command is synonymous with `unsubscribe'.\n"
+msgstr "命令 \"remove\" 和命令 \"unsubscribe\"是相同的.\n"
+
+#: Mailman/Commands/cmd_set.py:26
+msgid ""
+"\n"
+"    set ...\n"
+"        Set or view your membership options.\n"
+"\n"
+"        Use `set help' (without the quotes) to get a more detailed list of "
+"the\n"
+"        options you can change.\n"
+"\n"
+"        Use `set show' (without the quotes) to view your current option\n"
+"        settings.\n"
+msgstr ""
+"\n"
+"    set ...\n"
+"        重设或者查看您的成员设置.\n"
+"\n"
+"        使用 \"set help\" (不用引号) 可以取得您可以修改的更多的设置。\n"
+"\n"
+"        使用 \"set show\" (不用引号) 可以查看您当前的设置。\n"
+
+#: Mailman/Commands/cmd_set.py:37
+msgid ""
+"\n"
+"    set help\n"
+"        Show this detailed help.\n"
+"\n"
+"    set show [address=<address>]\n"
+"        View your current option settings.  If you're posting from an "
+"address\n"
+"        other than your membership address, specify your membership address\n"
+"        with `address=<address>' (no brackets around the email address, and "
+"no\n"
+"        quotes!).\n"
+"\n"
+"    set authenticate <password> [address=<address>]\n"
+"        To set any of your options, you must include this command first, "
+"along\n"
+"        with your membership password.  If you're posting from an address\n"
+"        other than your membership address, specify your membership address\n"
+"        with `address=<address>' (no brackets around the email address, and "
+"no\n"
+"        quotes!).\n"
+"\n"
+"    set ack on\n"
+"    set ack off\n"
+"        When the `ack' option is turned on, you will receive an\n"
+"        acknowledgement message whenever you post a message to the list.\n"
+"\n"
+"    set digest plain\n"
+"    set digest mime\n"
+"    set digest off\n"
+"        When the `digest' option is turned off, you will receive postings\n"
+"        immediately when they are posted.  Use `set digest plain' if "
+"instead\n"
+"        you want to receive postings bundled into a plain text digest\n"
+"        (i.e. RFC 1153 digest).  Use `set digest mime' if instead you want "
+"to\n"
+"        receive postings bundled together into a MIME digest.\n"
+"\n"
+"    set delivery on\n"
+"    set delivery off\n"
+"        Turn delivery on or off.  This does not unsubscribe you, but "
+"instead\n"
+"        tells Mailman not to deliver messages to you for now.  This is "
+"useful\n"
+"        if you're going on vacation.  Be sure to use `set delivery on' when\n"
+"        you return from vacation!\n"
+"\n"
+"    set myposts on\n"
+"    set myposts off\n"
+"        Use `set myposts off' to not receive copies of messages you post to\n"
+"        the list.  This has no effect if you're receiving digests.\n"
+"\n"
+"    set hide on\n"
+"    set hide off\n"
+"        Use `set hide on' to conceal your email address when people request\n"
+"        the membership list.\n"
+"\n"
+"    set duplicates on\n"
+"    set duplicates off\n"
+"        Use `set duplicates off' if you want Mailman to not send you "
+"messages\n"
+"        if your address is explicitly mentioned in the To: or Cc: fields of\n"
+"        the message.  This can reduce the number of duplicate postings you\n"
+"        will receive.\n"
+"\n"
+"    set reminders on\n"
+"    set reminders off\n"
+"        Use `set reminders off' if you want to disable the monthly password\n"
+"        reminder for this mailing list.\n"
+msgstr ""
+"\n"
+"    set help\n"
+"        显示详细的帮助信息.\n"
+"\n"
+"    set show [address=<address>]\n"
+"        查看您的当前设置.  如果您现在加入使用的不是您的成员地址，\n"
+"        请指定您的成员地址: \"address=<address>\"\n"
+"         (注意在email地址前后不用括号和引号。)\n"
+"\n"
+"    set authenticate <password> [address=<address>]\n"
+"        在进行任何设置前，您都得先使用这条命令，输入您的成员密码。\n"
+"        如果您现在加入使用的不是您的成员地址，请指定您的成员地址: \n"
+"        \"address=<address>\"(注意在email地址前后不用括号和引号。)\n"
+"\n"
+"    set ack on\n"
+"    set ack off\n"
+"        当\"ack\" 操作开启后，在您向列表发邮件后，您将收到一个确认信息。\n"
+"\n"
+"    set digest plain\n"
+"    set digest mime\n"
+"    set digest off\n"
+"        当操作\"digest\"关闭后，, 如果有人发信，您将能立即收到.\n"
+"        使用命令 \"set digest plain\" 后，信件将已纯文本(plain\n"
+"         text)(i.e. RFC 1153 digest)形式的摘要发给您。\n"
+"        使用命令 \"set digest mime\" 后，信件将以MIME(多用途的网际邮件\n"
+"        扩充协议)形式的摘要发给您。\n"
+"\n"
+"    set delivery on\n"
+"    set delivery off\n"
+"        能开启或者关闭接受信件.  这并不阻止您发信，只是告诉Mailman不要再收信了\n"
+"        当您度假或者外出时，这个命令可能很有用，但是，当您回来后，记住一定要再使用\n"
+"        \"set delivery on\"开启服务.\n"
+"\n"
+"    set myposts on\n"
+"    set myposts off\n"
+"        使用 \"set myposts off\" 后，您将不会再收到您发出去的信件的复制件\n"
+"        但是当您设置了接收摘要时，这个命令将不起作用.\n"
+"\n"
+"    set hide on\n"
+"    set hide off\n"
+"        使用 \"set hide on\" 后，当有人索取成员列表时，您能隐藏您的邮件地址\n"
+"\n"
+"    set duplicates on\n"
+"    set duplicates off\n"
+"        使用 \"set duplicates off\"后，当您的地址在邮件的 To:(收件人)或者 Cc:(抄送) 区域中时\n"
+"         您将不会收到邮件的复制件。这样能大量的减少您的信件量\n"
+"\n"
+"    set reminders on\n"
+"    set reminders off\n"
+"        使用 \"set reminders off\" 后，邮件列表的每月密码提示就会停止工作\n"
+
+#: Mailman/Commands/cmd_set.py:122
+msgid "Bad set command: %(subcmd)s"
+msgstr "错误的设置命令: %(subcmd)s"
+
+#: Mailman/Commands/cmd_set.py:151
+msgid "Your current option settings:"
+msgstr "您的当前操作设置:"
+
+#: Mailman/Commands/cmd_set.py:153 Mailman/Commands/cmd_set.py:191
+#: Mailman/Commands/cmd_set.py:194 Mailman/Commands/cmd_set.py:198
+#: Mailman/Commands/cmd_set.py:202
+msgid "off"
+msgstr "关闭"
+
+#: Mailman/Commands/cmd_set.py:153 Mailman/Commands/cmd_set.py:191
+#: Mailman/Commands/cmd_set.py:194 Mailman/Commands/cmd_set.py:198
+#: Mailman/Commands/cmd_set.py:202
+msgid "on"
+msgstr "开启"
+
+#: Mailman/Commands/cmd_set.py:154
+msgid "    ack %(onoff)s"
+msgstr "    确认 %(onoff)s"
+
+#: Mailman/Commands/cmd_set.py:160
+msgid "    digest plain"
+msgstr "    纯文本摘要"
+
+#: Mailman/Commands/cmd_set.py:162
+msgid "    digest mime"
+msgstr "    MIME摘要"
+
+#: Mailman/Commands/cmd_set.py:164
+msgid "    digest off"
+msgstr "    取消摘要"
+
+#: Mailman/Commands/cmd_set.py:169
+msgid "delivery on"
+msgstr "接收开启"
+
+#: Mailman/Commands/cmd_set.py:171 Mailman/Commands/cmd_set.py:174
+#: Mailman/Commands/cmd_set.py:177 Mailman/Commands/cmd_set.py:181
+msgid "delivery off"
+msgstr "接收关闭"
+
+#: Mailman/Commands/cmd_set.py:172
+msgid "by you"
+msgstr "由您"
+
+#: Mailman/Commands/cmd_set.py:175
+msgid "by the admin"
+msgstr "由管理员"
+
+#: Mailman/Commands/cmd_set.py:178
+msgid "due to bounces"
+msgstr "由于退信"
+
+#: Mailman/Commands/cmd_set.py:186
+msgid "    %(status)s (%(how)s on %(date)s)"
+msgstr ""
+
+#: Mailman/Commands/cmd_set.py:192
+msgid "    myposts %(onoff)s"
+msgstr "    我的信件 %(onoff)s"
+
+#: Mailman/Commands/cmd_set.py:195
+msgid "    hide %(onoff)s"
+msgstr "    隐藏 %(onoff)s"
+
+#: Mailman/Commands/cmd_set.py:199
+msgid "    duplicates %(onoff)s"
+msgstr "    复制 %(onoff)s"
+
+#: Mailman/Commands/cmd_set.py:203
+msgid "    reminders %(onoff)s"
+msgstr "    提示函 %(onoff)s"
+
+#: Mailman/Commands/cmd_set.py:224
+msgid "You did not give the correct password"
+msgstr "您没有输入正确的密码"
+
+#: Mailman/Commands/cmd_set.py:236 Mailman/Commands/cmd_set.py:283
+msgid "Bad argument: %(arg)s"
+msgstr "错误的参数: %(arg)s"
+
+#: Mailman/Commands/cmd_set.py:241 Mailman/Commands/cmd_set.py:261
+msgid "Not authenticated"
+msgstr "无法鉴别"
+
+#: Mailman/Commands/cmd_set.py:254
+msgid "ack option set"
+msgstr ""
+
+#: Mailman/Commands/cmd_set.py:286
+msgid "digest option set"
+msgstr ""
+
+#: Mailman/Commands/cmd_set.py:301
+msgid "delivery enabled"
+msgstr "启用投递"
+
+#: Mailman/Commands/cmd_set.py:304
+msgid "delivery disabled by user"
+msgstr "用户已经禁止投递"
+
+#: Mailman/Commands/cmd_set.py:316
+msgid "myposts option set"
+msgstr ""
+
+#: Mailman/Commands/cmd_set.py:327
+msgid "hide option set"
+msgstr "隐藏选项设置"
+
+#: Mailman/Commands/cmd_set.py:339
+msgid "duplicates option set"
+msgstr ""
+
+#: Mailman/Commands/cmd_set.py:351
+msgid "reminder option set"
+msgstr "提醒选项设置"
+
+#: Mailman/Commands/cmd_stop.py:17
+#, docstring
+msgid "stop is synonymous with the end command.\n"
+msgstr "stop 和end 命令相同\n"
+
+#: Mailman/Commands/cmd_subscribe.py:17
+#, docstring
+msgid ""
+"\n"
+"    subscribe [password] [digest|nodigest] [address=<address>]\n"
+"        Subscribe to this mailing list.  Your password must be given to\n"
+"        unsubscribe or change your options, but if you omit the password, "
+"one\n"
+"        will be generated for you.  You may be periodically reminded of "
+"your\n"
+"        password.\n"
+"\n"
+"        The next argument may be either: `nodigest' or `digest' (no "
+"quotes!).\n"
+"        If you wish to subscribe an address other than the address you sent\n"
+"        this request from, you may specify `address=<address>' (no brackets\n"
+"        around the email address, and no quotes!)\n"
+msgstr ""
+"\n"
+"    subscribe [password] [digest|nodigest] [address=<address>]\n"
+"        订阅此邮件列表.  如果您要取消订阅或者更改您的设置，您必须提供密码，\n"
+"        但如果您忽略密码，我们将为您生成一个。我们将会周期性的提醒您您的密码\n"
+"\n"
+"        下一个参数是: `nodigest' or `digest' (不用引号!).\n"
+"        如果您想订阅的地址不是您现在发信的地址您可以指定\n"
+"        `address=<address>' (注意在email地址前后不用括号和引号。)\n"
+
+#: Mailman/Commands/cmd_subscribe.py:62
+msgid "Bad digest specifier: %(arg)s"
+msgstr "指定了错误的分类: %(arg)s"
+
+#: Mailman/Commands/cmd_subscribe.py:92
+msgid "No valid address found to subscribe"
+msgstr "订阅的地址无效"
+
+#: Mailman/Commands/cmd_subscribe.py:113
+msgid ""
+"The email address you supplied is banned from this mailing list.\n"
+"If you think this restriction is erroneous, please contact the list\n"
+"owners at %(listowner)s."
+msgstr ""
+"您提供的邮件地址被禁止。如果您觉得这些限制是错误的，\n"
+"请联系列表管理员 %(listowner)s"
+
+#: Mailman/Commands/cmd_subscribe.py:119
+msgid ""
+"Mailman won't accept the given email address as a valid address.\n"
+"(E.g. it must have an @ in it.)"
+msgstr "您输入的地址不是Mailman的有效地址(如:地址中必须有@)。"
+
+#: Mailman/Commands/cmd_subscribe.py:124
+msgid ""
+"Your subscription is not allowed because\n"
+"the email address you gave is insecure."
+msgstr "由于您提供的邮件地址不可靠，所以您的订阅请求没有被批准。"
+
+#: Mailman/Commands/cmd_subscribe.py:129
+msgid "You are already subscribed!"
+msgstr "您已经订阅了!"
+
+#: Mailman/Commands/cmd_subscribe.py:133
+msgid "No one can subscribe to the digest of this list!"
+msgstr "此列表不支持订阅摘要!"
+
+#: Mailman/Commands/cmd_subscribe.py:136
+msgid "This list only supports digest subscriptions!"
+msgstr "此列表仅能订阅摘要！"
+
+#: Mailman/Commands/cmd_subscribe.py:142
+msgid ""
+"Your subscription request has been forwarded to the list administrator\n"
+"at %(listowner)s for review."
+msgstr "您的订阅要求已经转发给了列表管理员 %(listowner)s 。"
+
+#: Mailman/Commands/cmd_subscribe.py:147
+msgid "Subscription request succeeded."
+msgstr "订阅请求成功。"
+
+#: Mailman/Commands/cmd_unsubscribe.py:17
+#, docstring
+msgid ""
+"\n"
+"    unsubscribe [password] [address=<address>]\n"
+"        Unsubscribe from the mailing list.  If given, your password must "
+"match\n"
+"        your current password.  If omitted, a confirmation email will be "
+"sent\n"
+"        to the unsubscribing address. If you wish to unsubscribe an address\n"
+"        other than the address you sent this request from, you may specify\n"
+"        `address=<address>' (no brackets around the email address, and no\n"
+"        quotes!)\n"
+msgstr ""
+"\n"
+"    unsubscribe [password] [address=<address>]\n"
+"        从邮件列表中取消订阅.  使用此命令时，您必须提供一个正确的密码\n"
+"        如果不使用密码，必须提供一个正确的邮件地址。\n"
+"        如果您想取消的邮件地址不是您当前发信的地址，请指定新的地址\n"
+"        `address=<address>'  (注意在email地址前后不用括号和引号。)\n"
+
+#: Mailman/Commands/cmd_unsubscribe.py:62
+msgid "%(address)s is not a member of the %(listname)s mailing list"
+msgstr "%(address)s 不是邮件列表 %(listname)s 中的地址"
+
+#: Mailman/Commands/cmd_unsubscribe.py:69
+msgid ""
+"Your unsubscription request has been forwarded to the list administrator "
+"for\n"
+"approval."
+msgstr "您的取消订阅的请求已经发送给列表管理员去审查。"
+
+#: Mailman/Commands/cmd_unsubscribe.py:84
+msgid "You gave the wrong password"
+msgstr "您的密码错误"
+
+#: Mailman/Commands/cmd_unsubscribe.py:87
+msgid "Unsubscription request succeeded."
+msgstr "取消订阅成功"
+
+#: Mailman/Commands/cmd_who.py:27
+msgid ""
+"\n"
+"    who\n"
+"        See the non-hidden members of this mailing list.\n"
+"    who password\n"
+"        See everyone who is on this mailing list. The password is the\n"
+"        list's admin or moderator password.\n"
+msgstr ""
+
+#: Mailman/Commands/cmd_who.py:35
+msgid ""
+"\n"
+"    who password [address=<address>]\n"
+"        See the non-hidden members of this mailing list.  The roster is\n"
+"        limited to list members only, and you must supply your membership\n"
+"        password to retrieve it.  If you're posting from an address other\n"
+"        than your membership address, specify your membership address with\n"
+"        `address=<address>' (no brackets around the email address, and no\n"
+"        quotes!). If you provide the list's admin or moderator password,\n"
+"        hidden members will be included.\n"
+msgstr ""
+
+#: Mailman/Commands/cmd_who.py:46
+msgid ""
+"\n"
+"    who password\n"
+"        See everyone who is on this mailing list.  The roster is limited to\n"
+"        list administrators and moderators only; you must supply the list\n"
+"        admin or moderator password to retrieve the roster.\n"
+msgstr ""
+"\n"
+"    who password\n"
+"        查看所有在邮件列表中的人.  此命令仅限于列表管理员和仲裁员使用，您必须提供\n"
+"        管理员和仲裁员密码才能使用此命令\n"
+
+#: Mailman/Commands/cmd_who.py:128
+msgid "You are not allowed to retrieve the list membership."
+msgstr "您没资格查看邮件列表的成员。"
+
+#: Mailman/Commands/cmd_who.py:134
+msgid "This list has no members."
+msgstr "次列表没有成员。"
+
+#: Mailman/Commands/cmd_who.py:148
+msgid "Non-digest (regular) members:"
+msgstr "没订阅摘要(普通的)的成员:"
+
+#: Mailman/Commands/cmd_who.py:151
+msgid "Digest members:"
+msgstr "订阅了摘要的成员:"
+
+#: Mailman/Defaults.py:1742
+msgid "Arabic"
+msgstr "阿拉伯"
+
+#: Mailman/Defaults.py:1743
+msgid "Asturian"
+msgstr ""
+
+#: Mailman/Defaults.py:1744
+msgid "Catalan"
+msgstr "(西班牙)加泰罗尼亚语"
+
+#: Mailman/Defaults.py:1745
+msgid "Czech"
+msgstr "捷克语"
+
+#: Mailman/Defaults.py:1746
+msgid "Danish"
+msgstr "丹麦语"
+
+#: Mailman/Defaults.py:1747
+msgid "German"
+msgstr "德语"
+
+#: Mailman/Defaults.py:1748
+msgid "English (USA)"
+msgstr "英语(美式)"
+
+#: Mailman/Defaults.py:1749
+msgid "Spanish (Spain)"
+msgstr "西班牙语(西班牙)"
+
+#: Mailman/Defaults.py:1750
+msgid "Estonian"
+msgstr "爱沙尼亚语"
+
+#: Mailman/Defaults.py:1751
+msgid "Euskara"
+msgstr "喀拉海语"
+
+#: Mailman/Defaults.py:1752
+msgid "Persian"
+msgstr ""
+
+#: Mailman/Defaults.py:1753
+msgid "Finnish"
+msgstr "芬兰语"
+
+#: Mailman/Defaults.py:1754
+msgid "French"
+msgstr "法语"
+
+#: Mailman/Defaults.py:1755
+msgid "Galician"
+msgstr ""
+
+#: Mailman/Defaults.py:1756
+msgid "Greek"
+msgstr ""
+
+#: Mailman/Defaults.py:1757
+msgid "Hebrew"
+msgstr ""
+
+#: Mailman/Defaults.py:1758
+msgid "Croatian"
+msgstr "克罗地亚语"
+
+#: Mailman/Defaults.py:1759
+msgid "Hungarian"
+msgstr "匈牙利语"
+
+#: Mailman/Defaults.py:1760
+msgid "Interlingua"
+msgstr ""
+
+#: Mailman/Defaults.py:1761
+msgid "Italian"
+msgstr "意大利语"
+
+#: Mailman/Defaults.py:1762
+msgid "Japanese"
+msgstr "日语"
+
+#: Mailman/Defaults.py:1763
+msgid "Korean"
+msgstr "韩国语"
+
+#: Mailman/Defaults.py:1764
+msgid "Lithuanian"
+msgstr "立陶宛语"
+
+#: Mailman/Defaults.py:1765
+msgid "Dutch"
+msgstr "荷兰语"
+
+#: Mailman/Defaults.py:1766
+msgid "Norwegian"
+msgstr "挪威语"
+
+#: Mailman/Defaults.py:1767
+msgid "Polish"
+msgstr "波兰语"
+
+#: Mailman/Defaults.py:1768
+msgid "Portuguese"
+msgstr "葡萄牙语"
+
+#: Mailman/Defaults.py:1769
+msgid "Portuguese (Brazil)"
+msgstr "葡萄牙语(巴西)"
+
+#: Mailman/Defaults.py:1770
+msgid "Romanian"
+msgstr "罗马尼亚语"
+
+#: Mailman/Defaults.py:1771
+msgid "Russian"
+msgstr "俄语"
+
+#: Mailman/Defaults.py:1772
+msgid "Slovak"
+msgstr ""
+
+#: Mailman/Defaults.py:1773
+msgid "Slovenian"
+msgstr "斯洛文尼亚语"
+
+#: Mailman/Defaults.py:1774
+msgid "Serbian"
+msgstr "塞尔维亚语"
+
+#: Mailman/Defaults.py:1775
+msgid "Swedish"
+msgstr "瑞典语"
+
+#: Mailman/Defaults.py:1776
+msgid "Turkish"
+msgstr "土耳其语"
+
+#: Mailman/Defaults.py:1777
+msgid "Ukrainian"
+msgstr "乌克兰语"
+
+#: Mailman/Defaults.py:1778
+msgid "Vietnamese"
+msgstr "越南"
+
+#: Mailman/Defaults.py:1779
+msgid "Chinese (China)"
+msgstr "中文（中国）"
+
+#: Mailman/Defaults.py:1780
+msgid "Chinese (Taiwan)"
+msgstr "中文（台湾）"
+
+#: Mailman/Deliverer.py:53
+msgid ""
+"Note: Since this is a list of mailing lists, administrative\n"
+"notices like the password reminder will be sent to\n"
+"your membership administrative address, %(addr)s."
+msgstr ""
+"注意: 由于这是一个邮件列表的清单, 口令提示函等管理通知会被发\n"
+"送到您的成员管理地址, %(addr)s."
+
+#: Mailman/Deliverer.py:73
+msgid " (Digest mode)"
+msgstr " (摘要模式)"
+
+#: Mailman/Deliverer.py:79
+msgid "Welcome to the \"%(realname)s\" mailing list%(digmode)s"
+msgstr "欢迎加入\"%(realname)s\"的邮件列表 %(digmode)s"
+
+#: Mailman/Deliverer.py:89
+msgid "You have been unsubscribed from the %(realname)s mailing list"
+msgstr "您已经退订了 %(realname)s 的邮件列表"
+
+#: Mailman/Deliverer.py:116
+msgid "%(listfullname)s mailing list reminder"
+msgstr "%(listfullname)s 邮件列表提示函"
+
+#: Mailman/Deliverer.py:144
+msgid "No reason given"
+msgstr "没有给出原因"
+
+#: Mailman/Deliverer.py:168 Mailman/Deliverer.py:187
+msgid "Hostile subscription attempt detected"
+msgstr "检测到敌意的订阅尝试"
+
+#: Mailman/Deliverer.py:169
+msgid ""
+"%(address)s was invited to a different mailing\n"
+"list, but in a deliberate malicious attempt they tried to confirm the\n"
+"invitation to your list.  We just thought you'd like to know.  No further\n"
+"action by you is required."
+msgstr ""
+"%(address)s 被邀请加入另一个邮件列表, 但却恶意地\n"
+"将其对邀请的回复发送给您，我们估计您乐意了解这个情况但您不必采取任何行动。"
+
+#: Mailman/Deliverer.py:188
+msgid ""
+"You invited %(address)s to your list, but in a\n"
+"deliberate malicious attempt, they tried to confirm the invitation to a\n"
+"different list.  We just thought you'd like to know.  No further action by "
+"you\n"
+"is required."
+msgstr ""
+"您邀请了 %(address)s 加入您的列表, 但他们恶意\n"
+"尝试确认一个加入别的列表的邀请, 我们估计您乐意了解这个情况. 但您不必采取任何行动。"
+
+#: Mailman/Deliverer.py:221
+msgid "%(listname)s mailing list probe message"
+msgstr "%(listname)s 的邮件列表探测消息"
+
+#: Mailman/Errors.py:122
+msgid "For some unknown reason"
+msgstr "由于未知原因"
+
+#: Mailman/Errors.py:128 Mailman/Errors.py:151
+msgid "Your message was rejected"
+msgstr "您的消息被拒绝了"
+
+#: Mailman/Gui/Archive.py:25
+msgid "Archiving Options"
+msgstr "存档选项"
+
+#: Mailman/Gui/Archive.py:31
+msgid "List traffic archival policies."
+msgstr "列表通讯存档策略"
+
+#: Mailman/Gui/Archive.py:34
+msgid "Archive messages?"
+msgstr "存档消息吗?"
+
+#: Mailman/Gui/Archive.py:36
+msgid "private"
+msgstr "私人的"
+
+#: Mailman/Gui/Archive.py:36
+msgid "public"
+msgstr "公开的"
+
+#: Mailman/Gui/Archive.py:37
+msgid "Is archive file source for public or private archival?"
+msgstr "存档文件是公开的还是私人的?"
+
+#: Mailman/Gui/Archive.py:40 Mailman/Gui/Digest.py:78
+msgid "Monthly"
+msgstr "每月"
+
+#: Mailman/Gui/Archive.py:40 Mailman/Gui/Digest.py:78
+msgid "Quarterly"
+msgstr "每季度"
+
+#: Mailman/Gui/Archive.py:40 Mailman/Gui/Digest.py:78
+msgid "Yearly"
+msgstr "每年"
+
+#: Mailman/Gui/Archive.py:41 Mailman/Gui/Digest.py:79
+msgid "Daily"
+msgstr "每日"
+
+#: Mailman/Gui/Archive.py:41 Mailman/Gui/Digest.py:79
+msgid "Weekly"
+msgstr "每周"
+
+#: Mailman/Gui/Archive.py:43
+msgid "How often should a new archive volume be started?"
+msgstr "每隔多久启动一个新的存档卷?"
+
+#: Mailman/Gui/Autoresponse.py:31
+msgid "Auto-responder"
+msgstr "自动回复器"
+
+#: Mailman/Gui/Autoresponse.py:39
+msgid ""
+"Auto-responder characteristics.<p>\n"
+"\n"
+"In the text fields below, string interpolation is performed with\n"
+"the following key/value substitutions:\n"
+"<p><ul>\n"
+"    <li><b>listname</b> - <em>gets the name of the mailing list</em>\n"
+"    <li><b>listurl</b> - <em>gets the list's listinfo URL</em>\n"
+"    <li><b>requestemail</b> - <em>gets the list's -request address</em>\n"
+"    <li><b>owneremail</b> - <em>gets the list's -owner address</em>\n"
+"</ul>\n"
+"\n"
+"<p>For each text field, you can either enter the text directly into the "
+"text\n"
+"box, or you can specify a file on your local system to upload as the text."
+msgstr ""
+"自动回复器特征.<p>\n"
+"\n"
+"在下面的文字域内将执行如下的键/值替换:\n"
+"<p><ul>\n"
+"    <li><b>listname</b> - <em>得到邮件列表的名字</em>\n"
+"    <li><b>listurl</b> - <em>得到列表的信息页URL</em>\n"
+"    <li><b>requestemail</b> - <em>得到列表的请求地址</em>\n"
+"    <li><b>owneremail</b> - <em>得到列表的主人地址</em>\n"
+"</ul>\n"
+"\n"
+"<p>在每个文字域内,您可以直接向文本框中键入文本也可以指定一个本地文件, 上传后\n"
+"作为相应的文本."
+
+#: Mailman/Gui/Autoresponse.py:55
+msgid ""
+"Should Mailman send an auto-response to mailing list\n"
+"             posters?"
+msgstr "Mailman是否向邮件列表的发言者发送自动回复?"
+
+#: Mailman/Gui/Autoresponse.py:60
+msgid "Auto-response text to send to mailing list posters."
+msgstr "向邮件列表发言者发送的自动回复文本."
+
+#: Mailman/Gui/Autoresponse.py:63
+msgid ""
+"Should Mailman send an auto-response to emails sent to the\n"
+"             -owner address?"
+msgstr "Mailman是否就发向列表所有者地址的邮件发送自动回复?"
+
+#: Mailman/Gui/Autoresponse.py:68
+msgid "Auto-response text to send to -owner emails."
+msgstr "向列表所有者发送的自动回复文本."
+
+#: Mailman/Gui/Autoresponse.py:71
+msgid "Yes, w/discard"
+msgstr "是的,放弃"
+
+#: Mailman/Gui/Autoresponse.py:71
+msgid "Yes, w/forward"
+msgstr "是的,继续"
+
+#: Mailman/Gui/Autoresponse.py:72
+msgid ""
+"Should Mailman send an auto-response to emails sent to the\n"
+"             -request address?  If you choose yes, decide whether you want\n"
+"             Mailman to discard the original email, or forward it on to the\n"
+"             system as a normal mail command."
+msgstr ""
+"Mailman是否就发向请求地址的邮件发送自动回复?\n"
+"             如果您选择发送,请决定Mailman放弃原始邮件,还是继续把该邮件当做\n"
+"             正常的邮件发送到系统中."
+
+#: Mailman/Gui/Autoresponse.py:79
+msgid "Auto-response text to send to -request emails."
+msgstr "向请求邮件发送的自动回复文本."
+
+#: Mailman/Gui/Autoresponse.py:82
+msgid ""
+"Number of days between auto-responses to either the mailing\n"
+"             list or -request/-owner address from the same poster.  Set to\n"
+"             zero (or negative) for no grace period (i.e. auto-respond to\n"
+"             every message)."
+msgstr ""
+"向邮件列表或向相同发言者的请求或所有者地址发送自动回复\n"
+"             间隔的天数. 设置成零(或负数)则没有宽限期 (也就是说向每条消息\n"
+"             发送自动回复)."
+
+#: Mailman/Gui/Bounce.py:26
+msgid "Bounce processing"
+msgstr "退信处理"
+
+#: Mailman/Gui/Bounce.py:32
+msgid ""
+"These policies control the automatic bounce processing system\n"
+"            in Mailman.  Here's an overview of how it works.\n"
+"\n"
+"            <p>When a bounce is received, Mailman tries to extract two "
+"pieces\n"
+"            of information from the message: the address of the member the\n"
+"            message was intended for, and the severity of the problem "
+"causing\n"
+"            the bounce.  The severity can be either <em>hard</em> or\n"
+"            <em>soft</em> meaning either a fatal error occurred, or a\n"
+"            transient error occurred.  When in doubt, a hard severity is "
+"used.\n"
+"\n"
+"            <p>If no member address can be extracted from the bounce, then "
+"the\n"
+"            bounce is usually discarded.  Otherwise, each member is assigned "
+"a\n"
+"            <em>bounce score</em> and every time we encounter a bounce from\n"
+"            this member we increment the score.  Hard bounces increment by "
+"1\n"
+"            while soft bounces increment by 0.5.  We only increment the "
+"bounce\n"
+"            score once per day, so even if we receive ten hard bounces from "
+"a\n"
+"            member per day, their score will increase by only 1 for that "
+"day.\n"
+"\n"
+"            <p>When a member's bounce score is greater than the\n"
+"            <a href=\"?VARHELP=bounce/bounce_score_threshold\">bounce score\n"
+"            threshold</a>, the subscription is disabled.  Once disabled, "
+"the\n"
+"            member will not receive any postings from the list until their\n"
+"            membership is explicitly re-enabled (either by the list\n"
+"            administrator or the user).  However, they will receive "
+"occasional\n"
+"            reminders that their membership has been disabled, and these\n"
+"            reminders will include information about how to re-enable their\n"
+"            membership.\n"
+"\n"
+"            <p>You can control both the\n"
+"            <a "
+"href=\"?VARHELP=bounce/bounce_you_are_disabled_warnings\">number\n"
+"            of reminders</a> the member will receive and the\n"
+"            <a "
+"href=\"?VARHELP=bounce/bounce_you_are_disabled_warnings_interval\"\n"
+"            >frequency</a> with which these reminders are sent.\n"
+"\n"
+"            <p>There is one other important configuration variable; after a\n"
+"            certain period of time -- during which no bounces from the "
+"member\n"
+"            are received -- the bounce information is\n"
+"            <a href=\"?VARHELP=bounce/bounce_info_stale_after\">considered\n"
+"            stale</a> and discarded.  Thus by adjusting this value, and the\n"
+"            score threshold, you can control how quickly bouncing members "
+"are\n"
+"            disabled.  You should tune both of these to the frequency and\n"
+"            traffic volume of your list."
+msgstr ""
+"这些策略控制Mailman中的自动退信处理系统。下面是对其工作方式的\n"
+"            简要说明.\n"
+"\n"
+"            <p>一旦收到一封退信, Mailman尝试从中抽取两条信息: 消息的目的成员\n"
+"            的邮件地址, 以及导致退信的问题的严重性. 严重性可能是 <em>严重</em> 或\n"
+"            <em>轻微</em> 这分别意味着致命错误, 或仅是传送错误. 不能决定时就认为是\n"
+"            \"严重\". \n"
+"\n"
+"            <p>如果退信中得不到成员地址, 那么这封退信通常被忽略掉. 另外, 每\n"
+"            个成员都被赋予一个<em>退信值</em> 且每当遇到一个来自某成员的退信,\n"
+"            我们就增加该成员的退信值.  严重的退信增加1, 而轻微的退信增加0.5. \n"
+"            每天我们只增加一次退信值, 因此急事我们一天内从一个成员处收到10\n"
+"            退信, 他的退信值当天也仅增加1.\n"
+"\n"
+"            <p>若一个成员的退信值大于            <a "
+"href=\"?VARHELP=bounce/bounce_score_threshold\">退信值\n"
+"            阈值</a>, 那么他的订阅就被禁止了, 一旦被禁止, \n"
+"            这个成员就不在收到列表里的任何消息, 除非他被列表管理员或该用户\n"
+"            自己显式地重新开禁然而,他会收到相应的提示函,告知他已被禁止,\n"
+"            , 提示函里同时会包含关于用户如何开禁的信息.\n"
+"\n"
+"            <p>你既可控制该成员收到的            <a "
+"href=\"?VARHELP=bounce/bounce_you_are_disabled_warnings\">提示函            "
+"数量</a>也可控制提示函发送的 \n"
+"            <a "
+"href=\"?VARHELP=bounce/bounce_you_are_disabled_warnings_interval\"\n"
+"            >频率</a>.\n"
+"\n"
+"            <p>有几个重要的配置变量; 若一段时间不再从该用户处收到退信\n"
+"            ,退信信息就被            <a "
+"href=\"?VARHELP=bounce/bounce_info_stale_after\">认为            过期</a> 而被取消.  "
+"因此通过调整这个时长, 和刚才提到\n"
+"            的分数阈值, 你就能控制退信的用户多快被禁止. 您应该根据您的列表的\n"
+"            发信频度和通信量同时调节这两个值."
+
+#: Mailman/Gui/Bounce.py:75
+msgid "Bounce detection sensitivity"
+msgstr "退信检测灵敏度"
+
+#: Mailman/Gui/Bounce.py:78
+msgid "Should Mailman perform automatic bounce processing?"
+msgstr "Mailman是否执行自动退信处理?"
+
+#: Mailman/Gui/Bounce.py:79
+msgid ""
+"By setting this value to <em>No</em>, you disable all\n"
+"             automatic bounce processing for this list, however bounce\n"
+"             messages will still be discarded so that the list "
+"administrator\n"
+"             isn't inundated with them."
+msgstr ""
+"把这个值设置为<em>,否则设为</em>, 你就禁止了这个列表所有的\n"
+"             自动退信处, 然而为了使列表管理员免于被退信消息淹没, 它们\n"
+"             仍然会被忽略"
+
+#: Mailman/Gui/Bounce.py:85
+msgid ""
+"The maximum member bounce score before the member's\n"
+"             subscription is disabled.  This value can be a floating point\n"
+"             number."
+msgstr "用户退信数的阈值（超过此值您的服务将被关闭）, 该值可设为浮点数。"
+
+#: Mailman/Gui/Bounce.py:88
+msgid ""
+"Each subscriber is assigned a bounce score, as a floating\n"
+"             point number.  Whenever Mailman receives a bounce from a list\n"
+"             member, that member's score is incremented.  Hard bounces "
+"(fatal\n"
+"             errors) increase the score by 1, while soft bounces (temporary\n"
+"             errors) increase the score by 0.5.  Only one bounce per day\n"
+"             counts against a member's score, so even if 10 bounces are\n"
+"             received for a member on the same day, their score will "
+"increase\n"
+"             by just 1.\n"
+"\n"
+"             This variable describes the upper limit for a member's bounce\n"
+"             score, above which they are automatically disabled, but not\n"
+"             removed from the mailing list."
+msgstr ""
+"每个订阅者都被赋予一个退信值, 这是一个浮点数. 每当Mailman从\n"
+"             某列表用户那里收到一封退信, 该用户的分值就被增加.  严重退信 (致命\n"
+"             错误) 使分数加1, 而轻微退信 (暂时错误) 使分数增加0.5. 每个用户每\n"
+"             天只被计算一封退信, 故而即使在一天内收到10封来自同一用户的退信, \n"
+"             他的分数也仅会增1\n"
+"\n"
+"             这个变量描述了用户退信值的上限, 退信值高于此值的用户自动被禁止, \n"
+"             但并非永久从列表中除名."
+
+#: Mailman/Gui/Bounce.py:102
+msgid ""
+"The number of days after which a member's bounce information\n"
+"             is discarded, if no new bounces have been received in the\n"
+"             interim.  This value must be an integer."
+msgstr ""
+"取消某成员退信信息所需天数，在此天数内若系统未收到新的退信，则丢弃以前保留的退信信息。\n"
+"该值应为一个整数。"
+
+#: Mailman/Gui/Bounce.py:107
+msgid ""
+"How many <em>Your Membership Is Disabled</em> warnings a\n"
+"             disabled member should get before their address is removed "
+"from\n"
+"             the mailing list.  Set to 0 to immediately remove an address "
+"from\n"
+"             the list once their bounce score exceeds the threshold.  This\n"
+"             value must be an integer."
+msgstr ""
+"一个被禁止成员的地址被移出邮件列表前, 收到<em>你的成员\n"
+"             资格被禁止</em> 警告的次数. 如果设置成0, 则一旦某成员的退信值超过\n"
+"             阈值, 他的地址便立即被移出列表。"
+
+#: Mailman/Gui/Bounce.py:114
+msgid ""
+"The number of days between sending the <em>Your Membership\n"
+"             Is Disabled</em> warnings.  This value must be an integer."
+msgstr "发出<em>你的成员资格被禁止</em>警告的间隔天数. 此值必须是整数。"
+
+#: Mailman/Gui/Bounce.py:117 Mailman/Gui/General.py:332
+msgid "Notifications"
+msgstr "通告"
+
+#: Mailman/Gui/Bounce.py:121
+msgid ""
+"Should Mailman send you, the list owner, any bounce messages\n"
+"             that failed to be detected by the bounce processor?  "
+"<em>Yes</em>\n"
+"             is recommended."
+msgstr ""
+"Mainman是否向您(列表所有者)发送退信处理器检测失败的退信消息?\n"
+"                建议选择<em>是</em>。"
+
+#: Mailman/Gui/Bounce.py:124
+msgid ""
+"While Mailman's bounce detector is fairly robust, it's\n"
+"             impossible to detect every bounce format in the world.  You\n"
+"             should keep this variable set to <em>Yes</em> for two reasons: "
+"1)\n"
+"             If this really is a permanent bounce from one of your members,\n"
+"             you should probably manually remove them from your list, and "
+"2)\n"
+"             you might want to send the message on to the Mailman "
+"developers\n"
+"             so that this new format can be added to its known set.\n"
+"\n"
+"             <p>If you really can't be bothered, then set this variable to\n"
+"             <em>No</em> and all non-detected bounces will be discarded\n"
+"             without further processing.\n"
+"\n"
+"             <p><b>Note:</b> This setting will also affect all messages "
+"sent\n"
+"             to your list's -admin address.  This address is deprecated and\n"
+"             should never be used, but some people may still send mail to "
+"this\n"
+"             address.  If this happens, and this variable is set to\n"
+"             <em>No</em> those messages too will get discarded.  You may "
+"want\n"
+"             to set up an\n"
+"             <a "
+"href=\"?VARHELP=autoreply/autoresponse_admin_text\">autoresponse\n"
+"             message</a> for email to the -owner and -admin address."
+msgstr ""
+"虽然Mainman的退信检测器相当强大, 它仍不可能检测世界上\n"
+"             所有的退信格式.  鉴于如下两点理由, 你应该将这个变量设为<em>是</em>:\n"
+"             1) 如果这真的是来自某成员的永久性退信, 你应该手工移除这个成员, 而且\n"
+"              2)你可能想要向Mailman的开发者发一封邮件, 以便这种新的格式被添加到\n"
+"             已知格式集合中去. \n"
+"\n"
+"             <p>如果您真的不希望被打扰, 那么把这个变量设置成<em>否</em>, 这样这\n"
+"             样没有被正确检测的退信就直接被忽略, 而不会进行任何进一步的处理. \n"
+"\n"
+"             <p><b>注意:</b> 这个设置同样会影响发向您的列表的管理地址的消息. \n"
+"             这个地址是不被推荐的而且不应该收到任何消息但仍然可能有人给这个地址\n"
+"             发信一旦这种情况发生了, 同时这个变量被设置成<em>否</em>, 那么那些消息就被\n"
+"             忽略.  你可可能希望给列表的所有者地址和管理地址设置一个             <a "
+"href=\"?VARHELP=autoreply/autoresponse_admin_text\">自动             回复消息</a>."
+
+#: Mailman/Gui/Bounce.py:147
+msgid ""
+"Should Mailman notify you, the list owner, when bounces\n"
+"             cause a member's bounce score to be incremented?"
+msgstr ""
+
+#: Mailman/Gui/Bounce.py:149
+msgid ""
+"Setting this value to <em>Yes</em> will cause Mailman to\n"
+"             send a notice including a copy of the bounce message to the "
+"list\n"
+"             owners whenever a bounce increments a member's bounce score "
+"but\n"
+"             doesn't cause a disable or a probe to be sent."
+msgstr ""
+
+#: Mailman/Gui/Bounce.py:156
+msgid ""
+"Should Mailman notify you, the list owner, when bounces\n"
+"             cause a member's subscription to be disabled?"
+msgstr "当用户的订阅由于退信而被禁止, Mailman是否通知你?"
+
+#: Mailman/Gui/Bounce.py:158
+msgid ""
+"By setting this value to <em>No</em>, you turn off\n"
+"             notification messages that are normally sent to the list "
+"owners\n"
+"             when a member's delivery is disabled due to excessive bounces.\n"
+"             An attempt to notify the member will always be made."
+msgstr ""
+"把这个值设置成<em>否</em>, 你就关闭了一个通知服务，该服务用于在某一个用户\n"
+"因为过多的退信而将被暂时禁止时通知列表属主. 但系统总是尝试通知将被禁止的用户."
+
+#: Mailman/Gui/Bounce.py:165
+msgid ""
+"Should Mailman notify you, the list owner, when bounces\n"
+"             cause a member to be unsubscribed?"
+msgstr "当用户由于退信而被退订时, Mailman是否通知您(列表所有者)?"
+
+#: Mailman/Gui/Bounce.py:167
+msgid ""
+"By setting this value to <em>No</em>, you turn off\n"
+"             notification messages that are normally sent to the list "
+"owners\n"
+"             when a member is unsubscribed due to excessive bounces.  An\n"
+"             attempt to notify the member will always be made."
+msgstr ""
+"把这个值设置成<em>否</em>, 你就关闭了当一个用户由于\n"
+"             过多的退信而被退订时,通常发向列表所有者的通知消息的服务. 但系统总是尝\n"
+"             试通知将被禁止的用户."
+
+#: Mailman/Gui/Bounce.py:194
+msgid ""
+"Bad value for <a href=\"?VARHELP=bounce/%(property)s\"\n"
+"                >%(property)s</a>: %(val)s"
+msgstr ""
+"以下变量被赋予非法值:<a href=\"?VARHELP=bounce/%(property)s\"\n"
+"                >%(property)s</a>: %(val)s"
+
+#: Mailman/Gui/ContentFilter.py:30
+msgid "Content&nbsp;filtering"
+msgstr "内容过滤"
+
+#: Mailman/Gui/ContentFilter.py:37
+msgid "Forward to List Owner"
+msgstr "向前到列表所有者"
+
+#: Mailman/Gui/ContentFilter.py:39
+msgid "Preserve"
+msgstr "滞留"
+
+#: Mailman/Gui/ContentFilter.py:42
+msgid ""
+"Policies concerning the content of list traffic.\n"
+"\n"
+"            <p>Content filtering works like this: when a message is\n"
+"            received by the list and you have enabled content filtering, "
+"the\n"
+"            individual attachments are first compared to the\n"
+"            <a href=\"?VARHELP=contentfilter/filter_mime_types\">filter\n"
+"            types</a>.  If the attachment type matches an entry in the "
+"filter\n"
+"            types, it is discarded.\n"
+"\n"
+"            <p>Then, if there are <a\n"
+"            href=\"?VARHELP=contentfilter/pass_mime_types\">pass types</a>\n"
+"            defined, any attachment type that does <em>not</em> match a\n"
+"            pass type is also discarded.  If there are no pass types "
+"defined,\n"
+"            this check is skipped.\n"
+"\n"
+"            <p>After this initial filtering, any <tt>multipart</tt>\n"
+"            attachments that are empty are removed.  If the outer message "
+"is\n"
+"            left empty after this filtering, then the whole message is\n"
+"            discarded.\n"
+"\n"
+"            <p> Then, each <tt>multipart/alternative</tt> section will\n"
+"            be replaced by just the first alternative that is non-empty "
+"after\n"
+"            filtering if\n"
+"            <a href=\"?VARHELP=contentfilter/collapse_alternatives\"\n"
+"            >collapse_alternatives</a> is enabled.\n"
+"\n"
+"            <p>Finally, any <tt>text/html</tt> parts that are left in the\n"
+"            message may be converted to <tt>text/plain</tt> if\n"
+"            <a href=\"?VARHELP=contentfilter/convert_html_to_plaintext\"\n"
+"            >convert_html_to_plaintext</a> is enabled and the site is\n"
+"            configured to allow these conversions."
+msgstr ""
+
+#: Mailman/Gui/ContentFilter.py:75
+msgid ""
+"Should Mailman filter the content of list traffic according\n"
+"             to the settings below?"
+msgstr "Mainman是否安下列设置过滤列表中的消息内容?"
+
+#: Mailman/Gui/ContentFilter.py:79
+msgid ""
+"Remove message attachments that have a matching content\n"
+"             type."
+msgstr "移除类型匹配的附件."
+
+#: Mailman/Gui/ContentFilter.py:82
+msgid ""
+"Use this option to remove each message attachment that\n"
+"             matches one of these content types.  Each line should contain "
+"a\n"
+"             string naming a MIME <tt>type/subtype</tt>,\n"
+"             e.g. <tt>image/gif</tt>.  Leave off the subtype to remove all\n"
+"             parts with a matching major content type, e.g. <tt>image</tt>.\n"
+"\n"
+"             <p>Blank lines are ignored.\n"
+"\n"
+"             <p>See also <a href=\"?VARHELP=contentfilter/pass_mime_types\"\n"
+"             >pass_mime_types</a> for a content type whitelist."
+msgstr ""
+"使用这个选项来移除以下类型的附件. 每行应包含一个MIME \n"
+"             <tt>类型/子类型</tt>的名字, 例如 <tt>image/gif</tt>.  若省略子\n"
+"             类型, 则将移除所有匹配主类型的附件, 比如 <tt>image</tt>.\n"
+"\n"
+"             <p>空行会被忽略.\n"
+"\n"
+"             <p>参见 <a href=\"?VARHELP=contentfilter/pass_mime_types\"        "
+"     >pass_mime_types</a>, 那里有安全附件类型的列表."
+
+#: Mailman/Gui/ContentFilter.py:94
+msgid ""
+"Remove message attachments that don't have a matching\n"
+"             content type.  Leave this field blank to skip this filter\n"
+"             test."
+msgstr ""
+"移除内容类型不匹配的附件.\n"
+"             若想跳过过滤器测试则请将此项留空."
+
+#: Mailman/Gui/ContentFilter.py:98
+msgid ""
+"Use this option to remove each message attachment that does\n"
+"             not have a matching content type.  Requirements and formats "
+"are\n"
+"             exactly like <a "
+"href=\"?VARHELP=contentfilter/filter_mime_types\"\n"
+"             >filter_mime_types</a>.\n"
+"\n"
+"             <p><b>Note:</b> if you add entries to this list but don't add\n"
+"             <tt>multipart</tt> to this list, any messages with attachments\n"
+"             will be rejected by the pass filter."
+msgstr ""
+"使用此项来移除内容类型不匹配的附件.             要求和格式跟             <a "
+"href=\"?VARHELP=contentfilter/filter_mime_types\"\n"
+"             >过滤MIME类型</a>.\n"
+"\n"
+"             <p><b>注意:</b> 如果你向此清单增加了项目但没有同时增加\n"
+"             <tt>multipart</tt>, 所有带附件的消息都将被过滤掉"
+
+#: Mailman/Gui/ContentFilter.py:108
+msgid ""
+"Remove message attachments that have a matching filename\n"
+"             extension."
+msgstr "移除有匹配的扩展名的附件."
+
+#: Mailman/Gui/ContentFilter.py:112
+msgid ""
+"Remove message attachments that don't have a matching\n"
+"             filename extension.  Leave this field blank to skip this "
+"filter\n"
+"             test."
+msgstr "移除没有匹配的扩展名的消息附件. 如果您想跳过过滤器，请留空此项."
+
+#: Mailman/Gui/ContentFilter.py:117
+msgid ""
+"Should Mailman collapse multipart/alternative to its\n"
+"             first part content?"
+msgstr ""
+
+#: Mailman/Gui/ContentFilter.py:121
+msgid ""
+"Should Mailman convert <tt>text/html</tt> parts to plain\n"
+"             text?  This conversion happens after MIME attachments have "
+"been\n"
+"             stripped."
+msgstr ""
+"Mailman是否将<tt>text/html</tt>部分转化成纯文本?\n"
+"             此种转换在MIME附件被剥离时发生."
+
+#: Mailman/Gui/ContentFilter.py:127
+msgid ""
+"Action to take when a message matches the content filtering\n"
+"             rules."
+msgstr "当消息内容与内容过滤规则相符时过滤."
+
+#: Mailman/Gui/ContentFilter.py:130
+msgid ""
+"One of these actions is taken when the message matches one of\n"
+"             the content filtering rules, meaning, the top-level\n"
+"             content type matches one of the <a\n"
+"             href=\"?VARHELP=contentfilter/filter_mime_types\"\n"
+"             >filter_mime_types</a>, or the top-level content type does\n"
+"             <strong>not</strong> match one of the\n"
+"             <a href=\"?VARHELP=contentfilter/pass_mime_types\"\n"
+"             >pass_mime_types</a>, or if after filtering the subparts of "
+"the\n"
+"             message, the message ends up empty.\n"
+"\n"
+"             <p>Note this action is not taken if after filtering the "
+"message\n"
+"             still contains content.  In that case the message is always\n"
+"             forwarded on to the list membership.\n"
+"\n"
+"             <p>When messages are discarded, a log entry is written\n"
+"             containing the Message-ID of the discarded message.  When\n"
+"             messages are rejected or forwarded to the list owner, a reason\n"
+"             for the rejection is included in the bounce message to the\n"
+"             original author.  When messages are preserved, they are saved "
+"in\n"
+"             a special queue directory on disk for the site administrator "
+"to\n"
+"             view (and possibly rescue) but otherwise discarded.  This last\n"
+"             option is only available if enabled by the site\n"
+"             administrator."
+msgstr ""
+"当消息与内容过滤规则之一匹配, 将采取下列动作之一:\n"
+"             , 也就是说顶级内容类型与             <a\n"
+"             href=\"?VARHELP=contentfilter/filter_mime_types\"             "
+">过滤MIME类型</a>之一匹配, 或者顶级内容类型\n"
+"             <strong>不</strong>匹配             <a "
+"href=\"?VARHELP=contentfilter/pass_mime_types\"             "
+">允许通过MIME类型</a>中的任何一个,或者子部分被过滤后\n"
+"             该消息已经变成了一个空消息.\n"
+"\n"
+"             <p>请注意如果过滤后的消息仍然还有内容, 则次动作不会被采取.  在那\n"
+"             种情况下消息总会被发送给列表成员.\n"
+"\n"
+"             <p>当消息被放弃时, 会写入一个包含被放弃消息ID的消息项. 当消息被\n"
+"             拒绝或者发向了列表所有者时, 原作者将收到包含被拒原因的退信. 当\n"
+"             消息被滞留, 它被存储在磁盘上一个特殊的队列目录以便管理员查看\n"
+"             (也可能恢复这个消息), 但除此情况消息会被放弃.  最后这种选项只\n"
+"             有当站点管理员允许时才有效."
+
+#: Mailman/Gui/ContentFilter.py:171
+msgid "Bad MIME type ignored: %(spectype)s"
+msgstr "被忽略的错误的MIME类型：%(spectype)s"
+
+#: Mailman/Gui/Digest.py:36
+msgid "Digest options"
+msgstr "摘要选项"
+
+#: Mailman/Gui/Digest.py:44
+msgid "Batched-delivery digest characteristics."
+msgstr "打包投递摘要的特性"
+
+#: Mailman/Gui/Digest.py:47
+msgid "Can list members choose to receive list traffic bunched in digests?"
+msgstr "列表成员可以选择接收打包成摘要的列表通讯吗？"
+
+#: Mailman/Gui/Digest.py:51
+msgid "Digest"
+msgstr "摘要"
+
+#: Mailman/Gui/Digest.py:51
+msgid "Regular"
+msgstr "一般"
+
+#: Mailman/Gui/Digest.py:52
+msgid "Which delivery mode is the default for new users?"
+msgstr "向用户邮递时的默认方式是什么？"
+
+#: Mailman/Gui/Digest.py:55
+msgid "MIME"
+msgstr "MIME"
+
+#: Mailman/Gui/Digest.py:55
+msgid "Plain"
+msgstr "普通"
+
+#: Mailman/Gui/Digest.py:56
+msgid "When receiving digests, which format is default?"
+msgstr "当受到摘要时，默认的格式是什么？"
+
+#: Mailman/Gui/Digest.py:59
+msgid ""
+"How big in Kb should a digest be before it gets sent out?  0 implies no "
+"maximum size."
+msgstr ""
+
+#: Mailman/Gui/Digest.py:63
+msgid ""
+"Should a digest be dispatched daily when the size threshold isn't reached?"
+msgstr "当没有达到摘要大小的上限时，摘要需要每天投递吗？"
+
+#: Mailman/Gui/Digest.py:67
+msgid "Header added to every digest"
+msgstr "加在每个摘要上的头部"
+
+#: Mailman/Gui/Digest.py:68
+msgid ""
+"Text attached (as an initial message, before the table of contents) to the "
+"top of digests. "
+msgstr "加在摘要顶部的文本(在内容表格之前作为开始消息)。 "
+
+#: Mailman/Gui/Digest.py:73
+msgid "Footer added to every digest"
+msgstr "加在每个摘要上的尾部信息"
+
+#: Mailman/Gui/Digest.py:74
+msgid "Text attached (as a final message) to the bottom of digests. "
+msgstr "加在摘要尾部的文本(作为结束消息)。 "
+
+#: Mailman/Gui/Digest.py:80
+msgid "How often should a new digest volume be started?"
+msgstr "多长时间开始新的一册摘要？"
+
+#: Mailman/Gui/Digest.py:81
+msgid ""
+"When a new digest volume is started, the volume number is\n"
+"             incremented and the issue number is reset to 1."
+msgstr ""
+"当一册新的摘要开始时，册号增加\n"
+"             发行号被重置为1。"
+
+#: Mailman/Gui/Digest.py:85
+msgid "Should Mailman start a new digest volume?"
+msgstr "Mailman应该开始新一册摘要吗？"
+
+#: Mailman/Gui/Digest.py:86
+msgid ""
+"Setting this option instructs Mailman to start a new volume\n"
+"             with the next digest sent out."
+msgstr ""
+"设置这个选项用于指示Mailman在下一册发\n"
+"             送出去时开始新一册摘要。"
+
+#: Mailman/Gui/Digest.py:90
+msgid ""
+"Should Mailman send the next digest right now, if it is not\n"
+"             empty?"
+msgstr ""
+"如果摘要不为空，Mailman应该现在就发送下一册摘要吗\n"
+"             ？"
+
+#: Mailman/Gui/Digest.py:145
+msgid ""
+"The next digest will be sent as volume\n"
+"            %(volume)s, number %(number)s"
+msgstr ""
+"下一则摘要将作为第\n"
+"            %(volume)s册，%(number)s号发送。"
+
+#: Mailman/Gui/Digest.py:150
+msgid "A digest has been sent."
+msgstr "发送了一则摘要。"
+
+#: Mailman/Gui/Digest.py:152
+msgid "There was no digest to send."
+msgstr "没有要发送的摘要。"
+
+#: Mailman/Gui/GUIBase.py:173
+msgid "Invalid value for variable: %(property)s"
+msgstr "该变量的值非法：%(property)s"
+
+#: Mailman/Gui/GUIBase.py:177
+msgid "Bad email address for option %(property)s: %(error)s"
+msgstr ""
+
+#: Mailman/Gui/GUIBase.py:203
+msgid ""
+"The following illegal substitution variables were\n"
+"                found in the <code>%(property)s</code> string:\n"
+"                <code>%(bad)s</code>\n"
+"                <p>Your list may not operate properly until you correct "
+"this\n"
+"                problem."
+msgstr ""
+"在<code>%(property)s</code>中发现下列非法的订阅变量值：\n"
+"                <code>%(bad)s</code>\n"
+"                <p>不更正这些问题，你的列表可能无法正常运作"
+
+#: Mailman/Gui/GUIBase.py:217
+msgid ""
+"Your <code>%(property)s</code> string appeared to\n"
+"                    have some correctable problems in its new value.\n"
+"                    The fixed value will be used instead.  Please\n"
+"                    double check that this is what you intended.\n"
+"                    "
+msgstr ""
+"你的<code>%(property)s</code>的新值中好像有一些\n"
+"                    可以更正的问题。\n"
+"                    将用预备的值代替。请\n"
+"                    仔细检查这是你想要的结果。\n"
+"                    "
+
+#: Mailman/Gui/General.py:37
+msgid "General Options"
+msgstr "一般选项"
+
+#: Mailman/Gui/General.py:51
+msgid "Conceal the member's address"
+msgstr "隐藏成员地址"
+
+#: Mailman/Gui/General.py:52
+msgid "Acknowledge the member's posting"
+msgstr "应答成员的邮件"
+
+#: Mailman/Gui/General.py:53
+msgid "Do not send a copy of a member's own post"
+msgstr "不发送成员自己邮件拷贝"
+
+#: Mailman/Gui/General.py:55
+msgid "Filter out duplicate messages to list members (if possible)"
+msgstr "过滤发送给成员的重复消息(如果可能的话)"
+
+#: Mailman/Gui/General.py:62
+msgid ""
+"Fundamental list characteristics, including descriptive\n"
+"            info and basic behaviors."
+msgstr ""
+"基本的列表特征，包括描述信息\n"
+"            和基本行为。"
+
+#: Mailman/Gui/General.py:65
+msgid "General list personality"
+msgstr "一般的列表属性"
+
+#: Mailman/Gui/General.py:68
+msgid "The public name of this list (make case-changes only)."
+msgstr "该列表的公共名字(仅能做大小写改变)。"
+
+#: Mailman/Gui/General.py:69
+msgid ""
+"The capitalization of this name can be changed to make it\n"
+"             presentable in polite company as a proper noun, or to make an\n"
+"             acronym part all upper case, etc.  However, the name will be\n"
+"             advertised as the email address (e.g., in subscribe "
+"confirmation\n"
+"             notices), so it should <em>not</em> be otherwise altered.  "
+"(Email\n"
+"             addresses are not case sensitive, but they are sensitive to\n"
+"             almost everything else :-)"
+msgstr ""
+"该名字的大写或者首字母的缩写可能被某些公司里作为专用名词\n"
+"             。但是，如果该名字被申请作为邮件地址(\n"
+"             如：在订阅确认中可以注明)，所以<em>不</em>应该\n"
+"             以其他方式改变名字。(邮件地址不是大小写敏感的，\n"
+"             但是在其他地方一般是非常敏感的:-)"
+
+#: Mailman/Gui/General.py:78
+msgid ""
+"The list administrator email addresses.  Multiple\n"
+"             administrator addresses, each on separate line is okay."
+msgstr ""
+"列表管理员邮件地址。如果有多个地址，\n"
+"             每个地址填写在单独的一行即可。"
+
+#: Mailman/Gui/General.py:81
+msgid ""
+"There are two ownership roles associated with each mailing\n"
+"             list.  The <em>list administrators</em> are the people who "
+"have\n"
+"             ultimate control over all parameters of this mailing list.  "
+"They\n"
+"             are able to change any list configuration variable available\n"
+"             through these administration web pages.\n"
+"\n"
+"             <p>The <em>list moderators</em> have more limited permissions;\n"
+"             they are not able to change any list configuration variable, "
+"but\n"
+"             they are allowed to tend to pending administration requests,\n"
+"             including approving or rejecting held subscription requests, "
+"and\n"
+"             disposing of held postings.  Of course, the <em>list\n"
+"             administrators</em> can also tend to pending requests.\n"
+"\n"
+"             <p>In order to split the list ownership duties into\n"
+"             administrators and moderators, you must\n"
+"             <a href=\"passwords\">set a separate moderator password</a>,\n"
+"             and also provide the <a "
+"href=\"?VARHELP=general/moderator\">email\n"
+"             addresses of the list moderators</a>.  Note that the field you\n"
+"             are changing here specifies the list administrators."
+msgstr ""
+"每个邮件列表有两个管理者，他们扮演着不一样的角色。\n"
+"             <em>列表管理员</em>拥有最大的权力。\n"
+"             他们可以通过这些管理页面\n"
+"             改变任何列表配置变量。\n"
+"\n"
+"             <p><em>列表主持人</em>的权力受到一定的限制，\n"
+"             他们不能改变列表配置变量，但他们允许管理一些\n"
+"             待处理的管理请求，包括同意或拒绝保存的订阅请求、\n"
+"             丢弃邮件等。当然<em>列表管理员</em>也能够管理\n"
+"             未处理的请求。\n"
+"\n"
+"             <p>为了将列表所有者的职责分给管理员\n"
+"             和主持人，你必须\n"
+"             <a href=\"passwords\">设置一个单独的主持人密码</a>，\n"
+"             和提供<a href=\"?VARHELP=general/moderator\">列表主持人的邮件\n"
+"             地址</a>。注意，你在这里改变的区域定义的是列表管理员。"
+
+#: Mailman/Gui/General.py:102
+msgid ""
+"The list moderator email addresses.  Multiple\n"
+"             moderator addresses, each on separate line is okay."
+msgstr ""
+"列表主持人邮件地址。如果有多个地址，\n"
+"             每个地址填写在单独的一行即可。"
+
+#: Mailman/Gui/General.py:105
+msgid ""
+"There are two ownership roles associated with each mailing\n"
+"             list.  The <em>list administrators</em> are the people who "
+"have\n"
+"             ultimate control over all parameters of this mailing list.  "
+"They\n"
+"             are able to change any list configuration variable available\n"
+"             through these administration web pages.\n"
+"\n"
+"             <p>The <em>list moderators</em> have more limited permissions;\n"
+"             they are not able to change any list configuration variable, "
+"but\n"
+"             they are allowed to tend to pending administration requests,\n"
+"             including approving or rejecting held subscription requests, "
+"and\n"
+"             disposing of held postings.  Of course, the <em>list\n"
+"             administrators</em> can also tend to pending requests.\n"
+"\n"
+"             <p>In order to split the list ownership duties into\n"
+"             administrators and moderators, you must\n"
+"             <a href=\"passwords\">set a separate moderator password</a>,\n"
+"             and also provide the email addresses of the list moderators in\n"
+"             this section.  Note that the field you are changing here\n"
+"             specifies the list moderators."
+msgstr ""
+"每个邮件列表有两个所有者角色。\n"
+"             <em>列表管理员</em>是控\n"
+"             制该列表所有参数的成员。\n"
+"             他们可以通过这些管理页面\n"
+"             改变任何可变的列表配置变量。\n"
+"\n"
+"             <p><em>列表主持人</em>有其他一些限制的许可；\n"
+"             他们不能改变列表配置变量，但他们允许管理一些\n"
+"             待处理的管理请求，包括同意或拒绝保存的订阅请求，\n"
+"             和丢弃邮件。当然<em>列表管理员</em>也能够处理\n"
+"             未处理的请求。\n"
+"\n"
+"             <p>为了将列表所有者的职责分给管理员\n"
+"             和主持人，你必须\n"
+"             <a href=\"passwords\">设置一个单独的主持人密码</a>，\n"
+"             和提供<a href=\"?VARHELP=general/moderator\">列表主持人的邮件\n"
+"             地址</a>。注意，你在这里改变的区域定义的是列表支持人。"
+
+#: Mailman/Gui/General.py:126
+msgid "A terse phrase identifying this list."
+msgstr "一个唯一标识该列表的简洁的短语。"
+
+#: Mailman/Gui/General.py:128
+msgid ""
+"This description is used when the mailing list is listed with\n"
+"                other mailing lists, or in headers, and so forth.  It "
+"should\n"
+"                be as succinct as you can get it, while still identifying "
+"what\n"
+"                the list is."
+msgstr ""
+"当该邮件列表和其他邮件列表一起被列出、一起出现\n"
+"                在标题中等，在这些情况下，使用这个短语。\n"
+"                该短语要简洁，这样你才容易理解，同时它\n"
+"                还要能标识出列表。"
+
+#: Mailman/Gui/General.py:134
+msgid ""
+"An introductory description - a few paragraphs - about the\n"
+"             list.  It will be included, as html, at the top of the "
+"listinfo\n"
+"             page.  Carriage returns will end a paragraph - see the details\n"
+"             for more info."
+msgstr ""
+"关于列表的介绍性的描述 - 几个段落。\n"
+"             它将作为html片段包含在列表信息页面的顶部\n"
+"             回车将结束一个段落 - 更多信息看细节。"
+
+#: Mailman/Gui/General.py:138
+msgid ""
+"The text will be treated as html <em>except</em> that\n"
+"             newlines will be translated to &lt;br&gt; - so you can use "
+"links,\n"
+"             preformatted text, etc, but don't put in carriage returns "
+"except\n"
+"             where you mean to separate paragraphs.  And review your changes "
+"-\n"
+"             bad html (like some unterminated HTML constructs) can prevent\n"
+"             display of the entire listinfo page."
+msgstr ""
+"文本将作为html片段对待，<em>除了</em>\n"
+"             换行会被转换成&lt;br&gt; - 所以你能使用链接，\n"
+"             预定格式文本等等，但是不要使用回车，除非你打算\n"
+"             新建段落。预览你的改变 -\n"
+"             错误的html(像一些没有结束的html结构)\n"
+"             能影响整个列表信息页面的显示。"
+
+#: Mailman/Gui/General.py:146
+msgid "Prefix for subject line of list postings."
+msgstr "列表邮件的主题前缀。"
+
+#: Mailman/Gui/General.py:147
+msgid ""
+"This text will be prepended to subject lines of messages\n"
+"             posted to the list, to distinguish mailing list messages in\n"
+"             mailbox summaries.  Brevity is premium here, it's ok to "
+"shorten\n"
+"             long mailing list names to something more concise, as long as "
+"it\n"
+"             still identifies the mailing list.\n"
+"             You can also add a sequential number by %%d substitution\n"
+"             directive. eg.; [listname %%d] -> [listname 123]\n"
+"                            (listname %%05d) -> (listname 00123)\n"
+"             "
+msgstr ""
+"这些文本将被加在向列表发送的消息的主题行前，\n"
+"             用来在收件箱中区分列表消息。\n"
+"             这里简洁才是受欢迎的，将长长\n"
+"             的邮件列表名缩写更简洁的形式就\n"
+"             行，只要它仍能唯一标识邮件列表。\n"
+"             你也可以用%%d替代符添加序列号。\n"
+"             例如：[listname %%d] -> [listname 123]\n"
+"                            (listname %%05d) -> (listname 00123)\n"
+"             "
+
+#: Mailman/Gui/General.py:158 Mailman/Gui/Privacy.py:288
+msgid "Munge From"
+msgstr ""
+
+#: Mailman/Gui/General.py:158 Mailman/Gui/Privacy.py:288
+msgid "Wrap Message"
+msgstr ""
+
+#: Mailman/Gui/General.py:159
+msgid ""
+"Replace the From: header address with the list's posting\n"
+"             address to mitigate issues stemming from the original From:\n"
+"             domain's DMARC or similar policies."
+msgstr ""
+
+#: Mailman/Gui/General.py:162
+msgid ""
+"Several protocols now in wide use attempt to ensure that use\n"
+"             of the domain in the author's address (ie, in the From: header\n"
+"             field) is authorized by that domain.  These protocols may be\n"
+"             incompatible with common list features such as footers, "
+"causing\n"
+"             participating email services to bounce list traffic merely\n"
+"             because of the address in the From: field.  <b>This has "
+"resulted\n"
+"             in members being unsubscribed despite being perfectly able to\n"
+"             receive mail.</b>\n"
+"             <p>\n"
+"             The following actions are applied to all list messages when\n"
+"             selected here.  To apply these actions only to messages where "
+"the\n"
+"             domain in the From: header is determined to use such a "
+"protocol,\n"
+"             see the <a\n"
+"             href=\"?VARHELP=privacy/sender/dmarc_moderation_action\">\n"
+"             dmarc_moderation_action</a> settings under Privacy options...\n"
+"             -&gt; Sender filters.\n"
+"             <p>Settings:<p>\n"
+"             <dl>\n"
+"             <dt>No</dt>\n"
+"             <dd>Do nothing special.  This is appropriate for anonymous "
+"lists.\n"
+"             It is appropriate for dedicated announcement lists, unless the\n"
+"             From: address of authorized posters might be in a domain with "
+"a\n"
+"             DMARC or similar policy. It is also appropriate if you choose "
+"to\n"
+"             use dmarc_moderation_action other than Accept for this "
+"list.</dd>\n"
+"             <dt>Munge From</dt>\n"
+"             <dd>This action replaces the poster's address in the From: "
+"header\n"
+"             with the list's posting address and adds the poster's address "
+"to\n"
+"             the addresses in the original Reply-To: header.</dd>\n"
+"             <dt>Wrap Message</dt>\n"
+"             <dd>Just wrap the message in an outer message with the From:\n"
+"             header containing the list's posting address and with the "
+"original\n"
+"             From: address added to the addresses in the original Reply-To:\n"
+"             header and with Content-Type: message/rfc822.  This is "
+"effectively\n"
+"             a one message MIME format digest.</dd>\n"
+"             </dl>\n"
+"             <p>The transformations for anonymous_list are applied before\n"
+"             any of these actions. It is not useful to apply actions other\n"
+"             than No to an anonymous list, and if you do so, the result may\n"
+"             be surprising.\n"
+"             <p>The Reply-To: header munging actions below interact with "
+"these\n"
+"             actions as follows:\n"
+"             <p> first_strip_reply_to = Yes will remove all the incoming\n"
+"             Reply-To: addresses but will still add the poster's address to\n"
+"             Reply-To: for all three settings of reply_goes_to_list which\n"
+"             respectively will result in just the poster's address, the\n"
+"             poster's address and the list posting address or the poster's\n"
+"             address and the explicit reply_to_address in the outgoing\n"
+"             Reply-To: header. If first_strip_reply_to = No the poster's\n"
+"             address in the original From: header, if not already included "
+"in\n"
+"             the Reply-To:, will be added to any existing Reply-To:\n"
+"             address(es).\n"
+"             <p>These actions, whether selected here or via <a\n"
+"             href=\"?VARHELP=privacy/sender/dmarc_moderation_action\">\n"
+"             dmarc_moderation_action</a>, do not apply to messages in "
+"digests\n"
+"             or archives or sent to usenet via the Mail&lt;-&gt;News "
+"gateways.\n"
+"             <p>If <a\n"
+"             href=\"?VARHELP=privacy/sender/dmarc_moderation_action\">\n"
+"             dmarc_moderation_action</a> applies to this message with an\n"
+"             action other than Accept, that action rather than this is\n"
+"             applied"
+msgstr ""
+
+#: Mailman/Gui/General.py:224
+msgid ""
+"Hide the sender of a message, replacing it with the list\n"
+"             address (Removes From, Sender and Reply-To fields)"
+msgstr ""
+"隐藏消息的发送者，用列表地址替代它。\n"
+"             (将From,Sender,Reply-TO等域的信息删除掉)"
+
+#: Mailman/Gui/General.py:227
+msgid "<tt>Reply-To:</tt> header munging"
+msgstr "<tt>Reply-To:</tt> header munging"
+
+#: Mailman/Gui/General.py:230
+msgid ""
+"Should any existing <tt>Reply-To:</tt> header found in the\n"
+"             original message be stripped?  If so, this will be done\n"
+"             regardless of whether an explict <tt>Reply-To:</tt> header is\n"
+"             added by Mailman or not."
+msgstr ""
+"所有在原消息中找到的<tt>Reply-To:</tt>头部都应该被删除吗？\n"
+"             如果是，不管是否是Mailman显式添加的\n"
+"             <tt>Reply-To:</tt>头部都将被删除。"
+
+#: Mailman/Gui/General.py:236
+msgid "Explicit address"
+msgstr "显式地址"
+
+#: Mailman/Gui/General.py:236
+msgid "Poster"
+msgstr "发布者"
+
+#: Mailman/Gui/General.py:236
+msgid "This list"
+msgstr "该列表"
+
+#: Mailman/Gui/General.py:237
+msgid ""
+"Where are replies to list messages directed?\n"
+"             <tt>Poster</tt> is <em>strongly</em> recommended for most "
+"mailing\n"
+"             lists."
+msgstr ""
+"列表消息的回复被发送到哪里？\n"
+"             对大多数邮件列表来说，<em>强烈</em>推荐使用<tt>发布者</tt>。"
+
+#: Mailman/Gui/General.py:242
+msgid ""
+"This option controls what Mailman does to the\n"
+"             <tt>Reply-To:</tt> header in messages flowing through this\n"
+"             mailing list.  When set to <em>Poster</em>, no <tt>Reply-"
+"To:</tt>\n"
+"             header is added by Mailman, although if one is present in the\n"
+"             original message, it is not stripped.  Setting this value to\n"
+"             either <em>This list</em> or <em>Explicit address</em> causes\n"
+"             Mailman to insert a specific <tt>Reply-To:</tt> header in all\n"
+"             messages, overriding the header in the original message if\n"
+"             necessary (<em>Explicit address</em> inserts the value of <a\n"
+"             "
+"href=\"?VARHELP=general/reply_to_address\">reply_to_address</a>).\n"
+"\n"
+"             <p>There are many reasons not to introduce or override the\n"
+"             <tt>Reply-To:</tt> header.  One is that some posters depend on\n"
+"             their own <tt>Reply-To:</tt> settings to convey their valid\n"
+"             return address.  Another is that modifying <tt>Reply-To:</tt>\n"
+"             makes it much more difficult to send private replies.  See <a\n"
+"             href=\"http://marc.merlins.org/netrants/reply-to-"
+"harmful.html\">`Reply-To'\n"
+"             Munging Considered Harmful</a> for a general discussion of "
+"this\n"
+"             issue.  See <a\n"
+"             href=\"http://marc.merlins.org/netrants/reply-to-"
+"useful.html\">\n"
+"             Reply-To Munging Considered Useful</a> for a dissenting "
+"opinion.\n"
+"\n"
+"             <p>Some mailing lists have restricted posting privileges, with "
+"a\n"
+"             parallel list devoted to discussions.  Examples are `patches' "
+"or\n"
+"             `checkin' lists, where software changes are posted by a "
+"revision\n"
+"             control system, but discussion about the changes occurs on a\n"
+"             developers mailing list.  To support these types of mailing\n"
+"             lists, select <tt>Explicit address</tt> and set the\n"
+"             <tt>Reply-To:</tt> address below to point to the parallel\n"
+"             list."
+msgstr ""
+
+#: Mailman/Gui/General.py:274
+msgid "Explicit <tt>Reply-To:</tt> header."
+msgstr "显式的<tt>Reply-To:</tt>头部。"
+
+#: Mailman/Gui/General.py:276
+msgid ""
+"This is the address set in the <tt>Reply-To:</tt> header\n"
+"             when the <a\n"
+"             "
+"href=\"?VARHELP=general/reply_goes_to_list\">reply_goes_to_list</a>\n"
+"             option is set to <em>Explicit address</em>.\n"
+"\n"
+"             <p>There are many reasons not to introduce or override the\n"
+"             <tt>Reply-To:</tt> header.  One is that some posters depend on\n"
+"             their own <tt>Reply-To:</tt> settings to convey their valid\n"
+"             return address.  Another is that modifying <tt>Reply-To:</tt>\n"
+"             makes it much more difficult to send private replies.  See <a\n"
+"             href=\"http://marc.merlins.org/netrants/reply-to-"
+"harmful.html\">`Reply-To'\n"
+"             Munging Considered Harmful</a> for a general discussion of "
+"this\n"
+"             issue.  See <a\n"
+"             href=\"http://marc.merlins.org/netrants/reply-to-"
+"useful.html\">\n"
+"             Reply-To Munging Considered Useful</a> for a dissenting "
+"opinion.\n"
+"\n"
+"             <p>Some mailing lists have restricted posting privileges, with "
+"a\n"
+"             parallel list devoted to discussions.  Examples are `patches' "
+"or\n"
+"             `checkin' lists, where software changes are posted by a "
+"revision\n"
+"             control system, but discussion about the changes occurs on a\n"
+"             developers mailing list.  To support these types of mailing\n"
+"             lists, specify the explicit <tt>Reply-To:</tt> address here.  "
+"You\n"
+"             must also specify <tt>Explicit address</tt> in the\n"
+"             <tt>reply_goes_to_list</tt>\n"
+"             variable.\n"
+"\n"
+"             <p>Note that if the original message contains a\n"
+"             <tt>Reply-To:</tt> header, it will not be changed."
+msgstr ""
+
+#: Mailman/Gui/General.py:305
+msgid "Umbrella list settings"
+msgstr "保护列表设置"
+
+#: Mailman/Gui/General.py:308
+msgid ""
+"Send password reminders to, eg, \"-owner\" address instead of\n"
+"             directly to user."
+msgstr ""
+"将密码提示发送给，例如，\"-owner\"地址，而不是\n"
+"             直接发送给用户。"
+
+#: Mailman/Gui/General.py:311
+msgid ""
+"Set this to yes when this list is intended to cascade only\n"
+"             to other mailing lists.  When set, meta notices like\n"
+"             confirmations and password reminders will be directed to an\n"
+"             address derived from the member's address - it will have the\n"
+"             value of \"umbrella_member_suffix\" appended to the member's\n"
+"             account name."
+msgstr ""
+
+#: Mailman/Gui/General.py:319
+msgid ""
+"Suffix for use when this list is an umbrella for other\n"
+"             lists, according to setting of previous \"umbrella_list\"\n"
+"             setting."
+msgstr ""
+"根据前面\"umbrella_list\"的设置，当这个列表是其它列表的保护列表时\n"
+"             使用的前缀。"
+
+#: Mailman/Gui/General.py:323
+msgid ""
+"When \"umbrella_list\" is set to indicate that this list has\n"
+"             other mailing lists as members, then administrative notices "
+"like\n"
+"             confirmations and password reminders need to not be sent to "
+"the\n"
+"             member list addresses, but rather to the owner of those member\n"
+"             lists.  In that case, the value of this setting is appended to\n"
+"             the member's account name for such notices.  `-owner' is the\n"
+"             typical choice.  This setting has no effect when "
+"\"umbrella_list\"\n"
+"             is \"No\"."
+msgstr ""
+"当\"umbrella_list\"被的设置指示该列表有其它邮件列表作为成员时，\n"
+"             像确认和管理通知这样的管理通知不被发送到成员地址，\n"
+"             而是发送到这些成员列表的拥有者。这种情况下，这个\n"
+"             设置的值被添加到成员账户明后来作为接收这些通知的\n"
+"             地址。`-owner'是典型的选择。当\"umbrella_list\"\n"
+"             被设置为\"无\"时，该设置无效。"
+
+#: Mailman/Gui/General.py:335
+msgid "Send monthly password reminders?"
+msgstr "是否每月发送密码提示？"
+
+#: Mailman/Gui/General.py:337
+msgid ""
+"Turn this on if you want password reminders to be sent once\n"
+"             per month to your members.  Note that members may disable "
+"their\n"
+"             own individual password reminders."
+msgstr ""
+"如果你想向你的成员每月发送一次密码提示，启动这项功能。\n"
+"             注意成员可能仅用他们各自的密码提示功能。"
+
+#: Mailman/Gui/General.py:342
+msgid ""
+"List-specific text prepended to new-subscriber welcome\n"
+"             message"
+msgstr "添加到新订阅者欢迎消息前的列表说明文本"
+
+#: Mailman/Gui/General.py:345
+msgid ""
+"This value, if any, will be added to the front of the\n"
+"             new-subscriber welcome message.  The rest of the welcome "
+"message\n"
+"             already describes the important addresses and URLs for the\n"
+"             mailing list, so you don't need to include any of that kind of\n"
+"             stuff here.  This should just contain mission-specific kinds "
+"of\n"
+"             things, like etiquette policies or team orientation, or that "
+"kind\n"
+"             of thing.\n"
+"\n"
+"             <p>Note that this text will be wrapped, according to the\n"
+"             following rules:\n"
+"             <ul><li>Each paragraph is filled so that no line is longer "
+"than\n"
+"                     70 characters.\n"
+"                 <li>Any line that begins with whitespace is not filled.\n"
+"                 <li>A blank line separates paragraphs.\n"
+"             </ul>"
+msgstr ""
+"这个值，将被加到新订阅者的欢迎消息的前面。欢迎消息\n"
+"             的其余部分已经描述了邮件列表的地址和URL，\n"
+"             所以你不必在这里包含任何的这类信息。\n"
+"             这应该仅仅包含使命性的，像方针，团\n"
+"             队方向这类的说明。\n"
+"\n"
+"             <p>注意这些文本将根据一下规则被封装：\n"
+"             <ul><li>填充段落，使得每行不超过70个字符。\n"
+"                 <li>任何以空白符开始的行不被填充。\n"
+"                 <li>空白行分割段落。\n"
+"             </ul>"
+
+#: Mailman/Gui/General.py:362
+msgid "Send welcome message to newly subscribed members?"
+msgstr "是否向新订阅者发送欢迎消息？"
+
+#: Mailman/Gui/General.py:363
+msgid ""
+"Turn this off only if you plan on subscribing people manually\n"
+"             and don't want them to know that you did so.  This option is "
+"most\n"
+"             useful for transparently migrating lists from some other "
+"mailing\n"
+"             list manager to Mailman."
+msgstr ""
+"如果你打算手工添加订阅者，但不想让他们知道时，关掉这个功能。\n"
+"             当你想将成员从一个其他类型的列表透明地移一个Mailman列表时，\n"
+"             这个选项特别有用。"
+
+#: Mailman/Gui/General.py:369
+msgid ""
+"Text sent to people leaving the list.  If empty, no special\n"
+"             text will be added to the unsubscribe message."
+msgstr ""
+"发送给离开列表的成员的文本。如果空，不会有指定的文本\n"
+"             添加到退订消息上。"
+
+#: Mailman/Gui/General.py:373
+msgid "Send goodbye message to members when they are unsubscribed?"
+msgstr "当成员退订时，是否发送再见消息？"
+
+#: Mailman/Gui/General.py:376
+msgid ""
+"Should the list moderators get immediate notice of new\n"
+"             requests, as well as daily notices about collected ones?"
+msgstr "列表管理员是否应该得到新请求的即时通知，像得到关于收集到的请求的每日通知一样？"
+
+#: Mailman/Gui/General.py:379
+msgid ""
+"List moderators (and list administrators) are sent daily\n"
+"             reminders of requests pending approval, like subscriptions to "
+"a\n"
+"             moderated list, or postings that are being held for one reason "
+"or\n"
+"             another.  Setting this option causes notices to be sent\n"
+"             immediately on the arrival of new requests as well."
+msgstr ""
+"像对一个延缓列表的订阅，或因某种原因而被延缓的邮件所做的那样，给列表管理员\n"
+"\t\t\t\t\t\t\t发送关于未批准请求的每日提醒。设定这个选项同样会导致新请求一到达\n"
+"\t\t\t\t\t\t\t就立刻发通知给列表管理员。"
+
+#: Mailman/Gui/General.py:386
+msgid ""
+"Should administrator get notices of subscribes and\n"
+"             unsubscribes?"
+msgstr "管理员是否应该得到订阅和取消订阅的通知？"
+
+#: Mailman/Gui/General.py:391
+msgid "Send mail to poster when their posting is held for approval?"
+msgstr "当邮件被延缓等待批准时给发件人发邮件吗？"
+
+#: Mailman/Gui/General.py:394
+msgid "Additional settings"
+msgstr "其他设定"
+
+#: Mailman/Gui/General.py:397
+msgid "Emergency moderation of all list traffic."
+msgstr "紧急延缓列表中所有邮件。"
+
+#: Mailman/Gui/General.py:398
+msgid ""
+"When this option is enabled, all list traffic is emergency\n"
+"             moderated, i.e. held for moderation.  Turn this option on when\n"
+"             your list is experiencing a flamewar and you want a cooling "
+"off\n"
+"             period."
+msgstr ""
+"当打开此选项时，列表中所有邮件都被紧急延缓。也就是都被暂时保存起来而不立即发送。\n"
+"\t\t\t\t当你的列表邮件量不正常增多而你想要让此增长趋于缓和时打开此选项。"
+
+#: Mailman/Gui/General.py:410
+msgid ""
+"Default options for new members joining this list.<input\n"
+"             type=\"hidden\" name=\"new_member_options\" value=\"ignore\">"
+msgstr ""
+"新加入列表成员的默认选项设定是：<input\n"
+"             type=\"hidden\" name=\"new_member_options\" value=\"ignore\">"
+
+#: Mailman/Gui/General.py:413
+msgid ""
+"When a new member is subscribed to this list, their initial\n"
+"             set of options is taken from this variable's setting."
+msgstr "当新成员订阅此列表时，他们选项的初始设定从这个变量的设定获得。"
+
+#: Mailman/Gui/General.py:417
+msgid ""
+"(Administrivia filter) Check postings and intercept ones\n"
+"             that seem to be administrative requests?"
+msgstr "(邮件过滤器) 检查邮件和那些看起来像是管理请求但被中途拦截的邮件吗？"
+
+#: Mailman/Gui/General.py:420
+msgid ""
+"Administrivia tests will check postings to see whether it's\n"
+"             really meant as an administrative request (like subscribe,\n"
+"             unsubscribe, etc), and will add it to the the administrative\n"
+"             requests queue, notifying the administrator of the new "
+"request,\n"
+"             in the process."
+msgstr ""
+"邮件检查会检查邮件看它是否真的是一个管理请求(像订阅，取消订阅，等)，\n"
+"\t\t\t\t\t\t\t并把它加入到管理请求的队列中，通报管理员这一在进行之中的新的请求。"
+
+#: Mailman/Gui/General.py:427
+msgid ""
+"Maximum length in kilobytes (KB) of a message body.  Use 0\n"
+"             for no limit."
+msgstr "邮件正文最大长度(以千字节为单位的)。0表示无限制。"
+
+#: Mailman/Gui/General.py:431
+msgid ""
+"Maximum number of members to show on one page of the\n"
+"             Membership List."
+msgstr ""
+
+#: Mailman/Gui/General.py:435
+msgid "Host name this list prefers for email."
+msgstr "列表发送邮件时使用的主机名。"
+
+#: Mailman/Gui/General.py:437
+msgid ""
+"The \"host_name\" is the preferred name for email to\n"
+"             mailman-related addresses on this host, and generally should "
+"be\n"
+"             the mail host's exchanger address, if any.  This setting can "
+"be\n"
+"             useful for selecting among alternative names of a host that "
+"has\n"
+"             multiple addresses."
+msgstr ""
+"当此主机给mailman相关地址发送邮件时使用此主机名，通常主机名应该是邮件交换机的地址。\n"
+"\t\t\t\t当主机有多个地址时，可通过设定此选项为主机选择一个名字。"
+
+#: Mailman/Gui/General.py:449
+msgid ""
+"Should messages from this mailing list include the\n"
+"                 <a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC "
+"2369</a>\n"
+"                 (i.e. <tt>List-*</tt>) headers?  <em>Yes</em> is highly\n"
+"                 recommended."
+msgstr ""
+"来自这个邮件列表的邮件是否要包括\n"
+"               <a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC "
+"2369</a>\n"
+"\t\t\t\t(也就是，<tt>List-*</tt>) 的头部？强烈推荐<em>包括</em>"
+
+#: Mailman/Gui/General.py:454
+msgid ""
+"RFC 2369 defines a set of List-* headers that are\n"
+"                 normally added to every message sent to the list "
+"membership.\n"
+"                 These greatly aid end-users who are using standards "
+"compliant\n"
+"                 mail readers.  They should normally always be enabled.\n"
+"\n"
+"                 <p>However, not all mail readers are standards compliant "
+"yet,\n"
+"                 and if you have a large number of members who are using\n"
+"                 non-compliant mail readers, they may be annoyed at these\n"
+"                 headers.  You should first try to educate your members as "
+"to\n"
+"                 why these headers exist, and how to hide them in their "
+"mail\n"
+"                 clients.  As a last resort you can disable these headers, "
+"but\n"
+"                 this is not recommended (and in fact, your ability to "
+"disable\n"
+"                 these headers may eventually go away)."
+msgstr ""
+"RFC 2369 定义了一个 List-*的头部集，这个头部集通常会添加在发给列表成员的每封邮件中\n"
+"                 这极大的帮助了使用标准(standards compliant)邮件阅读器的终端用户。\n"
+"                 通常应该使用这些头部。\n"
+"\n"
+"                 <p>然而，并不是所有的阅读器都是符合标准的，如果你有很多成员使用非标准\n"
+"                 (non-compliant)邮件阅读器，他们会对此头部很生气。你应该首先告诉你的成员\n"
+"                 这些头部存在的原因，并告诉他们怎样在邮件客户端隐藏头部。实在不行的话可以\n"
+"                 禁用头部。但并不建议这样做(事实上，你最终会失去禁止头部的能力)。"
+
+#: Mailman/Gui/General.py:472
+msgid "Should postings include the <tt>List-Post:</tt> header?"
+msgstr "邮件是否应该包括<tt>List-Post:</tt>的头部？"
+
+#: Mailman/Gui/General.py:473
+msgid ""
+"The <tt>List-Post:</tt> header is one of the headers\n"
+"             recommended by\n"
+"             <a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC "
+"2369</a>.\n"
+"             However for some <em>announce-only</em> mailing lists, only a\n"
+"             very select group of people are allowed to post to the list; "
+"the\n"
+"             general membership is usually not allowed to post.  For lists "
+"of\n"
+"             this nature, the <tt>List-Post:</tt> header is misleading.\n"
+"             Select <em>No</em> to disable the inclusion of this header. "
+"(This\n"
+"             does not affect the inclusion of the other <tt>List-*:</tt>\n"
+"             headers.)"
+msgstr ""
+"<tt>List-Post:</tt>头部是<a href=\"http://www.faqs.org/rfcs/rfc2369.html\">RFC "
+"2369</a>.\n"
+"             推荐的头部之一。然而，对一些<em>只限通知</em>的邮件列表，仅有一些人有向列表\n"
+"             发送邮件的权利；不允许普通成员发送邮件。对这种类型的列表，<tt>List-Post:</tt>\n"
+"             头部容易让人误解。选择<em>否</em>来禁止此头部。(这不影响可包含其他\n"
+"             <tt>List-*:</tt>头部。"
+
+#: Mailman/Gui/General.py:489
+msgid ""
+"Should the <tt>Sender</tt> header be rewritten for this\n"
+"                 mailing list to avoid stray bounces?  <em>Yes</em> is\n"
+"                 recommended."
+msgstr ""
+
+#: Mailman/Gui/General.py:493
+msgid ""
+"<a href=\"http://www.faqs.org/rfcs/rfc2822.html\">RFC\n"
+"                 2822</a> defines the <tt>Sender</tt> header and defines it\n"
+"                 as \"the mailbox of the agent responsible for the actual\n"
+"                 transmission of the message.\"  Mailman replaces this "
+"header\n"
+"                 by default with the list's bounce address.\n"
+"                 \n"
+"                 <p>While it is debatable if Mailman is such an agent, "
+"setting\n"
+"                 this header helps directing bounces from some broken MTAs "
+"to\n"
+"                 the right destination.  On the other hand, some mail\n"
+"                 readers show unexpected behaviour if this header is set "
+"(like\n"
+"                 missing addresses in forwarded mails and copies sent to "
+"the\n"
+"                 bounce address on reply-to-all), so it can be disabled \n"
+"                 here."
+msgstr ""
+
+#: Mailman/Gui/General.py:511
+msgid ""
+"Discard held messages older than this number of days.\n"
+"            Use 0 for no automatic discarding."
+msgstr "丢弃此日数前被延缓的邮件。0 表示不自动丢弃"
+
+#: Mailman/Gui/General.py:521
+msgid ""
+"<b>real_name</b> attribute not\n"
+"            changed!  It must differ from the list's name by case\n"
+"            only."
+msgstr "<b>real_name</b>属性没有被修改!它必须与邮件列表有大小写上的不同"
+
+#: Mailman/Gui/General.py:549
+msgid ""
+"The <b>info</b> attribute you saved\n"
+"contains suspicious HTML that could potentially expose your users to cross-"
+"site\n"
+"scripting attacks.  This change has therefore been rejected.  If you still "
+"want\n"
+"to make these changes, you must have shell access to your Mailman server.\n"
+"This change can be made with bin/withlist or with bin/config_list by "
+"setting\n"
+"mlist.info.\n"
+"                        "
+msgstr ""
+
+#: Mailman/Gui/General.py:560
+msgid ""
+"<b>admin_member_chunksize</b> attribute not\n"
+"            changed!  It must be an integer > 0."
+msgstr ""
+
+#: Mailman/Gui/General.py:570
+msgid ""
+"You cannot add a Reply-To: to an explicit\n"
+"            address if that address is blank.  Resetting these values."
+msgstr "如果一个地址是空的话你不能为它设置Reply-To:头部。 重设这些值。"
+
+#: Mailman/Gui/Language.py:34
+msgid "Language&nbsp;options"
+msgstr "语言选项"
+
+#: Mailman/Gui/Language.py:66
+msgid "Natural language (internationalization) options."
+msgstr "自然语言(国际化)选项。"
+
+#: Mailman/Gui/Language.py:71
+msgid "Default language for this list."
+msgstr "列表默认语言。"
+
+#: Mailman/Gui/Language.py:72
+msgid ""
+"This is the default natural language for this mailing list.\n"
+"             If <a href=\"?VARHELP=language/available_languages\">more than "
+"one\n"
+"             language</a> is supported then users will be able to select "
+"their\n"
+"             own preferences for when they interact with the list.  All "
+"other\n"
+"             interactions will be conducted in the default language.  This\n"
+"             applies to both web-based and email-based messages, but not to\n"
+"             email posted by list members."
+msgstr ""
+"这是此邮件列表使用的默认自然语言，如果邮件列表\n"
+"             <a href=\"?VARHELP=language/available_languages\">支持的语言多于一种\n"
+"             </a>，用户可以选择选择他们与列表交互时使用的语言。此后其他所有的交互\n"
+"             都将使用用户选择的语言。这项规则适用于基于网页和电子邮件的信息，但不\n"
+"             适用于列表成员所发送的邮件。"
+
+#: Mailman/Gui/Language.py:82
+msgid "Languages supported by this list."
+msgstr "列表支持的语言。"
+
+#: Mailman/Gui/Language.py:84
+msgid ""
+"These are all the natural languages supported by this list.\n"
+"             Note that the\n"
+"             <a href=\"?VARHELP=language/preferred_language\">default\n"
+"             language</a> must be included."
+msgstr ""
+"这些是列表支持的自然语言，注意：必须包括\n"
+"             <a href=\"?VARHELP=language/preferred_language\">\n"
+"             默认语言</a>。"
+
+#: Mailman/Gui/Language.py:90
+msgid "Always"
+msgstr "始终"
+
+#: Mailman/Gui/Language.py:90
+msgid "As needed"
+msgstr "根据需要"
+
+#: Mailman/Gui/Language.py:90
+msgid "Never"
+msgstr "从不"
+
+#: Mailman/Gui/Language.py:91
+msgid ""
+"Encode the\n"
+"             <a href=\"?VARHELP=general/subject_prefix\">subject\n"
+"             prefix</a> even when it consists of only ASCII characters?"
+msgstr ""
+"即使<a href=\"?VARHELP=general/subject_prefix\">标题前缀</a>仅由ASCII码组成，\n"
+"             也对它编码。"
+
+#: Mailman/Gui/Language.py:95
+msgid ""
+"If your mailing list's default language uses a non-ASCII\n"
+"             character set and the prefix contains non-ASCII characters, "
+"the\n"
+"             prefix will always be encoded according to the relevant\n"
+"             standards.  However, if your prefix contains only ASCII\n"
+"             characters, you may want to set this option to <em>Never</em> "
+"to\n"
+"             disable prefix encoding.  This can make the subject headers\n"
+"             slightly more readable for users with mail readers that don't\n"
+"             properly handle non-ASCII encodings.\n"
+"\n"
+"             <p>Note however, that if your mailing list receives both "
+"encoded\n"
+"             and unencoded subject headers, you might want to choose <em>As\n"
+"             needed</em>.  Using this setting, Mailman will not encode "
+"ASCII\n"
+"             prefixes when the rest of the header contains only ASCII\n"
+"             characters, but if the original header contains non-ASCII\n"
+"             characters, it will encode the prefix.  This avoids an "
+"ambiguity\n"
+"             in the standards which could cause some mail readers to "
+"display\n"
+"             extra, or missing spaces between the prefix and the original\n"
+"             header."
+msgstr ""
+"如果你的邮件列表默认语言使用非ASCII码集，并且前缀中有非ASCII码，\n"
+"             将使用相关标准对前缀编码。但是，如果前缀仅包含ASCII码，或许你想\n"
+"             设置该选项为<em>从不</em>以禁止对前缀编码。对使用不支持非ASCII译\n"
+"             码邮件阅读器的用户来说，这将使得头部标题变得易读一些。\n"
+"\n"
+"             <p>注意，如果你的邮件列表同时接收编码和未编码的头部标题，你应该\n"
+"             选择<em>根据需要</em>。使用这个设定，如果头部其余部分仅含ASCII\n"
+"             码，Mailman将不编码前缀， 反之，如果原始头部中含有非ASCII码字符，\n"
+"             则将编码前缀。对于可能导致邮件阅读器显示额外信息或是遗失前缀和\n"
+"             头部之间空格的标准，这样做避免了译码时可能出现的模糊。"
+
+#: Mailman/Gui/Membership.py:26
+msgid "Membership&nbsp;Management..."
+msgstr "成员管理..."
+
+#: Mailman/Gui/Membership.py:30
+msgid "Membership&nbsp;List"
+msgstr "成员列表"
+
+#: Mailman/Gui/Membership.py:31
+msgid "Mass&nbsp;Subscription"
+msgstr "批量订阅"
+
+#: Mailman/Gui/Membership.py:32
+msgid "Mass&nbsp;Removal"
+msgstr "批量移除"
+
+#: Mailman/Gui/Membership.py:33
+msgid "Address&nbsp;Change"
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:35
+msgid "Non-digest&nbsp;options"
+msgstr "非摘要(Non-digest)选项"
+
+#: Mailman/Gui/NonDigest.py:43
+msgid "Policies concerning immediately delivered list traffic."
+msgstr "即时投递传输的策略"
+
+#: Mailman/Gui/NonDigest.py:46
+msgid ""
+"Can subscribers choose to receive mail immediately, rather\n"
+"             than in batched digests?"
+msgstr "订阅者可否选择即时收信而不是收取摘要？"
+
+#: Mailman/Gui/NonDigest.py:53
+msgid "Full Personalization"
+msgstr "完全个性化"
+
+#: Mailman/Gui/NonDigest.py:55
+msgid ""
+"Should Mailman personalize each non-digest delivery?\n"
+"                 This is often useful for announce-only lists, but <a\n"
+"                 href=\"?VARHELP=nondigest/personalize\">read the "
+"details</a>\n"
+"                 section for a discussion of important performance\n"
+"                 issues."
+msgstr ""
+"Mailman是否为每一个非摘要投递进行个性化设置？这对仅作发布通知用途的列表很有\n"
+"                 用，但应该<a href=\"?VARHELP=nondigest/personalize\">读取详细\n"
+"                 信息</a>部分讨论列表系统性能的重要性。"
+
+#: Mailman/Gui/NonDigest.py:61
+msgid ""
+"Normally, Mailman sends the regular delivery messages to\n"
+"                 the mail server in batches.  This is much more efficent\n"
+"                 because it reduces the amount of traffic between Mailman "
+"and\n"
+"                 the mail server.\n"
+"\n"
+"                 <p>However, some lists can benefit from a more "
+"personalized\n"
+"                 approach.  In this case, Mailman crafts a new message for\n"
+"                 each member on the regular delivery list.  Turning this\n"
+"                 feature on may degrade the performance of your site, so "
+"you\n"
+"                 need to carefully consider whether the trade-off is worth "
+"it,\n"
+"                 or whether there are other ways to accomplish what you "
+"want.\n"
+"                 You should also carefully monitor your system load to make\n"
+"                 sure it is acceptable.\n"
+"\n"
+"                 <p>Select <em>No</em> to disable personalization and send\n"
+"                 messages to the members in batches.  Select <em>Yes</em> "
+"to\n"
+"                 personalize deliveries and allow additional substitution\n"
+"                 variables in message headers and footers (see below).  In\n"
+"                 addition, by selecting <em>Full Personalization</em>, the\n"
+"                 <code>To</code> header of posted messages will be modified "
+"to\n"
+"                 include the member's address instead of the list's posting\n"
+"                 address.\n"
+"\n"
+"                 <p>When personalization is enabled, a few more expansion\n"
+"                 variables can be included in the <a\n"
+"                 href=\"?VARHELP=nondigest/msg_header\">message header</a> "
+"and\n"
+"                 <a href=\"?VARHELP=nondigest/msg_footer\">message "
+"footer</a>.\n"
+"\n"
+"                 <p>These additional substitution variables will be "
+"available\n"
+"                 for your headers and footers, when this feature is "
+"enabled:\n"
+"\n"
+"                 <ul><li><b>user_address</b> - The address of the user,\n"
+"                         coerced to lower case.\n"
+"                     <li><b>user_delivered_to</b> - The case-preserved "
+"address\n"
+"                         that the user is subscribed with.\n"
+"                     <li><b>user_password</b> - The user's password.\n"
+"                     <li><b>user_name</b> - The user's full name.\n"
+"                     <li><b>user_optionsurl</b> - The url to the user's "
+"option\n"
+"                         page.\n"
+"                 </ul>\n"
+"                 "
+msgstr ""
+"一般来说,Mailman把普通投递信息批量的送给邮件服务器.这样\n"
+"                  做更有效率,因为它减少了Mailman和邮件服务器之间的通讯量.\n"
+"\n"
+"                  <p>但是,更个性化的设置对一些列表可能会很有帮助.在这种情况下\n"
+"                  Mailman为普通投递列表中的每一个成员均提交一份新的信息.打开\n"
+"                  此特性可能会降低您站点的性能,所以您应该好好考虑一下,这个交易\n"
+"                  是否合算,或者是否有其它的方式来完成您想要的效果.您应该小心的\n"
+"                  监视您的系统负载,以确保您所花的代价是可承受的.\n"
+"\n"
+"                  <p>选择<em>否</em>来禁止个性化设置,批量向成员投递信息.选择\n"
+"                  <em>是</em>来个性化您的投递,并且允许在消息头和消息尾施用额外\n"
+"                  的替换变量(参考下面的内容).此外,通过选择<em>完全的个性化</em>,\n"
+"                  所发信息的<code>To</code>头部会被修改以包含成员的地址而非列表\n"
+"                  的发信地址.\n"
+"\n"
+"                  当个性化启用时,可以在<a href=\"?VARHELP=nondigest/msg_header\">\n"
+"                  信息头和<a href=\"?VARHELP=nondigest/msg_footer\">信息尾使用少量\n"
+"                  的额外替换变量.\n"
+"\n"
+"                  <p>当此特性开启时,如下的额外的替换变量可以在信息的头部或者尾\n"
+"                  部使用:\n"
+"\n"
+"                  <ul><li><b>user_address</b> - 用户的地址,被修改为小写.\n"
+"                      <li><b>user_delivered_to</b> - 用户订阅列表时使用的大小写\n"
+"                           相关的地址.\n"
+"                      <li><b>user_password</b> - 用户的口令.\n"
+"                      <li><b>user_name</b> - 用户的全名.\n"
+"                      <li><b>user_optionsurl</b> - 用户选项页的URL地址.\n"
+"                  </ul>\n"
+"                 "
+
+#: Mailman/Gui/NonDigest.py:110
+msgid ""
+"When <a href=\"?VARHELP=nondigest/personalize\">personalization</a> is "
+"enabled\n"
+"for this list, additional substitution variables are allowed in your "
+"headers\n"
+"and footers:\n"
+"\n"
+"<ul><li><b>user_address</b> - The address of the user,\n"
+"        coerced to lower case.\n"
+"    <li><b>user_delivered_to</b> - The case-preserved address\n"
+"        that the user is subscribed with.\n"
+"    <li><b>user_password</b> - The user's password.\n"
+"    <li><b>user_name</b> - The user's full name.\n"
+"    <li><b>user_optionsurl</b> - The url to the user's option\n"
+"        page.\n"
+"</ul>\n"
+msgstr ""
+"当列表启用<a "
+"href=\"?VARHELP=nondigest/personalize\">个性化设置(personalization)</a>时，\n"
+" 在邮件头部和尾部以下额外替换变量可用：\n"
+"\n"
+"<ul><li><b>user_address</b> - 用户地址，转化为小写字母。\n"
+"    <li><b>user_delivered_to</b> - 用户订阅列表时使用的大小写相关的地址.\n"
+"    <li><b>user_password</b> - 用户口令。\n"
+"    <li><b>user_name</b> - 用户全名。\n"
+"    <li><b>user_optionsurl</b> - 用户选项页的URL地址.\n"
+"</ul>\n"
+
+#: Mailman/Gui/NonDigest.py:129
+msgid "Header added to mail sent to regular list members"
+msgstr "添加到发给常规列表成员邮件头部的文本"
+
+#: Mailman/Gui/NonDigest.py:130
+msgid ""
+"Text prepended to the top of every immediately-delivery\n"
+"             message. "
+msgstr "添加到每一封即时投递的邮件中的文本 "
+
+#: Mailman/Gui/NonDigest.py:134
+msgid "Footer added to mail sent to regular list members"
+msgstr "添加到发给常规列表成员邮件尾部的文本"
+
+#: Mailman/Gui/NonDigest.py:135
+msgid ""
+"Text appended to the bottom of every immediately-delivery\n"
+"             message. "
+msgstr "添加到每一封即时投递的邮件末尾的文本 "
+
+#: Mailman/Gui/NonDigest.py:141
+msgid "Scrub attachments of regular delivery message?"
+msgstr "去除常规投递邮件的附件？"
+
+#: Mailman/Gui/NonDigest.py:142
+msgid ""
+"When you scrub attachments, they are stored in the archive\n"
+"             area and links are made in the message so that the member can\n"
+"             access them via a web browser. If you want the attachments to\n"
+"             totally disappear, you can use content filtering options."
+msgstr ""
+"当你使用附件时，附件被放在归档区，邮件中设置链接，这样成员可以通过网页浏览器来访问附件。\n"
+"             如果你想使附件完全不出现，可以使用内容过滤选项。"
+
+#: Mailman/Gui/NonDigest.py:149
+msgid "Sibling lists"
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:152
+msgid ""
+"Other mailing lists on this site whose members are\n"
+"             excluded from the regular (non-digest) delivery if those\n"
+"             list addresses appear in a To: or Cc: header."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:155
+msgid ""
+"The list addresses should be written in full mail address\n"
+"             format (e.g. mailman@example.com). Do not specify this list\n"
+"             address mutually in the exclude list configuration page of the\n"
+"             other list, or members of both lists won't get any message.\n"
+"             Note also that the site administrator may prohibit cross "
+"domain\n"
+"             siblings."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:163
+msgid ""
+"Ignore regular_exclude_lists of which the poster is not a\n"
+"             member."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:165
+msgid ""
+"If a post is addressed to this list and to one or more of\n"
+"             the exclude lists, regular members of those lists will not be\n"
+"             sent the post from this list, but if the poster is not a "
+"member\n"
+"             of an excluded list, the post may not be accepted by that list\n"
+"             which leaves the members of that list with no copy of the "
+"post.\n"
+"             Setting this to Yes ignores any of the exclude lists of which "
+"the\n"
+"             poster is not a member."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:174
+msgid ""
+"Other mailing lists on this site whose members are\n"
+"             included in the regular (non-digest) delivery if those\n"
+"             list addresses don't appear in a To: or Cc: header."
+msgstr ""
+
+#: Mailman/Gui/NonDigest.py:177
+msgid ""
+"The list addresses should be written in full mail address\n"
+"             format (e.g. mailman@example.com). Note also that the site\n"
+"             administrator may prohibit cross domain siblings."
+msgstr ""
+
+#: Mailman/Gui/Passwords.py:27
+msgid "Passwords"
+msgstr "口令"
+
+#: Mailman/Gui/Privacy.py:38
+msgid "Privacy options..."
+msgstr "隐私选项..."
+
+#: Mailman/Gui/Privacy.py:42
+msgid "Subscription&nbsp;rules"
+msgstr "订阅规则"
+
+#: Mailman/Gui/Privacy.py:43
+msgid "Sender&nbsp;filters"
+msgstr "发送端过滤器"
+
+#: Mailman/Gui/Privacy.py:44
+msgid "Recipient&nbsp;filters"
+msgstr "接收端过滤器"
+
+#: Mailman/Gui/Privacy.py:45
+msgid "Spam&nbsp;filters"
+msgstr "垃圾邮件过滤器"
+
+#: Mailman/Gui/Privacy.py:59 Mailman/Gui/Usenet.py:63
+msgid "None"
+msgstr "无"
+
+#: Mailman/Gui/Privacy.py:60 Mailman/Gui/Privacy.py:83
+msgid "Confirm"
+msgstr "确认"
+
+#: Mailman/Gui/Privacy.py:61 Mailman/Gui/Privacy.py:84
+msgid "Require approval"
+msgstr "要求核准"
+
+#: Mailman/Gui/Privacy.py:62 Mailman/Gui/Privacy.py:85
+msgid "Confirm and approve"
+msgstr "确认并核准"
+
+#: Mailman/Gui/Privacy.py:64 Mailman/Gui/Privacy.py:87
+msgid "What steps are required for subscription?<br>"
+msgstr "订阅需要那些步骤？<br>"
+
+#: Mailman/Gui/Privacy.py:65
+msgid ""
+"None - no verification steps (<em>Not\n"
+"                           Recommended </em>)<br>\n"
+"                           Confirm (*) - email confirmation step required "
+"<br>\n"
+"                           Require approval - require list administrator\n"
+"                           Approval for subscriptions <br>\n"
+"                           Confirm and approve - both confirm and approve\n"
+"                           \n"
+"                           <p>(*) when someone requests a subscription,\n"
+"                           Mailman sends them a notice with a unique\n"
+"                           subscription request number that they must reply "
+"to\n"
+"                           in order to subscribe.<br>\n"
+"\n"
+"                           This prevents mischievous (or malicious) people\n"
+"                           from creating subscriptions for others without\n"
+"                           their consent."
+msgstr ""
+"无 - 无认证步骤(<em> 不推荐使用 </em>)<br>\n"
+"                           确认 (*) - 要求有邮件确认步骤 <br>\n"
+"                           要求核准 - 需要列表管理员核准订阅<br>\n"
+"                           确认并核准 - 即要求确认,也需要管理员核准\n"
+"                           \n"
+"                           <p>(*) 当有人请求订阅时，Mailman给他发送带有唯一订阅请\n"
+"                           求号的的通知，如果他要订阅，必须回信。\n"
+"\n"
+"                           这用来防止恶意用户不经他人同意而为其订阅。"
+
+#: Mailman/Gui/Privacy.py:88
+msgid ""
+"Confirm (*) - email confirmation required <br>\n"
+"                           Require approval - require list administrator\n"
+"                           approval for subscriptions <br>\n"
+"                           Confirm and approve - both confirm and approve\n"
+"                           \n"
+"                           <p>(*) when someone requests a subscription,\n"
+"                           Mailman sends them a notice with a unique\n"
+"                           subscription request number that they must reply "
+"to\n"
+"                           in order to subscribe.<br> This prevents\n"
+"                           mischievous (or malicious) people from creating\n"
+"                           subscriptions for others without their consent."
+msgstr ""
+"确认 (*) - 需要邮件确认<br>\n"
+"                            Require approvel - 需要列表管理员审核订阅请求<br>\n"
+"                            Confirm and approve - 即需要邮件确认也需要管理员审核\n"
+"                            \n"
+"                            <p>(*) 当有人请求订阅时，Mailman会给他们发送一封通知，\n"
+"                            附带一个唯一的订阅请求号。要想订阅，必须回复此通知。\n"
+"                            <br>这用来防止恶意用户不经他人同意而为其订阅列表。"
+
+#: Mailman/Gui/Privacy.py:104
+msgid ""
+"This section allows you to configure subscription and\n"
+"            membership exposure policy.  You can also control whether this\n"
+"            list is public or not.  See also the\n"
+"            <a href=\"%(admin)s/archive\">Archival Options</a> section for\n"
+"            separate archive-related privacy settings."
+msgstr ""
+"您可以在本小节中配置订阅及成员身份公开策略。您也可以\n"
+"             控制此列表是否是公开的。参考<a href=\"%(admin)s/archive\">归档选\n"
+"             项</a>小节以获取归档相关的隐私策略。"
+
+#: Mailman/Gui/Privacy.py:110
+msgid "Subscribing"
+msgstr "订阅"
+
+#: Mailman/Gui/Privacy.py:112
+msgid ""
+"Advertise this list when people ask what lists are on this\n"
+"             machine?"
+msgstr "在有人询问此主机上运行着哪些邮件列表时，显示此列表吗？"
+
+#: Mailman/Gui/Privacy.py:118
+msgid ""
+"List of addresses (or regexps) whose subscriptions do not\n"
+"             require approval."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:121
+msgid ""
+"When subscription requires approval, addresses in this list\n"
+"             are allowed to subscribe without administrator approval. Add\n"
+"             addresses one per line. You may begin a line with a ^ "
+"character\n"
+"             to designate a (case insensitive) regular expression match."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:126
+msgid ""
+"You may also use the @listname notation to designate the\n"
+"             members of another list in this installation."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:130
+msgid ""
+"Is the list moderator's approval required for unsubscription\n"
+"             requests?  (<em>No</em> is recommended)"
+msgstr "退订请求需要经过列表主持者的核准吗？(推荐选<em>否</em>)"
+
+#: Mailman/Gui/Privacy.py:133
+msgid ""
+"When members want to leave a list, they will make an\n"
+"             unsubscription request, either via the web or via email.\n"
+"             Normally it is best for you to allow open unsubscriptions so "
+"that\n"
+"             users can easily remove themselves from mailing lists (they "
+"get\n"
+"             really upset if they can't get off lists!).\n"
+"\n"
+"             <p>For some lists though, you may want to impose moderator\n"
+"             approval before an unsubscription request is processed.  "
+"Examples\n"
+"             of such lists include a corporate mailing list that all "
+"employees\n"
+"             are required to be members of."
+msgstr ""
+"当成员想要离开列表时，他们会通过web或者email发送一个\n"
+"              退订请求。一般来说，您最好允许列表成员能够自由的退订列表，这样他\n"
+"              们就能够容易地把自己从邮件列表中移除(如果他们不能离开列表的话，会\n"
+"              觉得很烦)\n"
+"\n"
+"              <p>但是对某些列表，您可能希望在一个退订请求被执行之前需要经过列表\n"
+"              主持人核准。这种列表的例子包括公司的邮件列表，所有的雇员都要求是\n"
+"              列表的成员。"
+
+#: Mailman/Gui/Privacy.py:144
+msgid "Ban list"
+msgstr "黑名单"
+
+#: Mailman/Gui/Privacy.py:146
+msgid ""
+"List of addresses which are banned from membership in this\n"
+"             mailing list."
+msgstr "被禁止加入列表的地址清单。"
+
+#: Mailman/Gui/Privacy.py:149
+msgid ""
+"Addresses in this list are banned outright from subscribing\n"
+"             to this mailing list, with no further moderation required.  "
+"Add\n"
+"             addresses one per line; start the line with a ^ character to\n"
+"             designate a regular expression match."
+msgstr ""
+"此清单中的地址被禁止订阅此邮件列表，而无须审核。每行添加一\n"
+"              个地址；以 ^ 开头的行是一个正则表达式匹配。"
+
+#: Mailman/Gui/Privacy.py:154
+msgid "Membership exposure"
+msgstr "成员身份公布"
+
+#: Mailman/Gui/Privacy.py:156
+msgid "Anyone"
+msgstr "任何人"
+
+#: Mailman/Gui/Privacy.py:156
+msgid "List admin only"
+msgstr "仅列表管理员"
+
+#: Mailman/Gui/Privacy.py:156
+msgid "List members"
+msgstr "列表成员"
+
+#: Mailman/Gui/Privacy.py:157
+msgid "Who can view subscription list?"
+msgstr "谁可以查看已订阅成员清单？"
+
+#: Mailman/Gui/Privacy.py:159
+msgid ""
+"When set, the list of subscribers is protected by member or\n"
+"             admin password authentication."
+msgstr "若设置此项，则已订阅成员清单将受成员口令或管理员口令的保护。"
+
+#: Mailman/Gui/Privacy.py:163
+msgid ""
+"Show member addresses so they're not directly recognizable\n"
+"             as email addresses?"
+msgstr "不以标准格式显示成员的邮件地址？"
+
+#: Mailman/Gui/Privacy.py:165
+msgid ""
+"Setting this option causes member email addresses to be\n"
+"             transformed when they are presented on list web pages (both in\n"
+"             text and as links), so they're not trivially recognizable as\n"
+"             email addresses.  The intention is to prevent the addresses\n"
+"             from being snarfed up by automated web scanners for use by\n"
+"             spammers."
+msgstr ""
+"设置此项将导致在网页中显示经过变形后的成员邮件地址(文本\n"
+"             和链接都经过变形)，变形后的邮件地址将不再是标准格式。这样作的目\n"
+"             的是为了防止一些垃圾邮件制造者利用网络爬虫自动收集这些邮件地址。"
+
+#: Mailman/Gui/Privacy.py:176
+msgid "/Quarantine"
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:180
+msgid ""
+"When a message is posted to the list, a series of\n"
+"            moderation steps are taken to decide whether a moderator must\n"
+"            first approve the message or not.  This section contains the\n"
+"            controls for moderation of both member and non-member postings.\n"
+"\n"
+"            <p>Member postings are held for moderation if their\n"
+"            <b>moderation flag</b> is turned on.  You can control whether\n"
+"            member postings are moderated by default or not.\n"
+"\n"
+"            <p>Non-member postings can be automatically\n"
+"            <a href=\"?VARHELP=privacy/sender/accept_these_nonmembers\"\n"
+"            >accepted</a>,\n"
+"            <a href=\"?VARHELP=privacy/sender/hold_these_nonmembers\">held "
+"for\n"
+"            moderation</a>,\n"
+"            <a href=\"?VARHELP=privacy/sender/reject_these_nonmembers\"\n"
+"            >rejected</a> (bounced), or\n"
+"            <a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"\n"
+"            >discarded</a>,\n"
+"            either individually or as a group.  Any\n"
+"            posting from a non-member who is not explicitly accepted,\n"
+"            rejected, or discarded, will have their posting filtered by the\n"
+"            <a "
+"href=\"?VARHELP=privacy/sender/generic_nonmember_action\">general\n"
+"            non-member rules</a>.\n"
+"\n"
+"            <p>In the text boxes below, add one address per line; start the\n"
+"            line with a ^ character to designate a <a href=\n"
+"            \"http://docs.python.org/library/re.html\"\n"
+"            >Python regular expression</a>.  When entering backslashes, do "
+"so\n"
+"            as if you were using Python raw strings (i.e. you generally "
+"just\n"
+"            use a single backslash).\n"
+"\n"
+"            <p>Note that non-regexp matches are always done first."
+msgstr ""
+"当一封邮件被发送到列表时，要执行一系列的步骤以确定列\n"
+"            表主持者是否必须首先对此信件进行审查。本小节包含对成员或非成员信\n"
+"            件的控制选项。\n"
+"\n"
+"            <p>如果列表成员的<b>节制</b>标志被打开，那么他的信件都将被暂存以待\n"
+"            审核。您可以控制成员信件默认情况下是否被暂存。\n"
+"\n"
+"            <p>非成员的信件可以单独的或成组的被自动\n"
+"            <a href=\"?VARHELP=privacy/sender/accept_these_nonmembers\"\n"
+"            >接受</a>，\n"
+"            <a href=\"?VARHELP=privacy/sender/hold_these_nonmembers\">暂存以\n"
+"            待审核</a>，\n"
+"            <a href=\"?VARHELP=privacy/sender/reject_these_nonmembers\"\n"
+"            >拒绝</a>(被退回)，或者\n"
+"            <a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"\n"
+"            >丢弃</a>。\n"
+"            任何没有明确指明接受，退回，或者丢弃的非成员信件都将被\n"
+"            <a href=\"?VARHELP=privacy/sender/generic_nonmember_action\">非成\n"
+"            员通用规则</a>所过滤。\n"
+"\n"
+"            <p>下面的文本框中，每行只能添加一个地址。行首的字符 ^ 说明后面的是\n"
+"            一个<a href=\"http://docs.python.org/library/re.html\"\n"
+"            >Python正则表达式</a>。反斜线请按照Python原始字符串的形式输入(也就是\n"
+"            说您只需要输入一个反斜线就可以了)。\n"
+"\n"
+"            <p>请注意，总是先做非正则表达式匹配。"
+
+#: Mailman/Gui/Privacy.py:213
+msgid "Member filters"
+msgstr "成员过滤器"
+
+#: Mailman/Gui/Privacy.py:216
+msgid "By default, should new list member postings be moderated?"
+msgstr "默认情况下，列表新成员的信件是否被暂存？"
+
+#: Mailman/Gui/Privacy.py:218
+msgid ""
+"Each list member has a <em>moderation flag</em> which says\n"
+"             whether messages from the list member can be posted directly "
+"to\n"
+"             the list, or must first be approved by the list moderator.  "
+"When\n"
+"             the moderation flag is turned on, list member postings must be\n"
+"             approved first.  You, the list administrator can decide whether "
+"a\n"
+"             specific individual's postings will be moderated or not.\n"
+"\n"
+"             <p>When a new member is subscribed, their initial moderation "
+"flag\n"
+"             takes its value from this option.  Turn this option off to "
+"accept\n"
+"             member postings by default.  Turn this option on to, by "
+"default,\n"
+"             moderate member postings first.  You can always manually set "
+"an\n"
+"             individual member's moderation bit by using the\n"
+"             <a href=\"%(adminurl)s/members\">membership management\n"
+"             screens</a>."
+msgstr ""
+"每一个列表成员都有一个<em>节制标志</em>来控制此成员的信件是\n"
+"             直接发送到列表中还是必须先经列表主持者审查。当节制标志被打开时\n"
+"             列表成员的信件就必须先通过审查。作为列表管理员，您可以决定某个人\n"
+"             的信件是否必须通过审查。\n"
+"\n"
+"             <p>新加入成员的初始节制标志将从此选项中获得。关闭此选项将默认直接\n"
+"             接受成员的信件。打开此选项将默认使得成员信件必须首先经过审查。您\n"
+"             总是可以在<a href=\"%(adminurl)s/members\">成员管理页</a>单独地设\n"
+"             置某个成员的节制标志。"
+
+#: Mailman/Gui/Privacy.py:234
+msgid ""
+"Ceiling on acceptable number of member posts, per interval,\n"
+"               before automatic moderation."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:237
+msgid ""
+"If a member posts this many times, within a period of time\n"
+"               the member is automatically moderated.  Use 0 to disable.  "
+"See\n"
+"               <a "
+"href=\"?VARHELP=privacy/sender/member_verbosity_interval\"\n"
+"               >member_verbosity_interval</a> for details on the time "
+"period.\n"
+"\n"
+"               <p>This is intended to stop people who join a list or lists "
+"and\n"
+"               then use a bot to send many spam messages in a short "
+"interval.\n"
+"\n"
+"               <p>Be careful when using this setting.  If it is set too "
+"low,\n"
+"               this can be triggered by a single post cross-posted to\n"
+"               multiple lists or by a single post to an umbrella list."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:250
+msgid ""
+"Number of seconds to remember posts to this list to determine\n"
+"               member_verbosity_threshold for automatic moderation of a\n"
+"               member."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:254
+msgid ""
+"If a member's total posts to all lists in this installation\n"
+"               with member_verbosity_threshold enabled reaches this list's\n"
+"               member_verbosity_threshold, the member is automatically\n"
+"               moderated on this list.\n"
+"\n"
+"               <p>Posts which are counted towards this list's\n"
+"               member_verbosity_threshold are all posts to any list with\n"
+"               member_verbosity_threshold enabled that arrived within that\n"
+"               list's member_verbosity_interval."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:266
+msgid ""
+"Action to take when a moderated member posts to the\n"
+"             list."
+msgstr "当一个被节制的成员发信到列表时应该执行的动作。"
+
+#: Mailman/Gui/Privacy.py:268
+msgid ""
+"<ul><li><b>Hold</b> -- this holds the message for approval\n"
+"             by the list moderators.\n"
+"\n"
+"             <p><li><b>Reject</b> -- this automatically rejects the message "
+"by\n"
+"             sending a bounce notice to the post's author.  The text of the\n"
+"             bounce notice can be <a\n"
+"             href=\"?VARHELP=privacy/sender/member_moderation_notice\"\n"
+"             >configured by you</a>.\n"
+"\n"
+"             <p><li><b>Discard</b> -- this simply discards the message, "
+"with\n"
+"             no notice sent to the post's author.\n"
+"             </ul>"
+msgstr ""
+"<ul><li><b>暂存</b> -- 这将暂存信件以待列表管理员审核。\n"
+"\n"
+"             <p><li><b>退回</b> -- 这将把信件自动退回发信者，并发送一封退信通知。\n"
+"             退信通知的内容可以由您\n"
+"             <a "
+"href=\"?VARHELP=privacy/sender/member_moderation_notice\">配置</a>。\n"
+"\n"
+"             <p><li><b>丢弃</b> -- 这将简单的丢弃此信件，而不会向发信者发送任何的\n"
+"             通知。\n"
+"             </ul>"
+
+#: Mailman/Gui/Privacy.py:282
+msgid ""
+"Text to include in any\n"
+"             <a href=\"?VARHELP/privacy/sender/member_moderation_action\"\n"
+"             >rejection notice</a> to\n"
+"             be sent to moderated members who post to this list."
+msgstr ""
+"应当被包含在<a href=\"?VARHELP/privacy/sender/member_moderation_action\"\n"
+"             >退信通知</a>中的文本。"
+
+#: Mailman/Gui/Privacy.py:290
+msgid ""
+"Action to take when anyone posts to the\n"
+"             list from a domain with a DMARC Reject%(quarantine)s Policy."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:293
+msgid ""
+"<ul><li><b>Munge From</b> -- applies the <a\n"
+"             href=\"?VARHELP=general/from_is_list\">from_is_list Munge "
+"From</a>\n"
+"             transformation to these messages.\n"
+"\n"
+"             <p><li><b>Wrap Message</b> -- applies the <a\n"
+"             href=\"?VARHELP=general/from_is_list\">from_is_list Wrap\n"
+"             Message</a> transformation to these messages.\n"
+"\n"
+"             <p><li><b>Reject</b> -- this automatically rejects the message "
+"by\n"
+"             sending a bounce notice to the post's author.  The text of the\n"
+"             bounce notice can be <a\n"
+"             href=\"?VARHELP=privacy/sender/dmarc_moderation_notice\"\n"
+"             >configured by you</a>.\n"
+"\n"
+"             <p><li><b>Discard</b> -- this simply discards the message, "
+"with\n"
+"             no notice sent to the post's author.\n"
+"             </ul>\n"
+"\n"
+"             <p>This setting takes precedence over the <a\n"
+"             href=\"?VARHELP=general/from_is_list\"> from_is_list</a> "
+"setting\n"
+"             if the message is From: an affected domain and the setting is\n"
+"             other than Accept."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:318
+msgid ""
+"Shall the above dmarc_moderation_action apply to messages\n"
+"               From: domains with DMARC p=quarantine as well as p=reject"
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:321
+msgid ""
+"<ul><li><b>No</b> -- this applies dmarc_moderation_action to\n"
+"               only those posts From: a domain with DMARC p=reject.  This "
+"is\n"
+"               appropriate if you are concerned about bounced messages, but\n"
+"               want to apply dmarc_moderation_action to as few messages as\n"
+"               possible.\n"
+"               <p><li><b>Yes</b> -- this applies dmarc_moderation_action to\n"
+"               posts From: a domain with DMARC p=reject or p=quarantine.\n"
+"               </ul><p>If a message is From: a domain with DMARC "
+"p=quarantine\n"
+"               and dmarc_moderation_action is not applied (this set to No)\n"
+"               the message will likely not bounce, but will be delivered to\n"
+"               recipients' spam folders or other hard to find places."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:335
+msgid ""
+"Shall the above dmarc_moderation_action apply to messages\n"
+"               From: domains with DMARC p=none as well as p=quarantine and\n"
+"               p=reject"
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:339
+msgid ""
+"<ul><li><b>No</b> -- this applies dmarc_moderation_action to\n"
+"               only those posts From: a domain with DMARC p=reject and\n"
+"               possibly p=quarantine depending on the setting of\n"
+"               dmarc_quarantine_moderation_action.\n"
+"               <p><li><b>Yes</b> -- this applies dmarc_moderation_action to\n"
+"               posts From: a domain with DMARC p=none if\n"
+"               dmarc_moderation_action is Munge From or Wrap Message and\n"
+"               dmarc_quarantine_moderation_action is Yes.\n"
+"               <p>The intent of this setting is to eliminate failure "
+"reports\n"
+"               to the owner of a domain that publishes DMARC p=none by "
+"applying\n"
+"               the message transformations that would be applied if the\n"
+"               domain's DMARC policy were stronger."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:353
+msgid ""
+"Text to include in any\n"
+"             <a href=\"?VARHELP=privacy/sender/dmarc_moderation_action\"\n"
+"             >rejection notice</a> to\n"
+"             be sent to anyone who posts to this list from a domain\n"
+"             with a DMARC Reject%(quarantine)s Policy."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:360
+msgid ""
+"If dmarc_moderation_action applies and is Wrap Message,\n"
+"             and this text is provided, the text will be placed in a\n"
+"             separate text/plain MIME part preceding the original message\n"
+"             part in the wrapped message."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:365
+msgid ""
+"A wrapped message will either be a multipart/mixed message\n"
+"             with up to four sub-parts; a text/plain part containing\n"
+"             msg_header, a text/plain part containing \n"
+"             dmarc_wrapped_message_text, a message/rfc822 part containing "
+"the\n"
+"             original message and a text/plain part containing msg_footer, "
+"or\n"
+"             a message/rfc822 message containing only the original message "
+"if\n"
+"             none of the other parts are applicable."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:374
+msgid ""
+"A 'two dimensional' list of email address domains which are\n"
+"               considered equivalent when checking if a post is from a list\n"
+"               member."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:378
+msgid ""
+"If two poster addresses with the same local part but\n"
+"               different domains are to be considered equivalents for list\n"
+"               membership tests, the domains are put here.  The format is\n"
+"               one or more groups of equivalent domains.  Within a group,\n"
+"               the domains are separated by commas and multiple groups are\n"
+"               separated by semicolons. White space is ignored.\n"
+"               <p>For example:<pre>\n"
+"               example.com,mail.example.com;mac.com,me.com,icloud.com\n"
+"               </pre>\n"
+"               <p>In this example, if user@example.com is a list member,\n"
+"               a post from user@mail.example.com will be treated as if it "
+"is\n"
+"               from user@example.com for list membership/moderation "
+"purposes,\n"
+"               and likewise, if user@me.com is a list member, posts from\n"
+"               user@mac.com or user@icloud.com will be treated as if from\n"
+"               user@me.com.\n"
+"               <p>Note that the poster's address is first tested for list\n"
+"               membership, and the equivalent domain addresses are only "
+"tested\n"
+"               if the poster's address is not that of a member.\n"
+"               <p>Also note that moderation of the equivalent domain "
+"address\n"
+"               will apply to the post, but other options such as 'ack' or\n"
+"               'not&nbsp;metoo' will not."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:400
+msgid "Non-member filters"
+msgstr "非成员过滤器"
+
+#: Mailman/Gui/Privacy.py:403
+msgid ""
+"List of non-member addresses whose postings should be\n"
+"             automatically accepted."
+msgstr "其信件应当被自动接受的非成员地址清单。"
+
+#: Mailman/Gui/Privacy.py:410
+msgid ""
+"Postings from any of these non-members will be automatically\n"
+"             accepted with no further moderation applied.  Add member\n"
+"             addresses one per line; start the line with a ^ character to\n"
+"             designate a regular expression match.  A line consisting of\n"
+"             the @ character followed by a list name specifies another\n"
+"             Mailman list in this installation, all of whose member\n"
+"             addresses will be accepted for this list."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:419
+msgid ""
+"List of non-member addresses whose postings will be\n"
+"             immediately held for moderation."
+msgstr "所发信件会被立即暂存以待审查的非成员地址清单"
+
+#: Mailman/Gui/Privacy.py:422
+msgid ""
+"Postings from any of these non-members will be immediately\n"
+"             and automatically held for moderation by the list moderators.\n"
+"             The sender will receive a notification message which will "
+"allow\n"
+"             them to cancel their held message.  Add member addresses one "
+"per\n"
+"             line; start the line with a ^ character to designate a regular\n"
+"             expression match."
+msgstr ""
+"这些非成员的信件将会被立即暂存以待列表管理员审查。发送者将\n"
+"             收到邮件通知，以允许他们自己撤销被暂存的信件。每行添加一个地址；\n"
+"             行首的字符^说明后面的是正则表达式。"
+
+#: Mailman/Gui/Privacy.py:430
+msgid ""
+"List of non-member addresses whose postings will be\n"
+"             automatically rejected."
+msgstr "所发信件会被自动拒绝的非成员地址清单。"
+
+#: Mailman/Gui/Privacy.py:433
+msgid ""
+"Postings from any of these non-members will be automatically\n"
+"             rejected.  In other words, their messages will be bounced back "
+"to\n"
+"             the sender with a notification of automatic rejection.  This\n"
+"             option is not appropriate for known spam senders; their "
+"messages\n"
+"             should be\n"
+"             <a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"\n"
+"             >automatically discarded</a>.\n"
+"\n"
+"             <p>Add member addresses one per line; start the line with a ^\n"
+"             character to designate a regular expression match."
+msgstr ""
+"这些非成员的信件将被自动拒绝。也就是说，他们的信件将被连同一\n"
+"             份退信通知一起被退回。这个选项不适用于已知的垃圾邮件发送者；他们\n"
+"             发送的信件应该被\n"
+"             <a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"\n"
+"             >自动丢弃</a>。\n"
+"\n"
+"             <p>每行添加一个地址；行首的字符^说明后面的是正则表达式。"
+
+#: Mailman/Gui/Privacy.py:445
+msgid ""
+"List of non-member addresses whose postings will be\n"
+"             automatically discarded."
+msgstr "所发信件会被自动丢弃的非成员地址清单。"
+
+#: Mailman/Gui/Privacy.py:448
+msgid ""
+"Postings from any of these non-members will be automatically\n"
+"             discarded.  That is, the message will be thrown away with no\n"
+"             further processing or notification.  The sender will not "
+"receive\n"
+"             a notification or a bounce, however the list moderators can\n"
+"             optionally <a "
+"href=\"?VARHELP=privacy/sender/forward_auto_discards\"\n"
+"             >receive copies of auto-discarded messages.</a>.\n"
+"\n"
+"             <p>Add member addresses one per line; start the line with a ^\n"
+"             character to designate a regular expression match."
+msgstr ""
+"这些非成员的信件将被自动丢弃。也就是说，这些信件将被直接丢\n"
+"             弃，而不会再做进一步的处理，也不会发送任何的通知。发信人将不会收到\n"
+"             邮件通知或者退信，但是列表管理员可以选择\n"
+"             <a href=\"?VARHELP=privacy/sender/forward_auto_discards\">接收一份\n"
+"             被自动丢弃信件的拷贝</a>。\n"
+"\n"
+"             <p>每行添加一个地址；行首的字符^说明后面的是正则表达式。"
+
+#: Mailman/Gui/Privacy.py:460
+msgid ""
+"Action to take for postings from non-members for which no\n"
+"             explicit action is defined."
+msgstr "当一个没有被显式指定处理方法的非成员向列表发信时应执行的动作。"
+
+#: Mailman/Gui/Privacy.py:463
+msgid ""
+"When a post from a non-member is received, the message's\n"
+"             sender is matched against the list of explicitly\n"
+"             <a href=\"?VARHELP=privacy/sender/accept_these_nonmembers\"\n"
+"             >accepted</a>,\n"
+"             <a "
+"href=\"?VARHELP=privacy/sender/hold_these_nonmembers\">held</a>,\n"
+"             <a href=\"?VARHELP=privacy/sender/reject_these_nonmembers\"\n"
+"             >rejected</a> (bounced), and\n"
+"             <a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"\n"
+"             >discarded</a> addresses.  If no match is found, then this "
+"action\n"
+"             is taken."
+msgstr ""
+"当接收到非成员发送的信件时，发信者地址将与被显式指定为\n"
+"             <a href=\"?VARHELP=privacy/sender/accept_these_nonmembers\"\n"
+"             >接受</a>，\n"
+"             <a "
+"href=\"?VARHELP=privacy/sender/hold_these_nonmembers\">暂存</a>，\n"
+"             <a href=\"?VARHELP=privacy/sender/reject_these_nonmembers\"\n"
+"             >拒绝</a>(退信)，或者\n"
+"             <a href=\"?VARHELP=privacy/sender/discard_these_nonmembers\"\n"
+"             >丢弃</a>的地址进行比较。如果没有匹配，那么将执行此动作。"
+
+#: Mailman/Gui/Privacy.py:475
+msgid ""
+"Should messages from non-members, which are automatically\n"
+"             discarded, be forwarded to the list moderator?"
+msgstr "被自动丢弃的非成员信件是否应该被转发给列表管理员？"
+
+#: Mailman/Gui/Privacy.py:479
+msgid ""
+"Text to include in any rejection notice to be sent to\n"
+"             non-members who post to this list. This notice can include\n"
+"             the list's owner address by %%(listowner)s and replaces the\n"
+"             internally crafted default message."
+msgstr ""
+"应当被包含到寄给发信到本列表的非成员的退信通知中的文本。\n"
+"             此通知可以包含列表属主地址 %%(listowner)s, 并且替换掉Mailman\n"
+"             内定的默认信息。"
+
+#: Mailman/Gui/Privacy.py:487
+msgid ""
+"This section allows you to configure various filters based on\n"
+"            the recipient of the message."
+msgstr "您可以在本小节配置一些基于收信人地址的过滤器。"
+
+#: Mailman/Gui/Privacy.py:490
+msgid "Recipient filters"
+msgstr "收信人过滤器"
+
+#: Mailman/Gui/Privacy.py:494
+msgid ""
+"Must posts have list named in destination (to, cc) field\n"
+"             (or be among the acceptable alias names, specified below)?"
+msgstr ""
+"信件的目的地址(to,cc)必须包含此列表的地址(或在下面指定的\n"
+"             可接受的别名)吗？"
+
+#: Mailman/Gui/Privacy.py:497
+msgid ""
+"Many (in fact, most) spams do not explicitly name their\n"
+"             myriad destinations in the explicit destination addresses - in\n"
+"             fact often the To: field has a totally bogus address for\n"
+"             obfuscation.  The constraint applies only to the stuff in the\n"
+"             address before the '@' sign, but still catches all such spams.\n"
+"\n"
+"             <p>The cost is that the list will not accept unhindered any\n"
+"             postings relayed from other addresses, unless\n"
+"\n"
+"             <ol>\n"
+"                 <li>The relaying address has the same name, or\n"
+"\n"
+"                 <li>The relaying address name is included on the options "
+"that\n"
+"                 specifies acceptable aliases for the list.\n"
+"\n"
+"             </ol>"
+msgstr ""
+"很多(事实上是绝大多数)垃圾邮件都不是把它们那无数的目的地\n"
+"             直接的放到目的地址中 - 事实上To:字段经常只有伪造的虚假地址。\n"
+"             此限制仅仅应用到目的地址中'@'前面的部分，但是这样也能捕获\n"
+"             所有的这种垃圾邮件。\n"
+"\n"
+"             <p>这样做的代价是，列表将不再接受从其他地址中继过来的正常信件，\n"
+"             除非\n"
+"\n"
+"             <ol>\n"
+"                 <li>中继地址有着同样的名字，或者\n"
+"\n"
+"                 <li>可接受的别名清单中包含此中继地址。\n"
+"\n"
+"             </ol>"
+
+#: Mailman/Gui/Privacy.py:515
+msgid ""
+"Alias names (regexps) which qualify as explicit to or cc\n"
+"             destination names for this list."
+msgstr "明确指明此列表的to或者cc地址的别名(正则表达式)。"
+
+#: Mailman/Gui/Privacy.py:518
+msgid ""
+"Alternate addresses that are acceptable when\n"
+"             `require_explicit_destination' is enabled.  This option takes "
+"a\n"
+"             list of regular expressions, one per line, which is matched\n"
+"             against every recipient address in the message.  The matching "
+"is\n"
+"             performed with Python's re.match() function, meaning they are\n"
+"             anchored to the start of the string.\n"
+"             \n"
+"             <p>For backwards compatibility with Mailman 1.1, if the regexp\n"
+"             does not contain an `@', then the pattern is matched against "
+"just\n"
+"             the local part of the recipient address.  If that match fails, "
+"or\n"
+"             if the pattern does contain an `@', then the pattern is "
+"matched\n"
+"             against the entire recipient address.\n"
+"             \n"
+"             <p>Matching against the local part is deprecated; in a future\n"
+"             release, the pattern will always be matched against the entire\n"
+"             recipient address."
+msgstr ""
+"`require_explicit_destination'选项打开时的\n"
+"             其他可接受地址。可以在每行指定一个正则表达式，用来匹配信件中的\n"
+"             所有目的地址。正则表达式匹配是用Python的re.match()函数实现的，\n"
+"             这意味着匹配是从字符串的开头开始进行的。\n"
+"             \n"
+"             <p>为了与Mailman 1.1保持向后兼容，如果正则表达式中不包括字符'@'，\n"
+"             那么它将仅与收件地址的本地部分进行匹配。如果匹配失败，或者此\n"
+"             正则表达式中含有字符'@'的话，它将会与整个收件地址进行匹配。\n"
+"             \n"
+"             <p>不赞成与本地部分进行匹配；在未来的版本中，这里指定的正则表达式\n"
+"             模式将总是与完整的收件地址进行匹配。"
+
+#: Mailman/Gui/Privacy.py:536
+msgid "Ceiling on acceptable number of recipients for a posting."
+msgstr "信件收件人的最大数目。"
+
+#: Mailman/Gui/Privacy.py:538
+msgid ""
+"If a posting has this number, or more, of recipients, it is\n"
+"             held for admin approval.  Use 0 for no ceiling."
+msgstr ""
+"如果某封信件的收件人数目大于或等于这个数字，就将被暂存以待\n"
+"             管理员核准。0表示无上限。"
+
+#: Mailman/Gui/Privacy.py:543
+msgid ""
+"This section allows you to configure various anti-spam\n"
+"            filters posting filters, which can help reduce the amount of "
+"spam\n"
+"            your list members end up receiving.\n"
+"            "
+msgstr ""
+"您可以在本小节配置一些垃圾邮件过滤器，这将有助于减少\n"
+"            列表成员收到的垃圾邮件数量。\n"
+"            "
+
+#: Mailman/Gui/Privacy.py:548
+msgid "Header filters"
+msgstr "头部过滤器"
+
+#: Mailman/Gui/Privacy.py:551
+msgid "Filter rules to match against the headers of a message."
+msgstr "匹配邮件头部的过滤器规则"
+
+#: Mailman/Gui/Privacy.py:553
+msgid ""
+"Each header filter rule has two parts, a list of regular\n"
+"             expressions, one per line, and an action to take.  Mailman\n"
+"             matches the message's headers against every regular expression "
+"in\n"
+"             the rule and if any match, the message is rejected, held, or\n"
+"             discarded based on the action you specify.  Use <em>Defer</em> "
+"to\n"
+"             temporarily disable a rule.\n"
+"\n"
+"             You can have more than one filter rule for your list.  In that\n"
+"             case, each rule is matched in turn, with processing stopped "
+"after\n"
+"             the first match.\n"
+"\n"
+"             Note that headers are collected from all the attachments\n"
+"             (except for the mailman administrivia message) and\n"
+"             matched against the regular expressions. With this feature,\n"
+"             you can effectively sort out messages with dangerous file\n"
+"             types or file name extensions."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:570
+msgid "Legacy anti-spam filters"
+msgstr "传统的垃圾邮件过滤器"
+
+#: Mailman/Gui/Privacy.py:573
+msgid "Hold posts with header value matching a specified regexp."
+msgstr "暂存头部匹配指定正则表达式的信件。"
+
+#: Mailman/Gui/Privacy.py:574
+msgid ""
+"Use this option to prohibit posts according to specific\n"
+"             header values.  The target value is a regular-expression for\n"
+"             matching against the specified header.  The match is done\n"
+"             disregarding letter case.  Lines beginning with '#' are "
+"ignored\n"
+"             as comments.\n"
+"\n"
+"             <p>For example:<pre>to: .*@public.com </pre> says to hold all\n"
+"             postings with a <em>To:</em> mail header containing "
+"'@public.com'\n"
+"             anywhere among the addresses.\n"
+"\n"
+"             <p>Note that leading whitespace is trimmed from the regexp.  "
+"This\n"
+"             can be circumvented in a number of ways, e.g. by escaping or\n"
+"             bracketing it."
+msgstr ""
+"使用此选现来根据特定的头部值禁止垃圾邮件。目标值是一个\n"
+"             用来与指定头部进行匹配的正则表达式。匹配以大小写无关的形式进行。\n"
+"             以'#'开头的行将被作为注释而忽略。\n"
+"\n"
+"             <p>例如：<pre>to: .*@public.com </pre>是说要延缓邮件头<em>To:</em>\n"
+"             中包含'@public.com'的所有信件。\n"
+"\n"
+"             <p>注意，开头的空格将被从正则表达式中清除。可以通过许多方法绕开此\n"
+"             限制，例如转义或者用括号把空白括起来。"
+
+#: Mailman/Gui/Privacy.py:609
+msgid ""
+"dmarc_moderation_action must be >= the configured\n"
+"                           default value."
+msgstr ""
+
+#: Mailman/Gui/Privacy.py:659
+msgid ""
+"Header filter rules require a pattern.\n"
+"                Incomplete filter rules will be ignored."
+msgstr ""
+"头部过滤器规则需要一个模式。\n"
+"                不完整的过滤器规则将被忽略。"
+
+#: Mailman/Gui/Privacy.py:678
+msgid ""
+"The header filter rule pattern\n"
+"                '%(safepattern)s' is not a legal regular expression.  This\n"
+"                rule will be ignored."
+msgstr ""
+"头部过滤器规则模式\n"
+"                '%(safepattern)s' 不是合法的正则表达式。这条规则将被忽略。"
+
+#: Mailman/Gui/Topics.py:38
+msgid "Topics"
+msgstr "主题"
+
+#: Mailman/Gui/Topics.py:46
+msgid "List topic keywords"
+msgstr "列表主题关键字"
+
+#: Mailman/Gui/Topics.py:48
+msgid "Disabled"
+msgstr "禁用"
+
+#: Mailman/Gui/Topics.py:48
+msgid "Enabled"
+msgstr "启用"
+
+#: Mailman/Gui/Topics.py:49
+msgid "Should the topic filter be enabled or disabled?"
+msgstr "启用主题过滤器吗？"
+
+#: Mailman/Gui/Topics.py:51
+msgid ""
+"The topic filter categorizes each incoming email message\n"
+"             according to <a\n"
+"            href=\"http://docs.python.org/library/re.html\">regular\n"
+"             expression filters</a> you specify below.  If the message's\n"
+"             <code>Subject:</code> or <code>Keywords:</code> header contains "
+"a\n"
+"             match against a topic filter, the message is logically placed\n"
+"             into a topic <em>bucket</em>.  Each user can then choose to "
+"only\n"
+"             receive messages from the mailing list for a particular topic\n"
+"             bucket (or buckets).  Any message not categorized in a topic\n"
+"             bucket registered with the user is not delivered to the list.\n"
+"\n"
+"             <p>Note that this feature only works with regular delivery, "
+"not\n"
+"             digest delivery.\n"
+"\n"
+"             <p>The body of the message can also be optionally scanned for\n"
+"             <code>Subject:</code> and <code>Keywords:</code> headers, as\n"
+"             specified by the <a\n"
+"       "
+"href=\"?VARHELP=topics/topics_bodylines_limit\">topics_bodylines_limit</a>\n"
+"             configuration variable."
+msgstr ""
+"主题过滤器根据您在下面指定的<a\n"
+"             href=\"http://docs.python.org/library/re.html\">\n"
+"             正则表达式</a>来对收到的邮件进行分类。如果某邮件的<code>Subject:</code>\n"
+"             头或<code>Keywords:</code>头匹配一个主题过滤器，那么此邮件将在逻辑上\n"
+"             被放进一个主题<em>桶</em>。每个列表成员都可以选择只从邮件列表中接收属于\n"
+"             某个或某几个主题桶的邮件。不属于用户注册的任何主题桶的信件将不会被投递\n"
+"             到列表中。\n"
+"\n"
+"             <p>注意，此特性只工作在普通投递模式，而不工作于摘要投递模式。\n"
+"\n"
+"             <p>您也可以在<a \n"
+"             "
+"href=\"?VARHELP=topics/topics_bodylines_limit\">topics_bodylines_limit</a>\n"
+"             指定配置选项以在信件正文中寻找<code>Subject:</code>头和<code>Keywords:\n"
+"             </code>头。"
+
+#: Mailman/Gui/Topics.py:72
+msgid "How many body lines should the topic matcher scan?"
+msgstr "主题匹配器应该扫描多少行正文内容？"
+
+#: Mailman/Gui/Topics.py:74
+msgid ""
+"The topic matcher will scan this many lines of the message\n"
+"             body looking for topic keyword matches.  Body scanning stops "
+"when\n"
+"             either this many lines have been looked at, or a non-header-"
+"like\n"
+"             body line is encountered.  By setting this value to zero, no "
+"body\n"
+"             lines will be scanned (i.e. only the <code>Keywords:</code> "
+"and\n"
+"             <code>Subject:</code> headers will be scanned).  By setting "
+"this\n"
+"             value to a negative number, then all body lines will be "
+"scanned\n"
+"             until a non-header-like line is encountered.\n"
+"             "
+msgstr ""
+"主题匹配器将在信件正文中扫描这么多行以寻找要匹配的主题关键字。\n"
+"             当这么多行都已经扫描完或者遇到一个不象头部的行时，扫描终止。\n"
+"             若这个值设定为0，则将不会对正文进行扫描(也就是说，只有<code>Keywords:\n"
+"             </code>头和<code>Subject:</code>头会被扫描)。把这个值设为负数，则所有\n"
+"             的行都将被扫描，直至遇到一个不象头部的行。\n"
+"             "
+
+#: Mailman/Gui/Topics.py:85
+msgid "Topic keywords, one per line, to match against each message."
+msgstr "与每封邮件进行匹配的主题关键字，每行写一个。"
+
+#: Mailman/Gui/Topics.py:87
+msgid ""
+"Each topic keyword is actually a regular expression, which is\n"
+"             matched against certain parts of a mail message, specifically "
+"the\n"
+"             <code>Keywords:</code> and <code>Subject:</code> message "
+"headers.\n"
+"             Note that the first few lines of the body of the message can "
+"also\n"
+"             contain a <code>Keywords:</code> and <code>Subject:</code>\n"
+"             \"header\" on which matching is also performed."
+msgstr ""
+"每个主题关键字事实上都是一个正则表达式，他们将与邮件的指定部分，\n"
+"            特别是<code>Keywords:</code>头和<code>Subject:</code>头，进行匹配。\n"
+"            注意，邮件正文的前面几行也可以包含<code>Keywords:</code>\"头\"和\n"
+"            <code>Subject:</code>\"头\"，也将对他们进行匹配。"
+
+#: Mailman/Gui/Topics.py:125
+msgid ""
+"Topic specifications require both a name and\n"
+"                a pattern.  Incomplete topics will be ignored."
+msgstr ""
+"主题的说明需要包含一个名字和一个模式。不完整\n"
+"                的主题将被忽略。"
+
+#: Mailman/Gui/Topics.py:135
+msgid ""
+"The topic pattern '%(safepattern)s' is not a\n"
+"                legal regular expression.  It will be discarded."
+msgstr ""
+"主题模式 '%(safepattern)s' 不是一个合法的正则\n"
+"                表达式。它将被丢弃。"
+
+#: Mailman/Gui/Usenet.py:25
+msgid "Mail&lt;-&gt;News&nbsp;gateways"
+msgstr "邮件&lt;--&gt;新闻网关"
+
+#: Mailman/Gui/Usenet.py:35
+msgid "Mail-to-News and News-to-Mail gateway services."
+msgstr "Mail-to-News和News-to-Mail网关服务"
+
+#: Mailman/Gui/Usenet.py:37
+msgid "News server settings"
+msgstr "新闻服务器设置"
+
+#: Mailman/Gui/Usenet.py:40
+msgid "The hostname of the machine your news server is running on."
+msgstr "您的新闻服务器所在主机的主机名。"
+
+#: Mailman/Gui/Usenet.py:41
+msgid ""
+"This value may be either the name of your news server, or\n"
+"             optionally of the format name:port, where port is a port "
+"number.\n"
+"\n"
+"             The news server is not part of Mailman proper.  You have to\n"
+"             already have access to an NNTP server, and that NNTP server "
+"must\n"
+"             recognize the machine this mailing list runs on as a machine\n"
+"             capable of reading and posting news."
+msgstr ""
+"这个值可以是您新闻服务器的名字，或者是 name:port 的形式，\n"
+"             port是一个端口号。\n"
+"\n"
+"             新闻服务器不是Mailman的组成部分。您必须已经可以访问一个NNTP服务器，\n"
+"             并且此NNTP服务器必须已把此邮件列表所在的主机认作是可以阅读和发布新\n"
+"             闻的主机。"
+
+#: Mailman/Gui/Usenet.py:50
+msgid "The name of the Usenet group to gateway to and/or from."
+msgstr "要链接的Usenet新闻组名"
+
+#: Mailman/Gui/Usenet.py:53
+msgid ""
+"Should new posts to the mailing list be sent to the\n"
+"             newsgroup?"
+msgstr "要把投递到列表的新邮件发送给新闻组吗？"
+
+#: Mailman/Gui/Usenet.py:57
+msgid ""
+"Should new posts to the newsgroup be sent to the mailing\n"
+"             list?"
+msgstr "要把投递到新闻组的新邮件发送给列表吗？"
+
+#: Mailman/Gui/Usenet.py:60
+msgid "Forwarding options"
+msgstr "转发选项"
+
+#: Mailman/Gui/Usenet.py:63
+msgid "Moderated"
+msgstr "节制的"
+
+#: Mailman/Gui/Usenet.py:63
+msgid "Open list, moderated group"
+msgstr "开放的列表，节制的组"
+
+#: Mailman/Gui/Usenet.py:66
+msgid "The moderation policy of the newsgroup."
+msgstr "新闻组的节制策略"
+
+#: Mailman/Gui/Usenet.py:68
+msgid ""
+"This setting determines the moderation policy of the\n"
+"             newsgroup and its interaction with the moderation policy of "
+"the\n"
+"             mailing list.  This only applies to the newsgroup that you are\n"
+"             gatewaying <em>to</em>, so if you are only gatewaying from\n"
+"             Usenet, or the newsgroup you are gatewaying to is not "
+"moderated,\n"
+"             set this option to <em>None</em>.\n"
+"\n"
+"             <p>If the newsgroup is moderated, you can set this mailing "
+"list\n"
+"             up to be the moderation address for the newsgroup.  By "
+"selecting\n"
+"             <em>Moderated</em>, an additional posting hold will be placed "
+"in\n"
+"             the approval process.  All messages posted to the mailing list\n"
+"             will have to be approved before being sent on to the "
+"newsgroup,\n"
+"             or to the mailing list membership.\n"
+"\n"
+"             <p><em>Note that if the message has an <tt>Approved</tt> "
+"header\n"
+"             with the list's administrative password in it, this hold test\n"
+"             will be bypassed, allowing privileged posters to send messages\n"
+"             directly to the list and the newsgroup.</em>\n"
+"\n"
+"             <p>Finally, if the newsgroup is moderated, but you want to "
+"have\n"
+"             an open posting policy anyway, you should select <em>Open "
+"list,\n"
+"             moderated group</em>.  The effect of this is to use the normal\n"
+"             Mailman moderation facilities, but to add an <tt>Approved</tt>\n"
+"             header to all messages that are gatewayed to Usenet."
+msgstr ""
+"这个设置检测新闻组的节制策略以及它和邮件列表节制策略的相互作用。该设置仅应用于\n"
+"             您正通过网关连接<em>至</em>的新闻组，所以如果您只是从Usenet\n"
+"             向外连接，或者你正通过网关连接的新闻组不受节制，\n"
+"             请将该选项设为<em>不</em>。\n"
+"\n"
+"             <p>如果新闻组受节制，您可以将该邮件列表设为新闻组的缓冲地址。通过\n"
+"             选定<em>节制</em>，一份额外的消息会放置到审核程序中。所有发\n"
+"             送到邮件列表的信息将在被发送到新闻组或者邮件列表成员之前经过审核。\n"
+"\n"
+"             <p><em>注意如果信息中包含一个<tt>Approved</tt>头部，同时头部里还有\n"
+"             列表的管理口令，则这个暂存测试将被绕开，将允许有特权的发送者直接\n"
+"             往列表和新闻组发送信息。</em>\n"
+"\n"
+"             <p>最后，如果新闻组受节制，但是您又想要使用开放的发信策略,\n"
+"             您可以选定<em>开放的列表，节制的组</em>。这将使用标准的\n"
+"             Mailman节制设施，但是在所有通过网关发送到Usenet的信息中\n"
+"             加上了一个<tt>Approved</tt>头部。"
+
+#: Mailman/Gui/Usenet.py:94
+msgid "Prefix <tt>Subject:</tt> headers on postings gated to news?"
+msgstr "在经网关发送到新闻组的邮件中添加<tt>Subject:</tt>头部？"
+
+#: Mailman/Gui/Usenet.py:95
+msgid ""
+"Mailman prefixes <tt>Subject:</tt> headers with\n"
+"             <a href=\"?VARHELP=general/subject_prefix\">text you can\n"
+"             customize</a> and normally, this prefix shows up in messages\n"
+"             gatewayed to Usenet.  You can set this option to <em>No</em> "
+"to\n"
+"             disable the prefix on gated messages.  Of course, if you turn "
+"off\n"
+"             normal <tt>Subject:</tt> prefixes, they won't be prefixed for\n"
+"             gated messages either."
+msgstr ""
+"Mailman以<a href=\"?VARHELP=general/subject_prefix\">\n"
+"             您可以定制的文本</a>作为内容添加<tt>Subject:</tt>头部。并且在正\n"
+"             常情况下，这个前缀显示在经网关\n"
+"             路由到新闻组的信件中。你可以把此选项设定为<em>否</em>以禁止在被路由\n"
+"             信件中添加前缀。当然，如果你关闭正常的<tt>Subject:</tt>前缀，\n"
+"             它们也将不会出现为被路由信件的前缀。"
+
+#: Mailman/Gui/Usenet.py:103
+msgid "Mass catch up"
+msgstr ""
+
+#: Mailman/Gui/Usenet.py:106
+msgid "Should Mailman perform a <em>catchup</em> on the newsgroup?"
+msgstr ""
+
+#: Mailman/Gui/Usenet.py:107
+msgid ""
+"When you tell Mailman to perform a catchup on the newsgroup,\n"
+"             this means that you want to start gating messages to the "
+"mailing\n"
+"             list with the next new message found.  All earlier messages on\n"
+"             the newsgroup will be ignored.  This is as if you were reading\n"
+"             the newsgroup yourself, and you marked all current messages as\n"
+"             <em>read</em>.  By catching up, your mailing list members will\n"
+"             not see any of the earlier messages."
+msgstr ""
+"当你告知Mailman执行一个运行在新闻组上的catchup时，这意味着你\n"
+"             想开始向邮件列表连接找到的下一条新信息。所有在新闻组上的之前的\n"
+"             信息都将被忽略。这就好像你自己正在阅读新闻组，并且你给所有当前\n"
+"             信息标志了<em>读取</em>。通过catchup，你的邮件列表成员将看不到\n"
+"             任何之前的信息。"
+
+#: Mailman/Gui/Usenet.py:121
+msgid "Mass catchup completed"
+msgstr ""
+
+#: Mailman/Gui/Usenet.py:133
+msgid ""
+"You cannot enable gatewaying unless both the\n"
+"                <a href=\"?VARHELP=gateway/nntp_host\">news server field</a> "
+"and\n"
+"                the <a href=\"?VARHELP=gateway/linked_newsgroup\">linked\n"
+"                newsgroup</a> fields are filled in."
+msgstr ""
+"除非<a href=\"?VARHELP=gateway/nntp_host\">\n"
+"                新闻服务器字段</a>和<a href=\"?VARHELP=gateway/linked_newsgroup\">\n"
+"                链接的新闻组</a>域已经被填写，你不能启动网关。"
+
+#: Mailman/HTMLFormatter.py:49
+msgid "%(listinfo_link)s list run by %(owner_link)s"
+msgstr "由 %(owner_link)s 运行的 %(listinfo_link)s 邮件列表"
+
+#: Mailman/HTMLFormatter.py:57
+msgid "%(realname)s administrative interface"
+msgstr "%(realname)s 的管理接口"
+
+#: Mailman/HTMLFormatter.py:58
+msgid " (requires authorization)"
+msgstr " (需要授权)"
+
+#: Mailman/HTMLFormatter.py:61
+msgid "Overview of all %(hostname)s mailing lists"
+msgstr "%(hostname)s 上的所有邮件列表"
+
+#: Mailman/HTMLFormatter.py:78
+msgid "<em>(1 private member not shown)</em>"
+msgstr "<em>(1个私有成员没有显示)</em>"
+
+#: Mailman/HTMLFormatter.py:80
+msgid "<em>(%(num_concealed)d private members not shown)</em>"
+msgstr "<em>(%(num_concealed)d个私有成员没有显示)</em>"
+
+#: Mailman/HTMLFormatter.py:140
+msgid "; it was disabled by you"
+msgstr "；您禁止了该选项"
+
+#: Mailman/HTMLFormatter.py:142
+msgid "; it was disabled by the list administrator"
+msgstr "；列表管理员禁止了该选项"
+
+#: Mailman/HTMLFormatter.py:146
+msgid ""
+"; it was disabled due to excessive bounces.  The\n"
+"            last bounce was received on %(date)s"
+msgstr "；由于退信过多，它被禁止了。最后一封退信在 %(date)s 收到。"
+
+#: Mailman/HTMLFormatter.py:149
+msgid "; it was disabled for unknown reasons"
+msgstr "；由于不明原因，它被禁止了"
+
+#: Mailman/HTMLFormatter.py:151
+msgid "Note: your list delivery is currently disabled%(reason)s."
+msgstr "注意：你在列表中的发信权现在被禁止了，因为 %(reason)s。"
+
+#: Mailman/HTMLFormatter.py:154
+msgid "Mail delivery"
+msgstr "邮件投递"
+
+#: Mailman/HTMLFormatter.py:156 Mailman/HTMLFormatter.py:301
+msgid "the list administrator"
+msgstr "列表管理员"
+
+#: Mailman/HTMLFormatter.py:157
+msgid ""
+"<p>%(note)s\n"
+"\n"
+"            <p>You may have disabled list delivery intentionally,\n"
+"            or it may have been triggered by bounces from your email\n"
+"            address.  In either case, to re-enable delivery, change the\n"
+"            %(link)s option below.  Contact %(mailto)s if you have any\n"
+"            questions or need assistance."
+msgstr ""
+"<p>%(note)s\n"
+"\n"
+"            <p>你可能故意禁止了列表投递，或者被来自你的电子邮件地址的\n"
+"            退信触发而禁止了。无论是哪一种情况，改变以下的 %(link)s 选\n"
+"            项以便重新启动投递。如果您有任何问题，或者需要帮助，请联系\n"
+"            %(mailto)s。"
+
+#: Mailman/HTMLFormatter.py:169
+msgid ""
+"<p>We have received some recent bounces from your\n"
+"            address.  Your current <em>bounce score</em> is %(score)s out of "
+"a\n"
+"            maximum of %(total)s.  Please double check that your subscribed\n"
+"            address is correct and that there are no problems with delivery "
+"to\n"
+"            this address.  Your bounce score will be automatically reset if\n"
+"            the problems are corrected soon."
+msgstr ""
+"<p>我们已经接收到一些来自您的地址的新近的退信。\n"
+"            您当前的<em>退信数</em>已经比最大限制 %(total)s 超过了 %(score)s。\n"
+"            请仔细检查你用来订阅的地址是否正确并且可以正常使用。问题被纠正后，你\n"
+"            的退信数将很快被自动重设。"
+
+#: Mailman/HTMLFormatter.py:181
+msgid ""
+"(Note - you are subscribing to a list of mailing lists, so the %(type)s "
+"notice will be sent to the admin address for your membership, %(addr)s.)<p>"
+msgstr "(注意 - 您正在订阅一个邮件列表，所以 %(type)s 通知将被发送到管理员以告知您用来订阅的地址 %(addr)s。)<p>"
+
+#: Mailman/HTMLFormatter.py:191
+msgid ""
+"You will be sent email requesting confirmation, to\n"
+"            prevent others from gratuitously subscribing you."
+msgstr "为防止有人无意替您订阅，将有确认函发送给您。"
+
+#: Mailman/HTMLFormatter.py:194
+msgid ""
+"This is a closed list, which means your subscription\n"
+"            will be held for approval.  You will be notified of the list\n"
+"            moderator's decision by email."
+msgstr ""
+"这是一个关闭的列表，这意味着你的订阅请求将被暂缓以待\n"
+"            批准。列表管理员作出决定后将通过电子邮件通知你。"
+
+#: Mailman/HTMLFormatter.py:197 Mailman/HTMLFormatter.py:204
+msgid "also "
+msgstr "同样 "
+
+#: Mailman/HTMLFormatter.py:199
+msgid ""
+"You will be sent email requesting confirmation, to\n"
+"            prevent others from gratuitously subscribing you.  Once\n"
+"            confirmation is received, your request will be held for "
+"approval\n"
+"            by the list moderator.  You will be notified of the moderator's\n"
+"            decision by email."
+msgstr ""
+"为防止有人无意替您订阅，将有确认函发送给您。一旦经\n"
+"            您确认，您的请求将被暂缓以待列表主持者审核。主持者的决定将通\n"
+"            过电子邮件告知你。"
+
+#: Mailman/HTMLFormatter.py:208
+msgid ""
+"This is %(also)sa private list, which means that the\n"
+"            list of members is not available to non-members."
+msgstr "这是一个 %(also)s 私有列表，这意味着非成员无法访问成员列表。"
+
+#: Mailman/HTMLFormatter.py:211
+msgid ""
+"This is %(also)sa hidden list, which means that the\n"
+"            list of members is available only to the list administrator."
+msgstr "这是一个 %(also)s 隐藏列表，这意味着成员列表仅对列表管理员可见。"
+
+#: Mailman/HTMLFormatter.py:214
+msgid ""
+"This is %(also)sa public list, which means that the\n"
+"            list of members list is available to everyone."
+msgstr "这是一个 %(also)s 公共列表，这意味着成员列表对任何人都可见。"
+
+#: Mailman/HTMLFormatter.py:217
+msgid ""
+" (but we obscure the addresses so they are not\n"
+"                easily recognizable by spammers)."
+msgstr " (但是我们将地址模糊化，这样它们将不会轻易被垃圾信息收集器识别)。"
+
+#: Mailman/HTMLFormatter.py:222
+msgid ""
+"<p>(Note that this is an umbrella list, intended to\n"
+"            have only other mailing lists as members.  Among other things,\n"
+"            this means that your confirmation request will be sent to the\n"
+"            `%(sfx)s' account for your address.)"
+msgstr ""
+"<p>(注意：这是一个掩护列表，用来将其他的邮件列表作为\n"
+"            成员。在其他事务中，这意味着对您的地址，您的确认请求将被发送\n"
+"            到`%(sfx)s'。)"
+
+#: Mailman/HTMLFormatter.py:251
+msgid "<b><i>either</i></b> "
+msgstr "<b><i>任一的</i></b> "
+
+#: Mailman/HTMLFormatter.py:256
+msgid ""
+"To unsubscribe from %(realname)s, get a password reminder,\n"
+"        or change your subscription options %(either)senter your "
+"subscription\n"
+"        email address:\n"
+"        <p><center> "
+msgstr ""
+"为了从 %(realname)s 退订，获得口令提示函，或者改变你的订阅选项 %(either)s输入你\n"
+"        用来订阅的电子邮件地址:\n"
+"        <p><center> "
+
+#: Mailman/HTMLFormatter.py:263
+msgid "Unsubscribe or edit options"
+msgstr "退订或编辑选项"
+
+#: Mailman/HTMLFormatter.py:267
+msgid ""
+"<p>... <b><i>or</i></b> select your entry from\n"
+"                      the subscribers list (see above)."
+msgstr ""
+"<p>... <b><i>or</i></b>从订阅者列表(参考上文)中选择您的\n"
+"                      入口条目。"
+
+#: Mailman/HTMLFormatter.py:269
+msgid ""
+" If you leave the field blank, you will be prompted for\n"
+"        your email address"
+msgstr " 如果您将该字段设为空白，您将被提示输入您的邮件地址。"
+
+#: Mailman/HTMLFormatter.py:277
+msgid ""
+"(<i>%(which)s is only available to the list\n"
+"                members.</i>)"
+msgstr "(<i>%(which)s只对列表成员有效</i>)"
+
+#: Mailman/HTMLFormatter.py:281
+msgid ""
+"(<i>%(which)s is only available to the list\n"
+"            administrator.</i>)"
+msgstr "(<i>%(which)s只对列表管理员有效</i>)"
+
+#: Mailman/HTMLFormatter.py:291
+msgid "Click here for the list of "
+msgstr "点击这里获取列表 "
+
+#: Mailman/HTMLFormatter.py:293
+msgid " subscribers: "
+msgstr " 订阅者： "
+
+#: Mailman/HTMLFormatter.py:295
+msgid "Visit Subscriber list"
+msgstr "访问订阅者列表"
+
+#: Mailman/HTMLFormatter.py:298
+msgid "members"
+msgstr "成员"
+
+#: Mailman/HTMLFormatter.py:299
+msgid "Address:"
+msgstr "地址："
+
+#: Mailman/HTMLFormatter.py:302
+msgid "Admin address:"
+msgstr "管理员地址："
+
+#: Mailman/HTMLFormatter.py:305
+msgid "The subscribers list"
+msgstr "订阅者列表"
+
+#: Mailman/HTMLFormatter.py:307
+msgid " <p>Enter your "
+msgstr " <p>输入你的 "
+
+#: Mailman/HTMLFormatter.py:309
+msgid " and password to visit  the subscribers list: <p><center> "
+msgstr " 和口令以便访问订阅者列表：<p><center> "
+
+#: Mailman/HTMLFormatter.py:314
+msgid "Password: "
+msgstr "口令： "
+
+#: Mailman/HTMLFormatter.py:318
+msgid "Visit Subscriber List"
+msgstr "访问订阅者列表"
+
+#: Mailman/HTMLFormatter.py:357
+msgid "Once a month, your password will be emailed to you as a reminder."
+msgstr "你的口令将每月一次以提示函的形式发送给你。"
+
+#: Mailman/HTMLFormatter.py:404
+msgid "The current archive"
+msgstr "当前归档"
+
+#: Mailman/Handlers/Acknowledge.py:59
+msgid "%(realname)s post acknowledgement"
+msgstr "%(realname)s发送确认"
+
+#: Mailman/Handlers/Approve.py:45
+msgid ""
+"Message rejected.\n"
+"It appears that this message contains an HTML part with the\n"
+"Approved: password line, but due to the way it is coded in the\n"
+"HTML it can't be safely removed.\n"
+msgstr ""
+
+#: Mailman/Handlers/CalcRecips.py:79
+msgid ""
+"Your urgent message to the %(realname)s mailing list was not authorized for\n"
+"delivery.  The original message as received by Mailman is attached.\n"
+msgstr "您发送到 %(realname)s 邮件列表的加急信息没有投递授权。附上Mailman收讫的原始信息。\n"
+
+#: Mailman/Handlers/CookHeaders.py:180
+msgid "%(realname)s via %(lrn)s"
+msgstr ""
+
+#: Mailman/Handlers/Emergency.py:29
+msgid "Emergency hold on all list traffic is in effect"
+msgstr "紧急暂缓所有列表信件"
+
+#: Mailman/Handlers/Emergency.py:30 Mailman/Handlers/Hold.py:58
+msgid "Your message was deemed inappropriate by the moderator."
+msgstr "列表主持人认为您的信息不合适。"
+
+#: Mailman/Handlers/Hold.py:53
+msgid "Sender is explicitly forbidden"
+msgstr "发送人被明确禁止"
+
+#: Mailman/Handlers/Hold.py:54
+msgid "You are forbidden from posting messages to this list."
+msgstr "您被禁止往该列表发送信息。"
+
+#: Mailman/Handlers/Hold.py:57
+msgid "Post to moderated list"
+msgstr "发送到受限列表"
+
+#: Mailman/Handlers/Hold.py:61
+msgid "Post by non-member to a members-only list"
+msgstr "由非成员发送到一个仅成员列表(members-only list)"
+
+#: Mailman/Handlers/Hold.py:62
+msgid "Non-members are not allowed to post messages to this list."
+msgstr "不允许非成员往该列表发送信息。"
+
+#: Mailman/Handlers/Hold.py:65
+msgid "Posting to a restricted list by sender requires approval"
+msgstr "需要被审核的用户向一个受限列表发送信息"
+
+#: Mailman/Handlers/Hold.py:66
+msgid "This list is restricted; your message was not approved."
+msgstr "该列表受限制；您的信息没有经过批准。"
+
+#: Mailman/Handlers/Hold.py:69
+msgid "Too many recipients to the message"
+msgstr "该信息的收件人太多"
+
+#: Mailman/Handlers/Hold.py:70
+msgid "Please trim the recipient list; it is too long."
+msgstr "请整理收件人列表；该列表太长。"
+
+#: Mailman/Handlers/Hold.py:73
+msgid "Message has implicit destination"
+msgstr "信息中含有隐式的目的地"
+
+#: Mailman/Handlers/Hold.py:74
+msgid ""
+"Blind carbon copies or other implicit destinations are\n"
+"not allowed.  Try reposting your message by explicitly including the list\n"
+"address in the To: or Cc: fields."
+msgstr ""
+"不允许收信人的地址空白或者不清晰\n"
+"请尝试在To:和Cc:字段写明地址后重新发送"
+
+#: Mailman/Handlers/Hold.py:79
+msgid "Message may contain administrivia"
+msgstr "消息中包含管理指令"
+
+#: Mailman/Handlers/Hold.py:84
+msgid ""
+"Please do *not* post administrative requests to the mailing\n"
+"list.  If you wish to subscribe, visit %(listurl)s or send a message with "
+"the\n"
+"word `help' in it to the request address, %(request)s, for further\n"
+"instructions."
+msgstr ""
+"请不要发送管理请求到邮件列表，如果希望订阅，\n"
+"请访问 %(listurl)s 或者 以｀help｀为内容发送信息至\n"
+"请求地址， %(request)s，以获得进一步的指示信息。"
+
+#: Mailman/Handlers/Hold.py:90
+msgid "Message has a suspicious header"
+msgstr "信件带有可疑的邮件头"
+
+#: Mailman/Handlers/Hold.py:91
+msgid "Your message had a suspicious header."
+msgstr "您的信件带有可疑的邮件头"
+
+#: Mailman/Handlers/Hold.py:101
+msgid ""
+"Message body is too big: %(size)d bytes with a limit of\n"
+"%(limit)d KB"
+msgstr "信件内容过大：%(size)d 字节 (上限为 %(limit)d KB)"
+
+#: Mailman/Handlers/Hold.py:106
+msgid ""
+"Your message was too big; please trim it to less than\n"
+"%(kb)d KB in size."
+msgstr "您的信件过大，请修改信件内容至小于 %(kb)s KB"
+
+#: Mailman/Handlers/Hold.py:110
+msgid "Posting to a moderated newsgroup"
+msgstr "发送信息至受节制的新闻组"
+
+#: Mailman/Handlers/Hold.py:252
+msgid "Your message to %(listname)s awaits moderator approval"
+msgstr "您发送到 %(listname)s 的信件已经交由列表主持者审批"
+
+#: Mailman/Handlers/Hold.py:271
+msgid "%(listname)s post from %(sender)s requires approval"
+msgstr "%(listname)s 中来自 %(sender)s 的信件需要审批"
+
+#: Mailman/Handlers/Hold.py:278
+msgid ""
+"If you reply to this message, keeping the Subject: header intact, Mailman "
+"will\n"
+"discard the held message.  Do this if the message is spam.  If you reply to\n"
+"this message and include an Approved: header with the list password in it, "
+"the\n"
+"message will be approved for posting to the list.  The Approved: header can\n"
+"also appear in the first line of the body of the reply."
+msgstr ""
+"如果您回复该信件，请保持Subject:邮件头不变,\n"
+"Mailman 将会丢弃被暂存的信件。如果该信息是垃圾邮件，采用以上处理方式。\n"
+"如果您回复该信件并包含带有邮件列表密码的Approved:头部\n"
+"该信件将被批准发送至列表。该Approved:头部将会\n"
+"同时出现在回复信件正文的第一行"
+
+#: Mailman/Handlers/MimeDel.py:59
+msgid "The message's content type was explicitly disallowed"
+msgstr "该信件的内容类型(content type)被明确禁止"
+
+#: Mailman/Handlers/MimeDel.py:64
+msgid "The message's content type was not explicitly allowed"
+msgstr "该信件的内容类型(content type)没有被明确禁止"
+
+#: Mailman/Handlers/MimeDel.py:72
+msgid "The message's file extension was explicitly disallowed"
+msgstr "该信件的文件扩展名被明确禁止"
+
+#: Mailman/Handlers/MimeDel.py:75
+msgid "The message's file extension was not explicitly allowed"
+msgstr "该信件的文件扩展名没有被明确禁止"
+
+#: Mailman/Handlers/MimeDel.py:87
+msgid "After content filtering, the message was empty"
+msgstr "经过内容过滤后，该信件为空"
+
+#: Mailman/Handlers/MimeDel.py:269
+msgid ""
+"The attached message matched the %(listname)s mailing list's content "
+"filtering\n"
+"rules and was prevented from being forwarded on to the list membership.  "
+"You\n"
+"are receiving the only remaining copy of the discarded message.\n"
+"\n"
+msgstr ""
+"附带的信件匹配 %(listname)s 邮件列表的内容过滤规则\n"
+"而被禁止发送至列表用户\n"
+"您所收到的内容为被丢弃信息的拷贝。\n"
+"\n"
+
+#: Mailman/Handlers/MimeDel.py:275
+msgid "Content filtered message notification"
+msgstr "对内容被过滤信件的通知"
+
+#: Mailman/Handlers/Moderate.py:145
+msgid ""
+"Your message has been rejected, probably because you are not subscribed to "
+"the\n"
+"mailing list and the list's policy is to prohibit non-members from posting "
+"to\n"
+"it.  If you think that your messages are being rejected in error, contact "
+"the\n"
+"mailing list owner at %(listowner)s."
+msgstr ""
+
+#: Mailman/Handlers/Moderate.py:162
+msgid "Auto-discard notification"
+msgstr "自动丢弃通知"
+
+#: Mailman/Handlers/Moderate.py:165
+msgid "The attached message has been automatically discarded."
+msgstr "附带的消息被自动丢弃"
+
+#: Mailman/Handlers/Replybot.py:75
+msgid "Auto-response for your message to the \"%(realname)s\" mailing list"
+msgstr "对您发送至 \"%(realname)s\" 邮件列表信件的自动答复"
+
+#: Mailman/Handlers/Replybot.py:108
+msgid "The Mailman Replybot"
+msgstr "Mailman 自动回复机器人"
+
+#: Mailman/Handlers/Scrubber.py:205
+msgid ""
+"An embedded and charset-unspecified text was scrubbed...\n"
+"Name: %(filename)s\n"
+"URL: %(url)s\n"
+msgstr ""
+
+#: Mailman/Handlers/Scrubber.py:215
+msgid "HTML attachment scrubbed and removed"
+msgstr "HTML附件被移除"
+
+#: Mailman/Handlers/Scrubber.py:231 Mailman/Handlers/Scrubber.py:256
+msgid ""
+"An HTML attachment was scrubbed...\n"
+"URL: %(url)s\n"
+msgstr ""
+"一个HTML附件被移除...\n"
+"URL: %(url)s\n"
+
+#: Mailman/Handlers/Scrubber.py:268
+msgid "no subject"
+msgstr "没有主题"
+
+#: Mailman/Handlers/Scrubber.py:270
+msgid "no date"
+msgstr "没有日期"
+
+#: Mailman/Handlers/Scrubber.py:271
+msgid "unknown sender"
+msgstr "未知的发送者"
+
+#: Mailman/Handlers/Scrubber.py:273
+msgid ""
+"An embedded message was scrubbed...\n"
+"From: %(who)s\n"
+"Subject: %(subject)s\n"
+"Date: %(date)s\n"
+"Size: %(size)s\n"
+"URL: %(url)s\n"
+msgstr ""
+
+#: Mailman/Handlers/Scrubber.py:305
+msgid ""
+"A non-text attachment was scrubbed...\n"
+"Name: %(filename)s\n"
+"Type: %(ctype)s\n"
+"Size: %(size)d bytes\n"
+"Desc: %(desc)s\n"
+"URL: %(url)s\n"
+msgstr ""
+
+#: Mailman/Handlers/Scrubber.py:344
+msgid "Skipped content of type %(partctype)s\n"
+msgstr "跳过的 %(partctype)s 类型的内容\n"
+
+#: Mailman/Handlers/Scrubber.py:385
+msgid "-------------- next part --------------\n"
+msgstr "-------------- 下一部分 --------------\n"
+
+#: Mailman/Handlers/SpamDetect.py:64
+msgid "Header matched regexp: %(pattern)s"
+msgstr ""
+
+#: Mailman/Handlers/SpamDetect.py:126
+msgid ""
+"You are not allowed to post to this mailing list From: a domain which\n"
+"publishes a DMARC policy of reject or quarantine, and your message has been\n"
+"automatically rejected.  If you think that your messages are being rejected "
+"in\n"
+"error, contact the mailing list owner at %(listowner)s."
+msgstr ""
+
+#: Mailman/Handlers/SpamDetect.py:196
+msgid "Message rejected by filter rule match"
+msgstr "由于匹配过滤规则而被拒绝的信件"
+
+#: Mailman/Handlers/ToDigest.py:174
+msgid "%(realname)s Digest, Vol %(volume)d, Issue %(issue)d"
+msgstr "%(realname)s 摘要, 卷 %(volume)d, 发布 %(issue)d"
+
+#: Mailman/Handlers/ToDigest.py:220
+msgid "digest header"
+msgstr "摘要头部"
+
+#: Mailman/Handlers/ToDigest.py:223
+msgid "Digest Header"
+msgstr "摘要头部"
+
+#: Mailman/Handlers/ToDigest.py:236
+msgid "Today's Topics:\n"
+msgstr "本日主题:\n"
+
+#: Mailman/Handlers/ToDigest.py:316
+msgid "Today's Topics (%(msgcount)d messages)"
+msgstr "本日主题 (%(msgcount)d 封信件)"
+
+#: Mailman/Handlers/ToDigest.py:342
+msgid "[Message discarded by content filter]"
+msgstr "[被内容过滤程序删除的信件]"
+
+#: Mailman/Handlers/ToDigest.py:370
+msgid "digest footer"
+msgstr "摘要尾部"
+
+#: Mailman/Handlers/ToDigest.py:373 Mailman/Handlers/ToDigest.py:381
+msgid "Digest Footer"
+msgstr "摘要尾部"
+
+#: Mailman/Handlers/ToDigest.py:388
+msgid "End of "
+msgstr "结束 "
+
+#: Mailman/ListAdmin.py:307
+msgid "Posting of your message titled \"%(subject)s\""
+msgstr "您以标题 \"%(subject)s\" 发布的信件"
+
+#: Mailman/ListAdmin.py:308 Mailman/ListAdmin.py:430
+msgid "[No reason given]"
+msgstr "[没有给出原因]"
+
+#: Mailman/ListAdmin.py:346
+msgid "Forward of moderated message"
+msgstr "被暂存信件的转发"
+
+#: Mailman/ListAdmin.py:403
+msgid "New subscription request to list %(realname)s from %(addr)s"
+msgstr "来自 %(addr)s 的对 %(realname)s 列表的订阅请求"
+
+#: Mailman/ListAdmin.py:429
+msgid "Subscription request"
+msgstr "订阅请求"
+
+#: Mailman/ListAdmin.py:460
+msgid "New unsubscription request from %(realname)s by %(addr)s"
+msgstr "来自 %(addr)s 的对 %(realname)s 列表的退订请求"
+
+#: Mailman/ListAdmin.py:484
+msgid "Unsubscription request"
+msgstr "退订请求"
+
+#: Mailman/ListAdmin.py:517
+msgid "Original Message"
+msgstr "原文"
+
+#: Mailman/ListAdmin.py:520
+msgid "Request to mailing list %(realname)s rejected"
+msgstr "对于 %(realname)s 邮件列表的请求被拒绝"
+
+#: Mailman/MTA/Manual.py:66
+msgid ""
+"The mailing list `%(listname)s' has been created via the through-the-web\n"
+"interface.  In order to complete the activation of this mailing list, the\n"
+"proper /etc/aliases (or equivalent) file must be updated.  The program\n"
+"`newaliases' may also have to be run.\n"
+"\n"
+"Here are the entries for the /etc/aliases file:\n"
+msgstr ""
+"`%(listname)s' 邮件列表通过Web界面被创建。\n"
+"为了激活该邮件列表，需要对/etc/aliases给予适当的更新。\n"
+"同时需要运行程序newaliases\n"
+"\n"
+"以下为需要添加的/etc/aliases相关项\n"
+
+#: Mailman/MTA/Manual.py:77
+msgid ""
+"To finish creating your mailing list, you must edit your /etc/aliases (or\n"
+"equivalent) file by adding the following lines, and possibly running the\n"
+"`newaliases' program:\n"
+msgstr ""
+"为了完成邮件列表的创建，您需要编辑/etc/aliases或者相关文件，\n"
+"并添加如下行内容，然后运行newaliases程序：\n"
+
+#: Mailman/MTA/Manual.py:82
+msgid "## %(listname)s mailing list"
+msgstr "## %(listname)s 邮件列表"
+
+#: Mailman/MTA/Manual.py:99
+msgid "Mailing list creation request for list %(listname)s"
+msgstr "邮件列表 %(listname)s 创建请求"
+
+#: Mailman/MTA/Manual.py:113
+msgid ""
+"The mailing list `%(listname)s' has been removed via the through-the-web\n"
+"interface.  In order to complete the de-activation of this mailing list, "
+"the\n"
+"appropriate /etc/aliases (or equivalent) file must be updated.  The program\n"
+"`newaliases' may also have to be run.\n"
+"\n"
+"Here are the entries in the /etc/aliases file that should be removed:\n"
+msgstr ""
+"`%(listname)s' 邮件列表通过Web界面被移除。\n"
+"为了完全删除该邮件列表，需要对/etc/aliases给予适当的更新。\n"
+"同时需要运行程序newaliases\n"
+"以下为需要删除的/etc/aliases 相关项:\n"
+
+#: Mailman/MTA/Manual.py:123
+msgid ""
+"\n"
+"To finish removing your mailing list, you must edit your /etc/aliases (or\n"
+"equivalent) file by removing the following lines, and possibly running the\n"
+"`newaliases' program:\n"
+"\n"
+"## %(listname)s mailing list"
+msgstr ""
+"\n"
+"为了删除您的该邮件列表，需要删除/etc/aliases 中的以下列。\n"
+"同时需要运行程序newaliases\n"
+"\n"
+"## %(listname)s 邮件列表"
+
+#: Mailman/MTA/Manual.py:142
+msgid "Mailing list removal request for list %(listname)s"
+msgstr "对邮件列表 %(listname)s 的删除请求"
+
+#: Mailman/MTA/Postfix.py:420
+msgid "checking permissions on %(file)s"
+msgstr "查看 %(file)s 的权限"
+
+#: Mailman/MTA/Postfix.py:430
+msgid "%(file)s permissions must be 0664 (got %(octmode)s)"
+msgstr ""
+
+#: Mailman/MTA/Postfix.py:432 Mailman/MTA/Postfix.py:460
+#: Mailman/MTA/Postfix.py:471 bin/check_perms:125 bin/check_perms:153
+#: bin/check_perms:163 bin/check_perms:174 bin/check_perms:199
+#: bin/check_perms:216 bin/check_perms:242 bin/check_perms:265
+#: bin/check_perms:284 bin/check_perms:298 bin/check_perms:318
+#: bin/check_perms:358
+msgid "(fixing)"
+msgstr "(固定)"
+
+#: Mailman/MTA/Postfix.py:448
+msgid "checking ownership of %(dbfile)s"
+msgstr "查看 %(dbfile)s 的所有者"
+
+#: Mailman/MTA/Postfix.py:456
+msgid "%(dbfile)s owned by %(owner)s (must be owned by %(user)s"
+msgstr "%(dbfile)s 为 %(owner)s 所有(必须为 %(user)s 所有"
+
+#: Mailman/MTA/Postfix.py:469
+msgid "%(dbfile)s permissions must be 0664 (got %(octmode)s)"
+msgstr ""
+
+#: Mailman/MailList.py:217
+msgid "Your confirmation is required to join the %(listname)s mailing list"
+msgstr "您需要对加入 %(listname)s 邮件列表进行确认"
+
+#: Mailman/MailList.py:228
+msgid "Your confirmation is required to leave the %(listname)s mailing list"
+msgstr "您需要对退出 %(listname)s 邮件列表进行确认"
+
+#: Mailman/MailList.py:929 Mailman/MailList.py:1405
+msgid " from %(remote)s"
+msgstr " 来自 %(remote)s"
+
+#: Mailman/MailList.py:973
+msgid "subscriptions to %(realname)s require moderator approval"
+msgstr "对 %(realname)s 的订阅请求需要列表主持者批准"
+
+#: Mailman/MailList.py:1048 bin/add_members:253
+msgid "%(realname)s subscription notification"
+msgstr "%(realname)s 订阅通知"
+
+#: Mailman/MailList.py:1067
+msgid "unsubscriptions require moderator approval"
+msgstr "退订需要列表主持人批准"
+
+#: Mailman/MailList.py:1088
+msgid "%(realname)s unsubscribe notification"
+msgstr "%(realname)s 退订通知"
+
+#: Mailman/MailList.py:1249
+msgid "%(realname)s address change notification"
+msgstr ""
+
+#: Mailman/MailList.py:1314
+msgid "subscriptions to %(name)s require administrator approval"
+msgstr "%(name)s 的订阅需要管理员批准"
+
+#: Mailman/MailList.py:1579
+msgid "Last autoresponse notification for today"
+msgstr "本日最后一条自动回复通知"
+
+#: Mailman/Queue/BounceRunner.py:360
+msgid ""
+"The attached message was received as a bounce, but either the bounce format\n"
+"was not recognized, or no member addresses could be extracted from it.  "
+"This\n"
+"mailing list has been configured to send all unrecognized bounce messages "
+"to\n"
+"the list administrator(s).\n"
+"\n"
+"For more information see:\n"
+"%(adminurl)s\n"
+"\n"
+msgstr ""
+"附带的信件是接收到的退信，但是退信格式不可识别，或者无法从其中提取出成员地\n"
+"址。本邮件列表设置将所有不可辨识的退信发送至列表管理员。\n"
+"\n"
+"要获取更多信息，请浏览：\n"
+"%(adminurl)s\n"
+"\n"
+
+#: Mailman/Queue/BounceRunner.py:370
+msgid "Uncaught bounce notification"
+msgstr "未捕获的退信通知"
+
+#: Mailman/Queue/CommandRunner.py:98
+msgid "Ignoring non-text/plain MIME parts"
+msgstr "忽略 non-text/plain MIME 部分"
+
+#: Mailman/Queue/CommandRunner.py:177
+msgid ""
+"The results of your email command are provided below.\n"
+"Attached is your original message.\n"
+msgstr ""
+"您的邮件命令的执行结果提供如下。\n"
+"附件中是您的原始信件。\n"
+
+#: Mailman/Queue/CommandRunner.py:182
+msgid "- Results:"
+msgstr "- 结果："
+
+#: Mailman/Queue/CommandRunner.py:188
+msgid ""
+"\n"
+"- Unprocessed:"
+msgstr ""
+"\n"
+"- 未处理："
+
+#: Mailman/Queue/CommandRunner.py:192
+msgid ""
+"No commands were found in this message.\n"
+"To obtain instructions, send a message containing just the word \"help\".\n"
+msgstr ""
+"该邮件中没有发现指令。\n"
+"发送内容为 \"help\" 的信件以获得所有命令.\n"
+
+#: Mailman/Queue/CommandRunner.py:197
+msgid ""
+"\n"
+"- Ignored:"
+msgstr ""
+"\n"
+"- 忽略:"
+
+#: Mailman/Queue/CommandRunner.py:199
+msgid ""
+"\n"
+"- Done.\n"
+"\n"
+msgstr ""
+"\n"
+"- 完成。\n"
+"\n"
+
+#: Mailman/Queue/CommandRunner.py:223
+msgid "The results of your email commands"
+msgstr "您的邮件命令执行结果"
+
+#: Mailman/Queue/CommandRunner.py:229
+msgid "Message body suppressed by Mailman site configuration\n"
+msgstr ""
+
+#: Mailman/Queue/CommandRunner.py:231
+msgid "Original message suppressed by Mailman site configuration\n"
+msgstr ""
+
+#: Mailman/htmlformat.py:673
+msgid "Delivered by Mailman<br>version %(version)s"
+msgstr "由 Mailman<br> %(version)s 投递"
+
+#: Mailman/htmlformat.py:674
+msgid "Python Powered"
+msgstr "Python Powered"
+
+#: Mailman/htmlformat.py:675
+msgid "Gnu's Not Unix"
+msgstr "Gnu's Not Unix"
+
+#: Mailman/i18n.py:132
+msgid "Mon"
+msgstr "星期一"
+
+#: Mailman/i18n.py:132
+msgid "Thu"
+msgstr "星期四"
+
+#: Mailman/i18n.py:132
+msgid "Tue"
+msgstr "星期二"
+
+#: Mailman/i18n.py:132
+msgid "Wed"
+msgstr "星期三"
+
+#: Mailman/i18n.py:133
+msgid "Fri"
+msgstr "星期五"
+
+#: Mailman/i18n.py:133
+msgid "Sat"
+msgstr "星期六"
+
+#: Mailman/i18n.py:133
+msgid "Sun"
+msgstr "星期日"
+
+#: Mailman/i18n.py:137
+msgid "Apr"
+msgstr "四月"
+
+#: Mailman/i18n.py:137
+msgid "Feb"
+msgstr "二月"
+
+#: Mailman/i18n.py:137
+msgid "Jan"
+msgstr "一月"
+
+#: Mailman/i18n.py:137
+msgid "Jun"
+msgstr "六月"
+
+#: Mailman/i18n.py:137
+msgid "Mar"
+msgstr "三月"
+
+#: Mailman/i18n.py:138
+msgid "Aug"
+msgstr "八月"
+
+#: Mailman/i18n.py:138
+msgid "Dec"
+msgstr "十二月"
+
+#: Mailman/i18n.py:138
+msgid "Jul"
+msgstr "七月"
+
+#: Mailman/i18n.py:138
+msgid "Nov"
+msgstr "十一月"
+
+#: Mailman/i18n.py:138
+msgid "Oct"
+msgstr "十月"
+
+#: Mailman/i18n.py:138
+msgid "Sep"
+msgstr "九月"
+
+#: Mailman/i18n.py:141
+msgid "Server Local Time"
+msgstr "服务器本地时间"
+
+#: Mailman/i18n.py:180
+msgid ""
+"%(wday)s %(mon)s %(day)2i %(hh)02i:%(mm)02i:%(ss)02i %(tzname)s %(year)04i"
+msgstr ""
+"%(wday)s %(mon)s %(day)2i %(hh)02i:%(mm)02i:%(ss)02i %(tzname)s %(year)04i"
+
+#: bin/add_members:26
+#, docstring
+msgid ""
+"Add members to a list from the command line.\n"
+"\n"
+"Usage:\n"
+"    add_members [options] listname\n"
+"\n"
+"Options:\n"
+"\n"
+"    --regular-members-file=file\n"
+"    -r file\n"
+"        A file containing addresses of the members to be added, one\n"
+"        address per line.  This list of people become non-digest\n"
+"        members.  If file is `-', read addresses from stdin.  Note that\n"
+"        -n/--non-digest-members-file are deprecated synonyms for this "
+"option.\n"
+"\n"
+"    --digest-members-file=file\n"
+"    -d file\n"
+"        Similar to above, but these people become digest members.\n"
+"\n"
+"    --welcome-msg=<y|n>\n"
+"    -w <y|n>\n"
+"        Set whether or not to send the list members a welcome message,\n"
+"        overriding whatever the list's `send_welcome_msg' setting is.\n"
+"\n"
+"    --admin-notify=<y|n>\n"
+"    -a <y|n>\n"
+"        Set whether or not to send the list administrators a notification "
+"on\n"
+"        the success/failure of these subscriptions, overriding whatever the\n"
+"        list's `admin_notify_mchanges' setting is.\n"
+"\n"
+"    --nomail\n"
+"    -n\n"
+"        Set the newly added members mail delivery to disabled by admin.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"    listname\n"
+"        The name of the Mailman list you are adding members to.  It must\n"
+"        already exist.\n"
+"\n"
+"You must supply at least one of -r and -d options.  At most one of the\n"
+"files can be `-'.\n"
+msgstr ""
+
+#: bin/add_members:147
+msgid "Already a member: %(member)s"
+msgstr "已经是成员：%(member)s"
+
+#: bin/add_members:153
+msgid "Bad/Invalid email address: blank line"
+msgstr "错误/不合法的邮件地址: 空行"
+
+#: bin/add_members:155
+msgid "Bad/Invalid email address: %(member)s"
+msgstr "错误/不合法的邮件地址： %(member)s"
+
+#: bin/add_members:157
+msgid "Hostile address (illegal characters): %(member)s"
+msgstr "恶意地址(非法字符)： %(member)s"
+
+#: bin/add_members:159
+msgid "Subscribed: %(member)s"
+msgstr "已订阅: %(member)s"
+
+#: bin/add_members:200
+msgid "Bad argument to -w/--welcome-msg: %(arg)s"
+msgstr "-w/--welcome-msg选项的错误参数: %(arg)s"
+
+#: bin/add_members:207
+msgid "Bad argument to -a/--admin-notify: %(arg)s"
+msgstr "-a/--admin-notify选项的错误参数: %(arg)s"
+
+#: bin/add_members:215
+msgid "Cannot read both digest and normal members from standard input."
+msgstr "无法从标准输入既读取摘要用户又读取正常用户"
+
+#: bin/add_members:221 bin/config_list:110 bin/export.py:271
+#: bin/find_member:97 bin/inject:91 bin/list_admins:90 bin/list_members:252
+#: bin/sync_members:222 cron/bumpdigests:86
+msgid "No such list: %(listname)s"
+msgstr "没有此列表： %(listname)s"
+
+#: bin/add_members:241 bin/change_pw:159 bin/check_db:114 bin/discard:83
+#: bin/sync_members:244 bin/update:302 bin/update:323 bin/update:577
+#: cron/bumpdigests:78
+msgid "Nothing to do."
+msgstr "什么也不需要做."
+
+#: bin/arch:19
+#, docstring
+msgid ""
+"Rebuild a list's archive.\n"
+"\n"
+"Use this command to rebuild the archives for a mailing list.  You may want "
+"to\n"
+"do this if you edit some messages in an archive, or remove some messages "
+"from\n"
+"an archive.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] <listname> [<mbox>]\n"
+"\n"
+"Where options are:\n"
+"    -h / --help\n"
+"        Print this help message and exit.\n"
+"\n"
+"    -q / --quiet\n"
+"        Make the archiver output less verbose.\n"
+"\n"
+"    --wipe\n"
+"        First wipe out the original archive before regenerating.  You "
+"usually\n"
+"        want to specify this argument unless you're generating the archive "
+"in\n"
+"        chunks.\n"
+"\n"
+"    -s N\n"
+"    --start=N\n"
+"        Start indexing at article N, where article 0 is the first in the "
+"mbox.\n"
+"        Defaults to 0.\n"
+"\n"
+"    -e M\n"
+"    --end=M\n"
+"        End indexing at article M.  This script is not very efficient with\n"
+"        respect to memory management, and for large archives, it may not be\n"
+"        possible to index the mbox entirely.  For that reason, you can "
+"specify\n"
+"        the start and end article numbers.\n"
+"\n"
+"Where <mbox> is the path to a list's complete mbox archive.  Usually this "
+"will\n"
+"be some path in the archives/private directory.  For example:\n"
+"\n"
+"%% bin/arch mylist archives/private/mylist.mbox/mylist.mbox\n"
+"\n"
+"<mbox> is optional.  If it is missing, it is calculated.\n"
+msgstr ""
+"重建列表归档\n"
+"\n"
+"使用这个命令重新为一个邮件列表创建归档。如果您需要编辑或者\n"
+" 删除归档中的信件，可能需要做此操作。\n"
+"\n"
+"用法: %(PROGRAM)s [options] <listname> [<mbox>]\n"
+"\n"
+"这里选项为\n"
+"    -h / --help\n"
+"        打印此帮助信息然后退出.\n"
+"\n"
+"    -q / --quiet\n"
+"        关闭冗余输出.\n"
+"\n"
+"    --wipe\n"
+"        在重新生成归档前删除原有归档.一般来说,除非您成块地生成归档,您会指定此\n"
+"        选项.\n"
+"\n"
+"    -s N\n"
+"    --start=N\n"
+"        从第N篇文章开始索引,mbox中的文章从0开始计数.默认为0.\n"
+"\n"
+"    -e M\n"
+"    --end=M\n"
+"        到第M篇文章处结束索引.这个脚本在内存管理和处理大的归档方面并不高效,\n"
+"        可能无法完全索引mobx中的所有条目.由此,您可以提供开始和结束索引的文\n"
+"        章编号.\n"
+"\n"
+"<mbox>是列表mbox归档的路径.一般来说是archives/private目录下的某个路径.例如:\n"
+"\n"
+"%% bin/arch mylist archinves/private/mylist.mbox/mylist.mbox\n"
+"\n"
+"<mbox>是可选的.如果没有提供,它将被计算出来.\n"
+
+#: bin/arch:125
+msgid "listname is required"
+msgstr "需要列表名"
+
+#: bin/arch:143 bin/change_pw:107 bin/config_list:257
+msgid ""
+"No such list \"%(listname)s\"\n"
+"%(e)s"
+msgstr ""
+"列表\"%(listname)s\"不存在\n"
+"%(e)s"
+
+#: bin/arch:168
+msgid "Cannot open mbox file %(mbox)s: %(msg)s"
+msgstr "无法打开mbox文件 %(mbox)s: %(msg)s"
+
+#: bin/b4b5-archfix:19
+#, docstring
+msgid ""
+"Fix the MM2.1b4 archives.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] file ...\n"
+"\n"
+"Where options are:\n"
+"    -h / --help\n"
+"        Print this help message and exit.\n"
+"\n"
+"Only use this to `fix' some archive database files that may have gotten\n"
+"written in Mailman 2.1b4 with some bogus data.  Use like this from your\n"
+"$PREFIX directory\n"
+"\n"
+"%% %(PROGRAM)s `grep -l _mlist archives/private/*/database/*-article`\n"
+"\n"
+"(note the backquotes are required)\n"
+"\n"
+"You will need to run `bin/check_perms -f' after running this script.\n"
+msgstr ""
+"修复MM2.1b4归档。\n"
+"\n"
+"用法: %(PROGRAM)s [options] file ...\n"
+"\n"
+"可用的选项有:\n"
+"    -h / --help\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"仅用来'修复'在Mailman 2.1b4中生成的带有虚假数据(bogus data)的邮件存档文件。\n"
+"在您的$PREFIX目录里像这样来使用它:\n"
+"\n"
+"%% %(PROGRAM)s `grep -l _mlist archives/private/*/database/*-article`\n"
+"\n"
+"(注意，反引号是必须的)\n"
+"\n"
+"在运行此脚本后您需要运行'bin/check_perms -f'。\n"
+
+#: bin/change_pw:20
+#, docstring
+msgid ""
+"Change a list's password.\n"
+"\n"
+"Prior to Mailman 2.1, list passwords were kept in crypt'd format -- "
+"usually.\n"
+"Some Python installations didn't have the crypt module available, so they'd\n"
+"fall back to md5.  Then suddenly the Python installation might grow a crypt\n"
+"module and all list passwords would be broken.\n"
+"\n"
+"In Mailman 2.1, all list and site passwords are stored in SHA1 hexdigest\n"
+"form.  This breaks list passwords for all existing pre-Mailman 2.1 lists, "
+"and\n"
+"since those passwords aren't stored anywhere in plain text, they cannot be\n"
+"retrieved and updated.\n"
+"\n"
+"Thus, this script generates new passwords for a list, and optionally sends "
+"it\n"
+"to all the owners of the list.\n"
+"\n"
+"Usage: change_pw [options]\n"
+"\n"
+"Options:\n"
+"\n"
+"    --all / -a\n"
+"        Change the password for all lists.\n"
+"\n"
+"    --domain=domain\n"
+"    -d domain\n"
+"        Change the password for all lists in the virtual domain `domain'.  "
+"It\n"
+"        is okay to give multiple -d options.\n"
+"\n"
+"    --listname=listname\n"
+"    -l listname\n"
+"        Change the password only for the named list.  It is okay to give\n"
+"        multiple -l options.\n"
+"\n"
+"    --password=newpassword\n"
+"    -p newpassword\n"
+"        Use the supplied plain text password `newpassword' as the new "
+"password\n"
+"        for any lists that are being changed (as specified by the -a, -d, "
+"and\n"
+"        -l options).  If not given, lists will be assigned a randomly\n"
+"        generated new password.\n"
+"\n"
+"    --quiet / -q\n"
+"        Don't notify list owners of the new password.  You'll have to have\n"
+"        some other way of letting the list owners know the new password\n"
+"        (presumably out-of-band).\n"
+"\n"
+"    --help / -h\n"
+"        Print this help message and exit.\n"
+msgstr ""
+"修改列表的口令。\n"
+"\n"
+"在Mailman 2.1以前，列表的口令一般以加密格式保存。一些Python安装并没有附带加\n"
+"密模块，这样的话将会退而使用md5。如果这些Python安装突然添加了加密模块的话，\n"
+"所有的列表口令都将被破坏。\n"
+"\n"
+"在Mailman 2.1中，所有的列表和站点口令都是以SHA1 hexdigest形式存储的。这破坏\n"
+"了所有Mailman 2.1之前建立的列表的口令，同时，由于这些口令并不是以明文形式存\n"
+"放的，它们也将不能被取回或更新。\n"
+"\n"
+"此脚本用来为列表生成新的口令，并且可以选择将新口令发送给列表的所有管理员。\n"
+"\n"
+"用法： change_pw [options]\n"
+"\n"
+"选项:\n"
+"\n"
+"    --all / -a\n"
+"        修改所有列表的口令。\n"
+"\n"
+"    --domain=domain\n"
+"    -d domain\n"
+"        在虚拟域'domain'中修改所有列表的口令。可以指定多个-d选项。\n"
+"\n"
+"    --listname=listname\n"
+"    -l listname\n"
+"        为指定的列表修改口令。可以指定多个-l选项。\n"
+"\n"
+"    --password=newpassword\n"
+"    -p newpassword\n"
+"        使用指定的明文口令'newpassword'作为需要修改口令的列表(由-a,-d和-l指定\n"
+"        )的新口令。如果不给出此选项的话，列表将被指派一个随即产生的新口令。\n"
+"\n"
+"    --quiet / -q\n"
+"        不通知列表管理员列表的新口令。您需要有其他的方法来让列表管理员知道新口令\n"
+"\n"
+"    --help / -h\n"
+"        打印此帮助信息然后退出。\n"
+
+#: bin/change_pw:145
+msgid "Bad arguments: %(strargs)s"
+msgstr "错误的参数： %(strargs)s"
+
+#: bin/change_pw:149
+msgid "Empty list passwords are not allowed"
+msgstr "列表口令不得为空"
+
+#: bin/change_pw:181
+msgid "New %(listname)s password: %(notifypassword)s"
+msgstr "%(listname)s的新口令： %(notifypassword)s"
+
+#: bin/change_pw:190
+msgid "Your new %(listname)s list password"
+msgstr "您的 %(listname)s列表的新口令"
+
+#: bin/change_pw:191
+msgid ""
+"The site administrator at %(hostname)s has changed the password for your\n"
+"mailing list %(listname)s.  It is now\n"
+"\n"
+"    %(notifypassword)s\n"
+"\n"
+"Please be sure to use this for all future list administration.  You may "
+"want\n"
+"to log in now to your list and change the password to something more to "
+"your\n"
+"liking.  Visit your list admin page at\n"
+"\n"
+"    %(adminurl)s\n"
+msgstr ""
+"%(hostname)s的站点管理员为您的邮件列表 %(listname)s 修改了口令。新口令为：\n"
+"\n"
+"    %(notifypassword)s\n"
+"\n"
+"在以后的管理工作中请务必使用新口令。您现在可以登录到您的列表中，把口令修改\n"
+"得更合乎您的口味。访问您的列表管理页：\n"
+"\n"
+"    %(adminurl)s\n"
+
+#: bin/check_db:19
+#, docstring
+msgid ""
+"Check a list's config database file for integrity.\n"
+"\n"
+"All of the following files are checked:\n"
+"\n"
+"    config.pck\n"
+"    config.pck.last\n"
+"    config.db\n"
+"    config.db.last\n"
+"    config.safety\n"
+"\n"
+"It's okay if any of these are missing.  config.pck and config.pck.last are\n"
+"pickled versions of the config database file for 2.1a3 and beyond.  "
+"config.db\n"
+"and config.db.last are used in all earlier versions, and these are Python\n"
+"marshals.  config.safety is a pickle written by 2.1a3 and beyond when the\n"
+"primary config.pck file could not be read.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [listname [listname ...]]\n"
+"\n"
+"Options:\n"
+"\n"
+"    --all / -a\n"
+"        Check the databases for all lists.  Otherwise only the lists named "
+"on\n"
+"        the command line are checked.\n"
+"\n"
+"    --verbose / -v\n"
+"        Verbose output.  The state of every tested file is printed.\n"
+"        Otherwise only corrupt files are displayed.\n"
+"\n"
+"    --help / -h\n"
+"        Print this text and exit.\n"
+msgstr ""
+"检查列表配置数据库的完整性。\n"
+"\n"
+"下面的所有文件都将被检查：\n"
+"\n"
+"    config.pck\n"
+"    config.pck.last\n"
+"    config.db\n"
+"    config.db.last\n"
+"    config.safety\n"
+"\n"
+"这些文件中的任意一个都可以缺失。config.pck和config.pck.last是2.1a3及之后版本\n"
+"配置文件的备份。config.db和config.db.last是所有之前版本使用的配置文件，它们是\n"
+"Python的配置(marshals)。config.safety是当2.1a3及之后版本的主配置文件config.pck\n"
+"读取时使用的备份文件(pickle)。\n"
+"\n"
+"用法: %(PROGRAM)s [options] [listname [listname ...]]\n"
+"\n"
+"选项：\n"
+"\n"
+"    --all / -a\n"
+"        检查所有列表的数据库。否则只有在命令行上指定的列表才会被检查。\n"
+"\n"
+"    --verbose / -v\n"
+"        冗余输出。每一个被检查的文件的状态都将被打印。否则只有损坏的文件的状态\n"
+"        才会被打印。\n"
+"\n"
+"    --help / -h\n"
+"        打印此帮助信息然后退出。\n"
+
+#: bin/check_db:119
+msgid "No list named:"
+msgstr "没有指定列表:"
+
+#: bin/check_db:128
+msgid "List:"
+msgstr "列表:"
+
+#: bin/check_db:148
+msgid "   %(file)s: okay"
+msgstr "   %(file)s: 完好"
+
+#: bin/check_perms:20
+#, docstring
+msgid ""
+"Check the permissions for the Mailman installation.\n"
+"\n"
+"Usage: %(PROGRAM)s [-f] [-v] [-h]\n"
+"\n"
+"With no arguments, just check and report all the files that have bogus\n"
+"permissions or group ownership.  With -f (and run as root), fix all the\n"
+"permission problems found.  With -v be verbose.\n"
+msgstr ""
+"检查Mailman安装的文件许可权。\n"
+"\n"
+"用法： %(PROGRAM)s [-f] [-v] [-h]\n"
+"\n"
+"不指定参数时，仅检查和报告有虚假许可权或者所属组不正确的文件。\n"
+"指定-f选项(以root身份运行)时，修复所有被发现的许可权问题。\n"
+"指定-v选项将导致冗余输出。\n"
+
+#: bin/check_perms:110
+msgid "    checking gid and mode for %(path)s"
+msgstr "    为 %(path)s 检查gid和许可权"
+
+#: bin/check_perms:122
+msgid "%(path)s bad group (has: %(groupname)s, expected %(MAILMAN_GROUP)s)"
+msgstr "%(path)s所属组错误(当前组: %(groupname)s, 期望值为 %(MAILMAN_GROUP)s)"
+
+#: bin/check_perms:151
+msgid "directory permissions must be %(octperms)s: %(path)s"
+msgstr "目录许可权必须是 %(octperms)s: %(path)s"
+
+#: bin/check_perms:160
+msgid "source perms must be %(octperms)s: %(path)s"
+msgstr "源许可权必须是 %(octperms)s: %(path)s"
+
+#: bin/check_perms:171
+msgid "article db files must be %(octperms)s: %(path)s"
+msgstr "文章数据库文件必须是 %(octperms)s: %(path)s"
+
+#: bin/check_perms:183
+msgid "checking mode for %(prefix)s"
+msgstr "检查 %(prefix)s 的许可权"
+
+#: bin/check_perms:193
+msgid "WARNING: directory does not exist: %(d)s"
+msgstr "警告：目录不存在： %(d)s"
+
+#: bin/check_perms:197
+msgid "directory must be at least 02775: %(d)s"
+msgstr "目录许可权必须至少为02775: %(d)s"
+
+#: bin/check_perms:209
+msgid "checking perms on %(private)s"
+msgstr "检查 %(private)s 的许可权"
+
+#: bin/check_perms:214
+msgid "%(private)s must not be other-readable"
+msgstr "%(private)s不能是其他人可读(other-readable)"
+
+#: bin/check_perms:223
+msgid ""
+"Warning: Private archive directory is other-executable (o+x).\n"
+"         This could allow other users on your system to read private "
+"archives.\n"
+"         If you're on a shared multiuser system, you should consult the\n"
+"         installation manual on how to fix this."
+msgstr ""
+
+#: bin/check_perms:240
+msgid "mbox file must be at least 0660:"
+msgstr "mbox文件许可权必须至少为0660:"
+
+#: bin/check_perms:263
+msgid "%(dbdir)s \"other\" perms must be 000"
+msgstr "%(dbdir)s的\"其它\"许可权必须为000"
+
+#: bin/check_perms:273
+msgid "checking cgi-bin permissions"
+msgstr "检查cgi-bin许可权"
+
+#: bin/check_perms:278
+msgid "    checking set-gid for %(path)s"
+msgstr "    检查 %(path)s 的set-gid许可权"
+
+#: bin/check_perms:282
+msgid "%(path)s must be set-gid"
+msgstr "%(path)s必须是set-gid的"
+
+#: bin/check_perms:292
+msgid "checking set-gid for %(wrapper)s"
+msgstr "检查 %(wrapper)s 的set-gid许可权"
+
+#: bin/check_perms:296
+msgid "%(wrapper)s must be set-gid"
+msgstr "%(wrapper)s必须是set-gid的"
+
+#: bin/check_perms:306
+msgid "checking permissions on %(pwfile)s"
+msgstr "检查 %(pwfile)s 的许可权"
+
+#: bin/check_perms:315
+msgid "%(pwfile)s permissions must be exactly 0640 (got %(octmode)s)"
+msgstr "%(pwfile)s 的许可权必须是0640(现在是 %(octmode)s)"
+
+#: bin/check_perms:340
+msgid "checking permissions on list data"
+msgstr "检查列表数据的许可权"
+
+#: bin/check_perms:348
+msgid "    checking permissions on: %(path)s"
+msgstr "    检查 %(path)s的许可权"
+
+#: bin/check_perms:356
+msgid "file permissions must be at least 660: %(path)s"
+msgstr "文件许可权至少是660： %(path)s"
+
+#: bin/check_perms:401
+msgid "No problems found"
+msgstr "没有发现问题"
+
+#: bin/check_perms:403
+msgid "Problems found:"
+msgstr "发现问题:"
+
+#: bin/check_perms:404
+msgid "Re-run as %(MAILMAN_USER)s (or root) with -f flag to fix"
+msgstr ""
+"以 %(MAILMAN_USER)s(或root)身份使用-f标记(flag)重新运行此脚本\n"
+"来修复发现的问题"
+
+#: bin/cleanarch:20
+#, docstring
+msgid ""
+"Clean up an .mbox archive file.\n"
+"\n"
+"The archiver looks for Unix-From lines separating messages in an mbox "
+"archive\n"
+"file.  For compatibility, it specifically looks for lines that start with\n"
+"\"From \" -- i.e. the letters capital-F, lowercase-r, o, m, space, ignoring\n"
+"everything else on the line.\n"
+"\n"
+"Normally, any lines that start \"From \" in the body of a message should be\n"
+"escaped such that a > character is actually the first on a line.  It is\n"
+"possible though that body lines are not actually escaped.  This script\n"
+"attempts to fix these by doing a stricter test of the Unix-From lines.  Any\n"
+"lines that start \"From \" but do not pass this stricter test are escaped "
+"with a\n"
+"> character.\n"
+"\n"
+"Usage: cleanarch [options] < inputfile > outputfile\n"
+"Options:\n"
+"    -s n\n"
+"    --status=n\n"
+"        Print a # character every n lines processed\n"
+"\n"
+"    -q / --quiet\n"
+"        Don't print changed line information to standard error.\n"
+"\n"
+"    -n / --dry-run\n"
+"        Don't actually output anything.\n"
+"\n"
+"    -h / --help\n"
+"        Print this message and exit\n"
+msgstr ""
+"清除.mbox存档文件。\n"
+"\n"
+"存档器搜寻用来在mbox存档文件中分隔信件(messages)的Unix-From行。为兼容起见，\n"
+"它明确地寻找以\"From \"开头的行 -- 即，大写字母F，小写字母r，o，m，空格，忽略此行中\n"
+"其他的所有字符。\n"
+"\n"
+"一般来说，信件正文中以\"From \"开头的行都应该在行首使用字符'>'来转义。但是\n"
+"也有可能正文中的那些行并没有被转义。此脚本试图通过对Unix-From行做严格的测试\n"
+"以解决这些问题，任何以\"From \"开头但是没有通过此严格测试的行都将被用一个'>'\n"
+"字符转义。\n"
+"\n"
+"用法： cleanarch [options] < inputfile > outputfile\n"
+"选项：\n"
+"    -s n\n"
+"    --status=n\n"
+"        每处理完n行打印一个#字符\n"
+"\n"
+"    -q / --quiet\n"
+"        不向标准错误打印已修改行的信息\n"
+"\n"
+"    -n / --dry-run\n"
+"        不输出任何信息\n"
+"\n"
+"    -h / --help\n"
+"       打印此帮助信息并退出\n"
+
+#: bin/cleanarch:83
+msgid "Unix-From line changed: %(lineno)d"
+msgstr "Unix-From行被改变： %(lineno)d"
+
+#: bin/cleanarch:111
+msgid "Bad status number: %(arg)s"
+msgstr "错误的状态号： %(arg)s"
+
+#: bin/cleanarch:167
+msgid "%(messages)d messages found"
+msgstr "查找到 %(messages)d 封信件"
+
+#: bin/clone_member:19
+#, docstring
+msgid ""
+"Clone a member address.\n"
+"\n"
+"Cloning a member address means that a new member will be added who has all "
+"the\n"
+"same options and passwords as the original member address.  Note that this\n"
+"operation is fairly trusting of the user who runs it -- it does no\n"
+"verification to the new address, it does not send out a welcome message, "
+"etc.\n"
+"\n"
+"The existing member's subscription is usually not modified in any way.  If "
+"you\n"
+"want to remove the old address, use the -r flag.  If you also want to "
+"change\n"
+"any list admin addresses, use the -a flag.\n"
+"\n"
+"Usage:\n"
+"    clone_member [options] fromoldaddr tonewaddr\n"
+"\n"
+"Where:\n"
+"\n"
+"    --listname=listname\n"
+"    -l listname\n"
+"        Check and modify only the named mailing lists.  If -l is not given,\n"
+"        then all mailing lists are scanned from the address.  Multiple -l\n"
+"        options can be supplied.\n"
+"\n"
+"    --remove\n"
+"    -r\n"
+"        Remove the old address from the mailing list after it's been "
+"cloned.\n"
+"\n"
+"    --admin\n"
+"    -a\n"
+"        Scan the list admin addresses for the old address, and clone or "
+"change\n"
+"        them too.\n"
+"\n"
+"    --quiet\n"
+"    -q\n"
+"        Do the modifications quietly.\n"
+"\n"
+"    --nomodify\n"
+"    -n\n"
+"        Print what would be done, but don't actually do it.  Inhibits the\n"
+"        --quiet flag.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+" fromoldaddr (`from old address') is the old address of the user.  "
+"tonewaddr\n"
+" (`to new address') is the new address of the user.\n"
+"\n"
+msgstr ""
+"复制一个成员。\n"
+"\n"
+"复制成员意味着把一个新成员加入到列表，这个新成员有着和源成员完全相同的选\n"
+"项和口令。注意，此操作完全信任它的执行者 -- 它不对新成员作任何的确认，也不发\n"
+"送任何欢迎信息，等等。\n"
+"\n"
+"现有成员的订阅一般来说不会以任何方式发生修改。如果您想要移除老成员的话，可以\n"
+"使用-r选项。如果您也想修改任何列表管理员的地址，可以使用-a选项。\n"
+"\n"
+"用法：\n"
+"    clone_member [options] fromoldaddr tonewaddr\n"
+"\n"
+"其中：\n"
+"\n"
+"    --listname=listname\n"
+"    -l listname\n"
+"        仅检查和修改指定的邮件列表。如果没有指定-l选项，所有的邮件列表都将被\n"
+"        扫描。可以指定多个-l选项。\n"
+"\n"
+"    --remove\n"
+"    -r\n"
+"        复制并删除成员。\n"
+"\n"
+"    --admin\n"
+"    -a\n"
+"        在列表管理员中查找、复制或修改老成员。\n"
+"\n"
+"    --quiet\n"
+"    -q\n"
+"        修改时不产生任何输出。\n"
+"\n"
+"    --nomodify\n"
+"    -n\n"
+"        打印将要做的修改，但不做任何实际的操作。不能同时使用--quiet选项。\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        打印此帮助信息并退出。\n"
+"\n"
+" fromoldaddr ('from old address') 是成员的旧地址。tonewaddr \n"
+" ('to new address') 是成员的新地址。\n"
+"\n"
+
+#: bin/clone_member:94
+msgid "processing mailing list:"
+msgstr "正处理邮件列表："
+
+#: bin/clone_member:101
+msgid "    scanning list owners:"
+msgstr "    扫描列表属主："
+
+#: bin/clone_member:119
+msgid "    new list owners:"
+msgstr "    新列表属主："
+
+#: bin/clone_member:121
+msgid "(no change)"
+msgstr "(无更改)"
+
+#: bin/clone_member:130
+msgid "    address not found:"
+msgstr "    未找到的地址："
+
+#: bin/clone_member:145
+msgid "    clone address added:"
+msgstr "    添加的复制地址："
+
+#: bin/clone_member:148
+msgid "    clone address is already a member:"
+msgstr "    复制地址已经是列表成员："
+
+#: bin/clone_member:151
+msgid "    original address removed:"
+msgstr "    源地址被移除："
+
+#: bin/clone_member:202
+msgid "Not a valid email address: %(toaddr)s"
+msgstr "非法email地址： %(toaddr)s"
+
+#: bin/clone_member:215
+msgid ""
+"Error opening list \"%(listname)s\", skipping.\n"
+"%(e)s"
+msgstr ""
+"打开列表\"%(listname)s\"时发生错误，忽略。\n"
+"%(e)s"
+
+#: bin/config_list:20
+#, docstring
+msgid ""
+"Configure a list from a text file description.\n"
+"\n"
+"Usage: config_list [options] listname\n"
+"\n"
+"Options:\n"
+"    --inputfile filename\n"
+"    -i filename\n"
+"        Configure the list by assigning each module-global variable in the\n"
+"        file to an attribute on the list object, then saving the list.  The\n"
+"        named file is loaded with execfile() and must be legal Python code.\n"
+"        Any variable that isn't already an attribute of the list object is\n"
+"        ignored (a warning message is printed).  See also the -c option.\n"
+"\n"
+"        A special variable named `mlist' is put into the globals during the\n"
+"        execfile, which is bound to the actual MailList object.  This lets "
+"you\n"
+"        do all manner of bizarre thing to the list object, but BEWARE!  "
+"Using\n"
+"        this can severely (and possibly irreparably) damage your mailing "
+"list!\n"
+"\n"
+"    --outputfile filename\n"
+"    -o filename\n"
+"        Instead of configuring the list, print out a list's configuration\n"
+"        variables in a format suitable for input using this script.  In "
+"this\n"
+"        way, you can easily capture the configuration settings for a\n"
+"        particular list and imprint those settings on another list.  "
+"filename\n"
+"        is the file to output the settings to.  If filename is `-', "
+"standard\n"
+"        out is used.\n"
+"\n"
+"    --checkonly\n"
+"    -c\n"
+"        With this option, the modified list is not actually changed.  Only\n"
+"        useful with -i.\n"
+"\n"
+"    --verbose\n"
+"    -v\n"
+"        Print the name of each attribute as it is being changed.  Only "
+"useful\n"
+"        with -i.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"The options -o and -i are mutually exclusive.\n"
+"\n"
+msgstr ""
+"从描述文本中配置邮件列表。\n"
+"\n"
+"用法： config_list [options] listname\n"
+"\n"
+"选项：\n"
+"    --inputfile filename\n"
+"    -i filename\n"
+"        把文件中的每个模块全局变量(module-global variable)赋值给列表对象的\n"
+"        相应属性，然后保存列表。指定的文件由execfile()加载，并且必须是合法\n"
+"        的Python代码。不对应于列表对象任何属性的变量将被忽略(会打印一个警告\n"
+"        信息)。参见-c选项。\n"
+"\n"
+"        一个名为'mlist'的特殊变量在execfile时被设置为全局变量，被绑定到真实\n"
+"        的邮件列表对象上。这样您就可以对列表对象做任意的操作，但是小心！这样\n"
+"        做可能会对您的邮件列表造成严重的(同时也可能是不可挽回的)伤害！\n"
+"\n"
+"    --outputfile filename\n"
+"    -o filename\n"
+"        以此脚本的输入格式输出列表的当前配置参数，而不是配置列表。这样您就可\n"
+"        以方便地获取特定列表的配置并让其他列表使用相同配置。配置参数将被输出\n"
+"\t 到以filename命名的文件中。如果文件名为'-'，数据将被写到标准输出。\n"
+"\n"
+"    --checkonly\n"
+"    -c\n"
+"       指定此选项后，要修改的列表不会作任何实际的改动。只有与-i选项一起指定\n"
+"       时才起作用。\n"
+"\n"
+"    --verbose\n"
+"    -v\n"
+"        打印每一个被改变的属性的名字。只有与-i选项一起指定时才起作用。\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        打印此帮助信息并退出\n"
+"\n"
+"选项-o和-i不能同时使用。\n"
+"\n"
+
+#: bin/config_list:118
+msgid ""
+"# -*- python -*-\n"
+"# -*- coding: %(charset)s -*-\n"
+"## \"%(listname)s\" mailing list configuration settings\n"
+"## captured on %(when)s\n"
+msgstr ""
+
+#: bin/config_list:144
+msgid "options"
+msgstr "选项"
+
+#: bin/config_list:203
+msgid "legal values are:"
+msgstr "合法的值："
+
+#: bin/config_list:270
+msgid "attribute \"%(k)s\" ignored"
+msgstr "属性\"%(k)s\"被忽略"
+
+#: bin/config_list:273
+msgid "attribute \"%(k)s\" changed"
+msgstr "属性\"%(k)s\"被修改"
+
+#: bin/config_list:279
+msgid "Non-standard property restored: %(k)s"
+msgstr "非标准属性复位： %(k)s"
+
+#: bin/config_list:288
+msgid "Invalid value for property: %(k)s"
+msgstr "属性值非法: %(k)s"
+
+#: bin/config_list:291
+msgid "Bad email address for option %(k)s: %(v)s"
+msgstr "选项 %(k)s 的email地址错误： %(v)s"
+
+#: bin/config_list:348
+msgid "Only one of -i or -o is allowed"
+msgstr "-i和-o中只能选择一个"
+
+#: bin/config_list:350
+msgid "One of -i or -o is required"
+msgstr "-i和-o至少需要一个"
+
+#: bin/config_list:354
+msgid "List name is required"
+msgstr "需要列表名"
+
+#: bin/convert.py:19
+#, docstring
+msgid ""
+"Convert a list's interpolation strings from %-strings to $-strings.\n"
+"\n"
+"This script is intended to be run as a bin/withlist script, i.e.\n"
+"\n"
+"% bin/withlist -l -r convert <mylist>\n"
+msgstr ""
+"把列表中内插的字符串从 %-strings 转化为 $-strings。\n"
+"\n"
+"此脚本应该被作为bin/withlist脚本来运行，也就是\n"
+"\n"
+"% bin/withlist -l -r convert <mylist>\n"
+
+#: bin/convert.py:38 bin/fix_url.py:90
+msgid "Saving list"
+msgstr "保存列表"
+
+#: bin/convert.py:44 bin/fix_url.py:51 bin/reset_pw.py:57
+msgid "%%%"
+msgstr "%%%"
+
+#: bin/discard:19
+#, docstring
+msgid ""
+"Discard held messages.\n"
+"\n"
+"Usage:\n"
+"    discard [options] file ...\n"
+"\n"
+"Options:\n"
+"    --help / -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"    --quiet / -q\n"
+"        Don't print status messages.\n"
+msgstr ""
+"丢弃保存的信件。\n"
+"\n"
+"用法：\n"
+"    discard [options] file ...\n"
+"\n"
+"选项：\n"
+"    --help / -h\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"    --quiet / -q\n"
+"        不打印状态信息。\n"
+
+#: bin/discard:94
+msgid "Ignoring non-held message: %(f)s"
+msgstr "忽略未被保存的信件： %(f)s"
+
+#: bin/discard:100
+msgid "Ignoring held msg w/bad id: %(f)s"
+msgstr "忽略保存的信件w/bad id: %(f)s"
+
+#: bin/discard:112
+msgid "Discarded held msg #%(id)s for list %(listname)s"
+msgstr "丢弃列表 %(listname)s 中保存的信件 #%(id)s"
+
+#: bin/dumpdb:19
+#, docstring
+msgid ""
+"Dump the contents of any Mailman `database' file.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] filename\n"
+"\n"
+"Options:\n"
+"\n"
+"    --marshal/-m\n"
+"        Assume the file contains a Python marshal, overridding any "
+"automatic\n"
+"        guessing.\n"
+"\n"
+"    --pickle/-p\n"
+"        Assume the file contains a Python pickle, overridding any automatic\n"
+"        guessing.\n"
+"\n"
+"    --noprint/-n\n"
+"        Don't attempt to pretty print the object.  This is useful if "
+"there's\n"
+"        some problem with the object and you just want to get an unpickled\n"
+"        representation.  Useful with `python -i bin/dumpdb <file>'.  In "
+"that\n"
+"        case, the root of the tree will be left in a global called \"msg\".\n"
+"\n"
+"    --help/-h\n"
+"        Print this help message and exit\n"
+"\n"
+"If the filename ends with `.db', then it is assumed that the file contains "
+"a\n"
+"Python marshal.  If the file ends with `.pck' then it is assumed to contain "
+"a\n"
+"Python pickle.  In either case, if you want to override the default "
+"assumption\n"
+"-- or if the file ends in neither suffix -- use the -p or -m flags.\n"
+msgstr ""
+"导出所有Mailman 'database'文件的内容。\n"
+"\n"
+"用法: %(PROGRAM)s [options] filename\n"
+"\n"
+"选项：\n"
+"\n"
+"    --marshal/-m\n"
+"        如果文件包含Python marshal，则覆盖任何自动猜测。\n"
+"\n"
+"    --pickle/-p\n"
+"      如果文件包含Python pickle，覆盖任何自动猜测。\n"
+"\n"
+"    --noprint/-n\n"
+"        不试图美化打印对象。这在对象有一些问题，并且您只是想获得一个unpickled\n"
+"        表示时十分有用。以'python -i bin/dumpdb <file>'的形式使用非常有用。这\n"
+"        样的话，the root of the tree will be left in a global called \"msg\"。\n"
+"\n"
+"    --help/-h\n"
+"        打印此帮助信息然后退出\n"
+"\n"
+"如果文件名以'.db'结束，将假定文件中包含Python marshal。如果文件名以'.pck'结束，\n"
+"将假定文件中包含Python pickle。无论是哪种情况，如果您想要覆盖默认的假定 -- 或者\n"
+"文件名不以这两种后缀结束 -- 使用 -p 或者 -m 选项。\n"
+
+#: bin/dumpdb:105
+msgid "No filename given."
+msgstr "没有给出文件名"
+
+#: bin/dumpdb:108
+msgid "Bad arguments: %(pargs)s"
+msgstr "参数错误: %(pargs)s"
+
+#: bin/dumpdb:118
+msgid "Please specify either -p or -m."
+msgstr "请指定 -p 或者 -m"
+
+#: bin/dumpdb:133
+msgid "[----- start %(typename)s file -----]"
+msgstr ""
+
+#: bin/dumpdb:139
+msgid "[----- end %(typename)s file -----]"
+msgstr ""
+
+#: bin/dumpdb:142
+msgid "<----- start object %(cnt)s ----->"
+msgstr "<----- start object %(cnt)s ----->"
+
+#: bin/export.py:20
+#, docstring
+msgid "Export an XML representation of a mailing list."
+msgstr ""
+
+#: bin/export.py:319
+msgid ""
+"%%prog [options]\n"
+"\n"
+"Export the configuration and members of a mailing list in XML format."
+msgstr ""
+
+#: bin/export.py:325
+msgid ""
+"Output XML to FILENAME.  If not given, or if FILENAME is '-', standard out "
+"is\n"
+"used."
+msgstr ""
+
+#: bin/export.py:329
+msgid ""
+"Specify the RFC 2307 style hashing scheme for passwords included in the\n"
+"output.  Use -P to get a list of supported schemes, which are\n"
+"case-insensitive."
+msgstr ""
+
+#: bin/export.py:334
+msgid ""
+"List the supported password hashing schemes and exit.  The scheme labels "
+"are\n"
+"case-insensitive."
+msgstr ""
+
+#: bin/export.py:339
+msgid ""
+"The list to include in the output.  If not given, then all mailing lists "
+"are\n"
+"included in the XML output.  Multiple -l flags may be given."
+msgstr ""
+
+#: bin/export.py:345
+msgid "Unexpected arguments"
+msgstr ""
+
+#: bin/export.py:351
+msgid "Invalid password scheme"
+msgstr ""
+
+#: bin/find_member:19
+#, docstring
+msgid ""
+"Find all lists that a member's address is on.\n"
+"\n"
+"Usage:\n"
+"    find_member [options] regex [regex [...]]\n"
+"\n"
+"Where:\n"
+"    --listname=listname\n"
+"    -l listname\n"
+"        Include only the named list in the search.\n"
+"\n"
+"    --exclude=listname\n"
+"    -x listname\n"
+"        Exclude the named list from the search.\n"
+"\n"
+"    --owners\n"
+"    -w\n"
+"        Search list owners as well as members.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"    regex\n"
+"        A Python regular expression to match against.\n"
+"\n"
+"The interaction between -l and -x is as follows.  If any -l option is given\n"
+"then only the named list will be included in the search.  If any -x option "
+"is\n"
+"given but no -l option is given, then all lists will be search except those\n"
+"specifically excluded.\n"
+"\n"
+"Regular expression syntax is Perl5-like, using the Python re module.  "
+"Complete\n"
+"specifications are at:\n"
+"\n"
+"http://docs.python.org/library/re.html\n"
+"\n"
+"Address matches are case-insensitive, but case-preserved addresses are\n"
+"displayed.\n"
+"\n"
+msgstr ""
+"查找包含指定成员地址的所有列表。\n"
+"\n"
+"用法：\n"
+"    find_member [options] regex [regex [...]]\n"
+"\n"
+"其中：\n"
+"    --listname=listname\n"
+"    -l listname\n"
+"        仅搜索指定的列表。\n"
+"\n"
+"    --exclude=listname\n"
+"    -x listname\n"
+"        不搜索指定的列表。\n"
+"\n"
+"    --owners\n"
+"    -w\n"
+"        搜索列表属主和成员。\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        打印此帮助信息并退出。\n"
+"\n"
+"    regex\n"
+"        将要匹配的一个Python正则表达式。\n"
+"\n"
+"-l和-x的相互影响如下。如果给出了-l选项，则仅搜索指定的列表。如果\n"
+"指定了-x选项，但没有指定-l选项，那么除了指定的列表外，所有的列表都将被搜索。\n"
+"\n"
+"正则表达式语法类似于Perl5，使用了Python的re模块。完整的定义参见:\n"
+"\n"
+"http://docs.python.org/library/re.html\n"
+"\n"
+"地址匹配是大小写无关的，但是显示的地址将保留原有形式。\n"
+"\n"
+
+#: bin/find_member:159
+msgid "Search regular expression required"
+msgstr "需指定搜索正则表达式"
+
+#: bin/find_member:164
+msgid "No lists to search"
+msgstr "没有要搜索的列表"
+
+#: bin/find_member:173
+msgid "found in:"
+msgstr "在这里找到："
+
+#: bin/find_member:179
+msgid "(as owner)"
+msgstr "(列表属主)"
+
+#: bin/fix_url.py:19
+#, docstring
+msgid ""
+"Reset a list's web_page_url attribute to the default setting.\n"
+"\n"
+"This script is intended to be run as a bin/withlist script, i.e.\n"
+"\n"
+"% bin/withlist -l -r fix_url listname [options]\n"
+"\n"
+"Options:\n"
+"    -u urlhost\n"
+"    --urlhost=urlhost\n"
+"        Look up urlhost in the virtual host table and set the web_page_url "
+"and\n"
+"        host_name attributes of the list to the values found.  This\n"
+"        essentially moves the list from one virtual domain to another.\n"
+"\n"
+"        Without this option, the default web_page_url and host_name values "
+"are\n"
+"        used.\n"
+"\n"
+"    -v / --verbose\n"
+"        Print what the script is doing.\n"
+"\n"
+"If run standalone, it prints this help text and exits.\n"
+msgstr ""
+"把列表的web_page_url属性恢复为默认设置。\n"
+"\n"
+"此脚本应该被作为一个bin/withlist脚本来运行，也就是\n"
+"\n"
+"% bin/withlist -l -r fix_url listname [options]\n"
+"\n"
+"选项：\n"
+"    -u urlhost\n"
+"    --urlhost=urlhost\n"
+"        在虚拟主机列表中搜索urlhost，并把web_page_url和host_name属性设置为找到的值。\n"
+"        在本质上，这把一个列表从一个虚拟域移到了另一个。\n"
+"\n"
+"        不指定此选项，将使用web_page_url和host_name的默认值。\n"
+"\n"
+"    -v / --verbose\n"
+"        打印脚本正在做什么。\n"
+"\n"
+"如果独立运行的话，将打印此帮助信息并退出。\n"
+
+#: bin/fix_url.py:75
+msgid "Locking list"
+msgstr ""
+
+#: bin/fix_url.py:85
+msgid "Setting web_page_url to: %(web_page_url)s"
+msgstr "设置web_page_url为： %(web_page_url)s"
+
+#: bin/fix_url.py:88
+msgid "Setting host_name to: %(mailhost)s"
+msgstr "设置host_name为： %(mailhost)s"
+
+#: bin/genaliases:19
+#, docstring
+msgid ""
+"Regenerate Mailman specific aliases from scratch.\n"
+"\n"
+"The actual output depends on the value of the `MTA' variable in your "
+"mm_cfg.py\n"
+"file.\n"
+"\n"
+"Usage: genaliases [options]\n"
+"Options:\n"
+"\n"
+"    -q/--quiet\n"
+"        Some MTA output can include more verbose help text.  Use this to "
+"tone\n"
+"        down the verbosity.\n"
+"\n"
+"    -h/--help\n"
+"        Print this message and exit.\n"
+msgstr ""
+"从头开始重新生成Mailman specific aliases。\n"
+"\n"
+"实际的输出依赖于mm_cfg.py文件中'MTA'的值。\n"
+"\n"
+"用法： genaliases [options]\n"
+"选项：\n"
+"\n"
+"    -q/--quiet\n"
+"       一些MTA的输出会包括更多冗余的帮助信息。使用此选项来关闭冗于。\n"
+"\n"
+"    -h/--help\n"
+"       打印此帮助信息并退出。\n"
+
+#: bin/genaliases:84
+msgid "genaliases can't do anything useful with mm_cfg.MTA = %(mta)s."
+msgstr ""
+
+#: bin/inject:20
+#, docstring
+msgid ""
+"Inject a message from a file into Mailman's incoming queue.\n"
+"\n"
+"Usage: inject [options] [filename]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -h / --help\n"
+"        Print this text and exit.\n"
+"\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        The name of the list to inject this message to.  Required.\n"
+"\n"
+"    -q queuename\n"
+"    --queue=queuename\n"
+"        The name of the queue to inject the message to.  The queuename must "
+"be\n"
+"        one of the directories inside the qfiles directory.  If omitted, "
+"the\n"
+"        incoming queue is used.\n"
+"\n"
+"filename is the name of the plaintext message file to inject.  If omitted,\n"
+"standard input is used.\n"
+msgstr ""
+"把文件中的信件插入到Mailman的incoming队列中。\n"
+"\n"
+"用法: inject [options] [filename]\n"
+"\n"
+"选项：\n"
+"\n"
+"    -h / --help\n"
+"        打印此帮助信息并退出。\n"
+"\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        将插入信件的列表名。必须指定此选项。\n"
+"\n"
+"    -q queuename\n"
+"    --queue=queuename\n"
+"        将要插入信件的队列名。queuename必须是qfiles目录的一个子目录名。如果省略\n"
+"        的话，将使用incoming队列。\n"
+"\n"
+"filename是要插入的文本信息文件。如果省略的话，将使用标准输入。\n"
+
+#: bin/inject:84
+msgid "Bad queue directory: %(qdir)s"
+msgstr "队列目录错误： %(qdir)s"
+
+#: bin/inject:89
+msgid "A list name is required"
+msgstr "需要指定一个列表名"
+
+#: bin/list_admins:20
+#, docstring
+msgid ""
+"List all the owners of a mailing list.\n"
+"\n"
+"Usage: %(program)s [options] listname ...\n"
+"\n"
+"Where:\n"
+"\n"
+"    --all-vhost=vhost\n"
+"    -v=vhost\n"
+"        List the owners of all the mailing lists for the given virtual "
+"host.\n"
+"\n"
+"    --all\n"
+"    -a\n"
+"        List the owners of all the mailing lists on this system.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"`listname' is the name of the mailing list to print the owners of.  You can\n"
+"have more than one named list on the command line.\n"
+msgstr ""
+"列出一个邮件列表的所有属主。\n"
+"\n"
+"用法： %(program)s [options] listname ...\n"
+"\n"
+"其中：\n"
+"\n"
+"    --all-vhost=vhost\n"
+"    -v=vhost\n"
+"        列出指定虚拟主机上所有邮件列表的属主。\n"
+"\n"
+"    --all\n"
+"    -a\n"
+"        列出此系统中所有邮件列表的属主。\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        打印此帮助信息并退出。\n"
+"\n"
+"'listname'是要列出属主的邮件列表名。可以在命令行上指定多个列表。\n"
+
+#: bin/list_admins:97
+msgid "List: %(listname)s, \tOwners: %(owners)s"
+msgstr "列表： %(listname)s, \t属主： %(owners)s"
+
+#: bin/list_lists:19
+#, docstring
+msgid ""
+"List all mailing lists.\n"
+"\n"
+"Usage: %(program)s [options]\n"
+"\n"
+"Where:\n"
+"\n"
+"    -a / --advertised\n"
+"        List only those mailing lists that are publically advertised\n"
+"\n"
+"    -p / --public-archive\n"
+"        List only those lists with public archives.\n"
+"\n"
+"    --virtual-host-overview=domain\n"
+"    -V domain\n"
+"        List only those mailing lists that are homed to the given virtual\n"
+"        domain.  This only works if the VIRTUAL_HOST_OVERVIEW variable is\n"
+"        set.\n"
+"\n"
+"    -b / --bare\n"
+"        Displays only the list name, with no description.\n"
+"\n"
+"    -h / --help\n"
+"        Print this text and exit.\n"
+"\n"
+msgstr ""
+
+#: bin/list_lists:119
+msgid "No matching mailing lists found"
+msgstr "没有找到匹配的邮件列表"
+
+#: bin/list_lists:123
+msgid "matching mailing lists found:"
+msgstr "匹配的邮件列表："
+
+#: bin/list_members:19
+#, docstring
+msgid ""
+"List all the members of a mailing list.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] listname\n"
+"\n"
+"Where:\n"
+"\n"
+"    --output file\n"
+"    -o file\n"
+"        Write output to specified file instead of standard out.\n"
+"\n"
+"    --regular / -r\n"
+"        Print just the regular (non-digest) members.\n"
+"\n"
+"    --digest[=kind] / -d [kind]\n"
+"        Print just the digest members.  Optional argument can be \"mime\" "
+"or\n"
+"        \"plain\" which prints just the digest members receiving that kind "
+"of\n"
+"        digest.\n"
+"\n"
+"    --nomail[=why] / -n [why]\n"
+"        Print the members that have delivery disabled.  Optional argument "
+"can\n"
+"        be \"byadmin\", \"byuser\", \"bybounce\", or \"unknown\" which "
+"prints just the\n"
+"        users who have delivery disabled for that reason.  It can also be\n"
+"        \"enabled\" which prints just those member for whom delivery is\n"
+"        enabled.\n"
+"\n"
+"    --fullnames / -f\n"
+"        Include the full names in the output.\n"
+"\n"
+"    --preserve / -p\n"
+"        Output member addresses case preserved the way they were added to "
+"the\n"
+"        list.  Otherwise, addresses are printed in all lowercase.\n"
+"\n"
+"    --moderated / -m\n"
+"        Print just the moderated members.  Ignores -r, -d, -n.\n"
+"\n"
+"    --non-moderated / -M\n"
+"        Print just the non-moderated members.  Ignores -r, -d, -n.\n"
+"\n"
+"    --invalid / -i\n"
+"        Print only the addresses in the membership list that are invalid.\n"
+"        Ignores -r, -d, -n.\n"
+"\n"
+"    --unicode / -u\n"
+"        Print addresses which are stored as Unicode objects instead of "
+"normal\n"
+"        string objects.  Ignores -r, -d, -n.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"    listname is the name of the mailing list to use.\n"
+"\n"
+"Note that if neither -r or -d is supplied, regular members are printed "
+"first,\n"
+"followed by digest members, but no indication is given as to address "
+"status.\n"
+msgstr ""
+
+#: bin/list_members:198
+msgid "Bad --nomail option: %(why)s"
+msgstr "错误的 --nomail 选项： %(why)s"
+
+#: bin/list_members:209
+msgid "Bad --digest option: %(kind)s"
+msgstr "错误的 --digest 选项： %(kind)s"
+
+#: bin/list_members:213 bin/list_members:217 bin/list_members:221
+#: bin/list_members:225
+msgid "Only one of -m, -M, -i or -u may be specified."
+msgstr ""
+
+#: bin/list_members:243
+msgid "Could not open file for writing:"
+msgstr "无法以写方式打开文件："
+
+#: bin/list_owners:20
+#, docstring
+msgid ""
+"List the owners of a mailing list, or all mailing lists.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [listname ...]\n"
+"Options:\n"
+"\n"
+"    -w / --with-listnames\n"
+"        Group the owners by list names and include the list names in the\n"
+"        output.  Otherwise, the owners will be sorted and uniquified based "
+"on\n"
+"        the email address.\n"
+"\n"
+"    -m / --moderators\n"
+"        Include the list moderators in the output.\n"
+"\n"
+"    -h / --help\n"
+"        Print this help message and exit.\n"
+"\n"
+"    listname\n"
+"        Print the owners of the specified lists.  More than one can appear\n"
+"        after the options.  If there are no listnames provided, the owners "
+"of\n"
+"        all the lists will be displayed.\n"
+msgstr ""
+"列出一个或所有邮件列表的属主。\n"
+"\n"
+"用法： %(PROGRAM)s [options] [listname ...]\n"
+"选项：\n"
+"\n"
+"    -w / --with-listnames\n"
+"        把属主按列表名分组，并且在输出中包含列表名。否则，属主将按\n"
+"        邮件地址排序，并且重复的地址将被删去。\n"
+"\n"
+"    -m / --moderators\n"
+"        在输出中包括列表管理员。\n"
+"\n"
+"    -h / --help\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"    listname\n"
+"        打印指定列表的属主。可以在选项后指定多个列表。如果未指定列表，所有\n"
+"        列表的属主都将被打印。\n"
+
+#: bin/mailman-config:22
+#, docstring
+msgid ""
+"Show basic statistics about, and build options for this\n"
+"installation of Mailman. Requires python 2."
+msgstr ""
+
+#: bin/mailmanctl:20
+#, docstring
+msgid ""
+"Primary start-up and shutdown script for Mailman's qrunner daemon.\n"
+"\n"
+"This script starts, stops, and restarts the main Mailman queue runners, "
+"making\n"
+"sure that the various long-running qrunners are still alive and kicking.  "
+"It\n"
+"does this by forking and exec'ing the qrunners and waiting on their pids.\n"
+"When it detects a subprocess has exited, it may restart it.\n"
+"\n"
+"The qrunners respond to SIGINT, SIGTERM, and SIGHUP.  SIGINT and SIGTERM "
+"both\n"
+"cause the qrunners to exit cleanly, but the master will only restart "
+"qrunners\n"
+"that have exited due to a SIGINT.  SIGHUP causes the master and the "
+"qrunners\n"
+"to close their log files, and reopen then upon the next printed message.\n"
+"\n"
+"The master also responds to SIGINT, SIGTERM, and SIGHUP, which it simply\n"
+"passes on to the qrunners (note that the master will close and reopen its "
+"own\n"
+"log files on receipt of a SIGHUP).  The master also leaves its own process "
+"id\n"
+"in the file data/master-qrunner.pid but you normally don't need to use this\n"
+"pid directly.  The `start', `stop', `restart', and `reopen' commands handle\n"
+"everything for you.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [ start | stop | restart | reopen ]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -n/--no-restart\n"
+"        Don't restart the qrunners when they exit because of an error or a\n"
+"        SIGINT.  They are never restarted if they exit in response to a\n"
+"        SIGTERM.  Use this only for debugging.  Only useful if the `start'\n"
+"        command is given.\n"
+"\n"
+"    -u/--run-as-user\n"
+"        Normally, this script will refuse to run if the user id and group "
+"id\n"
+"        are not set to the `mailman' user and group (as defined when you\n"
+"        configured Mailman).  If run as root, this script will change to "
+"this\n"
+"        user and group before the check is made.\n"
+"\n"
+"        This can be inconvenient for testing and debugging purposes, so the -"
+"u\n"
+"        flag means that the step that sets and checks the uid/gid is "
+"skipped,\n"
+"        and the program is run as the current user and group.  This flag is\n"
+"        not recommended for normal production environments.\n"
+"\n"
+"        Note though, that if you run with -u and are not in the mailman "
+"group,\n"
+"        you may have permission problems, such as begin unable to delete a\n"
+"        list's archives through the web.  Tough luck!\n"
+"\n"
+"    -s/--stale-lock-cleanup\n"
+"        If mailmanctl finds an existing master lock, it will normally exit\n"
+"        with an error message.  With this option, mailmanctl will perform "
+"an\n"
+"        extra level of checking.  If a process matching the host/pid "
+"described\n"
+"        in the lock file is running, mailmanctl will still exit, but if no\n"
+"        matching process is found, mailmanctl will remove the apparently "
+"stale\n"
+"        lock and make another attempt to claim the master lock.\n"
+"\n"
+"    -q/--quiet\n"
+"        Don't print status messages.  Error messages are still printed to\n"
+"        standard error.\n"
+"\n"
+"    -h/--help\n"
+"        Print this message and exit.\n"
+"\n"
+"Commands:\n"
+"\n"
+"    start   - Start the master daemon and all qrunners.  Prints a message "
+"and\n"
+"              exits if the master daemon is already running.\n"
+"\n"
+"    stop    - Stops the master daemon and all qrunners.  After stopping, no\n"
+"              more messages will be processed.\n"
+"\n"
+"    restart - Restarts the qrunners, but not the master process.  Use this\n"
+"              whenever you upgrade or update Mailman so that the qrunners "
+"will\n"
+"              use the newly installed code.\n"
+"\n"
+"    reopen  - This will close all log files, causing them to be re-opened "
+"the\n"
+"              next time a message is written to them\n"
+msgstr ""
+"关闭、开启Mailman qrunner守护进程的主脚本程序。\n"
+"\n"
+"此脚本可以开启，关闭，和重启Mailman queue runners，确保各种长期运行的qrunner仍\n"
+"在正常运行。此脚本通过fork和exec这些qrunners并且获取他们的pid来做到这些。当它发\n"
+"现有子进程退出时，就会重新启动它。\n"
+"\n"
+"qrunners会对SIGINT， SIGTERM和SIGHUP信号作出响应。SIGINT和SIGTERM信号可以使qrunners\n"
+"完全地退出，但是master只会对由SIGINT信号造成的退出进行重启。SIGHUP会导致master\n"
+"和qrunners关闭它们的日志文件，直到产生新的输出信息时才重新打开它。\n"
+"\n"
+"master也会响应SIGINT, SIGTERM和SIGHUP，但只是把它们传递给qurnners(注意，当接收到\n"
+"SIGHUP时master会关闭并重新打开它的日志文件)。master也会在data/master-qrunner.pid\n"
+"这个文件中记录它自己的进程号，但是一般来说您不需要直接使用它。'start', 'stop',\n"
+"'restart'和'reopen'这几个命令为您处理了全部的事情。\n"
+"\n"
+"用法： %(PROGRAM)s [options] [ start | stop | restart | reopen ]\n"
+"\n"
+"选项：\n"
+"\n"
+"    -n/--no-restart\n"
+"        在qurnners因错误或者SIGINT而退出后不被重启。如果它们是因为SIGTERM而\n"
+"        退出的话，将从不会被重启。仅调试时使用此选项。仅在使用'start‘\n"
+"        命令时有效。\n"
+"\n"
+"    -u/--run-as-user\n"
+"        一般来说，当用户id和组id没有被设置为'mailman'(在您编译配置Mailman时定\n"
+"        义)时，此脚本会拒绝执行。如果以root身份运行的话，此脚本将会在检查之前\n"
+"        切换到此用户和组。\n"
+"\n"
+"        这可能会对测试或者调试造成不便，设置-u选项会导致设置和检查\n"
+"        uid/gid的步骤被忽略，并且程序将会以当前用户和组的身份运行。不推荐在实\n"
+"        际环境(normal production environments)中使用此选项。\n"
+"\n"
+"        但是请注意，如果使用了-u选项，并且不属于mailman组，则可能会遇到权\n"
+"        限问题，例如无法从web上删除一个列表的存档。厄运！\n"
+"\n"
+"    -s/--stale-lock-cleanup\n"
+"        如果mailmanctl发现一个已存在的master锁文件，它一般会打印一段错误信息，\n"
+"        然后退出。指定此选项会使mailmanctl做进一步的检查。如果发现一个正在运行\n"
+"        的进程，它的host/pid与锁文件中描述的一致，mailmanctl仍然会退出。但是如\n"
+"        果没有找到这样的进程，mailmanctl会删除这个错误的锁文件，然后尝试建立正确\n"
+"        的master锁文件。\n"
+"\n"
+"    -q/--quiet\n"
+"        不显示状态信息。错误信息仍然会被打印到标准错误。\n"
+"\n"
+"    -h/--help\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"命令：\n"
+"\n"
+"    start   - 启动master守护进程和所有的qrunners。如果master守护进程已经在运行\n"
+"              的话，打印一条信息然后退出。\n"
+"\n"
+"    stop    - 停止master守护进程和所有的qrunners。停止后，不会再有信件被处理。\n"
+"\n"
+"    restart - 重启qrunners，但是不重启master进程。当您升级Mailman后使用此\n"
+"              命令，这样qrunners将会使用新安装的代码。\n"
+"\n"
+"    reopen  - 这将会关闭所有的日志文件，在产生新的日志信息时再重新打开它们。\n"
+
+#: bin/mailmanctl:152
+msgid "PID unreadable in: %(pidfile)s"
+msgstr "在: %(pidfile)s 中找不到PID"
+
+#: bin/mailmanctl:154
+msgid "Is qrunner even running?"
+msgstr "队列管理器正在运行吗？"
+
+#: bin/mailmanctl:160
+msgid "No child with pid: %(pid)s"
+msgstr "进程: %(pid)s 没有子进程"
+
+#: bin/mailmanctl:162
+msgid "Stale pid file removed."
+msgstr "过期的进程号文件已删除。"
+
+#: bin/mailmanctl:221
+msgid ""
+"The master qrunner lock could not be acquired because it appears as if "
+"another\n"
+"master qrunner is already running.\n"
+msgstr "队列管理器的主锁无法获得，可能另一个主队列管理器正在运行。\n"
+
+#: bin/mailmanctl:227
+msgid ""
+"The master qrunner lock could not be acquired.  It appears as though there "
+"is\n"
+"a stale master qrunner lock.  Try re-running mailmanctl with the -s flag.\n"
+msgstr ""
+"队列管理器的主锁无法获得。可能存在一个过期的队列管理器主锁。\n"
+"可以尝试使用 -s flag 来重启mailmanctl。\n"
+
+#: bin/mailmanctl:233
+msgid ""
+"The master qrunner lock could not be acquired, because it appears as if "
+"some\n"
+"process on some other host may have acquired it.  We can't test for stale\n"
+"locks across host boundaries, so you'll have to do this manually.  Or, if "
+"you\n"
+"know the lock is stale, re-run mailmanctl with the -s flag.\n"
+"\n"
+"Lock file: %(LOCKFILE)s\n"
+"Lock host: %(status)s\n"
+"\n"
+"Exiting."
+msgstr ""
+"队列管理器的主锁无法获得，可能其他主机上的某些进程正在使用它。\n"
+"我们不能越过主机来测试过期的主锁，所以您必须手动测试。\n"
+"或者，如果您知道主锁已过期，用 -s flag 来重启mailmanctl。\n"
+"\n"
+"主锁文件: %(LOCKFILE)s\n"
+"主锁主机: %(status)s\n"
+"\n"
+"正在退出。"
+
+#: bin/mailmanctl:280 cron/mailpasswds:119
+msgid "Site list is missing: %(sitelistname)s"
+msgstr "缺少站点列表: %(sitelistname)s"
+
+#: bin/mailmanctl:305
+msgid "Run this program as root or as the %(name)s user, or use -u."
+msgstr "用root用户，或 %(name)s用户身份来运行此程序，或者使用-u。"
+
+#: bin/mailmanctl:336
+msgid "No command given."
+msgstr "没有提供命令。"
+
+#: bin/mailmanctl:339
+msgid "Bad command: %(command)s"
+msgstr "错误命令: %(command)s"
+
+#: bin/mailmanctl:344
+msgid "Warning!  You may encounter permission problems."
+msgstr "警告！您可能会遇到权限问题。"
+
+#: bin/mailmanctl:353
+msgid "Shutting down Mailman's master qrunner"
+msgstr "正在关闭Mailman的主队列管理器"
+
+#: bin/mailmanctl:360
+msgid "Restarting Mailman's master qrunner"
+msgstr "正在重启Mailman的主队列管理器"
+
+#: bin/mailmanctl:364
+msgid "Re-opening all log files"
+msgstr "正在打开所有的日志文件"
+
+#: bin/mailmanctl:400
+msgid "Starting Mailman's master qrunner."
+msgstr "正在启动Mailman的主队列管理器"
+
+#: bin/mmsitepass:19
+#, docstring
+msgid ""
+"Set the site password, prompting from the terminal.\n"
+"\n"
+"The site password can be used in most if not all places that the list\n"
+"administrator's password can be used, which in turn can be used in most "
+"places\n"
+"that a list users password can be used.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [password]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -c/--listcreator\n"
+"        Set the list creator password instead of the site password.  The "
+"list\n"
+"        creator is authorized to create and remove lists, but does not have\n"
+"        the total power of the site administrator.\n"
+"\n"
+"    -h/--help\n"
+"        Print this help message and exit.\n"
+"\n"
+"If password is not given on the command line, it will be prompted for.\n"
+msgstr ""
+"从终端提示来设置口令。\n"
+"\n"
+"在管理员口令有效的大部分地方（但不是全部），站点口令都有效。在用户口令有效的大部分地方，\n"
+"站点口令也有效。\n"
+"\n"
+"用法: %(PROGRAM)s [options] [password]\n"
+"\n"
+"选项:\n"
+"\n"
+"    -c/--列表创建者（listcreator）\n"
+"        设置列表创建者的口令，而不是站点口令。列表创建者有权创建和删除列表，但是\n"
+"        没有站点管理员的全部权限。\n"
+"\n"
+"    -h/--帮助\n"
+"        显示此帮助信息并退出\n"
+"\n"
+"如果没有在命令行中输入口令，则会提醒您。\n"
+
+#: bin/mmsitepass:73
+msgid "site"
+msgstr "站点"
+
+#: bin/mmsitepass:80
+msgid "list creator"
+msgstr "列表创建者"
+
+#: bin/mmsitepass:86
+msgid "New %(pwdesc)s password: "
+msgstr "新 %(pwdesc)s 口令 "
+
+#: bin/mmsitepass:87
+msgid "Again to confirm password: "
+msgstr "确认口令 "
+
+#: bin/mmsitepass:89
+msgid "Passwords do not match; no changes made."
+msgstr "口令不相同，未做改变"
+
+#: bin/mmsitepass:92
+msgid "Interrupted..."
+msgstr "被中断..."
+
+#: bin/mmsitepass:98
+msgid "Password changed."
+msgstr "口令以更改"
+
+#: bin/mmsitepass:100
+msgid "Password change failed."
+msgstr "更改口令失败"
+
+#: bin/msgfmt.py:5
+#, docstring
+msgid ""
+"Generate binary message catalog from textual translation description.\n"
+"\n"
+"This program converts a textual Uniforum-style message catalog (.po file) "
+"into\n"
+"a binary GNU catalog (.mo file).  This is essentially the same function as "
+"the\n"
+"GNU msgfmt program, however, it is a simpler implementation.\n"
+"\n"
+"Usage: msgfmt.py [OPTIONS] filename.po\n"
+"\n"
+"Options:\n"
+"    -o file\n"
+"    --output-file=file\n"
+"        Specify the output file to write to.  If omitted, output will go to "
+"a\n"
+"        file named filename.mo (based off the input file name).\n"
+"\n"
+"    -h\n"
+"    --help\n"
+"        Print this message and exit.\n"
+"\n"
+"    -V\n"
+"    --version\n"
+"        Display version information and exit.\n"
+msgstr ""
+"从文本翻译描述中产生二进制信息目录。\n"
+"\n"
+"本程序将原始的统一字符编码的信息目录(.po文件)转换成二进制的GNU目录(.mo文件)。\n"
+"它本质上和GNU的msgfmt程序是一样的，但是，它只是一个简单的操作。\n"
+"\n"
+"用法: msgfmt.py [OPTIONS] filename.po\n"
+"\n"
+"选项:\n"
+"    -o file\n"
+"    --output-file=file\n"
+"        指定信息写入的文件。如果忽略，将会输出到名为filename.mo（取决于输入文件名）的文件中。\n"
+"\n"
+"    -h\n"
+"    --help\n"
+"        输出此信息并退出。\n"
+"\n"
+"    -V\n"
+"    --version\n"
+"        显示版本信息并退出。\n"
+
+#: bin/msgfmt.py:49
+#, docstring
+msgid "Add a non-fuzzy translation to the dictionary."
+msgstr "向字典中加入一个准确的翻译。"
+
+#: bin/msgfmt.py:57
+#, docstring
+msgid "Return the generated output."
+msgstr "返回产生的输出。"
+
+#: bin/newlist:20
+#, docstring
+msgid ""
+"Create a new, unpopulated mailing list.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [listname [listadmin-addr [admin-password]]]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -l language\n"
+"    --language=language\n"
+"        Make the list's preferred language `language', which must be a two\n"
+"        letter language code.\n"
+"\n"
+"    -u urlhost\n"
+"    --urlhost=urlhost\n"
+"        Gives the list's web interface host name.\n"
+"\n"
+"    -e emailhost\n"
+"    --emailhost=emailhost\n"
+"        Gives the list's email domain name.\n"
+"\n"
+"    -q/--quiet\n"
+"        Normally the administrator is notified by email (after a prompt) "
+"that\n"
+"        their list has been created.  This option suppresses the prompt and\n"
+"        notification.\n"
+"\n"
+"    -a/--automate\n"
+"        This option suppresses the prompt prior to administrator "
+"notification\n"
+"        but still sends the notification.  It can be used to make newlist\n"
+"        totally non-interactive but still send the notification, assuming\n"
+"        listname, listadmin-addr and admin-password are all specified on "
+"the\n"
+"        command line.\n"
+"\n"
+"    -h/--help\n"
+"        Print this help text and exit.\n"
+"\n"
+"You can specify as many of the arguments as you want on the command line:\n"
+"you will be prompted for the missing ones.\n"
+"\n"
+"Every Mailman list has two parameters which define the default host name "
+"for\n"
+"outgoing email, and the default URL for all web interfaces.  When you\n"
+"configured Mailman, certain defaults were calculated, but if you are "
+"running\n"
+"multiple virtual Mailman sites, then the defaults may not be appropriate "
+"for\n"
+"the list you are creating.\n"
+"\n"
+"You also specify the domain to create your new list in by typing the "
+"command\n"
+"like so:\n"
+"\n"
+"    newlist --urlhost=www.mydom.ain mylist\n"
+"\n"
+"where `www.mydom.ain' should be the base hostname for the URL to this "
+"virtual\n"
+"hosts's lists.  E.g. with this setting people will view the general list\n"
+"overviews at http://www.mydom.ain/mailman/listinfo.  Also, www.mydom.ain\n"
+"should be a key in the VIRTUAL_HOSTS mapping in mm_cfg.py/Defaults.py if\n"
+"the email hostname to be automatically determined.\n"
+"\n"
+"If you want the email hostname to be different from the one looked up by "
+"the\n"
+"VIRTUAL_HOSTS or if urlhost is not registered in VIRTUAL_HOSTS, you can "
+"specify\n"
+"`emailhost' like so:\n"
+"\n"
+"    newlist --urlhost=www.mydom.ain --emailhost=mydom.ain mylist\n"
+"\n"
+"where `mydom.ain' is the mail domain name. If you don't specify emailhost "
+"but\n"
+"urlhost is not in the virtual host list, then mm_cfg.DEFAULT_EMAIL_HOST "
+"will\n"
+"be used for the email interface.\n"
+"\n"
+"For backward compatibility, you can also specify the domain to create your\n"
+"new list in by spelling the listname like so:\n"
+"\n"
+"    mylist@www.mydom.ain\n"
+"\n"
+"where www.mydom.ain is used for `urlhost' but it will also be used for\n"
+"`emailhost' if it is not found in the virtual host table. Note that\n"
+"'--urlhost' and '--emailhost' have precedence to this notation.\n"
+"\n"
+"If you spell the list name as just `mylist', then the email hostname will "
+"be\n"
+"taken from DEFAULT_EMAIL_HOST and the url will be taken from "
+"DEFAULT_URL_HOST\n"
+"interpolated into DEFAULT_URL_PATTERN (as defined in your Defaults.py file "
+"or\n"
+"overridden by settings in mm_cfg.py).\n"
+"\n"
+"Note that listnames are forced to lowercase.\n"
+msgstr ""
+
+#: bin/newlist:162
+msgid "Unknown language: %(lang)s"
+msgstr "未知的语言: %(lang)s"
+
+#: bin/newlist:167
+msgid "Enter the name of the list: "
+msgstr "输入列表的名字： "
+
+#: bin/newlist:188
+msgid "Enter the email of the person running the list: "
+msgstr "输入运行列表的人的email： "
+
+#: bin/newlist:193
+msgid "Initial %(listname)s password: "
+msgstr "初始的 %(listname)s的密码： "
+
+#: bin/newlist:197
+msgid "The list password cannot be empty"
+msgstr "列表密码不能为空"
+
+#: bin/newlist:220
+msgid ""
+" - owner addresses need to be fully-qualified names like "
+"\"owner@example.com\", not just \"owner\"."
+msgstr ""
+
+#: bin/newlist:244
+msgid "Hit enter to notify %(listname)s owner..."
+msgstr "单击回车来通知 %(listname)s的所有者..."
+
+#: bin/qrunner:20
+#, docstring
+msgid ""
+"Run one or more qrunners, once or repeatedly.\n"
+"\n"
+"Each named runner class is run in round-robin fashion.  In other words, the\n"
+"first named runner is run to consume all the files currently in its\n"
+"directory.  When that qrunner is done, the next one is run to consume all "
+"the\n"
+"files in /its/ directory, and so on.  The number of total iterations can be\n"
+"given on the command line.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -r runner[:slice:range]\n"
+"    --runner=runner[:slice:range]\n"
+"        Run the named qrunner, which must be one of the strings returned by\n"
+"        the -l option.  Optional slice:range if given, is used to assign\n"
+"        multiple qrunner processes to a queue.  range is the total number "
+"of\n"
+"        qrunners for this queue while slice is the number of this qrunner "
+"from\n"
+"        [0..range).\n"
+"\n"
+"        If using the slice:range form, you better make sure that each "
+"qrunner\n"
+"        for the queue is given the same range value.  If slice:runner is "
+"not\n"
+"        given, then 1:1 is used.\n"
+"\n"
+"        Multiple -r options may be given, in which case each qrunner will "
+"run\n"
+"        once in round-robin fashion.  The special runner `All' is shorthand\n"
+"        for a qrunner for each listed by the -l option.\n"
+"\n"
+"    --once\n"
+"    -o\n"
+"        Run each named qrunner exactly once through its main loop.  "
+"Otherwise,\n"
+"        each qrunner runs indefinitely, until the process receives a "
+"SIGTERM\n"
+"        or SIGINT.\n"
+"\n"
+"    -l/--list\n"
+"        Shows the available qrunner names and exit.\n"
+"\n"
+"    -v/--verbose\n"
+"        Spit out more debugging information to the logs/qrunner log file.\n"
+"\n"
+"    -s/--subproc\n"
+"        This should only be used when running qrunner as a subprocess of "
+"the\n"
+"        mailmanctl startup script.  It changes some of the exit-on-error\n"
+"        behavior to work better with that framework.\n"
+"\n"
+"    -h/--help\n"
+"        Print this message and exit.\n"
+"\n"
+"runner is required unless -l or -h is given, and it must be one of the "
+"names\n"
+"displayed by the -l switch.\n"
+"\n"
+"Note also that this script should be started up from mailmanctl as a normal\n"
+"operation.  It is only useful for debugging if it is run separately.\n"
+msgstr ""
+
+#: bin/qrunner:178
+msgid "%(name)s runs the %(runnername)s qrunner"
+msgstr "%(name)s 运行 %(runnername)s qrunner"
+
+#: bin/qrunner:179
+msgid "All runs all the above qrunners"
+msgstr "All 运行上面的所有qrunners"
+
+#: bin/qrunner:215
+msgid "No runner name given."
+msgstr "没提供管理器的名字。"
+
+#: bin/rb-archfix:21
+#, docstring
+msgid ""
+"Reduce disk space usage for Pipermail archives.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] file ...\n"
+"\n"
+"Where options are:\n"
+"    -h / --help\n"
+"        Print this help message and exit.\n"
+"\n"
+"Only use this to 'fix' archive -article database files that have been "
+"written\n"
+"with Mailman 2.1.3 or earlier and have html_body attributes in them.  These\n"
+"attributes can cause huge amounts of memory bloat and impact performance "
+"for\n"
+"high activity lists, particularly those where large text postings are made "
+"to\n"
+"them.\n"
+"\n"
+"Example:\n"
+"\n"
+"%% ls -1 archives/private/*/database/*-article | xargs %(PROGRAM)s\n"
+"\n"
+"You should run `bin/check_perms -f' after running this script.\n"
+"\n"
+"You will probably want to delete the -article.bak files created by this "
+"script\n"
+"when you are satisfied with the results.\n"
+"\n"
+"This script is provided for convenience purposes only.  It isn't supported.\n"
+msgstr ""
+"降低磁盘空间。\n"
+"\n"
+"用法: %(PROGRAM)s [options] file ...\n"
+"\n"
+"选项是:\n"
+"    -h / --help\n"
+"        输出此帮助信息然后退出。\n"
+"\n"
+"此命令仅用来整理用Mailman 2.1.3O或更早的版本生成的数据库归档文件，这些文件都是html格式的。\n"
+"而html格式会造成大量的内存浪费并严重影响高速列表的性能，特别是会产生大量文本纪录的列表。\n"
+"\n"
+"例子:\n"
+"\n"
+"%% ls -1 archives/private/*/database/*-article | xargs %(PROGRAM)s\n"
+"\n"
+"在运行此脚本后，您应该运行‘bin/check_perms -f’。\n"
+"\n"
+"当您对结果满意后，您可能会想要删除由此脚本产生的-article.bak文件。\n"
+"\n"
+"此脚本仅是用来提升性能的。并不是必需使用的。\n"
+
+#: bin/remove_members:20
+#, docstring
+msgid ""
+"Remove members from a list.\n"
+"\n"
+"Usage:\n"
+"    remove_members [options] [listname] [addr1 ...]\n"
+"\n"
+"Options:\n"
+"\n"
+"    --file=file\n"
+"    -f file\n"
+"        Remove member addresses found in the given file.  If file is\n"
+"        `-', read stdin.\n"
+"\n"
+"    --all\n"
+"    -a\n"
+"        Remove all members of the mailing list.\n"
+"        (mutually exclusive with --fromall)\n"
+"\n"
+"    --fromall\n"
+"        Removes the given addresses from all the lists on this system\n"
+"        regardless of virtual domains if you have any.  This option cannot "
+"be\n"
+"        used -a/--all.  Also, you should not specify a listname when using\n"
+"        this option.\n"
+"\n"
+"    --nouserack\n"
+"    -n\n"
+"        Don't send the user acknowledgements.  If not specified, the list\n"
+"        default value is used.\n"
+"\n"
+"    --noadminack\n"
+"    -N\n"
+"        Don't send the admin acknowledgements.  If not specified, the list\n"
+"        default value is used.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+"    listname is the name of the mailing list to use.\n"
+"\n"
+"    addr1 ... are additional addresses to remove.\n"
+msgstr ""
+
+#: bin/remove_members:156
+msgid "Could not open file for reading: %(filename)s."
+msgstr "不能读取文件: %(filename)s。"
+
+#: bin/remove_members:163
+msgid "Error opening list %(listname)s... skipping."
+msgstr "打开列表 %(listname)s 时出错... 正在跳过。"
+
+#: bin/remove_members:173
+msgid "No such member: %(addr)s"
+msgstr "没有这个成员: %(addr)s"
+
+#: bin/remove_members:178
+msgid "User `%(addr)s' removed from list: %(listname)s."
+msgstr "用户 %(addr)s 已从列表: %(listname)s中删除。"
+
+#: bin/reset_pw.py:21
+#, docstring
+msgid ""
+"Reset the passwords for members of a mailing list.\n"
+"\n"
+"This script resets all the passwords of a mailing list's members.  It can "
+"also\n"
+"be used to reset the lists of all members of all mailing lists, but it is "
+"your\n"
+"responsibility to let the users know that their passwords have been "
+"changed.\n"
+"\n"
+"This script is intended to be run as a bin/withlist script, i.e.\n"
+"\n"
+"% bin/withlist -l -r reset_pw listname [options]\n"
+"\n"
+"Options:\n"
+"    -v / --verbose\n"
+"        Print what the script is doing.\n"
+msgstr ""
+"为邮件列表成员重设密码。\n"
+"\n"
+"此脚本为一个邮件列表的所有成员重设密码。它也能为所有邮件列表的所有成员重设密码，\n"
+"但是您有必要让所有得用户知道他们的密码被改变了。\n"
+"\n"
+"该脚本必须作为bin/withlist脚本来运行，即\n"
+"\n"
+"% bin/withlist -l -r reset_pw listname [options]\n"
+"\n"
+"选项:\n"
+"    -v / --verbose\n"
+"        输出脚本正在干什么\n"
+
+#: bin/reset_pw.py:77
+msgid "Changing passwords for list: %(listname)s"
+msgstr "为列表 %(listname)s改变密码"
+
+#: bin/reset_pw.py:83
+msgid "New password for member %(member)40s: %(randompw)s"
+msgstr "成员 %(member)40s的新密码： %(randompw)s"
+
+#: bin/rmlist:19
+#, docstring
+msgid ""
+"Remove the components of a mailing list with impunity - beware!\n"
+"\n"
+"This removes (almost) all traces of a mailing list.  By default, the lists\n"
+"archives are not removed, which is very handy for retiring old lists.\n"
+"\n"
+"Usage:\n"
+"    rmlist [-a] [-h] listname\n"
+"\n"
+"Where:\n"
+"    --archives\n"
+"    -a\n"
+"        Remove the list's archives too, or if the list has already been\n"
+"        deleted, remove any residual archives.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this help message and exit.\n"
+"\n"
+msgstr ""
+"安全的删除邮件列表的所有组件!\n"
+"\n"
+"能删除邮件列表的（几乎）所有的痕迹。默认情况下，对不用的旧列表很有用的列表存档不会被删除。\n"
+"\n"
+"用法:\n"
+"    rmlist [-a] [-h] listname\n"
+"\n"
+"其中:\n"
+"    --archives\n"
+"    -a\n"
+"        将列表存档也删除，如果列表已经被删除，则删除所有残留的存档。\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        输出该帮助信息然后退出。\n"
+"\n"
+
+#: bin/rmlist:73 bin/rmlist:76
+msgid "Removing %(msg)s"
+msgstr "正在删除 %(msg)s"
+
+#: bin/rmlist:81
+msgid "%(listname)s %(msg)s not found as %(filename)s"
+msgstr "没有找到叫 %(filename)s的 %(listname)s %(msg)s"
+
+#: bin/rmlist:105
+msgid "No such list (or list already deleted): %(listname)s"
+msgstr "没有这个列表(或者列表已经被删除了): %(listname)s"
+
+#: bin/rmlist:108
+msgid "No such list: %(listname)s.  Removing its residual archives."
+msgstr "没有这个列表: %(listname)s。正在删除它的残留的文件。"
+
+#: bin/rmlist:112
+msgid "Not removing archives.  Reinvoke with -a to remove them."
+msgstr "没有删除文件。带上 -a再调用一遍命令来删除它们。"
+
+#: bin/rmlist:126
+msgid "list info"
+msgstr "列表信息"
+
+#: bin/rmlist:134
+msgid "stale lock file"
+msgstr "失效的被锁文件"
+
+#: bin/rmlist:142
+msgid "held message file"
+msgstr ""
+
+#: bin/rmlist:147 bin/rmlist:149
+msgid "private archives"
+msgstr "私人邮件存档"
+
+#: bin/rmlist:151 bin/rmlist:153
+msgid "public archives"
+msgstr "公有邮件存档"
+
+#: bin/show_qfiles:20
+#, docstring
+msgid ""
+"Show the contents of one or more Mailman queue files.\n"
+"\n"
+"Usage: show_qfiles [options] qfile ...\n"
+"\n"
+"Options:\n"
+"\n"
+"    -q / --quiet\n"
+"        Don't print `helpful' message delimiters.\n"
+"\n"
+"    -h / --help\n"
+"        Print this text and exit.\n"
+"\n"
+"Example: show_qfiles qfiles/shunt/*.pck\n"
+msgstr ""
+"显示一个或多个Mailman队列文件的内容.\n"
+"\n"
+"用法: show_qfiles [options] qfile ...\n"
+"\n"
+"    -q / --quiet\n"
+"        不打印`有用的'消息分界符.\n"
+"\n"
+"    -h / --help\n"
+"        打印这份文本并退出.\n"
+"\n"
+"示例: show_qfiles qfiles/shunt/*.pck\n"
+
+#: bin/sync_members:19
+#, docstring
+msgid ""
+"Synchronize a mailing list's membership with a flat file.\n"
+"\n"
+"This script is useful if you have a Mailman mailing list and a sendmail\n"
+":include: style list of addresses (also as is used in Majordomo).  For "
+"every\n"
+"address in the file that does not appear in the mailing list, the address "
+"is\n"
+"added.  For every address in the mailing list that does not appear in the\n"
+"file, the address is removed.  Other options control what happens when an\n"
+"address is added or removed.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] -f file listname\n"
+"\n"
+"Where `options' are:\n"
+"\n"
+"    --no-change\n"
+"    -n\n"
+"        Don't actually make the changes.  Instead, print out what would be\n"
+"        done to the list.\n"
+"\n"
+"    --welcome-msg[=<yes|no>]\n"
+"    -w[=<yes|no>]\n"
+"        Sets whether or not to send the newly added members a welcome\n"
+"        message, overriding whatever the list's `send_welcome_msg' setting\n"
+"        is.  With -w=yes or -w, the welcome message is sent.  With -w=no, "
+"no\n"
+"        message is sent.\n"
+"\n"
+"    --goodbye-msg[=<yes|no>]\n"
+"    -g[=<yes|no>]\n"
+"        Sets whether or not to send the goodbye message to removed members,\n"
+"        overriding whatever the list's `send_goodbye_msg' setting is.  With\n"
+"        -g=yes or -g, the goodbye message is sent.  With -g=no, no message "
+"is\n"
+"        sent.\n"
+"\n"
+"    --digest[=<yes|no>]\n"
+"    -d[=<yes|no>]\n"
+"        Selects whether to make newly added members receive messages in\n"
+"        digests.  With -d=yes or -d, they become digest members.  With -"
+"d=no\n"
+"        (or if no -d option given) they are added as regular members.\n"
+"\n"
+"    --notifyadmin[=<yes|no>]\n"
+"    -a[=<yes|no>]\n"
+"        Specifies whether the admin should be notified for each "
+"subscription\n"
+"        or unsubscription.  If you're adding a lot of addresses, you\n"
+"        definitely want to turn this off!  With -a=yes or -a, the admin is\n"
+"        notified.  With -a=no, the admin is not notified.  With no -a "
+"option,\n"
+"        the default for the list is used.\n"
+"\n"
+"    --file <filename | ->\n"
+"    -f <filename | ->\n"
+"        This option is required.  It specifies the flat file to synchronize\n"
+"        against.  Email addresses must appear one per line.  If filename is\n"
+"        `-' then stdin is used.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this message.\n"
+"\n"
+"    listname\n"
+"        Required.  This specifies the list to synchronize.\n"
+msgstr ""
+"使用一个普通的文件来同步一个邮件列表的全体成员.\n"
+"\n"
+"这个脚本将很有用,如果您有一份Mailman邮件列表和一份sendmail\n"
+":include:式样的地址列表(Majordomo也如此使用). 对于每一个\n"
+"没有出现在邮件列表里却包含在文件里的地址,它们将被添加.\n"
+"对于每一个没有出现在文件里的邮件列表内地址,它们将被\n"
+"删除.其他的选项用来控制当一个地址被添加或删除时将会\n"
+"发生什么.\n"
+"\n"
+"用法: %(PROGRAM)s [options] -f file listname\n"
+"\n"
+"这里 `options' 有:\n"
+"\n"
+"    --no-change\n"
+"    -n\n"
+"        不真正作成改变.  相应的,显示\n"
+"        列表将有何改变.\n"
+"\n"
+"    --welcome-msg[=<yes|no>]\n"
+"    -w[=<yes|no>]\n"
+"        设置是否向新加入成员发送欢迎信息,\n"
+"        而不论列表的 `send_welcome_msg' 设置究竟是什么.\n"
+"        使用 -w=yes 或 -w, 欢迎信息将被发送.  使用 -w=no, \n"
+"        将不会发送欢迎信息.\n"
+"\n"
+"    --goodbye-msg[=<yes|no>]\n"
+"    -g[=<yes|no>]\n"
+"        设置是否向移除成员发送告别信息,\n"
+"        不论列表的`send_goodbye_msg' 的设置.\n"
+"        使用-g=yes 或 -g, 告别信息将被发送.  使用 -g=no, \n"
+"        将不会发送告别信息.\n"
+"\n"
+"    --digest[=<yes|no>]\n"
+"    -d[=<yes|no>]\n"
+"        选择是否使新加入的成员接收文摘中的信息.\n"
+"        使用 -d=yes 或 -d, 他们将成为文摘成员. 使用 -d=no\n"
+"        (或者没有给出 -d ) 他们将被添加为普通成员.\n"
+"\n"
+"    --notifyadmin[=<yes|no>]\n"
+"    -a[=<yes|no>]\n"
+"        指定在每一次订阅或退订时,管理员是否被通知.\n"
+"        如果您加入大量的地址, 您绝对会将这个选项关闭!\n"
+"        使用 -a=yes 或 -a, 管理员将被通知.\n"
+"        使用 -a=no, 管理员不会被通知.  不给出 -a 选项,\n"
+"        将使用列表的默认选项.\n"
+"\n"
+"    --file <filename | ->\n"
+"    -f <filename | ->\n"
+"        这个选项是必需的.  它指定了用来同步的文件.\n"
+"        Email地址必须每行一个.  如果文件名是\n"
+"        `-' 那么将使用标准输入.\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        显示这段信息.\n"
+"\n"
+"    listname\n"
+"        必需.指定了同步的列表.\n"
+
+#: bin/sync_members:115
+msgid "Bad choice: %(yesno)s"
+msgstr "错误的选择: %(yesno)s"
+
+#: bin/sync_members:138
+msgid "Dry run mode"
+msgstr "演示模式"
+
+#: bin/sync_members:159
+msgid "Only one -f switch allowed"
+msgstr "只允许一个-f开关"
+
+#: bin/sync_members:163
+msgid "No argument to -f given"
+msgstr "没有给出-f的参数"
+
+#: bin/sync_members:172
+msgid "Illegal option: %(opt)s"
+msgstr "无效的选项: %(opt)s"
+
+#: bin/sync_members:178
+msgid "No listname given"
+msgstr "没给出列表名"
+
+#: bin/sync_members:182
+msgid "Must have a listname and a filename"
+msgstr "必须有一个列表名和文件名"
+
+#: bin/sync_members:191
+msgid "Cannot read address file: %(filename)s: %(msg)s"
+msgstr "无法读出地址文件: %(filename)s: %(msg)s"
+
+#: bin/sync_members:203
+msgid "Ignore  :  %(addr)30s"
+msgstr "忽略  :  %(addr)30s"
+
+#: bin/sync_members:212
+msgid "Invalid :  %(addr)30s"
+msgstr "无效的:  %(addr)30s"
+
+#: bin/sync_members:215
+msgid "You must fix the preceding invalid addresses first."
+msgstr "您必须先修正上述的无效地址."
+
+#: bin/sync_members:264
+msgid "Added  : %(s)s"
+msgstr "加入  : %(s)s"
+
+#: bin/sync_members:289
+msgid "Removed: %(s)s"
+msgstr "移除  : %(s)s"
+
+#: bin/transcheck:19
+#, docstring
+msgid ""
+"\n"
+"Check a given Mailman translation, making sure that variables and\n"
+"tags referenced in translation are the same variables and tags in\n"
+"the original templates and catalog.\n"
+"\n"
+"Usage:\n"
+"\n"
+"cd $MAILMAN_DIR\n"
+"%(program)s [-q] <lang>\n"
+"\n"
+"Where <lang> is your country code (e.g. 'it' for Italy) and -q is\n"
+"to ask for a brief summary.\n"
+msgstr ""
+"\n"
+"检查给定的Mailman翻译, 确定翻译中涉及到的变量与\n"
+"和原始模板与目录中的相同.\n"
+"\n"
+"用法:\n"
+"\n"
+"cd $MAILMAN_DIR\n"
+"%(program)s [-q] <lang>\n"
+"\n"
+"这里 <lang> 是您的国家代码 (例如 'it' 是意大利) , -q 用来\n"
+"请求简明的摘要.\n"
+
+#: bin/transcheck:58
+#, docstring
+msgid "check a translation comparing with the original string"
+msgstr "和原始字符串比较,检查翻译"
+
+#: bin/transcheck:68
+#, docstring
+msgid "scan a string from the original file"
+msgstr "从原始文件扫描一串字符串"
+
+#: bin/transcheck:78
+#, docstring
+msgid "scan a translated string"
+msgstr "扫描翻译后的字符串"
+
+#: bin/transcheck:91
+#, docstring
+msgid "check for differences between checked in and checked out"
+msgstr "检查读入和输出的不同"
+
+#: bin/transcheck:124
+#, docstring
+msgid "parse a .po file extracting msgids and msgstrs"
+msgstr "解析一个 .po文件, 读出消息标识和消息串"
+
+#: bin/transcheck:143
+#, docstring
+msgid ""
+"States table for the finite-states-machine parser:\n"
+"            0  idle\n"
+"            1  filename-or-comment\n"
+"            2  msgid\n"
+"            3  msgstr\n"
+"            4  end\n"
+"        "
+msgstr ""
+"有限状态机解析器的状态表:\n"
+"            0  空闲\n"
+"            1  文件名或注释\n"
+"            2  消息标识\n"
+"            3  消息串\n"
+"            4  结束\n"
+"        "
+
+#: bin/transcheck:280
+#, docstring
+msgid ""
+"check a translated template against the original one\n"
+"       search also <MM-*> tags if html is not zero"
+msgstr ""
+"对比原始模板检查翻译后的模板\n"
+"       如果html长不为零,则搜索<MM-*>标签"
+
+#: bin/transcheck:327
+#, docstring
+msgid "scan the po file comparing msgids with msgstrs"
+msgstr "对比消息标识和消息串扫描po文件"
+
+#: bin/unshunt:20
+#, docstring
+msgid ""
+"Move a message from the shunt queue to the original queue.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [directory]\n"
+"\n"
+"Where:\n"
+"\n"
+"    -h / --help\n"
+"        Print help and exit.\n"
+"\n"
+"Optional `directory' specifies a directory to dequeue from other than\n"
+"qfiles/shunt.  *** Warning ***  Do not unshunt messages that weren't\n"
+"shunted to begin with.  For example, running unshunt on qfiles/out/\n"
+"will result in losing all the messages in that queue.\n"
+msgstr ""
+
+#: bin/unshunt:85
+msgid ""
+"Cannot unshunt message %(filebase)s, skipping:\n"
+"%(e)s"
+msgstr ""
+"不能恢复消息 %(filebase)s, 忽略:\n"
+"%(e)s"
+
+#: bin/update:20
+#, docstring
+msgid ""
+"Perform all necessary upgrades.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"    -f/--force\n"
+"        Force running the upgrade procedures.  Normally, if the version "
+"number\n"
+"        of the installed Mailman matches the current version number (or a\n"
+"        `downgrade' is detected), nothing will be done.\n"
+"\n"
+"    -h/--help\n"
+"        Print this text and exit.\n"
+"\n"
+"Use this script to help you update to the latest release of Mailman from\n"
+"some previous version.  It knows about versions back to 1.0b4 (?).\n"
+msgstr ""
+"执行所有需要的升级.\n"
+"\n"
+"用法: %(PROGRAM)s [options]\n"
+"\n"
+"选项:\n"
+"    -f/--force\n"
+"        强迫运行升级过程.  正常情况下,如果\n"
+"        已安装的版本号与正安装的版本号相同 (或者\n"
+"        一次`降级'安装被发现), 什么安装也不会执行.\n"
+"\n"
+"    -h/--help\n"
+"        显示这段文本并退出.\n"
+"\n"
+"使用这段脚本从之前的某个版本升级到最新的发行版.\n"
+"它可以识别到1.0b4 (?)版本.\n"
+
+#: bin/update:107
+msgid "Fixing language templates: %(listname)s"
+msgstr "修正语言模板: %(listname)s"
+
+#: bin/update:196 bin/update:711
+msgid "WARNING: could not acquire lock for list: %(listname)s"
+msgstr "警告: 不能获得列表 %(listname)s 的锁"
+
+#: bin/update:215
+msgid "Resetting %(n)s BYBOUNCEs disabled addrs with no bounce info"
+msgstr "重设 %(n)s BYBOUNCEs 使没有退订信息的地址失效"
+
+#: bin/update:221
+msgid "Updating the held requests database."
+msgstr "升级持有请求的数据库"
+
+#: bin/update:243
+msgid ""
+"For some reason, %(mbox_dir)s exists as a file.  This won't work with\n"
+"b6, so I'm renaming it to %(mbox_dir)s.tmp and proceeding."
+msgstr ""
+"因为某些原因, %(mbox_dir)s 作为一个文件存在.  它不能和\n"
+"b6一同工作, 所以我将它更名为%(mbox_dir)s.tmp 并继续."
+
+#: bin/update:255
+msgid ""
+"\n"
+"%(listname)s has both public and private mbox archives.  Since this list\n"
+"currently uses private archiving, I'm installing the private mbox archive\n"
+"-- %(o_pri_mbox_file)s -- as the active archive, and renaming\n"
+"        %(o_pub_mbox_file)s\n"
+"to\n"
+"        %(o_pub_mbox_file)s.preb6\n"
+"\n"
+"You can integrate that into the archives if you want by using the 'arch'\n"
+"script.\n"
+msgstr ""
+"\n"
+"%(listname)s 既有公有邮箱存档又有私有邮箱存档.  因为这个列表\n"
+"正在使用私有存档, 我将安装私有邮箱存档\n"
+"-- %(o_pri_mbox_file)s -- 为活动存档, 并将\n"
+"        %(o_pub_mbox_file)s\n"
+"更名为\n"
+"        %(o_pub_mbox_file)s.preb6\n"
+"\n"
+"如果您想将它们合并,您可以使用'arch'\n"
+"脚本.\n"
+
+#: bin/update:270
+msgid ""
+"%s has both public and private mbox archives.  Since this list\n"
+"currently uses public archiving, I'm installing the public mbox file\n"
+"archive file (%s) as the active one, and renaming\n"
+"        %s\n"
+"    to\n"
+"        %s.preb6\n"
+"\n"
+"You can integrate that into the archives if you want by using the 'arch'\n"
+"script.\n"
+msgstr ""
+"%s 既有公有邮箱存档又有私有邮箱存档.  因为这个列表\n"
+"正在使用公有存档, 我将安装公有邮箱存档\n"
+"存档文件 (%s) 为活动者, 并将\n"
+"        %s\n"
+"    更名为\n"
+"        %s.preb6\n"
+"\n"
+"如果您想将它们合并,您可以使用'arch'\n"
+"脚本.\n"
+
+#: bin/update:287
+msgid "- updating old private mbox file"
+msgstr "- 正在升级旧的私有邮箱文件"
+
+#: bin/update:295
+msgid ""
+"    unknown file in the way, moving\n"
+"        %(o_pri_mbox_file)s\n"
+"    to\n"
+"        %(newname)s"
+msgstr ""
+"    不明的文件,移动\n"
+"        %(o_pri_mbox_file)s\n"
+"    至\n"
+"        %(newname)s"
+
+#: bin/update:309
+msgid "- updating old public mbox file"
+msgstr "- 正在升级旧有公有邮箱文件"
+
+#: bin/update:317
+msgid ""
+"    unknown file in the way, moving\n"
+"        %(o_pub_mbox_file)s\n"
+"    to\n"
+"        %(newname)s"
+msgstr ""
+"    未知文件,移动\n"
+"        %(o_pub_mbox_file)s\n"
+"    至\n"
+"        %(newname)s"
+
+#: bin/update:353
+msgid "- This list looks like it might have <= b4 list templates around"
+msgstr "- 看来可能有<=b4列表模板"
+
+#: bin/update:361
+msgid "- moved %(o_tmpl)s to %(n_tmpl)s"
+msgstr "- 移动 %(o_tmpl)s 至 %(n_tmpl)s"
+
+#: bin/update:363
+msgid "- both %(o_tmpl)s and %(n_tmpl)s exist, leaving untouched"
+msgstr "- %(o_tmpl)s 和 %(n_tmpl)s 均存在, 将不做任何修改"
+
+#: bin/update:366
+msgid "- %(o_tmpl)s doesn't exist, leaving untouched"
+msgstr "- %(o_tmpl)s 不存在, 不做修改"
+
+#: bin/update:396
+msgid "removing directory %(src)s and everything underneath"
+msgstr "删除目录%(src)s 及其目录内所有文件"
+
+#: bin/update:399
+msgid "removing %(src)s"
+msgstr "删除%(src)s"
+
+#: bin/update:403
+msgid "Warning: couldn't remove %(src)s -- %(rest)s"
+msgstr "警告: 无法删除 %(src)s -- %(rest)s"
+
+#: bin/update:408
+msgid "couldn't remove old file %(pyc)s -- %(rest)s"
+msgstr "无法删除旧文件 %(pyc)s -- %(rest)s"
+
+#: bin/update:412
+msgid "updating old qfiles"
+msgstr "升级旧的qfiles"
+
+#: bin/update:455
+msgid "Warning!  Not a directory: %(dirpath)s"
+msgstr ""
+
+#: bin/update:530
+msgid "message is unparsable: %(filebase)s"
+msgstr "消息无法解析: %(filebase)s"
+
+#: bin/update:544
+msgid "Warning!  Deleting empty .pck file: %(pckfile)s"
+msgstr ""
+
+#: bin/update:563
+msgid "Updating Mailman 2.0 pending_subscriptions.db database"
+msgstr "正在升级 Mailman 2.0 pending_subscriptions.db 数据库"
+
+#: bin/update:574
+msgid "Updating Mailman 2.1.4 pending.pck database"
+msgstr "正在升级 Mailman 2.1.4 pending.pck 数据库"
+
+#: bin/update:598
+msgid "Ignoring bad pended data: %(key)s: %(val)s"
+msgstr "忽略错误的未处理数据: %(key)s: %(val)s"
+
+#: bin/update:614
+msgid "WARNING: Ignoring duplicate pending ID: %(id)s."
+msgstr "警告: 忽略多重的未处理ID: %(id)s"
+
+#: bin/update:667
+msgid "getting rid of old source files"
+msgstr "去除旧的源文件"
+
+#: bin/update:677
+msgid "no lists == nothing to do, exiting"
+msgstr "没有列表文件 == 无事可做, 退出"
+
+#: bin/update:684
+msgid ""
+"fixing all the perms on your old html archives to work with b6\n"
+"If your archives are big, this could take a minute or two..."
+msgstr ""
+"正在修复您旧的html存档上所有的错误来使b6工作\n"
+"如果您的存档很大, 可能需要花费一两分钟时间..."
+
+#: bin/update:689
+msgid "done"
+msgstr "完成"
+
+#: bin/update:691
+msgid "Updating mailing list: %(listname)s"
+msgstr "正在升级邮件列表: %(listname)s"
+
+#: bin/update:694
+msgid "Updating Usenet watermarks"
+msgstr "正在升级新闻组水印"
+
+#: bin/update:699
+msgid "- nothing to update here"
+msgstr "- 没有需要升级的"
+
+#: bin/update:722
+msgid "- usenet watermarks updated and gate_watermarks removed"
+msgstr "- 新闻组水印升级,gate_watermarks 移除"
+
+#: bin/update:736
+msgid ""
+"\n"
+"\n"
+"NOTE NOTE NOTE NOTE NOTE\n"
+"\n"
+"    You are upgrading an existing Mailman installation, but I can't tell "
+"what\n"
+"    version you were previously running.\n"
+"\n"
+"    If you are upgrading from Mailman 1.0b9 or earlier you will need to\n"
+"    manually update your mailing lists.  For each mailing list you need to\n"
+"    copy the file templates/options.html lists/<listname>/options.html.\n"
+"\n"
+"    However, if you have edited this file via the Web interface, you will "
+"have\n"
+"    to merge your changes into this file, otherwise you will lose your\n"
+"    changes.\n"
+"\n"
+"NOTE NOTE NOTE NOTE NOTE\n"
+"\n"
+msgstr ""
+"\n"
+"\n"
+"注意 注意 注意 注意 注意\n"
+"\n"
+"    您正在升级一项已存在的Mailman安装, 但我无法得知\n"
+"    您之前运行的是什么版本.\n"
+"\n"
+"    如果您从 Mailman 1.0b9 或更早版本升级, 您需要\n"
+"    手动升级您的邮件列表.  对于每一张邮件列表,您需要\n"
+"    复制文件 templates/options.html lists/<listname>/options.html.\n"
+"\n"
+"    不管怎样, 如果您经由 Web 接口编辑了这个文件, 您必须\n"
+"    将您的修改加入这个文件, 否则您将失去您的\n"
+"    修改.\n"
+"\n"
+"注意 注意 注意 注意 注意\n"
+"\n"
+
+#: bin/update:793
+msgid "No updates are necessary."
+msgstr "不需要升级"
+
+#: bin/update:796
+msgid ""
+"Downgrade detected, from version %(hexlversion)s to version %(hextversion)s\n"
+"This is probably not safe.\n"
+"Exiting."
+msgstr ""
+"发现降级安装, 从版本 %(hexlversion)s 到版本 %(hextversion)s\n"
+"这很可能不安全.\n"
+"正在退出."
+
+#: bin/update:801
+msgid "Upgrading from version %(hexlversion)s to %(hextversion)s"
+msgstr "正在升级,从版本%(hexlversion)s 到 %(hextversion)s"
+
+#: bin/update:810
+msgid ""
+"\n"
+"ERROR:\n"
+"\n"
+"The locks for some lists could not be acquired.  This means that either\n"
+"Mailman was still active when you upgraded, or there were stale locks in "
+"the\n"
+"%(lockdir)s directory.\n"
+"\n"
+"You must put Mailman into a quiescent state and remove all stale locks, "
+"then\n"
+"re-run \"make update\" manually.  See the INSTALL and UPGRADE files for "
+"details.\n"
+msgstr ""
+"\n"
+"错误:\n"
+"\n"
+"某些列表的锁无法获得.  这意味着\n"
+"当您升级时, Mailman仍然运行, 或者有无效的锁定在\n"
+"%(lockdir)s 目录内.\n"
+"\n"
+"您必须将Mailman 停止并移除所有失效的锁, \n"
+"然后手动重新运行 \"make update\" .  参见 INSTALL 和 UPGRADE 文件来获得更多信息.\n"
+
+#: bin/version:19
+#, docstring
+msgid "Print the Mailman version.\n"
+msgstr "显示Mailman版本.\n"
+
+#: bin/version:26
+msgid "Using Mailman version:"
+msgstr "正在使用的Mailman版本:"
+
+#: bin/withlist:20
+#, docstring
+msgid ""
+"General framework for interacting with a mailing list object.\n"
+"\n"
+"There are two ways to use this script: interactively or programmatically.\n"
+"Using it interactively allows you to play with, examine and modify a "
+"MailList\n"
+"object from Python's interactive interpreter.  When running interactively, "
+"a\n"
+"MailList object called `m' will be available in the global namespace.  It "
+"also\n"
+"loads the class MailList into the global namespace.\n"
+"\n"
+"Programmatically, you can write a function to operate on a MailList object,\n"
+"and this script will take care of the housekeeping (see below for "
+"examples).\n"
+"In that case, the general usage syntax is:\n"
+"\n"
+"%% bin/withlist [options] listname [args ...]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -l / --lock\n"
+"        Lock the list when opening.  Normally the list is opened unlocked\n"
+"        (e.g. for read-only operations).  You can always lock the file "
+"after\n"
+"        the fact by typing `m.Lock()'\n"
+"\n"
+"        Note that if you use this option, you should explicitly call "
+"m.Save()\n"
+"        before exiting, since the interpreter's clean up procedure will not\n"
+"        automatically save changes to the MailList object (but it will "
+"unlock\n"
+"        the list).\n"
+"\n"
+"    -i / --interactive\n"
+"        Leaves you at an interactive prompt after all other processing is\n"
+"        complete.  This is the default unless the -r option is given.\n"
+"\n"
+"    --run [module.]callable\n"
+"    -r [module.]callable\n"
+"        This can be used to run a script with the opened MailList object.\n"
+"        This works by attempting to import `module' (which must be in the\n"
+"        directory containing withlist, or already be accessible on your\n"
+"        sys.path), and then calling `callable' from the module.  callable "
+"can\n"
+"        be a class or function; it is called with the MailList object as "
+"the\n"
+"        first argument.  If additional args are given on the command line,\n"
+"        they are passed as subsequent positional args to the callable.\n"
+"\n"
+"        Note that `module.' is optional; if it is omitted then a module "
+"with\n"
+"        the name `callable' will be imported.\n"
+"\n"
+"        The global variable `r' will be set to the results of this call.\n"
+"\n"
+"    --all / -a\n"
+"        This option only works with the -r option.  Use this if you want to\n"
+"        execute the script on all mailing lists.  When you use -a you "
+"should\n"
+"        not include a listname argument on the command line.  The variable "
+"`r'\n"
+"        will be a list of all the results.\n"
+"\n"
+"    --quiet / -q\n"
+"        Suppress all status messages.\n"
+"\n"
+"    --help / -h\n"
+"        Print this message and exit\n"
+"\n"
+"\n"
+"Here's an example of how to use the -r option.  Say you have a file in the\n"
+"Mailman installation directory called `listaddr.py', with the following\n"
+"two functions:\n"
+"\n"
+"def listaddr(mlist):\n"
+"    print mlist.GetListEmail()\n"
+"\n"
+"def requestaddr(mlist):\n"
+"    print mlist.GetRequestEmail()\n"
+"\n"
+"Now, from the command line you can print the list's posting address by "
+"running\n"
+"the following from the command line:\n"
+"\n"
+"%% bin/withlist -r listaddr mylist\n"
+"Loading list: mylist (unlocked)\n"
+"Importing listaddr ...\n"
+"Running listaddr.listaddr() ...\n"
+"mylist@myhost.com\n"
+"\n"
+"And you can print the list's request address by running:\n"
+"\n"
+"%% bin/withlist -r listaddr.requestaddr mylist\n"
+"Loading list: mylist (unlocked)\n"
+"Importing listaddr ...\n"
+"Running listaddr.requestaddr() ...\n"
+"mylist-request@myhost.com\n"
+"\n"
+"As another example, say you wanted to change the password for a particular\n"
+"user on a particular list.  You could put the following function in a file\n"
+"called `changepw.py':\n"
+"\n"
+"from Mailman.Errors import NotAMemberError\n"
+"\n"
+"def changepw(mlist, addr, newpasswd):\n"
+"    try:\n"
+"        mlist.setMemberPassword(addr, newpasswd)\n"
+"        mlist.Save()\n"
+"    except NotAMemberError:\n"
+"        print 'No address matched:', addr\n"
+"\n"
+"and run this from the command line:\n"
+" %% bin/withlist -l -r changepw mylist somebody@somewhere.org foobar\n"
+msgstr ""
+"与mailing list对象交互的通用框架。\n"
+"\n"
+"可以用两种方式使用此脚本：交互式或者程序式。\n"
+"交互式的使用允许您在Python交互式解释器中调整、检查和修改一个MailList\n"
+"对象。此时，在全局命名空间中会有一个名为'm'的MailList对象可用，同时\n"
+"也会把类MailList加载入全局命名空间。\n"
+"\n"
+"程序式的使用，您可以写一个函数来操纵MailList对象，而此脚本会负责所有\n"
+"的内务处理(请查看下面的例子)。如果是那样的话，一般的使用语法是：\n"
+"\n"
+"%% bin/withlist [options] listname [args ...]\n"
+"\n"
+"选项：\n"
+"\n"
+"    -l / --lock\n"
+"        打开列表列表时将其加锁。一般来说打开列表是不加锁的(例如为只读操作而打\n"
+"        开)。您总是可以通过输入'm.Lock()‘来给文件加锁。\n"
+"\n"
+"        注意，如果是用了此选项，您需要在退出前显式地调用m.Save()，因为解释器\n"
+"        的清理过程不会自动保存对MailList对象所作的修改(但是会给列表解锁)。\n"
+"\n"
+"    -i / --interactive\n"
+"        在所有其他处理过程结束后给您提供一个交互式的提示。这是默认行为，除非\n"
+"        提供了 -r 选项。\n"
+"\n"
+"    --run [module.]callable\n"
+"    -r [module.]callable\n"
+"       用于在一个打开的MailList对象上运行一个脚本，这是通过试图导入\n"
+"       'module'(它必须在保存列表的目录下，或者可以通过您的sys.path来访问),\n"
+"       然后从模块中调用'callable'来实现的。callable可以是一个类或者一个函\n"
+"       数；它被作为MailList对象的第一个参数来调用。如果在命令行上给出了其\n"
+"       的参数，他们会被作为后续的位置参数而传递给callable。\n"
+"\n"
+"       注意，'module.'是可选的；如果被省略的话，一个名为'callable'的模块将\n"
+"       被导入。\n"
+"\n"
+"       全局变量'r'将被设置为此调用的返回值。\n"
+"\n"
+"    --all / -a\n"
+"        此选项仅与 -r 选项一起工作。在您想要在所有的邮件列表上运行脚本时使用\n"
+"        此选项。在使用 -a 时，不能在命令行上包含列表名参数。变量'r'将是包含所\n"
+"        有返回值的列表。\n"
+"\n"
+"    --quiet / -q\n"
+"        去除所有的状态消息。\n"
+"\n"
+"    --help / -h\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"\n"
+"下面是一个如何使用 -r 选项的例子。假设您在Mailman的安装目录下有一个叫做\n"
+"'listaddr.py'的文件，其中有下面的两个函数：\n"
+"\n"
+"def listaddr(mlist):\n"
+"    print mlist.GetListEmail()\n"
+"\n"
+"def requestaddr(mlist):\n"
+"    print mlist.GetRequestEmail()\n"
+"\n"
+"现在，您可以通过在命令行上运行下面的命令来打印出列表的post地址：\n"
+"\n"
+"%% bin/withlist -r listaddr mylist\n"
+"Loading list: mylist (unlocked)\n"
+"Importing listaddr ...\n"
+"Running listaddr.listaddr() ...\n"
+"mylist@myhost.com\n"
+"\n"
+"您可以通过运行：\n"
+"\n"
+"%% bin/withlist -r listaddr.requestaddr mylist\n"
+"Loading list: mylist (unlocked)\n"
+"Importing listaddr ...\n"
+"Running listaddr.requestaddr() ...\n"
+"mylist-request@myhost.com\n"
+"\n"
+"来打印出列表的request地址。\n"
+"另外一个例子，假设您希望改变一指定列表中特定用户的口令，您可以把下面的函数\n"
+"放到一个名为'changepw.py'的文件中：\n"
+"\n"
+"from Mailman.Errors import NotAMemberError\n"
+"\n"
+"def changepw(mlist, addr, newpasswd):\n"
+"    try:\n"
+"        mlist.setMemberPassword(addr, newpasswd)\n"
+"        mlist.Save()\n"
+"    except NotAMemberError:\n"
+"        print 'No address matched:', addr\n"
+"\n"
+"从命令行中运行：\n"
+" %% bin/withlist -l -r changepw mylist somebody@somewhere.org foobar\n"
+
+#: bin/withlist:164
+#, docstring
+msgid ""
+"Unlock a locked list, but do not implicitly Save() it.\n"
+"\n"
+"    This does not get run if the interpreter exits because of a signal, or "
+"if\n"
+"    os._exit() is called.  It will get called if an exception occurs "
+"though.\n"
+"    "
+msgstr ""
+"解锁一个被锁住的列表，但是并不对其执行Save()。\n"
+"\n"
+"    如果解释器因为接收到一个信号而退出，或者os._exit()被调用，这将不会被执行。\n"
+"    但是当发生异常时，将会被调用。\n"
+"    "
+
+#: bin/withlist:175
+msgid "Unlocking (but not saving) list: %(listname)s"
+msgstr "解锁(但不保存)列表： %(listname)s"
+
+#: bin/withlist:179
+msgid "Finalizing"
+msgstr "完成"
+
+#: bin/withlist:188
+msgid "Loading list %(listname)s"
+msgstr "加载列表 %(listname)s"
+
+#: bin/withlist:190
+msgid "(locked)"
+msgstr "(已加锁)"
+
+#: bin/withlist:192
+msgid "(unlocked)"
+msgstr "(已解锁)"
+
+#: bin/withlist:197
+msgid "Unknown list: %(listname)s"
+msgstr "未知的列表： %(listname)s"
+
+#: bin/withlist:237
+msgid "No list name supplied."
+msgstr "没有给出列表的名字"
+
+#: bin/withlist:246
+msgid "--all requires --run"
+msgstr "--all需要--run"
+
+#: bin/withlist:266
+msgid "Importing %(module)s..."
+msgstr "导入 %(module)s..."
+
+#: bin/withlist:270
+msgid "Running %(module)s.%(callable)s()..."
+msgstr "运行 %(module)s.%(callable)s()..."
+
+#: bin/withlist:291
+msgid "The variable `m' is the %(listname)s MailList instance"
+msgstr "变量'm'是 %(listname)s 的MailList实例"
+
+#: cron/bumpdigests:19
+#, docstring
+msgid ""
+"Increment the digest volume number and reset the digest number to one.\n"
+"\n"
+"Usage: %(PROGRAM)s [options] [listname ...]\n"
+"\n"
+"Options:\n"
+"\n"
+"    --help/-h\n"
+"        Print this message and exit.\n"
+"\n"
+"The lists named on the command line are bumped.  If no list names are "
+"given,\n"
+"all lists are bumped.\n"
+msgstr ""
+"增加摘要卷序号并把摘要序号复位至1。\n"
+"\n"
+"用法： %(PROGRAM)s [options] [listname ...]\n"
+"\n"
+"选项：\n"
+"\n"
+"    --help/-h\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"命令行上给出的列表将被处理。如果没有给出任何列表的话，所有的列表都将被处理。\n"
+
+#: cron/checkdbs:20
+#, docstring
+msgid ""
+"Check for pending admin requests and mail the list owners if necessary.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"\n"
+"    -h/--help\n"
+"        Print this message and exit.\n"
+msgstr ""
+"查看阻塞的管理请求，在必要时向列表主人发送邮件。\n"
+"\n"
+"用法： %(PROGRAM)s [options]\n"
+"\n"
+"选项：\n"
+"\n"
+"    -h/--help\n"
+"        打印此帮助信息然后退出。\n"
+
+#: cron/checkdbs:108
+msgid ""
+"Notice: %(discarded)d old request(s) automatically expired.\n"
+"\n"
+msgstr ""
+"注意： %(discarded)d 旧请求自动过期。\n"
+"\n"
+
+#: cron/checkdbs:121
+msgid "%(count)d %(realname)s moderator request(s) waiting"
+msgstr ""
+
+#: cron/checkdbs:124
+msgid "%(realname)s moderator request check result"
+msgstr ""
+
+#: cron/checkdbs:144
+msgid "Pending subscriptions:"
+msgstr "阻塞的订阅："
+
+#: cron/checkdbs:155
+msgid "Pending unsubscriptions:"
+msgstr ""
+
+#: cron/checkdbs:162
+msgid ""
+"\n"
+"Pending posts:"
+msgstr ""
+"\n"
+"阻塞的信件："
+
+#: cron/checkdbs:169
+msgid ""
+"From: %(sender)s on %(date)s\n"
+"Subject: %(subject)s\n"
+"Cause: %(reason)s"
+msgstr ""
+
+#: cron/cull_bad_shunt:20
+#, docstring
+msgid ""
+"Cull bad and shunt queues, recommended once per day.\n"
+"\n"
+"This script goes through the 'bad' and 'shunt' queue directories and,\n"
+"if mm_cfg.BAD_SHUNT_STALE_AFTER is > 0, it removes all files more than\n"
+"that many seconds old.\n"
+"\n"
+"If mm_cfg.BAD_SHUNT_ARCHIVE_DIRECTORY is a writable directory, the old\n"
+"files are moved there. Otherwise they are deleted.\n"
+"\n"
+"Only regular files immediately subordinate to the 'bad' and 'shunt'\n"
+"directories are processed. Anything else is skipped.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"    -h / --help\n"
+"        Print this message and exit.\n"
+msgstr ""
+
+#: cron/disabled:20
+#, docstring
+msgid ""
+"Process disabled members, recommended once per day.\n"
+"\n"
+"This script cruises through every mailing list looking for members whose\n"
+"delivery is disabled.  If they have been disabled due to bounces, they will\n"
+"receive another notification, or they may be removed if they've received "
+"the\n"
+"maximum number of notifications.\n"
+"\n"
+"Use the --byadmin, --byuser, and --unknown flags to also send notifications "
+"to\n"
+"members whose accounts have been disabled for those reasons.  Use --all to\n"
+"send the notification to all disabled members.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"    -h / --help\n"
+"        Print this message and exit.\n"
+"\n"
+"    -o / --byadmin\n"
+"        Also send notifications to any member disabled by the list\n"
+"        owner/administrator.\n"
+"\n"
+"    -m / --byuser\n"
+"        Also send notifications to any member disabled by themselves.\n"
+"\n"
+"    -u / --unknown\n"
+"        Also send notifications to any member disabled for unknown reasons\n"
+"        (usually a legacy disabled address).\n"
+"\n"
+"    -b / --notbybounce\n"
+"        Don't send notifications to members disabled because of bounces "
+"(the\n"
+"        default is to notify bounce disabled members).\n"
+"\n"
+"    -a / --all\n"
+"        Send notifications to all disabled members.\n"
+"\n"
+"    -f / --force\n"
+"        Send notifications to disabled members even if they're not due a "
+"new\n"
+"        notification yet.\n"
+"\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        Process only the given list, otherwise do all lists.\n"
+msgstr ""
+"处理被禁止的成员，建议每天一次。\n"
+"\n"
+"此脚本在所有的邮件列表中查找禁止投递的成员。如果他们是因为退信而被禁止，他们将\n"
+"收到另一封通知，或者在他们收到的通知超过了最大数量时将他们从列表中移除。\n"
+"\n"
+"使用 --byadmin, --byuser, 和 --unknown 选项将会向因相应原因而被禁止的成员发送通\n"
+"知。使用 --all 将向所有被禁止的成员发送通知。\n"
+"\n"
+"用法： %(PROGRAM)s [options]\n"
+"\n"
+"选项：\n"
+"    -h / --help\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"    -o / --byadmin\n"
+"        也向被列表主人/管理员禁止的成员发送通知。\n"
+"\n"
+"    -m / --byuser\n"
+"        也向自己禁止的成员发送通知。\n"
+"\n"
+"    -u / --unknown\n"
+"        也向因未知原因而被禁止的成员发送通知(一般是一个继承的被禁止的地址)。\n"
+"\n"
+"    -b / --notbybounce\n"
+"        不向因退信而被禁止的成员发送通知(默认是向他们发送通知)。\n"
+"\n"
+"    -a / --all\n"
+"        向所有被禁止的成员发送通知。\n"
+"\n"
+"    -f / --force\n"
+"        向被禁止的成员发送通知，即使他们还不应该现在就接到新的通知。\n"
+"\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        仅处理指定的列表，否则将处理所有的列表。\n"
+
+#: cron/disabled:145
+msgid "[disabled by periodic sweep and cull, no message available]"
+msgstr ""
+
+#: cron/gate_news:19
+#, docstring
+msgid ""
+"Poll the NNTP servers for messages to be gatewayed to mailing lists.\n"
+"\n"
+"Usage: gate_news [options]\n"
+"\n"
+"Where options are\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        Print this text and exit.\n"
+"\n"
+msgstr ""
+"向NNTP服务器查询需要转发到邮件列表的消息。\n"
+"\n"
+"用法： gate_news [options]\n"
+"\n"
+"这里的选项为\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+
+#: cron/mailpasswds:19
+#, docstring
+msgid ""
+"Send password reminders for all lists to all users.\n"
+"\n"
+"This program scans all mailing lists and collects users and their "
+"passwords,\n"
+"grouped by the list's host_name if mm_cfg.VIRTUAL_HOST_OVERVIEW is true.  "
+"Then\n"
+"one email message is sent to each unique user (per-virtual host) containing\n"
+"the list passwords and options url for the user.  The password reminder "
+"comes\n"
+"from the mm_cfg.MAILMAN_SITE_LIST, which must exist.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        Send password reminders for the named list only.  If omitted,\n"
+"        reminders are sent for all lists.  Multiple -l/--listname options "
+"are\n"
+"        allowed.\n"
+"\n"
+"    -h/--help\n"
+"        Print this message and exit.\n"
+msgstr ""
+"向所有列表中的所有成员发送口令提示函。\n"
+"\n"
+"此程序扫描所有的邮件列表，搜集用户和他们的口令，如果mm_cfg.VIRTUAL_HOST_OVERVIEW\n"
+"为真的话还将他们按照列表的host_name进行分组。然后给每一个唯一的用户(每一个虚拟主机)\n"
+"发送一封电子邮件，包含列表的口令以及可选的url。口令提示函从mm_cfg.MAILMAN_SITE_LIST\n"
+"发出，mm_cfg.MAILMAN_SITE_LIST一定要存在。\n"
+"\n"
+"用法： %(PROGRAM)s [options]\n"
+"\n"
+"选项：\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        仅为指定的列表发送口令提示函。如果省略的话，将会给所有的列表发送。可以使用\n"
+"        多个 -l/--listname 选项。\n"
+"\n"
+"    -h/--help\n"
+"        打印此帮助信息然后退出。\n"
+
+#: cron/mailpasswds:216
+msgid "Password // URL"
+msgstr "口令 // URL"
+
+#: cron/mailpasswds:222
+msgid "%(host)s mailing list memberships reminder"
+msgstr "%(host)s邮件列表成员身份提示"
+
+#: cron/nightly_gzip:19
+#, docstring
+msgid ""
+"Re-generate the Pipermail gzip'd archive flat files.\n"
+"\n"
+"This script should be run nightly from cron.  When run from the command "
+"line,\n"
+"the following usage is understood:\n"
+"\n"
+"Usage: %(program)s [-v] [-h] [listnames]\n"
+"\n"
+"Where:\n"
+"    --verbose\n"
+"    -v\n"
+"        print each file as it's being gzip'd\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        print this message and exit\n"
+"\n"
+"    listnames\n"
+"        Optionally, only compress the .txt files for the named lists.  "
+"Without \n"
+"        this, all archivable lists are processed.\n"
+"\n"
+msgstr ""
+"重新生成gzip压缩的Pipermail存档文件。\n"
+"\n"
+"此脚本应该在每晚由cron运行。从命令行运行时，可以识别下面的用法：\n"
+"\n"
+"用法： %(program)s [-v] [-h] [listnames]\n"
+"\n"
+"这里：\n"
+"    --verbose\n"
+"    -v\n"
+"        打印正在被gzip压缩的文件名。\n"
+"\n"
+"    --help\n"
+"    -h\n"
+"        打印此帮助信息然后退出。\n"
+"\n"
+"    listnames\n"
+"        可选，仅压缩指定列表的 .txt 文件。不指定的话所有可存档的列表都将被处理。\n"
+"\n"
+
+#: cron/senddigests:20
+#, docstring
+msgid ""
+"Dispatch digests for lists w/pending messages and digest_send_periodic set.\n"
+"\n"
+"Usage: %(PROGRAM)s [options]\n"
+"\n"
+"Options:\n"
+"    -h / --help\n"
+"        Print this message and exit.\n"
+"\n"
+"    -l listname\n"
+"    --listname=listname\n"
+"        Send the digest for the given list only, otherwise the digests for "
+"all\n"
+"        lists are sent out.  May be repeated to do multiple lists.\n"
+"\n"
+"    -e listname\n"
+"    --exceptlist listname\n"
+"        Don't send the digest for the given list.  May be repeated to skip\n"
+"        multiple lists.\n"
+msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/man-db-gnulib.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/man-db-gnulib.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/man-db-gnulib.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/man-db-gnulib.po	2020-07-08 13:53:59.000000000 +0000
@@ -17,8 +17,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:58+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/man-db.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/man-db.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/man-db.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/man-db.po	2020-07-08 13:54:00.000000000 +0000
@@ -27,8 +27,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:58+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
@@ -43,7 +43,7 @@
 msgid "the setuid man user \"%s\" does not exist"
 msgstr "不存在用来将 man 程序 setuid 的用户 %s"
 
-#: src/check_mandirs.c:390 src/man.c:1689
+#: src/check_mandirs.c:390 src/man.c:1716
 #, c-format
 msgid "can't chown %s"
 msgstr "无法 chown %s"
@@ -223,7 +223,7 @@
 msgid "warning: cannot create catdir %s"
 msgstr "警告：无法创建 catdir %s"
 
-#: src/check_mandirs.c:467 src/man.c:1701 src/mandb.c:232
+#: src/check_mandirs.c:467 src/man.c:1728 src/mandb.c:232
 #, c-format
 msgid "can't chmod %s"
 msgstr "无法 chmod %s"
@@ -299,7 +299,7 @@
 msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
 msgstr[0] "警告：对 %s 的 whatis 操作结果超过 %d 字节，正在截断。"
 
-#: src/lexgrog.l:856 src/man.c:2270 src/man.c:2354 src/man.c:2452
+#: src/lexgrog.l:856 src/man.c:2297 src/man.c:2382 src/man.c:2480
 #: src/man-recode.c:176 src/man-recode.c:201 src/manconv_main.c:158
 #: src/straycats.c:204 src/ult_src.c:320 src/ult_src.c:333 src/zsoelim.l:517
 #, c-format
@@ -563,48 +563,48 @@
 msgid "ignoring unknown preprocessor `%c'"
 msgstr "忽略未知的预处理器 `%c'"
 
-#: src/man.c:1712 src/man-recode.c:243 src/mandb.c:223
+#: src/man.c:1739 src/man-recode.c:243 src/mandb.c:223
 #, c-format
 msgid "can't rename %s to %s"
 msgstr "无法将 %s 改名为 %s"
 
 #  need-proofread
-#: src/man.c:1729
+#: src/man.c:1756
 #, c-format
 msgid "can't set times on %s"
 msgstr "无法设定 %s 文件的时间"
 
-#: src/man.c:1738 src/man.c:1775
+#: src/man.c:1765 src/man.c:1802
 #, c-format
 msgid "can't unlink %s"
 msgstr "无法删除 (unlink) %s"
 
-#: src/man.c:1805
+#: src/man.c:1832
 #, c-format
 msgid "can't create temporary cat for %s"
 msgstr "无法为 %s 创建临时 cat 文件"
 
-#: src/man.c:1915
+#: src/man.c:1942
 #, c-format
 msgid "can't create temporary directory"
 msgstr "无法创建临时目录"
 
-#: src/man.c:1926 src/man-recode.c:209
+#: src/man.c:1953 src/man-recode.c:209
 #, c-format
 msgid "can't open temporary file %s"
 msgstr "无法打开临时文件 %s"
 
-#: src/man.c:1956 src/man.c:1985
+#: src/man.c:1983 src/man.c:2012
 #, c-format
 msgid "can't remove directory %s"
 msgstr "无法移除目录 %s"
 
-#: src/man.c:2114
+#: src/man.c:2141
 #, c-format
 msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
 msgstr "--Man-- 下一页: %s [ 查看 (return) | 跳过 (Ctrl-D) | 退出 (Ctrl-C) ]\n"
 
-#: src/man.c:2397
+#: src/man.c:2425
 #, c-format
 msgid ""
 "\n"
@@ -613,23 +613,23 @@
 "\n"
 "无法在 catman 模式下对 %s 写入"
 
-#: src/man.c:2477
+#: src/man.c:2505
 #, c-format
 msgid "Can't convert %s to cat name"
 msgstr "无法把 %s 转换为 cat 名称"
 
 #  need-proofread
-#: src/man.c:3202
+#: src/man.c:3230
 #, c-format
 msgid "%s: relying on whatis refs is deprecated\n"
 msgstr "%s：依赖于 whatis 引用是已被废弃的做法\n"
 
-#: src/man.c:3345 src/man.c:4203
+#: src/man.c:3373 src/man.c:4231
 #, c-format
 msgid "mandb command failed with exit status %d"
 msgstr "mandb 命令失败，退出状态代码为 %d"
 
-#: src/man.c:3547
+#: src/man.c:3575
 #, c-format
 msgid "internal error: candidate type %d out of range"
 msgstr "内部错误：候选类型 %d 超出正常范围"
@@ -637,7 +637,7 @@
 #  I'm not sure this should be translated.  It comes from a less prompt string
 #  but seems to be only part of it.  (Ming)
 #  need-proofread
-#: src/man.c:4146
+#: src/man.c:4174
 msgid " Manual page "
 msgstr " Manual page "
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/MoinMoin.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/MoinMoin.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/MoinMoin.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/MoinMoin.po	2020-07-08 13:53:59.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:09+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:59+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 msgid "Your changes are not saved!"
 msgstr "您所做的变更未被保存！"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/mutt.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/mutt.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/mutt.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/mutt.po	2020-07-08 13:54:02.000000000 +0000
@@ -11,14 +11,14 @@
 "Project-Id-Version: Mutt\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2018-03-03 13:36-0800\n"
-"PO-Revision-Date: 2018-07-23 16:29+0000\n"
+"PO-Revision-Date: 2020-06-24 20:17+0000\n"
 "Last-Translator: lilydjwg <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:09+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:59+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh\n"
 
 #: account.c:163
@@ -31,16 +31,17 @@
 msgid "Password for %s@%s: "
 msgstr "%s@%s 的密码： "
 
-#: addrbook.c:37 autocrypt/autocrypt_acct_menu.c:39 browser.c:46 history.c:75
-#: pager.c:1574 postpone.c:42 query.c:48 recvattach.c:58
+#: addrbook.c:37 autocrypt/autocrypt_acct_menu.c:39 background.c:180
+#: background.c:369 browser.c:46 history.c:75 pager.c:1577 postpone.c:42
+#: query.c:49 recvattach.c:58
 msgid "Exit"
 msgstr "退出"
 
-#: addrbook.c:38 curs_main.c:543 pager.c:1581 postpone.c:43
+#: addrbook.c:38 curs_main.c:545 pager.c:1584 postpone.c:43
 msgid "Del"
 msgstr "删除"
 
-#: addrbook.c:39 curs_main.c:544 postpone.c:44
+#: addrbook.c:39 curs_main.c:546 postpone.c:44
 msgid "Undel"
 msgstr "撤销删除"
 
@@ -48,10 +49,11 @@
 msgid "Select"
 msgstr "选择"
 
-#: addrbook.c:41 autocrypt/autocrypt_acct_menu.c:62 browser.c:49 compose.c:142
-#: crypt-gpgme.c:4535 curs_main.c:549 history.c:78 mutt_ssl.c:1323
-#: mutt_ssl_gnutls.c:1033 pager.c:1979 pgpkey.c:523 postpone.c:45 query.c:53
-#: recvattach.c:62 smime.c:453
+#: addrbook.c:41 autocrypt/autocrypt_acct_menu.c:62 background.c:182
+#: background.c:374 browser.c:49 compose.c:143 crypt-gpgme.c:4533
+#: curs_main.c:551 history.c:78 mutt_ssl.c:1338 mutt_ssl_gnutls.c:1051
+#: pager.c:1982 pgpkey.c:523 postpone.c:45 query.c:54 recvattach.c:62
+#: smime.c:468
 msgid "Help"
 msgstr "帮助"
 
@@ -80,7 +82,7 @@
 msgid "Address: "
 msgstr "地址： "
 
-#: alias.c:307 send.c:216
+#: alias.c:307 send.c:218
 #, c-format
 msgid "Error: '%s' is a bad IDN."
 msgstr "错误：'%s'是错误的 IDN。"
@@ -94,8 +96,8 @@
 msgid "[%s = %s] Accept?"
 msgstr "[%s = %s] 接受?"
 
-#: alias.c:348 recvattach.c:449 recvattach.c:472 recvattach.c:486
-#: recvattach.c:501 recvattach.c:541
+#: alias.c:348 recvattach.c:451 recvattach.c:474 recvattach.c:488
+#: recvattach.c:503 recvattach.c:543
 msgid "Save to file: "
 msgstr "存到文件： "
 
@@ -120,8 +122,9 @@
 msgid "Mailcap compose entry requires %%s"
 msgstr "Mailcap 编写项目需要 %%s"
 
-#: attach.c:140 attach.c:273 commands.c:326 compose.c:1617 compress.c:414
-#: curs_lib.c:297 curs_lib.c:980 sendlib.c:1424 sendlib.c:1462 sendlib.c:1525
+#: attach.c:140 attach.c:273 background.c:342 commands.c:343 compose.c:1806
+#: compress.c:414 curs_lib.c:299 curs_lib.c:989 sendlib.c:1431 sendlib.c:1469
+#: sendlib.c:1532
 #, c-format
 msgid "Error running \"%s\"!"
 msgstr "执行 \"%s\" 时出错！"
@@ -206,72 +209,72 @@
 msgid "Mask"
 msgstr "掩码"
 
-#: browser.c:461 browser.c:966 browser.c:1179
+#: browser.c:461 browser.c:971 browser.c:1184
 #, c-format
 msgid "%s is not a directory."
 msgstr "%s 不是目录"
 
-#: browser.c:639
+#: browser.c:644
 #, c-format
 msgid "Mailboxes [%d]"
 msgstr "邮箱 [%d]"
 
-#: browser.c:646
+#: browser.c:651
 #, c-format
 msgid "Subscribed [%s], File mask: %s"
 msgstr "已订阅 [%s], 文件掩码: %s"
 
-#: browser.c:650
+#: browser.c:655
 #, c-format
 msgid "Directory [%s], File mask: %s"
 msgstr "目录 [%s], 文件掩码: %s"
 
-#: browser.c:667
+#: browser.c:672
 msgid "Can't attach a directory!"
 msgstr "无法附加目录！"
 
-#: browser.c:846 browser.c:1247 browser.c:1354
+#: browser.c:851 browser.c:1252 browser.c:1359
 msgid "No files match the file mask"
 msgstr "没有文件与文件掩码相符"
 
-#: browser.c:1027
+#: browser.c:1032
 msgid "Create is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 邮箱才支持创建"
 
-#: browser.c:1050
+#: browser.c:1055
 msgid "Rename is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 邮箱才支持重命名"
 
-#: browser.c:1072
+#: browser.c:1077
 msgid "Delete is only supported for IMAP mailboxes"
 msgstr "只有 IMAP 邮箱才支持删除"
 
-#: browser.c:1082
+#: browser.c:1087
 msgid "Cannot delete root folder"
 msgstr "无法删除根文件夹"
 
-#: browser.c:1085
+#: browser.c:1090
 #, c-format
 msgid "Really delete mailbox \"%s\"?"
 msgstr "真的要删除 \"%s\" 邮箱吗？"
 
-#: browser.c:1101
+#: browser.c:1106
 msgid "Mailbox deleted."
 msgstr "邮箱已删除。"
 
-#: browser.c:1109
+#: browser.c:1114
 msgid "Mailbox not deleted."
 msgstr "邮箱未删除。"
 
-#: browser.c:1130
+#: browser.c:1135
 msgid "Chdir to: "
 msgstr "改变目录到： "
 
-#: browser.c:1168 browser.c:1241
+#: browser.c:1173 browser.c:1246
 msgid "Error scanning directory."
 msgstr "扫描目录出错。"
 
-#: browser.c:1191
+#: browser.c:1196
 msgid "File Mask: "
 msgstr "文件掩码： "
 
@@ -287,19 +290,19 @@
 msgid "dazn"
 msgstr "dazn"
 
-#: browser.c:1343
+#: browser.c:1348
 msgid "New file name: "
 msgstr "新文件名： "
 
-#: browser.c:1371
+#: browser.c:1376
 msgid "Can't view a directory"
 msgstr "无法显示目录"
 
-#: browser.c:1386
+#: browser.c:1391
 msgid "Error trying to view file"
 msgstr "尝试显示文件出错"
 
-#: buffy.c:671
+#: buffy.c:769
 msgid "New mail in "
 msgstr "有新邮件在 "
 
@@ -345,12 +348,12 @@
 msgid "%s: no such attribute"
 msgstr "%s：没有这个属性"
 
-#: color.c:807 hook.c:74 hook.c:82 hook.c:317 init.c:2030 init.c:2105
-#: keymap.c:973
+#: buffy.c:374 buffy.c:398 color.c:807 hook.c:74 hook.c:82 hook.c:330
+#: init.c:2037 init.c:2112 keymap.c:973
 msgid "too few arguments"
 msgstr "参数太少"
 
-#: color.c:816 hook.c:88 hook.c:324
+#: color.c:816 hook.c:88 hook.c:337
 msgid "too many arguments"
 msgstr "参数太多"
 
@@ -363,126 +366,126 @@
 msgid "Verify PGP signature?"
 msgstr "验证 PGP 签名?"
 
-#: commands.c:210 mbox.c:902
+#: commands.c:215 mbox.c:902
 msgid "Could not create temporary file!"
 msgstr "无法创建临时文件！"
 
-#: commands.c:223
+#: commands.c:228
 msgid "Cannot create display filter"
 msgstr "无法创建显示过滤器"
 
-#: commands.c:250
+#: commands.c:255
 msgid "Could not copy message"
 msgstr "无法复制邮件"
 
-#: commands.c:289
+#: commands.c:306
 msgid "S/MIME signature successfully verified."
 msgstr "S/MIME 签名验证成功。"
 
-#: commands.c:291
+#: commands.c:308
 msgid "S/MIME certificate owner does not match sender."
 msgstr "S/MIME 证书所有者与发送者不匹配。"
 
-#: commands.c:294 commands.c:305
+#: commands.c:311 commands.c:322
 msgid "Warning: Part of this message has not been signed."
 msgstr "警告：此邮件的部分内容未签名。"
 
-#: commands.c:296
+#: commands.c:313
 msgid "S/MIME signature could NOT be verified."
 msgstr "S/MIME 签名无法验证！"
 
-#: commands.c:303
+#: commands.c:320
 msgid "PGP signature successfully verified."
 msgstr "PGP 签名验证成功。"
 
-#: commands.c:307
+#: commands.c:324
 msgid "PGP signature could NOT be verified."
 msgstr "PGP 签名无法验证！"
 
-#: commands.c:336
+#: commands.c:353
 msgid "Command: "
 msgstr "命令： "
 
-#: commands.c:363 commands.c:373 recvcmd.c:146 recvcmd.c:159
+#: commands.c:380 commands.c:390 recvcmd.c:147 recvcmd.c:160
 msgid "Warning: message contains no From: header"
 msgstr "警告：邮件未包含 From: 邮件头"
 
-#: commands.c:381 recvcmd.c:169
+#: commands.c:398 recvcmd.c:170
 msgid "Bounce message to: "
 msgstr "重发邮件至： "
 
-#: commands.c:383 recvcmd.c:171
+#: commands.c:400 recvcmd.c:172
 msgid "Bounce tagged messages to: "
 msgstr "重发已标记的邮件至： "
 
-#: commands.c:391 recvcmd.c:180
+#: commands.c:408 recvcmd.c:181
 msgid "Error parsing address!"
 msgstr "解析地址出错！"
 
-#: commands.c:399 recvcmd.c:188
+#: commands.c:416 recvcmd.c:189
 #, c-format
 msgid "Bad IDN: '%s'"
 msgstr "错误的 IDN: '%s'"
 
-#: commands.c:410 recvcmd.c:202
+#: commands.c:427 recvcmd.c:203
 #, c-format
 msgid "Bounce message to %s"
 msgstr "重发邮件至 %s"
 
-#: commands.c:410 recvcmd.c:202
+#: commands.c:427 recvcmd.c:203
 #, c-format
 msgid "Bounce messages to %s"
 msgstr "重发邮件至 %s"
 
-#: commands.c:426 recvcmd.c:218
+#: commands.c:443 recvcmd.c:219
 msgid "Message not bounced."
 msgstr "邮件未重发。"
 
-#: commands.c:426 recvcmd.c:218
+#: commands.c:443 recvcmd.c:219
 msgid "Messages not bounced."
 msgstr "邮件未重发。"
 
-#: commands.c:436 recvcmd.c:237
+#: commands.c:453 recvcmd.c:238
 msgid "Message bounced."
 msgstr "邮件已重发。"
 
-#: commands.c:436 recvcmd.c:237
+#: commands.c:453 recvcmd.c:238
 msgid "Messages bounced."
 msgstr "邮件已重发。"
 
-#: commands.c:520 commands.c:556 commands.c:575
+#: commands.c:537 commands.c:573 commands.c:592
 msgid "Can't create filter process"
 msgstr "无法创建过滤进程"
 
-#: commands.c:606
+#: commands.c:623
 msgid "Pipe to command: "
 msgstr "用管道输出至命令： "
 
-#: commands.c:623
+#: commands.c:645
 msgid "No printing command has been defined."
 msgstr "未定义打印命令"
 
-#: commands.c:628
+#: commands.c:650
 msgid "Print message?"
 msgstr "打印邮件？"
 
-#: commands.c:628
+#: commands.c:650
 msgid "Print tagged messages?"
 msgstr "打印已标记的邮件？"
 
-#: commands.c:637
+#: commands.c:659
 msgid "Message printed"
 msgstr "邮件已打印"
 
-#: commands.c:637
+#: commands.c:659
 msgid "Messages printed"
 msgstr "邮件已打印"
 
-#: commands.c:639
+#: commands.c:661
 msgid "Message could not be printed"
 msgstr "邮件无法打印"
 
-#: commands.c:640
+#: commands.c:662
 msgid "Messages could not be printed"
 msgstr "邮件无法打印"
 
@@ -491,130 +494,130 @@
 #. * string.  Note that mutt now supports multiline prompts, so
 #. * it's okay for the translation to take up to three lines.
 #. 
-#: commands.c:654
+#: commands.c:676
 msgid "Rev-Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "
 msgstr "反向排序：按日期d/发件人f/收信时间r/主题s/收件人o/线索t/不排u/大小z/分数c/垃圾邮件p/标签l？ "
 
-#: commands.c:655
+#: commands.c:677
 msgid "Sort Date/Frm/Recv/Subj/tO/Thread/Unsort/siZe/sCore/sPam/Label?: "
 msgstr "排序：按日期d/发件人f/收信时间r/主题s/收件人o/线索t/不排u/大小z/分数c/垃圾邮件p/标签l？ "
 
-#: commands.c:656
+#: commands.c:678
 msgid "dfrsotuzcpl"
 msgstr "dfrsotuzcpl"
 
-#: commands.c:717
+#: commands.c:739
 msgid "Shell command: "
 msgstr "Shell 指令： "
 
-#: commands.c:864
+#: commands.c:887
 #, c-format
 msgid "Decode-save%s to mailbox"
 msgstr "解码保存%s 到邮箱"
 
-#: commands.c:865
+#: commands.c:888
 #, c-format
 msgid "Decode-copy%s to mailbox"
 msgstr "解码复制%s 到邮箱"
 
-#: commands.c:866
+#: commands.c:889
 #, c-format
 msgid "Decrypt-save%s to mailbox"
 msgstr "解密保存%s 到邮箱"
 
-#: commands.c:867
+#: commands.c:890
 #, c-format
 msgid "Decrypt-copy%s to mailbox"
 msgstr "解密复制%s 到邮箱"
 
-#: commands.c:868
+#: commands.c:891
 #, c-format
 msgid "Save%s to mailbox"
 msgstr "保存%s 到邮箱"
 
-#: commands.c:868
+#: commands.c:891
 #, c-format
 msgid "Copy%s to mailbox"
 msgstr "复制%s 到邮箱"
 
-#: commands.c:869
+#: commands.c:892
 msgid " tagged"
 msgstr " 已标记"
 
-#: commands.c:935
+#: commands.c:960
 #, c-format
 msgid "Copying to %s..."
 msgstr "正在复制到 %s..."
 
-#: commands.c:1065
+#: commands.c:1108
 #, c-format
 msgid "Convert to %s upon sending?"
 msgstr "发送时转换为 %s？"
 
-#: commands.c:1075
+#: commands.c:1118
 #, c-format
 msgid "Content-Type changed to %s."
 msgstr "内容类型(Content-Type)改变为 %s。"
 
-#: commands.c:1080
+#: commands.c:1123
 #, c-format
 msgid "Character set changed to %s; %s."
 msgstr "字符集改变为 %s；%s。"
 
-#: commands.c:1082
+#: commands.c:1125
 msgid "not converting"
 msgstr "不进行转换"
 
-#: commands.c:1082
+#: commands.c:1125
 msgid "converting"
 msgstr "正在转换"
 
-#: compose.c:54
+#: compose.c:55
 msgid "There are no attachments."
 msgstr "没有附件。"
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:94
+#: compose.c:95
 msgid "From: "
 msgstr "发件人: "
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:96 send.c:231
+#: compose.c:97 send.c:233
 msgid "To: "
 msgstr "收件人: "
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:98 send.c:233
+#: compose.c:99 send.c:235
 msgid "Cc: "
 msgstr "抄送: "
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:100 send.c:235
+#: compose.c:101 send.c:237
 msgid "Bcc: "
 msgstr "密送: "
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:102 compose.c:970 send.c:260
+#: compose.c:103 compose.c:1112 send.c:262
 msgid "Subject: "
 msgstr "主题: "
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:104
+#: compose.c:105
 msgid "Reply-To: "
 msgstr "回复到: "
 
 #. L10N: Compose menu field.  May not want to translate.
-#: compose.c:106 compose.c:987
+#: compose.c:107 compose.c:1129
 msgid "Fcc: "
 msgstr ""
 
 #. L10N: "Mix" refers to the MixMaster chain for anonymous email
-#: compose.c:109
+#: compose.c:110
 msgid "Mix: "
 msgstr ""
 
 #. L10N: Compose menu field.  Holds "Encrypt", "Sign" related information
-#: compose.c:112
+#: compose.c:113
 msgid "Security: "
 msgstr "安全性： "
 
@@ -627,222 +630,222 @@
 #. * Since it shares the row with "Encrypt with:", it should not be longer
 #. * than 15-20 character cells.
 #. 
-#: compose.c:122 crypt-gpgme.c:5367 pgp.c:1917 smime.c:2358
+#: compose.c:123 crypt-gpgme.c:5369 pgp.c:1926 smime.c:2353
 msgid "Sign as: "
 msgstr "选择身份签名： "
 
-#: compose.c:132
+#: compose.c:133
 msgid "Send"
 msgstr "寄出"
 
-#: compose.c:133 remailer.c:489
+#: compose.c:134 remailer.c:489
 msgid "Abort"
 msgstr "放弃"
 
 #. L10N: compose menu help line entry
-#: compose.c:135
+#: compose.c:136
 msgid "To"
 msgstr "收件人"
 
 #. L10N: compose menu help line entry
-#: compose.c:137
+#: compose.c:138
 msgid "CC"
 msgstr "抄送"
 
 #. L10N: compose menu help line entry
-#: compose.c:139
+#: compose.c:140
 msgid "Subj"
 msgstr "主题"
 
-#: compose.c:140 compose.c:1077
+#: compose.c:141 compose.c:1252
 msgid "Attach file"
 msgstr "添加附件"
 
-#: compose.c:141
+#: compose.c:142
 msgid "Descrip"
 msgstr "描述"
 
-#: compose.c:290
+#: compose.c:294
 msgid "Not supported"
 msgstr "不支持"
 
-#: compose.c:297
+#: compose.c:301
 msgid "Sign, Encrypt"
 msgstr "签名，加密"
 
-#: compose.c:302 compose.c:377
+#: compose.c:306 compose.c:387
 msgid "Encrypt"
 msgstr "加密"
 
-#: compose.c:307
+#: compose.c:311
 msgid "Sign"
 msgstr "签名"
 
-#: compose.c:312
+#: compose.c:316
 msgid "None"
 msgstr "无"
 
-#: compose.c:321
+#: compose.c:325
 msgid " (inline PGP)"
 msgstr " (内嵌 PGP)"
 
-#: compose.c:323
+#: compose.c:327
 msgid " (PGP/MIME)"
 msgstr " (PGP/MIME)"
 
-#: compose.c:327
+#: compose.c:331
 msgid " (S/MIME)"
 msgstr " (S/MIME)"
 
-#: compose.c:331
+#: compose.c:335
 msgid " (OppEnc mode)"
 msgstr " (OppEnc 模式)"
 
-#: compose.c:343 compose.c:352
+#: compose.c:348 compose.c:358
 msgid "<default>"
 msgstr "<默认值>"
 
-#: compose.c:361
+#: compose.c:371
 msgid "Encrypt with: "
 msgstr "加密采用： "
 
-#: compose.c:324
+#: compose.c:218
 #, c-format
 msgid "%s [#%d] no longer exists!"
 msgstr "%s [#%d] 已不存在!"
 
-#: compose.c:332
+#: compose.c:226
 #, c-format
 msgid "%s [#%d] modified. Update encoding?"
 msgstr "%s [#%d] 已修改。更新编码？"
 
-#: compose.c:579
+#: compose.c:589
 msgid "-- Attachments"
 msgstr "-- 附件"
 
-#: compose.c:601
+#: compose.c:611
 #, c-format
 msgid "Warning: '%s' is a bad IDN."
 msgstr "警告：'%s'是错误的 IDN。"
 
-#: compose.c:621
+#: compose.c:631
 msgid "You may not delete the only attachment."
 msgstr "您不可以删除唯一的附件。"
 
-#: compose.c:1022 send.c:2134
+#: compose.c:1197 send.c:2401
 #, c-format
 msgid "Bad IDN in \"%s\": '%s'"
 msgstr "在\"%s\"中有错误的 IDN: '%s'"
 
-#: compose.c:1087
+#: compose.c:1262
 msgid "Attaching selected files..."
 msgstr "正在添加已选择的文件附件..."
 
-#: compose.c:1099
+#: compose.c:1274
 #, c-format
 msgid "Unable to attach %s!"
 msgstr "无法将 %s 添加为附件！"
 
-#: compose.c:1119
+#: compose.c:1294
 msgid "Open mailbox to attach message from"
 msgstr "打开邮箱并选择邮件作为附件"
 
-#: compose.c:1150
+#: compose.c:1325
 #, c-format
 msgid "Unable to open mailbox %s"
 msgstr "无法打开邮箱 %s"
 
-#: compose.c:1158
+#: compose.c:1333
 msgid "No messages in that folder."
 msgstr "文件夹中没有邮件。"
 
-#: compose.c:1167
+#: compose.c:1342
 msgid "Tag the messages you want to attach!"
 msgstr "请标记您要作为附件的邮件！"
 
-#: compose.c:1193
+#: compose.c:1368
 msgid "Unable to attach!"
 msgstr "无法添加附件！"
 
-#: compose.c:1233
+#: compose.c:1422
 msgid "Recoding only affects text attachments."
 msgstr "重新编码只对文本附件有效。"
 
-#: compose.c:1238
+#: compose.c:1427
 msgid "The current attachment won't be converted."
 msgstr "当前附件不会被转换。"
 
-#: compose.c:1240
+#: compose.c:1429
 msgid "The current attachment will be converted."
 msgstr "当前附件将被转换。"
 
-#: compose.c:1314
+#: compose.c:1503
 msgid "Invalid encoding."
 msgstr "无效的编码。"
 
-#: compose.c:1340
+#: compose.c:1529
 msgid "Save a copy of this message?"
 msgstr "保存这封邮件的副本吗？"
 
-#: compose.c:1394
+#: compose.c:1583
 msgid "Send attachment with name: "
 msgstr "发送附件文件: "
 
-#: compose.c:1413
+#: compose.c:1602
 msgid "Rename to: "
 msgstr "重命名为： "
 
 #. L10N:
 #. "stat" is a system call. Do "man 2 stat" for more information.
-#: compose.c:1420 editmsg.c:98 editmsg.c:124 sendlib.c:907
+#: compose.c:1609 editmsg.c:98 editmsg.c:122 editmsg.c:132 sendlib.c:908
 #, c-format
 msgid "Can't stat %s: %s"
 msgstr "无法 stat %s：%s"
 
-#: compose.c:1447
+#: compose.c:1636
 msgid "New file: "
 msgstr "新文件： "
 
-#: compose.c:1460
+#: compose.c:1649
 msgid "Content-Type is of the form base/sub"
 msgstr "内容类型(Content-Type)的格式是 基础类型/子类型"
 
-#: compose.c:1466
+#: compose.c:1655
 #, c-format
 msgid "Unknown Content-Type %s"
 msgstr "未知的内容类型(Content-Type)%s"
 
-#: compose.c:1474
+#: compose.c:1663
 #, c-format
 msgid "Can't create file %s"
 msgstr "无法创建文件 %s"
 
-#: compose.c:1482
+#: compose.c:1671
 msgid "What we have here is a failure to make an attachment"
 msgstr "目前的情况是我们无法生成附件"
 
-#: compose.c:1574
+#: compose.c:1763
 msgid "Postpone this message?"
 msgstr "推迟这封邮件？"
 
-#: compose.c:1635
+#: compose.c:1824
 msgid "Write message to mailbox"
 msgstr "将邮件写入到邮箱"
 
-#: compose.c:1639
+#: compose.c:1828
 #, c-format
 msgid "Writing message to %s ..."
 msgstr "写入邮件到 %s ..."
 
-#: compose.c:1646
+#: compose.c:1835
 msgid "Message written."
 msgstr "邮件已写入。"
 
-#: compose.c:1667 compose.c:1740
+#: compose.c:1856 compose.c:1929
 msgid "S/MIME already selected. Clear & continue ? "
 msgstr "已经选择了 S/MIME。清除并继续？ "
 
-#: compose.c:1704
+#: compose.c:1893
 msgid "PGP already selected. Clear & continue ? "
 msgstr "已经选择了 PGP。清除并继续？ "
 
@@ -888,7 +891,7 @@
 msgid "Compressing %s..."
 msgstr "正在压缩 %s..."
 
-#: compress.c:630 editmsg.c:213
+#: compress.c:630 editmsg.c:222
 #, c-format
 msgid "Error. Preserving temporary file: %s"
 msgstr "错误。保留临时文件：%s"
@@ -932,7 +935,7 @@
 msgid "error reading data object: %s\n"
 msgstr "读取数据对象时出错：%s\n"
 
-#: crypt-gpgme.c:793 crypt-gpgme.c:4183 pgpkey.c:561 pgpkey.c:742
+#: crypt-gpgme.c:793 crypt-gpgme.c:4181 pgpkey.c:561 pgpkey.c:742
 msgid "Can't create temporary file"
 msgstr "无法创建临时文件"
 
@@ -1019,7 +1022,7 @@
 msgid "PKA verified signer's address is: "
 msgstr "公钥认证(PKA)确认的发送者地址为： "
 
-#: crypt-gpgme.c:1540 crypt-gpgme.c:3873
+#: crypt-gpgme.c:1540 crypt-gpgme.c:3871
 msgid "Fingerprint: "
 msgstr "指纹： "
 
@@ -1039,7 +1042,7 @@
 "above\n"
 msgstr "警告：无法确定密钥属于上述名字的人！\n"
 
-#: crypt-gpgme.c:1641 crypt-gpgme.c:1646 crypt-gpgme.c:3868
+#: crypt-gpgme.c:1641 crypt-gpgme.c:1646 crypt-gpgme.c:3866
 msgid "aka: "
 msgstr "亦即： "
 
@@ -1075,7 +1078,7 @@
 msgid "               expires: "
 msgstr "               过期于: "
 
-#: crypt-gpgme.c:1835 crypt-gpgme.c:2065 crypt-gpgme.c:2885
+#: crypt-gpgme.c:1835 crypt-gpgme.c:2065 crypt-gpgme.c:2886
 msgid "[-- Begin signature information --]\n"
 msgstr "[-- 签名信息开始 --]\n"
 
@@ -1093,7 +1096,7 @@
 msgid "*** End Notation ***\n"
 msgstr "*** 注释结束 ***\n"
 
-#: crypt-gpgme.c:1931 crypt-gpgme.c:2078 crypt-gpgme.c:2898
+#: crypt-gpgme.c:1931 crypt-gpgme.c:2078 crypt-gpgme.c:2899
 msgid ""
 "[-- End signature information --]\n"
 "\n"
@@ -1110,7 +1113,7 @@
 "[-- 错误：解密失败：%s --]\n"
 "\n"
 
-#: crypt-gpgme.c:2277
+#: crypt-gpgme.c:2246
 msgid "Error extracting key data!\n"
 msgstr "取出密钥数据出错！\n"
 
@@ -1119,11 +1122,11 @@
 msgid "Error: decryption/verification failed: %s\n"
 msgstr "错误：解密/验证失败：%s\n"
 
-#: crypt-gpgme.c:2906
+#: crypt-gpgme.c:2907
 msgid "Error: copy data failed\n"
 msgstr "错误：复制数据失败\n"
 
-#: crypt-gpgme.c:2927 pgp.c:622
+#: crypt-gpgme.c:2928 pgp.c:622
 msgid ""
 "[-- BEGIN PGP MESSAGE --]\n"
 "\n"
@@ -1131,11 +1134,11 @@
 "[-- PGP 消息开始 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2929 pgp.c:624
+#: crypt-gpgme.c:2930 pgp.c:624
 msgid "[-- BEGIN PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共钥匙区段开始 --]\n"
 
-#: crypt-gpgme.c:2932 pgp.c:626
+#: crypt-gpgme.c:2933 pgp.c:626
 msgid ""
 "[-- BEGIN PGP SIGNED MESSAGE --]\n"
 "\n"
@@ -1143,19 +1146,19 @@
 "[-- PGP 签名的邮件开始 --]\n"
 "\n"
 
-#: crypt-gpgme.c:2959 pgp.c:666
+#: crypt-gpgme.c:2960 pgp.c:666
 msgid "[-- END PGP MESSAGE --]\n"
 msgstr "[-- PGP 消息结束 --]\n"
 
-#: crypt-gpgme.c:2961 pgp.c:679
+#: crypt-gpgme.c:2962 pgp.c:679
 msgid "[-- END PGP PUBLIC KEY BLOCK --]\n"
 msgstr "[-- PGP 公共钥匙区段结束 --]\n"
 
-#: crypt-gpgme.c:2963 pgp.c:681
+#: crypt-gpgme.c:2964 pgp.c:681
 msgid "[-- END PGP SIGNED MESSAGE --]\n"
 msgstr "[-- PGP 签名的邮件结束 --]\n"
 
-#: crypt-gpgme.c:2986 pgp.c:715
+#: crypt-gpgme.c:2987 pgp.c:715
 msgid ""
 "[-- Error: could not find beginning of PGP message! --]\n"
 "\n"
@@ -1163,11 +1166,11 @@
 "[-- 错误：找不到 PGP 消息的开头！ --]\n"
 "\n"
 
-#: crypt-gpgme.c:3020 crypt-gpgme.c:3131 pgp.c:1163
+#: crypt-gpgme.c:3021 crypt-gpgme.c:3127 pgp.c:1162
 msgid "[-- Error: could not create temporary file! --]\n"
 msgstr "[-- 错误：无法创建临时文件！ --]\n"
 
-#: crypt-gpgme.c:3034
+#: crypt-gpgme.c:3035
 msgid ""
 "[-- The following data is PGP/MIME signed and encrypted --]\n"
 "\n"
@@ -1175,7 +1178,7 @@
 "[-- 以下数据已使用 PGP/MIME 签名并加密 --]\n"
 "\n"
 
-#: crypt-gpgme.c:3035 pgp.c:1173
+#: crypt-gpgme.c:3036 pgp.c:1178
 msgid ""
 "[-- The following data is PGP/MIME encrypted --]\n"
 "\n"
@@ -1183,23 +1186,23 @@
 "[-- 以下数据已使用 PGP/MIME 加密 --]\n"
 "\n"
 
-#: crypt-gpgme.c:3080
+#: crypt-gpgme.c:3081
 msgid "[-- End of PGP/MIME signed and encrypted data --]\n"
 msgstr "[-- PGP/MIME 签名并加密的数据结束 --]\n"
 
-#: crypt-gpgme.c:3081 pgp.c:1216
+#: crypt-gpgme.c:3082 pgp.c:1221
 msgid "[-- End of PGP/MIME encrypted data --]\n"
 msgstr "[-- PGP/MIME 加密数据结束 --]\n"
 
-#: crypt-gpgme.c:3086 pgp.c:676 pgp.c:1221
+#: crypt-gpgme.c:3087 pgp.c:676 pgp.c:1226
 msgid "PGP message successfully decrypted."
 msgstr "PGP 邮件成功解密。"
 
-#: crypt-gpgme.c:3092 pgp.c:609 pgp.c:668 pgp.c:1225
+#: pgp.c:609 pgp.c:668
 msgid "Could not decrypt PGP message"
 msgstr "无法解密 PGP 邮件"
 
-#: crypt-gpgme.c:3145
+#: crypt-gpgme.c:3141
 msgid ""
 "[-- The following data is S/MIME signed --]\n"
 "\n"
@@ -1207,7 +1210,7 @@
 "[-- 以下数据已使用 S/MIME 签名 --]\n"
 "\n"
 
-#: crypt-gpgme.c:3146
+#: crypt-gpgme.c:3142
 msgid ""
 "[-- The following data is S/MIME encrypted --]\n"
 "\n"
@@ -1215,23 +1218,23 @@
 "[-- 以下数据已使用 S/MIME 加密 --]\n"
 "\n"
 
-#: crypt-gpgme.c:3199
+#: crypt-gpgme.c:3195
 msgid "[-- End of S/MIME signed data --]\n"
 msgstr "[-- S/MIME 签名的数据结束 --]\n"
 
-#: crypt-gpgme.c:3200
+#: crypt-gpgme.c:3196
 msgid "[-- End of S/MIME encrypted data --]\n"
 msgstr "[-- S/MIME 加密的数据结束 --]\n"
 
-#: crypt-gpgme.c:3786
+#: crypt-gpgme.c:3784
 msgid "[Can't display this user ID (unknown encoding)]"
 msgstr "[无法显示用户 ID (未知编码)]"
 
-#: crypt-gpgme.c:3788
+#: crypt-gpgme.c:3786
 msgid "[Can't display this user ID (invalid encoding)]"
 msgstr "[无法显示用户 ID (无效编码)]"
 
-#: crypt-gpgme.c:3793
+#: crypt-gpgme.c:3791
 msgid "[Can't display this user ID (invalid DN)]"
 msgstr "[无法显示用户 ID (无效 DN)]"
 
@@ -1239,149 +1242,149 @@
 #. * The following are the headers for the "verify key" output from the
 #. * GPGME key selection menu (bound to "c" in the key selection menu).
 #. * They will be automatically aligned.
-#: crypt-gpgme.c:3867
+#: crypt-gpgme.c:3865
 msgid "Name: "
 msgstr "名称: "
 
-#: crypt-gpgme.c:3869
+#: crypt-gpgme.c:3867
 msgid "Valid From: "
 msgstr "生效于: "
 
-#: crypt-gpgme.c:3870
+#: crypt-gpgme.c:3868
 msgid "Valid To: "
 msgstr "有效至: "
 
-#: crypt-gpgme.c:3871
+#: crypt-gpgme.c:3869
 msgid "Key Type: "
 msgstr "密钥类型: "
 
-#: crypt-gpgme.c:3872
+#: crypt-gpgme.c:3870
 msgid "Key Usage: "
 msgstr "密钥用法: "
 
-#: crypt-gpgme.c:3874
+#: crypt-gpgme.c:3872
 msgid "Serial-No: "
 msgstr "序列号: "
 
-#: crypt-gpgme.c:3875
+#: crypt-gpgme.c:3873
 msgid "Issued By: "
 msgstr "颁发者: "
 
-#: crypt-gpgme.c:3876
+#: crypt-gpgme.c:3874
 msgid "Subkey: "
 msgstr "子密钥: "
 
 #. L10N: comes after the Name or aka if the key is invalid
 #. L10N: describes a subkey
-#: crypt-gpgme.c:3927 crypt-gpgme.c:4082
+#: crypt-gpgme.c:3925 crypt-gpgme.c:4080
 msgid "[Invalid]"
 msgstr "[无效]"
 
 #. L10N: This is printed after "Key Type: " and looks like this:
 #. *       PGP, 2048 bit RSA
-#: crypt-gpgme.c:3979 crypt-gpgme.c:4138
+#: crypt-gpgme.c:3977 crypt-gpgme.c:4136
 #, c-format
 msgid "%s, %lu bit %s\n"
 msgstr "%s, %lu 位 %s\n"
 
 #. L10N: value in Key Usage: field
-#: crypt-gpgme.c:3988 crypt-gpgme.c:4146
+#: crypt-gpgme.c:3986 crypt-gpgme.c:4144
 msgid "encryption"
 msgstr "加密"
 
-#: crypt-gpgme.c:3989 crypt-gpgme.c:3995 crypt-gpgme.c:4001 crypt-gpgme.c:4147
-#: crypt-gpgme.c:4152 crypt-gpgme.c:4157
+#: crypt-gpgme.c:3987 crypt-gpgme.c:3993 crypt-gpgme.c:3999 crypt-gpgme.c:4145
+#: crypt-gpgme.c:4150 crypt-gpgme.c:4155
 msgid ", "
 msgstr ", "
 
 #. L10N: value in Key Usage: field
-#: crypt-gpgme.c:3994 crypt-gpgme.c:4151
+#: crypt-gpgme.c:3992 crypt-gpgme.c:4149
 msgid "signing"
 msgstr "正在签名"
 
 #. L10N: value in Key Usage: field
-#: crypt-gpgme.c:4000 crypt-gpgme.c:4156
+#: crypt-gpgme.c:3998 crypt-gpgme.c:4154
 msgid "certification"
 msgstr "证书"
 
 #. L10N: describes a subkey
-#: crypt-gpgme.c:4076
+#: crypt-gpgme.c:4074
 msgid "[Revoked]"
 msgstr "[已吊销]"
 
 #. L10N: describes a subkey
-#: crypt-gpgme.c:4088
+#: crypt-gpgme.c:4086
 msgid "[Expired]"
 msgstr "[已过期]"
 
 #. L10N: describes a subkey
-#: crypt-gpgme.c:4094
+#: crypt-gpgme.c:4092
 msgid "[Disabled]"
 msgstr "[已禁用]"
 
-#: crypt-gpgme.c:4186
+#: crypt-gpgme.c:4184
 msgid "Collecting data..."
 msgstr "正在收集数据..."
 
-#: crypt-gpgme.c:4204
+#: crypt-gpgme.c:4202
 #, c-format
 msgid "Error finding issuer key: %s\n"
 msgstr "查找颁发者密钥出错：%s\n"
 
-#: crypt-gpgme.c:4214
+#: crypt-gpgme.c:4212
 msgid "Error: certification chain too long - stopping here\n"
 msgstr "错误：证书链过长 - 就此打住\n"
 
-#: crypt-gpgme.c:4225 pgpkey.c:587
+#: crypt-gpgme.c:4223 pgpkey.c:587
 #, c-format
 msgid "Key ID: 0x%s"
 msgstr "密钥 ID：0x%s"
 
-#: crypt-gpgme.c:3847
+#: crypt-gpgme.c:3736
 #, c-format
 msgid "gpgme_new failed: %s"
 msgstr "gpgme_new 失败：%s"
 
-#: crypt-gpgme.c:4343 crypt-gpgme.c:4396
+#: crypt-gpgme.c:4341 crypt-gpgme.c:4394
 #, c-format
 msgid "gpgme_op_keylist_start failed: %s"
 msgstr "gpgme_op_keylist_start 失败：%s"
 
-#: crypt-gpgme.c:4383 crypt-gpgme.c:4427 crypt-gpgme.c:5131
+#: crypt-gpgme.c:4381 crypt-gpgme.c:4425 crypt-gpgme.c:5130
 #, c-format
 msgid "gpgme_op_keylist_next failed: %s"
 msgstr "gpgme_op_keylist_next 失败：%s"
 
-#: crypt-gpgme.c:4498
+#: crypt-gpgme.c:4496
 msgid "All matching keys are marked expired/revoked."
 msgstr "所有符合的密钥都被标记为过期/吊销。"
 
-#: crypt-gpgme.c:4527 mutt_ssl.c:1321 mutt_ssl_gnutls.c:1031 pgpkey.c:516
-#: smime.c:448
+#: crypt-gpgme.c:4525 mutt_ssl.c:1336 mutt_ssl_gnutls.c:1049 pgpkey.c:516
+#: smime.c:463
 msgid "Exit  "
 msgstr "退出  "
 
-#: crypt-gpgme.c:4529 pgpkey.c:518 smime.c:450
+#: crypt-gpgme.c:4527 pgpkey.c:518 smime.c:465
 msgid "Select  "
 msgstr "选择  "
 
-#: crypt-gpgme.c:4532 pgpkey.c:521
+#: crypt-gpgme.c:4530 pgpkey.c:521
 msgid "Check key  "
 msgstr "检查钥匙  "
 
-#: crypt-gpgme.c:4549
+#: crypt-gpgme.c:4547
 msgid "PGP and S/MIME keys matching"
 msgstr "PGP 和 S/MIME 密钥匹配"
 
-#: crypt-gpgme.c:4551
+#: crypt-gpgme.c:4549
 msgid "PGP keys matching"
 msgstr "PGP 密钥匹配"
 
-#: crypt-gpgme.c:4553
+#: crypt-gpgme.c:4551
 msgid "S/MIME keys matching"
 msgstr "S/MIME 密钥匹配"
 
-#: crypt-gpgme.c:4555
+#: crypt-gpgme.c:4553
 msgid "keys matching"
 msgstr "密钥匹配"
 
@@ -1389,63 +1392,63 @@
 #. %1$s is one of the previous four entries.
 #. %2$s is an address.
 #. e.g. "S/MIME keys matching <me@mutt.org>."
-#: crypt-gpgme.c:4562
+#: crypt-gpgme.c:4560
 #, c-format
 msgid "%s <%s>."
 msgstr "%s <%s>."
 
 #. L10N:
 #. e.g. 'S/MIME keys matching "Michael Elkins".'
-#: crypt-gpgme.c:4566
+#: crypt-gpgme.c:4564
 #, c-format
 msgid "%s \"%s\"."
 msgstr "%s \"%s\"."
 
-#: crypt-gpgme.c:4593 pgpkey.c:608
+#: crypt-gpgme.c:4591 pgpkey.c:608
 msgid "This key can't be used: expired/disabled/revoked."
 msgstr "这个钥匙不能使用：过期/无效/已吊销。"
 
-#: crypt-gpgme.c:4607 pgpkey.c:620 smime.c:481
+#: crypt-gpgme.c:4605 pgpkey.c:620 smime.c:496
 msgid "ID is expired/disabled/revoked."
 msgstr "ID 已经过期/无效/已吊销。"
 
-#: crypt-gpgme.c:4615 pgpkey.c:624 smime.c:484
+#: crypt-gpgme.c:4613 pgpkey.c:624 smime.c:499
 msgid "ID has undefined validity."
 msgstr "ID 有效性未定义。"
 
-#: crypt-gpgme.c:4618 pgpkey.c:627
+#: crypt-gpgme.c:4616 pgpkey.c:627
 msgid "ID is not valid."
 msgstr "ID 无效。"
 
-#: crypt-gpgme.c:4621 pgpkey.c:630
+#: crypt-gpgme.c:4619 pgpkey.c:630
 msgid "ID is only marginally valid."
 msgstr "ID 仅勉强有效。"
 
-#: crypt-gpgme.c:4630 pgpkey.c:634 smime.c:491
+#: crypt-gpgme.c:4628 pgpkey.c:634 smime.c:506
 #, c-format
 msgid "%s Do you really want to use the key?"
 msgstr "%s 您真的要使用此密钥吗？"
 
-#: crypt-gpgme.c:4697 crypt-gpgme.c:4813 pgpkey.c:841 pgpkey.c:968
+#: crypt-gpgme.c:4695 crypt-gpgme.c:4812 pgpkey.c:841 pgpkey.c:969
 #, c-format
 msgid "Looking for keys matching \"%s\"..."
 msgstr "正寻找匹配 \"%s\" 的密钥..."
 
-#: crypt-gpgme.c:4964 pgp.c:1406
+#: crypt-gpgme.c:4963 pgp.c:1412
 #, c-format
 msgid "Use keyID = \"%s\" for %s?"
 msgstr "要使用 keyID = \"%s\" 用于 %s 吗？"
 
-#: crypt-gpgme.c:5017 pgp.c:1455 smime.c:813 smime.c:919
+#: crypt-gpgme.c:5016 pgp.c:1461 smime.c:831 smime.c:909
 #, c-format
 msgid "Enter keyID for %s: "
 msgstr "请输入 %s 的 keyID： "
 
-#: crypt-gpgme.c:5174 pgpkey.c:731
+#: crypt-gpgme.c:5173 pgpkey.c:731
 msgid "Please enter the key ID: "
 msgstr "请输入密钥 ID： "
 
-#: crypt-gpgme.c:5187
+#: crypt-gpgme.c:5186
 #, c-format
 msgid "Error exporting key: %s\n"
 msgstr "导出密钥出错：%s\n"
@@ -1454,20 +1457,20 @@
 #. MIME description for exported (attached) keys.
 #. You can translate this entry to a non-ASCII string (it will be encoded),
 #. but it may be safer to keep it untranslated.
-#: crypt-gpgme.c:5207
+#: crypt-gpgme.c:5206
 #, c-format
 msgid "PGP Key 0x%s."
 msgstr "PGP 密钥 0x%s。"
 
-#: crypt-gpgme.c:5249
+#: crypt-gpgme.c:5248
 msgid "GPGME: OpenPGP protocol not available"
 msgstr "GPGME: OpenPGP 协议不可用"
 
-#: crypt-gpgme.c:5257
+#: crypt-gpgme.c:5256
 msgid "GPGME: CMS protocol not available"
 msgstr "GPGME: CMS 协议不可用"
 
-#: crypt-gpgme.c:5294
+#: crypt-gpgme.c:5296
 msgid "S/MIME (s)ign, sign (a)s, (p)gp, (c)lear, or (o)ppenc mode off? "
 msgstr "S/MIME 签名(s)，选择身份签名(a)，(p)gp，清除(c)还是关(o)ppenc模式？ "
 
@@ -1475,59 +1478,59 @@
 #. 'clear'.  Please use a corresponding letter in your language.
 #. Alternatively, you may duplicate the letter 'c' is translated to.
 #. This comment also applies to the five following letter sequences.
-#: crypt-gpgme.c:5299
+#: crypt-gpgme.c:5301
 msgid "sapfco"
 msgstr "sapfco"
 
-#: crypt-gpgme.c:5304
+#: crypt-gpgme.c:5306
 msgid "PGP (s)ign, sign (a)s, s/(m)ime, (c)lear, or (o)ppenc mode off? "
 msgstr "PGP 签名(s)，选择身份签名(a)，s/(m)ime，清除(c)还是关(o)ppenc模式？ "
 
-#: crypt-gpgme.c:5305
+#: crypt-gpgme.c:5307
 msgid "samfco"
 msgstr "samfco"
 
-#: crypt-gpgme.c:5317
+#: crypt-gpgme.c:5319
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp, (c)lear, or (o)ppenc "
 "mode? "
 msgstr "S/MIME 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，(p)gp,清除(c)还是(o)ppenc模式？ "
 
-#: crypt-gpgme.c:5318
+#: crypt-gpgme.c:5320
 msgid "esabpfco"
 msgstr "esabpfco"
 
-#: crypt-gpgme.c:5323
+#: crypt-gpgme.c:5325
 msgid ""
 "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime, (c)lear, or (o)ppenc "
 "mode? "
 msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，s/(m)ime，清除(c)还是(o)ppenc模式？ "
 
-#: crypt-gpgme.c:5324
+#: crypt-gpgme.c:5326
 msgid "esabmfco"
 msgstr "esabmfco"
 
-#: crypt-gpgme.c:5335
+#: crypt-gpgme.c:5337
 msgid "S/MIME (e)ncrypt, (s)ign, sign (a)s, (b)oth, (p)gp or (c)lear? "
 msgstr "S/MIME 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，(p)gp还是清除(c)？ "
 
-#: crypt-gpgme.c:5336
+#: crypt-gpgme.c:5338
 msgid "esabpfc"
 msgstr "esabpfc"
 
-#: crypt-gpgme.c:5341
+#: crypt-gpgme.c:5343
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, s/(m)ime or (c)lear? "
 msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，两者皆要(b)，s/(m)ime还是清除(c)？ "
 
-#: crypt-gpgme.c:5342
+#: crypt-gpgme.c:5344
 msgid "esabmfc"
 msgstr "esabmfc"
 
-#: crypt-gpgme.c:5501
+#: crypt-gpgme.c:5502
 msgid "Failed to verify sender"
 msgstr "验证发送者失败"
 
-#: crypt-gpgme.c:5504
+#: crypt-gpgme.c:5505
 msgid "Failed to figure out sender"
 msgstr "找出发送者失败"
 
@@ -1545,39 +1548,39 @@
 msgid "Passphrase(s) forgotten."
 msgstr "已忘记通行密码。"
 
-#: crypt.c:167
+#: crypt.c:193
 msgid "Inline PGP can't be used with attachments.  Revert to PGP/MIME?"
 msgstr "有附件的情况下无法使用内嵌 PGP。转而使用 PGP/MIME 吗？"
 
-#: crypt.c:169
+#: crypt.c:195
 msgid "Mail not sent: inline PGP can't be used with attachments."
 msgstr "邮件未发送：嵌入 PGP 无法在有附件的时候使用。"
 
-#: crypt.c:186 cryptglue.c:115 pgpkey.c:567 pgpkey.c:754
+#: crypt.c:212 cryptglue.c:124 pgpkey.c:567 pgpkey.c:754
 msgid "Invoking PGP..."
 msgstr "正在调用 PGP..."
 
-#: crypt.c:195
+#: crypt.c:222
 msgid "Message can't be sent inline.  Revert to using PGP/MIME?"
 msgstr "无法将邮件嵌入发送。转而使用 PGP/MIME 吗？"
 
-#: crypt.c:197 send.c:2104
+#: crypt.c:224 send.c:2366
 msgid "Mail not sent."
 msgstr "邮件没有寄出。"
 
-#: crypt.c:548
+#: crypt.c:588
 msgid "S/MIME messages with no hints on content are unsupported."
 msgstr "不支持没有内容提示的 S/MIME 消息。"
 
-#: crypt.c:770 crypt.c:813
+#: crypt.c:810 crypt.c:853
 msgid "Trying to extract PGP keys...\n"
 msgstr "正在尝试提取 PGP 密钥...\n"
 
-#: crypt.c:793 crypt.c:833
+#: crypt.c:833 crypt.c:873
 msgid "Trying to extract S/MIME certificates...\n"
 msgstr "正在尝试提取 S/MIME 证书...\n"
 
-#: crypt.c:1038
+#: crypt.c:1078
 #, c-format
 msgid ""
 "[-- Error: Unknown multipart/signed protocol %s! --]\n"
@@ -1594,7 +1597,7 @@
 "[-- 错误：不一致的 multipart/signed 结构！ --]\n"
 "\n"
 
-#: crypt.c:1113
+#: crypt.c:1153
 #, c-format
 msgid ""
 "[-- Warning: We can't verify %s/%s signatures. --]\n"
@@ -1603,7 +1606,7 @@
 "[-- 警告：我们不能证实 %s/%s 签名。 --]\n"
 "\n"
 
-#: crypt.c:1126
+#: crypt.c:1166
 msgid ""
 "[-- The following data is signed --]\n"
 "\n"
@@ -1611,7 +1614,7 @@
 "[-- 以下数据已签名 --]\n"
 "\n"
 
-#: crypt.c:1133
+#: crypt.c:1173
 msgid ""
 "[-- Warning: Can't find any signatures. --]\n"
 "\n"
@@ -1619,7 +1622,7 @@
 "[-- 警告：找不到任何签名。 --]\n"
 "\n"
 
-#: crypt.c:1139
+#: crypt.c:1179
 msgid ""
 "\n"
 "[-- End of signed data --]\n"
@@ -1631,308 +1634,308 @@
 msgid "\"crypt_use_gpgme\" set but not built with GPGME support."
 msgstr "设置了 \"crypt_use_gpgme\" 但没有编译 GPGME 支持。"
 
-#: cryptglue.c:117
+#: cryptglue.c:126
 msgid "Invoking S/MIME..."
 msgstr "正在调用 S/MIME..."
 
 # Don't translate this!!
-#: curs_lib.c:313
+#: curs_lib.c:315
 msgid "yes"
 msgstr "yes"
 
 # Don't translate this!!
-#: curs_lib.c:314
+#: curs_lib.c:316
 msgid "no"
 msgstr "no"
 
-#: curs_lib.c:466
+#: curs_lib.c:468
 msgid "Exit Mutt?"
 msgstr "退出 Mutt？"
 
-#: curs_lib.c:931 mutt_socket.c:610 mutt_ssl.c:631
+#: curs_lib.c:940 mutt_socket.c:642 mutt_ssl.c:646
 msgid "unknown error"
 msgstr "未知错误"
 
-#: curs_lib.c:951
+#: curs_lib.c:960
 msgid "Press any key to continue..."
 msgstr "按任意键继续..."
 
-#: curs_lib.c:1015
+#: curs_lib.c:1024
 msgid " ('?' for list): "
 msgstr " (按'?'显示列表)： "
 
-#: curs_main.c:65 curs_main.c:817
+#: curs_main.c:67 curs_main.c:819
 msgid "No mailbox is open."
 msgstr "没有已打开的邮箱。"
 
-#: curs_main.c:66
+#: curs_main.c:68
 msgid "There are no messages."
 msgstr "没有邮件。"
 
-#: curs_main.c:67 mx.c:1206 pager.c:56 recvattach.c:45
+#: curs_main.c:69 mx.c:1206 pager.c:59 recvattach.c:45
 msgid "Mailbox is read-only."
 msgstr "邮箱是只读的。"
 
-#: curs_main.c:68 pager.c:57 recvattach.c:1133
+#: curs_main.c:70 pager.c:60 recvattach.c:1142
 msgid "Function not permitted in attach-message mode."
 msgstr "功能在邮件附件(attach-message)模式下不被支持。"
 
-#: curs_main.c:69
+#: curs_main.c:71
 msgid "No visible messages."
 msgstr "无可见邮件。"
 
 #. L10N: %s is one of the CHECK_ACL entries below.
-#: curs_main.c:115 pager.c:92
+#: curs_main.c:117 pager.c:95
 #, c-format
 msgid "%s: Operation not permitted by ACL"
 msgstr "%s: 访问控制列表(ACL)不允许此操作"
 
-#: curs_main.c:346
+#: curs_main.c:348
 msgid "Cannot toggle write on a readonly mailbox!"
 msgstr "无法在只读邮箱切换写入！"
 
-#: curs_main.c:353
+#: curs_main.c:355
 msgid "Changes to folder will be written on folder exit."
 msgstr "在退出文件夹后将会把改变写入文件夹。"
 
-#: curs_main.c:358
+#: curs_main.c:360
 msgid "Changes to folder will not be written."
 msgstr "将不会把改变写入文件夹。"
 
-#: curs_main.c:542
+#: curs_main.c:544
 msgid "Quit"
 msgstr "退出"
 
-#: curs_main.c:545 recvattach.c:59
+#: curs_main.c:547 recvattach.c:59
 msgid "Save"
 msgstr "保存"
 
-#: curs_main.c:546 query.c:49
+#: curs_main.c:548 query.c:50
 msgid "Mail"
 msgstr "写信"
 
-#: curs_main.c:547 pager.c:1582
+#: curs_main.c:549 pager.c:1585
 msgid "Reply"
 msgstr "回复"
 
-#: curs_main.c:548
+#: curs_main.c:550
 msgid "Group"
 msgstr "回复所有人"
 
-#: curs_main.c:696
+#: curs_main.c:698
 msgid "Mailbox was externally modified.  Flags may be wrong."
 msgstr "邮箱已有外部修改。标记可能有错误。"
 
-#: curs_main.c:699
+#: curs_main.c:701
 msgid "New mail in this mailbox."
 msgstr "此邮箱中有新邮件。"
 
-#: curs_main.c:710
+#: curs_main.c:712
 msgid "Mailbox was externally modified."
 msgstr "邮箱已有外部修改。"
 
-#: curs_main.c:824
+#: curs_main.c:826
 msgid "No tagged messages."
 msgstr "没有已标记的邮件。"
 
-#: curs_main.c:828 menu.c:1066
+#: curs_main.c:830 menu.c:1077
 msgid "Nothing to do."
 msgstr "无事可做。"
 
-#: curs_main.c:908
+#: curs_main.c:910
 msgid "Jump to message: "
 msgstr "跳到邮件： "
 
-#: curs_main.c:921
+#: curs_main.c:923
 msgid "Argument must be a message number."
 msgstr "参数必须是邮件编号。"
 
-#: curs_main.c:953
+#: curs_main.c:955
 msgid "That message is not visible."
 msgstr "这封邮件不可见。"
 
-#: curs_main.c:956
+#: curs_main.c:958
 msgid "Invalid message number."
 msgstr "无效的邮件编号。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:970 curs_main.c:2154 pager.c:2559
+#: curs_main.c:972 curs_main.c:2177 pager.c:2563
 msgid "Cannot delete message(s)"
 msgstr "无法删除邮件"
 
-#: curs_main.c:973
+#: curs_main.c:975
 msgid "Delete messages matching: "
 msgstr "删除符合此模式的邮件： "
 
-#: curs_main.c:1001
+#: curs_main.c:1003
 msgid "No limit pattern is in effect."
 msgstr "当前没有限制模式起作用。"
 
 #. L10N: ask for a limit to apply
-#: curs_main.c:1006
+#: curs_main.c:1008
 #, c-format
 msgid "Limit: %s"
 msgstr "限制：%s"
 
-#: curs_main.c:1016
+#: curs_main.c:1018
 msgid "Limit to messages matching: "
 msgstr "限制符合此模式的邮件： "
 
-#: curs_main.c:1037
+#: curs_main.c:1039
 msgid "To view all messages, limit to \"all\"."
 msgstr "要查看所有邮件，请将限制设为 \"all\"。"
 
-#: curs_main.c:1049 pager.c:2080
+#: curs_main.c:1051 pager.c:2083
 msgid "Quit Mutt?"
 msgstr "离开 Mutt？"
 
-#: curs_main.c:1139
+#: curs_main.c:1153
 msgid "Tag messages matching: "
 msgstr "标记符合此模式的邮件： "
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1149 curs_main.c:2497 pager.c:2804
+#: curs_main.c:1163 curs_main.c:2526 pager.c:2814
 msgid "Cannot undelete message(s)"
 msgstr "无法撤销删除邮件"
 
-#: curs_main.c:1151
+#: curs_main.c:1165
 msgid "Undelete messages matching: "
 msgstr "撤销删除符合此模式的邮件： "
 
-#: curs_main.c:1159
+#: curs_main.c:1173
 msgid "Untag messages matching: "
 msgstr "取消标记符合此模式的邮件： "
 
-#: curs_main.c:1189
+#: curs_main.c:1203
 msgid "Logged out of IMAP servers."
 msgstr "已从 IMAP 服务器退出。"
 
-#: curs_main.c:1286
+#: curs_main.c:1300
 msgid "Open mailbox in read-only mode"
 msgstr "用只读模式打开邮箱"
 
-#: curs_main.c:1288
+#: curs_main.c:1302
 msgid "Open mailbox"
 msgstr "打开邮箱"
 
-#: curs_main.c:1297
+#: curs_main.c:1311
 msgid "No mailboxes have new mail"
 msgstr "没有邮箱有新邮件"
 
-#: curs_main.c:1331 mx.c:535 mx.c:636
+#: curs_main.c:1345 mx.c:535 mx.c:636
 #, c-format
 msgid "%s is not a mailbox."
 msgstr "%s 不是邮箱。"
 
-#: curs_main.c:1467
+#: curs_main.c:1481
 msgid "Exit Mutt without saving?"
 msgstr "不保存便退出 Mutt 吗？"
 
-#: curs_main.c:1485 curs_main.c:1521 curs_main.c:1989 curs_main.c:2021
-#: flags.c:303 thread.c:1026 thread.c:1082 thread.c:1151
+#: curs_main.c:1507 curs_main.c:1543 curs_main.c:2011 curs_main.c:2043
+#: flags.c:303 thread.c:1026 thread.c:1082 thread.c:1150
 msgid "Threading is not enabled."
 msgstr "线索功能尚未启用。"
 
-#: curs_main.c:1497
+#: curs_main.c:1519
 msgid "Thread broken"
 msgstr "线索已断开"
 
-#: curs_main.c:1508
+#: curs_main.c:1530
 msgid "Thread cannot be broken, message is not part of a thread"
 msgstr "线索不能断开，因为邮件不是某线索的一部分"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1518
+#: curs_main.c:1540
 msgid "Cannot link threads"
 msgstr "无法连接线索"
 
-#: curs_main.c:1523
+#: curs_main.c:1545
 msgid "No Message-ID: header available to link thread"
 msgstr "无 Message-ID: 邮件头可用于连接线索"
 
-#: curs_main.c:1525
+#: curs_main.c:1547
 msgid "First, please tag a message to be linked here"
 msgstr "首先，请标记一个要连接到这里的邮件"
 
-#: curs_main.c:1537
+#: curs_main.c:1559
 msgid "Threads linked"
 msgstr "线索已连接"
 
-#: curs_main.c:1540
+#: curs_main.c:1562
 msgid "No thread linked"
 msgstr "线索没有连接"
 
-#: curs_main.c:1576 curs_main.c:1601
+#: curs_main.c:1598 curs_main.c:1623
 msgid "You are on the last message."
 msgstr "您已经在最后一封邮件了。"
 
-#: curs_main.c:1583 curs_main.c:1627
+#: curs_main.c:1605 curs_main.c:1649
 msgid "No undeleted messages."
 msgstr "没有要撤销删除的邮件。"
 
-#: curs_main.c:1620 curs_main.c:1644
+#: curs_main.c:1642 curs_main.c:1666
 msgid "You are on the first message."
 msgstr "您已经在第一封邮件了。"
 
-#: curs_main.c:1719 menu.c:887 pager.c:2199 pattern.c:1709
+#: curs_main.c:1741 menu.c:895 pager.c:2202 pattern.c:1878
 msgid "Search wrapped to top."
 msgstr "搜索从开头重新开始。"
 
-#: curs_main.c:1728 pager.c:2221 pattern.c:1720
+#: curs_main.c:1750 pager.c:2224 pattern.c:1889
 msgid "Search wrapped to bottom."
 msgstr "搜索从结尾重新开始。"
 
-#: curs_main.c:1772
+#: curs_main.c:1794
 msgid "No new messages in this limited view."
 msgstr "此限制视图中没有新邮件。"
 
-#: curs_main.c:1774
+#: curs_main.c:1796
 msgid "No new messages."
 msgstr "没有新邮件。"
 
-#: curs_main.c:1779
+#: curs_main.c:1801
 msgid "No unread messages in this limited view."
 msgstr "此限制视图中没有未读邮件。"
 
-#: curs_main.c:1781
+#: curs_main.c:1803
 msgid "No unread messages."
 msgstr "没有未读邮件。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1799
+#: curs_main.c:1821
 msgid "Cannot flag message"
 msgstr "无法标记邮件"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:1837 pager.c:2767
+#: curs_main.c:1859 pager.c:2777
 msgid "Cannot toggle new"
 msgstr "无法切换新邮件标记"
 
-#: curs_main.c:1922
+#: curs_main.c:1944
 msgid "No more threads."
 msgstr "没有更多的线索。"
 
-#: curs_main.c:1924
+#: curs_main.c:1946
 msgid "You are on the first thread."
 msgstr "您在第一个线索上。"
 
-#: curs_main.c:2007
+#: curs_main.c:2029
 msgid "Thread contains unread messages."
 msgstr "线索中有未读邮件。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:2110 pager.c:2526
+#: curs_main.c:2133 pager.c:2530
 msgid "Cannot delete message"
 msgstr "无法删除邮件"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:2191
+#: curs_main.c:2214
 msgid "Cannot edit message"
 msgstr "无法编辑邮件"
 
 #. L10N: This is displayed when the x-label on one or more
 #. * messages is edited.
-#: curs_main.c:2227 pager.c:2856
+#: curs_main.c:2251 pager.c:2866
 #, c-format
 msgid "%d labels changed."
 msgstr "%d 标签已改变。"
@@ -1940,44 +1943,44 @@
 #. L10N: This is displayed when editing an x-label, but no messages
 #. * were updated.  Possibly due to canceling at the prompt or if the new
 #. * label is the same as the old label.
-#: curs_main.c:2234 pager.c:2860
+#: curs_main.c:2258 pager.c:2870
 msgid "No labels changed."
 msgstr "标签没有改变。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:2322
+#: curs_main.c:2350
 msgid "Cannot mark message(s) as read"
 msgstr "无法标记邮件为已读"
 
 #. L10N: This is the prompt for <mark-message>.  Whatever they
 #. enter will be prefixed by $mark_macro_prefix and will become
 #. a macro hotkey to jump to the currently selected message.
-#: curs_main.c:2358
+#: curs_main.c:2386
 msgid "Enter macro stroke: "
 msgstr "请输入宏按键： "
 
 #. L10N: "message hotkey" is the key bindings menu description of a
 #. macro created by <mark-message>.
-#: curs_main.c:2366
+#: curs_main.c:2394
 msgid "message hotkey"
 msgstr "邮件热键"
 
 #. L10N: This is echoed after <mark-message> creates a new hotkey
 #. macro.  %s is the hotkey string ($mark_macro_prefix followed
 #. by whatever they typed at the prompt.)
-#: curs_main.c:2371
+#: curs_main.c:2399
 #, c-format
 msgid "Message bound to %s."
 msgstr "邮件已绑定到 %s。"
 
 #. L10N: This error is printed if <mark-message> cannot find a
 #. Message-ID for the currently selected message in the index.
-#: curs_main.c:2379
+#: curs_main.c:2407
 msgid "No message ID to macro."
 msgstr "没有邮件 ID 对应到宏。"
 
 #. L10N: CHECK_ACL
-#: curs_main.c:2467 pager.c:2787
+#: curs_main.c:2496 pager.c:2797
 msgid "Cannot undelete message"
 msgstr "无法撤销删除邮件"
 
@@ -2030,15 +2033,15 @@
 msgid "%d: invalid message number.\n"
 msgstr "%d：无效的邮件编号。\n"
 
-#: edit.c:333
+#: edit.c:344
 msgid "(End message with a . on a line by itself)\n"
 msgstr "(使用只包含 . 字符的行来结束邮件)\n"
 
-#: edit.c:392
+#: edit.c:403
 msgid "No mailbox.\n"
 msgstr "没有邮箱。\n"
 
-#: edit.c:396
+#: edit.c:407
 msgid "Message contains:\n"
 msgstr "邮件包含：\n"
 
@@ -2047,24 +2050,24 @@
 #. not IN the middle of the content.
 #. So it doesn't mean "(message will continue)"
 #. but means "(press any key to continue using mutt)".
-#: edit.c:405 edit.c:462
+#: edit.c:416 edit.c:475
 msgid "(continue)\n"
 msgstr "(继续)\n"
 
-#: edit.c:418
+#: edit.c:431
 msgid "missing filename.\n"
 msgstr "缺少文件名。\n"
 
-#: edit.c:438
+#: edit.c:451
 msgid "No lines in message.\n"
 msgstr "邮件中一行文字也没有。\n"
 
-#: edit.c:455
+#: edit.c:468
 #, c-format
 msgid "Bad IDN in %s: '%s'\n"
 msgstr "%s 中有错误的 IDN: '%s'\n"
 
-#: edit.c:473
+#: edit.c:486
 #, c-format
 msgid "%s: unknown editor command (~? for help)\n"
 msgstr "%s：未知的编辑器命令(~? 求助)\n"
@@ -2079,26 +2082,26 @@
 msgid "could not write temporary mail folder: %s"
 msgstr "无法创建临时邮件夹：%s"
 
-#: editmsg.c:113
+#: editmsg.c:114
 #, c-format
 msgid "could not truncate temporary mail folder: %s"
 msgstr "无法截断临时邮件夹：%s"
 
-#: editmsg.c:130
+#: editmsg.c:138
 msgid "Message file is empty!"
 msgstr "邮件文件是空的！"
 
-#: editmsg.c:137
+#: editmsg.c:145
 msgid "Message not modified!"
 msgstr "邮件未改动！"
 
-#: editmsg.c:145
+#: editmsg.c:153
 #, c-format
 msgid "Can't open message file: %s"
 msgstr "无法打开邮件文件：%s"
 
 #. L10N: %s is from strerror(errno)
-#: editmsg.c:153 editmsg.c:181
+#: editmsg.c:161 editmsg.c:190
 #, c-format
 msgid "Can't append to folder: %s"
 msgstr "无法添加到文件夹末尾：%s"
@@ -2145,82 +2148,82 @@
 msgid "[-- Can't run %s. --]\n"
 msgstr "[-- 无法运行 %s --]\n"
 
-#: handler.c:1393 handler.c:1414
+#: handler.c:1401 handler.c:1422
 #, c-format
 msgid "[-- Autoview stderr of %s --]\n"
 msgstr "[-- 自动显示命令 %s 输出到标准错误的内容 --]\n"
 
-#: handler.c:1458
+#: handler.c:1466
 msgid "[-- Error: message/external-body has no access-type parameter --]\n"
 msgstr "[-- 错误: message/external-body 没有访问类型参数 --]\n"
 
-#: handler.c:1479
+#: handler.c:1487
 #, c-format
 msgid "[-- This %s/%s attachment "
 msgstr "[-- 此 %s/%s 附件 "
 
-#: handler.c:1486
+#: handler.c:1494
 #, c-format
 msgid "(size %s bytes) "
 msgstr "(大小 %s 字节) "
 
-#: handler.c:1488
+#: handler.c:1496
 msgid "has been deleted --]\n"
 msgstr "已经被删除 --]\n"
 
-#: handler.c:1493
+#: handler.c:1501
 #, c-format
 msgid "[-- on %s --]\n"
 msgstr "[-- 在 %s --]\n"
 
-#: handler.c:1498
+#: handler.c:1506
 #, c-format
 msgid "[-- name: %s --]\n"
 msgstr "[-- 名称：%s --]\n"
 
-#: handler.c:1511 handler.c:1527
+#: handler.c:1519 handler.c:1535
 #, c-format
 msgid "[-- This %s/%s attachment is not included, --]\n"
 msgstr "[-- 此 %s/%s 附件未被包含， --]\n"
 
-#: handler.c:1513
+#: handler.c:1521
 msgid ""
 "[-- and the indicated external source has --]\n"
 "[-- expired. --]\n"
 msgstr "[-- 并且其标明的外部源已过期 --]\n"
 
-#: handler.c:1531
+#: handler.c:1539
 #, c-format
 msgid "[-- and the indicated access-type %s is unsupported --]\n"
 msgstr "[-- 并且其标明的访问类型 %s 不被支持 --]\n"
 
-#: handler.c:1638
+#: handler.c:1646
 msgid "Unable to open temporary file!"
 msgstr "无法打开临时文件！"
 
-#: handler.c:1822
+#: handler.c:1838
 msgid "Error: multipart/signed has no protocol."
 msgstr "错误：multipart/signed 没有协议。"
 
-#: handler.c:1878
+#: handler.c:1894
 msgid "[-- This is an attachment "
 msgstr "[-- 这是一个附件 "
 
-#: handler.c:1880
+#: handler.c:1896
 #, c-format
 msgid "[-- %s/%s is unsupported "
 msgstr "[-- %s/%s 尚未支持 "
 
-#: handler.c:1887
+#: handler.c:1903
 #, c-format
 msgid "(use '%s' to view this part)"
 msgstr "(使用 '%s' 来显示这部份)"
 
-#: handler.c:1889
+#: handler.c:1905
 msgid "(need 'view-attachments' bound to key!)"
 msgstr "(需要将 'view-attachments' 绑定到快捷键！)"
 
-#: headers.c:184
+#: headers.c:206
 #, c-format
 msgid "%s: unable to attach file"
 msgstr "%s：无法添加附件"
@@ -2275,16 +2278,16 @@
 msgid "badly formatted command string"
 msgstr "未格式化好的命令字符串"
 
-#: hook.c:393
+#: hook.c:406
 msgid "unhook: Can't do unhook * from within a hook."
 msgstr "unhook: 无法在一个钩子里进行 unhook * 操作"
 
-#: hook.c:406
+#: hook.c:419
 #, c-format
 msgid "unhook: unknown hook type: %s"
 msgstr "unhook：未知钩子类型：%s"
 
-#: hook.c:412
+#: hook.c:425
 #, c-format
 msgid "unhook: Can't delete a %s from within a %s."
 msgstr "unhook: 无法从 %2$s 中删除 %1$s"
@@ -2338,7 +2341,7 @@
 msgid "SASL authentication failed."
 msgstr "SASL 认证失败。"
 
-#: imap/browse.c:60 imap/imap.c:625
+#: imap/browse.c:60 imap/imap.c:651
 #, c-format
 msgid "%s is an invalid IMAP path"
 msgstr "%s 是无效的 IMAP 路径"
@@ -2381,7 +2384,7 @@
 msgid "Mailbox renamed."
 msgstr "邮箱已重命名。"
 
-#: imap/command.c:267 imap/command.c:348
+#: imap/command.c:268 imap/command.c:349
 #, c-format
 msgid "Connection to %s timed out"
 msgstr "到 %s 的连接已超时"
@@ -2390,106 +2393,106 @@
 msgid "Mailbox closed"
 msgstr "信箱已关闭。"
 
-#: imap/imap.c:125
+#: imap/imap.c:128
 #, c-format
 msgid "CREATE failed: %s"
 msgstr "CREATE(创建)失败：%s"
 
-#: imap/imap.c:196
+#: imap/imap.c:199
 #, c-format
 msgid "Closing connection to %s..."
 msgstr "正在关闭到 %s 的连接..."
 
-#: imap/imap.c:345
+#: imap/imap.c:348
 msgid "This IMAP server is ancient. Mutt does not work with it."
 msgstr "这个 IMAP 服务器已过时，Mutt 无法与之工作。"
 
-#: imap/imap.c:488 pop_lib.c:296 smtp.c:469
+#: imap/imap.c:499 pop_lib.c:296 smtp.c:469
 msgid "Secure connection with TLS?"
 msgstr "使用 TLS 安全连接？"
 
-#: imap/imap.c:498 pop_lib.c:316 smtp.c:481
+#: imap/imap.c:509 pop_lib.c:316 smtp.c:481
 msgid "Could not negotiate TLS connection"
 msgstr "无法协商 TLS 连接"
 
-#: imap/imap.c:514 pop_lib.c:337
+#: imap/imap.c:525 imap/imap.c:542 pop_lib.c:337
 msgid "Encrypted connection unavailable"
 msgstr "加密连接不可用"
 
-#: imap/imap.c:657
+#: imap/imap.c:684
 #, c-format
 msgid "Selecting %s..."
 msgstr "正在选择 %s..."
 
-#: imap/imap.c:837
+#: imap/imap.c:864
 msgid "Error opening mailbox"
 msgstr "打开邮箱时出错"
 
-#: imap/imap.c:887 imap/imap.c:2339 imap/message.c:1418 muttlib.c:1902
+#: imap/imap.c:916 imap/imap.c:2410 imap/message.c:1426 muttlib.c:2007
 #, c-format
 msgid "Create %s?"
 msgstr "创建 %s 吗？"
 
-#: imap/imap.c:1291
+#: imap/imap.c:1336
 msgid "Expunge failed"
 msgstr "执行删除失败"
 
-#: imap/imap.c:1303
+#: imap/imap.c:1349
 #, c-format
 msgid "Marking %d messages deleted..."
 msgstr "已标记的 %d 封邮件已删除..."
 
-#: imap/imap.c:1359
+#: imap/imap.c:1406
 #, c-format
 msgid "Saving changed messages... [%d/%d]"
 msgstr "正在保存已改变的邮件... [%d/%d]"
 
-#: imap/imap.c:1420
+#: imap/imap.c:1488
 msgid "Error saving flags. Close anyway?"
 msgstr "保存标记出错。仍然关闭吗？"
 
-#: imap/imap.c:1428
+#: imap/imap.c:1496
 msgid "Error saving flags"
 msgstr "保存标记时出错"
 
-#: imap/imap.c:1451
+#: imap/imap.c:1520
 msgid "Expunging messages from server..."
 msgstr "正在从服务器上删除邮件..."
 
-#: imap/imap.c:1457
+#: imap/imap.c:1526
 msgid "imap_sync_mailbox: EXPUNGE failed"
 msgstr "imap_sync_mailbox: EXPUNGE(删除)失败"
 
-#: imap/imap.c:1975
+#: imap/imap.c:2048
 #, c-format
 msgid "Header search without header name: %s"
 msgstr "无邮件头名的邮件头搜索：%s"
 
-#: imap/imap.c:2047
+#: imap/imap.c:2119
 msgid "Bad mailbox name"
 msgstr "错误的邮箱名"
 
-#: imap/imap.c:2073
+#: imap/imap.c:2144
 #, c-format
 msgid "Subscribing to %s..."
 msgstr "正在订阅 %s..."
 
-#: imap/imap.c:2075
+#: imap/imap.c:2146
 #, c-format
 msgid "Unsubscribing from %s..."
 msgstr "正在退订 %s..."
 
-#: imap/imap.c:2085
+#: imap/imap.c:2156
 #, c-format
 msgid "Subscribed to %s"
 msgstr "已订阅 %s..."
 
-#: imap/imap.c:2087
+#: imap/imap.c:2158
 #, c-format
 msgid "Unsubscribed from %s"
 msgstr "已退订 %s..."
 
-#: imap/imap.c:2324 imap/message.c:1382
+#: imap/imap.c:2395 imap/message.c:1390
 #, c-format
 msgid "Copying %d messages to %s..."
 msgstr "正在复制 %d 个邮件到 %s ..."
@@ -2498,38 +2501,38 @@
 msgid "Integer overflow -- can't allocate memory."
 msgstr "整数溢出 -- 无法分配内存。"
 
-#: imap/message.c:747
+#: imap/message.c:751
 msgid "Unable to fetch headers from this IMAP server version."
 msgstr "无法获取此版本的 IMAP 服务器的邮件头。"
 
-#: imap/message.c:760
+#: imap/message.c:764
 #, c-format
 msgid "Could not create temporary file %s"
 msgstr "无法创建临时文件 %s"
 
 #. L10N:
 #. Comparing the cached data with the IMAP server's data
-#: imap/message.c:426
+#: imap/message.c:427
 msgid "Evaluating cache..."
 msgstr "正在评估缓存..."
 
-#: imap/message.c:767 pop.c:309
+#: imap/message.c:772 pop.c:309
 msgid "Fetching message headers..."
 msgstr "正在获取邮件头..."
 
-#: imap/message.c:977 imap/message.c:1043 pop.c:603
+#: imap/message.c:983 imap/message.c:1049 pop.c:603
 msgid "Fetching message..."
 msgstr "正在获取邮件..."
 
-#: imap/message.c:1030 pop.c:598
+#: imap/message.c:1036 pop.c:598
 msgid "The message index is incorrect. Try reopening the mailbox."
 msgstr "邮件索引不正确。请尝试重新打开邮件箱。"
 
-#: imap/message.c:1205
+#: imap/message.c:1212
 msgid "Uploading message..."
 msgstr "正在上传邮件..."
 
-#: imap/message.c:1386
+#: imap/message.c:1394
 #, c-format
 msgid "Copying message %d to %s..."
 msgstr "正在复制邮件 %d 到 %s ..."
@@ -2538,200 +2541,200 @@
 msgid "Continue?"
 msgstr "继续？"
 
-#: init.c:61 init.c:2187 pager.c:55
+#: init.c:61 init.c:2194 pager.c:58
 msgid "Not available in this menu."
 msgstr "在此菜单中不可用。"
 
-#: init.c:465
+#: init.c:457
 #, c-format
 msgid "Bad regexp: %s"
 msgstr "错误的正则表达式：%s"
 
-#: init.c:522
+#: init.c:514
 msgid "Not enough subexpressions for template"
 msgstr "没有足够的子表达式来用于模板"
 
-#: hook.c:301 init.c:701 init.c:782 init.c:790 init.c:812
+#: hook.c:314 init.c:693 init.c:774 init.c:782 init.c:804
 msgid "not enough arguments"
 msgstr "参数不够"
 
-#: init.c:874
+#: init.c:866
 msgid "spam: no matching pattern"
 msgstr "垃圾邮件：无匹配的模式"
 
-#: init.c:876
+#: init.c:868
 msgid "nospam: no matching pattern"
 msgstr "去掉垃圾邮件：无匹配的模板"
 
-#: init.c:1074
+#: init.c:1066
 #, c-format
 msgid "%sgroup: missing -rx or -addr."
 msgstr "%sgroup: 缺少 -rx 或 -addr。"
 
-#: init.c:1092
+#: init.c:1084
 #, c-format
 msgid "%sgroup: warning: bad IDN '%s'.\n"
 msgstr "%sgroup: 警告：错误的 IDN '%s'。\n"
 
-#: init.c:1311
+#: init.c:1303
 msgid "attachments: no disposition"
 msgstr "附件：无处理方式"
 
-#: init.c:1352
+#: init.c:1353
 msgid "attachments: invalid disposition"
 msgstr "附件：无效的处理方式"
 
-#: init.c:1379
+#: init.c:1380
 msgid "unattachments: no disposition"
 msgstr "去掉附件：无处理方式"
 
-#: init.c:1417
+#: init.c:1427
 msgid "unattachments: invalid disposition"
 msgstr "去掉附件：无效的处理方式"
 
-#: init.c:1546
+#: init.c:1556
 msgid "alias: no address"
 msgstr "别名：没有邮件地址"
 
-#: init.c:1594
+#: init.c:1604
 #, c-format
 msgid "Warning: Bad IDN '%s' in alias '%s'.\n"
 msgstr "警告：错误的 IDN '%s'在别名'%s'中。\n"
 
-#: init.c:1683
+#: init.c:1693
 msgid "invalid header field"
 msgstr "无效的邮件头域"
 
-#: init.c:1736
+#: init.c:1743
 #, c-format
 msgid "%s: unknown sorting method"
 msgstr "%s：未知的排序方式"
 
-#: init.c:1845
+#: init.c:1852
 #, c-format
 msgid "mutt_restore_default(%s): error in regexp: %s\n"
 msgstr "mutt_restore_defualt(%s)：正则表达式有错误：%s\n"
 
-#: init.c:2067 init.c:2234
+#: init.c:2074 init.c:2241
 #, c-format
 msgid "%s is unset"
 msgstr "%s 没有被设定"
 
-#: init.c:2164 init.c:2279
+#: init.c:2171 init.c:2287
 #, c-format
 msgid "%s: unknown variable"
 msgstr "%s：未知的变量"
 
-#: init.c:2173
+#: init.c:2180
 msgid "prefix is illegal with reset"
 msgstr "reset 不能与前缀一起使用"
 
-#: init.c:2179
+#: init.c:2186
 msgid "value is illegal with reset"
 msgstr "reset 时不能指定值"
 
-#: init.c:2214 init.c:2226
+#: init.c:2221 init.c:2233
 msgid "Usage: set variable=yes|no"
 msgstr "用法：set variable=yes|no"
 
-#: init.c:2234
+#: init.c:2241
 #, c-format
 msgid "%s is set"
 msgstr "%s 已被设定"
 
-#: init.c:2345
+#: init.c:2361
 #, c-format
 msgid "Invalid value for option %s: \"%s\""
 msgstr "选项 %s 的值无效：\"%s\""
 
-#: init.c:2487
+#: init.c:2503
 #, c-format
 msgid "%s: invalid mailbox type"
 msgstr "%s：无效的邮箱类型"
 
-#: init.c:2518 init.c:2582
+#: init.c:2534 init.c:2598
 #, c-format
 msgid "%s: invalid value (%s)"
 msgstr "%s：无效的值 (%s)"
 
-#: init.c:2519 init.c:2583
+#: init.c:2535 init.c:2599
 msgid "format error"
 msgstr "格式错误"
 
-#: init.c:2519 init.c:2583
+#: init.c:2535 init.c:2599
 msgid "number overflow"
 msgstr "数值溢出"
 
-#: init.c:2617
+#: init.c:2633
 #, c-format
 msgid "%s: invalid value"
 msgstr "%s：无效值"
 
-#: init.c:2661
+#: init.c:2677
 #, c-format
 msgid "%s: Unknown type."
 msgstr "%s：未知类型。"
 
-#: init.c:2688
+#: init.c:2704
 #, c-format
 msgid "%s: unknown type"
 msgstr "%s：未知类型"
 
-#: init.c:2763
+#: init.c:2784
 #, c-format
 msgid "Error in %s, line %d: %s"
 msgstr "%s 发生错误，第 %d 行：%s"
 
-#: init.c:2786
+#: init.c:2808
 #, c-format
 msgid "source: errors in %s"
 msgstr "source：%s 中有错误"
 
-#: init.c:2787
+#: init.c:2809
 #, c-format
 msgid "source: reading aborted due to too many errors in %s"
 msgstr "source: 读取因 %s 中错误过多而中止"
 
-#: init.c:2802
+#: init.c:2827
 #, c-format
 msgid "source: error at %s"
 msgstr "source：%s 有错误"
 
-#: init.c:2807
+#: init.c:2832
 msgid "source: too many arguments"
 msgstr "source：参数太多"
 
-#: init.c:2866
+#: init.c:2909
 #, c-format
 msgid "%s: unknown command"
 msgstr "%s：未知命令"
 
-#: init.c:3370
+#: init.c:3413
 #, c-format
 msgid "Error in command line: %s\n"
 msgstr "命令行有错：%s\n"
 
-#: init.c:3492
+#: init.c:3535
 msgid "unable to determine home directory"
 msgstr "无法确定用户主目录"
 
-#: init.c:3500
+#: init.c:3543
 msgid "unable to determine username"
 msgstr "无法确定用户名"
 
-#: init.c:3526
+#: init.c:3569
 msgid "unable to determine nodename via uname()"
 msgstr "无法通过 uname() 确定主机名"
 
-#: init.c:3754
+#: init.c:3793
 msgid "-group: no group name"
 msgstr "-group: 无组名称"
 
-#: init.c:3764
+#: init.c:3803
 msgid "out of arguments"
 msgstr "参数不够用"
 
-#: keymap.c:547
+#: keymap.c:539
 msgid "Macros are currently disabled."
 msgstr "目前宏被禁用。"
 
@@ -2851,7 +2854,7 @@
 "\n"
 "许多这里没有提到的人也贡献了代码，修正以及建议。\n"
 
-#: main.c:102
+#: main.c:105
 msgid ""
 "    This program is free software; you can redistribute it and/or modify\n"
 "    it under the terms of the GNU General Public License as published by\n"
@@ -2870,7 +2873,7 @@
 "    本程序是基于使用目的而加以发布，然而不负任何担保责任；亦无对适售性或\n"
 "    特定目的适用性所为的默示性担保。详情请参照 GNU 通用公共许可。\n"
 
-#: main.c:112
+#: main.c:115
 msgid ""
 "    You should have received a copy of the GNU General Public License\n"
 "    along with this program; if not, write to the Free Software\n"
@@ -2880,7 +2883,7 @@
 "    您应已收到附随于本程序的 GNU 通用公共许可的副本；如果没有，请写信\n"
 "    至自由软件基金会，51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.\n"
 
-#: main.c:131
+#: main.c:134
 msgid ""
 "usage: mutt [<options>] [-z] [-f <file> | -yZ]\n"
 "       mutt [<options>] [-Ex] [-Hi <file>] [-s <subj>] [-bc <addr>] [-a "
@@ -2904,7 +2907,7 @@
 "      mutt [<选项>] -D\n"
 "      mutt -v[v]\n"
 
-#: main.c:140
+#: main.c:143
 msgid ""
 "options:\n"
 "  -A <alias>\texpand the given alias\n"
@@ -2921,11 +2924,11 @@
 "  -c <地址>\t指定一个抄送(CC)地址\n"
 "  -D\t\t打印所有变量的值到标准输出"
 
-#: main.c:149
+#: main.c:152
 msgid "  -d <level>\tlog debugging output to ~/.muttdebug0"
 msgstr "  -d <级别>\t将调试输出记录到 ~/.muttdebug0"
 
-#: main.c:152
+#: main.c:155
 msgid ""
 "  -E\t\tedit the draft (-H) or include (-i) file\n"
 "  -e <command>\tspecify a command to be executed after initialization\n"
@@ -2947,7 +2950,7 @@
 "  -n\t\t使 Mutt 不去读取系统的 Muttrc\n"
 "  -p\t\t取回一个延迟寄送的邮件"
 
-#: main.c:162
+#: main.c:165
 msgid ""
 "  -Q <variable>\tquery a configuration variable\n"
 "  -R\t\topen mailbox in read-only mode\n"
@@ -2969,7 +2972,7 @@
 "  -Z\t\t打开第一个有新邮件的文件夹，如果一个也没有的话立即退出\n"
 "  -h\t\t本帮助消息"
 
-#: main.c:248
+#: main.c:251
 msgid ""
 "\n"
 "Compile options:"
@@ -2977,21 +2980,21 @@
 "\n"
 "编译选项："
 
-#: main.c:586
+#: main.c:589
 msgid "Error initializing terminal."
 msgstr "初始化终端时出错。"
 
-#: main.c:746
+#: main.c:749
 #, c-format
 msgid "Error: value '%s' is invalid for -d.\n"
 msgstr "错误：值“%s”对于 -d 来说无效。\n"
 
-#: main.c:749
+#: main.c:752
 #, c-format
 msgid "Debugging at level %d.\n"
 msgstr "正在使用调试级别 %d。\n"
 
-#: main.c:751
+#: main.c:754
 msgid "DEBUG was not defined during compilation.  Ignored.\n"
 msgstr "编译时没有定义 DEBUG。已忽略。\n"
 
@@ -3000,7 +3003,7 @@
 #. for some reason (e.g. autocrypt, header cache, bcache), but it
 #. doesn't exist.  The prompt is asking whether to create the directory
 #. 
-#: autocrypt/autocrypt.c:55 main.c:946
+#: autocrypt/autocrypt.c:56 main.c:949
 #, c-format
 msgid "%s does not exist. Create it?"
 msgstr "%s 不存在。创建它吗？"
@@ -3009,37 +3012,37 @@
 #. mkdir() on the directory %s failed.  The second %s is the
 #. error message returned by libc
 #. 
-#: autocrypt/autocrypt.c:64 main.c:950
+#: autocrypt/autocrypt.c:65 main.c:953
 #, c-format
 msgid "Can't create %s: %s."
 msgstr "无法创建 %s: %s。"
 
-#: main.c:991
+#: main.c:994
 msgid "Failed to parse mailto: link\n"
 msgstr "解析 mailto: 链接失败\n"
 
-#: main.c:1006
+#: main.c:1009
 msgid "No recipients specified.\n"
 msgstr "没有指定收件人。\n"
 
-#: main.c:1032
+#: main.c:1035
 msgid "Cannot use -E flag with stdin\n"
 msgstr "无法将 -E 标志用于标准输入\n"
 
-#: main.c:1196
+#: main.c:1199
 #, c-format
 msgid "%s: unable to attach file.\n"
 msgstr "%s：无法添加附件。\n"
 
-#: main.c:1285
+#: main.c:1288
 msgid "No mailbox with new mail."
 msgstr "没有邮箱有新邮件。"
 
-#: main.c:1299
+#: main.c:1302
 msgid "No incoming mailboxes defined."
 msgstr "未定义收信邮箱"
 
-#: main.c:1327
+#: main.c:1330
 msgid "Mailbox is empty."
 msgstr "邮箱是空的。"
 
@@ -3105,7 +3108,7 @@
 msgstr "无效的索引编号。"
 
 #: menu.c:455 menu.c:477 menu.c:542 menu.c:585 menu.c:601 menu.c:612 menu.c:623
-#: menu.c:634 menu.c:647 menu.c:660 menu.c:1197
+#: menu.c:634 menu.c:647 menu.c:660 menu.c:1208
 msgid "No entries."
 msgstr "没有条目。"
 
@@ -3125,39 +3128,39 @@
 msgid "You are on the last page."
 msgstr "您现在在最后一页。"
 
-#: menu.c:671
+#: compose.c:728 compose.c:738 menu.c:671
 msgid "You are on the last entry."
 msgstr "您现在在最后一项。"
 
-#: menu.c:682
+#: compose.c:773 menu.c:682
 msgid "You are on the first entry."
 msgstr "您现在在第一项。"
 
-#: menu.c:861 pager.c:2244 pattern.c:1641
+#: menu.c:869 pager.c:2247 pattern.c:1810
 msgid "Search for: "
 msgstr "搜索： "
 
-#: menu.c:861 pager.c:2244 pattern.c:1641
+#: menu.c:869 pager.c:2247 pattern.c:1810
 msgid "Reverse search for: "
 msgstr "反向搜索： "
 
-#: menu.c:905 pager.c:2196 pager.c:2218 pager.c:2339 pattern.c:1763
+#: menu.c:913 pager.c:2199 pager.c:2221 pager.c:2342 pattern.c:1932
 msgid "Not found."
 msgstr "没有找到。"
 
-#: menu.c:1060
+#: menu.c:1071
 msgid "No tagged entries."
 msgstr "没有已标记的条目。"
 
-#: menu.c:1161
+#: menu.c:1172
 msgid "Search is not implemented for this menu."
 msgstr "此菜单未实现搜索。"
 
-#: menu.c:1166
+#: menu.c:1177
 msgid "Jumping is not implemented for dialogs."
 msgstr "对话模式中未实现跳转。"
 
-#: menu.c:1200
+#: menu.c:1211
 msgid "Tagging is not supported."
 msgstr "不支持标记。"
 
@@ -3194,68 +3197,68 @@
 msgid "Error setting SASL external user name"
 msgstr "设置 SASL 外部用户名时出错"
 
-#: mutt_socket.c:162
+#: mutt_socket.c:192
 #, c-format
 msgid "Connection to %s closed"
 msgstr "到 %s 的连接已关闭"
 
-#: mutt_socket.c:281
+#: mutt_socket.c:311
 msgid "SSL is unavailable."
 msgstr "SSL 不可用。"
 
-#: mutt_socket.c:313
+#: mutt_socket.c:343
 msgid "Preconnect command failed."
 msgstr "预连接命令失败。"
 
-#: mutt_socket.c:397 mutt_socket.c:420
+#: mutt_socket.c:427 mutt_socket.c:450
 #, c-format
 msgid "Error talking to %s (%s)"
 msgstr "与 %s 通话出错(%s)"
 
-#: mutt_socket.c:502 mutt_socket.c:561
+#: mutt_socket.c:534 mutt_socket.c:593
 #, c-format
 msgid "Bad IDN \"%s\"."
 msgstr "错误的 IDN \"%s\"。"
 
-#: mutt_socket.c:510 mutt_socket.c:569
+#: mutt_socket.c:542 mutt_socket.c:601
 #, c-format
 msgid "Looking up %s..."
 msgstr "正在查找 %s..."
 
-#: mutt_socket.c:520 mutt_socket.c:579
+#: mutt_socket.c:552 mutt_socket.c:611
 #, c-format
 msgid "Could not find the host \"%s\""
 msgstr "无法找到主机\"%s\""
 
-#: mutt_socket.c:526 mutt_socket.c:585
+#: mutt_socket.c:558 mutt_socket.c:617
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正在连接到 %s..."
 
-#: mutt_socket.c:609
+#: mutt_socket.c:641
 #, c-format
 msgid "Could not connect to %s (%s)."
 msgstr "无法连接到 %s (%s)"
 
-#: mutt_ssl.c:272 mutt_ssl.c:554
+#: mutt_ssl.c:284 mutt_ssl.c:569
 msgid "Warning: error enabling ssl_verify_partial_chains"
 msgstr "警告：启用 ssl_verify_partial_chains 时出错"
 
-#: mutt_ssl.c:358
+#: mutt_ssl.c:370
 msgid "Failed to find enough entropy on your system"
 msgstr "在您的系统上寻找足够的熵时失败"
 
-#: mutt_ssl.c:387
+#: mutt_ssl.c:399
 #, c-format
 msgid "Filling entropy pool: %s...\n"
 msgstr "正在填充熵池：%s...\n"
 
-#: mutt_ssl.c:395
+#: mutt_ssl.c:407
 #, c-format
 msgid "%s has insecure permissions!"
 msgstr "%s 的访问权限不安全！"
 
-#: mutt_ssl.c:414
+#: mutt_ssl.c:426
 msgid "SSL disabled due to the lack of entropy"
 msgstr "SSL 因缺少熵而被禁用"
 
@@ -3263,22 +3266,22 @@
 #. *       function SSL_CTX_new().  In this case it returned NULL: an
 #. *       error condition.
 #. 
-#: mutt_ssl.c:491
+#: mutt_ssl.c:506
 msgid "Unable to create SSL context"
 msgstr "无法创建 SSL 上下文"
 
 #. L10N: This is a warning when trying to set the host name for
 #. * TLS Server Name Indication (SNI).  This allows the server to present
 #. * the correct certificate if it supports multiple hosts.
-#: mutt_ssl.c:614 mutt_ssl_gnutls.c:445
+#: mutt_ssl.c:629 mutt_ssl_gnutls.c:460
 msgid "Warning: unable to set TLS SNI host name"
 msgstr "警告：无法设置 TLS SNI 主机名"
 
-#: mutt_ssl.c:625
+#: mutt_ssl.c:640
 msgid "I/O error"
 msgstr "输入/输出错误"
 
-#: mutt_ssl.c:634
+#: mutt_ssl.c:649
 #, c-format
 msgid "SSL failed: %s"
 msgstr "SSL 失败：%s"
@@ -3287,83 +3290,83 @@
 #. %1$s is version (e.g. "TLSv1.2")
 #. %2$s is cipher_version (e.g. "TLSv1/SSLv3")
 #. %3$s is cipher_name (e.g. "ECDHE-RSA-AES128-GCM-SHA256")
-#: mutt_ssl.c:644
+#: mutt_ssl.c:659
 #, c-format
 msgid "%s connection using %s (%s)"
 msgstr "%s 连接，使用 %s (%s)"
 
-#: mutt_ssl.c:774
+#: mutt_ssl.c:789
 msgid "Unknown"
 msgstr "未知"
 
-#: mutt_ssl.c:787 mutt_ssl_gnutls.c:633
+#: mutt_ssl.c:802 mutt_ssl_gnutls.c:648
 #, c-format
 msgid "[unable to calculate]"
 msgstr "[无法计算]"
 
-#: mutt_ssl.c:805 mutt_ssl_gnutls.c:656
+#: mutt_ssl.c:820 mutt_ssl_gnutls.c:671
 msgid "[invalid date]"
 msgstr "[无效日期]"
 
-#: mutt_ssl.c:874
+#: mutt_ssl.c:889
 msgid "Server certificate is not yet valid"
 msgstr "服务器证书尚未生效"
 
-#: mutt_ssl.c:884
+#: mutt_ssl.c:899
 msgid "Server certificate has expired"
 msgstr "服务器证书已过期"
 
-#: mutt_ssl.c:1033
+#: mutt_ssl.c:1048
 msgid "cannot get certificate subject"
 msgstr "无法获取证书持有者"
 
-#: mutt_ssl.c:1043 mutt_ssl.c:1052
+#: mutt_ssl.c:1058 mutt_ssl.c:1067
 msgid "cannot get certificate common name"
 msgstr "无法获取证书通用名称"
 
-#: mutt_ssl.c:1067
+#: mutt_ssl.c:1082
 #, c-format
 msgid "certificate owner does not match hostname %s"
 msgstr "证书所有者与主机名 %s 不匹配"
 
-#: mutt_ssl.c:1174
+#: mutt_ssl.c:1189
 #, c-format
 msgid "Certificate host check failed: %s"
 msgstr "证书主机名检查失败：%s"
 
-#: mutt_ssl.c:1236 mutt_ssl_gnutls.c:900
+#: mutt_ssl.c:1251 mutt_ssl_gnutls.c:918
 msgid "This certificate belongs to:"
 msgstr "此证书属于："
 
-#: mutt_ssl.c:1245 mutt_ssl_gnutls.c:942
+#: mutt_ssl.c:1260 mutt_ssl_gnutls.c:960
 msgid "This certificate was issued by:"
 msgstr "此证书颁发自："
 
-#: mutt_ssl.c:1254 mutt_ssl_gnutls.c:955
+#: mutt_ssl.c:1269 mutt_ssl_gnutls.c:973
 msgid "This certificate is valid"
 msgstr "此证书有效"
 
-#: mutt_ssl.c:1255 mutt_ssl_gnutls.c:958
+#: mutt_ssl.c:1270 mutt_ssl_gnutls.c:976
 #, c-format
 msgid "   from %s"
 msgstr "   来自 %s"
 
-#: mutt_ssl.c:1258 mutt_ssl_gnutls.c:963
+#: mutt_ssl.c:1273 mutt_ssl_gnutls.c:981
 #, c-format
 msgid "     to %s"
 msgstr "     发往 %s"
 
-#: mutt_ssl.c:1265 mutt_ssl_gnutls.c:970
+#: mutt_ssl.c:1280 mutt_ssl_gnutls.c:988
 #, c-format
 msgid "SHA1 Fingerprint: %s"
 msgstr "SHA1 指纹：%s"
 
-#: mutt_ssl.c:1211 mutt_ssl_gnutls.c:962
+#: mutt_ssl_gnutls.c:953
 #, c-format
 msgid "MD5 Fingerprint: %s"
 msgstr "MD5 指纹：%s"
 
-#: mutt_ssl.c:1278 mutt_ssl_gnutls.c:1000
+#: mutt_ssl.c:1293 mutt_ssl_gnutls.c:1018
 #, c-format
 msgid "SSL Certificate check (certificate %d of %d in chain)"
 msgstr "SSL 证书检查 (检查链中的第 %d 个证书，共 %d 个)"
@@ -3374,31 +3377,31 @@
 #. * These prompts are the interactive certificate confirmation prompts for
 #. * an OpenSSL connection.
 #. 
-#: mutt_ssl.c:1304
+#: mutt_ssl.c:1319
 msgid "roas"
 msgstr "roas"
 
-#: mutt_ssl.c:1308
+#: mutt_ssl.c:1323
 msgid "(r)eject, accept (o)nce, (a)ccept always, (s)kip"
 msgstr "拒绝(r)，接受一次(o)，总是接受(a)，跳过(s)"
 
-#: mutt_ssl.c:1310 mutt_ssl_gnutls.c:1009
+#: mutt_ssl.c:1325 mutt_ssl_gnutls.c:1027
 msgid "(r)eject, accept (o)nce, (a)ccept always"
 msgstr "拒绝(r)，接受一次(o)，总是接受(a)"
 
-#: mutt_ssl.c:1315
+#: mutt_ssl.c:1330
 msgid "(r)eject, accept (o)nce, (s)kip"
 msgstr "拒绝(r)，接受一次(o)，跳过(s)"
 
-#: mutt_ssl.c:1317 mutt_ssl_gnutls.c:1020
+#: mutt_ssl.c:1332 mutt_ssl_gnutls.c:1038
 msgid "(r)eject, accept (o)nce"
 msgstr "拒绝(r)，接受一次(o)"
 
-#: mutt_ssl.c:1355 mutt_ssl_gnutls.c:1083
+#: mutt_ssl.c:1370 mutt_ssl_gnutls.c:1101
 msgid "Warning: Couldn't save certificate"
 msgstr "警告：无法保存证书"
 
-#: mutt_ssl.c:1360 mutt_ssl_gnutls.c:1088
+#: mutt_ssl.c:1375 mutt_ssl_gnutls.c:1106
 msgid "Certificate saved"
 msgstr "证书已保存"
 
@@ -3406,48 +3409,48 @@
 msgid "Error: no TLS socket open"
 msgstr "错误：没有打开 TLS 套接字"
 
-#: mutt_ssl_gnutls.c:329 mutt_ssl_gnutls.c:373
+#: mutt_ssl_gnutls.c:344 mutt_ssl_gnutls.c:388
 msgid "All available protocols for TLS/SSL connection disabled"
 msgstr "所有用于 TLS/SSL 连接的可用协议已禁用"
 
-#: mutt_ssl_gnutls.c:379
+#: mutt_ssl_gnutls.c:394
 msgid "Explicit ciphersuite selection via $ssl_ciphers not supported"
 msgstr "不支持通过 $ssl_ciphers 来显式指定加密套件的选择"
 
-#: mutt_ssl_gnutls.c:497
+#: mutt_ssl_gnutls.c:512
 #, c-format
 msgid "SSL/TLS connection using %s (%s/%s/%s)"
 msgstr "使用 %s 的 SSL/TLS 连接 (%s/%s/%s)"
 
-#: mutt_ssl_gnutls.c:724 mutt_ssl_gnutls.c:852
+#: mutt_ssl_gnutls.c:742 mutt_ssl_gnutls.c:870
 msgid "Error initialising gnutls certificate data"
 msgstr "无法初始化 gnutls 证书数据。"
 
-#: mutt_ssl_gnutls.c:731 mutt_ssl_gnutls.c:859
+#: mutt_ssl_gnutls.c:749 mutt_ssl_gnutls.c:877
 msgid "Error processing certificate data"
 msgstr "处理证书数据出错"
 
-#: mutt_ssl_gnutls.c:997
+#: mutt_ssl_gnutls.c:1015
 msgid "Warning: Server certificate was signed using an insecure algorithm"
 msgstr "警告：服务器证书是使用不安全的算法签署的"
 
-#: mutt_ssl_gnutls.c:986
+#: mutt_ssl_gnutls.c:1004
 msgid "WARNING: Server certificate is not yet valid"
 msgstr "警告：服务器证书尚未有效"
 
-#: mutt_ssl_gnutls.c:988
+#: mutt_ssl_gnutls.c:1006
 msgid "WARNING: Server certificate has expired"
 msgstr "警告：服务器证书已过期"
 
-#: mutt_ssl_gnutls.c:990
+#: mutt_ssl_gnutls.c:1008
 msgid "WARNING: Server certificate has been revoked"
 msgstr "警告：服务器证书已吊销"
 
-#: mutt_ssl_gnutls.c:992
+#: mutt_ssl_gnutls.c:1010
 msgid "WARNING: Server hostname does not match certificate"
 msgstr "警告：服务器主机名与证书不匹配"
 
-#: mutt_ssl_gnutls.c:994
+#: mutt_ssl_gnutls.c:1012
 msgid "WARNING: Signer of server certificate is not a CA"
 msgstr "警告：服务器证书签署者不是证书颁发机构(CA)"
 
@@ -3457,7 +3460,7 @@
 #. * This is an interactive certificate confirmation prompt for
 #. * a GNUTLS connection.
 #. 
-#: mutt_ssl_gnutls.c:1016
+#: mutt_ssl_gnutls.c:1034
 msgid "roa"
 msgstr "roa"
 
@@ -3467,20 +3470,20 @@
 #. * These is an interactive certificate confirmation prompt for
 #. * a GNUTLS connection.
 #. 
-#: mutt_ssl_gnutls.c:1027
+#: mutt_ssl_gnutls.c:1045
 msgid "ro"
 msgstr "ro"
 
-#: mutt_ssl_gnutls.c:1120 mutt_ssl_gnutls.c:1155 mutt_ssl_gnutls.c:1165
+#: mutt_ssl_gnutls.c:1162 mutt_ssl_gnutls.c:1197
 msgid "Unable to get certificate from peer"
 msgstr "无法从对端获取证书"
 
-#: mutt_ssl_gnutls.c:1126
+#: mutt_ssl_gnutls.c:1164
 #, c-format
 msgid "Certificate verification error (%s)"
 msgstr "证书验证错误 (%s)"
 
-#: mutt_ssl_gnutls.c:1135
+#: mutt_ssl_gnutls.c:1094
 msgid "Certificate is not X.509"
 msgstr "证书不是 X.509"
 
@@ -3502,43 +3505,43 @@
 #. L10N:
 #. Means "The path you specified as the destination file is a directory."
 #. See the msgid "Save to file: " (alias.c, recvattach.c)
-#: muttlib.c:1154
+#: muttlib.c:1258
 msgid "File is a directory, save under it? [(y)es, (n)o, (a)ll]"
 msgstr "文件是一个目录，在其下保存吗？[是(y), 否(n), 全部(a)]"
 
-#: muttlib.c:1154
+#: muttlib.c:1258
 msgid "yna"
 msgstr "yna"
 
 #. L10N:
 #. Means "The path you specified as the destination file is a directory."
 #. See the msgid "Save to file: " (alias.c, recvattach.c)
-#: muttlib.c:1173
+#: muttlib.c:1277
 msgid "File is a directory, save under it?"
 msgstr "文件是一个目录，在其下保存吗？"
 
-#: muttlib.c:1178
+#: muttlib.c:1282
 msgid "File under directory: "
 msgstr "在目录下的文件： "
 
-#: muttlib.c:1192
+#: muttlib.c:1296
 msgid "File exists, (o)verwrite, (a)ppend, or (c)ancel?"
 msgstr "文件已经存在, 覆盖(o), 追加(a), 或取消(c)？"
 
-#: muttlib.c:1192
+#: muttlib.c:1296
 msgid "oac"
 msgstr "oac"
 
-#: muttlib.c:1865
+#: muttlib.c:1970
 msgid "Can't save message to POP mailbox."
 msgstr "无法将邮件保存到 POP 邮箱。"
 
-#: muttlib.c:1875
+#: muttlib.c:1980
 #, c-format
 msgid "Append messages to %s?"
 msgstr "追加邮件到 %s 末尾?"
 
-#: muttlib.c:1888
+#: muttlib.c:1993
 #, c-format
 msgid "%s is not a mailbox!"
 msgstr "%s 不是邮箱！"
@@ -3631,138 +3634,142 @@
 msgid "Mailbox checkpointed."
 msgstr "邮箱已检查。"
 
-#: pager.c:1575
+#: pager.c:1578
 msgid "PrevPg"
 msgstr "上一页"
 
-#: pager.c:1576
+#: pager.c:1579
 msgid "NextPg"
 msgstr "下一页"
 
-#: pager.c:1580
+#: pager.c:1583
 msgid "View Attachm."
 msgstr "显示附件。"
 
-#: pager.c:1583
+#: pager.c:1586
 msgid "Next"
 msgstr "下一个"
 
-#: pager.c:2096 pager.c:2127 pager.c:2160 pager.c:2453
+#: pager.c:2099 pager.c:2130 pager.c:2163 pager.c:2456
 msgid "Bottom of message is shown."
 msgstr "已显示邮件的最末端。"
 
-#: pager.c:2112 pager.c:2134 pager.c:2141 pager.c:2149
+#: pager.c:2115 pager.c:2137 pager.c:2144 pager.c:2152
 msgid "Top of message is shown."
 msgstr "已显示邮件的最上端。"
 
-#: pager.c:2386
+#: pager.c:2389
 msgid "Help is currently being shown."
 msgstr "现在正显示帮助。"
 
-#: pager.c:2420
+#: pager.c:2423
 msgid "No more quoted text."
 msgstr "无更多引用文本。"
 
-#: pager.c:2433
+#: pager.c:2436
 msgid "No more unquoted text after quoted text."
 msgstr "引用文本后没有其它未引用文本。"
 
-#: parse.c:697
+#: parse.c:715
 msgid "multipart message has no boundary parameter!"
 msgstr "多部份邮件没有边界参数！"
 
-#: pattern.c:272 pattern.c:724
+#: pattern.c:340 pattern.c:831
 #, c-format
 msgid "Error in expression: %s"
 msgstr "表达式有错误：%s"
 
-#: pattern.c:278 pattern.c:729
+#: pattern.c:346 pattern.c:836
 msgid "Empty expression"
 msgstr "空表达式"
 
-#: pattern.c:406
+#: pattern.c:498 pattern.c:513
 #, c-format
 msgid "Invalid day of month: %s"
 msgstr "无效的日子：%s"
 
-#: pattern.c:420
+#: pattern.c:503 pattern.c:527
 #, c-format
 msgid "Invalid month: %s"
 msgstr "无效的月份：%s"
 
-#: pattern.c:582
+#: pattern.c:689
 #, c-format
 msgid "Invalid relative date: %s"
 msgstr "无效的相对日期：%s"
 
-#: pattern.c:853 pattern.c:1021
+#: pattern.c:1001 pattern.c:1172
 #, c-format
 msgid "error in pattern at: %s"
 msgstr "模式有错误：%s"
 
-#: pattern.c:880
+#: pattern.c:1028
 #, c-format
 msgid "missing pattern: %s"
 msgstr "缺少模式：%s"
 
-#: pattern.c:899
+#: pattern.c:1047
 #, c-format
 msgid "mismatched brackets: %s"
 msgstr "不匹配的括号：%s"
 
-#: pattern.c:959
+#: pattern.c:1107
 #, c-format
 msgid "%c: invalid pattern modifier"
 msgstr "%c：无效的模式修饰符"
 
-#: pattern.c:965
+#: pattern.c:1113
 #, c-format
 msgid "%c: not supported in this mode"
 msgstr "%c：此模式下不支持"
 
-#: pattern.c:978
+#: pattern.c:1129
 msgid "missing parameter"
 msgstr "缺少参数"
 
-#: pattern.c:994
+#: pattern.c:1145
 #, c-format
 msgid "mismatched parenthesis: %s"
 msgstr "不匹配的圆括号：%s"
 
-#: pattern.c:1028
+#: pattern.c:971 pattern.c:1179
 msgid "empty pattern"
 msgstr "空模式"
 
-#: pattern.c:1420
+#. L10N:
+#. An unknown pattern operator was somehow invoked.  This
+#. shouldn't be possible unless there is a bug.
+#. 
+#: pattern.c:905 pattern.c:1589
 #, c-format
 msgid "error: unknown op %d (report this error)."
 msgstr "错误：未知操作(op) %d (请报告这个错误)。"
 
-#: pattern.c:1511 pattern.c:1664
+#: pattern.c:1680 pattern.c:1833
 msgid "Compiling search pattern..."
 msgstr "正在编译搜索模式..."
 
-#: pattern.c:1530
+#: pattern.c:1699
 msgid "Executing command on matching messages..."
 msgstr "正在对符合的邮件执行命令..."
 
-#: pattern.c:1601
+#: pattern.c:1770
 msgid "No messages matched criteria."
 msgstr "没有邮件符合标准。"
 
-#: pattern.c:1699
+#: pattern.c:1868
 msgid "Searching..."
 msgstr "正在搜索..."
 
-#: pattern.c:1712
+#: pattern.c:1881
 msgid "Search hit bottom without finding match"
 msgstr "已搜索至结尾而未发现匹配"
 
-#: pattern.c:1723
+#: pattern.c:1892
 msgid "Search hit top without finding match"
 msgstr "已搜索至开头而未发现匹配"
 
-#: pattern.c:1755
+#: pattern.c:1924
 msgid "Search interrupted."
 msgstr "搜索已中断。"
 
@@ -3778,7 +3785,7 @@
 msgid "[-- Error: unable to create PGP subprocess! --]\n"
 msgstr "[-- 错误：无法创建 PGP 子进程！ --]\n"
 
-#: pgp.c:586 pgp.c:867 pgp.c:1025
+#: pgp.c:586 pgp.c:867 pgp.c:1172
 msgid ""
 "[-- End of PGP output --]\n"
 "\n"
@@ -3798,28 +3805,28 @@
 "[-- 错误：无法创建 PGP 子进程！ --]\n"
 "\n"
 
-#: pgp.c:1013 pgp.c:1037 smime.c:1999
+#: pgp.c:1013 pgp.c:1036 smime.c:1990
 msgid "Decryption failed"
 msgstr "解密失败。"
 
-#: pgp.c:1282
+#: pgp.c:1288
 msgid "Can't open PGP subprocess!"
 msgstr "无法打开 PGP 子进程！"
 
-#: pgp.c:1721
+#: pgp.c:1727
 msgid "Can't invoke PGP"
 msgstr "不能调用 PGP"
 
-#: pgp.c:1829
+#: pgp.c:1838
 #, c-format
 msgid "PGP (s)ign, sign (a)s, %s format, (c)lear, or (o)ppenc mode off? "
 msgstr "PGP 签名(s)，选择身份签名(a)，%s 格式，清除(c)还是关(o)ppenc模式？ "
 
-#: pgp.c:1830 pgp.c:1860 pgp.c:1882
+#: pgp.c:1839 pgp.c:1869 pgp.c:1891
 msgid "PGP/M(i)ME"
 msgstr "PGP/M(i)ME"
 
-#: pgp.c:1830 pgp.c:1860 pgp.c:1882
+#: pgp.c:1839 pgp.c:1869 pgp.c:1891
 msgid "(i)nline"
 msgstr "嵌入(i)"
 
@@ -3827,51 +3834,51 @@
 #. 'clear'.  Please use a corresponding letter in your language.
 #. Alternatively, you may duplicate the letter 'c' is translated to.
 #. This comment also applies to the five following letter sequences.
-#: pgp.c:1836
+#: pgp.c:1845
 msgid "safcoi"
 msgstr "safcoi"
 
-#: pgp.c:1841
+#: pgp.c:1850
 msgid "PGP (s)ign, sign (a)s, (c)lear, or (o)ppenc mode off? "
 msgstr "PGP 签名(s)，选择身份签名(a)，清除(c)还是关(o)ppenc模式？ "
 
-#: pgp.c:1842
+#: pgp.c:1851
 msgid "safco"
 msgstr "safco"
 
-#: pgp.c:1859
+#: pgp.c:1868
 #, c-format
 msgid ""
 "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, (c)lear, or (o)ppenc "
 "mode? "
 msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，%s 格式，清除(c)还是(o)ppenc模式？ "
 
-#: pgp.c:1862
+#: pgp.c:1871
 msgid "esabfcoi"
 msgstr "esabfcoi"
 
-#: pgp.c:1867
+#: pgp.c:1876
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, (c)lear, or (o)ppenc mode? "
 msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，清除(c)还是(o)ppenc模式？ "
 
-#: pgp.c:1868
+#: pgp.c:1877
 msgid "esabfco"
 msgstr "esabfco"
 
-#: pgp.c:1881
+#: pgp.c:1890
 #, c-format
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s format, or (c)lear? "
 msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，%s 格式，或清除(c)？ "
 
-#: pgp.c:1884
+#: pgp.c:1893
 msgid "esabfci"
 msgstr "esabfci"
 
-#: pgp.c:1889
+#: pgp.c:1898
 msgid "PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, or (c)lear? "
 msgstr "PGP 加密(e)，签名(s)，选择身份签名(a)，同时(b)，或清除(c)？ "
 
-#: pgp.c:1890
+#: pgp.c:1899
 msgid "esabfc"
 msgstr "esabfc"
 
@@ -4016,55 +4023,55 @@
 msgid "Connection lost. Reconnect to POP server?"
 msgstr "连接丢失。重新连接到 POP 服务器吗？"
 
-#: postpone.c:170
+#: postpone.c:171
 msgid "Postponed Messages"
 msgstr "邮件已经被延迟寄出"
 
-#: postpone.c:253 postpone.c:274
+#: postpone.c:249 postpone.c:258
 msgid "No postponed messages."
 msgstr "没有被延迟寄出的邮件。"
 
-#: postpone.c:500 postpone.c:521 postpone.c:555
+#: postpone.c:490 postpone.c:511 postpone.c:545
 msgid "Illegal crypto header"
 msgstr "非法的加密(crypto)邮件头"
 
-#: postpone.c:541
+#: postpone.c:531
 msgid "Illegal S/MIME header"
 msgstr "非法的 S/MIME 邮件头"
 
-#: postpone.c:639 postpone.c:754 postpone.c:777
+#: postpone.c:629 postpone.c:744 postpone.c:767
 msgid "Decrypting message..."
 msgstr "正在解密邮件..."
 
-#: postpone.c:643 postpone.c:759 postpone.c:782
+#: postpone.c:633 postpone.c:749 postpone.c:772
 msgid "Decryption failed."
 msgstr "解密失败。"
 
-#: query.c:50
+#: query.c:51
 msgid "New Query"
 msgstr "新查询"
 
-#: query.c:51
+#: query.c:52
 msgid "Make Alias"
 msgstr "制作别名"
 
-#: history.c:77 query.c:52
+#: history.c:77 query.c:53
 msgid "Search"
 msgstr "搜索"
 
-#: query.c:118
+#: query.c:119
 msgid "Waiting for response..."
 msgstr "正在等待回应..."
 
-#: query.c:266 query.c:295
+#: query.c:267 query.c:296
 msgid "Query command not defined."
 msgstr "查询命令未定义。"
 
-#: query.c:325 query.c:358
+#: query.c:326 query.c:359
 msgid "Query: "
 msgstr "查询： "
 
-#: query.c:333 query.c:367
+#: query.c:334 query.c:368
 #, c-format
 msgid "Query '%s'"
 msgstr "查询 '%s'"
@@ -4077,120 +4084,120 @@
 msgid "Print"
 msgstr "打印"
 
-#: recvattach.c:491
+#: recvattach.c:493
 msgid "Saving..."
 msgstr "正在保存..."
 
-#: recvattach.c:495 recvattach.c:600
+#: recvattach.c:497 recvattach.c:602
 msgid "Attachment saved."
 msgstr "附件已保存。"
 
-#: recvattach.c:618
+#: recvattach.c:620
 #, c-format
 msgid "WARNING!  You are about to overwrite %s, continue?"
 msgstr "警告! 您即将覆盖 %s, 继续？"
 
-#: recvattach.c:635
+#: recvattach.c:637
 msgid "Attachment filtered."
 msgstr "附件已被过滤。"
 
-#: recvattach.c:713
+#: recvattach.c:716
 msgid "Filter through: "
 msgstr "使用过滤器过滤： "
 
-#: recvattach.c:713
+#: recvattach.c:716
 msgid "Pipe to: "
 msgstr "通过管道传给： "
 
-#: recvattach.c:751
+#: recvattach.c:760
 #, c-format
 msgid "I don't know how to print %s attachments!"
 msgstr "我不知道要如何打印 %s 类型的附件！"
 
-#: recvattach.c:821
+#: recvattach.c:830
 msgid "Print tagged attachment(s)?"
 msgstr "打印已标记的附件？"
 
-#: recvattach.c:821
+#: recvattach.c:830
 msgid "Print attachment?"
 msgstr "打印附件？"
 
-#: recvattach.c:881
+#: recvattach.c:890
 msgid "Structural changes to decrypted attachments are not supported"
 msgstr "不支持对已解密附件的结构性更改"
 
-#: recvattach.c:1039
+#: recvattach.c:1048
 msgid "Can't decrypt encrypted message!"
 msgstr "无法解密已加密邮件！"
 
-#: recvattach.c:1166
+#: recvattach.c:1175
 msgid "Attachments"
 msgstr "附件"
 
-#: recvattach.c:1204
+#: recvattach.c:1213
 msgid "There are no subparts to show!"
 msgstr "无子部分可显示！"
 
-#: recvattach.c:1259
+#: recvattach.c:1268
 msgid "Can't delete attachment from POP server."
 msgstr "无法从 POP 服务器上删除附件"
 
-#: recvattach.c:1267
+#: recvattach.c:1276
 msgid "Deletion of attachments from encrypted messages is unsupported."
 msgstr "不支持从加密邮件中删除附件。"
 
-#: recvattach.c:1273
+#: recvattach.c:1282
 msgid ""
 "Deletion of attachments from signed messages may invalidate the signature."
 msgstr "从已签名邮件中删除附件会使签名失效。"
 
-#: recvattach.c:1290 recvattach.c:1307
+#: recvattach.c:1299 recvattach.c:1316
 msgid "Only deletion of multipart attachments is supported."
 msgstr "只支持删除多部分附件"
 
-#: recvcmd.c:43
+#: recvcmd.c:44
 msgid "You may only bounce message/rfc822 parts."
 msgstr "您只能重发 message/rfc822 的部分。"
 
-#: recvcmd.c:239
+#: recvcmd.c:240
 msgid "Error bouncing message!"
 msgstr "重发邮件出错！"
 
-#: recvcmd.c:239
+#: recvcmd.c:240
 msgid "Error bouncing messages!"
 msgstr "重发邮件出错！"
 
-#: recvcmd.c:448
+#: recvcmd.c:449
 #, c-format
 msgid "Can't open temporary file %s."
 msgstr "无法打开临时文件 %s。"
 
-#: recvcmd.c:479
+#: recvcmd.c:480
 msgid "Forward as attachments?"
 msgstr "作为附件转发？"
 
-#: recvcmd.c:493
+#: recvcmd.c:494
 msgid "Can't decode all tagged attachments.  MIME-forward the others?"
 msgstr "无法解码所有已标记的附件。通过 MIME 转发其它的吗？"
 
-#: recvcmd.c:621
+#: recvcmd.c:620
 msgid "Forward MIME encapsulated?"
 msgstr "用 MIME 封装并转发？"
 
-#: recvcmd.c:629 recvcmd.c:926
+#: recvcmd.c:628 recvcmd.c:925
 #, c-format
 msgid "Can't create %s."
 msgstr "无法创建 %s。"
 
-#: recvcmd.c:801
+#: recvcmd.c:800
 msgid "Can't find any tagged messages."
 msgstr "无法找到任何已标记邮件。"
 
-#: recvcmd.c:822 send.c:862
+#: recvcmd.c:821 send.c:864
 msgid "No mailing lists found!"
 msgstr "没有找到邮件列表！"
 
-#: recvcmd.c:907
+#: recvcmd.c:906
 msgid "Can't decode all tagged attachments.  MIME-encapsulate the others?"
 msgstr "无法解码所有已标记的附件。通过 MIME 封装其它的吗？"
 
@@ -4266,11 +4273,11 @@
 msgid "Improperly formatted entry for type %s in \"%s\" line %d"
 msgstr "在 \"%2$s\" 的第 %3$d 行发现类型 %1$s 为错误的格式记录"
 
-#: rfc1524.c:437
+#: rfc1524.c:396
 msgid "No mailcap path specified"
 msgstr "没有指定 mailcap 路径"
 
-#: rfc1524.c:468
+#: rfc1524.c:482
 #, c-format
 msgid "mailcap entry for type %s not found"
 msgstr "没有发现类型 %s 的 mailcap 纪录"
@@ -4279,148 +4286,148 @@
 msgid "score: too few arguments"
 msgstr "score：参数太少"
 
-#: score.c:85
+#: score.c:84
 msgid "score: too many arguments"
 msgstr "score：参数太多"
 
-#: score.c:124
+#: score.c:123
 msgid "Error: score: invalid number"
 msgstr "错误：score：无效数值"
 
-#: send.c:261
+#: send.c:263
 msgid "No subject, abort?"
 msgstr "没有主题，放弃吗？"
 
-#: send.c:263
+#: send.c:265
 msgid "No subject, aborting."
 msgstr "没有主题，正在放弃。"
 
 #. L10N:
 #. Asks whether the user respects the reply-to header.
 #. If she says no, mutt will reply to the from header's address instead.
-#: send.c:617
+#: send.c:619
 #, c-format
 msgid "Reply to %s%s?"
 msgstr "回信到 %s%s？"
 
-#: send.c:652
+#: send.c:654
 #, c-format
 msgid "Follow-up to %s%s?"
 msgstr "发送后续邮件到 %s%s？"
 
-#: send.c:837
+#: send.c:839
 msgid "No tagged messages are visible!"
 msgstr "无可见的已标记邮件！"
 
-#: send.c:891
+#: send.c:893
 msgid "Include message in reply?"
 msgstr "在回信中包含原邮件吗？"
 
-#: send.c:896
+#: send.c:898
 msgid "Including quoted message..."
 msgstr "正在包含引用邮件..."
 
-#: send.c:906
+#: send.c:908
 msgid "Could not include all requested messages!"
 msgstr "无法包含所有请求的邮件！"
 
-#: send.c:920
+#: send.c:922
 msgid "Forward as attachment?"
 msgstr "作为附件转发？"
 
-#: send.c:924
+#: send.c:926
 msgid "Preparing forwarded message..."
 msgstr "正在准备转发邮件..."
 
-#: send.c:1641
+#: send.c:1824
 msgid "Recall postponed message?"
 msgstr "叫出延迟寄出的邮件吗？"
 
-#: send.c:1905
+#: send.c:2120
 msgid "Edit forwarded message?"
 msgstr "编辑已转发的邮件吗？"
 
-#: send.c:1942
+#: send.c:2184
 msgid "Abort unmodified message?"
 msgstr "放弃未修改过的邮件？"
 
-#: send.c:1944
+#: send.c:2186
 msgid "Aborted unmodified message."
 msgstr "已放弃未修改过的邮件。"
 
-#: send.c:2111
+#: send.c:2373
 msgid "Message postponed."
 msgstr "邮件被延迟寄出。"
 
-#: send.c:2122
+#: send.c:2389
 msgid "No recipients are specified!"
 msgstr "没有指定收件人！"
 
-#: send.c:2127
+#: send.c:2394
 msgid "No recipients were specified."
 msgstr "没有已指定的收件人。"
 
-#: send.c:2143
+#: send.c:2410
 msgid "No subject, abort sending?"
 msgstr "没有邮件主题，要放弃发送吗?"
 
-#: send.c:2147
+#: send.c:2414
 msgid "No subject specified."
 msgstr "没有指定主题。"
 
-#: send.c:2236 smtp.c:191
+#: send.c:2503 smtp.c:191
 msgid "Sending message..."
 msgstr "正在发送邮件..."
 
-#: send.c:1271
+#: send.c:1342
 msgid "Save attachments in Fcc?"
 msgstr "将附件保存到 Fcc 吗？"
 
-#: send.c:2274
+#: send.c:2541
 msgid "Could not send the message."
 msgstr "无法发送此邮件。"
 
-#: send.c:2284
+#: send.c:2640
 msgid "Mail sent."
 msgstr "邮件已发送。"
 
-#: send.c:2284
+#: send.c:2640
 msgid "Sending in background."
 msgstr "正在后台发送。"
 
-#: sendlib.c:454
+#: sendlib.c:455
 msgid "No boundary parameter found! [report this error]"
 msgstr "没有发现 boundary 参数！[请报告这个错误]"
 
-#: sendlib.c:485
+#: sendlib.c:486
 #, c-format
 msgid "%s no longer exists!"
 msgstr "%s 已经不存在了！"
 
-#: sendlib.c:913
+#: sendlib.c:914
 #, c-format
 msgid "%s isn't a regular file."
 msgstr "%s 不是常规文件。"
 
-#: sendlib.c:1084
+#: sendlib.c:1085
 #, c-format
 msgid "Could not open %s"
 msgstr "无法打开 %s"
 
-#: sendlib.c:2627
+#: sendlib.c:2634
 msgid "$sendmail must be set in order to send mail."
 msgstr "为了发送邮件，必须设置 $sendmail。"
 
-#: sendlib.c:2726
+#: sendlib.c:2733
 #, c-format
 msgid "Error sending message, child exited %d (%s)."
 msgstr "发送邮件出错，子进程已退出，退出状态码 %d (%s)。"
 
-#: sendlib.c:2732
+#: sendlib.c:2739
 msgid "Output of the delivery process"
 msgstr "送信进程的输出"
 
-#: sendlib.c:2894
+#: sendlib.c:2901
 #, c-format
 msgid "Bad IDN %s while preparing resent-from."
 msgstr "当准备 resent-from 时发生错误的 IDN %s。"
@@ -4440,85 +4447,85 @@
 msgid "Caught signal %d...  Exiting.\n"
 msgstr "捕捉到信号 %d...  正在退出。\n"
 
-#: smime.c:141
+#: smime.c:156
 msgid "Enter S/MIME passphrase:"
 msgstr "请输入 S/MIME 通行密码："
 
-#: smime.c:393
+#: smime.c:408
 msgid "Trusted   "
 msgstr "信任   "
 
-#: smime.c:396
+#: smime.c:411
 msgid "Verified  "
 msgstr "已验证  "
 
-#: smime.c:399
+#: smime.c:414
 msgid "Unverified"
 msgstr "未验证"
 
-#: smime.c:402
+#: smime.c:417
 msgid "Expired   "
 msgstr "已过期   "
 
-#: smime.c:405
+#: smime.c:420
 msgid "Revoked   "
 msgstr "已吊销   "
 
-#: smime.c:408
+#: smime.c:423
 msgid "Invalid   "
 msgstr "无效   "
 
-#: smime.c:411
+#: smime.c:426
 msgid "Unknown   "
 msgstr "未知   "
 
-#: smime.c:443
+#: smime.c:458
 #, c-format
 msgid "S/MIME certificates matching \"%s\"."
 msgstr "S/MIME 证书匹配 \"%s\"。"
 
-#: smime.c:487
+#: smime.c:502
 msgid "ID is not trusted."
 msgstr "ID 不被信任。"
 
-#: smime.c:779
+#: smime.c:795
 msgid "Enter keyID: "
 msgstr "请输入密钥 ID： "
 
-#: smime.c:926
+#: smime.c:916
 #, c-format
 msgid "No (valid) certificate found for %s."
 msgstr "未找到可用于 %s 的(有效)证书。"
 
-#: smime.c:983 smime.c:1013 smime.c:1082 smime.c:1118 smime.c:1194 smime.c:1276
+#: smime.c:973 smime.c:1003 smime.c:1072 smime.c:1108 smime.c:1184 smime.c:1266
 msgid "Error: unable to create OpenSSL subprocess!"
 msgstr "错误：无法创建 OpenSSL 子进程！"
 
-#: smime.c:1264
+#: smime.c:1254
 msgid "Label for certificate: "
 msgstr "证书标签： "
 
-#: smime.c:1356
+#: smime.c:1346
 msgid "no certfile"
 msgstr "无证书文件"
 
-#: smime.c:1359
+#: smime.c:1349
 msgid "no mbox"
 msgstr "没有 mbox 邮箱"
 
-#: smime.c:1501 smime.c:1675
+#: smime.c:1492 smime.c:1666
 msgid "No output from OpenSSL..."
 msgstr "OpenSSL 没有输出..."
 
-#: smime.c:1586
+#: smime.c:1577
 msgid "Can't sign: No key specified. Use Sign As."
 msgstr "无法签名：没有指定密钥。请使用指定身份签名(Sign As)。"
 
-#: smime.c:1639
+#: smime.c:1630
 msgid "Can't open OpenSSL subprocess!"
 msgstr "无法打开 OpenSSL 子进程！"
 
-#: smime.c:1857 smime.c:1981
+#: smime.c:1848 smime.c:1972
 msgid ""
 "[-- End of OpenSSL output --]\n"
 "\n"
@@ -4526,19 +4533,19 @@
 "[-- OpenSSL 输出结束 --]\n"
 "\n"
 
-#: smime.c:1941 smime.c:1951
+#: smime.c:1932 smime.c:1942
 msgid "[-- Error: unable to create OpenSSL subprocess! --]\n"
 msgstr "[-- 错误：无法创建 OpenSSL 子进程！ --]\n"
 
-#: smime.c:1985
+#: smime.c:1976
 msgid "[-- The following data is S/MIME encrypted --]\n"
 msgstr "[-- 以下数据已由 S/MIME 加密 --]\n"
 
-#: smime.c:1988
+#: smime.c:1979
 msgid "[-- The following data is S/MIME signed --]\n"
 msgstr "[-- 以下数据已由 S/MIME 签名 --]\n"
 
-#: smime.c:2085
+#: smime.c:2076
 msgid ""
 "\n"
 "[-- End of S/MIME encrypted data. --]\n"
@@ -4546,7 +4553,7 @@
 "\n"
 "[-- S/MIME 加密数据结束 --]\n"
 
-#: smime.c:2087
+#: smime.c:2078
 msgid ""
 "\n"
 "[-- End of S/MIME signed data. --]\n"
@@ -4554,7 +4561,7 @@
 "\n"
 "[-- S/MIME 签名的数据结束 --]\n"
 
-#: smime.c:2241
+#: smime.c:2235
 msgid ""
 "S/MIME (s)ign, encrypt (w)ith, sign (a)s, (c)lear, or (o)ppenc mode off? "
 msgstr "S/MIME 签名(s)，选择身份加密(w)，选择身份签名(s)，清除(c)还是关(o)ppenc模式？ "
@@ -4563,58 +4570,58 @@
 #. 'clear'.  Please use a corresponding letter in your language.
 #. Alternatively, you may duplicate the letter 'c' is translated to.
 #. This comment also applies to the two following letter sequences.
-#: smime.c:2246
+#: smime.c:2240
 msgid "swafco"
 msgstr "swafco"
 
-#: smime.c:2255
+#: smime.c:2249
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, (c)lear, or "
 "(o)ppenc mode? "
 msgstr "S/MIME 加密(e)，签名(s)，选择身份加密(w)，选择身份签名(s)，同时(b)，清除(c)还是(o)ppenc模式？ "
 
-#: smime.c:2256
+#: smime.c:2250
 msgid "eswabfco"
 msgstr "eswabfco"
 
-#: smime.c:2264
+#: smime.c:2258
 msgid ""
 "S/MIME (e)ncrypt, (s)ign, encrypt (w)ith, sign (a)s, (b)oth, or (c)lear? "
 msgstr "S/MIME 加密(e)，签名(s)，选择身份加密(w)，选择身份签名(s)，同时(b)或清除(c)？ "
 
-#: smime.c:2265
+#: smime.c:2259
 msgid "eswabfc"
 msgstr "eswabfc"
 
-#: smime.c:2286
+#: smime.c:2280
 msgid "Choose algorithm family: 1: DES, 2: RC2, 3: AES, or (c)lear? "
 msgstr "选择算法类别：1: DES, 2: RC2, 3: AES, 或(c)清除？ "
 
-#: smime.c:2289
+#: smime.c:2283
 msgid "drac"
 msgstr "drac"
 
-#: smime.c:2292
+#: smime.c:2286
 msgid "1: DES, 2: Triple-DES "
 msgstr "1: DES, 2: 三重DES "
 
-#: smime.c:2293
+#: smime.c:2287
 msgid "dt"
 msgstr "dt"
 
-#: smime.c:2305
+#: smime.c:2299
 msgid "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 msgstr "1: RC2-40, 2: RC2-64, 3: RC2-128 "
 
-#: smime.c:2306
+#: smime.c:2300
 msgid "468"
 msgstr "468"
 
-#: smime.c:2321
+#: smime.c:2315
 msgid "1: AES128, 2: AES192, 3: AES256 "
 msgstr "1: AES128, 2: AES192, 3: AES256 "
 
-#: smime.c:2322
+#: smime.c:2316
 msgid "895"
 msgstr "895"
 
@@ -4674,7 +4681,7 @@
 msgid "Could not find sorting function! [report this bug]"
 msgstr "找不到排序函数！[请报告这个问题]"
 
-#: status.c:116
+#: status.c:127
 msgid "(no mailbox)"
 msgstr "(没有邮箱)"
 
@@ -4722,847 +4729,847 @@
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:37
+#: ../keymap_alldefs.h:40
 msgid "move to the bottom of the page"
 msgstr "移到页面底端"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:40
+#: ../keymap_alldefs.h:43
 msgid "remail a message to another user"
 msgstr "将邮件转发给另一用户"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:43
+#: ../keymap_alldefs.h:46
 msgid "select a new file in this directory"
 msgstr "请选择本目录中一个新的文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:46
+#: ../keymap_alldefs.h:49
 msgid "view file"
 msgstr "查看文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:49
+#: ../keymap_alldefs.h:52
 msgid "display the currently selected file's name"
 msgstr "显示当前所选择的文件名"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:52
+#: ../keymap_alldefs.h:55
 msgid "subscribe to current mailbox (IMAP only)"
 msgstr "订阅当前邮箱 (只适用于 IMAP)"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:55
+#: ../keymap_alldefs.h:58
 msgid "unsubscribe from current mailbox (IMAP only)"
 msgstr "退订当前邮箱 (只适用于 IMAP)"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:58
+#: ../keymap_alldefs.h:61
 msgid "toggle view all/subscribed mailboxes (IMAP only)"
 msgstr "切换查看 全部/已订阅 的邮箱 (只适用于 IMAP)"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:61
+#: ../keymap_alldefs.h:64
 msgid "list mailboxes with new mail"
 msgstr "列出有新邮件的邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:64
+#: ../keymap_alldefs.h:67
 msgid "change directories"
 msgstr "改变目录"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:67
+#: ../keymap_alldefs.h:70
 msgid "check mailboxes for new mail"
 msgstr "检查邮箱是否有新邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:70
+#: ../keymap_alldefs.h:73
 msgid "attach file(s) to this message"
 msgstr "将文件作为附件添加到此邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:73
+#: ../keymap_alldefs.h:76
 msgid "attach message(s) to this message"
 msgstr "将邮件作为附件添加到此邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:79
+#: ../keymap_alldefs.h:82
 msgid "edit the BCC list"
 msgstr "编辑密送(BCC)列表"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:82
+#: ../keymap_alldefs.h:85
 msgid "edit the CC list"
 msgstr "编辑抄送(CC)列表"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:85
+#: ../keymap_alldefs.h:88
 msgid "edit attachment description"
 msgstr "编辑附件说明"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:88
+#: ../keymap_alldefs.h:91
 msgid "edit attachment transfer-encoding"
 msgstr "编辑附件的传输编码"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:91
+#: ../keymap_alldefs.h:94
 msgid "enter a file to save a copy of this message in"
 msgstr "请输入用来保存这封邮件副本的文件名称"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:94
+#: ../keymap_alldefs.h:97
 msgid "edit the file to be attached"
 msgstr "编辑附件文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:97
+#: ../keymap_alldefs.h:100
 msgid "edit the from field"
 msgstr "编辑发件人域"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:100
+#: ../keymap_alldefs.h:103
 msgid "edit the message with headers"
 msgstr "编辑邮件（带邮件头）"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:103
+#: ../keymap_alldefs.h:106
 msgid "edit the message"
 msgstr "编辑邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:106
+#: ../keymap_alldefs.h:109
 msgid "edit attachment using mailcap entry"
 msgstr "使用 mailcap 条目编辑附件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:109
+#: ../keymap_alldefs.h:112
 msgid "edit the Reply-To field"
 msgstr "编辑 Reply-To 域"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:112
+#: ../keymap_alldefs.h:115
 msgid "edit the subject of this message"
 msgstr "编辑此邮件的主题"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:115
+#: ../keymap_alldefs.h:118
 msgid "edit the TO list"
 msgstr "编辑 TO 列表"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:118
+#: ../keymap_alldefs.h:121
 msgid "create a new mailbox (IMAP only)"
 msgstr "创建新邮箱 (只适用于 IMAP)"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:121
+#: ../keymap_alldefs.h:124
 msgid "edit attachment content type"
 msgstr "编辑附件的内容类型"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:124
+#: ../keymap_alldefs.h:127
 msgid "get a temporary copy of an attachment"
 msgstr "取得附件的临时副本"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:127
+#: ../keymap_alldefs.h:130
 msgid "run ispell on the message"
 msgstr "对这封邮件运行 ispell"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:130
+#: ../keymap_alldefs.h:139
 msgid "compose new attachment using mailcap entry"
 msgstr "使用 mailcap 条目来编写新附件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:133
+#: ../keymap_alldefs.h:142
 msgid "toggle recoding of this attachment"
 msgstr "切换是否为此附件重新编码"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:136
+#: ../keymap_alldefs.h:145
 msgid "save this message to send later"
 msgstr "保存邮件以便稍后寄出"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:139
+#: ../keymap_alldefs.h:148
 msgid "send attachment with a different name"
 msgstr "使用另一个名字发送附件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:142
+#: ../keymap_alldefs.h:151
 msgid "rename/move an attached file"
 msgstr "重命名/移动 附件文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:145
+#: ../keymap_alldefs.h:154
 msgid "send the message"
 msgstr "发送邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:151
+#: ../keymap_alldefs.h:160
 msgid "toggle disposition between inline/attachment"
 msgstr "在嵌入/附件之间切换"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:154
+#: ../keymap_alldefs.h:163
 msgid "toggle whether to delete file after sending it"
 msgstr "切换发送后是否删除文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:157
+#: ../keymap_alldefs.h:166
 msgid "update an attachment's encoding info"
 msgstr "更新附件的编码信息"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:169
+#: ../keymap_alldefs.h:178
 msgid "write the message to a folder"
 msgstr "将邮件写到文件夹"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:172
+#: ../keymap_alldefs.h:181
 msgid "copy a message to a file/mailbox"
 msgstr "复制一封邮件到文件/邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:175
+#: ../keymap_alldefs.h:184
 msgid "create an alias from a message sender"
 msgstr "从邮件的发件人创建别名"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:178
+#: ../keymap_alldefs.h:187
 msgid "move entry to bottom of screen"
 msgstr "移动条目到屏幕底端"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:181
+#: ../keymap_alldefs.h:190
 msgid "move entry to middle of screen"
 msgstr "移动条目到屏幕中央"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:184
+#: ../keymap_alldefs.h:193
 msgid "move entry to top of screen"
 msgstr "移动条目到屏幕顶端"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:187
+#: ../keymap_alldefs.h:196
 msgid "make decoded (text/plain) copy"
 msgstr "制作已解码的(text/plain)副本"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:190
+#: ../keymap_alldefs.h:199
 msgid "make decoded copy (text/plain) and delete"
 msgstr "制作已解码的副本(text/plain)并且删除之"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:193
+#: ../keymap_alldefs.h:202
 msgid "delete the current entry"
 msgstr "删除当前条目"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:196
+#: ../keymap_alldefs.h:205
 msgid "delete the current mailbox (IMAP only)"
 msgstr "删除当前邮箱 (只适用于 IMAP)"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:199
+#: ../keymap_alldefs.h:208
 msgid "delete all messages in subthread"
 msgstr "删除所有子线索中的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:202
+#: ../keymap_alldefs.h:211
 msgid "delete all messages in thread"
 msgstr "删除所有线索中的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:205
+#: ../keymap_alldefs.h:214
 msgid "display full address of sender"
 msgstr "显示发件人的完整地址"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:208
+#: ../keymap_alldefs.h:217
 msgid "display message and toggle header weeding"
 msgstr "显示邮件并切换邮件头信息的显示"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:211
+#: ../keymap_alldefs.h:220
 msgid "display a message"
 msgstr "显示邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:214
+#: ../keymap_alldefs.h:223
 msgid "add, change, or delete a message's label"
 msgstr "添加、更改或者删除邮件的标签"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:217
+#: ../keymap_alldefs.h:226
 msgid "edit the raw message"
 msgstr "编辑原始邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:220
+#: ../keymap_alldefs.h:229
 msgid "delete the char in front of the cursor"
 msgstr "删除光标位置之前的字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:223
+#: ../keymap_alldefs.h:232
 msgid "move the cursor one character to the left"
 msgstr "将光标向左移动一个字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:226
+#: ../keymap_alldefs.h:235
 msgid "move the cursor to the beginning of the word"
 msgstr "将光标移动到单词开头"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:229
+#: ../keymap_alldefs.h:238
 msgid "jump to the beginning of the line"
 msgstr "跳到行首"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:232
+#: ../keymap_alldefs.h:241
 msgid "cycle among incoming mailboxes"
 msgstr "在收件箱中循环选择"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:235
+#: ../keymap_alldefs.h:244
 msgid "complete filename or alias"
 msgstr "补全文件名或别名"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:238
+#: ../keymap_alldefs.h:247
 msgid "complete address with query"
 msgstr "补全带查询的地址"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:241
+#: ../keymap_alldefs.h:250
 msgid "delete the char under the cursor"
 msgstr "删除光标下的字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:244
+#: ../keymap_alldefs.h:253
 msgid "jump to the end of the line"
 msgstr "跳到行尾"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:247
+#: ../keymap_alldefs.h:256
 msgid "move the cursor one character to the right"
 msgstr "将光标向右移动一个字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:250
+#: ../keymap_alldefs.h:259
 msgid "move the cursor to the end of the word"
 msgstr "将光标移到单词结尾"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:253
+#: ../keymap_alldefs.h:262
 msgid "scroll down through the history list"
 msgstr "向下滚动历史列表"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:256
+#: ../keymap_alldefs.h:265
 msgid "scroll up through the history list"
 msgstr "向上滚动历史列表"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:262
+#: ../keymap_alldefs.h:271
 msgid "delete chars from cursor to end of line"
 msgstr "删除光标所在位置到行尾的字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:265
+#: ../keymap_alldefs.h:274
 msgid "delete chars from the cursor to the end of the word"
 msgstr "删除光标所在位置到单词结尾的字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:268
+#: ../keymap_alldefs.h:277
 msgid "delete all chars on the line"
 msgstr "删除本行所有字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:271
+#: ../keymap_alldefs.h:280
 msgid "delete the word in front of the cursor"
 msgstr "删除光标之前的词"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:274
+#: ../keymap_alldefs.h:283
 msgid "quote the next typed key"
 msgstr "下一个输入的键按本义插入"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:277
+#: ../keymap_alldefs.h:286
 msgid "transpose character under cursor with previous"
 msgstr "对调光标位置的字符和其前一个字符"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:280
+#: ../keymap_alldefs.h:289
 msgid "capitalize the word"
 msgstr "将单词首字母转换为大写"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:283
+#: ../keymap_alldefs.h:292
 msgid "convert the word to lower case"
 msgstr "将单词转换为小写"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:286
+#: ../keymap_alldefs.h:295
 msgid "convert the word to upper case"
 msgstr "将单词转换为大写"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:289
+#: ../keymap_alldefs.h:298
 msgid "enter a muttrc command"
 msgstr "输入一个 muttrc 命令"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:292
+#: ../keymap_alldefs.h:301
 msgid "enter a file mask"
 msgstr "输入文件掩码"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:298
+#: ../keymap_alldefs.h:307
 msgid "exit this menu"
 msgstr "退出本菜单"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:301
+#: ../keymap_alldefs.h:310
 msgid "filter attachment through a shell command"
 msgstr "使用 shell 命令过滤附件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:304
+#: ../keymap_alldefs.h:313
 msgid "move to the first entry"
 msgstr "移动到第一项"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:307
+#: ../keymap_alldefs.h:316
 msgid "toggle a message's 'important' flag"
 msgstr "切换邮件的“重要”标记"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:310
+#: ../keymap_alldefs.h:319
 msgid "forward a message with comments"
 msgstr "转发邮件并注释"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:313
+#: ../keymap_alldefs.h:322
 msgid "select the current entry"
 msgstr "选择当前条目"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:319
+#: ../keymap_alldefs.h:328
 msgid "reply to all recipients"
 msgstr "回复给所有收件人"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:322
+#: ../keymap_alldefs.h:331
 msgid "scroll down 1/2 page"
 msgstr "向下滚动半页"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:325
+#: ../keymap_alldefs.h:334
 msgid "scroll up 1/2 page"
 msgstr "向上滚动半页"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:328
+#: ../keymap_alldefs.h:337
 msgid "this screen"
 msgstr "这个屏幕"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:331
+#: ../keymap_alldefs.h:340
 msgid "jump to an index number"
 msgstr "跳转到索引号码"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:334
+#: ../keymap_alldefs.h:343
 msgid "move to the last entry"
 msgstr "移动到最后一项"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:337
+#: ../keymap_alldefs.h:346
 msgid "reply to specified mailing list"
 msgstr "回复给指定的邮件列表"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:340
+#: ../keymap_alldefs.h:349
 msgid "execute a macro"
 msgstr "执行宏"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:343
+#: ../keymap_alldefs.h:352
 msgid "compose a new mail message"
 msgstr "撰写新邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:346
+#: ../keymap_alldefs.h:355
 msgid "break the thread in two"
 msgstr "将线索拆为两个"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:355
+#: ../keymap_alldefs.h:364
 msgid "open a different folder"
 msgstr "打开另一个文件夹"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:358
+#: ../keymap_alldefs.h:367
 msgid "open a different folder in read only mode"
 msgstr "用只读模式打开另一个文件夹"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:361
+#: ../keymap_alldefs.h:370
 msgid "clear a status flag from a message"
 msgstr "清除邮件上的状态标记"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:364
+#: ../keymap_alldefs.h:373
 msgid "delete messages matching a pattern"
 msgstr "删除符合某个模式的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:367
+#: ../keymap_alldefs.h:376
 msgid "force retrieval of mail from IMAP server"
 msgstr "强制从 IMAP 服务器获取邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:370
+#: ../keymap_alldefs.h:379
 msgid "logout from all IMAP servers"
 msgstr "从所有 IMAP 服务器登出"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:373
+#: ../keymap_alldefs.h:382
 msgid "retrieve mail from POP server"
 msgstr "从 POP 服务器获取邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:376
+#: ../keymap_alldefs.h:385
 msgid "show only messages matching a pattern"
 msgstr "只显示匹配某个模式的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:379
+#: ../keymap_alldefs.h:388
 msgid "link tagged message to the current one"
 msgstr "连接已标记的邮件到当前邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:382
+#: ../keymap_alldefs.h:391
 msgid "open next mailbox with new mail"
 msgstr "打开下一个有新邮件的邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:385
+#: ../keymap_alldefs.h:394
 msgid "jump to the next new message"
 msgstr "跳到下一封新邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:388
+#: ../keymap_alldefs.h:397
 msgid "jump to the next new or unread message"
 msgstr "跳到下一个新的或未读取的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:391
+#: ../keymap_alldefs.h:400
 msgid "jump to the next subthread"
 msgstr "跳到下一个子线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:394
+#: ../keymap_alldefs.h:403
 msgid "jump to the next thread"
 msgstr "跳到下一个线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:397
+#: ../keymap_alldefs.h:406
 msgid "move to the next undeleted message"
 msgstr "移动到下一个未删除邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:400
+#: ../keymap_alldefs.h:409
 msgid "jump to the next unread message"
 msgstr "跳到下一个未读邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:403
+#: ../keymap_alldefs.h:412
 msgid "jump to parent message in thread"
 msgstr "跳到本线索中的父邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:406
+#: ../keymap_alldefs.h:415
 msgid "jump to previous thread"
 msgstr "跳到上一个线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:409
+#: ../keymap_alldefs.h:418
 msgid "jump to previous subthread"
 msgstr "跳到上一个子线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:412
+#: ../keymap_alldefs.h:421
 msgid "move to the previous undeleted message"
 msgstr "移动到上一个未删除邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:415
+#: ../keymap_alldefs.h:424
 msgid "jump to the previous new message"
 msgstr "跳到上一个新邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:418
+#: ../keymap_alldefs.h:427
 msgid "jump to the previous new or unread message"
 msgstr "跳到上一个新的或未读取的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:421
+#: ../keymap_alldefs.h:430
 msgid "jump to the previous unread message"
 msgstr "跳到上一个未读邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:424
+#: ../keymap_alldefs.h:433
 msgid "mark the current thread as read"
 msgstr "标记当前线索为已读"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:427
+#: ../keymap_alldefs.h:436
 msgid "mark the current subthread as read"
 msgstr "标记当前子线索为已读"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:430
+#: ../keymap_alldefs.h:439
 msgid "jump to root message in thread"
 msgstr "跳到本线索中的根邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:433
+#: ../keymap_alldefs.h:442
 msgid "set a status flag on a message"
 msgstr "设定邮件的状态标记"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:436
+#: ../keymap_alldefs.h:445
 msgid "save changes to mailbox"
 msgstr "保存修改到邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:439
+#: ../keymap_alldefs.h:448
 msgid "tag messages matching a pattern"
 msgstr "标记符合某个模式的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:442
+#: ../keymap_alldefs.h:451
 msgid "undelete messages matching a pattern"
 msgstr "撤销删除符合某个模式的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:445
+#: ../keymap_alldefs.h:454
 msgid "untag messages matching a pattern"
 msgstr "取消标记符合某个模式的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:448
+#: ../keymap_alldefs.h:457
 msgid "create a hotkey macro for the current message"
 msgstr "为当前邮件创建热键宏"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:451
+#: ../keymap_alldefs.h:460
 msgid "move to the middle of the page"
 msgstr "移动到本页的中间"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:454
+#: ../keymap_alldefs.h:463
 msgid "move to the next entry"
 msgstr "移动到下一条目"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:457
+#: ../keymap_alldefs.h:466
 msgid "scroll down one line"
 msgstr "向下滚动一行"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:460
+#: ../keymap_alldefs.h:469
 msgid "move to the next page"
 msgstr "移动到下一页"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:463
+#: ../keymap_alldefs.h:472
 msgid "jump to the bottom of the message"
 msgstr "跳到邮件的底端"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:466
+#: ../keymap_alldefs.h:475
 msgid "toggle display of quoted text"
 msgstr "切换引用文本的显示"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:469
+#: ../keymap_alldefs.h:478
 msgid "skip beyond quoted text"
 msgstr "跳过引用"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:472
+#: ../keymap_alldefs.h:481
 msgid "jump to the top of the message"
 msgstr "跳到邮件的顶端"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:475
+#: ../keymap_alldefs.h:484
 msgid "pipe message/attachment to a shell command"
 msgstr "将邮件/附件通过管道传递给 shell 命令"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:478
+#: ../keymap_alldefs.h:487
 msgid "move to the previous entry"
 msgstr "移到上一条目"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:481
+#: ../keymap_alldefs.h:490
 msgid "scroll up one line"
 msgstr "向上滚动一行"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:484
+#: ../keymap_alldefs.h:493
 msgid "move to the previous page"
 msgstr "移动到上一页"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:487
+#: ../keymap_alldefs.h:496
 msgid "print the current entry"
 msgstr "打印当前条目"
 
@@ -5572,378 +5579,378 @@
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:493
+#: ../keymap_alldefs.h:502
 msgid "query external program for addresses"
 msgstr "向外部程序查询地址"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:496
+#: ../keymap_alldefs.h:505
 msgid "append new query results to current results"
 msgstr "附加新查询结果到当前结果"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:499
+#: ../keymap_alldefs.h:508
 msgid "save changes to mailbox and quit"
 msgstr "保存修改到邮箱并退出"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:502
+#: ../keymap_alldefs.h:511
 msgid "recall a postponed message"
 msgstr "重新叫出一封被延迟寄出的邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:505
+#: ../keymap_alldefs.h:514
 msgid "clear and redraw the screen"
 msgstr "清除并重新绘制屏幕"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:508
+#: ../keymap_alldefs.h:517
 msgid "{internal}"
 msgstr "{内部的}"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:511
+#: ../keymap_alldefs.h:520
 msgid "rename the current mailbox (IMAP only)"
 msgstr "重命名当前邮箱 (只适用于 IMAP)"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:514
+#: ../keymap_alldefs.h:523
 msgid "reply to a message"
 msgstr "回复一封邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:517
+#: ../keymap_alldefs.h:526
 msgid "use the current message as a template for a new one"
 msgstr "用当前邮件作为新邮件的模板"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:520
+#: ../keymap_alldefs.h:529
 msgid "save message/attachment to a mailbox/file"
 msgstr "保存邮件/附件到邮箱/文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:523
+#: ../keymap_alldefs.h:532
 msgid "search for a regular expression"
 msgstr "用正则表达式搜索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:526
+#: ../keymap_alldefs.h:535
 msgid "search backwards for a regular expression"
 msgstr "用正则表达式反向搜索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:529
+#: ../keymap_alldefs.h:538
 msgid "search for next match"
 msgstr "寻找下一个匹配"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:532
+#: ../keymap_alldefs.h:541
 msgid "search for next match in opposite direction"
 msgstr "反向寻找下一个匹配"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:535
+#: ../keymap_alldefs.h:544
 msgid "toggle search pattern coloring"
 msgstr "切换搜索模式的颜色标识"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:538
+#: ../keymap_alldefs.h:547
 msgid "invoke a command in a subshell"
 msgstr "在子 shell 中调用命令"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:541
+#: ../keymap_alldefs.h:550
 msgid "sort messages"
 msgstr "排序邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:544
+#: ../keymap_alldefs.h:553
 msgid "sort messages in reverse order"
 msgstr "反向排序邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:547
+#: ../keymap_alldefs.h:556
 msgid "tag the current entry"
 msgstr "标记当前条目"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:550
+#: ../keymap_alldefs.h:559
 msgid "apply next function to tagged messages"
 msgstr "对已标记邮件应用下一功能"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:553
+#: ../keymap_alldefs.h:562
 msgid "apply next function ONLY to tagged messages"
 msgstr "“仅”对已标记邮件应用下一功能"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:556
+#: ../keymap_alldefs.h:565
 msgid "tag the current subthread"
 msgstr "标记当前子线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:559
+#: ../keymap_alldefs.h:568
 msgid "tag the current thread"
 msgstr "标记当前线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:562
+#: ../keymap_alldefs.h:571
 msgid "toggle a message's 'new' flag"
 msgstr "切换邮件的新邮件标记"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:565
+#: ../keymap_alldefs.h:574
 msgid "toggle whether the mailbox will be rewritten"
 msgstr "切换邮箱是否要重写"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:568
+#: ../keymap_alldefs.h:577
 msgid "toggle whether to browse mailboxes or all files"
 msgstr "切换是否浏览邮箱或所有文件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:571
+#: ../keymap_alldefs.h:580
 msgid "move to the top of the page"
 msgstr "移到页面顶端"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:574
+#: ../keymap_alldefs.h:583
 msgid "undelete the current entry"
 msgstr "撤销删除当前条目"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:577
+#: ../keymap_alldefs.h:586
 msgid "undelete all messages in thread"
 msgstr "撤销删除线索中的所有邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:580
+#: ../keymap_alldefs.h:589
 msgid "undelete all messages in subthread"
 msgstr "撤销删除子线索中的所有邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:583
+#: ../keymap_alldefs.h:592
 msgid "show the Mutt version number and date"
 msgstr "显示 Mutt 的版本号与日期"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:586
+#: ../keymap_alldefs.h:595
 msgid "view attachment using mailcap entry if necessary"
 msgstr "如果需要的话使用 mailcap 条目浏览附件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:589
+#: ../keymap_alldefs.h:598
 msgid "show MIME attachments"
 msgstr "显示 MIME 附件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:592
+#: ../keymap_alldefs.h:601
 msgid "display the keycode for a key press"
 msgstr "显示按键的键码"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:598
+#: ../keymap_alldefs.h:607
 msgid "show currently active limit pattern"
 msgstr "显示当前激活的限制模式"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:601
+#: ../keymap_alldefs.h:610
 msgid "collapse/uncollapse current thread"
 msgstr "折叠/展开当前线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:604
+#: ../keymap_alldefs.h:613
 msgid "collapse/uncollapse all threads"
 msgstr "折叠/展开所有线索"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:610
+#: ../keymap_alldefs.h:625
 msgid "move the highlight to next mailbox"
 msgstr "移动高亮到下一邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:613
+#: ../keymap_alldefs.h:628
 msgid "move the highlight to next mailbox with new mail"
 msgstr "移动高亮到下一个有新邮件的邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:616
+#: ../keymap_alldefs.h:631
 msgid "open highlighted mailbox"
 msgstr "正在打开高亮的邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:619
+#: ../keymap_alldefs.h:634
 msgid "scroll the sidebar down 1 page"
 msgstr "侧栏向下滚动一页"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:622
+#: ../keymap_alldefs.h:637
 msgid "scroll the sidebar up 1 page"
 msgstr "侧栏向上滚动一页"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:625
+#: ../keymap_alldefs.h:640
 msgid "move the highlight to previous mailbox"
 msgstr "移动高亮到上一邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:628
+#: ../keymap_alldefs.h:643
 msgid "move the highlight to previous mailbox with new mail"
 msgstr "移动高亮到上一个有新邮件的邮箱"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:631
+#: ../keymap_alldefs.h:646
 msgid "make the sidebar (in)visible"
 msgstr "显示/隐藏侧栏"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:634
+#: ../keymap_alldefs.h:649
 msgid "attach a PGP public key"
 msgstr "作为附件添加 PGP 公钥"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:637
+#: ../keymap_alldefs.h:652
 msgid "show PGP options"
 msgstr "显示 PGP 选项"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:640
+#: ../keymap_alldefs.h:655
 msgid "mail a PGP public key"
 msgstr "邮寄 PGP 公钥"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:643
+#: ../keymap_alldefs.h:658
 msgid "verify a PGP public key"
 msgstr "验证 PGP 公钥"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:646
+#: ../keymap_alldefs.h:661
 msgid "view the key's user id"
 msgstr "查看密钥的用户 id"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:649
+#: ../keymap_alldefs.h:664
 msgid "check for classic PGP"
 msgstr "检查经典 PGP"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:652
+#: ../keymap_alldefs.h:667
 msgid "accept the chain constructed"
 msgstr "接受创建的链"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:655
+#: ../keymap_alldefs.h:670
 msgid "append a remailer to the chain"
 msgstr "向链追加转发者"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:658
+#: ../keymap_alldefs.h:673
 msgid "insert a remailer into the chain"
 msgstr "向链中插入转发者"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:661
+#: ../keymap_alldefs.h:676
 msgid "delete a remailer from the chain"
 msgstr "从链中删除转发者"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:664
+#: ../keymap_alldefs.h:679
 msgid "select the previous element of the chain"
 msgstr "选择链中的前一个元素"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:667
+#: ../keymap_alldefs.h:682
 msgid "select the next element of the chain"
 msgstr "选择链中的下一个元素"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:670
+#: ../keymap_alldefs.h:685
 msgid "send the message through a mixmaster remailer chain"
 msgstr "通过 mixmaster 转发者链发送邮件"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:673
+#: ../keymap_alldefs.h:688
 msgid "make decrypted copy and delete"
 msgstr "制作解密的副本并且删除之"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:676
+#: ../keymap_alldefs.h:691
 msgid "make decrypted copy"
 msgstr "制作解密的副本"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:679
+#: ../keymap_alldefs.h:694
 msgid "wipe passphrase(s) from memory"
 msgstr "从内存中清除通行密钥"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:682
+#: ../keymap_alldefs.h:697
 msgid "extract supported public keys"
 msgstr "取出支持的公钥"
 
 #. L10N: Help screen function description.
 #. Generated from one of the OPS files.
-#: ../keymap_alldefs.h:685
+#: ../keymap_alldefs.h:700
 msgid "show S/MIME options"
 msgstr "显示 S/MIME 选项"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/neon.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/neon.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/neon.po	2020-01-23 16:51:56.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/neon.po	2020-07-08 13:53:57.000000000 +0000
@@ -16,11 +16,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:46+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:31+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: \n"
 
-#: src/ne_207.c:198
+#: src/ne_207.c:213
 #, c-format
 msgid ""
 "Invalid HTTP status line in status element at line %d of response:\n"
@@ -39,103 +39,103 @@
 msgid "Could not authenticate to proxy server: %s"
 msgstr "不能认证到代理服务器: %s"
 
-#: src/ne_auth.c:386
+#: src/ne_auth.c:384
 #, c-format
 msgid "rejected %s challenge"
 msgstr "被拒绝的 %s 挑战"
 
-#: src/ne_auth.c:402
+#: src/ne_auth.c:400
 msgid "missing realm in Basic challenge"
 msgstr "在基本挑战中丢失了领域"
 
-#: src/ne_auth.c:497
+#: src/ne_auth.c:495
 msgid "invalid Negotiate token"
 msgstr "非法磋商令牌"
 
-#: src/ne_auth.c:520
+#: src/ne_auth.c:518
 msgid "GSSAPI authentication error: "
 msgstr "GSSAPI 认证错误: "
 
-#: src/ne_auth.c:533
+#: src/ne_auth.c:531
 #, c-format
 msgid "GSSAPI failure (code %u)"
 msgstr "GSSAPI 失败(代码 %u)"
 
-#: src/ne_auth.c:568
+#: src/ne_auth.c:566
 msgid "ignoring empty Negotiate continuation"
 msgstr "忽略后续的空磋商"
 
-#: src/ne_auth.c:583
+#: src/ne_auth.c:581
 #, c-format
 msgid "Negotiate response verification failed: invalid response header token"
 msgstr "校验协商响应失败：非法响应头令牌"
 
-#: src/ne_auth.c:605
+#: src/ne_auth.c:603
 #, c-format
 msgid "Negotiate response verification failure: %s"
 msgstr "磋商响应校验失败: %s"
 
-#: src/ne_auth.c:669
+#: src/ne_auth.c:667
 #, c-format
 msgid "SSPI response verification failed: invalid response header token"
 msgstr ""
 
-#: src/ne_auth.c:802
+#: src/ne_auth.c:800
 msgid "unknown algorithm in Digest challenge"
 msgstr "在摘要挑战中的算法不可识别"
 
-#: src/ne_auth.c:806
+#: src/ne_auth.c:804
 msgid "incompatible algorithm in Digest challenge"
 msgstr "在摘要挑战中的算法不兼容"
 
-#: src/ne_auth.c:810
+#: src/ne_auth.c:808
 msgid "missing parameter in Digest challenge"
 msgstr "在摘要挑战中的参数丢失"
 
-#: src/ne_auth.c:814
+#: src/ne_auth.c:812
 msgid "initial Digest challenge was stale"
 msgstr "陈旧的初始化摘要挑战"
 
-#: src/ne_auth.c:821
+#: src/ne_auth.c:819
 msgid "stale Digest challenge with new algorithm or realm"
 msgstr "陈旧的摘要挑战用于新算法或新领域"
 
-#: src/ne_auth.c:833
+#: src/ne_auth.c:831
 msgid "could not parse domain in Digest challenge"
 msgstr "在摘要挑战中的不能解析域"
 
-#: src/ne_auth.c:1142
+#: src/ne_auth.c:1140
 #, c-format
 msgid "Digest mutual authentication failure: missing parameters"
 msgstr "摘要互相认证失败：参数遗漏"
 
-#: src/ne_auth.c:1147
+#: src/ne_auth.c:1145
 #, c-format
 msgid "Digest mutual authentication failure: client nonce mismatch"
 msgstr "摘要互相认证失败：客户现时不匹配"
 
-#: src/ne_auth.c:1157
+#: src/ne_auth.c:1155
 #, c-format
 msgid "Digest mutual authentication failure: could not parse nonce count"
 msgstr "摘要互相认证失败：不能解析现时计数"
 
-#: src/ne_auth.c:1162
+#: src/ne_auth.c:1160
 #, c-format
 msgid ""
 "Digest mutual authentication failure: nonce count mismatch (%u not %u)"
 msgstr "摘要互相认证失败：现时计算不匹配 (应该是 %u，不是 %u)"
 
-#: src/ne_auth.c:1205
+#: src/ne_auth.c:1203
 #, c-format
 msgid "Digest mutual authentication failure: request-digest mismatch"
 msgstr "摘要互相认证失败：请求摘要不匹配"
 
-#: src/ne_auth.c:1336
+#: src/ne_auth.c:1334
 #, c-format
 msgid "ignored %s challenge"
 msgstr "被忽略的 %s 挑战"
 
-#: src/ne_auth.c:1415
+#: src/ne_auth.c:1413
 msgid "could not parse challenge"
 msgstr "不能解析挑战"
 
@@ -195,7 +195,7 @@
 msgid "unrecognized errors (%u)"
 msgstr ""
 
-#: src/ne_gnutls.c:951 src/ne_openssl.c:477
+#: src/ne_gnutls.c:951 src/ne_openssl.c:481
 #, c-format
 msgid "Server certificate was missing commonName attribute in subject name"
 msgstr "服务器证书在主题名称遗漏了属性 commonName"
@@ -205,41 +205,41 @@
 msgid "Could not verify server certificate: %s"
 msgstr ""
 
-#: src/ne_gnutls.c:977 src/ne_openssl.c:464
+#: src/ne_gnutls.c:984 src/ne_openssl.c:468
 #, c-format
 msgid "Certificate verification error: %s"
 msgstr "证书校验失败：%s"
 
-#: src/ne_gnutls.c:1010 src/ne_openssl.c:710
+#: src/ne_gnutls.c:1017 src/ne_openssl.c:717
 #, c-format
 msgid "SSL handshake failed, client certificate was requested: %s"
 msgstr ""
 
-#: src/ne_gnutls.c:1015 src/ne_openssl.c:715
+#: src/ne_gnutls.c:1022 src/ne_openssl.c:722
 #, c-format
 msgid "SSL handshake failed: %s"
 msgstr ""
 
-#: src/ne_gnutls.c:1025
+#: src/ne_gnutls.c:1032
 #, c-format
 msgid "Server did not send certificate chain"
 msgstr "服务器不能发送证书链"
 
-#: src/ne_locks.c:584
+#: src/ne_locks.c:619
 msgid "LOCK response missing Lock-Token header"
 msgstr "LOCK 的响应遗漏了 Lock-Token 行"
 
-#: src/ne_locks.c:759
+#: src/ne_locks.c:794
 #, c-format
 msgid "Response missing activelock for %s"
 msgstr "锁定 %s 的响应遗漏了主动锁"
 
-#: src/ne_locks.c:801
+#: src/ne_locks.c:836
 #, c-format
 msgid "No activelock for <%s> returned in LOCK refresh response"
 msgstr "刷新锁定 %s 的响应没有返回主动锁"
 
-#: src/ne_openssl.c:735
+#: src/ne_openssl.c:742
 #, c-format
 msgid "SSL server did not present certificate"
 msgstr "SSL 服务器不能呈现证书"
@@ -295,97 +295,97 @@
 msgid "Could not send chunked request terminator"
 msgstr ""
 
-#: src/ne_request.c:784
+#: src/ne_request.c:785
 msgid "Could not read chunk size"
 msgstr "不能读块大小"
 
-#: src/ne_request.c:791
+#: src/ne_request.c:792
 msgid "Could not parse chunk size"
 msgstr "不能解析块大小"
 
-#: src/ne_request.c:828
+#: src/ne_request.c:829
 msgid "Could not read response body"
 msgstr "不能读取响应主体"
 
-#: src/ne_request.c:844
+#: src/ne_request.c:845
 msgid "Could not read chunk delimiter"
 msgstr "不能读块分割符"
 
-#: src/ne_request.c:847
+#: src/ne_request.c:848
 msgid "Chunk delimiter was invalid"
 msgstr "非法的分割符"
 
-#: src/ne_request.c:952
+#: src/ne_request.c:961
 msgid "Could not read status line"
 msgstr "不能读状态行"
 
-#: src/ne_request.c:974
+#: src/ne_request.c:984
 msgid "Could not parse response status line"
 msgstr "不能解析响应状态行"
 
-#: src/ne_request.c:986
+#: src/ne_request.c:996
 msgid "Could not read interim response headers"
 msgstr "不能读临时响应头"
 
-#: src/ne_request.c:1020
+#: src/ne_request.c:1030
 msgid "Could not send request"
 msgstr "不能发送请求"
 
-#: src/ne_request.c:1068 src/ne_request.c:1086 src/ne_request.c:1096
+#: src/ne_request.c:1078 src/ne_request.c:1096 src/ne_request.c:1106
 msgid "Error reading response headers"
 msgstr "读取响应头出错"
 
-#: src/ne_request.c:1114
+#: src/ne_request.c:1124
 #, c-format
 msgid "Response header too long"
 msgstr "响应头太长"
 
-#: src/ne_request.c:1196
+#: src/ne_request.c:1206
 msgid "Response exceeded maximum number of header fields"
 msgstr "响应头的域数量超出了最大数量"
 
-#: src/ne_request.c:1211
+#: src/ne_request.c:1221
 #, c-format
 msgid "Could not resolve hostname `%s': %s"
 msgstr "不能解析主机名称 “%s”: %s"
 
-#: src/ne_request.c:1342
+#: src/ne_request.c:1352
 msgid "Unknown transfer-coding in response"
 msgstr "响应中的传输代码未知"
 
-#: src/ne_request.c:1355
+#: src/ne_request.c:1365
 msgid "Invalid Content-Length in response"
 msgstr "非法的 Content-Length 响应域"
 
-#: src/ne_request.c:1428
+#: src/ne_request.c:1438
 #, c-format
 msgid "Could not write to file: %s"
 msgstr "不能写入文件：%s"
 
-#: src/ne_request.c:1501
+#: src/ne_request.c:1511
 #, c-format
 msgid "Could not create SSL connection through proxy server: %s"
 msgstr "不能通过代理服务器 “%s” 创建 SSL 连接"
 
-#: src/ne_request.c:1540
+#: src/ne_request.c:1550
 #, c-format
 msgid "Could not create socket"
 msgstr "不能创建套接字"
 
-#: src/ne_request.c:1574
+#: src/ne_request.c:1584
 msgid "Could not connect to server"
 msgstr "不能连接到服务器"
 
-#: src/ne_request.c:1576
+#: src/ne_request.c:1586
 msgid "Could not connect to proxy server"
 msgstr "不能连接到代理服务器"
 
-#: src/ne_request.c:1619
+#: src/ne_request.c:1629
 #, c-format
 msgid "Could not find IPv4 address of hostname %s for SOCKS v4 proxy"
 msgstr ""
 
-#: src/ne_request.c:1677
+#: src/ne_request.c:1687
 #, c-format
 msgid "Could not establish connection from SOCKS proxy (%s:%u): %s"
 msgstr ""
@@ -422,62 +422,62 @@
 msgid "Server certificate verification failed: "
 msgstr "服务器证书校验失败 "
 
-#: src/ne_socket.c:522 src/ne_socket.c:618 src/ne_socket.c:722
+#: src/ne_socket.c:525 src/ne_socket.c:660 src/ne_socket.c:770
 msgid "Connection closed"
 msgstr "连接关闭"
 
-#: src/ne_socket.c:628 src/ne_socket.c:736
+#: src/ne_socket.c:674 src/ne_socket.c:784
 msgid "Secure connection truncated"
 msgstr "安全连接切断"
 
-#: src/ne_socket.c:640 src/ne_socket.c:748
+#: src/ne_socket.c:686 src/ne_socket.c:796
 #, c-format
 msgid "SSL error: %s"
 msgstr "SSL 错误：%s"
 
-#: src/ne_socket.c:643
+#: src/ne_socket.c:689
 #, c-format
 msgid "SSL error code %d/%d/%lu"
 msgstr "SSL 错误代码 %d/%d/%lu"
 
-#: src/ne_socket.c:727
+#: src/ne_socket.c:775
 #, c-format
 msgid "SSL alert received: %s"
 msgstr "收到 SSL 警报： %s"
 
-#: src/ne_socket.c:744
+#: src/ne_socket.c:792
 msgid "SSL socket read failed"
 msgstr "SSL 套接字读取失败"
 
-#: src/ne_socket.c:875
+#: src/ne_socket.c:923
 msgid "Line too long"
 msgstr "行太长"
 
-#: src/ne_socket.c:1036 src/ne_socket.c:1042
+#: src/ne_socket.c:1084 src/ne_socket.c:1090
 msgid "Host not found"
 msgstr "没有发现主机"
 
-#: src/ne_socket.c:1251
+#: src/ne_socket.c:1299
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: src/ne_socket.c:1444
+#: src/ne_socket.c:1492
 msgid "Socket descriptor number exceeds FD_SETSIZE"
 msgstr "套接字数量超过 FD_SETSIZE"
 
-#: src/ne_socket.c:1506
+#: src/ne_socket.c:1554
 msgid "Socket family not supported"
 msgstr "插座家族不被支持"
 
-#: src/ne_socket.c:1737
+#: src/ne_socket.c:1785
 msgid "Client certificate verification failed"
 msgstr "客户证书校验失败"
 
-#: src/ne_socket.c:1753
+#: src/ne_socket.c:1801
 msgid "SSL disabled due to lack of entropy"
 msgstr "由于缺少熵，SSL 已经禁用"
 
-#: src/ne_socket.c:1759
+#: src/ne_socket.c:1807
 msgid "Could not create SSL structure"
 msgstr "不能创建 SSL 结构"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/NetworkManager.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/NetworkManager.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/NetworkManager.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/NetworkManager.po	2020-07-08 13:54:00.000000000 +0000
@@ -19,19 +19,19 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-06 21:14+0000\n"
-"PO-Revision-Date: 2019-12-06 23:06+0000\n"
+"POT-Creation-Date: 2020-04-28 23:42+0000\n"
+"PO-Revision-Date: 2020-04-29 01:47+0000\n"
 "Last-Translator: Mingye Wang <arthur2e5@aosc.xyz>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:24+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:13+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_Hans\n"
 
-#: ../clients/cli/agent.c:23
+#: ../clients/cli/agent.c:22
 #, c-format
 msgid ""
 "Usage: nmcli agent { COMMAND | help }\n"
@@ -44,7 +44,7 @@
 "命令 := { secret | polkit | all }\n"
 "\n"
 
-#: ../clients/cli/agent.c:31
+#: ../clients/cli/agent.c:30
 #, c-format
 msgid ""
 "Usage: nmcli agent secret { help }\n"
@@ -61,7 +61,7 @@
 "注册的代理提供。这个命令将使 nmcli 保持运行，如果要求密码则会请求用户提供。\n"
 "\n"
 
-#: ../clients/cli/agent.c:41
+#: ../clients/cli/agent.c:40
 #, c-format
 msgid ""
 "Usage: nmcli agent polkit { help }\n"
@@ -78,7 +78,7 @@
 "当 polkit 守护进程要求授权时，nmcli 询问用户后将其响应返回 polkit。\n"
 "\n"
 
-#: ../clients/cli/agent.c:51
+#: ../clients/cli/agent.c:50
 #, c-format
 msgid ""
 "Usage: nmcli agent all { help }\n"
@@ -91,48 +91,48 @@
 "将 nmcli 同时作为网络管理器（NetworkManager）的密钥（secret）代理及 polkit 代理运行。\n"
 "\n"
 
-#: ../clients/cli/agent.c:143
+#: ../clients/cli/agent.c:142
 #, c-format
 msgid "nmcli successfully registered as a NetworkManager's secret agent.\n"
 msgstr "nmcli 已成功地注册为网络管理器（NetworkManager）的密钥（secret）代理。\n"
 
-#: ../clients/cli/agent.c:145
+#: ../clients/cli/agent.c:144
 #, c-format
 msgid "Error: secret agent initialization failed"
 msgstr "错误：密钥（secret）代理初始化失败"
 
-#: ../clients/cli/agent.c:164
+#: ../clients/cli/agent.c:176
 #, c-format
 msgid "Error: polkit agent initialization failed: %s"
 msgstr "错误：polkit 代理初始化失败：%s"
 
-#: ../clients/cli/agent.c:172
+#: ../clients/cli/agent.c:153
 #, c-format
 msgid "nmcli successfully registered as a polkit agent.\n"
 msgstr "nmcli 已成功地注册为 polkit 代理。\n"
 
-#: ../clients/cli/common.c:344 ../clients/cli/common.c:345
-#: ../clients/cli/common.c:376 ../clients/cli/common.c:377
-#: ../clients/cli/connections.c:1495
+#: ../clients/cli/common.c:347 ../clients/cli/common.c:348
+#: ../clients/cli/common.c:379 ../clients/cli/common.c:380
+#: ../clients/cli/connections.c:1511
 msgid "GROUP"
 msgstr "组"
 
-#: ../clients/cli/common.c:628
+#: ../clients/cli/common.c:631
 #, c-format
 msgid "Error: openconnect failed: %s\n"
 msgstr "错误：openconnect 失败：%s\n"
 
-#: ../clients/cli/common.c:635
+#: ../clients/cli/common.c:638
 #, c-format
 msgid "Error: openconnect failed with status %d\n"
 msgstr "错误：openconnect 失败，状态为 %d\n"
 
-#: ../clients/cli/common.c:637
+#: ../clients/cli/common.c:640
 #, c-format
 msgid "Error: openconnect failed with signal %d\n"
 msgstr "错误：openconnect 失败，信号为 %d\n"
 
-#: ../clients/cli/common.c:725
+#: ../clients/cli/common.c:728
 #, c-format
 msgid ""
 "Warning: password for '%s' not given in 'passwd-file' and nmcli cannot ask "
@@ -141,25 +141,25 @@
 "警告：\"passwd-file\" 里没有给定 \"%s\" 的密码而且 nmcli 没有 \"--ask\" 选项就无法进行\n"
 "询问。\n"
 
-#: ../clients/cli/common.c:1227
+#: ../clients/cli/common.c:1244
 #, c-format
 msgid "Error: Could not create NMClient object: %s."
 msgstr "错误：无法创建 NMClient 对象：%s。"
 
-#: ../clients/cli/common.c:1246
+#: ../clients/cli/common.c:1265
 msgid "Error: NetworkManager is not running."
 msgstr "错误：网络管理器（NetworkManager）未运行。"
 
-#: ../clients/cli/common.c:1339
+#: ../clients/cli/common.c:1364
 #, c-format
 msgid "Error: argument '%s' not understood. Try passing --help instead."
 msgstr "错误：不能理解参数 \"%s\"。试下换成传递 --help 参数。"
 
-#: ../clients/cli/common.c:1347
+#: ../clients/cli/common.c:1372
 msgid "Error: missing argument. Try passing --help."
 msgstr "错误：缺少参数。试下传递 --help 参数。"
 
-#: ../clients/cli/common.c:1414
+#: ../clients/cli/common.c:1439
 msgid "access denied"
 msgstr "访问遭到拒绝"
 
@@ -194,7 +194,7 @@
 msgid "Connection(s) (name, UUID, path or apath)"
 msgstr "连接（名称、UUID、路径或活动路径）"
 
-#: ../clients/cli/connections.c:904
+#: ../clients/cli/connections.c:907
 #, c-format
 msgid ""
 "Usage: nmcli connection { COMMAND | help }\n"
@@ -271,7 +271,7 @@
 "  export [id | uuid | path] <ID> [<output file>]\n"
 "\n"
 
-#: ../clients/cli/connections.c:926
+#: ../clients/cli/connections.c:929
 #, c-format
 msgid ""
 "Usage: nmcli connection show { ARGUMENTS | help }\n"
@@ -311,7 +311,7 @@
 "局的 \"--fields\" 选项过滤输出。更多信息请参考手册页。当指定 --active 选项时，只\n"
 "会考虑活动的配置集。请使用全局的 --show-secrets 选项以同时显示关联的密钥（secret）。\n"
 
-#: ../clients/cli/connections.c:947
+#: ../clients/cli/connections.c:950
 #, c-format
 msgid ""
 "Usage: nmcli connection up { ARGUMENTS | help }\n"
@@ -352,7 +352,7 @@
 "passwd-file - 激活连接所需的密码文件\n"
 "\n"
 
-#: ../clients/cli/connections.c:968
+#: ../clients/cli/connections.c:971
 #, c-format
 msgid ""
 "Usage: nmcli connection down { ARGUMENTS | help }\n"
@@ -568,7 +568,7 @@
 "nmcli con mod bond0 -bond.options downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:1127
+#: ../clients/cli/connections.c:1135
 #, c-format
 msgid ""
 "Usage: nmcli connection clone { ARGUMENTS | help }\n"
@@ -589,7 +589,7 @@
 "成）和 ID（由 <新名称> 参数提供）不同。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1139
+#: ../clients/cli/connections.c:1147
 #, c-format
 msgid ""
 "Usage: nmcli connection edit { ARGUMENTS | help }\n"
@@ -616,7 +616,7 @@
 "在交互式编辑器中添加新的连接配置文件。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1154
+#: ../clients/cli/connections.c:1162
 #, c-format
 msgid ""
 "Usage: nmcli connection delete { ARGUMENTS | help }\n"
@@ -635,7 +635,7 @@
 "配置集由其名称、UUID 或 D-Bus 路径来确定。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1165
+#: ../clients/cli/connections.c:1173
 #, c-format
 msgid ""
 "Usage: nmcli connection monitor { ARGUMENTS | help }\n"
@@ -655,7 +655,7 @@
 "每当指定的连接修改时，这个命令将其打印出来。如果没有指定则监视所有的连接。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1177
+#: ../clients/cli/connections.c:1185
 #, c-format
 msgid ""
 "Usage: nmcli connection reload { help }\n"
@@ -668,7 +668,7 @@
 "从磁盘重新载入所有的连接文件。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1185
+#: ../clients/cli/connections.c:1193
 #, c-format
 msgid ""
 "Usage: nmcli connection load { ARGUMENTS | help }\n"
@@ -689,7 +689,7 @@
 "网络管理器（NetworkManager）能注意到它的最新状态。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1197
+#: ../clients/cli/connections.c:1205
 #, c-format
 msgid ""
 "Usage: nmcli connection import { ARGUMENTS | help }\n"
@@ -711,7 +711,7 @@
 "目前只支持 VPN 配置。配置通过 NetworkManager VPN 插件导入。\n"
 "\n"
 
-#: ../clients/cli/connections.c:1210
+#: ../clients/cli/connections.c:1218
 #, c-format
 msgid ""
 "Usage: nmcli connection export { ARGUMENTS | help }\n"
@@ -729,194 +729,194 @@
 "导出连接。目前只支持 VPN 连接。数据会导出到标准输出或文件（如果给定了）。\n"
 "\n"
 
-#: ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:68
 msgid "activating"
 msgstr "激活中"
 
-#: ../clients/cli/connections.c:68
+#: ../clients/cli/connections.c:69
 msgid "activated"
 msgstr "已激活"
 
-#: ../clients/cli/connections.c:69 ../clients/common/nm-client-utils.c:261
+#: ../clients/cli/connections.c:70 ../clients/common/nm-client-utils.c:261
 msgid "deactivating"
 msgstr "停用中"
 
-#: ../clients/cli/connections.c:70
+#: ../clients/cli/connections.c:71
 msgid "deactivated"
 msgstr "已停用"
 
-#: ../clients/cli/common.c:1468 ../clients/cli/connections.c:66
-#: ../clients/cli/connections.c:75 ../clients/cli/devices.c:427
-#: ../clients/cli/devices.c:519 ../clients/cli/devices.c:526
-#: ../clients/cli/general.c:26 ../clients/cli/general.c:116
-#: ../clients/cli/general.c:121 ../clients/common/nm-client-utils.c:250
+#: ../clients/cli/common.c:1493 ../clients/cli/connections.c:67
+#: ../clients/cli/connections.c:77 ../clients/cli/devices.c:433
+#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:532
+#: ../clients/cli/general.c:31 ../clients/cli/general.c:86
+#: ../clients/cli/general.c:91 ../clients/common/nm-client-utils.c:250
 #: ../clients/common/nm-client-utils.c:263
 #: ../clients/common/nm-client-utils.c:267
 #: ../clients/common/nm-client-utils.c:272
-#: ../clients/common/nm-meta-setting-desc.c:1724
-#: ../clients/common/nm-meta-setting-desc.c:1755
-#: ../clients/common/nm-meta-setting-desc.c:2687
-#: ../clients/common/nm-meta-setting-desc.c:2745
+#: ../clients/common/nm-meta-setting-desc.c:1713
+#: ../clients/common/nm-meta-setting-desc.c:1744
+#: ../clients/common/nm-meta-setting-desc.c:2646
+#: ../clients/common/nm-meta-setting-desc.c:2704
 msgid "unknown"
 msgstr "未知"
 
-#: ../clients/cli/connections.c:76
+#: ../clients/cli/connections.c:78
 msgid "VPN connecting (prepare)"
 msgstr "VPN 连接中(准备)"
 
-#: ../clients/cli/connections.c:77
+#: ../clients/cli/connections.c:79
 msgid "VPN connecting (need authentication)"
 msgstr "VPN 连接中（需要验证）"
 
-#: ../clients/cli/connections.c:78
+#: ../clients/cli/connections.c:80
 msgid "VPN connecting"
 msgstr "VPN 连接中"
 
-#: ../clients/cli/connections.c:79
+#: ../clients/cli/connections.c:81
 msgid "VPN connecting (getting IP configuration)"
 msgstr "VPN 连接中（获取 IP 配置中）"
 
-#: ../clients/cli/connections.c:80
+#: ../clients/cli/connections.c:82
 msgid "VPN connected"
 msgstr "VPN 已连接"
 
-#: ../clients/cli/connections.c:81
+#: ../clients/cli/connections.c:83
 msgid "VPN connection failed"
 msgstr "VPN 连接失败"
 
-#: ../clients/cli/connections.c:82
+#: ../clients/cli/connections.c:84
 msgid "VPN disconnected"
 msgstr "VPN 已断开"
 
-#: ../clients/cli/connections.c:1301
+#: ../clients/cli/connections.c:1309
 #, c-format
 msgid "Error updating secrets for %s: %s\n"
 msgstr "更新 %s 的密钥时出错：%s\n"
 
-#: ../clients/cli/connections.c:1348
+#: ../clients/cli/connections.c:1356
 msgid "Connection profile details"
 msgstr "连接配置集详情"
 
-#: ../clients/cli/connections.c:1361 ../clients/cli/connections.c:1446
+#: ../clients/cli/connections.c:1369 ../clients/cli/connections.c:1458
 #, c-format
 msgid "Error: 'connection show': %s"
 msgstr "错误：\"connection show\"：%s"
 
-#: ../clients/cli/connections.c:544
+#: ../clients/cli/connections.c:546
 msgid "never"
 msgstr "从不"
 
-#: ../clients/cli/connections.c:4966 ../clients/cli/connections.c:6921
-#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:517
-#: ../clients/cli/devices.c:524 ../clients/cli/devices.c:1239
-#: ../clients/cli/general.c:122 ../clients/cli/utils.h:291
+#: ../clients/cli/connections.c:5067 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:523
+#: ../clients/cli/devices.c:530 ../clients/cli/devices.c:1249
+#: ../clients/cli/general.c:92 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:268
-#: ../clients/common/nm-meta-setting-desc.c:866
-#: ../clients/common/nm-meta-setting-desc.c:2679
+#: ../clients/common/nm-meta-setting-desc.c:847
+#: ../clients/common/nm-meta-setting-desc.c:2638
 msgid "yes"
 msgstr "是"
 
-#: ../clients/cli/connections.c:4965 ../clients/cli/connections.c:6921
-#: ../clients/cli/connections.c:6922 ../clients/cli/devices.c:518
-#: ../clients/cli/devices.c:525 ../clients/cli/devices.c:1239
-#: ../clients/cli/general.c:123 ../clients/cli/utils.h:291
+#: ../clients/cli/connections.c:5066 ../clients/cli/connections.c:7004
+#: ../clients/cli/connections.c:7005 ../clients/cli/devices.c:524
+#: ../clients/cli/devices.c:531 ../clients/cli/devices.c:1249
+#: ../clients/cli/general.c:93 ../clients/cli/utils.h:293
 #: ../clients/common/nm-client-utils.c:269
-#: ../clients/common/nm-meta-setting-desc.c:866
-#: ../clients/common/nm-meta-setting-desc.c:2682
+#: ../clients/common/nm-meta-setting-desc.c:847
+#: ../clients/common/nm-meta-setting-desc.c:2641
 msgid "no"
 msgstr "否"
 
-#: ../clients/cli/connections.c:1436
+#: ../clients/cli/connections.c:1448
 msgid "Activate connection details"
 msgstr "激活连接详情"
 
-#: ../clients/cli/connections.c:1637
+#: ../clients/cli/connections.c:1653
 #, c-format
 msgid "invalid field '%s'; allowed fields: %s and %s, or %s,%s"
 msgstr "无效字段 \"%s\"；允许的字段为 %s 和 %s，或 %s,%s"
 
-#: ../clients/cli/connections.c:1647 ../clients/cli/connections.c:1655
+#: ../clients/cli/connections.c:1663 ../clients/cli/connections.c:1671
 #, c-format
 msgid "'%s' has to be alone"
 msgstr "\"%s\" 必须是单独的"
 
-#: ../clients/cli/connections.c:1915
+#: ../clients/cli/connections.c:1931
 #, c-format
 msgid "incorrect string '%s' of '--order' option"
 msgstr "\"--order\" 选项的字符串 \"%s\" 错误"
 
-#: ../clients/cli/connections.c:1940
+#: ../clients/cli/connections.c:1956
 #, c-format
 msgid "incorrect item '%s' in '--order' option"
 msgstr "\"--order\" 选项里有错误项 \"%s\""
 
-#: ../clients/cli/connections.c:1978
+#: ../clients/cli/connections.c:1994
 msgid "No connection specified"
 msgstr "未指定连接"
 
-#: ../clients/cli/connections.c:1989
+#: ../clients/cli/connections.c:2005
 #, c-format
 msgid "%s argument is missing"
 msgstr "缺少 %s 参数"
 
-#: ../clients/cli/connections.c:2007
+#: ../clients/cli/connections.c:2023
 #, c-format
 msgid "unknown connection '%s'"
 msgstr "未知的连接 \"%s\""
 
-#: ../clients/cli/connections.c:2036
+#: ../clients/cli/connections.c:2052
 msgid "'--order' argument is missing"
 msgstr "缺少 \"--order\" 参数"
 
-#: ../clients/cli/connections.c:2096
+#: ../clients/cli/connections.c:2112
 msgid "NetworkManager active profiles"
 msgstr "网络管理器活动的配置集"
 
-#: ../clients/cli/connections.c:2097
+#: ../clients/cli/connections.c:2113
 msgid "NetworkManager connection profiles"
 msgstr "网络管理器连接配置集"
 
-#: ../clients/cli/connections.c:2149 ../clients/cli/connections.c:2895
-#: ../clients/cli/connections.c:2907 ../clients/cli/connections.c:2919
-#: ../clients/cli/connections.c:3149 ../clients/cli/connections.c:8969
-#: ../clients/cli/connections.c:8990 ../clients/cli/devices.c:3019
-#: ../clients/cli/devices.c:3031 ../clients/cli/devices.c:3044
-#: ../clients/cli/devices.c:3299 ../clients/cli/devices.c:3310
-#: ../clients/cli/devices.c:3328 ../clients/cli/devices.c:3337
-#: ../clients/cli/devices.c:3358 ../clients/cli/devices.c:3369
-#: ../clients/cli/devices.c:3387 ../clients/cli/devices.c:3905
-#: ../clients/cli/devices.c:3915 ../clients/cli/devices.c:3923
-#: ../clients/cli/devices.c:3935 ../clients/cli/devices.c:3950
-#: ../clients/cli/devices.c:3958 ../clients/cli/devices.c:4101
-#: ../clients/cli/devices.c:4112 ../clients/cli/devices.c:4326
-#: ../clients/cli/devices.c:4495
+#: ../clients/cli/connections.c:2165 ../clients/cli/connections.c:2911
+#: ../clients/cli/connections.c:2924 ../clients/cli/connections.c:2937
+#: ../clients/cli/connections.c:3169 ../clients/cli/connections.c:9056
+#: ../clients/cli/connections.c:9078 ../clients/cli/devices.c:3108
+#: ../clients/cli/devices.c:3121 ../clients/cli/devices.c:3133
+#: ../clients/cli/devices.c:3425 ../clients/cli/devices.c:3436
+#: ../clients/cli/devices.c:3454 ../clients/cli/devices.c:3463
+#: ../clients/cli/devices.c:3484 ../clients/cli/devices.c:3495
+#: ../clients/cli/devices.c:3513 ../clients/cli/devices.c:4029
+#: ../clients/cli/devices.c:4040 ../clients/cli/devices.c:4049
+#: ../clients/cli/devices.c:4063 ../clients/cli/devices.c:4080
+#: ../clients/cli/devices.c:4089 ../clients/cli/devices.c:4236
+#: ../clients/cli/devices.c:4247 ../clients/cli/devices.c:4463
+#: ../clients/cli/devices.c:4635
 #, c-format
 msgid "Error: %s argument is missing."
 msgstr "错误：缺少 %s 参数。"
 
-#: ../clients/cli/connections.c:2177
+#: ../clients/cli/connections.c:2193
 #, c-format
 msgid "Error: %s - no such connection profile."
 msgstr "错误：%s - 没有这样的连接配置集。"
 
-#: ../clients/cli/connections.c:2268 ../clients/cli/connections.c:2882
-#: ../clients/cli/connections.c:2947 ../clients/cli/connections.c:8506
-#: ../clients/cli/connections.c:8597 ../clients/cli/connections.c:9090
-#: ../clients/cli/devices.c:1773 ../clients/cli/devices.c:2041
-#: ../clients/cli/devices.c:2211 ../clients/cli/devices.c:2319
-#: ../clients/cli/devices.c:2511 ../clients/cli/devices.c:3178
-#: ../clients/cli/devices.c:4064 ../clients/cli/devices.c:4501
-#: ../clients/cli/general.c:982
+#: ../clients/cli/connections.c:2284 ../clients/cli/connections.c:2897
+#: ../clients/cli/connections.c:2967 ../clients/cli/connections.c:8597
+#: ../clients/cli/connections.c:8689 ../clients/cli/connections.c:9183
+#: ../clients/cli/devices.c:1786 ../clients/cli/devices.c:2054
+#: ../clients/cli/devices.c:2224 ../clients/cli/devices.c:2337
+#: ../clients/cli/devices.c:2526 ../clients/cli/devices.c:3304
+#: ../clients/cli/devices.c:4200 ../clients/cli/devices.c:4642
+#: ../clients/cli/general.c:993
 #, c-format
 msgid "Error: %s."
 msgstr "错误：%s。"
 
-#: ../clients/cli/connections.c:2361 ../clients/cli/devices.c:4278
+#: ../clients/cli/connections.c:2376 ../clients/cli/devices.c:4414
 #, c-format
 msgid "no active connection on device '%s'"
 msgstr "设备 “%s” 上没有活跃连接"
 
-#: ../clients/cli/connections.c:2369
+#: ../clients/cli/connections.c:2384
 msgid "no active connection or device"
 msgstr "没有活动的连接或设备"
 
@@ -925,63 +925,63 @@
 msgid "device '%s' not compatible with connection '%s':"
 msgstr ""
 
-#: ../clients/cli/connections.c:2422
+#: ../clients/cli/connections.c:2437
 #, c-format
 msgid "device '%s' not compatible with connection '%s'"
 msgstr "设备 \"%s\" 与连接 \"%s\" 不兼容"
 
-#: ../clients/cli/connections.c:2425
+#: ../clients/cli/connections.c:2440
 #, c-format
 msgid "no device found for connection '%s'"
 msgstr "没有找到可用于连接 \"%s\" 的设备"
 
-#: ../clients/cli/connections.c:2494
+#: ../clients/cli/connections.c:2509
 #, c-format
 msgid "Connection successfully activated (%s) (D-Bus active path: %s)\n"
 msgstr "连接已成功激活（%s）（D-Bus 活动路径：%s）\n"
 
-#: ../clients/cli/connections.c:2498 ../clients/cli/connections.c:2648
-#: ../clients/cli/connections.c:6798
+#: ../clients/cli/connections.c:2513 ../clients/cli/connections.c:2663
+#: ../clients/cli/connections.c:6898
 #, c-format
 msgid "Connection successfully activated (D-Bus active path: %s)\n"
 msgstr "连接已成功激活（D-Bus 活动路径：%s）\n"
 
-#: ../clients/cli/connections.c:2505 ../clients/cli/connections.c:2627
+#: ../clients/cli/connections.c:2520 ../clients/cli/connections.c:2642
 #, c-format
 msgid "Error: Connection activation failed: %s"
 msgstr "错误：连接激活失败：%s"
 
-#: ../clients/cli/connections.c:2542
+#: ../clients/cli/connections.c:2557
 #, c-format
 msgid "Error: Timeout expired (%d seconds)"
 msgstr "错误：超时时间已到（%d 秒）"
 
-#: ../clients/cli/connections.c:2709
+#: ../clients/cli/connections.c:2724
 #, c-format
 msgid "failed to read passwd-file '%s': %s"
 msgstr "读取 passwd-file \"%s\" 失败：%s"
 
-#: ../clients/cli/connections.c:2722
+#: ../clients/cli/connections.c:2737
 #, c-format
 msgid "missing colon in 'password' entry '%s'"
 msgstr "\"password\" 条目 \"%s\" 缺失了冒号"
 
-#: ../clients/cli/connections.c:2730
+#: ../clients/cli/connections.c:2745
 #, c-format
 msgid "missing dot in 'password' entry '%s'"
 msgstr "\"password\" 条目 \"%s\" 缺失了点号"
 
-#: ../clients/cli/connections.c:2743
+#: ../clients/cli/connections.c:2758
 #, c-format
 msgid "invalid setting name in 'password' entry '%s'"
 msgstr "\"password\" 条目 \"%s\" 里出现无效的设置名称"
 
-#: ../clients/cli/connections.c:2800
+#: ../clients/cli/connections.c:2815
 #, c-format
 msgid "unknown device '%s'."
 msgstr "未知设备 \"%s\"。"
 
-#: ../clients/cli/connections.c:2805
+#: ../clients/cli/connections.c:2820
 msgid "neither a valid connection nor device given"
 msgstr "没有给定有效的连接或设备"
 
@@ -992,153 +992,153 @@
 msgid "Unknown parameter: %s\n"
 msgstr "未知参数：%s\n"
 
-#: ../clients/cli/connections.c:2955
+#: ../clients/cli/connections.c:2976
 msgid "preparing"
 msgstr "准备中"
 
-#: ../clients/cli/connections.c:3064
+#: ../clients/cli/connections.c:3083
 #, c-format
 msgid "Connection '%s' (%s) successfully deleted.\n"
 msgstr "成功删除连接 \"%s\" (%s)。\n"
 
-#: ../clients/cli/connections.c:3080
+#: ../clients/cli/connections.c:3099
 #, c-format
 msgid "Connection '%s' successfully deactivated (D-Bus active path: %s)\n"
 msgstr "成功停用连接 \"%s\"（D-Bus 活动路径：%s）\n"
 
-#: ../clients/cli/connections.c:3131 ../clients/cli/connections.c:8693
-#: ../clients/cli/connections.c:8724 ../clients/cli/connections.c:8890
+#: ../clients/cli/connections.c:3150 ../clients/cli/connections.c:8786
+#: ../clients/cli/connections.c:8817 ../clients/cli/connections.c:8980
 #, c-format
 msgid "Error: No connection specified."
 msgstr "错误：未指定连接。"
 
-#: ../clients/cli/connections.c:3161
+#: ../clients/cli/connections.c:3182
 #, c-format
 msgid "Error: '%s' is not an active connection.\n"
 msgstr "错误：\"%s\" 不是活动的连接。\n"
 
-#: ../clients/cli/connections.c:3162
+#: ../clients/cli/connections.c:3183
 #, c-format
 msgid "Error: not all active connections found."
 msgstr "错误：未找到所有的活动连接。"
 
-#: ../clients/cli/connections.c:3170
+#: ../clients/cli/connections.c:3191
 #, c-format
 msgid "Error: no active connection provided."
 msgstr "错误：未提供活动连接。"
 
-#: ../clients/cli/connections.c:3201
+#: ../clients/cli/connections.c:3223
 #, c-format
 msgid "Connection '%s' deactivation failed: %s\n"
 msgstr "错误：停用连接 \"%s\" 失败：%s\n"
 
-#: ../clients/cli/connections.c:3461 ../clients/cli/connections.c:3518
+#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3538
 #: ../clients/common/nm-client-utils.c:211
 #, c-format
 msgid "'%s' not among [%s]"
 msgstr "\"%s\" 不在 [%s] 中"
 
 #. We should not really come here
-#: ../clients/cli/connections.c:3481 ../clients/cli/connections.c:3541
+#: ../clients/cli/connections.c:3501 ../clients/cli/connections.c:3561
 #: ../clients/common/nm-client-utils.c:279
 #, c-format
 msgid "Unknown error"
 msgstr "未知错误"
 
-#: ../clients/cli/connections.c:3675
+#: ../clients/cli/connections.c:3695
 #, c-format
 msgid "Warning: master='%s' doesn't refer to any existing profile.\n"
 msgstr "警告：master=\"%s\" 没有引用任何现有的配置集。\n"
 
-#: ../clients/cli/connections.c:4038
+#: ../clients/cli/connections.c:4058
 #, c-format
 msgid "Error: invalid property '%s': %s."
 msgstr "错误：无效的属性 \"%s\"：%s。"
 
-#: ../clients/cli/connections.c:3995
+#: ../clients/cli/connections.c:3585
 #, c-format
 msgid "Error: failed to modify %s.%s: %s."
 msgstr "错误：修改 %s.%s 失败：%s。"
 
-#: ../clients/cli/connections.c:4015
+#: ../clients/cli/connections.c:3604
 #, c-format
 msgid "Error: failed to remove a value from %s.%s: %s."
 msgstr "错误：从 %s.%s 删除值失败：%s。"
 
-#: ../clients/cli/connections.c:4095
+#: ../clients/cli/connections.c:4115
 #, c-format
 msgid "Error: '%s' is mandatory."
 msgstr "错误：设置 \"%s\" 是必填的。"
 
-#: ../clients/cli/connections.c:4122
+#: ../clients/cli/connections.c:4142
 #, c-format
 msgid "Error: invalid slave type; %s."
 msgstr "错误：无效的从属类型；%s。"
 
-#: ../clients/cli/connections.c:4130
+#: ../clients/cli/connections.c:4150
 #, c-format
 msgid "Error: invalid connection type; %s."
 msgstr "错误：无效的连接类型；%s。"
 
-#: ../clients/cli/connections.c:4207
+#: ../clients/cli/connections.c:4227
 #, c-format
 msgid "Error: bad connection type: %s"
 msgstr "错误：错误的连接类型：%s"
 
-#: ../clients/cli/connections.c:4263
+#: ../clients/cli/connections.c:4234
 #, c-format
 msgid "Error: '%s': %s"
 msgstr "错误：\"%s\"：%s"
 
-#: ../clients/cli/connections.c:4290
+#: ../clients/cli/connections.c:4302
 msgid "Error: master is required"
 msgstr "错误：需要主连接"
 
-#: ../clients/cli/connections.c:4359
+#: ../clients/cli/connections.c:4371
 #, c-format
 msgid "Error: error adding bond option '%s=%s'."
 msgstr "错误：添加绑定（bond）选项 \"%s=%s\" 时出错。"
 
-#: ../clients/cli/connections.c:4390
+#: ../clients/cli/connections.c:4402
 #, c-format
 msgid "Error: '%s' is not a valid monitoring mode; use '%s' or '%s'.\n"
 msgstr "错误：\"%s\" 不是有效的监视模式；使用 \"%s\" 或 \"%s\"。\n"
 
-#: ../clients/cli/connections.c:4421
+#: ../clients/cli/connections.c:4433
 #, c-format
 msgid "Error: 'bt-type': '%s' not valid; use [%s, %s, %s (%s), %s]."
 msgstr "错误：\"bt-type\"：\"%s\" 无效；使用 [%s, %s, %s (%s), %s]。"
 
-#: ../clients/cli/connections.c:4686
+#: ../clients/cli/connections.c:4737
 #, c-format
 msgid "Error: value for '%s' is missing."
 msgstr "错误：缺少 \"%s\" 的值。"
 
-#: ../clients/cli/connections.c:4730
+#: ../clients/cli/connections.c:4782
 msgid "Error: <setting>.<property> argument is missing."
 msgstr "错误：缺少 <设置>.<属性> 参数。"
 
-#: ../clients/cli/connections.c:4756
+#: ../clients/cli/connections.c:4854
 #, c-format
 msgid "Error: invalid or not allowed setting '%s': %s."
 msgstr "错误：无效或不允许的设置 \"%s\"：%s。"
 
-#: ../clients/cli/connections.c:4805 ../clients/cli/connections.c:4821
+#: ../clients/cli/connections.c:4903 ../clients/cli/connections.c:4919
 #, c-format
 msgid "Error: '%s' is ambiguous (%s.%s or %s.%s)."
 msgstr "错误：\"%s\" 不明确（%s.%s 或 %s.%s）。"
 
-#: ../clients/cli/connections.c:4837
+#: ../clients/cli/connections.c:4939
 #, c-format
 msgid "Error: invalid <setting>.<property> '%s'."
 msgstr "Error: invalid <setting>.<property> '%s'."
 
-#: ../clients/cli/connections.c:4876 ../clients/cli/connections.c:8545
+#: ../clients/cli/connections.c:4977 ../clients/cli/connections.c:8637
 #, c-format
 msgid "Error: Failed to add '%s' connection: %s"
 msgstr "错误：添加 \"%s\" 连接失败：%s"
 
-#: ../clients/cli/connections.c:4894
+#: ../clients/cli/connections.c:4995
 #, c-format
 msgid ""
 "Warning: There is another connection with the name '%1$s'. Reference the "
@@ -1149,46 +1149,46 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../clients/cli/connections.c:4903
+#: ../clients/cli/connections.c:5004
 #, c-format
 msgid "Connection '%s' (%s) successfully added.\n"
 msgstr "连接 \"%s\" (%s) 已成功添加。\n"
 
-#: ../clients/cli/connections.c:5052
+#: ../clients/cli/connections.c:5153
 #, c-format
 msgid ""
 "You can specify this option more than once. Press <Enter> when you're done.\n"
 msgstr "您可以多次指定此选项。按下 <回车键> 以完成。\n"
 
 #. Ask for optional arguments.
-#: ../clients/cli/connections.c:5154
+#: ../clients/cli/connections.c:5255
 #, c-format
 msgid "There is %d optional setting for %s.\n"
 msgid_plural "There are %d optional settings for %s.\n"
 msgstr[0] "%2$s 有 %1$d 个可选的设置。\n"
 
-#: ../clients/cli/connections.c:5160
+#: ../clients/cli/connections.c:5261
 #, c-format
 msgid "Do you want to provide it? %s"
 msgid_plural "Do you want to provide them? %s"
 msgstr[0] "您要提供它吗？%s"
 
-#: ../clients/cli/connections.c:5292 ../clients/cli/utils.c:279
+#: ../clients/cli/connections.c:5393 ../clients/cli/utils.c:279
 #, c-format
 msgid "Error: value for '%s' argument is required."
 msgstr "错误：需要 \"%s\" 参数的值。"
 
-#: ../clients/cli/connections.c:5299
+#: ../clients/cli/connections.c:5400
 #, c-format
 msgid "Error: 'save': %s."
 msgstr "错误：\"save\"：%s。"
 
-#: ../clients/cli/connections.c:5384 ../clients/cli/connections.c:5395
+#: ../clients/cli/connections.c:5485 ../clients/cli/connections.c:5496
 #, c-format
 msgid "Error: '%s' argument is required."
 msgstr "错误：需要 \"%s\" 参数。"
 
-#: ../clients/cli/connections.c:6354
+#: ../clients/cli/connections.c:6454
 #, c-format
 msgid "['%s' setting values]\n"
 msgstr "[\"%s\" 设置值]\n"
@@ -1196,7 +1196,7 @@
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #. 
-#: ../clients/cli/connections.c:6463
+#: ../clients/cli/connections.c:6563
 #, c-format
 msgid ""
 "---[ Main menu ]---\n"
@@ -1228,7 +1228,7 @@
 "nmcli    <配置选项> <值>          :: nmcli configuration\n"
 "quit                              :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:6490
+#: ../clients/cli/connections.c:6590
 #, c-format
 msgid ""
 "goto <setting>[.<prop>] | <prop>  :: enter setting/property for editing\n"
@@ -1247,7 +1247,7 @@
 "      nmcli connection> goto secondaries\n"
 "      nmcli> goto ipv4.addresses\n"
 
-#: ../clients/cli/connections.c:6497
+#: ../clients/cli/connections.c:6597
 #, c-format
 msgid ""
 "remove <setting>[.<prop>]  :: remove setting or reset property value\n"
@@ -1266,7 +1266,7 @@
 "示例：nmcli> remove wifi-sec\n"
 "      nmcli> remove eth.mtu\n"
 
-#: ../clients/cli/connections.c:6504
+#: ../clients/cli/connections.c:6604
 #, c-format
 msgid ""
 "set [<setting>.<prop> <value>]  :: set property value\n"
@@ -1281,7 +1281,7 @@
 "\n"
 "示例：nmcli> set con.id 我的连接\n"
 
-#: ../clients/cli/connections.c:6509
+#: ../clients/cli/connections.c:6609
 #, c-format
 msgid ""
 "describe [<setting>.<prop>]  :: describe property\n"
@@ -1293,7 +1293,7 @@
 "\n"
 "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看全部的网络管理器（NetworkManager）设置和属性。\n"
 
-#: ../clients/cli/connections.c:6514
+#: ../clients/cli/connections.c:6614
 #, c-format
 msgid ""
 "print [all]  :: print setting or connection values\n"
@@ -1308,7 +1308,7 @@
 "\n"
 "示例：nmcli ipv4> print all\n"
 
-#: ../clients/cli/connections.c:6519
+#: ../clients/cli/connections.c:6619
 #, c-format
 msgid ""
 "verify [all | fix]  :: verify setting or connection validity\n"
@@ -1331,7 +1331,7 @@
 "      nmcli> verify fix\n"
 "      nmcli bond> verify\n"
 
-#: ../clients/cli/connections.c:6528
+#: ../clients/cli/connections.c:6628
 #, c-format
 msgid ""
 "save [persistent|temporary]  :: save the connection\n"
@@ -1354,7 +1354,7 @@
 "可以是临时的，也可以是永久的，但任何临时的修改在重启后都会复原。如果您想完全删\n"
 "除永久性连接，连接配置集就必须被删除。\n"
 
-#: ../clients/cli/connections.c:6539
+#: ../clients/cli/connections.c:6639
 #, c-format
 msgid ""
 "activate [<ifname>] [/<ap>|<nsp>]  :: activate the connection\n"
@@ -1374,7 +1374,7 @@
 "<接口名>    - 将激活连接的设备。\n"
 "/<ap>|<nsp> - AP (Wi-Fi) 或者 NSP (WiMAX)（未指定 <接口名> 时前置 / 符号。）\n"
 
-#: ../clients/cli/connections.c:6546 ../clients/cli/connections.c:6704
+#: ../clients/cli/connections.c:6646 ../clients/cli/connections.c:6804
 #, c-format
 msgid ""
 "back  :: go to upper menu level\n"
@@ -1383,7 +1383,7 @@
 "back  :: 转到上层菜单\n"
 "\n"
 
-#: ../clients/cli/connections.c:6549
+#: ../clients/cli/connections.c:6649
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for the nmcli commands\n"
@@ -1392,7 +1392,7 @@
 "help/? [<命令>]  :: nmcli 命令的帮助\n"
 "\n"
 
-#: ../clients/cli/connections.c:6552
+#: ../clients/cli/connections.c:6652
 #, c-format
 msgid ""
 "nmcli [<conf-option> <value>]  :: nmcli configuration\n"
@@ -1419,7 +1419,7 @@
 "          nmcli> nmcli save-confirmation no\n"
 "          nmcli> nmcli prompt-color 3\n"
 
-#: ../clients/cli/connections.c:6574 ../clients/cli/connections.c:6710
+#: ../clients/cli/connections.c:6674 ../clients/cli/connections.c:6810
 #, c-format
 msgid ""
 "quit  :: exit nmcli\n"
@@ -1431,8 +1431,8 @@
 "\n"
 "此命令用于退出 nmcli。当被编辑的连接没有保存时，会询问用户确定操作。\n"
 
-#: ../clients/cli/connections.c:6579 ../clients/cli/connections.c:6715
-#: ../clients/cli/connections.c:7126 ../clients/cli/connections.c:8129
+#: ../clients/cli/connections.c:6679 ../clients/cli/connections.c:6815
+#: ../clients/cli/connections.c:7209 ../clients/cli/connections.c:8219
 #, c-format
 msgid "Unknown command: '%s'\n"
 msgstr "未知命令：\"%s\"\n"
@@ -1440,7 +1440,7 @@
 #. TRANSLATORS: do not translate command names and keywords before ::
 #. *              However, you should translate terms enclosed in <>.
 #. 
-#: ../clients/cli/connections.c:6644
+#: ../clients/cli/connections.c:6744
 #, c-format
 msgid ""
 "---[ Property menu ]---\n"
@@ -1466,7 +1466,7 @@
 "help/?   [<命令>]                :: 输出该帮助或命令描述\n"
 "quit                             :: 退出 nmcli\n"
 
-#: ../clients/cli/connections.c:6669
+#: ../clients/cli/connections.c:6769
 #, c-format
 msgid ""
 "set [<value>]  :: set new value\n"
@@ -1477,7 +1477,7 @@
 "\n"
 "此命令用于设置提供的 <值> 到该属性\n"
 
-#: ../clients/cli/connections.c:6673
+#: ../clients/cli/connections.c:6773
 #, c-format
 msgid ""
 "add [<value>]  :: append new value to the property\n"
@@ -1490,7 +1490,7 @@
 "\n"
 "如果该属性为容器类型，则这个命令在这个属性中添加提供的 <值>。对于单值属性，它会替换该值（和 \"set\" 一样）。\n"
 
-#: ../clients/cli/connections.c:6679
+#: ../clients/cli/connections.c:6779
 #, c-format
 msgid ""
 "change  :: change current value\n"
@@ -1501,7 +1501,7 @@
 "\n"
 "显示当前值并允许编辑它。\n"
 
-#: ../clients/cli/connections.c:6683
+#: ../clients/cli/connections.c:6783
 #, c-format
 msgid ""
 "remove [<value>|<index>|<option name>]  :: delete the value\n"
@@ -1531,7 +1531,7 @@
 "      nmcli bond.options> remove downdelay\n"
 "\n"
 
-#: ../clients/cli/connections.c:6694
+#: ../clients/cli/connections.c:6794
 #, c-format
 msgid ""
 "describe  :: describe property\n"
@@ -1543,7 +1543,7 @@
 "\n"
 "显示属性描述。您可以参阅 nm-settings(5) 手册页来查看所有的网络管理器（NetworkManager）设置和属性。\n"
 
-#: ../clients/cli/connections.c:6699
+#: ../clients/cli/connections.c:6799
 #, c-format
 msgid ""
 "print [property|setting|connection]  :: print property (setting, connection) "
@@ -1556,7 +1556,7 @@
 "\n"
 "显示属性。提供参数您也可以显示整个设置或连接的值。\n"
 
-#: ../clients/cli/connections.c:6707
+#: ../clients/cli/connections.c:6807
 #, c-format
 msgid ""
 "help/? [<command>]  :: help for nmcli commands\n"
@@ -1565,93 +1565,93 @@
 "help/? [<命令>]  :: nmcli 命令的帮助\n"
 "\n"
 
-#: ../clients/cli/connections.c:6804
+#: ../clients/cli/connections.c:6904
 #, c-format
 msgid "Error: Connection activation failed.\n"
 msgstr "错误：连接激活失败。\n"
 
-#: ../clients/cli/connections.c:6901
+#: ../clients/cli/connections.c:6893
 #, c-format
 msgid "Error: setting '%s' is mandatory and cannot be removed.\n"
 msgstr "错误：设置 \"%s\" 是必填的而且无法移除。\n"
 
 #. TRANSLATORS: status line in nmcli connection editor
-#: ../clients/cli/connections.c:6919
+#: ../clients/cli/connections.c:7002
 #, c-format
 msgid "[ Type: %s | Name: %s | UUID: %s | Dirty: %s | Temp: %s ]\n"
 msgstr "[ 类型：%s | 名称：%s | UUID：%s | 变动：%s | 临时：%s ]\n"
 
-#: ../clients/cli/connections.c:6955
+#: ../clients/cli/connections.c:7038
 #, c-format
 msgid "The connection is not saved. Do you really want to quit? %s"
 msgstr "连接未保存。您真的要退出吗？%s"
 
-#: ../clients/cli/connections.c:6996
+#: ../clients/cli/connections.c:7079
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' in the main menu to restore it.\n"
 msgstr "此连接配置集已被其他客户端移除了。您可以在主菜单中输入 \"save\" 来还原它。\n"
 
-#: ../clients/cli/connections.c:7030 ../clients/cli/connections.c:7424
-#: ../clients/cli/connections.c:7488
+#: ../clients/cli/connections.c:7113 ../clients/cli/connections.c:7507
+#: ../clients/cli/connections.c:7571
 #, c-format
 msgid "Allowed values for '%s' property: %s\n"
 msgstr "\"%s\" 属性允许的值：%s\n"
 
-#: ../clients/cli/connections.c:7034 ../clients/cli/connections.c:7428
-#: ../clients/cli/connections.c:7492
+#: ../clients/cli/connections.c:7117 ../clients/cli/connections.c:7511
+#: ../clients/cli/connections.c:7575
 #, c-format
 msgid "Enter '%s' value: "
 msgstr "输入 \"%s\" 值： "
 
-#: ../clients/cli/connections.c:7048 ../clients/cli/connections.c:7066
-#: ../clients/cli/connections.c:7437 ../clients/cli/connections.c:7505
+#: ../clients/cli/connections.c:7131 ../clients/cli/connections.c:7149
+#: ../clients/cli/connections.c:7520 ../clients/cli/connections.c:7588
 #, c-format
 msgid "Error: failed to set '%s' property: %s\n"
 msgstr "错误：设置 \"%s\" 属性失败：%s\n"
 
-#: ../clients/cli/connections.c:7057
+#: ../clients/cli/connections.c:7140
 #, c-format
 msgid "Edit '%s' value: "
 msgstr "编辑 \"%s\" 值： "
 
-#: ../clients/cli/connections.c:7080 ../clients/cli/settings.c:400
+#: ../clients/cli/connections.c:7163 ../clients/cli/settings.c:400
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误：%s\n"
 
-#: ../clients/cli/connections.c:7607 ../clients/cli/connections.c:7662
+#: ../clients/cli/connections.c:7690 ../clients/cli/connections.c:7749
 #, c-format
 msgid "Error: failed to remove value of '%s': %s\n"
 msgstr "错误：移除 \"%s\" 的值失败：%s\n"
 
-#: ../clients/cli/connections.c:7099
+#: ../clients/cli/connections.c:7182
 #, c-format
 msgid "Unknown command argument: '%s'\n"
 msgstr "未知的命令参数：\"%s\"\n"
 
-#: ../clients/cli/connections.c:7190
+#: ../clients/cli/connections.c:7273
 #, c-format
 msgid "Available settings: %s\n"
 msgstr "有效设置：%s\n"
 
-#: ../clients/cli/connections.c:7202
+#: ../clients/cli/connections.c:7285
 #, c-format
 msgid "Error: invalid setting name; %s\n"
 msgstr "错误：无效的设置名称；%s\n"
 
-#: ../clients/cli/connections.c:7220
+#: ../clients/cli/connections.c:7303
 #, c-format
 msgid "Available properties: %s\n"
 msgstr "有效属性：%s\n"
 
-#: ../clients/cli/connections.c:7228
+#: ../clients/cli/connections.c:7311
 #, c-format
 msgid "Error: property %s\n"
 msgstr "错误：属性 %s\n"
 
-#: ../clients/cli/connections.c:7273
+#: ../clients/cli/connections.c:7356
 #, c-format
 msgid ""
 "Saving the connection with 'autoconnect=yes'. That might result in an "
@@ -1661,189 +1661,189 @@
 "使用 \"autoconnect=yes\" 保存该连接。这样会立即激活该连接。\n"
 "您仍要保存吗？ %s"
 
-#: ../clients/cli/connections.c:7358
+#: ../clients/cli/connections.c:7441
 #, c-format
 msgid "You may edit the following settings: %s\n"
 msgstr "您可编辑下列设置：%s\n"
 
-#: ../clients/cli/connections.c:7389
+#: ../clients/cli/connections.c:7472
 #, c-format
 msgid ""
 "The connection profile has been removed from another client. You may type "
 "'save' to restore it.\n"
 msgstr "此连接配置集已被其他客户端移除了。您可以输入 \"save\" 来还原它。\n"
 
-#: ../clients/cli/connections.c:7441 ../clients/cli/connections.c:7709
-#: ../clients/cli/connections.c:7741
+#: ../clients/cli/connections.c:7524 ../clients/cli/connections.c:7799
+#: ../clients/cli/connections.c:7831
 #, c-format
 msgid "Error: no setting selected; valid are [%s]\n"
 msgstr "错误：未选择设置；有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7442
+#: ../clients/cli/connections.c:7525
 #, c-format
 msgid "use 'goto <setting>' first, or 'set <setting>.<property>'\n"
 msgstr "先使用 \"goto <设置>\"，或 \"set <设置>.<属性>\"\n"
 
-#: ../clients/cli/connections.c:7457 ../clients/cli/connections.c:7634
-#: ../clients/cli/connections.c:7731
+#: ../clients/cli/connections.c:7540 ../clients/cli/connections.c:7717
+#: ../clients/cli/connections.c:7821
 #, c-format
 msgid "Error: invalid setting argument '%s'; valid are [%s]\n"
 msgstr "错误：无效的设置参数 \"%s\"；有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7466
+#: ../clients/cli/connections.c:7549
 #, c-format
 msgid "Error: missing setting for '%s' property\n"
 msgstr "错误：缺少 \"%s\" 属性的设置\n"
 
-#: ../clients/cli/connections.c:7473
+#: ../clients/cli/connections.c:7556
 #, c-format
 msgid "Error: invalid property: %s\n"
 msgstr "错误：无效的属性：%s\n"
 
-#: ../clients/cli/connections.c:7537
+#: ../clients/cli/connections.c:7620
 #, c-format
 msgid "Error: unknown setting '%s'\n"
 msgstr "错误：未知的设置 \"%s\"\n"
 
-#: ../clients/cli/connections.c:7562
+#: ../clients/cli/connections.c:7645
 #, c-format
 msgid "You may edit the following properties: %s\n"
 msgstr "您可以编辑下列属性：%s\n"
 
-#: ../clients/cli/connections.c:7612
+#: ../clients/cli/connections.c:7695
 #, c-format
 msgid "Error: no argument given; valid are [%s]\n"
 msgstr "错误：未给定参数：有效的为 [%s]\n"
 
-#: ../clients/cli/connections.c:7631
+#: ../clients/cli/connections.c:7714
 #, c-format
 msgid "Setting '%s' is not present in the connection.\n"
 msgstr "设置 \"%s\" 在连接里未提供。\n"
 
-#: ../clients/cli/connections.c:7685
+#: ../clients/cli/connections.c:7775
 #, c-format
 msgid "Error: %s properties, nor it is a setting name.\n"
 msgstr "错误：%s 属性，也不是设置名称。\n"
 
-#: ../clients/cli/connections.c:7710 ../clients/cli/connections.c:7742
+#: ../clients/cli/connections.c:7800 ../clients/cli/connections.c:7832
 #, c-format
 msgid "use 'goto <setting>' first, or 'describe <setting>.<property>'\n"
 msgstr "先使用 \"goto <设置>\"，或 \"describe <设置>.<属性>\"\n"
 
-#: ../clients/cli/connections.c:7765
+#: ../clients/cli/connections.c:7855
 #, c-format
 msgid "Error: invalid property: %s, neither a valid setting name.\n"
 msgstr "错误：无效的属性：%s，也不是有效的设置名称。\n"
 
-#: ../clients/cli/connections.c:7795
+#: ../clients/cli/connections.c:7885
 #, c-format
 msgid "Error: unknown setting: '%s'\n"
 msgstr "错误：未知的设置：\"%s\"\n"
 
-#: ../clients/cli/connections.c:7800
+#: ../clients/cli/connections.c:7890
 #, c-format
 msgid "Error: '%s' setting not present in the connection\n"
 msgstr "错误：设置 \"%s\" 在连接里未提供。\n"
 
-#: ../clients/cli/connections.c:7831
+#: ../clients/cli/connections.c:7921
 #, c-format
 msgid "Error: invalid property: %s%s\n"
 msgstr "错误：无效的属性：%s%s\n"
 
-#: ../clients/cli/connections.c:7833
+#: ../clients/cli/connections.c:7923
 msgid ", neither a valid setting name"
 msgstr "，也不是有效的设置名称"
 
-#: ../clients/cli/connections.c:7849
+#: ../clients/cli/connections.c:7939
 #, c-format
 msgid "Invalid verify option: %s\n"
 msgstr "无效的验证选项：%s\n"
 
-#: ../clients/cli/connections.c:7858
+#: ../clients/cli/connections.c:7948
 #, c-format
 msgid "Verify setting '%s': %s\n"
 msgstr "验证设置 \"%s\"：%s\n"
 
-#: ../clients/cli/connections.c:7874
+#: ../clients/cli/connections.c:7964
 #, c-format
 msgid "Verify connection: %s\n"
 msgstr "验证连接：%s\n"
 
-#: ../clients/cli/connections.c:7877
+#: ../clients/cli/connections.c:7967
 #, c-format
 msgid "The error cannot be fixed automatically.\n"
 msgstr "错误无法自动修复。\n"
 
-#: ../clients/cli/connections.c:7897
+#: ../clients/cli/connections.c:7987
 #, c-format
 msgid "Error: invalid argument '%s'\n"
 msgstr "错误：无效的参数 \"%s\"\n"
 
-#: ../clients/cli/connections.c:7947
+#: ../clients/cli/connections.c:8037
 #, c-format
 msgid "Error: Failed to save '%s' (%s) connection: %s\n"
 msgstr "错误：保存 \"%s\" (%s) 连接失败：%s\n"
 
-#: ../clients/cli/connections.c:7958
+#: ../clients/cli/connections.c:8048
 #, c-format
 msgid "Connection '%s' (%s) successfully saved.\n"
 msgstr "连接 \"%s\" (%s) 已成功保存。\n"
 
-#: ../clients/cli/connections.c:7959
+#: ../clients/cli/connections.c:8049
 #, c-format
 msgid "Connection '%s' (%s) successfully updated.\n"
 msgstr "成功地更新了连接 \"%s\" (%s)。\n"
 
-#: ../clients/cli/connections.c:7992
+#: ../clients/cli/connections.c:8082
 #, c-format
 msgid "Error: connection verification failed: %s\n"
 msgstr "错误：连接验证失败：%s。\n"
 
-#: ../clients/cli/connections.c:7993
+#: ../clients/cli/connections.c:8083
 msgid "(unknown error)"
 msgstr "（未知错误）"
 
-#: ../clients/cli/connections.c:7994
+#: ../clients/cli/connections.c:8084
 #, c-format
 msgid "You may try running 'verify fix' to fix errors.\n"
 msgstr "您可以运行 \"verify fix\" 来修复错误。\n"
 
 #. TRANSLATORS: do not translate 'save', leave it as it is
-#: ../clients/cli/connections.c:8017
+#: ../clients/cli/connections.c:8107
 #, c-format
 msgid "Error: connection is not saved. Type 'save' first.\n"
 msgstr "错误：连接还未保存。先输入 \"save\"。\n"
 
-#: ../clients/cli/connections.c:8021
+#: ../clients/cli/connections.c:8111
 #, c-format
 msgid "Error: connection is not valid: %s\n"
 msgstr "错误：连接是无效的：%s\n"
 
-#: ../clients/cli/connections.c:8031
+#: ../clients/cli/connections.c:8121
 #, c-format
 msgid "Error: Cannot activate connection: %s.\n"
 msgstr "错误：无法激活连接：%s。\n"
 
-#: ../clients/cli/connections.c:8040
+#: ../clients/cli/connections.c:8130
 #, c-format
 msgid "Error: Failed to activate '%s' (%s) connection: %s\n"
 msgstr "错误：激活 \"%s\" (%s) 连接失败：%s\n"
 
-#: ../clients/cli/connections.c:8047
+#: ../clients/cli/connections.c:8137
 msgid "Monitoring connection activation (press any key to continue)\n"
 msgstr "正在监视连接激活（按任意键继续）\n"
 
-#: ../clients/cli/connections.c:8083
+#: ../clients/cli/connections.c:8173
 #, c-format
 msgid "Error: status-line: %s\n"
 msgstr "错误：status-line：%s\n"
 
-#: ../clients/cli/connections.c:8091
+#: ../clients/cli/connections.c:8181
 #, c-format
 msgid "Error: save-confirmation: %s\n"
 msgstr "错误：save-confirmation：%s\n"
 
-#: ../clients/cli/connections.c:8099
+#: ../clients/cli/connections.c:8189
 #, c-format
 msgid "Error: show-secrets: %s\n"
 msgstr "错误：show-secrets：%s\n"
@@ -1853,12 +1853,12 @@
 msgid "Error: bad color: %s\n"
 msgstr "错误：错误的颜色：%s\n"
 
-#: ../clients/cli/connections.c:8106
+#: ../clients/cli/connections.c:8196
 #, c-format
 msgid "Current nmcli configuration:\n"
 msgstr "当前 nmcli 配置：\n"
 
-#: ../clients/cli/connections.c:8114
+#: ../clients/cli/connections.c:8204
 #, c-format
 msgid "Invalid configuration option '%s'; allowed [%s]\n"
 msgstr "无效的配置选项 \"%s\"；允许 [%s]\n"
@@ -1868,160 +1868,160 @@
 msgid "Error: only one of 'id', uuid, or 'path' can be provided."
 msgstr "错误：只能提供“id”、uuid 或“路径”之一。"
 
-#: ../clients/cli/connections.c:8349 ../clients/cli/connections.c:8513
+#: ../clients/cli/connections.c:8441 ../clients/cli/connections.c:8605
 #, c-format
 msgid "Error: Unknown connection '%s'."
 msgstr "错误：未知连接 \"%s\"。"
 
-#: ../clients/cli/connections.c:8365
+#: ../clients/cli/connections.c:8458
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'type' argument is ignored\n"
 msgstr "警告：正在编辑已有的连接 \"%s\"；\"type\" 参数已忽略\n"
 
-#: ../clients/cli/connections.c:8368
+#: ../clients/cli/connections.c:8461
 #, c-format
 msgid ""
 "Warning: editing existing connection '%s'; 'con-name' argument is ignored\n"
 msgstr "警告：正在编辑已有的连接 \"%s\"；\"con-name\" 参数已忽略\n"
 
-#: ../clients/cli/connections.c:8395
+#: ../clients/cli/connections.c:8488
 #, c-format
 msgid "Valid connection types: %s\n"
 msgstr "有效的连接类型：%s\n"
 
-#: ../clients/cli/connections.c:8397
+#: ../clients/cli/connections.c:8490
 #, c-format
 msgid "Error: invalid connection type; %s\n"
 msgstr "错误：无效的连接类型；%s\n"
 
-#: ../clients/cli/connections.c:8433
+#: ../clients/cli/connections.c:8526
 #, c-format
 msgid "===| nmcli interactive connection editor |==="
 msgstr "===| nmcli 交互式连接编辑器 |==="
 
-#: ../clients/cli/connections.c:8436
+#: ../clients/cli/connections.c:8529
 #, c-format
 msgid "Editing existing '%s' connection: '%s'"
 msgstr "正在编辑已有的连接 \"%s\"：\"%s\""
 
-#: ../clients/cli/connections.c:8438
+#: ../clients/cli/connections.c:8531
 #, c-format
 msgid "Adding a new '%s' connection"
 msgstr "正在添加新的 \"%s\" 连接"
 
 #. TRANSLATORS: do not translate 'help', leave it as it is
-#: ../clients/cli/connections.c:8441
+#: ../clients/cli/connections.c:8534
 #, c-format
 msgid "Type 'help' or '?' for available commands."
 msgstr "输入 \"help\" 或 \"?\" 查看可用的命令。"
 
 #. TRANSLATORS: do not translate 'describe', leave it as it is
-#: ../clients/cli/connections.c:8447
+#: ../clients/cli/connections.c:8540
 #, c-format
 msgid "Type 'describe [<setting>.<prop>]' for detailed property description."
 msgstr "输入 \"describe [<设置>.<属性>]\" 来获得详细的属性描述。"
 
-#: ../clients/cli/connections.c:8475
+#: ../clients/cli/connections.c:8568
 #, c-format
 msgid "Error: Failed to modify connection '%s': %s"
 msgstr "错误：修改连接 \"%s\" 失败：%s"
 
-#: ../clients/cli/connections.c:8481
+#: ../clients/cli/connections.c:8574
 #, c-format
 msgid "Connection '%s' (%s) successfully modified.\n"
 msgstr "连接 \"%s\" (%s) 已成功修改。\n"
 
-#: ../clients/cli/connections.c:8549
+#: ../clients/cli/connections.c:8641
 #, c-format
 msgid "%s (%s) cloned as %s (%s).\n"
 msgstr "%s (%s) 已克隆为 %s (%s)。\n"
 
-#: ../clients/cli/connections.c:8608
+#: ../clients/cli/connections.c:8701
 msgid "New connection name: "
 msgstr "新连接名称： "
 
-#: ../clients/cli/connections.c:8610
+#: ../clients/cli/connections.c:8703
 #, c-format
 msgid "Error: <new name> argument is missing."
 msgstr "错误：缺少 <新名称> 参数。"
 
-#: ../clients/cli/connections.c:8615 ../clients/cli/connections.c:9101
+#: ../clients/cli/connections.c:8709 ../clients/cli/connections.c:9194
 #, c-format
 msgid "Error: unknown extra argument: '%s'."
 msgstr "错误：未知的额外参数：\"%s\"。"
 
-#: ../clients/cli/connections.c:8648
+#: ../clients/cli/connections.c:8741
 #, c-format
 msgid "Error: not all connections deleted."
 msgstr "错误：未删除所有的连接。"
 
-#: ../clients/cli/connections.c:8588
+#: ../clients/cli/connections.c:8154
 #, c-format
 msgid "Error: Connection deletion failed: %s"
 msgstr "错误：连接删除失败：%s"
 
-#: ../clients/cli/connections.c:8705 ../clients/cli/connections.c:8826
+#: ../clients/cli/connections.c:8798 ../clients/cli/connections.c:8918
 #, c-format
 msgid "Error: %s.\n"
 msgstr "错误：%s。\n"
 
-#: ../clients/cli/connections.c:8706 ../clients/cli/connections.c:8827
+#: ../clients/cli/connections.c:8799 ../clients/cli/connections.c:8919
 #, c-format
 msgid "Error: not all connections found."
 msgstr "错误：未找到所有连接。"
 
 #. truncate trailing ", "
-#: ../clients/cli/connections.c:8757
+#: ../clients/cli/connections.c:8850
 #, c-format
 msgid "Error: cannot delete unknown connection(s): %s."
 msgstr "错误：无法删除未知连接：%s。"
 
-#: ../clients/cli/connections.c:8767
+#: ../clients/cli/connections.c:8859
 #, c-format
 msgid "%s: connection profile changed\n"
 msgstr "%s：连接配置集已改动\n"
 
-#: ../clients/cli/connections.c:8793
+#: ../clients/cli/connections.c:8885
 #, c-format
 msgid "%s: connection profile created\n"
 msgstr "%s：连接配置集已创建\n"
 
-#: ../clients/cli/connections.c:8802
+#: ../clients/cli/connections.c:8894
 #, c-format
 msgid "%s: connection profile removed\n"
 msgstr "%s：连接配置集已移除\n"
 
-#: ../clients/cli/connections.c:8873
+#: ../clients/cli/connections.c:8964
 #, c-format
 msgid "Error: failed to reload connections: %s."
 msgstr "错误：重新加载连接失败：%s。"
 
-#: ../clients/cli/connections.c:8905
+#: ../clients/cli/connections.c:8994
 #, c-format
 msgid "Error: failed to load connection: %s."
 msgstr "错误：加载连接失败：%s。"
 
-#: ../clients/cli/connections.c:8913
+#: ../clients/cli/connections.c:9002
 #, c-format
 msgid "Could not load file '%s'\n"
 msgstr "无法加载文件 \"%s\"\n"
 
-#: ../clients/cli/connections.c:8920
+#: ../clients/cli/connections.c:9006
 msgid "File to import: "
 msgstr "要导入的文件： "
 
-#: ../clients/cli/connections.c:8953
+#: ../clients/cli/connections.c:9039
 #, c-format
 msgid "Error: No arguments provided."
 msgstr "错误：未提供参数。"
 
-#: ../clients/cli/connections.c:8984
+#: ../clients/cli/connections.c:9072
 #, c-format
 msgid "Warning: 'type' already specified, ignoring extra one.\n"
 msgstr "警告：已指定 \"type\"，忽略额外的参数。\n"
 
-#: ../clients/cli/connections.c:8998
+#: ../clients/cli/connections.c:9087
 #, c-format
 msgid "Warning: 'file' already specified, ignoring extra one.\n"
 msgstr "警告：已指定 \"file\"，忽略额外的参数。\n"
@@ -2031,51 +2031,51 @@
 msgid "Unknown parameter: %s"
 msgstr "未知参数：%s"
 
-#: ../clients/cli/connections.c:9011
+#: ../clients/cli/connections.c:9101
 #, c-format
 msgid "Error: 'type' argument is required."
 msgstr "错误：需要 \"type\" 参数。"
 
-#: ../clients/cli/connections.c:9015
+#: ../clients/cli/connections.c:9106
 #, c-format
 msgid "Error: 'file' argument is required."
 msgstr "错误：需要 \"file\" 参数。"
 
-#: ../clients/cli/connections.c:9024
+#: ../clients/cli/connections.c:9116
 #, c-format
 msgid "Error: failed to find VPN plugin for %s."
 msgstr "错误：查找用于 %s 的 VPN 插件失败。"
 
-#: ../clients/cli/connections.c:9031 ../clients/cli/connections.c:9122
+#: ../clients/cli/connections.c:9124 ../clients/cli/connections.c:9215
 #, c-format
 msgid "Error: failed to load VPN plugin: %s."
 msgstr "错误：加载 VPN 插件失败：%s。"
 
-#: ../clients/cli/connections.c:9040
+#: ../clients/cli/connections.c:9134
 #, c-format
 msgid "Error: failed to import '%s': %s."
 msgstr "错误：导入 \"%s\" 失败失败失败失败失败失败失败失败失败失败失败：%s。"
 
-#: ../clients/cli/connections.c:9108
+#: ../clients/cli/connections.c:9201
 msgid "Output file name: "
 msgstr "输出文件名称： "
 
-#: ../clients/cli/connections.c:9113
+#: ../clients/cli/connections.c:9206
 #, c-format
 msgid "Error: the connection is not VPN."
 msgstr "错误：连接不是 VPN。"
 
-#: ../clients/cli/connections.c:9135
+#: ../clients/cli/connections.c:9228
 #, c-format
 msgid "Error: failed to create temporary file %s."
 msgstr "错误：创建临时文件 %s 失败。"
 
-#: ../clients/cli/connections.c:9143
+#: ../clients/cli/connections.c:9236
 #, c-format
 msgid "Error: failed to export '%s': %s."
 msgstr "错误：导出 \"%s\" 失败：%s。"
 
-#: ../clients/cli/connections.c:9155
+#: ../clients/cli/connections.c:9248
 #, c-format
 msgid "Error: failed to read temporary file '%s': %s."
 msgstr "错误：读取临时文件 \"%s\" 失败：%s。"
@@ -2132,7 +2132,7 @@
 msgstr ""
 
 # 大写的 DEVICE、TYPE、STATE、CONNECTION 找不到具体对应的翻译位置，这是在 CLI 是显示的列表项，所以没有翻译。
-#: ../clients/cli/devices.c:749
+#: ../clients/cli/devices.c:755
 #, c-format
 msgid ""
 "Usage: nmcli device status { help }\n"
@@ -2161,7 +2161,7 @@
 "\"nmcli device\" 会调用 \"nmcli device status\"。\n"
 "\n"
 
-#: ../clients/cli/devices.c:764
+#: ../clients/cli/devices.c:770
 #, c-format
 msgid ""
 "Usage: nmcli device show { ARGUMENTS | help }\n"
@@ -2180,7 +2180,7 @@
 "该命令列出所有设备或者给定设备的详情。\n"
 "\n"
 
-#: ../clients/cli/devices.c:775
+#: ../clients/cli/devices.c:781
 #, c-format
 msgid ""
 "Usage: nmcli device connect { ARGUMENTS | help }\n"
@@ -2201,7 +2201,7 @@
 "网络管理器（NetworkManager）将尝试查找将激活的合适连接，包括那些没有设定为自动连接的连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:787
+#: ../clients/cli/devices.c:793
 #, c-format
 msgid ""
 "Usage: nmcli device reapply { ARGUMENTS | help }\n"
@@ -2219,7 +2219,7 @@
 "尝试将自上次应用以后对当前活跃连接所做出的改变应用到设备中。\n"
 "\n"
 
-#: ../clients/cli/devices.c:798
+#: ../clients/cli/devices.c:804
 #, c-format
 msgid ""
 "Usage: nmcli device modify { ARGUMENTS | --help }\n"
@@ -2254,7 +2254,7 @@
 "nmcli dev mod em1 -ipv4.dns 1\n"
 "nmcli dev mod em1 -ipv6.addr \"abbe::cafe/56\"\n"
 
-#: ../clients/cli/devices.c:818
+#: ../clients/cli/devices.c:824
 #, c-format
 msgid ""
 "Usage: nmcli device disconnect { ARGUMENTS | help }\n"
@@ -2274,7 +2274,7 @@
 "该命令断开设备的连接并阻止其在没有用户/手动干预的情况下继续自动激活连接。\n"
 "\n"
 
-#: ../clients/cli/devices.c:830
+#: ../clients/cli/devices.c:836
 #, c-format
 msgid ""
 "Usage: nmcli device delete { ARGUMENTS | help }\n"
@@ -2296,7 +2296,7 @@
 "令来删除。\n"
 "\n"
 
-#: ../clients/cli/devices.c:843
+#: ../clients/cli/devices.c:849
 #, c-format
 msgid ""
 "Usage: nmcli device set { ARGUMENTS | help }\n"
@@ -2319,7 +2319,7 @@
 "修改设备属性。\n"
 "\n"
 
-#: ../clients/cli/devices.c:856
+#: ../clients/cli/devices.c:862
 #, c-format
 msgid ""
 "Usage: nmcli device monitor { ARGUMENTS | help }\n"
@@ -2392,7 +2392,7 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/devices.c:915
+#: ../clients/cli/devices.c:921
 #, c-format
 msgid ""
 "Usage: nmcli device lldp { ARGUMENTS | help }\n"
@@ -2411,45 +2411,45 @@
 "列出通过 LLDP 发现的邻居设备。可使用 \"ifname\" 选项列出具体接口的邻居设备。\n"
 "\n"
 
-#: ../clients/cli/devices.c:1013
+#: ../clients/cli/devices.c:1020
 #, c-format
 msgid "Error: No interface specified."
 msgstr "错误：没有指定接口。"
 
-#: ../clients/cli/devices.c:1036
+#: ../clients/cli/devices.c:1043
 #, c-format
 msgid "Warning: argument '%s' is duplicated.\n"
 msgstr "警告：重复的参数 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:1039
+#: ../clients/cli/devices.c:1046
 #, c-format
 msgid "Error: Device '%s' not found.\n"
 msgstr "错误：没有找到设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:1040
+#: ../clients/cli/devices.c:1047
 #, c-format
 msgid "Error: not all devices found."
 msgstr "错误：未找到所有设备。"
 
-#: ../clients/cli/devices.c:1071
+#: ../clients/cli/devices.c:1078
 msgid "No interface specified"
 msgstr "没有指定接口"
 
-#: ../clients/cli/devices.c:1090
+#: ../clients/cli/devices.c:1097
 #, c-format
 msgid "Device '%s' not found"
 msgstr "未找到设备 \"%s\""
 
-#: ../clients/cli/devices.c:59 ../clients/cli/devices.c:1267
+#: ../clients/cli/devices.c:64 ../clients/cli/devices.c:1277
 msgid "(none)"
 msgstr "（无）"
 
-#: ../clients/cli/devices.c:1186
+#: ../clients/cli/devices.c:1193
 #, c-format
 msgid "%u MHz"
 msgstr "%u MHz"
 
-#: ../clients/cli/devices.c:1187
+#: ../clients/cli/devices.c:1194
 #, c-format
 msgid "%u Mbit/s"
 msgstr "%u Mbit/s"
@@ -2470,84 +2470,84 @@
 msgid "802.1X"
 msgstr "802.1X"
 
-#: ../clients/cli/devices.c:1226
+#: ../clients/cli/devices.c:1236
 msgid "Ad-Hoc"
 msgstr "Ad-Hoc"
 
-#: ../clients/cli/devices.c:1227
+#: ../clients/cli/devices.c:1237
 msgid "Infra"
 msgstr "Infra"
 
-#: ../clients/cli/devices.c:1229
+#: ../clients/cli/devices.c:1239
 msgid "N/A"
 msgstr "不可用"
 
-#: ../clients/cli/devices.c:1424
+#: ../clients/cli/devices.c:1434
 msgid "Device details"
 msgstr "设备详情"
 
-#: ../clients/cli/devices.c:1435
+#: ../clients/cli/devices.c:1445
 #, c-format
 msgid "Error: 'device show': %s"
 msgstr "错误：\"device show\"：%s"
 
-#: ../clients/cli/devices.c:166 ../clients/cli/devices.c:173
+#: ../clients/cli/devices.c:172 ../clients/cli/devices.c:179
 msgid "(unknown)"
 msgstr "（未知）"
 
-#: ../clients/cli/devices.c:424
+#: ../clients/cli/devices.c:430
 #, c-format
 msgid "%u Mb/s"
 msgstr "%u Mb/s"
 
-#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4136
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4105
 msgid "on"
 msgstr "开启"
 
-#: ../clients/cli/utils.h:297 ../clients/common/nm-meta-setting-desc.c:4138
+#: ../clients/cli/utils.h:299 ../clients/common/nm-meta-setting-desc.c:4107
 msgid "off"
 msgstr "关闭"
 
-#: ../clients/cli/devices.c:1751
+#: ../clients/cli/devices.c:1765
 #, c-format
 msgid "Error: 'device status': %s"
 msgstr "错误：\"dev status\": %s"
 
-#: ../clients/cli/devices.c:1747
+#: ../clients/cli/devices.c:1761
 msgid "Status of devices"
 msgstr "设备状态"
 
-#: ../clients/cli/connections.c:2929 ../clients/cli/connections.c:9000
-#: ../clients/cli/devices.c:1732 ../clients/cli/devices.c:1778
-#: ../clients/cli/devices.c:2216 ../clients/cli/devices.c:3076
-#: ../clients/cli/devices.c:3400 ../clients/cli/devices.c:3967
-#: ../clients/cli/devices.c:4118 ../clients/cli/devices.c:4335
-#: ../clients/cli/devices.c:4505
+#: ../clients/cli/connections.c:2948 ../clients/cli/connections.c:9089
+#: ../clients/cli/devices.c:1745 ../clients/cli/devices.c:1792
+#: ../clients/cli/devices.c:2230 ../clients/cli/devices.c:3167
+#: ../clients/cli/devices.c:3526 ../clients/cli/devices.c:4099
+#: ../clients/cli/devices.c:4253 ../clients/cli/devices.c:4473
+#: ../clients/cli/devices.c:4647
 #, c-format
 msgid "Error: invalid extra argument '%s'."
 msgstr "错误：无效的额外参数 \"%s\"。"
 
-#: ../clients/cli/devices.c:1814 ../clients/cli/general.c:537
+#: ../clients/cli/devices.c:1827 ../clients/cli/general.c:511
 #, c-format
 msgid "Error: Timeout %d sec expired."
 msgstr "错误：超时时间 %d 秒已到。"
 
-#: ../clients/cli/devices.c:1886
+#: ../clients/cli/devices.c:1899
 #, c-format
 msgid "Device '%s' successfully activated with '%s'.\n"
 msgstr "成功用 \"%s%s\" 激活了设备 \"\"。\n"
 
-#: ../clients/cli/devices.c:1895
+#: ../clients/cli/devices.c:1908
 #, c-format
 msgid "Error: Connection activation failed: (%d) %s.\n"
 msgstr "错误：连接激活失败：(%d) %s。\n"
 
-#: ../clients/cli/devices.c:1925
+#: ../clients/cli/devices.c:1938
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot: %s"
 msgstr "错误：建立 Wi-Fi 热点失败：%s"
 
-#: ../clients/cli/devices.c:1928
+#: ../clients/cli/devices.c:1941
 #, c-format
 msgid "Error: Failed to add/activate new connection: %s"
 msgstr "错误：添加/激活新连接失败：%s"
@@ -2555,7 +2555,7 @@
 #: ../clients/cli/devices.c:1727
 #, c-format
 msgid "Error: Failed to setup a Wi-Fi hotspot"
-msgstr "错误：建立 Wi-Fi 热点失败"
+msgstr "错误：设定 Wi-Fi 热点失败"
 
 #: ../clients/cli/devices.c:1729
 #, c-format
@@ -2565,14 +2565,14 @@
 #: ../clients/cli/devices.c:1741
 #, c-format
 msgid "Connection with UUID '%s' created and activated on device '%s'\n"
-msgstr "UUID 为 \"%s\" 的连接已创建并在设备 \"%s\" 上激活\n"
+msgstr "UUID 为“%s”的连接已创建并在设备“%s”上激活\n"
 
 #: ../clients/cli/devices.c:1744
 #, c-format
 msgid "Hotspot '%s' activated on device '%s'\n"
-msgstr "热点 \"%s\" 已在设备 \"%s\" 上激活\n"
+msgstr "设备 '%s' 上激活的热点 '%s'\n"
 
-#: ../clients/cli/devices.c:1996
+#: ../clients/cli/devices.c:2009
 #, c-format
 msgid "Error: Device activation failed: %s"
 msgstr "错误：激活设备失败：%s"
@@ -2582,225 +2582,224 @@
 msgid "Error: Device activation failed: device was disconnected"
 msgstr "错误：设备激活失败：设备已断开连接"
 
-# 原译设备已连接。原话用来提示设备已连接过了，不能再激活另一个连接了。如果使用“已连接”会让人认为是连接成功的意思，所以改成这个。
 #: ../clients/cli/devices.c:1832
 #, c-format
 msgid "Device '%s' has been connected.\n"
-msgstr "设备 \"%s\" 已有连接。\n"
+msgstr "设备“%s”已连接。\n"
 
-#: ../clients/cli/devices.c:2046
+#: ../clients/cli/devices.c:2060
 #, c-format
 msgid "Error: extra argument not allowed: '%s'."
 msgstr "错误：不允许的额外参数：\"%s\"。"
 
-#: ../clients/cli/devices.c:2116 ../clients/cli/devices.c:2131
-#: ../clients/cli/devices.c:2368
+#: ../clients/cli/devices.c:2129 ../clients/cli/devices.c:2144
+#: ../clients/cli/devices.c:2385
 #, c-format
 msgid "Device '%s' successfully disconnected.\n"
 msgstr "成功断开设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:2119 ../clients/cli/devices.c:2442
+#: ../clients/cli/devices.c:2132 ../clients/cli/devices.c:2458
 #, c-format
 msgid "Device '%s' successfully removed.\n"
 msgstr "成功移除设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:2181 ../clients/cli/devices.c:2251
+#: ../clients/cli/devices.c:2194 ../clients/cli/devices.c:2264
 #, c-format
 msgid "Error: Reapplying connection to device '%s' (%s) failed: %s"
 msgstr "错误：重新应用连接到 \"%s\" (%s) 失败：%s"
 
-#: ../clients/cli/devices.c:2191 ../clients/cli/devices.c:2260
+#: ../clients/cli/devices.c:2204 ../clients/cli/devices.c:2273
 #, c-format
 msgid "Connection successfully reapplied to device '%s'.\n"
 msgstr "成功重新应用连接到设备 \"%s\"。\n"
 
-#: ../clients/cli/devices.c:2285
+#: ../clients/cli/devices.c:2300
 #, c-format
 msgid "Error: Reading applied connection from device '%s' (%s) failed: %s"
 msgstr "错误：从设备 \"%s\" (%s) 读取已应用的连接失败：%s"
 
-#: ../clients/cli/devices.c:2352
+#: ../clients/cli/devices.c:2369
 #, c-format
 msgid "Error: not all devices disconnected."
 msgstr "错误：未断开所有设备的连接。"
 
-#: ../clients/cli/devices.c:2353
+#: ../clients/cli/devices.c:2370
 #, c-format
 msgid "Error: Device '%s' (%s) disconnecting failed: %s\n"
 msgstr "错误：断开设备 \"%s\" (%s) 的连接失败：%s\n"
 
-#: ../clients/cli/devices.c:2433
+#: ../clients/cli/devices.c:2449
 #, c-format
 msgid "Error: not all devices deleted."
 msgstr "错误：未删除所有设备。"
 
-#: ../clients/cli/devices.c:2434
+#: ../clients/cli/devices.c:2450
 #, c-format
 msgid "Error: Device '%s' (%s) deletion failed: %s\n"
 msgstr "错误：删除设备 \"%s\" (%s) 失败：%s\n"
 
-#: ../clients/cli/devices.c:2516
+#: ../clients/cli/devices.c:2532
 #, c-format
 msgid "Error: No property specified."
 msgstr "错误：未指定属性。"
 
-#: ../clients/cli/devices.c:2531 ../clients/cli/devices.c:2548
-#: ../clients/cli/general.c:777 ../clients/cli/general.c:789
+#: ../clients/cli/devices.c:2548 ../clients/cli/devices.c:2567
+#: ../clients/cli/general.c:769 ../clients/cli/general.c:782
 #, c-format
 msgid "Error: '%s' argument is missing."
 msgstr "错误：缺少 \"%s\" 参数。"
 
-#: ../clients/cli/devices.c:2537
+#: ../clients/cli/devices.c:2555
 #, c-format
 msgid "Error: 'managed': %s."
 msgstr "错误：\"managed\"：%s。"
 
-#: ../clients/cli/devices.c:2554
+#: ../clients/cli/devices.c:2574
 #, c-format
 msgid "Error: 'autoconnect': %s."
 msgstr "错误：\"autoconnect\"：%s。"
 
-#: ../clients/cli/devices.c:2562 ../clients/cli/general.c:803
+#: ../clients/cli/devices.c:2583 ../clients/cli/general.c:797
 #, c-format
 msgid "Error: property '%s' is not known."
 msgstr "错误：属性 \"%s\" 是未知的。"
 
-#: ../clients/cli/devices.c:2611
+#: ../clients/cli/devices.c:2631
 #, c-format
 msgid "%s: using connection '%s'\n"
 msgstr "%s：正使用连接 \"%s\"\n"
 
-#: ../clients/cli/devices.c:2637
+#: ../clients/cli/devices.c:2657
 #, c-format
 msgid "%s: device created\n"
 msgstr "%s：设备已创建\n"
 
-#: ../clients/cli/devices.c:2644
+#: ../clients/cli/devices.c:2664
 #, c-format
 msgid "%s: device removed\n"
 msgstr "%s：设备已移除\n"
 
-#: ../clients/cli/devices.c:2824
+#: ../clients/cli/devices.c:2843
 msgid "Wi-Fi scan list"
 msgstr "Wi-Fi 扫描列表"
 
-#: ../clients/cli/devices.c:3067
+#: ../clients/cli/devices.c:3160
 #, c-format
 msgid "Error: 'device wifi': %s"
 msgstr "错误：\"device wifi\"：%s"
 
-#: ../clients/cli/devices.c:3094
+#: ../clients/cli/devices.c:3218
 #, c-format
 msgid "Error: Device '%s' not found."
 msgstr "错误：没有找到设备 \"%s\"。"
 
-#: ../clients/cli/devices.c:2911
+#: ../clients/cli/devices.c:2961 ../clients/cli/devices.c:3237
 #, c-format
 msgid "Error: Access point with bssid '%s' not found."
 msgstr "错误：未找到 bssid 为 \"%s\" 的接入点。"
 
-#: ../clients/cli/devices.c:3105
+#: ../clients/cli/devices.c:3223
 #, c-format
 msgid ""
 "Error: Device '%s' was not recognized as a Wi-Fi device, check "
 "NetworkManager Wi-Fi plugin."
 msgstr "错误：设备 \"%s\" 没有被识别为 Wi-Fi 设备，请检查网络管理器（NetworkManager）的 Wi-Fi 插件。"
 
-#: ../clients/cli/devices.c:3109 ../clients/cli/devices.c:3430
-#: ../clients/cli/devices.c:4006 ../clients/cli/devices.c:4134
-#: ../clients/cli/devices.c:4266
+#: ../clients/cli/devices.c:3227 ../clients/cli/devices.c:3556
+#: ../clients/cli/devices.c:4141 ../clients/cli/devices.c:4269
+#: ../clients/cli/devices.c:4402
 #, c-format
 msgid "Error: Device '%s' is not a Wi-Fi device."
 msgstr "错误：设备 \"%s\" 不是 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:3277
+#: ../clients/cli/devices.c:3403
 msgid "SSID or BSSID: "
 msgstr "SSID 或 BSSID： "
 
-#: ../clients/cli/devices.c:3282
+#: ../clients/cli/devices.c:3408
 #, c-format
 msgid "Error: SSID or BSSID are missing."
 msgstr "错误：缺少 SSID/BSSID。"
 
-#: ../clients/cli/devices.c:3319
+#: ../clients/cli/devices.c:3445
 #, c-format
 msgid "Error: bssid argument value '%s' is not a valid BSSID."
 msgstr "错误：bssid 参数值\"%s\"为无效 BSSID。"
 
-#: ../clients/cli/devices.c:3349
+#: ../clients/cli/devices.c:3475
 #, c-format
 msgid ""
 "Error: wep-key-type argument value '%s' is invalid, use 'key' or 'phrase'."
 msgstr "错误：wep-key-type 参数值 \"%s\" 无效，请使用 \"key\" 或 \"phrase\"。"
 
-#: ../clients/cli/devices.c:3376 ../clients/cli/devices.c:3394
+#: ../clients/cli/devices.c:3502 ../clients/cli/devices.c:3520
 #, c-format
 msgid "Error: %s: %s."
 msgstr "错误：%s：%s。"
 
-#: ../clients/cli/devices.c:3413
+#: ../clients/cli/devices.c:3539
 #, c-format
 msgid "Error: BSSID to connect to (%s) differs from bssid argument (%s)."
 msgstr "错误：要连接的 BSSID (%s) 与 bssid 参数 (%s) 不同。"
 
-#: ../clients/cli/devices.c:3419
+#: ../clients/cli/devices.c:3545
 #, c-format
 msgid "Error: Parameter '%s' is neither SSID nor BSSID."
 msgstr "错误：参数 \"%s\" 不是 SSID 或 BSSID。"
 
-#: ../clients/cli/devices.c:3432 ../clients/cli/devices.c:4008
-#: ../clients/cli/devices.c:4136 ../clients/cli/devices.c:4367
+#: ../clients/cli/devices.c:3558 ../clients/cli/devices.c:4143
+#: ../clients/cli/devices.c:4271 ../clients/cli/devices.c:4507
 #, c-format
 msgid "Error: No Wi-Fi device found."
 msgstr "错误：未发现 Wi-Fi 设备。"
 
-#: ../clients/cli/devices.c:3452
+#: ../clients/cli/devices.c:3578
 #, c-format
 msgid "Error: Failed to scan hidden SSID: %s."
 msgstr "错误：扫描隐藏的 SSID 失败：%s。"
 
-#: ../clients/cli/devices.c:3479
+#: ../clients/cli/devices.c:3605
 #, c-format
 msgid "Error: No network with SSID '%s' found."
 msgstr "错误：未发现 SSID 为 \"%s\" 的网络。"
 
-#: ../clients/cli/devices.c:3481
+#: ../clients/cli/devices.c:3607
 #, c-format
 msgid "Error: No access point with BSSID '%s' found."
 msgstr "错误：未找到 BSSID 为 \"%s\" 的接入点。"
 
-#: ../clients/cli/devices.c:3551
+#: ../clients/cli/devices.c:3677
 #, c-format
 msgid ""
 "Warning: '%s' should be SSID for hidden APs; but it looks like a BSSID.\n"
 msgstr "警告：\"%s\" 应该是隐藏 AP 的 SSID，但看起来像 BSSID。\n"
 
-#: ../clients/cli/devices.c:3588
+#: ../clients/cli/devices.c:3714
 msgid "Password: "
 msgstr "密码： "
 
-#: ../clients/cli/devices.c:3729
+#: ../clients/cli/devices.c:3853
 #, c-format
 msgid "'%s' is not valid WPA PSK"
 msgstr "\"%s\" 不是有效的 WPA PSK"
 
-#: ../clients/cli/devices.c:3746
+#: ../clients/cli/devices.c:3870
 #, c-format
 msgid "'%s' is not valid WEP key (it should be 5 or 13 ASCII chars)"
 msgstr "\"%s\" 不是有效的 WEP 密钥（它应该是 5 或 13 个 ASCII 字符）"
 
-#: ../clients/cli/devices.c:3762
+#: ../clients/cli/devices.c:3886
 #, c-format
 msgid "Hotspot password: %s\n"
 msgstr "热点密码：%s\n"
 
-#: ../clients/cli/devices.c:3927
+#: ../clients/cli/devices.c:4054
 #, c-format
 msgid "Error: ssid is too long."
 msgstr "错误：SSID 太长。"
 
 # 这里 channel/band 开头不大写，表示其是命令行选项，所以不译。下面的同理。
-#: ../clients/cli/devices.c:3942
+#: ../clients/cli/devices.c:4071
 #, c-format
 msgid "Error: band argument value '%s' is invalid; use 'a' or 'bg'."
 msgstr "错误：band 参数值 \"%s\" 无效，请使用 \"a\" 或 \"bg\"。"
@@ -2810,110 +2809,110 @@
 msgid "Error: Unknown parameter %s."
 msgstr "错误：未知参数 %s。"
 
-#: ../clients/cli/devices.c:3989
+#: ../clients/cli/devices.c:4122
 #, c-format
 msgid "Error: channel requires band too."
 msgstr "错误：channal 也需要 band。"
 
-#: ../clients/cli/devices.c:3994
+#: ../clients/cli/devices.c:4128
 #, c-format
 msgid "Error: channel '%s' not valid for band '%s'."
 msgstr "错误：band \"%s\" 的 channel \"%s\" 无效。"
 
-#: ../clients/cli/devices.c:4019
+#: ../clients/cli/devices.c:4155
 #, c-format
 msgid "Error: Device '%s' supports neither AP nor Ad-Hoc mode."
 msgstr "错误：设备 \"%s\" 既不支持 AP 也不支持 Ad-Hoc 模式。"
 
-#: ../clients/cli/devices.c:4041
+#: ../clients/cli/devices.c:4178
 #, c-format
 msgid "Error: Invalid 'password': %s."
 msgstr "错误：无效的 \"password\"：%s。"
 
-#: ../clients/cli/devices.c:4094 ../clients/cli/devices.c:4318
+#: ../clients/cli/devices.c:4229 ../clients/cli/devices.c:4454
 #, c-format
 msgid "Error: '%s' cannot repeat."
 msgstr "错误：\"%s\" 不能重复。"
 
 #. Main header name
-#: ../clients/cli/devices.c:4411
+#: ../clients/cli/devices.c:4548
 msgid "Device LLDP neighbors"
 msgstr "设备 LLDP 邻居"
 
-#: ../clients/cli/devices.c:4521
+#: ../clients/cli/devices.c:4664
 #, c-format
 msgid "Error: 'device lldp list': %s"
 msgstr "错误：\"device lldp list\"：%s"
 
-#: ../clients/cli/general.c:27
+#: ../clients/cli/general.c:32
 msgid "asleep"
 msgstr "休眠"
 
-#: ../clients/cli/general.c:28
+#: ../clients/cli/general.c:33
 msgid "connecting"
 msgstr "连接中"
 
-#: ../clients/cli/general.c:29
+#: ../clients/cli/general.c:34
 msgid "connected (local only)"
 msgstr "已连接（仅本地）"
 
-#: ../clients/cli/general.c:30
+#: ../clients/cli/general.c:35
 msgid "connected (site only)"
 msgstr "已连接（仅站点）"
 
-#: ../clients/cli/general.c:31 ../clients/common/nm-client-utils.c:260
+#: ../clients/cli/general.c:36 ../clients/common/nm-client-utils.c:260
 msgid "connected"
 msgstr "已连接"
 
-#: ../clients/cli/general.c:32
+#: ../clients/cli/general.c:37
 msgid "disconnecting"
 msgstr "断开中"
 
-#: ../clients/cli/general.c:33 ../clients/common/nm-client-utils.c:253
+#: ../clients/cli/general.c:38 ../clients/common/nm-client-utils.c:253
 msgid "disconnected"
 msgstr "已断开"
 
-#: ../clients/cli/common.c:1469
+#: ../clients/cli/common.c:1494
 msgid "none"
 msgstr "无"
 
-#: ../clients/cli/common.c:1470
+#: ../clients/cli/common.c:1495
 msgid "portal"
 msgstr "入口"
 
-#: ../clients/cli/common.c:1471
+#: ../clients/cli/common.c:1496
 msgid "limited"
 msgstr "受限"
 
-#: ../clients/cli/common.c:1472
+#: ../clients/cli/common.c:1497
 msgid "full"
 msgstr "完全"
 
-#: ../clients/cli/general.c:124
+#: ../clients/cli/general.c:94
 msgid "auth"
 msgstr "验证"
 
-#: ../clients/cli/general.c:152
+#: ../clients/cli/general.c:123
 msgid "running"
 msgstr "运行中"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:137
 msgid "starting"
 msgstr "启动中"
 
-#: ../clients/cli/general.c:166
+#: ../clients/cli/general.c:137
 msgid "started"
 msgstr "已启动"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:171
 msgid "enabled"
 msgstr "已启用"
 
-#: ../clients/cli/general.c:200
+#: ../clients/cli/general.c:171
 msgid "disabled"
 msgstr "已禁用"
 
-#: ../clients/cli/general.c:318
+#: ../clients/cli/general.c:289
 #, c-format
 msgid ""
 "Usage: nmcli general { COMMAND | help }\n"
@@ -2942,7 +2941,7 @@
 "  logging [level <日志级别>] [domains <日志域>]\n"
 "\n"
 
-#: ../clients/cli/general.c:329
+#: ../clients/cli/general.c:300
 #, c-format
 msgid ""
 "Usage: nmcli general status { help }\n"
@@ -2958,7 +2957,7 @@
 "\"status\" 是默认操作，即 \"nmcli gen\" 调用 \"nmcli gen status\"\n"
 "\n"
 
-#: ../clients/cli/general.c:338
+#: ../clients/cli/general.c:309
 #, c-format
 msgid ""
 "Usage: nmcli general hostname { ARGUMENTS | help }\n"
@@ -2980,7 +2979,7 @@
 "新的永久系统主机名。\n"
 "\n"
 
-#: ../clients/cli/general.c:350
+#: ../clients/cli/general.c:321
 #, c-format
 msgid ""
 "Usage: nmcli general permissions { help }\n"
@@ -2993,7 +2992,7 @@
 "显示验证操作的调用程序权限。\n"
 "\n"
 
-#: ../clients/cli/general.c:390
+#: ../clients/cli/general.c:361
 #, c-format
 msgid ""
 "Usage: nmcli general logging { ARGUMENTS | help }\n"
@@ -3017,7 +3016,7 @@
 "可能的日志域列表请参阅手册页。\n"
 "\n"
 
-#: ../clients/cli/general.c:403
+#: ../clients/cli/general.c:374
 #, c-format
 msgid ""
 "Usage: nmcli networking { COMMAND | help }\n"
@@ -3042,7 +3041,7 @@
 "  connectivity [check]\n"
 "\n"
 
-#: ../clients/cli/general.c:413
+#: ../clients/cli/general.c:384
 #, c-format
 msgid ""
 "Usage: nmcli networking on { help }\n"
@@ -3055,7 +3054,7 @@
 "打开联网。\n"
 "\n"
 
-#: ../clients/cli/general.c:421
+#: ../clients/cli/general.c:392
 #, c-format
 msgid ""
 "Usage: nmcli networking off { help }\n"
@@ -3068,7 +3067,7 @@
 "关闭联网。\n"
 "\n"
 
-#: ../clients/cli/general.c:429
+#: ../clients/cli/general.c:400
 #, c-format
 msgid ""
 "Usage: nmcli networking connectivity { ARGUMENTS | help }\n"
@@ -3088,7 +3087,7 @@
 "可选的 \"check\" 参数可让网络管理器（NetworkManager）重新检查连接性。\n"
 "\n"
 
-#: ../clients/cli/general.c:441
+#: ../clients/cli/general.c:412
 #, c-format
 msgid ""
 "Usage: nmcli radio { COMMAND | help }\n"
@@ -3105,7 +3104,7 @@
 "  all | wifi | wwan [ on | off ]\n"
 "\n"
 
-#: ../clients/cli/general.c:450
+#: ../clients/cli/general.c:421
 #, c-format
 msgid ""
 "Usage: nmcli radio all { ARGUMENTS | help }\n"
@@ -3122,7 +3121,7 @@
 "获取所有无线电开关的状态，或者打开/关闭它们。\n"
 "\n"
 
-#: ../clients/cli/general.c:460
+#: ../clients/cli/general.c:431
 #, c-format
 msgid ""
 "Usage: nmcli radio wifi { ARGUMENTS | help }\n"
@@ -3139,7 +3138,7 @@
 "获取 Wi-Fi 无线电开关的状态，或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:470
+#: ../clients/cli/general.c:441
 #, c-format
 msgid ""
 "Usage: nmcli radio wwan { ARGUMENTS | help }\n"
@@ -3156,7 +3155,7 @@
 "获取移动宽带无线电开关的状态，或者打开/关闭它。\n"
 "\n"
 
-#: ../clients/cli/general.c:480
+#: ../clients/cli/general.c:451
 #, c-format
 msgid ""
 "Usage: nmcli monitor\n"
@@ -3171,36 +3170,36 @@
 "每当 NetworkManager 出现更改时打印一行信息。\n"
 "\n"
 
-#: ../clients/cli/general.c:510
+#: ../clients/cli/general.c:481
 msgid "NetworkManager status"
 msgstr "网络管理器状态"
 
-#: ../clients/cli/general.c:514
+#: ../clients/cli/general.c:485
 #, c-format
 msgid "Error: only these fields are allowed: %s"
 msgstr "错误：只允许使用这些字段：%s"
 
-#: ../clients/cli/general.c:567
+#: ../clients/cli/general.c:561
 msgid "NetworkManager permissions"
 msgstr "网络管理器权限"
 
 # XXX: 这里考虑一下要不要翻译
 # XXX: Should we translate this?
-#: ../clients/cli/general.c:571
+#: ../clients/cli/general.c:565
 #, c-format
 msgid "Error: 'general permissions': %s"
 msgstr "错误：\"常规权限\"：%s"
 
-#: ../clients/cli/general.c:727
+#: ../clients/cli/general.c:704
 msgid "NetworkManager logging"
 msgstr "网络管理器日志"
 
-#: ../clients/cli/general.c:731
+#: ../clients/cli/general.c:708
 #, c-format
 msgid "Error: 'general logging': %s"
 msgstr "错误：\"常规日志\"：%s"
 
-#: ../clients/cli/general.c:813
+#: ../clients/cli/general.c:740
 #, c-format
 msgid "Error: failed to set logging: %s"
 msgstr "错误：设置日志失败：%s"
@@ -3210,141 +3209,141 @@
 msgid "Error: failed to set hostname: %s"
 msgstr "错误：设置主机名失败：%s"
 
-#: ../clients/cli/general.c:900
+#: ../clients/cli/general.c:891
 #, c-format
 msgid "Error: '--fields' value '%s' is not valid here (allowed field: %s)"
 msgstr "错误：\"--fields\" 值 \"%s\" 在此无效（允许的字段：%s）"
 
-#: ../clients/cli/general.c:925
+#: ../clients/cli/general.c:916
 #, c-format
 msgid "Error: invalid '%s' argument: '%s' (use on/off)."
 msgstr "错误：无效的 \"%s\" 参数：\"%s\"（使用 on/off）。"
 
 #. no arguments -> get current state
-#: ../clients/cli/general.c:973 ../clients/cli/general.c:985
+#: ../clients/cli/general.c:984 ../clients/cli/general.c:996
 msgid "Connectivity"
 msgstr "连接性"
 
-#: ../clients/cli/general.c:988
+#: ../clients/cli/general.c:999
 #, c-format
 msgid "Error: 'networking' command '%s' is not valid."
 msgstr "错误：\"networking\" 命令 \"%s\" 无效。"
 
-#: ../clients/cli/general.c:1002
+#: ../clients/cli/general.c:1011
 msgid "Networking"
 msgstr "联网"
 
 #. no argument, show all radio switches
-#: ../clients/cli/general.c:1037
+#: ../clients/cli/general.c:1039
 msgid "Radio switches"
 msgstr "无线电开关"
 
 #. no argument, show current Wi-Fi state
-#: ../clients/cli/general.c:1067
+#: ../clients/cli/general.c:1082
 msgid "Wi-Fi radio switch"
 msgstr "Wi-Fi 无线电开关"
 
 #. no argument, show current WWAN (mobile broadband) state
-#: ../clients/cli/general.c:1094
+#: ../clients/cli/general.c:1118
 msgid "WWAN radio switch"
 msgstr "WWAN 无线电开关"
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has started"
 msgstr "网络管理器已启动"
 
-#: ../clients/cli/general.c:1142
+#: ../clients/cli/general.c:1158
 msgid "NetworkManager has stopped"
 msgstr "网络管理器已停止"
 
-#: ../clients/cli/general.c:1153
+#: ../clients/cli/general.c:1169
 #, c-format
 msgid "Hostname set to '%s'\n"
 msgstr "主机名已设为 \"%s\"\n"
 
-#: ../clients/cli/general.c:1168
+#: ../clients/cli/general.c:1184
 #, c-format
 msgid "'%s' is now the primary connection\n"
 msgstr "\"%s\" 现在是主连接\n"
 
-#: ../clients/cli/general.c:1170
+#: ../clients/cli/general.c:1186
 #, c-format
 msgid "There's no primary connection\n"
 msgstr "没有主连接\n"
 
-#: ../clients/cli/general.c:1182
+#: ../clients/cli/general.c:1198
 #, c-format
 msgid "Connectivity is now '%s'\n"
 msgstr "连接性现在是 \"%s\"\n"
 
-#: ../clients/cli/general.c:1196
+#: ../clients/cli/general.c:1212
 #, c-format
 msgid "Networkmanager is now in the '%s' state\n"
 msgstr "网络管理器现在处于 \"%s\" 状态\n"
 
-#: ../clients/cli/general.c:1216
+#: ../clients/cli/general.c:1232
 msgid "connection available"
 msgstr "连接可用"
 
-#: ../clients/cli/general.c:1218
+#: ../clients/cli/general.c:1234
 msgid "connections available"
 msgstr "连接可用"
 
-#: ../clients/cli/general.c:1236
+#: ../clients/cli/general.c:1252
 msgid "autoconnect"
 msgstr "自动连接"
 
-#: ../clients/cli/general.c:1238
+#: ../clients/cli/general.c:1254
 msgid "fw missing"
 msgstr "缺失固件"
 
-#: ../clients/cli/general.c:1243
+#: ../clients/cli/general.c:1259
 msgid "plugin missing"
 msgstr "缺失插件"
 
-#: ../clients/cli/general.c:1283
+#: ../clients/cli/general.c:1299
 msgid "sw"
 msgstr "软件"
 
-#: ../clients/cli/general.c:1285
+#: ../clients/cli/general.c:1301
 msgid "hw"
 msgstr "硬件"
 
-#: ../clients/cli/general.c:1290
+#: ../clients/cli/general.c:1306
 msgid "iface"
 msgstr "接口"
 
-#: ../clients/cli/general.c:1293
+#: ../clients/cli/general.c:1309
 msgid "port"
 msgstr "端口"
 
-#: ../clients/cli/general.c:1296
+#: ../clients/cli/general.c:1312
 msgid "mtu"
 msgstr "mtu"
 
-#: ../clients/cli/general.c:1313
+#: ../clients/cli/general.c:1329
 msgid "master"
 msgstr "主连接"
 
-#: ../clients/cli/general.c:1317 ../clients/tui/nm-editor-utils.c:235
+#: ../clients/cli/general.c:1333 ../clients/tui/nm-editor-utils.c:230
 #: ../clients/tui/nmt-connect-connection-list.c:394
 msgid "VPN"
 msgstr "VPN"
 
-#: ../clients/cli/general.c:1319
+#: ../clients/cli/general.c:1335
 msgid "ip4 default"
 msgstr "ip4 默认"
 
-#: ../clients/cli/general.c:1321
+#: ../clients/cli/general.c:1337
 msgid "ip6 default"
 msgstr "ip6 默认"
 
-#: ../clients/cli/general.c:1403
+#: ../clients/cli/general.c:1416
 #, c-format
 msgid "%s VPN connection"
 msgstr "%s VPN 连接"
 
-#: ../clients/cli/general.c:1350
+#: ../clients/cli/general.c:1386
 #, c-format
 msgid ""
 "Use \"nmcli device show\" to get complete information about known devices "
@@ -3359,12 +3358,12 @@
 "\n"
 "完整的用法细节，可参考 nmcli(1) 和 nmcli-examples(5) 手册页。\n"
 
-#: ../clients/cli/general.c:1501
+#: ../clients/cli/general.c:1509
 #, c-format
 msgid "Error: 'monitor' command '%s' is not valid."
 msgstr "错误：\"monitor\" 命令 \"%s\" 无效。"
 
-#: ../clients/cli/general.c:1513
+#: ../clients/cli/general.c:1521
 msgid "Networkmanager is not running (waiting for it)\n"
 msgstr "网络管理器未运行（等待中）。\n"
 
@@ -3402,62 +3401,62 @@
 "\n"
 msgstr ""
 
-#: ../clients/cli/nmcli.c:310
+#: ../clients/cli/nmcli.c:306
 #, c-format
 msgid "Error: missing argument for '%s' option."
 msgstr "错误：\"%s\" 选项缺少参数。"
 
-#: ../clients/cli/nmcli.c:741
+#: ../clients/cli/nmcli.c:757
 #, c-format
 msgid "Error: Option '--terse' is specified the second time."
 msgstr "错误：第二次指定了选项 \"--terse\"。"
 
-#: ../clients/cli/nmcli.c:746
+#: ../clients/cli/nmcli.c:762
 #, c-format
 msgid "Error: Option '--terse' is mutually exclusive with '--pretty'."
 msgstr "错误：选项 \"--terse\" 与 \"--pretty\" 相互排斥。"
 
-#: ../clients/cli/nmcli.c:754
+#: ../clients/cli/nmcli.c:770
 #, c-format
 msgid "Error: Option '--pretty' is specified the second time."
 msgstr "错误：第二次指定了选项 \"--pretty\"。"
 
-#: ../clients/cli/nmcli.c:759
+#: ../clients/cli/nmcli.c:775
 #, c-format
 msgid "Error: Option '--pretty' is mutually exclusive with '--terse'."
 msgstr "错误：选项 \"--pretty\" 与 \"--terse\" 相互排斥。"
 
-#: ../clients/cli/nmcli.c:774
+#: ../clients/cli/nmcli.c:790
 #, c-format
 msgid "Error: '%s' is not a valid argument for '%s' option."
 msgstr "错误：\"%s\" 不是 \"%s\" 选项的有效参数。"
 
-#: ../clients/cli/nmcli.c:788 ../clients/cli/nmcli.c:800
+#: ../clients/cli/nmcli.c:804 ../clients/cli/nmcli.c:816
 #, c-format
 msgid "Error: '%s' is not valid argument for '%s' option."
 msgstr "错误：\"%s\" 不是 \"%s\" 选项的有效参数。"
 
-#: ../clients/cli/nmcli.c:824
+#: ../clients/cli/nmcli.c:840
 #, c-format
 msgid "Error: '%s' is not a valid timeout."
 msgstr "错误：\"%s\" 不是有效的超时时间。"
 
-#: ../clients/cli/nmcli.c:831
+#: ../clients/cli/nmcli.c:847
 #, c-format
 msgid "nmcli tool, version %s\n"
 msgstr "nmcli 工具，版本 %s\n"
 
-#: ../clients/cli/nmcli.c:839
+#: ../clients/cli/nmcli.c:855
 #, c-format
 msgid "Error: Option '%s' is unknown, try 'nmcli -help'."
 msgstr "错误：选项 \"%s\" 未知，尝试 \"nmcli -help\"。"
 
-#: ../clients/cli/nmcli.c:895 ../clients/cli/nmcli.c:902
+#: ../clients/cli/nmcli.c:911 ../clients/cli/nmcli.c:918
 #, c-format
 msgid "Error: nmcli terminated by signal %s (%d)"
 msgstr "错误：nmcli 被信号 %s (%d) 终止了"
 
-#: ../clients/cli/nmcli.c:968
+#: ../clients/cli/nmcli.c:986
 msgid "Success"
 msgstr "成功"
 
@@ -3471,7 +3470,7 @@
 msgid "Authentication error: %s\n"
 msgstr "验证错误：%s\n"
 
-#: ../clients/cli/polkit-agent.c:122
+#: ../clients/cli/polkit-agent.c:99
 #, c-format
 msgid "Warning: polkit agent initialization failed: %s\n"
 msgstr "警告：polkit 代理初始化失败：%s\n"
@@ -3526,19 +3525,19 @@
 msgid "Info: %s\n"
 msgstr "信息：%s\n"
 
-#: ../clients/cli/settings.c:490
+#: ../clients/cli/settings.c:488
 msgid "don't know how to get the property value"
 msgstr "不知道如何获取属性值"
 
-#: ../clients/cli/settings.c:580
+#: ../clients/cli/settings.c:578
 msgid "the property can't be changed"
 msgstr "无法更改该属性"
 
-#: ../clients/cli/settings.c:658
+#: ../clients/cli/settings.c:656
 msgid "[NM property description]"
 msgstr "[NM 属性描述]"
 
-#: ../clients/cli/settings.c:668
+#: ../clients/cli/settings.c:666
 msgid "[nmcli specific description]"
 msgstr "[nmcli 特定描述]"
 
@@ -3552,42 +3551,42 @@
 msgid "Error: Unexpected argument '%s'"
 msgstr "错误：意外参数 \"%s\""
 
-#: ../clients/cli/utils.c:695
+#: ../clients/cli/utils.c:691
 #, c-format
 msgid "invalid field '%s%s%s'; no such field"
 msgstr "无效字段 \"%s%s%s\"；没有此类字段"
 
-#: ../clients/cli/utils.c:699
+#: ../clients/cli/utils.c:695
 #, c-format
 msgid "invalid field '%s%s%s'; allowed fields: [%s]"
 msgstr "无效字段 \"%s%s%s\";允许的字段：[%s]"
 
-#: ../clients/cli/utils.c:795
+#: ../clients/cli/utils.c:791
 #, c-format
 msgid "failure to select field"
 msgstr "选择字段失败"
 
-#: ../clients/cli/utils.c:1424
+#: ../clients/cli/utils.c:1427
 #, c-format
 msgid "Error reading nmcli output: %s\n"
 msgstr "读取 nmcli 输出时出错：%s\n"
 
-#: ../clients/cli/utils.c:1429
+#: ../clients/cli/utils.c:1432
 #, c-format
 msgid "Error writing nmcli output: %s\n"
 msgstr "写入 nmcli 输出时出错：%s\n"
 
-#: ../clients/cli/utils.c:1455
+#: ../clients/cli/utils.c:1458
 #, c-format
 msgid "Failed to create pager pipe: %s\n"
 msgstr "创建与子进程通讯的管道失败：%s\n"
 
-#: ../clients/cli/utils.c:1464
+#: ../clients/cli/utils.c:1467
 #, c-format
 msgid "Failed to fork pager: %s\n"
 msgstr "fork 子进程失败：%s\n"
 
-#: ../clients/cli/utils.c:1511 ../clients/cli/utils.c:1515
+#: ../clients/cli/utils.c:1514 ../clients/cli/utils.c:1518
 #, c-format
 msgid "Failed to duplicate pager pipe: %s\n"
 msgstr "复制与子进程通讯的管道失败：%s\n"
@@ -3614,7 +3613,7 @@
 #: ../clients/common/nm-client-utils.c:155
 #, c-format
 msgid "'%s' is ambiguous (%s x %s)"
-msgstr "\"%s\" 不明确（%s x %s）"
+msgstr "“%s” 含义模糊 (%s x %s)"
 
 #: ../clients/common/nm-client-utils.c:209
 #, c-format
@@ -3931,7 +3930,7 @@
 #. TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason)
 #. TRANSLATORS: Unknown reason for a connection state change (NMActiveConnectionStateReason)
 #: ../clients/common/nm-client-utils.c:277
-#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1514
+#: ../clients/common/nm-client-utils.c:350 ../libnm/nm-device.c:1583
 msgid "Unknown"
 msgstr "未知"
 
@@ -4005,18 +4004,18 @@
 msgid "invalid field '%s%s%s%s%s'; %s%s%s"
 msgstr "无效字段 \"%s%s%s%s%s\"；%s%s%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:297
-#: ../clients/common/nm-meta-setting-desc.c:358
+#: ../clients/common/nm-meta-setting-desc.c:276
+#: ../clients/common/nm-meta-setting-desc.c:337
 #, c-format
 msgid "invalid prefix '%s'; <1-%d> allowed"
 msgstr "无效的前缀 '%s'; 只允许 <1-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:305
+#: ../clients/common/nm-meta-setting-desc.c:284
 #, c-format
 msgid "invalid IP address: %s"
 msgstr "无效的 IP 地址：%s"
 
-#: ../clients/common/nm-meta-setting-desc.c:330
+#: ../clients/common/nm-meta-setting-desc.c:309
 msgid ""
 "The valid syntax is: 'ip[/prefix] [next-hop] [metric] [attribute=val]... "
 "[,ip[/prefix] ...]'"
@@ -4024,72 +4023,72 @@
 "有效语法为：\"ip[/prefix] [next-hop] [metric] [attribute=val]... [,ip[/prefix] "
 "...]\""
 
-#: ../clients/common/nm-meta-setting-desc.c:369
+#: ../clients/common/nm-meta-setting-desc.c:348
 #, c-format
 msgid "the next hop ('%s') must be first"
 msgstr "下一跳（\"%s\"）必须在首位"
 
-#: ../clients/common/nm-meta-setting-desc.c:375
+#: ../clients/common/nm-meta-setting-desc.c:354
 #, c-format
 msgid "the metric ('%s') must be before attributes"
 msgstr "跃点数（\"%s\"）必需在属性前"
 
-#: ../clients/common/nm-meta-setting-desc.c:423
+#: ../clients/common/nm-meta-setting-desc.c:402
 #, c-format
 msgid "invalid route: %s. %s"
 msgstr "无效路由：%s。%s"
 
 #: ../clients/common/nm-meta-setting-desc.c:226
 msgid "default route cannot be added (NetworkManager handles it by itself)"
-msgstr "无法添加默认路由（网络管理器自己进行处理）"
+msgstr "无法添加默认的路由（NetworkManager 自己进行处理）"
 
-#: ../clients/common/nm-meta-setting-desc.c:3816
+#: ../clients/common/nm-meta-setting-desc.c:3781
 #, c-format
 msgid "invalid priority map '%s'"
 msgstr "无效的优先级映射 \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:440
-#: ../clients/common/nm-meta-setting-desc.c:446
+#: ../clients/common/nm-meta-setting-desc.c:432
+#: ../clients/common/nm-meta-setting-desc.c:438
 #, c-format
 msgid "priority '%s' is not valid (<0-%ld>)"
-msgstr "优先级 '%s' 无效 (<0-%ld>)"
+msgstr "优先级“%s”无效 (<0-%ld>)"
 
-#: ../clients/common/nm-meta-setting-desc.c:489
+#: ../clients/common/nm-meta-setting-desc.c:468
 #, c-format
 msgid "cannot read pac-script from file '%s'"
 msgstr "无法从文件 \"%s\" 读取 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:496
+#: ../clients/common/nm-meta-setting-desc.c:475
 #, c-format
 msgid "file '%s' contains non-valid utf-8"
 msgstr "文件 \"%s\" 包含无效的 utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:509
+#: ../clients/common/nm-meta-setting-desc.c:488
 #, c-format
 msgid "'%s' does not contain a valid PAC Script"
 msgstr "\"%s\" 没有包含有效的 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:512
+#: ../clients/common/nm-meta-setting-desc.c:491
 #, c-format
 msgid "Not a valid PAC Script"
 msgstr "不是有效的 PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:565
+#: ../clients/common/nm-meta-setting-desc.c:544
 #, c-format
 msgid "cannot read team config from file '%s'"
 msgstr "无法从文件 \"%s\" 读取组合（team）配置"
 
-#: ../clients/common/nm-meta-setting-desc.c:572
+#: ../clients/common/nm-meta-setting-desc.c:551
 #, c-format
 msgid "team config file '%s' contains non-valid utf-8"
 msgstr "组合（team）配置文件 \"%s\" 包含无效的 utf-8"
 
-#: ../clients/common/nm-meta-setting-desc.c:594
+#: ../clients/common/nm-meta-setting-desc.c:586
 #, c-format
 msgid "'%s' does not contain a valid team configuration"
 msgstr "\"%s\" 没有包含有效的组合（team）配置"
 
-#: ../clients/common/nm-meta-setting-desc.c:597
+#: ../clients/common/nm-meta-setting-desc.c:589
 #, c-format
 msgid "team configuration must be a JSON object"
 msgstr "组合（team）配置必须为 JSON 目标"
@@ -4098,11 +4097,11 @@
 msgid "(default)"
 msgstr "（默认）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1029
+#: ../clients/common/nm-meta-setting-desc.c:1018
 msgid "auto"
 msgstr "自动"
 
-#: ../clients/common/nm-meta-setting-desc.c:1181
+#: ../clients/common/nm-meta-setting-desc.c:1170
 #, c-format
 msgid "%s (%s)"
 msgstr "%s（%s）"
@@ -4112,17 +4111,17 @@
 msgid "'%s' is out of range [%lli, %lli]"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:1338
+#: ../clients/common/nm-meta-setting-desc.c:1327
 #, c-format
 msgid "'%s' is not a valid number"
 msgstr "\"%s\" 不是有效的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:1395
+#: ../clients/common/nm-meta-setting-desc.c:1384
 #, c-format
 msgid "'%s' is out of range [0, %u]"
 msgstr "\"%s\" 超出范围 [0, %u]"
 
-#: ../clients/common/nm-meta-setting-desc.c:1441
+#: ../clients/common/nm-meta-setting-desc.c:1430
 #, c-format
 msgid "'%s' is not a valid Ethernet MAC"
 msgstr "\"%s\" 不是有效的以太网 MAC"
@@ -4137,149 +4136,150 @@
 msgid "'%s' sum is higher than all flags => all flags set"
 msgstr "\"%s\" 总和高于全部的标记 => 全部标记集合"
 
-#: ../clients/common/nm-meta-setting-desc.c:1567
+#: ../clients/common/nm-meta-setting-desc.c:1556
 #, c-format
 msgid "invalid option '%s', use a combination of [%s]"
 msgstr "无效选项 \"%s\"，请使用 [%s] 的组合"
 
-#: ../clients/common/nm-meta-setting-desc.c:1572 ../libnm-core/nm-keyfile.c:926
+#: ../clients/common/nm-meta-setting-desc.c:1561
+#: ../shared/nm-keyfile/nm-keyfile.c:927
 #, c-format
 msgid "invalid option '%s', use one of [%s]"
 msgstr "无效选项 \"%s\"，请使用 [%s] 中的一个。"
 
-#: ../clients/common/nm-meta-setting-desc.c:1691
+#: ../clients/common/nm-meta-setting-desc.c:1680
 #, c-format
 msgid "%d (key)"
 msgstr "%d（密钥）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1693
+#: ../clients/common/nm-meta-setting-desc.c:1682
 #, c-format
 msgid "%d (passphrase)"
 msgstr "%d（密码）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1696
+#: ../clients/common/nm-meta-setting-desc.c:1685
 #, c-format
 msgid "%d (unknown)"
 msgstr "%d（未知）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1709
+#: ../clients/common/nm-meta-setting-desc.c:1698
 msgid "0 (NONE)"
 msgstr "0（无）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1715
+#: ../clients/common/nm-meta-setting-desc.c:1704
 msgid "REORDER_HEADERS, "
 msgstr "记录头、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1717
+#: ../clients/common/nm-meta-setting-desc.c:1706
 msgid "GVRP, "
 msgstr "GVRP、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1719
+#: ../clients/common/nm-meta-setting-desc.c:1708
 msgid "LOOSE_BINDING, "
 msgstr "松散绑定、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1721
+#: ../clients/common/nm-meta-setting-desc.c:1710
 msgid "MVRP, "
 msgstr "MVRP、 "
 
 #: ../clients/common/nm-meta-setting-desc.c:1516
 #, c-format
 msgid "%d (disabled)"
-msgstr "%d（禁用）"
+msgstr "%d (已禁用)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1518
 #, c-format
 msgid "%d (enabled, prefer public IP)"
-msgstr "%d（启用，首选公共 IP）"
+msgstr "%d (已启用，首选公共 IP)"
 
 #: ../clients/common/nm-meta-setting-desc.c:1520
 #, c-format
 msgid "%d (enabled, prefer temporary IP)"
-msgstr "%d（启用，首选临时 IP）"
+msgstr "%d (已启用，首选临时 IP)"
 
-#: ../clients/common/nm-meta-setting-desc.c:1742
+#: ../clients/common/nm-meta-setting-desc.c:1731
 msgid "0 (none)"
 msgstr "0（无）"
 
-#: ../clients/common/nm-meta-setting-desc.c:1748
+#: ../clients/common/nm-meta-setting-desc.c:1737
 msgid "agent-owned, "
 msgstr "为代理拥有、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1750
+#: ../clients/common/nm-meta-setting-desc.c:1739
 msgid "not saved, "
 msgstr "未保存、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1752
+#: ../clients/common/nm-meta-setting-desc.c:1741
 msgid "not required, "
 msgstr "不必需、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:1970
+#: ../clients/common/nm-meta-setting-desc.c:1941
 #, c-format
 msgid "'%s' is not valid; use <option>=<value>"
 msgstr "'%s' 无效; 使用 <option>=<value>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1703
+#: ../clients/common/nm-meta-setting-desc.c:1649
 msgid "no item to remove"
-msgstr "没有要移除的项"
+msgstr "没有要删除的项"
 
-#: ../clients/common/nm-meta-setting-desc.c:1707
+#: ../clients/common/nm-meta-setting-desc.c:1653
 #, c-format
 msgid "index '%d' is not in range <0-%d>"
-msgstr "索引 '%d' 超出了范围 <0-%d>"
+msgstr "索引“%d”超出了范围 <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:1722
+#: ../clients/common/nm-meta-setting-desc.c:1668
 #, c-format
 msgid "invalid option '%s'"
-msgstr "无效选项 \"%s\""
+msgstr "无效选项“%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:1724
+#: ../clients/common/nm-meta-setting-desc.c:1670
 msgid "missing option"
 msgstr "缺少选项"
 
-#: ../clients/common/nm-meta-setting-desc.c:1748
+#: ../clients/common/nm-meta-setting-desc.c:1694
 #, c-format
 msgid "'%s' is not a valid MAC"
-msgstr "\"%s\" 不是有效的 MAC"
+msgstr "“%s”不是有效的 MAC 地址"
 
-#: ../clients/common/nm-meta-setting-desc.c:2077
-#: ../clients/common/nm-meta-setting-desc.c:4052
+#: ../clients/common/nm-meta-setting-desc.c:2048
+#: ../clients/common/nm-meta-setting-desc.c:4021
 #: ../libnm-core/nm-setting-ovs-bridge.c:183 ../src/nm-config.c:556
 #, c-format
 msgid "'%s' is not valid"
 msgstr "\"%s\" 无效"
 
-#: ../clients/common/nm-meta-setting-desc.c:2039
+#: ../clients/common/nm-meta-setting-desc.c:2010
 #, c-format
 msgid "'%u' flags are not valid; use combination of %s"
 msgstr "\"%u\" 标记无效；请使用 %s 的组合"
 
-#: ../clients/common/nm-meta-setting-desc.c:2056
+#: ../clients/common/nm-meta-setting-desc.c:2027
 #, c-format
 msgid "'%s' is not a valid number (or out of range)"
 msgstr "\"%s\" 不是有效的数字（或超出范围）"
 
-#: ../clients/common/nm-meta-setting-desc.c:2190
+#: ../clients/common/nm-meta-setting-desc.c:2159
 #, c-format
 msgid "'%s' is not a valid hex character"
 msgstr "\"%s\" 不是有效十六进制字符"
 
-#: ../clients/common/nm-meta-setting-desc.c:2266
+#: ../clients/common/nm-meta-setting-desc.c:2200
 #, c-format
 msgid "the property doesn't contain EAP method '%s'"
-msgstr "属性没有包含 EAP 方法 \"%s\""
+msgstr "属性不能包含 EAP 方法 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:2289
+#: ../clients/common/nm-meta-setting-desc.c:2223
 #, c-format
 msgid "the property doesn't contain alternative subject match '%s'"
-msgstr "属性没有包含符合 \"%s\" 的替换者"
+msgstr "属性没有包含匹配 '%s' 的替代主体"
 
-#: ../clients/common/nm-meta-setting-desc.c:2315
+#: ../clients/common/nm-meta-setting-desc.c:2249
 #, c-format
 msgid ""
 "the property doesn't contain \"phase2\" alternative subject match '%s'"
-msgstr "属性没有包含符合 \"%s\" 的 \"phase2\" 替换者"
+msgstr "属性没有包含匹配 '%s' 的 \"phase2\" 替代主体"
 
-#: ../clients/common/nm-meta-setting-desc.c:2393
+#: ../clients/common/nm-meta-setting-desc.c:2370
 #, c-format
 msgid ""
 "Enter a list of bonding options formatted as:\n"
@@ -4317,136 +4317,138 @@
 #. * hacky: we can not see if the type is already set, because
 #. * nmc_setting_set_property() is called only after the property
 #. * we're setting (type) has been removed.
-#: ../clients/common/nm-meta-setting-desc.c:2458
+#: ../clients/common/nm-meta-setting-desc.c:2435
 #, c-format
 msgid "Can not change the connection type"
 msgstr "无法更改连接类型"
 
-#: ../clients/common/nm-meta-setting-desc.c:2597
+#: ../clients/common/nm-meta-setting-desc.c:2540
 #, c-format
 msgid "the property doesn't contain permission '%s'"
-msgstr "属性没有包含权限 \"%s\""
+msgstr "属性没有包含权限 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:2580
+#: ../clients/common/nm-meta-setting-desc.c:2567
 #, c-format
 msgid "'%s' is not valid master; use ifname or connection UUID"
 msgstr "\"%s\" 不是有效的主连接；使用接口名或连接的 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2661
+#: ../clients/common/nm-meta-setting-desc.c:2620
 #, c-format
 msgid "the value '%s' is not a valid UUID"
 msgstr "值 \"%s\" 不是有效的 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:2722
+#: ../clients/common/nm-meta-setting-desc.c:2667
 #, c-format
 msgid "the property doesn't contain UUID '%s'"
-msgstr "属性没有包含 UUID \"%s\""
+msgstr "属性没有包含 UUID '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:2732
+#: ../clients/common/nm-meta-setting-desc.c:2691
 msgid "0 (disabled)"
 msgstr "0（禁用）"
 
-#: ../clients/common/nm-meta-setting-desc.c:2738
+#: ../clients/common/nm-meta-setting-desc.c:2697
 msgid "enabled, "
 msgstr "启用、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:2740
+#: ../clients/common/nm-meta-setting-desc.c:2699
 msgid "advertise, "
 msgstr "通告、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:2742
+#: ../clients/common/nm-meta-setting-desc.c:2701
 msgid "willing, "
 msgstr "愿意、 "
 
-#: ../clients/common/nm-meta-setting-desc.c:2831
+#: ../clients/common/nm-meta-setting-desc.c:2790
 #, c-format
 msgid "'%s' is not a valid DCB flag"
 msgstr "\"%s\" 不是有效的 DCB 标记"
 
-#: ../clients/common/nm-meta-setting-desc.c:2858
+#: ../clients/common/nm-meta-setting-desc.c:2817
 msgid "must contain 8 comma-separated numbers"
 msgstr "必须包含 8 个用逗号分隔的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2872
+#: ../clients/common/nm-meta-setting-desc.c:2831
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive) or %u"
 msgstr "\"%s\" 不是 0 和 %u（包括）之间的数字或是 %u"
 
-#: ../clients/common/nm-meta-setting-desc.c:2875
+#: ../clients/common/nm-meta-setting-desc.c:2834
 #, c-format
 msgid "'%s' not a number between 0 and %u (inclusive)"
 msgstr "\"%s\" 不是 0 和 %u（包括）之间的数字"
 
-#: ../clients/common/nm-meta-setting-desc.c:2896
+#: ../clients/common/nm-meta-setting-desc.c:2855
 #, c-format
 msgid "changes will have no effect until '%s' includes 1 (enabled)"
 msgstr "除非 \"%s\" 包含 1（启用），否则更改无法生效"
 
-#: ../clients/common/nm-meta-setting-desc.c:2926
+#: ../clients/common/nm-meta-setting-desc.c:2885
 #, c-format
 msgid "bandwidth percentages must total 100%%"
 msgstr "带宽百分比总和必须为 100%%"
 
-#: ../clients/common/nm-meta-setting-desc.c:2997
-#: ../clients/common/nm-meta-setting-desc.c:3003
+#: ../clients/common/nm-meta-setting-desc.c:2956
+#: ../clients/common/nm-meta-setting-desc.c:2962
 msgid "SIM operator ID must be a 5 or 6 number MCCMNC code"
 msgstr "SIM 运营商 ID 必须为 5 或 6 个数字的 MCCMNC 代码"
 
-#: ../clients/common/nm-meta-setting-desc.c:3027
+#: ../clients/common/nm-meta-setting-desc.c:2986
 #, c-format
 msgid "'%s' is not a valid IBoIP P_Key"
 msgstr "\"%s\" 不是有效的 IBoIP P_Key"
 
-#: ../clients/common/nm-meta-setting-desc.c:3050
+#: ../clients/common/nm-meta-setting-desc.c:3009
 msgid "default"
 msgstr "默认"
 
-#: ../clients/common/nm-meta-setting-desc.c:3312
-#: ../clients/common/nm-meta-setting-desc.c:3329
+#: ../clients/common/nm-meta-setting-desc.c:3249
+#: ../clients/common/nm-meta-setting-desc.c:3268
 #, c-format
 msgid "invalid IPv4 address '%s'"
-msgstr "无效的 IPv4 地址\"%s\""
+msgstr "无效的 IPv4 地址“%s”"
 
-#: ../clients/common/nm-meta-setting-desc.c:3335
-#: ../clients/common/nm-meta-setting-desc.c:3582
+#: ../clients/common/nm-meta-setting-desc.c:3274
+#: ../clients/common/nm-meta-setting-desc.c:3528
 #, c-format
 msgid "the property doesn't contain DNS server '%s'"
-msgstr "属性没有包含 DNS 服务器 \"%s\""
+msgstr "属性没有包含 DNS 服务器 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3373
+#: ../clients/common/nm-meta-setting-desc.c:3314
+#: ../clients/common/nm-meta-setting-desc.c:3568
 #, c-format
 msgid "the property doesn't contain DNS search domain '%s'"
-msgstr "属性没有包含 DNS 搜索域 \"%s\""
+msgstr "属性没有包含 DNS 搜索域 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3413
+#: ../clients/common/nm-meta-setting-desc.c:3351
+#: ../clients/common/nm-meta-setting-desc.c:3605
 #, c-format
 msgid "the property doesn't contain DNS option '%s'"
-msgstr "属性没有包含 DNS 选项 \"%s\""
+msgstr "属性没有包含 DNS 选项 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3456
-#: ../clients/common/nm-meta-setting-desc.c:3630
+#: ../clients/common/nm-meta-setting-desc.c:3394
+#: ../clients/common/nm-meta-setting-desc.c:3654
 #, c-format
 msgid "the property doesn't contain IP address '%s'"
-msgstr "属性没有包含 IP 地址 \"%s\""
+msgstr "属性没有包含 IP 地址 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3341
+#: ../clients/common/nm-meta-setting-desc.c:3300
 #, c-format
 msgid "invalid gateway address '%s'"
 msgstr "无效的网关地址 \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:3515
-#: ../clients/common/nm-meta-setting-desc.c:3690
+#: ../clients/common/nm-meta-setting-desc.c:3453
+#: ../clients/common/nm-meta-setting-desc.c:3714
 #, c-format
 msgid "the property doesn't contain route '%s'"
-msgstr "属性没有包含路由 \"%s\""
+msgstr "属性没有包含路由 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3559
-#: ../clients/common/nm-meta-setting-desc.c:3576
+#: ../clients/common/nm-meta-setting-desc.c:3503
+#: ../clients/common/nm-meta-setting-desc.c:3522
 #, c-format
 msgid "invalid IPv6 address '%s'"
-msgstr "无效的 IPv6 地址 \"%s\""
+msgstr "无效的 IPv6 地址“%s”"
 
-#: ../libnm-core/nm-setting-gsm.c:372
+#: ../libnm-core/nm-setting-gsm.c:366
 #, c-format
 msgid "'%s' is not a number"
 msgstr "\"%s\" 不是数字"
@@ -4456,92 +4458,92 @@
 msgid "'%s' is not valid; use 0, 1, or 2"
 msgstr "“%s” 无效，请使用 0、1 或者 2。"
 
-#: ../clients/common/nm-meta-setting-desc.c:3491
+#: ../clients/common/nm-meta-setting-desc.c:3456
 #, c-format
 msgid "'%s' is not a valid channel; use <1-13>"
 msgstr "'%s' 不是一个有效的 channel; 使用 <1-13>"
 
-#: ../clients/common/nm-meta-setting-desc.c:3903
+#: ../clients/common/nm-meta-setting-desc.c:3833
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <qdisc>'"
 msgstr "有效的语法是：'[root | parent <handle>] [handle <handle>] <qdisc>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3954
+#: ../clients/common/nm-meta-setting-desc.c:3856
 #, c-format
 msgid "the property doesn't contain qdisc '%s'"
 msgstr "属性没有包含排队规则（qdisc） \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4008
+#: ../clients/common/nm-meta-setting-desc.c:3909
 msgid ""
 "The valid syntax is: '[root | parent <handle>] [handle <handle>] <tfilter>'"
 msgstr "有效的语法是：'[root | parent <handle>] [handle <handle>] <tfilter>'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4031
+#: ../clients/common/nm-meta-setting-desc.c:3932
 #, c-format
 msgid "the property doesn't contain tfilter '%s'"
 msgstr "属性没有包含流量过滤器（tfilter）\"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4098
+#: ../clients/common/nm-meta-setting-desc.c:4003
 #, c-format
 msgid "the property doesn't contain string '%s'"
 msgstr "属性没有包含字符串 \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4173
-#: ../clients/common/nm-meta-setting-desc.c:4247
+#: ../clients/common/nm-meta-setting-desc.c:4077
+#: ../clients/common/nm-meta-setting-desc.c:4150
 #, c-format
 msgid "the property doesn't contain link watcher '%s'"
 msgstr "属性没有包含链路监视器 \"%s\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4353
+#: ../clients/common/nm-meta-setting-desc.c:4241
 #, c-format
 msgid "only one mapping at a time is supported; taking the first one (%s)"
 msgstr "警告：一次只支持映射一个；使用第一个（%s）"
 
-#: ../clients/common/nm-meta-setting-desc.c:4361
+#: ../clients/common/nm-meta-setting-desc.c:4249
 #, c-format
 msgid "the property doesn't contain mapping '%s'"
-msgstr "属性没有包含映射 \"%s\""
+msgstr "属性没有包含映射 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4369
+#: ../clients/common/nm-meta-setting-desc.c:4257
 msgid "no priority to remove"
-msgstr "没有要删除的优先级"
+msgstr "未删除任何优先级"
 
-#: ../clients/common/nm-meta-setting-desc.c:4373
+#: ../clients/common/nm-meta-setting-desc.c:4261
 #, c-format
 msgid "index '%d' is not in the range of <0-%d>"
-msgstr "索引 '%d' 不在 <0-%d> 范围内"
+msgstr "索引“%d”超出了范围 <0-%d>"
 
-#: ../clients/common/nm-meta-setting-desc.c:4442
+#: ../clients/common/nm-meta-setting-desc.c:4330
 #, c-format
 msgid "'%s' cannot be empty"
-msgstr "\"%s\" 不能为空"
+msgstr "'%s' 不能为空"
 
-#: ../clients/common/nm-meta-setting-desc.c:4001
+#: ../clients/common/nm-meta-setting-desc.c:3970
 #: ../libnm-core/nm-setting-sriov.c:438 ../libnm-core/nm-setting-wired.c:758
 #: ../libnm-core/nm-setting-wired.c:771 ../libnm-core/nm-setting-wired.c:824
-#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:876
-#: ../libnm-core/nm-setting-wireless.c:892
+#: ../libnm-core/nm-setting-wired.c:867 ../libnm-core/nm-setting-wireless.c:881
+#: ../libnm-core/nm-setting-wireless.c:897
 #, c-format
 msgid "'%s' is not a valid MAC address"
 msgstr "\"%s\" 不是有效的 MAC 地址"
 
-#: ../clients/common/nm-meta-setting-desc.c:4487
-#: ../clients/common/nm-meta-setting-desc.c:4618
+#: ../clients/common/nm-meta-setting-desc.c:4375
+#: ../clients/common/nm-meta-setting-desc.c:4508
 #, c-format
 msgid "the property doesn't contain MAC address '%s'"
-msgstr "属性没有包含 MAC 地址 \"%s\""
+msgstr "属性没有包含 MAC 地址 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:3904
+#: ../clients/common/nm-meta-setting-desc.c:3873
 #, c-format
 msgid "'%s' is not valid; 2 or 3 strings should be provided"
 msgstr "\"%s\" 无效；应提供两至三个字符串"
 
-#: ../clients/common/nm-meta-setting-desc.c:4519
+#: ../clients/common/nm-meta-setting-desc.c:4409
 #, c-format
 msgid "'%s' string value should consist of 1 - 199 characters"
-msgstr "\"%s\" 字符串值应该由 1～199 个字符组成"
+msgstr "'%s' 字符串值应该由 1 - 199 个字符组成"
 
-#: ../clients/common/nm-meta-setting-desc.c:3943
+#: ../clients/common/nm-meta-setting-desc.c:3912
 #, c-format
 msgid ""
 "Enter a list of S/390 options formatted as:\n"
@@ -4552,41 +4554,41 @@
 "  option = <value>, option = <value>,...\n"
 "有效选项为: %s\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:3978
+#: ../clients/common/nm-meta-setting-desc.c:3947
 #, c-format
 msgid "'%s' is not a valid channel"
 msgstr "\"%s\" 不是有效的信道"
 
-#: ../clients/common/nm-meta-setting-desc.c:3984
+#: ../clients/common/nm-meta-setting-desc.c:3953
 #, c-format
 msgid "'%ld' is not a valid channel"
 msgstr "\"%ld\" 不是有效的信道"
 
-#: ../clients/common/nm-meta-setting-desc.c:4674
-#: ../clients/common/nm-meta-setting-desc.c:4710
-#: ../clients/common/nm-meta-setting-desc.c:4746
+#: ../clients/common/nm-meta-setting-desc.c:4580
+#: ../clients/common/nm-meta-setting-desc.c:4616
+#: ../clients/common/nm-meta-setting-desc.c:4652
 #, c-format
 msgid "the property doesn't contain protocol '%s'"
-msgstr "属性没有包含协议 \"%s\""
+msgstr "属性没有包含协议 '%s'"
 
-#: ../clients/common/nm-meta-setting-desc.c:4061
+#: ../clients/common/nm-meta-setting-desc.c:4030
 #, c-format
 msgid ""
 "'%s' not compatible with %s '%s', please change the key or set the right %s "
 "first."
 msgstr "\"%s\" 和 %s \"%s\" 不兼容，请先修改密钥或设置正确的 %s。"
 
-#: ../clients/common/nm-meta-setting-desc.c:4071
+#: ../clients/common/nm-meta-setting-desc.c:4040
 #, c-format
 msgid "WEP key is guessed to be of '%s'"
 msgstr "猜测 WEP 密钥为 \"%s\" 类型"
 
-#: ../clients/common/nm-meta-setting-desc.c:4076
+#: ../clients/common/nm-meta-setting-desc.c:4045
 #, c-format
 msgid "WEP key index set to '%d'"
 msgstr "WEP 密钥索引已设为 \"%d\""
 
-#: ../clients/common/nm-meta-setting-desc.c:4115
+#: ../clients/common/nm-meta-setting-desc.c:4084
 #, c-format
 msgid ""
 "'%s' is not compatible with '%s' type, please change or delete the key."
@@ -4595,46 +4597,46 @@
 #: ../clients/common/nm-meta-setting-desc.c:4753
 #, c-format
 msgid "'%s' is not a valid PSK"
-msgstr "\"%s\" 不是有效的 PSK"
+msgstr "“%s” 是无效 PSK"
 
-#: ../clients/common/nm-meta-setting-desc.c:4232
+#: ../clients/common/nm-meta-setting-desc.c:4200
 msgid "Bonding primary interface [none]"
 msgstr "绑定主要接口 [无]"
 
 #. this is a virtual property, only needed during "ask" mode.
-#: ../clients/common/nm-meta-setting-desc.c:4239
+#: ../clients/common/nm-meta-setting-desc.c:4207
 msgid "Bonding monitoring mode"
 msgstr "绑定监控模式"
 
 # https://www.centos.org/docs/5/html/5.1/Deployment_Guide/s3-modules-bonding-directives.html
 # 链接有下面几个术语的定义，不过应该不用翻译，作为参考。
-#: ../clients/common/nm-meta-setting-desc.c:4248
+#: ../clients/common/nm-meta-setting-desc.c:4216
 msgid "Bonding miimon [100]"
 msgstr "绑定 miimon [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4256
+#: ../clients/common/nm-meta-setting-desc.c:4224
 msgid "Bonding downdelay [0]"
 msgstr "绑定 downdelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4264
+#: ../clients/common/nm-meta-setting-desc.c:4232
 msgid "Bonding updelay [0]"
 msgstr "绑定 updelay [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4272
+#: ../clients/common/nm-meta-setting-desc.c:4240
 msgid "Bonding arp-interval [0]"
 msgstr "绑定 arp-interval [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4280
+#: ../clients/common/nm-meta-setting-desc.c:4248
 msgid "Bonding arp-ip-target [none]"
 msgstr "绑定 arp-ip-target [none]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4288
+#: ../clients/common/nm-meta-setting-desc.c:4256
 msgid "LACP rate ('slow' or 'fast') [slow]"
 msgstr "LACP 速率（\"slow\" 或 \"fast\"）[slow]"
 
 #. macro that returns @func as const (guint32(*)(NMSetting*)) type, but checks
 #. * that the actual type is (guint32(*)(type *)).
-#: ../clients/common/nm-meta-setting-desc.c:4455
+#: ../clients/common/nm-meta-setting-desc.c:4423
 msgid ""
 "nmcli can accepts both direct JSON configuration data and a file name "
 "containing the configuration. In the latter case the file is read and the "
@@ -4650,7 +4652,7 @@
 "\"roundrobin\"}, \"ports\": {\"eth1\": {}, \"eth2\": {}} }\n"
 "          set team.config /etc/my-team.conf\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4463
+#: ../clients/common/nm-meta-setting-desc.c:4431
 msgid ""
 "Enter a list of link watchers formatted as dictionaries where the keys are "
 "teamd properties. Dictionary pairs are in the form: key=value and pairs are "
@@ -4694,7 +4696,7 @@
 "   name=arp_ping source-host=172.16.1.1 target-host=172.16.1.254, "
 "name=ethtool delay-up=3\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4532
+#: ../clients/common/nm-meta-setting-desc.c:4516
 msgid ""
 "Enter file path to CA certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -4706,7 +4708,7 @@
 "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
 "示例：/home/cimrman/cacert.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4571
+#: ../clients/common/nm-meta-setting-desc.c:4558
 msgid ""
 "Enter file path to client certificate (optionally prefixed with file://).\n"
 "  [file://]<file path>\n"
@@ -4718,7 +4720,7 @@
 "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
 "示例：/home/cimrman/jara.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4628
+#: ../clients/common/nm-meta-setting-desc.c:4615
 msgid ""
 "Enter file path to CA certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4732,7 +4734,7 @@
 "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
 "示例：/home/cimrman/ca-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4668
+#: ../clients/common/nm-meta-setting-desc.c:4658
 msgid ""
 "Enter file path to client certificate for inner authentication (optionally "
 "prefixed\n"
@@ -4746,7 +4748,7 @@
 "请注意，nmcli 不支持将证书指定为原始比特块（blob）数据。\n"
 "示例：/home/cimrman/jara-zweite-phase.crt\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4695
+#: ../clients/common/nm-meta-setting-desc.c:4685
 msgid ""
 "Enter bytes as a list of hexadecimal values.\n"
 "Two formats are accepted:\n"
@@ -4766,8 +4768,8 @@
 "例如：ab0455a6ea3a74C2\n"
 "      ab 4 55 0xa6 ea 3a 74 C2\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4712
-#: ../clients/common/nm-meta-setting-desc.c:4730
+#: ../clients/common/nm-meta-setting-desc.c:4702
+#: ../clients/common/nm-meta-setting-desc.c:4720
 msgid ""
 "Enter path to a private key and the key password (if not set yet):\n"
 "  [file://]<file path> [<password>]\n"
@@ -4779,84 +4781,84 @@
 "请注意，nmcli 不支持将私有密钥指定为原始比特块（blob）数据。\n"
 "示例：/home/cimrman/jara-priv-key Dardanely\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:4769
+#: ../clients/common/nm-meta-setting-desc.c:4759
 #: ../clients/common/nm-secret-agent-simple.c:268
 #: ../clients/common/nm-secret-agent-simple.c:356
-#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:321
+#: ../clients/tui/nmt-page-dsl.c:53 ../clients/tui/nmt-page-wifi.c:322
 msgid "Username"
 msgstr "用户名"
 
-#: ../clients/common/nm-meta-setting-desc.c:4775
-#: ../clients/common/nm-meta-setting-desc.c:4990
-#: ../clients/common/nm-meta-setting-desc.c:5385
-#: ../clients/common/nm-meta-setting-desc.c:6328
+#: ../clients/common/nm-meta-setting-desc.c:4765
+#: ../clients/common/nm-meta-setting-desc.c:5013
+#: ../clients/common/nm-meta-setting-desc.c:5410
+#: ../clients/common/nm-meta-setting-desc.c:6350
 msgid "Password [none]"
 msgstr "密码 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4821
+#: ../clients/common/nm-meta-setting-desc.c:4811
 msgid "Bluetooth device address"
 msgstr "蓝牙设备地址"
 
-#: ../clients/common/nm-meta-setting-desc.c:4869
-#: ../clients/common/nm-meta-setting-desc.c:5438
-#: ../clients/common/nm-meta-setting-desc.c:7024
-#: ../clients/common/nm-meta-setting-desc.c:7062
-#: ../clients/common/nm-meta-setting-desc.c:7244
-#: ../clients/common/nm-meta-setting-desc.c:7474
+#: ../clients/common/nm-meta-setting-desc.c:4859
+#: ../clients/common/nm-meta-setting-desc.c:5463
+#: ../clients/common/nm-meta-setting-desc.c:7058
+#: ../clients/common/nm-meta-setting-desc.c:7096
+#: ../clients/common/nm-meta-setting-desc.c:7278
+#: ../clients/common/nm-meta-setting-desc.c:7508
 msgid "MAC [none]"
 msgstr "MAC [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4875
+#: ../clients/common/nm-meta-setting-desc.c:4865
 msgid "Enable STP [no]"
 msgstr "启用 STP [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4881
+#: ../clients/common/nm-meta-setting-desc.c:4871
 msgid "STP priority [32768]"
 msgstr "STP 优先级 [32768]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4887
+#: ../clients/common/nm-meta-setting-desc.c:4877
 msgid "Forward delay [15]"
 msgstr "转发延时 [15]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4893
+#: ../clients/common/nm-meta-setting-desc.c:4883
 msgid "Hello time [2]"
 msgstr "呼叫时间 [2]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4899
+#: ../clients/common/nm-meta-setting-desc.c:4889
 msgid "Max age [20]"
 msgstr "最大寿命 [20]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4905
+#: ../clients/common/nm-meta-setting-desc.c:4895
 msgid "MAC address ageing time [300]"
 msgstr "MAC 地址老化时间 [300]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4911
+#: ../clients/common/nm-meta-setting-desc.c:4905
 msgid "Group forward mask [0]"
 msgstr "组前向掩码 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4917
+#: ../clients/common/nm-meta-setting-desc.c:4919
 msgid "Enable IGMP snooping [no]"
 msgstr "启用 IGMP 监听 [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4946
+#: ../clients/common/nm-meta-setting-desc.c:4969
 msgid "Bridge port priority [32]"
 msgstr "网桥端口优先级 [32]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4952
+#: ../clients/common/nm-meta-setting-desc.c:4975
 msgid "Bridge port STP path cost [100]"
 msgstr "网桥端口 STP 路径开销 [100]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4958
+#: ../clients/common/nm-meta-setting-desc.c:4981
 msgid "Hairpin [no]"
 msgstr "Hairpin [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:4984
-#: ../clients/common/nm-meta-setting-desc.c:5379
-#: ../clients/common/nm-meta-setting-desc.c:6882
+#: ../clients/common/nm-meta-setting-desc.c:5007
+#: ../clients/common/nm-meta-setting-desc.c:5404
+#: ../clients/common/nm-meta-setting-desc.c:6904
 msgid "Username [none]"
 msgstr "用户名 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5086
+#: ../clients/common/nm-meta-setting-desc.c:5109
 msgid ""
 "Enter a list of user permissions. This is a list of user names formatted "
 "as:\n"
@@ -4871,7 +4873,7 @@
 "\n"
 "例如：alice bob charlie\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5138
+#: ../clients/common/nm-meta-setting-desc.c:5162
 msgid ""
 "Enter secondary connections that should be activated when this connection "
 "is\n"
@@ -4889,7 +4891,7 @@
 "\n"
 "示例：private-openvpn, fe6ba5d8-c2fc-4aae-b2e3-97efddd8d9a7\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5161
+#: ../clients/common/nm-meta-setting-desc.c:5185
 msgid ""
 "Enter a value which indicates whether the connection is subject to a data\n"
 "quota, usage costs or other limitations. Accepted options are:\n"
@@ -4903,25 +4905,25 @@
 "\"false\"、\"no\"、\"off\"，设置连接为不计流量的\n"
 "\"unknown\"，让网络管理器（NetworkManager）使用一些启发式算法来选择值\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5395
+#: ../clients/common/nm-meta-setting-desc.c:5420
 msgid "APN"
 msgstr "APN"
 
-#: ../clients/common/nm-meta-setting-desc.c:5447
-#: ../clients/common/nm-meta-setting-desc.c:7093
-#: ../clients/common/nm-meta-setting-desc.c:7284
+#: ../clients/common/nm-meta-setting-desc.c:5472
+#: ../clients/common/nm-meta-setting-desc.c:7127
+#: ../clients/common/nm-meta-setting-desc.c:7318
 msgid "MTU [auto]"
 msgstr "MTU [自动]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5466
+#: ../clients/common/nm-meta-setting-desc.c:5491
 msgid "P_KEY [none]"
 msgstr "P_KEY [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5475
+#: ../clients/common/nm-meta-setting-desc.c:5500
 msgid "Parent interface [none]"
 msgstr "上级接口 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5502
+#: ../clients/common/nm-meta-setting-desc.c:5527
 msgid ""
 "Enter a list of IPv4 addresses of DNS servers.\n"
 "\n"
@@ -4931,11 +4933,11 @@
 "\n"
 "示例：8.8.8.8, 8.8.4.4\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5550
+#: ../clients/common/nm-meta-setting-desc.c:5575
 msgid "IPv4 address (IP[/plen]) [none]"
 msgstr "IPv4 地址（IP[/plen]）[无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5552
+#: ../clients/common/nm-meta-setting-desc.c:5577
 msgid ""
 "Enter a list of IPv4 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -4949,11 +4951,11 @@
 "\n"
 "示例：192.168.1.5/24, 10.0.0.11/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5571
+#: ../clients/common/nm-meta-setting-desc.c:5596
 msgid "IPv4 gateway [none]"
 msgstr "IPv4 网关 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5579
+#: ../clients/common/nm-meta-setting-desc.c:5604
 msgid ""
 "Enter a list of IPv4 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -4974,7 +4976,7 @@
 "示例：192.168.2.0/24 192.168.2.1 3, 10.1.0.0/16 10.0.0.254\n"
 "      10.1.2.0/24\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5721
+#: ../clients/common/nm-meta-setting-desc.c:5735
 msgid ""
 "Enter a list of IPv6 addresses of DNS servers.  If the IPv6 configuration "
 "method is 'auto' these DNS servers are appended to those (if any) returned "
@@ -4991,11 +4993,11 @@
 "\n"
 "示例：2607:f0d0:1002:51::4, 2607:f0d0:1002:51::1\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5775
+#: ../clients/common/nm-meta-setting-desc.c:5789
 msgid "IPv6 address (IP[/plen]) [none]"
 msgstr "IPv6 地址（IP[/plen]）[无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5777
+#: ../clients/common/nm-meta-setting-desc.c:5791
 msgid ""
 "Enter a list of IPv6 addresses formatted as:\n"
 "  ip[/prefix], ip[/prefix],...\n"
@@ -5009,11 +5011,11 @@
 "\n"
 "示例：2607:f0d0:1002:51::4/64, 1050:0:0:0:5:600:300c:326b\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5796
+#: ../clients/common/nm-meta-setting-desc.c:5810
 msgid "IPv6 gateway [none]"
 msgstr "IPv6 网关 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5804
+#: ../clients/common/nm-meta-setting-desc.c:5818
 msgid ""
 "Enter a list of IPv6 routes formatted as:\n"
 "  ip[/prefix] [next-hop] [metric],...\n"
@@ -5036,162 +5038,162 @@
 "2001:db8:beef::3 2\n"
 "      abbe::/64 55\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:5943
-#: ../clients/common/nm-meta-setting-desc.c:6923
+#: ../clients/common/nm-meta-setting-desc.c:5965
+#: ../clients/common/nm-meta-setting-desc.c:6957
 msgid "Parent device [none]"
 msgstr "上级设备 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5949
+#: ../clients/common/nm-meta-setting-desc.c:5971
 msgid "Local endpoint [none]"
 msgstr "本地端点 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:5956
-#: ../clients/common/nm-meta-setting-desc.c:6943
+#: ../clients/common/nm-meta-setting-desc.c:5978
+#: ../clients/common/nm-meta-setting-desc.c:6977
 msgid "Remote"
 msgstr "远程"
 
-#: ../clients/common/nm-meta-setting-desc.c:6001
+#: ../clients/common/nm-meta-setting-desc.c:6023
 msgid "MACsec parent device or connection UUID"
 msgstr "MACsec 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6022
+#: ../clients/common/nm-meta-setting-desc.c:6044
 msgid "Enable encryption [yes]"
 msgstr "启用加密 [是]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6028
+#: ../clients/common/nm-meta-setting-desc.c:6050
 #: ../clients/common/nm-secret-agent-simple.c:917
 msgid "MKA CAK"
 msgstr "MKA CAK"
 
-#: ../clients/common/nm-meta-setting-desc.c:6038
+#: ../clients/common/nm-meta-setting-desc.c:6060
 msgid "MKA_CKN"
 msgstr "MKA_CKN"
 
-#: ../clients/common/nm-meta-setting-desc.c:6044
+#: ../clients/common/nm-meta-setting-desc.c:6066
 msgid "SCI port [1]"
 msgstr "SCI 端口 [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6070
+#: ../clients/common/nm-meta-setting-desc.c:6092
 msgid "MACVLAN parent device or connection UUID"
 msgstr "MACVLAN 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6091
+#: ../clients/common/nm-meta-setting-desc.c:6113
 msgid "Tap [no]"
 msgstr "Tap [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6126
-#: ../clients/common/nm-meta-setting-desc.c:7198
-#: ../clients/tui/nmt-page-wifi.c:212
+#: ../clients/common/nm-meta-setting-desc.c:6148
+#: ../clients/common/nm-meta-setting-desc.c:7232
+#: ../clients/tui/nmt-page-wifi.c:213
 msgid "SSID"
 msgstr "SSID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6135
+#: ../clients/common/nm-meta-setting-desc.c:6157
 msgid "OLPC Mesh channel [1]"
 msgstr "OLPC Mesh 信道 [1]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6144
+#: ../clients/common/nm-meta-setting-desc.c:6166
 msgid "DHCP anycast MAC address [none]"
 msgstr "DHCP 任意广播 MAC 地址 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6309
+#: ../clients/common/nm-meta-setting-desc.c:6331
 msgid "PPPoE parent device"
 msgstr "PPPoE 上级设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:6315
+#: ../clients/common/nm-meta-setting-desc.c:6337
 msgid "Service [none]"
 msgstr "服务 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6322
+#: ../clients/common/nm-meta-setting-desc.c:6344
 msgid "PPPoE username"
 msgstr "PPPoE 用户名"
 
-#: ../clients/common/nm-meta-setting-desc.c:6358
+#: ../clients/common/nm-meta-setting-desc.c:6380
 msgid "Browser only [no]"
 msgstr "仅浏览器 [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6364
+#: ../clients/common/nm-meta-setting-desc.c:6386
 msgid "PAC URL"
 msgstr "PAC URL"
 
-#: ../clients/common/nm-meta-setting-desc.c:6370
+#: ../clients/common/nm-meta-setting-desc.c:6392
 msgid "PAC script"
 msgstr "PAC 脚本"
 
-#: ../clients/common/nm-meta-setting-desc.c:6494
-#: ../clients/common/nm-meta-setting-desc.c:6682
+#: ../clients/common/nm-meta-setting-desc.c:6516
+#: ../clients/common/nm-meta-setting-desc.c:6704
 msgid "Team JSON configuration [none]"
 msgstr "组合 JSON 配置 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6785
+#: ../clients/common/nm-meta-setting-desc.c:6807
 msgid "User ID [none]"
 msgstr "用户 ID [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6791
+#: ../clients/common/nm-meta-setting-desc.c:6813
 msgid "Group ID [none]"
 msgstr "分组 ID [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6797
+#: ../clients/common/nm-meta-setting-desc.c:6819
 msgid "Enable PI [no]"
 msgstr "启用 PI [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6803
+#: ../clients/common/nm-meta-setting-desc.c:6825
 msgid "Enable VNET header [no]"
 msgstr "启用 VNET 首部 [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6809
+#: ../clients/common/nm-meta-setting-desc.c:6831
 msgid "Enable multi queue [no]"
 msgstr "启用多队列 [否]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6822
+#: ../clients/common/nm-meta-setting-desc.c:6844
 msgid "VLAN parent device or connection UUID"
 msgstr "VLAN 上级设备或连接 UUID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6829
+#: ../clients/common/nm-meta-setting-desc.c:6851
 msgid "VLAN ID (<0-4094>)"
 msgstr "VLAN ID <0-4095>"
 
-#: ../clients/common/nm-meta-setting-desc.c:6835
+#: ../clients/common/nm-meta-setting-desc.c:6857
 msgid "VLAN flags (<0-7>) [none]"
 msgstr "VLAN 标记（<0-7>）[无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6844
+#: ../clients/common/nm-meta-setting-desc.c:6866
 msgid "Ingress priority maps [none]"
 msgstr "入口优先级映射 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6854
+#: ../clients/common/nm-meta-setting-desc.c:6876
 msgid "Egress priority maps [none]"
 msgstr "出口优先级映射 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6930
+#: ../clients/common/nm-meta-setting-desc.c:6964
 msgid "VXLAN ID"
 msgstr "VXLAN ID"
 
-#: ../clients/common/nm-meta-setting-desc.c:6936
+#: ../clients/common/nm-meta-setting-desc.c:6970
 msgid "Local address [none]"
 msgstr "本地地址 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6949
+#: ../clients/common/nm-meta-setting-desc.c:6983
 msgid "Minimum source port [0]"
 msgstr "最小来源端口 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6955
+#: ../clients/common/nm-meta-setting-desc.c:6989
 msgid "Maximum source port [0]"
 msgstr "最大来源端口 [0]"
 
-#: ../clients/common/nm-meta-setting-desc.c:6961
+#: ../clients/common/nm-meta-setting-desc.c:6995
 msgid "Destination port [8472]"
 msgstr "目标端口 [8472]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7031
+#: ../clients/common/nm-meta-setting-desc.c:7065
 msgid "WiMAX NSP name"
 msgstr "WiMAX NSP 名称"
 
-#: ../clients/common/nm-meta-setting-desc.c:7068
-#: ../clients/common/nm-meta-setting-desc.c:7249
+#: ../clients/common/nm-meta-setting-desc.c:7102
+#: ../clients/common/nm-meta-setting-desc.c:7283
 msgid "Cloned MAC [none]"
 msgstr "克隆的 MAC 地址 [无]"
 
-#: ../clients/common/nm-meta-setting-desc.c:7101
+#: ../clients/common/nm-meta-setting-desc.c:7135
 msgid ""
 "Enter a list of subchannels (comma or space separated).\n"
 "\n"
@@ -5201,87 +5203,87 @@
 "\n"
 "示例：0.0.0e20 0.0.0e21 0.0.0e22\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7423
+#: ../clients/common/nm-meta-setting-desc.c:7457
 msgid ""
 "Enter the type of WEP keys. The accepted values are: 0 or unknown, 1 or key, "
 "and 2 or passphrase.\n"
 msgstr "输入 WEP 密钥类型。可接受的值为：0 或者 unknown、1 或者 key, 以及 2 或者 passphrase。\n"
 
-#: ../clients/common/nm-meta-setting-desc.c:7663
+#: ../clients/common/nm-meta-setting-desc.c:7697
 msgid "802-1x settings"
 msgstr "802-1x 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7664
+#: ../clients/common/nm-meta-setting-desc.c:7698
 #: ../src/devices/adsl/nm-device-adsl.c:117
 msgid "ADSL connection"
 msgstr "ADSL 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7665
+#: ../clients/common/nm-meta-setting-desc.c:7699
 msgid "bluetooth connection"
 msgstr "蓝牙连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7666
+#: ../clients/common/nm-meta-setting-desc.c:7700
 msgid "Bond device"
 msgstr "绑定设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7667
+#: ../clients/common/nm-meta-setting-desc.c:7701
 msgid "Bridge device"
 msgstr "网桥设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7668
+#: ../clients/common/nm-meta-setting-desc.c:7702
 msgid "Bridge port"
 msgstr "网桥端口"
 
-#: ../clients/common/nm-meta-setting-desc.c:7669
+#: ../clients/common/nm-meta-setting-desc.c:7703
 msgid "CDMA mobile broadband connection"
 msgstr "CDMA 移动宽带连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7670
+#: ../clients/common/nm-meta-setting-desc.c:7704
 msgid "General settings"
 msgstr "常规设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7671
+#: ../clients/common/nm-meta-setting-desc.c:7705
 msgid "DCB settings"
 msgstr "DCB 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7672
+#: ../clients/common/nm-meta-setting-desc.c:7706
 msgid "Dummy settings"
 msgstr "虚拟设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7674
+#: ../clients/common/nm-meta-setting-desc.c:7708
 msgid "Generic settings"
 msgstr "通用设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7675
+#: ../clients/common/nm-meta-setting-desc.c:7709
 msgid "GSM mobile broadband connection"
 msgstr "GSM 移动宽带连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7676
+#: ../clients/common/nm-meta-setting-desc.c:7710
 #: ../src/devices/nm-device-infiniband.c:158
 msgid "InfiniBand connection"
 msgstr "InfiniBand 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7677
+#: ../clients/common/nm-meta-setting-desc.c:7711
 msgid "IPv4 protocol"
 msgstr "IPv4 协议"
 
-#: ../clients/common/nm-meta-setting-desc.c:7678
+#: ../clients/common/nm-meta-setting-desc.c:7712
 msgid "IPv6 protocol"
 msgstr "IPv6 协议"
 
-#: ../clients/common/nm-meta-setting-desc.c:7679
+#: ../clients/common/nm-meta-setting-desc.c:7713
 msgid "IP-tunnel settings"
 msgstr "IP 隧道设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7680
+#: ../clients/common/nm-meta-setting-desc.c:7714
 msgid "MACsec connection"
 msgstr "MACsec 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7681
+#: ../clients/common/nm-meta-setting-desc.c:7715
 msgid "macvlan connection"
 msgstr "macvlan 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7683
+#: ../clients/common/nm-meta-setting-desc.c:7717
 msgid "OLPC Mesh connection"
 msgstr "OLPC Mesh 连接"
 
@@ -5301,73 +5303,73 @@
 msgid "OpenVSwitch port settings"
 msgstr ""
 
-#: ../clients/common/nm-meta-setting-desc.c:7689
+#: ../clients/common/nm-meta-setting-desc.c:7723
 msgid "PPP settings"
 msgstr "PPP 设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7690
+#: ../clients/common/nm-meta-setting-desc.c:7724
 msgid "PPPoE"
 msgstr "PPPoE"
 
-#: ../clients/common/nm-meta-setting-desc.c:7691
+#: ../clients/common/nm-meta-setting-desc.c:7725
 msgid "Proxy"
 msgstr "代理"
 
-#: ../clients/common/nm-meta-setting-desc.c:7692
+#: ../clients/common/nm-meta-setting-desc.c:7726
 msgid "Serial settings"
 msgstr "串行设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7694
+#: ../clients/common/nm-meta-setting-desc.c:7728
 msgid "Traffic controls"
 msgstr "流量控制"
 
-#: ../clients/common/nm-meta-setting-desc.c:7695
+#: ../clients/common/nm-meta-setting-desc.c:7729
 msgid "Team device"
 msgstr "组合设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7696
+#: ../clients/common/nm-meta-setting-desc.c:7730
 msgid "Team port"
 msgstr "组合端口"
 
-#: ../clients/common/nm-meta-setting-desc.c:7697
+#: ../clients/common/nm-meta-setting-desc.c:7731
 msgid "Tun device"
 msgstr "Tun 设备"
 
-#: ../clients/common/nm-meta-setting-desc.c:7698
+#: ../clients/common/nm-meta-setting-desc.c:7732
 msgid "User settings"
 msgstr "用户设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:7699
+#: ../clients/common/nm-meta-setting-desc.c:7733
 #: ../src/devices/nm-device-vlan.c:385
 msgid "VLAN connection"
 msgstr "VLAN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7700 ../src/nm-manager.c:5682
+#: ../clients/common/nm-meta-setting-desc.c:7734 ../src/nm-manager.c:5713
 msgid "VPN connection"
 msgstr "VPN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7701
+#: ../clients/common/nm-meta-setting-desc.c:7736
 #: ../src/devices/nm-device-vxlan.c:354
 msgid "VXLAN connection"
 msgstr "VXLAN 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7703
+#: ../clients/common/nm-meta-setting-desc.c:7738
 msgid "WiMAX connection"
 msgstr "WiMAX 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7704
+#: ../clients/common/nm-meta-setting-desc.c:7739
 msgid "Wired Ethernet"
 msgstr "有线以太网"
 
-#: ../clients/common/nm-meta-setting-desc.c:7706
+#: ../clients/common/nm-meta-setting-desc.c:7741
 msgid "Wi-Fi connection"
 msgstr "Wi-Fi 连接"
 
-#: ../clients/common/nm-meta-setting-desc.c:7707
+#: ../clients/common/nm-meta-setting-desc.c:7742
 msgid "Wi-Fi security settings"
 msgstr "Wi-Fi 安全设置"
 
-#: ../clients/common/nm-meta-setting-desc.c:8074
+#: ../clients/common/nm-meta-setting-desc.c:8120
 msgid "name"
 msgstr "名称"
 
@@ -5375,7 +5377,7 @@
 msgid "An authentication session is already underway."
 msgstr "验证会话已在进行。"
 
-#: ../clients/cli/devices.c:4240 ../clients/common/nm-secret-agent-simple.c:273
+#: ../clients/cli/devices.c:4376 ../clients/common/nm-secret-agent-simple.c:273
 #: ../clients/common/nm-secret-agent-simple.c:310
 #: ../clients/common/nm-secret-agent-simple.c:333
 #: ../clients/common/nm-secret-agent-simple.c:366
@@ -5386,8 +5388,8 @@
 #: ../clients/common/nm-vpn-helpers.c:114
 #: ../clients/common/nm-vpn-helpers.c:120
 #: ../clients/common/nm-vpn-helpers.c:125 ../clients/tui/nmt-page-dsl.c:62
-#: ../clients/tui/nmt-page-wifi.c:265 ../clients/tui/nmt-page-wifi.c:297
-#: ../clients/tui/nmt-page-wifi.c:330
+#: ../clients/tui/nmt-page-wifi.c:266 ../clients/tui/nmt-page-wifi.c:298
+#: ../clients/tui/nmt-page-wifi.c:331
 msgid "Password"
 msgstr "密码"
 
@@ -5400,7 +5402,7 @@
 msgstr "私钥密码"
 
 #: ../clients/common/nm-secret-agent-simple.c:323
-#: ../clients/tui/nmt-page-wifi.c:278
+#: ../clients/tui/nmt-page-wifi.c:279
 msgid "Key"
 msgstr "密钥"
 
@@ -5646,7 +5648,7 @@
 "\"assigned-mac-address\" 或已弃用的 \"cloned-mac-address\"。"
 
 #: ../clients/common/settings-docs.h.in:11
-#: ../clients/common/settings-docs.h.in:92
+#: ../clients/common/settings-docs.h.in:94
 msgid ""
 "With \"cloned-mac-address\" setting \"random\" or \"stable\", by default all "
 "bits of the MAC address are scrambled and a locally-administered, unicast "
@@ -5722,7 +5724,7 @@
 "(1)（从不随机化 MAC 地址）或 NM_SETTING_MAC_RANDOMIZATION_ALWAYS (2)（总是随机化 MAC "
 "地址）之一。此属性已为 \"cloned-mac-address\" 所弃用。已弃用：1"
 
-#: ../clients/common/settings-docs.h.in:16
+#: ../clients/common/settings-docs.c.in:16
 msgid ""
 "Wi-Fi network mode; one of \"infrastructure\", \"adhoc\" or \"ap\".  If "
 "blank, infrastructure is assumed."
@@ -5730,7 +5732,7 @@
 "Wi-Fi 网络模式；\"infrastructure\"、\"adhoc\" 或 \"ap\" 之一。如果留空，假定为 infrastructure。"
 
 #: ../clients/common/settings-docs.h.in:17
-#: ../clients/common/settings-docs.h.in:95
+#: ../clients/common/settings-docs.h.in:97
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple Ethernet frames."
@@ -6042,7 +6044,7 @@
 "服务器域名的约束。如果设定，此其 FQDN 用作后缀以匹配验证服务器所提供证书的 dNSName 元素需求。如果找到了匹配的 "
 "dNSName，此约束被满足。如果未提供 dNSName 值，此约束用来匹配使用同个后缀匹配对比的 SubjectName CN。"
 
-#: ../clients/common/settings-docs.h.in:55
+#: ../clients/common/settings-docs.h.in:56
 msgid ""
 "The allowed EAP method to be used when authenticating to the network with "
 "802.1x.  Valid methods are: \"leap\", \"md5\", \"tls\", \"peap\", \"ttls\", "
@@ -6054,17 +6056,17 @@
 "方法。有效方法有：\"leap\"、\"md5\"、\"tls\"、\"peap\"、\"ttls\"、\"pwd\" 和 "
 "\"fast\"。每种方法需要使用此设置属性的不同配置；请参考 wpa_supplicant 文档以获取允许的组合。"
 
-#: ../clients/common/settings-docs.h.in:56
+#: ../clients/common/settings-docs.h.in:57
 msgid ""
 "Identity string for EAP authentication methods.  Often the user's user or "
 "login name."
 msgstr "用于 EAP 验证方法的标识字符串。通常是用户的用户名或登录名。"
 
-#: ../clients/common/settings-docs.h.in:58
+#: ../clients/common/settings-docs.h.in:59
 msgid "UTF-8 encoded file path containing PAC for EAP-FAST."
 msgstr "UTF-8 编码的文件路径，包含用于 EAP-FAST 的 PAC。"
 
-#: ../clients/common/settings-docs.h.in:59
+#: ../clients/common/settings-docs.h.in:60
 msgid ""
 "UTF-8 encoded password used for EAP authentication methods. If both the "
 "\"password\" property and the \"password-raw\" property are specified, "
@@ -6073,15 +6075,15 @@
 "用于 EAP 验证方法的 UTF-8 编码密码。如果 \"password\" 属性和 \"password-raw\" 属性都指定了，首选 "
 "\"password\"。"
 
-#: ../clients/common/settings-docs.h.in:60
-#: ../clients/common/settings-docs.h.in:105
-#: ../clients/common/settings-docs.h.in:132
-#: ../clients/common/settings-docs.h.in:181
-#: ../clients/common/settings-docs.h.in:299
+#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:308
 msgid "Flags indicating how to handle the \"password\" property."
 msgstr "指示如何处理 \"password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:61
+#: ../clients/common/settings-docs.h.in:62
 msgid ""
 "Password used for EAP authentication methods, given as a byte array to allow "
 "passwords in other encodings than UTF-8 to be used. If both the \"password\" "
@@ -6091,11 +6093,11 @@
 "用于 EAP 验证方法的密码，以字节数组给定以允许其他不是 UTF-8 编码的密码能够使用。如果 \"password\" 属性和 \"password-"
 "raw\" 属性都指定了，首选 \"password\"。"
 
-#: ../clients/common/settings-docs.h.in:62
+#: ../clients/common/settings-docs.h.in:63
 msgid "Flags indicating how to handle the \"password-raw\" property."
 msgstr "指示如何处理 \"password-raw\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:63
+#: ../clients/common/settings-docs.h.in:64
 msgid ""
 "Specifies authentication flags to use in \"phase 1\" outer authentication "
 "using NMSetting8021xAuthFlags options. The individual TLS versions can be "
@@ -6108,7 +6110,7 @@
 "版本。如果未设定确切的 TLS 禁用标识，将由请求方决定允许还是禁止它。TLS 选项映射到 tls_disable_tlsv1_x 设置。详情请见 "
 "wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:64
+#: ../clients/common/settings-docs.h.in:65
 msgid ""
 "Enables or disables in-line provisioning of EAP-FAST credentials when FAST "
 "is specified as the EAP method in the \"eap\" property. Recognized values "
@@ -6121,7 +6123,7 @@
 "\"0\"（禁用）、\"1\"（允许未验证的设置）、\"2\"（允许验证的设置）和 \"3\"（验证和未验证的设置都允许）。详情请见 "
 "wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:65
+#: ../clients/common/settings-docs.h.in:66
 msgid ""
 "Forces use of the new PEAP label during key derivation.  Some RADIUS servers "
 "may require forcing the new PEAP label to interoperate with PEAPv1.  Set to "
@@ -6131,7 +6133,7 @@
 "强制在衍生密钥时使用新的 PEAP 标签。有些 RADIUS 服务器可能需要强制使用新的 PEAP 标签以与 PEAPv1 互操作。设为 \"1\" "
 "以强制使用新的 PEAP 标签。详情请见 wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:66
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "Forces which PEAP version is used when PEAP is set as the EAP method in the "
 "\"eap\" property.  When unset, the version reported by the server will be "
@@ -6143,7 +6145,7 @@
 "RADIUS 服务器时，强制客户端使用特定的 PEAP 版本时必须的。要这么做，此属性可以设为 \"0\" 或 \"1\" 以强制所指定的 PEAP "
 "版本。"
 
-#: ../clients/common/settings-docs.h.in:67
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
 "List of strings to be matched against the altSubjectName of the certificate "
 "presented by the authentication server during the inner \"phase 2\" "
@@ -6153,7 +6155,7 @@
 "字符串列表，在 \"phase 2\" 验证期间将与验证服务器所提供证书里的 altSubjectName 匹配。如果列表为空，不执行服务器证书的 "
 "altSubjectName 验证。"
 
-#: ../clients/common/settings-docs.h.in:68
+#: ../clients/common/settings-docs.h.in:67
 msgid ""
 "Specifies the allowed \"phase 2\" inner non-EAP authentication methods when "
 "an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6167,7 +6169,7 @@
 "\"pap\"、\"chap\"、\"mschap\"、\"mschapv2\"、\"gtc\"、\"otp\"、\"md5\" 和 "
 "\"tls\"。要成功验证，每个 \"phase 2\" 内部方法都需要特定的参数；详情请见 wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:69
+#: ../clients/common/settings-docs.h.in:68
 msgid ""
 "Specifies the allowed \"phase 2\" inner EAP-based authentication methods "
 "when an EAP method that uses an inner TLS tunnel is specified in the \"eap\" "
@@ -6180,7 +6182,7 @@
 "EAP 的 \"phase 2\" 方法有 \"md5\", \"mschapv2\", \"otp\", \"gtc\", and "
 "\"tls\"。要成功验证，每个 \"phase 2\" 内部方法都需要特定的参数；详情请见 wpa_supplicant 文档。"
 
-#: ../clients/common/settings-docs.h.in:70
+#: ../clients/common/settings-docs.h.in:71
 msgid ""
 "Contains the \"phase 2\" CA certificate if used by the EAP method specified "
 "in the \"phase2-auth\" or \"phase2-autheap\" properties. Certificate data is "
@@ -6198,7 +6200,7 @@
 "后向兼容）时，此属性应设定为证书的 DER 编码数据。当使用路径方案时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" "
 "为前缀并以终止 NUL 字节结束。此属性可不设定，即使 EAP 方法支持 CA 证书，但这将允许中间人攻击因此不推荐。"
 
-#: ../clients/common/settings-docs.h.in:71
+#: ../clients/common/settings-docs.h.in:72
 msgid ""
 "The password used to access the \"phase2\" CA certificate stored in \"phase2-"
 "ca-cert\" property. Only makes sense if the certificate is stored on a "
@@ -6207,12 +6209,12 @@
 "用于访问 \"phase2-ca-cert\" 属性里存储的 \"phase2\" CA 证书的密码。只在 PKCS#11 "
 "令牌里存储的证书需要登录时有意义。"
 
-#: ../clients/common/settings-docs.h.in:72
+#: ../clients/common/settings-docs.h.in:73
 msgid ""
 "Flags indicating how to handle the \"phase2-ca-cert-password\" property."
 msgstr "指示如何处理 \"phase2-ca-cert-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:73
+#: ../clients/common/settings-docs.h.in:74
 msgid ""
 "UTF-8 encoded path to a directory containing PEM or DER formatted "
 "certificates to be added to the verification chain in addition to the "
@@ -6220,7 +6222,7 @@
 msgstr ""
 "指向包含 PEM 或 DER 格式化证书目录的 UTF-8 编码路径，该证书将同 \"phase2-ca-cert\" 属性里的指定证书一起添加到验证链。"
 
-#: ../clients/common/settings-docs.h.in:74
+#: ../clients/common/settings-docs.h.in:75
 msgid ""
 "Contains the \"phase 2\" client certificate if used by the EAP method "
 "specified in the \"phase2-auth\" or \"phase2-autheap\" properties. "
@@ -6238,7 +6240,7 @@
 "后向兼容）时，此属性应设定为证书的 DER 编码数据。当使用路径方案时，此属性应设定为证书的完整 UTF-8 编码路径，以字符串 \"file://\" "
 "为前缀并以终止 NUL 字节结束。此属性可不设定，即使 EAP 方法支持 CA 证书，但这将允许中间人攻击因此不推荐。"
 
-#: ../clients/common/settings-docs.h.in:75
+#: ../clients/common/settings-docs.h.in:76
 msgid ""
 "The password used to access the \"phase2\" client certificate stored in "
 "\"phase2-client-cert\" property. Only makes sense if the certificate is "
@@ -6247,7 +6249,7 @@
 "用于访问 \"phase2-client-cert\" 属性里存储的 \"phase2\" 客户端证书的密码。只在 PKCS#11 "
 "令牌里存储的证书需要登录时有意义。"
 
-#: ../clients/common/settings-docs.h.in:76
+#: ../clients/common/settings-docs.h.in:77
 msgid ""
 "Flags indicating how to handle the \"phase2-client-cert-password\" property."
 msgstr "指示如何处理 \"phase2-client-cert-password\" 属性的标志。"
@@ -6265,7 +6267,7 @@
 "元素需求。如果找到了匹配的 dNSName，此约束被满足。如果未提供 dNSName 值，此约束用来匹配使用同个后缀匹配对比的 SubjectName "
 "CN。"
 
-#: ../clients/common/settings-docs.h.in:78
+#: ../clients/common/settings-docs.h.in:80
 msgid ""
 "Contains the \"phase 2\" inner private key when the \"phase2-auth\" or "
 "\"phase2-autheap\" property is set to \"tls\". Key data is specified using a "
@@ -6291,7 +6293,7 @@
 "\"file://\" 为前缀并以终止 NUL 字节结束；而与 blob 方案同用时，\"phase2-private-key-password\" "
 "属性必须设为用于解码 PKCS#12 私钥和证书的密码。"
 
-#: ../clients/common/settings-docs.h.in:79
+#: ../clients/common/settings-docs.h.in:81
 msgid ""
 "The password used to decrypt the \"phase 2\" private key specified in the "
 "\"phase2-private-key\" property when the private key either uses the path "
@@ -6299,12 +6301,12 @@
 msgstr ""
 "当私钥使用路径方案或为 PKCS#12 格式时，解密 \"phase2-private-key\" 属性指定的 \"phase 2\" 私钥所使用的密码。"
 
-#: ../clients/common/settings-docs.h.in:80
+#: ../clients/common/settings-docs.h.in:82
 msgid ""
 "Flags indicating how to handle the \"phase2-private-key-password\" property."
 msgstr "指示如何处理 \"phase2-private-key-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:81
+#: ../clients/common/settings-docs.h.in:83
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server during the inner \"phase 2\" authentication. When "
@@ -6316,16 +6318,16 @@
 "验证期间将与验证服务器所提供证书的主题匹配。如果未设，不执行服务器证书的主题验证。就算设定了此属性也提供不了多少安全性，而且它的使用已废弃，取代的是 "
 "NMSetting8021x:phase2-domain-suffix-match。"
 
-#: ../clients/common/settings-docs.h.in:82
+#: ../clients/common/settings-docs.h.in:84
 msgid "PIN used for EAP authentication methods."
 msgstr "用于 EAP 验证方法的 PIN。"
 
-#: ../clients/common/settings-docs.h.in:83
-#: ../clients/common/settings-docs.h.in:183
+#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:191
 msgid "Flags indicating how to handle the \"pin\" property."
 msgstr "指示如何处理 \"pin\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:84
+#: ../clients/common/settings-docs.h.in:86
 msgid ""
 "Contains the private key when the \"eap\" property is set to \"tls\". Key "
 "data is specified using a \"scheme\"; two are currently supported: blob and "
@@ -6355,18 +6357,18 @@
 "PKCS#12 私钥和证书的密码。警告：\"private-key\" 不是 \"secret\" "
 "属性，因此使用比特块方案时未加密的私钥数据可能会被非特权用户读取。私钥总是应该用私钥密码加密以阻止对未加密私钥数据的未授权访问。"
 
-#: ../clients/common/settings-docs.h.in:85
+#: ../clients/common/settings-docs.h.in:87
 msgid ""
 "The password used to decrypt the private key specified in the \"private-"
 "key\" property when the private key either uses the path scheme, or if the "
 "private key is a PKCS#12 format key."
 msgstr "当私钥使用路径方案或为 PKCS#12 格式时，解密 \"private-key\" 属性指定私钥所使用的密码。"
 
-#: ../clients/common/settings-docs.h.in:86
+#: ../clients/common/settings-docs.h.in:88
 msgid "Flags indicating how to handle the \"private-key-password\" property."
 msgstr "指示如何处理 \"private-key-password\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:87
+#: ../clients/common/settings-docs.h.in:89
 msgid ""
 "Substring to be matched against the subject of the certificate presented by "
 "the authentication server. When unset, no verification of the authentication "
@@ -6377,7 +6379,7 @@
 "主题字符串，将与验证服务器所提供证书的主题匹配。如果未设，不执行服务器证书的主题验证。就算设定了此属性也提供不了多少安全性，而且它的使用已废弃，取代的是 "
 "NMSetting8021x:domain-suffix-match。"
 
-#: ../clients/common/settings-docs.h.in:88
+#: ../clients/common/settings-docs.h.in:90
 msgid ""
 "When TRUE, overrides the \"ca-path\" and \"phase2-ca-path\" properties using "
 "the system CA directory specified at configure time with the --system-ca-"
@@ -6402,7 +6404,7 @@
 "如果为 TRUE，强制端口速度和双工模式的自动协商。如果为 FALSE，\"speed\" 和 \"duplex\" "
 "属性都应该被设定或者链接配置将被忽略。"
 
-#: ../clients/common/settings-docs.h.in:90
+#: ../clients/common/settings-docs.h.in:92
 msgid ""
 "If specified, request that the device use this MAC address instead. This is "
 "known as MAC cloning or spoofing. Beside explicitly specifying a MAC "
@@ -6435,14 +6437,14 @@
 "只在 \"auto-negotiate\" 为 \"off\" 时可指定。在该情况下，静态配置设备使用指定的双工模式，\"half\" 或 "
 "\"full\"。如果指定则必须同时设定 \"speed\" 属性。在指定双工模式前请确保您的设备支持它。"
 
-#: ../clients/common/settings-docs.h.in:93
+#: ../clients/common/settings-docs.h.in:95
 msgid ""
 "If specified, this connection will only apply to the Ethernet device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr "如果指定了，此连接将只应用到其永久 MAC 地址匹配的以太网设备。此属性不会改变设备的 MAC 地址（例如 MAC 欺骗）。"
 
-#: ../clients/common/settings-docs.h.in:94
+#: ../clients/common/settings-docs.h.in:96
 msgid ""
 "If specified, this connection will never apply to the Ethernet device whose "
 "permanent MAC address matches an address in the list.  Each MAC address is "
@@ -6451,7 +6453,7 @@
 "如果指定了，此连接将从不应用到其永久 MAC 地址与列表里的地址匹配的以太网设备。每个 MAC "
 "地址采用标准的十六进制数字和冒号标记（00:11:22:33:44:55）。"
 
-#: ../clients/common/settings-docs.h.in:96
+#: ../clients/common/settings-docs.h.in:98
 msgid ""
 "Specific port type to use if the device supports multiple attachment "
 "methods.  One of \"tp\" (Twisted Pair), \"aui\" (Attachment Unit Interface), "
@@ -6461,13 +6463,13 @@
 "如果设备支持多个连接方法，指定其使用的端口类型。\"tp\"（双绞线）、\"aui\"（连接单元接口）、\"bnc\"（细以太网）或 "
 "\"mii\"（介质无关接口）之一。如果设备只支持一个端口类型，忽略此设置。"
 
-#: ../clients/common/settings-docs.h.in:97
+#: ../clients/common/settings-docs.h.in:99
 msgid ""
 "s390 network device type; one of \"qeth\", \"lcs\", or \"ctc\", representing "
 "the different types of virtual network devices available on s390 systems."
 msgstr "s390 网络设备类型；\"qeth\"、\"lcs\" 或 \"ctc\" 之一，代表 s390 系统上可用的不同虚拟网络设备。"
 
-#: ../clients/common/settings-docs.h.in:98
+#: ../clients/common/settings-docs.h.in:100
 msgid ""
 "Dictionary of key/value pairs of s390-specific device options.  Both keys "
 "and values must be strings.  Allowed keys include \"portno\", \"layer2\", "
@@ -6478,7 +6480,7 @@
 "\"portno\"、\"layer2\"、\"portname\"、\"protocol\" 等等。键名必须只能包含字母数字字符（例如 [a-zA-"
 "Z0-9]）。"
 
-#: ../clients/common/settings-docs.h.in:99
+#: ../clients/common/settings-docs.h.in:101
 msgid ""
 "Identifies specific subchannels that this network device uses for "
 "communication with z/VM or s390 host.  Like the \"mac-address\" property for "
@@ -6501,7 +6503,7 @@
 "只在 \"auto-negotiate\" 为 \"off\" 时可以设置为大于零的值。这种情况下，静态配置设备使用该指定的速度。以 Mbit/s "
 "计算，例如 100 == 100Mbit/s。非零时 \"duplex\" 属性必须同时设置。在指定速度值前请确保您的设备支持它。"
 
-#: ../clients/common/settings-docs.h.in:101
+#: ../clients/common/settings-docs.h.in:103
 msgid ""
 "The NMSettingWiredWakeOnLan options to enable. Not all devices support all "
 "options. May be any combination of NM_SETTING_WIRED_WAKE_ON_LAN_PHY (0x2), "
@@ -6524,63 +6526,63 @@
 "NM_SETTING_WIRED_WAKE_ON_LAN_IGNORE (0x8000)（在网络管理器（NetworkManager）里禁用 LAN "
 "唤醒的管理）。"
 
-#: ../clients/common/settings-docs.h.in:102
+#: ../clients/common/settings-docs.h.in:104
 msgid ""
 "If specified, the password used with magic-packet-based Wake-on-LAN, "
 "represented as an Ethernet MAC address.  If NULL, no password will be "
 "required."
 msgstr "如果指定了，其为基于幻数据包的 LAN 唤醒所使用的密码，表示为以太网 MAC 地址。如果为 NULL，将不需要密码。"
 
-#: ../clients/common/settings-docs.h.in:103
+#: ../clients/common/settings-docs.h.in:105
 msgid "Encapsulation of ADSL connection.  Can be \"vcmux\" or \"llc\"."
 msgstr "ADSL 连接的封装。可以是 \"vcmux\" 或 \"llc\"。"
 
-#: ../clients/common/settings-docs.h.in:104
+#: ../clients/common/settings-docs.h.in:106
 msgid "Password used to authenticate with the ADSL service."
 msgstr "用于 ADSL 服务验证的密码。"
 
-#: ../clients/common/settings-docs.h.in:106
+#: ../clients/common/settings-docs.h.in:108
 msgid "ADSL connection protocol.  Can be \"pppoa\", \"pppoe\" or \"ipoatm\"."
 msgstr "ADSL 连接协议。可为 \"pppoa\"、\"pppoe\" 或 \"ipoatm\"。"
 
-#: ../clients/common/settings-docs.h.in:107
+#: ../clients/common/settings-docs.h.in:109
 msgid "Username used to authenticate with the ADSL service."
 msgstr "用于 ADSL 服务验证的用户名。"
 
-#: ../clients/common/settings-docs.h.in:108
+#: ../clients/common/settings-docs.h.in:110
 msgid "VCI of ADSL connection"
 msgstr "ADSL 连接的 VCI"
 
-#: ../clients/common/settings-docs.h.in:109
+#: ../clients/common/settings-docs.h.in:111
 msgid "VPI of ADSL connection"
 msgstr "ADSL 连接的 VPI"
 
-#: ../clients/common/settings-docs.h.in:110
+#: ../clients/common/settings-docs.h.in:112
 msgid "The Bluetooth address of the device."
 msgstr "设备的蓝牙地址。"
 
-#: ../clients/common/settings-docs.h.in:111
+#: ../clients/common/settings-docs.h.in:113
 msgid ""
 "Either \"dun\" for Dial-Up Networking connections or \"panu\" for Personal "
 "Area Networking connections to devices supporting the NAP profile."
 msgstr "拨号网络连接时使用 \"dun\"，或者支持 NAP 配置集设备的个人区域网络连接时使用 \"panu\"。"
 
-#: ../clients/common/settings-docs.h.in:112
+#: ../clients/common/settings-docs.h.in:114
 msgid ""
 "Dictionary of key/value pairs of bonding options.  Both keys and values must "
 "be strings. Option names must contain only alphanumeric characters (ie, [a-"
 "zA-Z0-9])."
 msgstr "绑定（bonding）选项的键/值对目录。键和值都必须为字符串。选项名必须只能包含字母数字字符（示例 [a-zA-Z0-9]）。"
 
-#: ../clients/common/settings-docs.h.in:113
+#: ../clients/common/settings-docs.h.in:115
 msgid "The Ethernet MAC address aging time, in seconds."
 msgstr "以太网 MAC 地址的老化时间，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:114
+#: ../clients/common/settings-docs.h.in:116
 msgid "The Spanning Tree Protocol (STP) forwarding delay, in seconds."
 msgstr "生成树协议（STP）转发延迟，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:115
+#: ../clients/common/settings-docs.h.in:118
 msgid ""
 "A mask of group addresses to forward. Usually, group addresses in the range "
 "from 01:80:C2:00:00:00 to 01:80:C2:00:00:0F are not forwarded according to "
@@ -6591,7 +6593,7 @@
 "要转发的组地址掩码。通常，范围在 01:80:C2:00:00:00 到 01:80:C2:00:00:0F 内的组地址根据标准不转发。此属性是个 16 "
 "位的掩码，每个对应于一个组地址，组地址范围内的地址必须被转发。掩码不能设定了位 0、1 或 2，因为它们用于 STP、MAC 暂停帧和 LACP。"
 
-#: ../clients/common/settings-docs.h.in:116
+#: ../clients/common/settings-docs.h.in:119
 msgid "The Spanning Tree Protocol (STP) hello time, in seconds."
 msgstr "生成树协议（STP）呼叫时间，以秒计。"
 
@@ -6605,76 +6607,76 @@
 "Hence, this property is deprecated."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:118
+#: ../clients/common/settings-docs.h.in:121
 msgid "The Spanning Tree Protocol (STP) maximum message age, in seconds."
 msgstr "生成树协议（STP）最大消息寿命，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:119
+#: ../clients/common/settings-docs.h.in:125
 msgid ""
 "Controls whether IGMP snooping is enabled for this bridge. Note that if "
 "snooping was automatically disabled due to hash collisions, the system may "
 "refuse to enable the feature until the collisions are resolved."
 msgstr "控制是否为此网桥启用 IGMP 监听。注意如果散列冲突监听会被自动禁用，系统可能拒绝启用该功能直到冲突解决。"
 
-#: ../clients/common/settings-docs.h.in:120
+#: ../clients/common/settings-docs.h.in:126
 msgid ""
 "Sets the Spanning Tree Protocol (STP) priority for this bridge.  Lower "
 "values are \"better\"; the lowest priority bridge will be elected the root "
 "bridge."
 msgstr "设定此网桥的生成树协议（STP）优先级。值越小优先级越高；最高优先级（值最低）的网桥将选为根桥。"
 
-#: ../clients/common/settings-docs.h.in:121
+#: ../clients/common/settings-docs.h.in:127
 msgid ""
 "Controls whether Spanning Tree Protocol (STP) is enabled for this bridge."
 msgstr "控制是否为此网桥启用生成树协议（STP）。"
 
-#: ../clients/common/settings-docs.h.in:125
+#: ../clients/common/settings-docs.h.in:133
 msgid ""
 "Enables or disables \"hairpin mode\" for the port, which allows frames to be "
 "sent back out through the port the frame was received on."
 msgstr "启用或禁用端口的 \"hairpin mode\"，其允许从接收帧的端口发回帧。"
 
-#: ../clients/common/settings-docs.h.in:126
+#: ../clients/common/settings-docs.h.in:134
 msgid ""
 "The Spanning Tree Protocol (STP) port cost for destinations via this port."
 msgstr "通过此端口的目标的生成树协议（STP）端口开销。"
 
-#: ../clients/common/settings-docs.h.in:127
+#: ../clients/common/settings-docs.h.in:135
 msgid "The Spanning Tree Protocol (STP) priority of this bridge port."
 msgstr "此网桥端口的生成树协议（STP）优先级。"
 
-#: ../clients/common/settings-docs.h.in:129
-#: ../clients/common/settings-docs.h.in:177
-#: ../clients/common/settings-docs.h.in:188
+#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:196
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple frames."
 msgstr "如果非零，只传输指定大小或更小的数据包，将较大的数据包分成多个帧。"
 
-#: ../clients/common/settings-docs.h.in:130
+#: ../clients/common/settings-docs.h.in:138
 msgid ""
 "The number to dial to establish the connection to the CDMA-based mobile "
 "broadband network, if any.  If not specified, the default number (#777) is "
 "used when required."
 msgstr "建立基于 CDMA 移动宽带网络连接的拨号号码，如果有的话。如未指定，需要时默认使用号码（#777）。"
 
-#: ../clients/common/settings-docs.h.in:131
-#: ../clients/common/settings-docs.h.in:180
+#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:188
 msgid ""
 "The password used to authenticate with the network, if required.  Many "
 "providers do not require a password, or accept any password.  But if a "
 "password is required, it is specified here."
 msgstr "用于与网络验证的密码，如果需要。很多运营商不需要密码，或是接受任何密码。但是如果需要密码，可在这里指定。"
 
-#: ../clients/common/settings-docs.h.in:133
-#: ../clients/common/settings-docs.h.in:186
+#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:194
 msgid ""
 "The username used to authenticate with the network, if required.  Many "
 "providers do not require a username, or accept any username.  But if a "
 "username is required, it is specified here."
 msgstr "用于与网络验证的用户名，如果需要。很多运营商不需要用户名，或是接受任何用户名。但是如果需要用户名，可在这里指定。"
 
-#: ../clients/common/settings-docs.h.in:134
+#: ../clients/common/settings-docs.h.in:142
 msgid ""
 "The number of retries for the authentication. Zero means to try "
 "indefinitely; -1 means to use a global default. If the global default is not "
@@ -6691,14 +6693,14 @@
 "to activate the connection."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:136
+#: ../clients/common/settings-docs.h.in:144
 msgid ""
 "The autoconnect priority. If the connection is set to autoconnect, "
 "connections with higher priority will be preferred. Defaults to 0. The "
 "higher number means higher priority."
 msgstr "自动连接优先级。如果连接设为自动连接时，首选高优先级的连接。默认为 0。数值越高优先级越高。"
 
-#: ../clients/common/settings-docs.h.in:137
+#: ../clients/common/settings-docs.h.in:145
 msgid ""
 "The number of times a connection should be tried when autoactivating before "
 "giving up. Zero means forever, -1 means the global default (4 times if not "
@@ -6720,19 +6722,19 @@
 "to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:139
+#: ../clients/common/settings-docs.h.in:147
 msgid ""
 "If greater than zero, delay success of IP addressing until either the "
 "timeout is reached, or an IP gateway replies to a ping."
 msgstr "如果大于零，推迟 IP 寻址的成功，直到到达超时时间或 IP 网关应答了 ping。"
 
-#: ../clients/common/settings-docs.h.in:140
+#: ../clients/common/settings-docs.h.in:148
 msgid ""
 "A human readable unique identifier for the connection, like \"Work Wi-Fi\" "
 "or \"T-Mobile 3G\"."
 msgstr "用户可读的连接的唯一标识符，如 \"工作 Wi-Fi\" 或 \"运营商 4G\"。"
 
-#: ../clients/common/settings-docs.h.in:141
+#: ../clients/common/settings-docs.h.in:149
 msgid ""
 "The name of the network interface this connection is bound to. If not set, "
 "then the connection can be attached to any interface of the appropriate type "
@@ -6748,11 +6750,11 @@
 "固定的连接类型（例如 移动宽带或 USB "
 "以太网），不应使用此属性。设置此属性会限制连接可以使用的接口，而且当接口名改变或重新排序了，连接可能会应用到错误的接口。"
 
-#: ../clients/common/settings-docs.h.in:142
+#: ../clients/common/settings-docs.h.in:150
 msgid "Whether LLDP is enabled for the connection."
 msgstr "是否为连接启用 LLDP。"
 
-#: ../clients/common/settings-docs.h.in:144
+#: ../clients/common/settings-docs.h.in:152
 msgid "Interface name of the master device or UUID of the master connection."
 msgstr "主设备的接口名或 UUID 或主连接。"
 
@@ -6766,13 +6768,13 @@
 "supports mDNS. One such plugin is dns-systemd-resolved."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:146
+#: ../clients/common/settings-docs.h.in:154
 msgid ""
 "Whether the connection is metered. When updating this property on a "
 "currently activated connection, the change takes effect immediately."
 msgstr "连接是否按流量计费。当在当前激活的连接上更新此属性时，更改立即生效。"
 
-#: ../clients/common/settings-docs.h.in:148
+#: ../clients/common/settings-docs.h.in:156
 msgid ""
 "An array of strings defining what access a given user has to this "
 "connection.  If this is NULL or empty, all users are allowed to access this "
@@ -6792,20 +6794,20 @@
 "[类型]。其他任何值被忽略并保留为将来使用。[ID] 是此权限引用的用户名，不能包含冒号 \":\" 字符。存在的任何 [已保留] "
 "信息都必须被忽略并保留为将来使用。所有的 [类型]、[ID] 和 [已保留] 都必须为有效的 UTF-8。"
 
-#: ../clients/common/settings-docs.h.in:149
+#: ../clients/common/settings-docs.h.in:157
 msgid ""
 "FALSE if the connection can be modified using the provided settings "
 "service's D-Bus interface with the right privileges, or TRUE if the "
 "connection is read-only and cannot be modified."
 msgstr "如果连接可以用提供设置服务的 D-Bus 接口以正确的权限来修改，为 FALSE；如果连接为只读且无法修改，为 TRUE。"
 
-#: ../clients/common/settings-docs.h.in:150
+#: ../clients/common/settings-docs.h.in:158
 msgid ""
 "List of connection UUIDs that should be activated when the base connection "
 "itself is activated. Currently only VPN connections are supported."
 msgstr "当基础连接本身激活时应一块激活的连接 UUID 列表。当前只支持 VPN 连接。"
 
-#: ../clients/common/settings-docs.h.in:151
+#: ../clients/common/settings-docs.h.in:159
 msgid ""
 "Setting name of the device type of this slave's master connection (eg, "
 "\"bond\"), or NULL if this connection is not a slave."
@@ -6834,7 +6836,7 @@
 "identical before performing dynamic substitutions."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:153
+#: ../clients/common/settings-docs.h.in:161
 msgid ""
 "The time, in seconds since the Unix Epoch, that the connection was last "
 "_successfully_ fully activated. NetworkManager updates the connection "
@@ -6845,7 +6847,7 @@
 "连接上次完全激活的时间，以秒计算和 Unix "
 "时间表示。当连接激活时网络管理器（NetworkManager）会定期更新连接的时间戳以确保活动连接有最新的时间戳。该用来读取（此属性的更改不被保留）。"
 
-#: ../clients/common/settings-docs.h.in:154
+#: ../clients/common/settings-docs.h.in:162
 msgid ""
 "Base type of the connection. For hardware-dependent connections, should "
 "contain the setting name of the hardware-type specific setting (ie, \"802-3-"
@@ -6857,7 +6859,7 @@
 "wireless\" 或 \"bluetooth\"，等等），而对于非硬件相关的连接如 VPN 或其他的，应包含该设置类型的设置名称（例如 "
 "\"vpn\" 或 \"bridge\"，等等）。"
 
-#: ../clients/common/settings-docs.h.in:155
+#: ../clients/common/settings-docs.h.in:163
 msgid ""
 "A universally unique identifier for the connection, for example generated "
 "with libuuid.  It should be assigned when the connection is created, and "
@@ -6873,7 +6875,7 @@
 "属性改变时它可能需要重新创建。UUIS 必须为如 \"2815492f-7e56-435e-b2e9-246bd7cdc664\" "
 "的格式（示例，只包含十六进制和 \"-\"）。"
 
-#: ../clients/common/settings-docs.h.in:157
+#: ../clients/common/settings-docs.h.in:165
 msgid ""
 "The trust level of a the connection.  Free form case-insensitive string (for "
 "example \"Home\", \"Work\", \"Public\").  NULL or unspecified zone means the "
@@ -6884,7 +6886,7 @@
 "连接的信任级别。格式自由、不区分大小写的字符串（例如 \"Home\"、\"工作\"、\"公共\"）。NULL "
 "或为指定区域表示连接将放置到防火墙定义的默认区域。当在当前激活的连接上更新此属性时，更改立即生效。"
 
-#: ../clients/common/settings-docs.h.in:158
+#: ../clients/common/settings-docs.h.in:166
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FCoE application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -6894,11 +6896,11 @@
 "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
 "(0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:159
+#: ../clients/common/settings-docs.h.in:167
 msgid "The FCoE controller mode; either \"fabric\" (default) or \"vn2vn\"."
 msgstr "FCoE 控制器模式；为 \"fabric\"（默认）或 \"vn2vn\"。"
 
-#: ../clients/common/settings-docs.h.in:160
+#: ../clients/common/settings-docs.h.in:168
 msgid ""
 "The highest User Priority (0 - 7) which FCoE frames should use, or -1 for "
 "default priority.  Only used when the \"app-fcoe-flags\" property includes "
@@ -6907,7 +6909,7 @@
 "FCoE 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fcoe-flags\" 属性包含 "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:161
+#: ../clients/common/settings-docs.h.in:169
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB FIP application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -6917,7 +6919,7 @@
 "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
 "(0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:162
+#: ../clients/common/settings-docs.h.in:170
 msgid ""
 "The highest User Priority (0 - 7) which FIP frames should use, or -1 for "
 "default priority.  Only used when the \"app-fip-flags\" property includes "
@@ -6926,7 +6928,7 @@
 "FIP 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-fip-flags\" 属性包含 "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:163
+#: ../clients/common/settings-docs.h.in:171
 msgid ""
 "Specifies the NMSettingDcbFlags for the DCB iSCSI application.  Flags may be "
 "any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -6936,7 +6938,7 @@
 "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
 "(0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:164
+#: ../clients/common/settings-docs.h.in:172
 msgid ""
 "The highest User Priority (0 - 7) which iSCSI frames should use, or -1 for "
 "default priority. Only used when the \"app-iscsi-flags\" property includes "
@@ -6945,7 +6947,7 @@
 "iSCSI 帧应使用的最高用户优先级（0～7），或 -1 代表默认优先级。只当 \"app-iscsi-flags\" 属性包含 "
 "NM_SETTING_DCB_FLAG_ENABLE (0x1) 标志时使用。"
 
-#: ../clients/common/settings-docs.h.in:165
+#: ../clients/common/settings-docs.h.in:173
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the percentage of bandwidth of the "
@@ -6957,14 +6959,14 @@
 "个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级可使用的优先级指定组的带宽百分比。属于同个组的所有优先级百分比总和必须为 1"
 "00%。"
 
-#: ../clients/common/settings-docs.h.in:166
+#: ../clients/common/settings-docs.h.in:174
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the corresponding "
 "priority should transmit priority pause."
 msgstr "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示对应优先级是否应该传输优先级暂停。"
 
-#: ../clients/common/settings-docs.h.in:167
+#: ../clients/common/settings-docs.h.in:175
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Flow Control (PFC). Flags "
 "may be any combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -6974,7 +6976,7 @@
 "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
 "(0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:168
+#: ../clients/common/settings-docs.h.in:176
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the Priority "
 "Group ID (0 - 7) and the value indicates the percentage of link bandwidth "
@@ -6984,7 +6986,7 @@
 "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示分配到该组的链路带宽百分比。允许的值为 0～100，且所有值的总和必须为 "
 "100%。"
 
-#: ../clients/common/settings-docs.h.in:169
+#: ../clients/common/settings-docs.h.in:177
 msgid ""
 "Specifies the NMSettingDcbFlags for DCB Priority Groups.  Flags may be any "
 "combination of NM_SETTING_DCB_FLAG_ENABLE (0x1), "
@@ -6994,7 +6996,7 @@
 "(0x1)、NM_SETTING_DCB_FLAG_ADVERTISE (0x2) 和 NM_SETTING_DCB_FLAG_WILLING "
 "(0x4) 的任意组合。"
 
-#: ../clients/common/settings-docs.h.in:170
+#: ../clients/common/settings-docs.h.in:178
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the Priority Group ID.  Allowed "
@@ -7002,21 +7004,21 @@
 msgstr ""
 "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级组 ID。允许的优先级组 ID 值为 0～7，或 15 表示无限制组。"
 
-#: ../clients/common/settings-docs.h.in:171
+#: ../clients/common/settings-docs.h.in:179
 msgid ""
 "An array of 8 boolean values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates whether or not the priority may use "
 "all of the bandwidth allocated to its assigned group."
 msgstr "8 个布尔值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示优先级是否可以使用分配到它指定组的全部带宽。"
 
-#: ../clients/common/settings-docs.h.in:172
+#: ../clients/common/settings-docs.h.in:180
 msgid ""
 "An array of 8 uint values, where the array index corresponds to the User "
 "Priority (0 - 7) and the value indicates the traffic class (0 - 7) to which "
 "the priority is mapped."
 msgstr "8 个无符号整数值组成的数组，其数组索引对应于用户优先级（0～7）而其值指示该优先级映射的流量等级（0～7）。"
 
-#: ../clients/common/settings-docs.h.in:173
+#: ../clients/common/settings-docs.h.in:181
 msgid ""
 "The GPRS Access Point Name specifying the APN used when establishing a data "
 "session with the GSM-based network.  The APN often determines how the user "
@@ -7030,20 +7032,20 @@
 "通常确定了用户如何为他们的网络使用付费，和用户能否访问互联网或只是运营商特定的封闭平台，因此为用户的移动带宽套餐使用正确的 APN 很重要。根据 GSM "
 "03.60 章节 14.9，APN 只能由字符 a～z、0～9、. 和 - 组成。"
 
-#: ../clients/common/settings-docs.h.in:175
+#: ../clients/common/settings-docs.h.in:183
 msgid ""
 "The device unique identifier (as given by the WWAN management service) which "
 "this connection applies to.  If given, the connection will only apply to the "
 "specified device."
 msgstr "此连接要应用的设备唯一标识符（由 WWAN 管理服务给定）。如果给定了，连接将只应用到指定的设备。"
 
-#: ../clients/common/settings-docs.h.in:176
+#: ../clients/common/settings-docs.h.in:184
 msgid ""
 "When TRUE, only connections to the home network will be allowed. Connections "
 "to roaming networks will not be made."
 msgstr "为 TRUE 时，将只允许连接到本地网络，不会连接到漫游网络。"
 
-#: ../clients/common/settings-docs.h.in:178
+#: ../clients/common/settings-docs.h.in:186
 msgid ""
 "The Network ID (GSM LAI format, ie MCC-MNC) to force specific network "
 "registration.  If the Network ID is specified, NetworkManager will attempt "
@@ -7064,14 +7066,14 @@
 "当与基于 GSM 移动宽带网络建立 PPP 数据会话时要拨打的号码。很多调制解调器不需要 PPP "
 "来连接到移动网络，这种情况下该属性应留空，以允许网络管理器（NetworkManager）自动选择合适的设置。"
 
-#: ../clients/common/settings-docs.h.in:182
+#: ../clients/common/settings-docs.h.in:190
 msgid ""
 "If the SIM is locked with a PIN it must be unlocked before any other "
 "operations are requested.  Specify the PIN here to allow operation of the "
 "device."
 msgstr "如果 SIM 被 PIN 锁住了，在请求任何其他操作前必须解锁。在这里指定 PIN 以允许设备的操作。"
 
-#: ../clients/common/settings-docs.h.in:184
+#: ../clients/common/settings-docs.h.in:192
 msgid ""
 "The SIM card unique identifier (as given by the WWAN management service) "
 "which this connection applies to.  If given, the connection will apply to "
@@ -7081,7 +7083,7 @@
 "此连接应用的 SIM 卡的唯一标识符（由 WWAN 管理服务给定）。如果给定了，此连接将应用到包含匹配给定标识符 SIM 卡的 \"device-"
 "id\" 所允许的任何设备。"
 
-#: ../clients/common/settings-docs.h.in:185
+#: ../clients/common/settings-docs.h.in:193
 msgid ""
 "A MCC/MNC string like \"310260\" or \"21601\" identifying the specific "
 "mobile network operator which this connection applies to.  If given, the "
@@ -7092,14 +7094,14 @@
 "字符串，用来鉴定此连接应用到的指定移动网络运营商。如果给定了，连接将应用到包含给定运营商提供 SIM 卡的 \"device-id\" 和 \"sim-"
 "id\" 所允许的任何设备。"
 
-#: ../clients/common/settings-docs.h.in:187
+#: ../clients/common/settings-docs.h.in:195
 msgid ""
 "If specified, this connection will only apply to the IPoIB device whose "
 "permanent MAC address matches. This property does not change the MAC address "
 "of the device (i.e. MAC spoofing)."
 msgstr "如指定了，此连接将只应用到符合永久 MAC 地址的 IPoIB 设备。此属性不会改变设备的 MAC 地址（例如 MAC 欺骗）。"
 
-#: ../clients/common/settings-docs.h.in:189
+#: ../clients/common/settings-docs.h.in:197
 msgid ""
 "The InfiniBand P_Key to use for this device. A value of -1 means to use the "
 "default P_Key (aka \"the P_Key at index 0\").  Otherwise it is a 16-bit "
@@ -7108,7 +7110,7 @@
 "用于此设备的 InfiniBand P_Key。值 -1 代表使用默认的 P_Key（又名 \"索引 0 的 P_Key\"）。否则它是个 16 "
 "位无符号整数，其高位已设定如果它是个 \"正式会员\" P_Key。"
 
-#: ../clients/common/settings-docs.h.in:190
+#: ../clients/common/settings-docs.h.in:198
 msgid ""
 "The interface name of the parent device of this device. Normally NULL, but "
 "if the \"p_key\" property is set, then you must specify the base device by "
@@ -7116,84 +7118,84 @@
 msgstr ""
 "此设备的上级设备的接口名称。一般是 NULL，但如果 \"p_key\" 已设定，您必须通过设置此属性或 \"mac-address\" 来指定基础设备。"
 
-#: ../clients/common/settings-docs.h.in:191
+#: ../clients/common/settings-docs.h.in:199
 msgid ""
 "The IP-over-InfiniBand transport mode. Either \"datagram\" or \"connected\"."
 msgstr "IP-over-InfiniBand 传输模式。要么为 \"datagram\" 要么为 \"connected\"。"
 
-#: ../clients/common/settings-docs.h.in:192
+#: ../clients/common/settings-docs.h.in:200
 msgid ""
 "How many additional levels of encapsulation are permitted to be prepended to "
 "packets. This property applies only to IPv6 tunnels."
 msgstr "允许多少个附加的封装等级预置到数据包。此属性值只应用到 IPv6 隧道。"
 
-#: ../clients/common/settings-docs.h.in:194
+#: ../clients/common/settings-docs.h.in:202
 msgid ""
 "The flow label to assign to tunnel packets. This property applies only to "
 "IPv6 tunnels."
 msgstr "要分配到隧道数据包的流量标签。此属性只应用到 IPv6 隧道。"
 
-#: ../clients/common/settings-docs.h.in:195
+#: ../clients/common/settings-docs.h.in:203
 msgid ""
 "The key used for tunnel input packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr "用于隧道输入数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空则不使用密钥。"
 
-#: ../clients/common/settings-docs.h.in:196
+#: ../clients/common/settings-docs.h.in:204
 msgid ""
 "The local endpoint of the tunnel; the value can be empty, otherwise it must "
 "contain an IPv4 or IPv6 address."
 msgstr "隧道的本地端点。值可以为空，否则它必须包含一个 IPv4 或 IPv6 地址。"
 
-#: ../clients/common/settings-docs.h.in:197
+#: ../clients/common/settings-docs.h.in:205
 msgid ""
 "The tunneling mode, for example NM_IP_TUNNEL_MODE_IPIP (1) or "
 "NM_IP_TUNNEL_MODE_GRE (2)."
 msgstr "隧道模式，例如 NM_IP_TUNNEL_MODE_IPIP (1) 或 NM_IP_TUNNEL_MODE_GRE (2)。"
 
-#: ../clients/common/settings-docs.h.in:198
+#: ../clients/common/settings-docs.h.in:206
 msgid ""
 "If non-zero, only transmit packets of the specified size or smaller, "
 "breaking larger packets up into multiple fragments."
 msgstr "如果非零，只传输指定大小或更小的数据包，将较大的数据包分成多个帧。"
 
-#: ../clients/common/settings-docs.h.in:199
+#: ../clients/common/settings-docs.h.in:207
 msgid ""
 "The key used for tunnel output packets; the property is valid only for "
 "certain tunnel modes (GRE, IP6GRE). If empty, no key is used."
 msgstr "用于隧道输出数据包的密钥。该属性值对某些隧道模式有效（GRE、IP6GRE）。如果留空则不使用密钥。"
 
-#: ../clients/common/settings-docs.h.in:200
+#: ../clients/common/settings-docs.h.in:208
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID the "
 "new device will be bound to so that tunneled packets will only be routed via "
 "that interface."
 msgstr "如果给定了，指定新设备将绑定到的上级接口名或上级连接 UUID，以让隧道的数据包只能通过该接口进行路由。"
 
-#: ../clients/common/settings-docs.h.in:201
+#: ../clients/common/settings-docs.h.in:209
 msgid "Whether to enable Path MTU Discovery on this tunnel."
 msgstr "是否在此隧道启用路径 MTU 发现。"
 
-#: ../clients/common/settings-docs.h.in:202
+#: ../clients/common/settings-docs.h.in:210
 msgid ""
 "The remote endpoint of the tunnel; the value must contain an IPv4 or IPv6 "
 "address."
 msgstr "隧道的远程端点；值必须包含一个 IPv4 或 IPv6 地址。"
 
-#: ../clients/common/settings-docs.h.in:203
+#: ../clients/common/settings-docs.h.in:211
 msgid ""
 "The type of service (IPv4) or traffic class (IPv6) field to be set on "
 "tunneled packets."
 msgstr "设定在隧道数据包上的服务类型（IPv4）或流量等级（IPv6）字段。"
 
-#: ../clients/common/settings-docs.h.in:204
+#: ../clients/common/settings-docs.h.in:212
 msgid ""
 "The TTL to assign to tunneled packets. 0 is a special value meaning that "
 "packets inherit the TTL value."
 msgstr "分配到隧道数据包的 TTL。0 为特殊值，表示数据包继承 TTL 值。"
 
-#: ../clients/common/settings-docs.h.in:205
-#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:213
+#: ../clients/common/settings-docs.h.in:236
 msgid "Array of IP addresses."
 msgstr "IP 地址数组。"
 
@@ -7220,7 +7222,7 @@
 "non-hardware-address client ID and the 'type' field is set to 0."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:208
+#: ../clients/common/settings-docs.h.in:216
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified FQDN will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -7229,8 +7231,8 @@
 "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的 FQDN 将被发送到 DHCP 服务器。此属性与 \"dhcp-"
 "hostname\" 相互排斥而且无法被同时设定。"
 
-#: ../clients/common/settings-docs.h.in:209
-#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:217
+#: ../clients/common/settings-docs.h.in:239
 msgid ""
 "If the \"dhcp-send-hostname\" property is TRUE, then the specified name will "
 "be sent to the DHCP server when acquiring a lease. This property and \"dhcp-"
@@ -7239,8 +7241,8 @@
 "如果 \"dhcp-send-hostname\" 属性为 TRUE，当获取租约时指定的名称将被发送到 DHCP 服务器。此属性与 \"dhcp-"
 "fqdn\" 相互排斥而且无法被同时设定。"
 
-#: ../clients/common/settings-docs.h.in:212
-#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:220
+#: ../clients/common/settings-docs.h.in:242
 msgid ""
 "If TRUE, a hostname is sent to the DHCP server when acquiring a lease. Some "
 "DHCP servers use this hostname to update DNS databases, essentially "
@@ -7251,13 +7253,13 @@
 "如果为 TRUE，当获取租约时发送主机名到 DHCP 服务器。有些 DHCP 服务器使用这个主机名来更新 DNS "
 "数据库，实质上为计算机提供了个静态的主机名。如果 \"dhcp-hostname\" 属性为 NULL 且此属性为 TRUE，以计算机的当前永久主机。"
 
-#: ../clients/common/settings-docs.h.in:213
-#: ../clients/common/settings-docs.h.in:235
+#: ../clients/common/settings-docs.h.in:209
+#: ../clients/common/settings-docs.h.in:229
 msgid "A timeout for a DHCP transaction in seconds."
 msgstr "DHCP 事务的超时时间，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:214
-#: ../clients/common/settings-docs.h.in:236
+#: ../clients/common/settings-docs.h.in:222
+#: ../clients/common/settings-docs.h.in:244
 msgid "Array of IP addresses of DNS servers."
 msgstr "DNS 服务器的 IP 地址数组。"
 
@@ -7297,8 +7299,8 @@
 "negative DNS priority value, the subdomain is ignored."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:217
-#: ../clients/common/settings-docs.h.in:239
+#: ../clients/common/settings-docs.h.in:225
+#: ../clients/common/settings-docs.h.in:247
 msgid ""
 "Array of DNS search domains. Domains starting with a tilde ('~') are "
 "considered 'routing' domains and are used only to decide the interface over "
@@ -7314,8 +7316,8 @@
 "\"addresses\" is also set."
 msgstr "与此配置关联的网关。这只在 \"addresses\" 也设定的时候有意义。"
 
-#: ../clients/common/settings-docs.h.in:219
-#: ../clients/common/settings-docs.h.in:241
+#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:249
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured nameservers and search domains are ignored and only nameservers "
@@ -7325,8 +7327,8 @@
 "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动配置的名称服务器和搜索域被忽略且只有 \"dns\" 和 \"dns-"
 "search\" 属性中指定的名称服务器和搜索域被使用，如果有的话。"
 
-#: ../clients/common/settings-docs.h.in:220
-#: ../clients/common/settings-docs.h.in:242
+#: ../clients/common/settings-docs.h.in:228
+#: ../clients/common/settings-docs.h.in:250
 msgid ""
 "When \"method\" is set to \"auto\" and this property to TRUE, automatically "
 "configured routes are ignored and only routes specified in the \"routes\" "
@@ -7335,8 +7337,8 @@
 "当 \"method\" 设为 \"auto\" 且此属性为 TRUE 时，自动配置的路由被忽略且只有 \"routes\" "
 "属性中指定的路由被使用，如果有的话。"
 
-#: ../clients/common/settings-docs.h.in:221
-#: ../clients/common/settings-docs.h.in:244
+#: ../clients/common/settings-docs.h.in:229
+#: ../clients/common/settings-docs.h.in:252
 msgid ""
 "If TRUE, allow overall network configuration to proceed even if the "
 "configuration specified by this property times out.  Note that at least one "
@@ -7363,15 +7365,15 @@
 "10.42.x.0/24 is chosen."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:223
-#: ../clients/common/settings-docs.h.in:246
+#: ../clients/common/settings-docs.h.in:231
+#: ../clients/common/settings-docs.h.in:254
 msgid ""
 "If TRUE, this connection will never be the default connection for this IP "
 "type, meaning it will never be assigned the default route by NetworkManager."
 msgstr "如果为 TRUE，此连接将永不成为此 IP 类型的默认连接，这表示网络管理器（NetworkManager）永远不会为其分配默认路由。"
 
-#: ../clients/common/settings-docs.h.in:224
-#: ../clients/common/settings-docs.h.in:247
+#: ../clients/common/settings-docs.h.in:232
+#: ../clients/common/settings-docs.h.in:256
 msgid ""
 "The default metric for routes that don't explicitly specify a metric. The "
 "default value -1 means that the metric is chosen automatically based on the "
@@ -7385,8 +7387,8 @@
 "表示根据设备类型自动选择跃点。该跃点应用到自动路由、没有明确跃点设置的手动（静态）路由、地址前缀路由和默认路由。注意对于 "
 "IPv6，内核接受零值（0）但会将其转为 1024（用户默认）。因此，设置此属性为零等于设置它为 1024。对于 IPv4，零是跃点的常规值。"
 
-#: ../clients/common/settings-docs.h.in:225
-#: ../clients/common/settings-docs.h.in:248
+#: ../clients/common/settings-docs.h.in:233
+#: ../clients/common/settings-docs.h.in:257
 msgid ""
 "Enable policy routing (source routing) and set the routing table used when "
 "adding routes. This affects all routes, including device-routes, IPv4LL, "
@@ -7407,12 +7409,12 @@
 "由。禁用策略路由意味着网络管理器（NetworkManager）将添加所有路由到主表（除了明确配置了不同路由表的静态路由）。另外，网络管理器将不会从表中删"
 "除任何外部路由，除了主路由。这是为了给用网络管理器之外工具管理路由表的用户保持后向兼容性。"
 
-#: ../clients/common/settings-docs.h.in:226
-#: ../clients/common/settings-docs.h.in:249
+#: ../clients/common/settings-docs.h.in:234
+#: ../clients/common/settings-docs.h.in:258
 msgid "Array of IP routes."
 msgstr "IP 路由数组。"
 
-#: ../clients/common/settings-docs.h.in:227
+#: ../clients/common/settings-docs.h.in:235
 msgid ""
 "Configure method for creating the address for use with RFC4862 IPv6 "
 "Stateless Address Autoconfiguration. The permitted values are: "
@@ -7442,7 +7444,7 @@
 "设置等于启用 stable-privacy。对于密钥文件，磁盘上没有设置则表示 EUI6，因此属性在从旧版本升级时不会改变。注意此设置与由 \"ip6-"
 "privacy\" 配置的隐私扩展不同，而且它不会影响此选项配置的临时地址。"
 
-#: ../clients/common/settings-docs.h.in:243
+#: ../clients/common/settings-docs.h.in:251
 msgid ""
 "Configure IPv6 Privacy Extensions for SLAAC, described in RFC4941.  If "
 "enabled, it makes the kernel generate a temporary IPv6 address in addition "
@@ -7465,7 +7467,7 @@
 "\"/proc/sys/net/ipv6/conf/default/use_tempaddr\" 的值。注意此设置与固定隐私地址不同，后者可通过 "
 "\"addr-gen-mode\" 属性的 \"stable-privacy\" 设置启用，可作为避免 IPv6 地址追踪的另一种方法。"
 
-#: ../clients/common/settings-docs.h.in:250
+#: ../clients/common/settings-docs.h.in:259
 msgid ""
 "Configure the token for draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 "
 "tokenized interface identifiers. Useful with eui64 addr-gen-mode."
@@ -7473,32 +7475,32 @@
 "配置用于 draft-chown-6man-tokenised-ipv6-identifiers-02 IPv6 令牌化接口标识符的令牌。对 eui64 "
 "addr-gen-mode 有用。"
 
-#: ../clients/common/settings-docs.h.in:251
+#: ../clients/common/settings-docs.h.in:260
 msgid "Whether the transmitted traffic must be encrypted."
 msgstr "是否加密传输的流量。"
 
-#: ../clients/common/settings-docs.h.in:252
+#: ../clients/common/settings-docs.h.in:261
 msgid ""
 "The pre-shared CAK (Connectivity Association Key) for MACsec Key Agreement."
 msgstr "用于 MACsec 密钥协商的预共享 CAK。"
 
-#: ../clients/common/settings-docs.h.in:253
+#: ../clients/common/settings-docs.h.in:262
 msgid "Flags indicating how to handle the \"mka-cak\" property."
 msgstr "指示如何处理 \"mka-cak\" 属性的标志。"
 
-#: ../clients/common/settings-docs.h.in:254
+#: ../clients/common/settings-docs.h.in:263
 msgid ""
 "The pre-shared CKN (Connectivity-association Key Name) for MACsec Key "
 "Agreement."
 msgstr "用于 MACsec 密钥协商的预共享 CKN（连接关联密钥名称）。"
 
-#: ../clients/common/settings-docs.h.in:255
+#: ../clients/common/settings-docs.h.in:264
 msgid ""
 "Specifies how the CAK (Connectivity Association Key) for MKA (MACsec Key "
 "Agreement) is obtained."
 msgstr "指定如何获取用于 MKA（MACsec 密钥协商）的 CAK（连接关联密钥）。"
 
-#: ../clients/common/settings-docs.h.in:256
+#: ../clients/common/settings-docs.h.in:265
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MACSEC interface should be created.  If this property is not "
@@ -7508,23 +7510,23 @@
 "如果给定了，其指定从此 MACSEC 接口应该创建自的上级接口名称或上级连接的 UUID。如果此属性未指定，该连接必须包含具有 \"mac-"
 "address\" 属性的 \"802-3-ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:257
+#: ../clients/common/settings-docs.h.in:266
 msgid ""
 "The port component of the SCI (Secure Channel Identifier), between 1 and "
 "65534."
 msgstr "SCI（安全信道标识符）的端口组件，介于 1 和 65534 之间。"
 
-#: ../clients/common/settings-docs.h.in:259
+#: ../clients/common/settings-docs.h.in:268
 msgid "Specifies the validation mode for incoming frames."
 msgstr "指定传入帧的验证模式。"
 
-#: ../clients/common/settings-docs.h.in:260
+#: ../clients/common/settings-docs.h.in:269
 msgid ""
 "The macvlan mode, which specifies the communication mechanism between "
 "multiple macvlans on the same lower device."
 msgstr "macvlan 模式，它指定了同一低层设备上的多个 macvlans 之间的通信机制。"
 
-#: ../clients/common/settings-docs.h.in:261
+#: ../clients/common/settings-docs.h.in:270
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this MAC-VLAN interface should be created.  If this property is not "
@@ -7534,31 +7536,31 @@
 "如果给定了，其指定从此 MAC-VLAN 接口应该创建自的上级接口名称或上级连接的 UUID。如果此属性未指定，该连接必须包含具有 \"mac-"
 "address\" 属性的 \"802-3-ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:262
+#: ../clients/common/settings-docs.h.in:271
 msgid "Whether the interface should be put in promiscuous mode."
 msgstr "是否应将接口置于混杂模式。"
 
-#: ../clients/common/settings-docs.h.in:263
+#: ../clients/common/settings-docs.h.in:272
 msgid "Whether the interface should be a MACVTAP."
 msgstr "接口是否应为 MACVTAP。"
 
-#: ../clients/common/settings-docs.h.in:266
+#: ../clients/common/settings-docs.h.in:275
 msgid "The bridge failure mode. One of \"secure\", \"standalone\" or empty."
 msgstr "网桥失败模式。\"secure\"、\"standalone\" 之一或留空。"
 
-#: ../clients/common/settings-docs.h.in:267
+#: ../clients/common/settings-docs.h.in:276
 msgid "Enable or disable multicast snooping."
 msgstr "启用或禁用多播监听。"
 
-#: ../clients/common/settings-docs.h.in:268
+#: ../clients/common/settings-docs.h.in:277
 msgid "Enable or disable RSTP."
 msgstr "启用或禁用 RSTP。"
 
-#: ../clients/common/settings-docs.h.in:269
+#: ../clients/common/settings-docs.h.in:278
 msgid "Enable or disable STP."
 msgstr "启用或禁用 STP。"
 
-#: ../clients/common/settings-docs.h.in:258
+#: ../clients/common/settings-docs.c.in:273
 msgid "The interface type. Either \"internal\", or empty."
 msgstr "接口类型。要么为 \"internal\"，要么留空。"
 
@@ -7568,49 +7570,49 @@
 "port to connect to."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:273
+#: ../clients/common/settings-docs.h.in:282
 msgid "The time port must be inactive in order to be considered down."
 msgstr "端口被视为关闭所需停用的时间。"
 
-#: ../clients/common/settings-docs.h.in:274
+#: ../clients/common/settings-docs.h.in:283
 msgid ""
 "Bonding mode. One of \"active-backup\", \"balance-slb\", or \"balance-tcp\"."
 msgstr ""
 "绑定（Bonding）模式。\"active-backup\"、\"balance-slb\" 或 \"balance-tcp\" 之一。"
 
-#: ../clients/common/settings-docs.h.in:275
+#: ../clients/common/settings-docs.h.in:284
 msgid "The time port must be active before it starts forwarding traffic."
 msgstr "端口开始流量转发所需激活的时间。"
 
-#: ../clients/common/settings-docs.h.in:276
+#: ../clients/common/settings-docs.h.in:285
 msgid "LACP mode. One of \"active\", \"off\", or \"passive\"."
 msgstr "LACP 模式。\"active\"、\"off\" 或 \"passive\" 之一。"
 
-#: ../clients/common/settings-docs.h.in:277
+#: ../clients/common/settings-docs.h.in:286
 msgid "The VLAN tag in the range 0-4095."
 msgstr "VLAN 标记在 0～4095 范围内。"
 
-#: ../clients/common/settings-docs.h.in:278
+#: ../clients/common/settings-docs.h.in:287
 msgid ""
 "The VLAN mode. One of \"access\", \"native-tagged\", \"native-untagged\", "
 "\"trunk\" or unset."
 msgstr ""
 "VLAN 模式。\"access\"、\"native-tagged\"、\"native-untagged\"、\"trunk\" 之一或不设定。"
 
-#: ../clients/common/settings-docs.h.in:279
+#: ../clients/common/settings-docs.h.in:288
 msgid ""
 "If non-zero, instruct pppd to set the serial port to the specified baudrate. "
 " This value should normally be left as 0 to automatically choose the speed."
 msgstr "如果非零，指示 pppd 设定串口到指定的波特率。要自动选择速度时此值通常保留为 0。"
 
-#: ../clients/common/settings-docs.h.in:280
+#: ../clients/common/settings-docs.h.in:289
 msgid ""
 "If TRUE, specify that pppd should set the serial port to use hardware flow "
 "control with RTS and CTS signals.  This value should normally be set to "
 "FALSE."
 msgstr "如果为 TRUE，指定 pppd 应设定串口以使用通过 RTS 和 CTS 信号的硬件流量控制。此值通常应设为 FALSE。"
 
-#: ../clients/common/settings-docs.h.in:281
+#: ../clients/common/settings-docs.h.in:290
 msgid ""
 "If non-zero, instruct pppd to presume the connection to the peer has failed "
 "if the specified number of LCP echo-requests go unanswered by the peer.  The "
@@ -7620,7 +7622,7 @@
 "如果非零，指示如果指定的 LCP 回响请求号码未被节点回应时 pppd 就认定到节点的连接失败了。如果要使用此属性，\"lcp-echo-"
 "interval\" 属性也必须设为非零值。"
 
-#: ../clients/common/settings-docs.h.in:282
+#: ../clients/common/settings-docs.h.in:291
 msgid ""
 "If non-zero, instruct pppd to send an LCP echo-request frame to the peer "
 "every n seconds (where n is the specified value).  Note that some PPP peers "
@@ -7630,29 +7632,29 @@
 "如果非零，指示 pppd 每几秒发送一个 LCP 回响请求帧到节点（几秒为该属性指定）。注意有些 PPP "
 "节点将响应回响请求而有些不会，并且无法自动检测此行为。"
 
-#: ../clients/common/settings-docs.h.in:283
+#: ../clients/common/settings-docs.h.in:292
 msgid ""
 "If TRUE, stateful MPPE is used.  See pppd documentation for more information "
 "on stateful MPPE."
 msgstr "如果为 TRUE，使用有状态 MPPE。关于有状态 MPPPE 的更多信息请查看 pppd 文档。"
 
-#: ../clients/common/settings-docs.h.in:284
+#: ../clients/common/settings-docs.h.in:293
 msgid ""
 "If non-zero, instruct pppd to request that the peer send packets no larger "
 "than the specified size.  If non-zero, the MRU should be between 128 and "
 "16384."
 msgstr "如果非零，指示 pppd 请求节点发送的数据包不要超过指定的大小。如果非零，MRU 应在 128 和 16384 之间。"
 
-#: ../clients/common/settings-docs.h.in:285
+#: ../clients/common/settings-docs.h.in:294
 msgid ""
 "If non-zero, instruct pppd to send packets no larger than the specified size."
 msgstr "如果非零，指示 pppd 不要发送超过指定大小的数据包。"
 
-#: ../clients/common/settings-docs.h.in:286
+#: ../clients/common/settings-docs.h.in:295
 msgid "If TRUE, Van Jacobsen TCP header compression will not be requested."
 msgstr "如果为 TRUE，将不请求压缩 Van Jacobsen TCP 首部。"
 
-#: ../clients/common/settings-docs.h.in:287
+#: ../clients/common/settings-docs.h.in:296
 msgid ""
 "If TRUE, do not require the other side (usually the PPP server) to "
 "authenticate itself to the client.  If FALSE, require authentication from "
@@ -7660,35 +7662,35 @@
 msgstr ""
 "如果为 TRUE，不需要其他方（通常是 PPP 服务器）验证自己到客户端。如果为 FALSE，需要来自远端的验证。在大多数情况下，此属性应为 TRUE。"
 
-#: ../clients/common/settings-docs.h.in:288
+#: ../clients/common/settings-docs.h.in:297
 msgid "If TRUE, BSD compression will not be requested."
 msgstr "如果为 TURE，将不会请求 BSD 压缩。"
 
-#: ../clients/common/settings-docs.h.in:289
+#: ../clients/common/settings-docs.h.in:298
 msgid "If TRUE, \"deflate\" compression will not be requested."
 msgstr "如果为 TURE，将不会请求 \"deflate\" 压缩。"
 
-#: ../clients/common/settings-docs.h.in:290
+#: ../clients/common/settings-docs.h.in:299
 msgid "If TRUE, the CHAP authentication method will not be used."
 msgstr "如果为 TRUE，将不会使用 CHAP 验证方法。"
 
-#: ../clients/common/settings-docs.h.in:291
+#: ../clients/common/settings-docs.h.in:300
 msgid "If TRUE, the EAP authentication method will not be used."
 msgstr "如果为 TRUE，将不会使用 EAP 验证方法。"
 
-#: ../clients/common/settings-docs.h.in:292
+#: ../clients/common/settings-docs.h.in:301
 msgid "If TRUE, the MSCHAP authentication method will not be used."
 msgstr "如果为 TRUE，将不会使用 MSCHAP 验证方法。"
 
-#: ../clients/common/settings-docs.h.in:293
+#: ../clients/common/settings-docs.h.in:302
 msgid "If TRUE, the MSCHAPv2 authentication method will not be used."
 msgstr "如果为 TRUE，将不会使用 MSCHAPv2 验证方法。"
 
-#: ../clients/common/settings-docs.h.in:294
+#: ../clients/common/settings-docs.h.in:303
 msgid "If TRUE, the PAP authentication method will not be used."
 msgstr "如果为 TRUE，将不会使用 PAP 验证方法。"
 
-#: ../clients/common/settings-docs.h.in:295
+#: ../clients/common/settings-docs.h.in:304
 msgid ""
 "If TRUE, MPPE (Microsoft Point-to-Point Encryption) will be required for the "
 "PPP session.  If either 64-bit or 128-bit MPPE is not available the session "
@@ -7697,7 +7699,7 @@
 "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）。如果 64 位或 128 位的 MPPE 都不可用，会话将失败。注意 MPPE "
 "不用在移动宽带连接。"
 
-#: ../clients/common/settings-docs.h.in:296
+#: ../clients/common/settings-docs.h.in:305
 msgid ""
 "If TRUE, 128-bit MPPE (Microsoft Point-to-Point Encryption) will be required "
 "for the PPP session, and the \"require-mppe\" property must also be set to "
@@ -7706,7 +7708,7 @@
 "如果为 TRUE，PPP 会话将需要 MPPE（微软点对点加密）且 \"require-mppe\" 也必须设为 TRUE。如果 128 位的 MPPE "
 "不可用，会话将失败。"
 
-#: ../clients/common/settings-docs.h.in:297
+#: ../clients/common/settings-docs.h.in:306
 msgid ""
 "If given, specifies the parent interface name on which this PPPoE connection "
 "should be created.  If this property is not specified, the connection is "
@@ -7716,11 +7718,11 @@
 "如果给定了，指定此 PPPoE 连接应被创建在的上级接口名。如果此属性未指定，连接将激活到 NMSettingConnection 的 "
 "\"interface-name\" 所指定的接口。"
 
-#: ../clients/common/settings-docs.h.in:298
+#: ../clients/common/settings-docs.h.in:307
 msgid "Password used to authenticate with the PPPoE service."
 msgstr "用于 PPPoE 服务验证的密码。"
 
-#: ../clients/common/settings-docs.h.in:300
+#: ../clients/common/settings-docs.h.in:309
 msgid ""
 "If specified, instruct PPPoE to only initiate sessions with access "
 "concentrators that provide the specified service.  For most providers, this "
@@ -7730,47 +7732,47 @@
 "如果指定了，指示 PPPoE "
 "只启动与提供了指定服务的集线器的会话。对于大多数运营商，此属性应留空。如果有多个集线器存在或者特定服务需要时，此属性才需要设定。"
 
-#: ../clients/common/settings-docs.h.in:301
+#: ../clients/common/settings-docs.h.in:310
 msgid "Username used to authenticate with the PPPoE service."
 msgstr "用于 PPPoE 服务验证的用户名。"
 
-#: ../clients/common/settings-docs.h.in:302
+#: ../clients/common/settings-docs.h.in:311
 msgid "Whether the proxy configuration is for browser only."
 msgstr "代理配置是否只用于浏览器。"
 
-#: ../clients/common/settings-docs.h.in:303
+#: ../clients/common/settings-docs.h.in:312
 msgid ""
 "Method for proxy configuration, Default is NM_SETTING_PROXY_METHOD_NONE (0)"
 msgstr "代理配置的方法，默认为 NM_SETTING_PROXY_METHOD_NONE (0)"
 
-#: ../clients/common/settings-docs.h.in:304
+#: ../clients/common/settings-docs.h.in:313
 msgid "PAC script for the connection."
 msgstr "用于连接的 PAC 脚本。"
 
-#: ../clients/common/settings-docs.h.in:305
+#: ../clients/common/settings-docs.h.in:314
 msgid "PAC URL for obtaining PAC file."
 msgstr "用户获取 PAC 文件的 PAC URL。"
 
-#: ../clients/common/settings-docs.h.in:306
+#: ../clients/common/settings-docs.h.in:315
 msgid ""
 "Speed to use for communication over the serial port.  Note that this value "
 "usually has no effect for mobile broadband modems as they generally ignore "
 "speed settings and use the highest available speed."
 msgstr "通过串口通信使用的速度。注意该值一般对移动宽带调制解调器没有效果，因为它们通常忽略速度设置并使用最高的可用速度。"
 
-#: ../clients/common/settings-docs.h.in:307
+#: ../clients/common/settings-docs.h.in:316
 msgid "Byte-width of the serial communication. The 8 in \"8n1\" for example."
 msgstr "串口通信的字节宽度。以 \"8n1\" 中的 8 为例。"
 
-#: ../clients/common/settings-docs.h.in:308
+#: ../clients/common/settings-docs.h.in:317
 msgid "Parity setting of the serial port."
 msgstr "串口的奇偶校验设置。"
 
-#: ../clients/common/settings-docs.h.in:309
+#: ../clients/common/settings-docs.h.in:318
 msgid "Time to delay between each byte sent to the modem, in microseconds."
 msgstr "每次发送字节到调制解调器的延迟时间，以微秒计。"
 
-#: ../clients/common/settings-docs.h.in:310
+#: ../clients/common/settings-docs.h.in:319
 msgid ""
 "Number of stop bits for communication on the serial port.  Either 1 or 2. "
 "The 1 in \"8n1\" for example."
@@ -7780,11 +7782,11 @@
 msgid "Array of TC queuening disciplines."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:315
+#: ../clients/common/settings-docs.h.in:324
 msgid "Array of TC traffic filters."
 msgstr "TC 流量过滤器阵列。"
 
-#: ../clients/common/settings-docs.h.in:316
+#: ../clients/common/settings-docs.h.in:325
 msgid ""
 "The JSON configuration for the team network interface.  The property should "
 "contain raw JSON configuration data suitable for teamd, because the value is "
@@ -7807,19 +7809,19 @@
 "for more details."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:318
+#: ../clients/common/settings-docs.h.in:327
 msgid "Corresponds to the teamd mcast_rejoin.count."
 msgstr "对应于 teamd mcast_rejoin.count。"
 
-#: ../clients/common/settings-docs.h.in:319
+#: ../clients/common/settings-docs.h.in:328
 msgid "Corresponds to the teamd mcast_rejoin.interval."
 msgstr "对应于 teamd mcast_rejoin.interval。"
 
-#: ../clients/common/settings-docs.h.in:320
+#: ../clients/common/settings-docs.h.in:329
 msgid "Corresponds to the teamd notify_peers.count."
 msgstr "对应于 teamd notify_peers.count。"
 
-#: ../clients/common/settings-docs.h.in:321
+#: ../clients/common/settings-docs.h.in:330
 msgid "Corresponds to the teamd notify_peers.interval."
 msgstr "对应于 teamd notify_peers.interval。"
 
@@ -7832,43 +7834,43 @@
 "an empty value (or if not possible to a default value)."
 msgstr ""
 
-#: ../clients/common/settings-docs.h.in:323
+#: ../clients/common/settings-docs.h.in:332
 msgid "Corresponds to the teamd runner.active."
 msgstr "对应于 teamd runner.active。"
 
-#: ../clients/common/settings-docs.h.in:324
+#: ../clients/common/settings-docs.h.in:333
 msgid "Corresponds to the teamd runner.agg_select_policy."
 msgstr "对应于 teamd runner.agg_select_policy。"
 
-#: ../clients/common/settings-docs.h.in:325
+#: ../clients/common/settings-docs.h.in:334
 msgid "Corresponds to the teamd runner.fast_rate."
 msgstr "对应于 teamd runner.fast_rate。"
 
-#: ../clients/common/settings-docs.h.in:326
+#: ../clients/common/settings-docs.h.in:335
 msgid "Corresponds to the teamd runner.hwaddr_policy."
 msgstr "对应于 teamd runner.hwaddr_policy。"
 
-#: ../clients/common/settings-docs.h.in:327
+#: ../clients/common/settings-docs.h.in:336
 msgid "Corresponds to the teamd runner.min_ports."
 msgstr "对应于 teamd runner.min_ports。"
 
-#: ../clients/common/settings-docs.h.in:328
+#: ../clients/common/settings-docs.h.in:337
 msgid "Corresponds to the teamd runner.sys_prio."
 msgstr "对应于 teamd runner.sys_prio。"
 
-#: ../clients/common/settings-docs.h.in:329
+#: ../clients/common/settings-docs.h.in:338
 msgid "Corresponds to the teamd runner.tx_balancer.name."
 msgstr "对应于 teamd runner.tx_balancer.name。"
 
-#: ../clients/common/settings-docs.h.in:330
+#: ../clients/common/settings-docs.h.in:339
 msgid "Corresponds to the teamd runner.tx_balancer.interval."
 msgstr "对应于 teamd runner.tx_balancer.interval。"
 
-#: ../clients/common/settings-docs.h.in:331
+#: ../clients/common/settings-docs.h.in:340
 msgid "Corresponds to the teamd runner.tx_hash."
 msgstr "对应于 teamd runner.tx_hash。"
 
-#: ../clients/common/settings-docs.h.in:332
+#: ../clients/common/settings-docs.h.in:341
 msgid ""
 "The JSON configuration for the team port. The property should contain raw "
 "JSON configuration data suitable for teamd, because the value is passed "
@@ -7878,35 +7880,35 @@
 "组合（team）接口的 JSON 配置。此属性应包含适用于 teamd 的原始 JSON 配置，因为该值直接传递给 "
 "teamd。如果未指定则使用默认的配置。格式详情请参阅 teamd.conf 手册。"
 
-#: ../clients/common/settings-docs.h.in:333
+#: ../clients/common/settings-docs.h.in:342
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_key."
 msgstr "对应于 teamd ports.PORTIFNAME.lacp_key。"
 
-#: ../clients/common/settings-docs.h.in:334
+#: ../clients/common/settings-docs.h.in:343
 msgid "Corresponds to the teamd ports.PORTIFNAME.lacp_prio."
 msgstr "对应于 teamd ports.PORTIFNAME.lacp_prio。"
 
-#: ../clients/common/settings-docs.h.in:336
+#: ../clients/common/settings-docs.h.in:345
 msgid "Corresponds to the teamd ports.PORTIFNAME.prio."
 msgstr "对应于 teamd ports.PORTIFNAME.prio。"
 
-#: ../clients/common/settings-docs.h.in:337
+#: ../clients/common/settings-docs.h.in:346
 msgid ""
 "Corresponds to the teamd ports.PORTIFNAME.queue_id. When set to -1 means the "
 "parameter is skipped from the json config."
 msgstr "对应于 teamd ports.PORTIFNAME.queue_id。设定为 -1 时表示参数从 json 配置忽略。"
 
-#: ../clients/common/settings-docs.h.in:338
+#: ../clients/common/settings-docs.h.in:347
 msgid "Corresponds to the teamd ports.PORTIFNAME.sticky."
 msgstr "对应于 teamd ports.PORTIFNAME.sticky。"
 
-#: ../clients/common/settings-docs.h.in:339
+#: ../clients/common/settings-docs.h.in:348
 msgid ""
 "The group ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr "将拥有设备的组 ID。如果设为 NULL 则每个人都能使用设备。"
 
-#: ../clients/common/settings-docs.h.in:340
+#: ../clients/common/settings-docs.h.in:349
 msgid ""
 "The operating mode of the virtual device. Allowed values are "
 "NM_SETTING_TUN_MODE_TUN (1) to create a layer 3 device and "
@@ -7915,32 +7917,32 @@
 "虚拟设备的操作模式。允许值有 NM_SETTING_TUN_MODE_TUN (1) 以创建第三层设备和 NM_SETTING_TUN_MODE_TAP "
 "(2) 以创建类以太网的第二层设备。"
 
-#: ../clients/common/settings-docs.h.in:341
+#: ../clients/common/settings-docs.h.in:350
 msgid ""
 "If the property is set to TRUE, the interface will support multiple file "
 "descriptors (queues) to parallelize packet sending or receiving. Otherwise, "
 "the interface will only support a single queue."
 msgstr "如果属性设为 TRUE，接口将支持多个文件描述符（队列）以并行化数据包的发送和接收，接口将只支持单个队列。"
 
-#: ../clients/common/settings-docs.h.in:342
+#: ../clients/common/settings-docs.h.in:351
 msgid ""
 "The user ID which will own the device. If set to NULL everyone will be able "
 "to use the device."
 msgstr "将拥有设备的用户 ID。如果设为 NULL 则每个人都能使用设备。"
 
-#: ../clients/common/settings-docs.h.in:343
+#: ../clients/common/settings-docs.h.in:352
 msgid ""
 "If TRUE the interface will prepend a 4 byte header describing the physical "
 "interface to the packets."
 msgstr "如果为 TRUE，接口将前置一个描述到数据包的物理接口的 4 字节首部。"
 
-#: ../clients/common/settings-docs.h.in:344
+#: ../clients/common/settings-docs.h.in:353
 msgid ""
 "If TRUE the IFF_VNET_HDR the tunnel packets will include a virtio network "
 "header."
 msgstr "如果为 TRUE，隧道数据包的 IFF_VNET_HDR 将包含一个 virtio 网络首部。"
 
-#: ../clients/common/settings-docs.h.in:345
+#: ../clients/common/settings-docs.h.in:354
 msgid ""
 "A dictionary of key/value pairs with user data. This data is ignored by "
 "NetworkManager and can be used at the users discretion. The keys only "
@@ -7950,7 +7952,7 @@
 "包含用户数据的键/值对字典。此数据被网络管理器（NetworkManager）忽略且可被用户随意使用。键只支持严格的 ASCII "
 "格式，但是值可以为长度有限的任意 UTF8 字符串。"
 
-#: ../clients/common/settings-docs.h.in:346
+#: ../clients/common/settings-docs.h.in:355
 msgid ""
 "For outgoing packets, a list of mappings from Linux SKB priorities to 802.1p "
 "priorities.  The mapping is given in the format \"from:to\" where both "
@@ -7959,7 +7961,7 @@
 "用于传出的数据包，从 Linux SKB 优先级到 802.1p 优先级的映射列表。映射以 \"从:到\" 的格式给定，其中 \"从\" 和 \"到\" "
 "都是无符号整数，如 \"7:3\"。"
 
-#: ../clients/common/settings-docs.h.in:347
+#: ../clients/common/settings-docs.h.in:356
 msgid ""
 "One or more flags which control the behavior and features of the VLAN "
 "interface.  Flags include NM_VLAN_FLAG_REORDER_HEADERS (0x1) (reordering of "
@@ -7977,13 +7979,13 @@
 "(0x8)（使用 MVRP 协议）。此属性的默认值为 NM_VLAN_FLAG_REORDER_HEADERS，但它以前是 0。为了保持后向兼容性，D-"
 "Bus API 里的默认值继续为 0 而且 D-Bus 上缺少属性时仍视为 0。"
 
-#: ../clients/common/settings-docs.h.in:348
+#: ../clients/common/settings-docs.h.in:357
 msgid ""
 "The VLAN identifier that the interface created by this connection should be "
 "assigned. The valid range is from 0 to 4094, without the reserved id 4095."
 msgstr "由此连接创建的接口应该分配的 VLAN 标识符。有效范围为从 0 到 4094，不包括保留的 ID 4095。"
 
-#: ../clients/common/settings-docs.h.in:349
+#: ../clients/common/settings-docs.h.in:358
 msgid ""
 "For incoming packets, a list of mappings from 802.1p priorities to Linux SKB "
 "priorities.  The mapping is given in the format \"from:to\" where both "
@@ -7992,7 +7994,7 @@
 "用于传入的数据包，从 802.1p 优先级到 Linux SKB 优先级的映射列表。映射以 \"从:到\" 的格式给定，其中 \"从\" 和 \"到\" "
 "都是无符号整数，如 \"7:3\"。"
 
-#: ../clients/common/settings-docs.h.in:350
+#: ../clients/common/settings-docs.h.in:359
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID from "
 "which this VLAN interface should be created.  If this property is not "
@@ -8002,26 +8004,26 @@
 "如果给定了，其指定从此 VLAN 接口应该创建自的上级接口名称或上级连接的 UUID。如果此属性未指定，该连接必须包含具有 \"mac-"
 "address\" 属性的 \"802-3-ethernet\" 设置。"
 
-#: ../clients/common/settings-docs.h.in:351
+#: ../clients/common/settings-docs.h.in:360
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific data.  Both keys and "
 "values must be strings."
 msgstr "VPN 插件特定数据的键/值对字典。键和值都必须为字符串。"
 
-#: ../clients/common/settings-docs.h.in:352
+#: ../clients/common/settings-docs.h.in:361
 msgid ""
 "If the VPN service supports persistence, and this property is TRUE, the VPN "
 "will attempt to stay connected across link changes and outages, until "
 "explicitly disconnected."
 msgstr "如果 VPN 服务支持持久连接，并且此属性为 TRUE，VPN 将尝试在链路更改和中断的整个期间都保持连接，直到手动断开连接。"
 
-#: ../clients/common/settings-docs.h.in:353
+#: ../clients/common/settings-docs.h.in:362
 msgid ""
 "Dictionary of key/value pairs of VPN plugin specific secrets like passwords "
 "or private keys.  Both keys and values must be strings."
 msgstr "VPN 插件指定如密码或密钥的密钥（secret）的键/值对字典。键和值都必须为字符串。"
 
-#: ../clients/common/settings-docs.h.in:354
+#: ../clients/common/settings-docs.h.in:363
 msgid ""
 "D-Bus service name of the VPN plugin that this setting uses to connect to "
 "its network.  i.e. org.freedesktop.NetworkManager.vpnc for the vpnc plugin."
@@ -8029,7 +8031,7 @@
 "此连接用于连接到它网络的 VPN 插件的 D-Bus 服务名。例如 org.freedesktop.NetworkManager.vpnc 用于 "
 "vpnc 插件。"
 
-#: ../clients/common/settings-docs.h.in:355
+#: ../clients/common/settings-docs.h.in:364
 msgid ""
 "Timeout for the VPN service to establish the connection. Some services may "
 "take quite a long time to connect. Value of 0 means a default timeout, which "
@@ -8039,7 +8041,7 @@
 "VPN 服务建立连接的超时时间。有些服务可能需要很多时间才能连接。值 0 表示默认的超时，即 60 秒（除非被配置文件中的 vpn.timeout "
 "覆盖）。大于零的值表示以秒计算的超时时间。"
 
-#: ../clients/common/settings-docs.h.in:356
+#: ../clients/common/settings-docs.h.in:365
 msgid ""
 "If the VPN connection requires a user name for authentication, that name "
 "should be provided here.  If the connection is available to more than one "
@@ -8051,144 +8053,144 @@
 "如果 VPN 连接需要用户名用于验证，应在这里提供。如果连接可用于多个用户，且 VPN "
 "需要每个用户提供个不同的名称，那么让此属性留空。如果此属性留空，网络管理器（NetworkManager）将自动提供 VPN 连接所需要用户的用户名。"
 
-#: ../clients/common/settings-docs.h.in:357
+#: ../clients/common/settings-docs.h.in:367
 msgid ""
 "Specifies the lifetime in seconds of FDB entries learnt by the kernel."
 msgstr "指定内核已获知 FDB 条目的生存期，以秒计。"
 
-#: ../clients/common/settings-docs.h.in:358
+#: ../clients/common/settings-docs.h.in:368
 msgid ""
 "Specifies the UDP destination port to communicate to the remote VXLAN tunnel "
 "endpoint."
 msgstr "指定连接到远程 VXLAN 隧道端点的 UDP 目标端口。"
 
-#: ../clients/common/settings-docs.h.in:359
+#: ../clients/common/settings-docs.h.in:369
 msgid ""
 "Specifies the VXLAN Network Identifier (or VXLAN Segment Identifier) to use."
 msgstr "指定要使用的 VXLAN 网络标识符（或 VXLAN 分段标识符）。"
 
-#: ../clients/common/settings-docs.h.in:360
+#: ../clients/common/settings-docs.h.in:370
 msgid "Specifies whether netlink LL ADDR miss notifications are generated."
 msgstr "指定是否生成网络链路 LL ADDR 未命中通知。"
 
-#: ../clients/common/settings-docs.h.in:361
+#: ../clients/common/settings-docs.h.in:371
 msgid "Specifies whether netlink IP ADDR miss notifications are generated."
 msgstr "指定是否生成网络链路 IP ADDR 未命中通知。"
 
-#: ../clients/common/settings-docs.h.in:362
+#: ../clients/common/settings-docs.h.in:372
 msgid ""
 "Specifies whether unknown source link layer addresses and IP addresses are "
 "entered into the VXLAN device forwarding database."
 msgstr "指定是否让未知来源的链路层地址和 IP 地址输入进 VXLAN 设备转发数据库。"
 
-#: ../clients/common/settings-docs.h.in:363
+#: ../clients/common/settings-docs.h.in:373
 msgid ""
 "Specifies the maximum number of FDB entries. A value of zero means that the "
 "kernel will store unlimited entries."
 msgstr "指定 FDB 条目的最大数量。零值表示允许内核存储不限量的条目。"
 
-#: ../clients/common/settings-docs.h.in:364
+#: ../clients/common/settings-docs.h.in:374
 msgid "If given, specifies the source IP address to use in outgoing packets."
 msgstr "如果给定，指定要在传出数据包使用的来源 IP 地址。"
 
-#: ../clients/common/settings-docs.h.in:365
+#: ../clients/common/settings-docs.h.in:375
 msgid ""
 "If given, specifies the parent interface name or parent connection UUID."
 msgstr "如果给定了，其指定上级接口名称或上级连接的 UUID。"
 
-#: ../clients/common/settings-docs.h.in:366
+#: ../clients/common/settings-docs.h.in:376
 msgid "Specifies whether ARP proxy is turned on."
 msgstr "指定是否打开 ARP 代理。"
 
-#: ../clients/common/settings-docs.h.in:367
+#: ../clients/common/settings-docs.h.in:377
 msgid ""
 "Specifies the unicast destination IP address to use in outgoing packets when "
 "the destination link layer address is not known in the VXLAN device "
 "forwarding database, or the multicast IP address to join."
 msgstr "指定当目标链路层地址在 VXLAN 设备转发数据库中未知时要在传出数据包中使用的单播目标 IP 地址，或者要加入的多播 IP 地址。"
 
-#: ../clients/common/settings-docs.h.in:368
+#: ../clients/common/settings-docs.h.in:378
 msgid "Specifies whether route short circuit is turned on."
 msgstr "指定是否打开路由短路。"
 
-#: ../clients/common/settings-docs.h.in:369
+#: ../clients/common/settings-docs.h.in:379
 msgid ""
 "Specifies the maximum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr "指定连接到远程 VXLAN 隧道端点的最大 UDP 来源端口。"
 
-#: ../clients/common/settings-docs.h.in:370
+#: ../clients/common/settings-docs.h.in:380
 msgid ""
 "Specifies the minimum UDP source port to communicate to the remote VXLAN "
 "tunnel endpoint."
 msgstr "指定连接到远程 VXLAN 隧道端点的最小 UDP 来源端口。"
 
-#: ../clients/common/settings-docs.h.in:371
+#: ../clients/common/settings-docs.h.in:381
 msgid "Specifies the TOS value to use in outgoing packets."
 msgstr "指定要在传出数据包使用的 TOS 值。"
 
-#: ../clients/common/settings-docs.h.in:372
+#: ../clients/common/settings-docs.h.in:382
 msgid "Specifies the time-to-live value to use in outgoing packets."
 msgstr "指定要在传出数据包使用的存活时间值。"
 
-#: ../clients/common/settings-docs.h.in:376
+#: ../clients/common/settings-docs.h.in:386
 msgid ""
 "If specified, this connection will only apply to the WiMAX device whose MAC "
 "address matches. This property does not change the MAC address of the device "
 "(known as MAC spoofing). Deprecated: 1"
 msgstr "如指定了，此连接将只应用到其 MAC 地址符合的 WiMAX 设备。此属性不会改变设备的 MAC 地址（又名 MAC 欺骗）。已弃用：1"
 
-#: ../clients/common/settings-docs.h.in:377
+#: ../clients/common/settings-docs.h.in:387
 msgid ""
 "Network Service Provider (NSP) name of the WiMAX network this connection "
 "should use. Deprecated: 1"
 msgstr "此连接应使用的 WiMAX 网络服务提供商（NSP）的名称。已弃用：1"
 
-#: ../clients/nm-online.c:75
+#: ../clients/nm-online.c:77
 msgid "Connecting"
 msgstr "正在连接"
 
-#: ../clients/nm-online.c:191
+#: ../clients/nm-online.c:193
 #, c-format
 msgid "Error: timeout creating NMClient object\n"
 msgstr "错误：创建 NMClient 对象时超时\n"
 
-#: ../clients/nm-online.c:211
+#: ../clients/nm-online.c:216
 #, c-format
 msgid "Error: Could not create NMClient object: %s\n"
 msgstr "错误：无法创建 NMClient 对象：%s\n"
 
-#: ../clients/nm-online.c:239
+#: ../clients/nm-online.c:242
 msgid ""
 "Time to wait for a connection, in seconds (without the option, default value "
 "is 30)"
 msgstr "等待连接时间，以秒计（没有该选项时，默认为 30）"
 
-#: ../clients/nm-online.c:240
+#: ../clients/nm-online.c:243
 msgid "Exit immediately if NetworkManager is not running or connecting"
 msgstr "如果网络管理器未运行或连接则立即退出"
 
-#: ../clients/nm-online.c:237
+#: ../clients/nm-online.c:240
 msgid "Don't print anything"
 msgstr "不输出任何结果"
 
-#: ../clients/nm-online.c:238
+#: ../clients/nm-online.c:241
 msgid "Wait for NetworkManager startup instead of a connection"
 msgstr "等待网络管理器启动而不是连接"
 
-#: ../clients/nm-online.c:260
+#: ../clients/nm-online.c:265
 msgid ""
 "Waits for NetworkManager to finish activating startup network connections."
 msgstr "等待网络管理完成激活启动网络连接。"
 
-#: ../clients/nm-online.c:267 ../clients/nm-online.c:273
+#: ../clients/nm-online.c:272 ../clients/nm-online.c:278
 msgid "Invalid option.  Please use --help to see a list of valid options."
 msgstr "无效选项。请使用 --help 查看有效选项列表。"
 
 #: ../clients/tui/newt/nmt-newt-utils.c:163 ../clients/tui/nmt-editor.c:420
 #: ../clients/tui/nmt-password-dialog.c:161
 #: ../clients/tui/nmt-route-editor.c:109 ../clients/tui/nmtui-hostname.c:56
-#: ../clients/tui/nmtui.c:121
+#: ../clients/tui/nmtui.c:123
 msgid "OK"
 msgstr "确定"
 
@@ -8218,105 +8220,105 @@
 msgid "Could not re-read file: %s"
 msgstr "无法重新读取文件：%s"
 
-#: ../clients/tui/nm-editor-utils.c:140 ../libnm/nm-device.c:1455
+#: ../clients/tui/nm-editor-utils.c:135 ../libnm/nm-device.c:1522
 msgid "Ethernet"
 msgstr "以太网"
 
-#: ../clients/tui/nm-editor-utils.c:144
+#: ../clients/tui/nm-editor-utils.c:139
 #, c-format
 msgid "Ethernet connection %d"
 msgstr "以太网连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:148 ../libnm/nm-device.c:1457
+#: ../clients/tui/nm-editor-utils.c:143 ../libnm/nm-device.c:1524
 msgid "Wi-Fi"
 msgstr "Wi-Fi"
 
-#: ../clients/tui/nm-editor-utils.c:152
+#: ../clients/tui/nm-editor-utils.c:147
 #, c-format
 msgid "Wi-Fi connection %d"
 msgstr "Wi-Fi 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:157 ../libnm-core/nm-connection.c:2752
-#: ../libnm/nm-device.c:1473
+#: ../clients/tui/nm-editor-utils.c:152 ../libnm-core/nm-connection.c:2713
+#: ../libnm/nm-device.c:1540
 msgid "InfiniBand"
 msgstr "InfiniBand"
 
-#: ../clients/tui/nm-editor-utils.c:161
+#: ../clients/tui/nm-editor-utils.c:156
 #, c-format
 msgid "InfiniBand connection %d"
 msgstr "InfiniBand 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:166 ../libnm/nm-device.c:1471
+#: ../clients/tui/nm-editor-utils.c:161 ../libnm/nm-device.c:1538
 msgid "Mobile Broadband"
 msgstr "移动宽带"
 
-#: ../clients/tui/nm-editor-utils.c:169
+#: ../clients/tui/nm-editor-utils.c:164
 #, c-format
 msgid "Mobile broadband connection %d"
 msgstr "移动宽带连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:175 ../clients/tui/nmt-page-dsl.c:49
+#: ../clients/tui/nm-editor-utils.c:170 ../clients/tui/nmt-page-dsl.c:49
 msgid "DSL"
 msgstr "DSL"
 
-#: ../clients/tui/nm-editor-utils.c:179
+#: ../clients/tui/nm-editor-utils.c:174
 #, c-format
 msgid "DSL connection %d"
 msgstr "DSL 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:184 ../libnm-core/nm-connection.c:2744
-#: ../libnm/nm-device.c:1475
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:4959
+#: ../clients/tui/nm-editor-utils.c:179 ../libnm-core/nm-connection.c:2705
+#: ../libnm/nm-device.c:1542
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5036
 msgid "Bond"
 msgstr "绑定"
 
-#: ../clients/tui/nm-editor-utils.c:188
+#: ../clients/tui/nm-editor-utils.c:183
 #, c-format
 msgid "Bond connection %d"
 msgstr "绑定连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:193 ../libnm-core/nm-connection.c:2748
-#: ../libnm/nm-device.c:1479
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5314
+#: ../clients/tui/nm-editor-utils.c:188 ../libnm-core/nm-connection.c:2709
+#: ../libnm/nm-device.c:1546
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5400
 msgid "Bridge"
 msgstr "网桥"
 
-#: ../clients/tui/nm-editor-utils.c:198
+#: ../clients/tui/nm-editor-utils.c:193
 #, c-format
 msgid "Bridge connection %d"
 msgstr "网桥连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:202 ../libnm-core/nm-connection.c:2746
-#: ../libnm/nm-device.c:1477
-#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5032
+#: ../clients/tui/nm-editor-utils.c:197 ../libnm-core/nm-connection.c:2707
+#: ../libnm/nm-device.c:1544
+#: ../src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-reader.c:5109
 msgid "Team"
 msgstr "组合"
 
-#: ../clients/tui/nm-editor-utils.c:207
+#: ../clients/tui/nm-editor-utils.c:202
 #, c-format
 msgid "Team connection %d"
 msgstr "组合连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:211 ../clients/tui/nmt-page-vlan.c:69
-#: ../libnm-core/nm-connection.c:2750 ../libnm/nm-device.c:1481
+#: ../clients/tui/nm-editor-utils.c:206 ../clients/tui/nmt-page-vlan.c:69
+#: ../libnm-core/nm-connection.c:2711 ../libnm/nm-device.c:1548
 msgid "VLAN"
 msgstr "VLAN"
 
-#: ../clients/tui/nm-editor-utils.c:215
+#: ../clients/tui/nm-editor-utils.c:210
 #, c-format
 msgid "VLAN connection %d"
 msgstr "VLAN 连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:219 ../clients/tui/nmt-page-ip-tunnel.c:123
+#: ../clients/tui/nm-editor-utils.c:214 ../clients/tui/nmt-page-ip-tunnel.c:123
 msgid "IP tunnel"
 msgstr "IP 隧道"
 
-#: ../clients/tui/nm-editor-utils.c:223
+#: ../clients/tui/nm-editor-utils.c:218
 #, c-format
 msgid "IP tunnel connection %d"
 msgstr "IP 隧道连接 %d"
 
-#: ../clients/tui/nm-editor-utils.c:238
+#: ../clients/tui/nm-editor-utils.c:233
 #, c-format
 msgid "VPN connection %d"
 msgstr "VPN 连接 %d"
@@ -8449,7 +8451,7 @@
 msgstr "从机"
 
 #: ../clients/tui/nmt-page-bond.c:365 ../clients/tui/nmt-page-ip-tunnel.c:135
-#: ../clients/tui/nmt-page-wifi.c:218
+#: ../clients/tui/nmt-page-wifi.c:219
 msgid "Mode"
 msgstr "模式"
 
@@ -8484,7 +8486,7 @@
 msgstr "ARP 目标"
 
 #: ../clients/tui/nmt-page-bond.c:418 ../clients/tui/nmt-page-ethernet.c:64
-#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:353
+#: ../clients/tui/nmt-page-vlan.c:97 ../clients/tui/nmt-page-wifi.c:354
 msgid "Cloned MAC address"
 msgstr "克隆的 MAC 地址"
 
@@ -8549,7 +8551,7 @@
 #: ../clients/tui/nmt-page-ethernet.c:70
 #: ../clients/tui/nmt-page-infiniband.c:81
 #: ../clients/tui/nmt-page-ip-tunnel.c:173 ../clients/tui/nmt-page-vlan.c:103
-#: ../clients/tui/nmt-page-wifi.c:359
+#: ../clients/tui/nmt-page-wifi.c:360
 msgid "MTU"
 msgstr "MTU"
 
@@ -8837,68 +8839,69 @@
 msgid "LEAP"
 msgstr "LEAP"
 
-#: ../clients/tui/nmt-page-wifi.c:79
+#: ../clients/tui/nmt-page-wifi.c:80
 msgctxt "WEP key index"
 msgid "1 (Default)"
 msgstr "1（默认）"
 
-#: ../clients/tui/nmt-page-wifi.c:80
+#: ../clients/tui/nmt-page-wifi.c:81
 msgctxt "WEP key index"
 msgid "2"
 msgstr "2"
 
-#: ../clients/tui/nmt-page-wifi.c:81
+#: ../clients/tui/nmt-page-wifi.c:82
 msgctxt "WEP key index"
 msgid "3"
 msgstr "3"
 
-#: ../clients/tui/nmt-page-wifi.c:82
+#: ../clients/tui/nmt-page-wifi.c:83
 msgctxt "WEP key index"
 msgid "4"
 msgstr "4"
 
-#: ../clients/tui/nmt-page-wifi.c:87
+#: ../clients/tui/nmt-page-wifi.c:88
 msgid "Open System"
 msgstr "开放系统"
 
-#: ../clients/tui/nmt-page-wifi.c:88
+#: ../clients/tui/nmt-page-wifi.c:89
 msgid "Shared Key"
 msgstr "共享密钥"
 
-#: ../clients/tui/nmt-page-wifi.c:202
+#: ../clients/tui/nmt-page-wifi.c:203
 msgid "WI-FI"
 msgstr "WI-FI"
 
-#: ../clients/tui/nmt-page-wifi.c:244
+#: ../clients/tui/nmt-page-wifi.c:245
 msgid "Channel"
 msgstr "信道"
 
-#: ../clients/cli/devices.c:4227 ../clients/cli/devices.c:4231
-#: ../clients/cli/devices.c:4236 ../clients/tui/nmt-page-wifi.c:249
+#: ../clients/cli/devices.c:4360 ../clients/cli/devices.c:4364
+#: ../clients/cli/devices.c:4369 ../clients/cli/devices.c:4372
+#: ../clients/tui/nmt-page-wifi.c:250
 msgid "Security"
 msgstr "安全性"
 
 #. "wpa-enterprise"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:271
+#: ../clients/tui/nmt-page-wifi.c:272
 msgid "(No support for wpa-enterprise yet...)"
 msgstr "（还未支持 WPA 企业...）"
 
-#: ../clients/tui/nmt-page-wifi.c:281 ../clients/tui/nmt-page-wifi.c:300
+#: ../clients/tui/nmt-page-wifi.c:282 ../clients/tui/nmt-page-wifi.c:301
 msgid "WEP index"
 msgstr "WEP 索引"
 
-#: ../clients/tui/nmt-page-wifi.c:289 ../clients/tui/nmt-page-wifi.c:308
+#: ../clients/tui/nmt-page-wifi.c:290 ../clients/tui/nmt-page-wifi.c:309
 msgid "Authentication"
 msgstr "验证"
 
 #. "dynamic-wep"
 #. FIXME
-#: ../clients/tui/nmt-page-wifi.c:314
+#: ../clients/tui/nmt-page-wifi.c:315
 msgid "(No support for dynamic-wep yet...)"
 msgstr "（还未支持动态 WEP...）"
 
-#: ../clients/tui/nmt-page-wifi.c:347
+#: ../clients/tui/nmt-page-wifi.c:348
 msgid "BSSID"
 msgstr "BSSID"
 
@@ -8986,7 +8989,7 @@
 msgstr "停用"
 
 #: ../clients/tui/nmtui-connect.c:432 ../clients/tui/nmtui-edit.c:105
-#: ../clients/tui/nmtui.c:115
+#: ../clients/tui/nmtui.c:117
 msgid "Quit"
 msgstr "退出"
 
@@ -9055,48 +9058,50 @@
 msgid "Unable to set hostname: %s"
 msgstr "无法设置主机名：%s"
 
-#: ../clients/tui/nmtui.c:38 ../clients/tui/nmtui.c:41
+#: ../clients/tui/nmtui.c:40 ../clients/tui/nmtui.c:43
 msgid "connection"
 msgstr "连接"
 
-#: ../clients/tui/nmtui.c:39
+#: ../clients/tui/nmtui.c:41
 msgid "Edit a connection"
 msgstr "编辑连接"
 
-#: ../clients/tui/nmtui.c:42
+#: ../clients/tui/nmtui.c:44
 msgid "Activate a connection"
 msgstr "启用连接"
 
-#: ../clients/tui/nmtui.c:44
+#: ../clients/tui/nmtui.c:46
 msgid "new hostname"
 msgstr "新主机名"
 
-#: ../clients/tui/nmtui.c:45
+#: ../clients/tui/nmtui.c:47
 msgid "Set system hostname"
 msgstr "设置系统主机名"
 
-#: ../clients/tui/nmtui.c:89
+#: ../clients/tui/nmtui.c:91
 msgid "NetworkManager TUI"
 msgstr "网络管理器文本用户界面"
 
-#: ../clients/tui/nmtui.c:97
+#: ../clients/tui/nmtui.c:99
 msgid "Please select an option"
 msgstr "请选择选项"
 
-#: ../clients/tui/nmtui.c:145
+#: ../clients/tui/nmtui.c:147
 msgid "Usage"
 msgstr "用法"
 
-#: ../clients/tui/nmtui.c:226
+#: ../clients/tui/nmtui.c:228
 msgid "Could not parse arguments"
 msgstr "无法解析参数"
 
-#: ../clients/tui/nmtui.c:236
+#: ../clients/tui/nmtui.c:241
 #, c-format
 msgid "Could not contact NetworkManager: %s.\n"
 msgstr "无法联系网络管理器：%s\n"
 
-#: ../clients/tui/nmtui.c:241
+#. NetworkManager quit while we were waiting.
+#: ../clients/cli/general.c:541 ../clients/tui/nmtui.c:246
+#, c-format
 msgid "NetworkManager is not running."
 msgstr "NetworkManaer 未运行。"
 
@@ -9105,7 +9110,7 @@
 msgid "PEM key file had no end tag '%s'."
 msgstr "PEM 密钥文件没有结束标记 \"%s\"。"
 
-#: ../libnm-util/crypto.c:143
+#: ../libnm-core/crypto.c:131 ../libnm-util/crypto.c:144
 #, c-format
 msgid "Doesn't look like a PEM private key file."
 msgstr "不像是一个 PEM 私钥文件。"
@@ -9168,9 +9173,11 @@
 msgid "IV contains non-hexadecimal digits."
 msgstr "初始向量中包含非十六进制数字。"
 
-#: ../libnm-util/crypto.c:405 ../libnm-util/crypto_gnutls.c:151
-#: ../libnm-util/crypto_gnutls.c:253 ../libnm-util/crypto_nss.c:162
-#: ../libnm-util/crypto_nss.c:323
+#: ../libnm-core/crypto.c:395 ../libnm-core/crypto_gnutls.c:91
+#: ../libnm-core/crypto_gnutls.c:197 ../libnm-core/crypto_nss.c:112
+#: ../libnm-core/crypto_nss.c:277 ../libnm-util/crypto.c:406
+#: ../libnm-util/crypto_gnutls.c:151 ../libnm-util/crypto_gnutls.c:256
+#: ../libnm-util/crypto_nss.c:162 ../libnm-util/crypto_nss.c:323
 #, c-format
 msgid "Private key cipher '%s' was unknown."
 msgstr "私钥加密算法 “%s” 未知。"
@@ -9204,7 +9211,7 @@
 msgid "Failed to initialize the crypto engine."
 msgstr "初始化加密引擎失败。"
 
-#: ../libnm-util/crypto_gnutls.c:159
+#: ../libnm-core/crypto_gnutls.c:99 ../libnm-util/crypto_gnutls.c:159
 #, c-format
 msgid "Invalid IV length (must be at least %zd)."
 msgstr "无效初始向量长度(至少为 %zd)。"
@@ -9279,10 +9286,10 @@
 msgid "Failed to initialize the crypto engine: %d."
 msgstr "初始化加密引擎失败：%d。"
 
-#: ../libnm-util/crypto_nss.c:170
+#: ../libnm-core/crypto_nss.c:120 ../libnm-util/crypto_nss.c:170
 #, c-format
 msgid "Invalid IV length (must be at least %d)."
-msgstr "无效的初始向量长度（至少为 %d）。"
+msgstr "无效的初始向量长度(至少为 %d)。"
 
 #: ../libnm-core/nm-crypto-nss.c:131
 #, c-format
@@ -9390,52 +9397,52 @@
 msgid "duplicate setting name"
 msgstr "重复的设置名称"
 
-#: ../libnm-core/nm-connection.c:1423
+#: ../libnm-core/nm-connection.c:1424
 msgid "setting not found"
 msgstr "未找到设置"
 
-#: ../libnm-core/nm-connection.c:1502 ../libnm-core/nm-connection.c:1527
-#: ../libnm-core/nm-connection.c:1552
+#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
+#: ../libnm-core/nm-connection.c:1539
 msgid "setting not allowed in slave connection"
 msgstr "从连接中不允许设置"
 
-#: ../libnm-core/nm-connection.c:1489 ../libnm-core/nm-connection.c:1514
-#: ../libnm-core/nm-connection.c:1539
+#: ../libnm-core/nm-connection.c:1476 ../libnm-core/nm-connection.c:1501
+#: ../libnm-core/nm-connection.c:1526
 msgid "setting is required for non-slave connections"
 msgstr "对于非从连接，设置是必需的"
 
-#: ../libnm-core/nm-connection.c:1720
+#: ../libnm-core/nm-connection.c:1707
 msgid "Unexpected failure to verify the connection"
 msgstr "检验连接意外地失败"
 
-#: ../libnm-core/nm-connection.c:1657
+#: ../libnm-core/nm-connection.c:1644
 msgid "Unexpected failure to normalize the connection"
 msgstr "正常化连接意外地失败"
 
-#: ../libnm-core/nm-connection.c:2609 ../libnm-core/nm-setting-8021x.c:2574
-#: ../libnm-core/nm-setting-8021x.c:2591 ../libnm-core/nm-setting-8021x.c:2622
-#: ../libnm-core/nm-setting-8021x.c:2639 ../libnm-core/nm-setting-8021x.c:2681
-#: ../libnm-core/nm-setting-8021x.c:2693 ../libnm-core/nm-setting-8021x.c:2711
-#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2747
-#: ../libnm-core/nm-setting-8021x.c:2840 ../libnm-core/nm-setting-adsl.c:158
+#: ../libnm-core/nm-connection.c:2569 ../libnm-core/nm-setting-8021x.c:2610
+#: ../libnm-core/nm-setting-8021x.c:2627 ../libnm-core/nm-setting-8021x.c:2658
+#: ../libnm-core/nm-setting-8021x.c:2675 ../libnm-core/nm-setting-8021x.c:2717
+#: ../libnm-core/nm-setting-8021x.c:2729 ../libnm-core/nm-setting-8021x.c:2747
+#: ../libnm-core/nm-setting-8021x.c:2759 ../libnm-core/nm-setting-8021x.c:2783
+#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-adsl.c:158
 #: ../libnm-core/nm-setting-bluetooth.c:109
 #: ../libnm-core/nm-setting-bluetooth.c:167
 #: ../libnm-core/nm-setting-bluetooth.c:181 ../libnm-core/nm-setting-cdma.c:128
 #: ../libnm-core/nm-setting-connection.c:954
-#: ../libnm-core/nm-setting-connection.c:997
-#: ../libnm-core/nm-setting-connection.c:1177
-#: ../libnm-core/nm-setting-ip-config.c:4946
-#: ../libnm-core/nm-setting-ip-tunnel.c:359
+#: ../libnm-core/nm-setting-connection.c:983
+#: ../libnm-core/nm-setting-connection.c:1220
+#: ../libnm-core/nm-setting-ip-config.c:4935
+#: ../libnm-core/nm-setting-ip-tunnel.c:367
 #: ../libnm-core/nm-setting-olpc-mesh.c:84
 #: ../libnm-core/nm-setting-ovs-patch.c:77 ../libnm-core/nm-setting-pppoe.c:130
-#: ../libnm-core/nm-setting-vpn.c:516 ../libnm-core/nm-setting-vxlan.c:323
+#: ../libnm-core/nm-setting-vpn.c:551 ../libnm-core/nm-setting-vxlan.c:323
 #: ../libnm-core/nm-setting-wifi-p2p.c:122 ../libnm-core/nm-setting-wimax.c:94
-#: ../libnm-core/nm-setting-wireless-security.c:902
-#: ../libnm-core/nm-setting-wireless.c:759
+#: ../libnm-core/nm-setting-wireless-security.c:894
+#: ../libnm-core/nm-setting-wireless.c:764
 msgid "property is missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-connection.c:2755
+#: ../libnm-core/nm-connection.c:2716
 msgid "IP Tunnel"
 msgstr "IP 隧道"
 
@@ -9444,62 +9451,62 @@
 msgid "Method returned type '%s', but expected '%s'"
 msgstr "方法返回类型 \"%s\"，但期望的是 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:196
+#: ../shared/nm-keyfile/nm-keyfile.c:197
 msgid "ignoring missing number"
 msgstr "忽略缺失的数字"
 
-#: ../libnm-core/nm-keyfile.c:204
+#: ../shared/nm-keyfile/nm-keyfile.c:205
 #, c-format
 msgid "ignoring invalid number '%s'"
 msgstr "忽略无效的数字 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:225
+#: ../shared/nm-keyfile/nm-keyfile.c:226
 #, c-format
 msgid "ignoring invalid %s address: %s"
 msgstr "忽略无效的 %s 地址：%s"
 
-#: ../libnm-core/nm-keyfile.c:268
+#: ../shared/nm-keyfile/nm-keyfile.c:269
 #, c-format
 msgid "ignoring invalid gateway '%s' for %s route"
 msgstr "忽略 %s%s 路由的无效网关 \"\""
 
-#: ../libnm-core/nm-keyfile.c:292
+#: ../shared/nm-keyfile/nm-keyfile.c:293
 #, c-format
 msgid "ignoring invalid %s route: %s"
 msgstr "忽略无效的 %s 路由：%s"
 
-#: ../libnm-core/nm-keyfile.c:464
+#: ../shared/nm-keyfile/nm-keyfile.c:465
 #, c-format
 msgid "unexpected character '%c' for address %s: '%s' (position %td)"
 msgstr "对于地址 %2$s 的意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）"
 
-#: ../libnm-core/nm-keyfile.c:474
+#: ../shared/nm-keyfile/nm-keyfile.c:475
 #, c-format
 msgid "unexpected character '%c' for %s: '%s' (position %td)"
 msgstr "对于 %2$s 的意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）"
 
-#: ../libnm-core/nm-keyfile.c:483
+#: ../shared/nm-keyfile/nm-keyfile.c:484
 #, c-format
 msgid ""
 "unexpected character '%c' in prefix length for %s: '%s' (position %td)"
 msgstr "对于 %2$s，前缀长度中有意外字符 \"%1$c\"：\"%3$s\"（位置 %4$td）"
 
-#: ../libnm-core/nm-keyfile.c:494
+#: ../shared/nm-keyfile/nm-keyfile.c:495
 #, c-format
 msgid "garbage at the end of value %s: '%s'"
 msgstr "值 %s 的末尾有无用信息：\"%s\""
 
-#: ../libnm-core/nm-keyfile.c:500
+#: ../shared/nm-keyfile/nm-keyfile.c:501
 #, c-format
 msgid "deprecated semicolon at the end of value %s: '%s'"
 msgstr "值 %s 的末尾有舍弃的分号：\"%s\""
 
-#: ../libnm-core/nm-keyfile.c:514
+#: ../shared/nm-keyfile/nm-keyfile.c:515
 #, c-format
 msgid "invalid prefix length for %s '%s', defaulting to %d"
 msgstr "%s 的前缀长度 \"%s\" 无效，默认为 %d"
 
-#: ../libnm-core/nm-keyfile.c:521
+#: ../shared/nm-keyfile/nm-keyfile.c:522
 #, c-format
 msgid "missing prefix length for %s '%s', defaulting to %d"
 msgstr "缺少 %s 的前缀长度  \"%s\"，默认为 %d"
@@ -9512,77 +9519,78 @@
 #: ../libnm-core/nm-keyfile-reader.c:593
 #, c-format
 msgid "ignoring invalid DNS server IPv6 address '%s'"
-msgstr "忽略无效的 DNS 服务器 IPv6 地址 \"%s\""
+msgstr "忽略无效的 DNS 服务器 IPv6 地址 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:990 ../libnm-core/nm-keyfile.c:3143
+#: ../shared/nm-keyfile/nm-keyfile.c:3121
 #, c-format
 msgid "ignoring invalid byte element '%d' (not between 0 and 255 inclusive)"
 msgstr "忽略无效的字节元素 \"%d\"（不在 0 和 255 之间）"
 
-#: ../libnm-core/nm-keyfile.c:1001
+#: ../shared/nm-keyfile/nm-keyfile.c:979
 msgid "ignoring invalid MAC address"
 msgstr "忽略无效的 MAC 地址"
 
-#: ../libnm-core/nm-keyfile.c:1260
+#: ../shared/nm-keyfile/nm-keyfile.c:1238
 msgid "ignoring invalid SSID"
 msgstr "忽略无效的 SSID"
 
-#: ../libnm-core/nm-keyfile.c:1276
+#: ../shared/nm-keyfile/nm-keyfile.c:1254
 msgid "ignoring invalid raw password"
 msgstr "忽略无效的原始密码"
 
-#: ../libnm-core/nm-keyfile.c:1447 ../libnm-core/nm-keyfile.c:1530
+#: ../shared/nm-keyfile/nm-keyfile.c:1425
+#: ../shared/nm-keyfile/nm-keyfile.c:1508
 #, c-format
 msgid "certificate or key file '%s' does not exist"
 msgstr "证书或密钥文件 \"%s\" 不存在"
 
-#: ../libnm-core/nm-keyfile.c:1427
+#: ../shared/nm-keyfile/nm-keyfile.c:1405
 #, c-format
 msgid "invalid key/cert value path \"%s\""
 msgstr "无效的密钥/证书值路径 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1456
+#: ../shared/nm-keyfile/nm-keyfile.c:1434
 #, c-format
 msgid "invalid PKCS#11 URI \"%s\""
 msgstr "无效的 PKCS#11 URI \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1500
+#: ../shared/nm-keyfile/nm-keyfile.c:1478
 msgid "invalid key/cert value data:;base64, is not base64"
 msgstr "无效的密钥/证书值 data:;base64，不是 base64"
 
-#: ../libnm-core/nm-keyfile.c:1509
+#: ../shared/nm-keyfile/nm-keyfile.c:1487
 msgid "invalid key/cert value data:;base64,file://"
 msgstr "无效的密钥/证书值 data:;base64,file://"
 
-#: ../libnm-core/nm-keyfile.c:1542
+#: ../shared/nm-keyfile/nm-keyfile.c:1520
 msgid "invalid key/cert value is not a valid blob"
 msgstr "无效的密钥/证书值，不是有效的比特块（blob）"
 
-#: ../libnm-core/nm-keyfile.c:1416
+#: ../shared/nm-keyfile/nm-keyfile.c:1394
 msgid "invalid key/cert value"
 msgstr "无效的密钥/证书值"
 
-#: ../libnm-core/nm-keyfile.c:1644
+#: ../shared/nm-keyfile/nm-keyfile.c:1622
 #, c-format
 msgid "invalid parity value '%s'"
 msgstr "无效的奇偶校验值 \"%s\""
 
-#: ../libnm-core/nm-keyfile.c:1678
+#: ../shared/nm-keyfile/nm-keyfile.c:1656
 #, c-format
 msgid "ignoring invalid team configuration: %s"
 msgstr "忽略无效的组合（team）配置：%s"
 
-#: ../libnm-core/nm-keyfile.c:1756
+#: ../shared/nm-keyfile/nm-keyfile.c:1734
 #, c-format
 msgid "invalid qdisc: %s"
 msgstr "无效的排队规则（qdisc）：%s"
 
-#: ../libnm-core/nm-keyfile.c:1802
+#: ../shared/nm-keyfile/nm-keyfile.c:1780
 #, c-format
 msgid "invalid tfilter: %s"
 msgstr "无效的流量过滤器（tfilter）：%s"
 
-#: ../libnm-core/nm-keyfile.c:3042
+#: ../shared/nm-keyfile/nm-keyfile.c:3020
 #, c-format
 msgid "error loading setting value: %s"
 msgstr "加载设置值时出错：%s"
@@ -9590,141 +9598,140 @@
 #: ../libnm-core/nm-keyfile-reader.c:1654
 #, c-format
 msgid "invalid negative value (%i)"
-msgstr "无效的负值（%i）"
+msgstr "无效的负值 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1675
 #, c-format
 msgid "invalid char value (%i)"
-msgstr "无效的字符值（%i）"
+msgstr "无效的字符值 (%i)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1698
 #, c-format
 msgid "invalid int64 value (%s)"
-msgstr "无效的 int64 值（%s）"
+msgstr "无效的 int64 值 (%s)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1757
 #, c-format
 msgid "too large FLAGS property '%s' (%llu)"
-msgstr "过大的 FLAGS 属性 \"%s\" (%llu)"
+msgstr "过大的 FLAGS 属性 '%s' (%llu)"
 
 #: ../libnm-core/nm-keyfile-reader.c:1770
 #, c-format
 msgid "unhandled setting property type '%s'"
-msgstr "未处理的设置属性类型 \"%s\""
+msgstr "未处理的设置属性类型 '%s'"
 
-#: ../libnm-core/nm-keyfile.c:3219
+#: ../shared/nm-keyfile/nm-keyfile.c:3197
 #, c-format
 msgid "invalid setting name '%s'"
 msgstr "无效的设置名称 \"%s\""
 
-#: ../libnm-core/nm-setting-8021x.c:276
+#: ../libnm-core/nm-setting-8021x.c:280
 msgid "data missing"
 msgstr "数据缺失"
 
-#: ../libnm-core/nm-setting-8021x.c:213
+#: ../libnm-core/nm-setting-8021x.c:217
 msgid "binary data missing"
 msgstr "二进制数据缺失"
 
-#: ../libnm-core/nm-setting-8021x.c:241
+#: ../libnm-core/nm-setting-8021x.c:245
 msgid "URI not NUL terminated"
 msgstr "URI 非 NUL 终止符"
 
-#: ../libnm-core/nm-setting-8021x.c:250
+#: ../libnm-core/nm-setting-8021x.c:254
 msgid "URI is empty"
 msgstr "URI 为空"
 
-#: ../libnm-core/nm-setting-8021x.c:258
+#: ../libnm-core/nm-setting-8021x.c:262
 msgid "URI is not valid UTF-8"
 msgstr "URI 不是有效的 UTF-8"
 
-#: ../libnm-core/nm-setting-8021x.c:521
+#: ../libnm-core/nm-setting-8021x.c:525
 msgid "CA certificate must be in X.509 format"
 msgstr "CA 证书必须是 X.509 格式"
 
-#: ../libnm-core/nm-setting-8021x.c:537
+#: ../libnm-core/nm-setting-8021x.c:541
 msgid "invalid certificate format"
 msgstr "无效的证书格式"
 
-#: ../libnm-util/nm-setting-8021x.c:1811
+#: ../libnm-core/nm-setting-8021x.c:2275 ../libnm-util/nm-setting-8021x.c:1812
 msgid "invalid private key"
 msgstr "无效的私有密钥"
 
-#: ../libnm-util/nm-setting-8021x.c:2122
+#: ../libnm-core/nm-setting-8021x.c:2622 ../libnm-util/nm-setting-8021x.c:2123
 msgid "invalid phase2 private key"
-msgstr "无效的二阶段私钥"
+msgstr "无效的二阶段私有密钥"
 
-#: ../libnm-core/nm-setting-8021x.c:2581 ../libnm-core/nm-setting-8021x.c:2598
-#: ../libnm-core/nm-setting-8021x.c:2629 ../libnm-core/nm-setting-8021x.c:2646
-#: ../libnm-core/nm-setting-8021x.c:2687 ../libnm-core/nm-setting-8021x.c:2699
-#: ../libnm-core/nm-setting-8021x.c:2717 ../libnm-core/nm-setting-8021x.c:2729
-#: ../libnm-core/nm-setting-8021x.c:2754 ../libnm-core/nm-setting-adsl.c:165
+#: ../libnm-core/nm-setting-8021x.c:2617 ../libnm-core/nm-setting-8021x.c:2634
+#: ../libnm-core/nm-setting-8021x.c:2665 ../libnm-core/nm-setting-8021x.c:2682
+#: ../libnm-core/nm-setting-8021x.c:2723 ../libnm-core/nm-setting-8021x.c:2735
+#: ../libnm-core/nm-setting-8021x.c:2753 ../libnm-core/nm-setting-8021x.c:2765
+#: ../libnm-core/nm-setting-8021x.c:2790 ../libnm-core/nm-setting-adsl.c:166
 #: ../libnm-core/nm-setting-cdma.c:135 ../libnm-core/nm-setting-cdma.c:144
 #: ../libnm-core/nm-setting-connection.c:961
-#: ../libnm-core/nm-setting-connection.c:1009
-#: ../libnm-core/nm-setting-gsm.c:289 ../libnm-core/nm-setting-gsm.c:347
-#: ../libnm-core/nm-setting-gsm.c:384 ../libnm-core/nm-setting-gsm.c:393
-#: ../libnm-core/nm-setting-ip-config.c:4953
+#: ../libnm-core/nm-setting-connection.c:995 ../libnm-core/nm-setting-gsm.c:283
+#: ../libnm-core/nm-setting-gsm.c:341 ../libnm-core/nm-setting-gsm.c:378
+#: ../libnm-core/nm-setting-gsm.c:387 ../libnm-core/nm-setting-ip-config.c:4942
 #: ../libnm-core/nm-setting-ip4-config.c:167
 #: ../libnm-core/nm-setting-ip4-config.c:174
 #: ../libnm-core/nm-setting-pppoe.c:137 ../libnm-core/nm-setting-pppoe.c:146
-#: ../libnm-core/nm-setting-vpn.c:525 ../libnm-core/nm-setting-vpn.c:535
+#: ../libnm-core/nm-setting-vpn.c:559 ../libnm-core/nm-setting-vpn.c:570
 #: ../libnm-core/nm-setting-wimax.c:103
-#: ../libnm-core/nm-setting-wireless-security.c:945
-#: ../libnm-core/nm-setting-wireless-security.c:969
-#: ../libnm-core/nm-setting.c:1243
+#: ../libnm-core/nm-setting-wireless-security.c:937
+#: ../libnm-core/nm-setting-wireless-security.c:961
+#: ../libnm-core/nm-setting.c:1246
 msgid "property is empty"
 msgstr "属性为空"
 
-#: ../libnm-core/nm-setting-8021x.c:2611 ../libnm-core/nm-setting-8021x.c:2659
+#: ../libnm-core/nm-setting-8021x.c:2647 ../libnm-core/nm-setting-8021x.c:2695
 #, c-format
 msgid "has to match '%s' property for PKCS#12"
 msgstr "必须匹配 PKCS#12 的 \"%s\" 属性"
 
-#: ../libnm-core/nm-setting-8021x.c:299 ../libnm-core/nm-setting-8021x.c:666
+#: ../libnm-core/nm-setting-8021x.c:303 ../libnm-core/nm-setting-8021x.c:670
 #, c-format
 msgid "certificate is invalid: %s"
 msgstr "证书是无效的：%s"
 
-#: ../libnm-core/nm-setting-8021x.c:676
+#: ../libnm-core/nm-setting-8021x.c:680
 #, c-format
 msgid "password is not supported when certificate is not on a PKCS#11 token"
 msgstr "当证书不在 PKCS#11 令牌上时不支持密码"
 
-#: ../libnm-core/nm-setting-8021x.c:2849
+#: ../libnm-core/nm-setting-8021x.c:2885
 #: ../libnm-core/nm-setting-bluetooth.c:94
-#: ../libnm-core/nm-setting-infiniband.c:162
-#: ../libnm-core/nm-setting-infiniband.c:172
+#: ../libnm-core/nm-setting-infiniband.c:163
+#: ../libnm-core/nm-setting-infiniband.c:173
 #: ../libnm-core/nm-setting-ip4-config.c:158
-#: ../libnm-core/nm-setting-ip6-config.c:207
-#: ../libnm-core/nm-setting-ip6-config.c:218
+#: ../libnm-core/nm-setting-ip6-config.c:226
+#: ../libnm-core/nm-setting-ip6-config.c:237
 #: ../libnm-core/nm-setting-olpc-mesh.c:113
 #: ../libnm-core/nm-setting-wifi-p2p.c:131 ../libnm-core/nm-setting-wimax.c:112
 #: ../libnm-core/nm-setting-wired.c:785 ../libnm-core/nm-setting-wired.c:795
-#: ../libnm-core/nm-setting-wireless-security.c:988
-#: ../libnm-core/nm-setting-wireless-security.c:997
-#: ../libnm-core/nm-setting-wireless-security.c:1006
-#: ../libnm-core/nm-setting-wireless-security.c:1016
-#: ../libnm-core/nm-setting-wireless-security.c:1026
-#: ../libnm-core/nm-setting-wireless-security.c:1049
-#: ../libnm-core/nm-setting-wireless-security.c:1087
-#: ../libnm-core/nm-setting-wireless-security.c:1128
-#: ../libnm-core/nm-setting-wireless.c:830
-#: ../libnm-core/nm-setting-wireless.c:839
-#: ../libnm-core/nm-setting-wireless.c:850 ../libnm-core/nm-setting-wpan.c:162
-#: ../libnm-core/nm-utils.c:4566
+#: ../libnm-core/nm-setting-wireless-security.c:980
+#: ../libnm-core/nm-setting-wireless-security.c:989
+#: ../libnm-core/nm-setting-wireless-security.c:998
+#: ../libnm-core/nm-setting-wireless-security.c:1008
+#: ../libnm-core/nm-setting-wireless-security.c:1018
+#: ../libnm-core/nm-setting-wireless-security.c:1041
+#: ../libnm-core/nm-setting-wireless-security.c:1079
+#: ../libnm-core/nm-setting-wireless-security.c:1120
+#: ../libnm-core/nm-setting-wireless.c:835
+#: ../libnm-core/nm-setting-wireless.c:844
+#: ../libnm-core/nm-setting-wireless.c:855 ../libnm-core/nm-setting-wpan.c:162
+#: ../libnm-core/nm-utils.c:4562
 msgid "property is invalid"
 msgstr "属性无效"
 
-#: ../libnm-core/nm-setting-8021x.c:2876 ../libnm-core/nm-setting-8021x.c:2888
-#: ../libnm-core/nm-setting-8021x.c:2902 ../libnm-core/nm-setting-8021x.c:2929
-#: ../libnm-core/nm-setting-8021x.c:2944 ../libnm-core/nm-setting-adsl.c:177
+#: ../libnm-core/nm-setting-8021x.c:2912 ../libnm-core/nm-setting-8021x.c:2924
+#: ../libnm-core/nm-setting-8021x.c:2938 ../libnm-core/nm-setting-8021x.c:2965
+#: ../libnm-core/nm-setting-8021x.c:2980 ../libnm-core/nm-setting-adsl.c:177
 #: ../libnm-core/nm-setting-adsl.c:189 ../libnm-core/nm-setting-bluetooth.c:122
-#: ../libnm-core/nm-setting-wireless-security.c:923
+#: ../libnm-core/nm-setting-wireless-security.c:915
 #, c-format
 msgid "'%s' is not a valid value for the property"
 msgstr "\"%s\" 不是该属性的有效取值"
 
-#: ../libnm-core/nm-setting-8021x.c:2912
+#: ../libnm-core/nm-setting-8021x.c:2948
 msgid "invalid auth flags"
 msgstr "无效的验证标记"
 
@@ -9738,85 +9745,84 @@
 msgid "'%s' connection requires '%s' setting"
 msgstr "\"%s\" 连接需要 \"%s\" 设置"
 
-#: ../libnm-core/nm-setting-bond.c:541
+#: ../libnm-core/nm-setting-bond.c:757
 #, c-format
 msgid "invalid option '%s' or its value '%s'"
 msgstr "无效的选项 \"%s\" 或其值 \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:566
+#: ../libnm-core/nm-setting-bond.c:576
 #, c-format
 msgid "only one of '%s' and '%s' can be set"
 msgstr "只能设置 \"%s\" 和 \"%s\" 中的一个"
 
-#: ../libnm-core/nm-setting-bond.c:579
+#: ../libnm-core/nm-setting-bond.c:789
 #, c-format
 msgid "mandatory option '%s' is missing"
 msgstr "缺少必填选项 \"%s\""
 
-#: ../libnm-core/nm-setting-bond.c:589
+#: ../libnm-core/nm-setting-bond.c:799
 #, c-format
 msgid "'%s' is not a valid value for '%s'"
 msgstr "\"%s\" 不是 \"%s\" 的有效取值"
 
-#: ../libnm-core/nm-setting-bond.c:603
+#: ../libnm-core/nm-setting-bond.c:816
 #, c-format
 msgid "'%s=%s' is incompatible with '%s > 0'"
 msgstr "\"%s=%s\" 与 \"%s > 0\" 不兼容"
 
-#: ../libnm-core/nm-setting-bond.c:618
+#: ../libnm-core/nm-setting-bond.c:836
 #, c-format
 msgid "'%s' is not valid for the '%s' option: %s"
 msgstr "\"%s\" 对 \"%s\" 选项无效：%s"
 
-#: ../libnm-core/nm-setting-bond.c:629
+#: ../libnm-core/nm-setting-bond.c:849
 #, c-format
 msgid "'%s' option is only valid for '%s=%s'"
 msgstr "\"%s\" 选项只能在 \"%s=%s\" 中使用"
 
-#: ../libnm-core/nm-setting-bond.c:642
+#: ../libnm-core/nm-setting-bond.c:862
 #, c-format
 msgid "'%s=%s' is not a valid configuration for '%s'"
 msgstr "\"%s=%s\" 不是 \"%s\" 的有效配置"
 
-#: ../libnm-core/nm-setting-bond.c:655 ../libnm-core/nm-setting-bond.c:664
-#: ../libnm-core/nm-setting-bond.c:684 ../libnm-core/nm-setting-bond.c:720
+#: ../libnm-core/nm-setting-bond.c:912 ../libnm-core/nm-setting-bond.c:958
 #, c-format
 msgid "'%s' option requires '%s' option to be set"
 msgstr "\"%s\" 选项需要设置 \"%s\" 选项"
 
-#: ../libnm-core/nm-setting-bond.c:695
+#: ../libnm-core/nm-setting-bond.c:927
 #, c-format
 msgid "'%s' option is empty"
 msgstr "\"%s\"选项为空"
 
-#: ../libnm-core/nm-setting-bond.c:707
+#: ../libnm-core/nm-setting-bond.c:941
 #, c-format
 msgid "'%s' is not a valid IPv4 address for '%s' option"
 msgstr "\"%s\" 不是 \"%s\" 选项的有效 IPv4 地址"
 
-#: ../libnm-core/nm-setting-bond.c:735
+#: ../libnm-core/nm-setting-bond.c:975
 #, c-format
 msgid "'%s' option is only valid with mode '%s'"
 msgstr "\"%s\" 选项只在 \"%s\" 模式里有效"
 
-#: ../libnm-core/nm-setting-bond.c:746
+#: ../libnm-core/nm-setting-bond.c:987
 #, c-format
 msgid "'%s' and '%s' cannot have different values"
 msgstr "\"%s\" 和 \"%s\" 不能有不同的值"
 
-#: ../libnm-core/nm-setting-bond.c:762
+#: ../libnm-core/nm-setting-bond.c:1010
 #, c-format
 msgid "'%s' option should be string"
 msgstr "\"%s\" 选项应该为字符串"
 
-#: ../libnm-core/nm-setting-bond.c:778
+#: ../libnm-core/nm-setting-bond.c:1023
 #, c-format
 msgid "'%s' option is not valid with mode '%s'"
 msgstr "\"%s\" 选项在 \"%s\" 模式里无效"
 
 #: ../libnm-core/nm-setting-bridge-port.c:301
 #: ../libnm-core/nm-setting-ovs-bridge.c:153
-#: ../libnm-core/nm-setting-ovs-interface.c:259
+#: ../libnm-core/nm-setting-ovs-interface.c:269
 #: ../libnm-core/nm-setting-ovs-port.c:172
 #: ../libnm-core/nm-setting-team-port.c:299
 #, c-format
@@ -9824,7 +9830,7 @@
 msgstr "缺少设置"
 
 #: ../libnm-core/nm-setting-bridge-port.c:312
-#: ../libnm-core/nm-setting-ovs-interface.c:280
+#: ../libnm-core/nm-setting-ovs-interface.c:290
 #: ../libnm-core/nm-setting-ovs-port.c:193
 #: ../libnm-core/nm-setting-team-port.c:310
 #, c-format
@@ -9833,16 +9839,16 @@
 "Instead it is '%s'"
 msgstr "具有 \"%s\" 设置的连接必须将 slave-type 设置为 \"%s\"。而它是 \"%s\""
 
-#: ../libnm-core/nm-setting-bridge.c:896
+#: ../libnm-core/nm-setting-bridge.c:1030
 #, c-format
 msgid "value '%d' is out of range <%d-%d>"
 msgstr "值 '%d' 超出了范围 <%d-%d>"
 
-#: ../libnm-core/nm-setting-bridge.c:913
+#: ../libnm-core/nm-setting-bridge.c:1047
 msgid "is not a valid MAC address"
 msgstr "不是有效的 MAC 地址"
 
-#: ../libnm-core/nm-setting-bridge.c:954
+#: ../libnm-core/nm-setting-bridge.c:1088
 msgid "the mask can't contain bits 0 (STP), 1 (MAC) or 2 (LACP)"
 msgstr "掩码不能包含位 0（STP）、1（MAC）或2（LACP）"
 
@@ -9856,22 +9862,22 @@
 msgid "'%s' is not a valid UUID"
 msgstr "\"%s\"不是有效的 UUID"
 
-#: ../libnm-core/nm-setting-connection.c:1020
+#: ../libnm-core/nm-setting-connection.c:1006
 #, c-format
 msgid "connection type '%s' is not valid"
 msgstr "连接类型 \"%s\" 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1056
+#: ../libnm-core/nm-setting-connection.c:1099
 #, c-format
 msgid "Unknown slave type '%s'"
 msgstr "未知的从类型 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1067
+#: ../libnm-core/nm-setting-connection.c:1110
 #, c-format
 msgid "Slave connections need a valid '%s' property"
 msgstr "从连接需要有效的 \"%s\" 属性"
 
-#: ../libnm-core/nm-setting-connection.c:1088
+#: ../libnm-core/nm-setting-connection.c:1131
 #, c-format
 msgid "Cannot set '%s' without '%s'"
 msgstr "没有 \"%s\" 无法设置 \"%s\""
@@ -9881,7 +9887,7 @@
 msgid "Only '%s' connections can be enslaved to '%s'"
 msgstr ""
 
-#: ../libnm-core/nm-setting-connection.c:1116
+#: ../libnm-core/nm-setting-connection.c:1159
 #, c-format
 msgid "metered value %d is not valid"
 msgstr "计量值 %d 无效"
@@ -9891,201 +9897,201 @@
 msgid "mdns value %d is not valid"
 msgstr "mdns %d 无效"
 
-#: ../libnm-core/nm-setting-connection.c:1186
+#: ../libnm-core/nm-setting-connection.c:1229
 #, c-format
 msgid "property type should be set to '%s'"
 msgstr "属性类型应该设置为 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1201
+#: ../libnm-core/nm-setting-connection.c:1244
 #, c-format
 msgid "slave-type '%s' requires a '%s' setting in the connection"
 msgstr "slave-type \"%s\" 要求连接中有 \"%s\" 设置"
 
-#: ../libnm-core/nm-setting-connection.c:1211
+#: ../libnm-core/nm-setting-connection.c:1254
 #, c-format
 msgid ""
 "Detect a slave connection with '%s' set and a port type '%s'. '%s' should be "
 "set to '%s'"
 msgstr "检测到设置了 \"%s\" 和端口类型为 \"%s\" 的从连接。\"%s\" 应该设置为 \"%s\""
 
-#: ../libnm-core/nm-setting-connection.c:1228
+#: ../libnm-core/nm-setting-connection.c:1271
 #, c-format
 msgid "A slave connection with '%s' set to '%s' cannot have a '%s' setting"
 msgstr "\"%s\" 设为 \"%s\" 的从连接不能有个 \"%s\" 设置"
 
-#: ../libnm-core/nm-setting-dcb.c:492
+#: ../libnm-core/nm-setting-dcb.c:486
 msgid "flags invalid"
 msgstr "标志无效"
 
-#: ../libnm-core/nm-setting-dcb.c:501
+#: ../libnm-core/nm-setting-dcb.c:495
 msgid "flags invalid - disabled"
 msgstr "标志无效 — 已禁用"
 
-#: ../libnm-core/nm-setting-dcb.c:527 ../libnm-core/nm-setting-dcb.c:576
+#: ../libnm-core/nm-setting-dcb.c:521 ../libnm-core/nm-setting-dcb.c:570
 msgid "property invalid (not enabled)"
 msgstr "属性无效（未启用）"
 
-#: ../libnm-core/nm-setting-dcb.c:536
+#: ../libnm-core/nm-setting-dcb.c:530
 msgid "element invalid"
 msgstr "元素无效"
 
-#: ../libnm-core/nm-setting-dcb.c:551
+#: ../libnm-core/nm-setting-dcb.c:545
 msgid "sum not 100%"
 msgstr "总和不是 100%"
 
-#: ../libnm-core/nm-setting-dcb.c:585 ../libnm-core/nm-setting-dcb.c:617
+#: ../libnm-core/nm-setting-dcb.c:579 ../libnm-core/nm-setting-dcb.c:611
 msgid "property invalid"
 msgstr "属性无效"
 
-#: ../libnm-core/nm-setting-dcb.c:607
+#: ../libnm-core/nm-setting-dcb.c:601
 msgid "property missing"
 msgstr "缺少属性"
 
-#: ../libnm-core/nm-setting-gsm.c:302
+#: ../libnm-core/nm-setting-gsm.c:296
 #, c-format
 msgid "property value '%s' is empty or too long (>64)"
 msgstr "属性值 \"%s\" 为空或过长（>64）"
 
-#: ../libnm-core/nm-setting-gsm.c:334
+#: ../libnm-core/nm-setting-gsm.c:328
 #, c-format
 msgid "'%s' contains invalid char(s) (use [A-Za-z._-])"
 msgstr "\"%s\" 包含无效字符（请使用 [A-Za-z._-]）"
 
-#: ../libnm-core/nm-setting-gsm.c:361
+#: ../libnm-core/nm-setting-gsm.c:355
 #, c-format
 msgid "'%s' length is invalid (should be 5 or 6 digits)"
 msgstr "\"%s\" 长度无效（应为 5 位或 6 位数）"
 
-#: ../libnm-core/nm-setting-gsm.c:406
+#: ../libnm-core/nm-setting-gsm.c:400
 msgid "property is empty or wrong size"
 msgstr "属性为空或大小错误"
 
-#: ../libnm-core/nm-setting-gsm.c:416
+#: ../libnm-core/nm-setting-gsm.c:410
 msgid "property must contain only digits"
 msgstr "属性必须只包含数字"
 
-#: ../libnm-core/nm-setting-infiniband.c:193
+#: ../libnm-core/nm-setting-infiniband.c:194
 msgid "Must specify a P_Key if specifying parent"
 msgstr "如果指定上级接口，则必须指定 P_Key"
 
-#: ../libnm-core/nm-setting-infiniband.c:203
+#: ../libnm-core/nm-setting-infiniband.c:204
 msgid "InfiniBand P_Key connection did not specify parent interface name"
 msgstr "InfiniBand P_Key 连接未指定上级接口名"
 
-#: ../libnm-core/nm-setting-infiniband.c:241
+#: ../libnm-core/nm-setting-infiniband.c:227
 #, c-format
 msgid ""
 "interface name of software infiniband device must be '%s' or unset (instead "
 "it is '%s')"
 msgstr "软件 infiniband 设备的接口名必须为 \"%s\" 或未设置（但现在是 \"%s\"）"
 
-#: ../libnm-core/nm-setting-infiniband.c:278
+#: ../libnm-core/nm-setting-infiniband.c:291
 #, c-format
 msgid "mtu for transport mode '%s' can be at most %d but it is %d"
-msgstr "传输模式 \"%s\" 的 MTU 最多为 %d，但现在是 %d"
+msgstr "传输模式 '%s' 的 MTU 最多为 %d，但现在是 %d。"
 
-#: ../libnm-core/nm-setting-ip-config.c:120
+#: ../libnm-core/nm-setting-ip-config.c:109
 #, c-format
 msgid "Missing IPv4 address"
 msgstr "缺失 IPv4 地址"
 
-#: ../libnm-core/nm-setting-ip-config.c:120
+#: ../libnm-core/nm-setting-ip-config.c:109
 #, c-format
 msgid "Missing IPv6 address"
 msgstr "缺失 IPv6 地址"
 
-#: ../libnm-core/nm-setting-ip-config.c:125
+#: ../libnm-core/nm-setting-ip-config.c:114
 #, c-format
 msgid "Invalid IPv4 address '%s'"
 msgstr "无效的 IPv4 地址 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:125
+#: ../libnm-core/nm-setting-ip-config.c:114
 #, c-format
 msgid "Invalid IPv6 address '%s'"
 msgstr "无效的 IPv6 地址 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:140
+#: ../libnm-core/nm-setting-ip-config.c:129
 #, c-format
 msgid "Invalid IPv4 address prefix '%u'"
 msgstr "无效 IPv4 地址前缀 \"%u\""
 
-#: ../libnm-core/nm-setting-ip-config.c:140
+#: ../libnm-core/nm-setting-ip-config.c:129
 #, c-format
 msgid "Invalid IPv6 address prefix '%u'"
 msgstr "无效 IPv6 地址前缀 \"%u\""
 
-#: ../libnm-core/nm-setting-ip-config.c:155
+#: ../libnm-core/nm-setting-ip-config.c:144
 #, c-format
 msgid "Invalid routing metric '%s'"
 msgstr "无效的路由度量 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:1282
+#: ../libnm-core/nm-setting-ip-config.c:1271
 #: ../libnm-core/nm-setting-sriov.c:413
 msgid "unknown attribute"
 msgstr "未知属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:1292
+#: ../libnm-core/nm-setting-ip-config.c:1281
 #: ../libnm-core/nm-setting-sriov.c:423
 #, c-format
 msgid "invalid attribute type '%s'"
 msgstr "无效的属性类型 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:1303
+#: ../libnm-core/nm-setting-ip-config.c:1292
 #, c-format
 msgid "attribute is not valid for a IPv4 route"
 msgstr "属性对 IPv4 路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:1304
+#: ../libnm-core/nm-setting-ip-config.c:1293
 #, c-format
 msgid "attribute is not valid for a IPv6 route"
 msgstr "属性对 IPv6 路由无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:1318
-#: ../libnm-core/nm-setting-ip-config.c:1346
+#: ../libnm-core/nm-setting-ip-config.c:1307
+#: ../libnm-core/nm-setting-ip-config.c:1335
 #, c-format
 msgid "'%s' is not a valid IPv4 address"
 msgstr "\"%s\" 不是有效的 IPv4 地址"
 
-#: ../libnm-core/nm-setting-ip-config.c:1319
-#: ../libnm-core/nm-setting-ip-config.c:1347
+#: ../libnm-core/nm-setting-ip-config.c:1308
+#: ../libnm-core/nm-setting-ip-config.c:1336
 #, c-format
 msgid "'%s' is not a valid IPv6 address"
 msgstr "\"%s\" 不是有效的 IPv6 地址"
 
-#: ../libnm-core/nm-setting-ip-config.c:1337
+#: ../libnm-core/nm-setting-ip-config.c:1326
 #, c-format
 msgid "invalid prefix %s"
 msgstr "无效的前缀 %s"
 
-#: ../libnm-core/nm-setting-ip-config.c:4966
+#: ../libnm-core/nm-setting-ip-config.c:4955
 #, c-format
 msgid "%d. DNS server address is invalid"
 msgstr "%d。DNS 服务器地址无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:4982
+#: ../libnm-core/nm-setting-ip-config.c:4971
 #, c-format
 msgid "%d. IP address is invalid"
 msgstr "%d。IP 地址无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:4994
+#: ../libnm-core/nm-setting-ip-config.c:4983
 #, c-format
 msgid "%d. IP address has 'label' property with invalid type"
 msgstr "%d。IP 地址有无效类型的 \"label\" 属性"
 
-#: ../libnm-core/nm-setting-ip-config.c:5003
+#: ../libnm-core/nm-setting-ip-config.c:4992
 #, c-format
 msgid "%d. IP address has invalid label '%s'"
 msgstr "%d。IP 地址有无效标签 \"%s\""
 
-#: ../libnm-core/nm-setting-ip-config.c:5017
+#: ../libnm-core/nm-setting-ip-config.c:5006
 msgid "gateway cannot be set if there are no addresses configured"
 msgstr "如果没有配置地址，网关会无法设置"
 
-#: ../libnm-core/nm-setting-ip-config.c:5026
+#: ../libnm-core/nm-setting-ip-config.c:5015
 msgid "gateway is invalid"
 msgstr "网关无效"
 
-#: ../libnm-core/nm-setting-ip-config.c:5040
+#: ../libnm-core/nm-setting-ip-config.c:5029
 #, c-format
 msgid "%d. route is invalid"
 msgstr "%d。路由无效"
@@ -10095,13 +10101,13 @@
 msgid "%d. route cannot be a default route"
 msgstr "%d。路由不能是默认路由"
 
-#: ../libnm-core/nm-setting-ip-config.c:5115
+#: ../libnm-core/nm-setting-ip-config.c:5104
 #, c-format
 msgid "a gateway is incompatible with '%s'"
 msgstr "网关与 \"%s\" 不兼容"
 
 #: ../libnm-core/nm-setting-ip4-config.c:112
-#: ../libnm-core/nm-setting-ip6-config.c:159
+#: ../libnm-core/nm-setting-ip6-config.c:178
 #, c-format
 msgid "this property cannot be empty for '%s=%s'"
 msgstr "\"%s=%s\" 不允许这个属性为空"
@@ -10109,9 +10115,9 @@
 #: ../libnm-core/nm-setting-ip4-config.c:124
 #: ../libnm-core/nm-setting-ip4-config.c:134
 #: ../libnm-core/nm-setting-ip4-config.c:146
-#: ../libnm-core/nm-setting-ip6-config.c:174
-#: ../libnm-core/nm-setting-ip6-config.c:184
-#: ../libnm-core/nm-setting-ip6-config.c:194
+#: ../libnm-core/nm-setting-ip6-config.c:193
+#: ../libnm-core/nm-setting-ip6-config.c:203
+#: ../libnm-core/nm-setting-ip6-config.c:213
 #, c-format
 msgid "this property is not allowed for '%s=%s'"
 msgstr "此属性不允许用于\"%s=%s\""
@@ -10134,52 +10140,52 @@
 msgid "property should be TRUE when method is set to disabled"
 msgstr "方法设为禁用时属性应该是 TRUE"
 
-#: ../libnm-core/nm-setting-ip6-config.c:233
+#: ../libnm-core/nm-setting-ip6-config.c:252
 msgid "value is not a valid token"
 msgstr "值不是有效的令牌"
 
-#: ../libnm-core/nm-setting-ip6-config.c:244
+#: ../libnm-core/nm-setting-ip6-config.c:263
 msgid "only makes sense with EUI64 address generation mode"
 msgstr "只有 EUI64 地址生成模式才有意义"
 
-#: ../libnm-core/nm-setting-ip6-config.c:267
+#: ../libnm-core/nm-setting-ip6-config.c:286
 msgid "token is not in canonical form"
 msgstr "令牌不是规范形式"
 
-#: ../libnm-core/nm-setting-ip6-config.c:294
+#: ../libnm-core/nm-setting-ip6-config.c:276
 msgid "property should be TRUE when method is set to ignore"
 msgstr "方法设为忽略时属性应该是 TRUE"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:325
+#: ../libnm-core/nm-setting-ip-tunnel.c:333
 #, c-format
 msgid "'%d' is not a valid tunnel mode"
 msgstr "\"%d\" 是无效的隧道模式"
 
 #: ../libnm-core/nm-setting-6lowpan.c:112
-#: ../libnm-core/nm-setting-ip-tunnel.c:337
+#: ../libnm-core/nm-setting-ip-tunnel.c:345
 #: ../libnm-core/nm-setting-macsec.c:298 ../libnm-core/nm-setting-macvlan.c:127
 #: ../libnm-core/nm-setting-vlan.c:611 ../libnm-core/nm-setting-vxlan.c:366
 #, c-format
 msgid "'%s' is neither an UUID nor an interface name"
 msgstr "\"%s\" 不是 UUID 或接口名称"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:348
-#: ../libnm-core/nm-setting-ip-tunnel.c:368
+#: ../libnm-core/nm-setting-ip-tunnel.c:356
+#: ../libnm-core/nm-setting-ip-tunnel.c:376
 #, c-format
 msgid "'%s' is not a valid IPv%c address"
 msgstr "\"%s\" 不是有效的 IPv%c 地址"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:385
+#: ../libnm-core/nm-setting-ip-tunnel.c:393
 msgid "tunnel keys can only be specified for GRE tunnels"
 msgstr "只能为 GRE 隧道指定隧道密钥"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:398
-#: ../libnm-core/nm-setting-ip-tunnel.c:414
+#: ../libnm-core/nm-setting-ip-tunnel.c:406
+#: ../libnm-core/nm-setting-ip-tunnel.c:422
 #, c-format
 msgid "'%s' is not a valid tunnel key"
 msgstr "\"%s\" 不是有效的隧道密钥"
 
-#: ../libnm-core/nm-setting-ip-tunnel.c:426
+#: ../libnm-core/nm-setting-ip-tunnel.c:434
 msgid "a fixed TTL is allowed only when path MTU discovery is enabled"
 msgstr "只有启用路径 MTU 发现时才允许固定的 TTL"
 
@@ -10223,67 +10229,67 @@
 msgstr "只有通过（passthru）模式才允许无混杂操作"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:94
-#: ../libnm-core/nm-setting-wireless.c:769
+#: ../libnm-core/nm-setting-wireless.c:774
 msgid "SSID length is out of range <1-32> bytes"
 msgstr "SSID 长度超出 <1-32> 字节范围"
 
 #: ../libnm-core/nm-setting-olpc-mesh.c:103
-#: ../libnm-core/nm-setting-wireless.c:809
+#: ../libnm-core/nm-setting-wireless.c:814
 #, c-format
 msgid "'%d' is not a valid channel"
 msgstr "\"%d\" 不是有效的信道"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:94
+#: ../libnm-core/nm-setting-ovs-interface.c:96
 #, c-format
 msgid "'%s' is not a valid interface type"
 msgstr "\"%s\" 不是有效的接口类型"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:116
+#: ../libnm-core/nm-setting-ovs-interface.c:120
 #, c-format
 msgid "A connection with a '%s' setting needs connection.type explicitly set"
 msgstr "有 \"%s\" 设置的连接需要明确设定 connection.type"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:128
+#: ../libnm-core/nm-setting-ovs-interface.c:132
 #, c-format
 msgid "A connection of type '%s' cannot have ovs-interface.type \"system\""
 msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"system\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:140
+#: ../libnm-core/nm-setting-ovs-interface.c:144
 #, c-format
 msgid "A connection of type '%s' cannot have an ovs-interface.type \"%s\""
 msgstr "\"%s\" 类型的连接不能有 ovs-interface.type \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:173
+#: ../libnm-core/nm-setting-ovs-interface.c:177
 #, c-format
 msgid ""
 "A connection with '%s' setting must be of connection.type \"ovs-interface\" "
 "but is \"%s\""
 msgstr "有 \"%s\" 设置的连接必须是 connection.type \"ovs-interface\" 类型，但现在是 \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:184
+#: ../libnm-core/nm-setting-ovs-interface.c:186
 #, c-format
 msgid ""
 "A connection with '%s' setting needs to be of 'patch' interface type, not "
 "'%s'"
 msgstr "有 \"%s\" 设置的连接必须是 \"patch\" 接口类型 ，而不是 \"%s\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:201
+#: ../libnm-core/nm-setting-ovs-interface.c:206
 #, c-format
 msgid ""
 "A connection with ovs-interface.type '%s' setting a 'ovs-patch' setting"
 msgstr "ovs-interface.type \"%s\" 类型的连接缺少设置 \"ovs-patch\""
 
-#: ../libnm-core/nm-setting-ovs-interface.c:221
+#: ../libnm-core/nm-setting-ovs-interface.c:231
 #, c-format
 msgid "Missing ovs interface setting"
 msgstr "缺少 ovs 接口设置"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:227
+#: ../libnm-core/nm-setting-ovs-interface.c:237
 #, c-format
 msgid "Missing ovs interface type"
 msgstr "缺少 ovs 接口类型"
 
-#: ../libnm-core/nm-setting-ovs-interface.c:268
+#: ../libnm-core/nm-setting-ovs-interface.c:278
 #: ../libnm-core/nm-setting-ovs-port.c:181
 #, c-format
 msgid "A connection with a '%s' setting must have a master."
@@ -10334,27 +10340,27 @@
 msgid "setting this property requires non-zero '%s' property"
 msgstr "设置此属性要求 \"%s\" 属性不为零"
 
-#: ../libnm-core/nm-setting-proxy.c:132
+#: ../libnm-core/nm-setting-proxy.c:129
 #, c-format
 msgid "invalid proxy method"
 msgstr "无效的代理方法"
 
-#: ../libnm-core/nm-setting-proxy.c:142 ../libnm-core/nm-setting-proxy.c:151
+#: ../libnm-core/nm-setting-proxy.c:139 ../libnm-core/nm-setting-proxy.c:148
 #, c-format
 msgid "this property is not allowed for method none"
 msgstr "无方法时不允许此属性"
 
-#: ../libnm-core/nm-setting-proxy.c:162
+#: ../libnm-core/nm-setting-proxy.c:159
 #, c-format
 msgid "the script is too large"
 msgstr "脚本太大"
 
-#: ../libnm-core/nm-setting-proxy.c:170
+#: ../libnm-core/nm-setting-proxy.c:167
 #, c-format
 msgid "the script is not valid utf8"
 msgstr "脚本不是有效的 utf8"
 
-#: ../libnm-core/nm-setting-proxy.c:178
+#: ../libnm-core/nm-setting-proxy.c:175
 #, c-format
 msgid "the script lacks FindProxyForURL function"
 msgstr "脚本缺少 FindProxyForURL 功能"
@@ -10402,27 +10408,27 @@
 msgid "team config exceeds size limit"
 msgstr "组合（team）配置超过大小限制"
 
-#: ../libnm-core/nm-setting-team.c:1229
+#: ../libnm-core/nm-setting-team.c:1179
 #, c-format
 msgid "invalid runner \"%s\""
 msgstr "无效的运行程序（runner）\"%s\""
 
-#: ../libnm-core/nm-setting-team.c:1242
+#: ../libnm-core/nm-setting-team.c:1192
 #, c-format
 msgid "missing link watcher name"
 msgstr "缺少链路监视器名称"
 
-#: ../libnm-core/nm-setting-team.c:1252
+#: ../libnm-core/nm-setting-team.c:1202
 #, c-format
 msgid "unknown link watcher \"%s\""
 msgstr "未知的链路监视器 \"%s\""
 
-#: ../libnm-core/nm-setting-team.c:1263
+#: ../libnm-core/nm-setting-team.c:1213
 #, c-format
 msgid "missing target host"
 msgstr "缺少目标主机"
 
-#: ../libnm-core/nm-setting-team.c:1271
+#: ../libnm-core/nm-setting-team.c:1221
 #, c-format
 msgid "missing source address"
 msgstr "缺少来源地址"
@@ -10487,7 +10493,7 @@
 msgid "invalid key \"%s\": %s"
 msgstr "无效的密钥 \"%s\"：%s"
 
-#: ../libnm-core/nm-keyfile.c:856 ../libnm-core/nm-setting-user.c:358
+#: ../libnm-core/nm-setting-user.c:358 ../shared/nm-keyfile/nm-keyfile.c:857
 #, c-format
 msgid "invalid value for \"%s\": %s"
 msgstr "对 \"%s\" 无效的值：%s"
@@ -10515,7 +10521,7 @@
 msgid "secret was empty"
 msgstr "密钥为空"
 
-#: ../libnm-core/nm-setting-vpn.c:597
+#: ../libnm-core/nm-setting-vpn.c:626
 msgid "setting contained a secret with an empty name"
 msgstr "设置包含具有空名称的密钥"
 
@@ -10524,18 +10530,18 @@
 msgid "secret value was empty"
 msgstr "密钥值为空"
 
-#: ../libnm-core/nm-setting-vpn.c:652 ../libnm-core/nm-setting.c:2124
+#: ../libnm-core/nm-setting-vpn.c:666 ../libnm-core/nm-setting.c:2127
 msgid "not a secret property"
 msgstr "不是密钥（secret）属性"
 
-#: ../libnm-core/nm-setting-vpn.c:658
+#: ../libnm-core/nm-setting-vpn.c:672
 msgid "secret is not of correct type"
 msgstr "密钥（secret）不是正确的类型"
 
 #: ../libnm-core/nm-setting-vpn.c:582
 #, c-format
 msgid "failed to convert value '%s' to uint"
-msgstr "转换 \"%s\" 值为 uint 失败"
+msgstr "转换 '%s' 值为 uint 失败"
 
 #: ../libnm-core/nm-setting-vxlan.c:351
 #, c-format
@@ -10582,17 +10588,17 @@
 msgid "both speed and duplex are required for static link configuration"
 msgstr "静态链路配置需要设置速度和双工"
 
-#: ../libnm-core/nm-setting-wireless-security.c:936
+#: ../libnm-core/nm-setting-wireless-security.c:928
 #, c-format
 msgid "'%s' security requires '%s=%s'"
 msgstr "\"%s\" 安全需要 \"%s=%s\""
 
-#: ../libnm-core/nm-setting-wireless-security.c:957
+#: ../libnm-core/nm-setting-wireless-security.c:949
 #, c-format
 msgid "'%s' security requires '%s' setting presence"
 msgstr "\"%s\" 安全需要 \"%s\" 设置存在"
 
-#: ../libnm-core/nm-setting-wireless-security.c:978
+#: ../libnm-core/nm-setting-wireless-security.c:970
 #, c-format
 msgid "'%d' value is out of range <0-3>"
 msgstr "'%d' 值超出了 范围 <0-3>"
@@ -10602,7 +10608,7 @@
 msgid "'%s' connections require '%s' in this property"
 msgstr "\"%s\" 连接需要此属性中的 \"%s\""
 
-#: ../libnm-core/nm-setting-wireless-security.c:1037
+#: ../libnm-core/nm-setting-wireless-security.c:1029
 #, c-format
 msgid "'%s' can only be used with '%s=%s' (WEP)"
 msgstr "\"%s\" 只能与 \"%s=%s\"（WEP）共用"
@@ -10612,237 +10618,237 @@
 msgid "'%s' can only be used with '%s=%s' or '%s=%s'"
 msgstr "\"%s\" 只能与 \"%s=%s\" 或 \"%s=%s\"共用"
 
-#: ../libnm-core/nm-utils.c:4576
+#: ../libnm-core/nm-utils.c:4572
 msgid "can't be simultaneously disabled and enabled"
 msgstr "不能同时启用和禁用"
 
-#: ../libnm-core/nm-setting-wireless.c:778
+#: ../libnm-core/nm-setting-wireless.c:783
 #, c-format
 msgid "'%s' is not a valid Wi-Fi mode"
 msgstr "\"%s\" 不是有效的 Wi-Fi 模式"
 
-#: ../libnm-core/nm-setting-wireless.c:788
+#: ../libnm-core/nm-setting-wireless.c:793
 #, c-format
 msgid "'%s' is not a valid band"
 msgstr "\"%s\" 不是有效频段"
 
-#: ../libnm-core/nm-setting-wireless.c:798
+#: ../libnm-core/nm-setting-wireless.c:803
 #, c-format
 msgid "'%s' requires setting '%s' property"
 msgstr "\"%s\" 需要设置 \"%s\" 属性"
 
-#: ../libnm-core/nm-setting-wireless.c:907 ../libnm-core/nm-team-utils.c:1990
+#: ../libnm-core/nm-setting-wireless.c:912 ../libnm-core/nm-team-utils.c:1990
 #, c-format
 msgid "invalid value"
 msgstr "无效值"
 
-#: ../libnm-core/nm-setting-wireless.c:948
+#: ../libnm-core/nm-setting-wireless.c:953
 #, c-format
 msgid "conflicting value of mac-address-randomization and cloned-mac-address"
 msgstr "mac-address-randomization 和 cloned-mac-address 的值冲突"
 
-#: ../libnm-core/nm-setting.c:806
+#: ../libnm-core/nm-setting.c:809
 #, c-format
 msgid "duplicate property"
 msgstr "重复的属性"
 
-#: ../libnm-core/nm-setting.c:900 ../libnm-core/nm-setting.c:949
+#: ../libnm-core/nm-setting.c:903 ../libnm-core/nm-setting.c:952
 #, c-format
 msgid "can't set property of type '%s' from value of type '%s'"
 msgstr "无法从类型为 \"%s%s\" 的值设置类型为 \"\" 的属性"
 
-#: ../libnm-core/nm-setting.c:919 ../libnm-core/nm-setting.c:934
+#: ../libnm-core/nm-setting.c:922 ../libnm-core/nm-setting.c:937
 #, c-format
 msgid "failed to set property: %s"
 msgstr "设定属性失败：%s"
 
-#: ../libnm-core/nm-setting.c:964
+#: ../libnm-core/nm-setting.c:967
 #, c-format
 msgid "can not set property: %s"
 msgstr "无法设定属性：%s"
 
-#: ../libnm-core/nm-setting.c:829
+#: ../libnm-core/nm-setting.c:832
 #, c-format
 msgid "unknown property"
 msgstr "未知属性"
 
-#: ../libnm-core/nm-setting.c:2015
+#: ../libnm-core/nm-setting.c:2018
 msgid "secret not found"
 msgstr "未找到密钥"
 
 #: ../libnm-core/nm-setting.c:1778
 msgid "secret is not set"
-msgstr "未设置密钥"
+msgstr "未设置 secret"
 
-#: ../libnm-core/nm-utils.c:2330
+#: ../libnm-core/nm-utils.c:2284
 #, c-format
 msgid "'%s' is not a valid handle."
 msgstr "\"%s\" 不是有效的处理模块。"
 
-#: ../libnm-core/nm-utils.c:2458
+#: ../libnm-core/nm-utils.c:2412
 #, c-format
 msgid "'%s' unexpected: parent already specified."
 msgstr "意外的 \"%s\"：已指定上级。"
 
-#: ../libnm-core/nm-utils.c:2474
+#: ../libnm-core/nm-utils.c:2428
 #, c-format
 msgid "invalid handle: '%s'"
 msgstr "无效的句柄：\"%s\""
 
-#: ../libnm-core/nm-utils.c:2496
+#: ../libnm-core/nm-utils.c:2450
 msgid "parent not specified."
 msgstr "未指定上级。"
 
-#: ../libnm-core/nm-utils.c:2558
+#: ../libnm-core/nm-utils.c:2512
 #, c-format
 msgid "unsupported qdisc option: '%s'."
 msgstr "不支持的排队规则（qdisc）选项：\"%s\"。"
 
-#: ../libnm-core/nm-utils.c:2680
+#: ../libnm-core/nm-utils.c:2634
 msgid "action name missing."
 msgstr "操作名缺失。"
 
-#: ../libnm-core/nm-utils.c:2706
+#: ../libnm-core/nm-utils.c:2660
 #, c-format
 msgid "unsupported action option: '%s'."
 msgstr "不支持的操作选项：\"%s\"。"
 
-#: ../libnm-core/nm-utils.c:2844
+#: ../libnm-core/nm-utils.c:2798
 msgid "invalid action: "
 msgstr "无效操作： "
 
-#: ../libnm-core/nm-utils.c:2848
+#: ../libnm-core/nm-utils.c:2802
 #, c-format
 msgid "unsupported tfilter option: '%s'."
 msgstr "不支持的流量过滤器（tfilter）选项：\"%s\"。"
 
-#: ../libnm-core/nm-utils.c:3449
+#: ../libnm-core/nm-utils.c:3403
 #, c-format
 msgid "failed stat file %s: %s"
 msgstr "统计文件 %s 失败：%s"
 
-#: ../libnm-core/nm-utils.c:3458
+#: ../libnm-core/nm-utils.c:3412
 #, c-format
 msgid "not a file (%s)"
 msgstr "不是一个文件（%s）"
 
-#: ../libnm-core/nm-utils.c:3469
+#: ../libnm-core/nm-utils.c:3423
 #, c-format
 msgid "invalid file owner %d for %s"
 msgstr "对 %d%s 无效的文件所有者"
 
-#: ../libnm-core/nm-utils.c:3480
+#: ../libnm-core/nm-utils.c:3434
 #, c-format
 msgid "file permissions for %s"
 msgstr "%s 的文件权限"
 
-#: ../libnm-core/nm-utils.c:3490
+#: ../libnm-core/nm-utils.c:3444
 #, c-format
 msgid "reject %s"
 msgstr "拒绝 %s"
 
-#: ../libnm-core/nm-utils.c:3509
+#: ../libnm-core/nm-utils.c:3463
 #, c-format
 msgid "path is not absolute (%s)"
 msgstr "路径不是绝对路径（%s）"
 
-#: ../libnm-core/nm-utils.c:3523
+#: ../libnm-core/nm-utils.c:3477
 #, c-format
 msgid "Plugin file does not exist (%s)"
 msgstr "插件文件不存在（%s）"
 
-#: ../libnm-core/nm-utils.c:3531
+#: ../libnm-core/nm-utils.c:3485
 #, c-format
 msgid "Plugin is not a valid file (%s)"
 msgstr "插件不是有效的文件（%s）"
 
-#: ../libnm-core/nm-utils.c:3541
+#: ../libnm-core/nm-utils.c:3495
 #, c-format
 msgid "libtool archives are not supported (%s)"
 msgstr "不支持 libtool 归档（%s）"
 
-#: ../libnm-core/nm-utils.c:3623
+#: ../libnm-core/nm-utils.c:3577
 #, c-format
 msgid "Could not find \"%s\" binary"
 msgstr "无法找到 \"%s\" 二进制文件"
 
-#: ../libnm-core/nm-utils.c:4650
+#: ../libnm-core/nm-utils.c:4646
 #, c-format
 msgid "not a valid ethernet MAC address for mask at position %lld"
 msgstr "对于 %lld 位置的掩码，该以太网 MAC 地址无效"
 
-#: ../libnm-core/nm-utils.c:4665
+#: ../libnm-core/nm-utils.c:4661
 #, c-format
 msgid "not a valid ethernet MAC address #%u at position %lld"
 msgstr "在位置 %u%lld，该以太网 MAC 地址 # 无效"
 
-#: ../libnm-core/nm-utils.c:4731
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4620
 msgid "interface name is too short"
 msgstr "接口名太短"
 
-#: ../libnm-core/nm-utils.c:4740
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4629
 msgid "interface name is reserved"
 msgstr "接口名被保留"
 
-#: ../libnm-core/nm-utils.c:4752
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4641
 msgid "interface name contains an invalid character"
 msgstr "接口名包含无效字符"
 
-#: ../libnm-core/nm-utils.c:4758
+#: ../shared/nm-glib-aux/nm-shared-utils.c:4647
 msgid "interface name is longer than 15 characters"
 msgstr "接口名长度超过 15 字符"
 
-#: ../libnm-core/nm-utils.c:5425
+#: ../libnm-core/nm-utils.c:5356
 msgid "not valid utf-8"
 msgstr "不是有效的 utf-8"
 
-#: ../libnm-core/nm-utils.c:5446 ../libnm-core/nm-utils.c:5499
+#: ../libnm-core/nm-utils.c:5377 ../libnm-core/nm-utils.c:5430
 msgid "is not a JSON object"
 msgstr "不是 JSON 对象"
 
-#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
+#: ../libnm-core/nm-utils.c:5406 ../libnm-core/nm-utils.c:5443
 msgid "value is NULL"
 msgstr "值为 NULL"
 
-#: ../libnm-core/nm-utils.c:5475 ../libnm-core/nm-utils.c:5512
+#: ../libnm-core/nm-utils.c:5406 ../libnm-core/nm-utils.c:5443
 msgid "value is empty"
 msgstr "值为空"
 
-#: ../libnm-core/nm-utils.c:5487
+#: ../libnm-core/nm-utils.c:5418
 #, c-format
 msgid "invalid JSON at position %d (%s)"
 msgstr "位置 %d 有无效的 JSON（%s）"
 
-#: ../libnm-core/nm-utils.c:5649 ../libnm-core/nm-utils.c:5669
+#: ../libnm-core/nm-utils.c:5580 ../libnm-core/nm-utils.c:5600
 msgid "unterminated escape sequence"
 msgstr "未结束的转义序列"
 
-#: ../libnm-core/nm-utils.c:5694
+#: ../libnm-core/nm-utils.c:5625
 #, c-format
 msgid "unknown attribute '%s'"
 msgstr "未知属性 \"%s\""
 
-#: ../libnm-core/nm-utils.c:5709
+#: ../libnm-core/nm-utils.c:5640
 #, c-format
 msgid "missing key-value separator '%c' after '%s'"
 msgstr "在 \"%2$s\" 后缺少键值对分隔符 \"%1$c\""
 
-#: ../libnm-core/nm-utils.c:5725
+#: ../libnm-core/nm-utils.c:5656
 #, c-format
 msgid "invalid uint32 value '%s' for attribute '%s'"
 msgstr "uint32 值 \"%1$s\" 对属性 \"%2$s\" 无效"
 
-#: ../libnm-core/nm-utils.c:5734
+#: ../libnm-core/nm-utils.c:5665
 #, c-format
 msgid "invalid uint8 value '%s' for attribute '%s'"
 msgstr "uint8 值 \"%1$s\" 对属性 \"%2$s\" 无效"
 
-#: ../libnm-core/nm-utils.c:5744
+#: ../libnm-core/nm-utils.c:5675
 #, c-format
 msgid "invalid boolean value '%s' for attribute '%s'"
 msgstr "布尔值 \"%1$s\" 对属性 \"%2$s\" 无效"
 
-#: ../libnm-core/nm-utils.c:5754
+#: ../libnm-core/nm-utils.c:5685
 #, c-format
 msgid "unsupported attribute '%s' of type '%s'"
 msgstr "不支持类型 \"%2$s\" 的属性 \"%1$s\""
@@ -10882,98 +10888,98 @@
 msgid "the plugin does not support export capability"
 msgstr "插件不支持导出功能"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:93
+#: ../libnm-core/nm-vpn-plugin-info.c:111
 #, c-format
 msgid "missing filename"
 msgstr "缺少文件名"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:101
+#: ../libnm-core/nm-vpn-plugin-info.c:119
 #, c-format
 msgid "filename must be an absolute path (%s)"
 msgstr "文件名必须为绝对路径（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:110
+#: ../libnm-core/nm-vpn-plugin-info.c:128
 #, c-format
 msgid "filename has invalid format (%s)"
 msgstr "文件名具有无效的格式（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:433
+#: ../libnm-core/nm-vpn-plugin-info.c:419
 #, c-format
 msgid "there exists a conflicting plugin (%s) that has the same %s.%s value"
 msgstr "已存在具有相同 %s.%s 值的冲突插件（%s）"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:471
+#: ../libnm-core/nm-vpn-plugin-info.c:457
 #, c-format
 msgid "there exists a conflicting plugin with the same name (%s)"
 msgstr "已存在具有相同名称（%s）的冲突插件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1053
+#: ../libnm-core/nm-vpn-plugin-info.c:1045
 #, c-format
 msgid "missing \"plugin\" setting"
 msgstr "缺少 \"plugin\" 设置"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1063
+#: ../libnm-core/nm-vpn-plugin-info.c:1055
 #, c-format
 msgid "%s: don't retry loading plugin which already failed previously"
 msgstr "%s：不要重试加载之前已失败的插件"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1139
+#: ../libnm-core/nm-vpn-plugin-info.c:1131
 msgid "missing filename to load VPN plugin info"
 msgstr "缺少文件名来加载 VPN 插件信息"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1151
+#: ../libnm-core/nm-vpn-plugin-info.c:1143
 msgid "missing name for VPN plugin info"
 msgstr "缺少 VPN 插件信息的名称"
 
-#: ../libnm-core/nm-vpn-plugin-info.c:1160
+#: ../libnm-core/nm-vpn-plugin-info.c:1152
 msgid "missing service for VPN plugin info"
 msgstr "缺少 VPN 插件信息的服务"
 
-#: ../libnm/nm-device.c:1459
+#: ../libnm/nm-device.c:1526
 msgid "Bluetooth"
 msgstr "蓝牙"
 
-#: ../libnm/nm-device.c:1461
+#: ../libnm/nm-device.c:1528
 msgid "OLPC Mesh"
 msgstr "OLPC Mesh"
 
-#: ../libnm/nm-device.c:1469
+#: ../libnm/nm-device.c:1536
 msgid "WiMAX"
 msgstr "WiMAX"
 
-#: ../libnm/nm-device.c:1483
+#: ../libnm/nm-device.c:1550
 msgid "ADSL"
 msgstr "ADSL"
 
-#: ../libnm/nm-device.c:1485
+#: ../libnm/nm-device.c:1552
 msgid "MACVLAN"
 msgstr "MACVLAN"
 
-#: ../libnm/nm-device.c:1487
+#: ../libnm/nm-device.c:1554
 msgid "VXLAN"
 msgstr "VXLAN"
 
-#: ../libnm/nm-device.c:1489
+#: ../libnm/nm-device.c:1556
 msgid "IPTunnel"
 msgstr "IP 隧道"
 
-#: ../libnm/nm-device.c:1491
+#: ../libnm/nm-device.c:1558
 msgid "Tun"
 msgstr "Tun"
 
-#: ../libnm/nm-device.c:1493
+#: ../libnm/nm-device.c:1560
 msgid "Veth"
 msgstr "Veth"
 
-#: ../libnm/nm-device.c:1539
+#: ../libnm/nm-device.c:1608
 msgid "Wired"
 msgstr "有线"
 
-#: ../libnm/nm-device.c:1571
+#: ../libnm/nm-device.c:1640
 msgid "PCI"
 msgstr "PCI"
 
-#: ../libnm/nm-device.c:1573
+#: ../libnm/nm-device.c:1642
 msgid "USB"
 msgstr "USB"
 
@@ -10983,56 +10989,56 @@
 #. * "%2$s (%1$s)" if there's no grammatical way to combine
 #. * the strings otherwise.
 #. 
-#: ../libnm/nm-device.c:1873 ../libnm/nm-device.c:1892
+#: ../libnm/nm-device.c:1942 ../libnm/nm-device.c:1961
 #, c-format
 msgctxt "long device name"
 msgid "%s %s"
 msgstr "%s %s"
 
-#: ../libnm-glib/nm-remote-connection.c:148
+#: ../libnm-glib/nm-remote-connection.c:149
 msgid "Disconnected by D-Bus"
 msgstr "被 D-Bus 断开"
 
 #: ../libnm-util/crypto_gnutls.c:84
 #, c-format
 msgid "Hash length too long (%d > %d)."
-msgstr "散列长度太长（%d > %d）。"
+msgstr "Hash 长度太常 (%d > %d)。"
 
 #: ../libnm-util/crypto_gnutls.c:115
 #, c-format
 msgid "Failed to initialize the MD5 engine: %s (%s)"
-msgstr "初始化 MD5 引擎失败：%s（%s）"
+msgstr "初始化 MD5 引擎失败：%s (%s)"
 
 #: ../libnm-util/crypto_nss.c:99
 #, c-format
 msgid "Failed to initialize the MD5 context: %d."
 msgstr "初始化 MD5 环境失败：%d。"
 
-#: ../libnm-util/crypto_nss.c:457
+#: ../libnm-util/crypto_nss.c:460
 #, c-format
 msgid "Couldn't convert password to UCS2: %d"
 msgstr "无法将密码转换为 USC2 方式：%d"
 
-#: ../libnm-util/nm-setting-bluetooth.c:185
+#: ../libnm-util/nm-setting-bluetooth.c:186
 #, c-format
 msgid "requires '%s' or '%s' setting"
-msgstr "需要 \"%s\" 或 \"%s\" 设置"
+msgstr "要求“%s”或“%s”设置"
 
-#: ../libnm-util/nm-setting-bond.c:580
+#: ../libnm-util/nm-setting-bond.c:582
 #, c-format
 msgid "'%s' is not a valid interface name for '%s' option"
-msgstr "\"%s\" 不是 \"%s\" 选项的有效接口名"
+msgstr "“%s” 不是 “%s” 选项的有效接口名"
 
-#: ../libnm-util/nm-setting-connection.c:831
+#: ../libnm-util/nm-setting-connection.c:834
 #: ../libnm-util/nm-setting-infiniband.c:269
 #, c-format
 msgid "'%s' is not a valid interface name"
-msgstr "\"%s\" 不是有效的接口名称"
+msgstr "“%s”不是有效的接口名称"
 
-#: ../libnm-util/nm-setting-connection.c:859
+#: ../libnm-util/nm-setting-connection.c:862
 #, c-format
 msgid "requires presence of '%s' setting in the connection"
-msgstr "需要连接中存在 \"%s\" 设置"
+msgstr "要求连接中存在“%s”设置"
 
 #: ../libnm-util/nm-setting-infiniband.c:231
 msgid "not a valid interface name"
@@ -11049,41 +11055,41 @@
 msgstr "%d。IPv4 地址前缀无效"
 
 #: ../libnm-util/nm-setting-ip4-config.c:983
-#: ../libnm-util/nm-setting-ip6-config.c:937
+#: ../libnm-util/nm-setting-ip6-config.c:939
 #, c-format
 msgid "%d. route has invalid prefix"
 msgstr "%d。路由前缀无效"
 
-#: ../libnm-util/nm-setting-ip6-config.c:911
+#: ../libnm-util/nm-setting-ip6-config.c:913
 #, c-format
 msgid "%d. IPv6 address is invalid"
-msgstr "%d。IPv6 地址无效"
+msgstr "%d. IPv6 地址无效。"
 
-#: ../libnm-util/nm-setting-ip6-config.c:921
+#: ../libnm-util/nm-setting-ip6-config.c:923
 #, c-format
 msgid "%d. IPv6 address has invalid prefix"
-msgstr "%d。IPv6 地址前缀无效"
+msgstr "%d. IPv6 地址有无效前缀。"
 
-#: ../libnm-util/nm-setting-vpn.c:580
+#: ../libnm-util/nm-setting-vpn.c:582
 #, c-format
 msgid "Failed to convert '%s' value '%s' to uint"
-msgstr "转换 \"%s\" 值 \"%s\" 为 uint 失败"
+msgstr "转换 '%s' 值 '%s' 为 uint 失败"
 
-#: ../libnm-util/nm-setting-vpn.c:587
+#: ../libnm-util/nm-setting-vpn.c:589
 #, c-format
 msgid "Secret flags property '%s' not found"
-msgstr "未找到密钥（secret）标记属性 \"%s\""
+msgstr "未找到 Secret flags 属性 '%s'"
 
-#: ../libnm-util/nm-setting-wireless.c:806
+#: ../libnm-util/nm-setting-wireless.c:807
 #, c-format
 msgid "requires setting '%s' property"
-msgstr "需要设置 \"%s\" 属性"
+msgstr "要求设置“%s”属性"
 
 #: ../libnm/nm-device-adsl.c:64
 msgid "The connection was not an ADSL connection."
 msgstr "此连接不是 ADSL 连接。"
 
-#: ../libnm/nm-device-bond.c:104
+#: ../libnm/nm-device-bond.c:105
 msgid "The connection was not a bond connection."
 msgstr "此连接不是绑定（bond）连接。"
 
@@ -11115,11 +11121,11 @@
 "The device is lacking Bluetooth capabilities required by the connection."
 msgstr "设备缺少连接所要求的蓝牙功能。"
 
-#: ../libnm/nm-device-dummy.c:68
+#: ../libnm/nm-device-dummy.c:61
 msgid "The connection was not a dummy connection."
 msgstr "此连接不是虚拟（dummy）连接。"
 
-#: ../libnm/nm-device-dummy.c:75 ../libnm/nm-device-generic.c:91
+#: ../libnm/nm-device-dummy.c:68 ../libnm/nm-device-generic.c:85
 #: ../libnm/nm-device-ovs-bridge.c:84 ../libnm/nm-device-ovs-interface.c:52
 #: ../libnm/nm-device-ovs-port.c:84
 msgid "The connection did not specify an interface name."
@@ -11152,7 +11158,7 @@
 msgid "Device MAC (%s) is blacklisted by the connection."
 msgstr "设备 MAC（%s）被连接列入了黑名单。"
 
-#: ../libnm/nm-device-generic.c:84
+#: ../libnm/nm-device-generic.c:78
 msgid "The connection was not a generic connection."
 msgstr "此连接不是通用的连接。"
 
@@ -11180,7 +11186,7 @@
 msgid "The connection was not an IP tunnel connection."
 msgstr "此连接不是 IP 隧道连接。"
 
-#: ../libnm/nm-device-macvlan.c:151
+#: ../libnm/nm-device-macvlan.c:152
 msgid "The connection was not a MAC-VLAN connection."
 msgstr "此连接不是 MAC-VLAN 连接。"
 
@@ -11196,7 +11202,7 @@
 msgid "The device is lacking capabilities required by the connection."
 msgstr "设备缺少连接所要求的功能。"
 
-#: ../libnm/nm-device-olpc-mesh.c:107
+#: ../libnm/nm-device-olpc-mesh.c:101
 msgid "The connection was not an OLPC Mesh connection."
 msgstr "此连接不是 OLPC Mesh 连接。"
 
@@ -11212,7 +11218,7 @@
 msgid "The connection was not a ovs_port connection."
 msgstr "此连接不是 ovs 端口连接。"
 
-#: ../libnm/nm-device-team.c:131
+#: ../libnm/nm-device-team.c:125
 msgid "The connection was not a team connection."
 msgstr "此连接不是组合（team）连接。"
 
@@ -11224,7 +11230,7 @@
 msgid "The VLAN identifiers of the device and the connection didn't match."
 msgstr "设备和连接的 VLAN 标识符不匹配。"
 
-#: ../libnm/nm-device-vlan.c:143
+#: ../libnm/nm-device-vlan.c:144
 msgid "The hardware address of the device and the connection didn't match."
 msgstr "设备和连接的硬件地址不匹配。"
 
@@ -11265,24 +11271,24 @@
 msgid "OpenVSwitch Bridge"
 msgstr ""
 
-#: ../libnm/nm-device.c:1495
+#: ../libnm/nm-device.c:1562
 msgid "MACsec"
 msgstr "MACsec"
 
-#: ../libnm/nm-device.c:1497
+#: ../libnm/nm-device.c:1564
 msgid "Dummy"
 msgstr "虚拟"
 
-#: ../libnm/nm-device.c:1499
+#: ../libnm/nm-device.c:1566
 msgid "PPP"
 msgstr "PPP"
 
-#: ../libnm/nm-device.c:2569
+#: ../libnm/nm-device.c:2638
 #, c-format
 msgid "The connection was not valid: %s"
 msgstr "连接无效：%s"
 
-#: ../libnm/nm-device.c:2578
+#: ../libnm/nm-device.c:2647
 #, c-format
 msgid "The interface names of the device and the connection didn't match."
 msgstr "这个设备的接口名和连接不匹配。"
@@ -11434,33 +11440,33 @@
 msgid "System policy prevents enabling or disabling connectivity checking"
 msgstr "系统策略阻止启用或禁用连接性检查"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1669
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2202
 #, c-format
 msgid "object class '%s' has no property named '%s'"
 msgstr "对象类 \"%s\" 没有名为 \"%s\" 的属性"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1676
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2209
 #, c-format
 msgid "property '%s' of object class '%s' is not writable"
 msgstr "对象类 \"%2$s\" 的 \"%1$s\" 属性是不可写的"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1683
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2216
 #, c-format
 msgid ""
 "construct property \"%s\" for object '%s' can't be set after construction"
 msgstr "对象 \"%2$s\" 的构造属性 \"%1$s\" 在构造后不能被设定"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1691
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2224
 #, c-format
 msgid "'%s::%s' is not a valid property name; '%s' is not a GObject subtype"
 msgstr "\"%s::%s\" 不是有效的属性名；\"%s\" 不是 GObject 子类型"
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1700
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2233
 #, c-format
 msgid "unable to set property '%s' of type '%s' from value of type '%s'"
 msgstr "无法从类型 \"%3$s\" 的值设定类型为 \"%2$s\" 的属性 \"%1$s\""
 
-#: ../shared/nm-glib-aux/nm-shared-utils.c:1711
+#: ../shared/nm-glib-aux/nm-shared-utils.c:2244
 #, c-format
 msgid ""
 "value \"%s\" of type '%s' is invalid or out of range for property '%s' of "
@@ -11483,25 +11489,25 @@
 msgstr "读取配置失败：%s\n"
 
 #. Logging/debugging
-#: ../src/main.c:184 ../src/nm-iface-helper.c:295
+#: ../src/main.c:184 ../src/nm-iface-helper.c:296
 msgid "Print NetworkManager version and exit"
 msgstr "输出网络管理器版本并退出"
 
-#: ../src/main.c:185 ../src/nm-iface-helper.c:296
+#: ../src/main.c:185 ../src/nm-iface-helper.c:297
 msgid "Don't become a daemon"
 msgstr "不成为守护进程"
 
-#: ../src/main.c:186 ../src/nm-iface-helper.c:298
+#: ../src/main.c:186 ../src/nm-iface-helper.c:299
 #, c-format
 msgid "Log level: one of [%s]"
 msgstr "日志级别：取 [%s] 之一"
 
-#: ../src/main.c:188 ../src/nm-iface-helper.c:300
+#: ../src/main.c:188 ../src/nm-iface-helper.c:301
 #, c-format
 msgid "Log domains separated by ',': any combination of [%s]"
 msgstr "以 \",\" 分开的日志域：可以是 [%s] 的任意组合"
 
-#: ../src/main.c:190 ../src/nm-iface-helper.c:302
+#: ../src/main.c:190 ../src/nm-iface-helper.c:303
 msgid "Make all warnings fatal"
 msgstr "视所有警告为致命错误"
 
@@ -11523,12 +11529,12 @@
 "网络管理器（NetworkManager）监视所有网络连接，并自动选择要使用的最佳连接。\n"
 "它还允许用户指定计算机无线网卡连接的无线访问点。"
 
-#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:443
+#: ../src/main.c:325 ../src/main-utils.c:275 ../src/nm-iface-helper.c:444
 #, c-format
 msgid "%s.  Please use --help to see a list of valid options.\n"
 msgstr "%s。请使用 --help 查看有效选项列表。\n"
 
-#: ../src/nm-iface-helper.c:448
+#: ../src/nm-iface-helper.c:449
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' passed on command line.\n"
 msgstr "正在忽略传给命令行的未识别日志域 \"%s\"。\n"
@@ -11541,9 +11547,9 @@
 #: ../src/main.c:338
 #, c-format
 msgid "Ignoring unrecognized log domain(s) '%s' from config files.\n"
-msgstr "正在忽略来自配置文件的未识别日志域 \"%s\"。\n"
+msgstr "正在忽略来自配置文件的未识别日志域“%s”。\n"
 
-#: ../src/main.c:358 ../src/nm-iface-helper.c:456
+#: ../src/main.c:358 ../src/nm-iface-helper.c:457
 #, c-format
 msgid "Could not daemonize: %s [error %u]\n"
 msgstr "无法设为守护进程：%s [错误 %u]\n"
@@ -11646,11 +11652,11 @@
 msgid "Dummy connection"
 msgstr "虚拟连接"
 
-#: ../src/devices/nm-device-ethernet.c:1506
+#: ../src/devices/nm-device-ethernet.c:1562
 msgid "PPPoE connection"
 msgstr "PPPoE 连接"
 
-#: ../src/devices/nm-device-ethernet.c:1506
+#: ../src/devices/nm-device-ethernet.c:1562
 msgid "Wired connection"
 msgstr "有线连接"
 
@@ -11659,7 +11665,7 @@
 msgid "Wired connection %d"
 msgstr "有线连接 %d"
 
-#: ../src/devices/nm-device-ip-tunnel.c:407
+#: ../src/devices/nm-device-ip-tunnel.c:408
 msgid "IP tunnel connection"
 msgstr "IP 隧道连接"
 
@@ -11675,7 +11681,7 @@
 msgid "Team connection"
 msgstr "组合连接"
 
-#: ../clients/cli/devices.c:1228 ../src/devices/wifi/nm-device-olpc-mesh.c:118
+#: ../clients/cli/devices.c:1238 ../src/devices/wifi/nm-device-olpc-mesh.c:118
 msgid "Mesh"
 msgstr "Mesh"
 
@@ -11828,13 +11834,13 @@
 msgid "WPA authentication is incompatible with Shared Key authentication"
 msgstr "WPA 验证和共享密钥（Shared Key）验证不兼容"
 
-#: ../src/devices/wifi/nm-wifi-utils.c:776
+#: ../src/devices/wifi/nm-wifi-utils.c:782
 msgid "Failed to determine AP security information"
 msgstr "确定 AP 安全信息失败"
 
-#: ../src/devices/wwan/nm-modem-broadband.c:690
+#: ../src/devices/wwan/nm-modem-broadband.c:695
 msgid "GSM mobile broadband connection requires a 'gsm' setting"
-msgstr "GSM 移动宽带连接要求 \"gsm\" 设置"
+msgstr "GSM 移动宽带连接要求 'gsm' 设置"
 
 #: ../src/nm-config.c:585
 msgid "Config file location"
@@ -11868,7 +11874,7 @@
 msgid "Quit after initial configuration"
 msgstr "初始化配置后退出"
 
-#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:297
+#: ../src/nm-config.c:593 ../src/nm-iface-helper.c:298
 msgid "Don't become a daemon, and log to stderr"
 msgstr "不成为守护进程，并向标准错误打印日志"
 
@@ -11886,105 +11892,105 @@
 msgstr "预期的响应开头"
 
 #. Interface/IP config
-#: ../src/nm-iface-helper.c:277
+#: ../src/nm-iface-helper.c:278
 msgid "The interface to manage"
 msgstr "要管理的接口"
 
-#: ../src/nm-iface-helper.c:278
+#: ../src/nm-iface-helper.c:279
 msgid "Connection UUID"
 msgstr "连接 UUID"
 
-#: ../src/nm-iface-helper.c:279
+#: ../src/nm-iface-helper.c:280
 msgid "Connection Token for Stable IDs"
 msgstr "固定 ID 的连接令牌"
 
-#: ../src/nm-iface-helper.c:280
+#: ../src/nm-iface-helper.c:281
 msgid "Whether to manage IPv6 SLAAC"
 msgstr "是否管理 IPv6 SLAAC"
 
-#: ../src/nm-iface-helper.c:281
+#: ../src/nm-iface-helper.c:282
 msgid "Whether SLAAC must be successful"
 msgstr "SLAAC 是否必须是成功的"
 
-#: ../src/nm-iface-helper.c:282
+#: ../src/nm-iface-helper.c:283
 msgid "Use an IPv6 temporary privacy address"
 msgstr "使用 IPv6 临时私有地址"
 
-#: ../src/nm-iface-helper.c:283
+#: ../src/nm-iface-helper.c:284
 msgid "Current DHCPv4 address"
 msgstr "当前的 DHCPv4 地址"
 
-#: ../src/nm-iface-helper.c:284
+#: ../src/nm-iface-helper.c:285
 msgid "Whether DHCPv4 must be successful"
 msgstr "DHCPv4 是否必须是成功的"
 
-#: ../src/nm-iface-helper.c:285
+#: ../src/nm-iface-helper.c:286
 msgid "Hex-encoded DHCPv4 client ID"
 msgstr "十六进制编码的 DHCPv4 客户 ID"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "Hostname to send to DHCP server"
 msgstr "发送至 DHCP 服务器的主机名"
 
-#: ../src/nm-iface-helper.c:286
+#: ../src/nm-iface-helper.c:287
 msgid "barbar"
 msgstr "barbar"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "FQDN to send to DHCP server"
 msgstr "发送至 DHCP 服务器的 FQDN"
 
-#: ../src/nm-iface-helper.c:287
+#: ../src/nm-iface-helper.c:288
 msgid "host.domain.org"
 msgstr "host.domain.org"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "Route priority for IPv4"
 msgstr "IPv4 的路由优先级"
 
-#: ../src/nm-iface-helper.c:288
+#: ../src/nm-iface-helper.c:289
 msgid "0"
 msgstr "0"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "Route priority for IPv6"
 msgstr "IPv6 的路由优先级"
 
-#: ../src/nm-iface-helper.c:289
+#: ../src/nm-iface-helper.c:290
 msgid "1024"
 msgstr "1024"
 
-#: ../src/nm-iface-helper.c:290
+#: ../src/nm-iface-helper.c:291
 msgid "Hex-encoded Interface Identifier"
 msgstr "十六进制编码的接口标识符"
 
-#: ../src/nm-iface-helper.c:291
+#: ../src/nm-iface-helper.c:292
 msgid "IPv6 SLAAC address generation mode"
 msgstr "IPv6 SLAAC 地址生成模式"
 
-#: ../src/nm-iface-helper.c:292
+#: ../src/nm-iface-helper.c:293
 msgid ""
 "The logging backend configuration value. See logging.backend in "
 "NetworkManager.conf"
 msgstr "日志后台的配置值。请参考 NetworkManager.conf 里的 logging.backend"
 
-#: ../src/nm-iface-helper.c:312
+#: ../src/nm-iface-helper.c:313
 msgid ""
 "nm-iface-helper is a small, standalone process that manages a single network "
 "interface."
 msgstr "nm-iface-helper 是一个管理单个网络接口的小型独立进程。"
 
-#: ../src/nm-iface-helper.c:423
+#: ../src/nm-iface-helper.c:424
 #, c-format
 msgid "An interface name and UUID are required\n"
 msgstr "接口名称和 UUID 是必需的\n"
 
-#: ../src/nm-iface-helper.c:430
+#: ../src/nm-iface-helper.c:431
 #, c-format
 msgid "Failed to find interface index for %s (%s)\n"
 msgstr "寻找 %s(%s) 的接口索引失败\n"
 
-#: ../src/nm-iface-helper.c:489
+#: ../src/nm-iface-helper.c:490
 #, c-format
 msgid "(%s): Invalid IID %s\n"
 msgstr "（%s）：无效的 IID %s\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/nova.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/nova.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/nova.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/nova.po	2020-07-08 13:54:00.000000000 +0000
@@ -42,8 +42,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:07+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:47+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "Generated-By: Babel 2.2.0\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/opcodes.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/opcodes.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/opcodes.po	2020-01-23 16:51:54.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/opcodes.po	2020-07-08 13:53:54.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:56+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:49+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/parted.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/parted.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/parted.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/parted.po	2020-07-08 13:53:59.000000000 +0000
@@ -7,35 +7,35 @@
 "Project-Id-Version: parted 1.6.6\n"
 "Report-Msgid-Bugs-To: bug-parted@gnu.org\n"
 "POT-Creation-Date: 2014-07-28 23:04-0400\n"
-"PO-Revision-Date: 2019-03-27 03:23+0000\n"
+"PO-Revision-Date: 2020-06-24 16:18+0000\n"
 "Last-Translator: Wang Li <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:06+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:56+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: lib/argmatch.c:132
+#: lib/argmatch.c:133
 #, c-format
 msgid "invalid argument %s for %s"
 msgstr "无效的参数 %s 被用于 %s"
 
-#: lib/argmatch.c:133
+#: lib/argmatch.c:134
 #, c-format
 msgid "ambiguous argument %s for %s"
 msgstr "模糊的参数 %s 被用于 %s"
 
-#: lib/argmatch.c:152 lib/argmatch.h:223
+#: lib/argmatch.c:153
 msgid "Valid arguments are:"
 msgstr "有效的参数是："
 
-#: lib/closeout.c:122 libparted/labels/fdasd.c:145
+#: lib/closeout.c:112 libparted/labels/fdasd.c:151
 msgid "write error"
 msgstr "写入错误"
 
-#: lib/error.c:195
+#: lib/error.c:188
 msgid "Unknown system error"
 msgstr "不明系统错误"
 
@@ -69,12 +69,12 @@
 msgid "%s: unrecognized option '%c%s'\n"
 msgstr ""
 
-#: lib/getopt.c:621
+#: lib/getopt.c:805 lib/getopt.c:808
 #, c-format
 msgid "%s: invalid option -- '%c'\n"
 msgstr "%s：无效的选项 --“%c”\n"
 
-#: lib/getopt.c:636 lib/getopt.c:682
+#: lib/getopt.c:861 lib/getopt.c:878 lib/getopt.c:1088 lib/getopt.c:1106
 #, c-format
 msgid "%s: option requires an argument -- '%c'\n"
 msgstr "%s：选项需要一个参数 --“%c”\n"
@@ -113,41 +113,41 @@
 #. for your locale.
 #. 
 #. If you don't know what to put here, please see
-#. <https://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
+#. <http://en.wikipedia.org/wiki/Quotation_marks_in_other_languages>
 #. and use glyphs suitable for your language.
-#: lib/quotearg.c:362
+#: lib/quotearg.c:312
 msgid "`"
 msgstr "“"
 
-#: lib/quotearg.c:363
+#: lib/quotearg.c:313
 msgid "'"
 msgstr "”"
 
-#: lib/regcomp.c:135
+#: lib/regcomp.c:131
 msgid "Success"
 msgstr "成功"
 
-#: lib/regcomp.c:138
+#: lib/regcomp.c:134
 msgid "No match"
 msgstr "无匹配"
 
-#: lib/regcomp.c:141
+#: lib/regcomp.c:137
 msgid "Invalid regular expression"
 msgstr "无效的正则表达式"
 
-#: lib/regcomp.c:144
+#: lib/regcomp.c:140
 msgid "Invalid collation character"
 msgstr "无效的定序字符"
 
-#: lib/regcomp.c:147
+#: lib/regcomp.c:143
 msgid "Invalid character class name"
 msgstr "无效字符类别名称"
 
-#: lib/regcomp.c:150
+#: lib/regcomp.c:146
 msgid "Trailing backslash"
 msgstr "结尾反斜杠"
 
-#: lib/regcomp.c:153
+#: lib/regcomp.c:149
 msgid "Invalid back reference"
 msgstr "无效的反向引用"
 
@@ -155,43 +155,43 @@
 msgid "Unmatched [ or [^"
 msgstr "不匹配的 [ 或 [^"
 
-#: lib/regcomp.c:159
+#: lib/regcomp.c:155
 msgid "Unmatched ( or \\("
 msgstr "未匹配的 ( 或 \\("
 
-#: lib/regcomp.c:162
+#: lib/regcomp.c:158
 msgid "Unmatched \\{"
 msgstr "未匹配的 \\{"
 
-#: lib/regcomp.c:165
+#: lib/regcomp.c:161
 msgid "Invalid content of \\{\\}"
 msgstr "无效的 \\{\\} 内容"
 
-#: lib/regcomp.c:168
+#: lib/regcomp.c:164
 msgid "Invalid range end"
 msgstr "无效的范围结束符"
 
-#: lib/regcomp.c:171
+#: lib/regcomp.c:167
 msgid "Memory exhausted"
 msgstr "内存耗尽"
 
-#: lib/regcomp.c:174
+#: lib/regcomp.c:170
 msgid "Invalid preceding regular expression"
 msgstr "无效的前继正则表达式"
 
-#: lib/regcomp.c:177
+#: lib/regcomp.c:173
 msgid "Premature end of regular expression"
 msgstr "过早结束的正则表达式"
 
-#: lib/regcomp.c:180
+#: lib/regcomp.c:176
 msgid "Regular expression too big"
 msgstr "正则表达式太大"
 
-#: lib/regcomp.c:183
+#: lib/regcomp.c:179
 msgid "Unmatched ) or \\)"
 msgstr "未匹配的 ) 或 \\)"
 
-#: lib/regcomp.c:676
+#: lib/regcomp.c:707
 msgid "No previous regular expression"
 msgstr "无前一个正则表达式"
 
@@ -216,12 +216,12 @@
 msgid "^[nN]"
 msgstr "^[nN不否]"
 
-#: lib/version-etc.c:73
+#: lib/version-etc.c:74
 #, c-format
 msgid "Packaged by %s (%s)\n"
 msgstr "软件包由 %s (%s) 所打包\n"
 
-#: lib/version-etc.c:76
+#: lib/version-etc.c:77
 #, c-format
 msgid "Packaged by %s\n"
 msgstr "软件包由 %s 所打包\n"
@@ -229,7 +229,7 @@
 #. TRANSLATORS: Translate "(C)" to the copyright symbol
 #. (C-in-a-circle), if this symbol is available in the user's
 #. locale.  Otherwise, do not translate "(C)"; leave it as-is.
-#: lib/version-etc.c:83
+#: lib/version-etc.c:84
 msgid "(C)"
 msgstr "©"
 
@@ -249,19 +249,19 @@
 "\n"
 
 #. TRANSLATORS: %s denotes an author name.
-#: lib/version-etc.c:105
+#: lib/version-etc.c:102
 #, c-format
 msgid "Written by %s.\n"
 msgstr "由 %s 编写。\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:109
+#: lib/version-etc.c:106
 #, c-format
 msgid "Written by %s and %s.\n"
 msgstr "由 %s 和 %s 编写。\n"
 
 #. TRANSLATORS: Each %s denotes an author name.
-#: lib/version-etc.c:113
+#: lib/version-etc.c:110
 #, c-format
 msgid "Written by %s, %s, and %s.\n"
 msgstr "由 %s, %s 和 %s 编写。\n"
@@ -269,7 +269,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:120
+#: lib/version-etc.c:117
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -281,7 +281,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:127
+#: lib/version-etc.c:124
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -293,7 +293,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:134
+#: lib/version-etc.c:131
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -305,7 +305,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:142
+#: lib/version-etc.c:139
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -317,7 +317,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:150
+#: lib/version-etc.c:147
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -331,7 +331,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:159
+#: lib/version-etc.c:156
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -345,7 +345,7 @@
 #. TRANSLATORS: Each %s denotes an author name.
 #. You can use line breaks, estimating that each author name occupies
 #. ca. 16 screen columns and that a screen line has ca. 80 columns.
-#: lib/version-etc.c:170
+#: lib/version-etc.c:167
 #, c-format
 msgid ""
 "Written by %s, %s, %s,\n"
@@ -367,12 +367,12 @@
 "Report bugs to: %s\n"
 msgstr ""
 
-#: lib/version-etc.c:251
+#: lib/version-etc.c:247
 #, c-format
 msgid "Report %s bugs to: %s\n"
 msgstr "将 %s 错误报告给：%s\n"
 
-#: lib/version-etc.c:255 lib/version-etc.c:257
+#: lib/version-etc.c:251
 #, c-format
 msgid "%s home page: <%s>\n"
 msgstr "%s 首页：<%s>\n"
@@ -410,58 +410,58 @@
 msgstr "磁盘映像"
 
 #: libparted/arch/beos.c:346 libparted/arch/gnu.c:277
-#: libparted/arch/linux.c:1731
+#: libparted/arch/linux.c:1639
 #, c-format
 msgid "Error opening %s: %s"
 msgstr "打开 %s 出错：%s"
 
 #: libparted/arch/beos.c:357 libparted/arch/gnu.c:287
-#: libparted/arch/linux.c:1742
+#: libparted/arch/linux.c:1650
 #, c-format
 msgid "Unable to open %s read-write (%s).  %s has been opened read-only."
 msgstr "无法以读写方式打开 %s (%s)。%s 已按照只读方式打开。"
 
-#: libparted/arch/beos.c:419 libparted/arch/linux.c:1907
+#: libparted/arch/beos.c:419 libparted/arch/linux.c:1806
 #, c-format
 msgid "%s during seek for read on %s"
 msgstr "在为读取 %2$s 而调用 seek 时 %1$s"
 
 #: libparted/arch/beos.c:452 libparted/arch/gnu.c:465 libparted/arch/gnu.c:564
-#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1867
-#: libparted/arch/linux.c:1949
+#: libparted/arch/gnu.c:692 libparted/arch/linux.c:1766
+#: libparted/arch/linux.c:1847
 #, c-format
 msgid "%s during read on %s"
 msgstr "在读取 %2$s 期间 %1$s"
 
 #: libparted/arch/beos.c:488 libparted/arch/gnu.c:525
-#: libparted/arch/linux.c:2026
+#: libparted/arch/linux.c:1923
 #, c-format
 msgid "Can't write to %s, because it is opened read-only."
 msgstr "由于 %s 是以只读方式打开的，因此无法写入。"
 
-#: libparted/arch/beos.c:504 libparted/arch/linux.c:2051
+#: libparted/arch/beos.c:504 libparted/arch/linux.c:1948
 #, c-format
 msgid "%s during seek for write on %s"
 msgstr "在为写入 %2$s 调用 seek 时 %1$s"
 
 #: libparted/arch/beos.c:541 libparted/arch/gnu.c:601 libparted/arch/gnu.c:646
-#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1999
-#: libparted/arch/linux.c:2094 libparted/arch/linux.c:2167
+#: libparted/arch/gnu.c:723 libparted/arch/linux.c:1896
+#: libparted/arch/linux.c:1990 libparted/arch/linux.c:2062
 #, c-format
 msgid "%s during write on %s"
 msgstr "在写入 %2$s 时 %1$s"
 
-#: partprobe/partprobe.c:148
+#: partprobe/partprobe.c:143
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "尝试“%s --help”以获得更多信息。\n"
 
-#: partprobe/partprobe.c:152
+#: partprobe/partprobe.c:147
 #, c-format
 msgid "Usage: %s [OPTION] [DEVICE]...\n"
 msgstr "用法：%s [选项] [设备]…\n"
 
-#: partprobe/partprobe.c:153
+#: partprobe/partprobe.c:148
 msgid ""
 "Inform the operating system about partition table changes.\n"
 "\n"
@@ -477,7 +477,7 @@
 "  -h, --help       显示这个说明然后离开\n"
 "  -v, --version    输出版本信息然后离开\n"
 
-#: partprobe/partprobe.c:161
+#: partprobe/partprobe.c:156
 msgid ""
 "\n"
 "When no DEVICE is given, probe all partitions.\n"
@@ -485,7 +485,7 @@
 "\n"
 "如果没有指定任何设备，探查所有分区。\n"
 
-#: partprobe/partprobe.c:165
+#: partprobe/partprobe.c:160
 #, c-format
 msgid ""
 "\n"
@@ -524,7 +524,7 @@
 "before doing anything with %s."
 msgstr "%s 上的分区表无法被重新读取 (%s)。这意味着 Hurd 不知道任何您所作的修改。您应该在对 %s 做任何操作之前重新启动您的电脑。"
 
-#: libparted/arch/gnu.c:396 parted/parted.c:2318
+#: libparted/arch/gnu.c:396 parted/parted.c:2262
 msgid ""
 "You should reinstall your boot loader before rebooting.  Read section 4 of "
 "the Parted User documentation for more information."
@@ -535,17 +535,17 @@
 msgid "%s trying to sync %s to disk"
 msgstr "%s 试图将 %s 同步到磁盘上"
 
-#: libparted/arch/linux.c:633
+#: libparted/arch/linux.c:622
 #, c-format
 msgid "Could not stat device %s - %s."
 msgstr "无法对设备 %s - %s 做 stat 操作。"
 
-#: libparted/arch/linux.c:690
+#: libparted/arch/linux.c:679
 #, c-format
 msgid "Unable to determine the dm type of %s."
 msgstr "无法决定 %s 的 dm 类型。"
 
-#: libparted/arch/linux.c:774 libparted/arch/linux.c:907
+#: libparted/arch/linux.c:757
 #, c-format
 msgid ""
 "Could not determine sector size for %s: %s.\n"
@@ -554,7 +554,7 @@
 "无法决定用于 %s:%s 的扇区大小。\n"
 "使用缺省扇区大小 (%lld)。"
 
-#: libparted/arch/linux.c:795
+#: libparted/arch/linux.c:778
 #, c-format
 msgid ""
 "Could not determine physical sector size for %s.\n"
@@ -563,21 +563,21 @@
 "无法决定 %s 的物理扇区大小。\n"
 "将使用逻辑扇区大小 (%lld)。"
 
-#: libparted/arch/linux.c:855
+#: libparted/arch/linux.c:834
 #, c-format
 msgid "Unable to determine the size of %s (%s)."
 msgstr "无法确定 %s (%s) 的大小。"
 
-#: libparted/arch/linux.c:963
+#: libparted/arch/linux.c:920
 #, c-format
 msgid "Could not get identity of device %s - %s"
 msgstr "无法获取设备 %s - %s 的标识"
 
-#: libparted/arch/linux.c:958 libparted/arch/linux.c:973
+#: libparted/arch/linux.c:929
 msgid "Generic IDE"
 msgstr "一般 IDE"
 
-#: libparted/arch/linux.c:994
+#: libparted/arch/linux.c:950
 #, c-format
 msgid ""
 "Device %s has multiple (%d) logical sectors per physical sector.\n"
@@ -589,105 +589,105 @@
 "GNU Parted 对某些特定磁盘卷标/文件系统组合还是[实验性]支持，像是 GPT 和 ext2/3。\n"
 "请参照网页以获得最新的信息。"
 
-#: libparted/arch/linux.c:1172
+#: libparted/arch/linux.c:1127
 #, c-format
 msgid "Error initialising SCSI device %s - %s"
 msgstr "初始化 SCSI 设备 %s - %s 出错"
 
-#: libparted/arch/linux.c:1236
+#: libparted/arch/linux.c:1191
 #, c-format
 msgid ""
 "The device %s is so small that it cannot possibly store a file system or "
 "partition table.  Perhaps you selected the wrong device?"
 msgstr "设备 %s 太小，因此可能无法保存文件系统或分区表。也许您选择了错误的设备？"
 
-#: libparted/arch/linux.c:1349
+#: libparted/arch/linux.c:1304
 #, c-format
 msgid ""
 "Unable to determine geometry of file/device %s.  You should not use Parted "
 "unless you REALLY know what you're doing!"
 msgstr "无法决定文件/设备 %s 的几何位置。您不应使用 Parted 除非您真的知道在做什么！"
 
-#: libparted/arch/linux.c:1410
+#: libparted/arch/linux.c:1364
 msgid "Generic SD/MMC Storage Card"
 msgstr "通用 SD/MMC 记忆卡"
 
-#: libparted/arch/linux.c:1483
+#: libparted/arch/linux.c:1421
 msgid "DAC960 RAID controller"
 msgstr "DAC960 RAID 控制器"
 
-#: libparted/arch/linux.c:1488
+#: libparted/arch/linux.c:1426
 msgid "Promise SX8 SATA Device"
 msgstr "Promise SX8 SATA 设备"
 
-#: libparted/arch/linux.c:1493
+#: libparted/arch/linux.c:1431
 msgid "ATA over Ethernet Device"
 msgstr "以太网 ATA 设备"
 
-#: libparted/arch/linux.c:1499
+#: libparted/arch/linux.c:1437
 msgid "IBM S390 DASD drive"
 msgstr "IBM S390 DASD 磁盘机"
 
-#: libparted/arch/linux.c:1505
+#: libparted/arch/linux.c:1443
 msgid "IBM iSeries Virtual DASD"
 msgstr "IBM iSeries 虚拟 DASD"
 
-#: libparted/arch/linux.c:1510
+#: libparted/arch/linux.c:1448
 msgid "Compaq Smart Array"
 msgstr "Compaq 智能阵列"
 
-#: libparted/arch/linux.c:1525
+#: libparted/arch/linux.c:1453
 msgid "ATARAID Controller"
 msgstr "ATARAID 控制器"
 
-#: libparted/arch/linux.c:1530
+#: libparted/arch/linux.c:1458
 msgid "I2O Controller"
 msgstr "I2O 控制器"
 
-#: libparted/arch/linux.c:1535
+#: libparted/arch/linux.c:1463
 msgid "User-Mode Linux UBD"
 msgstr "用户模式 Linux UBD"
 
-#: libparted/arch/linux.c:1545
+#: libparted/arch/linux.c:1473
 msgid "Loopback device"
 msgstr "回环设备"
 
-#: libparted/arch/linux.c:1553
+#: libparted/arch/linux.c:1481
 #, c-format
 msgid "Linux device-mapper (%s)"
 msgstr "Linux 设备映射程序 (%s)"
 
-#: libparted/arch/linux.c:1564
+#: libparted/arch/linux.c:1492
 msgid "Xen Virtual Block Device"
 msgstr "Xen 虚拟块设备"
 
-#: libparted/arch/linux.c:1569
+#: libparted/arch/linux.c:1497
 msgid "Unknown"
 msgstr "未知"
 
-#: libparted/arch/linux.c:1578
+#: libparted/arch/linux.c:1506
 msgid "Virtio Block Device"
 msgstr "Virtio 块设备"
 
-#: libparted/arch/linux.c:1583
+#: libparted/arch/linux.c:1511
 msgid "Linux Software RAID Array"
 msgstr "Linux 软件 RAID 数组"
 
-#: libparted/arch/linux.c:1595
+#: libparted/arch/linux.c:1518
 msgid "ped_device_new()  Unsupported device type"
 msgstr "ped_device_new()  不支持的设备类型"
 
-#: libparted/arch/linux.c:1689 libparted/arch/linux.c:1774
+#: libparted/arch/linux.c:1612 libparted/arch/linux.c:1682
 #, c-format
 msgid "Error fsyncing/closing %s: %s"
 msgstr "文件同步/关闭 %s 时发生错误：%s"
 
-#: libparted/arch/linux.c:1948
+#: libparted/arch/linux.c:1846
 #, c-format
 msgid "%0.0send of file while reading %s"
 msgstr "%0.0s 出现文件结尾于读取 %s 时"
 
-#: libparted/arch/linux.c:2687
+#: libparted/arch/linux.c:2564
 #, c-format
 msgid ""
 "Error informing the kernel about modifications to partition %s -- %s.  This "
@@ -697,12 +697,12 @@
 "通知内核关于分区 %s -- %s 的修改时出错。这意味着 Linux 在重新启动之前无法知道您针对 %s 所作的任何修改 - "
 "所以您也不能在重新启动之前挂载或以任何方式使用它。"
 
-#: libparted/arch/linux.c:2807
+#: libparted/arch/linux.c:2683
 #, c-format
 msgid "Unable to determine the start and length of %s."
 msgstr "无法决定 %s 的起始和长度。"
 
-#: libparted/arch/linux.c:3220
+#: libparted/arch/linux.c:3080
 #, c-format
 msgid ""
 "Partition(s) %s on %s have been written, but we have been unable to inform "
@@ -713,200 +713,200 @@
 "%2$s 上的分区 %1$s "
 "已被写入，但是我们并无法将变更通报内核，或许是因为它/它们正在使用中。这将造成继续使用旧的分区。在进行进一步的变更之前，您应该立刻重新启动。"
 
-#: libparted/cs/geom.c:163
+#: libparted/cs/geom.c:162
 #, c-format
 msgid "Can't have the end before the start! (start sector=%jd length=%jd)"
 msgstr "结束不可位于开始之前！(起始扇区=%jd 长度=%jd)"
 
-#: libparted/cs/geom.c:379
+#: libparted/cs/geom.c:378
 #, c-format
 msgid "Attempt to write sectors %ld-%ld outside of partition on %s."
 msgstr "试图写入 %3$s 上分区之外的扇区 %1$ld-%2$ld。"
 
-#: libparted/cs/geom.c:419
+#: libparted/cs/geom.c:418
 msgid "checking for bad blocks"
 msgstr "检查坏块"
 
-#: libparted/debug.c:97
+#: libparted/debug.c:96
 #, c-format
 msgid "Backtrace has %d calls on stack:\n"
 msgstr "回溯区有 %d 个调用在堆栈上：\n"
 
-#: libparted/debug.c:110
+#: libparted/debug.c:109
 #, c-format
 msgid "Assertion (%s) at %s:%d in function %s() failed."
 msgstr "断言 (%s) 于 %s:%d 在函数 %s() 中失败。"
 
-#: libparted/disk.c:194
+#: libparted/disk.c:193
 #, c-format
 msgid "%s: unrecognised disk label"
 msgstr "%s: 无法辨识的磁盘卷标"
 
-#: libparted/disk.c:487
+#: libparted/disk.c:486
 #, c-format
 msgid ""
 "This libparted doesn't have write support for %s.  Perhaps it was compiled "
 "read-only."
 msgstr "这个 libparted 不支持对 %s 的写操作。可能它是按只读方式编译的。"
 
-#: libparted/disk.c:632
+#: libparted/disk.c:631
 #, c-format
 msgid "Partition %d is %s, but the file system is %s."
 msgstr "分区 %d 为 %s，但文件系统为 %s。"
 
-#: libparted/disk.c:841
+#: libparted/disk.c:840
 msgid "cylinder_alignment"
 msgstr "cylinder_alignment"
 
-#: libparted/disk.c:843
+#: libparted/disk.c:842
 msgid "pmbr_boot"
 msgstr "pmbr_boot"
 
-#: libparted/disk.c:848
+#: libparted/disk.c:847
 #, c-format
 msgid "Unknown disk flag, %d."
 msgstr "不明的磁盘旗标，%d。"
 
-#: libparted/disk.c:1289
+#: libparted/disk.c:1288
 #, c-format
 msgid "%s disk labels do not support extended partitions."
-msgstr "%s 磁盘卷标不支持扩展分区。"
+msgstr "%s 磁盘标签不支持扩展分区。"
 
-#: libparted/disk.c:1821
+#: libparted/disk.c:1820
 #, c-format
 msgid "%s disk labels don't support logical or extended partitions."
-msgstr "%s 磁盘卷标不支持逻辑或扩展分区。"
+msgstr "%s 磁盘标签不支持逻辑或扩展分区。"
 
-#: libparted/disk.c:1834
+#: libparted/disk.c:1833
 msgid "Too many primary partitions."
 msgstr "主分区太多。"
 
-#: libparted/disk.c:1843
+#: libparted/disk.c:1842
 #, c-format
 msgid ""
 "Can't add a logical partition to %s, because there is no extended partition."
 msgstr "由于没有扩展分区，无法将逻辑分区添加到 %s。"
 
-#: libparted/disk.c:1867
+#: libparted/disk.c:1866
 #, c-format
 msgid "Can't have more than one extended partition on %s."
 msgstr "%s 上不能含有多于一个的拓展分区。"
 
-#: libparted/disk.c:1877
+#: libparted/disk.c:1876
 msgid "Can't have logical partitions outside of the extended partition."
 msgstr "逻辑分区不能处于扩展分区之外。"
 
-#: libparted/disk.c:1902
+#: libparted/disk.c:1901
 #, c-format
 msgid ""
 "Can't have a logical partition outside of the extended partition on %s."
 msgstr "%s 上的逻辑分区不能处于扩展分区之外。"
 
-#: libparted/disk.c:1912
+#: libparted/disk.c:1911
 msgid "Can't have a primary partition inside an extended partition."
 msgstr "扩展分区中不能含有主分区。"
 
-#: libparted/disk.c:1921
+#: libparted/disk.c:1920
 msgid "Can't have a partition outside the disk!"
 msgstr "无法让分区超出磁盘！"
 
-#: libparted/disk.c:1972 libparted/disk.c:2150
+#: libparted/disk.c:1971 libparted/disk.c:2149
 msgid "Can't have overlapping partitions."
 msgstr "分区之间不能重叠。"
 
-#: libparted/disk.c:2351
+#: libparted/disk.c:2350
 msgid "metadata"
 msgstr "元数据"
 
-#: libparted/disk.c:2353
+#: libparted/disk.c:2352
 msgid "free"
-msgstr "空闲"
+msgstr "空闲空间"
 
-#: libparted/disk.c:2355 parted/ui.c:1258 parted/ui.c:1286
+#: libparted/disk.c:2354 parted/ui.c:1222 parted/ui.c:1250
 msgid "extended"
-msgstr "扩展"
+msgstr "扩展分区"
 
-#: libparted/disk.c:2357 parted/ui.c:1262 parted/ui.c:1290
+#: libparted/disk.c:2356 parted/ui.c:1226 parted/ui.c:1254
 msgid "logical"
-msgstr "逻辑"
+msgstr "逻辑分区"
 
-#: libparted/disk.c:2359 parted/ui.c:1254 parted/ui.c:1282
+#: libparted/disk.c:2358 parted/ui.c:1218 parted/ui.c:1246
 msgid "primary"
 msgstr "主分区"
 
-#: libparted/disk.c:2375
+#: libparted/disk.c:2374
 msgid "boot"
 msgstr "启动"
 
-#: libparted/disk.c:2377
+#: libparted/disk.c:2376
 msgid "bios_grub"
 msgstr "bios_grub"
 
-#: libparted/disk.c:2379
+#: libparted/disk.c:2378
 msgid "root"
 msgstr "根"
 
-#: libparted/disk.c:2381
+#: libparted/disk.c:2380
 msgid "swap"
-msgstr "交换"
+msgstr "对换分区"
 
-#: libparted/disk.c:2383
+#: libparted/disk.c:2382
 msgid "hidden"
-msgstr "隐藏"
+msgstr "隐藏分区"
 
-#: libparted/disk.c:2385
+#: libparted/disk.c:2384
 msgid "raid"
 msgstr "raid"
 
-#: libparted/disk.c:2387
+#: libparted/disk.c:2386
 msgid "lvm"
 msgstr "lvm"
 
-#: libparted/disk.c:2389
+#: libparted/disk.c:2388
 msgid "lba"
 msgstr "lba"
 
-#: libparted/disk.c:2391
+#: libparted/disk.c:2390
 msgid "hp-service"
 msgstr "hp-服务"
 
-#: libparted/disk.c:2393
+#: libparted/disk.c:2392
 msgid "palo"
 msgstr "palo"
 
-#: libparted/disk.c:2395
+#: libparted/disk.c:2394
 msgid "prep"
 msgstr "prep"
 
-#: libparted/disk.c:2397
+#: libparted/disk.c:2396
 msgid "msftres"
 msgstr "msftres"
 
-#: libparted/disk.c:2399
+#: libparted/disk.c:2398
 msgid "msftdata"
 msgstr "msftdata"
 
-#: libparted/disk.c:2401
+#: libparted/disk.c:2400
 msgid "atvrecv"
 msgstr "atvrecv"
 
-#: libparted/disk.c:2403
+#: libparted/disk.c:2402
 msgid "diag"
 msgstr "诊断"
 
-#: libparted/disk.c:2405
+#: libparted/disk.c:2404
 msgid "legacy_boot"
 msgstr "旧版启动"
 
-#: libparted/disk.c:2407
+#: libparted/disk.c:2406
 msgid "irst"
 msgstr "irst"
 
-#: libparted/disk.c:2409
+#: libparted/disk.c:2408
 msgid "esp"
 msgstr "EFI 启动"
 
-#: libparted/disk.c:2415
+#: libparted/disk.c:2414
 #, c-format
 msgid "Unknown partition flag, %d."
 msgstr "未知的分区旗标，%d。"
@@ -975,95 +975,94 @@
 "http://www.gnu.org/software/parted/parted.html 以获得更多有关提交错误报告的有用信息！请将至少含有版本 "
 "(%2$s) 和以下信息的错误报告发送到 %1$s：  "
 
-#: libparted/labels/aix.c:91
+#: libparted/labels/aix.c:103
 msgid "Support for reading AIX disk labels is is not implemented yet."
 msgstr "尚未支持读取 AIX 磁盘卷标。"
 
-#: libparted/labels/aix.c:102
+#: libparted/labels/aix.c:114
 msgid "Support for writing AIX disk labels is is not implemented yet."
 msgstr "尚未支持写入 AIX 磁盘卷标。"
 
-#: libparted/labels/aix.c:115
+#: libparted/labels/aix.c:127
 msgid ""
 "Support for adding partitions to AIX disk labels is not implemented yet."
 msgstr "尚未支持加入分区到 AIX 磁盘卷标。"
 
-#: libparted/labels/aix.c:125
+#: libparted/labels/aix.c:137
 msgid ""
 "Support for duplicating partitions in AIX disk labels is not implemented yet."
 msgstr "尚未支持在 AIX 磁盘卷标中重制分区。"
 
-#: libparted/labels/aix.c:143
+#: libparted/labels/aix.c:155
 msgid ""
 "Support for setting system type of partitions in AIX disk labels is not "
 "implemented yet."
 msgstr "尚未支持在 AIX 磁盘卷标中设置分区的系统类型。"
 
-#: libparted/labels/aix.c:153
+#: libparted/labels/aix.c:165
 msgid "Support for setting flags in AIX disk labels is not implemented yet."
 msgstr "尚未支持在 AIX 磁盘卷标中设置旗标。"
 
-#: libparted/labels/atari.c:1657 libparted/labels/bsd.c:567
-#: libparted/labels/dasd.c:894 libparted/labels/dos.c:2276
-#: libparted/labels/dvh.c:770 libparted/labels/gpt.c:2050
-#: libparted/labels/loop.c:243 libparted/labels/mac.c:1423
-#: libparted/labels/pc98.c:701 libparted/labels/rdb.c:1054
-#: libparted/labels/sun.c:781
+#: libparted/labels/bsd.c:571 libparted/labels/dasd.c:874
+#: libparted/labels/dos.c:2237 libparted/labels/dvh.c:769
+#: libparted/labels/gpt.c:2015 libparted/labels/loop.c:243
+#: libparted/labels/mac.c:1420 libparted/labels/pc98.c:701
+#: libparted/labels/rdb.c:1052 libparted/labels/sun.c:780
 msgid "Unable to satisfy all constraints on the partition."
 msgstr "无法满足分区的所有限制。"
 
-#: libparted/labels/bsd.c:592
+#: libparted/labels/bsd.c:596
 msgid "Unable to allocate a bsd disklabel slot."
 msgstr "无法定位 bsd 磁盘标签槽"
 
-#: libparted/labels/dasd.c:920
+#: libparted/labels/dasd.c:900
 msgid "Unable to allocate a dasd disklabel slot"
 msgstr "无法配置 dasd 磁盘卷标槽。"
 
-#: libparted/labels/dos.c:1003
+#: libparted/labels/dos.c:1001
 #, c-format
 msgid "Invalid partition table on %s -- wrong signature %x."
 msgstr "%s 上的分区表无效 - 错误的签名 %x。"
 
-#: libparted/labels/dos.c:1031
+#: libparted/labels/dos.c:1029
 #, c-format
 msgid "Invalid partition table - recursive partition on %s."
 msgstr "无效的分区表 - %s 出现递归分区。"
 
-#: libparted/labels/dos.c:1560
+#: libparted/labels/dos.c:1545
 msgid "Extended partitions cannot be hidden on msdos disk labels."
 msgstr "拓展分区无法隐藏，在 msdos 磁盘卷标中。"
 
-#: libparted/labels/dos.c:2258
+#: libparted/labels/dos.c:2219
 msgid "Parted can't resize partitions managed by Windows Dynamic Disk."
 msgstr "Parted 无法改变由“Windows 动态磁盘”所管理的分区大小。"
 
-#: libparted/labels/dos.c:2514
+#: libparted/labels/dos.c:2475
 msgid "cannot create any more partitions"
 msgstr "无法再创建任何分区"
 
-#: libparted/labels/dvh.c:183
+#: libparted/labels/dvh.c:182
 #, c-format
 msgid "%s has no extended partition (volume header partition)."
 msgstr "%s 没有拓展分区 (卷头分区)。"
 
-#: libparted/labels/dvh.c:309
+#: libparted/labels/dvh.c:308
 msgid "Checksum is wrong, indicating the partition table is corrupt."
 msgstr "校验和错误，标明分区表已损坏。"
 
-#: libparted/labels/dvh.c:614
+#: libparted/labels/dvh.c:613
 msgid "Only primary partitions can be root partitions."
 msgstr "只有主分区可以是根分区。"
 
-#: libparted/labels/dvh.c:628
+#: libparted/labels/dvh.c:627
 msgid "Only primary partitions can be swap partitions."
-msgstr "只有主分区可以是交换分区。"
+msgstr "只有主分区可以是对换分区。"
 
-#: libparted/labels/dvh.c:642
+#: libparted/labels/dvh.c:641
 msgid "Only logical partitions can be a boot file."
 msgstr "只有逻辑分区可以是启动文件。"
 
-#: libparted/labels/dvh.c:719
+#: libparted/labels/dvh.c:718
 #, c-format
 msgid ""
 "failed to set dvh partition name to %s:\n"
@@ -1072,97 +1071,97 @@
 "设置 dvh 分区名称为 %s 时失败：\n"
 "只有逻辑分区 (启动文件) 拥有名称。"
 
-#: libparted/labels/dvh.c:812
+#: libparted/labels/dvh.c:811
 msgid "Too many primary partitions"
 msgstr "过多的主分区"
 
-#: libparted/labels/fdasd.c:136
+#: libparted/labels/fdasd.c:142
 msgid "open error"
 msgstr "打开错误"
 
-#: libparted/labels/fdasd.c:139
+#: libparted/labels/fdasd.c:145
 msgid "seek error"
 msgstr "寻道错误"
 
-#: libparted/labels/fdasd.c:142
+#: libparted/labels/fdasd.c:148
 msgid "read error"
 msgstr "读取错误"
 
-#: libparted/labels/fdasd.c:148
+#: libparted/labels/fdasd.c:154
 msgid "ioctl() error"
 msgstr "ioctl() 错误"
 
-#: libparted/labels/fdasd.c:152
+#: libparted/labels/fdasd.c:158
 msgid "API version mismatch"
 msgstr "API 版本不符"
 
-#: libparted/labels/fdasd.c:156
+#: libparted/labels/fdasd.c:162
 msgid "Unsupported disk type"
 msgstr "不支持的磁盘类型"
 
-#: libparted/labels/fdasd.c:160
+#: libparted/labels/fdasd.c:166
 msgid "Unsupported disk format"
 msgstr "不支持的磁盘格式"
 
-#: libparted/labels/fdasd.c:164
+#: libparted/labels/fdasd.c:170
 msgid "Disk is in use"
 msgstr "磁盘正被使用"
 
-#: libparted/labels/fdasd.c:168
+#: libparted/labels/fdasd.c:174
 msgid "Syntax error in config file"
 msgstr "配置文件语法错误"
 
-#: libparted/labels/fdasd.c:172
+#: libparted/labels/fdasd.c:178
 msgid "Volume label is corrupted"
 msgstr "卷标已损坏"
 
-#: libparted/labels/fdasd.c:176
+#: libparted/labels/fdasd.c:182
 msgid "A data set name is corrupted"
 msgstr "数据集名称已损坏"
 
-#: libparted/labels/fdasd.c:180
+#: libparted/labels/fdasd.c:186
 msgid "Memory allocation failed"
 msgstr "内存配置失败"
 
-#: libparted/labels/fdasd.c:184
+#: libparted/labels/fdasd.c:190
 msgid "Device verification failed"
 msgstr "设备验证失败"
 
-#: libparted/labels/fdasd.c:185
+#: libparted/labels/fdasd.c:191
 msgid "The specified device is not a valid DASD device"
 msgstr "指定设备并非有效的 DASD 设备"
 
-#: libparted/labels/fdasd.c:191 libparted/labels/vtoc.c:179
+#: libparted/labels/fdasd.c:194 libparted/labels/vtoc.c:179
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: libparted/labels/fdasd.c:243
+#: libparted/labels/fdasd.c:266
 msgid "No room for volume label."
 msgstr "没有空间可用于卷标。"
 
-#: libparted/labels/fdasd.c:251
+#: libparted/labels/fdasd.c:274
 msgid "No room for partition info."
 msgstr "没有空间可用于分区信息。"
 
-#: libparted/labels/fdasd.c:828
+#: libparted/labels/fdasd.c:854
 msgid "Invalid VTOC."
 msgstr "无效的 VTOC。"
 
-#: libparted/labels/fdasd.c:912
+#: libparted/labels/fdasd.c:938
 msgid "Could not retrieve API version."
 msgstr "无法获取 API 版本。"
 
-#: libparted/labels/fdasd.c:915
+#: libparted/labels/fdasd.c:941
 #, c-format
 msgid ""
 "The current API version '%d' doesn't match dasd driver API version '%d'!"
 msgstr "目前的 API 版本“%d”不匹配 dasd 驱动程序 API 版本“%d”！"
 
-#: libparted/labels/fdasd.c:1029
+#: libparted/labels/fdasd.c:984
 msgid "Could not retrieve disk geometry information."
 msgstr "无法获取磁盘几何位置信息。"
 
-#: libparted/labels/fdasd.c:1035
+#: libparted/labels/fdasd.c:988
 msgid "Could not retrieve blocksize information."
 msgstr "无法获取区块大小信息。"
 
@@ -1170,18 +1169,18 @@
 msgid "Could not retrieve disk information."
 msgstr ""
 
-#: libparted/labels/gpt.c:531
+#: libparted/labels/gpt.c:532
 msgid "device is too small for GPT"
 msgstr "设备对 GPT 来说太小"
 
-#: libparted/labels/gpt.c:733
+#: libparted/labels/gpt.c:734
 #, c-format
 msgid ""
 "The format of the GPT partition table is version %x, which is newer than "
 "what Parted can recognise.  Please report this!"
 msgstr "GPT 分区表的格式版本为 %x，它比 Parted 所能辨识的版本要新。请报告这个状况！"
 
-#: libparted/labels/gpt.c:769
+#: libparted/labels/gpt.c:770
 #, c-format
 msgid ""
 "Not all of the space available to %s appears to be used, you can fix the GPT "
@@ -1190,113 +1189,113 @@
 msgstr ""
 "并非所有可用于 %s 的空间都被用到了，您可以修正 GPT 以使用所有的空间 (额外的 %llu 个区块)，还是说要继续使用目前的设置？ "
 
-#: libparted/labels/gpt.c:1008
+#: libparted/labels/gpt.c:1006
 msgid ""
 "The backup GPT table is not at the end of the disk, as it should be.  Fix, "
 "by moving the backup to the end (and removing the old backup)?"
 msgstr "备份 GPT 分区表不如它应当的那样在磁盘末端。要通过移动过去（并且删除旧备份）的方式修复吗？"
 
-#: libparted/labels/gpt.c:1026
+#: libparted/labels/gpt.c:1024
 msgid ""
 "Both the primary and backup GPT tables are corrupt.  Try making a fresh "
 "table, and using Parted's rescue feature to recover partitions."
 msgstr "主 GPT 和备份 GPT 都损坏了。试着创建新表，然后使用 Parted 的急救功能以修复分区表。"
 
-#: libparted/labels/gpt.c:1037
+#: libparted/labels/gpt.c:1035
 msgid ""
 "The backup GPT table is corrupt, but the primary appears OK, so that will be "
 "used."
 msgstr "备份 GPT 表损坏，但主表似乎是正确的，所以使用备份。"
 
-#: libparted/labels/gpt.c:1049
+#: libparted/labels/gpt.c:1047
 msgid ""
 "The primary GPT table is corrupt, but the backup appears OK, so that will be "
 "used."
 msgstr "主 GPT 表损坏，但备份似乎是正确的，所以使用备份。"
 
-#: libparted/labels/gpt.c:1073
+#: libparted/labels/gpt.c:1071
 msgid "primary partition table array CRC mismatch"
 msgstr "主分区表的数组循环冗余检查 (CRC) 值不匹配"
 
-#: libparted/labels/gpt.c:1936 libparted/labels/gpt.c:1963
+#: libparted/labels/gpt.c:1901 libparted/labels/gpt.c:1928
 msgid "failed to translate partition name"
 msgstr "未能转换分区名称"
 
-#: libparted/labels/mac.c:185
+#: libparted/labels/mac.c:184
 #, c-format
 msgid "Invalid signature %x for Mac disk labels."
-msgstr "无效的 Mac 磁盘卷标签名 %x。"
+msgstr "无效的 Mac 磁盘标签签名 %x。"
 
-#: libparted/labels/mac.c:232
+#: libparted/labels/mac.c:231
 msgid "Partition map has no partition map entry!"
 msgstr "分区映射不含有分区映射条目！"
 
-#: libparted/labels/mac.c:280
+#: libparted/labels/mac.c:279
 #, c-format
 msgid "%s is too small for a Mac disk label!"
-msgstr "%s 对 Mac 磁盘卷标来说太小了！"
+msgstr "%s 对 Mac 磁盘标签来说太小了！"
 
-#: libparted/labels/mac.c:507
+#: libparted/labels/mac.c:506
 #, c-format
 msgid "Partition %d has an invalid signature %x."
 msgstr "分区 %d 含有无效的签名 %x。"
 
-#: libparted/labels/mac.c:524
+#: libparted/labels/mac.c:523
 #, c-format
 msgid "Partition %d has an invalid length of 0 bytes!"
 msgstr "分区 %d 含有无效的长度 0 字节！"
 
-#: libparted/labels/mac.c:555
+#: libparted/labels/mac.c:554
 msgid "The data region doesn't start at the start of the partition."
 msgstr "数据区并未从分区的起点开始."
 
-#: libparted/labels/mac.c:572
+#: libparted/labels/mac.c:571
 msgid "The boot region doesn't start at the start of the partition."
 msgstr "启动区域并未从分区的起点开始."
 
-#: libparted/labels/mac.c:586
+#: libparted/labels/mac.c:585
 msgid "The partition's boot region doesn't occupy the entire partition."
 msgstr "分区的启动区域并未占用整个分区。"
 
-#: libparted/labels/mac.c:597
+#: libparted/labels/mac.c:596
 msgid "The partition's data region doesn't occupy the entire partition."
 msgstr "分区的数据区域并未占用整个分区。"
 
-#: libparted/labels/mac.c:649
+#: libparted/labels/mac.c:648
 #, c-format
 msgid ""
 "Weird block size on device descriptor: %d bytes is not divisible by 512."
 msgstr "设备描述中出现古怪的块大小：%d 字节不能被 512 整除。"
 
-#: libparted/labels/mac.c:662
+#: libparted/labels/mac.c:661
 #, c-format
 msgid ""
 "The driver descriptor says the physical block size is %d bytes, but Linux "
 "says it is %d bytes."
 msgstr "磁盘描述表明物理块大小为 %d 字节，但 Linux 认为它是 %d 字节。"
 
-#: libparted/labels/mac.c:715
+#: libparted/labels/mac.c:714
 msgid "No valid partition map found."
 msgstr "找不到有效的分区映射。"
 
-#: libparted/labels/mac.c:789
+#: libparted/labels/mac.c:787
 #, c-format
 msgid ""
 "Conflicting partition map entry sizes!  Entry 1 says it is %d, but entry %d "
 "says it is %d!"
 msgstr "分区映射条目大小冲突！条目 1 说它是 %d，但条目 %d 说它是 %d！"
 
-#: libparted/labels/mac.c:820
+#: libparted/labels/mac.c:818
 msgid "Weird!  There are 2 partitions map entries!"
 msgstr "奇怪 - 有两个分区映射条目！"
 
-#: libparted/labels/mac.c:1359
+#: libparted/labels/mac.c:1356
 msgid ""
 "Changing the name of a root or swap partition will prevent Linux from "
 "recognising it as such."
-msgstr "改变根分区或交换分区的名称将导致 Linux 无法识别它。"
+msgstr "改变根分区或对换分区的名称将导致 Linux 无法识别它。"
 
-#: libparted/labels/mac.c:1458
+#: libparted/labels/mac.c:1455
 msgid "Can't add another partition -- the partition map is too small!"
 msgstr "无法添加另一个分区 -- 分区图过小！"
 
@@ -1316,92 +1315,92 @@
 msgid "Can't add another partition."
 msgstr "无法添加其它分区。"
 
-#: libparted/labels/pt-tools.c:134
+#: libparted/labels/pt-tools.c:133
 #, c-format
 msgid ""
 "partition length of %jd sectors exceeds the %s-partition-table-imposed "
 "maximum of %jd"
 msgstr "分区的 %1$jd 扇区长度超出 %3$jd 的 %2$s-partition-table-imposed 最大值"
 
-#: libparted/labels/pt-tools.c:147
+#: libparted/labels/pt-tools.c:146
 #, c-format
 msgid ""
 "starting sector number, %jd exceeds the %s-partition-table-imposed maximum "
 "of %jd"
 msgstr "起始扇区编号 %1$jd 超出 %3$jd 的 %2$s-partition-table-imposed 最大值"
 
-#: libparted/labels/rdb.c:170
+#: libparted/labels/rdb.c:169
 #, c-format
 msgid "%s : Bad checksum on block %llu of type %s."
 msgstr "%s：区块 %llu 的类型 %s 有不当的校验和。"
 
-#: libparted/labels/rdb.c:486
+#: libparted/labels/rdb.c:484
 #, c-format
 msgid "%s : Didn't find rdb block, should never happen."
 msgstr "%s：无法找到 rdb 区块，这不该发生。"
 
-#: libparted/labels/rdb.c:575
+#: libparted/labels/rdb.c:573
 #, c-format
 msgid "%s : Loop detected at block %d."
 msgstr "%s：于区块 %d 侦测到循环。"
 
-#: libparted/labels/rdb.c:594
+#: libparted/labels/rdb.c:592
 #, c-format
 msgid "%s : The %s list seems bad at block %s."
 msgstr "%1$s：区块 %3$s 处似有不当 %2$s 列表。"
 
-#: libparted/labels/rdb.c:693
+#: libparted/labels/rdb.c:691
 #, c-format
 msgid "%s : Failed to list bad blocks."
 msgstr "%s：列出坏块时失败。"
 
-#: libparted/labels/rdb.c:701
+#: libparted/labels/rdb.c:699
 #, c-format
 msgid "%s : Failed to list partition blocks."
 msgstr "%s：列出分区区块时失败。"
 
-#: libparted/labels/rdb.c:709
+#: libparted/labels/rdb.c:707
 #, c-format
 msgid "%s : Failed to list file system blocks."
 msgstr "%s：列出文件系统区块时失败。"
 
-#: libparted/labels/rdb.c:717
+#: libparted/labels/rdb.c:715
 #, c-format
 msgid "%s : Failed to list boot blocks."
 msgstr "%s：列出启动区块时失败。"
 
-#: libparted/labels/rdb.c:744
+#: libparted/labels/rdb.c:742
 #, c-format
 msgid "Failed to write partition block at %d."
 msgstr "写入分区区块 %d 时失败。"
 
-#: libparted/labels/atari.c:1823 libparted/labels/rdb.c:1082
+#: libparted/labels/rdb.c:1080
 msgid "Unable to allocate a partition number."
 msgstr "无法分配分区编号。"
 
-#: libparted/labels/sun.c:162
+#: libparted/labels/sun.c:161
 msgid "Corrupted Sun disk label detected."
-msgstr "检测到损坏了的 Sun 磁盘卷标。"
+msgstr "检测到损坏了的 Sun 磁盘标签。"
 
-#: libparted/labels/sun.c:277
+#: libparted/labels/sun.c:276
 #, c-format
 msgid ""
 "The disk CHS geometry (%d,%d,%d) reported by the operating system does not "
 "match the geometry stored on the disk label (%d,%d,%d)."
 msgstr "由操作系统报告的磁盘 CHS 几何结构 (%d,%d,%d) 与保存在磁盘卷标中的几何结构 (%d,%d,%d) 不符合。"
 
-#: libparted/labels/sun.c:299
+#: libparted/labels/sun.c:298
 #, c-format
 msgid "The disk label describes a disk bigger than %s."
-msgstr "磁盘卷标描述的磁盘大于 %s。"
+msgstr "磁盘标签描述的磁盘大于 %s。"
 
-#: libparted/labels/sun.c:474
+#: libparted/labels/sun.c:473
 #, c-format
 msgid ""
 "The disk has %d cylinders, which is greater than the maximum of 65536."
 msgstr "该磁盘具有 %d 圈柱面，已超过 65536 的最大限制。"
 
-#: libparted/labels/sun.c:813
+#: libparted/labels/sun.c:812
 msgid ""
 "The Whole Disk partition is the only available one left.  Generally, it is "
 "not a good idea to overwrite this partition with a real one.  Solaris may "
@@ -1411,9 +1410,9 @@
 "整个磁盘分区是惟一还留下的可用区块。一般而言，以真实的区块来覆写这块分区并不是个好主意。没有了它，Solaris 也许就无法启动，并且 SILO "
 "(sparc 启动引导程序) 也需要它。"
 
-#: libparted/labels/sun.c:828
+#: libparted/labels/sun.c:827
 msgid "Sun disk label is full."
-msgstr "Sun 磁盘卷标已满。"
+msgstr "Sun 磁盘标签已满。"
 
 #: libparted/labels/vtoc.c:164
 msgid "opening of device failed"
@@ -1431,60 +1430,60 @@
 msgid "reading from device failed"
 msgstr "从设备读取时失败"
 
-#: libparted/labels/vtoc.c:371 libparted/labels/vtoc.c:378
-#: libparted/labels/vtoc.c:399 libparted/labels/vtoc.c:406
+#: libparted/labels/vtoc.c:371 libparted/labels/vtoc.c:380
+#: libparted/labels/vtoc.c:401 libparted/labels/vtoc.c:408
 msgid "Could not read volume label."
 msgstr "无法读取卷标。"
 
-#: libparted/labels/vtoc.c:426 libparted/labels/vtoc.c:431
+#: libparted/labels/vtoc.c:428 libparted/labels/vtoc.c:435
 msgid "Could not write volume label."
 msgstr "无法写入卷标。"
 
-#: libparted/labels/vtoc.c:537
+#: libparted/labels/vtoc.c:541
 msgid "Could not read VTOC labels."
 msgstr "无法读取 VTOC 卷标。"
 
-#: libparted/labels/vtoc.c:543
+#: libparted/labels/vtoc.c:547
 msgid "Could not read VTOC FMT1 DSCB."
 msgstr "无法读取 VTOC FMT1 DSCB。"
 
-#: libparted/labels/vtoc.c:550
+#: libparted/labels/vtoc.c:554
 msgid "Could not read VTOC FMT4 DSCB."
 msgstr "无法读取 VTOC FMT4 DSCB。"
 
-#: libparted/labels/vtoc.c:557
+#: libparted/labels/vtoc.c:561
 msgid "Could not read VTOC FMT5 DSCB."
 msgstr "无法读取 VTOC FMT5 DSCB。"
 
-#: libparted/labels/vtoc.c:564
+#: libparted/labels/vtoc.c:568
 msgid "Could not read VTOC FMT7 DSCB."
 msgstr "无法读取 VTOC FMT7 DSCB。"
 
-#: libparted/labels/vtoc.c:585
+#: libparted/labels/vtoc.c:589
 msgid "Could not write VTOC labels."
 msgstr "无法写入 VTOC 卷标。"
 
-#: libparted/labels/vtoc.c:591
+#: libparted/labels/vtoc.c:595
 msgid "Could not write VTOC FMT1 DSCB."
 msgstr "无法写入 VTOC FMT1 DSCB。"
 
-#: libparted/labels/vtoc.c:598
+#: libparted/labels/vtoc.c:602
 msgid "Could not write VTOC FMT4 DSCB."
 msgstr "无法写入 VTOC FMT4 DSCB。"
 
-#: libparted/labels/vtoc.c:605
+#: libparted/labels/vtoc.c:609
 msgid "Could not write VTOC FMT5 DSCB."
 msgstr "无法写入 VTOC FMT5 DSCB。"
 
-#: libparted/labels/vtoc.c:612
+#: libparted/labels/vtoc.c:616
 msgid "Could not write VTOC FMT7 DSCB."
 msgstr "无法写入 VTOC FMT7 DSCB。"
 
-#: libparted/labels/vtoc.c:622
+#: libparted/labels/vtoc.c:626
 msgid "Could not write VTOC FMT9 DSCB."
 msgstr "无法写入 VTOC FMT9 DSCB。"
 
-#: libparted/libparted.c:242
+#: libparted/libparted.c:234
 msgid "Out of memory."
 msgstr "内存耗尽。"
 
@@ -1507,73 +1506,73 @@
 msgid "The maximum sector value is %d."
 msgstr "扇区数量的最大值为 %d。"
 
-#: libparted/unit.c:412 libparted/unit.c:564
+#: libparted/unit.c:412 libparted/unit.c:563
 #, c-format
 msgid "The location %s is outside of the device %s."
 msgstr "位置 %s 超出设备 %s 的范围。"
 
-#: libparted/unit.c:526
+#: libparted/unit.c:532
 msgid "Invalid number."
 msgstr "无效的数字。"
 
-#: libparted/unit.c:532
+#: libparted/unit.c:538
 msgid "Use a smaller unit instead of a value < 1"
 msgstr "使用较小单位以代替 < 1 的值"
 
-#: libparted/fs/amiga/affs.c:64 libparted/fs/amiga/apfs.c:58
-#: libparted/fs/amiga/asfs.c:72
+#: libparted/fs/amiga/affs.c:63 libparted/fs/amiga/apfs.c:57
+#: libparted/fs/amiga/asfs.c:71
 #, c-format
 msgid "%s : Failed to allocate partition block\n"
 msgstr "%s：配置分区区块时失败\n"
 
-#: libparted/fs/amiga/affs.c:79 libparted/fs/amiga/apfs.c:71
-#: libparted/fs/amiga/asfs.c:84
+#: libparted/fs/amiga/affs.c:78 libparted/fs/amiga/apfs.c:70
+#: libparted/fs/amiga/asfs.c:83
 #, c-format
 msgid "%s : Failed to allocate block\n"
 msgstr "%s：配置区块时失败\n"
 
-#: libparted/fs/amiga/affs.c:84 libparted/fs/amiga/apfs.c:76
+#: libparted/fs/amiga/affs.c:83 libparted/fs/amiga/apfs.c:75
 #, c-format
 msgid "%s : Couldn't read boot block %llu\n"
 msgstr "%s：无法读取启动区块 %llu\n"
 
-#: libparted/fs/amiga/affs.c:98 libparted/fs/amiga/apfs.c:87
-#: libparted/fs/amiga/asfs.c:90 libparted/fs/amiga/asfs.c:104
+#: libparted/fs/amiga/affs.c:99 libparted/fs/amiga/apfs.c:86
+#: libparted/fs/amiga/asfs.c:89 libparted/fs/amiga/asfs.c:103
 #, c-format
 msgid "%s : Couldn't read root block %llu\n"
 msgstr "%s：无法读取根区块 %llu\n"
 
-#: libparted/fs/amiga/amiga.c:72
+#: libparted/fs/amiga/amiga.c:71
 #, c-format
 msgid "%s : Failed to allocate id list element\n"
 msgstr "%s：配置 ID 列表元素时失败\n"
 
-#: libparted/fs/amiga/amiga.c:189
+#: libparted/fs/amiga/amiga.c:188
 #, c-format
 msgid "%s : Couldn't read block %llu\n"
 msgstr "%s：无法读取区块 %llu\n"
 
-#: libparted/fs/amiga/amiga.c:202
+#: libparted/fs/amiga/amiga.c:201
 #, c-format
 msgid "%s : Bad checksum on block %llu of type %s\n"
 msgstr "%s：区块 %llu 的类型 %s 有不当的校验和\n"
 
-#: libparted/fs/amiga/amiga.c:212
+#: libparted/fs/amiga/amiga.c:211
 #, c-format
 msgid "%s : Couldn't write block %d\n"
 msgstr "%s：无法写入区块 %d\n"
 
-#: libparted/fs/amiga/amiga.c:278
+#: libparted/fs/amiga/amiga.c:277
 #, c-format
 msgid "%s : Failed to allocate disk_specific rdb block\n"
 msgstr "%s：配置磁盘特定的 rdb 区块时失败\n"
 
-#: libparted/fs/amiga/amiga.c:289
+#: libparted/fs/amiga/amiga.c:288
 #, c-format
 msgid "%s : Didn't find rdb block, should never happen\n"
 msgstr "%s：无法找到 rdb 区块，这不应该发生\n"
 
-#: libparted/fs/amiga/amiga.c:318
+#: libparted/fs/amiga/amiga.c:317
 #, c-format
 msgid "%s : Failed to read partition block %llu\n"
 msgstr "%s：读取分区区块 %llu 时失败\n"
@@ -1612,38 +1611,38 @@
 "partition table's CHS geometry is (%d, %d, %d)."
 msgstr "文件系统的 CHS 几何数据是 (%d, %d, %d)，该项无效。分区表的 CHS 位置与尺寸是 (%d, %d, %d)。"
 
-#: libparted/fs/fat/bootsector.c:197 libparted/fs/r/fat/bootsector.c:194
+#: libparted/fs/fat/bootsector.c:197 libparted/fs/r/fat/bootsector.c:206
 msgid "FAT boot sector says logical sector size is 0.  This is weird. "
 msgstr "FAT 启动扇区声称逻辑扇区的大小为零。这很奇怪。 "
 
-#: libparted/fs/fat/bootsector.c:203 libparted/fs/r/fat/bootsector.c:200
+#: libparted/fs/fat/bootsector.c:203 libparted/fs/r/fat/bootsector.c:212
 msgid "FAT boot sector says there are no FAT tables.  This is weird. "
 msgstr "FAT 启动扇区声称没有 FAT 表。这很奇怪。 "
 
-#: libparted/fs/fat/bootsector.c:209 libparted/fs/r/fat/bootsector.c:206
+#: libparted/fs/fat/bootsector.c:209 libparted/fs/r/fat/bootsector.c:218
 msgid "FAT boot sector says clusters are 0 sectors.  This is weird. "
-msgstr "FAT 启动扇区声称簇是零扇区。这很奇怪。 "
+msgstr "FAT 启动扇区声称卒是零扇区。这很奇怪。 "
 
-#: libparted/fs/fat/bootsector.c:219 libparted/fs/r/fat/bootsector.c:216
+#: libparted/fs/fat/bootsector.c:219 libparted/fs/r/fat/bootsector.c:228
 msgid "File system is FAT12, which is unsupported."
 msgstr "文件系统为 FAT12，不支持。"
 
-#: libparted/fs/linux_swap/linux_swap.c:231
+#: libparted/fs/linux_swap/linux_swap.c:230
 #, c-format
 msgid "Unrecognised old style linux swap signature '%10s'."
 msgstr "无法辨识的旧式 linux 交换签名“%10s”。"
 
-#: libparted/fs/linux_swap/linux_swap.c:269
+#: libparted/fs/linux_swap/linux_swap.c:268
 #, c-format
 msgid "Unrecognised new style linux swap signature '%10s'."
 msgstr "无法辨识的新式 linux 交换签名“%10s”。"
 
-#: libparted/fs/linux_swap/linux_swap.c:309
+#: libparted/fs/linux_swap/linux_swap.c:308
 #, c-format
 msgid "Unrecognised swsusp linux swap signature '%9s'."
 msgstr "无法辨识的 swsusp linux 交换签名“%9s”。"
 
-#: libparted/fs/hfs/probe.c:51 libparted/fs/r/hfs/probe.c:51
+#: libparted/fs/hfs/probe.c:50 libparted/fs/r/hfs/probe.c:50
 #, c-format
 msgid ""
 "Parted can't use HFS file systems on disks with a sector size not equal to "
@@ -1657,7 +1656,7 @@
 "to work properly with sector sizes other than 512 bytes."
 msgstr "此文件系统的逻辑扇区大小为 %d。GNU Parted 不能在扇区大小不是 512 字节的情况下正确工作。"
 
-#: libparted/fs/r/fat/bootsector.c:145
+#: libparted/fs/r/fat/bootsector.c:157
 #, c-format
 msgid ""
 "The file system's CHS geometry is (%d, %d, %d), which is invalid.  The "
@@ -1669,7 +1668,7 @@
 "文件系统的 CHS 几何结构为 (%d, %d, %d)，而其无效。分区表的 CHS 几何结构为 (%d, %d, %d)。如果您选择忽略，文件系统的 "
 "CHS 几何结构将会保留不变。如果您选择修复，文件系统的 CHS 几何结构将会被设置以符合分区表的 CHS 几何结构。"
 
-#: libparted/fs/r/fat/bootsector.c:399
+#: libparted/fs/r/fat/bootsector.c:406
 #, c-format
 msgid ""
 "The information sector has the wrong signature (%x).  Select cancel for now, "
@@ -1683,43 +1682,43 @@
 "Currently, only %s is free."
 msgstr "您需要 %s 的空闲空间来将此分区收缩到这一大小 (您目前只有 %s 的空闲空间)"
 
-#: libparted/fs/r/fat/context.c:56
+#: libparted/fs/r/fat/context.c:55
 #, c-format
 msgid ""
 "Cluster start delta = %d, which is not a multiple of the cluster size %d."
 msgstr "簇起始偏移 = %d，不是簇大小 %d 的整数倍。"
 
-#: libparted/fs/r/fat/count.c:144
+#: libparted/fs/r/fat/count.c:143
 #, c-format
 msgid "Bad directory entry for %s: first cluster is the end of file marker."
 msgstr "%s 的目录条目错误：第一个簇就是文件标志的结束。"
 
-#: libparted/fs/r/fat/count.c:157
+#: libparted/fs/r/fat/count.c:156
 #, c-format
 msgid ""
 "Bad FAT: unterminated chain for %s.  You should run dosfsck or scandisk."
 msgstr "错误的 FAT：%s 的链未终止。您应该运行 dosfsck 或 scandisk。"
 
-#: libparted/fs/r/fat/count.c:166
+#: libparted/fs/r/fat/count.c:165
 #, c-format
 msgid ""
 "Bad FAT: cluster %d outside file system in chain for %s.  You should run "
 "dosfsck or scandisk."
 msgstr "不当的 FAT 分区表：%2$s 的链中有簇 %1$d 位于文件系统之外。您应该运行 dosfsck 或 scandisk。"
 
-#: libparted/fs/r/fat/count.c:176
+#: libparted/fs/r/fat/count.c:175
 #, c-format
 msgid ""
 "Bad FAT: cluster %d is cross-linked for %s.  You should run dosfsck or "
 "scandisk."
 msgstr "错误的 FAT：簇 %d 同 %s 的链交叉了。您应该运行 dosfsck 或 scandisk。"
 
-#: libparted/fs/r/fat/count.c:195
+#: libparted/fs/r/fat/count.c:194
 #, c-format
 msgid "%s is %dk, but it has %d clusters (%dk)."
 msgstr "%s 为 %dk，但含有 %d 个簇 (%dk)。"
 
-#: libparted/fs/r/fat/count.c:258
+#: libparted/fs/r/fat/count.c:257
 #, c-format
 msgid ""
 "The file %s is marked as a system file.  This means moving it could cause "
@@ -1763,16 +1762,16 @@
 "cancel, or ignore to lose the files."
 msgstr "在根目录中空间不足以用于所有的文件。你可选择取消，或是忽略而遗失文件。"
 
-#: libparted/fs/r/fat/resize.c:302
+#: libparted/fs/r/fat/resize.c:299
 msgid "Error writing to the root directory."
 msgstr "写入根目录错误。"
 
-#: libparted/fs/r/fat/resize.c:495
+#: libparted/fs/r/fat/resize.c:488
 msgid ""
 "If you leave your file system as FAT16, then you will have no problems."
 msgstr "如果将您的文件系统类型保持 FAT16 不变，那么就不会有什么问题。"
 
-#: libparted/fs/r/fat/resize.c:498
+#: libparted/fs/r/fat/resize.c:491
 msgid ""
 "If you convert to FAT16, and MS Windows is installed on this partition, then "
 "you must re-install the MS Windows boot loader.  If you want to do this, you "
@@ -1781,13 +1780,13 @@
 "如果您转换为 FAT16，并将 MS Windows 安装到这个分区，那么您必须重新安装 MS Windows 启动管理器。如果您打算这么做，您应该参阅 "
 "Parted 的手册 (或您的发行版的手册)。"
 
-#: libparted/fs/r/fat/resize.c:506
+#: libparted/fs/r/fat/resize.c:499
 msgid ""
 "If you leave your file system as FAT32, then you will not introduce any new "
 "problems."
 msgstr "如果您保持文件系统类型为 FAT32 不变，那么您将不会遇到任何新问题。"
 
-#: libparted/fs/r/fat/resize.c:510
+#: libparted/fs/r/fat/resize.c:503
 msgid ""
 "If you convert to FAT32, and MS Windows is installed on this partition, then "
 "you must re-install the MS Windows boot loader.  If you want to do this, you "
@@ -1799,31 +1798,31 @@
 "的启动管理器。如果您打算这样作，您应该参阅 Parted 的手册 (或者您的发行版的手册)。此外，将文件系统转换为 FAT32，文件系统就不能够被 MS "
 "DOS、MS Windows 95a 和 MS Windows NT 所访问了。"
 
-#: libparted/fs/r/fat/resize.c:524
+#: libparted/fs/r/fat/resize.c:517
 #, c-format
 msgid "%s  %s  %s"
 msgstr "%s  %s  %s"
 
-#: libparted/fs/r/fat/resize.c:525
+#: libparted/fs/r/fat/resize.c:518
 msgid "Would you like to use FAT32?"
 msgstr "您是否愿意使用 FAT32？"
 
-#: libparted/fs/r/fat/resize.c:556 libparted/fs/r/fat/resize.c:572
+#: libparted/fs/r/fat/resize.c:549 libparted/fs/r/fat/resize.c:565
 #, c-format
 msgid "%s  %s"
 msgstr "%s  %s"
 
-#: libparted/fs/r/fat/resize.c:557
+#: libparted/fs/r/fat/resize.c:550
 msgid ""
 "The file system can only be resized to this size by converting to FAT16."
 msgstr "文件系统的大小只能通过转换为 FAT16 改变到这一大小。"
 
-#: libparted/fs/r/fat/resize.c:573
+#: libparted/fs/r/fat/resize.c:566
 msgid ""
 "The file system can only be resized to this size by converting to FAT32."
 msgstr "文件系统的大小只能通过转换为 FAT32 改变到这一大小。"
 
-#: libparted/fs/r/fat/resize.c:586
+#: libparted/fs/r/fat/resize.c:579
 msgid ""
 "GNU Parted cannot resize this partition to this size.  We're working on it!"
 msgstr "GNU Parted 无法调整这个分区为这样的大小。我们正为此努力！"
@@ -1862,18 +1861,18 @@
 msgid "The file system is bigger than its volume!"
 msgstr "文件系统大于其所在的卷！"
 
-#: libparted/fs/r/hfs/advfs.c:121 libparted/fs/r/hfs/advfs_plus.c:121
-#: libparted/fs/r/hfs/reloc.c:413 libparted/fs/r/hfs/reloc.c:507
-#: libparted/fs/r/hfs/reloc_plus.c:538 libparted/fs/r/hfs/reloc_plus.c:656
-#: libparted/fs/r/hfs/reloc_plus.c:769
+#: libparted/fs/r/hfs/advfs.c:120 libparted/fs/r/hfs/advfs_plus.c:120
+#: libparted/fs/r/hfs/reloc.c:412 libparted/fs/r/hfs/reloc.c:506
+#: libparted/fs/r/hfs/reloc_plus.c:537 libparted/fs/r/hfs/reloc_plus.c:655
+#: libparted/fs/r/hfs/reloc_plus.c:768
 msgid "The file system contains errors."
 msgstr "文件系统含有错误。"
 
-#: libparted/fs/r/hfs/advfs_plus.c:285
+#: libparted/fs/r/hfs/advfs_plus.c:284
 msgid "Bad blocks could not be read."
 msgstr "无法读取不当的区块。"
 
-#: libparted/fs/r/hfs/cache.c:137
+#: libparted/fs/r/hfs/cache.c:136
 #, c-format
 msgid ""
 "Trying to register an extent starting at block 0x%X, but another one already "
@@ -1887,42 +1886,42 @@
 "already exists at this position.  This should not happen!"
 msgstr "正在尝试把一个扩展块从 Ox%X 块移动到 Ox%X 块，但是另一个扩展块已经使用了这个位置。这是不应该发生的。"
 
-#: libparted/fs/r/hfs/file.c:143
+#: libparted/fs/r/hfs/file.c:142
 #, c-format
 msgid "Could not update the extent cache for HFS file with CNID %X."
 msgstr "无法更新具有 CNID %X 的 HFS 文件延伸缓存。"
 
-#: libparted/fs/r/hfs/file.c:180
+#: libparted/fs/r/hfs/file.c:179
 #, c-format
 msgid "Trying to read HFS file with CNID %X behind EOF."
 msgstr "尝试读取 EOF 之后具有 CNID %X 的 HFS 文件。"
 
-#: libparted/fs/r/hfs/file.c:190 libparted/fs/r/hfs/file.c:220
+#: libparted/fs/r/hfs/file.c:189 libparted/fs/r/hfs/file.c:219
 #, c-format
 msgid "Could not find sector %lli of HFS file with CNID %X."
 msgstr "找不到具有 CNID %2$X 的 HFS 文件扇区 %1$lli。"
 
-#: libparted/fs/r/hfs/file.c:210
+#: libparted/fs/r/hfs/file.c:209
 #, c-format
 msgid "Trying to write HFS file with CNID %X behind EOF."
 msgstr "尝试写入 EOF 之后具有 CNID %X 的 HFS 文件。"
 
-#: libparted/fs/r/hfs/file_plus.c:157
+#: libparted/fs/r/hfs/file_plus.c:156
 #, c-format
 msgid "Could not update the extent cache for HFS+ file with CNID %X."
 msgstr "无法更新具有 CNID %X 的 HFS+ 文件延伸缓存。"
 
-#: libparted/fs/r/hfs/file_plus.c:202
+#: libparted/fs/r/hfs/file_plus.c:201
 #, c-format
 msgid "Trying to read HFS+ file with CNID %X behind EOF."
 msgstr "尝试读取 EOF 之后具有 CNID %X 的 HFS+ 文件。"
 
-#: libparted/fs/r/hfs/file_plus.c:213 libparted/fs/r/hfs/file_plus.c:256
+#: libparted/fs/r/hfs/file_plus.c:212 libparted/fs/r/hfs/file_plus.c:255
 #, c-format
 msgid "Could not find sector %lli of HFS+ file with CNID %X."
 msgstr "找不到具有 CNID %2$X 的 HFS+ 文件扇区 %1$lli。"
 
-#: libparted/fs/r/hfs/file_plus.c:245
+#: libparted/fs/r/hfs/file_plus.c:244
 #, c-format
 msgid "Trying to write HFS+ file with CNID %X behind EOF."
 msgstr "尝试写入 EOF 之后具有 CNID %X 的 HFS+ 文件。"
@@ -1995,30 +1994,30 @@
 msgid "shrinking embedded HFS+ volume"
 msgstr "正收缩嵌入式 HFS+ 卷"
 
-#: libparted/fs/r/hfs/hfs.c:992
+#: libparted/fs/r/hfs/hfs.c:991
 msgid "Resizing the HFS+ volume has failed."
 msgstr "调整 HFS+ 卷大小失败。"
 
-#: libparted/fs/r/hfs/hfs.c:999
+#: libparted/fs/r/hfs/hfs.c:998
 msgid "shrinking HFS wrapper"
 msgstr "正收缩 HFS 包装程序"
 
-#: libparted/fs/r/hfs/hfs.c:1008
+#: libparted/fs/r/hfs/hfs.c:1007
 msgid "Updating the HFS wrapper has failed."
 msgstr "正更新 HFS 包装程序失败。"
 
-#: libparted/fs/r/hfs/hfs.c:1110 libparted/fs/r/hfs/hfs.c:1195
+#: libparted/fs/r/hfs/hfs.c:1109 libparted/fs/r/hfs/hfs.c:1194
 #, c-format
 msgid ""
 "This is not a real %s check.  This is going to extract special low level "
 "files for debugging purposes."
 msgstr "这不是真实的 %s 检查。这是为了调试的目的而抽出特殊的低级文件。"
 
-#: libparted/fs/r/hfs/journal.c:155
+#: libparted/fs/r/hfs/journal.c:154
 msgid "Bad block list header checksum."
 msgstr "不当的块清单标头校验和。"
 
-#: libparted/fs/r/hfs/journal.c:168
+#: libparted/fs/r/hfs/journal.c:167
 #, c-format
 msgid ""
 "Invalid size of a transaction block while replaying the journal (%i bytes)."
@@ -2030,85 +2029,85 @@
 "the journal and run Parted again."
 msgstr "不支持在卷以外存储日志。请停止日志记录后再运行 Parted。"
 
-#: libparted/fs/r/hfs/journal.c:271
+#: libparted/fs/r/hfs/journal.c:270
 msgid "Journal offset or size is not multiple of the sector size."
 msgstr "日志的偏移值或大小并非扇区大小的倍数。"
 
-#: libparted/fs/r/hfs/journal.c:292
+#: libparted/fs/r/hfs/journal.c:291
 msgid "Incorrect magic values in the journal header."
 msgstr "日志标头中有不正确的幻数。"
 
-#: libparted/fs/r/hfs/journal.c:302
+#: libparted/fs/r/hfs/journal.c:301
 msgid "Journal size mismatch between journal info block and journal header."
 msgstr "日志信息区块与日志标头中的日志大小不匹配。"
 
-#: libparted/fs/r/hfs/journal.c:314
+#: libparted/fs/r/hfs/journal.c:313
 msgid "Some header fields are not multiple of the sector size."
 msgstr "某些标头字段不是扇区大小的倍数。"
 
-#: libparted/fs/r/hfs/journal.c:323
+#: libparted/fs/r/hfs/journal.c:322
 msgid ""
 "The sector size stored in the journal is not 512 bytes.  Parted only "
 "supports 512 bytes length sectors."
 msgstr "保存在日志中的扇区大小不是 512 字节。Parted 只支持 512 字节长度的扇区。"
 
-#: libparted/fs/r/hfs/journal.c:335
+#: libparted/fs/r/hfs/journal.c:334
 msgid "Bad journal checksum."
 msgstr "不当的日志校验和。"
 
-#: libparted/fs/r/hfs/journal.c:353
+#: libparted/fs/r/hfs/journal.c:352
 msgid ""
 "The journal is not empty.  Parted must replay the transactions before "
 "opening the file system.  This will modify the file system."
 msgstr "日志非空。Parted 必须于打开文件系统之前重播事务作业。这将会修改文件系统。"
 
-#: libparted/fs/r/hfs/journal.c:381
+#: libparted/fs/r/hfs/journal.c:380
 msgid ""
 "The volume header or the master directory block has changed while replaying "
 "the journal.  You should restart Parted."
 msgstr "重播日志时，卷标头或主目录区块已变更。您应该重新启动 Parted。"
 
-#: libparted/fs/r/hfs/reloc.c:151 libparted/fs/r/hfs/reloc_plus.c:155
+#: libparted/fs/r/hfs/reloc.c:150 libparted/fs/r/hfs/reloc_plus.c:154
 msgid "An extent has not been relocated."
 msgstr "某个延伸未被重寻址。"
 
-#: libparted/fs/r/hfs/reloc.c:250 libparted/fs/r/hfs/reloc_plus.c:307
+#: libparted/fs/r/hfs/reloc.c:249 libparted/fs/r/hfs/reloc_plus.c:306
 msgid ""
 "A reference to an extent comes from a place it should not.  You should check "
 "the file system!"
 msgstr "某个延伸的参考来自它不该来的地方。您应该检查一下文件系统！"
 
-#: libparted/fs/r/hfs/reloc.c:380
+#: libparted/fs/r/hfs/reloc.c:379
 msgid "This HFS volume has no catalog file.  This is very unusual!"
 msgstr "这个 HFS 卷没有任何目录文件。这是很不寻常的！"
 
-#: libparted/fs/r/hfs/reloc.c:474
+#: libparted/fs/r/hfs/reloc.c:473
 msgid "This HFS volume has no extents overflow file.  This is quite unusual!"
 msgstr "这个 HFS 卷没有任何延伸溢出文件。这是相当不寻常的！"
 
-#: libparted/fs/r/hfs/reloc.c:516 libparted/fs/r/hfs/reloc_plus.c:666
+#: libparted/fs/r/hfs/reloc.c:515 libparted/fs/r/hfs/reloc_plus.c:665
 msgid ""
 "The extents overflow file should not contain its own extents!  You should "
 "check the file system."
 msgstr "延伸溢出文件不应该包含其本身的延伸！ 您应该检查一下文件系统。"
 
-#: libparted/fs/r/hfs/reloc.c:573 libparted/fs/r/hfs/reloc_plus.c:844
+#: libparted/fs/r/hfs/reloc.c:572 libparted/fs/r/hfs/reloc_plus.c:843
 msgid "Could not cache the file system in memory."
 msgstr "无法在内存中缓存文件系统。"
 
-#: libparted/fs/r/hfs/reloc.c:634 libparted/fs/r/hfs/reloc_plus.c:905
+#: libparted/fs/r/hfs/reloc.c:633 libparted/fs/r/hfs/reloc_plus.c:904
 msgid "Bad blocks list could not be loaded."
 msgstr "无法加载坏块清单。"
 
-#: libparted/fs/r/hfs/reloc.c:648 libparted/fs/r/hfs/reloc_plus.c:921
+#: libparted/fs/r/hfs/reloc.c:647 libparted/fs/r/hfs/reloc_plus.c:920
 msgid "An error occurred during extent relocation."
 msgstr "在延伸重寻址的期间发生了错误。"
 
-#: libparted/fs/r/hfs/reloc_plus.c:494
+#: libparted/fs/r/hfs/reloc_plus.c:493
 msgid "This HFS+ volume has no catalog file.  This is very unusual!"
 msgstr "这个 HFS+ 卷没有任何类别文件。这是很不寻常的！"
 
-#: libparted/fs/r/hfs/reloc_plus.c:617
+#: libparted/fs/r/hfs/reloc_plus.c:616
 msgid ""
 "This HFS+ volume has no extents overflow file.  This is quite unusual!"
 msgstr "这个 HFS+ 卷没有任何延伸溢出文件。这是相当不寻常的！"
@@ -2145,7 +2144,7 @@
 
 #: parted/parted.c:145
 msgid "LABEL-TYPE is one of: "
-msgstr "“卷标类型”是以下任意一项： "
+msgstr "“标签类型”是以下任意一项： "
 
 #: parted/parted.c:146 parted/parted.c:147
 msgid "FLAG is one of: "
@@ -2211,53 +2210,53 @@
 "详情请参见 GNU 通用公共许可证。\n"
 "\n"
 
-#: parted/parted.c:212
+#: parted/parted.c:211
 #, c-format
 msgid "%0.f%%\t(time left %.2d:%.2d)"
 msgstr "%0.f%%\t(剩余时间 %.2d:%.2d)"
 
-#: parted/parted.c:231
+#: parted/parted.c:230
 #, c-format
 msgid "Partition %s is being used. Are you sure you want to continue?"
 msgstr "分区 %s 正被使用。你确定要继续吗?"
 
-#: parted/parted.c:252
+#: parted/parted.c:251
 #, c-format
 msgid "Partition(s) on %s are being used."
 msgstr "正在使用 %s 上的分区。"
 
-#: parted/parted.c:264
+#: parted/parted.c:263
 #, c-format
 msgid ""
 "The existing disk label on %s will be destroyed and all data on this disk "
 "will be lost. Do you want to continue?"
 msgstr "现有 %s 上的磁盘卷标将被销毁，而所有在这个磁盘上的数据将会丢失。您要继续吗？"
 
-#: parted/parted.c:525
+#: parted/parted.c:524
 msgid "New disk label type?"
-msgstr "新的磁盘卷标类型？"
+msgstr "新的磁盘标签类型？"
 
-#: parted/parted.c:662
+#: parted/parted.c:661
 msgid "Partition type?"
 msgstr "分区类型？"
 
-#: parted/parted.c:680 parted/parted.c:884
+#: parted/parted.c:679 parted/parted.c:869
 msgid "Partition name?"
 msgstr "分区名称？"
 
-#: parted/parted.c:690
+#: parted/parted.c:687
 msgid "File system type?"
 msgstr "文件系统类型？"
 
-#: parted/parted.c:695 parted/parted.c:1498
+#: parted/parted.c:693 parted/parted.c:1476
 msgid "Start?"
 msgstr "起始点？"
 
-#: parted/parted.c:698 parted/parted.c:1500 parted/parted.c:1569
+#: parted/parted.c:696 parted/parted.c:1478 parted/parted.c:1546
 msgid "End?"
 msgstr "结束点？"
 
-#: parted/parted.c:766
+#: parted/parted.c:764
 #, c-format
 msgid ""
 "You requested a partition from %s to %s (sectors %llu..%llu).\n"
@@ -2266,7 +2265,7 @@
 "您要求将分区从 %s 移动到 %s (扇区 %llu..%llu)。\n"
 "我们可以管理的最近的分区是从 %s 到 %s (扇区 %llu..%llu).%s"
 
-#: parted/parted.c:775
+#: parted/parted.c:773
 msgid ""
 "\n"
 "Is this still acceptable to you?"
@@ -2278,106 +2277,106 @@
 msgid "The resulting partition is not properly aligned for best performance."
 msgstr ""
 
-#: parted/parted.c:881 parted/parted.c:1561 parted/parted.c:1612
-#: parted/parted.c:1706 parted/parted.c:1781
+#: parted/parted.c:866 parted/parted.c:1539 parted/parted.c:1587
+#: parted/parted.c:1661 parted/parted.c:1725
 msgid "Partition number?"
 msgstr "分区编号？"
 
-#: parted/parted.c:975
+#: parted/parted.c:960
 #, c-format
 msgid "BIOS cylinder,head,sector geometry: %d,%d,%d.  Each cylinder is %s.\n"
 msgstr "BIOS 的柱面、磁头、扇区几何结构：%d,%d,%d。每圈柱面是 %s。\n"
 
-#: parted/parted.c:1017
+#: parted/parted.c:1001
 #, c-format
 msgid "Model: %s (%s)\n"
 msgstr "型号：%s (%s)\n"
 
-#: parted/parted.c:1019
+#: parted/parted.c:1003
 #, c-format
 msgid "Disk %s: %s\n"
 msgstr "磁盘 %s: %s\n"
 
-#: parted/parted.c:1020
+#: parted/parted.c:1004
 #, c-format
 msgid "Sector size (logical/physical): %lldB/%lldB\n"
 msgstr "扇区大小 (逻辑/物理)：%lldB/%lldB\n"
 
-#: parted/parted.c:1032
+#: parted/parted.c:1016
 #, c-format
 msgid "Partition Table: %s\n"
 msgstr "分区表：%s\n"
 
-#: parted/parted.c:1033
+#: parted/parted.c:1017
 #, c-format
 msgid "Disk Flags: %s\n"
 msgstr "磁盘标志：%s\n"
 
-#: parted/parted.c:1153 parted/parted.c:1156
+#: parted/parted.c:1139 parted/parted.c:1142
 msgid "Number"
 msgstr "编号"
 
-#: parted/parted.c:1153 parted/parted.c:1156
+#: parted/parted.c:1139 parted/parted.c:1142
 msgid "Start"
 msgstr "起始点"
 
-#: parted/parted.c:1154 parted/parted.c:1157
+#: parted/parted.c:1140 parted/parted.c:1143
 msgid "End"
 msgstr "结束点"
 
-#: parted/parted.c:1157
+#: parted/parted.c:1143
 msgid "Size"
 msgstr "大小"
 
-#: parted/parted.c:1161
+#: parted/parted.c:1147
 msgid "Type"
 msgstr "类型"
 
-#: parted/parted.c:1163
+#: parted/parted.c:1149
 msgid "File system"
 msgstr "文件系统"
 
-#: parted/parted.c:1166
+#: parted/parted.c:1152
 msgid "Name"
 msgstr "名称"
 
-#: parted/parted.c:1168
+#: parted/parted.c:1154
 msgid "Flags"
 msgstr "标志"
 
-#: parted/parted.c:1225
+#: parted/parted.c:1211
 msgid "Free Space"
 msgstr "可用空间"
 
-#: parted/parted.c:1385
+#: parted/parted.c:1371
 #, c-format
 msgid ""
 "A %s %s partition was found at %s -> %s.  Do you want to add it to the "
 "partition table?"
 msgstr "%s %s 分区发现于 %s -> %s.  要将她添加到分区表么?"
 
-#: parted/parted.c:1428
+#: parted/parted.c:1410
 msgid "searching for file systems"
 msgstr "正在搜索文件系统"
 
-#: parted/parted.c:1535
+#: parted/parted.c:1513
 msgid "The resize command has been removed in parted 3.0"
 msgstr "resize 命令已在 parted 3.0 移除"
 
-#: parted/parted.c:1583
+#: parted/parted.c:1558
 msgid ""
 "Shrinking a partition can cause data loss, are you sure you want to continue?"
 msgstr "缩小分区可导致数据丢失，你确定要继续吗？"
 
-#: parted/parted.c:1636
+#: parted/parted.c:1609
 msgid "New device?"
 msgstr "新设备？"
 
-#: parted/parted.c:1704
+#: parted/parted.c:1659
 msgid "alignment type(min/opt)"
 msgstr "对齐类型 (最小/最佳)"
 
-#: parted/parted.c:1719
+#: parted/parted.c:1666
 #, c-format
 msgid "%d aligned\n"
 msgstr "%d 已对齐\n"
@@ -2387,19 +2386,19 @@
 msgid "%d not aligned\n"
 msgstr ""
 
-#: parted/parted.c:1746 parted/parted.c:1783
+#: parted/parted.c:1690 parted/parted.c:1727
 msgid "Flag to Invert?"
 msgstr "要反转的标志？"
 
-#: parted/parted.c:1751 parted/parted.c:1788
+#: parted/parted.c:1695 parted/parted.c:1732
 msgid "New state?"
 msgstr "新状态？"
 
-#: parted/parted.c:1834
+#: parted/parted.c:1778
 msgid "Unit?"
 msgstr "单位？"
 
-#: parted/parted.c:1969
+#: parted/parted.c:1913
 msgid "align-check"
 msgstr "对齐检查"
 
@@ -2409,225 +2408,225 @@
 "TYPE(min|opt) alignment"
 msgstr ""
 
-#: parted/parted.c:1980
+#: parted/parted.c:1924
 msgid "help"
 msgstr "help"
 
-#: parted/parted.c:1983
+#: parted/parted.c:1927
 msgid ""
 "help [COMMAND]                           print general help, or help on "
 "COMMAND"
 msgstr "help [COMMAND]                           打印通用求助信息，或 COMMAND 的帮助"
 
-#: parted/parted.c:1989
+#: parted/parted.c:1933
 msgid "mklabel"
 msgstr "mklabel"
 
-#: parted/parted.c:1989
+#: parted/parted.c:1933
 msgid "mktable"
 msgstr "mktable"
 
-#: parted/parted.c:1992
+#: parted/parted.c:1936
 msgid ""
 "mklabel,mktable LABEL-TYPE               create a new disklabel (partition "
 "table)"
 msgstr "mklabel,mktable LABEL-TYPE               创建新的磁盘卷标 (分区表)"
 
-#: parted/parted.c:1998
+#: parted/parted.c:1942
 msgid "mkpart"
 msgstr "mkpart"
 
-#: parted/parted.c:2001
+#: parted/parted.c:1945
 msgid "mkpart PART-TYPE [FS-TYPE] START END     make a partition"
 msgstr "mkpart 分区类型 [文件系统类型] 起始点 结束点 创建一个分区"
 
-#: parted/parted.c:2007
+#: parted/parted.c:1951
 msgid ""
 "'mkpart' makes a partition without creating a new file system on the "
 "partition.  FS-TYPE may be specified to set an appropriate partition ID.\n"
 msgstr "“mkpart”创建分区而不在分区上创建新文件系统。“文件系统类型”可以用于设置适当的分区辨识号。\n"
 
-#: parted/parted.c:2012
+#: parted/parted.c:1956
 msgid "name"
 msgstr "name"
 
-#: parted/parted.c:2015
+#: parted/parted.c:1959
 msgid ""
 "name NUMBER NAME                         name partition NUMBER as NAME"
 msgstr "name 编号 名称                           将指定“编号”的分区命名为“名称”"
 
-#: parted/parted.c:2020
+#: parted/parted.c:1964
 msgid "print"
 msgstr "print"
 
-#: parted/parted.c:2023
+#: parted/parted.c:1967
 msgid ""
 "print [devices|free|list,all|NUMBER]     display the partition table, "
 "available devices, free space, all found partitions, or a particular "
 "partition"
 msgstr "print [devices|free|list,all|数字]        显示分区表、可用设备、剩余空间、所有分区或特殊分区"
 
-#: parted/parted.c:2028
+#: parted/parted.c:1972
 msgid ""
 "Without arguments, 'print' displays the entire partition table. However with "
 "the following arguments it performs various other actions.\n"
 msgstr "“print”不加参数可显示整个分区表。然而借由下列参数它能运行各种其他动作。\n"
 
-#: parted/parted.c:2030
+#: parted/parted.c:1974
 msgid "  devices   : display all active block devices\n"
 msgstr "  devices  ：显示所有作用中的块设备\n"
 
-#: parted/parted.c:2031
+#: parted/parted.c:1975
 msgid ""
 "  free      : display information about free unpartitioned space on the "
 "current block device\n"
 msgstr "  free     ：显示在目前块设备上未分区的可用空间信息\n"
 
-#: parted/parted.c:2033
+#: parted/parted.c:1977
 msgid ""
 "  list, all : display the partition tables of all active block devices\n"
 msgstr "  list, all : 显示所有作用中块设备的分区表\n"
 
-#: parted/parted.c:2034
+#: parted/parted.c:1978
 msgid ""
 "  NUMBER    : display more detailed information about this particular "
 "partition\n"
 msgstr "  数字      : 显示此一特殊分区更详细的信息\n"
 
-#: parted/parted.c:2039
+#: parted/parted.c:1983
 msgid "quit"
 msgstr "quit"
 
-#: parted/parted.c:2042
+#: parted/parted.c:1986
 msgid "quit                                     exit program"
 msgstr "quit                                     退出程序"
 
-#: parted/parted.c:2047
+#: parted/parted.c:1991
 msgid "rescue"
 msgstr "rescue"
 
-#: parted/parted.c:2050
+#: parted/parted.c:1994
 msgid ""
 "rescue START END                         rescue a lost partition near START "
 "and END"
 msgstr "rescue 起始点 终止点                      挽救临近“起始点”、“终止点”的遗失的分区"
 
-#: parted/parted.c:2056
+#: parted/parted.c:2000
 msgid "resize"
 msgstr "resize"
 
-#: parted/parted.c:2059
+#: parted/parted.c:2003
 msgid "The resize command was removed in parted 3.0\n"
 msgstr "resize 命令已在 parted 3.0 移除\n"
 
-#: parted/parted.c:2062
+#: parted/parted.c:2006
 msgid "resizepart"
 msgstr "resizepart"
 
-#: parted/parted.c:2065
+#: parted/parted.c:2009
 msgid "resizepart NUMBER END                    resize partition NUMBER"
 msgstr "resizepart NUMBER END                    改变 NUMBER 的大小"
 
-#: parted/parted.c:2070
+#: parted/parted.c:2014
 msgid "rm"
 msgstr "rm"
 
-#: parted/parted.c:2073
+#: parted/parted.c:2017
 msgid "rm NUMBER                                delete partition NUMBER"
 msgstr "rm NUMBER                                删除编号为 NUMBER 的分区"
 
-#: parted/parted.c:2078
+#: parted/parted.c:2022
 msgid "select"
 msgstr "select"
 
-#: parted/parted.c:2081
+#: parted/parted.c:2025
 msgid "select DEVICE                            choose the device to edit"
 msgstr "select 设备                              选择要编辑的设备"
 
-#: parted/parted.c:2086
+#: parted/parted.c:2030
 msgid "disk_set"
 msgstr "disk_set"
 
-#: parted/parted.c:2089
+#: parted/parted.c:2033
 msgid ""
 "disk_set FLAG STATE                      change the FLAG on selected device"
 msgstr "disk_set 旗标 状态                       变更已选设备上的旗标"
 
-#: parted/parted.c:2094
+#: parted/parted.c:2038
 msgid "disk_toggle"
 msgstr "disk_toggle"
 
-#: parted/parted.c:2097
+#: parted/parted.c:2041
 msgid ""
 "disk_toggle [FLAG]                       toggle the state of FLAG on "
 "selected device"
 msgstr "disk_toggle [旗标]                       切换已选设备上的旗标状态"
 
-#: parted/parted.c:2103
+#: parted/parted.c:2047
 msgid "set"
 msgstr "set"
 
-#: parted/parted.c:2106
+#: parted/parted.c:2050
 msgid ""
 "set NUMBER FLAG STATE                    change the FLAG on partition NUMBER"
 msgstr "set 编号 旗标 状态                       改变指定“编号”分区的旗标"
 
-#: parted/parted.c:2112
+#: parted/parted.c:2056
 msgid "toggle"
 msgstr "toggle"
 
-#: parted/parted.c:2115
+#: parted/parted.c:2059
 msgid ""
 "toggle [NUMBER [FLAG]]                   toggle the state of FLAG on "
 "partition NUMBER"
 msgstr "toggle [编号 [旗标]]                     切换“编号”分区上的“旗标”状态"
 
-#: parted/parted.c:2121
+#: parted/parted.c:2065
 msgid "unit"
 msgstr "unit"
 
-#: parted/parted.c:2124
+#: parted/parted.c:2068
 msgid "unit UNIT                                set the default unit to UNIT"
 msgstr "unit 单位                                设置缺省的“单位”"
 
-#: parted/parted.c:2129
+#: parted/parted.c:2073
 msgid "version"
 msgstr "version"
 
-#: parted/parted.c:2132
+#: parted/parted.c:2076
 msgid ""
 "version                                  display the version number and "
 "copyright information of GNU Parted"
 msgstr "version                                  显示目前 GNU Parted 的版本与版权信息"
 
-#: parted/parted.c:2136
+#: parted/parted.c:2080
 msgid ""
 "'version' displays copyright and version information corresponding to this "
 "copy of GNU Parted\n"
 msgstr "'version' 显示此份 GNU Parted 的版权与版本信息\n"
 
-#: parted/parted.c:2204
+#: parted/parted.c:2148
 #, c-format
 msgid "Usage: %s [-hlmsv] [-a<align>] [DEVICE [COMMAND [PARAMETERS]]...]\n"
 msgstr "用法：%s [-hlmsv] [-a<align>] [设备 [命令 [参数]]…]\n"
 
-#: parted/parted.c:2248
+#: parted/parted.c:2192
 msgid "No device found"
-msgstr "未找到设备"
+msgstr "没有找到设备"
 
-#: parted/parted.c:2285
+#: parted/parted.c:2229
 msgid "WARNING: You are not superuser.  Watch out for permissions.\n"
 msgstr "警告：您不是超级用户。注意权限问题。\n"
 
-#: parted/parted.c:2325
+#: parted/parted.c:2269
 msgid "You may need to update /etc/fstab.\n"
 msgstr "你可能需要 /etc/fstab。\n"
 
-#: parted/ui.c:164
+#: parted/ui.c:162
 msgid "Welcome to GNU Parted! Type 'help' to view a list of commands.\n"
 msgstr "欢迎使用 GNU Parted！输入 'help' 来查看命令列表。\n"
 
-#: parted/ui.c:167
+#: parted/ui.c:165
 msgid ""
 "Usage: parted [OPTION]... [DEVICE [COMMAND [PARAMETERS]...]...]\n"
 "Apply COMMANDs with PARAMETERS to DEVICE.  If no COMMAND(s) are given, run "
@@ -2637,7 +2636,7 @@
 "用法：parted [选项]... [设备 [命令 [参数]...]...]\n"
 "将命令带着参数应用于“设备”。如果没有给出“命令”，则以交互模式运行。\n"
 
-#: parted/ui.c:172
+#: parted/ui.c:170
 #, c-format
 msgid ""
 "\n"
@@ -2698,7 +2697,7 @@
 "\n"
 "的输出结果和其他您认为重要的设置信息。\n"
 
-#: parted/ui.c:293
+#: parted/ui.c:291
 msgid ""
 "\n"
 "Command History:\n"
@@ -2706,7 +2705,7 @@
 "\n"
 "命令历史：\n"
 
-#: parted/ui.c:356
+#: parted/ui.c:354
 msgid ""
 "\n"
 "Error: SEGV_MAPERR (Address not mapped to object)\n"
@@ -2714,7 +2713,7 @@
 "\n"
 "错误：SEGV_MAPERR (地址未对应到对象)\n"
 
-#: parted/ui.c:362
+#: parted/ui.c:360
 msgid ""
 "\n"
 "Error: SEGV_ACCERR (Invalid permissions for mapped object)\n"
@@ -2722,7 +2721,7 @@
 "\n"
 "错误：SEGV_ACCERR (对应的对象权限无效)\n"
 
-#: parted/ui.c:367
+#: parted/ui.c:365
 msgid ""
 "\n"
 "Error: A general SIGSEGV signal was encountered.\n"
@@ -2730,7 +2729,7 @@
 "\n"
 "错误: 遇到一般的 SIGSEGV 信号。\n"
 
-#: parted/ui.c:391
+#: parted/ui.c:389
 msgid ""
 "\n"
 "Error: FPE_INTDIV (Integer: divide by zero)"
@@ -2738,7 +2737,7 @@
 "\n"
 "错误: FPE_INTDIV (整数: 除零)"
 
-#: parted/ui.c:396
+#: parted/ui.c:394
 msgid ""
 "\n"
 "Error: FPE_INTOVF (Integer: overflow)"
@@ -2746,7 +2745,7 @@
 "\n"
 "错误: FPE_INTOVF (整数: 上溢)"
 
-#: parted/ui.c:401
+#: parted/ui.c:399
 msgid ""
 "\n"
 "Error: FPE_FLTDIV (Float: divide by zero)"
@@ -2754,7 +2753,7 @@
 "\n"
 "错误：FPE_FLTDIV (浮点数: 除零)"
 
-#: parted/ui.c:406
+#: parted/ui.c:404
 msgid ""
 "\n"
 "Error: FPE_FLTOVF (Float: overflow)"
@@ -2762,7 +2761,7 @@
 "\n"
 "错误: FPE_FLTOVF (浮点数: 上溢)"
 
-#: parted/ui.c:411
+#: parted/ui.c:409
 msgid ""
 "\n"
 "Error: FPE_FLTUND (Float: underflow)"
@@ -2770,7 +2769,7 @@
 "\n"
 "错误: FPE_FLTUND (浮点数: 下溢)"
 
-#: parted/ui.c:416
+#: parted/ui.c:414
 msgid ""
 "\n"
 "Error: FPE_FLTRES (Float: inexact result)"
@@ -2778,7 +2777,7 @@
 "\n"
 "错误: FPE_FLTRES (浮点数: 不精确的结果)"
 
-#: parted/ui.c:421
+#: parted/ui.c:419
 msgid ""
 "\n"
 "Error: FPE_FLTINV (Float: invalid operation)"
@@ -2786,7 +2785,7 @@
 "\n"
 "错误: FPE_FLTINV (浮点数: 无效的操作)"
 
-#: parted/ui.c:426
+#: parted/ui.c:424
 msgid ""
 "\n"
 "Error: FPE_FLTSUB (Float: subscript out of range)"
@@ -2794,7 +2793,7 @@
 "\n"
 "错误: FPE_FLTSUB (浮点数: 注标超出范围)"
 
-#: parted/ui.c:431
+#: parted/ui.c:429
 msgid ""
 "\n"
 "Error: A general SIGFPE signal was encountered."
@@ -2802,7 +2801,7 @@
 "\n"
 "错误: 遇到一般的 SIGFPE 信号。"
 
-#: parted/ui.c:455
+#: parted/ui.c:453
 msgid ""
 "\n"
 "Error: ILL_ILLOPC (Illegal Opcode)"
@@ -2810,7 +2809,7 @@
 "\n"
 "错误: ILL_ILLOPC (不合法的操作码)"
 
-#: parted/ui.c:460
+#: parted/ui.c:458
 msgid ""
 "\n"
 "Error: ILL_ILLOPN (Illegal Operand)"
@@ -2818,7 +2817,7 @@
 "\n"
 "错误: ILL_ILLOPN (不合法的算符)"
 
-#: parted/ui.c:465
+#: parted/ui.c:463
 msgid ""
 "\n"
 "Error: ILL_ILLADR (Illegal addressing mode)"
@@ -2826,7 +2825,7 @@
 "\n"
 "错误: ILL_ILLADR (不合法的寻址模式)"
 
-#: parted/ui.c:470
+#: parted/ui.c:468
 msgid ""
 "\n"
 "Error: ILL_ILLTRP (Illegal Trap)"
@@ -2834,7 +2833,7 @@
 "\n"
 "错误: ILL_ILLTRP (不合法的陷阱)"
 
-#: parted/ui.c:475
+#: parted/ui.c:473
 msgid ""
 "\n"
 "Error: ILL_PRVOPC (Privileged Opcode)"
@@ -2842,7 +2841,7 @@
 "\n"
 "错误: ILL_PRVOPC (需要特权的操作码)"
 
-#: parted/ui.c:480
+#: parted/ui.c:478
 msgid ""
 "\n"
 "Error: ILL_PRVREG (Privileged Register)"
@@ -2850,7 +2849,7 @@
 "\n"
 "错误: ILL_PRVREG (需要特权的寄存器)"
 
-#: parted/ui.c:485
+#: parted/ui.c:483
 msgid ""
 "\n"
 "Error: ILL_COPROC (Coprocessor Error)"
@@ -2858,7 +2857,7 @@
 "\n"
 "错误: ILL_COPROC (辅助处理器错误)"
 
-#: parted/ui.c:490
+#: parted/ui.c:488
 msgid ""
 "\n"
 "Error: ILL_BADSTK (Internal Stack Error)"
@@ -2866,7 +2865,7 @@
 "\n"
 "错误: ILL_BADSTK (内部堆栈错误)"
 
-#: parted/ui.c:495
+#: parted/ui.c:493
 msgid ""
 "\n"
 "Error: A general SIGILL signal was encountered."
@@ -2874,65 +2873,65 @@
 "\n"
 "错误: 遇到一般的 SIGILL 信号。"
 
-#: parted/ui.c:888
+#: parted/ui.c:883
 #, c-format
 msgid "invalid token: %s"
 msgstr "无效的字组：%s"
 
-#: parted/ui.c:1069
+#: parted/ui.c:1047
 msgid "Expecting a partition number."
 msgstr "需要分区编号。"
 
-#: parted/ui.c:1078
+#: parted/ui.c:1056
 msgid "Partition doesn't exist."
 msgstr "分区不存在。"
 
-#: parted/ui.c:1098
+#: parted/ui.c:1076
 msgid "Expecting a file system type."
 msgstr "需要文件系统类型。"
 
-#: parted/ui.c:1105
+#: parted/ui.c:1083
 #, c-format
 msgid "Unknown file system type \"%s\"."
 msgstr "未知的文件系统类型“%s”。"
 
-#: parted/ui.c:1126
+#: parted/ui.c:1104
 msgid "Expecting a disk label type."
-msgstr "需要磁盘卷标类型。"
+msgstr "需要磁盘标签类型。"
 
-#: parted/ui.c:1267
+#: parted/ui.c:1231
 msgid "Can't create any more partitions."
 msgstr "无法创建更多分区。"
 
-#: parted/ui.c:1277
+#: parted/ui.c:1241
 msgid "Expecting a partition type."
 msgstr "需要分区类型。"
 
-#: parted/ui.c:1426
+#: parted/ui.c:1389
 msgid "on"
 msgstr "开"
 
-#: parted/ui.c:1427
+#: parted/ui.c:1390
 msgid "off"
 msgstr "关"
 
-#: parted/ui.c:1444
+#: parted/ui.c:1407
 msgid "optimal"
 msgstr "最佳"
 
-#: parted/ui.c:1445
+#: parted/ui.c:1408
 msgid "minimal"
 msgstr "最小"
 
-#: parted/ui.c:1578
+#: parted/ui.c:1541
 msgid "OPTIONs:"
 msgstr "选项："
 
-#: parted/ui.c:1583
+#: parted/ui.c:1546
 msgid "COMMANDs:"
 msgstr "命令："
 
-#: parted/ui.c:1586
+#: parted/ui.c:1549
 #, c-format
 msgid ""
 "\n"
@@ -2941,11 +2940,11 @@
 "\n"
 "将错误报告给 %s\n"
 
-#: parted/ui.c:1593
+#: parted/ui.c:1556
 #, c-format
 msgid "Using %s\n"
 msgstr "使用 %s\n"
 
-#: parted/ui.c:1673
+#: parted/ui.c:1630
 msgid "This command does not make sense in non-interactive mode.\n"
 msgstr "这个命令在非交互模式中不具任何意义。\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/polkit-1.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/polkit-1.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/polkit-1.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/polkit-1.po	2020-07-08 13:53:59.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:57+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:39+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: ../actions/org.freedesktop.policykit.policy.in.h:1
 msgid "Run programs as another user"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/procps-ng.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/procps-ng.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/procps-ng.po	2020-01-23 16:51:57.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/procps-ng.po	2020-07-08 13:53:57.000000000 +0000
@@ -14,11 +14,11 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:06+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:56+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
-#: free.c:74 slabtop.c:189 uptime.c:59 w.c:453
+#: free.c:74 slabtop.c:193 uptime.c:62 w.c:457
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [选项]\n"
@@ -95,29 +95,29 @@
 msgid " -w, --wide          wide output\n"
 msgstr " -w, --wide          宽版输出\n"
 
-#: free.c:95 w.c:462
+#: free.c:95 w.c:466
 msgid "     --help     display this help and exit\n"
 msgstr "     --help     显示此帮助信息并退出\n"
 
-#: free.c:198
+#: free.c:191
 msgid "Multiple unit options doesn't make sense."
 msgstr ""
 
-#: free.c:330
+#: free.c:322
 #, c-format
 msgid "seconds argument `%s' is not positive number"
 msgstr ""
 
-#: free.c:336
+#: free.c:328
 msgid "failed to parse count argument"
 msgstr ""
 
-#: free.c:339
+#: free.c:331
 #, c-format
 msgid "failed to parse count argument: '%s'"
 msgstr ""
 
-#: free.c:360
+#: free.c:352
 #, c-format
 msgid ""
 "              total        used        free      shared     buffers       "
@@ -125,30 +125,30 @@
 msgstr ""
 "              总计         已用        空闲      共享       缓冲          缓存    可用"
 
-#: free.c:362
+#: free.c:354
 #, c-format
 msgid ""
 "              total        used        free      shared  buff/cache   "
 "available"
 msgstr "              总计         已用        空闲      共享    缓冲/缓存    可用"
 
-#: free.c:365
+#: free.c:357
 msgid "Mem:"
 msgstr "内存："
 
-#: free.c:385
+#: free.c:377
 msgid "Low:"
 msgstr "低："
 
-#: free.c:391
+#: free.c:383
 msgid "High:"
 msgstr "高："
 
-#: free.c:398
+#: free.c:390
 msgid "Swap:"
 msgstr "交换："
 
-#: free.c:405
+#: free.c:397
 msgid "Total:"
 msgstr "总量："
 
@@ -156,107 +156,107 @@
 msgid "write error"
 msgstr "写入错误"
 
-#: pgrep.c:103
+#: pgrep.c:108
 #, c-format
 msgid " %s [options] <pattern>\n"
 msgstr ""
 
-#: pgrep.c:106
+#: pgrep.c:111
 msgid " -d, --delimiter <string>  specify output delimiter\n"
 msgstr ""
 
-#: pgrep.c:107
+#: pgrep.c:112
 msgid " -l, --list-name           list PID and process name\n"
 msgstr ""
 
-#: pgrep.c:108
+#: pgrep.c:113
 msgid " -a, --list-full           list PID and full command line\n"
 msgstr ""
 
-#: pgrep.c:109
+#: pgrep.c:114
 msgid " -v, --inverse             negates the matching\n"
 msgstr ""
 
-#: pgrep.c:110
+#: pgrep.c:115
 msgid " -w, --lightweight         list all TID\n"
 msgstr ""
 
-#: pgrep.c:113
+#: pgrep.c:118
 msgid " -<sig>, --signal <sig>    signal to send (either number or name)\n"
 msgstr ""
 
-#: pgrep.c:114
+#: pgrep.c:119
 msgid " -e, --echo                display what is killed\n"
 msgstr ""
 
-#: pgrep.c:116
+#: pgrep.c:121
 msgid " -c, --count               count of matching processes\n"
 msgstr ""
 
-#: pgrep.c:117
+#: pgrep.c:122
 msgid " -f, --full                use full process name to match\n"
 msgstr ""
 
-#: pgrep.c:118
+#: pgrep.c:123
 msgid " -g, --pgroup <PGID,...>   match listed process group IDs\n"
 msgstr ""
 
-#: pgrep.c:119
+#: pgrep.c:124
 msgid " -G, --group <GID,...>     match real group IDs\n"
 msgstr ""
 
-#: pgrep.c:120
+#: pgrep.c:125
 msgid " -i, --ignore-case         match case insensitively\n"
 msgstr ""
 
-#: pgrep.c:121
+#: pgrep.c:126
 msgid " -n, --newest              select most recently started\n"
 msgstr ""
 
-#: pgrep.c:122
+#: pgrep.c:127
 msgid " -o, --oldest              select least recently started\n"
 msgstr ""
 
-#: pgrep.c:123
+#: pgrep.c:128
 msgid ""
 " -P, --parent <PPID,...>   match only child processes of the given parent\n"
 msgstr ""
 
-#: pgrep.c:124
+#: pgrep.c:129
 msgid " -s, --session <SID,...>   match session IDs\n"
 msgstr ""
 
-#: pgrep.c:125
+#: pgrep.c:130
 msgid " -t, --terminal <tty,...>  match by controlling terminal\n"
 msgstr ""
 
-#: pgrep.c:126
+#: pgrep.c:131
 msgid " -u, --euid <ID,...>       match by effective IDs\n"
 msgstr ""
 
-#: pgrep.c:127
+#: pgrep.c:132
 msgid " -U, --uid <ID,...>        match by real IDs\n"
 msgstr ""
 
-#: pgrep.c:128
+#: pgrep.c:133
 msgid " -x, --exact               match exactly with the command name\n"
 msgstr ""
 
-#: pgrep.c:129
+#: pgrep.c:134
 msgid " -F, --pidfile <file>      read PIDs from file\n"
 msgstr ""
 
-#: pgrep.c:130
+#: pgrep.c:135
 msgid " -L, --logpidfile          fail if PID file is not locked\n"
 msgstr ""
 
-#: pgrep.c:131
+#: pgrep.c:137
 msgid ""
 " --ns <PID>                match the processes that belong to the same\n"
 "                           namespace as <pid>\n"
 msgstr ""
 
-#: pgrep.c:133
+#: pgrep.c:139
 msgid ""
 " --nslist <ns,...>         list which namespaces will be considered for\n"
 "                           the --ns option.\n"
@@ -264,222 +264,222 @@
 "uts\n"
 msgstr ""
 
-#: pgrep.c:274
+#: pgrep.c:280
 #, c-format
 msgid "invalid user name: %s"
 msgstr ""
 
-#: pgrep.c:291
+#: pgrep.c:297
 #, c-format
 msgid "invalid group name: %s"
 msgstr ""
 
-#: pgrep.c:302
+#: pgrep.c:308
 #, c-format
 msgid "invalid process group: %s"
 msgstr ""
 
-#: pgrep.c:314
+#: pgrep.c:320
 #, c-format
 msgid "invalid session id: %s"
 msgstr ""
 
-#: pgrep.c:326
+#: pgrep.c:332
 #, c-format
 msgid "not a number: %s"
 msgstr ""
 
-#: pgrep.c:507
+#: pgrep.c:515
 msgid "Error reading reference namespace information\n"
 msgstr ""
 
-#: pgrep.c:610 pidof.c:230 pidof.c:271 sysctl.c:643
+#: pgrep.c:632 pidof.c:233 pidof.c:272 skill.c:506 sysctl.c:680
 msgid "internal error"
 msgstr ""
 
-#: pgrep.c:876
+#: pgrep.c:895
 #, c-format
 msgid ""
 "-L without -F makes no sense\n"
 "Try `%s --help' for more information."
 msgstr ""
 
-#: pgrep.c:883
+#: pgrep.c:902
 #, c-format
 msgid ""
 "pidfile not valid\n"
 "Try `%s --help' for more information."
 msgstr ""
 
-#: pgrep.c:891
+#: pgrep.c:910
 #, c-format
 msgid ""
 "only one pattern can be provided\n"
 "Try `%s --help' for more information."
 msgstr ""
 
-#: pgrep.c:895
+#: pgrep.c:914
 #, c-format
 msgid ""
 "no matching criteria specified\n"
 "Try `%s --help' for more information."
 msgstr ""
 
-#: pgrep.c:922
+#: pgrep.c:942
 #, c-format
 msgid "%s killed (pid %lu)\n"
 msgstr ""
 
-#: pgrep.c:928
+#: pgrep.c:949
 #, c-format
 msgid "killing pid %ld failed"
 msgstr ""
 
-#: pidof.c:61
+#: pidof.c:67
 #, c-format
 msgid " %s [options] [program [...]]\n"
 msgstr ""
 
-#: pidof.c:63
+#: pidof.c:69
 msgid " -s, --single-shot         return one PID only\n"
 msgstr ""
 
-#: pidof.c:64
+#: pidof.c:70
 msgid " -c, --check-root          omit processes with different root\n"
 msgstr ""
 
-#: pidof.c:65
+#: pidof.c:71
 msgid ""
 " -x                        also find shells running the named scripts\n"
 msgstr ""
 
-#: pidof.c:66
+#: pidof.c:72
 msgid " -o, --omit-pid <PID,...>  omit processes with PID\n"
 msgstr ""
 
-#: pidof.c:274
+#: pidof.c:275
 #, c-format
 msgid "illegal omit pid value (%s)!\n"
 msgstr ""
 
-#: pmap.c:61
+#: pmap.c:62
 msgid "Address"
 msgstr "住址"
 
-#: pmap.c:62
+#: pmap.c:63
 msgid "Offset"
 msgstr ""
 
-#: pmap.c:63
+#: pmap.c:64
 msgid "Device"
 msgstr ""
 
-#: pmap.c:64
+#: pmap.c:65
 msgid "Mapping"
 msgstr ""
 
-#: pmap.c:68
+#: pmap.c:69
 msgid "Perm"
 msgstr ""
 
-#: pmap.c:69
+#: pmap.c:70
 msgid "Inode"
 msgstr ""
 
-#: pmap.c:72
+#: pmap.c:73
 msgid "Kbytes"
 msgstr ""
 
-#: pmap.c:73
+#: pmap.c:74
 msgid "Mode"
 msgstr ""
 
-#: pmap.c:74
+#: pmap.c:75
 msgid "RSS"
 msgstr ""
 
-#: pmap.c:75
+#: pmap.c:76
 msgid "Dirty"
 msgstr ""
 
-#: pmap.c:109
+#: pmap.c:110
 #, c-format
 msgid " %s [options] PID [PID ...]\n"
 msgstr ""
 
-#: pmap.c:111
+#: pmap.c:112
 msgid " -x, --extended              show details\n"
 msgstr ""
 
-#: pmap.c:112
+#: pmap.c:113
 msgid " -X                          show even more details\n"
 msgstr ""
 
-#: pmap.c:113
+#: pmap.c:114
 msgid "            WARNING: format changes according to /proc/PID/smaps\n"
 msgstr ""
 
-#: pmap.c:114
+#: pmap.c:115
 msgid " -XX                         show everything the kernel provides\n"
 msgstr ""
 
-#: pmap.c:115
+#: pmap.c:116
 msgid " -c, --read-rc               read the default rc\n"
 msgstr ""
 
-#: pmap.c:116
+#: pmap.c:117
 msgid " -C, --read-rc-from=<file>   read the rc from file\n"
 msgstr ""
 
-#: pmap.c:117
+#: pmap.c:118
 msgid " -n, --create-rc             create new default rc\n"
 msgstr ""
 
-#: pmap.c:118
+#: pmap.c:119
 msgid " -N, --create-rc-to=<file>   create new rc to file\n"
 msgstr ""
 
-#: pmap.c:119
+#: pmap.c:120
 msgid "            NOTE: pid arguments are not allowed with -n, -N\n"
 msgstr ""
 
-#: pmap.c:120
+#: pmap.c:121
 msgid " -d, --device                show the device format\n"
 msgstr ""
 
-#: pmap.c:121
+#: pmap.c:122
 msgid " -q, --quiet                 do not display header and footer\n"
 msgstr ""
 
-#: pmap.c:122
+#: pmap.c:123
 msgid " -p, --show-path             show path in the mapping\n"
 msgstr ""
 
-#: pmap.c:123
+#: pmap.c:124
 msgid " -A, --range=<low>[,<high>]  limit results to the given range\n"
 msgstr ""
 
-#: pmap.c:201
+#: pmap.c:202
 msgid "shared memory detach"
 msgstr ""
 
-#: pmap.c:205
+#: pmap.c:206
 msgid "shared memory remove"
 msgstr ""
 
-#: pmap.c:238
+#: pmap.c:231
 msgid "  [ anon ]"
 msgstr ""
 
-#: pmap.c:240
+#: pmap.c:233
 msgid "  [ stack ]"
 msgstr ""
 
-#: pmap.c:325
+#: pmap.c:319 pmap.c:325
 msgid "Unknown format in smaps file!"
 msgstr ""
 
-#: pmap.c:368
+#: pmap.c:364
 msgid "inconsistent detail field in smaps file, line:\n"
 msgstr ""
 
@@ -506,81 +506,81 @@
 msgid " total %8ldK\n"
 msgstr ""
 
-#: pmap.c:767 skill.c:500 skill.c:534 skill.c:621 tload.c:128 tload.c:133
-#: vmstat.c:959 vmstat.c:968 watch.c:726
+#: pmap.c:771 skill.c:518 skill.c:550 skill.c:634 tload.c:135 tload.c:140
+#: vmstat.c:977 vmstat.c:986 watch.c:732
 msgid "failed to parse argument"
 msgstr ""
 
-#: pmap.c:811
+#: pmap.c:814
 #, c-format
 msgid "config line too long - line %d"
 msgstr ""
 
-#: pmap.c:836
+#: pmap.c:839
 #, c-format
 msgid "unsupported section found in the config - line %d"
 msgstr ""
 
-#: pmap.c:839 pmap.c:850 pmap.c:861 pmap.c:880 pmap.c:892
+#: pmap.c:842 pmap.c:853 pmap.c:864 pmap.c:883 pmap.c:895
 #, c-format
 msgid "syntax error found in the config - line %d"
 msgstr ""
 
-#: pmap.c:911
+#: pmap.c:914
 msgid "the file already exists - delete or rename it first"
 msgstr ""
 
-#: pmap.c:974
+#: pmap.c:977
 msgid "HOME variable undefined"
 msgstr ""
 
-#: pmap.c:982
+#: pmap.c:985
 msgid "memory allocation failed"
 msgstr ""
 
-#: pmap.c:1034
+#: pmap.c:1037
 msgid "option -r is ignored as SunOS compatibility"
 msgstr ""
 
-#: pmap.c:1081
+#: pmap.c:1084
 msgid "options -c, -C, -d, -n, -N, -x, -X are mutually exclusive"
 msgstr ""
 
-#: pmap.c:1084
+#: pmap.c:1087
 msgid "options -p, -q are mutually exclusive with -n, -N"
 msgstr ""
 
-#: pmap.c:1087
+#: pmap.c:1090 pmap.c:1142
 msgid "too many arguments"
 msgstr "实参太多"
 
-#: pmap.c:1091
+#: pmap.c:1094
 msgid "rc file successfully created, feel free to edit the content"
 msgstr ""
 
-#: pmap.c:1094
+#: pmap.c:1097
 msgid "couldn't create the rc file"
 msgstr ""
 
-#: pmap.c:1106
+#: pmap.c:1109
 #, c-format
 msgid "~/.%src file successfully created, feel free to edit the content"
 msgstr ""
 
-#: pmap.c:1109
+#: pmap.c:1112
 #, c-format
 msgid "couldn't create ~/.%src"
 msgstr ""
 
-#: pmap.c:1114
+#: pmap.c:1117
 msgid "argument missing"
 msgstr ""
 
-#: pmap.c:1128
+#: pmap.c:1131
 msgid "couldn't read the rc file"
 msgstr ""
 
-#: pmap.c:1130
+#: pmap.c:1133
 #, c-format
 msgid "couldn't read ~/.%src"
 msgstr ""
@@ -590,27 +590,28 @@
 msgid "Signal %d (%s) caught by %s (%s).\n"
 msgstr ""
 
-#: ps/display.c:66 ps/display.c:271 ps/parser.c:495 ps/parser.c:742
-#: ps/select.c:95 ps/sortformat.c:544
+#: ps/display.c:66 ps/display.c:272 ps/display.c:480 ps/output.c:2174
+#: ps/parser.c:495 ps/parser.c:742 ps/select.c:95 ps/sortformat.c:263
+#: ps/sortformat.c:301 ps/sortformat.c:548
 msgid "please report this bug"
 msgstr ""
 
-#: ps/display.c:356
+#: ps/display.c:357
 #, c-format
 msgid "error: not enough memory\n"
 msgstr ""
 
-#: ps/display.c:367 ps/display.c:542
+#: ps/display.c:368 ps/display.c:553
 #, c-format
 msgid "error: can not access /proc\n"
 msgstr ""
 
-#: ps/display.c:417
+#: ps/display.c:418
 #, c-format
 msgid "could not find start_time\n"
 msgstr ""
 
-#: ps/display.c:428
+#: ps/display.c:429
 #, c-format
 msgid "could not find ppid\n"
 msgstr ""
@@ -1022,17 +1023,17 @@
 "For more details see ps(1).\n"
 msgstr ""
 
-#: ps/output.c:1969
+#: ps/output.c:2022
 #, c-format
 msgid "fix bigness error\n"
 msgstr ""
 
-#: ps/output.c:2044
+#: ps/output.c:2105
 #, c-format
 msgid "bad alignment code\n"
 msgstr ""
 
-#: ps/output.c:2106
+#: ps/output.c:2100
 #, c-format
 msgid "unknown page size (assume 4096)\n"
 msgstr ""
@@ -1314,130 +1315,131 @@
 msgid "process selection options conflict"
 msgstr ""
 
-#: ps/sortformat.c:106 ps/sortformat.c:111
+#: ps/sortformat.c:107 ps/sortformat.c:112
 msgid "seriously crashing: goodbye cruel world"
 msgstr ""
 
-#: ps/sortformat.c:146
+#: ps/sortformat.c:147
 msgid "improper AIX field descriptor"
 msgstr ""
 
-#: ps/sortformat.c:167
+#: ps/sortformat.c:168
 msgid "unknown AIX field descriptor"
 msgstr ""
 
-#: ps/sortformat.c:172
+#: ps/sortformat.c:173
 msgid "AIX field descriptor processing bug"
 msgstr ""
 
-#: ps/sortformat.c:285
+#: ps/sortformat.c:287
 #, c-format
 msgid "unknown user-defined format specifier \"%s\""
 msgstr ""
 
-#: ps/sortformat.c:311
+#: ps/sortformat.c:314
 msgid "empty format list"
 msgstr ""
 
-#: ps/sortformat.c:312
+#: ps/sortformat.c:315
 msgid "improper format list"
 msgstr ""
 
-#: ps/sortformat.c:313
+#: ps/sortformat.c:316
 msgid "column widths must be unsigned decimal numbers"
 msgstr ""
 
-#: ps/sortformat.c:314
+#: ps/sortformat.c:317
 msgid "can not set width for a macro (multi-column) format specifier"
 msgstr ""
 
-#: ps/sortformat.c:367 ps/sortformat.c:383
+#: ps/sortformat.c:370 ps/sortformat.c:386
 msgid "improper sort list"
 msgstr ""
 
-#: ps/sortformat.c:378
+#: ps/sortformat.c:381
 msgid "empty sort list"
 msgstr ""
 
-#: ps/sortformat.c:399 ps/sortformat.c:477 ps/sortformat.c:479
+#: ps/sortformat.c:402 ps/sortformat.c:481 ps/sortformat.c:483
 msgid "unknown sort specifier"
 msgstr ""
 
-#: ps/sortformat.c:426 ps/sortformat.c:437 ps/sortformat.c:443
+#: ps/sortformat.c:429 ps/sortformat.c:434 ps/sortformat.c:441
+#: ps/sortformat.c:447
 msgid "bad sorting code"
 msgstr ""
 
-#: ps/sortformat.c:440
+#: ps/sortformat.c:444
 msgid "PPID sort and forest output conflict"
 msgstr ""
 
-#: ps/sortformat.c:514
+#: ps/sortformat.c:518
 msgid "option -O can not follow other format options"
 msgstr ""
 
-#: ps/sortformat.c:521 ps/sortformat.c:539
+#: ps/sortformat.c:525 ps/sortformat.c:543
 msgid "multiple sort options"
 msgstr ""
 
-#: ps/sortformat.c:529
+#: ps/sortformat.c:533
 msgid "option O is neither first format nor sort order"
 msgstr ""
 
-#: ps/sortformat.c:656
+#: ps/sortformat.c:660
 msgid "modifier -y without format -l makes no sense"
 msgstr ""
 
-#: ps/sortformat.c:756
+#: ps/sortformat.c:760
 msgid "bug: must reset the list first"
 msgstr ""
 
-#: ps/sortformat.c:794
+#: ps/sortformat.c:798
 msgid "tell <procps@freelists.org> what you expected"
 msgstr ""
 
-#: ps/sortformat.c:804
+#: ps/sortformat.c:808
 msgid ""
 "tell <procps@freelists.org> what you want (-L/-T, -m/m/H, and $PS_FORMAT)"
 msgstr ""
 
-#: ps/sortformat.c:821
+#: ps/sortformat.c:825
 #, c-format
 msgid "warning: $PS_FORMAT ignored. (%s)\n"
 msgstr ""
 
-#: ps/sortformat.c:826 ps/sortformat.c:836
+#: ps/sortformat.c:830 ps/sortformat.c:840
 msgid "conflicting format options"
 msgstr ""
 
-#: ps/sortformat.c:827
+#: ps/sortformat.c:831
 msgid "can not use output modifiers with user-defined output"
 msgstr ""
 
-#: ps/sortformat.c:828
+#: ps/sortformat.c:832
 msgid "-L/-T with H/m/-m and -o/-O/o/O is nonsense"
 msgstr ""
 
-#: ps/sortformat.c:886
+#: ps/sortformat.c:890
 msgid "internal error: no PID or PPID for -j option"
 msgstr ""
 
-#: ps/sortformat.c:888
+#: ps/sortformat.c:892
 msgid "lost my PGID"
 msgstr ""
 
-#: ps/sortformat.c:901
+#: ps/sortformat.c:905
 msgid "internal error: no PRI for -c option"
 msgstr ""
 
-#: ps/sortformat.c:904
+#: ps/sortformat.c:908
 msgid "lost my CLS"
 msgstr ""
 
-#: ps/sortformat.c:909
+#: ps/sortformat.c:913
 msgid "-T with H/-m/m but no PID for SPID to follow"
 msgstr ""
 
-#: ps/sortformat.c:920
+#: ps/sortformat.c:924
 msgid "-L with H/-m/m but no PID/PGID/SID/SESS for NLWP to follow"
 msgstr ""
 
@@ -1451,115 +1453,115 @@
 msgid "invalid process id: %s"
 msgstr ""
 
-#: skill.c:185
+#: skill.c:188
 #, c-format
 msgid "cannot open file %s"
 msgstr ""
 
-#: skill.c:326
+#: skill.c:339
 #, c-format
 msgid " %s [options] <pid> [...]\n"
 msgstr ""
 
-#: skill.c:328
+#: skill.c:341
 msgid " <pid> [...]            send signal to every <pid> listed\n"
 msgstr ""
 
-#: skill.c:329
+#: skill.c:342
 msgid ""
 " -<signal>, -s, --signal <signal>\n"
 "                        specify the <signal> to be sent\n"
 msgstr ""
 
-#: skill.c:331
+#: skill.c:344
 msgid ""
 " -l, --list=[<signal>]  list all signal names, or convert one to a name\n"
 msgstr ""
 
-#: skill.c:332
+#: skill.c:345
 msgid " -L, --table            list all signal names in a nice table\n"
 msgstr ""
 
-#: skill.c:347
+#: skill.c:360
 #, c-format
 msgid " %s [signal] [options] <expression>\n"
 msgstr ""
 
-#: skill.c:351
+#: skill.c:364
 #, c-format
 msgid " %s [new priority] [options] <expression>\n"
 msgstr ""
 
-#: skill.c:355
+#: skill.c:368
 msgid " -f, --fast         fast mode (not implemented)\n"
 msgstr ""
 
-#: skill.c:356
+#: skill.c:369
 msgid " -i, --interactive  interactive\n"
 msgstr ""
 
-#: skill.c:357
+#: skill.c:370
 msgid " -l, --list         list all signal names\n"
 msgstr ""
 
-#: skill.c:358
+#: skill.c:371
 msgid " -L, --table        list all signal names in a nice table\n"
 msgstr ""
 
-#: skill.c:359
+#: skill.c:372
 msgid ""
 " -n, --no-action    do not actually kill processes; just print what would "
 "happen\n"
 msgstr ""
 
-#: skill.c:360
+#: skill.c:373
 msgid " -v, --verbose      explain what is being done\n"
 msgstr ""
 
-#: skill.c:361
+#: skill.c:374
 msgid " -w, --warnings     enable warnings (not implemented)\n"
 msgstr ""
 
-#: skill.c:363
+#: skill.c:376
 msgid ""
 "Expression can be: terminal, user, pid, command.\n"
 "The options below may be used to ensure correct interpretation.\n"
 msgstr ""
 
-#: skill.c:365
+#: skill.c:378
 msgid " -c, --command <command>  expression is a command name\n"
 msgstr ""
 
-#: skill.c:366
+#: skill.c:379
 msgid " -p, --pid <pid>          expression is a process id number\n"
 msgstr ""
 
-#: skill.c:367
+#: skill.c:380
 msgid " -t, --tty <tty>          expression is a terminal\n"
 msgstr ""
 
-#: skill.c:368
+#: skill.c:381
 msgid " -u, --user <username>    expression is a username\n"
 msgstr ""
 
-#: skill.c:370
+#: skill.c:383
 msgid "Alternatively, expression can be:\n"
 msgstr ""
 
-#: skill.c:371
+#: skill.c:384
 msgid ""
 " --ns <pid>               match the processes that belong to the same\n"
 "                          namespace as <pid>\n"
 msgstr ""
 
-#: skill.c:373
+#: skill.c:386
 msgid ""
 " --nslist <ns,...>        list which namespaces will be considered for\n"
 "                          the --ns option; available namespaces are\n"
 ":                          ipc, mnt, net, pid, user, uts\n"
 msgstr ""
 
-#: skill.c:383
+#: skill.c:396
 #, c-format
 msgid ""
 "\n"
@@ -1568,7 +1570,7 @@
 "Alternate signals may be specified in three ways: -SIGKILL -KILL -9\n"
 msgstr ""
 
-#: skill.c:390
+#: skill.c:403
 #, c-format
 msgid ""
 "\n"
@@ -1577,197 +1579,197 @@
 "Negative priority numbers are restricted to administrative users.\n"
 msgstr ""
 
-#: skill.c:457
+#: skill.c:476
 #, c-format
 msgid "unknown signal name %s"
 msgstr ""
 
-#: skill.c:477
+#: skill.c:496
 #, c-format
 msgid "invalid argument %c"
 msgstr ""
 
-#: skill.c:514
+#: skill.c:532
 #, c-format
 msgid "something at line %d\n"
 msgstr ""
 
-#: skill.c:537
+#: skill.c:553
 #, c-format
 msgid "priority %lu out of range"
 msgstr ""
 
-#: skill.c:650
+#: skill.c:662
 #, c-format
 msgid "invalid pid number %s"
 msgstr ""
 
-#: skill.c:654
+#: skill.c:666
 msgid "error reading reference namespace information"
 msgstr ""
 
-#: skill.c:662
+#: skill.c:674
 msgid "invalid namespace list"
 msgstr ""
 
-#: skill.c:700
+#: skill.c:711
 msgid "no process selection criteria"
 msgstr ""
 
-#: skill.c:703
+#: skill.c:714
 msgid "general flags may not be repeated"
 msgstr ""
 
-#: skill.c:706
+#: skill.c:717
 msgid "-i makes no sense with -v, -f, and -n"
 msgstr ""
 
-#: skill.c:708
+#: skill.c:719
 msgid "-v makes no sense with -i and -f"
 msgstr ""
 
-#: skill.c:753
+#: skill.c:769
 #, c-format
 msgid "skill: \"%s\" is not supported\n"
 msgstr ""
 
-#: slabtop.c:191
+#: slabtop.c:195
 msgid " -d, --delay <secs>  delay updates\n"
 msgstr ""
 
-#: slabtop.c:192
+#: slabtop.c:196
 msgid " -o, --once          only display once, then exit\n"
 msgstr ""
 
-#: slabtop.c:193
+#: slabtop.c:197
 msgid " -s, --sort <char>   specify sort criteria by character (see below)\n"
 msgstr ""
 
-#: slabtop.c:198
+#: slabtop.c:202
 msgid ""
 "\n"
 "The following are valid sort criteria:\n"
 msgstr ""
 
-#: slabtop.c:199
+#: slabtop.c:203
 msgid " a: sort by number of active objects\n"
 msgstr ""
 
-#: slabtop.c:200
+#: slabtop.c:204
 msgid " b: sort by objects per slab\n"
 msgstr ""
 
-#: slabtop.c:201
+#: slabtop.c:205
 msgid " c: sort by cache size\n"
 msgstr ""
 
-#: slabtop.c:202
+#: slabtop.c:206
 msgid " l: sort by number of slabs\n"
 msgstr ""
 
-#: slabtop.c:203
+#: slabtop.c:207
 msgid " v: sort by number of active slabs\n"
 msgstr ""
 
-#: slabtop.c:204
+#: slabtop.c:208
 msgid " n: sort by name\n"
 msgstr ""
 
-#: slabtop.c:205
+#: slabtop.c:209
 msgid " o: sort by number of objects (the default)\n"
 msgstr ""
 
-#: slabtop.c:206
+#: slabtop.c:210
 msgid " p: sort by pages per slab\n"
 msgstr ""
 
-#: slabtop.c:207
+#: slabtop.c:211
 msgid " s: sort by object size\n"
 msgstr ""
 
-#: slabtop.c:208
+#: slabtop.c:212
 msgid " u: sort by cache utilization\n"
 msgstr ""
 
-#: slabtop.c:317
+#: slabtop.c:321
 msgid "illegal delay"
 msgstr ""
 
-#: slabtop.c:320 tload.c:135 vmstat.c:961
+#: slabtop.c:324 tload.c:142 vmstat.c:979
 msgid "delay must be positive integer"
 msgstr ""
 
-#: slabtop.c:342
+#: slabtop.c:346
 msgid "terminal setting retrieval"
 msgstr ""
 
 #. Translation Hint: Next five strings must not
 #. * exceed 35 length in characters.
-#: slabtop.c:381
+#: slabtop.c:386
 #, no-c-format
 msgid "Active / Total Objects (% used)"
 msgstr ""
 
-#: slabtop.c:385
+#: slabtop.c:390
 #, no-c-format
 msgid "Active / Total Slabs (% used)"
 msgstr ""
 
-#: slabtop.c:389
+#: slabtop.c:394
 #, no-c-format
 msgid "Active / Total Caches (% used)"
 msgstr ""
 
-#: slabtop.c:393
+#: slabtop.c:398
 #, no-c-format
 msgid "Active / Total Size (% used)"
 msgstr ""
 
-#: slabtop.c:396
+#: slabtop.c:401
 msgid "Minimum / Average / Maximum Object"
 msgstr ""
 
 #. Translation Hint: Please keep alignment of the
 #. * following intact.
-#: slabtop.c:405
+#: slabtop.c:410
 msgid "  OBJS ACTIVE  USE OBJ SIZE  SLABS OBJ/SLAB CACHE SIZE NAME"
 msgstr ""
 
-#: sysctl.c:86
+#: sysctl.c:92
 #, c-format
 msgid "separators should not be repeated: %s"
 msgstr ""
 
-#: sysctl.c:105
+#: sysctl.c:111
 #, c-format
 msgid " %s [options] [variable[=value] ...]\n"
 msgstr ""
 
-#: sysctl.c:108
+#: sysctl.c:114
 msgid "  -a, --all            display all variables\n"
 msgstr ""
 
-#: sysctl.c:109
+#: sysctl.c:115
 msgid "  -A                   alias of -a\n"
 msgstr ""
 
-#: sysctl.c:110
+#: sysctl.c:116
 msgid "  -X                   alias of -a\n"
 msgstr ""
 
-#: sysctl.c:111
+#: sysctl.c:117
 msgid "      --deprecated     include deprecated parameters to listing\n"
 msgstr ""
 
-#: sysctl.c:112
+#: sysctl.c:118
 msgid "  -b, --binary         print value without new line\n"
 msgstr ""
 
-#: sysctl.c:113
+#: sysctl.c:119
 msgid "  -e, --ignore         ignore unknown variables errors\n"
 msgstr ""
 
-#: sysctl.c:114
+#: sysctl.c:120
 msgid "  -N, --names          print variable names without values\n"
 msgstr ""
 
@@ -1775,155 +1777,155 @@
 msgid "  -n, --values         print only values of a variables\n"
 msgstr ""
 
-#: sysctl.c:116
+#: sysctl.c:122
 msgid "  -p, --load[=<file>]  read values from file\n"
 msgstr ""
 
-#: sysctl.c:117
+#: sysctl.c:123
 msgid "  -f                   alias of -p\n"
 msgstr ""
 
-#: sysctl.c:118
+#: sysctl.c:124
 msgid "      --system         read values from all system directories\n"
 msgstr ""
 
-#: sysctl.c:119
+#: sysctl.c:125
 msgid ""
 "  -r, --pattern <expression>\n"
 "                       select setting that match expression\n"
 msgstr ""
 
-#: sysctl.c:121
+#: sysctl.c:127
 msgid "  -q, --quiet          do not echo variable set\n"
 msgstr ""
 
-#: sysctl.c:122
+#: sysctl.c:128
 msgid "  -w, --write          enable writing a value to variable\n"
 msgstr ""
 
-#: sysctl.c:123
+#: sysctl.c:129
 msgid "  -o                   does nothing\n"
 msgstr ""
 
-#: sysctl.c:124
+#: sysctl.c:130
 msgid "  -x                   does nothing\n"
 msgstr ""
 
-#: sysctl.c:125
+#: sysctl.c:131
 msgid "  -d                   alias of -h\n"
 msgstr ""
 
-#: sysctl.c:171 sysctl.c:222 sysctl.c:431
+#: sysctl.c:177 sysctl.c:233
 #, c-format
 msgid "\"%s\" is an unknown key"
 msgstr ""
 
-#: sysctl.c:194 sysctl.c:333 sysctl.c:409
+#: sysctl.c:200 sysctl.c:351 sysctl.c:432
 #, c-format
 msgid "cannot stat %s"
 msgstr "无法获取%s 的文件状态(stat)"
 
-#: sysctl.c:227 sysctl.c:265 sysctl.c:436
+#: sysctl.c:238 sysctl.c:280
 #, c-format
 msgid "permission denied on key '%s'"
 msgstr ""
 
-#: sysctl.c:231 sysctl.c:279
+#: sysctl.c:245 sysctl.c:297
 #, c-format
 msgid "reading key \"%s\""
 msgstr ""
 
-#: sysctl.c:317
+#: sysctl.c:335
 #, c-format
 msgid "unable to open directory \"%s\""
 msgstr ""
 
-#: sysctl.c:374
+#: sysctl.c:393
 #, c-format
 msgid "\"%s\" must be of the form name=value"
 msgstr ""
 
-#: sysctl.c:383
+#: sysctl.c:402
 #, c-format
 msgid "malformed setting \"%s\""
 msgstr ""
 
-#: sysctl.c:403
+#: sysctl.c:426
 #, c-format
 msgid "%s is deprecated, value not set"
 msgstr ""
 
-#: sysctl.c:416 sysctl.c:421 sysctl.c:440 sysctl.c:449
+#: sysctl.c:439 sysctl.c:444 sysctl.c:475
 #, c-format
 msgid "setting key \"%s\""
 msgstr ""
 
-#: sysctl.c:514
+#: sysctl.c:537
 #, c-format
 msgid ""
 "GLOB_TILDE is not supported on your platform, the tilde in \"%s\" won't be "
 "expanded."
 msgstr ""
 
-#: sysctl.c:520
+#: sysctl.c:543
 msgid "glob failed"
 msgstr ""
 
-#: sysctl.c:526
+#: sysctl.c:549
 #, c-format
 msgid "cannot open \"%s\""
 msgstr ""
 
-#: sysctl.c:542 sysctl.c:554
+#: sysctl.c:571 sysctl.c:587
 #, c-format
 msgid "%s(%d): invalid syntax, continuing..."
 msgstr ""
 
-#: sysctl.c:653 sysctl.c:660
+#: sysctl.c:690 sysctl.c:697
 #, c-format
 msgid "* Applying %s ...\n"
 msgstr ""
 
-#: sysctl.c:810
+#: sysctl.c:849
 #, c-format
 msgid ""
 "no variables specified\n"
 "Try `%s --help' for more information."
 msgstr ""
 
-#: sysctl.c:814
+#: sysctl.c:853
 #, c-format
 msgid ""
 "options -N and -q cannot coexist\n"
 "Try `%s --help' for more information."
 msgstr ""
 
-#: tload.c:89
+#: tload.c:96
 #, c-format
 msgid " %s [options] [tty]\n"
 msgstr ""
 
-#: tload.c:91
+#: tload.c:98
 msgid " -d, --delay <secs>  update delay in seconds\n"
 msgstr ""
 
-#: tload.c:92
+#: tload.c:99
 msgid " -s, --scale <num>   vertical scale\n"
 msgstr ""
 
-#: tload.c:130
+#: tload.c:137
 msgid "scale cannot be negative"
 msgstr ""
 
-#: tload.c:137 vmstat.c:963
+#: tload.c:144 vmstat.c:981
 msgid "too large delay value"
 msgstr ""
 
-#: tload.c:152
+#: tload.c:159
 msgid "can not open tty"
 msgstr ""
 
-#: tload.c:211 tload.c:213
+#: tload.c:218 tload.c:220
 msgid "writing to tty failed"
 msgstr ""
 
@@ -1935,524 +1937,535 @@
 #. .     1) a field name/column header - mostly upper case
 #. .     2) the related description    - both upper and lower case
 #. .
-#. .  To avoid truncation at runtime, each column header is noted with
-#. .  its maximum size and the following description must not exceed
-#. .  20 characters.  Fewer characters are ok.
+#. .  To avoid truncation on the main top display, each column header
+#. .  is noted with its maximum size, while a few are 'variable' width.
+#. .  Names for the latter should probably be 10 or fewer characters.
+#. .
+#. .  Those fields shown with a '+' are also eligible for user resizing
+#. .  using the 'X' command. That means the default width might produce
+#. .  truncation but need not if widened (see the man page 'X' command).
+#. .
+#. .  All headers are subject to a maximum of 7 on the Fields Management
+#. .  screen where truncation is entirely acceptable.
+#. .
+#. .  The associated descriptions are always limited to 20 characters,
+#. .  and are used only on the Fields Management screen.
 #. .
+#. .  In all cases, fewer characters are just fine.
 #. .
 #. Translation Hint: maximum 'PID' = 5
-#: top/top_nls.c:124
+#: top/top_nls.c:133
 msgid "PID"
 msgstr "进程号"
 
-#: top/top_nls.c:125
+#: top/top_nls.c:134
 msgid "Process Id"
 msgstr ""
 
 #. Translation Hint: maximum 'PPID' = 5
-#: top/top_nls.c:127
+#: top/top_nls.c:136
 msgid "PPID"
 msgstr ""
 
-#: top/top_nls.c:128
+#: top/top_nls.c:137
 msgid "Parent Process pid"
 msgstr ""
 
-#. Translation Hint: maximum 'UID' = 5
-#: top/top_nls.c:130
+#. Translation Hint: maximum 'UID' = 5 +
+#: top/top_nls.c:139
 msgid "UID"
 msgstr ""
 
-#: top/top_nls.c:131
+#: top/top_nls.c:140
 msgid "Effective User Id"
 msgstr ""
 
-#. Translation Hint: maximum 'USER' = 7
-#: top/top_nls.c:133 w.c:591
+#. Translation Hint: maximum 'USER' = 8 +
+#: top/top_nls.c:142 w.c:598
 msgid "USER"
 msgstr "USER"
 
-#: top/top_nls.c:134
+#: top/top_nls.c:143
 msgid "Effective User Name"
 msgstr ""
 
-#. Translation Hint: maximum 'RUID' = 5
-#: top/top_nls.c:136
+#. Translation Hint: maximum 'RUID' = 5 +
+#: top/top_nls.c:145
 msgid "RUID"
 msgstr ""
 
-#: top/top_nls.c:137
+#: top/top_nls.c:146
 msgid "Real User Id"
 msgstr ""
 
-#. Translation Hint: maximum 'RUSER' = 7
-#: top/top_nls.c:139
+#. Translation Hint: maximum 'RUSER' = 8 +
+#: top/top_nls.c:148
 msgid "RUSER"
 msgstr ""
 
-#: top/top_nls.c:140
+#: top/top_nls.c:149
 msgid "Real User Name"
 msgstr ""
 
-#. Translation Hint: maximum 'SUID' = 5
-#: top/top_nls.c:142
+#. Translation Hint: maximum 'SUID' = 5 +
+#: top/top_nls.c:151
 msgid "SUID"
 msgstr ""
 
-#: top/top_nls.c:143
+#: top/top_nls.c:152
 msgid "Saved User Id"
 msgstr ""
 
-#. Translation Hint: maximum 'SUSER' = 7
-#: top/top_nls.c:145
+#. Translation Hint: maximum 'SUSER' = 8 +
+#: top/top_nls.c:154
 msgid "SUSER"
 msgstr ""
 
-#: top/top_nls.c:146
+#: top/top_nls.c:155
 msgid "Saved User Name"
 msgstr ""
 
-#. Translation Hint: maximum 'GID' = 5
-#: top/top_nls.c:148
+#. Translation Hint: maximum 'GID' = 5 +
+#: top/top_nls.c:157
 msgid "GID"
 msgstr ""
 
-#: top/top_nls.c:149
+#: top/top_nls.c:158
 msgid "Group Id"
 msgstr ""
 
-#. Translation Hint: maximum 'GROUP' = 7
-#: top/top_nls.c:151
+#. Translation Hint: maximum 'GROUP' = 8 +
+#: top/top_nls.c:160
 msgid "GROUP"
 msgstr "GROUP"
 
-#: top/top_nls.c:152
+#: top/top_nls.c:161
 msgid "Group Name"
 msgstr ""
 
 #. Translation Hint: maximum 'PGRP' = 5
-#: top/top_nls.c:154
+#: top/top_nls.c:163
 msgid "PGRP"
 msgstr ""
 
-#: top/top_nls.c:155
+#: top/top_nls.c:164
 msgid "Process Group Id"
 msgstr ""
 
-#. Translation Hint: maximum 'TTY' = 7
-#: top/top_nls.c:157
+#. Translation Hint: maximum 'TTY' = 8 +
+#: top/top_nls.c:166
 msgid "TTY"
 msgstr ""
 
-#: top/top_nls.c:158
+#: top/top_nls.c:167
 msgid "Controlling Tty"
 msgstr ""
 
 #. Translation Hint: maximum 'TPGID' = 5
-#: top/top_nls.c:160
+#: top/top_nls.c:169
 msgid "TPGID"
 msgstr ""
 
-#: top/top_nls.c:161
+#: top/top_nls.c:170
 msgid "Tty Process Grp Id"
 msgstr ""
 
 #. Translation Hint: maximum 'SID' = 5
-#: top/top_nls.c:163
+#: top/top_nls.c:172
 msgid "SID"
 msgstr ""
 
-#: top/top_nls.c:164
+#: top/top_nls.c:173
 msgid "Session Id"
 msgstr ""
 
 #. Translation Hint: maximum 'PR' = 3
-#: top/top_nls.c:166
+#: top/top_nls.c:175
 msgid "PR"
 msgstr "PR"
 
-#: top/top_nls.c:167
+#: top/top_nls.c:176
 msgid "Priority"
 msgstr "优先级"
 
 #. Translation Hint: maximum 'NI' = 3
-#: top/top_nls.c:169
+#: top/top_nls.c:178
 msgid "NI"
 msgstr ""
 
-#: top/top_nls.c:170
+#: top/top_nls.c:179
 msgid "Nice Value"
 msgstr ""
 
 #. Translation Hint: maximum 'nTH' = 3
-#: top/top_nls.c:172
+#: top/top_nls.c:181
 msgid "nTH"
 msgstr ""
 
-#: top/top_nls.c:173
+#: top/top_nls.c:182
 msgid "Number of Threads"
 msgstr ""
 
 #. Translation Hint: maximum 'P' = 1
-#: top/top_nls.c:175
+#: top/top_nls.c:184
 msgid "P"
 msgstr ""
 
-#: top/top_nls.c:176
+#: top/top_nls.c:185
 msgid "Last Used Cpu (SMP)"
 msgstr ""
 
 #. Translation Hint: maximum '%CPU' = 4
-#: top/top_nls.c:178
+#: top/top_nls.c:187
 #, c-format
 msgid "%CPU"
 msgstr ""
 
-#: top/top_nls.c:179
+#: top/top_nls.c:188
 msgid "CPU Usage"
 msgstr ""
 
 #. Translation Hint: maximum '' = 6
-#: top/top_nls.c:181
+#: top/top_nls.c:190
 msgid "TIME"
 msgstr "时间"
 
-#: top/top_nls.c:182
+#: top/top_nls.c:191
 msgid "CPU Time"
 msgstr ""
 
-#. Translation Hint: maximum 'TIME+' = 7
-#: top/top_nls.c:184
+#. Translation Hint: maximum 'TIME+' = 9
+#: top/top_nls.c:193
 msgid "TIME+"
 msgstr ""
 
-#: top/top_nls.c:185
+#: top/top_nls.c:194
 msgid "CPU Time, hundredths"
 msgstr ""
 
 #. Translation Hint: maximum '%MEM' = 4
-#: top/top_nls.c:187
+#: top/top_nls.c:196
 msgid "%MEM"
 msgstr ""
 
-#: top/top_nls.c:188
+#: top/top_nls.c:197
 msgid "Memory Usage (RES)"
 msgstr ""
 
-#. Translation Hint: maximum 'VIRT' = 5
-#: top/top_nls.c:190
+#. Translation Hint: maximum 'VIRT' = 7
+#: top/top_nls.c:199
 msgid "VIRT"
 msgstr ""
 
-#: top/top_nls.c:191
+#: top/top_nls.c:200
 msgid "Virtual Image (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'SWAP' = 4
-#: top/top_nls.c:193
+#. Translation Hint: maximum 'SWAP' = 6
+#: top/top_nls.c:202
 msgid "SWAP"
 msgstr ""
 
-#: top/top_nls.c:194
+#: top/top_nls.c:203
 msgid "Swapped Size (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'RES' = 4
-#: top/top_nls.c:196
+#. Translation Hint: maximum 'RES' = 6
+#: top/top_nls.c:205
 msgid "RES"
 msgstr ""
 
-#: top/top_nls.c:197
+#: top/top_nls.c:206
 msgid "Resident Size (KiB)"
 msgstr ""
 
 #. Translation Hint: maximum 'CODE' = 4
-#: top/top_nls.c:199
+#: top/top_nls.c:208
 msgid "CODE"
 msgstr ""
 
-#: top/top_nls.c:200
+#: top/top_nls.c:209
 msgid "Code Size (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'DATA' = 4
-#: top/top_nls.c:202
+#. Translation Hint: maximum 'DATA' = 7
+#: top/top_nls.c:211
 msgid "DATA"
 msgstr ""
 
-#: top/top_nls.c:203
+#: top/top_nls.c:212
 msgid "Data+Stack (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'SHR' = 4
-#: top/top_nls.c:205
+#. Translation Hint: maximum 'SHR' = 6
+#: top/top_nls.c:214
 msgid "SHR"
 msgstr ""
 
-#: top/top_nls.c:206
+#: top/top_nls.c:215
 msgid "Shared Memory (KiB)"
 msgstr ""
 
 #. Translation Hint: maximum 'nMaj' = 4
-#: top/top_nls.c:208
+#: top/top_nls.c:217
 msgid "nMaj"
 msgstr ""
 
-#: top/top_nls.c:209
+#: top/top_nls.c:218
 msgid "Major Page Faults"
 msgstr ""
 
 #. Translation Hint: maximum 'nMin' = 4
-#: top/top_nls.c:211
+#: top/top_nls.c:220
 msgid "nMin"
 msgstr ""
 
-#: top/top_nls.c:212
+#: top/top_nls.c:221
 msgid "Minor Page Faults"
 msgstr ""
 
 #. Translation Hint: maximum 'nDRT' = 4
-#: top/top_nls.c:214
+#: top/top_nls.c:223
 msgid "nDRT"
 msgstr ""
 
-#: top/top_nls.c:215
+#: top/top_nls.c:224
 msgid "Dirty Pages Count"
 msgstr ""
 
 #. Translation Hint: maximum 'S' = 1
-#: top/top_nls.c:217
+#: top/top_nls.c:226
 msgid "S"
 msgstr "日"
 
-#: top/top_nls.c:218
+#: top/top_nls.c:227
 msgid "Process Status"
 msgstr ""
 
-#. Translation Hint: maximum 'COMMAND' = 7
-#: top/top_nls.c:220
+#. Translation Hint: maximum 'COMMAND' = variable
+#: top/top_nls.c:229
 msgid "COMMAND"
 msgstr "COMMAND"
 
-#: top/top_nls.c:221
+#: top/top_nls.c:230
 msgid "Command Name/Line"
 msgstr ""
 
-#. Translation Hint: maximum 'WCHAN' = 7
-#: top/top_nls.c:223
+#. Translation Hint: maximum 'WCHAN' = 10 +
+#: top/top_nls.c:232
 msgid "WCHAN"
 msgstr ""
 
-#: top/top_nls.c:224
+#: top/top_nls.c:233
 msgid "Sleeping in Function"
 msgstr ""
 
-#. Translation Hint: maximum 'Flags' = 7
-#: top/top_nls.c:226
+#. Translation Hint: maximum 'Flags' = 8
+#: top/top_nls.c:235
 msgid "Flags"
 msgstr "标志"
 
-#: top/top_nls.c:227
+#: top/top_nls.c:236
 msgid "Task Flags <sched.h>"
 msgstr ""
 
-#. Translation Hint: maximum 'CGROUPS' = 7
-#: top/top_nls.c:229
+#. Translation Hint: maximum 'CGROUPS' = variable
+#: top/top_nls.c:238
 msgid "CGROUPS"
 msgstr ""
 
-#: top/top_nls.c:230
+#: top/top_nls.c:239
 msgid "Control Groups"
 msgstr ""
 
-#. Translation Hint: maximum 'SUPGIDS' = 7
-#: top/top_nls.c:232
+#. Translation Hint: maximum 'SUPGIDS' = variable
+#: top/top_nls.c:241
 msgid "SUPGIDS"
 msgstr ""
 
-#: top/top_nls.c:233
+#: top/top_nls.c:242
 msgid "Supp Groups IDs"
 msgstr ""
 
-#. Translation Hint: maximum 'SUPGRPS' = 7
-#: top/top_nls.c:235
+#. Translation Hint: maximum 'SUPGRPS' = variable
+#: top/top_nls.c:244
 msgid "SUPGRPS"
 msgstr ""
 
-#: top/top_nls.c:236
+#: top/top_nls.c:245
 msgid "Supp Groups Names"
 msgstr ""
 
 #. Translation Hint: maximum 'TGID' = 5
-#: top/top_nls.c:238
+#: top/top_nls.c:247
 msgid "TGID"
 msgstr ""
 
-#: top/top_nls.c:239
+#: top/top_nls.c:248
 msgid "Thread Group Id"
 msgstr ""
 
 #. Translation Hint: maximum 'OOMa' = 5
-#: top/top_nls.c:241
+#: top/top_nls.c:250
 msgid "OOMa"
 msgstr ""
 
-#: top/top_nls.c:242
+#: top/top_nls.c:251
 msgid "OOMEM Adjustment"
 msgstr ""
 
 #. Translation Hint: maximum 'OOMs' = 4
-#: top/top_nls.c:244
+#: top/top_nls.c:253
 msgid "OOMs"
 msgstr ""
 
-#: top/top_nls.c:245
+#: top/top_nls.c:254
 msgid "OOMEM Score current"
 msgstr ""
 
-#. Translation Hint: maximum 'ENVIRON' = 7
-#: top/top_nls.c:247
+#. Translation Hint: maximum 'ENVIRON' = variable
+#: top/top_nls.c:256
 msgid "ENVIRON"
 msgstr ""
 
 #. Translation Hint: the abbreviation 'vars' below is shorthand for
 #. 'variables'
-#: top/top_nls.c:250
+#: top/top_nls.c:259
 msgid "Environment vars"
 msgstr ""
 
 #. Translation Hint: maximum 'vMj' = 3
-#: top/top_nls.c:252
+#: top/top_nls.c:261
 msgid "vMj"
 msgstr ""
 
-#: top/top_nls.c:253
+#: top/top_nls.c:262
 msgid "Major Faults delta"
 msgstr ""
 
 #. Translation Hint: maximum 'vMn' = 3
-#: top/top_nls.c:255
+#: top/top_nls.c:264
 msgid "vMn"
 msgstr ""
 
-#: top/top_nls.c:256
+#: top/top_nls.c:265
 msgid "Minor Faults delta"
 msgstr ""
 
-#. Translation Hint: maximum 'USED' = 4
-#: top/top_nls.c:258
+#. Translation Hint: maximum 'USED' = 6
+#: top/top_nls.c:267
 msgid "USED"
 msgstr ""
 
-#: top/top_nls.c:259
+#: top/top_nls.c:268
 msgid "Res+Swap Size (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'nsIPC' = 7
-#: top/top_nls.c:261
+#. Translation Hint: maximum 'nsIPC' = 10 +
+#: top/top_nls.c:270
 msgid "nsIPC"
 msgstr ""
 
-#: top/top_nls.c:262
+#: top/top_nls.c:271
 msgid "IPC namespace Inode"
 msgstr ""
 
-#. Translation Hint: maximum 'nsMNT' = 7
-#: top/top_nls.c:264
+#. Translation Hint: maximum 'nsMNT' = 10 +
+#: top/top_nls.c:273
 msgid "nsMNT"
 msgstr ""
 
-#: top/top_nls.c:265
+#: top/top_nls.c:274
 msgid "MNT namespace Inode"
 msgstr ""
 
-#. Translation Hint: maximum 'nsNET' = 7
-#: top/top_nls.c:267
+#. Translation Hint: maximum 'nsNET' = 10 +
+#: top/top_nls.c:276
 msgid "nsNET"
 msgstr ""
 
-#: top/top_nls.c:268
+#: top/top_nls.c:277
 msgid "NET namespace Inode"
 msgstr ""
 
-#. Translation Hint: maximum 'nsPID' = 7
-#: top/top_nls.c:270
+#. Translation Hint: maximum 'nsPID' = 10 +
+#: top/top_nls.c:279
 msgid "nsPID"
 msgstr ""
 
-#: top/top_nls.c:271
+#: top/top_nls.c:280
 msgid "PID namespace Inode"
 msgstr ""
 
-#. Translation Hint: maximum 'nsUSER' = 7
-#: top/top_nls.c:273
+#. Translation Hint: maximum 'nsUSER' = 10 +
+#: top/top_nls.c:282
 msgid "nsUSER"
 msgstr ""
 
-#: top/top_nls.c:274
+#: top/top_nls.c:283
 msgid "USER namespace Inode"
 msgstr ""
 
-#. Translation Hint: maximum 'nsUTS' = 7
-#: top/top_nls.c:276
+#. Translation Hint: maximum 'nsUTS' = 10 +
+#: top/top_nls.c:285
 msgid "nsUTS"
 msgstr ""
 
-#: top/top_nls.c:277
+#: top/top_nls.c:286
 msgid "UTS namespace Inode"
 msgstr ""
 
-#. Translation Hint: maximum 'LXC' = 7
-#: top/top_nls.c:279
+#. Translation Hint: maximum 'LXC' = 8 +
+#: top/top_nls.c:288
 msgid "LXC"
 msgstr ""
 
-#: top/top_nls.c:280
+#: top/top_nls.c:289
 msgid "LXC container name"
 msgstr ""
 
-#. Translation Hint: maximum 'RSan' = 4
-#: top/top_nls.c:282
+#. Translation Hint: maximum 'RSan' = 6
+#: top/top_nls.c:291
 msgid "RSan"
 msgstr ""
 
-#: top/top_nls.c:283
+#: top/top_nls.c:292
 msgid "RES Anonymous (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'RSfd' = 4
-#: top/top_nls.c:285
+#. Translation Hint: maximum 'RSfd' = 6
+#: top/top_nls.c:294
 msgid "RSfd"
 msgstr ""
 
-#: top/top_nls.c:286
+#: top/top_nls.c:295
 msgid "RES File-based (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'RSlk' = 4
-#: top/top_nls.c:288
+#. Translation Hint: maximum 'RSlk' = 6
+#: top/top_nls.c:297
 msgid "RSlk"
 msgstr ""
 
-#: top/top_nls.c:289
+#: top/top_nls.c:298
 msgid "RES Locked (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'RSsh' = 4
-#: top/top_nls.c:291
+#. Translation Hint: maximum 'RSsh' = 6
+#: top/top_nls.c:300
 msgid "RSsh"
 msgstr ""
 
-#: top/top_nls.c:292
+#: top/top_nls.c:301
 msgid "RES Shared (KiB)"
 msgstr ""
 
-#. Translation Hint: maximum 'CGNAME' = 7
-#: top/top_nls.c:294
+#. Translation Hint: maximum 'CGNAME' = variable
+#: top/top_nls.c:303
 msgid "CGNAME"
 msgstr ""
 
-#: top/top_nls.c:295
+#: top/top_nls.c:304
 msgid "Control Group name"
 msgstr ""
 
@@ -2466,14 +2479,14 @@
 #. .  and should not be translated without also making corresponding
 #. .  c-code logic changes.
 #. .
-#: top/top_nls.c:315
+#: top/top_nls.c:299
 #, c-format
 msgid ""
 "\tsignal %d (%s) was caught by %s, please\n"
 "\tsee http://www.debian.org/Bugs/Reporting\n"
 msgstr ""
 
-#: top/top_nls.c:318
+#: top/top_nls.c:330
 #, c-format
 msgid ""
 "inappropriate '%s'\n"
@@ -2481,7 +2494,7 @@
 "  %s%s"
 msgstr ""
 
-#: top/top_nls.c:321
+#: top/top_nls.c:333
 #, c-format
 msgid ""
 "  %s\n"
@@ -2489,47 +2502,47 @@
 "  %s%s"
 msgstr ""
 
-#: top/top_nls.c:324
+#: top/top_nls.c:336
 #, c-format
 msgid "failed /proc/stat open: %s"
 msgstr ""
 
-#: top/top_nls.c:325
+#: top/top_nls.c:337
 #, c-format
 msgid "failed openproc: %s"
 msgstr ""
 
-#: top/top_nls.c:326
+#: top/top_nls.c:338
 #, c-format
 msgid "bad delay interval '%s'"
 msgstr ""
 
-#: top/top_nls.c:327
+#: top/top_nls.c:339
 #, c-format
 msgid "bad iterations argument '%s'"
 msgstr ""
 
-#: top/top_nls.c:328
+#: top/top_nls.c:340
 #, c-format
 msgid "pid limit (%d) exceeded"
 msgstr ""
 
-#: top/top_nls.c:329
+#: top/top_nls.c:341
 #, c-format
 msgid "bad pid '%s'"
 msgstr ""
 
-#: top/top_nls.c:330
+#: top/top_nls.c:342
 #, c-format
 msgid "-%c requires argument"
 msgstr ""
 
-#: top/top_nls.c:331
+#: top/top_nls.c:343
 #, c-format
 msgid "bad width arg '%s'"
 msgstr ""
 
-#: top/top_nls.c:332
+#: top/top_nls.c:344
 #, c-format
 msgid ""
 "unknown option '%c'\n"
@@ -2537,325 +2550,325 @@
 "  %s%s"
 msgstr ""
 
-#: top/top_nls.c:335
+#: top/top_nls.c:347
 msgid "-d disallowed in \"secure\" mode"
 msgstr ""
 
-#: top/top_nls.c:336
+#: top/top_nls.c:348
 msgid "-d requires positive argument"
 msgstr ""
 
-#: top/top_nls.c:337
+#: top/top_nls.c:349
 msgid "On"
 msgstr ""
 
-#: top/top_nls.c:338
+#: top/top_nls.c:350
 msgid "Off"
 msgstr ""
 
 #. Translation Hint: Only the following words should be translated
 #. .                 secs (seconds), max (maximum), user, field, cols (columns)
-#: top/top_nls.c:341
+#: top/top_nls.c:325
 msgid " -hv | -bcHiOSs -d secs -n max -u|U user -p pid(s) -o field -w [cols]"
 msgstr ""
 
-#: top/top_nls.c:342
+#: top/top_nls.c:354
 msgid "failed /proc/stat read"
 msgstr ""
 
-#: top/top_nls.c:343
+#: top/top_nls.c:355
 #, c-format
 msgid "Forest mode %s"
 msgstr ""
 
-#: top/top_nls.c:344
+#: top/top_nls.c:356
 msgid "failed tty get"
 msgstr ""
 
-#: top/top_nls.c:345
+#: top/top_nls.c:357
 #, c-format
 msgid "failed tty set: %s"
 msgstr ""
 
-#: top/top_nls.c:346
+#: top/top_nls.c:358
 msgid "Choose field group (1 - 4)"
 msgstr ""
 
-#: top/top_nls.c:347
+#: top/top_nls.c:359
 msgid "Command disabled, 'A' mode required"
 msgstr ""
 
-#: top/top_nls.c:348
+#: top/top_nls.c:360
 #, c-format
 msgid "Command disabled, activate %s with '-' or '_'"
 msgstr ""
 
-#: top/top_nls.c:349
+#: top/top_nls.c:361
 msgid "No colors to map!"
 msgstr ""
 
-#: top/top_nls.c:350
+#: top/top_nls.c:362
 #, c-format
 msgid "Failed '%s' open: %s"
 msgstr ""
 
-#: top/top_nls.c:351
+#: top/top_nls.c:363
 #, c-format
 msgid "Wrote configuration to '%s'"
 msgstr ""
 
-#: top/top_nls.c:352
+#: top/top_nls.c:364
 #, c-format
 msgid "Change delay from %.1f to"
 msgstr ""
 
-#: top/top_nls.c:353
+#: top/top_nls.c:365
 #, c-format
 msgid "Show threads %s"
 msgstr ""
 
-#: top/top_nls.c:354
+#: top/top_nls.c:366
 #, c-format
 msgid "Irix mode %s"
 msgstr ""
 
-#: top/top_nls.c:355
+#: top/top_nls.c:367
 #, c-format
 msgid "PID to signal/kill [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:356
+#: top/top_nls.c:368
 #, c-format
 msgid "Send pid %d signal [%d/sigterm]"
 msgstr ""
 
-#: top/top_nls.c:357
+#: top/top_nls.c:369
 #, c-format
 msgid "Failed signal pid '%d' with '%d': %s"
 msgstr ""
 
-#: top/top_nls.c:358
+#: top/top_nls.c:370
 msgid "Invalid signal"
 msgstr "无效的信号"
 
-#: top/top_nls.c:359
+#: top/top_nls.c:371
 #, c-format
 msgid "PID to renice [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:360
+#: top/top_nls.c:372
 #, c-format
 msgid "Renice PID %d to value"
 msgstr ""
 
-#: top/top_nls.c:361
+#: top/top_nls.c:373
 #, c-format
 msgid "Failed renice of PID %d to %d: %s"
 msgstr ""
 
-#: top/top_nls.c:362
+#: top/top_nls.c:374
 #, c-format
 msgid "Rename window '%s' to (1-3 chars)"
 msgstr ""
 
-#: top/top_nls.c:363
+#: top/top_nls.c:375
 #, c-format
 msgid "Cumulative time %s"
 msgstr ""
 
-#: top/top_nls.c:364
+#: top/top_nls.c:376
 #, c-format
 msgid "Maximum tasks = %d, change to (0 is unlimited)"
 msgstr ""
 
-#: top/top_nls.c:365
+#: top/top_nls.c:377
 msgid "Invalid maximum"
 msgstr ""
 
-#: top/top_nls.c:366
+#: top/top_nls.c:378
 msgid "Which user (blank for all)"
 msgstr ""
 
-#: top/top_nls.c:367
+#: top/top_nls.c:379
 msgid "Unknown command - try 'h' for help"
 msgstr ""
 
-#: top/top_nls.c:368
+#: top/top_nls.c:352
 #, c-format
 msgid "scroll coordinates: y = %d/%%d (tasks), x = %d/%d (fields)"
 msgstr ""
 
-#: top/top_nls.c:369
+#: top/top_nls.c:381
 msgid "failed memory allocate"
 msgstr ""
 
-#: top/top_nls.c:370
+#: top/top_nls.c:382
 msgid "failed memory re-allocate"
 msgstr ""
 
-#: top/top_nls.c:371
+#: top/top_nls.c:383
 msgid "Unacceptable floating point"
 msgstr ""
 
-#: top/top_nls.c:372
+#: top/top_nls.c:384
 msgid "Invalid user"
 msgstr ""
 
-#: top/top_nls.c:373
+#: top/top_nls.c:385
 msgid "forest view"
 msgstr ""
 
-#: top/top_nls.c:374
+#: top/top_nls.c:386
 msgid "failed pid maximum size test"
 msgstr ""
 
-#: top/top_nls.c:375
+#: top/top_nls.c:387
 msgid "failed number of cpus test"
 msgstr ""
 
-#: top/top_nls.c:376
+#: top/top_nls.c:388
 #, c-format
 msgid "incompatible rcfile, you should delete '%s'"
 msgstr ""
 
-#: top/top_nls.c:377
+#: top/top_nls.c:389
 #, c-format
 msgid "window entry #%d corrupt, please delete '%s'"
 msgstr ""
 
-#: top/top_nls.c:378
+#: top/top_nls.c:390
 msgid "Unavailable in secure mode"
 msgstr ""
 
-#: top/top_nls.c:379
+#: top/top_nls.c:391
 msgid "Only 1 cpu detected"
 msgstr "仅探测到 1 个 CPU"
 
-#: top/top_nls.c:380
+#: top/top_nls.c:392
 msgid "Unacceptable integer"
 msgstr ""
 
-#: top/top_nls.c:381
+#: top/top_nls.c:393
 msgid "conflicting process selections (U/p/u)"
 msgstr ""
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 kibibytes (1024 bytes)
-#: top/top_nls.c:384
+#: top/top_nls.c:396
 msgid "KiB"
 msgstr "KiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 mebibytes (1,048,576 bytes)
-#: top/top_nls.c:387
+#: top/top_nls.c:399
 msgid "MiB"
 msgstr "MiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 gibibytes (1,073,741,824 bytes)
-#: top/top_nls.c:390
+#: top/top_nls.c:402
 msgid "GiB"
 msgstr "GiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 tebibytes (1,099,511,627,776 bytes)
-#: top/top_nls.c:393
+#: top/top_nls.c:405
 msgid "TiB"
 msgstr "TiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 pebibytes (1,024 tebibytes)
-#: top/top_nls.c:396
+#: top/top_nls.c:408
 msgid "PiB"
 msgstr "PiB"
 
 #. Translation Hint: This is an abbreviation (limit 3 characters) for:
 #. .                 exbibytes (1,024 pebibytes)
-#: top/top_nls.c:399
+#: top/top_nls.c:411
 msgid "EiB"
 msgstr "EiB"
 
-#: top/top_nls.c:400
+#: top/top_nls.c:412
 msgid "Threads"
 msgstr ""
 
-#: top/top_nls.c:401
+#: top/top_nls.c:413
 msgid "Tasks"
 msgstr "任务"
 
 #. Translation Hint: The following "word" is meant to represent either a single
 #. .                 cpu or all of the processors in a multi-processor computer
 #. .                 (should be exactly 6 characters, not counting the colon)
-#: top/top_nls.c:405
+#: top/top_nls.c:417
 msgid "Cpu(s):"
 msgstr ""
 
 #. Translation Hint: The following "word" is meant to represent a single processor
 #. .                 (should be exactly 3 characters)
-#: top/top_nls.c:408
+#: top/top_nls.c:420
 #, c-format
 msgid "Cpu%-3d:"
 msgstr ""
 
 #. Translation Hint: The following word "another" must have 1 trailing space
-#: top/top_nls.c:410
+#: top/top_nls.c:422
 msgid "another "
 msgstr ""
 
-#: top/top_nls.c:411
+#: top/top_nls.c:423
 msgid "Locate next inactive, use \"L\""
 msgstr ""
 
-#: top/top_nls.c:412
+#: top/top_nls.c:424
 msgid "Locate string"
 msgstr ""
 
-#: top/top_nls.c:413
+#: top/top_nls.c:425
 #, c-format
 msgid "%s\"%s\" not found"
 msgstr ""
 
-#: top/top_nls.c:414
+#: top/top_nls.c:426
 #, c-format
 msgid "width incr is %d, change to (0 default, -1 auto)"
 msgstr ""
 
-#: top/top_nls.c:415
+#: top/top_nls.c:399
 msgid "Overwrite existing obsolete/corrupted rcfile?"
 msgstr ""
 
-#: top/top_nls.c:416
+#: top/top_nls.c:428
 #, c-format
 msgid "unrecognized field name '%s'"
 msgstr ""
 
-#: top/top_nls.c:417
+#: top/top_nls.c:429
 msgid "even using field names only, window is now too small"
 msgstr ""
 
-#: top/top_nls.c:419
+#: top/top_nls.c:431
 msgid "Open Files"
 msgstr ""
 
-#: top/top_nls.c:420
+#: top/top_nls.c:432
 msgid "NUMA Info"
 msgstr ""
 
-#: top/top_nls.c:421
+#: top/top_nls.c:433
 msgid "Log"
 msgstr ""
 
-#: top/top_nls.c:422
+#: top/top_nls.c:434
 msgid ""
 "the '=' key will eventually show the actual file read or command(s) executed "
 "..."
 msgstr ""
 
-#: top/top_nls.c:423
+#: top/top_nls.c:435
 msgid "demo"
 msgstr ""
 
-#: top/top_nls.c:424
+#: top/top_nls.c:436
 #, c-format
 msgid ""
 "This is simulated output representing the contents of some file or the "
@@ -2905,100 +2918,100 @@
 "Enjoy!\n"
 msgstr ""
 
-#: top/top_nls.c:456
+#: top/top_nls.c:468
 msgid "to enable 'Y' press <Enter> then type 'W' and restart top"
 msgstr ""
 
-#: top/top_nls.c:458
+#: top/top_nls.c:470
 msgid "to enable 'Y' please consult the top man page (press Enter)"
 msgstr ""
 
-#: top/top_nls.c:460
+#: top/top_nls.c:472
 #, c-format
 msgid "Selection failed with: %s\n"
 msgstr ""
 
-#: top/top_nls.c:461
+#: top/top_nls.c:473
 #, c-format
 msgid "unable to inspect, pid %d not found"
 msgstr ""
 
-#: top/top_nls.c:462
+#: top/top_nls.c:474
 #, c-format
 msgid "inspect at PID [default pid = %d]"
 msgstr ""
 
-#: top/top_nls.c:463
+#: top/top_nls.c:475
 #, c-format
 msgid "%s: %*d-%-*d lines, %*d-%*d columns, %lu bytes read"
 msgstr ""
 
-#: top/top_nls.c:464
+#: top/top_nls.c:448
 msgid "patience please, working..."
 msgstr ""
 
 #. Translation Hint: Below are 2 abbreviations which can be as long as needed:
 #. .                 FLD = FIELD, VAL = VALUE
-#: top/top_nls.c:467
+#: top/top_nls.c:480
 #, c-format
 msgid "add filter #%d (%s) as: [!]FLD?VAL"
 msgstr ""
 
-#: top/top_nls.c:468
+#: top/top_nls.c:481
 msgid "ignoring case"
 msgstr ""
 
-#: top/top_nls.c:469
+#: top/top_nls.c:482
 msgid "case sensitive"
 msgstr "大小写敏感"
 
-#: top/top_nls.c:470
+#: top/top_nls.c:483
 msgid "duplicate filter was ignored"
 msgstr ""
 
-#: top/top_nls.c:471
+#: top/top_nls.c:484
 #, c-format
 msgid "'%s' filter delimiter is missing"
 msgstr ""
 
-#: top/top_nls.c:472
+#: top/top_nls.c:485
 #, c-format
 msgid "'%s' filter value is missing"
 msgstr ""
 
-#: top/top_nls.c:473
+#: top/top_nls.c:486
 msgid "include"
 msgstr ""
 
-#: top/top_nls.c:474
+#: top/top_nls.c:487
 msgid "exclude"
 msgstr ""
 
-#: top/top_nls.c:475
+#: top/top_nls.c:488
 #, c-format
 msgid "<Enter> to resume, filters: %s"
 msgstr ""
 
-#: top/top_nls.c:476
+#: top/top_nls.c:489
 msgid "none"
 msgstr ""
 
 #. Translation Hint: The following word 'Node' should be exactly 4 characters
-#: top/top_nls.c:478
+#: top/top_nls.c:491
 #, c-format
 msgid "Node%-2d:"
 msgstr ""
 
-#: top/top_nls.c:479
+#: top/top_nls.c:492
 #, c-format
 msgid "expand which node (0-%d)"
 msgstr ""
 
-#: top/top_nls.c:480
+#: top/top_nls.c:493
 msgid "invalid node"
 msgstr ""
 
-#: top/top_nls.c:481
+#: top/top_nls.c:494
 msgid "sorry, NUMA extensions unavailable"
 msgstr ""
 
@@ -3006,11 +3019,11 @@
 #. .                 'Swap' represents the linux swap file --
 #. .                 please make both translations exactly 4 characters,
 #. .                 padding with extra spaces as necessary
-#: top/top_nls.c:486
+#: top/top_nls.c:499
 msgid "Mem "
 msgstr ""
 
-#: top/top_nls.c:487
+#: top/top_nls.c:500
 msgid "Swap"
 msgstr ""
 
@@ -3038,7 +3051,7 @@
 #. .  please see the prologue to the show_special function in the top.c
 #. .  source file.
 #. .
-#: top/top_nls.c:521
+#: top/top_nls.c:505
 #, c-format
 msgid ""
 "Help for Interactive Commands~2 - %s\n"
@@ -3083,7 +3096,7 @@
 #. Translation Hint: As is true for the text above, the "keys" shown to the left and
 #. .                 also imbedded in the translatable text (along with escape seqs)
 #. .                 should never themselves be translated.
-#: top/top_nls.c:549
+#: top/top_nls.c:575
 msgid ""
 "  k,r       Manipulate tasks: '~1k~2' kill; '~1r~2' renice\n"
 "  d or s    Set update interval\n"
@@ -3091,7 +3104,7 @@
 "  k,r       操作进程：'~1k~2' 杀死；'~1r~2' 设置优先级\n"
 "  d or s    设定更新间隔\n"
 
-#: top/top_nls.c:553
+#: top/top_nls.c:579
 #, c-format
 msgid ""
 "Help for Windows / Field Groups~2 - \"Current Window\" = ~1 %s ~6\n"
@@ -3161,7 +3174,7 @@
 #. .     --> "   0~2 = black,~1  1~2 = red,    ~1  2~2 = gree
 #. .     --> "   4~2 = blue, ~1  5~2 = magenta,~1  6~2 = cyan
 #. .
-#: top/top_nls.c:603
+#: top/top_nls.c:587
 #, c-format
 msgid ""
 "Help for color mapping~2 - %s\n"
@@ -3193,7 +3206,12 @@
 "   'a' or 'w' to commit & change another, <Enter> to commit and end "
 msgstr ""
 
-#: top/top_nls.c:629
+#. Translation Hint:
+#. .  This Fields Management header should be 3 lines long so as
+#. .  to allow 1 blank line before the fields & descriptions.
+#. .  If absoultely necessary, 4 lines could be used (but never more).
+#. .
+#: top/top_nls.c:645
 #, c-format
 msgid ""
 "Fields Management~2 for window ~1%s~6, whose current sort field is ~1%s~2\n"
@@ -3202,21 +3220,24 @@
 "   'd' or <Space> toggles display, 's' sets sort.  Use 'q' or <Esc> to end!\n"
 msgstr ""
 
-#: top/top_nls.c:634
+#. Translation Hint:
+#. .  The next 5 items must each be translated as a single line.
+#. .
+#: top/top_nls.c:653
 #, c-format
 msgid ""
 "%s:~3 %3u ~2total,~3 %3u ~2running,~3 %3u ~2sleeping,~3 %3u ~2stopped,~3 %3u "
 "~2zombie~3\n"
 msgstr ""
 
-#: top/top_nls.c:637
+#: top/top_nls.c:656
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
 "~2idle~3\n"
 msgstr ""
 
-#: top/top_nls.c:640
+#: top/top_nls.c:659
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f  ~2user,~3 %#5.1f  ~2system,~3 %#5.1f  ~2nice,~3 %#5.1f  "
@@ -3226,7 +3247,7 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt
-#: top/top_nls.c:646
+#: top/top_nls.c:665
 #, c-format
 msgid ""
 "%%%s~3 %#5.1f ~2us,~3 %#5.1f ~2sy,~3 %#5.1f ~2ni,~3 %#5.1f ~2id,~3 %#5.1f "
@@ -3236,21 +3257,25 @@
 #. Translation Hint: Only the following abbreviations need be translated
 #. .                 us = user, sy = system, ni = nice, id = idle, wa = wait,
 #. .                 hi hardware interrupt, si = software interrupt, st = steal time
-#: top/top_nls.c:652
+#: top/top_nls.c:671
 #, c-format
 msgid ""
 "%%%s~3%#5.1f ~2us,~3%#5.1f ~2sy,~3%#5.1f ~2ni,~3%#5.1f ~2id,~3%#5.1f "
 "~2wa,~3%#5.1f ~2hi,~3%#5.1f ~2si,~3%#5.1f ~2st~3\n"
 msgstr ""
 
-#: top/top_nls.c:655
+#. Translation Hint: this must be translated as 2 lines with words above & below aligned
+#: top/top_nls.c:675
 #, c-format
 msgid ""
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used,~3 %9.9s~2buff/cache~3\n"
 "%s %s:~3 %9.9s~2total,~3 %9.9s~2free,~3 %9.9s~2used.~3 %9.9s~2avail %s~3\n"
 msgstr ""
 
-#: top/top_nls.c:659
+#. Translation Hint:
+#. .  The next 2 headers for 'Inspection' must each be 3 lines or less
+#. .
+#: top/top_nls.c:682
 #, c-format
 msgid ""
 "Inspection~2 Pause at: pid ~1%d~6, running ~1%s~6\n"
@@ -3259,7 +3284,7 @@
 "Options~2: ~1%s\n"
 msgstr ""
 
-#: top/top_nls.c:664
+#: top/top_nls.c:687
 #, c-format
 msgid ""
 "Inspection~2 View at pid: ~1%s~3, running ~1%s~3.  Locating: ~1%s~6\n"
@@ -3268,11 +3293,11 @@
 "Or~2:   <Enter> to ~1select another~5; 'q' or <Esc> to ~1end~5 !\n"
 msgstr ""
 
-#: uptime.c:61
+#: uptime.c:64
 msgid " -p, --pretty   show uptime in pretty format\n"
 msgstr ""
 
-#: uptime.c:63
+#: uptime.c:66
 msgid " -s, --since    system up since\n"
 msgstr ""
 
@@ -3337,7 +3362,7 @@
 "-- -system-- --------cpu--------"
 msgstr ""
 
-#: vmstat.c:198 vmstat.c:523
+#: vmstat.c:198 vmstat.c:530
 msgid " -----timestamp-----"
 msgstr ""
 
@@ -3446,8 +3471,8 @@
 msgid "reads  "
 msgstr "读取  "
 
-#. Translation Hint: max 10 chars
-#: vmstat.c:438
+#. Translation Hint: max 16 chars.
+#: vmstat.c:447
 msgid "read sectors"
 msgstr ""
 
@@ -3458,58 +3483,58 @@
 msgid "writes   "
 msgstr "写入   "
 
-#. Translation Hint: max 10 chars
-#: vmstat.c:444
+#. Translation Hint: max 16 chars
+#: vmstat.c:451
 msgid "requested writes"
 msgstr ""
 
-#: vmstat.c:458
+#: vmstat.c:465
 msgid "your kernel does not support diskstat. (2.5.70 or above required)"
 msgstr ""
 
-#: vmstat.c:520
+#: vmstat.c:527
 msgid ""
 "disk- ------------reads------------ ------------writes----------- -----IO----"
 "--"
 msgstr ""
 
-#: vmstat.c:522
+#: vmstat.c:529
 msgid ""
 "disk- -------------------reads------------------- -------------------writes--"
 "---------------- ------IO-------"
 msgstr ""
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:541 vmstat.c:549
+#: vmstat.c:548 vmstat.c:556
 msgid "total"
 msgstr "总用量"
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:543 vmstat.c:551
+#: vmstat.c:550 vmstat.c:558
 msgid "merged"
 msgstr ""
 
 #. Translation Hint: max 7 chars
-#: vmstat.c:545 vmstat.c:553
+#: vmstat.c:552 vmstat.c:560
 msgid "sectors"
 msgstr "扇区"
 
 #. Translation Hint: max 7 chars
-#: vmstat.c:547 vmstat.c:555
+#: vmstat.c:554 vmstat.c:562
 msgid "ms"
 msgstr ""
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:557
+#: vmstat.c:564
 msgid "cur"
 msgstr ""
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:559
+#: vmstat.c:566
 msgid "sec"
 msgstr ""
 
-#: vmstat.c:669
+#: vmstat.c:687
 msgid "your kernel does not support diskstat (2.5.70 or above required)"
 msgstr ""
 
@@ -3517,327 +3542,327 @@
 #. * follow (marked with max x chars) might not work, unless
 #. * manual page is translated as well.
 #. Translation Hint: max 24 chars
-#: vmstat.c:679
+#: vmstat.c:697
 msgid "Cache"
 msgstr ""
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:681
+#: vmstat.c:699
 msgid "Num"
 msgstr ""
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:683
+#: vmstat.c:701
 msgid "Total"
 msgstr "总共"
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:685
+#: vmstat.c:703
 msgid "Size"
 msgstr "大小"
 
 #. Translation Hint: max 6 chars
-#: vmstat.c:687
+#: vmstat.c:705
 msgid "Pages"
 msgstr ""
 
-#: vmstat.c:699
+#: vmstat.c:717
 msgid ""
 "your kernel does not support slabinfo or your permissions are insufficient"
 msgstr "您的内核不支持 slabinfo 或您的权限不够"
 
-#: vmstat.c:751
+#: vmstat.c:769
 #, c-format
 msgid "%13d disks \n"
 msgstr ""
 
-#: vmstat.c:752
+#: vmstat.c:770
 #, c-format
 msgid "%13d partitions \n"
 msgstr ""
 
-#: vmstat.c:768
+#: vmstat.c:786
 #, c-format
 msgid "%13lu total reads\n"
 msgstr ""
 
-#: vmstat.c:769
+#: vmstat.c:787
 #, c-format
 msgid "%13lu merged reads\n"
 msgstr ""
 
-#: vmstat.c:770
+#: vmstat.c:788
 #, c-format
 msgid "%13lu read sectors\n"
 msgstr ""
 
-#: vmstat.c:771
+#: vmstat.c:789
 #, c-format
 msgid "%13lu milli reading\n"
 msgstr ""
 
-#: vmstat.c:772
+#: vmstat.c:790
 #, c-format
 msgid "%13lu writes\n"
 msgstr ""
 
-#: vmstat.c:773
+#: vmstat.c:791
 #, c-format
 msgid "%13lu merged writes\n"
 msgstr ""
 
-#: vmstat.c:774
+#: vmstat.c:792
 #, c-format
 msgid "%13lu written sectors\n"
 msgstr ""
 
-#: vmstat.c:775
+#: vmstat.c:793
 #, c-format
 msgid "%13lu milli writing\n"
 msgstr ""
 
-#: vmstat.c:776
+#: vmstat.c:794
 #, c-format
 msgid "%13lu inprogress IO\n"
 msgstr ""
 
-#: vmstat.c:777
+#: vmstat.c:795
 #, c-format
 msgid "%13lu milli spent IO\n"
 msgstr ""
 
-#: vmstat.c:798
+#: vmstat.c:816
 #, c-format
 msgid "%13lu %s total memory\n"
 msgstr ""
 
-#: vmstat.c:799
+#: vmstat.c:817
 #, c-format
 msgid "%13lu %s used memory\n"
 msgstr ""
 
-#: vmstat.c:800
+#: vmstat.c:818
 #, c-format
 msgid "%13lu %s active memory\n"
 msgstr ""
 
-#: vmstat.c:801
+#: vmstat.c:819
 #, c-format
 msgid "%13lu %s inactive memory\n"
 msgstr ""
 
-#: vmstat.c:802
+#: vmstat.c:820
 #, c-format
 msgid "%13lu %s free memory\n"
 msgstr ""
 
-#: vmstat.c:803
+#: vmstat.c:821
 #, c-format
 msgid "%13lu %s buffer memory\n"
 msgstr ""
 
-#: vmstat.c:804
+#: vmstat.c:822
 #, c-format
 msgid "%13lu %s swap cache\n"
 msgstr ""
 
-#: vmstat.c:805
+#: vmstat.c:823
 #, c-format
 msgid "%13lu %s total swap\n"
 msgstr ""
 
-#: vmstat.c:806
+#: vmstat.c:824
 #, c-format
 msgid "%13lu %s used swap\n"
 msgstr ""
 
-#: vmstat.c:807
+#: vmstat.c:825
 #, c-format
 msgid "%13lu %s free swap\n"
 msgstr ""
 
-#: vmstat.c:808
+#: vmstat.c:826
 #, c-format
 msgid "%13lld non-nice user cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:809
+#: vmstat.c:827
 #, c-format
 msgid "%13lld nice user cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:810
+#: vmstat.c:828
 #, c-format
 msgid "%13lld system cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:811
+#: vmstat.c:829
 #, c-format
 msgid "%13lld idle cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:812
+#: vmstat.c:830
 #, c-format
 msgid "%13lld IO-wait cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:813
+#: vmstat.c:831
 #, c-format
 msgid "%13lld IRQ cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:814
+#: vmstat.c:832
 #, c-format
 msgid "%13lld softirq cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:815
+#: vmstat.c:833
 #, c-format
 msgid "%13lld stolen cpu ticks\n"
 msgstr ""
 
-#: vmstat.c:816
+#: vmstat.c:834
 #, c-format
 msgid "%13lu pages paged in\n"
 msgstr ""
 
-#: vmstat.c:817
+#: vmstat.c:835
 #, c-format
 msgid "%13lu pages paged out\n"
 msgstr ""
 
-#: vmstat.c:818
+#: vmstat.c:836
 #, c-format
 msgid "%13lu pages swapped in\n"
 msgstr ""
 
-#: vmstat.c:819
+#: vmstat.c:837
 #, c-format
 msgid "%13lu pages swapped out\n"
 msgstr ""
 
-#: vmstat.c:820
+#: vmstat.c:838
 #, c-format
 msgid "%13u interrupts\n"
 msgstr ""
 
-#: vmstat.c:821
+#: vmstat.c:839
 #, c-format
 msgid "%13u CPU context switches\n"
 msgstr ""
 
-#: vmstat.c:822
+#: vmstat.c:840
 #, c-format
 msgid "%13u boot time\n"
 msgstr ""
 
-#: vmstat.c:823 vmstat.c:838
+#: vmstat.c:841 vmstat.c:856
 #, c-format
 msgid "%13u forks\n"
 msgstr ""
 
 #. Translation Hint: do not change argument characters
-#: vmstat.c:940
+#: vmstat.c:958
 msgid "-S requires k, K, m or M (default is KiB)"
 msgstr ""
 
-#: vmstat.c:991
+#: vmstat.c:1009
 #, c-format
 msgid "partition was not found\n"
 msgstr ""
 
-#: watch.c:90
+#: watch.c:89
 #, c-format
 msgid " %s [options] command\n"
 msgstr ""
 
-#: watch.c:92
+#: watch.c:91
 msgid "  -b, --beep             beep if command has a non-zero exit\n"
 msgstr ""
 
-#: watch.c:93
+#: watch.c:92
 msgid "  -c, --color            interpret ANSI color and style sequences\n"
 msgstr ""
 
-#: watch.c:94
+#: watch.c:93
 msgid ""
 "  -d, --differences[=<permanent>]\n"
 "                         highlight changes between updates\n"
 msgstr ""
 
-#: watch.c:96
+#: watch.c:95
 msgid "  -e, --errexit          exit if command has a non-zero exit\n"
 msgstr ""
 
-#: watch.c:97
+#: watch.c:96
 msgid "  -g, --chgexit          exit when output from command changes\n"
 msgstr ""
 
-#: watch.c:98
+#: watch.c:97
 msgid "  -n, --interval <secs>  seconds to wait between updates\n"
 msgstr ""
 
-#: watch.c:99
+#: watch.c:98
 msgid "  -p, --precise          attempt run command in precise intervals\n"
 msgstr ""
 
-#: watch.c:100
+#: watch.c:99
 msgid "  -t, --no-title         turn off header\n"
 msgstr ""
 
-#: watch.c:101
+#: watch.c:100
 msgid "  -x, --exec             pass command to exec instead of \"sh -c\"\n"
 msgstr ""
 
-#: watch.c:104
+#: watch.c:103
 msgid " -v, --version  output version information and exit\n"
 msgstr ""
 
-#: watch.c:384
+#: watch.c:390
 #, c-format
 msgid "Every %.1fs: "
 msgstr ""
 
-#: watch.c:385
+#: watch.c:391
 #, c-format
 msgid "%s: %s"
 msgstr ""
 
-#: watch.c:456
+#: watch.c:462
 msgid "unable to create IPC pipes"
 msgstr ""
 
-#: watch.c:466
+#: watch.c:472
 msgid "unable to fork process"
 msgstr "无法创建 (fork) 进程"
 
-#: watch.c:471
+#: watch.c:477
 msgid "dup2 failed"
 msgstr ""
 
-#: watch.c:478
+#: watch.c:484
 #, c-format
 msgid "unable to execute '%s'"
 msgstr ""
 
-#: watch.c:495
+#: watch.c:501
 msgid "fdopen"
 msgstr "fdopen"
 
-#: watch.c:641
+#: watch.c:647
 msgid "waitpid"
 msgstr ""
 
-#: watch.c:649
+#: watch.c:655
 msgid "command exit with a non-zero status, press a key to exit"
 msgstr "命令以非零状态退出，按任意键退出"
 
-#: watch.c:773
+#: watch.c:779
 #, c-format
 msgid "unicode handling error\n"
 msgstr ""
 
-#: watch.c:779
+#: watch.c:785
 #, c-format
 msgid "unicode handling error (malloc)\n"
 msgstr "unicode 处理错误 (malloc)\n"
@@ -3860,38 +3885,38 @@
 msgid " %2lu.%02us"
 msgstr ""
 
-#: w.c:455
+#: w.c:459
 msgid " -h, --no-header     do not print header\n"
 msgstr ""
 
-#: w.c:456
+#: w.c:460
 msgid " -u, --no-current    ignore current process username\n"
 msgstr ""
 
-#: w.c:457
+#: w.c:461
 msgid " -s, --short         short format\n"
 msgstr ""
 
-#: w.c:458
+#: w.c:462
 msgid " -f, --from          show remote hostname field\n"
 msgstr ""
 
-#: w.c:459
+#: w.c:463
 msgid " -o, --old-style     old style output\n"
 msgstr ""
 
-#: w.c:460
+#: w.c:464
 msgid ""
 " -i, --ip-addr       display IP address instead of hostname (if possible)\n"
 msgstr ""
 
-#: w.c:557
+#: w.c:561
 #, c-format
 msgid ""
 "User length environment PROCPS_USERLEN must be between 8 and %i, ignoring.\n"
 msgstr ""
 
-#: w.c:567
+#: w.c:571
 #, c-format
 msgid ""
 "from length environment PROCPS_FROMLEN must be between 8 and %d, ignoring\n"
@@ -3899,21 +3924,21 @@
 
 #. Translation Hint: Following five uppercase messages are
 #. * headers. Try to keep alignment intact.
-#: w.c:591
+#: w.c:598
 #, c-format
 msgid "%-*s TTY      "
 msgstr "%-*s TTY      "
 
-#: w.c:593
+#: w.c:600
 msgid "FROM"
 msgstr "来自"
 
-#: w.c:595
+#: w.c:602
 #, c-format
 msgid "  LOGIN@   IDLE   JCPU   PCPU WHAT\n"
 msgstr ""
 
-#: w.c:597
+#: w.c:604
 #, c-format
 msgid "   IDLE WHAT\n"
 msgstr "   空闲等待\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/psmisc.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/psmisc.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/psmisc.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/psmisc.po	2020-07-08 13:53:56.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:09+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:00+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/pulseaudio.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/pulseaudio.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/pulseaudio.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/pulseaudio.po	2020-07-08 13:53:55.000000000 +0000
@@ -13,15 +13,15 @@
 "Report-Msgid-Bugs-To: "
 "https://bugs.freedesktop.org/enter_bug.cgi?product=PulseAudio&keywords=I18N+L"
 "10N&component=misc\n"
-"POT-Creation-Date: 2019-10-16 00:40+0000\n"
-"PO-Revision-Date: 2019-11-22 18:20+0000\n"
-"Last-Translator: Luo Lei <robert165@163.com>\n"
+"POT-Creation-Date: 2020-06-29 13:36+0000\n"
+"PO-Revision-Date: 2020-05-12 20:27+0000\n"
+"Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: Chinese (Simplified, GNOME) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:39+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:25+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: ../src/daemon/cmdline.c:113
@@ -97,37 +97,37 @@
 "  -n                                    Don't load default script file\n"
 msgstr ""
 
-#: src/daemon/cmdline.c:246
+#: ../src/daemon/cmdline.c:246
 msgid "--daemonize expects boolean argument"
 msgstr "--daemonize 布尔参数"
 
-#: src/daemon/cmdline.c:254
+#: ../src/daemon/cmdline.c:254
 msgid "--fail expects boolean argument"
 msgstr "--fail 布尔参数"
 
-#: src/daemon/cmdline.c:265
+#: ../src/daemon/cmdline.c:265
 msgid ""
 "--log-level expects log level argument (either numeric in range 0..4 or one "
 "of debug, info, notice, warn, error)."
 msgstr "--log-level 日志级别参数(可以是数字 0～4 或者 debug、info、notice、warn 和 error 中的一个)"
 
-#: src/daemon/cmdline.c:277
+#: ../src/daemon/cmdline.c:277
 msgid "--high-priority expects boolean argument"
 msgstr "--high-priority 布尔参数"
 
-#: src/daemon/cmdline.c:285
+#: ../src/daemon/cmdline.c:285
 msgid "--realtime expects boolean argument"
 msgstr "--realtime 布尔参数"
 
-#: src/daemon/cmdline.c:293
+#: ../src/daemon/cmdline.c:293
 msgid "--disallow-module-loading expects boolean argument"
 msgstr "--disallow-module-loading 布尔参数"
 
-#: src/daemon/cmdline.c:301
+#: ../src/daemon/cmdline.c:301
 msgid "--disallow-exit expects boolean argument"
 msgstr "--disallow-exit 布尔参数"
 
-#: src/daemon/cmdline.c:309
+#: ../src/daemon/cmdline.c:309
 msgid "--use-pid-file expects boolean argument"
 msgstr "--use-pid-file 布尔参数"
 
@@ -138,312 +138,312 @@
 msgstr ""
 "无效的日志目标：要么使用 syslog、journal、stderr 或 auto，要么给定正确的文件名：file:<路径>、newfile:<路径>。"
 
-#: src/daemon/cmdline.c:330
+#: ../src/daemon/cmdline.c:330
 msgid ""
 "Invalid log target: use either 'syslog', 'stderr' or 'auto' or a valid file "
 "name 'file:<path>', 'newfile:<path>'."
 msgstr "无效的日志目标：要么使用 syslog、stderr 或 auto，要么给定正确的文件名：file:<路径>、newfile:<路径>。"
 
-#: src/daemon/cmdline.c:338
+#: ../src/daemon/cmdline.c:338
 msgid "--log-time expects boolean argument"
 msgstr "--log-time 布尔参数"
 
-#: src/daemon/cmdline.c:346
+#: ../src/daemon/cmdline.c:346
 msgid "--log-meta expects boolean argument"
 msgstr "--log-meta 布尔参数"
 
-#: src/daemon/cmdline.c:366
+#: ../src/daemon/cmdline.c:366
 #, c-format
 msgid "Invalid resample method '%s'."
 msgstr "无效的重采样方法 %s。"
 
-#: src/daemon/cmdline.c:373
+#: ../src/daemon/cmdline.c:373
 msgid "--system expects boolean argument"
 msgstr "--system 布尔参数"
 
-#: src/daemon/cmdline.c:381
+#: ../src/daemon/cmdline.c:381
 msgid "--no-cpu-limit expects boolean argument"
 msgstr "--no-cpu-limit 布尔参数"
 
-#: src/daemon/cmdline.c:389
+#: ../src/daemon/cmdline.c:389
 msgid "--disable-shm expects boolean argument"
 msgstr "--disable-shm 布尔参数"
 
-#: src/daemon/cmdline.c:397
+#: ../src/daemon/cmdline.c:397
 msgid "--enable-memfd expects boolean argument"
 msgstr ""
 
-#: src/daemon/daemon-conf.c:268
+#: ../src/daemon/daemon-conf.c:262
 #, c-format
 msgid "[%s:%u] Invalid log target '%s'."
 msgstr "[%s:%u] 无效的日志目标 %s。"
 
-#: src/daemon/daemon-conf.c:283
+#: ../src/daemon/daemon-conf.c:277
 #, c-format
 msgid "[%s:%u] Invalid log level '%s'."
 msgstr "[%s:%u] 无效的日志级别 '%s。"
 
-#: src/daemon/daemon-conf.c:298
+#: ../src/daemon/daemon-conf.c:292
 #, c-format
 msgid "[%s:%u] Invalid resample method '%s'."
 msgstr "[%s:%u] 无效的重采样方法 %s。"
 
-#: src/daemon/daemon-conf.c:320
+#: ../src/daemon/daemon-conf.c:314
 #, c-format
 msgid "[%s:%u] Invalid rlimit '%s'."
 msgstr "[%s:%u] 无效的运行限制 %s。"
 
-#: src/daemon/daemon-conf.c:340
+#: ../src/daemon/daemon-conf.c:334
 #, c-format
 msgid "[%s:%u] Invalid sample format '%s'."
 msgstr "[%s:%u] 无效的采样格式 %s。"
 
-#: src/daemon/daemon-conf.c:357 src/daemon/daemon-conf.c:374
+#: ../src/daemon/daemon-conf.c:351 ../src/daemon/daemon-conf.c:368
 #, c-format
 msgid "[%s:%u] Invalid sample rate '%s'."
 msgstr "[%s:%u] 无效的采样率 %s。"
 
-#: src/daemon/daemon-conf.c:397
+#: ../src/daemon/daemon-conf.c:391
 #, c-format
 msgid "[%s:%u] Invalid sample channels '%s'."
 msgstr "[%s:%u] 无效的采样声道 %s。"
 
-#: src/daemon/daemon-conf.c:414
+#: ../src/daemon/daemon-conf.c:408
 #, c-format
 msgid "[%s:%u] Invalid channel map '%s'."
 msgstr "[%s:%u] 无效声道映射 '%s'。"
 
-#: src/daemon/daemon-conf.c:431
+#: ../src/daemon/daemon-conf.c:425
 #, c-format
 msgid "[%s:%u] Invalid number of fragments '%s'."
 msgstr "[%s:%u] 无效的分片数 %s。"
 
-#: src/daemon/daemon-conf.c:448
+#: ../src/daemon/daemon-conf.c:442
 #, c-format
 msgid "[%s:%u] Invalid fragment size '%s'."
 msgstr "[%s:%u] 无效的分片大小 %s。"
 
-#: src/daemon/daemon-conf.c:465
+#: ../src/daemon/daemon-conf.c:459
 #, c-format
 msgid "[%s:%u] Invalid nice level '%s'."
 msgstr "[%s:%u] 无效的优先级 %s。"
 
-#: src/daemon/daemon-conf.c:508
+#: ../src/daemon/daemon-conf.c:502
 #, c-format
 msgid "[%s:%u] Invalid server type '%s'."
 msgstr "[%s:%u] 无效的服务器类型 '%s'。"
 
-#: src/daemon/daemon-conf.c:626
+#: ../src/daemon/daemon-conf.c:620
 #, c-format
 msgid "Failed to open configuration file: %s"
 msgstr "打开配置文件失败：%s"
 
-#: src/daemon/daemon-conf.c:642
+#: ../src/daemon/daemon-conf.c:636
 msgid ""
 "The specified default channel map has a different number of channels than "
 "the specified default number of channels."
 msgstr "指定的默认声道映射的声道数与指定的默认声道数不同。"
 
-#: src/daemon/daemon-conf.c:729
+#: ../src/daemon/daemon-conf.c:723
 #, c-format
 msgid "### Read from configuration file: %s ###\n"
 msgstr "### 从配置文件读取：%s ###\n"
 
-#: src/daemon/dumpmodules.c:57
+#: ../src/daemon/dumpmodules.c:57
 #, c-format
 msgid "Name: %s\n"
 msgstr "名称：%s\n"
 
-#: src/daemon/dumpmodules.c:60
+#: ../src/daemon/dumpmodules.c:60
 #, c-format
 msgid "No module information available\n"
 msgstr "没有可用的模块信息\n"
 
-#: src/daemon/dumpmodules.c:63
+#: ../src/daemon/dumpmodules.c:63
 #, c-format
 msgid "Version: %s\n"
 msgstr "版本：%s\n"
 
-#: src/daemon/dumpmodules.c:65
+#: ../src/daemon/dumpmodules.c:65
 #, c-format
 msgid "Description: %s\n"
 msgstr "描述：%s\n"
 
-#: src/daemon/dumpmodules.c:67
+#: ../src/daemon/dumpmodules.c:67
 #, c-format
 msgid "Author: %s\n"
 msgstr "作者：%s\n"
 
-#: src/daemon/dumpmodules.c:69
+#: ../src/daemon/dumpmodules.c:69
 #, c-format
 msgid "Usage: %s\n"
 msgstr "用法：%s\n"
 
-#: src/daemon/dumpmodules.c:70
+#: ../src/daemon/dumpmodules.c:70
 #, c-format
 msgid "Load Once: %s\n"
 msgstr "加载一次：%s\n"
 
-#: src/daemon/dumpmodules.c:72
+#: ../src/daemon/dumpmodules.c:72
 #, c-format
 msgid "DEPRECATION WARNING: %s\n"
 msgstr "旧接口警告：%s\n"
 
-#: src/daemon/dumpmodules.c:76
+#: ../src/daemon/dumpmodules.c:76
 #, c-format
 msgid "Path: %s\n"
 msgstr "路径：%s\n"
 
-#: src/daemon/ltdl-bind-now.c:75
+#: ../src/daemon/ltdl-bind-now.c:75
 #, c-format
 msgid "Failed to open module %s: %s"
 msgstr "打开模块 %s 失败：%s"
 
-#: src/daemon/ltdl-bind-now.c:126
+#: ../src/daemon/ltdl-bind-now.c:126
 msgid "Failed to find original lt_dlopen loader."
 msgstr "查找原始 lt_dlopen 加载器失败。"
 
-#: src/daemon/ltdl-bind-now.c:131
+#: ../src/daemon/ltdl-bind-now.c:131
 msgid "Failed to allocate new dl loader."
 msgstr "分配新的动态加载器失败。"
 
-#: src/daemon/ltdl-bind-now.c:144
+#: ../src/daemon/ltdl-bind-now.c:144
 msgid "Failed to add bind-now-loader."
 msgstr "添加 bind-now-loader 失败。"
 
-#: src/daemon/main.c:171
+#: ../src/daemon/main.c:161
 #, c-format
 msgid "Failed to find user '%s'."
 msgstr "找不到用户 %s。"
 
-#: src/daemon/main.c:176
+#: ../src/daemon/main.c:166
 #, c-format
 msgid "Failed to find group '%s'."
 msgstr "找不到组 %s。"
 
-#: src/daemon/main.c:185
+#: ../src/daemon/main.c:175
 #, c-format
 msgid "GID of user '%s' and of group '%s' don't match."
 msgstr "用户 %s 与组 %s 的 GID 不匹配。"
 
-#: src/daemon/main.c:190
+#: ../src/daemon/main.c:180
 #, c-format
 msgid "Home directory of user '%s' is not '%s', ignoring."
 msgstr "用户 %s 的主文件夹不是 %s，忽略。"
 
-#: src/daemon/main.c:193 src/daemon/main.c:198
+#: ../src/daemon/main.c:183 ../src/daemon/main.c:188
 #, c-format
 msgid "Failed to create '%s': %s"
 msgstr "创建 %s 失败：%s"
 
-#: src/daemon/main.c:205
+#: ../src/daemon/main.c:195
 #, c-format
 msgid "Failed to change group list: %s"
 msgstr "更改组列表失败：%s"
 
-#: src/daemon/main.c:221
+#: ../src/daemon/main.c:211
 #, c-format
 msgid "Failed to change GID: %s"
 msgstr "更改 GID 失败：%s"
 
-#: src/daemon/main.c:237
+#: ../src/daemon/main.c:227
 #, c-format
 msgid "Failed to change UID: %s"
 msgstr "更改 UID 失败：%s"
 
-#: src/daemon/main.c:266
+#: ../src/daemon/main.c:256
 msgid "System wide mode unsupported on this platform."
 msgstr "此平台不支持系统全局模式。"
 
-#: src/daemon/main.c:495
+#: ../src/daemon/main.c:494
 msgid "Failed to parse command line."
 msgstr "命令行解析失败"
 
-#: src/daemon/main.c:534
+#: ../src/daemon/main.c:533
 msgid ""
 "System mode refused for non-root user. Only starting the D-Bus server lookup "
 "service."
 msgstr "已拒绝非超级用户使用系统模式，仅启动 D-Bus 服务器查找服务。"
 
-#: src/daemon/main.c:633
+#: ../src/daemon/main.c:632
 #, c-format
 msgid "Failed to kill daemon: %s"
 msgstr "杀死守护进程失败：%s"
 
-#: src/daemon/main.c:662
+#: ../src/daemon/main.c:661
 msgid ""
 "This program is not intended to be run as root (unless --system is "
 "specified)."
 msgstr "不应以 root 身份运行本程序(除非指定 --system 参数)。"
 
-#: src/daemon/main.c:665
+#: ../src/daemon/main.c:664
 msgid "Root privileges required."
 msgstr "需要 root 权限。"
 
-#: src/daemon/main.c:672
+#: ../src/daemon/main.c:671
 msgid "--start not supported for system instances."
 msgstr "系统实例不支持 --start 参数。"
 
-#: src/daemon/main.c:712
+#: ../src/daemon/main.c:711
 #, c-format
 msgid "User-configured server at %s, refusing to start/autospawn."
 msgstr "用户配置的服务器 %s，拒绝启动/自动派生。"
 
-#: src/daemon/main.c:718
+#: ../src/daemon/main.c:717
 #, c-format
 msgid ""
 "User-configured server at %s, which appears to be local. Probing deeper."
 msgstr "用户配置的服务器 %s，看起来是本地服务器。正在进一步探测。"
 
-#: src/daemon/main.c:723
+#: ../src/daemon/main.c:722
 msgid "Running in system mode, but --disallow-exit not set."
 msgstr "正在以系统模式运行，但未设定 --disallow-exit。"
 
-#: src/daemon/main.c:726
+#: ../src/daemon/main.c:725
 msgid "Running in system mode, but --disallow-module-loading not set."
 msgstr "正在以系统模式运行，但未设定 --disallow-module-loading。"
 
-#: src/daemon/main.c:729
+#: ../src/daemon/main.c:728
 msgid "Running in system mode, forcibly disabling SHM mode."
 msgstr "正在以系统模式运行，强制禁用 SHM 模式！"
 
-#: src/daemon/main.c:734
+#: ../src/daemon/main.c:733
 msgid "Running in system mode, forcibly disabling exit idle time."
 msgstr "正在以系统模式运行，强制禁用退出空闲时间！"
 
-#: src/daemon/main.c:767
+#: ../src/daemon/main.c:766
 msgid "Failed to acquire stdio."
 msgstr "获取 stdio 失败。"
 
-#: src/daemon/main.c:773 src/daemon/main.c:844
+#: ../src/daemon/main.c:772 ../src/daemon/main.c:843
 #, c-format
 msgid "pipe() failed: %s"
 msgstr "pipe() 失败：%s"
 
-#: src/daemon/main.c:778 src/daemon/main.c:849
+#: ../src/daemon/main.c:777 ../src/daemon/main.c:848
 #, c-format
 msgid "fork() failed: %s"
 msgstr "fork() 失败：%s"
 
-#: src/daemon/main.c:793 src/daemon/main.c:864 src/utils/pacat.c:562
+#: ../src/daemon/main.c:792 ../src/daemon/main.c:863 ../src/utils/pacat.c:562
 #, c-format
 msgid "read() failed: %s"
 msgstr "read() 失败：%s"
 
-#: src/daemon/main.c:799
+#: ../src/daemon/main.c:798
 msgid "Daemon startup failed."
 msgstr "守护程序启动失败。"
 
-#: src/daemon/main.c:832
+#: ../src/daemon/main.c:831
 #, c-format
 msgid "setsid() failed: %s"
 msgstr "setsid() 失败：%s"
 
-#: src/daemon/main.c:965
+#: ../src/daemon/main.c:958
 msgid "Failed to get machine ID"
 msgstr "获取机器 ID 失败"
 
-#: src/daemon/main.c:991
+#: ../src/daemon/main.c:984
 msgid ""
 "OK, so you are running PA in system mode. Please make sure that you actually "
 "do want to do that.\n"
@@ -453,11 +453,11 @@
 "idea."
 msgstr ""
 
-#: src/daemon/main.c:1007
+#: ../src/daemon/main.c:1000
 msgid "pa_pid_file_create() failed."
 msgstr "pa_pid_file_create() 失败。"
 
-#: src/daemon/main.c:1039
+#: ../src/daemon/main.c:1032
 msgid "pa_core_new() failed."
 msgstr "pa_core_new() 失败。"
 
@@ -465,301 +465,310 @@
 msgid "Failed to initialize daemon."
 msgstr "初始化守护进程失败。"
 
-#: src/daemon/main.c:1120
+#: ../src/daemon/main.c:1110
 msgid "Daemon startup without any loaded modules, refusing to work."
 msgstr "守护进程未加载任何负载模块，拒绝工作。"
 
-#: src/daemon/pulseaudio.desktop.in:4
+#: ../src/daemon/pulseaudio.desktop.in.h:1
 msgid "PulseAudio Sound System"
 msgstr "PulseAudio 声音系统"
 
-#: src/daemon/pulseaudio.desktop.in:5
+#: ../src/daemon/pulseaudio.desktop.in.h:2
 msgid "Start the PulseAudio Sound System"
 msgstr "启动 PulseAudio 声音系统"
 
-#: src/modules/alsa/alsa-mixer.c:2443
+#: ../src/modules/alsa/alsa-mixer.c:2492
 msgid "Input"
 msgstr "输入"
 
-#: src/modules/alsa/alsa-mixer.c:2444
+#: ../src/modules/alsa/alsa-mixer.c:2493
 msgid "Docking Station Input"
 msgstr "扩展坞输入"
 
-#: src/modules/alsa/alsa-mixer.c:2445
+#: ../src/modules/alsa/alsa-mixer.c:2494
 msgid "Docking Station Microphone"
 msgstr "扩展坞话筒"
 
-#: src/modules/alsa/alsa-mixer.c:2446
+#: ../src/modules/alsa/alsa-mixer.c:2495
 msgid "Docking Station Line In"
 msgstr "扩展坞线输入"
 
-#: src/modules/alsa/alsa-mixer.c:2447 src/modules/alsa/alsa-mixer.c:2532
+#: ../src/modules/alsa/alsa-mixer.c:2496 ../src/modules/alsa/alsa-mixer.c:2581
 msgid "Line In"
 msgstr "输入插孔"
 
-#: src/modules/alsa/alsa-mixer.c:2448 src/modules/alsa/alsa-mixer.c:2526
-#: src/modules/bluetooth/module-bluez5-device.c:1757
+#: ../src/modules/alsa/alsa-mixer.c:2497 ../src/modules/alsa/alsa-mixer.c:2575
+#: ../src/modules/bluetooth/module-bluez4-device.c:2104
+#: ../src/modules/bluetooth/module-bluez5-device.c:1887
 msgid "Microphone"
 msgstr "话筒"
 
-#: src/modules/alsa/alsa-mixer.c:2449 src/modules/alsa/alsa-mixer.c:2527
+#: ../src/modules/alsa/alsa-mixer.c:2498 ../src/modules/alsa/alsa-mixer.c:2576
 msgid "Front Microphone"
 msgstr "前麦克风"
 
-#: src/modules/alsa/alsa-mixer.c:2450 src/modules/alsa/alsa-mixer.c:2528
+#: ../src/modules/alsa/alsa-mixer.c:2499 ../src/modules/alsa/alsa-mixer.c:2577
 msgid "Rear Microphone"
 msgstr "后麦克风"
 
-#: src/modules/alsa/alsa-mixer.c:2451
+#: ../src/modules/alsa/alsa-mixer.c:2500
 msgid "External Microphone"
 msgstr "外部话筒"
 
-#: src/modules/alsa/alsa-mixer.c:2452 src/modules/alsa/alsa-mixer.c:2530
+#: ../src/modules/alsa/alsa-mixer.c:2501 ../src/modules/alsa/alsa-mixer.c:2579
 msgid "Internal Microphone"
 msgstr "内部话筒"
 
-#: src/modules/alsa/alsa-mixer.c:2453 src/modules/alsa/alsa-mixer.c:2533
+#: ../src/modules/alsa/alsa-mixer.c:2502 ../src/modules/alsa/alsa-mixer.c:2582
 msgid "Radio"
 msgstr "无线电"
 
-#: src/modules/alsa/alsa-mixer.c:2454 src/modules/alsa/alsa-mixer.c:2534
+#: ../src/modules/alsa/alsa-mixer.c:2503 ../src/modules/alsa/alsa-mixer.c:2583
 msgid "Video"
 msgstr "视频"
 
-#: src/modules/alsa/alsa-mixer.c:2455
+#: ../src/modules/alsa/alsa-mixer.c:2504
 msgid "Automatic Gain Control"
 msgstr "自动增益控制"
 
-#: src/modules/alsa/alsa-mixer.c:2456
+#: ../src/modules/alsa/alsa-mixer.c:2505
 msgid "No Automatic Gain Control"
 msgstr "无自动增益控制"
 
-#: src/modules/alsa/alsa-mixer.c:2457
+#: ../src/modules/alsa/alsa-mixer.c:2506
 msgid "Boost"
 msgstr "增强"
 
-#: src/modules/alsa/alsa-mixer.c:2458
+#: ../src/modules/alsa/alsa-mixer.c:2507
 msgid "No Boost"
 msgstr "无增强"
 
-#: src/modules/alsa/alsa-mixer.c:2459
+#: ../src/modules/alsa/alsa-mixer.c:2508
 msgid "Amplifier"
 msgstr "功放"
 
-#: src/modules/alsa/alsa-mixer.c:2460
+#: ../src/modules/alsa/alsa-mixer.c:2509
 msgid "No Amplifier"
 msgstr "无功放"
 
-#: src/modules/alsa/alsa-mixer.c:2461
+#: ../src/modules/alsa/alsa-mixer.c:2510
 msgid "Bass Boost"
 msgstr "重低音增强"
 
-#: src/modules/alsa/alsa-mixer.c:2462
+#: ../src/modules/alsa/alsa-mixer.c:2511
 msgid "No Bass Boost"
 msgstr "无重低音增强"
 
-#: src/modules/alsa/alsa-mixer.c:2463
-#: src/modules/bluetooth/module-bluez5-device.c:1764
+#: ../src/modules/alsa/alsa-mixer.c:2512
+#: ../src/modules/bluetooth/module-bluez4-device.c:2109
+#: ../src/modules/bluetooth/module-bluez5-device.c:1894
 msgid "Speaker"
 msgstr "扬声器"
 
-#: src/modules/alsa/alsa-mixer.c:2464 src/modules/alsa/alsa-mixer.c:2536
+#: ../src/modules/alsa/alsa-mixer.c:2513 ../src/modules/alsa/alsa-mixer.c:2585
 msgid "Headphones"
 msgstr "模拟耳机"
 
-#: src/modules/alsa/alsa-mixer.c:2525
+#: ../src/modules/alsa/alsa-mixer.c:2574
 msgid "Analog Input"
 msgstr "模拟输入"
 
-#: src/modules/alsa/alsa-mixer.c:2529
+#: ../src/modules/alsa/alsa-mixer.c:2578
 msgid "Dock Microphone"
 msgstr "扩展坞麦克风"
 
-#: src/modules/alsa/alsa-mixer.c:2531
+#: ../src/modules/alsa/alsa-mixer.c:2580
 msgid "Headset Microphone"
 msgstr "头挂麦克风"
 
-#: src/modules/alsa/alsa-mixer.c:2535
+#: ../src/modules/alsa/alsa-mixer.c:2584
 msgid "Analog Output"
 msgstr "模拟输出"
 
-#: src/modules/alsa/alsa-mixer.c:2537
+#: ../src/modules/alsa/alsa-mixer.c:2586
 msgid "Headphones Mono Output"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:2538
+#: ../src/modules/alsa/alsa-mixer.c:2587
 msgid "LFE on Separate Mono Output"
 msgstr "模拟输出（LFE）"
 
-#: src/modules/alsa/alsa-mixer.c:2539
+#: ../src/modules/alsa/alsa-mixer.c:2588
 msgid "Line Out"
 msgstr "线缆输出"
 
-#: src/modules/alsa/alsa-mixer.c:2540
+#: ../src/modules/alsa/alsa-mixer.c:2589
 msgid "Analog Mono Output"
 msgstr "模拟单声道输出"
 
-#: src/modules/alsa/alsa-mixer.c:2541
+#: ../src/modules/alsa/alsa-mixer.c:2590
 msgid "Speakers"
 msgstr "扬声器"
 
-#: src/modules/alsa/alsa-mixer.c:2542
+#: ../src/modules/alsa/alsa-mixer.c:2591
 msgid "HDMI / DisplayPort"
 msgstr "HDMI / DisplayPort"
 
-#: src/modules/alsa/alsa-mixer.c:2543
+#: ../src/modules/alsa/alsa-mixer.c:2592
 msgid "Digital Output (S/PDIF)"
 msgstr "数字输出 (S/PDIF)"
 
-#: src/modules/alsa/alsa-mixer.c:2544
+#: ../src/modules/alsa/alsa-mixer.c:2593
 msgid "Digital Input (S/PDIF)"
 msgstr "数字输入 (S/PDIF)"
 
-#: src/modules/alsa/alsa-mixer.c:2545
+#: ../src/modules/alsa/alsa-mixer.c:2594
 msgid "Digital Passthrough (S/PDIF)"
 msgstr "数字直通 (S/PDIF)"
 
-#: src/modules/alsa/alsa-mixer.c:2546
+#: ../src/modules/alsa/alsa-mixer.c:2595
 msgid "Multichannel Input"
 msgstr "多声道输入"
 
-#: src/modules/alsa/alsa-mixer.c:2547
+#: ../src/modules/alsa/alsa-mixer.c:2596
 msgid "Multichannel Output"
 msgstr "多声道输出"
 
-#: src/modules/alsa/alsa-mixer.c:2548
+#: ../src/modules/alsa/alsa-mixer.c:2597
 msgid "Game Output"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:2549
+#: ../src/modules/alsa/alsa-mixer.c:2598
 msgid "Chat Output"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4063
+#: ../src/modules/alsa/alsa-mixer.c:4113
 msgid "Analog Mono"
 msgstr "模拟单声道"
 
-#: src/modules/alsa/alsa-mixer.c:4064 src/modules/alsa/alsa-mixer.c:4072
-#: src/modules/alsa/alsa-mixer.c:4073
+#. Note: Not translated to "Analog Stereo Input", because the source
+#. * name gets "Input" appended to it automatically, so adding "Input"
+#. * here would lead to the source name to become "Analog Stereo Input
+#. * Input". The same logic applies to analog-stereo-output,
+#. * multichannel-input and multichannel-output.
+#: ../src/modules/alsa/alsa-mixer.c:4114 ../src/modules/alsa/alsa-mixer.c:4121
+#: ../src/modules/alsa/alsa-mixer.c:4122
 msgid "Analog Stereo"
 msgstr "模拟立体声"
 
-#: src/modules/alsa/alsa-mixer.c:4066 src/pulse/channelmap.c:775
+#: ../src/modules/alsa/alsa-mixer.c:4115 ../src/pulse/channelmap.c:775
 msgid "Stereo"
 msgstr "立体声"
 
-#: src/modules/alsa/alsa-mixer.c:4074 src/modules/alsa/alsa-mixer.c:4075
+#: ../src/modules/alsa/alsa-mixer.c:4123 ../src/modules/alsa/alsa-mixer.c:4124
 msgid "Multichannel"
 msgstr "多声道"
 
-#: src/modules/alsa/alsa-mixer.c:4076
+#: ../src/modules/alsa/alsa-mixer.c:4125
 msgid "Analog Surround 2.1"
 msgstr "模拟环绕 2.1"
 
-#: src/modules/alsa/alsa-mixer.c:4077
+#: ../src/modules/alsa/alsa-mixer.c:4126
 msgid "Analog Surround 3.0"
 msgstr "模拟环绕 3.0"
 
-#: src/modules/alsa/alsa-mixer.c:4078
+#: ../src/modules/alsa/alsa-mixer.c:4127
 msgid "Analog Surround 3.1"
 msgstr "模拟环绕 3.1"
 
-#: src/modules/alsa/alsa-mixer.c:4079
+#: ../src/modules/alsa/alsa-mixer.c:4128
 msgid "Analog Surround 4.0"
 msgstr "模拟环绕 4.0"
 
-#: src/modules/alsa/alsa-mixer.c:4080
+#: ../src/modules/alsa/alsa-mixer.c:4129
 msgid "Analog Surround 4.1"
 msgstr "模拟环绕 4.1"
 
-#: src/modules/alsa/alsa-mixer.c:4081
+#: ../src/modules/alsa/alsa-mixer.c:4130
 msgid "Analog Surround 5.0"
 msgstr "模拟环绕 5.0"
 
-#: src/modules/alsa/alsa-mixer.c:4082
+#: ../src/modules/alsa/alsa-mixer.c:4131
 msgid "Analog Surround 5.1"
 msgstr "模拟环绕 5.1"
 
-#: src/modules/alsa/alsa-mixer.c:4083
+#: ../src/modules/alsa/alsa-mixer.c:4132
 msgid "Analog Surround 6.0"
 msgstr "模拟环绕 6.0"
 
-#: src/modules/alsa/alsa-mixer.c:4084
+#: ../src/modules/alsa/alsa-mixer.c:4133
 msgid "Analog Surround 6.1"
 msgstr "模拟环绕 6.1"
 
-#: src/modules/alsa/alsa-mixer.c:4085
+#: ../src/modules/alsa/alsa-mixer.c:4134
 msgid "Analog Surround 7.0"
 msgstr "模拟环绕 7.0"
 
-#: src/modules/alsa/alsa-mixer.c:4086
+#: ../src/modules/alsa/alsa-mixer.c:4135
 msgid "Analog Surround 7.1"
 msgstr "模拟环绕 7.1"
 
-#: src/modules/alsa/alsa-mixer.c:4087
+#: ../src/modules/alsa/alsa-mixer.c:4136
 msgid "Digital Stereo (IEC958)"
 msgstr "数字立体声(IEC958)"
 
-#: ../src/modules/alsa/alsa-mixer.c:4017
+#: ../src/modules/alsa/alsa-mixer.c:4137
 msgid "Digital Passthrough  (IEC958)"
 msgstr "数字直通（IEC958）"
 
-#: src/modules/alsa/alsa-mixer.c:4089
+#: ../src/modules/alsa/alsa-mixer.c:4138
 msgid "Digital Surround 4.0 (IEC958/AC3)"
 msgstr "数字环绕 4.0(IEC958/AC3)"
 
-#: src/modules/alsa/alsa-mixer.c:4090
+#: ../src/modules/alsa/alsa-mixer.c:4139
 msgid "Digital Surround 5.1 (IEC958/AC3)"
 msgstr "数字环绕 5.1(IEC958/AC3)"
 
-#: src/modules/alsa/alsa-mixer.c:4091
+#: ../src/modules/alsa/alsa-mixer.c:4140
 msgid "Digital Surround 5.1 (IEC958/DTS)"
 msgstr "数字环绕 5.1（IEC958/DTS）"
 
-#: src/modules/alsa/alsa-mixer.c:4092
+#: ../src/modules/alsa/alsa-mixer.c:4141
 msgid "Digital Stereo (HDMI)"
 msgstr "数字立体声(HDMI)"
 
-#: src/modules/alsa/alsa-mixer.c:4093
+#: ../src/modules/alsa/alsa-mixer.c:4142
 msgid "Digital Surround 5.1 (HDMI)"
 msgstr "数字环绕 5.1（HDMI）"
 
-#: src/modules/alsa/alsa-mixer.c:4226
+#: ../src/modules/alsa/alsa-mixer.c:4275
 msgid "Analog Mono Duplex"
 msgstr "模拟单声道双工"
 
-#: src/modules/alsa/alsa-mixer.c:4227
+#: ../src/modules/alsa/alsa-mixer.c:4276
 msgid "Analog Stereo Duplex"
 msgstr "模拟立体声双工"
 
-#: src/modules/alsa/alsa-mixer.c:4228
+#: ../src/modules/alsa/alsa-mixer.c:4277
 msgid "Digital Stereo Duplex (IEC958)"
 msgstr "数字立体声双工(IEC958)"
 
-#: src/modules/alsa/alsa-mixer.c:4229
+#: ../src/modules/alsa/alsa-mixer.c:4278
 msgid "Multichannel Duplex"
 msgstr "多声道双工"
 
-#: src/modules/alsa/alsa-mixer.c:4230
+#: ../src/modules/alsa/alsa-mixer.c:4279
 msgid "Stereo Duplex"
 msgstr ""
 
-#: src/modules/alsa/alsa-mixer.c:4231 src/modules/alsa/module-alsa-card.c:189
-#: src/modules/bluetooth/module-bluez5-device.c:2012
+#: ../src/modules/alsa/alsa-mixer.c:4280
+#: ../src/modules/alsa/module-alsa-card.c:186
+#: ../src/modules/bluetooth/module-bluez4-device.c:2324
+#: ../src/modules/bluetooth/module-bluez5-device.c:2142
 msgid "Off"
 msgstr "关"
 
-#: src/modules/alsa/alsa-mixer.c:4330
+#: ../src/modules/alsa/alsa-mixer.c:4379
 #, c-format
 msgid "%s Output"
 msgstr "%s 输出"
 
-#: src/modules/alsa/alsa-mixer.c:4338
+#: ../src/modules/alsa/alsa-mixer.c:4387
 #, c-format
 msgid "%s Input"
 msgstr "%s 输入"
 
-#: src/modules/alsa/alsa-sink.c:651 src/modules/alsa/alsa-sink.c:841
+#: ../src/modules/alsa/alsa-sink.c:636
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -773,7 +782,7 @@
 "这很可能是 ALSA 驱动程序 '%s' 中的一个 bug。请向 ALSA 开发人员报告这个问题。\n"
 "我们因 POLLOUT 被设置而唤醒 -- 但结果是 snd_pcm_avail() 返回 0 或者另一个小于最小可用值的数值。"
 
-#: ../src/modules/alsa/alsa-sink.c:756
+#: ../src/modules/alsa/alsa-sink.c:826
 #, c-format
 msgid ""
 "ALSA woke us up to write new data to the device, but there was actually "
@@ -787,7 +796,7 @@
 "这很可能是 ALSA 驱动程序 %s 中的一个 bug。请向 ALSA 开发人员报告这个问题。\n"
 "提醒我们设置 POLLOUT - 但结果是 snd_pcm_avail() 返回 0 或者另一个小于最小可用值的数值。"
 
-#: src/modules/alsa/alsa-source.c:610 src/modules/alsa/alsa-source.c:776
+#: ../src/modules/alsa/alsa-source.c:596
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -801,7 +810,7 @@
 "这很可能是 ALSA 驱动程序 '%s' 中的一个 bug。请向 ALSA 开发人员报告这个问题。\n"
 "我们因 POLLOUT 被设置而唤醒 -- 但结果是 snd_pcm_avail() 返回 0 或者另一个小于最小可用值的数值。"
 
-#: ../src/modules/alsa/alsa-source.c:680
+#: ../src/modules/alsa/alsa-source.c:762
 #, c-format
 msgid ""
 "ALSA woke us up to read new data from the device, but there was actually "
@@ -815,7 +824,7 @@
 "这很可能是 ALSA 驱动程序 %s 中的一个 bug。请向 ALSA 开发人员报告这个问题。\n"
 "提醒我们设置 POLLIN - 但结果是 snd_pcm_avail() 返回 0 或者另一个小于最小可用值的数值。"
 
-#: ../src/modules/alsa/alsa-util.c:1168 ../src/modules/alsa/alsa-util.c:1243
+#: ../src/modules/alsa/alsa-util.c:1173 ../src/modules/alsa/alsa-util.c:1248
 #, c-format
 msgid ""
 "snd_pcm_avail() returned a value that is exceptionally large: %lu bytes (%lu "
@@ -826,7 +835,7 @@
 "snd_pcm_avail() 返回的值非常大：%lu 字节(%lu 毫秒)。\n"
 "这很可能是由 ALSA 驱动程序 %s 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
 
-#: ../src/modules/alsa/alsa-util.c:1218
+#: ../src/modules/alsa/alsa-util.c:1223
 #, c-format
 msgid ""
 "snd_pcm_delay() returned a value that is exceptionally large: %li bytes "
@@ -837,7 +846,7 @@
 "snd_pcm_delay() 返回的值非常大：%li 字节(%s%lu 毫秒)。\n"
 "这很可能是由 ALSA 驱动程序 %s 的缺陷导致的。请向 ALSA 开发者报告这个问题。"
 
-#: src/modules/alsa/alsa-util.c:1286
+#: ../src/modules/alsa/alsa-util.c:1264
 #, c-format
 msgid ""
 "snd_pcm_avail_delay() returned strange values: delay %lu is less than avail "
@@ -848,7 +857,7 @@
 "snd_pcm_avail_delay() 返回的值非常很奇怪：延迟 %lu 小于可用 (avail) %lu。\n"
 "很可能是 ALSA 驱动程序 '%s' 中的 bug。请向 ALSA 开发者举报这个问题。"
 
-#: ../src/modules/alsa/alsa-util.c:1302
+#: ../src/modules/alsa/alsa-util.c:1307
 #, c-format
 msgid ""
 "snd_pcm_mmap_begin() returned a value that is exceptionally large: %lu bytes "
@@ -859,44 +868,53 @@
 "snd_pcm_mmap_begin() 返回的值非常大：%lu 字节(%lu ms)。\n"
 "这很可能是由 ALSA 驱动程序 %s 中的 bug。请向 ALSA 开发者举报这个问题。"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1747
+#: ../src/modules/bluetooth/module-bluez4-device.c:2094
+#: ../src/modules/bluetooth/module-bluez5-device.c:1877
 msgid "Headset"
 msgstr "耳机"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1752
+#: ../src/modules/bluetooth/module-bluez4-device.c:2099
+#: ../src/modules/bluetooth/module-bluez5-device.c:1882
 msgid "Handsfree"
 msgstr "免手操作"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1770
+#: ../src/modules/bluetooth/module-bluez4-device.c:2114
+#: ../src/modules/bluetooth/module-bluez5-device.c:1900
 msgid "Headphone"
 msgstr "头戴耳机"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1775
+#: ../src/modules/bluetooth/module-bluez4-device.c:2119
+#: ../src/modules/bluetooth/module-bluez5-device.c:1905
 msgid "Portable"
 msgstr "便携式"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1780
+#: ../src/modules/bluetooth/module-bluez4-device.c:2124
+#: ../src/modules/bluetooth/module-bluez5-device.c:1910
 msgid "Car"
 msgstr "车内"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1785
+#: ../src/modules/bluetooth/module-bluez4-device.c:2129
+#: ../src/modules/bluetooth/module-bluez5-device.c:1915
 msgid "HiFi"
 msgstr "高保真"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1790
+#: ../src/modules/bluetooth/module-bluez4-device.c:2134
+#: ../src/modules/bluetooth/module-bluez5-device.c:1920
 msgid "Phone"
 msgstr "电话"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1742
-#: src/modules/bluetooth/module-bluez5-device.c:1758
-#: src/modules/bluetooth/module-bluez5-device.c:1796
+#: ../src/modules/bluetooth/module-bluez4-device.c:2142
+#: ../src/modules/bluetooth/module-bluez5-device.c:1872
+#: ../src/modules/bluetooth/module-bluez5-device.c:1888
+#: ../src/modules/bluetooth/module-bluez5-device.c:1926
 msgid "Bluetooth Output"
 msgstr "蓝牙输出"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1741
-#: src/modules/bluetooth/module-bluez5-device.c:1763
-#: src/modules/bluetooth/module-bluez5-device.c:1769
-#: src/modules/bluetooth/module-bluez5-device.c:1795
+#: ../src/modules/bluetooth/module-bluez4-device.c:2145
+#: ../src/modules/bluetooth/module-bluez5-device.c:1871
+#: ../src/modules/bluetooth/module-bluez5-device.c:1893
+#: ../src/modules/bluetooth/module-bluez5-device.c:1899
+#: ../src/modules/bluetooth/module-bluez5-device.c:1925
 msgid "Bluetooth Input"
 msgstr "蓝牙输入"
 
@@ -916,23 +934,23 @@
 msgid "Handsfree Gateway"
 msgstr "蓝牙音频网关"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1837
+#: ../src/modules/bluetooth/module-bluez5-device.c:1967
 msgid "High Fidelity Playback (A2DP Sink)"
 msgstr "高保真回放 (A2DP 信宿)"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1849
+#: ../src/modules/bluetooth/module-bluez5-device.c:1979
 msgid "High Fidelity Capture (A2DP Source)"
 msgstr "高保真采集（A2DP 信源）"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1861
+#: ../src/modules/bluetooth/module-bluez5-device.c:1991
 msgid "Headset Head Unit (HSP/HFP)"
 msgstr "头戴式耳机单元 (HSP/HFP)"
 
-#: src/modules/bluetooth/module-bluez5-device.c:1874
+#: ../src/modules/bluetooth/module-bluez5-device.c:2004
 msgid "Headset Audio Gateway (HSP/HFP)"
 msgstr "头戴式音频网关 (HSP/HFP)"
 
-#: src/modules/echo-cancel/module-echo-cancel.c:59
+#: ../src/modules/echo-cancel/module-echo-cancel.c:61
 msgid ""
 "source_name=<name for the source> source_properties=<properties for the "
 "source> source_master=<name of source to filter> sink_name=<name for the "
@@ -952,31 +970,25 @@
 "aec_args=<AEC 引擎的参数> save_aec=<在 /tmp 下保存 AEC 数据> autoloaded=<若为自动加载则会设置> "
 "use_volume_sharing=<yes 或 no> use_master_format=<yes or no> "
 
-#: src/modules/macosx/module-coreaudio-device.c:824
+#. add on profile
+#: ../src/modules/macosx/module-coreaudio-device.c:811
 msgid "On"
 msgstr "启用"
 
-#: src/modules/module-allow-passthrough.c:71
-#: src/modules/module-always-sink.c:80
+#: ../src/modules/module-allow-passthrough.c:73
+#: ../src/modules/module-always-sink.c:82
 msgid "Dummy Output"
 msgstr "伪输出"
 
-#. / TRANSLATORS: The app icon and name appears above this string. If the phrase
-#. / can't be translated in this language, translate the whole sentence
-#. / 'This app wants to record audio.'
-#: ../src/modules/trust-store/module-trust-store.c:154
-msgid "wants to record audio."
-msgstr "试图录制音频。"
-
-#: src/modules/module-always-sink.c:34
+#: ../src/modules/module-always-sink.c:36
 msgid "Always keeps at least one sink loaded even if it's a null one"
 msgstr "总是保持至少载入一个信宿，即使它并不真实存在"
 
-#: src/modules/module-equalizer-sink.c:68
+#: ../src/modules/module-equalizer-sink.c:70
 msgid "General Purpose Equalizer"
 msgstr "通用均衡器"
 
-#: src/modules/module-equalizer-sink.c:72
+#: ../src/modules/module-equalizer-sink.c:74
 msgid ""
 "sink_name=<name of the sink> sink_properties=<properties for the sink> "
 "sink_master=<sink to connect to> format=<sample format> rate=<sample rate> "
@@ -987,11 +999,11 @@
 "rate=<采样率> channels=<声道数> channel_map=<声道映射> autoloaded=<若为自动加载则会设置> "
 "use_volume_sharing=<yes 或 no> "
 
-#: src/modules/module-filter-apply.c:47
+#: ../src/modules/module-filter-apply.c:48
 msgid "autoclean=<automatically unload unused filters?>"
 msgstr "autoclean=<是否自动卸载未使用的滤波器？>"
 
-#: src/modules/module-ladspa-sink.c:50
+#: ../src/modules/module-ladspa-sink.c:51
 msgid "Virtual LADSPA sink"
 msgstr "虚拟 LDASPA 信宿"
 
@@ -1007,47 +1019,49 @@
 "autoloaded=<set if this module is being loaded automatically> "
 msgstr ""
 
-#: src/modules/module-null-sink.c:46
+#: ../src/modules/module-null-sink.c:47
 msgid "Clocked NULL sink"
 msgstr "定时的空信宿"
 
-#: src/modules/module-null-sink.c:333
+#: ../src/modules/module-null-sink.c:284
 msgid "Null Output"
 msgstr "空输出"
 
-#: src/modules/module-rygel-media-server.c:506
-#: src/modules/module-rygel-media-server.c:544
-#: src/modules/module-rygel-media-server.c:903
+#: ../src/modules/module-rygel-media-server.c:508
+#: ../src/modules/module-rygel-media-server.c:546
+#: ../src/modules/module-rygel-media-server.c:905
 msgid "Output Devices"
 msgstr "输出设备"
 
-#: src/modules/module-rygel-media-server.c:507
-#: src/modules/module-rygel-media-server.c:545
-#: src/modules/module-rygel-media-server.c:904
+#: ../src/modules/module-rygel-media-server.c:509
+#: ../src/modules/module-rygel-media-server.c:547
+#: ../src/modules/module-rygel-media-server.c:906
 msgid "Input Devices"
 msgstr "输入设备"
 
-#: src/modules/module-rygel-media-server.c:1061
+#: ../src/modules/module-rygel-media-server.c:1063
 msgid "Audio on @HOSTNAME@"
 msgstr "@HOSTNAME@ 中的音频"
 
-#: src/modules/module-tunnel-sink-new.c:307
-#: src/modules/module-tunnel-source-new.c:305
+#. TODO: old tunnel put here the remote sink_name into stream name e.g. 'Null Output for lynxis@lazus'
+#. TODO: old tunnel put here the remote source_name into stream name e.g. 'Null Output for lynxis@lazus'
+#: ../src/modules/module-tunnel-sink-new.c:309
+#: ../src/modules/module-tunnel-source-new.c:307
 #, c-format
 msgid "Tunnel for %s@%s"
 msgstr "%s@%s 的通道"
 
-#: src/modules/module-tunnel-sink-new.c:544
-#: src/modules/module-tunnel-source-new.c:540
+#: ../src/modules/module-tunnel-sink-new.c:532
+#: ../src/modules/module-tunnel-source-new.c:528
 #, c-format
 msgid "Tunnel to %s/%s"
 msgstr "到远程信宿 %s/%s 的通道"
 
-#: src/modules/module-virtual-surround-sink.c:45
+#: ../src/modules/module-virtual-surround-sink.c:47
 msgid "Virtual surround sink"
 msgstr "虚拟环绕声信宿"
 
-#: src/modules/module-virtual-surround-sink.c:49
+#: ../src/modules/module-virtual-surround-sink.c:51
 msgid ""
 "sink_name=<name for the sink> sink_properties=<properties for the sink> "
 "master=<name of sink to filter> sink_master=<name of sink to filter> "
@@ -1057,281 +1071,282 @@
 "this module is being loaded automatically> "
 msgstr ""
 
-#: src/modules/reserve-wrap.c:149
+#: ../src/modules/reserve-wrap.c:149
 msgid "PulseAudio Sound Server"
 msgstr "PulseAudio 声音服务器"
 
-#: src/modules/alsa/alsa-mixer.c:4065 src/pulse/channelmap.c:103
-#: src/pulse/channelmap.c:771
+#: ../src/pulse/channelmap.c:103 ../src/pulse/channelmap.c:771
 msgid "Mono"
 msgstr "单声道"
 
-#: src/pulse/channelmap.c:105
+#: ../src/pulse/channelmap.c:105
 msgid "Front Center"
 msgstr "正前"
 
-#: src/pulse/channelmap.c:106
+#: ../src/pulse/channelmap.c:106
 msgid "Front Left"
 msgstr "左前"
 
-#: src/pulse/channelmap.c:107
+#: ../src/pulse/channelmap.c:107
 msgid "Front Right"
 msgstr "右前"
 
-#: src/pulse/channelmap.c:109
+#: ../src/pulse/channelmap.c:109
 msgid "Rear Center"
 msgstr "正后"
 
-#: src/pulse/channelmap.c:110
+#: ../src/pulse/channelmap.c:110
 msgid "Rear Left"
 msgstr "左后"
 
-#: src/pulse/channelmap.c:111
+#: ../src/pulse/channelmap.c:111
 msgid "Rear Right"
 msgstr "右后"
 
-#: src/pulse/channelmap.c:113
+#: ../src/pulse/channelmap.c:113
 msgid "Subwoofer"
 msgstr "低音音箱"
 
-#: src/pulse/channelmap.c:115
+#: ../src/pulse/channelmap.c:115
 msgid "Front Left-of-center"
 msgstr "前左中央"
 
-#: src/pulse/channelmap.c:116
+#: ../src/pulse/channelmap.c:116
 msgid "Front Right-of-center"
 msgstr "前右中央"
 
-#: src/pulse/channelmap.c:118
+#: ../src/pulse/channelmap.c:118
 msgid "Side Left"
 msgstr "左侧"
 
-#: src/pulse/channelmap.c:119
+#: ../src/pulse/channelmap.c:119
 msgid "Side Right"
 msgstr "右侧"
 
-#: src/pulse/channelmap.c:121
+#: ../src/pulse/channelmap.c:121
 msgid "Auxiliary 0"
 msgstr "辅助 0"
 
-#: src/pulse/channelmap.c:122
+#: ../src/pulse/channelmap.c:122
 msgid "Auxiliary 1"
 msgstr "辅助 1"
 
-#: src/pulse/channelmap.c:123
+#: ../src/pulse/channelmap.c:123
 msgid "Auxiliary 2"
 msgstr "辅助 2"
 
-#: src/pulse/channelmap.c:124
+#: ../src/pulse/channelmap.c:124
 msgid "Auxiliary 3"
 msgstr "辅助 3"
 
-#: src/pulse/channelmap.c:125
+#: ../src/pulse/channelmap.c:125
 msgid "Auxiliary 4"
 msgstr "辅助 4"
 
-#: src/pulse/channelmap.c:126
+#: ../src/pulse/channelmap.c:126
 msgid "Auxiliary 5"
 msgstr "辅助 5"
 
-#: src/pulse/channelmap.c:127
+#: ../src/pulse/channelmap.c:127
 msgid "Auxiliary 6"
 msgstr "辅助 6"
 
-#: src/pulse/channelmap.c:128
+#: ../src/pulse/channelmap.c:128
 msgid "Auxiliary 7"
 msgstr "辅助 7"
 
-#: src/pulse/channelmap.c:129
+#: ../src/pulse/channelmap.c:129
 msgid "Auxiliary 8"
 msgstr "辅助 7"
 
-#: src/pulse/channelmap.c:130
+#: ../src/pulse/channelmap.c:130
 msgid "Auxiliary 9"
 msgstr "辅助 9"
 
-#: src/pulse/channelmap.c:131
+#: ../src/pulse/channelmap.c:131
 msgid "Auxiliary 10"
 msgstr "辅助 10"
 
-#: src/pulse/channelmap.c:132
+#: ../src/pulse/channelmap.c:132
 msgid "Auxiliary 11"
 msgstr "辅助 11"
 
-#: src/pulse/channelmap.c:133
+#: ../src/pulse/channelmap.c:133
 msgid "Auxiliary 12"
 msgstr "辅助 12"
 
-#: src/pulse/channelmap.c:134
+#: ../src/pulse/channelmap.c:134
 msgid "Auxiliary 13"
 msgstr "辅助 13"
 
-#: src/pulse/channelmap.c:135
+#: ../src/pulse/channelmap.c:135
 msgid "Auxiliary 14"
 msgstr "辅助 14"
 
-#: src/pulse/channelmap.c:136
+#: ../src/pulse/channelmap.c:136
 msgid "Auxiliary 15"
 msgstr "辅助 15"
 
-#: src/pulse/channelmap.c:137
+#: ../src/pulse/channelmap.c:137
 msgid "Auxiliary 16"
 msgstr "辅助 16"
 
-#: src/pulse/channelmap.c:138
+#: ../src/pulse/channelmap.c:138
 msgid "Auxiliary 17"
 msgstr "辅助 17"
 
-#: src/pulse/channelmap.c:139
+#: ../src/pulse/channelmap.c:139
 msgid "Auxiliary 18"
 msgstr "辅助 18"
 
-#: src/pulse/channelmap.c:140
+#: ../src/pulse/channelmap.c:140
 msgid "Auxiliary 19"
 msgstr "辅助 19"
 
-#: src/pulse/channelmap.c:141
+#: ../src/pulse/channelmap.c:141
 msgid "Auxiliary 20"
 msgstr "辅助 20"
 
-#: src/pulse/channelmap.c:142
+#: ../src/pulse/channelmap.c:142
 msgid "Auxiliary 21"
 msgstr "辅助 21"
 
-#: src/pulse/channelmap.c:143
+#: ../src/pulse/channelmap.c:143
 msgid "Auxiliary 22"
 msgstr "辅助 22"
 
-#: src/pulse/channelmap.c:144
+#: ../src/pulse/channelmap.c:144
 msgid "Auxiliary 23"
 msgstr "辅助 23"
 
-#: src/pulse/channelmap.c:145
+#: ../src/pulse/channelmap.c:145
 msgid "Auxiliary 24"
 msgstr "辅助 24"
 
-#: src/pulse/channelmap.c:146
+#: ../src/pulse/channelmap.c:146
 msgid "Auxiliary 25"
 msgstr "辅助 25"
 
-#: src/pulse/channelmap.c:147
+#: ../src/pulse/channelmap.c:147
 msgid "Auxiliary 26"
 msgstr "辅助 26"
 
-#: src/pulse/channelmap.c:148
+#: ../src/pulse/channelmap.c:148
 msgid "Auxiliary 27"
 msgstr "辅助 27"
 
-#: src/pulse/channelmap.c:149
+#: ../src/pulse/channelmap.c:149
 msgid "Auxiliary 28"
 msgstr "辅助 28"
 
-#: src/pulse/channelmap.c:150
+#: ../src/pulse/channelmap.c:150
 msgid "Auxiliary 29"
 msgstr "辅助 29"
 
-#: src/pulse/channelmap.c:151
+#: ../src/pulse/channelmap.c:151
 msgid "Auxiliary 30"
 msgstr "辅助 30"
 
-#: src/pulse/channelmap.c:152
+#: ../src/pulse/channelmap.c:152
 msgid "Auxiliary 31"
 msgstr "辅助 31"
 
-#: src/pulse/channelmap.c:154
+#: ../src/pulse/channelmap.c:154
 msgid "Top Center"
 msgstr "上中"
 
-#: src/pulse/channelmap.c:156
+#: ../src/pulse/channelmap.c:156
 msgid "Top Front Center"
 msgstr "上中前"
 
-#: src/pulse/channelmap.c:157
+#: ../src/pulse/channelmap.c:157
 msgid "Top Front Left"
 msgstr "上左前"
 
-#: src/pulse/channelmap.c:158
+#: ../src/pulse/channelmap.c:158
 msgid "Top Front Right"
 msgstr "上右前"
 
-#: src/pulse/channelmap.c:160
+#: ../src/pulse/channelmap.c:160
 msgid "Top Rear Center"
 msgstr "上中后"
 
-#: src/pulse/channelmap.c:161
+#: ../src/pulse/channelmap.c:161
 msgid "Top Rear Left"
 msgstr "上左后"
 
-#: src/pulse/channelmap.c:162
+#: ../src/pulse/channelmap.c:162
 msgid "Top Rear Right"
 msgstr "上右后"
 
-#: src/pulse/channelmap.c:479 src/pulse/format.c:123 src/pulse/sample.c:177
-#: src/pulse/volume.c:306 src/pulse/volume.c:332 src/pulse/volume.c:352
-#: src/pulse/volume.c:384 src/pulse/volume.c:424 src/pulse/volume.c:443
+#: ../src/pulse/channelmap.c:479 ../src/pulse/format.c:121
+#: ../src/pulse/sample.c:177 ../src/pulse/volume.c:306
+#: ../src/pulse/volume.c:332 ../src/pulse/volume.c:352
+#: ../src/pulse/volume.c:384 ../src/pulse/volume.c:424
+#: ../src/pulse/volume.c:443
 msgid "(invalid)"
 msgstr "(无效)"
 
-#: src/pulse/channelmap.c:780
+#: ../src/pulse/channelmap.c:780
 msgid "Surround 4.0"
 msgstr "环绕 4.0"
 
-#: src/pulse/channelmap.c:786
+#: ../src/pulse/channelmap.c:786
 msgid "Surround 4.1"
 msgstr "环绕 4.1"
 
-#: src/pulse/channelmap.c:792
+#: ../src/pulse/channelmap.c:792
 msgid "Surround 5.0"
 msgstr "环绕 5.0"
 
-#: src/pulse/channelmap.c:798
+#: ../src/pulse/channelmap.c:798
 msgid "Surround 5.1"
 msgstr "环绕 5.1"
 
-#: src/pulse/channelmap.c:805
+#: ../src/pulse/channelmap.c:805
 msgid "Surround 7.1"
 msgstr "环绕 7.1"
 
-#: src/pulse/client-conf-x11.c:61 src/utils/pax11publish.c:97
+#: ../src/pulse/client-conf-x11.c:53 ../src/utils/pax11publish.c:97
 msgid "xcb_connect() failed"
 msgstr "xcb_connect() 失败"
 
-#: src/pulse/client-conf-x11.c:66 src/utils/pax11publish.c:102
+#: ../src/pulse/client-conf-x11.c:58 ../src/utils/pax11publish.c:102
 msgid "xcb_connection_has_error() returned true"
 msgstr "xcb_connection_has_error() 返回真"
 
-#: src/pulse/client-conf-x11.c:102
+#: ../src/pulse/client-conf-x11.c:94
 msgid "Failed to parse cookie data"
 msgstr "cookie 数据解析失败"
 
-#: src/pulse/context.c:705
+#: ../src/pulse/context.c:702
 #, c-format
 msgid "fork(): %s"
 msgstr "fork()：%s"
 
-#: src/pulse/context.c:760
+#: ../src/pulse/context.c:757
 #, c-format
 msgid "waitpid(): %s"
 msgstr "waitpid()：%s"
 
-#: src/pulse/context.c:1466
+#: ../src/pulse/context.c:1463
 #, c-format
 msgid "Received message for unknown extension '%s'"
 msgstr "收到未知扩展 %s 的信息"
 
-#: src/pulse/direction.c:37
+#: ../src/pulse/direction.c:37
 msgid "input"
 msgstr "输入"
 
-#: src/pulse/direction.c:39
+#: ../src/pulse/direction.c:39
 msgid "output"
 msgstr "输出"
 
-#: src/pulse/direction.c:41
+#: ../src/pulse/direction.c:41
 msgid "bidirectional"
 msgstr "双向"
 
-#: src/pulse/direction.c:43
+#: ../src/pulse/direction.c:43
 msgid "invalid"
 msgstr "无效"
 
@@ -1345,351 +1360,351 @@
 "XDG_RUNTIME_DIR (%s) 不属于本进程 (uid %d)，而属于 uid %d 号进程! (这可能是在原生协议下通过 root "
 "用户连接一个非 root 用户的 PulseAudio 导致的，请不要这样做。)"
 
-#: src/pulsecore/core-util.h:96
+#: ../src/pulsecore/core-util.h:97
 msgid "yes"
 msgstr "是"
 
-#: src/pulsecore/core-util.h:96
+#: ../src/pulsecore/core-util.h:97
 msgid "no"
 msgstr "否"
 
-#: src/pulsecore/lock-autospawn.c:141 src/pulsecore/lock-autospawn.c:227
+#: ../src/pulsecore/lock-autospawn.c:141 ../src/pulsecore/lock-autospawn.c:227
 msgid "Cannot access autospawn lock."
 msgstr "不能访问自动执行锁。"
 
-#: src/pulsecore/log.c:165
+#: ../src/pulsecore/log.c:165
 #, c-format
 msgid "Failed to open target file '%s'."
 msgstr "打开目标文件 %s 失败。"
 
-#: src/pulsecore/log.c:188
+#: ../src/pulsecore/log.c:188
 #, c-format
 msgid ""
 "Tried to open target file '%s', '%s.1', '%s.2' ... '%s.%d', but all failed."
 msgstr "尝试打开目标文件 '%s'，'%s.1'，'%s.2'…'%s.%d'，但均失败。"
 
-#: src/pulsecore/log.c:651
+#: ../src/pulsecore/log.c:651
 msgid "Invalid log target."
 msgstr "无效的日志目标。"
 
-#: src/pulsecore/sink.c:3516
+#: ../src/pulsecore/sink.c:3475
 msgid "Built-in Audio"
 msgstr "内置音频"
 
-#: src/pulsecore/sink.c:3521
+#: ../src/pulsecore/sink.c:3480
 msgid "Modem"
 msgstr "调制解调器"
 
-#: src/pulse/error.c:38
+#: ../src/pulse/error.c:38
 msgid "OK"
 msgstr "确定"
 
-#: src/pulse/error.c:39
+#: ../src/pulse/error.c:39
 msgid "Access denied"
 msgstr "拒绝访问"
 
-#: src/pulse/error.c:40
+#: ../src/pulse/error.c:40
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: src/pulse/error.c:41
+#: ../src/pulse/error.c:41
 msgid "Invalid argument"
 msgstr "无效参数"
 
-#: src/pulse/error.c:42
+#: ../src/pulse/error.c:42
 msgid "Entity exists"
 msgstr "实体存在"
 
-#: src/pulse/error.c:43
+#: ../src/pulse/error.c:43
 msgid "No such entity"
 msgstr "无此实体"
 
-#: src/pulse/error.c:44
+#: ../src/pulse/error.c:44
 msgid "Connection refused"
 msgstr "拒绝连接"
 
-#: src/pulse/error.c:45
+#: ../src/pulse/error.c:45
 msgid "Protocol error"
 msgstr "协议错误"
 
-#: src/pulse/error.c:46
+#: ../src/pulse/error.c:46
 msgid "Timeout"
 msgstr "超时"
 
-#: src/pulse/error.c:47
+#: ../src/pulse/error.c:47
 msgid "No authentication key"
 msgstr "没有授权密钥"
 
-#: src/pulse/error.c:48
+#: ../src/pulse/error.c:48
 msgid "Internal error"
 msgstr "内部错误"
 
-#: src/pulse/error.c:49
+#: ../src/pulse/error.c:49
 msgid "Connection terminated"
 msgstr "连接终止"
 
-#: src/pulse/error.c:50
+#: ../src/pulse/error.c:50
 msgid "Entity killed"
 msgstr "实体已被杀死"
 
-#: src/pulse/error.c:51
+#: ../src/pulse/error.c:51
 msgid "Invalid server"
 msgstr "无效服务器"
 
-#: src/pulse/error.c:52
+#: ../src/pulse/error.c:52
 msgid "Module initialization failed"
 msgstr "模块初始化失败"
 
-#: src/pulse/error.c:53
+#: ../src/pulse/error.c:53
 msgid "Bad state"
 msgstr "错误状态"
 
-#: src/pulse/error.c:54
+#: ../src/pulse/error.c:54
 msgid "No data"
 msgstr "无数据"
 
-#: src/pulse/error.c:55
+#: ../src/pulse/error.c:55
 msgid "Incompatible protocol version"
 msgstr "不兼容的协议版本"
 
-#: src/pulse/error.c:56
+#: ../src/pulse/error.c:56
 msgid "Too large"
 msgstr "太大"
 
-#: src/pulse/error.c:57
+#: ../src/pulse/error.c:57
 msgid "Not supported"
 msgstr "不支持"
 
-#: src/pulse/error.c:58
+#: ../src/pulse/error.c:58
 msgid "Unknown error code"
 msgstr "未知错误码"
 
-#: src/pulse/error.c:59
+#: ../src/pulse/error.c:59
 msgid "No such extension"
 msgstr "没有该扩展"
 
-#: src/pulse/error.c:60
+#: ../src/pulse/error.c:60
 msgid "Obsolete functionality"
 msgstr "废弃的功能"
 
-#: src/pulse/error.c:61
+#: ../src/pulse/error.c:61
 msgid "Missing implementation"
 msgstr "缺少实现"
 
-#: src/pulse/error.c:62
+#: ../src/pulse/error.c:62
 msgid "Client forked"
 msgstr "客户端分支"
 
-#: src/pulse/error.c:63
+#: ../src/pulse/error.c:63
 msgid "Input/Output error"
 msgstr "输入/输出错误"
 
-#: src/pulse/error.c:64
+#: ../src/pulse/error.c:64
 msgid "Device or resource busy"
 msgstr "设备或者资源忙"
 
-#: src/pulse/sample.c:179
+#: ../src/pulse/sample.c:179
 #, c-format
 msgid "%s %uch %uHz"
 msgstr "%s %uch %uHz"
 
-#: src/pulse/sample.c:191
+#: ../src/pulse/sample.c:191
 #, c-format
 msgid "%0.1f GiB"
 msgstr "%0.1f GiB"
 
-#: src/pulse/sample.c:193
+#: ../src/pulse/sample.c:193
 #, c-format
 msgid "%0.1f MiB"
 msgstr "%0.1f MiB"
 
-#: src/pulse/sample.c:195
+#: ../src/pulse/sample.c:195
 #, c-format
 msgid "%0.1f KiB"
 msgstr "%0.1f KiB"
 
-#: src/pulse/sample.c:197
+#: ../src/pulse/sample.c:197
 #, c-format
 msgid "%u B"
 msgstr "%u B"
 
-#: src/utils/pacat.c:134
+#: ../src/utils/pacat.c:134
 #, c-format
 msgid "Failed to drain stream: %s"
 msgstr "排空流失败：%s"
 
-#: src/utils/pacat.c:139
+#: ../src/utils/pacat.c:139
 msgid "Playback stream drained."
 msgstr "回放流枯竭。"
 
-#: src/utils/pacat.c:150
+#: ../src/utils/pacat.c:150
 msgid "Draining connection to server."
 msgstr "到服务器的 Draining 连接。"
 
-#: src/utils/pacat.c:163
+#: ../src/utils/pacat.c:163
 #, c-format
 msgid "pa_stream_drain(): %s"
 msgstr "pa_stream_drain(): %s"
 
-#: src/utils/pacat.c:194 src/utils/pacat.c:543
+#: ../src/utils/pacat.c:194 ../src/utils/pacat.c:543
 #, c-format
 msgid "pa_stream_begin_write() failed: %s"
 msgstr "pa_stream_begin_write() 失败：%s"
 
-#: src/utils/pacat.c:244 src/utils/pacat.c:274
+#: ../src/utils/pacat.c:244 ../src/utils/pacat.c:274
 #, c-format
 msgid "pa_stream_peek() failed: %s"
 msgstr "pa_stream_peek() 失败：%s"
 
-#: src/utils/pacat.c:324
+#: ../src/utils/pacat.c:324
 msgid "Stream successfully created."
 msgstr "成功创建流。"
 
-#: src/utils/pacat.c:327
+#: ../src/utils/pacat.c:327
 #, c-format
 msgid "pa_stream_get_buffer_attr() failed: %s"
 msgstr "pa_stream_get_buffer_attr() 失败：%s"
 
-#: src/utils/pacat.c:331
+#: ../src/utils/pacat.c:331
 #, c-format
 msgid "Buffer metrics: maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 msgstr "缓冲量度：maxlength=%u, tlength=%u, prebuf=%u, minreq=%u"
 
-#: src/utils/pacat.c:334
+#: ../src/utils/pacat.c:334
 #, c-format
 msgid "Buffer metrics: maxlength=%u, fragsize=%u"
 msgstr "缓冲量度：maxlength=%u, fragsize=%u"
 
-#: src/utils/pacat.c:338
+#: ../src/utils/pacat.c:338
 #, c-format
 msgid "Using sample spec '%s', channel map '%s'."
 msgstr "正在使用采样规格 %s，声道映射 %s。"
 
-#: src/utils/pacat.c:342
+#: ../src/utils/pacat.c:342
 #, c-format
 msgid "Connected to device %s (index: %u, suspended: %s)."
 msgstr "已连接至设备 %s (索引: %u，已挂起: %s）。"
 
-#: src/utils/pacat.c:352
+#: ../src/utils/pacat.c:352
 #, c-format
 msgid "Stream error: %s"
 msgstr "流错误：%s"
 
-#: src/utils/pacat.c:362
+#: ../src/utils/pacat.c:362
 #, c-format
 msgid "Stream device suspended.%s"
 msgstr "流设备挂起。%s"
 
-#: src/utils/pacat.c:364
+#: ../src/utils/pacat.c:364
 #, c-format
 msgid "Stream device resumed.%s"
 msgstr "流设备恢复。%s"
 
-#: src/utils/pacat.c:372
+#: ../src/utils/pacat.c:372
 #, c-format
 msgid "Stream underrun.%s"
 msgstr "流欠载运行。%s"
 
-#: src/utils/pacat.c:379
+#: ../src/utils/pacat.c:379
 #, c-format
 msgid "Stream overrun.%s"
 msgstr "流超限运行。%s"
 
-#: src/utils/pacat.c:386
+#: ../src/utils/pacat.c:386
 #, c-format
 msgid "Stream started.%s"
 msgstr "流已启动。%s"
 
-#: src/utils/pacat.c:393
+#: ../src/utils/pacat.c:393
 #, c-format
 msgid "Stream moved to device %s (%u, %ssuspended).%s"
 msgstr "流移至设备 %s (%u，%s 挂起)。%s"
 
-#: src/utils/pacat.c:393
+#: ../src/utils/pacat.c:393
 msgid "not "
 msgstr "非 "
 
-#: src/utils/pacat.c:400
+#: ../src/utils/pacat.c:400
 #, c-format
 msgid "Stream buffer attributes changed.%s"
 msgstr "更改流缓冲属性。%s"
 
-#: src/utils/pacat.c:415
+#: ../src/utils/pacat.c:415
 msgid "Cork request stack is empty: corking stream"
 msgstr "抑制请求列表为空：正在抑制音频流"
 
-#: src/utils/pacat.c:421
+#: ../src/utils/pacat.c:421
 msgid "Cork request stack is empty: uncorking stream"
 msgstr "抑制请求列表为空：正在反抑制音频流"
 
-#: src/utils/pacat.c:425
+#: ../src/utils/pacat.c:425
 msgid "Warning: Received more uncork requests than cork requests."
 msgstr "警告：收到比抑制请求更多的反抑制请求！"
 
-#: src/utils/pacat.c:450
+#: ../src/utils/pacat.c:450
 #, c-format
 msgid "Connection established.%s"
 msgstr "连接已建立。%s"
 
-#: src/utils/pacat.c:453
+#: ../src/utils/pacat.c:453
 #, c-format
 msgid "pa_stream_new() failed: %s"
 msgstr "pa_stream_new() 失败：%s"
 
-#: src/utils/pacat.c:491
+#: ../src/utils/pacat.c:491
 #, c-format
 msgid "pa_stream_connect_playback() failed: %s"
 msgstr "pa_stream_connect_playback() 失败：%s"
 
-#: src/utils/pacat.c:497
+#: ../src/utils/pacat.c:497
 #, c-format
 msgid "Failed to set monitor stream: %s"
 msgstr "设置监视器流失败: %s"
 
-#: src/utils/pacat.c:501
+#: ../src/utils/pacat.c:501
 #, c-format
 msgid "pa_stream_connect_record() failed: %s"
 msgstr "pa_stream_connect_record() 失败：%s"
 
-#: src/utils/pacat.c:514 src/utils/pactl.c:1454
+#: ../src/utils/pacat.c:514 ../src/utils/pactl.c:1446
 #, c-format
 msgid "Connection failure: %s"
 msgstr "连接失败：%s"
 
-#: src/utils/pacat.c:557
+#: ../src/utils/pacat.c:557
 msgid "Got EOF."
 msgstr "到达 EOF。"
 
-#: src/utils/pacat.c:581
+#: ../src/utils/pacat.c:581
 #, c-format
 msgid "pa_stream_write() failed: %s"
 msgstr "pa_stream_write() 失败：%s"
 
-#: src/utils/pacat.c:605
+#: ../src/utils/pacat.c:605
 #, c-format
 msgid "write() failed: %s"
 msgstr "write() 失败：%s"
 
-#: src/utils/pacat.c:626
+#: ../src/utils/pacat.c:626
 msgid "Got signal, exiting."
 msgstr "收到信号，退出。"
 
-#: src/utils/pacat.c:640
+#: ../src/utils/pacat.c:640
 #, c-format
 msgid "Failed to get latency: %s"
 msgstr "获取传输延迟失败：%s"
 
-#: src/utils/pacat.c:645
+#: ../src/utils/pacat.c:645
 #, c-format
 msgid "Time: %0.3f sec; Latency: %0.0f usec."
 msgstr "时间：%0.3f 秒；延迟：%0.0f 微秒。"
 
-#: src/utils/pacat.c:666
+#: ../src/utils/pacat.c:666
 #, c-format
 msgid "pa_stream_update_timing_info() failed: %s"
 msgstr "pa_stream_update_timing_info() 失败：%s"
 
-#: src/utils/pacat.c:676
+#: ../src/utils/pacat.c:676
 #, c-format
 msgid ""
 "%s [options]\n"
@@ -1785,28 +1800,28 @@
 "      --latency=BYTES               请求指定字节数的延迟。\n"
 "      --process-time=BYTES          每次请求指定字节数的处理时间。\n"
 
-#: src/utils/pacat.c:793
+#: ../src/utils/pacat.c:793
 msgid "Play back encoded audio files on a PulseAudio sound server."
 msgstr "在 PulseAudio 声音服务器播放编码的音频文件。"
 
-#: src/utils/pacat.c:797
+#: ../src/utils/pacat.c:797
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to a file."
 msgstr "从 PulseAudio 声音服务器捕捉音频数据并保存到文件。"
 
-#: src/utils/pacat.c:801
+#: ../src/utils/pacat.c:801
 msgid ""
 "Capture audio data from a PulseAudio sound server and write it to STDOUT or "
 "the specified file."
 msgstr "从 PulseAudio 声音服务器捕捉饮品数据并写入标准输出或特殊文件。"
 
-#: src/utils/pacat.c:805
+#: ../src/utils/pacat.c:805
 msgid ""
 "Play back audio data from STDIN or the specified file on a PulseAudio sound "
 "server."
 msgstr "在 PulseAudio 声音服务器从标准输入或特殊文件播放音频数据。"
 
-#: src/utils/pacat.c:819
+#: ../src/utils/pacat.c:819
 #, c-format
 msgid ""
 "pacat %s\n"
@@ -1817,226 +1832,226 @@
 "使用 libpulse %s 编译\n"
 "与 libpulse %s 链接\n"
 
-#: src/utils/pacat.c:852 src/utils/pactl.c:1656
+#: ../src/utils/pacat.c:852 ../src/utils/pactl.c:1648
 #, c-format
 msgid "Invalid client name '%s'"
 msgstr "无效的客户端名称 '%s'"
 
-#: src/utils/pacat.c:867
+#: ../src/utils/pacat.c:867
 #, c-format
 msgid "Invalid stream name '%s'"
 msgstr "无效的流名称 '%s'"
 
-#: src/utils/pacat.c:904
+#: ../src/utils/pacat.c:904
 #, c-format
 msgid "Invalid channel map '%s'"
 msgstr "无效的通道映射 '%s'"
 
-#: src/utils/pacat.c:933 src/utils/pacat.c:947
+#: ../src/utils/pacat.c:933 ../src/utils/pacat.c:947
 #, c-format
 msgid "Invalid latency specification '%s'"
 msgstr "无效的延迟规格 %s'"
 
-#: src/utils/pacat.c:940 src/utils/pacat.c:954
+#: ../src/utils/pacat.c:940 ../src/utils/pacat.c:954
 #, c-format
 msgid "Invalid process time specification '%s'"
 msgstr "无效的处理时间规格 '%s'"
 
-#: src/utils/pacat.c:966
+#: ../src/utils/pacat.c:966
 #, c-format
 msgid "Invalid property '%s'"
 msgstr "无效的属性 %s"
 
-#: src/utils/pacat.c:985
+#: ../src/utils/pacat.c:985
 #, c-format
 msgid "Unknown file format %s."
 msgstr "未知文件格式 %s。"
 
-#: src/utils/pacat.c:1000
+#: ../src/utils/pacat.c:1000
 msgid "Failed to parse the argument for --monitor-stream"
 msgstr "--monitor-stream 的参数解析失败"
 
-#: src/utils/pacat.c:1011
+#: ../src/utils/pacat.c:1011
 msgid "Invalid sample specification"
 msgstr "无效的采样规格"
 
-#: src/utils/pacat.c:1021
+#: ../src/utils/pacat.c:1021
 #, c-format
 msgid "open(): %s"
 msgstr "open()：%s"
 
-#: src/utils/pacat.c:1026
+#: ../src/utils/pacat.c:1026
 #, c-format
 msgid "dup2(): %s"
 msgstr "dup2()：%s"
 
-#: src/utils/pacat.c:1033
+#: ../src/utils/pacat.c:1033
 msgid "Too many arguments."
 msgstr "参数过多。"
 
-#: src/utils/pacat.c:1044
+#: ../src/utils/pacat.c:1044
 msgid "Failed to generate sample specification for file."
 msgstr "为文件生成采样规格失败。"
 
-#: src/utils/pacat.c:1070
+#: ../src/utils/pacat.c:1070
 msgid "Failed to open audio file."
 msgstr "打开声音文件失败。"
 
-#: src/utils/pacat.c:1076
+#: ../src/utils/pacat.c:1076
 msgid ""
 "Warning: specified sample specification will be overwritten with "
 "specification from file."
 msgstr "警告：指定的采样规格将覆盖文件中的说明。"
 
-#: src/utils/pacat.c:1079 src/utils/pactl.c:1720
+#: ../src/utils/pacat.c:1079 ../src/utils/pactl.c:1712
 msgid "Failed to determine sample specification from file."
 msgstr "从文件中确定采样规格失败。"
 
-#: src/utils/pacat.c:1088
+#: ../src/utils/pacat.c:1088
 msgid "Warning: Failed to determine channel map from file."
 msgstr "警告：从文件中确定通道映射失败。"
 
-#: src/utils/pacat.c:1099
+#: ../src/utils/pacat.c:1099
 msgid "Channel map doesn't match sample specification"
 msgstr "通道映射与采样规格不匹配"
 
-#: src/utils/pacat.c:1110
+#: ../src/utils/pacat.c:1110
 msgid "Warning: failed to write channel map to file."
 msgstr "警告：在文件中写入通道映射失败。"
 
-#: src/utils/pacat.c:1125
+#: ../src/utils/pacat.c:1125
 #, c-format
 msgid ""
 "Opening a %s stream with sample specification '%s' and channel map '%s'."
 msgstr "使用采样规格 %s 和通道映射 %s 打开 %s 流。"
 
-#: src/utils/pacat.c:1126
+#: ../src/utils/pacat.c:1126
 msgid "recording"
 msgstr "正在录制"
 
-#: src/utils/pacat.c:1126
+#: ../src/utils/pacat.c:1126
 msgid "playback"
 msgstr "回放"
 
-#: src/utils/pacat.c:1150
+#: ../src/utils/pacat.c:1150
 msgid "Failed to set media name."
 msgstr "设置媒体名失败。"
 
-#: src/utils/pacat.c:1160 src/utils/pactl.c:2070
+#: ../src/utils/pacat.c:1160 ../src/utils/pactl.c:2062
 msgid "pa_mainloop_new() failed."
 msgstr "pa_mainloop_new() 失败。"
 
-#: src/utils/pacat.c:1183
+#: ../src/utils/pacat.c:1183
 msgid "io_new() failed."
 msgstr "io_new() 失败。"
 
-#: src/utils/pacat.c:1190 src/utils/pactl.c:2082
+#: ../src/utils/pacat.c:1190 ../src/utils/pactl.c:2074
 msgid "pa_context_new() failed."
 msgstr "pa_context_new() 失败。"
 
-#: src/utils/pacat.c:1198 src/utils/pactl.c:2088
+#: ../src/utils/pacat.c:1198 ../src/utils/pactl.c:2080
 #, c-format
 msgid "pa_context_connect() failed: %s"
 msgstr "pa_context_connect() 失败：%s"
 
-#: src/utils/pacat.c:1204
+#: ../src/utils/pacat.c:1204
 msgid "pa_context_rttime_new() failed."
 msgstr "pa_context_rttime_new() 失败。"
 
-#: src/utils/pacat.c:1211 src/utils/pactl.c:2093
+#: ../src/utils/pacat.c:1211 ../src/utils/pactl.c:2085
 msgid "pa_mainloop_run() failed."
 msgstr "pa_mainloop_run() 失败。"
 
-#: src/utils/pacmd.c:51 src/utils/pactl.c:1578
+#: ../src/utils/pacmd.c:51 ../src/utils/pactl.c:1570
 msgid "NAME [ARGS ...]"
 msgstr "名称 [参数 ...]"
 
-#: src/utils/pacmd.c:52 src/utils/pacmd.c:60 src/utils/pactl.c:1579
+#: ../src/utils/pacmd.c:52 ../src/utils/pacmd.c:60 ../src/utils/pactl.c:1571
 msgid "NAME|#N"
 msgstr "名称|#N"
 
-#: src/utils/pacmd.c:53 src/utils/pacmd.c:63 src/utils/pactl.c:1577
-#: src/utils/pactl.c:1583
+#: ../src/utils/pacmd.c:53 ../src/utils/pacmd.c:63 ../src/utils/pactl.c:1569
+#: ../src/utils/pactl.c:1575
 msgid "NAME"
 msgstr "名称"
 
-#: src/utils/pacmd.c:54
+#: ../src/utils/pacmd.c:54
 msgid "NAME|#N VOLUME"
 msgstr "名称|#N 音量"
 
-#: src/utils/pacmd.c:55
+#: ../src/utils/pacmd.c:55
 msgid "#N VOLUME"
 msgstr "#N 音量"
 
-#: src/utils/pacmd.c:56 src/utils/pacmd.c:70 src/utils/pactl.c:1581
+#: ../src/utils/pacmd.c:56 ../src/utils/pacmd.c:70 ../src/utils/pactl.c:1573
 msgid "NAME|#N 1|0"
 msgstr "名称|#N 1|0"
 
-#: src/utils/pacmd.c:57
+#: ../src/utils/pacmd.c:57
 msgid "#N 1|0"
 msgstr "#N 1|0"
 
-#: src/utils/pacmd.c:58
+#: ../src/utils/pacmd.c:58
 msgid "NAME|#N KEY=VALUE"
 msgstr "名称|#N 键=值"
 
-#: src/utils/pacmd.c:59
+#: ../src/utils/pacmd.c:59
 msgid "#N KEY=VALUE"
 msgstr "#N 键=值"
 
-#: src/utils/pacmd.c:61
+#: ../src/utils/pacmd.c:61
 msgid "#N"
 msgstr "#N"
 
-#: src/utils/pacmd.c:62
+#: ../src/utils/pacmd.c:62
 msgid "NAME SINK|#N"
 msgstr "名称 信宿|#N"
 
-#: src/utils/pacmd.c:64 src/utils/pacmd.c:65
+#: ../src/utils/pacmd.c:64 ../src/utils/pacmd.c:65
 msgid "NAME FILENAME"
 msgstr "名称 文件名"
 
-#: src/utils/pacmd.c:66
+#: ../src/utils/pacmd.c:66
 msgid "PATHNAME"
 msgstr "路径名"
 
-#: src/utils/pacmd.c:67
+#: ../src/utils/pacmd.c:67
 msgid "FILENAME SINK|#N"
 msgstr "文件名 信宿|#N"
 
-#: src/utils/pacmd.c:69 src/utils/pactl.c:1580
+#: ../src/utils/pacmd.c:69 ../src/utils/pactl.c:1572
 msgid "#N SINK|SOURCE"
 msgstr "#N 信宿|信号源"
 
-#: src/utils/pacmd.c:71 src/utils/pacmd.c:77 src/utils/pacmd.c:78
+#: ../src/utils/pacmd.c:71 ../src/utils/pacmd.c:77 ../src/utils/pacmd.c:78
 msgid "1|0"
 msgstr "1|0"
 
-#: src/utils/pacmd.c:72 src/utils/pactl.c:1582
+#: ../src/utils/pacmd.c:72 ../src/utils/pactl.c:1574
 msgid "CARD PROFILE"
 msgstr "声卡配置文件"
 
-#: src/utils/pacmd.c:73 src/utils/pactl.c:1584
+#: ../src/utils/pacmd.c:73 ../src/utils/pactl.c:1576
 msgid "NAME|#N PORT"
 msgstr "名称|#N 端口"
 
-#: src/utils/pacmd.c:74 src/utils/pactl.c:1590
+#: ../src/utils/pacmd.c:74 ../src/utils/pactl.c:1582
 msgid "CARD-NAME|CARD-#N PORT OFFSET"
 msgstr "声卡名|卡号-#N 端口 偏移量"
 
-#: src/utils/pacmd.c:75
+#: ../src/utils/pacmd.c:75
 msgid "TARGET"
 msgstr "目标"
 
-#: src/utils/pacmd.c:76
+#: ../src/utils/pacmd.c:76
 msgid "NUMERIC-LEVEL"
 msgstr "级别 (数字)"
 
-#: src/utils/pacmd.c:79
+#: ../src/utils/pacmd.c:79
 msgid "FRAMES"
 msgstr "FRAMES"
 
-#: src/utils/pacmd.c:81
+#: ../src/utils/pacmd.c:81
 #, c-format
 msgid ""
 "\n"
@@ -2049,7 +2064,7 @@
 "     --version                     显示版本\n"
 "不给定命令的话 pacmd 会启动入交互模式。\n"
 
-#: src/utils/pacmd.c:128
+#: ../src/utils/pacmd.c:128
 #, c-format
 msgid ""
 "pacmd %s\n"
@@ -2060,44 +2075,44 @@
 "使用 libpulse %s 编译\n"
 "与 libpulse %s 链接\n"
 
-#: src/utils/pacmd.c:142
+#: ../src/utils/pacmd.c:142
 msgid "No PulseAudio daemon running, or not running as session daemon."
 msgstr "没有 PulseAudio 守护进程在运行，或者没有作为会话守护进程运行。"
 
-#: src/utils/pacmd.c:147
+#: ../src/utils/pacmd.c:147
 #, c-format
 msgid "socket(PF_UNIX, SOCK_STREAM, 0): %s"
 msgstr "socket(PF_UNIX, SOCK_STREAM, 0)：%s"
 
-#: src/utils/pacmd.c:164
+#: ../src/utils/pacmd.c:164
 #, c-format
 msgid "connect(): %s"
 msgstr "connect()：%s"
 
-#: src/utils/pacmd.c:172
+#: ../src/utils/pacmd.c:172
 msgid "Failed to kill PulseAudio daemon."
 msgstr "杀死 PulseAudio 守护程序失败。"
 
-#: src/utils/pacmd.c:180
+#: ../src/utils/pacmd.c:180
 msgid "Daemon not responding."
 msgstr "守护进程未响应"
 
-#: src/utils/pacmd.c:212 src/utils/pacmd.c:321 src/utils/pacmd.c:339
+#: ../src/utils/pacmd.c:212 ../src/utils/pacmd.c:321 ../src/utils/pacmd.c:339
 #, c-format
 msgid "write(): %s"
 msgstr "write()：%s"
 
-#: src/utils/pacmd.c:268
+#: ../src/utils/pacmd.c:268
 #, c-format
 msgid "poll(): %s"
 msgstr "poll()：%s"
 
-#: src/utils/pacmd.c:279 src/utils/pacmd.c:299
+#: ../src/utils/pacmd.c:279 ../src/utils/pacmd.c:299
 #, c-format
 msgid "read(): %s"
 msgstr "read()：%s"
 
-#: src/utils/pactl.c:164
+#: ../src/utils/pactl.c:164
 #, c-format
 msgid "Failed to get statistics: %s"
 msgstr "获取统计数据失败：%s"
@@ -2113,17 +2128,17 @@
 "Allocated during whole lifetime: %u blocks containing %s bytes total.\n"
 msgstr "整个生命周期所得分配：%u 块，总共 %s 字节。\n"
 
-#: src/utils/pactl.c:182
+#: ../src/utils/pactl.c:176
 #, c-format
 msgid "Sample cache size: %s\n"
 msgstr "采样缓存大小：%s\n"
 
-#: src/utils/pactl.c:191
+#: ../src/utils/pactl.c:185
 #, c-format
 msgid "Failed to get server information: %s"
 msgstr "获取服务器信息失败：%s"
 
-#: src/utils/pactl.c:196
+#: ../src/utils/pactl.c:190
 #, c-format
 msgid ""
 "Server String: %s\n"
@@ -2140,7 +2155,7 @@
 "客户端索引：%u\n"
 "区块大小: %zu\n"
 
-#: src/utils/pactl.c:212
+#: ../src/utils/pactl.c:206
 #, c-format
 msgid ""
 "User Name: %s\n"
@@ -2163,12 +2178,12 @@
 "默认信源： %s\n"
 "Cookie：%04x:%04x\n"
 
-#: src/utils/pactl.c:261 src/utils/pactl.c:908 src/utils/pactl.c:986
+#: ../src/utils/pactl.c:255 ../src/utils/pactl.c:900 ../src/utils/pactl.c:978
 #, c-format
 msgid "Failed to get sink information: %s"
 msgstr "获取音频出口信息失败：%s"
 
-#: src/utils/pactl.c:287
+#: ../src/utils/pactl.c:281
 #, c-format
 msgid ""
 "Sink #%u\n"
@@ -2207,27 +2222,27 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:331 src/utils/pactl.c:437 src/utils/pactl.c:598
+#: ../src/utils/pactl.c:325 ../src/utils/pactl.c:431 ../src/utils/pactl.c:592
 #, c-format
 msgid "\tPorts:\n"
 msgstr "\t端口：\n"
 
-#: src/utils/pactl.c:338 src/utils/pactl.c:444
+#: ../src/utils/pactl.c:332 ../src/utils/pactl.c:438
 #, c-format
 msgid "\tActive Port: %s\n"
 msgstr "\t活动端口：%s\n"
 
-#: src/utils/pactl.c:344 src/utils/pactl.c:450
+#: ../src/utils/pactl.c:338 ../src/utils/pactl.c:444
 #, c-format
 msgid "\tFormats:\n"
 msgstr "\t格式：\n"
 
-#: src/utils/pactl.c:368 src/utils/pactl.c:928 src/utils/pactl.c:1001
+#: ../src/utils/pactl.c:362 ../src/utils/pactl.c:920 ../src/utils/pactl.c:993
 #, c-format
 msgid "Failed to get source information: %s"
 msgstr "获取音频入口信息失败：%s"
 
-#: src/utils/pactl.c:394
+#: ../src/utils/pactl.c:388
 #, c-format
 msgid ""
 "Source #%u\n"
@@ -2266,20 +2281,20 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:422 src/utils/pactl.c:492 src/utils/pactl.c:535
-#: src/utils/pactl.c:577 src/utils/pactl.c:675 src/utils/pactl.c:676
-#: src/utils/pactl.c:687 src/utils/pactl.c:745 src/utils/pactl.c:746
-#: src/utils/pactl.c:757 src/utils/pactl.c:808 src/utils/pactl.c:809
-#: src/utils/pactl.c:815
+#: ../src/utils/pactl.c:416 ../src/utils/pactl.c:486 ../src/utils/pactl.c:529
+#: ../src/utils/pactl.c:571 ../src/utils/pactl.c:669 ../src/utils/pactl.c:670
+#: ../src/utils/pactl.c:681 ../src/utils/pactl.c:739 ../src/utils/pactl.c:740
+#: ../src/utils/pactl.c:751 ../src/utils/pactl.c:802 ../src/utils/pactl.c:803
+#: ../src/utils/pactl.c:809
 msgid "n/a"
 msgstr "n/a"
 
-#: src/utils/pactl.c:461 src/utils/pactl.c:865
+#: ../src/utils/pactl.c:455 ../src/utils/pactl.c:859
 #, c-format
 msgid "Failed to get module information: %s"
 msgstr "获取模块信息失败：%s"
 
-#: src/utils/pactl.c:484
+#: ../src/utils/pactl.c:478
 #, c-format
 msgid ""
 "Module #%u\n"
@@ -2296,12 +2311,12 @@
 "\t属性\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:503
+#: ../src/utils/pactl.c:497
 #, c-format
 msgid "Failed to get client information: %s"
 msgstr "获取客户端信息失败：%s"
 
-#: src/utils/pactl.c:529
+#: ../src/utils/pactl.c:523
 #, c-format
 msgid ""
 "Client #%u\n"
@@ -2316,12 +2331,12 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:546
+#: ../src/utils/pactl.c:540
 #, c-format
 msgid "Failed to get card information: %s"
 msgstr "获取声卡信息失败：%s"
 
-#: src/utils/pactl.c:569
+#: ../src/utils/pactl.c:563
 #, c-format
 msgid ""
 "Card #%u\n"
@@ -2338,22 +2353,22 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:585
+#: ../src/utils/pactl.c:579
 #, c-format
 msgid "\tProfiles:\n"
 msgstr "\t配置文件：\n"
 
-#: src/utils/pactl.c:587
+#: ../src/utils/pactl.c:581
 #, c-format
 msgid "\t\t%s: %s (sinks: %u, sources: %u, priority: %u, available: %s)\n"
 msgstr "\t\t%s: %s (信宿：%u，信源：%u，优先级：%u，可用性：%s)\n"
 
-#: src/utils/pactl.c:592
+#: ../src/utils/pactl.c:586
 #, c-format
 msgid "\tActive Profile: %s\n"
 msgstr "\t活动配置：%s\n"
 
-#: src/utils/pactl.c:606
+#: ../src/utils/pactl.c:600
 #, c-format
 msgid ""
 "\t\t\tProperties:\n"
@@ -2362,17 +2377,17 @@
 "\t\t\t属性：\n"
 "\t\t\t\t%s\n"
 
-#: src/utils/pactl.c:611
+#: ../src/utils/pactl.c:605
 #, c-format
 msgid "\t\t\tPart of profile(s): %s"
 msgstr "\t\t\t属于配置文件：%s"
 
-#: src/utils/pactl.c:628 src/utils/pactl.c:948 src/utils/pactl.c:1016
+#: ../src/utils/pactl.c:622 ../src/utils/pactl.c:940 ../src/utils/pactl.c:1008
 #, c-format
 msgid "Failed to get sink input information: %s"
 msgstr "获取音频信宿输入信息失败：%s"
 
-#: src/utils/pactl.c:657
+#: ../src/utils/pactl.c:651
 #, c-format
 msgid ""
 "Sink Input #%u\n"
@@ -2411,12 +2426,12 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:698 src/utils/pactl.c:968 src/utils/pactl.c:1031
+#: ../src/utils/pactl.c:692 ../src/utils/pactl.c:960 ../src/utils/pactl.c:1023
 #, c-format
 msgid "Failed to get source output information: %s"
 msgstr "获取音频信源输出信息失败：%s"
 
-#: src/utils/pactl.c:727
+#: ../src/utils/pactl.c:721
 #, c-format
 msgid ""
 "Source Output #%u\n"
@@ -2455,12 +2470,12 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:768
+#: ../src/utils/pactl.c:762
 #, c-format
 msgid "Failed to get sample information: %s"
 msgstr "获取采样信息失败：%s"
 
-#: src/utils/pactl.c:795
+#: ../src/utils/pactl.c:789
 #, c-format
 msgid ""
 "Sample #%u\n"
@@ -2489,12 +2504,12 @@
 "\t属性：\n"
 "\t\t%s\n"
 
-#: src/utils/pactl.c:823 src/utils/pactl.c:833
+#: ../src/utils/pactl.c:817 ../src/utils/pactl.c:827
 #, c-format
 msgid "Failure: %s"
 msgstr "失败：%s"
 
-#: src/utils/pactl.c:872
+#: ../src/utils/pactl.c:866
 #, c-format
 msgid "Failed to unload module: Module %s not loaded"
 msgstr "未能卸载模块：模块 %s 未加载"
@@ -2506,140 +2521,144 @@
 "channel/s supported = %d\n"
 msgstr "设置音量失败：您尝试设置 %d 个声道的音量，而支持的声道数为 %d。\n"
 
-#: src/modules/module-null-sink.c:345 src/utils/pactl.c:1058
+#: ../src/utils/pactl.c:1050
 #, c-format
 msgid "Failed to set format: invalid format string %s"
 msgstr "未能设置格式：无效的格式字串 %s"
 
-#: src/utils/pactl.c:1101
+#: ../src/utils/pactl.c:1093
 #, c-format
 msgid "Failed to upload sample: %s"
 msgstr "上传采样失败：%s"
 
-#: src/utils/pactl.c:1118
+#: ../src/utils/pactl.c:1110
 msgid "Premature end of file"
 msgstr "文件过早结束"
 
-#: src/utils/pactl.c:1138
+#: ../src/utils/pactl.c:1130
 msgid "new"
 msgstr "新"
 
-#: src/utils/pactl.c:1141
+#: ../src/utils/pactl.c:1133
 msgid "change"
 msgstr "变更"
 
-#: src/utils/pactl.c:1144
+#: ../src/utils/pactl.c:1136
 msgid "remove"
 msgstr "移除"
 
-#: src/utils/pactl.c:1147 src/utils/pactl.c:1182
+#: ../src/utils/pactl.c:1139 ../src/utils/pactl.c:1174
 msgid "unknown"
 msgstr "未知"
 
-#: src/utils/pactl.c:1155
+#: ../src/utils/pactl.c:1147
 msgid "sink"
 msgstr "信宿"
 
-#: src/utils/pactl.c:1158
+#: ../src/utils/pactl.c:1150
 msgid "source"
 msgstr "信源"
 
-#: src/utils/pactl.c:1161
+#: ../src/utils/pactl.c:1153
 msgid "sink-input"
 msgstr "信宿-输入"
 
-#: src/utils/pactl.c:1164
+#: ../src/utils/pactl.c:1156
 msgid "source-output"
 msgstr "信源-输出"
 
-#: src/utils/pactl.c:1167
+#: ../src/utils/pactl.c:1159
 msgid "module"
 msgstr "模块"
 
-#: src/utils/pactl.c:1170
+#: ../src/utils/pactl.c:1162
 msgid "client"
 msgstr "客户端"
 
-#: src/utils/pactl.c:1173
+#: ../src/utils/pactl.c:1165
 msgid "sample-cache"
 msgstr "采样-缓冲"
 
-#: src/utils/pactl.c:1176
+#: ../src/utils/pactl.c:1168
 msgid "server"
 msgstr "服务器"
 
-#: src/utils/pactl.c:1179
+#: ../src/utils/pactl.c:1171
 msgid "card"
 msgstr "声卡"
 
-#: src/utils/pactl.c:1188
+#: ../src/utils/pactl.c:1180
 #, c-format
 msgid "Event '%s' on %s #%u\n"
 msgstr "事件“%s”于 %s #%u\n"
 
-#: src/utils/pactl.c:1460
+#: ../src/utils/pactl.c:1452
 msgid "Got SIGINT, exiting."
 msgstr "收到 SIGINT 信号，退出。"
 
-#: src/utils/pactl.c:1493
+#: ../src/utils/pactl.c:1485
 msgid "Invalid volume specification"
 msgstr "无效采样规格"
 
-#: src/utils/pactl.c:1516
+#: ../src/utils/pactl.c:1508
 msgid "Volume outside permissible range.\n"
 msgstr "音量超出允许范围。\n"
 
-#: src/utils/pactl.c:1529
+#: ../src/utils/pactl.c:1521
 msgid "Invalid number of volume specifications.\n"
 msgstr "无效音量规格数。\n"
 
-#: src/utils/pactl.c:1541
+#: ../src/utils/pactl.c:1533
 msgid "Inconsistent volume specification.\n"
 msgstr "无效音量规格。\n"
 
-#: src/utils/pactl.c:1571 src/utils/pactl.c:1572 src/utils/pactl.c:1573
-#: src/utils/pactl.c:1574 src/utils/pactl.c:1575 src/utils/pactl.c:1576
-#: src/utils/pactl.c:1577 src/utils/pactl.c:1578 src/utils/pactl.c:1579
-#: src/utils/pactl.c:1580 src/utils/pactl.c:1581 src/utils/pactl.c:1582
-#: src/utils/pactl.c:1583 src/utils/pactl.c:1584 src/utils/pactl.c:1585
-#: src/utils/pactl.c:1586 src/utils/pactl.c:1587 src/utils/pactl.c:1588
-#: src/utils/pactl.c:1589 src/utils/pactl.c:1590 src/utils/pactl.c:1591
+#: ../src/utils/pactl.c:1563 ../src/utils/pactl.c:1564
+#: ../src/utils/pactl.c:1565 ../src/utils/pactl.c:1566
+#: ../src/utils/pactl.c:1567 ../src/utils/pactl.c:1568
+#: ../src/utils/pactl.c:1569 ../src/utils/pactl.c:1570
+#: ../src/utils/pactl.c:1571 ../src/utils/pactl.c:1572
+#: ../src/utils/pactl.c:1573 ../src/utils/pactl.c:1574
+#: ../src/utils/pactl.c:1575 ../src/utils/pactl.c:1576
+#: ../src/utils/pactl.c:1577 ../src/utils/pactl.c:1578
+#: ../src/utils/pactl.c:1579 ../src/utils/pactl.c:1580
+#: ../src/utils/pactl.c:1581 ../src/utils/pactl.c:1582
+#: ../src/utils/pactl.c:1583
 msgid "[options]"
 msgstr "[选项]"
 
-#: src/utils/pactl.c:1573
+#: ../src/utils/pactl.c:1565
 msgid "[TYPE]"
 msgstr "[类型]"
 
-#: src/utils/pactl.c:1575
+#: ../src/utils/pactl.c:1567
 msgid "FILENAME [NAME]"
 msgstr "文件名 [名称]"
 
-#: src/utils/pactl.c:1576
+#: ../src/utils/pactl.c:1568
 msgid "NAME [SINK]"
 msgstr "名称 [信宿]"
 
-#: src/utils/pactl.c:1585
+#: ../src/utils/pactl.c:1577
 msgid "NAME|#N VOLUME [VOLUME ...]"
 msgstr "名称|#N 音量 [音量 ...]"
 
-#: src/utils/pactl.c:1586
+#: ../src/utils/pactl.c:1578
 msgid "#N VOLUME [VOLUME ...]"
 msgstr "#N 音量 [音量 ...]"
 
-#: src/utils/pactl.c:1587
+#: ../src/utils/pactl.c:1579
 msgid "NAME|#N 1|0|toggle"
 msgstr "名称|#N 1|0|toggle"
 
-#: src/utils/pactl.c:1588
+#: ../src/utils/pactl.c:1580
 msgid "#N 1|0|toggle"
 msgstr "#N 1|0|toggle"
 
-#: src/utils/pactl.c:1589
+#: ../src/utils/pactl.c:1581
 msgid "#N FORMATS"
 msgstr "#N 格式列表"
 
-#: src/utils/pactl.c:1592
+#: ../src/utils/pactl.c:1584
 #, c-format
 msgid ""
 "\n"
@@ -2650,7 +2669,7 @@
 "指定名称 @DEFAULT_SINK@，@DEFAULT_SOURCE@ 和 @DEFAULT_MONITOR@\n"
 "可用于指定默认的信宿、信源和监视器。\n"
 
-#: src/utils/pactl.c:1595
+#: ../src/utils/pactl.c:1587
 #, c-format
 msgid ""
 "\n"
@@ -2668,7 +2687,7 @@
 "  -s, --server=服务器                   要连接的服务器名\n"
 "  -n, --client-name=名称                向服务器提供的客户端自称\n"
 
-#: src/utils/pactl.c:1636
+#: ../src/utils/pactl.c:1628
 #, c-format
 msgid ""
 "pactl %s\n"
@@ -2679,195 +2698,195 @@
 "使用 libpulse %s 编译\n"
 "与 libpules %s 链接\n"
 
-#: src/utils/pactl.c:1692
+#: ../src/utils/pactl.c:1684
 #, c-format
 msgid "Specify nothing, or one of: %s"
 msgstr "不指定，或指定成下列之一：%s"
 
-#: src/utils/pactl.c:1702
+#: ../src/utils/pactl.c:1694
 msgid "Please specify a sample file to load"
 msgstr "请指定要加载的采样文件"
 
-#: src/utils/pactl.c:1715
+#: ../src/utils/pactl.c:1707
 msgid "Failed to open sound file."
 msgstr "打开声音文件失败。"
 
-#: src/utils/pactl.c:1727
+#: ../src/utils/pactl.c:1719
 msgid "Warning: Failed to determine sample specification from file."
 msgstr "警告：从文件中确定采样规格失败。"
 
-#: src/utils/pactl.c:1737
+#: ../src/utils/pactl.c:1729
 msgid "You have to specify a sample name to play"
 msgstr "您必须指定要播放的采样名"
 
-#: src/utils/pactl.c:1749
+#: ../src/utils/pactl.c:1741
 msgid "You have to specify a sample name to remove"
 msgstr "您必须指定要删除的采样名"
 
-#: src/utils/pactl.c:1758
+#: ../src/utils/pactl.c:1750
 msgid "You have to specify a sink input index and a sink"
 msgstr "您必须指定信宿输入索引和信宿"
 
-#: src/utils/pactl.c:1768
+#: ../src/utils/pactl.c:1760
 msgid "You have to specify a source output index and a source"
 msgstr "您必须指定信源输出索引和信源"
 
-#: src/utils/pactl.c:1783
+#: ../src/utils/pactl.c:1775
 msgid "You have to specify a module name and arguments."
 msgstr "必须指定模块名和参数。"
 
-#: src/utils/pactl.c:1803
+#: ../src/utils/pactl.c:1795
 msgid "You have to specify a module index or name"
 msgstr "必须指定模块索引或名称"
 
-#: src/utils/pactl.c:1816
+#: ../src/utils/pactl.c:1808
 msgid ""
 "You may not specify more than one sink. You have to specify a boolean value."
 msgstr "不可指定多个信宿。必须指定一个布尔值。"
 
-#: src/utils/pactl.c:1821 src/utils/pactl.c:1841
+#: ../src/utils/pactl.c:1813 ../src/utils/pactl.c:1833
 msgid "Invalid suspend specification."
 msgstr "无效挂起规范。"
 
-#: src/utils/pactl.c:1836
+#: ../src/utils/pactl.c:1828
 msgid ""
 "You may not specify more than one source. You have to specify a boolean "
 "value."
 msgstr "不可指定多个信源。必须指定一个布尔值。"
 
-#: src/utils/pactl.c:1853
+#: ../src/utils/pactl.c:1845
 msgid "You have to specify a card name/index and a profile name"
 msgstr "您必须指定声卡名称/索引和侧写名称"
 
-#: src/utils/pactl.c:1864
+#: ../src/utils/pactl.c:1856
 msgid "You have to specify a sink name/index and a port name"
 msgstr "您必须指定信宿名称/索引和端口名称"
 
-#: src/utils/pactl.c:1875
+#: ../src/utils/pactl.c:1867
 msgid "You have to specify a sink name"
 msgstr "必须指定接收器名"
 
-#: src/utils/pactl.c:1885
+#: ../src/utils/pactl.c:1877
 msgid "You have to specify a source name/index and a port name"
 msgstr "您必须指定信源名称/索引和端口名称"
 
-#: src/utils/pactl.c:1896
+#: ../src/utils/pactl.c:1888
 msgid "You have to specify a source name"
 msgstr "必须指定信号源索引"
 
-#: src/utils/pactl.c:1906
+#: ../src/utils/pactl.c:1898
 msgid "You have to specify a sink name/index and a volume"
 msgstr "您必须指定信宿名称/索引和音量"
 
-#: src/utils/pactl.c:1919
+#: ../src/utils/pactl.c:1911
 msgid "You have to specify a source name/index and a volume"
 msgstr "您必须指定源名称/索引和音量"
 
-#: src/utils/pactl.c:1932
+#: ../src/utils/pactl.c:1924
 msgid "You have to specify a sink input index and a volume"
 msgstr "您必须指定信宿输入索引和音量"
 
-#: src/utils/pactl.c:1937
+#: ../src/utils/pactl.c:1929
 msgid "Invalid sink input index"
 msgstr "无效信宿输入索引"
 
-#: src/utils/pactl.c:1948
+#: ../src/utils/pactl.c:1940
 msgid "You have to specify a source output index and a volume"
 msgstr "您必须指定信源输出索引 (index) 和音量"
 
-#: src/utils/pactl.c:1953
+#: ../src/utils/pactl.c:1945
 msgid "Invalid source output index"
 msgstr "无效信源输出索引"
 
-#: src/utils/pactl.c:1964
+#: ../src/utils/pactl.c:1956
 msgid ""
 "You have to specify a sink name/index and a mute action (0, 1, or 'toggle')"
 msgstr "您必须指定信宿名称/索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
-#: src/utils/pactl.c:1969 src/utils/pactl.c:1984 src/utils/pactl.c:2004
-#: src/utils/pactl.c:2022
+#: ../src/utils/pactl.c:1961 ../src/utils/pactl.c:1976
+#: ../src/utils/pactl.c:1996 ../src/utils/pactl.c:2014
 msgid "Invalid mute specification"
 msgstr "无效静音说明"
 
-#: src/utils/pactl.c:1979
+#: ../src/utils/pactl.c:1971
 msgid ""
 "You have to specify a source name/index and a mute action (0, 1, or 'toggle')"
 msgstr "您必须指定信源名称/索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
-#: src/utils/pactl.c:1994
+#: ../src/utils/pactl.c:1986
 msgid ""
 "You have to specify a sink input index and a mute action (0, 1, or 'toggle')"
 msgstr "您必须指定信宿输入索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
-#: src/utils/pactl.c:1999
+#: ../src/utils/pactl.c:1991
 msgid "Invalid sink input index specification"
 msgstr "无效信宿输入索引规格"
 
-#: src/utils/pactl.c:2012
+#: ../src/utils/pactl.c:2004
 msgid ""
 "You have to specify a source output index and a mute action (0, 1, or "
 "'toggle')"
 msgstr "您必须指定信源输出索引和静音动作 (0, 1, 或 'toggle' 切换)"
 
-#: src/utils/pactl.c:2017
+#: ../src/utils/pactl.c:2009
 msgid "Invalid source output index specification"
 msgstr "无效信源输出索引说明"
 
-#: src/utils/pactl.c:2034
+#: ../src/utils/pactl.c:2026
 msgid ""
 "You have to specify a sink index and a semicolon-separated list of supported "
 "formats"
 msgstr "您必须指定信宿名称及以英文分号分隔的其所支持格式的列表"
 
-#: src/utils/pactl.c:2046
+#: ../src/utils/pactl.c:2038
 msgid ""
 "You have to specify a card name/index, a port name and a latency offset"
 msgstr "您必须指定声卡名称/索引、端口名称和延迟偏移"
 
-#: src/utils/pactl.c:2053
+#: ../src/utils/pactl.c:2045
 msgid "Could not parse latency offset"
 msgstr "无法解析延迟偏移"
 
-#: src/utils/pactl.c:2065
+#: ../src/utils/pactl.c:2057
 msgid "No valid command specified."
 msgstr "未指定有效的命令。"
 
-#: src/utils/pasuspender.c:79
+#: ../src/utils/pasuspender.c:79
 #, c-format
 msgid "fork(): %s\n"
 msgstr "fork()：%s\n"
 
-#: src/utils/pasuspender.c:92
+#: ../src/utils/pasuspender.c:92
 #, c-format
 msgid "execvp(): %s\n"
 msgstr "execvp()：%s\n"
 
-#: src/utils/pasuspender.c:111
+#: ../src/utils/pasuspender.c:111
 #, c-format
 msgid "Failure to resume: %s\n"
 msgstr "恢复失败：%s\n"
 
-#: src/utils/pasuspender.c:145
+#: ../src/utils/pasuspender.c:145
 #, c-format
 msgid "Failure to suspend: %s\n"
 msgstr "挂起失败：%s\n"
 
-#: src/utils/pasuspender.c:170
+#: ../src/utils/pasuspender.c:170
 #, c-format
 msgid "WARNING: Sound server is not local, not suspending.\n"
 msgstr "警告：非本地声音服务器，不会挂起。\n"
 
-#: src/utils/pasuspender.c:183
+#: ../src/utils/pasuspender.c:183
 #, c-format
 msgid "Connection failure: %s\n"
 msgstr "连接失败：%s\n"
 
-#: src/utils/pasuspender.c:201
+#: ../src/utils/pasuspender.c:201
 #, c-format
 msgid "Got SIGINT, exiting.\n"
 msgstr "收到 SIGINT 信号，退出。\n"
 
-#: src/utils/pasuspender.c:219
+#: ../src/utils/pasuspender.c:219
 #, c-format
 msgid "WARNING: Child process terminated by signal %u\n"
 msgstr "警告：子进程被信号 %u 终止\n"
@@ -2890,7 +2909,7 @@
 "  -s, --server=SERVER                   要连接的服务器名\n"
 "\n"
 
-#: src/utils/pasuspender.c:267
+#: ../src/utils/pasuspender.c:266
 #, c-format
 msgid ""
 "pasuspender %s\n"
@@ -2901,22 +2920,22 @@
 "使用 libpulse %s 编译\n"
 "与 libpulse %s 链接\n"
 
-#: src/utils/pasuspender.c:296
+#: ../src/utils/pasuspender.c:295
 #, c-format
 msgid "pa_mainloop_new() failed.\n"
 msgstr "pa_mainloop_new() 失败。\n"
 
-#: src/utils/pasuspender.c:309
+#: ../src/utils/pasuspender.c:308
 #, c-format
 msgid "pa_context_new() failed.\n"
 msgstr "pa_context_new() 失败。\n"
 
-#: src/utils/pasuspender.c:321
+#: ../src/utils/pasuspender.c:320
 #, c-format
 msgid "pa_mainloop_run() failed.\n"
 msgstr "pa_mainloop_run() 失败。\n"
 
-#: src/utils/pax11publish.c:58
+#: ../src/utils/pax11publish.c:58
 #, c-format
 msgid ""
 "%s [-D display] [-S server] [-O sink] [-I source] [-c file]  [-d|-e|-i|-r]\n"
@@ -2934,52 +2953,52 @@
 " -i    将 PulseAudio 数据由 X11 显示器导入至本地环境变量和 cookie 文件。\n"
 " -r    从 X11 显示中清除 PulseAudio 数据\n"
 
-#: src/utils/pax11publish.c:91
+#: ../src/utils/pax11publish.c:91
 #, c-format
 msgid "Failed to parse command line.\n"
 msgstr "解析命令行失败。\n"
 
-#: src/utils/pax11publish.c:110
+#: ../src/utils/pax11publish.c:110
 #, c-format
 msgid "Server: %s\n"
 msgstr "服务器：%s\n"
 
-#: src/utils/pax11publish.c:112
+#: ../src/utils/pax11publish.c:112
 #, c-format
 msgid "Source: %s\n"
 msgstr "信源：%s\n"
 
-#: src/utils/pax11publish.c:114
+#: ../src/utils/pax11publish.c:114
 #, c-format
 msgid "Sink: %s\n"
 msgstr "信宿：%s\n"
 
-#: src/utils/pax11publish.c:116
+#: ../src/utils/pax11publish.c:116
 #, c-format
 msgid "Cookie: %s\n"
 msgstr "Cookie：%s\n"
 
-#: src/utils/pax11publish.c:134
+#: ../src/utils/pax11publish.c:134
 #, c-format
 msgid "Failed to parse cookie data\n"
 msgstr "解析 cookie 数据失败\n"
 
-#: src/utils/pax11publish.c:139
+#: ../src/utils/pax11publish.c:139
 #, c-format
 msgid "Failed to save cookie data\n"
 msgstr "保存 cookie 数据失败\n"
 
-#: src/utils/pax11publish.c:168
+#: ../src/utils/pax11publish.c:168
 #, c-format
 msgid "Failed to get FQDN.\n"
 msgstr "获取 FQDN 失败。\n"
 
-#: src/utils/pax11publish.c:188
+#: ../src/utils/pax11publish.c:188
 #, c-format
 msgid "Failed to load cookie data\n"
 msgstr "加载 cookie 数据失败\n"
 
-#: src/utils/pax11publish.c:206
+#: ../src/utils/pax11publish.c:206
 #, c-format
 msgid "Not yet implemented.\n"
 msgstr "尚未实现。\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/python-apt.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/python-apt.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/python-apt.po	2020-01-23 16:52:00.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/python-apt.po	2020-07-08 13:54:01.000000000 +0000
@@ -7,15 +7,15 @@
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-01-22 22:28+0000\n"
+"POT-Creation-Date: 2020-05-21 14:20+0000\n"
 "PO-Revision-Date: 2018-04-03 16:18+0000\n"
 "Last-Translator: Aron Xu <Unknown>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:10+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:00+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #. ChangelogURI
@@ -71,407 +71,407 @@
 msgstr "Ubuntu 16.10 'Yakkety Yak' 的 CD 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:572
+#: ../data/templates/Ubuntu.info.in:140
 msgid "Ubuntu 16.04 LTS 'Xenial Xerus'"
 msgstr "Ubuntu 16.04 LTS 'Xenial Xerus'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:579
+#: ../data/templates/Ubuntu.info.in:147
 msgid "Cdrom with Ubuntu 16.04 LTS 'Xenial Xerus'"
 msgstr "Ubuntu 16.04 LTS 'Xenial Xerus' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:680
+#: ../data/templates/Ubuntu.info.in:248
 msgid "Ubuntu 15.10 'Wily Werewolf'"
 msgstr "Ubuntu 15.10 'Wily Werewolf'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:687
+#: ../data/templates/Ubuntu.info.in:255
 msgid "Cdrom with Ubuntu 15.10 'Wily Werewolf'"
 msgstr "Ubuntu 15.10 'Wily Werewolf' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:789
+#: ../data/templates/Ubuntu.info.in:357
 msgid "Ubuntu 15.04 'Vivid Vervet'"
 msgstr "Ubuntu 15.04 'Vivid Vervet'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:796
+#: ../data/templates/Ubuntu.info.in:364
 msgid "Cdrom with Ubuntu 15.04 'Vivid Vervet'"
 msgstr "Ubuntu 15.04 'Vivid Vervet' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:908
+#: ../data/templates/Ubuntu.info.in:476
 msgid "Ubuntu 14.10 'Utopic Unicorn'"
 msgstr "Ubuntu 14.10 'Utopic Unicorn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:915
+#: ../data/templates/Ubuntu.info.in:483
 msgid "Cdrom with Ubuntu 14.10 'Utopic Unicorn'"
 msgstr "Ubuntu 14.10 'Utopic Unicorn' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1027
+#: ../data/templates/Ubuntu.info.in:595
 msgid "Ubuntu 14.04 'Trusty Tahr'"
 msgstr "Ubuntu 14.04 'Trusty Tahr'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1034
+#: ../data/templates/Ubuntu.info.in:602
 msgid "Cdrom with Ubuntu 14.04 'Trusty Tahr'"
 msgstr "Ubuntu 14.04 'Trusty Tahr' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1146
+#: ../data/templates/Ubuntu.info.in:714
 msgid "Ubuntu 13.10 'Saucy Salamander'"
 msgstr "Ubuntu 13.10 'Saucy Salamander'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1153
+#: ../data/templates/Ubuntu.info.in:721
 msgid "Cdrom with Ubuntu 13.10 'Saucy Salamander'"
 msgstr "Ubuntu 13.10 'Saucy Salamander' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1265
+#: ../data/templates/Ubuntu.info.in:833
 msgid "Ubuntu 13.04 'Raring Ringtail'"
 msgstr "Ubuntu 13.04 'Raring Ringtail'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1272
+#: ../data/templates/Ubuntu.info.in:840
 msgid "Cdrom with Ubuntu 13.04 'Raring Ringtail'"
 msgstr "Ubuntu 13.04 'Raring Ringtail' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1384
+#: ../data/templates/Ubuntu.info.in:952
 msgid "Ubuntu 12.10 'Quantal Quetzal'"
 msgstr "Ubuntu 12.10 'Quantal Quetzal'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1391
+#: ../data/templates/Ubuntu.info.in:959
 msgid "Cdrom with Ubuntu 12.10 'Quantal Quetzal'"
 msgstr "Ubuntu 12.10 'Quantal Quetzal' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1502
+#: ../data/templates/Ubuntu.info.in:1070
 msgid "Ubuntu 12.04 'Precise Pangolin'"
 msgstr "Ubuntu 12.04 'Precise Pangolin'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1509
+#: ../data/templates/Ubuntu.info.in:1077
 msgid "Cdrom with Ubuntu 12.04 'Precise Pangolin'"
 msgstr "Ubuntu 12.04 'Precise Pangolin' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1620
+#: ../data/templates/Ubuntu.info.in:1188
 msgid "Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr "Ubuntu 11.10 'Oneiric Ocelot'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1627
+#: ../data/templates/Ubuntu.info.in:1195
 msgid "Cdrom with Ubuntu 11.10 'Oneiric Ocelot'"
 msgstr "Ubuntu 11.10 'Oneiric Ocelot' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1739
+#: ../data/templates/Ubuntu.info.in:1307
 msgid "Ubuntu 11.04 'Natty Narwhal'"
 msgstr "Ubuntu 11.04 'Natty Narwhal'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1746
+#: ../data/templates/Ubuntu.info.in:1314
 msgid "Cdrom with Ubuntu 11.04 'Natty Narwhal'"
 msgstr "Ubuntu 11.04 'Natty Narwhal' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1837
+#: ../data/templates/Ubuntu.info.in:1405
 msgid "Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "Ubuntu 10.10 'Maverick Meerkat'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1857
+#: ../data/templates/Ubuntu.info.in:1425
 msgid "Cdrom with Ubuntu 10.10 'Maverick Meerkat'"
 msgstr "Ubuntu 10.10 'Maverick Meerkat' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1869
+#: ../data/templates/Ubuntu.info.in:1437
 msgid "Canonical Partners"
 msgstr "Canonical 合作伙伴"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1871
+#: ../data/templates/Ubuntu.info.in:1439
 msgid "Software packaged by Canonical for their partners"
 msgstr "Canonical 为合作伙伴打包的软件"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1872
+#: ../data/templates/Ubuntu.info.in:1440
 msgid "This software is not part of Ubuntu."
 msgstr "此软件不是 Ubuntu 一部分"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1879
+#: ../data/templates/Ubuntu.info.in:1447
 msgid "Independent"
 msgstr "独立"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:1881
+#: ../data/templates/Ubuntu.info.in:1449
 msgid "Provided by third-party software developers"
 msgstr "由第三方软件开发商提供"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:1882
+#: ../data/templates/Ubuntu.info.in:1450
 msgid "Software offered by third party developers."
 msgstr "由第三方软件开发商提供的软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1920
+#: ../data/templates/Ubuntu.info.in:1488
 msgid "Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Ubuntu 10.04 'Lucid Lynx'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1940
+#: ../data/templates/Ubuntu.info.in:1508
 msgid "Cdrom with Ubuntu 10.04 'Lucid Lynx'"
 msgstr "Ubuntu 10.04 'Lucid Lynx' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:1983
+#: ../data/templates/Ubuntu.info.in:1551
 msgid "Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 'Karmic Koala'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2003
+#: ../data/templates/Ubuntu.info.in:1571
 msgid "Cdrom with Ubuntu 9.10 'Karmic Koala'"
 msgstr "Ubuntu 9.10 'Karmic Koala' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2046
+#: ../data/templates/Ubuntu.info.in:1614
 msgid "Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 'Jaunty Jackalope'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2065
+#: ../data/templates/Ubuntu.info.in:1633
 msgid "Cdrom with Ubuntu 9.04 'Jaunty Jackalope'"
 msgstr "Ubuntu 9.04 'Jaunty Jackalope' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2108
+#: ../data/templates/Ubuntu.info.in:1676
 msgid "Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 'Intrepid Ibex'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2128
+#: ../data/templates/Ubuntu.info.in:1696
 msgid "Cdrom with Ubuntu 8.10 'Intrepid Ibex'"
 msgstr "Ubuntu 8.10 ‘Intrepid Ibex’光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2172
+#: ../data/templates/Ubuntu.info.in:1740
 msgid "Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04‘Hardy Heron’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2192
+#: ../data/templates/Ubuntu.info.in:1760
 msgid "Cdrom with Ubuntu 8.04 'Hardy Heron'"
 msgstr "Ubuntu 8.04 'Hardy Heron' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2237
+#: ../data/templates/Ubuntu.info.in:1805
 msgid "Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10‘Gutsy Gibbon’"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2256
+#: ../data/templates/Ubuntu.info.in:1824
 msgid "Cdrom with Ubuntu 7.10 'Gutsy Gibbon'"
 msgstr "Ubuntu 7.10 'Gutsy Gibbon' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2301
+#: ../data/templates/Ubuntu.info.in:1869
 msgid "Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2320
+#: ../data/templates/Ubuntu.info.in:1888
 msgid "Cdrom with Ubuntu 7.04 'Feisty Fawn'"
 msgstr "Ubuntu 7.04 'Feisty Fawn' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2362
+#: ../data/templates/Ubuntu.info.in:1930
 msgid "Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2367
+#: ../data/templates/Ubuntu.info.in:1935
 msgid "Community-maintained"
 msgstr "社区维护"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2373
+#: ../data/templates/Ubuntu.info.in:1941
 msgid "Restricted software"
 msgstr "受限软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2381
+#: ../data/templates/Ubuntu.info.in:1949
 msgid "Cdrom with Ubuntu 6.10 'Edgy Eft'"
 msgstr "Ubuntu 6.10 'Edgy Eft' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2423
+#: ../data/templates/Ubuntu.info.in:1991
 msgid "Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake'"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2426
+#: ../data/templates/Ubuntu.info.in:1994
 msgid "Canonical-supported free and open-source software"
 msgstr "Canonical 支持的免费和开源软件"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2428
+#: ../data/templates/Ubuntu.info.in:1996
 msgid "Community-maintained (universe)"
 msgstr "社区维护 (universe)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2429
+#: ../data/templates/Ubuntu.info.in:1997
 msgid "Community-maintained free and open-source software"
 msgstr "社区维护的免费和开源软件"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2431
+#: ../data/templates/Ubuntu.info.in:1999
 msgid "Non-free drivers"
 msgstr "非开源或私有驱动"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2432
+#: ../data/templates/Ubuntu.info.in:2000
 msgid "Proprietary drivers for devices"
 msgstr "设备的专有驱动"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2434
+#: ../data/templates/Ubuntu.info.in:2002
 msgid "Restricted software (Multiverse)"
 msgstr "受限软件(Multiverse)"
 
 #. CompDescriptionLong
-#: ../data/templates/Ubuntu.info.in:2435
+#: ../data/templates/Ubuntu.info.in:2003
 msgid "Software restricted by copyright or legal issues"
 msgstr "有版权和合法性问题的的软件"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2442
+#: ../data/templates/Ubuntu.info.in:2010
 msgid "Cdrom with Ubuntu 6.06 LTS 'Dapper Drake'"
 msgstr "Ubuntu 6.06 LTS 'Dapper Drake' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2458
+#: ../data/templates/Ubuntu.info.in:2026
 msgid "Important security updates"
 msgstr "重要安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2463 ../data/templates/Debian.info.in:86
+#: ../data/templates/Ubuntu.info.in:2031 ../data/templates/Debian.info.in:56
 msgid "Recommended updates"
 msgstr "推荐更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2468
+#: ../data/templates/Ubuntu.info.in:2036
 msgid "Pre-released updates"
 msgstr "提前释放出的更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2473
+#: ../data/templates/Ubuntu.info.in:2041
 msgid "Unsupported updates"
 msgstr "不支持的更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2484
+#: ../data/templates/Ubuntu.info.in:2052
 msgid "Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2499
+#: ../data/templates/Ubuntu.info.in:2067
 msgid "Cdrom with Ubuntu 5.10 'Breezy Badger'"
 msgstr "Ubuntu 5.10 'Breezy Badger' 光盘"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2515
+#: ../data/templates/Ubuntu.info.in:2083
 msgid "Ubuntu 5.10 Security Updates"
 msgstr "Ubuntu 5.10 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2520
+#: ../data/templates/Ubuntu.info.in:2088
 msgid "Ubuntu 5.10 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2525
+#: ../data/templates/Ubuntu.info.in:2093
 msgid "Ubuntu 5.10 Backports"
 msgstr "Ubuntu 5.10 移植"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2536
+#: ../data/templates/Ubuntu.info.in:2104
 msgid "Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2551
+#: ../data/templates/Ubuntu.info.in:2119
 msgid "Cdrom with Ubuntu 5.04 'Hoary Hedgehog'"
 msgstr "Ubuntu 5.04 'Hoary Hedgehog'光盘"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2554 ../data/templates/Debian.info.in:239
+#: ../data/templates/Ubuntu.info.in:2122 ../data/templates/Debian.info.in:209
 msgid "Officially supported"
 msgstr "官方支持"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2567
+#: ../data/templates/Ubuntu.info.in:2135
 msgid "Ubuntu 5.04 Security Updates"
 msgstr "Ubuntu 5.04 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2572
+#: ../data/templates/Ubuntu.info.in:2140
 msgid "Ubuntu 5.04 Updates"
 msgstr "Ubuntu 5.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2577
+#: ../data/templates/Ubuntu.info.in:2145
 msgid "Ubuntu 5.04 Backports"
 msgstr "Ubuntu 5.04 Backports"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2583
+#: ../data/templates/Ubuntu.info.in:2151
 msgid "Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2589
+#: ../data/templates/Ubuntu.info.in:2157
 msgid "Community-maintained (Universe)"
 msgstr "社区维护 (Universe)"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2591
+#: ../data/templates/Ubuntu.info.in:2159
 msgid "Non-free (Multiverse)"
 msgstr "非自由"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2598
+#: ../data/templates/Ubuntu.info.in:2166
 msgid "Cdrom with Ubuntu 4.10 'Warty Warthog'"
 msgstr "Ubuntu 4.10 'Warty Warthog'光盘"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2601
+#: ../data/templates/Ubuntu.info.in:2169
 msgid "No longer officially supported"
 msgstr "官方不再支持"
 
 #. CompDescription
-#: ../data/templates/Ubuntu.info.in:2603
+#: ../data/templates/Ubuntu.info.in:2171
 msgid "Restricted copyright"
 msgstr "版权受限"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2610
+#: ../data/templates/Ubuntu.info.in:2178
 msgid "Ubuntu 4.10 Security Updates"
 msgstr "Ubuntu 4.10 安全更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2615
+#: ../data/templates/Ubuntu.info.in:2183
 msgid "Ubuntu 4.10 Updates"
 msgstr "Ubuntu 4.10 更新"
 
 #. Description
-#: ../data/templates/Ubuntu.info.in:2620
+#: ../data/templates/Ubuntu.info.in:2188
 msgid "Ubuntu 4.10 Backports"
 msgstr "Ubuntu 4.10 Backports"
 
@@ -487,72 +487,72 @@
 msgstr "Debian 9 'stretch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:38
+#: ../data/templates/Debian.info.in:8
 msgid "Debian 8 'jessie'"
 msgstr "Debian 8 'jessie'"
 
 #. Description
-#: ../data/templates/Debian.info.in:68
+#: ../data/templates/Debian.info.in:38
 msgid "Debian 7 'Wheezy' "
 msgstr "Debian 7 'Wheezy' "
 
 #. Description
-#: ../data/templates/Debian.info.in:98
+#: ../data/templates/Debian.info.in:68
 msgid "Debian 6.0 'Squeeze' "
 msgstr "Debian 6.0 'Squeeze' "
 
 #. Description
-#: ../data/templates/Debian.info.in:123
+#: ../data/templates/Debian.info.in:93
 msgid "Debian 5.0 'Lenny' "
 msgstr "Debian 5.0 'Lenny' "
 
 #. Description
-#: ../data/templates/Debian.info.in:148
+#: ../data/templates/Debian.info.in:118
 msgid "Debian 4.0 'Etch'"
 msgstr "Debian 4.0 'Etch'"
 
 #. Description
-#: ../data/templates/Debian.info.in:173
+#: ../data/templates/Debian.info.in:143
 msgid "Debian 3.1 'Sarge'"
 msgstr "Debian 3.1 \"Sarge\""
 
 #. Description
-#: ../data/templates/Debian.info.in:184
+#: ../data/templates/Debian.info.in:154
 msgid "Proposed updates"
 msgstr "建议更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:191
+#: ../data/templates/Debian.info.in:161
 msgid "Security updates"
 msgstr "安全更新"
 
 #. Description
-#: ../data/templates/Debian.info.in:198
+#: ../data/templates/Debian.info.in:168
 msgid "Debian current stable release"
 msgstr "当前稳定的 Debian 发布"
 
 #. Description
-#: ../data/templates/Debian.info.in:211
+#: ../data/templates/Debian.info.in:181
 msgid "Debian testing"
 msgstr "Debian testing"
 
 #. Description
-#: ../data/templates/Debian.info.in:237
+#: ../data/templates/Debian.info.in:207
 msgid "Debian 'Sid' (unstable)"
 msgstr "Debian \"Sid\" (非稳定)"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:241
+#: ../data/templates/Debian.info.in:211
 msgid "DFSG-compatible Software with Non-Free Dependencies"
 msgstr "带有非自由依赖关系的DFSG兼容软件"
 
 #. CompDescription
-#: ../data/templates/Debian.info.in:243
+#: ../data/templates/Debian.info.in:213
 msgid "Non-DFSG-compatible Software"
 msgstr "非DFSG兼容软件"
 
 #. TRANSLATORS: %s is a country
-#: ../aptsources/distro.py:215 ../aptsources/distro.py:446
+#: ../aptsources/distro.py:211 ../aptsources/distro.py:442
 #, python-format
 msgid "Server for %s"
 msgstr "%s 的服务器"
@@ -560,12 +560,12 @@
 #. More than one server is used. Since we don't handle this case
 #. in the user interface we set "custom servers" to true and
 #. append a list of all used servers
-#: ../aptsources/distro.py:233 ../aptsources/distro.py:239
-#: ../aptsources/distro.py:255
+#: ../aptsources/distro.py:229 ../aptsources/distro.py:235
+#: ../aptsources/distro.py:251
 msgid "Main server"
 msgstr "主服务器"
 
-#: ../aptsources/distro.py:259
+#: ../aptsources/distro.py:255
 msgid "Custom servers"
 msgstr "自定义服务器"
 
@@ -574,16 +574,16 @@
 msgid "Missing description for '%s'.Please report."
 msgstr ""
 
-#: ../apt/package.py:620
+#: ../apt/package.py:529
 #, python-format
 msgid "Invalid unicode in description for '%s' (%s). Please report."
 msgstr "无效的 unicode 在 '%s' (%s) 的描述中。 请汇报。"
 
-#: ../apt/package.py:1315 ../apt/package.py:1424 ../apt/package.py:1438
+#: ../apt/package.py:1153 ../apt/package.py:1259 ../apt/package.py:1273
 msgid "The list of changes is not available"
 msgstr "变动列表尚不可用。"
 
-#: ../apt/package.py:1431
+#: ../apt/package.py:1266
 #, python-format
 msgid ""
 "The list of changes is not available yet.\n"
@@ -596,7 +596,7 @@
 "请使用http://launchpad.net/ubuntu/+source/%s/%s/+changelog\n"
 "直至这些选项可用或者稍后再试。"
 
-#: ../apt/package.py:1444
+#: ../apt/package.py:1276
 msgid ""
 "Failed to download the list of changes. \n"
 "Please check your Internet connection."
@@ -660,20 +660,20 @@
 "afterwards"
 msgstr "错误的架构 '%s' -- 运行 dpkg --add-architecture 添加该架构后再更新"
 
-#: ../apt/debfile.py:514
+#: ../apt/debfile.py:512
 msgid "A later version is already installed"
 msgstr "已经安装了较新的版本"
 
-#: ../apt/debfile.py:539
+#: ../apt/debfile.py:537
 msgid "Failed to satisfy all dependencies (broken cache)"
 msgstr "无法满足所有的依赖关系（缓存损坏）"
 
-#: ../apt/debfile.py:568
+#: ../apt/debfile.py:566
 #, python-format
 msgid "Cannot install '%s'"
 msgstr "无法安装 '%s'"
 
-#: ../apt/debfile.py:644
+#: ../apt/debfile.py:642
 msgid ""
 "Automatically decompressed:\n"
 "\n"
@@ -681,16 +681,16 @@
 "自动解压：\n"
 "\n"
 
-#: ../apt/debfile.py:650
+#: ../apt/debfile.py:648
 msgid "Automatically converted to printable ascii:\n"
 msgstr "自动转换为可打印的 ascii：\n"
 
-#: ../apt/debfile.py:750
+#: ../apt/debfile.py:748
 #, python-format
 msgid "Install Build-Dependencies for source package '%s' that builds %s\n"
 msgstr "为源软件包 '%s' 编译 %s 安装编译依赖\n"
 
-#: ../apt/debfile.py:761
+#: ../apt/debfile.py:759
 msgid "An essential package would be removed"
 msgstr "一个基本软件包将被移除"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sane-backends.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sane-backends.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sane-backends.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sane-backends.po	2020-07-08 13:53:54.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:07+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:56+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: include/sane/saneopts.h:154
 #, no-c-format
@@ -28,37 +28,39 @@
 msgstr ""
 
 #: include/sane/saneopts.h:157 backend/artec_eplus48u.c:2884
-#: backend/epson.c:3298 backend/epson2.c:1291 backend/genesys.c:5618
-#: backend/gt68xx.c:703 backend/hp3500.c:1019 backend/hp-option.c:3297
-#: backend/kvs1025_opt.c:640 backend/kvs20xx_opt.c:285
-#: backend/kvs40xx_opt.c:506 backend/leo.c:823 backend/lexmark.c:199
-#: backend/ma1509.c:551 backend/matsushita.c:1135 backend/microtek2.h:599
-#: backend/mustek.c:4361 backend/mustek_usb.c:305 backend/mustek_usb2.c:465
-#: backend/pixma_sane_options.c:160 backend/plustek.c:808
-#: backend/plustek_pp.c:747 backend/sceptre.c:702
-#: backend/snapscan-options.c:550 backend/teco1.c:1095 backend/teco2.c:1914
-#: backend/teco3.c:920 backend/test.c:647 backend/u12.c:546
-#: backend/umax.c:5176 backend/umax_pp.c:580
+#: backend/epson.c:3298 backend/epson2.c:1290 backend/epsonds.c:677
+#: backend/genesys/genesys.cpp:4034 backend/gt68xx.c:696
+#: backend/hp-option.c:3300 backend/hp3500.c:1019 backend/kvs1025_opt.c:639
+#: backend/kvs20xx_opt.c:285 backend/kvs40xx_opt.c:506 backend/leo.c:827
+#: backend/lexmark.c:203 backend/ma1509.c:551 backend/matsushita.c:1139
+#: backend/microtek2.h:599 backend/mustek.c:4373 backend/mustek_usb.c:301
+#: backend/mustek_usb2.c:465 backend/pixma/pixma_sane_options.c:160
+#: backend/plustek.c:808 backend/plustek_pp.c:747 backend/sceptre.c:706
+#: backend/snapscan-options.c:550 backend/teco1.c:1099 backend/teco2.c:1914
+#: backend/teco3.c:924 backend/test.c:651 backend/u12.c:546
+#: backend/umax.c:5176 backend/umax_pp.c:570
 #, no-c-format
 msgid "Geometry"
 msgstr "几何形状"
 
 #: include/sane/saneopts.h:158 backend/artec_eplus48u.c:2805
-#: backend/canon.c:1498 backend/genesys.c:5678 backend/gt68xx.c:672
-#: backend/hp-option.c:2953 backend/kvs1025_opt.c:704 backend/leo.c:871
-#: backend/ma1509.c:599 backend/matsushita.c:1189 backend/microtek2.h:600
-#: backend/mustek.c:4409 backend/mustek_usb.c:353 backend/mustek_usb2.c:431
-#: backend/niash.c:754 backend/plustek.c:854 backend/plustek_pp.c:793
-#: backend/sceptre.c:750 backend/snapscan-options.c:617 backend/stv680.c:1067
-#: backend/teco1.c:1143 backend/teco2.c:1962 backend/teco3.c:968
-#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:629
+#: backend/canon.c:1493 backend/genesys/genesys.cpp:4077
+#: backend/gt68xx.c:665 backend/hp-option.c:2956 backend/kvs1025_opt.c:703
+#: backend/leo.c:875 backend/ma1509.c:599 backend/matsushita.c:1193
+#: backend/microtek2.h:600 backend/mustek.c:4421 backend/mustek_usb.c:349
+#: backend/mustek_usb2.c:431 backend/niash.c:754 backend/plustek.c:854
+#: backend/plustek_pp.c:793 backend/sceptre.c:754
+#: backend/snapscan-options.c:617 backend/stv680.c:1071
+#: backend/teco1.c:1147 backend/teco2.c:1962 backend/teco3.c:972
+#: backend/u12.c:592 backend/umax.c:5226 backend/umax_pp.c:619
 #, no-c-format
 msgid "Enhancement"
 msgstr "增强"
 
-#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1216
-#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597 backend/rts8891.c:2831
-#: backend/snapscan-options.c:923 backend/umax.c:5565
+#: include/sane/saneopts.h:159 backend/epson.c:3197 backend/epson2.c:1215
+#: backend/kvs20xx_opt.c:366 backend/kvs40xx_opt.c:597
+#: backend/rts8891.c:2831 backend/snapscan-options.c:923
+#: backend/umax.c:5565
 #, no-c-format
 msgid "Advanced"
 msgstr ""
@@ -83,8 +85,8 @@
 msgid "Bit depth"
 msgstr ""
 
-#: include/sane/saneopts.h:165 backend/canon.c:1145 backend/leo.c:781
-#: backend/pixma_sane_options.c:47
+#: include/sane/saneopts.h:165 backend/canon.c:1140 backend/leo.c:785
+#: backend/pixma/pixma_sane_options.c:47
 #, no-c-format
 msgid "Scan mode"
 msgstr "扫描模式"
@@ -124,8 +126,8 @@
 msgid "Bottom-right y"
 msgstr ""
 
-#: include/sane/saneopts.h:173 backend/canon.c:1221
-#: backend/pixma_sane_options.c:300
+#: include/sane/saneopts.h:173 backend/canon.c:1216
+#: backend/pixma/pixma_sane_options.c:300
 #, no-c-format
 msgid "Scan resolution"
 msgstr "扫描分辨率"
@@ -280,7 +282,7 @@
 msgid "Halftone pattern size"
 msgstr ""
 
-#: include/sane/saneopts.h:204 backend/fujitsu.c:3186
+#: include/sane/saneopts.h:204 backend/fujitsu.c:3237
 #, no-c-format
 msgid "Halftone pattern"
 msgstr ""
@@ -290,10 +292,10 @@
 msgid "Bind X and Y resolution"
 msgstr ""
 
-#: include/sane/saneopts.h:206 backend/hp3900_sane.c:428
-#: backend/hp3900_sane.c:1021 backend/hp3900_sane.c:1421
-#: backend/hp-option.c:3235 backend/mustek_usb2.c:121 backend/plustek.c:236
-#: backend/plustek_pp.c:205 backend/u12.c:157
+#: include/sane/saneopts.h:206 backend/hp-option.c:3238
+#: backend/hp3900_sane.c:433 backend/hp3900_sane.c:1026
+#: backend/hp3900_sane.c:1426 backend/mustek_usb2.c:121
+#: backend/plustek.c:236 backend/plustek_pp.c:205 backend/u12.c:157
 #, no-c-format
 msgid "Negative"
 msgstr ""
@@ -937,7 +939,7 @@
 msgid "Set default values for enhancement controls."
 msgstr "设定增强控制的默认值"
 
-#: backend/artec_eplus48u.c:2932 backend/canon.c:1616
+#: backend/artec_eplus48u.c:2932 backend/canon.c:1611
 #, no-c-format
 msgid "Calibration"
 msgstr "校准"
@@ -992,54 +994,54 @@
 msgid "Duplex scan provide a scan of the front and back side of the document"
 msgstr ""
 
-#: backend/canon630u.c:159
+#: backend/canon630u.c:163
 #, no-c-format
 msgid "Calibrate Scanner"
 msgstr ""
 
-#: backend/canon630u.c:160
+#: backend/canon630u.c:164
 #, no-c-format
 msgid "Force scanner calibration before scan"
 msgstr ""
 
-#: backend/canon630u.c:259 backend/umax1220u.c:208
+#: backend/canon630u.c:263 backend/umax1220u.c:208
 #, no-c-format
 msgid "Grayscale scan"
 msgstr ""
 
-#: backend/canon630u.c:260 backend/umax1220u.c:209
+#: backend/canon630u.c:264 backend/umax1220u.c:209
 #, no-c-format
 msgid "Do a grayscale rather than color scan"
 msgstr ""
 
-#: backend/canon630u.c:306
+#: backend/canon630u.c:310
 #, no-c-format
 msgid "Analog Gain"
 msgstr ""
 
-#: backend/canon630u.c:307
+#: backend/canon630u.c:311
 #, no-c-format
 msgid "Increase or decrease the analog gain of the CCD array"
 msgstr ""
 
-#: backend/canon630u.c:347 backend/epson.h:68 backend/epson2.h:67
+#: backend/canon630u.c:351 backend/epson.h:68 backend/epson2.h:67
 #, no-c-format
 msgid "Gamma Correction"
 msgstr ""
 
-#: backend/canon630u.c:348
+#: backend/canon630u.c:352
 #, no-c-format
 msgid "Selects the gamma corrected transfer curve"
 msgstr ""
 
-#: backend/canon.c:149 backend/canon-sane.c:1318
+#: backend/canon-sane.c:1318 backend/canon.c:149
 #, no-c-format
 msgid "Raw"
 msgstr "原始"
 
-#: backend/canon.c:157 backend/canon-sane.c:732 backend/canon-sane.c:940
+#: backend/canon-sane.c:732 backend/canon-sane.c:940
 #: backend/canon-sane.c:1076 backend/canon-sane.c:1314
-#: backend/canon-sane.c:1494 backend/canon-sane.c:1643
+#: backend/canon-sane.c:1494 backend/canon-sane.c:1643 backend/canon.c:157
 #, no-c-format
 msgid "Fine color"
 msgstr "高质量颜色"
@@ -1049,17 +1051,17 @@
 msgid "No transparency correction"
 msgstr "无透明度校正"
 
-#: backend/canon.c:170 backend/canon-sane.c:680
+#: backend/canon-sane.c:680 backend/canon.c:170
 #, no-c-format
 msgid "Correction according to film type"
 msgstr ""
 
-#: backend/canon.c:171 backend/canon-sane.c:674
+#: backend/canon-sane.c:674 backend/canon.c:171
 #, no-c-format
 msgid "Correction according to transparency ratio"
 msgstr ""
 
-#: backend/canon.c:176 backend/canon-sane.c:776
+#: backend/canon-sane.c:776 backend/canon.c:176
 #, no-c-format
 msgid "Negatives"
 msgstr ""
@@ -1069,8 +1071,8 @@
 msgid "Slides"
 msgstr ""
 
-#: backend/canon.c:186 backend/kvs1025_opt.c:181 backend/kvs40xx_opt.c:273
-#: backend/matsushita.c:178
+#: backend/canon.c:186 backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:273
+#: backend/matsushita.c:182
 #, no-c-format
 msgid "Automatic"
 msgstr "自动"
@@ -1090,108 +1092,108 @@
 msgid "1/3 normal speed"
 msgstr "1/3 正常速度"
 
-#: backend/canon.c:365
+#: backend/canon.c:360
 #, no-c-format
 msgid "rounded parameter"
 msgstr ""
 
-#: backend/canon.c:368 backend/canon.c:384 backend/canon.c:419
-#: backend/canon.c:469 backend/canon.c:487 backend/canon.c:530
+#: backend/canon.c:363 backend/canon.c:379 backend/canon.c:414
+#: backend/canon.c:464 backend/canon.c:482 backend/canon.c:525
 #, no-c-format
 msgid "unknown"
 msgstr "未知"
 
-#: backend/canon.c:378
+#: backend/canon.c:373
 #, no-c-format
 msgid "ADF jam"
 msgstr ""
 
-#: backend/canon.c:381
+#: backend/canon.c:376
 #, no-c-format
 msgid "ADF cover open"
 msgstr ""
 
-#: backend/canon.c:394
+#: backend/canon.c:389
 #, no-c-format
 msgid "lamp failure"
 msgstr ""
 
-#: backend/canon.c:397
+#: backend/canon.c:392
 #, no-c-format
 msgid "scan head positioning error"
 msgstr ""
 
-#: backend/canon.c:400
+#: backend/canon.c:395
 #, no-c-format
 msgid "CPU check error"
 msgstr "CPU 检查出错"
 
-#: backend/canon.c:403
+#: backend/canon.c:398
 #, no-c-format
 msgid "RAM check error"
 msgstr "RAM 检查出错"
 
-#: backend/canon.c:406
+#: backend/canon.c:401
 #, no-c-format
 msgid "ROM check error"
 msgstr "ROM 检查出错"
 
-#: backend/canon.c:409
+#: backend/canon.c:404
 #, no-c-format
 msgid "hardware check error"
 msgstr "硬件检查出错"
 
-#: backend/canon.c:412
+#: backend/canon.c:407
 #, no-c-format
 msgid "transparency unit lamp failure"
 msgstr ""
 
-#: backend/canon.c:415
+#: backend/canon.c:410
 #, no-c-format
 msgid "transparency unit scan head positioning failure"
 msgstr ""
 
-#: backend/canon.c:429
+#: backend/canon.c:424
 #, no-c-format
 msgid "parameter list length error"
 msgstr "参数表长度出错"
 
-#: backend/canon.c:433
+#: backend/canon.c:428
 #, no-c-format
 msgid "invalid command operation code"
 msgstr "无效的命令操作码"
 
-#: backend/canon.c:437
+#: backend/canon.c:432
 #, no-c-format
 msgid "invalid field in CDB"
 msgstr ""
 
-#: backend/canon.c:441
+#: backend/canon.c:436
 #, no-c-format
 msgid "unsupported LUN"
 msgstr "不支持的 LUN"
 
-#: backend/canon.c:445
+#: backend/canon.c:440
 #, no-c-format
 msgid "invalid field in parameter list"
 msgstr ""
 
-#: backend/canon.c:449
+#: backend/canon.c:444
 #, no-c-format
 msgid "command sequence error"
 msgstr "命令顺序出错"
 
-#: backend/canon.c:453
+#: backend/canon.c:448
 #, no-c-format
 msgid "too many windows specified"
 msgstr "指定了过多的窗口"
 
-#: backend/canon.c:457
+#: backend/canon.c:452
 #, no-c-format
 msgid "medium not present"
 msgstr "媒体不存在"
 
-#: backend/canon.c:461
+#: backend/canon.c:456
 #, no-c-format
 msgid "invalid bit IDENTIFY message"
 msgstr ""
@@ -1201,418 +1203,429 @@
 msgid "option not connect"
 msgstr ""
 
-#: backend/canon.c:479
+#: backend/canon.c:474
 #, no-c-format
 msgid "power on reset / bus device reset"
 msgstr ""
 
-#: backend/canon.c:483
+#: backend/canon.c:478
 #, no-c-format
 msgid "parameter changed by another initiator"
 msgstr ""
 
-#: backend/canon.c:497
+#: backend/canon.c:492
 #, no-c-format
 msgid "no additional sense information"
 msgstr ""
 
-#: backend/canon.c:501
+#: backend/canon.c:496
 #, no-c-format
 msgid "reselect failure"
 msgstr "重新选择失败"
 
-#: backend/canon.c:505
+#: backend/canon.c:500
 #, no-c-format
 msgid "SCSI parity error"
 msgstr ""
 
-#: backend/canon.c:509
+#: backend/canon.c:504
 #, no-c-format
 msgid "initiator detected error message received"
 msgstr ""
 
-#: backend/canon.c:514
+#: backend/canon.c:509
 #, no-c-format
 msgid "invalid message error"
 msgstr "无效消息错误"
 
-#: backend/canon.c:518
+#: backend/canon.c:513
 #, no-c-format
 msgid "timeout error"
 msgstr "超时错误"
 
-#: backend/canon.c:522
+#: backend/canon.c:517
 #, no-c-format
 msgid "transparency unit shading error"
 msgstr ""
 
-#: backend/canon.c:526
+#: backend/canon.c:521
 #, no-c-format
 msgid "lamp not stabilized"
 msgstr ""
 
-#: backend/canon.c:852 backend/canon.c:867
+#: backend/canon.c:847 backend/canon.c:862
 #, no-c-format
 msgid "film scanner"
 msgstr ""
 
-#: backend/canon.c:882 backend/canon.c:897 backend/canon.c:912
-#: backend/canon.c:927 backend/hp3900_sane.c:1683 backend/plustek.c:1335
-#: backend/plustek_pp.c:1014 backend/sceptre.c:593 backend/teco2.c:1836
+#: backend/canon.c:877 backend/canon.c:892 backend/canon.c:907
+#: backend/canon.c:922 backend/hp3900_sane.c:1688 backend/plustek.c:1335
+#: backend/plustek_pp.c:1014 backend/sceptre.c:597 backend/teco2.c:1836
 #: backend/u12.c:851
 #, no-c-format
 msgid "flatbed scanner"
 msgstr ""
 
-#: backend/canon.c:1183 backend/epson.c:3386 backend/epson2.c:1365
+#: backend/canon.c:1178 backend/epson.c:3386 backend/epson2.c:1364
 #, no-c-format
 msgid "Film type"
 msgstr ""
 
-#: backend/canon.c:1184
+#: backend/canon.c:1179
 #, no-c-format
 msgid "Selects the film type, i.e. negatives or slides"
 msgstr ""
 
-#: backend/canon.c:1196
+#: backend/canon.c:1191
 #, no-c-format
 msgid "Negative film type"
 msgstr ""
 
-#: backend/canon.c:1197
+#: backend/canon.c:1192
 #, no-c-format
 msgid "Selects the negative film type"
 msgstr ""
 
-#: backend/canon.c:1236
+#: backend/canon.c:1231
 #, no-c-format
 msgid "Hardware resolution"
 msgstr "硬件分辨率"
 
-#: backend/canon.c:1237
+#: backend/canon.c:1232
 #, no-c-format
 msgid "Use only hardware resolutions"
 msgstr "使用硬件分辨率"
 
-#: backend/canon.c:1318
+#: backend/canon.c:1313
 #, no-c-format
 msgid "Focus"
 msgstr "聚焦"
 
-#: backend/canon.c:1328
+#: backend/canon.c:1323
 #, no-c-format
 msgid "Auto focus"
 msgstr "自动聚焦"
 
-#: backend/canon.c:1329
+#: backend/canon.c:1324
 #, no-c-format
 msgid "Enable/disable auto focus"
 msgstr "启用/禁用 自动聚焦"
 
-#: backend/canon.c:1336
+#: backend/canon.c:1331
 #, no-c-format
 msgid "Auto focus only once"
 msgstr "只自动聚焦一次"
 
-#: backend/canon.c:1337
+#: backend/canon.c:1332
 #, no-c-format
 msgid "Do auto focus only once between ejects"
 msgstr ""
 
-#: backend/canon.c:1345
+#: backend/canon.c:1340
 #, no-c-format
 msgid "Manual focus position"
 msgstr ""
 
-#: backend/canon.c:1346
+#: backend/canon.c:1341
 #, no-c-format
 msgid "Set the optical system's focus position by hand (default: 128)."
 msgstr ""
 
-#: backend/canon.c:1356
+#: backend/canon.c:1351
 #, no-c-format
 msgid "Scan margins"
 msgstr ""
 
-#: backend/canon.c:1403
+#: backend/canon.c:1398
 #, no-c-format
 msgid "Extra color adjustments"
 msgstr ""
 
-#: backend/canon.c:1538 backend/epson.c:3205 backend/epson2.c:1255
+#: backend/canon.c:1533 backend/epson.c:3205 backend/epson2.c:1254
 #: backend/kvs1025.h:55 backend/kvs40xx_opt.c:826
 #, no-c-format
 msgid "Mirror image"
 msgstr ""
 
-#: backend/canon.c:1539
+#: backend/canon.c:1534
 #, no-c-format
 msgid "Mirror the image horizontally"
 msgstr ""
 
-#: backend/canon.c:1608
+#: backend/canon.c:1603
 #, no-c-format
 msgid "Auto exposure"
 msgstr ""
 
-#: backend/canon.c:1609
+#: backend/canon.c:1604
 #, no-c-format
 msgid "Enable/disable the auto exposure feature"
 msgstr ""
 
-#: backend/canon.c:1625
+#: backend/canon.c:1620
 #, no-c-format
 msgid "Calibration now"
 msgstr ""
 
-#: backend/canon.c:1626
+#: backend/canon.c:1621
 #, no-c-format
 msgid "Execute calibration *now*"
 msgstr ""
 
-#: backend/canon.c:1636
+#: backend/canon.c:1631
 #, no-c-format
 msgid "Self diagnosis"
 msgstr ""
 
-#: backend/canon.c:1637
+#: backend/canon.c:1632
 #, no-c-format
 msgid "Perform scanner self diagnosis"
 msgstr ""
 
-#: backend/canon.c:1648
+#: backend/canon.c:1643
 #, no-c-format
 msgid "Reset scanner"
 msgstr ""
 
-#: backend/canon.c:1649
+#: backend/canon.c:1644
 #, no-c-format
 msgid "Reset the scanner"
 msgstr ""
 
-#: backend/canon.c:1659
+#: backend/canon.c:1654
 #, no-c-format
 msgid "Medium handling"
 msgstr ""
 
-#: backend/canon.c:1668
+#: backend/canon.c:1663
 #, no-c-format
 msgid "Eject film after each scan"
 msgstr ""
 
-#: backend/canon.c:1669
+#: backend/canon.c:1664
 #, no-c-format
 msgid "Automatically eject the film from the device after each scan"
 msgstr ""
 
-#: backend/canon.c:1680
+#: backend/canon.c:1675
 #, no-c-format
 msgid "Eject film before exit"
 msgstr ""
 
-#: backend/canon.c:1681
+#: backend/canon.c:1676
 #, no-c-format
 msgid ""
 "Automatically eject the film from the device before exiting the program"
 msgstr ""
 
-#: backend/canon.c:1690
+#: backend/canon.c:1685
 #, no-c-format
 msgid "Eject film now"
 msgstr ""
 
-#: backend/canon.c:1691
+#: backend/canon.c:1686
 #, no-c-format
 msgid "Eject the film *now*"
 msgstr ""
 
-#: backend/canon.c:1700
+#: backend/canon.c:1695
 #, no-c-format
 msgid "Document feeder extras"
 msgstr ""
 
-#: backend/canon.c:1707
+#: backend/canon.c:1702
 #, no-c-format
 msgid "Flatbed only"
 msgstr ""
 
-#: backend/canon.c:1708
+#: backend/canon.c:1703
 #, no-c-format
 msgid "Disable auto document feeder and use flatbed only"
 msgstr ""
 
-#: backend/canon.c:1718 backend/canon.c:1728
+#: backend/canon.c:1713 backend/canon.c:1723
 #, no-c-format
 msgid "Transparency unit"
 msgstr ""
 
-#: backend/canon.c:1729
+#: backend/canon.c:1724
 #, no-c-format
 msgid "Switch on/off the transparency unit (FAU, film adapter unit)"
 msgstr ""
 
-#: backend/canon.c:1739
+#: backend/canon.c:1734
 #, no-c-format
 msgid "Negative film"
 msgstr ""
 
-#: backend/canon.c:1740
+#: backend/canon.c:1735
 #, no-c-format
 msgid "Positive or negative film"
 msgstr ""
 
-#: backend/canon.c:1749
+#: backend/canon.c:1744
 #, no-c-format
 msgid "Density control"
 msgstr ""
 
-#: backend/canon.c:1750
+#: backend/canon.c:1745
 #, no-c-format
 msgid "Set density control mode"
 msgstr ""
 
-#: backend/canon.c:1761
+#: backend/canon.c:1756
 #, no-c-format
 msgid "Transparency ratio"
 msgstr ""
 
-#: backend/canon.c:1775
+#: backend/canon.c:1770
 #, no-c-format
 msgid "Select film type"
 msgstr ""
 
-#: backend/canon.c:1776
+#: backend/canon.c:1771
 #, no-c-format
 msgid "Select the film type"
 msgstr ""
 
-#: backend/canon_dr.c:408 backend/epjitsu.c:233 backend/epson.c:501
-#: backend/epson2.c:115 backend/fujitsu.c:672 backend/gt68xx.c:148
-#: backend/hp3900_sane.c:418 backend/hp3900_sane.c:427
-#: backend/hp3900_sane.c:1017 backend/hp5590.c:85 backend/ma1509.c:108
-#: backend/magicolor.c:181 backend/mustek.c:156 backend/mustek.c:160
-#: backend/mustek.c:164 backend/pixma.c:901 backend/pixma_sane_options.c:92
-#: backend/snapscan-options.c:86 backend/test.c:192 backend/umax.c:181
+#: backend/canon_dr.c:413 backend/epjitsu.c:233 backend/epson.c:501
+#: backend/epson2-ops.c:101 backend/epson2.c:115 backend/epsonds-ops.c:32
+#: backend/epsonds.c:95 backend/epsonds.h:62 backend/fujitsu.c:677
+#: backend/genesys/genesys.h:78 backend/gt68xx.c:148
+#: backend/hp3900_sane.c:423 backend/hp3900_sane.c:432
+#: backend/hp3900_sane.c:1022 backend/hp5590.c:92 backend/kodakaio.c:617
+#: backend/ma1509.c:108 backend/magicolor.c:181 backend/mustek.c:156
+#: backend/mustek.c:160 backend/mustek.c:164 backend/pixma/pixma.c:920
+#: backend/pixma/pixma_sane_options.c:92 backend/snapscan-options.c:86
+#: backend/test.c:196 backend/umax.c:181
 #, no-c-format
 msgid "Flatbed"
 msgstr ""
 
-#: backend/canon_dr.c:409 backend/epjitsu.c:234 backend/fujitsu.c:673
+#: backend/canon_dr.c:414 backend/epjitsu.c:234 backend/fujitsu.c:678
 #: backend/kodak.c:140
 #, no-c-format
 msgid "ADF Front"
 msgstr ""
 
-#: backend/canon_dr.c:410 backend/epjitsu.c:235 backend/fujitsu.c:674
+#: backend/canon_dr.c:415 backend/epjitsu.c:235 backend/fujitsu.c:679
 #: backend/kodak.c:141
 #, no-c-format
 msgid "ADF Back"
 msgstr ""
 
-#: backend/canon_dr.c:411 backend/epjitsu.c:236 backend/fujitsu.c:675
-#: backend/hp5590.c:87 backend/kodak.c:142 backend/pixma.c:912
+#: backend/canon_dr.c:416 backend/epjitsu.c:236 backend/fujitsu.c:680
+#: backend/hp5590.c:94 backend/kodak.c:142 backend/pixma/pixma.c:931
 #, no-c-format
 msgid "ADF Duplex"
 msgstr ""
 
-#: backend/canon_dr.c:412
+#: backend/canon_dr.c:417
 #, no-c-format
 msgid "Card Front"
 msgstr ""
 
-#: backend/canon_dr.c:413
+#: backend/canon_dr.c:418
 #, no-c-format
 msgid "Card Back"
 msgstr ""
 
-#: backend/canon_dr.c:414
+#: backend/canon_dr.c:419
 #, no-c-format
 msgid "Card Duplex"
 msgstr ""
 
-#: backend/canon_dr.c:421 backend/epson.c:599 backend/epson.c:3096
-#: backend/epson2.c:201 backend/fujitsu.c:692 backend/genesys.c:89
-#: backend/genesys.c:96 backend/gt68xx_low.h:133 backend/hp-option.c:3093
+#: backend/canon_dr.c:426 backend/epson.c:599 backend/epson.c:3096
+#: backend/epson2.c:201 backend/fujitsu.c:697
+#: backend/genesys/genesys.cpp:120 backend/genesys/genesys.cpp:127
+#: backend/gt68xx_low.h:136 backend/hp-option.c:3096
 #, no-c-format
 msgid "Red"
 msgstr ""
 
-#: backend/canon_dr.c:422 backend/epson.c:600 backend/epson.c:3092
-#: backend/epson2.c:202 backend/fujitsu.c:693 backend/genesys.c:90
-#: backend/genesys.c:97 backend/gt68xx_low.h:134 backend/hp-option.c:3094
+#: backend/canon_dr.c:427 backend/epson.c:600 backend/epson.c:3092
+#: backend/epson2.c:202 backend/fujitsu.c:698
+#: backend/genesys/genesys.cpp:121 backend/genesys/genesys.cpp:128
+#: backend/gt68xx_low.h:137 backend/hp-option.c:3097
 #, no-c-format
 msgid "Green"
 msgstr ""
 
-#: backend/canon_dr.c:423 backend/epson.c:601 backend/epson.c:3100
-#: backend/epson2.c:203 backend/fujitsu.c:694 backend/genesys.c:91
-#: backend/genesys.c:98 backend/gt68xx_low.h:135 backend/hp-option.c:3095
+#: backend/canon_dr.c:428 backend/epson.c:601 backend/epson.c:3100
+#: backend/epson2.c:203 backend/fujitsu.c:699
+#: backend/genesys/genesys.cpp:122 backend/genesys/genesys.cpp:129
+#: backend/gt68xx_low.h:138 backend/hp-option.c:3098
 #, no-c-format
 msgid "Blue"
 msgstr ""
 
-#: backend/canon_dr.c:424
+#: backend/canon_dr.c:429
 #, no-c-format
 msgid "Enhance Red"
 msgstr ""
 
-#: backend/canon_dr.c:425
+#: backend/canon_dr.c:430
 #, no-c-format
 msgid "Enhance Green"
 msgstr ""
 
-#: backend/canon_dr.c:426
+#: backend/canon_dr.c:431
 #, no-c-format
 msgid "Enhance Blue"
 msgstr ""
 
-#: backend/canon_dr.c:428 backend/epson.c:556 backend/epson.c:564
+#: backend/canon_dr.c:433 backend/epson.c:556 backend/epson.c:564
 #: backend/epson.c:576 backend/epson.c:598 backend/epson2.c:165
 #: backend/epson2.c:173 backend/epson2.c:185 backend/epson2.c:200
-#: backend/epson2.c:214 backend/fujitsu.c:698 backend/genesys.c:99
-#: backend/leo.c:109 backend/matsushita.c:138 backend/matsushita.c:159
-#: backend/matsushita.c:191 backend/matsushita.c:213
+#: backend/epson2.c:214 backend/fujitsu.c:703
+#: backend/genesys/genesys.cpp:130 backend/leo.c:113
+#: backend/matsushita.c:142 backend/matsushita.c:163
+#: backend/matsushita.c:195 backend/matsushita.c:217
 #: backend/snapscan-options.c:91
 #, no-c-format
 msgid "None"
 msgstr ""
 
-#: backend/canon_dr.c:429 backend/fujitsu.c:699
+#: backend/canon_dr.c:434 backend/fujitsu.c:704
 #, no-c-format
 msgid "JPEG"
 msgstr ""
 
-#: backend/canon_dr.c:2449 backend/fujitsu.c:4066 backend/genesys.c:5769
-#: backend/kvs1025_opt.c:911
+#: backend/canon_dr.c:2479 backend/fujitsu.c:4117
+#: backend/genesys/genesys.cpp:4168 backend/kvs1025_opt.c:910
 #, no-c-format
 msgid "Software blank skip percentage"
 msgstr ""
 
-#: backend/canon_dr.c:2450 backend/fujitsu.c:4067
+#: backend/canon_dr.c:2480 backend/fujitsu.c:4118
 #, no-c-format
 msgid "Request driver to discard pages with low percentage of dark pixels"
 msgstr ""
 
-#: backend/epson.c:491 backend/epson2.c:108 backend/magicolor.c:174
+#: backend/epson.c:491 backend/epson2.c:108 backend/epsonds.c:88
+#: backend/kodakaio.c:611 backend/magicolor.c:174
 #, no-c-format
 msgid "Simplex"
 msgstr ""
 
-#: backend/epson.c:492 backend/epson2.c:109 backend/kvs1025.h:50
-#: backend/kvs20xx_opt.c:204 backend/kvs40xx_opt.c:353 backend/magicolor.c:175
+#: backend/epson.c:492 backend/epson2.c:109 backend/epsonds.c:89
+#: backend/kodakaio.c:612 backend/kvs1025.h:50 backend/kvs20xx_opt.c:204
+#: backend/kvs40xx_opt.c:353 backend/magicolor.c:175
 #: backend/matsushita.h:218
 #, no-c-format
 msgid "Duplex"
 msgstr ""
 
-#: backend/epson.c:502 backend/epson2.c:116 backend/pixma.c:918
+#: backend/epson.c:502 backend/epson2-ops.c:102 backend/epson2.c:116
+#: backend/epsonds-ops.c:33 backend/epsonds.h:63 backend/pixma/pixma.c:937
 #, no-c-format
 msgid "Transparency Unit"
 msgstr ""
 
-#: backend/epson.c:503 backend/epson2.c:118 backend/magicolor.c:182
-#: backend/mustek.c:160 backend/pixma.c:906 backend/test.c:192
-#: backend/umax.c:183
+#: backend/epson.c:503 backend/epson2-ops.c:104 backend/epson2.c:118
+#: backend/epsonds-ops.c:34 backend/epsonds.c:96 backend/epsonds.h:64
+#: backend/kodakaio.c:618 backend/magicolor.c:182 backend/mustek.c:160
+#: backend/pixma/pixma.c:925 backend/test.c:196 backend/umax.c:183
 #, no-c-format
 msgid "Automatic Document Feeder"
 msgstr ""
@@ -1724,8 +1737,8 @@
 msgid "CRT monitors"
 msgstr ""
 
-#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:682
-#: backend/hp-option.c:3226 backend/test.c:143
+#: backend/epson.c:656 backend/epson2.c:254 backend/fujitsu.c:687
+#: backend/hp-option.c:3229 backend/test.c:147
 #, no-c-format
 msgid "Default"
 msgstr ""
@@ -1788,49 +1801,51 @@
 msgid "Max"
 msgstr ""
 
-#: backend/epson.c:2813 backend/epson2.c:977 backend/genesys.c:5535
-#: backend/gt68xx.c:458 backend/hp-option.c:2914 backend/kvs1025_opt.c:522
+#: backend/epson.c:2813 backend/epson2.c:976 backend/epsonds.c:629
+#: backend/genesys/genesys.cpp:3965 backend/gt68xx.c:451
+#: backend/hp-option.c:2917 backend/kvs1025_opt.c:521
 #: backend/kvs20xx_opt.c:171 backend/kvs40xx_opt.c:320 backend/ma1509.c:501
-#: backend/matsushita.c:1084 backend/microtek2.h:598 backend/mustek.c:4203
-#: backend/mustek_usb.c:260 backend/mustek_usb2.c:344 backend/niash.c:734
-#: backend/plustek.c:721 backend/plustek_pp.c:658 backend/sceptre.c:673
-#: backend/snapscan-options.c:354 backend/stv680.c:1030 backend/teco2.c:1886
-#: backend/test.c:306 backend/u12.c:473 backend/umax.c:5054
+#: backend/matsushita.c:1088 backend/microtek2.h:598 backend/mustek.c:4215
+#: backend/mustek_usb.c:256 backend/mustek_usb2.c:344 backend/niash.c:734
+#: backend/plustek.c:721 backend/plustek_pp.c:658 backend/sceptre.c:677
+#: backend/snapscan-options.c:354 backend/stv680.c:1034
+#: backend/teco2.c:1886 backend/test.c:310 backend/u12.c:473
+#: backend/umax.c:5054
 #, no-c-format
 msgid "Scan Mode"
 msgstr ""
 
-#: backend/epson.c:2845 backend/epson2.c:1012
+#: backend/epson.c:2845 backend/epson2.c:1011
 #, no-c-format
 msgid "Selects the halftone."
 msgstr ""
 
-#: backend/epson.c:2867 backend/epson2.c:1033
+#: backend/epson.c:2867 backend/epson2.c:1032
 #, no-c-format
 msgid "Dropout"
 msgstr ""
 
-#: backend/epson.c:2868 backend/epson2.c:1034
+#: backend/epson.c:2868 backend/epson2.c:1033
 #, no-c-format
 msgid "Selects the dropout."
 msgstr ""
 
-#: backend/epson.c:2880 backend/epson2.c:1046
+#: backend/epson.c:2880 backend/epson2.c:1045
 #, no-c-format
 msgid "Selects the brightness."
 msgstr ""
 
-#: backend/epson.c:2895 backend/epson2.c:1059
+#: backend/epson.c:2895 backend/epson2.c:1058
 #, no-c-format
 msgid "Sharpness"
 msgstr ""
 
-#: backend/epson.c:3031 backend/epson2.c:1175 backend/epson2.c:1222
+#: backend/epson.c:3031 backend/epson2.c:1174 backend/epson2.c:1221
 #, no-c-format
 msgid "Color correction"
 msgstr ""
 
-#: backend/epson.c:3034 backend/epson2.c:1177
+#: backend/epson.c:3034 backend/epson2.c:1176
 #, no-c-format
 msgid "Sets the color correction table for the selected output device."
 msgstr ""
@@ -1920,17 +1935,17 @@
 msgid "Controls blue level"
 msgstr ""
 
-#: backend/epson.c:3206 backend/epson2.c:1256
+#: backend/epson.c:3206 backend/epson2.c:1255
 #, no-c-format
 msgid "Mirror the image."
 msgstr ""
 
-#: backend/epson.c:3232 backend/mustek.c:4332
+#: backend/epson.c:3232 backend/mustek.c:4344
 #, no-c-format
 msgid "Fast preview"
 msgstr ""
 
-#: backend/epson.c:3245 backend/epson2.c:1266
+#: backend/epson.c:3245 backend/epson2.c:1265
 #, no-c-format
 msgid "Auto area segmentation"
 msgstr ""
@@ -1960,47 +1975,49 @@
 msgid "Quick format"
 msgstr ""
 
-#: backend/epson.c:3360 backend/epson2.c:1341
+#: backend/epson.c:3360 backend/epson2.c:1340 backend/epsonds.c:726
 #, no-c-format
 msgid "Optional equipment"
 msgstr ""
 
-#: backend/epson.c:3431 backend/epson2.c:1394
+#: backend/epson.c:3431 backend/epson2.c:1393 backend/epsonds.c:742
 #, no-c-format
 msgid "Eject"
 msgstr ""
 
-#: backend/epson.c:3432 backend/epson2.c:1395
+#: backend/epson.c:3432 backend/epson2.c:1394 backend/epsonds.c:743
 #, no-c-format
 msgid "Eject the sheet in the ADF"
 msgstr ""
 
-#: backend/epson.c:3444 backend/epson2.c:1405
+#: backend/epson.c:3444 backend/epson2.c:1404
 #, no-c-format
 msgid "Auto eject"
 msgstr ""
 
-#: backend/epson.c:3445 backend/epson2.c:1407
+#: backend/epson.c:3445 backend/epson2.c:1406
 #, no-c-format
 msgid "Eject document after scanning"
 msgstr ""
 
-#: backend/epson.c:3457 backend/epson2.c:1417 backend/magicolor.c:2419
+#: backend/epson.c:3457 backend/epson2.c:1416 backend/epsonds.c:758
+#: backend/kodakaio.c:2855 backend/magicolor.c:2450
 #, no-c-format
 msgid "ADF Mode"
 msgstr ""
 
-#: backend/epson.c:3459 backend/epson2.c:1419 backend/magicolor.c:2421
+#: backend/epson.c:3459 backend/epson2.c:1418 backend/epsonds.c:760
+#: backend/kodakaio.c:2857 backend/magicolor.c:2452
 #, no-c-format
 msgid "Selects the ADF mode (simplex/duplex)"
 msgstr ""
 
-#: backend/epson.c:3473 backend/epson2.c:1431
+#: backend/epson.c:3473 backend/epson2.c:1430
 #, no-c-format
 msgid "Bay"
 msgstr ""
 
-#: backend/epson.c:3474 backend/epson2.c:1432
+#: backend/epson.c:3474 backend/epson2.c:1431
 #, no-c-format
 msgid "Select bay to scan"
 msgstr ""
@@ -2034,12 +2051,12 @@
 "pressed to actually start the scan process."
 msgstr ""
 
-#: backend/epson2.c:102 backend/pixma.c:390
+#: backend/epson2.c:102 backend/pixma/pixma.c:409
 #, no-c-format
 msgid "Infrared"
 msgstr ""
 
-#: backend/epson2.c:117
+#: backend/epson2-ops.c:103 backend/epson2.c:117
 #, no-c-format
 msgid "TPU8x10"
 msgstr ""
@@ -2064,490 +2081,490 @@
 msgid "User defined CCT profile"
 msgstr ""
 
-#: backend/fujitsu.c:683 backend/hp-option.c:3327 backend/hp-option.c:3340
+#: backend/fujitsu.c:688 backend/hp-option.c:3330 backend/hp-option.c:3343
 #, no-c-format
 msgid "On"
 msgstr ""
 
-#: backend/fujitsu.c:684 backend/hp-option.c:3159 backend/hp-option.c:3326
-#: backend/hp-option.c:3339
+#: backend/fujitsu.c:689 backend/hp-option.c:3162 backend/hp-option.c:3329
+#: backend/hp-option.c:3342
 #, no-c-format
 msgid "Off"
 msgstr ""
 
-#: backend/fujitsu.c:686
+#: backend/fujitsu.c:691
 #, no-c-format
 msgid "DTC"
 msgstr ""
 
-#: backend/fujitsu.c:687
+#: backend/fujitsu.c:692
 #, no-c-format
 msgid "SDTC"
 msgstr ""
 
-#: backend/fujitsu.c:689 backend/teco1.c:1152 backend/teco1.c:1153
-#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:977
-#: backend/teco3.c:978
+#: backend/fujitsu.c:694 backend/teco1.c:1156 backend/teco1.c:1157
+#: backend/teco2.c:1971 backend/teco2.c:1972 backend/teco3.c:981
+#: backend/teco3.c:982
 #, no-c-format
 msgid "Dither"
 msgstr ""
 
-#: backend/fujitsu.c:690
+#: backend/fujitsu.c:695
 #, no-c-format
 msgid "Diffusion"
 msgstr ""
 
-#: backend/fujitsu.c:695
+#: backend/fujitsu.c:700
 #, no-c-format
 msgid "White"
 msgstr ""
 
-#: backend/fujitsu.c:696
+#: backend/fujitsu.c:701
 #, no-c-format
 msgid "Black"
 msgstr ""
 
-#: backend/fujitsu.c:701
+#: backend/fujitsu.c:706
 #, no-c-format
 msgid "Continue"
 msgstr ""
 
-#: backend/fujitsu.c:702
+#: backend/fujitsu.c:707
 #, no-c-format
 msgid "Stop"
 msgstr ""
 
-#: backend/fujitsu.c:704
+#: backend/fujitsu.c:709
 #, no-c-format
 msgid "10mm"
 msgstr ""
 
-#: backend/fujitsu.c:705
+#: backend/fujitsu.c:710
 #, no-c-format
 msgid "15mm"
 msgstr ""
 
-#: backend/fujitsu.c:706
+#: backend/fujitsu.c:711
 #, no-c-format
 msgid "20mm"
 msgstr ""
 
-#: backend/fujitsu.c:708 backend/hp-option.c:3045
+#: backend/fujitsu.c:713 backend/hp-option.c:3048
 #, no-c-format
 msgid "Horizontal"
 msgstr ""
 
-#: backend/fujitsu.c:709
+#: backend/fujitsu.c:714
 #, no-c-format
 msgid "Horizontal bold"
 msgstr ""
 
-#: backend/fujitsu.c:710
+#: backend/fujitsu.c:715
 #, no-c-format
 msgid "Horizontal narrow"
 msgstr ""
 
-#: backend/fujitsu.c:711 backend/hp-option.c:3044
+#: backend/fujitsu.c:716 backend/hp-option.c:3047
 #, no-c-format
 msgid "Vertical"
 msgstr ""
 
-#: backend/fujitsu.c:712
+#: backend/fujitsu.c:717
 #, no-c-format
 msgid "Vertical bold"
 msgstr ""
 
-#: backend/fujitsu.c:714
+#: backend/fujitsu.c:719
 #, no-c-format
 msgid "Top to bottom"
 msgstr ""
 
-#: backend/fujitsu.c:715
+#: backend/fujitsu.c:720
 #, no-c-format
 msgid "Bottom to top"
 msgstr ""
 
-#: backend/fujitsu.c:717
+#: backend/fujitsu.c:722
 #, no-c-format
 msgid "Front"
 msgstr ""
 
-#: backend/fujitsu.c:718
+#: backend/fujitsu.c:723
 #, no-c-format
 msgid "Back"
 msgstr ""
 
-#: backend/fujitsu.c:3097 backend/pixma_sane_options.c:145
+#: backend/fujitsu.c:3148 backend/pixma/pixma_sane_options.c:145
 #, no-c-format
 msgid "Gamma function exponent"
 msgstr ""
 
-#: backend/fujitsu.c:3098 backend/pixma_sane_options.c:146
+#: backend/fujitsu.c:3149 backend/pixma/pixma_sane_options.c:146
 #, no-c-format
 msgid "Changes intensity of midtones"
 msgstr ""
 
-#: backend/fujitsu.c:3147
+#: backend/fujitsu.c:3198
 #, no-c-format
 msgid "RIF"
 msgstr ""
 
-#: backend/fujitsu.c:3148
+#: backend/fujitsu.c:3199
 #, no-c-format
 msgid "Reverse image format"
 msgstr ""
 
-#: backend/fujitsu.c:3165
+#: backend/fujitsu.c:3216
 #, no-c-format
 msgid "Halftone type"
 msgstr ""
 
-#: backend/fujitsu.c:3166
+#: backend/fujitsu.c:3217
 #, no-c-format
 msgid "Control type of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3187
+#: backend/fujitsu.c:3238
 #, no-c-format
 msgid "Control pattern of halftone filter"
 msgstr ""
 
-#: backend/fujitsu.c:3209
+#: backend/fujitsu.c:3260
 #, no-c-format
 msgid "Outline"
 msgstr ""
 
-#: backend/fujitsu.c:3210
+#: backend/fujitsu.c:3261
 #, no-c-format
 msgid "Perform outline extraction"
 msgstr ""
 
-#: backend/fujitsu.c:3221
+#: backend/fujitsu.c:3272
 #, no-c-format
 msgid "Emphasis"
 msgstr ""
 
-#: backend/fujitsu.c:3222
+#: backend/fujitsu.c:3273
 #, no-c-format
 msgid "Negative to smooth or positive to sharpen image"
 msgstr ""
 
-#: backend/fujitsu.c:3240
+#: backend/fujitsu.c:3291
 #, no-c-format
 msgid "Separation"
 msgstr ""
 
-#: backend/fujitsu.c:3241
+#: backend/fujitsu.c:3292
 #, no-c-format
 msgid "Enable automatic separation of image and text"
 msgstr ""
 
-#: backend/fujitsu.c:3252
+#: backend/fujitsu.c:3303
 #, no-c-format
 msgid "Mirroring"
 msgstr ""
 
-#: backend/fujitsu.c:3253
+#: backend/fujitsu.c:3304
 #, no-c-format
 msgid "Reflect output image horizontally"
 msgstr ""
 
-#: backend/fujitsu.c:3270
+#: backend/fujitsu.c:3321
 #, no-c-format
 msgid "White level follower"
 msgstr ""
 
-#: backend/fujitsu.c:3271
+#: backend/fujitsu.c:3322
 #, no-c-format
 msgid "Control white level follower"
 msgstr ""
 
-#: backend/fujitsu.c:3289
+#: backend/fujitsu.c:3340
 #, no-c-format
 msgid "BP filter"
 msgstr ""
 
-#: backend/fujitsu.c:3290
+#: backend/fujitsu.c:3341
 #, no-c-format
 msgid "Improves quality of high resolution ball-point pen text"
 msgstr ""
 
-#: backend/fujitsu.c:3306 backend/hp-option.h:73
+#: backend/fujitsu.c:3357 backend/hp-option.h:73
 #, no-c-format
 msgid "Smoothing"
 msgstr ""
 
-#: backend/fujitsu.c:3307
+#: backend/fujitsu.c:3358
 #, no-c-format
 msgid "Enable smoothing for improved OCR"
 msgstr ""
 
-#: backend/fujitsu.c:3323
+#: backend/fujitsu.c:3374
 #, no-c-format
 msgid "Gamma curve"
 msgstr ""
 
-#: backend/fujitsu.c:3324
+#: backend/fujitsu.c:3375
 #, no-c-format
 msgid "Gamma curve, from light to dark, but upper two may not work"
 msgstr ""
 
-#: backend/fujitsu.c:3346 backend/genesys.c:5832
-#: backend/pixma_sane_options.c:335
+#: backend/fujitsu.c:3397 backend/genesys/genesys.cpp:4229
+#: backend/pixma/pixma_sane_options.c:335
 #, no-c-format
 msgid "Threshold curve"
 msgstr ""
 
-#: backend/fujitsu.c:3347
+#: backend/fujitsu.c:3398
 #, no-c-format
 msgid "Threshold curve, from light to dark, but upper two may not be linear"
 msgstr ""
 
-#: backend/fujitsu.c:3369
+#: backend/fujitsu.c:3420
 #, no-c-format
 msgid "Threshold white"
 msgstr ""
 
-#: backend/fujitsu.c:3370
+#: backend/fujitsu.c:3421
 #, no-c-format
 msgid "Set pixels equal to threshold to white instead of black"
 msgstr ""
 
-#: backend/fujitsu.c:3386 backend/fujitsu.c:3387
+#: backend/fujitsu.c:3437 backend/fujitsu.c:3438
 #, no-c-format
 msgid "Noise removal"
 msgstr ""
 
-#: backend/fujitsu.c:3403
+#: backend/fujitsu.c:3454
 #, no-c-format
 msgid "Matrix 5x5"
 msgstr ""
 
-#: backend/fujitsu.c:3404
+#: backend/fujitsu.c:3455
 #, no-c-format
 msgid "Remove 5 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3420
+#: backend/fujitsu.c:3471
 #, no-c-format
 msgid "Matrix 4x4"
 msgstr ""
 
-#: backend/fujitsu.c:3421
+#: backend/fujitsu.c:3472
 #, no-c-format
 msgid "Remove 4 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3437
+#: backend/fujitsu.c:3488
 #, no-c-format
 msgid "Matrix 3x3"
 msgstr ""
 
-#: backend/fujitsu.c:3438
+#: backend/fujitsu.c:3489
 #, no-c-format
 msgid "Remove 3 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3454
+#: backend/fujitsu.c:3505
 #, no-c-format
 msgid "Matrix 2x2"
 msgstr ""
 
-#: backend/fujitsu.c:3455
+#: backend/fujitsu.c:3506
 #, no-c-format
 msgid "Remove 2 pixel square noise"
 msgstr ""
 
-#: backend/fujitsu.c:3474
+#: backend/fujitsu.c:3525
 #, no-c-format
 msgid "Variance"
 msgstr ""
 
-#: backend/fujitsu.c:3475
+#: backend/fujitsu.c:3526
 #, no-c-format
 msgid "Set SDTC variance rate (sensitivity), 0 equals 127"
 msgstr ""
 
-#: backend/fujitsu.c:3508
+#: backend/fujitsu.c:3559
 #, no-c-format
 msgid "Auto width detection"
 msgstr ""
 
-#: backend/fujitsu.c:3509
+#: backend/fujitsu.c:3560
 #, no-c-format
 msgid "Scanner detects paper sides. May reduce scanning speed."
 msgstr ""
 
-#: backend/fujitsu.c:3526
+#: backend/fujitsu.c:3577
 #, no-c-format
 msgid "Auto length detection"
 msgstr ""
 
-#: backend/fujitsu.c:3527
+#: backend/fujitsu.c:3578
 #, no-c-format
 msgid "Scanner detects paper lower edge. May confuse some frontends."
 msgstr ""
 
-#: backend/fujitsu.c:3553
+#: backend/fujitsu.c:3604
 #, no-c-format
 msgid "Compression"
 msgstr ""
 
-#: backend/fujitsu.c:3554
+#: backend/fujitsu.c:3605
 #, no-c-format
 msgid "Enable compressed data. May crash your front-end program"
 msgstr ""
 
-#: backend/fujitsu.c:3574
+#: backend/fujitsu.c:3625
 #, no-c-format
 msgid "Compression argument"
 msgstr ""
 
-#: backend/fujitsu.c:3575
+#: backend/fujitsu.c:3626
 #, no-c-format
 msgid ""
 "Level of JPEG compression. 1 is small file, 7 is large file. 0 (default) is "
 "same as 4"
 msgstr ""
 
-#: backend/fujitsu.c:3605
+#: backend/fujitsu.c:3656
 #, no-c-format
 msgid "DF action"
 msgstr ""
 
-#: backend/fujitsu.c:3606
+#: backend/fujitsu.c:3657
 #, no-c-format
 msgid "Action following double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3622
+#: backend/fujitsu.c:3673
 #, no-c-format
 msgid "DF skew"
 msgstr ""
 
-#: backend/fujitsu.c:3623
+#: backend/fujitsu.c:3674
 #, no-c-format
 msgid "Enable double feed error due to skew"
 msgstr ""
 
-#: backend/fujitsu.c:3641
+#: backend/fujitsu.c:3692
 #, no-c-format
 msgid "DF thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3642
+#: backend/fujitsu.c:3693
 #, no-c-format
 msgid "Enable double feed error due to paper thickness"
 msgstr ""
 
-#: backend/fujitsu.c:3660
+#: backend/fujitsu.c:3711
 #, no-c-format
 msgid "DF length"
 msgstr ""
 
-#: backend/fujitsu.c:3661
+#: backend/fujitsu.c:3712
 #, no-c-format
 msgid "Enable double feed error due to paper length"
 msgstr ""
 
-#: backend/fujitsu.c:3684
+#: backend/fujitsu.c:3735
 #, no-c-format
 msgid "DF length difference"
 msgstr ""
 
-#: backend/fujitsu.c:3685
+#: backend/fujitsu.c:3736
 #, no-c-format
 msgid "Difference in page length to trigger double feed error"
 msgstr ""
 
-#: backend/fujitsu.c:3708
+#: backend/fujitsu.c:3759
 #, no-c-format
 msgid "DF recovery mode"
 msgstr ""
 
-#: backend/fujitsu.c:3709
+#: backend/fujitsu.c:3760
 #, no-c-format
 msgid "Request scanner to reverse feed on paper jam"
 msgstr ""
 
-#: backend/fujitsu.c:3728
+#: backend/fujitsu.c:3779
 #, no-c-format
 msgid "Paper protection"
 msgstr ""
 
-#: backend/fujitsu.c:3729
+#: backend/fujitsu.c:3780
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3748
+#: backend/fujitsu.c:3799
 #, no-c-format
 msgid "Advanced paper protection"
 msgstr ""
 
-#: backend/fujitsu.c:3749
+#: backend/fujitsu.c:3800
 #, no-c-format
 msgid "Request scanner to predict jams in the ADF using improved sensors"
 msgstr ""
 
-#: backend/fujitsu.c:3768
+#: backend/fujitsu.c:3819
 #, no-c-format
 msgid "Staple detection"
 msgstr ""
 
-#: backend/fujitsu.c:3769
+#: backend/fujitsu.c:3820
 #, no-c-format
 msgid "Request scanner to detect jams in the ADF caused by staples"
 msgstr ""
 
-#: backend/fujitsu.c:3788
+#: backend/fujitsu.c:3839
 #, no-c-format
 msgid "Background color"
 msgstr ""
 
-#: backend/fujitsu.c:3789
+#: backend/fujitsu.c:3840
 #, no-c-format
 msgid "Set color of background for scans. May conflict with overscan option"
 msgstr ""
 
-#: backend/fujitsu.c:3809
+#: backend/fujitsu.c:3860
 #, no-c-format
 msgid "Dropout color"
 msgstr ""
 
-#: backend/fujitsu.c:3810
+#: backend/fujitsu.c:3861
 #, no-c-format
 msgid ""
 "One-pass scanners use only one color during gray or binary scanning, useful "
 "for colored paper or ink"
 msgstr ""
 
-#: backend/fujitsu.c:3833
+#: backend/fujitsu.c:3884
 #, no-c-format
 msgid "Buffer mode"
 msgstr ""
 
-#: backend/fujitsu.c:3834
+#: backend/fujitsu.c:3885
 #, no-c-format
 msgid "Request scanner to read pages quickly from ADF into internal memory"
 msgstr ""
 
-#: backend/fujitsu.c:3853
+#: backend/fujitsu.c:3904
 #, no-c-format
 msgid "Prepick"
 msgstr ""
 
-#: backend/fujitsu.c:3854
+#: backend/fujitsu.c:3905
 #, no-c-format
 msgid "Request scanner to grab next page from ADF"
 msgstr ""
 
-#: backend/fujitsu.c:3873
+#: backend/fujitsu.c:3924
 #, no-c-format
 msgid "Overscan"
 msgstr ""
 
-#: backend/fujitsu.c:3874
+#: backend/fujitsu.c:3925
 #, no-c-format
 msgid ""
 "Collect a few mm of background on top side of scan, before paper enters ADF, "
@@ -2555,65 +2572,65 @@
 "remaining sides. May conflict with bgcolor option"
 msgstr ""
 
-#: backend/fujitsu.c:3892
+#: backend/fujitsu.c:3943
 #, no-c-format
 msgid "Sleep timer"
 msgstr ""
 
-#: backend/fujitsu.c:3893
+#: backend/fujitsu.c:3944
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches to sleep mode"
 msgstr ""
 
-#: backend/fujitsu.c:3911
+#: backend/fujitsu.c:3962
 #, no-c-format
 msgid "Off timer"
 msgstr ""
 
-#: backend/fujitsu.c:3912
+#: backend/fujitsu.c:3963
 #, no-c-format
 msgid ""
 "Time in minutes until the internal power supply switches the scanner off. "
 "Will be rounded to nearest 15 minutes. Zero means never power off."
 msgstr ""
 
-#: backend/fujitsu.c:3930
+#: backend/fujitsu.c:3981
 #, no-c-format
 msgid "Duplex offset"
 msgstr ""
 
-#: backend/fujitsu.c:3931
+#: backend/fujitsu.c:3982
 #, no-c-format
 msgid "Adjust front/back offset"
 msgstr ""
 
-#: backend/fujitsu.c:3948 backend/plustek.c:1025 backend/umax_pp.c:804
+#: backend/fujitsu.c:3999 backend/plustek.c:1025 backend/umax_pp.c:794
 #, no-c-format
 msgid "Green offset"
 msgstr ""
 
-#: backend/fujitsu.c:3949
+#: backend/fujitsu.c:4000
 #, no-c-format
 msgid "Adjust green/red offset"
 msgstr ""
 
-#: backend/fujitsu.c:3966 backend/plustek.c:1041 backend/umax_pp.c:816
+#: backend/fujitsu.c:4017 backend/plustek.c:1041 backend/umax_pp.c:806
 #, no-c-format
 msgid "Blue offset"
 msgstr ""
 
-#: backend/fujitsu.c:3967
+#: backend/fujitsu.c:4018
 #, no-c-format
 msgid "Adjust blue/red offset"
 msgstr ""
 
-#: backend/fujitsu.c:3980
+#: backend/fujitsu.c:4031
 #, no-c-format
 msgid "Low Memory"
 msgstr ""
 
-#: backend/fujitsu.c:3981
+#: backend/fujitsu.c:4032
 #, no-c-format
 msgid ""
 "Limit driver memory usage for use in embedded systems. Causes some duplex "
@@ -2622,172 +2639,172 @@
 "used with custom front-end software."
 msgstr ""
 
-#: backend/fujitsu.c:3996
+#: backend/fujitsu.c:4047
 #, no-c-format
 msgid "Duplex side"
 msgstr ""
 
-#: backend/fujitsu.c:3997
+#: backend/fujitsu.c:4048
 #, no-c-format
 msgid ""
 "Tells which side (0=front, 1=back) of a duplex scan the next call to "
 "sane_read will return."
 msgstr ""
 
-#: backend/fujitsu.c:4008
+#: backend/fujitsu.c:4059
 #, no-c-format
 msgid "Hardware deskew and crop"
 msgstr ""
 
-#: backend/fujitsu.c:4009
+#: backend/fujitsu.c:4060
 #, no-c-format
 msgid "Request scanner to rotate and crop pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4020 backend/kvs1025_opt.c:872
+#: backend/fujitsu.c:4071 backend/kvs1025_opt.c:871
 #, no-c-format
 msgid "Software deskew"
 msgstr ""
 
-#: backend/fujitsu.c:4021
+#: backend/fujitsu.c:4072
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4033 backend/kvs1025_opt.c:881
+#: backend/fujitsu.c:4084 backend/kvs1025_opt.c:880
 #, no-c-format
 msgid "Software despeckle diameter"
 msgstr ""
 
-#: backend/fujitsu.c:4034
+#: backend/fujitsu.c:4085
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan."
 msgstr ""
 
-#: backend/fujitsu.c:4053 backend/genesys.c:5760
+#: backend/fujitsu.c:4104 backend/genesys/genesys.cpp:4159
 #, no-c-format
 msgid "Software crop"
 msgstr ""
 
-#: backend/fujitsu.c:4054
+#: backend/fujitsu.c:4105
 #, no-c-format
 msgid "Request driver to remove border from pages digitally."
 msgstr ""
 
-#: backend/fujitsu.c:4083
+#: backend/fujitsu.c:4134
 #, no-c-format
 msgid "Halt on Cancel"
 msgstr ""
 
-#: backend/fujitsu.c:4084
+#: backend/fujitsu.c:4135
 #, no-c-format
 msgid ""
 "Request driver to halt the paper feed instead of eject during a cancel."
 msgstr ""
 
-#: backend/fujitsu.c:4095
+#: backend/fujitsu.c:4146
 #, no-c-format
 msgid "Endorser Options"
 msgstr ""
 
-#: backend/fujitsu.c:4096
+#: backend/fujitsu.c:4147
 #, no-c-format
 msgid "Controls for endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4107
+#: backend/fujitsu.c:4158
 #, no-c-format
 msgid "Endorser"
 msgstr ""
 
-#: backend/fujitsu.c:4108
+#: backend/fujitsu.c:4159
 #, no-c-format
 msgid "Enable endorser unit"
 msgstr ""
 
-#: backend/fujitsu.c:4123
+#: backend/fujitsu.c:4174
 #, no-c-format
 msgid "Endorser bits"
 msgstr ""
 
-#: backend/fujitsu.c:4124
+#: backend/fujitsu.c:4175
 #, no-c-format
 msgid "Determines maximum endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4149
+#: backend/fujitsu.c:4200
 #, no-c-format
 msgid "Endorser value"
 msgstr ""
 
-#: backend/fujitsu.c:4150
+#: backend/fujitsu.c:4201
 #, no-c-format
 msgid "Initial endorser counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4173
+#: backend/fujitsu.c:4224
 #, no-c-format
 msgid "Endorser step"
 msgstr ""
 
-#: backend/fujitsu.c:4174
+#: backend/fujitsu.c:4225
 #, no-c-format
 msgid "Change endorser counter value by this much for each page."
 msgstr ""
 
-#: backend/fujitsu.c:4197
+#: backend/fujitsu.c:4248
 #, no-c-format
 msgid "Endorser Y"
 msgstr ""
 
-#: backend/fujitsu.c:4198
+#: backend/fujitsu.c:4249
 #, no-c-format
 msgid "Endorser print offset from top of paper."
 msgstr ""
 
-#: backend/fujitsu.c:4223
+#: backend/fujitsu.c:4274
 #, no-c-format
 msgid "Endorser font"
 msgstr ""
 
-#: backend/fujitsu.c:4224
+#: backend/fujitsu.c:4275
 #, no-c-format
 msgid "Endorser printing font."
 msgstr ""
 
-#: backend/fujitsu.c:4253
+#: backend/fujitsu.c:4304
 #, no-c-format
 msgid "Endorser direction"
 msgstr ""
 
-#: backend/fujitsu.c:4254
+#: backend/fujitsu.c:4305
 #, no-c-format
 msgid "Endorser printing direction."
 msgstr ""
 
-#: backend/fujitsu.c:4278
+#: backend/fujitsu.c:4329
 #, no-c-format
 msgid "Endorser side"
 msgstr ""
 
-#: backend/fujitsu.c:4279
+#: backend/fujitsu.c:4330
 #, no-c-format
 msgid "Endorser printing side, requires hardware support to change"
 msgstr ""
 
-#: backend/fujitsu.c:4304
+#: backend/fujitsu.c:4355
 #, no-c-format
 msgid "Endorser string"
 msgstr ""
 
-#: backend/fujitsu.c:4305
+#: backend/fujitsu.c:4356
 #, no-c-format
 msgid ""
 "Endorser alphanumeric print format. %05ud or %08ud at the end will be "
 "replaced by counter value."
 msgstr ""
 
-#: backend/fujitsu.c:4332
+#: backend/fujitsu.c:4383
 #, no-c-format
 msgid "Top edge"
 msgstr ""
@@ -2797,177 +2814,177 @@
 msgid "Paper is pulled partly into adf"
 msgstr ""
 
-#: backend/fujitsu.c:4344
+#: backend/fujitsu.c:4395
 #, no-c-format
 msgid "A3 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4345
+#: backend/fujitsu.c:4396
 #, no-c-format
 msgid "A3 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4356
+#: backend/fujitsu.c:4407
 #, no-c-format
 msgid "B4 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4357
+#: backend/fujitsu.c:4408
 #, no-c-format
 msgid "B4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4368
+#: backend/fujitsu.c:4419
 #, no-c-format
 msgid "A4 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4369
+#: backend/fujitsu.c:4420
 #, no-c-format
 msgid "A4 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4380
+#: backend/fujitsu.c:4431
 #, no-c-format
 msgid "B5 paper"
 msgstr ""
 
-#: backend/fujitsu.c:4381
+#: backend/fujitsu.c:4432
 #, no-c-format
 msgid "B5 paper detected"
 msgstr ""
 
-#: backend/fujitsu.c:4404
+#: backend/fujitsu.c:4455
 #, no-c-format
 msgid "OMR or DF"
 msgstr ""
 
-#: backend/fujitsu.c:4405
+#: backend/fujitsu.c:4456
 #, no-c-format
 msgid "OMR or double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4428
+#: backend/fujitsu.c:4479
 #, no-c-format
 msgid "Power saving"
 msgstr ""
 
-#: backend/fujitsu.c:4429
+#: backend/fujitsu.c:4480
 #, no-c-format
 msgid "Scanner in power saving mode"
 msgstr ""
 
-#: backend/fujitsu.c:4452
+#: backend/fujitsu.c:4503
 #, no-c-format
 msgid "Manual feed"
 msgstr ""
 
-#: backend/fujitsu.c:4453
+#: backend/fujitsu.c:4504
 #, no-c-format
 msgid "Manual feed selected"
 msgstr ""
 
-#: backend/fujitsu.c:4476
+#: backend/fujitsu.c:4527
 #, no-c-format
 msgid "Function"
 msgstr ""
 
-#: backend/fujitsu.c:4477
+#: backend/fujitsu.c:4528
 #, no-c-format
 msgid "Function character on screen"
 msgstr ""
 
-#: backend/fujitsu.c:4488
+#: backend/fujitsu.c:4539
 #, no-c-format
 msgid "Ink low"
 msgstr ""
 
-#: backend/fujitsu.c:4489
+#: backend/fujitsu.c:4540
 #, no-c-format
 msgid "Imprinter ink running low"
 msgstr ""
 
-#: backend/fujitsu.c:4500
+#: backend/fujitsu.c:4551
 #, no-c-format
 msgid "Double feed"
 msgstr ""
 
-#: backend/fujitsu.c:4501
+#: backend/fujitsu.c:4552
 #, no-c-format
 msgid "Double feed detected"
 msgstr ""
 
-#: backend/fujitsu.c:4512
+#: backend/fujitsu.c:4563
 #, no-c-format
 msgid "Error code"
 msgstr ""
 
-#: backend/fujitsu.c:4513
+#: backend/fujitsu.c:4564
 #, no-c-format
 msgid "Hardware error code"
 msgstr ""
 
-#: backend/fujitsu.c:4524
+#: backend/fujitsu.c:4575
 #, no-c-format
 msgid "Skew angle"
 msgstr ""
 
-#: backend/fujitsu.c:4525
+#: backend/fujitsu.c:4576
 #, no-c-format
 msgid "Requires black background for scanning"
 msgstr ""
 
-#: backend/fujitsu.c:4536
+#: backend/fujitsu.c:4587
 #, no-c-format
 msgid "Ink remaining"
 msgstr ""
 
-#: backend/fujitsu.c:4537
+#: backend/fujitsu.c:4588
 #, no-c-format
 msgid "Imprinter ink level"
 msgstr ""
 
-#: backend/fujitsu.c:4548
+#: backend/fujitsu.c:4599
 #, no-c-format
 msgid "Density"
 msgstr ""
 
-#: backend/fujitsu.c:4549
+#: backend/fujitsu.c:4600
 #, no-c-format
 msgid "Density dial"
 msgstr ""
 
-#: backend/fujitsu.c:4560 backend/fujitsu.c:4561
+#: backend/fujitsu.c:4611 backend/fujitsu.c:4612
 #, no-c-format
 msgid "Duplex switch"
 msgstr ""
 
-#: backend/genesys.c:5761
+#: backend/genesys/genesys.cpp:4160
 #, no-c-format
 msgid "Request backend to remove border from pages digitally"
 msgstr ""
 
-#: backend/genesys.c:5770 backend/kvs1025_opt.c:913
+#: backend/genesys/genesys.cpp:4169 backend/kvs1025_opt.c:912
 #, no-c-format
 msgid "Request driver to discard pages with low numbers of dark pixels"
 msgstr ""
 
-#: backend/genesys.c:5781 backend/kvs1025_opt.c:893
+#: backend/genesys/genesys.cpp:4179 backend/kvs1025_opt.c:892
 #, no-c-format
 msgid "Software derotate"
 msgstr ""
 
-#: backend/genesys.c:5782 backend/kvs1025_opt.c:895
+#: backend/genesys/genesys.cpp:4180 backend/kvs1025_opt.c:894
 #, no-c-format
 msgid "Request driver to detect and correct 90 degree image rotation"
 msgstr ""
 
-#: backend/genesys.c:5813 backend/pixma_sane_options.c:314
+#: backend/genesys/genesys.cpp:4210 backend/pixma/pixma_sane_options.c:314
 #, no-c-format
 msgid "Extras"
 msgstr ""
 
-#: backend/genesys.c:5833 backend/pixma_sane_options.c:336
+#: backend/genesys/genesys.cpp:4230 backend/pixma/pixma_sane_options.c:336
 #, no-c-format
 msgid "Dynamic threshold curve, from light to dark, normally 50-65"
 msgstr ""
@@ -2984,180 +3001,183 @@
 "instead on hardware lineart."
 msgstr ""
 
-#: backend/genesys.c:5860
+#: backend/genesys/genesys.cpp:4240
 #, no-c-format
 msgid "Disable interpolation"
 msgstr ""
 
-#: backend/genesys.c:5863
+#: backend/genesys/genesys.cpp:4243
 #, no-c-format
 msgid ""
 "When using high resolutions where the horizontal resolution is smaller than "
 "the vertical resolution this disables horizontal interpolation."
 msgstr ""
 
-#: backend/genesys.c:5872
+#: backend/genesys/genesys.cpp:4252
 #, no-c-format
 msgid "Color filter"
 msgstr ""
 
-#: backend/genesys.c:5875
+#: backend/genesys/genesys.cpp:4255
 #, no-c-format
 msgid "When using gray or lineart this option selects the used color."
 msgstr ""
 
-#: backend/genesys.c:5901
+#: backend/genesys/genesys.cpp:4279
 #, no-c-format
 msgid "Calibration file"
 msgstr ""
 
-#: backend/genesys.c:5902
+#: backend/genesys/genesys.cpp:4280
 #, no-c-format
 msgid "Specify the calibration file to use"
 msgstr ""
 
-#: backend/genesys.c:5919
+#: backend/genesys/genesys.cpp:4297
 #, no-c-format
 msgid "Calibration cache expiration time"
 msgstr ""
 
-#: backend/genesys.c:5920
+#: backend/genesys/genesys.cpp:4298
 #, no-c-format
 msgid ""
 "Time (in minutes) before a cached calibration expires. A value of 0 means "
 "cache is not used. A negative value means cache never expires."
 msgstr ""
 
-#: backend/genesys.c:5930
+#: backend/genesys/genesys.cpp:4308
 #, no-c-format
 msgid "Lamp off time"
 msgstr ""
 
-#: backend/genesys.c:5933
+#: backend/genesys/genesys.cpp:4311
 #, no-c-format
 msgid ""
 "The lamp will be turned off after the given time (in minutes). A value of 0 "
 "means, that the lamp won't be turned off."
 msgstr ""
 
-#: backend/genesys.c:5943
+#: backend/genesys/genesys.cpp:4321
 #, no-c-format
 msgid "Lamp off during scan"
 msgstr ""
 
-#: backend/genesys.c:5944
+#: backend/genesys/genesys.cpp:4322
 #, no-c-format
 msgid "The lamp will be turned off during scan. "
 msgstr ""
 
-#: backend/genesys.c:5972 backend/genesys.c:5973
+#: backend/genesys/genesys.cpp:4349 backend/genesys/genesys.cpp:4350
 #, no-c-format
 msgid "File button"
 msgstr ""
 
-#: backend/genesys.c:6025 backend/genesys.c:6026
+#: backend/genesys/genesys.cpp:4394 backend/genesys/genesys.cpp:4395
 #, no-c-format
 msgid "OCR button"
 msgstr ""
 
-#: backend/genesys.c:6039 backend/genesys.c:6040
+#: backend/genesys/genesys.cpp:4406 backend/genesys/genesys.cpp:4407
 #, no-c-format
 msgid "Power button"
 msgstr ""
 
-#: backend/genesys.c:6053 backend/genesys.c:6054
+#: backend/genesys/genesys.cpp:4418 backend/genesys/genesys.cpp:4419
 #, no-c-format
 msgid "Extra button"
 msgstr ""
 
-#: backend/genesys.c:6067 backend/gt68xx.c:762
+#: backend/p5.c:1926
 #, no-c-format
 msgid "Need calibration"
 msgstr ""
 
-#: backend/genesys.c:6068 backend/gt68xx.c:763
+#: backend/genesys/genesys.cpp:4431 backend/gt68xx.c:756 backend/p5.c:1928
 #, no-c-format
 msgid "The scanner needs calibration for the current settings"
 msgstr ""
 
-#: backend/genesys.c:6080 backend/gt68xx.c:787 backend/gt68xx.c:788
-#: backend/pixma_sane_options.c:226 backend/plustek.c:1080
+#: backend/genesys/genesys.cpp:4442 backend/gt68xx.c:780
+#: backend/gt68xx.c:781 backend/p5.c:1937 backend/p5.c:1938
+#: backend/pixma/pixma_sane_options.c:226 backend/plustek.c:1080
 #, no-c-format
 msgid "Buttons"
 msgstr ""
 
-#: backend/genesys.c:6089 backend/gt68xx.c:794 backend/hp5400_sane.c:392
-#: backend/hp-option.h:97 backend/niash.c:726 backend/plustek.c:941
+#: backend/genesys/genesys.cpp:4451 backend/gt68xx.c:787
+#: backend/hp-option.h:97 backend/hp5400_sane.c:395 backend/niash.c:726
+#: backend/p5.c:1945 backend/plustek.c:941
 #, no-c-format
 msgid "Calibrate"
 msgstr ""
 
-#: backend/genesys.c:6091 backend/gt68xx.c:796
+#: backend/genesys/genesys.cpp:4453 backend/gt68xx.c:789 backend/p5.c:1947
 #, no-c-format
 msgid "Start calibration using special sheet"
 msgstr ""
 
-#: backend/genesys.c:6105 backend/gt68xx.c:809
+#: backend/genesys/genesys.cpp:4465 backend/gt68xx.c:802 backend/p5.c:1958
 #, no-c-format
 msgid "Clear calibration"
 msgstr ""
 
-#: backend/genesys.c:6106 backend/gt68xx.c:810
+#: backend/genesys/genesys.cpp:4466 backend/gt68xx.c:803 backend/p5.c:1960
 #, no-c-format
 msgid "Clear calibration cache"
 msgstr ""
 
-#: backend/gt68xx.c:149 backend/ma1509.c:108 backend/mustek.c:164
-#: backend/snapscan-options.c:87 backend/umax.c:182
+#: backend/genesys/genesys.h:79 backend/gt68xx.c:149 backend/ma1509.c:108
+#: backend/mustek.c:164 backend/snapscan-options.c:87 backend/umax.c:182
 #, no-c-format
 msgid "Transparency Adapter"
 msgstr ""
 
-#: backend/gt68xx.c:477
+#: backend/gt68xx.c:470
 #, no-c-format
 msgid "Gray mode color"
 msgstr ""
 
-#: backend/gt68xx.c:479
+#: backend/gt68xx.c:472
 #, no-c-format
 msgid "Selects which scan color is used gray mode (default: green)."
 msgstr ""
 
-#: backend/gt68xx.c:560 backend/hp3900_sane.c:1392 backend/mustek_usb2.c:410
+#: backend/gt68xx.c:553 backend/hp3900_sane.c:1397
+#: backend/mustek_usb2.c:410
 #, no-c-format
 msgid "Debugging Options"
 msgstr ""
 
-#: backend/gt68xx.c:571 backend/mustek_usb2.c:419
+#: backend/gt68xx.c:564 backend/mustek_usb2.c:419
 #, no-c-format
 msgid "Automatic warmup"
 msgstr ""
 
-#: backend/gt68xx.c:573
+#: backend/gt68xx.c:566
 #, no-c-format
 msgid ""
 "Warm-up until the lamp's brightness is constant instead of insisting on 60 "
 "seconds warm-up time."
 msgstr ""
 
-#: backend/gt68xx.c:585
+#: backend/gt68xx.c:578
 #, no-c-format
 msgid "Full scan"
 msgstr ""
 
-#: backend/gt68xx.c:587
+#: backend/gt68xx.c:580
 #, no-c-format
 msgid ""
 "Scan the complete scanning area including calibration strip. Be careful. "
 "Don't select the full height. For testing only."
 msgstr ""
 
-#: backend/gt68xx.c:598
+#: backend/gt68xx.c:591
 #, no-c-format
 msgid "Coarse calibration"
 msgstr ""
 
-#: backend/gt68xx.c:600
+#: backend/gt68xx.c:593
 #, no-c-format
 msgid ""
 "Setup gain and offset for scanning automatically. If this option is "
@@ -3165,12 +3185,12 @@
 "provided. This option is enabled by default. For testing only."
 msgstr ""
 
-#: backend/gt68xx.c:619
+#: backend/gt68xx.c:612
 #, no-c-format
 msgid "Coarse calibration for first scan only"
 msgstr ""
 
-#: backend/gt68xx.c:621
+#: backend/gt68xx.c:614
 #, no-c-format
 msgid ""
 "Coarse calibration is only done for the first scan. Works with most scanners "
@@ -3178,12 +3198,12 @@
 "scan, disable this option. For testing only."
 msgstr ""
 
-#: backend/gt68xx.c:654
+#: backend/gt68xx.c:647
 #, no-c-format
 msgid "Backtrack lines"
 msgstr ""
 
-#: backend/gt68xx.c:656
+#: backend/gt68xx.c:649
 #, no-c-format
 msgid ""
 "Number of lines the scan slider moves back when backtracking occurs. That "
@@ -3191,12 +3211,12 @@
 "data. Low values cause faster scans but increase the risk of omitting lines."
 msgstr ""
 
-#: backend/gt68xx.c:681 backend/mustek_usb2.c:452
+#: backend/gt68xx.c:674 backend/mustek_usb2.c:452
 #, no-c-format
 msgid "Gamma value"
 msgstr ""
 
-#: backend/gt68xx.c:683 backend/mustek_usb2.c:454
+#: backend/gt68xx.c:676 backend/mustek_usb2.c:454
 #, no-c-format
 msgid "Sets the gamma value of all channels."
 msgstr ""
@@ -3211,13 +3231,13 @@
 msgid "Scan Mode Group"
 msgstr ""
 
-#: backend/hp3900_sane.c:427 backend/hp3900_sane.c:1019
-#: backend/hp-option.c:3174
+#: backend/hp-option.c:3177 backend/hp3900_sane.c:432
+#: backend/hp3900_sane.c:1024
 #, no-c-format
 msgid "Slide"
 msgstr ""
 
-#: backend/hp3900_sane.c:1405
+#: backend/hp3900_sane.c:1410
 #, no-c-format
 msgid "Scanner model"
 msgstr ""
@@ -3232,42 +3252,42 @@
 msgid "Image colours will be inverted"
 msgstr ""
 
-#: backend/hp3900_sane.c:1436
+#: backend/hp3900_sane.c:1441
 #, no-c-format
 msgid "Disable gamma correction"
 msgstr ""
 
-#: backend/hp3900_sane.c:1437
+#: backend/hp3900_sane.c:1442
 #, no-c-format
 msgid "Gamma correction will be disabled"
 msgstr ""
 
-#: backend/hp3900_sane.c:1451
+#: backend/hp3900_sane.c:1456
 #, no-c-format
 msgid "Disable white shading correction"
 msgstr ""
 
-#: backend/hp3900_sane.c:1453
+#: backend/hp3900_sane.c:1458
 #, no-c-format
 msgid "White shading correction will be disabled"
 msgstr ""
 
-#: backend/hp3900_sane.c:1467
+#: backend/hp3900_sane.c:1472
 #, no-c-format
 msgid "Skip warmup process"
 msgstr ""
 
-#: backend/hp3900_sane.c:1468
+#: backend/hp3900_sane.c:1473
 #, no-c-format
 msgid "Warmup process will be disabled"
 msgstr ""
 
-#: backend/hp3900_sane.c:1482
+#: backend/hp3900_sane.c:1487
 #, no-c-format
 msgid "Force real depth"
 msgstr ""
 
-#: backend/hp3900_sane.c:1485
+#: backend/hp3900_sane.c:1490
 #, no-c-format
 msgid ""
 "If gamma is enabled, scans are always made in 16 bits depth to improve image "
@@ -3275,293 +3295,294 @@
 "emulation."
 msgstr ""
 
-#: backend/hp3900_sane.c:1499
+#: backend/hp3900_sane.c:1504
 #, no-c-format
 msgid "Emulate Grayscale"
 msgstr ""
 
-#: backend/hp3900_sane.c:1502
+#: backend/hp3900_sane.c:1507
 #, no-c-format
 msgid ""
 "If enabled, image will be scanned in color mode and then converted to "
 "grayscale by software. This may improve image quality in some circumstances."
 msgstr ""
 
-#: backend/hp3900_sane.c:1516
+#: backend/hp3900_sane.c:1521
 #, no-c-format
 msgid "Save debugging images"
 msgstr ""
 
-#: backend/hp3900_sane.c:1519
+#: backend/hp3900_sane.c:1524
 #, no-c-format
 msgid ""
 "If enabled, some images involved in scanner processing are saved to analyze "
 "them."
 msgstr ""
 
-#: backend/hp3900_sane.c:1533
+#: backend/hp3900_sane.c:1538
 #, no-c-format
 msgid "Reset chipset"
 msgstr ""
 
-#: backend/hp3900_sane.c:1534
+#: backend/hp3900_sane.c:1539
 #, no-c-format
 msgid "Resets chipset data"
 msgstr ""
 
-#: backend/hp3900_sane.c:1547
+#: backend/hp3900_sane.c:1552
 #, no-c-format
 msgid "Information"
 msgstr ""
 
-#: backend/hp3900_sane.c:1560
+#: backend/hp3900_sane.c:1565
 #, no-c-format
 msgid "Chipset name"
 msgstr ""
 
-#: backend/hp3900_sane.c:1561
+#: backend/hp3900_sane.c:1566
 #, no-c-format
 msgid "Shows chipset name used in device."
 msgstr ""
 
-#: backend/hp3900_sane.c:1565
+#: backend/hp3900_sane.c:1570
 #, no-c-format
 msgid "Unknown"
 msgstr ""
 
-#: backend/hp3900_sane.c:1571
+#: backend/hp3900_sane.c:1576
 #, no-c-format
 msgid "Chipset ID"
 msgstr ""
 
-#: backend/hp3900_sane.c:1572
+#: backend/hp3900_sane.c:1577
 #, no-c-format
 msgid "Shows the chipset ID"
 msgstr ""
 
-#: backend/hp3900_sane.c:1582
+#: backend/hp3900_sane.c:1587
 #, no-c-format
 msgid "Scan counter"
 msgstr ""
 
-#: backend/hp3900_sane.c:1584
+#: backend/hp3900_sane.c:1589
 #, no-c-format
 msgid "Shows the number of scans made by scanner"
 msgstr ""
 
-#: backend/hp3900_sane.c:1594
+#: backend/hp3900_sane.c:1599
 #, no-c-format
 msgid "Update information"
 msgstr ""
 
-#: backend/hp3900_sane.c:1595
+#: backend/hp3900_sane.c:1600
 #, no-c-format
 msgid "Updates information about device"
 msgstr ""
 
-#: backend/hp3900_sane.c:1635
+#: backend/hp3900_sane.c:1640
 #, no-c-format
 msgid "This option reflects a front panel scanner button"
 msgstr ""
 
-#: backend/hp5400_sane.c:313 backend/niash.c:678
+#: backend/hp5400_sane.c:316 backend/niash.c:678
 #, no-c-format
 msgid "Image"
 msgstr ""
 
-#: backend/hp5400_sane.c:352 backend/niash.c:709
+#: backend/hp5400_sane.c:355 backend/niash.c:709
 #, no-c-format
 msgid "Miscellaneous"
 msgstr ""
 
-#: backend/hp5400_sane.c:358
+#: backend/hp5400_sane.c:361
 #, no-c-format
 msgid "offset X"
 msgstr ""
 
-#: backend/hp5400_sane.c:359
+#: backend/hp5400_sane.c:362
 #, no-c-format
 msgid "Hardware internal X position of the scanning area."
 msgstr ""
 
-#: backend/hp5400_sane.c:368
+#: backend/hp5400_sane.c:371
 #, no-c-format
 msgid "offset Y"
 msgstr ""
 
-#: backend/hp5400_sane.c:369
+#: backend/hp5400_sane.c:372
 #, no-c-format
 msgid "Hardware internal Y position of the scanning area."
 msgstr ""
 
-#: backend/hp5400_sane.c:381 backend/niash.c:716
+#: backend/hp5400_sane.c:384 backend/niash.c:716
 #, no-c-format
 msgid "Lamp status"
 msgstr ""
 
-#: backend/hp5400_sane.c:382 backend/niash.c:717
+#: backend/hp5400_sane.c:385 backend/niash.c:717
 #, no-c-format
 msgid "Switches the lamp on or off."
 msgstr ""
 
-#: backend/hp5400_sane.c:393 backend/niash.c:727
+#: backend/hp5400_sane.c:396 backend/niash.c:727
 #, no-c-format
 msgid "Calibrates for black and white level."
 msgstr ""
 
-#: backend/hp5590.c:86 backend/hp-option.c:3253
+#: backend/hp-option.c:3256 backend/hp5590.c:93
 #, no-c-format
 msgid "ADF"
 msgstr ""
 
-#: backend/hp5590.c:88
+#: backend/hp5590.c:95
 #, no-c-format
 msgid "TMA Slides"
 msgstr ""
 
-#: backend/hp5590.c:89
+#: backend/hp5590.c:96
 #, no-c-format
 msgid "TMA Negatives"
 msgstr ""
 
-#: backend/hp5590.c:92
+#: backend/hp5590.c:108
 #, no-c-format
 msgid "Color (48 bits)"
 msgstr ""
 
-#: backend/hp5590.c:95
+#: backend/hp5590.c:112
 #, no-c-format
 msgid "Extend lamp timeout"
 msgstr ""
 
-#: backend/hp5590.c:96
+#: backend/hp5590.c:113
 #, no-c-format
 msgid "Extends lamp timeout (from 15 minutes to 1 hour)"
 msgstr ""
 
-#: backend/hp5590.c:98
+#: backend/hp5590.c:115
 #, no-c-format
 msgid "Wait for button"
 msgstr ""
 
-#: backend/hp5590.c:99
+#: backend/hp5590.c:116
 #, no-c-format
 msgid "Waits for button before scanning"
 msgstr ""
 
-#: backend/hp-option.c:2984
+#: backend/hp-option.c:2987
 #, no-c-format
 msgid "Advanced Options"
 msgstr ""
 
-#: backend/hp-option.c:3041
+#: backend/hp-option.c:3044
 #, no-c-format
 msgid "Coarse"
 msgstr ""
 
-#: backend/hp-option.c:3042
+#: backend/hp-option.c:3045
 #, no-c-format
 msgid "Fine"
 msgstr ""
 
-#: backend/hp-option.c:3043
+#: backend/hp-option.c:3046
 #, no-c-format
 msgid "Bayer"
 msgstr ""
 
-#: backend/hp-option.c:3046 backend/hp-option.c:3097
+#: backend/hp-option.c:3049 backend/hp-option.c:3100
 #, no-c-format
 msgid "Custom"
 msgstr ""
 
-#: backend/hp-option.c:3087 backend/hp-option.c:3143 backend/hp-option.c:3158
+#: backend/hp-option.c:3090 backend/hp-option.c:3146
+#: backend/hp-option.c:3161
 #, no-c-format
 msgid "Auto"
 msgstr ""
 
-#: backend/hp-option.c:3088
+#: backend/hp-option.c:3091
 #, no-c-format
 msgid "NTSC RGB"
 msgstr ""
 
-#: backend/hp-option.c:3089
+#: backend/hp-option.c:3092
 #, no-c-format
 msgid "XPA RGB"
 msgstr ""
 
-#: backend/hp-option.c:3090
+#: backend/hp-option.c:3093
 #, no-c-format
 msgid "Pass-through"
 msgstr ""
 
-#: backend/hp-option.c:3091
+#: backend/hp-option.c:3094
 #, no-c-format
 msgid "NTSC Gray"
 msgstr ""
 
-#: backend/hp-option.c:3092
+#: backend/hp-option.c:3095
 #, no-c-format
 msgid "XPA Gray"
 msgstr ""
 
-#: backend/hp-option.c:3144
+#: backend/hp-option.c:3147
 #, no-c-format
 msgid "Slow"
 msgstr ""
 
-#: backend/hp-option.c:3145 backend/hp-option.c:3252 backend/kvs40xx_opt.c:230
-#: backend/matsushita.c:244 backend/mustek.c:149 backend/plustek.c:234
-#: backend/plustek_pp.c:203 backend/u12.c:155
+#: backend/hp-option.c:3148 backend/hp-option.c:3255
+#: backend/kvs40xx_opt.c:230 backend/matsushita.c:248 backend/mustek.c:149
+#: backend/plustek.c:234 backend/plustek_pp.c:203 backend/u12.c:155
 #, no-c-format
 msgid "Normal"
 msgstr ""
 
-#: backend/hp-option.c:3146
+#: backend/hp-option.c:3149
 #, no-c-format
 msgid "Fast"
 msgstr ""
 
-#: backend/hp-option.c:3147
+#: backend/hp-option.c:3150
 #, no-c-format
 msgid "Extra Fast"
 msgstr ""
 
-#: backend/hp-option.c:3160
+#: backend/hp-option.c:3163
 #, no-c-format
 msgid "2-pixel"
 msgstr ""
 
-#: backend/hp-option.c:3161
+#: backend/hp-option.c:3164
 #, no-c-format
 msgid "4-pixel"
 msgstr ""
 
-#: backend/hp-option.c:3162
+#: backend/hp-option.c:3165
 #, no-c-format
 msgid "8-pixel"
 msgstr ""
 
-#: backend/hp-option.c:3173
+#: backend/hp-option.c:3176
 #, no-c-format
 msgid "Print"
 msgstr ""
 
-#: backend/hp-option.c:3175
+#: backend/hp-option.c:3178
 #, no-c-format
 msgid "Film-strip"
 msgstr ""
 
-#: backend/hp-option.c:3254
+#: backend/hp-option.c:3257
 #, no-c-format
 msgid "XPA"
 msgstr ""
 
-#: backend/hp-option.c:3328 backend/hp-option.c:3341
+#: backend/hp-option.c:3331 backend/hp-option.c:3344
 #, no-c-format
 msgid "Conditional"
 msgstr ""
 
-#: backend/hp-option.c:3414
+#: backend/hp-option.c:3417
 #, no-c-format
 msgid "Experiment"
 msgstr ""
@@ -3819,46 +3840,51 @@
 msgid "adf"
 msgstr ""
 
-#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50 backend/kvs40xx_opt.c:109
+#: backend/kvs1025_opt.c:62 backend/kvs40xx_opt.c:50
+#: backend/kvs40xx_opt.c:109
 #, no-c-format
 msgid "fb"
 msgstr ""
 
-#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55 backend/kvs40xx_opt.c:101
+#: backend/kvs1025_opt.c:72 backend/kvs20xx_opt.c:55
+#: backend/kvs40xx_opt.c:101
 #, no-c-format
 msgid "single"
 msgstr ""
 
 #: backend/kvs1025_opt.c:73 backend/kvs20xx.c:462 backend/kvs20xx_opt.c:56
-#: backend/kvs40xx.c:704 backend/kvs40xx.c:722 backend/kvs40xx_opt.c:102
+#: backend/kvs40xx.c:705 backend/kvs40xx.c:723 backend/kvs40xx_opt.c:102
 #: backend/kvs40xx_opt.c:1087
 #, no-c-format
 msgid "continuous"
 msgstr ""
 
-#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62 backend/kvs40xx_opt.c:115
+#: backend/kvs1025_opt.c:83 backend/kvs20xx_opt.c:62
+#: backend/kvs40xx_opt.c:115
 #, no-c-format
 msgid "off"
 msgstr ""
 
-#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63 backend/kvs40xx_opt.c:116
+#: backend/kvs1025_opt.c:84 backend/kvs20xx_opt.c:63
+#: backend/kvs40xx_opt.c:116
 #, no-c-format
 msgid "wait_doc"
 msgstr ""
 
-#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64 backend/kvs40xx_opt.c:118
+#: backend/kvs1025_opt.c:85 backend/kvs20xx_opt.c:64
+#: backend/kvs40xx_opt.c:118
 #, no-c-format
 msgid "wait_key"
 msgstr ""
 
-#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70 backend/kvs40xx_opt.c:124
-#: backend/kvs40xx_opt.c:141
+#: backend/kvs1025_opt.c:96 backend/kvs20xx_opt.c:70
+#: backend/kvs40xx_opt.c:124 backend/kvs40xx_opt.c:141
 #, no-c-format
 msgid "user_def"
 msgstr ""
 
-#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71 backend/kvs40xx_opt.c:125
-#: backend/kvs40xx_opt.c:142
+#: backend/kvs1025_opt.c:97 backend/kvs20xx_opt.c:71
+#: backend/kvs40xx_opt.c:125 backend/kvs40xx_opt.c:142
 #, no-c-format
 msgid "business_card"
 msgstr ""
@@ -3899,96 +3925,96 @@
 msgid "Legal"
 msgstr ""
 
-#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:239
+#: backend/kvs1025_opt.c:148 backend/kvs40xx_opt.c:239
 #, no-c-format
 msgid "bayer_64"
 msgstr ""
 
-#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:240
+#: backend/kvs1025_opt.c:149 backend/kvs40xx_opt.c:240
 #, no-c-format
 msgid "bayer_16"
 msgstr ""
 
-#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:241
+#: backend/kvs1025_opt.c:150 backend/kvs40xx_opt.c:241
 #, no-c-format
 msgid "halftone_32"
 msgstr ""
 
-#: backend/kvs1025_opt.c:152 backend/kvs40xx_opt.c:242
+#: backend/kvs1025_opt.c:151 backend/kvs40xx_opt.c:242
 #, no-c-format
 msgid "halftone_64"
 msgstr ""
 
-#: backend/kvs1025_opt.c:153
+#: backend/kvs1025_opt.c:152
 #, no-c-format
 msgid "diffusion"
 msgstr ""
 
-#: backend/kvs1025_opt.c:166 backend/kvs1025_opt.c:228
-#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:129
+#: backend/kvs1025_opt.c:165 backend/kvs1025_opt.c:227
+#: backend/kvs1025_opt.c:240 backend/kvs20xx_opt.c:129
 #: backend/kvs20xx_opt.c:137 backend/kvs40xx_opt.c:215
 #: backend/kvs40xx_opt.c:223 backend/kvs40xx_opt.c:258
 #, no-c-format
 msgid "normal"
 msgstr ""
 
-#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:259
+#: backend/kvs1025_opt.c:166 backend/kvs40xx_opt.c:259
 #, no-c-format
 msgid "light"
 msgstr ""
 
-#: backend/kvs1025_opt.c:168 backend/kvs40xx_opt.c:260
+#: backend/kvs1025_opt.c:167 backend/kvs40xx_opt.c:260
 #, no-c-format
 msgid "dark"
 msgstr ""
 
-#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:271
+#: backend/kvs1025_opt.c:178 backend/kvs40xx_opt.c:271
 #, no-c-format
 msgid "From scanner"
 msgstr ""
 
-#: backend/kvs1025_opt.c:180 backend/kvs40xx_opt.c:272
-#: backend/matsushita.c:177
+#: backend/kvs1025_opt.c:179 backend/kvs40xx_opt.c:272
+#: backend/matsushita.c:181
 #, no-c-format
 msgid "From paper"
 msgstr ""
 
-#: backend/kvs1025_opt.c:192 backend/kvs40xx_opt.c:284
+#: backend/kvs1025_opt.c:191 backend/kvs40xx_opt.c:284
 #, no-c-format
 msgid "default"
 msgstr ""
 
-#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:123
+#: backend/kvs1025_opt.c:210 backend/kvs20xx_opt.c:123
 #: backend/kvs40xx_opt.c:209
 #, no-c-format
 msgid "smooth"
 msgstr ""
 
-#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:119
+#: backend/kvs1025_opt.c:211 backend/kvs20xx_opt.c:119
 #: backend/kvs40xx_opt.c:205
 #, no-c-format
 msgid "none"
 msgstr ""
 
-#: backend/kvs1025_opt.c:213 backend/kvs20xx_opt.c:120
+#: backend/kvs1025_opt.c:212 backend/kvs20xx_opt.c:120
 #: backend/kvs40xx_opt.c:206
 #, no-c-format
 msgid "low"
 msgstr ""
 
-#: backend/kvs1025_opt.c:214 backend/kvs1025_opt.c:804
+#: backend/kvs1025_opt.c:213 backend/kvs1025_opt.c:803
 #: backend/kvs20xx_opt.c:121 backend/kvs40xx_opt.c:207
 #, no-c-format
 msgid "medium"
 msgstr ""
 
-#: backend/kvs1025_opt.c:215 backend/kvs20xx_opt.c:122
+#: backend/kvs1025_opt.c:214 backend/kvs20xx_opt.c:122
 #: backend/kvs40xx_opt.c:208
 #, no-c-format
 msgid "high"
 msgstr ""
 
-#: backend/kvs1025_opt.c:229 backend/kvs20xx_opt.c:130
+#: backend/kvs1025_opt.c:228 backend/kvs20xx_opt.c:130
 #: backend/kvs40xx_opt.c:216
 #, no-c-format
 msgid "crt"
@@ -3999,194 +4025,194 @@
 msgid "linier"
 msgstr ""
 
-#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:138
+#: backend/kvs1025_opt.c:241 backend/kvs20xx_opt.c:138
 #: backend/kvs40xx_opt.c:224
 #, no-c-format
 msgid "red"
 msgstr ""
 
-#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:139
+#: backend/kvs1025_opt.c:242 backend/kvs20xx_opt.c:139
 #: backend/kvs40xx_opt.c:225
 #, no-c-format
 msgid "green"
 msgstr ""
 
-#: backend/kvs1025_opt.c:244 backend/kvs20xx_opt.c:140
+#: backend/kvs1025_opt.c:243 backend/kvs20xx_opt.c:140
 #: backend/kvs40xx_opt.c:226
 #, no-c-format
 msgid "blue"
 msgstr ""
 
-#: backend/kvs1025_opt.c:562
+#: backend/kvs1025_opt.c:561
 #, no-c-format
 msgid "Sets the scan source"
 msgstr ""
 
-#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:218
-#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1126
+#: backend/kvs1025_opt.c:572 backend/kvs20xx_opt.c:218
+#: backend/kvs40xx_opt.c:367 backend/matsushita.c:1130
 #, no-c-format
 msgid "Feeder mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:574 backend/kvs20xx_opt.c:219
-#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1127
+#: backend/kvs1025_opt.c:573 backend/kvs20xx_opt.c:219
+#: backend/kvs40xx_opt.c:368 backend/matsushita.c:1131
 #, no-c-format
 msgid "Sets the feeding mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:584
+#: backend/kvs1025_opt.c:583
 #, no-c-format
 msgid "Enable/Disable long paper mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:593
+#: backend/kvs1025_opt.c:592
 #, no-c-format
 msgid "Enable/Disable length control mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:601 backend/kvs20xx_opt.c:243
+#: backend/kvs1025_opt.c:600 backend/kvs20xx_opt.c:243
 #: backend/kvs40xx_opt.c:417
 #, no-c-format
 msgid "Sets the manual feed mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:612 backend/kvs20xx_opt.c:255
+#: backend/kvs1025_opt.c:611 backend/kvs20xx_opt.c:255
 #: backend/kvs40xx_opt.c:429
 #, no-c-format
 msgid "Sets the manual feed timeout in seconds"
 msgstr ""
 
-#: backend/kvs1025_opt.c:625 backend/kvs20xx_opt.c:268
+#: backend/kvs1025_opt.c:624 backend/kvs20xx_opt.c:268
 #: backend/kvs40xx_opt.c:442
 #, no-c-format
 msgid "Enable/Disable double feed detection"
 msgstr ""
 
-#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:276
+#: backend/kvs1025_opt.c:630 backend/kvs20xx_opt.c:276
 #: backend/kvs40xx_opt.c:497
 #, no-c-format
 msgid "fit-to-page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:632 backend/kvs20xx_opt.c:277
+#: backend/kvs1025_opt.c:631 backend/kvs20xx_opt.c:277
 #: backend/kvs40xx_opt.c:498
 #, no-c-format
 msgid "Fit to page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:634 backend/kvs20xx_opt.c:278
+#: backend/kvs1025_opt.c:633 backend/kvs20xx_opt.c:278
 #: backend/kvs40xx_opt.c:499
 #, no-c-format
 msgid "Scanner shrinks image to fit scanned page"
 msgstr ""
 
-#: backend/kvs1025_opt.c:661 backend/kvs20xx_opt.c:309
+#: backend/kvs1025_opt.c:660 backend/kvs20xx_opt.c:309
 #: backend/kvs40xx_opt.c:533
 #, no-c-format
 msgid "Set paper position : true for landscape, false for portrait"
 msgstr ""
 
-#: backend/kvs1025_opt.c:735 backend/matsushita.c:1224
+#: backend/kvs1025_opt.c:734 backend/matsushita.c:1228
 #, no-c-format
 msgid "Automatic threshold"
 msgstr ""
 
-#: backend/kvs1025_opt.c:738 backend/matsushita.c:1227
+#: backend/kvs1025_opt.c:737 backend/matsushita.c:1231
 #, no-c-format
 msgid ""
 "Automatically sets brightness, contrast, white level, gamma, noise reduction "
 "and image emphasis"
 msgstr ""
 
-#: backend/kvs1025_opt.c:783 backend/kvs40xx_opt.c:764
-#: backend/matsushita.c:1275
+#: backend/kvs1025_opt.c:782 backend/kvs40xx_opt.c:764
+#: backend/matsushita.c:1279
 #, no-c-format
 msgid "Noise reduction"
 msgstr ""
 
-#: backend/kvs1025_opt.c:785 backend/kvs40xx_opt.c:765
-#: backend/matsushita.c:1277
+#: backend/kvs1025_opt.c:784 backend/kvs40xx_opt.c:765
+#: backend/matsushita.c:1281
 #, no-c-format
 msgid "Reduce the isolated dot noise"
 msgstr ""
 
-#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:412
-#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1288
+#: backend/kvs1025_opt.c:795 backend/kvs20xx_opt.c:412
+#: backend/kvs40xx_opt.c:655 backend/matsushita.c:1292
 #, no-c-format
 msgid "Image emphasis"
 msgstr ""
 
-#: backend/kvs1025_opt.c:797 backend/kvs20xx_opt.c:413
-#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1289
+#: backend/kvs1025_opt.c:796 backend/kvs20xx_opt.c:413
+#: backend/kvs40xx_opt.c:656 backend/matsushita.c:1293
 #, no-c-format
 msgid "Sets the image emphasis"
 msgstr ""
 
-#: backend/kvs1025_opt.c:808 backend/kvs1025_opt.c:809
-#: backend/matsushita.c:1300 backend/matsushita.c:1301
-#: backend/pixma_sane_options.c:112
+#: backend/kvs1025_opt.c:807 backend/kvs1025_opt.c:808
+#: backend/matsushita.c:1304 backend/matsushita.c:1305
+#: backend/pixma/pixma_sane_options.c:112
 #, no-c-format
 msgid "Gamma"
 msgstr ""
 
-#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:436
+#: backend/kvs1025_opt.c:817 backend/kvs20xx_opt.c:436
 #: backend/kvs40xx_opt.c:681
 #, no-c-format
 msgid "Lamp color"
 msgstr ""
 
-#: backend/kvs1025_opt.c:819 backend/kvs20xx_opt.c:437
+#: backend/kvs1025_opt.c:818 backend/kvs20xx_opt.c:437
 #: backend/kvs40xx_opt.c:682
 #, no-c-format
 msgid "Sets the lamp color (color dropout)"
 msgstr ""
 
-#: backend/kvs1025_opt.c:832
+#: backend/kvs1025_opt.c:831
 #, no-c-format
 msgid "Inverse image in B/W or halftone mode"
 msgstr ""
 
-#: backend/kvs1025_opt.c:840
+#: backend/kvs1025_opt.c:839
 #, no-c-format
 msgid "Mirror image (left/right flip)"
 msgstr ""
 
-#: backend/kvs1025_opt.c:847
+#: backend/kvs1025_opt.c:846
 #, no-c-format
 msgid "jpeg compression"
 msgstr ""
 
-#: backend/kvs1025_opt.c:850
+#: backend/kvs1025_opt.c:849
 #, no-c-format
 msgid "JPEG Image Compression with Q parameter, '0' - no compression"
 msgstr ""
 
-#: backend/kvs1025_opt.c:860
+#: backend/kvs1025_opt.c:859
 #, no-c-format
 msgid "Rotate image clockwise"
 msgstr ""
 
-#: backend/kvs1025_opt.c:862
+#: backend/kvs1025_opt.c:861
 #, no-c-format
 msgid "Request driver to rotate pages by a fixed amount"
 msgstr ""
 
-#: backend/kvs1025_opt.c:874
+#: backend/kvs1025_opt.c:873
 #, no-c-format
 msgid "Request driver to rotate skewed pages digitally"
 msgstr ""
 
-#: backend/kvs1025_opt.c:883
+#: backend/kvs1025_opt.c:882
 #, no-c-format
 msgid "Maximum diameter of lone dots to remove from scan"
 msgstr ""
 
-#: backend/kvs1025_opt.c:902
+#: backend/kvs1025_opt.c:901
 #, no-c-format
 msgid "Software automatic cropping"
 msgstr ""
 
-#: backend/kvs1025_opt.c:904
+#: backend/kvs1025_opt.c:903
 #, no-c-format
 msgid "Request driver to remove border from pages digitally"
 msgstr ""
@@ -4199,7 +4225,8 @@
 msgstr ""
 
 #: backend/kvs20xx_opt.c:424 backend/kvs20xx_opt.c:425
-#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669 backend/microtek2.h:640
+#: backend/kvs40xx_opt.c:668 backend/kvs40xx_opt.c:669
+#: backend/microtek2.h:640
 #, no-c-format
 msgid "Gamma correction"
 msgstr ""
@@ -4381,162 +4408,163 @@
 msgid "Addition of space in bottom position"
 msgstr ""
 
-#: backend/leo.c:110
+#: backend/leo.c:114
 #, no-c-format
 msgid "Diamond"
 msgstr ""
 
-#: backend/leo.c:111
+#: backend/leo.c:115
 #, no-c-format
 msgid "8x8 Coarse Fatting"
 msgstr ""
 
-#: backend/leo.c:112
+#: backend/leo.c:116
 #, no-c-format
 msgid "8x8 Fine Fatting"
 msgstr ""
 
-#: backend/leo.c:113
+#: backend/leo.c:117
 #, no-c-format
 msgid "8x8 Bayer"
 msgstr ""
 
-#: backend/leo.c:114
+#: backend/leo.c:118
 #, no-c-format
 msgid "8x8 Vertical Line"
 msgstr ""
 
-#: backend/lexmark.c:273 backend/umax_pp.c:715
+#: backend/lexmark.c:277 backend/umax_pp.c:705
 #, no-c-format
 msgid "Gain"
 msgstr ""
 
-#: backend/lexmark.c:274 backend/umax_pp.c:716
+#: backend/lexmark.c:278 backend/umax_pp.c:706
 #, no-c-format
 msgid "Color channels gain settings"
 msgstr ""
 
-#: backend/lexmark.c:283 backend/umax_pp.c:723
+#: backend/lexmark.c:287 backend/umax_pp.c:713
 #, no-c-format
 msgid "Gray gain"
 msgstr ""
 
-#: backend/lexmark.c:284 backend/umax_pp.c:724
+#: backend/lexmark.c:288 backend/umax_pp.c:714
 #, no-c-format
 msgid "Sets gray channel gain"
 msgstr ""
 
-#: backend/lexmark.c:297 backend/plustek.c:1001 backend/umax_pp.c:735
+#: backend/lexmark.c:301 backend/plustek.c:1001 backend/umax_pp.c:725
 #, no-c-format
 msgid "Red gain"
 msgstr ""
 
-#: backend/lexmark.c:298 backend/umax_pp.c:736
+#: backend/lexmark.c:302 backend/umax_pp.c:726
 #, no-c-format
 msgid "Sets red channel gain"
 msgstr ""
 
-#: backend/lexmark.c:311 backend/plustek.c:1017 backend/umax_pp.c:747
+#: backend/lexmark.c:315 backend/plustek.c:1017 backend/umax_pp.c:737
 #, no-c-format
 msgid "Green gain"
 msgstr ""
 
-#: backend/lexmark.c:312 backend/umax_pp.c:748
+#: backend/lexmark.c:316 backend/umax_pp.c:738
 #, no-c-format
 msgid "Sets green channel gain"
 msgstr ""
 
-#: backend/lexmark.c:325 backend/plustek.c:1033 backend/umax_pp.c:759
+#: backend/lexmark.c:329 backend/plustek.c:1033 backend/umax_pp.c:749
 #, no-c-format
 msgid "Blue gain"
 msgstr ""
 
-#: backend/lexmark.c:326 backend/umax_pp.c:760
+#: backend/lexmark.c:330 backend/umax_pp.c:750
 #, no-c-format
 msgid "Sets blue channel gain"
 msgstr ""
 
-#: backend/matsushita.c:139
+#: backend/matsushita.c:143
 #, no-c-format
 msgid "Bayer Dither 16"
 msgstr ""
 
-#: backend/matsushita.c:140
+#: backend/matsushita.c:144
 #, no-c-format
 msgid "Bayer Dither 64"
 msgstr ""
 
-#: backend/matsushita.c:141
+#: backend/matsushita.c:145
 #, no-c-format
 msgid "Halftone Dot 32"
 msgstr ""
 
-#: backend/matsushita.c:142
+#: backend/matsushita.c:146
 #, no-c-format
 msgid "Halftone Dot 64"
 msgstr ""
 
-#: backend/matsushita.c:143
+#: backend/matsushita.c:147
 #, no-c-format
 msgid "Error Diffusion"
 msgstr ""
 
-#: backend/matsushita.c:160
+#: backend/matsushita.c:164
 #, no-c-format
 msgid "Mode 1"
 msgstr ""
 
-#: backend/matsushita.c:161
+#: backend/matsushita.c:165
 #, no-c-format
 msgid "Mode 2"
 msgstr ""
 
-#: backend/matsushita.c:162
+#: backend/matsushita.c:166
 #, no-c-format
 msgid "Mode 3"
 msgstr ""
 
-#: backend/matsushita.c:176
+#: backend/matsushita.c:180
 #, no-c-format
 msgid "From white stick"
 msgstr ""
 
-#: backend/matsushita.c:212
+#: backend/matsushita.c:216
 #, no-c-format
 msgid "Smooth"
 msgstr ""
 
-#: backend/matsushita.c:214 backend/matsushita.c:229
+#: backend/matsushita.c:218 backend/matsushita.c:233
 #, no-c-format
 msgid "Low"
 msgstr ""
 
-#: backend/matsushita.c:215 backend/matsushita.c:230 backend/matsushita.c:1296
+#: backend/matsushita.c:219 backend/matsushita.c:234
+#: backend/matsushita.c:1300
 #, no-c-format
 msgid "Medium"
 msgstr ""
 
-#: backend/matsushita.c:216 backend/matsushita.c:231
+#: backend/matsushita.c:220 backend/matsushita.c:235
 #, no-c-format
 msgid "High"
 msgstr ""
 
-#: backend/matsushita.c:245
+#: backend/matsushita.c:249
 #, no-c-format
 msgid "CRT"
 msgstr ""
 
-#: backend/matsushita.c:257
+#: backend/matsushita.c:261
 #, no-c-format
 msgid "One page"
 msgstr ""
 
-#: backend/matsushita.c:258
+#: backend/matsushita.c:262
 #, no-c-format
 msgid "All pages"
 msgstr ""
 
-#: backend/matsushita.c:1034 backend/plustek.c:1333
+#: backend/matsushita.c:1038 backend/p5_device.c:13 backend/plustek.c:1333
 #, no-c-format
 msgid "sheetfed scanner"
 msgstr ""
@@ -4894,99 +4922,99 @@
 msgid "2x2 custom"
 msgstr ""
 
-#: backend/mustek.c:4235
+#: backend/mustek.c:4247
 #, no-c-format
 msgid "Fast gray mode"
 msgstr ""
 
-#: backend/mustek.c:4236
+#: backend/mustek.c:4248
 #, no-c-format
 msgid "Scan in fast gray mode (lower quality)."
 msgstr ""
 
-#: backend/mustek.c:4333
+#: backend/mustek.c:4345
 #, no-c-format
 msgid ""
 "Request that all previews are done in the fastest (low-quality) mode. This "
 "may be a non-color mode or a low resolution mode."
 msgstr ""
 
-#: backend/mustek.c:4341
+#: backend/mustek.c:4353
 #, no-c-format
 msgid "Lamp off time (minutes)"
 msgstr ""
 
-#: backend/mustek.c:4342
+#: backend/mustek.c:4354
 #, no-c-format
 msgid "Set the time (in minutes) after which the lamp is shut off."
 msgstr ""
 
-#: backend/mustek.c:4353
+#: backend/mustek.c:4365
 #, no-c-format
 msgid "Turn lamp off"
 msgstr ""
 
-#: backend/mustek.c:4354
+#: backend/mustek.c:4366
 #, no-c-format
 msgid "Turns the lamp off immediately."
 msgstr ""
 
-#: backend/mustek.c:4431
+#: backend/mustek.c:4443
 #, no-c-format
 msgid "Red brightness"
 msgstr ""
 
-#: backend/mustek.c:4432
+#: backend/mustek.c:4444
 #, no-c-format
 msgid "Controls the brightness of the red channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4444
+#: backend/mustek.c:4456
 #, no-c-format
 msgid "Green brightness"
 msgstr ""
 
-#: backend/mustek.c:4445
+#: backend/mustek.c:4457
 #, no-c-format
 msgid "Controls the brightness of the green channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4457
+#: backend/mustek.c:4469
 #, no-c-format
 msgid "Blue brightness"
 msgstr ""
 
-#: backend/mustek.c:4458
+#: backend/mustek.c:4470
 #, no-c-format
 msgid "Controls the brightness of the blue channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4483
+#: backend/mustek.c:4495
 #, no-c-format
 msgid "Contrast red channel"
 msgstr ""
 
-#: backend/mustek.c:4484
+#: backend/mustek.c:4496
 #, no-c-format
 msgid "Controls the contrast of the red channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4496
+#: backend/mustek.c:4508
 #, no-c-format
 msgid "Contrast green channel"
 msgstr ""
 
-#: backend/mustek.c:4497
+#: backend/mustek.c:4509
 #, no-c-format
 msgid "Controls the contrast of the green channel of the acquired image."
 msgstr ""
 
-#: backend/mustek.c:4509
+#: backend/mustek.c:4521
 #, no-c-format
 msgid "Contrast blue channel"
 msgstr ""
 
-#: backend/mustek.c:4510
+#: backend/mustek.c:4522
 #, no-c-format
 msgid "Controls the contrast of the blue channel of the acquired image."
 msgstr ""
@@ -5028,39 +5056,39 @@
 "seconds warm-up time."
 msgstr ""
 
-#: backend/pixma.c:378
+#: backend/pixma/pixma.c:397
 #, no-c-format
 msgid "Negative color"
 msgstr ""
 
-#: backend/pixma.c:383
+#: backend/pixma/pixma.c:402
 #, no-c-format
 msgid "Negative gray"
 msgstr ""
 
-#: backend/pixma.c:396
+#: backend/pixma/pixma.c:415
 #, no-c-format
 msgid "48 bits color"
 msgstr ""
 
-#: backend/pixma.c:401
+#: backend/pixma/pixma.c:420
 #, no-c-format
 msgid "16 bits gray"
 msgstr ""
 
-#: backend/pixma_sane_options.c:84
+#: backend/pixma/pixma_sane_options.c:84
 #, no-c-format
 msgid ""
 "Selects the scan source (such as a document-feeder). Set source before mode "
 "and resolution. Resets mode and resolution to auto values."
 msgstr ""
 
-#: backend/pixma_sane_options.c:98
+#: backend/pixma/pixma_sane_options.c:98
 #, no-c-format
 msgid "Button-controlled scan"
 msgstr ""
 
-#: backend/pixma_sane_options.c:99
+#: backend/pixma/pixma_sane_options.c:99
 #, no-c-format
 msgid ""
 "When enabled, scan process will not start immediately. To proceed, press "
@@ -5068,32 +5096,32 @@
 "cancel, press \"GRAY\" button."
 msgstr ""
 
-#: backend/pixma_sane_options.c:232
+#: backend/pixma/pixma_sane_options.c:232
 #, no-c-format
 msgid "Update button state"
 msgstr ""
 
-#: backend/pixma_sane_options.c:244
+#: backend/pixma/pixma_sane_options.c:244
 #, no-c-format
 msgid "Button 1"
 msgstr ""
 
-#: backend/pixma_sane_options.c:258
+#: backend/pixma/pixma_sane_options.c:258
 #, no-c-format
 msgid "Button 2"
 msgstr ""
 
-#: backend/pixma_sane_options.c:272
+#: backend/pixma/pixma_sane_options.c:272
 #, no-c-format
 msgid "Type of original to scan"
 msgstr ""
 
-#: backend/pixma_sane_options.c:286
+#: backend/pixma/pixma_sane_options.c:286
 #, no-c-format
 msgid "Target operation type"
 msgstr ""
 
-#: backend/pixma_sane_options.c:348
+#: backend/pixma/pixma_sane_options.c:348
 #, no-c-format
 msgid "ADF Waiting Time"
 msgstr ""
@@ -5190,7 +5218,7 @@
 msgid "Red gain value of the AFE"
 msgstr ""
 
-#: backend/plustek.c:1009 backend/umax_pp.c:792
+#: backend/plustek.c:1009 backend/umax_pp.c:782
 #, no-c-format
 msgid "Red offset"
 msgstr ""
@@ -5444,7 +5472,7 @@
 msgid "This option reflects the status of a scanner button."
 msgstr ""
 
-#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:639
+#: backend/rts8891.c:2840 backend/umax.c:5795 backend/umax_pp.c:629
 #, no-c-format
 msgid "Lamp on"
 msgstr ""
@@ -5454,12 +5482,12 @@
 msgid "Turn on scanner lamp"
 msgstr ""
 
-#: backend/rts8891.c:2851 backend/umax1220u.c:248 backend/umax.c:5812
+#: backend/rts8891.c:2851 backend/umax.c:5812 backend/umax1220u.c:248
 #, no-c-format
 msgid "Lamp off"
 msgstr ""
 
-#: backend/rts8891.c:2852 backend/umax1220u.c:249 backend/umax.c:5813
+#: backend/rts8891.c:2852 backend/umax.c:5813 backend/umax1220u.c:249
 #, no-c-format
 msgid "Turn off scanner lamp"
 msgstr ""
@@ -5602,7 +5630,7 @@
 msgid "Greyscale lines per read"
 msgstr ""
 
-#: backend/stv680.c:974
+#: backend/stv680.c:978
 #, no-c-format
 msgid "webcam"
 msgstr ""
@@ -5622,49 +5650,49 @@
 msgid "Color RGB TEXT"
 msgstr ""
 
-#: backend/test.c:137
+#: backend/test.c:141
 #, no-c-format
 msgid "Solid black"
 msgstr ""
 
-#: backend/test.c:137
+#: backend/test.c:141
 #, no-c-format
 msgid "Solid white"
 msgstr ""
 
-#: backend/test.c:138
+#: backend/test.c:142
 #, no-c-format
 msgid "Color pattern"
 msgstr ""
 
-#: backend/test.c:138
+#: backend/test.c:142
 #, no-c-format
 msgid "Grid"
 msgstr ""
 
-#: backend/test.c:163 backend/test.c:171
+#: backend/test.c:167 backend/test.c:175
 #, no-c-format
 msgid "First entry"
 msgstr ""
 
-#: backend/test.c:163 backend/test.c:171
+#: backend/test.c:167 backend/test.c:175
 #, no-c-format
 msgid "Second entry"
 msgstr ""
 
-#: backend/test.c:165
+#: backend/test.c:169
 #, no-c-format
 msgid ""
 "This is the very long third entry. Maybe the frontend has an idea how to "
 "display it"
 msgstr ""
 
-#: backend/test.c:348
+#: backend/test.c:352
 #, no-c-format
 msgid "Hand-scanner simulation"
 msgstr ""
 
-#: backend/test.c:349
+#: backend/test.c:353
 #, no-c-format
 msgid ""
 "Simulate a hand-scanner.  Hand-scanners do not know the image height a "
@@ -5673,45 +5701,45 @@
 "enables a fixed width of 11 cm."
 msgstr ""
 
-#: backend/test.c:366
+#: backend/test.c:370
 #, no-c-format
 msgid "Three-pass simulation"
 msgstr ""
 
-#: backend/test.c:367
+#: backend/test.c:371
 #, no-c-format
 msgid ""
 "Simulate a three-pass scanner. In color mode, three frames are transmitted."
 msgstr ""
 
-#: backend/test.c:382
+#: backend/test.c:386
 #, no-c-format
 msgid "Set the order of frames"
 msgstr ""
 
-#: backend/test.c:383
+#: backend/test.c:387
 #, no-c-format
 msgid "Set the order of frames in three-pass color mode."
 msgstr ""
 
-#: backend/test.c:416
+#: backend/test.c:420
 #, no-c-format
 msgid ""
 "If Automatic Document Feeder is selected, the feeder will be 'empty' after "
 "10 scans."
 msgstr ""
 
-#: backend/test.c:431
+#: backend/test.c:435
 #, no-c-format
 msgid "Special Options"
 msgstr ""
 
-#: backend/test.c:444
+#: backend/test.c:448
 #, no-c-format
 msgid "Select the test picture"
 msgstr ""
 
-#: backend/test.c:446
+#: backend/test.c:450
 #, no-c-format
 msgid ""
 "Select the kind of test picture. Available options:\n"
@@ -5721,12 +5749,12 @@
 "Grid: draws a black/white grid with a width and height of 10 mm per square."
 msgstr ""
 
-#: backend/test.c:467
+#: backend/test.c:471
 #, no-c-format
 msgid "Invert endianness"
 msgstr ""
 
-#: backend/test.c:468
+#: backend/test.c:472
 #, no-c-format
 msgid ""
 "Exchange upper and lower byte of image data in 16 bit modes. This option can "
@@ -5734,54 +5762,54 @@
 "correct endianness."
 msgstr ""
 
-#: backend/test.c:484
+#: backend/test.c:488
 #, no-c-format
 msgid "Read limit"
 msgstr ""
 
-#: backend/test.c:485
+#: backend/test.c:489
 #, no-c-format
 msgid "Limit the amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: backend/test.c:498
+#: backend/test.c:502
 #, no-c-format
 msgid "Size of read-limit"
 msgstr ""
 
-#: backend/test.c:499
+#: backend/test.c:503
 #, no-c-format
 msgid ""
 "The (maximum) amount of data transferred with each call to sane_read()."
 msgstr ""
 
-#: backend/test.c:514
+#: backend/test.c:518
 #, no-c-format
 msgid "Read delay"
 msgstr ""
 
-#: backend/test.c:515
+#: backend/test.c:519
 #, no-c-format
 msgid "Delay the transfer of data to the pipe."
 msgstr ""
 
-#: backend/test.c:527
+#: backend/test.c:531
 #, no-c-format
 msgid "Duration of read-delay"
 msgstr ""
 
-#: backend/test.c:528
+#: backend/test.c:532
 #, no-c-format
 msgid ""
 "How long to wait after transferring each buffer of data through the pipe."
 msgstr ""
 
-#: backend/test.c:543
+#: backend/test.c:547
 #, no-c-format
 msgid "Return-value of sane_read"
 msgstr ""
 
-#: backend/test.c:545
+#: backend/test.c:549
 #, no-c-format
 msgid ""
 "Select the return-value of sane_read(). \"Default\" is the normal handling "
@@ -5789,94 +5817,94 @@
 "handles them."
 msgstr ""
 
-#: backend/test.c:562
+#: backend/test.c:566
 #, no-c-format
 msgid "Loss of pixels per line"
 msgstr ""
 
-#: backend/test.c:564
+#: backend/test.c:568
 #, no-c-format
 msgid "The number of pixels that are wasted at the end of each line."
 msgstr ""
 
-#: backend/test.c:577
+#: backend/test.c:581
 #, no-c-format
 msgid "Fuzzy parameters"
 msgstr ""
 
-#: backend/test.c:578
+#: backend/test.c:582
 #, no-c-format
 msgid ""
 "Return fuzzy lines and bytes per line when sane_parameters() is called "
 "before sane_start()."
 msgstr ""
 
-#: backend/test.c:591
+#: backend/test.c:595
 #, no-c-format
 msgid "Use non-blocking IO"
 msgstr ""
 
-#: backend/test.c:592
+#: backend/test.c:596
 #, no-c-format
 msgid "Use non-blocking IO for sane_read() if supported by the frontend."
 msgstr ""
 
-#: backend/test.c:605
+#: backend/test.c:609
 #, no-c-format
 msgid "Offer select file descriptor"
 msgstr ""
 
-#: backend/test.c:606
+#: backend/test.c:610
 #, no-c-format
 msgid ""
 "Offer a select filedescriptor for detecting if sane_read() will return data."
 msgstr ""
 
-#: backend/test.c:619
+#: backend/test.c:623
 #, no-c-format
 msgid "Enable test options"
 msgstr ""
 
-#: backend/test.c:620
+#: backend/test.c:624
 #, no-c-format
 msgid ""
 "Enable various test options. This is for testing the ability of frontends to "
 "view and modify all the different SANE option types."
 msgstr ""
 
-#: backend/test.c:634
+#: backend/test.c:638
 #, no-c-format
 msgid "Print options"
 msgstr ""
 
-#: backend/test.c:635
+#: backend/test.c:639
 #, no-c-format
 msgid "Print a list of all options."
 msgstr ""
 
-#: backend/test.c:712
+#: backend/test.c:716
 #, no-c-format
 msgid "Bool test options"
 msgstr ""
 
-#: backend/test.c:725
+#: backend/test.c:729
 #, no-c-format
 msgid "(1/6) Bool soft select soft detect"
 msgstr ""
 
-#: backend/test.c:727
+#: backend/test.c:731
 #, no-c-format
 msgid ""
 "(1/6) Bool test option that has soft select and soft detect (and advanced) "
 "capabilities. That's just a normal bool option."
 msgstr ""
 
-#: backend/test.c:743
+#: backend/test.c:747
 #, no-c-format
 msgid "(2/6) Bool hard select soft detect"
 msgstr ""
 
-#: backend/test.c:745
+#: backend/test.c:749
 #, no-c-format
 msgid ""
 "(2/6) Bool test option that has hard select and soft detect (and advanced) "
@@ -5884,12 +5912,12 @@
 "user (e.g. by pressing a button at the device)."
 msgstr ""
 
-#: backend/test.c:762
+#: backend/test.c:766
 #, no-c-format
 msgid "(3/6) Bool hard select"
 msgstr ""
 
-#: backend/test.c:763
+#: backend/test.c:767
 #, no-c-format
 msgid ""
 "(3/6) Bool test option that has hard select (and advanced) capabilities. "
@@ -5897,199 +5925,199 @@
 "pressing a button at the device) and can't be read by the frontend."
 msgstr ""
 
-#: backend/test.c:781
+#: backend/test.c:785
 #, no-c-format
 msgid "(4/6) Bool soft detect"
 msgstr ""
 
-#: backend/test.c:782
+#: backend/test.c:786
 #, no-c-format
 msgid ""
 "(4/6) Bool test option that has soft detect (and advanced) capabilities. "
 "That means the option is read-only."
 msgstr ""
 
-#: backend/test.c:798
+#: backend/test.c:802
 #, no-c-format
 msgid "(5/6) Bool soft select soft detect emulated"
 msgstr ""
 
-#: backend/test.c:799
+#: backend/test.c:803
 #, no-c-format
 msgid ""
 "(5/6) Bool test option that has soft select, soft detect, and emulated (and "
 "advanced) capabilities."
 msgstr ""
 
-#: backend/test.c:815
+#: backend/test.c:819
 #, no-c-format
 msgid "(6/6) Bool soft select soft detect auto"
 msgstr ""
 
-#: backend/test.c:816
+#: backend/test.c:820
 #, no-c-format
 msgid ""
 "(6/6) Bool test option that has soft select, soft detect, and automatic (and "
 "advanced) capabilities. This option can be automatically set by the backend."
 msgstr ""
 
-#: backend/test.c:833
+#: backend/test.c:837
 #, no-c-format
 msgid "Int test options"
 msgstr ""
 
-#: backend/test.c:846
+#: backend/test.c:850
 #, no-c-format
 msgid "(1/6) Int"
 msgstr ""
 
-#: backend/test.c:847
+#: backend/test.c:851
 #, no-c-format
 msgid "(1/6) Int test option with no unit and no constraint set."
 msgstr ""
 
-#: backend/test.c:862
+#: backend/test.c:866
 #, no-c-format
 msgid "(2/6) Int constraint range"
 msgstr ""
 
-#: backend/test.c:863
+#: backend/test.c:867
 #, no-c-format
 msgid ""
 "(2/6) Int test option with unit pixel and constraint range set. Minimum is "
 "4, maximum 192, and quant is 2."
 msgstr ""
 
-#: backend/test.c:879
+#: backend/test.c:883
 #, no-c-format
 msgid "(3/6) Int constraint word list"
 msgstr ""
 
-#: backend/test.c:880
+#: backend/test.c:884
 #, no-c-format
 msgid "(3/6) Int test option with unit bits and constraint word list set."
 msgstr ""
 
-#: backend/test.c:895
+#: backend/test.c:899
 #, no-c-format
 msgid "(4/6) Int array"
 msgstr ""
 
-#: backend/test.c:896
+#: backend/test.c:900
 #, no-c-format
 msgid ""
 "(4/6) Int test option with unit mm and using an array without constraints."
 msgstr ""
 
-#: backend/test.c:911
+#: backend/test.c:915
 #, no-c-format
 msgid "(5/6) Int array constraint range"
 msgstr ""
 
-#: backend/test.c:912
+#: backend/test.c:916
 #, no-c-format
 msgid ""
 "(5/6) Int test option with unit dpi and using an array with a range "
 "constraint. Minimum is 4, maximum 192, and quant is 2."
 msgstr ""
 
-#: backend/test.c:929
+#: backend/test.c:933
 #, no-c-format
 msgid "(6/6) Int array constraint word list"
 msgstr ""
 
-#: backend/test.c:930
+#: backend/test.c:934
 #, no-c-format
 msgid ""
 "(6/6) Int test option with unit percent and using an array with a word list "
 "constraint."
 msgstr ""
 
-#: backend/test.c:946
+#: backend/test.c:950
 #, no-c-format
 msgid "Fixed test options"
 msgstr ""
 
-#: backend/test.c:959
+#: backend/test.c:963
 #, no-c-format
 msgid "(1/3) Fixed"
 msgstr ""
 
-#: backend/test.c:960
+#: backend/test.c:964
 #, no-c-format
 msgid "(1/3) Fixed test option with no unit and no constraint set."
 msgstr ""
 
-#: backend/test.c:975
+#: backend/test.c:979
 #, no-c-format
 msgid "(2/3) Fixed constraint range"
 msgstr ""
 
-#: backend/test.c:976
+#: backend/test.c:980
 #, no-c-format
 msgid ""
 "(2/3) Fixed test option with unit microsecond and constraint range set. "
 "Minimum is -42.17, maximum 32767.9999, and quant is 2.0."
 msgstr ""
 
-#: backend/test.c:992
+#: backend/test.c:996
 #, no-c-format
 msgid "(3/3) Fixed constraint word list"
 msgstr ""
 
-#: backend/test.c:993
+#: backend/test.c:997
 #, no-c-format
 msgid "(3/3) Fixed test option with no unit and constraint word list set."
 msgstr ""
 
-#: backend/test.c:1008
+#: backend/test.c:1012
 #, no-c-format
 msgid "String test options"
 msgstr ""
 
-#: backend/test.c:1021
+#: backend/test.c:1025
 #, no-c-format
 msgid "(1/3) String"
 msgstr ""
 
-#: backend/test.c:1022
+#: backend/test.c:1026
 #, no-c-format
 msgid "(1/3) String test option without constraint."
 msgstr ""
 
-#: backend/test.c:1039
+#: backend/test.c:1043
 #, no-c-format
 msgid "(2/3) String constraint string list"
 msgstr ""
 
-#: backend/test.c:1040
+#: backend/test.c:1044
 #, no-c-format
 msgid "(2/3) String test option with string list constraint."
 msgstr ""
 
-#: backend/test.c:1059
+#: backend/test.c:1063
 #, no-c-format
 msgid "(3/3) String constraint long string list"
 msgstr ""
 
-#: backend/test.c:1060
+#: backend/test.c:1064
 #, no-c-format
 msgid ""
 "(3/3) String test option with string list constraint. Contains some more "
 "entries..."
 msgstr ""
 
-#: backend/test.c:1080
+#: backend/test.c:1084
 #, no-c-format
 msgid "Button test options"
 msgstr ""
 
-#: backend/test.c:1093
+#: backend/test.c:1097
 #, no-c-format
 msgid "(1/1) Button"
 msgstr ""
 
-#: backend/test.c:1094
+#: backend/test.c:1098
 #, no-c-format
 msgid "(1/1) Button test option. Prints some text..."
 msgstr ""
@@ -6179,52 +6207,52 @@
 msgid "Define calibration mode"
 msgstr ""
 
-#: backend/umax_pp.c:640
+#: backend/umax_pp.c:630
 #, no-c-format
 msgid "Sets lamp on/off"
 msgstr ""
 
-#: backend/umax_pp.c:649
+#: backend/umax_pp.c:639
 #, no-c-format
 msgid "UTA on"
 msgstr ""
 
-#: backend/umax_pp.c:650
+#: backend/umax_pp.c:640
 #, no-c-format
 msgid "Sets UTA on/off"
 msgstr ""
 
-#: backend/umax_pp.c:771
+#: backend/umax_pp.c:761
 #, no-c-format
 msgid "Offset"
 msgstr ""
 
-#: backend/umax_pp.c:773
+#: backend/umax_pp.c:763
 #, no-c-format
 msgid "Color channels offset settings"
 msgstr ""
 
-#: backend/umax_pp.c:780
+#: backend/umax_pp.c:770
 #, no-c-format
 msgid "Gray offset"
 msgstr ""
 
-#: backend/umax_pp.c:781
+#: backend/umax_pp.c:771
 #, no-c-format
 msgid "Sets gray channel offset"
 msgstr ""
 
-#: backend/umax_pp.c:793
+#: backend/umax_pp.c:783
 #, no-c-format
 msgid "Sets red channel offset"
 msgstr ""
 
-#: backend/umax_pp.c:805
+#: backend/umax_pp.c:795
 #, no-c-format
 msgid "Sets green channel offset"
 msgstr ""
 
-#: backend/umax_pp.c:817
+#: backend/umax_pp.c:807
 #, no-c-format
 msgid "Sets blue channel offset"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/software-properties.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/software-properties.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/software-properties.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/software-properties.po	2020-07-08 13:54:02.000000000 +0000
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: update-manager HEAD\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-12-06 21:41+0000\n"
+"POT-Creation-Date: 2020-05-26 20:54+0000\n"
 "PO-Revision-Date: 2018-04-14 12:14+0000\n"
 "Last-Translator: shijing <jingshi@ubuntukylin.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:40+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:26+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: ../data/com.ubuntu.softwareproperties.policy.in.h:1
@@ -30,13 +30,13 @@
 msgstr "要更改软件源设置，必须通过身份验证。"
 
 #: ../data/software-properties-gtk.desktop.in.h:1
-#: ../data/gtkbuilder/main.ui.h:14
+#: ../data/gtkbuilder/main.ui.h:17
 msgid "Software & Updates"
 msgstr "软件和更新"
 
 #: ../data/software-properties-gtk.desktop.in.h:2
 #: ../data/software-properties-gtk.appdata.xml.in.h:2
-#: ../data/software-properties-kde.desktop.in.h:2
+#: ../data/software-properties-qt.desktop.in.h:2
 msgid "Configure the sources for installable software and updates"
 msgstr "配置用于安装和升级软件的源"
 
@@ -61,9 +61,9 @@
 "enabling the Canonical Livepatch service."
 msgstr "这个实用程序还允许为您的计算机选择附加的驱动程序、以及启用 Canonical Livepatch 服务。"
 
-#: ../data/software-properties-kde.desktop.in.h:1
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:690
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:709
+#: ../data/software-properties-qt.desktop.in.h:1
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:785
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:804
 msgid "Software Sources"
 msgstr "软件源"
 
@@ -84,36 +84,36 @@
 "--enable-component/-e 命令行开关已经弃用。您可以使用 ‘add-apt-repository multiverse’ 代替 "
 "‘software-properties-gtk -e multiverse’"
 
-#: ../software-properties-kde:73
+#: ../software-properties-qt:73
 msgid "Print some debug information to the command line"
 msgstr "打印调试信息至命令行"
 
-#: ../software-properties-kde:76 ../add-apt-repository:58
+#: ../software-properties-qt:76 ../add-apt-repository:58
 msgid "Print a lot of debug information to the command line"
 msgstr "将多个调试信息输出到命令行"
 
-#: ../software-properties-kde:79
+#: ../software-properties-qt:79
 msgid ""
 "No update on repository change (useful if called from an external program)"
 msgstr "软件仓库更改后未发现有更新（外部程序调用时有用）"
 
-#: ../software-properties-kde:82
+#: ../software-properties-qt:82
 msgid "Enable the specified component of the distro's repositories"
 msgstr "启用该发行版软件仓库的指定组件"
 
-#: ../software-properties-kde:86
+#: ../software-properties-qt:90
 msgid "Enable PPA with the given name"
 msgstr "以指定名称启用 PPA"
 
-#: ../software-properties-kde:90
+#: ../software-properties-qt:94
 msgid "Legacy option, unused"
 msgstr "遗留选项，未使用"
 
-#: ../software-properties-kde:93
+#: ../software-properties-qt:97
 msgid "Win ID to act as a dialogue for"
 msgstr "作为 Win ID 的对话框"
 
-#: ../software-properties-kde:96
+#: ../software-properties-qt:100
 msgid "data directory for UI files"
 msgstr "UI 文件数据目录"
 
@@ -147,7 +147,7 @@
 
 #: ../add-apt-repository:94
 msgid "Error: need a repository as argument"
-msgstr "错误： 需要以一个软件仓库作为参数"
+msgstr "错误： 需要一个仓库作为参数"
 
 #: ../add-apt-repository:97
 msgid "Error: need a single repository as argument"
@@ -189,7 +189,7 @@
 #: ../add-apt-repository:178 ../add-apt-repository:182
 #, c-format
 msgid "Error: '%s' doesn't exist in a sourcelist file"
-msgstr "错误：“%s”不存在于一个软件源列表文件"
+msgstr "错误：软件源列表文件中不存在“%s”"
 
 #: ../add-apt-repository:187
 #, c-format
@@ -229,59 +229,59 @@
 "distribution project."
 msgstr "向发行版项目提交系统安装的软件包列表及其使用频率。"
 
-#: ../softwareproperties/kde/DialogMirror.py:63
+#: ../softwareproperties/qt/DialogMirror.py:63
 msgid "Mirror"
 msgstr "镜像"
 
-#: ../softwareproperties/kde/DialogMirror.py:184
-#: ../softwareproperties/kde/DialogMirror.py:185
-#: ../softwareproperties/kde/DialogMirror.py:218
+#: ../softwareproperties/qt/DialogMirror.py:184
+#: ../softwareproperties/qt/DialogMirror.py:185
+#: ../softwareproperties/qt/DialogMirror.py:218
 msgid "Testing Mirrors"
 msgstr "正在测试镜像站点"
 
-#: ../softwareproperties/kde/DialogMirror.py:184
-#: ../softwareproperties/kde/DialogMirror.py:187
+#: ../softwareproperties/qt/DialogMirror.py:184
+#: ../softwareproperties/qt/DialogMirror.py:187
 #: ../data/gtkbuilder/dialog-auth.ui.h:2
 msgid "Cancel"
 msgstr "取消"
 
-#: ../softwareproperties/kde/DialogMirror.py:219
+#: ../softwareproperties/qt/DialogMirror.py:219
 #: ../softwareproperties/gtk/DialogMirror.py:337
 msgid "No suitable download server was found"
 msgstr "未找到合适的下载服务器"
 
-#: ../softwareproperties/kde/DialogMirror.py:220
+#: ../softwareproperties/qt/DialogMirror.py:220
 #: ../softwareproperties/gtk/DialogMirror.py:338
 msgid "Please check your Internet connection."
 msgstr "请检查您的互联网连接。"
 
-#: ../softwareproperties/kde/DialogMirror.py:235
+#: ../softwareproperties/qt/DialogMirror.py:235
 #: ../softwareproperties/gtk/DialogMirror.py:353
 msgid "Canceling..."
 msgstr "取消..."
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:162
-#: ../data/gtkbuilder/main.ui.h:9
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:211
+#: ../data/gtkbuilder/main.ui.h:12
 msgid "Daily"
 msgstr "每天"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:163
-#: ../data/gtkbuilder/main.ui.h:10
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:212
+#: ../data/gtkbuilder/main.ui.h:13
 msgid "Every two days"
 msgstr "每两天"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:164
-#: ../data/gtkbuilder/main.ui.h:11
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:213
+#: ../data/gtkbuilder/main.ui.h:14
 msgid "Weekly"
 msgstr "每周"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:165
-#: ../data/gtkbuilder/main.ui.h:12
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:214
+#: ../data/gtkbuilder/main.ui.h:15
 msgid "Every two weeks"
 msgstr "每两周"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:172
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:263
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:221
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:302
 #, python-format
 msgid "Every %s days"
 msgstr "每 %s 天"
@@ -293,8 +293,7 @@
 msgstr "%s 更新"
 
 #. TRANS: %s stands for the distribution name e.g. Debian or Ubuntu
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:218
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:323
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:362
 #, python-format
 msgid "%s Software"
 msgstr "%s 软件"
@@ -302,111 +301,111 @@
 #. TRANSLATORS: Label for the components in the Internet section
 #. first %s is the description of the component
 #. second %s is the code name of the comp, eg main, universe
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:237
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:336
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:282
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:375
 #, python-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. add a separator and the option to choose another mirror from the list
 #. #FIXME server_store.append(["sep", None, True])
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:300
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:466
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:559
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:345
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:532
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:660
 msgid "Other..."
 msgstr "其他站点..."
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:668
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:982
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:713
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1077
 msgid "Import key"
 msgstr "导入密钥"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:671
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:996
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:716
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1091
 msgid "Error importing selected file"
 msgstr "导入所选文件时出错"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:672
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:997
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:717
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1092
 msgid "The selected file may not be a GPG key file or it might be corrupt."
 msgstr "所选文件可能不是 GPG 密钥文件或者已经损坏."
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:685
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1013
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:730
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1107
 msgid "Error removing the key"
 msgstr "删除密钥时出错"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:686
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1014
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:731
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1108
 msgid ""
 "The key you selected could not be removed. Please report this as a bug."
 msgstr "您选择的密钥无法删除。请将其作为 bug 提交。"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:703
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:762
 msgid "Reload"
 msgstr "重新加载"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:705
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:764
 msgid "Your local copy of the software catalog is out of date."
 msgstr "您本地的软件信息索引以及过期。"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:706
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:765
 msgid "A new copy will be downloaded."
 msgstr "将再次下载。"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:730
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:814
 msgid "CD Error"
 msgstr "光盘错误"
 
-#: ../softwareproperties/kde/SoftwarePropertiesKDE.py:731
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:848
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:815
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:948
 msgid "Error scanning the CD"
 msgstr "扫描光盘出错"
 
-#: ../softwareproperties/kde/CdromProgress.py:54
+#: ../softwareproperties/qt/CdromProgress.py:54
 msgid "CD Name"
 msgstr "光盘名称"
 
-#: ../softwareproperties/kde/CdromProgress.py:54
+#: ../softwareproperties/qt/CdromProgress.py:54
 #: ../softwareproperties/gtk/CdromProgress.py:61
 msgid "Please enter a name for the disc"
 msgstr "请为该光盘输入一个名称"
 
-#: ../softwareproperties/kde/CdromProgress.py:58
+#: ../softwareproperties/qt/CdromProgress.py:58
 msgid "Insert Disk"
 msgstr "放入光盘"
 
-#: ../softwareproperties/kde/CdromProgress.py:58
+#: ../softwareproperties/qt/CdromProgress.py:58
 #: ../softwareproperties/gtk/CdromProgress.py:77
 msgid "Please insert a disk in the drive:"
 msgstr "请将光盘放入光驱："
 
 #. L10N: the example is of the format: deb http://ftp.debian.org sarge main
-#: ../softwareproperties/kde/DialogAdd.py:55
+#: ../softwareproperties/qt/DialogAdd.py:55
 msgid "Enter the complete APT line of the repository that you want to add."
 msgstr "输入要添加的软件源的完整 APT 行。"
 
-#: ../softwareproperties/kde/DialogAdd.py:57
+#: ../softwareproperties/qt/DialogAdd.py:57
 #, python-format
 msgid ""
 "Include the type, location and components of the repository. Example: %s"
 msgstr "包含类型，位置，以及分类。例如：%s"
 
-#: ../softwareproperties/kde/DialogEdit.py:43
+#: ../softwareproperties/qt/DialogEdit.py:43
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:1
 msgid "Binary"
 msgstr "二进制"
 
-#: ../softwareproperties/kde/DialogEdit.py:44 ../data/gtkbuilder/main.ui.h:15
+#: ../softwareproperties/qt/DialogEdit.py:44 ../data/gtkbuilder/main.ui.h:18
 msgid "Source code"
 msgstr "源代码"
 
-#: ../softwareproperties/SoftwareProperties.py:515
-#: ../softwareproperties/SoftwareProperties.py:522
+#: ../softwareproperties/SoftwareProperties.py:516
+#: ../softwareproperties/SoftwareProperties.py:523
 msgid "(Source Code)"
 msgstr "(源代码)"
 
-#: ../softwareproperties/SoftwareProperties.py:528
+#: ../softwareproperties/SoftwareProperties.py:529
 msgid "Source Code"
 msgstr "源代码"
 
@@ -440,133 +439,148 @@
 msgid "Completed %s of %s tests"
 msgstr "已完成 %s 个测试，共有 %s 个"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:700
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:719
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:795
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:814
 msgid "Active"
 msgstr "启用"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:758
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:859
 msgid "Key"
 msgstr "密钥"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:775
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:876
 msgid "_Add key from paste data"
 msgstr "从剪贴板数据中添加密钥(_A)"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:788
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:799
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:889
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:900
 msgid "Error importing key"
 msgstr "导入密钥出错"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:789
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:800
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:890
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:901
 msgid "The selected data may not be a GPG key file or it might be corrupt."
 msgstr "选择的数据可能不是一个 GPG 密钥或者它已经损坏了。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:849
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:949
 msgid "Could not find a suitable CD."
 msgstr "未能找到合适的 CD。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1066
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1157
 msgid "Applying changes..."
 msgstr "正在应用更改..."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1173
-#: ../data/gtkbuilder/main.ui.h:45
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1276
+#: ../data/gtkbuilder/main.ui.h:49
 msgid "Re_vert"
 msgstr "还原(_V)"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1175
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1278
 msgid "_Apply Changes"
 msgstr "应用更改(_A)"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1177
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1280
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1179
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1282
 msgid "_Restart..."
 msgstr "重新启动(_R)..."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1194
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1297
 msgid "Searching for available drivers..."
 msgstr "正在搜索可用的驱动..."
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1224
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1327
 msgid "An error occurred while searching for drivers."
 msgstr "搜索驱动时发生错误。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1298
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1101
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1401
 msgid "This device is using the recommended driver."
 msgstr "该设备正在使用推荐的驱动。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1299
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1103
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1402
 msgid "This device is using an alternative driver."
 msgstr "该设备正在使用备选的驱动。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1300
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1105
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1403
 msgid "This device is using a manually-installed driver."
 msgstr "该设备正在使用手动安装的驱动。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1301
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1106
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1404
 msgid "This device is not working."
 msgstr "该设备没有工作。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1310
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1115
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1413
 msgid "Continue using a manually installed driver"
 msgstr "继续使用手动安装的驱动"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1337
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1142
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1440
 msgid "Using {} from {}"
 msgstr "使用 {} 来自 {}"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1339
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1144
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1442
 msgid "Using {}"
 msgstr "使用 {}"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1346
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1151
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1449
 msgid "open source"
 msgstr "开源"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1348
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1153
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1451
 msgid "proprietary"
 msgstr "专有"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1351
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1156
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1454
 #, python-brace-format
 msgid "{base_description} ({licence}, tested)"
 msgstr "{base_description} ({licence}, tested)"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1353
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1158
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1456
 #, python-brace-format
 msgid "{base_description} ({licence})"
 msgstr "{base_description} ({licence})"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1373
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1176
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1476
 msgid "Do not use the device"
 msgstr "不使用设备"
 
 #. No drivers found.
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1393
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1496
 msgid "No additional drivers available."
 msgstr "没有可用的附加驱动。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1411
+#. 1 for priority over the icon to stretch
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1219
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1514
 msgid "Unknown"
 msgstr "未知"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1460
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1563
 msgid "You need to restart the computer to complete the driver changes."
 msgstr "您需要重启计算机以完成驱动更改。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1474
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1577
 #, python-format
 msgid "%(count)d proprietary driver in use."
 msgid_plural "%(count)d proprietary drivers in use."
 msgstr[0] "正在使用 %(count)d 个专有驱动。"
 
-#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1479
-#: ../data/gtkbuilder/main.ui.h:37
+#: ../softwareproperties/qt/SoftwarePropertiesQt.py:1287
+#: ../softwareproperties/gtk/SoftwarePropertiesGtk.py:1582
+#: ../data/gtkbuilder/main.ui.h:41
 msgid "No proprietary drivers are in use."
 msgstr "未使用专有驱动。"
 
@@ -758,7 +772,7 @@
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:7
 msgid "<b>Components:</b>"
-msgstr "<b>组件:</b>"
+msgstr "<b>组件：</b>"
 
 #: ../data/gtkbuilder/dialog-edit-source.ui.h:8
 msgid "<b>Comment:</b>"
@@ -772,67 +786,67 @@
 msgid "Scanning CD-ROM"
 msgstr "正在扫描光驱"
 
-#: ../data/gtkbuilder/main.ui.h:1
+#: ../data/gtkbuilder/main.ui.h:4
 msgid "Display immediately"
 msgstr "立即显示"
 
-#: ../data/gtkbuilder/main.ui.h:2
+#: ../data/gtkbuilder/main.ui.h:5
 msgid "Display weekly"
 msgstr "每周显示一次"
 
-#: ../data/gtkbuilder/main.ui.h:3
+#: ../data/gtkbuilder/main.ui.h:6
 msgid "Display every two weeks"
 msgstr "每两周显示一次"
 
-#: ../data/gtkbuilder/main.ui.h:4
+#: ../data/gtkbuilder/main.ui.h:7
 msgid "For any new version"
 msgstr "适用任何新版本"
 
-#: ../data/gtkbuilder/main.ui.h:5
+#: ../data/gtkbuilder/main.ui.h:8
 msgid "For long-term support versions"
 msgstr "适用长期支持版本"
 
-#: ../data/gtkbuilder/main.ui.h:6
+#: ../data/gtkbuilder/main.ui.h:9
 msgid "Never"
 msgstr "从不"
 
-#: ../data/gtkbuilder/main.ui.h:7
+#: ../data/gtkbuilder/main.ui.h:10
 msgid "Download automatically"
 msgstr "自动下载"
 
-#: ../data/gtkbuilder/main.ui.h:8
+#: ../data/gtkbuilder/main.ui.h:11
 msgid "Download and install automatically"
 msgstr "自动下载和安装"
 
-#: ../data/gtkbuilder/main.ui.h:13
+#: ../data/gtkbuilder/main.ui.h:16
 msgid "To install from a CD-ROM or DVD, insert the medium into the drive."
 msgstr "要从光驱安装, 请将光盘放入驱动器."
 
-#: ../data/gtkbuilder/main.ui.h:16
+#: ../data/gtkbuilder/main.ui.h:19
 msgid "Download from:"
 msgstr "下载自："
 
-#: ../data/gtkbuilder/main.ui.h:17
+#: ../data/gtkbuilder/main.ui.h:20
 msgid "<b>Downloadable from the Internet</b>"
 msgstr "<b>可从互联网下载</b>"
 
-#: ../data/gtkbuilder/main.ui.h:18
+#: ../data/gtkbuilder/main.ui.h:21
 msgid "<b>Installable from CD-ROM/DVD</b>"
 msgstr "<b>可从光驱安装</b>"
 
-#: ../data/gtkbuilder/main.ui.h:19
+#: ../data/gtkbuilder/main.ui.h:22
 msgid "Add..."
 msgstr "添加..."
 
-#: ../data/gtkbuilder/main.ui.h:20
+#: ../data/gtkbuilder/main.ui.h:23
 msgid "Edit..."
 msgstr "编辑..."
 
-#: ../data/gtkbuilder/main.ui.h:21
+#: ../data/gtkbuilder/main.ui.h:24
 msgid "Add Volume..."
 msgstr "添加卷..."
 
-#: ../data/gtkbuilder/main.ui.h:22
+#: ../data/gtkbuilder/main.ui.h:25
 msgid "Other Software"
 msgstr "其它软件"
 
@@ -840,82 +854,82 @@
 msgid "Install updates from:"
 msgstr "从下列地点安装更新："
 
-#: ../data/gtkbuilder/main.ui.h:24
+#: ../data/gtkbuilder/main.ui.h:28
 msgid "Automatically check for updates:"
 msgstr "自动检查更新："
 
-#: ../data/gtkbuilder/main.ui.h:25
+#: ../data/gtkbuilder/main.ui.h:29
 msgid "When there are security updates:"
 msgstr "当有安全更新时："
 
-#: ../data/gtkbuilder/main.ui.h:26
+#: ../data/gtkbuilder/main.ui.h:30
 msgid "When there are other updates:"
 msgstr "当有其它更新时："
 
-#: ../data/gtkbuilder/main.ui.h:27
+#: ../data/gtkbuilder/main.ui.h:31
 msgid "Notify me of a new Ubuntu version:"
 msgstr "有新版本时通知我："
 
-#: ../data/gtkbuilder/main.ui.h:28
+#: ../data/gtkbuilder/main.ui.h:32
 msgid "Updates"
 msgstr "更新"
 
-#: ../data/gtkbuilder/main.ui.h:29
+#: ../data/gtkbuilder/main.ui.h:33
 msgid "<b>Trusted software providers</b>"
 msgstr "<b>可信任的软件提供者</b>"
 
-#: ../data/gtkbuilder/main.ui.h:30
+#: ../data/gtkbuilder/main.ui.h:34
 msgid "    "
 msgstr "    "
 
-#: ../data/gtkbuilder/main.ui.h:31
+#: ../data/gtkbuilder/main.ui.h:35
 msgid ""
 "Keys are used to authenticate the correct source of software and so protect "
 "your computer from malicious software"
 msgstr "密钥用于验证软件源的正确性，使您的电脑远离恶意软件"
 
-#: ../data/gtkbuilder/main.ui.h:32
+#: ../data/gtkbuilder/main.ui.h:36
 msgid "_Import Key File..."
 msgstr "导入密钥文件(_I)..."
 
-#: ../data/gtkbuilder/main.ui.h:33
+#: ../data/gtkbuilder/main.ui.h:37
 msgid "Import the public key from a trusted software provider"
 msgstr "从可信任的软件提供者导入密钥。"
 
-#: ../data/gtkbuilder/main.ui.h:34
+#: ../data/gtkbuilder/main.ui.h:38
 msgid "Restore _Defaults"
 msgstr "恢复默认值(_D)"
 
-#: ../data/gtkbuilder/main.ui.h:35
+#: ../data/gtkbuilder/main.ui.h:39
 msgid "Restore the default keys of your distribution"
 msgstr "还原为发行版本预设的密钥"
 
-#: ../data/gtkbuilder/main.ui.h:36
+#: ../data/gtkbuilder/main.ui.h:40
 msgid "Authentication"
 msgstr "身份验证"
 
-#: ../data/gtkbuilder/main.ui.h:38
+#: ../data/gtkbuilder/main.ui.h:42
 msgid ""
 "<small>A proprietary driver has private code that Ubuntu developers can't "
 "review or improve. Security and other updates are dependent on the driver "
 "vendor.</small>"
 msgstr "<small>专有的驱动程序包含私有代码，Ubuntu 的开发人员不能查看或改善。安全和其他更新依赖于驱动程序供应商。</small>"
 
-#: ../data/gtkbuilder/main.ui.h:39
+#: ../data/gtkbuilder/main.ui.h:43
 msgid "Additional Drivers"
 msgstr "附加驱动"
 
-#: ../data/gtkbuilder/main.ui.h:40
+#: ../data/gtkbuilder/main.ui.h:44
 msgid ""
 "Use proposed updates if you’re willing to report bugs on any problems that "
 "occur."
-msgstr "使用 proposed 仓库表面您乐意对遇到的问题提交缺陷报告。"
+msgstr "使用 proposed 仓库表明您乐意对遇到的任何问题提交缺陷报告。"
 
-#: ../data/gtkbuilder/main.ui.h:41
+#: ../data/gtkbuilder/main.ui.h:45
 msgid "Developer Options"
 msgstr "开发者选项"
 
-#: ../data/gtkbuilder/main.ui.h:42
+#: ../data/gtkbuilder/main.ui.h:46
 msgid ""
 "Canonical Livepatch helps keep your system secure by applying security "
 "updates that don't require a restart. <a "
@@ -924,11 +938,11 @@
 "Canonical Livepatch 可以保持您的系统安全，不需要重启就可以应用安全更新，<a "
 "href=\"https://www.ubuntu.com/livepatch\">更多...</a>"
 
-#: ../data/gtkbuilder/main.ui.h:43
+#: ../data/gtkbuilder/main.ui.h:47
 msgid "column"
 msgstr "列"
 
-#: ../data/gtkbuilder/main.ui.h:44
+#: ../data/gtkbuilder/main.ui.h:48
 msgid "Show Livepatch status in the top bar"
 msgstr "在顶部栏显示 Livepatch 状态。"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sos.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sos.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sos.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sos.po	2020-07-08 13:53:53.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:13+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:51+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "Generated-By: pygettext.py 1.5\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sssd.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sssd.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sssd.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sssd.po	2020-07-08 13:54:00.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:57+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:39+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh-CN\n"
 
 #: src/config/SSSDConfig/__init__.py.in:43
@@ -78,12 +78,12 @@
 msgstr ""
 
 #: src/config/SSSDConfig/__init__.py.in:60
-#: src/config/SSSDConfig/__init__.py.in:201
+#: src/config/SSSDConfig/__init__.py.in:197
 msgid "Regex to parse username and domain"
 msgstr ""
 
 #: src/config/SSSDConfig/__init__.py.in:61
-#: src/config/SSSDConfig/__init__.py.in:200
+#: src/config/SSSDConfig/__init__.py.in:196
 msgid "Printf-compatible format for displaying fully-qualified names"
 msgstr ""
 
@@ -131,7 +131,7 @@
 msgstr ""
 
 #: src/config/SSSDConfig/__init__.py.in:74
-#: src/config/SSSDConfig/__init__.py.in:116
+#: src/config/SSSDConfig/__init__.py.in:113
 msgid "Negative cache timeout length (seconds)"
 msgstr ""
 
@@ -258,184 +258,184 @@
 msgid "Which PAM services are permitted to contact application domains"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:111
+#: src/config/SSSDConfig/__init__.py.in:108
 msgid "Whether to evaluate the time-based attributes in sudo rules"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:112
+#: src/config/SSSDConfig/__init__.py.in:109
 msgid "If true, SSSD will switch back to lower-wins ordering logic"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:113
+#: src/config/SSSDConfig/__init__.py.in:110
 msgid ""
 "Maximum number of rules that can be refreshed at once. If this is exceeded, "
 "full refresh is performed."
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:119
+#: src/config/SSSDConfig/__init__.py.in:116
 msgid "Whether to hash host names and addresses in the known_hosts file"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:120
+#: src/config/SSSDConfig/__init__.py.in:117
 msgid ""
 "How many seconds to keep a host in the known_hosts file after its host keys "
 "were requested"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:121
+#: src/config/SSSDConfig/__init__.py.in:118
 msgid "Path to storage of trusted CA certificates"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:124
+#: src/config/SSSDConfig/__init__.py.in:121
 msgid "List of UIDs or user names allowed to access the PAC responder"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:125
+#: src/config/SSSDConfig/__init__.py.in:122
 msgid "How long the PAC data is considered valid"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:128
+#: src/config/SSSDConfig/__init__.py.in:125
 msgid "List of UIDs or user names allowed to access the InfoPipe responder"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:129
+#: src/config/SSSDConfig/__init__.py.in:126
 msgid "List of user attributes the InfoPipe is allowed to publish"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:132
+#: src/config/SSSDConfig/__init__.py.in:129
 msgid "The provider where the secrets will be stored in"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:133
+#: src/config/SSSDConfig/__init__.py.in:130
 msgid "The maximum allowed number of nested containers"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:134
+#: src/config/SSSDConfig/__init__.py.in:131
 msgid "The maximum number of secrets that can be stored"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:135
+#: src/config/SSSDConfig/__init__.py.in:132
 msgid "The maximum number of secrets that can be stored per UID"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:136
+#: src/config/SSSDConfig/__init__.py.in:133
 msgid "The maximum payload size of a secret in kilobytes"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:138
+#: src/config/SSSDConfig/__init__.py.in:135
 msgid "The URL Custodia server is listening on"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:139
+#: src/config/SSSDConfig/__init__.py.in:136
 msgid "The method to use when authenticating to a Custodia server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:140
+#: src/config/SSSDConfig/__init__.py.in:137
 msgid ""
 "The name of the headers that will be added into a HTTP request with the "
 "value defined in auth_header_value"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:141
+#: src/config/SSSDConfig/__init__.py.in:138
 msgid "The value sssd-secrets would use for auth_header_name"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:142
+#: src/config/SSSDConfig/__init__.py.in:139
 msgid ""
 "The list of the headers to forward to the Custodia server together with the "
 "request"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:143
+#: src/config/SSSDConfig/__init__.py.in:140
 msgid ""
 "The username to use when authenticating to a Custodia server using basic_auth"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:144
+#: src/config/SSSDConfig/__init__.py.in:141
 msgid ""
 "The password to use when authenticating to a Custodia server using basic_auth"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:145
+#: src/config/SSSDConfig/__init__.py.in:142
 msgid ""
 "If true peer's certificate is verified if proxy_url uses https protocol"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:146
+#: src/config/SSSDConfig/__init__.py.in:143
 msgid ""
 "If false peer's certificate may contain different hostname than proxy_url "
 "when https protocol is used"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:147
+#: src/config/SSSDConfig/__init__.py.in:144
 msgid "Path to directory where certificate authority certificates are stored"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:148
+#: src/config/SSSDConfig/__init__.py.in:145
 msgid "Path to file containing server's CA certificate"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:149
+#: src/config/SSSDConfig/__init__.py.in:146
 msgid "Path to file containing client's certificate"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:150
+#: src/config/SSSDConfig/__init__.py.in:147
 msgid "Path to file containing client's private key"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:153
+#: src/config/SSSDConfig/__init__.py.in:150
 msgid "Identity provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:154
+#: src/config/SSSDConfig/__init__.py.in:151
 msgid "Authentication provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:155
+#: src/config/SSSDConfig/__init__.py.in:152
 msgid "Access control provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:156
+#: src/config/SSSDConfig/__init__.py.in:153
 msgid "Password change provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:157
+#: src/config/SSSDConfig/__init__.py.in:154
 msgid "SUDO provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:158
+#: src/config/SSSDConfig/__init__.py.in:155
 msgid "Autofs provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:159
+#: src/config/SSSDConfig/__init__.py.in:156
 msgid "Host identity provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:160
+#: src/config/SSSDConfig/__init__.py.in:157
 msgid "SELinux provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:161
+#: src/config/SSSDConfig/__init__.py.in:158
 msgid "Session management provider"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:164
+#: src/config/SSSDConfig/__init__.py.in:161
 msgid "Whether the domain is usable by the OS or by applications"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:165
+#: src/config/SSSDConfig/__init__.py.in:162
 msgid "Minimum user ID"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:166
+#: src/config/SSSDConfig/__init__.py.in:163
 msgid "Maximum user ID"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:167
+#: src/config/SSSDConfig/__init__.py.in:164
 msgid "Enable enumerating all users/groups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:168
+#: src/config/SSSDConfig/__init__.py.in:165
 msgid "Cache credentials for offline login"
 msgstr ""
 
@@ -443,831 +443,831 @@
 msgid "Store password hashes"
 msgstr "保存密码哈希值"
 
-#: src/config/SSSDConfig/__init__.py.in:169
+#: src/config/SSSDConfig/__init__.py.in:167
 msgid "Display users/groups in fully-qualified form"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:170
+#: src/config/SSSDConfig/__init__.py.in:168
 msgid "Don't include group members in group lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:171
+#: src/config/SSSDConfig/__init__.py.in:169
+#: src/config/SSSDConfig/__init__.py.in:176
+#: src/config/SSSDConfig/__init__.py.in:177
+#: src/config/SSSDConfig/__init__.py.in:178
+#: src/config/SSSDConfig/__init__.py.in:179
 #: src/config/SSSDConfig/__init__.py.in:180
 #: src/config/SSSDConfig/__init__.py.in:181
-#: src/config/SSSDConfig/__init__.py.in:182
-#: src/config/SSSDConfig/__init__.py.in:183
-#: src/config/SSSDConfig/__init__.py.in:184
-#: src/config/SSSDConfig/__init__.py.in:185
 msgid "Entry cache timeout length (seconds)"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:172
+#: src/config/SSSDConfig/__init__.py.in:170
 msgid ""
 "Restrict or prefer a specific address family when performing DNS lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:173
+#: src/config/SSSDConfig/__init__.py.in:171
 msgid "How long to keep cached entries after last successful login (days)"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:176
+#: src/config/SSSDConfig/__init__.py.in:172
 msgid ""
 "How long to wait for replies from DNS when resolving servers (seconds)"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:177
+#: src/config/SSSDConfig/__init__.py.in:173
 msgid "The domain part of service discovery DNS query"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:178
+#: src/config/SSSDConfig/__init__.py.in:174
 msgid "Override GID value from the identity provider with this value"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:179
+#: src/config/SSSDConfig/__init__.py.in:175
 msgid "Treat usernames as case sensitive"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:186
+#: src/config/SSSDConfig/__init__.py.in:182
 msgid "How often should expired entries be refreshed in background"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:187
+#: src/config/SSSDConfig/__init__.py.in:183
 msgid "Whether to automatically update the client's DNS entry"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:188
-#: src/config/SSSDConfig/__init__.py.in:210
+#: src/config/SSSDConfig/__init__.py.in:184
+#: src/config/SSSDConfig/__init__.py.in:206
 msgid "The TTL to apply to the client's DNS entry after updating it"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:189
-#: src/config/SSSDConfig/__init__.py.in:211
+#: src/config/SSSDConfig/__init__.py.in:185
+#: src/config/SSSDConfig/__init__.py.in:207
 msgid "The interface whose IP should be used for dynamic DNS updates"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:190
+#: src/config/SSSDConfig/__init__.py.in:186
 msgid "How often to periodically update the client's DNS entry"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:191
+#: src/config/SSSDConfig/__init__.py.in:187
 msgid "Whether the provider should explicitly update the PTR record as well"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:192
+#: src/config/SSSDConfig/__init__.py.in:188
 msgid "Whether the nsupdate utility should default to using TCP"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:193
+#: src/config/SSSDConfig/__init__.py.in:189
 msgid "What kind of authentication should be used to perform the DNS update"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:194
+#: src/config/SSSDConfig/__init__.py.in:190
 msgid "Override the DNS server used to perform the DNS update"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:195
+#: src/config/SSSDConfig/__init__.py.in:191
 msgid "Control enumeration of trusted domains"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:196
+#: src/config/SSSDConfig/__init__.py.in:192
 msgid "How often should subdomains list be refreshed"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:197
+#: src/config/SSSDConfig/__init__.py.in:193
 msgid "List of options that should be inherited into a subdomain"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:198
+#: src/config/SSSDConfig/__init__.py.in:194
 msgid "Default subdomain homedir value"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:199
+#: src/config/SSSDConfig/__init__.py.in:195
 msgid "How long can cached credentials be used for cached authentication"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:202
+#: src/config/SSSDConfig/__init__.py.in:198
 msgid "Whether to automatically create private groups for users"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:205
+#: src/config/SSSDConfig/__init__.py.in:201
 msgid "IPA domain"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:206
+#: src/config/SSSDConfig/__init__.py.in:202
 msgid "IPA server address"
 msgstr "IPA 服务器地址"
 
-#: src/config/SSSDConfig/__init__.py.in:207
+#: src/config/SSSDConfig/__init__.py.in:203
 msgid "Address of backup IPA server"
 msgstr "IPA 备份服务器地址"
 
-#: src/config/SSSDConfig/__init__.py.in:208
+#: src/config/SSSDConfig/__init__.py.in:204
 msgid "IPA client hostname"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:209
+#: src/config/SSSDConfig/__init__.py.in:205
 msgid "Whether to automatically update the client's DNS entry in FreeIPA"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:212
+#: src/config/SSSDConfig/__init__.py.in:208
 msgid "Search base for HBAC related objects"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:213
+#: src/config/SSSDConfig/__init__.py.in:209
 msgid ""
 "The amount of time between lookups of the HBAC rules against the IPA server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:214
+#: src/config/SSSDConfig/__init__.py.in:210
 msgid ""
 "The amount of time in seconds between lookups of the SELinux maps against "
 "the IPA server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:215
+#: src/config/SSSDConfig/__init__.py.in:211
 msgid "If set to false, host argument given by PAM will be ignored"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:216
+#: src/config/SSSDConfig/__init__.py.in:212
 msgid "The automounter location this IPA client is using"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:217
+#: src/config/SSSDConfig/__init__.py.in:213
 msgid "Search base for object containing info about IPA domain"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:218
+#: src/config/SSSDConfig/__init__.py.in:214
 msgid "Search base for objects containing info about ID ranges"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:219
-#: src/config/SSSDConfig/__init__.py.in:237
+#: src/config/SSSDConfig/__init__.py.in:215
+#: src/config/SSSDConfig/__init__.py.in:233
 msgid "Enable DNS sites - location based service discovery"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:220
+#: src/config/SSSDConfig/__init__.py.in:216
 msgid "Search base for view containers"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:221
+#: src/config/SSSDConfig/__init__.py.in:217
 msgid "Objectclass for view containers"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:222
+#: src/config/SSSDConfig/__init__.py.in:218
 msgid "Attribute with the name of the view"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:223
+#: src/config/SSSDConfig/__init__.py.in:219
 msgid "Objectclass for override objects"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:224
+#: src/config/SSSDConfig/__init__.py.in:220
 msgid "Attribute with the reference to the original object"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:225
+#: src/config/SSSDConfig/__init__.py.in:221
 msgid "Objectclass for user override objects"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:226
+#: src/config/SSSDConfig/__init__.py.in:222
 msgid "Objectclass for group override objects"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:227
+#: src/config/SSSDConfig/__init__.py.in:223
 msgid "Search base for Desktop Profile related objects"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:228
+#: src/config/SSSDConfig/__init__.py.in:224
 msgid ""
 "The amount of time in seconds between lookups of the Desktop Profile rules "
 "against the IPA server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:229
+#: src/config/SSSDConfig/__init__.py.in:225
 msgid ""
 "The amount of time in minutes between lookups of Desktop Profiles rules "
 "against the IPA server when the last request did not find any rule"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:232
+#: src/config/SSSDConfig/__init__.py.in:228
 msgid "Active Directory domain"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:233
+#: src/config/SSSDConfig/__init__.py.in:229
 msgid "Enabled Active Directory domains"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:234
+#: src/config/SSSDConfig/__init__.py.in:230
 msgid "Active Directory server address"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:235
+#: src/config/SSSDConfig/__init__.py.in:231
 msgid "Active Directory backup server address"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:236
+#: src/config/SSSDConfig/__init__.py.in:232
 msgid "Active Directory client hostname"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:238
-#: src/config/SSSDConfig/__init__.py.in:423
+#: src/config/SSSDConfig/__init__.py.in:234
+#: src/config/SSSDConfig/__init__.py.in:420
 msgid "LDAP filter to determine access privileges"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:239
+#: src/config/SSSDConfig/__init__.py.in:235
 msgid "Whether to use the Global Catalog for lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:240
+#: src/config/SSSDConfig/__init__.py.in:236
 msgid "Operation mode for GPO-based access control"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:241
+#: src/config/SSSDConfig/__init__.py.in:237
 msgid ""
 "The amount of time between lookups of the GPO policy files against the AD "
 "server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:242
+#: src/config/SSSDConfig/__init__.py.in:238
 msgid ""
 "PAM service names that map to the GPO (Deny)InteractiveLogonRight policy "
 "settings"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:243
+#: src/config/SSSDConfig/__init__.py.in:239
 msgid ""
 "PAM service names that map to the GPO (Deny)RemoteInteractiveLogonRight "
 "policy settings"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:244
+#: src/config/SSSDConfig/__init__.py.in:240
 msgid ""
 "PAM service names that map to the GPO (Deny)NetworkLogonRight policy settings"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:245
+#: src/config/SSSDConfig/__init__.py.in:241
 msgid ""
 "PAM service names that map to the GPO (Deny)BatchLogonRight policy settings"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:246
+#: src/config/SSSDConfig/__init__.py.in:242
 msgid ""
 "PAM service names that map to the GPO (Deny)ServiceLogonRight policy settings"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:247
+#: src/config/SSSDConfig/__init__.py.in:243
 msgid "PAM service names for which GPO-based access is always granted"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:248
+#: src/config/SSSDConfig/__init__.py.in:244
 msgid "PAM service names for which GPO-based access is always denied"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:249
+#: src/config/SSSDConfig/__init__.py.in:245
 msgid ""
 "Default logon right (or permit/deny) to use for unmapped PAM service names"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:250
+#: src/config/SSSDConfig/__init__.py.in:246
 msgid "a particular site to be used by the client"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:251
+#: src/config/SSSDConfig/__init__.py.in:247
 msgid ""
 "Maximum age in days before the machine account password should be renewed"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:252
+#: src/config/SSSDConfig/__init__.py.in:248
 msgid "Option for tuning the machine account renewal task"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:255
-#: src/config/SSSDConfig/__init__.py.in:256
+#: src/config/SSSDConfig/__init__.py.in:251
+#: src/config/SSSDConfig/__init__.py.in:252
 msgid "Kerberos server address"
 msgstr "Kerberos 服务器地址"
 
-#: src/config/SSSDConfig/__init__.py.in:257
+#: src/config/SSSDConfig/__init__.py.in:253
 msgid "Kerberos backup server address"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:258
+#: src/config/SSSDConfig/__init__.py.in:254
 msgid "Kerberos realm"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:259
+#: src/config/SSSDConfig/__init__.py.in:255
 msgid "Authentication timeout"
 msgstr "验证超时"
 
-#: src/config/SSSDConfig/__init__.py.in:260
+#: src/config/SSSDConfig/__init__.py.in:256
 msgid "Whether to create kdcinfo files"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:261
+#: src/config/SSSDConfig/__init__.py.in:257
 msgid "Where to drop krb5 config snippets"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:264
+#: src/config/SSSDConfig/__init__.py.in:260
 msgid "Directory to store credential caches"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:265
+#: src/config/SSSDConfig/__init__.py.in:261
 msgid "Location of the user's credential cache"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:266
+#: src/config/SSSDConfig/__init__.py.in:262
 msgid "Location of the keytab to validate credentials"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:267
+#: src/config/SSSDConfig/__init__.py.in:263
 msgid "Enable credential validation"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:268
+#: src/config/SSSDConfig/__init__.py.in:264
 msgid "Store password if offline for later online authentication"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:269
+#: src/config/SSSDConfig/__init__.py.in:265
 msgid "Renewable lifetime of the TGT"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:270
+#: src/config/SSSDConfig/__init__.py.in:266
 msgid "Lifetime of the TGT"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:271
+#: src/config/SSSDConfig/__init__.py.in:267
 msgid "Time between two checks for renewal"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:272
+#: src/config/SSSDConfig/__init__.py.in:268
 msgid "Enables FAST"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:273
+#: src/config/SSSDConfig/__init__.py.in:269
 msgid "Selects the principal to use for FAST"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:274
+#: src/config/SSSDConfig/__init__.py.in:270
 msgid "Enables principal canonicalization"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:275
+#: src/config/SSSDConfig/__init__.py.in:271
 msgid "Enables enterprise principals"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:276
+#: src/config/SSSDConfig/__init__.py.in:272
 msgid "A mapping from user names to Kerberos principal names"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:279
-#: src/config/SSSDConfig/__init__.py.in:280
+#: src/config/SSSDConfig/__init__.py.in:275
+#: src/config/SSSDConfig/__init__.py.in:276
 msgid "Server where the change password service is running if not on the KDC"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:283
+#: src/config/SSSDConfig/__init__.py.in:279
 msgid "ldap_uri, The URI of the LDAP server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:284
+#: src/config/SSSDConfig/__init__.py.in:280
 msgid "ldap_backup_uri, The URI of the LDAP server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:285
+#: src/config/SSSDConfig/__init__.py.in:281
 msgid "The default base DN"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:286
+#: src/config/SSSDConfig/__init__.py.in:282
 msgid "The Schema Type in use on the LDAP server, rfc2307"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:288
+#: src/config/SSSDConfig/__init__.py.in:283
 msgid "The default bind DN"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:289
+#: src/config/SSSDConfig/__init__.py.in:284
 msgid "The type of the authentication token of the default bind DN"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:290
+#: src/config/SSSDConfig/__init__.py.in:285
 msgid "The authentication token of the default bind DN"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:291
+#: src/config/SSSDConfig/__init__.py.in:286
 msgid "Length of time to attempt connection"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:292
+#: src/config/SSSDConfig/__init__.py.in:287
 msgid "Length of time to attempt synchronous LDAP operations"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:293
+#: src/config/SSSDConfig/__init__.py.in:288
 msgid "Length of time between attempts to reconnect while offline"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:294
+#: src/config/SSSDConfig/__init__.py.in:289
 msgid "Use only the upper case for realm names"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:295
+#: src/config/SSSDConfig/__init__.py.in:290
 msgid "File that contains CA certificates"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:296
+#: src/config/SSSDConfig/__init__.py.in:291
 msgid "Path to CA certificate directory"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:297
+#: src/config/SSSDConfig/__init__.py.in:292
 msgid "File that contains the client certificate"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:298
+#: src/config/SSSDConfig/__init__.py.in:293
 msgid "File that contains the client key"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:299
+#: src/config/SSSDConfig/__init__.py.in:294
 msgid "List of possible ciphers suites"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:300
+#: src/config/SSSDConfig/__init__.py.in:295
 msgid "Require TLS certificate verification"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:301
+#: src/config/SSSDConfig/__init__.py.in:296
 msgid "Specify the sasl mechanism to use"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:302
+#: src/config/SSSDConfig/__init__.py.in:297
 msgid "Specify the sasl authorization id to use"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:303
+#: src/config/SSSDConfig/__init__.py.in:298
 msgid "Specify the sasl authorization realm to use"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:304
+#: src/config/SSSDConfig/__init__.py.in:299
 msgid "Specify the minimal SSF for LDAP sasl authorization"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:305
+#: src/config/SSSDConfig/__init__.py.in:300
 msgid "Kerberos service keytab"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:306
+#: src/config/SSSDConfig/__init__.py.in:301
 msgid "Use Kerberos auth for LDAP connection"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:307
+#: src/config/SSSDConfig/__init__.py.in:302
 msgid "Follow LDAP referrals"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:308
+#: src/config/SSSDConfig/__init__.py.in:303
 msgid "Lifetime of TGT for LDAP connection"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:309
+#: src/config/SSSDConfig/__init__.py.in:304
 msgid "How to dereference aliases"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:310
+#: src/config/SSSDConfig/__init__.py.in:305
 msgid "Service name for DNS service lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:311
+#: src/config/SSSDConfig/__init__.py.in:306
 msgid "The number of records to retrieve in a single LDAP query"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:312
+#: src/config/SSSDConfig/__init__.py.in:307
 msgid "The number of members that must be missing to trigger a full deref"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:313
+#: src/config/SSSDConfig/__init__.py.in:308
 msgid ""
 "Whether the LDAP library should perform a reverse lookup to canonicalize the "
 "host name during a SASL bind"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:315
+#: src/config/SSSDConfig/__init__.py.in:310
 msgid "entryUSN attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:316
+#: src/config/SSSDConfig/__init__.py.in:311
 msgid "lastUSN attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:318
+#: src/config/SSSDConfig/__init__.py.in:313
 msgid ""
 "How long to retain a connection to the LDAP server before disconnecting"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:320
+#: src/config/SSSDConfig/__init__.py.in:315
 msgid "Disable the LDAP paging control"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:321
+#: src/config/SSSDConfig/__init__.py.in:316
 msgid "Disable Active Directory range retrieval"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:324
+#: src/config/SSSDConfig/__init__.py.in:319
 msgid "Length of time to wait for a search request"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:325
+#: src/config/SSSDConfig/__init__.py.in:320
 msgid "Length of time to wait for a enumeration request"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:326
+#: src/config/SSSDConfig/__init__.py.in:321
 msgid "Length of time between enumeration updates"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:327
+#: src/config/SSSDConfig/__init__.py.in:322
 msgid "Length of time between cache cleanups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:328
+#: src/config/SSSDConfig/__init__.py.in:323
 msgid "Require TLS for ID lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:329
+#: src/config/SSSDConfig/__init__.py.in:324
 msgid "Use ID-mapping of objectSID instead of pre-set IDs"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:330
+#: src/config/SSSDConfig/__init__.py.in:325
 msgid "Base DN for user lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:331
+#: src/config/SSSDConfig/__init__.py.in:326
 msgid "Scope of user lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:332
+#: src/config/SSSDConfig/__init__.py.in:327
 msgid "Filter for user lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:333
+#: src/config/SSSDConfig/__init__.py.in:328
 msgid "Objectclass for users"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:334
+#: src/config/SSSDConfig/__init__.py.in:329
 msgid "Username attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:336
+#: src/config/SSSDConfig/__init__.py.in:331
 msgid "UID attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:337
+#: src/config/SSSDConfig/__init__.py.in:332
 msgid "Primary GID attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:338
+#: src/config/SSSDConfig/__init__.py.in:333
 msgid "GECOS attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:339
+#: src/config/SSSDConfig/__init__.py.in:334
 msgid "Home directory attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:340
+#: src/config/SSSDConfig/__init__.py.in:335
 msgid "Shell attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:341
+#: src/config/SSSDConfig/__init__.py.in:336
 msgid "UUID attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:342
-#: src/config/SSSDConfig/__init__.py.in:384
+#: src/config/SSSDConfig/__init__.py.in:337
+#: src/config/SSSDConfig/__init__.py.in:379
 msgid "objectSID attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:343
+#: src/config/SSSDConfig/__init__.py.in:338
 msgid "Active Directory primary group attribute for ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:344
+#: src/config/SSSDConfig/__init__.py.in:339
 msgid "User principal attribute (for Kerberos)"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:345
+#: src/config/SSSDConfig/__init__.py.in:340
 msgid "Full Name"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:346
+#: src/config/SSSDConfig/__init__.py.in:341
 msgid "memberOf attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:347
+#: src/config/SSSDConfig/__init__.py.in:342
 msgid "Modification time attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:349
+#: src/config/SSSDConfig/__init__.py.in:344
 msgid "shadowLastChange attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:350
+#: src/config/SSSDConfig/__init__.py.in:345
 msgid "shadowMin attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:351
+#: src/config/SSSDConfig/__init__.py.in:346
 msgid "shadowMax attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:352
+#: src/config/SSSDConfig/__init__.py.in:347
 msgid "shadowWarning attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:353
+#: src/config/SSSDConfig/__init__.py.in:348
 msgid "shadowInactive attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:354
+#: src/config/SSSDConfig/__init__.py.in:349
 msgid "shadowExpire attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:355
+#: src/config/SSSDConfig/__init__.py.in:350
 msgid "shadowFlag attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:356
+#: src/config/SSSDConfig/__init__.py.in:351
 msgid "Attribute listing authorized PAM services"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:357
+#: src/config/SSSDConfig/__init__.py.in:352
 msgid "Attribute listing authorized server hosts"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:358
+#: src/config/SSSDConfig/__init__.py.in:353
 msgid "Attribute listing authorized server rhosts"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:359
+#: src/config/SSSDConfig/__init__.py.in:354
 msgid "krbLastPwdChange attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:360
+#: src/config/SSSDConfig/__init__.py.in:355
 msgid "krbPasswordExpiration attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:361
+#: src/config/SSSDConfig/__init__.py.in:356
 msgid "Attribute indicating that server side password policies are active"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:362
+#: src/config/SSSDConfig/__init__.py.in:357
 msgid "accountExpires attribute of AD"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:363
+#: src/config/SSSDConfig/__init__.py.in:358
 msgid "userAccountControl attribute of AD"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:364
+#: src/config/SSSDConfig/__init__.py.in:359
 msgid "nsAccountLock attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:365
+#: src/config/SSSDConfig/__init__.py.in:360
 msgid "loginDisabled attribute of NDS"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:366
+#: src/config/SSSDConfig/__init__.py.in:361
 msgid "loginExpirationTime attribute of NDS"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:367
+#: src/config/SSSDConfig/__init__.py.in:362
 msgid "loginAllowedTimeMap attribute of NDS"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:368
+#: src/config/SSSDConfig/__init__.py.in:363
 msgid "SSH public key attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:369
+#: src/config/SSSDConfig/__init__.py.in:364
 msgid "attribute listing allowed authentication types for a user"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:370
+#: src/config/SSSDConfig/__init__.py.in:365
 msgid "attribute containing the X509 certificate of the user"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:371
+#: src/config/SSSDConfig/__init__.py.in:366
 msgid "attribute containing the email address of the user"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:373
+#: src/config/SSSDConfig/__init__.py.in:368
 msgid "A list of extra attributes to download along with the user entry"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:375
+#: src/config/SSSDConfig/__init__.py.in:370
 msgid "Base DN for group lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:378
+#: src/config/SSSDConfig/__init__.py.in:373
 msgid "Objectclass for groups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:379
+#: src/config/SSSDConfig/__init__.py.in:374
 msgid "Group name"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:380
+#: src/config/SSSDConfig/__init__.py.in:375
 msgid "Group password"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:381
+#: src/config/SSSDConfig/__init__.py.in:376
 msgid "GID attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:382
+#: src/config/SSSDConfig/__init__.py.in:377
 msgid "Group member attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:383
+#: src/config/SSSDConfig/__init__.py.in:378
 msgid "Group UUID attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:385
+#: src/config/SSSDConfig/__init__.py.in:380
 msgid "Modification time attribute for groups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:386
+#: src/config/SSSDConfig/__init__.py.in:381
 msgid "Type of the group and other flags"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:387
+#: src/config/SSSDConfig/__init__.py.in:382
 msgid "The LDAP group external member attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:389
+#: src/config/SSSDConfig/__init__.py.in:384
 msgid "Maximum nesting level SSSD will follow"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:391
+#: src/config/SSSDConfig/__init__.py.in:386
 msgid "Base DN for netgroup lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:392
+#: src/config/SSSDConfig/__init__.py.in:387
 msgid "Objectclass for netgroups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:393
+#: src/config/SSSDConfig/__init__.py.in:388
 msgid "Netgroup name"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:394
+#: src/config/SSSDConfig/__init__.py.in:389
 msgid "Netgroups members attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:395
+#: src/config/SSSDConfig/__init__.py.in:390
 msgid "Netgroup triple attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:396
+#: src/config/SSSDConfig/__init__.py.in:391
 msgid "Modification time attribute for netgroups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:398
+#: src/config/SSSDConfig/__init__.py.in:393
 msgid "Base DN for service lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:399
+#: src/config/SSSDConfig/__init__.py.in:394
 msgid "Objectclass for services"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:400
+#: src/config/SSSDConfig/__init__.py.in:395
 msgid "Service name attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:401
+#: src/config/SSSDConfig/__init__.py.in:396
 msgid "Service port attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:402
+#: src/config/SSSDConfig/__init__.py.in:397
 msgid "Service protocol attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:405
+#: src/config/SSSDConfig/__init__.py.in:400
 msgid "Lower bound for ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:406
+#: src/config/SSSDConfig/__init__.py.in:401
 msgid "Upper bound for ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:407
+#: src/config/SSSDConfig/__init__.py.in:402
 msgid "Number of IDs for each slice when ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:408
+#: src/config/SSSDConfig/__init__.py.in:403
 msgid "Use autorid-compatible algorithm for ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:409
+#: src/config/SSSDConfig/__init__.py.in:404
 msgid "Name of the default domain for ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:410
+#: src/config/SSSDConfig/__init__.py.in:405
 msgid "SID of the default domain for ID-mapping"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:411
+#: src/config/SSSDConfig/__init__.py.in:406
 msgid "Number of secondary slices"
 msgstr ""
 
@@ -1279,408 +1279,408 @@
 msgid "Use LDAP_MATCHING_RULE_IN_CHAIN for initgroup lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:413
+#: src/config/SSSDConfig/__init__.py.in:410
 msgid "Whether to use Token-Groups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:414
+#: src/config/SSSDConfig/__init__.py.in:411
 msgid "Set lower boundary for allowed IDs from the LDAP server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:415
+#: src/config/SSSDConfig/__init__.py.in:412
 msgid "Set upper boundary for allowed IDs from the LDAP server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:416
+#: src/config/SSSDConfig/__init__.py.in:413
 msgid "DN for ppolicy queries"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:417
+#: src/config/SSSDConfig/__init__.py.in:414
 msgid "How many maximum entries to fetch during a wildcard request"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:420
+#: src/config/SSSDConfig/__init__.py.in:417
 msgid "Policy to evaluate the password expiration"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:424
+#: src/config/SSSDConfig/__init__.py.in:421
 msgid "Which attributes shall be used to evaluate if an account is expired"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:425
+#: src/config/SSSDConfig/__init__.py.in:422
 msgid "Which rules should be used to evaluate access control"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:428
+#: src/config/SSSDConfig/__init__.py.in:425
 msgid "URI of an LDAP server where password changes are allowed"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:429
+#: src/config/SSSDConfig/__init__.py.in:426
 msgid "URI of a backup LDAP server where password changes are allowed"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:430
+#: src/config/SSSDConfig/__init__.py.in:427
 msgid "DNS service name for LDAP password change server"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:431
+#: src/config/SSSDConfig/__init__.py.in:428
 msgid ""
 "Whether to update the ldap_user_shadow_last_change attribute after a "
 "password change"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:434
+#: src/config/SSSDConfig/__init__.py.in:431
 msgid "Base DN for sudo rules lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:435
+#: src/config/SSSDConfig/__init__.py.in:432
 msgid "Automatic full refresh period"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:436
+#: src/config/SSSDConfig/__init__.py.in:433
 msgid "Automatic smart refresh period"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:437
+#: src/config/SSSDConfig/__init__.py.in:434
 msgid "Whether to filter rules by hostname, IP addresses and network"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:438
+#: src/config/SSSDConfig/__init__.py.in:435
 msgid ""
 "Hostnames and/or fully qualified domain names of this machine to filter sudo "
 "rules"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:439
+#: src/config/SSSDConfig/__init__.py.in:436
 msgid ""
 "IPv4 or IPv6 addresses or network of this machine to filter sudo rules"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:440
+#: src/config/SSSDConfig/__init__.py.in:437
 msgid "Whether to include rules that contains netgroup in host attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:441
+#: src/config/SSSDConfig/__init__.py.in:438
 msgid ""
 "Whether to include rules that contains regular expression in host attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:442
+#: src/config/SSSDConfig/__init__.py.in:439
 msgid "Object class for sudo rules"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:443
+#: src/config/SSSDConfig/__init__.py.in:440
 msgid "Sudo rule name"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:444
+#: src/config/SSSDConfig/__init__.py.in:441
 msgid "Sudo rule command attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:445
+#: src/config/SSSDConfig/__init__.py.in:442
 msgid "Sudo rule host attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:446
+#: src/config/SSSDConfig/__init__.py.in:443
 msgid "Sudo rule user attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:447
+#: src/config/SSSDConfig/__init__.py.in:444
 msgid "Sudo rule option attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:448
+#: src/config/SSSDConfig/__init__.py.in:445
 msgid "Sudo rule runas attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:449
+#: src/config/SSSDConfig/__init__.py.in:446
 msgid "Sudo rule runasuser attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:450
+#: src/config/SSSDConfig/__init__.py.in:447
 msgid "Sudo rule runasgroup attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:451
+#: src/config/SSSDConfig/__init__.py.in:448
 msgid "Sudo rule notbefore attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:452
+#: src/config/SSSDConfig/__init__.py.in:449
 msgid "Sudo rule notafter attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:453
+#: src/config/SSSDConfig/__init__.py.in:450
 msgid "Sudo rule order attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:456
+#: src/config/SSSDConfig/__init__.py.in:453
 msgid "Object class for automounter maps"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:457
+#: src/config/SSSDConfig/__init__.py.in:454
 msgid "Automounter map name attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:458
+#: src/config/SSSDConfig/__init__.py.in:455
 msgid "Object class for automounter map entries"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:459
+#: src/config/SSSDConfig/__init__.py.in:456
 msgid "Automounter map entry key attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:460
+#: src/config/SSSDConfig/__init__.py.in:457
 msgid "Automounter map entry value attribute"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:461
+#: src/config/SSSDConfig/__init__.py.in:458
 msgid "Base DN for automounter map lookups"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:464
+#: src/config/SSSDConfig/__init__.py.in:461
 msgid "Comma separated list of allowed users"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:465
+#: src/config/SSSDConfig/__init__.py.in:462
 msgid "Comma separated list of prohibited users"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:468
+#: src/config/SSSDConfig/__init__.py.in:465
 msgid "Default shell, /bin/bash"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:469
+#: src/config/SSSDConfig/__init__.py.in:466
 msgid "Base for home directories"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:472
+#: src/config/SSSDConfig/__init__.py.in:469
 msgid "The number of preforked proxy children."
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:475
+#: src/config/SSSDConfig/__init__.py.in:472
 msgid "The name of the NSS library to use"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:476
+#: src/config/SSSDConfig/__init__.py.in:473
 msgid "Whether to look up canonical group name from cache if possible"
 msgstr ""
 
-#: src/config/SSSDConfig/__init__.py.in:479
+#: src/config/SSSDConfig/__init__.py.in:476
 msgid "PAM stack to use"
 msgstr ""
 
-#: src/monitor/monitor.c:2332
+#: src/monitor/monitor.c:2449
 msgid "Become a daemon (default)"
 msgstr ""
 
-#: src/monitor/monitor.c:2334
+#: src/monitor/monitor.c:2451
 msgid "Run interactive (not a daemon)"
 msgstr ""
 
-#: src/monitor/monitor.c:2337
+#: src/monitor/monitor.c:2454
 msgid "Disable netlink interface"
 msgstr ""
 
-#: src/monitor/monitor.c:2339 src/tools/sssctl/sssctl_logs.c:311
+#: src/monitor/monitor.c:2456 src/tools/sssctl/sssctl_logs.c:311
 msgid "Specify a non-default config file"
 msgstr ""
 
-#: src/monitor/monitor.c:2341
+#: src/monitor/monitor.c:2458
 msgid "Refresh the configuration database, then exit"
 msgstr ""
 
-#: src/monitor/monitor.c:2347
+#: src/monitor/monitor.c:2461
 msgid "Print version number and exit"
 msgstr ""
 
-#: src/monitor/monitor.c:2491
+#: src/monitor/monitor.c:2627
 msgid "SSSD is already running\n"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3232 src/providers/ldap/ldap_child.c:605
+#: src/providers/krb5/krb5_child.c:3216 src/providers/ldap/ldap_child.c:617
 msgid "Debug level"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3234 src/providers/ldap/ldap_child.c:607
+#: src/providers/krb5/krb5_child.c:3218 src/providers/ldap/ldap_child.c:619
 msgid "Add debug timestamps"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3236 src/providers/ldap/ldap_child.c:609
+#: src/providers/krb5/krb5_child.c:3220 src/providers/ldap/ldap_child.c:621
 msgid "Show timestamps with microseconds"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3238 src/providers/ldap/ldap_child.c:611
+#: src/providers/krb5/krb5_child.c:3222 src/providers/ldap/ldap_child.c:623
 msgid "An open file descriptor for the debug logs"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3241 src/providers/ldap/ldap_child.c:613
+#: src/providers/krb5/krb5_child.c:3225 src/providers/ldap/ldap_child.c:625
 msgid "Send the debug output to stderr directly."
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3244
+#: src/providers/krb5/krb5_child.c:3228
 msgid "The user to create FAST ccache as"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3246
+#: src/providers/krb5/krb5_child.c:3230
 msgid "The group to create FAST ccache as"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3248
+#: src/providers/krb5/krb5_child.c:3232
 msgid "Kerberos realm to use"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3250
+#: src/providers/krb5/krb5_child.c:3234
 msgid "Requested lifetime of the ticket"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3252
+#: src/providers/krb5/krb5_child.c:3236
 msgid "Requested renewable lifetime of the ticket"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3254
+#: src/providers/krb5/krb5_child.c:3238
 msgid "FAST options ('never', 'try', 'demand')"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3257
+#: src/providers/krb5/krb5_child.c:3241
 msgid "Specifies the server principal to use for FAST"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3259
+#: src/providers/krb5/krb5_child.c:3243
 msgid "Requests canonicalization of the principal name"
 msgstr ""
 
-#: src/providers/krb5/krb5_child.c:3261
+#: src/providers/krb5/krb5_child.c:3245
 msgid "Use custom version of krb5_get_init_creds_password"
 msgstr ""
 
-#: src/providers/data_provider_be.c:711
+#: src/providers/data_provider_be.c:555
 msgid "Domain of the information provider (mandatory)"
 msgstr ""
 
-#: src/sss_client/common.c:1084
+#: src/sss_client/common.c:1066
 msgid "Privileged socket has wrong ownership or permissions."
 msgstr ""
 
-#: src/sss_client/common.c:1087
+#: src/sss_client/common.c:1069
 msgid "Public socket has wrong ownership or permissions."
 msgstr ""
 
-#: src/sss_client/common.c:1090
+#: src/sss_client/common.c:1072
 msgid "Unexpected format of the server credential message."
 msgstr ""
 
-#: src/sss_client/common.c:1093
+#: src/sss_client/common.c:1075
 msgid "SSSD is not run by root."
 msgstr ""
 
-#: src/sss_client/common.c:1104
+#: src/sss_client/common.c:1080
 msgid "An error occurred, but no description can be found."
 msgstr ""
 
-#: src/sss_client/common.c:1110
+#: src/sss_client/common.c:1086
 msgid "Unexpected error while looking for an error description"
 msgstr ""
 
-#: src/sss_client/pam_sss.c:67
+#: src/sss_client/pam_sss.c:76
 msgid "Permission denied. "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:68 src/sss_client/pam_sss.c:778
-#: src/sss_client/pam_sss.c:789
+#: src/sss_client/pam_sss.c:77 src/sss_client/pam_sss.c:782
+#: src/sss_client/pam_sss.c:793
 msgid "Server message: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:296
+#: src/sss_client/pam_sss.c:300
 msgid "Passwords do not match"
 msgstr ""
 
-#: src/sss_client/pam_sss.c:484
+#: src/sss_client/pam_sss.c:488
 msgid "Password reset by root is not supported."
 msgstr ""
 
-#: src/sss_client/pam_sss.c:525
+#: src/sss_client/pam_sss.c:529
 msgid "Authenticated with cached credentials"
 msgstr ""
 
-#: src/sss_client/pam_sss.c:526
+#: src/sss_client/pam_sss.c:530
 msgid ", your cached password will expire at: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:556
+#: src/sss_client/pam_sss.c:560
 #, c-format
 msgid "Your password has expired. You have %1$d grace login(s) remaining."
 msgstr ""
 
-#: src/sss_client/pam_sss.c:602
+#: src/sss_client/pam_sss.c:606
 #, c-format
 msgid "Your password will expire in %1$d %2$s."
 msgstr ""
 
-#: src/sss_client/pam_sss.c:651
+#: src/sss_client/pam_sss.c:655
 msgid "Authentication is denied until: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:672
+#: src/sss_client/pam_sss.c:676
 msgid "System is offline, password change not possible"
 msgstr ""
 
-#: src/sss_client/pam_sss.c:687
+#: src/sss_client/pam_sss.c:691
 msgid ""
 "After changing the OTP password, you need to log out and back in order to "
 "acquire a ticket"
 msgstr ""
 
-#: src/sss_client/pam_sss.c:775 src/sss_client/pam_sss.c:788
+#: src/sss_client/pam_sss.c:779 src/sss_client/pam_sss.c:792
 msgid "Password change failed. "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:1989
+#: src/sss_client/pam_sss.c:1926
 msgid "New Password: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:1990
+#: src/sss_client/pam_sss.c:1927
 msgid "Reenter new Password: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2152 src/sss_client/pam_sss.c:2155
+#: src/sss_client/pam_sss.c:2039 src/sss_client/pam_sss.c:2042
 msgid "First Factor: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2153 src/sss_client/pam_sss.c:2324
+#: src/sss_client/pam_sss.c:2040 src/sss_client/pam_sss.c:2202
 msgid "Second Factor (optional): "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2156 src/sss_client/pam_sss.c:2327
+#: src/sss_client/pam_sss.c:2043 src/sss_client/pam_sss.c:2205
 msgid "Second Factor: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2171
+#: src/sss_client/pam_sss.c:2058
 msgid "Password: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2323 src/sss_client/pam_sss.c:2326
+#: src/sss_client/pam_sss.c:2201 src/sss_client/pam_sss.c:2204
 msgid "First Factor (Current Password): "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2330
+#: src/sss_client/pam_sss.c:2208
 msgid "Current Password: "
 msgstr ""
 
-#: src/sss_client/pam_sss.c:2685
+#: src/sss_client/pam_sss.c:2536
 msgid "Password expired. Change your password now."
 msgstr ""
 
-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:41
-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:204 src/tools/sss_useradd.c:48
+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:40
+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:203 src/tools/sss_useradd.c:48
 #: src/tools/sss_groupadd.c:41 src/tools/sss_groupdel.c:44
 #: src/tools/sss_groupmod.c:42 src/tools/sss_groupshow.c:668
 #: src/tools/sss_userdel.c:134 src/tools/sss_usermod.c:47
-#: src/tools/sss_cache.c:704
+#: src/tools/sss_cache.c:670
 msgid "The debug level to run with"
 msgstr ""
 
-#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:43
-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:208
+#: src/sss_client/ssh/sss_ssh_authorizedkeys.c:42
+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:207
 msgid "The SSSD domain to use"
 msgstr ""
 
@@ -1688,7 +1688,7 @@
 #: src/tools/sss_groupadd.c:59 src/tools/sss_groupdel.c:54
 #: src/tools/sss_groupmod.c:66 src/tools/sss_groupshow.c:680
 #: src/tools/sss_userdel.c:152 src/tools/sss_usermod.c:79
-#: src/tools/sss_cache.c:750
+#: src/tools/sss_cache.c:716
 msgid "Error setting the locale\n"
 msgstr ""
 
@@ -1704,19 +1704,19 @@
 msgid "Error looking up public keys\n"
 msgstr ""
 
-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:206
+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:205
 msgid "The port to use to connect to the host"
 msgstr ""
 
-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:252
+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:249
 msgid "Invalid port\n"
 msgstr "无效端口\n"
 
-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:257
+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:254
 msgid "Host not specified\n"
 msgstr ""
 
-#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:263
+#: src/sss_client/ssh/sss_ssh_knownhostsproxy.c:260
 msgid "The path to the proxy command must be absolute\n"
 msgstr ""
 
@@ -2118,102 +2118,102 @@
 msgid "Transaction error. Could not modify user.\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:245
+#: src/tools/sss_cache.c:218
 msgid "No cache object matched the specified search\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:536
+#: src/tools/sss_cache.c:502
 #, c-format
 msgid "Couldn't invalidate %1$s\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:543
+#: src/tools/sss_cache.c:509
 #, c-format
 msgid "Couldn't invalidate %1$s %2$s\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:706
+#: src/tools/sss_cache.c:672
 msgid "Invalidate all cached entries"
 msgstr ""
 
-#: src/tools/sss_cache.c:708
+#: src/tools/sss_cache.c:674
 msgid "Invalidate particular user"
 msgstr ""
 
-#: src/tools/sss_cache.c:710
+#: src/tools/sss_cache.c:676
 msgid "Invalidate all users"
 msgstr ""
 
-#: src/tools/sss_cache.c:712
+#: src/tools/sss_cache.c:678
 msgid "Invalidate particular group"
 msgstr ""
 
-#: src/tools/sss_cache.c:714
+#: src/tools/sss_cache.c:680
 msgid "Invalidate all groups"
 msgstr ""
 
-#: src/tools/sss_cache.c:716
+#: src/tools/sss_cache.c:682
 msgid "Invalidate particular netgroup"
 msgstr ""
 
-#: src/tools/sss_cache.c:718
+#: src/tools/sss_cache.c:684
 msgid "Invalidate all netgroups"
 msgstr ""
 
-#: src/tools/sss_cache.c:720
+#: src/tools/sss_cache.c:686
 msgid "Invalidate particular service"
 msgstr ""
 
-#: src/tools/sss_cache.c:722
+#: src/tools/sss_cache.c:688
 msgid "Invalidate all services"
 msgstr ""
 
-#: src/tools/sss_cache.c:725
+#: src/tools/sss_cache.c:691
 msgid "Invalidate particular autofs map"
 msgstr ""
 
-#: src/tools/sss_cache.c:727
+#: src/tools/sss_cache.c:693
 msgid "Invalidate all autofs maps"
 msgstr ""
 
-#: src/tools/sss_cache.c:731
+#: src/tools/sss_cache.c:697
 msgid "Invalidate particular SSH host"
 msgstr ""
 
-#: src/tools/sss_cache.c:733
+#: src/tools/sss_cache.c:699
 msgid "Invalidate all SSH hosts"
 msgstr ""
 
-#: src/tools/sss_cache.c:737
+#: src/tools/sss_cache.c:703
 msgid "Invalidate particular sudo rule"
 msgstr ""
 
-#: src/tools/sss_cache.c:739
+#: src/tools/sss_cache.c:705
 msgid "Invalidate all cached sudo rules"
 msgstr ""
 
-#: src/tools/sss_cache.c:742
+#: src/tools/sss_cache.c:708
 msgid "Only invalidate entries from a particular domain"
 msgstr ""
 
-#: src/tools/sss_cache.c:796
+#: src/tools/sss_cache.c:762
 msgid ""
 "Unexpected argument(s) provided, options that invalidate a single object "
 "only accept a single provided argument.\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:806
+#: src/tools/sss_cache.c:772
 msgid "Please select at least one object to invalidate\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:889
+#: src/tools/sss_cache.c:852
 #, c-format
 msgid ""
 "Could not open domain %1$s. If the domain is a subdomain (trusted domain), "
 "use fully qualified name instead of --domain/-d parameter.\n"
 msgstr ""
 
-#: src/tools/sss_cache.c:894
+#: src/tools/sss_cache.c:856
 msgid "Could not open available domains\n"
 msgstr ""
 
@@ -2299,38 +2299,38 @@
 msgid "Cached in InfoPipe"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:522
+#: src/tools/sssctl/sssctl_cache.c:512
 #, c-format
 msgid "Error: Unable to get object [%d]: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:538
+#: src/tools/sssctl/sssctl_cache.c:528
 #, c-format
 msgid "%s: Unable to read value [%d]: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:566
+#: src/tools/sssctl/sssctl_cache.c:556
 msgid "Specify name."
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:576
+#: src/tools/sssctl/sssctl_cache.c:566
 #, c-format
 msgid "Unable to parse name %s.\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:602 src/tools/sssctl/sssctl_cache.c:649
+#: src/tools/sssctl/sssctl_cache.c:592 src/tools/sssctl/sssctl_cache.c:639
 msgid "Search by SID"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:603
+#: src/tools/sssctl/sssctl_cache.c:593
 msgid "Search by user ID"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:612
+#: src/tools/sssctl/sssctl_cache.c:602
 msgid "Initgroups expiration time"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_cache.c:650
+#: src/tools/sssctl/sssctl_cache.c:640
 msgid "Search by group ID"
 msgstr ""
 
@@ -2395,8 +2395,8 @@
 msgid "Unable to import group overrides\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_data.c:194 src/tools/sssctl/sssctl_domains.c:82
-#: src/tools/sssctl/sssctl_domains.c:315
+#: src/tools/sssctl/sssctl_data.c:194 src/tools/sssctl/sssctl_domains.c:74
+#: src/tools/sssctl/sssctl_domains.c:339
 msgid "Start SSSD if it is not running"
 msgstr ""
 
@@ -2441,68 +2441,68 @@
 msgid "Restoring local data...\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:83
+#: src/tools/sssctl/sssctl_domains.c:75
 msgid "Show domain list including primary or trusted domain type"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:167
+#: src/tools/sssctl/sssctl_domains.c:156
 #, c-format
 msgid "Online status: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:167
+#: src/tools/sssctl/sssctl_domains.c:156
 msgid "Online"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:167
+#: src/tools/sssctl/sssctl_domains.c:156
 msgid "Offline"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:212
+#: src/tools/sssctl/sssctl_domains.c:214
 #, c-format
 msgid "Active servers:\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:223
+#: src/tools/sssctl/sssctl_domains.c:231
 msgid "not connected"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:260
+#: src/tools/sssctl/sssctl_domains.c:278
 #, c-format
 msgid "Discovered %s servers:\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:272
+#: src/tools/sssctl/sssctl_domains.c:296
 msgid "None so far.\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:312
+#: src/tools/sssctl/sssctl_domains.c:336
 msgid "Show online status"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:313
+#: src/tools/sssctl/sssctl_domains.c:337
 msgid "Show information about active server"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:314
+#: src/tools/sssctl/sssctl_domains.c:338
 msgid "Show list of discovered servers"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:320
+#: src/tools/sssctl/sssctl_domains.c:344
 msgid "Specify domain name."
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:342
+#: src/tools/sssctl/sssctl_domains.c:360
 #, c-format
 msgid "Out of memory!\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:362 src/tools/sssctl/sssctl_domains.c:372
+#: src/tools/sssctl/sssctl_domains.c:377 src/tools/sssctl/sssctl_domains.c:387
 #, c-format
 msgid "Unable to get online status\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_domains.c:382
+#: src/tools/sssctl/sssctl_domains.c:397
 #, c-format
 msgid "Unable to get server list\n"
 msgstr ""
@@ -2570,7 +2570,7 @@
 msgid "Unable to get user object"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:117
+#: src/tools/sssctl/sssctl_user_checks.c:101
 #, c-format
 msgid "SSSD InfoPipe user lookup result:\n"
 msgstr ""
@@ -2580,76 +2580,76 @@
 msgid "Unable to get user name attr"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:167
+#: src/tools/sssctl/sssctl_user_checks.c:146
 #, c-format
 msgid "dlopen failed with [%s].\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:174
+#: src/tools/sssctl/sssctl_user_checks.c:153
 #, c-format
 msgid "dlsym failed with [%s].\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:182
+#: src/tools/sssctl/sssctl_user_checks.c:161
 #, c-format
 msgid "malloc failed.\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:189
+#: src/tools/sssctl/sssctl_user_checks.c:168
 #, c-format
 msgid "sss_getpwnam_r failed with [%d].\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:194
+#: src/tools/sssctl/sssctl_user_checks.c:173
 #, c-format
 msgid "SSSD nss user lookup result:\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:195
+#: src/tools/sssctl/sssctl_user_checks.c:174
 #, c-format
 msgid " - user name: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:196
+#: src/tools/sssctl/sssctl_user_checks.c:175
 #, c-format
 msgid " - user id: %d\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:197
+#: src/tools/sssctl/sssctl_user_checks.c:176
 #, c-format
 msgid " - group id: %d\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:198
+#: src/tools/sssctl/sssctl_user_checks.c:177
 #, c-format
 msgid " - gecos: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:199
+#: src/tools/sssctl/sssctl_user_checks.c:178
 #, c-format
 msgid " - home directory: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:200
+#: src/tools/sssctl/sssctl_user_checks.c:179
 #, c-format
 msgid ""
 " - shell: %s\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:232
+#: src/tools/sssctl/sssctl_user_checks.c:211
 msgid "PAM action [auth|acct|setc|chau|open|clos], default: "
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:235
+#: src/tools/sssctl/sssctl_user_checks.c:214
 msgid "PAM service, default: "
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:240
+#: src/tools/sssctl/sssctl_user_checks.c:219
 msgid "Specify user name."
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:247
+#: src/tools/sssctl/sssctl_user_checks.c:226
 #, c-format
 msgid ""
 "user: %s\n"
@@ -2658,137 +2658,137 @@
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:253
+#: src/tools/sssctl/sssctl_user_checks.c:232
 #, c-format
 msgid "User name lookup with [%s] failed.\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:258
+#: src/tools/sssctl/sssctl_user_checks.c:237
 #, c-format
 msgid "InfoPipe User lookup with [%s] failed.\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:265
+#: src/tools/sssctl/sssctl_user_checks.c:244
 #, c-format
 msgid "pam_start failed: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:270
+#: src/tools/sssctl/sssctl_user_checks.c:249
 #, c-format
 msgid ""
 "testing pam_authenticate\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:274
+#: src/tools/sssctl/sssctl_user_checks.c:253
 #, c-format
 msgid "pam_get_item failed: %s\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:278
+#: src/tools/sssctl/sssctl_user_checks.c:257
 #, c-format
 msgid ""
 "pam_authenticate for user [%s]: %s\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:281
+#: src/tools/sssctl/sssctl_user_checks.c:260
 #, c-format
 msgid ""
 "testing pam_chauthtok\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:283
+#: src/tools/sssctl/sssctl_user_checks.c:262
 #, c-format
 msgid ""
 "pam_chauthtok: %s\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:285
+#: src/tools/sssctl/sssctl_user_checks.c:264
 #, c-format
 msgid ""
 "testing pam_acct_mgmt\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:287
+#: src/tools/sssctl/sssctl_user_checks.c:266
 #, c-format
 msgid ""
 "pam_acct_mgmt: %s\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:289
+#: src/tools/sssctl/sssctl_user_checks.c:268
 #, c-format
 msgid ""
 "testing pam_setcred\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:291
+#: src/tools/sssctl/sssctl_user_checks.c:270
 #, c-format
 msgid ""
 "pam_setcred: [%s]\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:293
+#: src/tools/sssctl/sssctl_user_checks.c:272
 #, c-format
 msgid ""
 "testing pam_open_session\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:295
+#: src/tools/sssctl/sssctl_user_checks.c:274
 #, c-format
 msgid ""
 "pam_open_session: %s\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:297
+#: src/tools/sssctl/sssctl_user_checks.c:276
 #, c-format
 msgid ""
 "testing pam_close_session\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:299
+#: src/tools/sssctl/sssctl_user_checks.c:278
 #, c-format
 msgid ""
 "pam_close_session: %s\n"
 "\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:302
+#: src/tools/sssctl/sssctl_user_checks.c:281
 #, c-format
 msgid "unknown action\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:305
+#: src/tools/sssctl/sssctl_user_checks.c:284
 #, c-format
 msgid "PAM Environment:\n"
 msgstr ""
 
-#: src/tools/sssctl/sssctl_user_checks.c:313
+#: src/tools/sssctl/sssctl_user_checks.c:292
 #, c-format
 msgid " - no env -\n"
 msgstr ""
 
-#: src/util/util.h:82
+#: src/util/util.h:75
 msgid "The user ID to run the server as"
 msgstr ""
 
-#: src/util/util.h:84
+#: src/util/util.h:77
 msgid "The group ID to run the server as"
 msgstr ""
 
-#: src/util/util.h:92
+#: src/util/util.h:85
 msgid "Informs that the responder has been socket-activated"
 msgstr ""
 
-#: src/util/util.h:94
+#: src/util/util.h:87
 msgid "Informs that the responder has been dbus-activated"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/subdomain_parser.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/subdomain_parser.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/subdomain_parser.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/subdomain_parser.po	2020-07-08 13:53:55.000000000 +0000
@@ -12,8 +12,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:40+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:27+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: ../parser_include.c:80
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sudoers.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sudoers.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sudoers.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sudoers.po	2020-07-08 13:54:02.000000000 +0000
@@ -7,15 +7,15 @@
 "Project-Id-Version: sudoers 1.8.21b2\n"
 "Report-Msgid-Bugs-To: https://bugzilla.sudo.ws\n"
 "POT-Creation-Date: 2017-08-03 10:04-0600\n"
-"PO-Revision-Date: 2019-10-14 16:59+0000\n"
+"PO-Revision-Date: 2020-02-03 13:59+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:11+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:01+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
@@ -43,38 +43,45 @@
 msgid "Sorry, try again."
 msgstr "对不起，请重试。"
 
-#: gram.y:196 gram.y:244 gram.y:251 gram.y:258 gram.y:265 gram.y:272 gram.y:288
-#: gram.y:312 gram.y:319 gram.y:326 gram.y:333 gram.y:340 gram.y:403 gram.y:412
-#: gram.y:423 gram.y:456 gram.y:463 gram.y:470 gram.y:477 gram.y:559 gram.y:566
-#: gram.y:575 gram.y:584 gram.y:601 gram.y:713 gram.y:720 gram.y:727 gram.y:735
-#: gram.y:835 gram.y:842 gram.y:849 gram.y:856 gram.y:863 gram.y:889 gram.y:896
-#: gram.y:903 gram.y:1026 gram.y:1303 plugins/sudoers/alias.c:132
-#: plugins/sudoers/alias.c:139 plugins/sudoers/alias.c:155
-#: plugins/sudoers/auth/bsdauth.c:148 plugins/sudoers/auth/kerb5.c:123
-#: plugins/sudoers/auth/kerb5.c:149 plugins/sudoers/auth/pam.c:670
-#: plugins/sudoers/auth/rfc1938.c:116 plugins/sudoers/auth/sia.c:64
-#: plugins/sudoers/cvtsudoers.c:124 plugins/sudoers/cvtsudoers.c:165
-#: plugins/sudoers/cvtsudoers.c:182 plugins/sudoers/cvtsudoers.c:193
-#: plugins/sudoers/cvtsudoers.c:305 plugins/sudoers/cvtsudoers.c:433
-#: plugins/sudoers/cvtsudoers.c:566 plugins/sudoers/cvtsudoers.c:583
-#: plugins/sudoers/cvtsudoers.c:646 plugins/sudoers/cvtsudoers.c:761
-#: plugins/sudoers/cvtsudoers.c:769 plugins/sudoers/cvtsudoers.c:1179
-#: plugins/sudoers/cvtsudoers.c:1183 plugins/sudoers/cvtsudoers.c:1285
+#: gram.y:198 gram.y:246 gram.y:253 gram.y:260 gram.y:267 gram.y:274 gram.y:290
+#: gram.y:314 gram.y:321 gram.y:328 gram.y:335 gram.y:342 gram.y:405 gram.y:414
+#: gram.y:425 gram.y:458 gram.y:465 gram.y:472 gram.y:479 gram.y:506 gram.y:578
+#: gram.y:585 gram.y:594 gram.y:603 gram.y:620 gram.y:732 gram.y:739 gram.y:747
+#: gram.y:753 gram.y:853 gram.y:860 gram.y:867 gram.y:874 gram.y:881 gram.y:907
+#: gram.y:914 gram.y:921 gram.y:1063 gram.y:1342 lib/iolog/iolog_fileio.c:1084
+#: lib/iolog/iolog_json.c:127 lib/iolog/iolog_json.c:290
+#: lib/iolog/iolog_json.c:320 lib/iolog/iolog_json.c:442
+#: lib/iolog/iolog_util.c:112 lib/iolog/iolog_util.c:121
+#: lib/iolog/iolog_util.c:131 lib/iolog/iolog_util.c:139
+#: lib/iolog/iolog_util.c:143 lib/iolog/iolog_util.c:202 logsrvd/eventlog.c:223
+#: plugins/sudoers/alias.c:132 plugins/sudoers/alias.c:139
+#: plugins/sudoers/alias.c:155 plugins/sudoers/auth/bsdauth.c:148
+#: plugins/sudoers/auth/kerb5.c:123 plugins/sudoers/auth/kerb5.c:149
+#: plugins/sudoers/auth/pam.c:674 plugins/sudoers/auth/rfc1938.c:116
+#: plugins/sudoers/auth/sia.c:64 plugins/sudoers/cvtsudoers.c:124
+#: plugins/sudoers/cvtsudoers.c:165 plugins/sudoers/cvtsudoers.c:182
+#: plugins/sudoers/cvtsudoers.c:193 plugins/sudoers/cvtsudoers.c:305
+#: plugins/sudoers/cvtsudoers.c:433 plugins/sudoers/cvtsudoers.c:566
+#: plugins/sudoers/cvtsudoers.c:583 plugins/sudoers/cvtsudoers.c:646
+#: plugins/sudoers/cvtsudoers.c:761 plugins/sudoers/cvtsudoers.c:769
+#: plugins/sudoers/cvtsudoers.c:1183 plugins/sudoers/cvtsudoers.c:1187
+#: plugins/sudoers/cvtsudoers.c:1289 plugins/sudoers/cvtsudoers_json.c:83
 #: plugins/sudoers/cvtsudoers_ldif.c:154 plugins/sudoers/cvtsudoers_ldif.c:197
-#: plugins/sudoers/cvtsudoers_ldif.c:244 plugins/sudoers/cvtsudoers_ldif.c:263
-#: plugins/sudoers/cvtsudoers_ldif.c:334 plugins/sudoers/cvtsudoers_ldif.c:389
-#: plugins/sudoers/cvtsudoers_ldif.c:397 plugins/sudoers/cvtsudoers_ldif.c:414
-#: plugins/sudoers/cvtsudoers_ldif.c:423 plugins/sudoers/cvtsudoers_ldif.c:570
-#: plugins/sudoers/defaults.c:666 plugins/sudoers/defaults.c:959
-#: plugins/sudoers/defaults.c:1130 plugins/sudoers/editor.c:72
+#: plugins/sudoers/cvtsudoers_ldif.c:238 plugins/sudoers/cvtsudoers_ldif.c:303
+#: plugins/sudoers/cvtsudoers_ldif.c:374 plugins/sudoers/cvtsudoers_ldif.c:429
+#: plugins/sudoers/cvtsudoers_ldif.c:437 plugins/sudoers/cvtsudoers_ldif.c:454
+#: plugins/sudoers/cvtsudoers_ldif.c:463 plugins/sudoers/cvtsudoers_ldif.c:610
+#: plugins/sudoers/defaults.c:633 plugins/sudoers/defaults.c:926
+#: plugins/sudoers/defaults.c:1059 plugins/sudoers/editor.c:72
 #: plugins/sudoers/editor.c:90 plugins/sudoers/editor.c:101
 #: plugins/sudoers/env.c:268 plugins/sudoers/filedigest.c:66
 #: plugins/sudoers/filedigest.c:82 plugins/sudoers/gc.c:59
-#: plugins/sudoers/group_plugin.c:138 plugins/sudoers/interfaces.c:78
-#: plugins/sudoers/iolog.c:943 plugins/sudoers/iolog_path.c:174
-#: plugins/sudoers/iolog_util.c:86 plugins/sudoers/iolog_util.c:125
-#: plugins/sudoers/iolog_util.c:134 plugins/sudoers/iolog_util.c:144
-#: plugins/sudoers/iolog_util.c:152 plugins/sudoers/iolog_util.c:156
+#: plugins/sudoers/group_plugin.c:141 plugins/sudoers/interfaces.c:78
+#: plugins/sudoers/iolog.c:487 plugins/sudoers/iolog_client.c:109
+#: plugins/sudoers/iolog_client.c:380 plugins/sudoers/iolog_client.c:557
+#: plugins/sudoers/iolog_client.c:676 plugins/sudoers/iolog_client.c:694
+#: plugins/sudoers/iolog_client.c:1174 plugins/sudoers/iolog_client.c:1403
+#: plugins/sudoers/iolog_client.c:1721 plugins/sudoers/iolog_client.c:1749
 #: plugins/sudoers/ldap.c:185 plugins/sudoers/ldap.c:416
 #: plugins/sudoers/ldap.c:420 plugins/sudoers/ldap.c:432
 #: plugins/sudoers/ldap.c:723 plugins/sudoers/ldap.c:887
@@ -86,161 +93,172 @@
 #: plugins/sudoers/ldap_conf.c:342 plugins/sudoers/ldap_conf.c:446
 #: plugins/sudoers/ldap_conf.c:461 plugins/sudoers/ldap_conf.c:558
 #: plugins/sudoers/ldap_conf.c:591 plugins/sudoers/ldap_conf.c:683
-#: plugins/sudoers/ldap_conf.c:765 plugins/sudoers/ldap_util.c:510
-#: plugins/sudoers/ldap_util.c:567 plugins/sudoers/linux_audit.c:83
-#: plugins/sudoers/logging.c:202 plugins/sudoers/logging.c:532
-#: plugins/sudoers/logging.c:558 plugins/sudoers/logging.c:599
-#: plugins/sudoers/logging.c:740 plugins/sudoers/logging.c:1100
-#: plugins/sudoers/match_command.c:249 plugins/sudoers/match_command.c:367
-#: plugins/sudoers/match_command.c:414 plugins/sudoers/match_command.c:485
-#: plugins/sudoers/match_digest.c:70 plugins/sudoers/parse.c:200
-#: plugins/sudoers/parse.c:212 plugins/sudoers/parse.c:227
-#: plugins/sudoers/parse.c:239 plugins/sudoers/parse_ldif.c:156
-#: plugins/sudoers/parse_ldif.c:187 plugins/sudoers/parse_ldif.c:256
-#: plugins/sudoers/parse_ldif.c:263 plugins/sudoers/parse_ldif.c:268
-#: plugins/sudoers/parse_ldif.c:344 plugins/sudoers/parse_ldif.c:355
-#: plugins/sudoers/parse_ldif.c:361 plugins/sudoers/parse_ldif.c:386
-#: plugins/sudoers/parse_ldif.c:398 plugins/sudoers/parse_ldif.c:402
-#: plugins/sudoers/parse_ldif.c:416 plugins/sudoers/parse_ldif.c:584
-#: plugins/sudoers/parse_ldif.c:614 plugins/sudoers/parse_ldif.c:639
-#: plugins/sudoers/parse_ldif.c:697 plugins/sudoers/parse_ldif.c:714
-#: plugins/sudoers/parse_ldif.c:742 plugins/sudoers/parse_ldif.c:749
-#: plugins/sudoers/policy.c:504 plugins/sudoers/policy.c:750
-#: plugins/sudoers/prompt.c:100 plugins/sudoers/pwutil.c:199
-#: plugins/sudoers/pwutil.c:270 plugins/sudoers/pwutil.c:348
-#: plugins/sudoers/pwutil.c:522 plugins/sudoers/pwutil.c:586
-#: plugins/sudoers/pwutil.c:657 plugins/sudoers/pwutil.c:816
-#: plugins/sudoers/pwutil.c:873 plugins/sudoers/pwutil.c:917
-#: plugins/sudoers/pwutil.c:975 plugins/sudoers/sssd.c:154
-#: plugins/sudoers/sssd.c:400 plugins/sudoers/sssd.c:463
-#: plugins/sudoers/sssd.c:507 plugins/sudoers/sssd.c:554
-#: plugins/sudoers/sssd.c:746 plugins/sudoers/stubs.c:103
-#: plugins/sudoers/stubs.c:111 plugins/sudoers/sudoers.c:273
-#: plugins/sudoers/sudoers.c:283 plugins/sudoers/sudoers.c:292
-#: plugins/sudoers/sudoers.c:334 plugins/sudoers/sudoers.c:657
-#: plugins/sudoers/sudoers.c:786 plugins/sudoers/sudoers.c:830
-#: plugins/sudoers/sudoers.c:1124 plugins/sudoers/sudoers_debug.c:114
-#: plugins/sudoers/sudoreplay.c:584 plugins/sudoers/sudoreplay.c:587
-#: plugins/sudoers/sudoreplay.c:1265 plugins/sudoers/sudoreplay.c:1465
-#: plugins/sudoers/sudoreplay.c:1469 plugins/sudoers/testsudoers.c:136
+#: plugins/sudoers/ldap_conf.c:765 plugins/sudoers/ldap_util.c:331
+#: plugins/sudoers/ldap_util.c:338 plugins/sudoers/ldap_util.c:603
+#: plugins/sudoers/linux_audit.c:83 plugins/sudoers/logging.c:200
+#: plugins/sudoers/logging.c:527 plugins/sudoers/logging.c:553
+#: plugins/sudoers/logging.c:594 plugins/sudoers/logging.c:731
+#: plugins/sudoers/logging.c:1091 plugins/sudoers/match_command.c:249
+#: plugins/sudoers/match_command.c:397 plugins/sudoers/match_command.c:444
+#: plugins/sudoers/match_command.c:515 plugins/sudoers/match_digest.c:87
+#: plugins/sudoers/parse.c:200 plugins/sudoers/parse.c:212
+#: plugins/sudoers/parse.c:227 plugins/sudoers/parse.c:239
+#: plugins/sudoers/parse_ldif.c:156 plugins/sudoers/parse_ldif.c:187
+#: plugins/sudoers/parse_ldif.c:256 plugins/sudoers/parse_ldif.c:263
+#: plugins/sudoers/parse_ldif.c:268 plugins/sudoers/parse_ldif.c:344
+#: plugins/sudoers/parse_ldif.c:355 plugins/sudoers/parse_ldif.c:382
+#: plugins/sudoers/parse_ldif.c:399 plugins/sudoers/parse_ldif.c:411
+#: plugins/sudoers/parse_ldif.c:415 plugins/sudoers/parse_ldif.c:429
+#: plugins/sudoers/parse_ldif.c:597 plugins/sudoers/parse_ldif.c:627
+#: plugins/sudoers/parse_ldif.c:652 plugins/sudoers/parse_ldif.c:710
+#: plugins/sudoers/parse_ldif.c:727 plugins/sudoers/parse_ldif.c:755
+#: plugins/sudoers/parse_ldif.c:762 plugins/sudoers/policy.c:504
+#: plugins/sudoers/policy.c:836 plugins/sudoers/prompt.c:100
+#: plugins/sudoers/pwutil.c:199 plugins/sudoers/pwutil.c:270
+#: plugins/sudoers/pwutil.c:348 plugins/sudoers/pwutil.c:522
+#: plugins/sudoers/pwutil.c:586 plugins/sudoers/pwutil.c:657
+#: plugins/sudoers/pwutil.c:816 plugins/sudoers/pwutil.c:873
+#: plugins/sudoers/pwutil.c:917 plugins/sudoers/pwutil.c:975
+#: plugins/sudoers/sssd.c:154 plugins/sudoers/sssd.c:400
+#: plugins/sudoers/sssd.c:463 plugins/sudoers/sssd.c:507
+#: plugins/sudoers/sssd.c:554 plugins/sudoers/sssd.c:746
+#: plugins/sudoers/stubs.c:103 plugins/sudoers/stubs.c:111
+#: plugins/sudoers/sudoers.c:320 plugins/sudoers/sudoers.c:331
+#: plugins/sudoers/sudoers.c:341 plugins/sudoers/sudoers.c:384
+#: plugins/sudoers/sudoers.c:735 plugins/sudoers/sudoers.c:864
+#: plugins/sudoers/sudoers.c:909 plugins/sudoers/sudoers.c:1213
+#: plugins/sudoers/sudoreplay.c:555 plugins/sudoers/sudoreplay.c:558
+#: plugins/sudoers/sudoreplay.c:1219 plugins/sudoers/sudoreplay.c:1429
+#: plugins/sudoers/sudoreplay.c:1433 plugins/sudoers/testsudoers.c:136
 #: plugins/sudoers/testsudoers.c:236 plugins/sudoers/testsudoers.c:253
 #: plugins/sudoers/testsudoers.c:587 plugins/sudoers/timestamp.c:439
-#: plugins/sudoers/timestamp.c:483 plugins/sudoers/timestamp.c:960
+#: plugins/sudoers/timestamp.c:483 plugins/sudoers/timestamp.c:993
 #: plugins/sudoers/toke_util.c:59 plugins/sudoers/toke_util.c:112
-#: plugins/sudoers/toke_util.c:149 plugins/sudoers/tsdump.c:130
-#: plugins/sudoers/visudo.c:152 plugins/sudoers/visudo.c:328
-#: plugins/sudoers/visudo.c:334 plugins/sudoers/visudo.c:444
-#: plugins/sudoers/visudo.c:622 plugins/sudoers/visudo.c:942
-#: plugins/sudoers/visudo.c:1029 plugins/sudoers/visudo.c:1118 toke.l:846
-#: toke.l:947 toke.l:1104
+#: plugins/sudoers/toke_util.c:137 plugins/sudoers/toke_util.c:165
+#: plugins/sudoers/tsdump.c:130 plugins/sudoers/visudo.c:152
+#: plugins/sudoers/visudo.c:328 plugins/sudoers/visudo.c:334
+#: plugins/sudoers/visudo.c:444 plugins/sudoers/visudo.c:622
+#: plugins/sudoers/visudo.c:942 plugins/sudoers/visudo.c:1029
+#: plugins/sudoers/visudo.c:1118 toke.l:846 toke.l:947 toke.l:1104
 msgid "unable to allocate memory"
 msgstr "无法分配内存"
 
-#: gram.y:488
+#: gram.y:500
 msgid "a digest requires a path name"
 msgstr "摘要需要路径参数"
 
-#: gram.y:614
+#: gram.y:633
 msgid "invalid notbefore value"
 msgstr "无效的 notbefore 值"
 
-#: gram.y:622
+#: gram.y:641
 msgid "invalid notafter value"
 msgstr "无效的 notafter 值"
 
-#: gram.y:631 plugins/sudoers/policy.c:320
+#: gram.y:650 plugins/sudoers/policy.c:319
 msgid "timeout value too large"
 msgstr "超时值过大"
 
-#: gram.y:633 plugins/sudoers/policy.c:322
+#: gram.y:652 plugins/sudoers/policy.c:321
 msgid "invalid timeout value"
 msgstr "无效的超时值"
 
-#: gram.y:1303 plugins/sudoers/auth/pam.c:483 plugins/sudoers/auth/pam.c:670
+#: gram.y:1342 lib/iolog/iolog_fileio.c:1084 lib/iolog/iolog_json.c:127
+#: lib/iolog/iolog_json.c:289 lib/iolog/iolog_json.c:320
+#: lib/iolog/iolog_json.c:442 lib/iolog/iolog_json.c:720
+#: lib/iolog/iolog_util.c:112 lib/iolog/iolog_util.c:121
+#: lib/iolog/iolog_util.c:131 lib/iolog/iolog_util.c:139
+#: lib/iolog/iolog_util.c:143 lib/iolog/iolog_util.c:202 logsrvd/eventlog.c:223
+#: logsrvd/logsrvd.c:1174 logsrvd/logsrvd.c:1187 logsrvd/logsrvd.c:1226
+#: logsrvd/sendlog.c:1178 logsrvd/sendlog.c:1185 logsrvd/sendlog.c:1591
+#: plugins/sudoers/auth/pam.c:487 plugins/sudoers/auth/pam.c:674
 #: plugins/sudoers/auth/rfc1938.c:116 plugins/sudoers/cvtsudoers.c:124
 #: plugins/sudoers/cvtsudoers.c:164 plugins/sudoers/cvtsudoers.c:181
 #: plugins/sudoers/cvtsudoers.c:192 plugins/sudoers/cvtsudoers.c:304
 #: plugins/sudoers/cvtsudoers.c:432 plugins/sudoers/cvtsudoers.c:565
 #: plugins/sudoers/cvtsudoers.c:582 plugins/sudoers/cvtsudoers.c:646
 #: plugins/sudoers/cvtsudoers.c:761 plugins/sudoers/cvtsudoers.c:768
-#: plugins/sudoers/cvtsudoers.c:1179 plugins/sudoers/cvtsudoers.c:1183
-#: plugins/sudoers/cvtsudoers.c:1285 plugins/sudoers/cvtsudoers_ldif.c:153
-#: plugins/sudoers/cvtsudoers_ldif.c:196 plugins/sudoers/cvtsudoers_ldif.c:243
-#: plugins/sudoers/cvtsudoers_ldif.c:262 plugins/sudoers/cvtsudoers_ldif.c:333
-#: plugins/sudoers/cvtsudoers_ldif.c:388 plugins/sudoers/cvtsudoers_ldif.c:396
-#: plugins/sudoers/cvtsudoers_ldif.c:413 plugins/sudoers/cvtsudoers_ldif.c:422
-#: plugins/sudoers/cvtsudoers_ldif.c:569 plugins/sudoers/defaults.c:666
-#: plugins/sudoers/defaults.c:959 plugins/sudoers/defaults.c:1130
-#: plugins/sudoers/editor.c:72 plugins/sudoers/editor.c:90
-#: plugins/sudoers/editor.c:101 plugins/sudoers/env.c:268
-#: plugins/sudoers/filedigest.c:66 plugins/sudoers/filedigest.c:82
-#: plugins/sudoers/gc.c:59 plugins/sudoers/group_plugin.c:138
-#: plugins/sudoers/interfaces.c:78 plugins/sudoers/iolog.c:943
-#: plugins/sudoers/iolog_path.c:174 plugins/sudoers/iolog_util.c:86
-#: plugins/sudoers/iolog_util.c:125 plugins/sudoers/iolog_util.c:134
-#: plugins/sudoers/iolog_util.c:144 plugins/sudoers/iolog_util.c:152
-#: plugins/sudoers/iolog_util.c:156 plugins/sudoers/ldap.c:185
-#: plugins/sudoers/ldap.c:416 plugins/sudoers/ldap.c:420
-#: plugins/sudoers/ldap.c:432 plugins/sudoers/ldap.c:723
-#: plugins/sudoers/ldap.c:887 plugins/sudoers/ldap.c:1241
-#: plugins/sudoers/ldap.c:1668 plugins/sudoers/ldap.c:1705
-#: plugins/sudoers/ldap.c:1786 plugins/sudoers/ldap.c:1921
-#: plugins/sudoers/ldap.c:2022 plugins/sudoers/ldap.c:2038
-#: plugins/sudoers/ldap_conf.c:223 plugins/sudoers/ldap_conf.c:254
-#: plugins/sudoers/ldap_conf.c:306 plugins/sudoers/ldap_conf.c:342
-#: plugins/sudoers/ldap_conf.c:446 plugins/sudoers/ldap_conf.c:461
-#: plugins/sudoers/ldap_conf.c:558 plugins/sudoers/ldap_conf.c:591
-#: plugins/sudoers/ldap_conf.c:682 plugins/sudoers/ldap_conf.c:765
-#: plugins/sudoers/ldap_util.c:510 plugins/sudoers/ldap_util.c:567
-#: plugins/sudoers/linux_audit.c:83 plugins/sudoers/logging.c:202
-#: plugins/sudoers/logging.c:532 plugins/sudoers/logging.c:558
-#: plugins/sudoers/logging.c:598 plugins/sudoers/logging.c:1100
-#: plugins/sudoers/match_command.c:248 plugins/sudoers/match_command.c:366
-#: plugins/sudoers/match_command.c:413 plugins/sudoers/match_command.c:485
-#: plugins/sudoers/match_digest.c:70 plugins/sudoers/parse.c:199
+#: plugins/sudoers/cvtsudoers.c:1183 plugins/sudoers/cvtsudoers.c:1187
+#: plugins/sudoers/cvtsudoers.c:1289 plugins/sudoers/cvtsudoers_json.c:82
+#: plugins/sudoers/cvtsudoers_ldif.c:153 plugins/sudoers/cvtsudoers_ldif.c:196
+#: plugins/sudoers/cvtsudoers_ldif.c:237 plugins/sudoers/cvtsudoers_ldif.c:302
+#: plugins/sudoers/cvtsudoers_ldif.c:373 plugins/sudoers/cvtsudoers_ldif.c:428
+#: plugins/sudoers/cvtsudoers_ldif.c:436 plugins/sudoers/cvtsudoers_ldif.c:453
+#: plugins/sudoers/cvtsudoers_ldif.c:462 plugins/sudoers/cvtsudoers_ldif.c:609
+#: plugins/sudoers/defaults.c:633 plugins/sudoers/defaults.c:926
+#: plugins/sudoers/defaults.c:1059 plugins/sudoers/editor.c:72
+#: plugins/sudoers/editor.c:90 plugins/sudoers/editor.c:101
+#: plugins/sudoers/env.c:268 plugins/sudoers/filedigest.c:66
+#: plugins/sudoers/filedigest.c:82 plugins/sudoers/gc.c:59
+#: plugins/sudoers/group_plugin.c:140 plugins/sudoers/interfaces.c:78
+#: plugins/sudoers/iolog.c:487 plugins/sudoers/iolog_client.c:109
+#: plugins/sudoers/iolog_client.c:219 plugins/sudoers/iolog_client.c:234
+#: plugins/sudoers/iolog_client.c:247 plugins/sudoers/iolog_client.c:380
+#: plugins/sudoers/iolog_client.c:676 plugins/sudoers/iolog_client.c:694
+#: plugins/sudoers/iolog_client.c:1174 plugins/sudoers/iolog_client.c:1403
+#: plugins/sudoers/iolog_client.c:1721 plugins/sudoers/iolog_client.c:1749
+#: plugins/sudoers/ldap.c:185 plugins/sudoers/ldap.c:416
+#: plugins/sudoers/ldap.c:420 plugins/sudoers/ldap.c:432
+#: plugins/sudoers/ldap.c:723 plugins/sudoers/ldap.c:887
+#: plugins/sudoers/ldap.c:1241 plugins/sudoers/ldap.c:1668
+#: plugins/sudoers/ldap.c:1705 plugins/sudoers/ldap.c:1786
+#: plugins/sudoers/ldap.c:1921 plugins/sudoers/ldap.c:2022
+#: plugins/sudoers/ldap.c:2038 plugins/sudoers/ldap_conf.c:223
+#: plugins/sudoers/ldap_conf.c:254 plugins/sudoers/ldap_conf.c:306
+#: plugins/sudoers/ldap_conf.c:342 plugins/sudoers/ldap_conf.c:446
+#: plugins/sudoers/ldap_conf.c:461 plugins/sudoers/ldap_conf.c:558
+#: plugins/sudoers/ldap_conf.c:591 plugins/sudoers/ldap_conf.c:682
+#: plugins/sudoers/ldap_conf.c:765 plugins/sudoers/ldap_util.c:330
+#: plugins/sudoers/ldap_util.c:337 plugins/sudoers/ldap_util.c:603
+#: plugins/sudoers/linux_audit.c:83 plugins/sudoers/logging.c:200
+#: plugins/sudoers/logging.c:527 plugins/sudoers/logging.c:553
+#: plugins/sudoers/logging.c:593 plugins/sudoers/logging.c:1091
+#: plugins/sudoers/match_command.c:248 plugins/sudoers/match_command.c:396
+#: plugins/sudoers/match_command.c:443 plugins/sudoers/match_command.c:515
+#: plugins/sudoers/match_digest.c:87 plugins/sudoers/parse.c:199
 #: plugins/sudoers/parse.c:211 plugins/sudoers/parse.c:226
 #: plugins/sudoers/parse.c:238 plugins/sudoers/parse_ldif.c:155
 #: plugins/sudoers/parse_ldif.c:186 plugins/sudoers/parse_ldif.c:255
 #: plugins/sudoers/parse_ldif.c:262 plugins/sudoers/parse_ldif.c:267
 #: plugins/sudoers/parse_ldif.c:343 plugins/sudoers/parse_ldif.c:354
-#: plugins/sudoers/parse_ldif.c:360 plugins/sudoers/parse_ldif.c:385
-#: plugins/sudoers/parse_ldif.c:397 plugins/sudoers/parse_ldif.c:401
-#: plugins/sudoers/parse_ldif.c:415 plugins/sudoers/parse_ldif.c:584
-#: plugins/sudoers/parse_ldif.c:613 plugins/sudoers/parse_ldif.c:638
-#: plugins/sudoers/parse_ldif.c:696 plugins/sudoers/parse_ldif.c:713
-#: plugins/sudoers/parse_ldif.c:741 plugins/sudoers/parse_ldif.c:748
-#: plugins/sudoers/policy.c:134 plugins/sudoers/policy.c:143
-#: plugins/sudoers/policy.c:152 plugins/sudoers/policy.c:178
-#: plugins/sudoers/policy.c:305 plugins/sudoers/policy.c:320
-#: plugins/sudoers/policy.c:322 plugins/sudoers/policy.c:348
-#: plugins/sudoers/policy.c:358 plugins/sudoers/policy.c:402
+#: plugins/sudoers/parse_ldif.c:381 plugins/sudoers/parse_ldif.c:398
+#: plugins/sudoers/parse_ldif.c:410 plugins/sudoers/parse_ldif.c:414
+#: plugins/sudoers/parse_ldif.c:428 plugins/sudoers/parse_ldif.c:597
+#: plugins/sudoers/parse_ldif.c:626 plugins/sudoers/parse_ldif.c:651
+#: plugins/sudoers/parse_ldif.c:709 plugins/sudoers/parse_ldif.c:726
+#: plugins/sudoers/parse_ldif.c:754 plugins/sudoers/parse_ldif.c:761
+#: plugins/sudoers/policy.c:133 plugins/sudoers/policy.c:142
+#: plugins/sudoers/policy.c:151 plugins/sudoers/policy.c:177
+#: plugins/sudoers/policy.c:304 plugins/sudoers/policy.c:319
+#: plugins/sudoers/policy.c:321 plugins/sudoers/policy.c:350
+#: plugins/sudoers/policy.c:359 plugins/sudoers/policy.c:402
 #: plugins/sudoers/policy.c:412 plugins/sudoers/policy.c:421
 #: plugins/sudoers/policy.c:430 plugins/sudoers/policy.c:504
-#: plugins/sudoers/policy.c:750 plugins/sudoers/prompt.c:100
+#: plugins/sudoers/policy.c:836 plugins/sudoers/prompt.c:100
 #: plugins/sudoers/pwutil.c:199 plugins/sudoers/pwutil.c:270
 #: plugins/sudoers/pwutil.c:348 plugins/sudoers/pwutil.c:522
 #: plugins/sudoers/pwutil.c:586 plugins/sudoers/pwutil.c:657
 #: plugins/sudoers/pwutil.c:816 plugins/sudoers/pwutil.c:873
 #: plugins/sudoers/pwutil.c:917 plugins/sudoers/pwutil.c:975
-#: plugins/sudoers/set_perms.c:396 plugins/sudoers/set_perms.c:775
-#: plugins/sudoers/set_perms.c:1165 plugins/sudoers/set_perms.c:1493
-#: plugins/sudoers/set_perms.c:1659 plugins/sudoers/sssd.c:153
+#: plugins/sudoers/set_perms.c:365 plugins/sudoers/set_perms.c:704
+#: plugins/sudoers/set_perms.c:1067 plugins/sudoers/set_perms.c:1370
+#: plugins/sudoers/set_perms.c:1535 plugins/sudoers/sssd.c:153
 #: plugins/sudoers/sssd.c:400 plugins/sudoers/sssd.c:463
 #: plugins/sudoers/sssd.c:507 plugins/sudoers/sssd.c:554
 #: plugins/sudoers/sssd.c:746 plugins/sudoers/stubs.c:103
-#: plugins/sudoers/stubs.c:111 plugins/sudoers/sudoers.c:273
-#: plugins/sudoers/sudoers.c:283 plugins/sudoers/sudoers.c:292
-#: plugins/sudoers/sudoers.c:334 plugins/sudoers/sudoers.c:657
-#: plugins/sudoers/sudoers.c:786 plugins/sudoers/sudoers.c:830
-#: plugins/sudoers/sudoers.c:1124 plugins/sudoers/sudoers_debug.c:113
-#: plugins/sudoers/sudoreplay.c:584 plugins/sudoers/sudoreplay.c:587
-#: plugins/sudoers/sudoreplay.c:1265 plugins/sudoers/sudoreplay.c:1465
-#: plugins/sudoers/sudoreplay.c:1469 plugins/sudoers/testsudoers.c:136
-#: plugins/sudoers/testsudoers.c:236 plugins/sudoers/testsudoers.c:253
-#: plugins/sudoers/testsudoers.c:587 plugins/sudoers/timestamp.c:439
-#: plugins/sudoers/timestamp.c:483 plugins/sudoers/timestamp.c:960
-#: plugins/sudoers/toke_util.c:59 plugins/sudoers/toke_util.c:112
-#: plugins/sudoers/toke_util.c:149 plugins/sudoers/tsdump.c:130
+#: plugins/sudoers/stubs.c:111 plugins/sudoers/sudoers.c:320
+#: plugins/sudoers/sudoers.c:331 plugins/sudoers/sudoers.c:341
+#: plugins/sudoers/sudoers.c:384 plugins/sudoers/sudoers.c:735
+#: plugins/sudoers/sudoers.c:864 plugins/sudoers/sudoers.c:909
+#: plugins/sudoers/sudoers.c:1213 plugins/sudoers/sudoreplay.c:555
+#: plugins/sudoers/sudoreplay.c:558 plugins/sudoers/sudoreplay.c:1219
+#: plugins/sudoers/sudoreplay.c:1429 plugins/sudoers/sudoreplay.c:1433
+#: plugins/sudoers/testsudoers.c:136 plugins/sudoers/testsudoers.c:236
+#: plugins/sudoers/testsudoers.c:253 plugins/sudoers/testsudoers.c:587
+#: plugins/sudoers/timestamp.c:439 plugins/sudoers/timestamp.c:483
+#: plugins/sudoers/timestamp.c:993 plugins/sudoers/toke_util.c:59
+#: plugins/sudoers/toke_util.c:112 plugins/sudoers/toke_util.c:136
+#: plugins/sudoers/toke_util.c:165 plugins/sudoers/tsdump.c:130
 #: plugins/sudoers/visudo.c:152 plugins/sudoers/visudo.c:328
 #: plugins/sudoers/visudo.c:334 plugins/sudoers/visudo.c:444
 #: plugins/sudoers/visudo.c:622 plugins/sudoers/visudo.c:942
@@ -343,30 +361,30 @@
 msgid "unable to initialize PAM"
 msgstr "无法初始化 PAM"
 
-#: plugins/sudoers/auth/pam.c:338
+#: plugins/sudoers/auth/pam.c:341
 msgid "account validation failure, is your account locked?"
 msgstr "账户验证失败，您的账户是不是上锁了？"
 
-#: plugins/sudoers/auth/pam.c:349
+#: plugins/sudoers/auth/pam.c:352
 msgid "Account or password is expired, reset your password and try again"
 msgstr "账户或密码过期，重置您的密码并重试"
 
-#: plugins/sudoers/auth/pam.c:355
+#: plugins/sudoers/auth/pam.c:358
 #, c-format
 msgid "unable to change expired password: %s"
 msgstr "无法更改过期的密码：%s"
 
-#: plugins/sudoers/auth/pam.c:366
+#: plugins/sudoers/auth/pam.c:369
 msgid "Password expired, contact your system administrator"
 msgstr "密码过期，联系您的系统管理员"
 
-#: plugins/sudoers/auth/pam.c:371
+#: plugins/sudoers/auth/pam.c:374
 msgid ""
 "Account expired or PAM config lacks an \"account\" section for sudo, contact "
 "your system administrator"
 msgstr "账户过期，或 PAM 配置缺少 sudo 使用的“account”节，联系您的系统管理员"
 
-#: plugins/sudoers/auth/pam.c:319
+#: plugins/sudoers/auth/pam.c:322
 #, c-format
 msgid "PAM authentication error: %s"
 msgstr "PAM 认证出错：%s"
@@ -448,7 +466,7 @@
 msgid "unable to commit audit record"
 msgstr "无法提交审核记录"
 
-#: plugins/sudoers/check.c:269
+#: plugins/sudoers/check.c:264
 msgid ""
 "\n"
 "We trust you have received the usual lecture from the local System\n"
@@ -468,15 +486,16 @@
 "    #3) 权力越大，责任越大。\n"
 "\n"
 
-#: plugins/sudoers/check.c:312 plugins/sudoers/check.c:322
-#: plugins/sudoers/sudoers.c:700 plugins/sudoers/sudoers.c:748
+#: plugins/sudoers/check.c:307 plugins/sudoers/check.c:317
+#: plugins/sudoers/sudoers.c:778 plugins/sudoers/sudoers.c:826
 #: plugins/sudoers/tsdump.c:126
 #, c-format
 msgid "unknown uid: %u"
 msgstr "未知的用户 ID：%u"
 
-#: plugins/sudoers/check.c:317 plugins/sudoers/iolog.c:255
-#: plugins/sudoers/policy.c:921 plugins/sudoers/sudoers.c:1163
+#: plugins/sudoers/check.c:312 plugins/sudoers/iolog.c:121
+#: plugins/sudoers/policy.c:1047 plugins/sudoers/sudoers.c:391
+#: plugins/sudoers/sudoers.c:393 plugins/sudoers/sudoers.c:1255
 #: plugins/sudoers/testsudoers.c:227 plugins/sudoers/testsudoers.c:400
 #, c-format
 msgid "unknown user: %s"
@@ -983,75 +1002,79 @@
 msgid "Type of authentication timestamp record: %s"
 msgstr "认证时间戳记录的类型：%s"
 
-#: plugins/sudoers/defaults.c:231
+#: plugins/sudoers/defaults.c:190
 #, c-format
 msgid "%s:%d unknown defaults entry \"%s\""
 msgstr "%s：%d 未知的默认条目“%s”"
 
-#: plugins/sudoers/defaults.c:234
+#: plugins/sudoers/defaults.c:193
 #, c-format
 msgid "%s: unknown defaults entry \"%s\""
 msgstr "%s：未知的默认条目“%s”"
 
-#: plugins/sudoers/defaults.c:277
+#: plugins/sudoers/defaults.c:236
 #, c-format
 msgid "%s:%d no value specified for \"%s\""
 msgstr "%s：%d 没有给“%s”指定值"
 
-#: plugins/sudoers/defaults.c:280
+#: plugins/sudoers/defaults.c:239
 #, c-format
 msgid "%s: no value specified for \"%s\""
 msgstr "%s：没有给“%s”指定值"
 
-#: plugins/sudoers/defaults.c:300
+#: plugins/sudoers/defaults.c:259
 #, c-format
 msgid "%s:%d values for \"%s\" must start with a '/'"
 msgstr "%s：%d “%s”的值必须以“/”开头"
 
-#: plugins/sudoers/defaults.c:303
+#: plugins/sudoers/defaults.c:262
 #, c-format
 msgid "%s: values for \"%s\" must start with a '/'"
 msgstr "%s：“%s”的值必须以“/”开头"
 
-#: plugins/sudoers/defaults.c:325
+#: plugins/sudoers/defaults.c:284
 #, c-format
 msgid "%s:%d option \"%s\" does not take a value"
 msgstr "%s：%d “%s”选项不带值"
 
-#: plugins/sudoers/defaults.c:328
+#: plugins/sudoers/defaults.c:287
 #, c-format
 msgid "%s: option \"%s\" does not take a value"
 msgstr "%s：“%s”选项不带值"
 
-#: plugins/sudoers/defaults.c:353
+#: plugins/sudoers/defaults.c:312
 #, c-format
 msgid "%s:%d invalid Defaults type 0x%x for option \"%s\""
 msgstr "%1$s：%2$d 选项“%4$s”的默认类型 0x%3$x 无效"
 
-#: plugins/sudoers/defaults.c:356
+#: plugins/sudoers/defaults.c:315
 #, c-format
 msgid "%s: invalid Defaults type 0x%x for option \"%s\""
 msgstr "%1$s：选项“%3$s”的默认类型 0x%2$x 无效"
 
-#: plugins/sudoers/defaults.c:366
+#: plugins/sudoers/defaults.c:325
 #, c-format
 msgid "%s:%d value \"%s\" is invalid for option \"%s\""
 msgstr "%1$s：%2$d 值“%3$s”对选项“%4$s”无效"
 
-#: plugins/sudoers/defaults.c:369
+#: plugins/sudoers/defaults.c:328
 #, c-format
 msgid "%s: value \"%s\" is invalid for option \"%s\""
 msgstr "%s：值“%s”对选项“%s”无效"
 
-#: plugins/sudoers/cvtsudoers_ldif.c:526 plugins/sudoers/env.c:330
+#: lib/iolog/iolog_json.c:448 lib/iolog/iolog_json.c:451
+#: lib/iolog/iolog_json.c:453 lib/iolog/iolog_json.c:545 logsrvd/eventlog.c:228
+#: plugins/sudoers/cvtsudoers_ldif.c:247 plugins/sudoers/cvtsudoers_ldif.c:254
+#: plugins/sudoers/cvtsudoers_ldif.c:566 plugins/sudoers/env.c:330
 #: plugins/sudoers/env.c:337 plugins/sudoers/env.c:442
+#: plugins/sudoers/iolog.c:566 plugins/sudoers/iolog.c:582
 #: plugins/sudoers/ldap.c:496 plugins/sudoers/ldap.c:727
 #: plugins/sudoers/ldap.c:1060 plugins/sudoers/ldap_conf.c:227
 #: plugins/sudoers/ldap_conf.c:317 plugins/sudoers/linux_audit.c:89
-#: plugins/sudoers/logging.c:1105 plugins/sudoers/policy.c:625
-#: plugins/sudoers/policy.c:635 plugins/sudoers/prompt.c:168
-#: plugins/sudoers/sudoers.c:852 plugins/sudoers/testsudoers.c:257
-#: plugins/sudoers/toke_util.c:161
+#: plugins/sudoers/logging.c:1096 plugins/sudoers/policy.c:534
+#: plugins/sudoers/policy.c:681 plugins/sudoers/policy.c:691
+#: plugins/sudoers/prompt.c:168 plugins/sudoers/sudoers.c:931
+#: plugins/sudoers/testsudoers.c:257 plugins/sudoers/toke_util.c:177
 #, c-format
 msgid "internal error, %s overflow"
 msgstr "内部错误，%s 溢出"
@@ -1060,11 +1083,11 @@
 msgid "sudo_putenv: corrupted envp, length mismatch"
 msgstr "sudo_putenv：envp 损坏，长度不符"
 
-#: plugins/sudoers/env.c:1132
+#: plugins/sudoers/env.c:1138
 msgid "unable to rebuild the environment"
 msgstr "无法重建环境"
 
-#: plugins/sudoers/env.c:1206
+#: plugins/sudoers/env.c:1212
 #, c-format
 msgid ""
 "sorry, you are not allowed to set the following environment variables: %s"
@@ -1080,27 +1103,27 @@
 msgid "%s: read error"
 msgstr "%s：写错误"
 
-#: plugins/sudoers/group_plugin.c:90
+#: plugins/sudoers/group_plugin.c:91
 #, c-format
 msgid "%s must be owned by uid %d"
 msgstr "%s 必须属于用户 ID %d"
 
-#: plugins/sudoers/group_plugin.c:94
+#: plugins/sudoers/group_plugin.c:95
 #, c-format
 msgid "%s must only be writable by owner"
 msgstr "%s 必须只对所有者可写"
 
-#: plugins/sudoers/group_plugin.c:102 plugins/sudoers/sssd.c:562
+#: plugins/sudoers/group_plugin.c:104 plugins/sudoers/sssd.c:562
 #, c-format
 msgid "unable to load %s: %s"
 msgstr "无法加载 %s：%s"
 
-#: plugins/sudoers/group_plugin.c:108
+#: plugins/sudoers/group_plugin.c:110
 #, c-format
 msgid "unable to find symbol \"group_plugin\" in %s"
 msgstr "无法在 %s 中找到符号“group_plugin”"
 
-#: plugins/sudoers/group_plugin.c:113
+#: plugins/sudoers/group_plugin.c:115
 #, c-format
 msgid "%s: incompatible group plugin major version %d, expected %d"
 msgstr "%s：不兼容的组插件主版本号 %d，应为 %d"
@@ -1119,50 +1142,47 @@
 msgid "Local IP address and netmask pairs:\n"
 msgstr "本地 IP 地址和网络掩码对：\n"
 
-#: plugins/sudoers/iolog.c:117 plugins/sudoers/mkdir_parents.c:82
+#: lib/iolog/iolog_fileio.c:165
 #, c-format
 msgid "%s exists but is not a directory (0%o)"
 msgstr "%s 存在，但不是目录(0%o)"
 
-#: plugins/sudoers/iolog.c:142 plugins/sudoers/iolog.c:182
-#: plugins/sudoers/mkdir_parents.c:71 plugins/sudoers/timestamp.c:212
+#: lib/iolog/iolog_fileio.c:195 lib/iolog/iolog_fileio.c:241
+#: plugins/sudoers/timestamp.c:212
 #, c-format
 msgid "unable to mkdir %s"
 msgstr "无法创建目录 %s"
 
-#: plugins/sudoers/iolog.c:186 plugins/sudoers/visudo.c:739
+#: lib/iolog/iolog_fileio.c:245 plugins/sudoers/visudo.c:739
 #: plugins/sudoers/visudo.c:750
 #, c-format
 msgid "unable to change mode of %s to 0%o"
 msgstr "无法将 %s 的模式更改为 0%o"
 
-#: plugins/sudoers/iolog.c:294 plugins/sudoers/sudoers.c:1194
+#: plugins/sudoers/iolog.c:146 plugins/sudoers/sudoers.c:398
+#: plugins/sudoers/sudoers.c:400 plugins/sudoers/sudoers.c:1289
 #: plugins/sudoers/testsudoers.c:424
 #, c-format
 msgid "unknown group: %s"
 msgstr "未知组：%s"
 
 #: plugins/sudoers/cvtsudoers.c:622 plugins/sudoers/cvtsudoers.c:639
-#: plugins/sudoers/cvtsudoers.c:1245 plugins/sudoers/cvtsudoers_json.c:1130
-#: plugins/sudoers/cvtsudoers_ldif.c:643 plugins/sudoers/iolog.c:413
-#: plugins/sudoers/iolog_util.c:75 plugins/sudoers/sudoers.c:914
-#: plugins/sudoers/sudoreplay.c:338 plugins/sudoers/sudoreplay.c:1431
-#: plugins/sudoers/timestamp.c:448 plugins/sudoers/tsdump.c:135
-#: plugins/sudoers/visudo.c:929
+#: plugins/sudoers/cvtsudoers.c:1249 plugins/sudoers/cvtsudoers_json.c:868
+#: plugins/sudoers/cvtsudoers_ldif.c:683 plugins/sudoers/sudoers.c:1001
+#: plugins/sudoers/sudoreplay.c:1395 plugins/sudoers/timestamp.c:448
+#: plugins/sudoers/tsdump.c:135 plugins/sudoers/visudo.c:929
 #, c-format
 msgid "unable to open %s"
 msgstr "无法打开 %s"
 
-#: plugins/sudoers/iolog.c:464 plugins/sudoers/sudoers.c:918
-#: plugins/sudoers/sudoreplay.c:846 plugins/sudoers/sudoreplay.c:1542
+#: plugins/sudoers/sudoers.c:1005 plugins/sudoers/sudoreplay.c:1507
 #: plugins/sudoers/tsdump.c:145
 #, c-format
 msgid "unable to read %s"
 msgstr "无法读取 %s"
 
-#: plugins/sudoers/cvtsudoers.c:1292 plugins/sudoers/iolog.c:500
-#: plugins/sudoers/sudoreplay.c:1135 plugins/sudoers/timestamp.c:332
-#: plugins/sudoers/timestamp.c:335
+#: plugins/sudoers/cvtsudoers.c:1296 plugins/sudoers/sudoreplay.c:1084
+#: plugins/sudoers/timestamp.c:332 plugins/sudoers/timestamp.c:335
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
@@ -1172,14 +1192,15 @@
 msgid "unable to create %s"
 msgstr "无法创建 %s"
 
-#: plugins/sudoers/iolog.c:824 plugins/sudoers/iolog.c:1039
-#: plugins/sudoers/iolog.c:1115 plugins/sudoers/iolog.c:1209
-#: plugins/sudoers/iolog.c:1270
+#: plugins/sudoers/iolog.c:521 plugins/sudoers/iolog.c:796
+#: plugins/sudoers/iolog.c:948 plugins/sudoers/iolog.c:955
+#: plugins/sudoers/iolog.c:1076 plugins/sudoers/iolog.c:1083
+#: plugins/sudoers/iolog.c:1182 plugins/sudoers/iolog.c:1189
 #, c-format
 msgid "unable to write to I/O log file: %s"
 msgstr "无法写入 I/O 日志文件：%s"
 
-#: plugins/sudoers/iolog.c:723
+#: plugins/sudoers/iolog.c:1069
 #, c-format
 msgid "%s: internal error, file index %d not open"
 msgstr "%s：内部错误，文件索引 %d 未打开"
@@ -1211,14 +1232,14 @@
 msgid "you must set TLS_CERT in %s to use SSL"
 msgstr "要使用 SSL，您必须在 %s 中设置 TLS_CERT"
 
-#: plugins/sudoers/cvtsudoers_json.c:858 plugins/sudoers/cvtsudoers_json.c:873
-#: plugins/sudoers/cvtsudoers_ldif.c:308 plugins/sudoers/cvtsudoers_ldif.c:319
+#: plugins/sudoers/cvtsudoers_json.c:647 plugins/sudoers/cvtsudoers_json.c:660
+#: plugins/sudoers/cvtsudoers_ldif.c:348 plugins/sudoers/cvtsudoers_ldif.c:359
 #: plugins/sudoers/ldap.c:482
 msgid "unable to get GMT time"
 msgstr "无法获取 GMT 时间"
 
-#: plugins/sudoers/cvtsudoers_json.c:861 plugins/sudoers/cvtsudoers_json.c:876
-#: plugins/sudoers/cvtsudoers_ldif.c:311 plugins/sudoers/cvtsudoers_ldif.c:322
+#: plugins/sudoers/cvtsudoers_json.c:650 plugins/sudoers/cvtsudoers_json.c:663
+#: plugins/sudoers/cvtsudoers_ldif.c:351 plugins/sudoers/cvtsudoers_ldif.c:362
 #: plugins/sudoers/ldap.c:488
 msgid "unable to format timestamp"
 msgstr "无法格式化时间戳"
@@ -1237,7 +1258,7 @@
 "\n"
 "LDAP 角色：%s\n"
 
-#: plugins/sudoers/ldap.c:2396
+#: plugins/sudoers/ldap.c:2535
 #, c-format
 msgid ""
 "\n"
@@ -1246,7 +1267,7 @@
 "\n"
 "LDAP 角色：未知\n"
 
-#: plugins/sudoers/ldap.c:2443
+#: plugins/sudoers/ldap.c:2591
 #, c-format
 msgid "    Order: %s\n"
 msgstr "    顺序：%s\n"
@@ -1267,7 +1288,7 @@
 "ldap_start_tls_s_np()"
 msgstr "指定了 start_tls，但 LDAP 库不支持 ldap_start_tls_s() 或 ldap_start_tls_s_np()"
 
-#: plugins/sudoers/ldap.c:1793 plugins/sudoers/parse_ldif.c:734
+#: plugins/sudoers/ldap.c:1793 plugins/sudoers/parse_ldif.c:747
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr "无效的 sudoOrder 属性：%s"
@@ -1280,27 +1301,27 @@
 msgid "unable to send audit message"
 msgstr "无法发送审核消息"
 
-#: plugins/sudoers/logging.c:120
+#: logsrvd/eventlog.c:423 plugins/sudoers/logging.c:118
 #, c-format
 msgid "%8s : %s"
 msgstr "%8s：%s"
 
-#: plugins/sudoers/logging.c:148
+#: logsrvd/eventlog.c:452 plugins/sudoers/logging.c:146
 #, c-format
 msgid "%8s : (command continued) %s"
 msgstr "%8s：(命令继续执行) %s"
 
-#: plugins/sudoers/logging.c:177
+#: plugins/sudoers/logging.c:175
 #, c-format
 msgid "unable to open log file: %s"
 msgstr "无法打开日志文件：%s"
 
-#: plugins/sudoers/logging.c:185
+#: plugins/sudoers/logging.c:183
 #, c-format
 msgid "unable to lock log file: %s"
 msgstr "无法锁定日志文件：%s"
 
-#: plugins/sudoers/logging.c:218
+#: plugins/sudoers/logging.c:216
 #, c-format
 msgid "unable to write log file: %s"
 msgstr "无法写入日志文件： %s"
@@ -1313,48 +1334,48 @@
 msgid "validation failure"
 msgstr "校验失败"
 
-#: plugins/sudoers/logging.c:261
+#: plugins/sudoers/logging.c:249
 msgid "user NOT in sudoers"
 msgstr "用户不在 sudoers 中"
 
-#: plugins/sudoers/logging.c:263
+#: plugins/sudoers/logging.c:251
 msgid "user NOT authorized on host"
 msgstr "用户未获得此主机上的授权"
 
-#: plugins/sudoers/logging.c:265
+#: plugins/sudoers/logging.c:253
 msgid "command not allowed"
 msgstr "命令禁止使用"
 
-#: plugins/sudoers/logging.c:301
+#: plugins/sudoers/logging.c:296
 #, c-format
 msgid "%s is not in the sudoers file.  This incident will be reported.\n"
 msgstr "%s 不在 sudoers 文件中。此事将被报告。\n"
 
-#: plugins/sudoers/logging.c:304
+#: plugins/sudoers/logging.c:299
 #, c-format
 msgid ""
 "%s is not allowed to run sudo on %s.  This incident will be reported.\n"
 msgstr "%s 无权在 %s 上运行 sudo。此事将被报告。\n"
 
-#: plugins/sudoers/logging.c:308
+#: plugins/sudoers/logging.c:303
 #, c-format
 msgid "Sorry, user %s may not run sudo on %s.\n"
 msgstr "对不起，用户 %s 不能在 %s 上运行 sudo。\n"
 
-#: plugins/sudoers/logging.c:311
+#: plugins/sudoers/logging.c:306
 #, c-format
 msgid "Sorry, user %s is not allowed to execute '%s%s%s' as %s%s%s on %s.\n"
 msgstr "对不起，用户 %1$s 无权以 %5$s%6$s%7$s 的身份在 %8$s 上执行 %2$s%3$s%4$s。\n"
 
-#: plugins/sudoers/logging.c:348 plugins/sudoers/sudoers.c:442
-#: plugins/sudoers/sudoers.c:444 plugins/sudoers/sudoers.c:446
-#: plugins/sudoers/sudoers.c:448 plugins/sudoers/sudoers.c:603
-#: plugins/sudoers/sudoers.c:605
+#: plugins/sudoers/logging.c:343 plugins/sudoers/sudoers.c:518
+#: plugins/sudoers/sudoers.c:520 plugins/sudoers/sudoers.c:522
+#: plugins/sudoers/sudoers.c:524 plugins/sudoers/sudoers.c:675
+#: plugins/sudoers/sudoers.c:677
 #, c-format
 msgid "%s: command not found"
 msgstr "%s：找不到命令"
 
-#: plugins/sudoers/logging.c:350 plugins/sudoers/sudoers.c:438
+#: plugins/sudoers/logging.c:345 plugins/sudoers/sudoers.c:514
 #, c-format
 msgid ""
 "ignoring \"%s\" found in '.'\n"
@@ -1363,51 +1384,51 @@
 "忽略在“.”中找到的“%s”\n"
 "请使用“sudo ./%s”，如果这是您想运行的“%s”。"
 
-#: plugins/sudoers/logging.c:367
+#: plugins/sudoers/logging.c:362
 msgid "authentication failure"
 msgstr "认证失败"
 
-#: plugins/sudoers/logging.c:393
+#: plugins/sudoers/logging.c:388
 msgid "a password is required"
 msgstr "需要密码"
 
-#: plugins/sudoers/logging.c:463
+#: plugins/sudoers/logging.c:458
 #, c-format
 msgid "%u incorrect password attempt"
 msgid_plural "%u incorrect password attempts"
 msgstr[0] "%u 次错误密码尝试"
 
-#: plugins/sudoers/auth/aix_auth.c:203 plugins/sudoers/logging.c:801
+#: plugins/sudoers/auth/aix_auth.c:203 plugins/sudoers/logging.c:792
 msgid "unable to fork"
 msgstr "无法执行 fork"
 
-#: plugins/sudoers/logging.c:809 plugins/sudoers/logging.c:865
+#: plugins/sudoers/logging.c:800 plugins/sudoers/logging.c:856
 #, c-format
 msgid "unable to fork: %m"
 msgstr "无法执行 fork：%m"
 
-#: plugins/sudoers/logging.c:855
+#: plugins/sudoers/logging.c:846
 #, c-format
 msgid "unable to open pipe: %m"
 msgstr "无法打开管道：%m"
 
-#: plugins/sudoers/logging.c:728
+#: plugins/sudoers/logging.c:722
 #, c-format
 msgid "unable to dup stdin: %m"
 msgstr "无法 dup stdin：%m"
 
-#: plugins/sudoers/logging.c:768
+#: plugins/sudoers/logging.c:759
 #, c-format
 msgid "unable to execute %s: %m"
 msgstr "无法执行 %s：%m"
 
-#: plugins/sudoers/match_digest.c:103
+#: plugins/sudoers/match_digest.c:123
 #, c-format
 msgid "digest for %s (%s) is not in %s form"
 msgstr "%s(%s) 的摘要不是 %s 形式"
 
-#: plugins/sudoers/mkdir_parents.c:77 plugins/sudoers/sudoers.c:943
-#: plugins/sudoers/visudo.c:437 plugins/sudoers/visudo.c:733
+#: plugins/sudoers/sudoers.c:1030 plugins/sudoers/visudo.c:437
+#: plugins/sudoers/visudo.c:733
 #, c-format
 msgid "unable to stat %s"
 msgstr "无法 stat %s"
@@ -1446,27 +1467,27 @@
 msgid "    Options: "
 msgstr "    选项： "
 
-#: plugins/sudoers/policy.c:295 plugins/sudoers/testsudoers.c:280
+#: plugins/sudoers/policy.c:294 plugins/sudoers/testsudoers.c:280
 msgid "unable to parse network address list"
 msgstr "无法解析网络地址列表"
 
-#: plugins/sudoers/policy.c:808 plugins/sudoers/visudo.c:236
+#: plugins/sudoers/policy.c:905 plugins/sudoers/visudo.c:236
 #: plugins/sudoers/visudo.c:867
 #, c-format
 msgid "unable to execute %s"
 msgstr "无法执行 %s"
 
-#: plugins/sudoers/policy.c:939
+#: plugins/sudoers/policy.c:1070
 #, c-format
 msgid "Sudoers policy plugin version %s\n"
 msgstr "Sudoers 策略插件版本 %s\n"
 
-#: plugins/sudoers/policy.c:941
+#: plugins/sudoers/policy.c:1072
 #, c-format
 msgid "Sudoers file grammar version %d\n"
 msgstr "Sudoers 文件语法版本 %d\n"
 
-#: plugins/sudoers/policy.c:945
+#: plugins/sudoers/policy.c:1076
 #, c-format
 msgid ""
 "\n"
@@ -1475,22 +1496,22 @@
 "\n"
 "Sudoers 路径：%s\n"
 
-#: plugins/sudoers/policy.c:948
+#: plugins/sudoers/policy.c:1079
 #, c-format
 msgid "nsswitch path: %s\n"
 msgstr "nsswitch 路径：%s\n"
 
-#: plugins/sudoers/policy.c:950
+#: plugins/sudoers/policy.c:1081
 #, c-format
 msgid "ldap.conf path: %s\n"
 msgstr "ldap.conf 路径：%s\n"
 
-#: plugins/sudoers/policy.c:951
+#: plugins/sudoers/policy.c:1082
 #, c-format
 msgid "ldap.secret path: %s\n"
 msgstr "ldap.secret 路径：%s\n"
 
-#: plugins/sudoers/policy.c:984
+#: plugins/sudoers/policy.c:1115
 #, c-format
 msgid "unable to register hook of type %d (version %d.%d)"
 msgstr "无法注册类型为 %d 的钩子(hook)(版本 %d.%d)"
@@ -1559,48 +1580,48 @@
 msgid "unable to parse gids for %s"
 msgstr "无法解析 %s 的组 ID"
 
-#: plugins/sudoers/set_perms.c:120 plugins/sudoers/set_perms.c:478
-#: plugins/sudoers/set_perms.c:921 plugins/sudoers/set_perms.c:1254
-#: plugins/sudoers/set_perms.c:1573
+#: plugins/sudoers/set_perms.c:120 plugins/sudoers/set_perms.c:447
+#: plugins/sudoers/set_perms.c:850 plugins/sudoers/set_perms.c:1156
+#: plugins/sudoers/set_perms.c:1450
 msgid "perm stack overflow"
 msgstr "权限堆栈上溢"
 
-#: plugins/sudoers/set_perms.c:128 plugins/sudoers/set_perms.c:409
-#: plugins/sudoers/set_perms.c:486 plugins/sudoers/set_perms.c:788
-#: plugins/sudoers/set_perms.c:929 plugins/sudoers/set_perms.c:1178
-#: plugins/sudoers/set_perms.c:1262 plugins/sudoers/set_perms.c:1506
-#: plugins/sudoers/set_perms.c:1581 plugins/sudoers/set_perms.c:1672
+#: plugins/sudoers/set_perms.c:128 plugins/sudoers/set_perms.c:378
+#: plugins/sudoers/set_perms.c:455 plugins/sudoers/set_perms.c:717
+#: plugins/sudoers/set_perms.c:858 plugins/sudoers/set_perms.c:1080
+#: plugins/sudoers/set_perms.c:1164 plugins/sudoers/set_perms.c:1383
+#: plugins/sudoers/set_perms.c:1458 plugins/sudoers/set_perms.c:1548
 msgid "perm stack underflow"
 msgstr "权限堆栈下溢"
 
-#: plugins/sudoers/set_perms.c:187 plugins/sudoers/set_perms.c:532
-#: plugins/sudoers/set_perms.c:1315 plugins/sudoers/set_perms.c:1614
+#: plugins/sudoers/set_perms.c:187 plugins/sudoers/set_perms.c:501
+#: plugins/sudoers/set_perms.c:1217 plugins/sudoers/set_perms.c:1491
 msgid "unable to change to root gid"
 msgstr "无法切换为 root 组 ID"
 
-#: plugins/sudoers/set_perms.c:278 plugins/sudoers/set_perms.c:629
-#: plugins/sudoers/set_perms.c:1060 plugins/sudoers/set_perms.c:1392
+#: plugins/sudoers/set_perms.c:278 plugins/sudoers/set_perms.c:598
+#: plugins/sudoers/set_perms.c:989 plugins/sudoers/set_perms.c:1294
 msgid "unable to change to runas gid"
 msgstr "无法切换为 runas 组 ID"
 
-#: plugins/sudoers/set_perms.c:283 plugins/sudoers/set_perms.c:634
-#: plugins/sudoers/set_perms.c:1065 plugins/sudoers/set_perms.c:1397
+#: plugins/sudoers/set_perms.c:283 plugins/sudoers/set_perms.c:603
+#: plugins/sudoers/set_perms.c:994 plugins/sudoers/set_perms.c:1299
 msgid "unable to set runas group vector"
 msgstr "无法设置 runas 组向量"
 
-#: plugins/sudoers/set_perms.c:294 plugins/sudoers/set_perms.c:645
-#: plugins/sudoers/set_perms.c:1074 plugins/sudoers/set_perms.c:1406
+#: plugins/sudoers/set_perms.c:294 plugins/sudoers/set_perms.c:614
+#: plugins/sudoers/set_perms.c:1003 plugins/sudoers/set_perms.c:1308
 msgid "unable to change to runas uid"
 msgstr "无法切换为 runas 用户 ID"
 
-#: plugins/sudoers/set_perms.c:312 plugins/sudoers/set_perms.c:663
-#: plugins/sudoers/set_perms.c:1090 plugins/sudoers/set_perms.c:1422
+#: plugins/sudoers/set_perms.c:312 plugins/sudoers/set_perms.c:632
+#: plugins/sudoers/set_perms.c:1019 plugins/sudoers/set_perms.c:1324
 msgid "unable to change to sudoers gid"
 msgstr "无法切换为 sudoers 组 ID"
 
-#: plugins/sudoers/set_perms.c:396 plugins/sudoers/set_perms.c:775
-#: plugins/sudoers/set_perms.c:1165 plugins/sudoers/set_perms.c:1493
-#: plugins/sudoers/set_perms.c:1659
+#: plugins/sudoers/set_perms.c:365 plugins/sudoers/set_perms.c:704
+#: plugins/sudoers/set_perms.c:1067 plugins/sudoers/set_perms.c:1370
+#: plugins/sudoers/set_perms.c:1535
 msgid "too many processes"
 msgstr "进程过多"
 
@@ -1671,108 +1692,109 @@
 msgid "User %s is not allowed to run sudo on %s.\n"
 msgstr "用户 %s 无权在 %s 上运行 sudo。\n"
 
-#: plugins/sudoers/cvtsudoers.c:335 plugins/sudoers/sudoers.c:176
+#: plugins/sudoers/cvtsudoers.c:335 plugins/sudoers/sudoers.c:185
 #: plugins/sudoers/testsudoers.c:266 plugins/sudoers/visudo.c:254
 #: plugins/sudoers/visudo.c:610 plugins/sudoers/visudo.c:933
 msgid "unable to initialize sudoers default values"
 msgstr "无法初始化 sudoers 默认值"
 
-#: plugins/sudoers/sudoers.c:212 plugins/sudoers/sudoers.c:871
+#: plugins/sudoers/sudoers.c:221 plugins/sudoers/sudoers.c:958
 msgid "problem with defaults entries"
 msgstr "默认条目有问题"
 
-#: plugins/sudoers/sudoers.c:216
+#: plugins/sudoers/sudoers.c:225
 msgid "no valid sudoers sources found, quitting"
 msgstr "没有找到有效的 sudoers 资源，退出"
 
-#: plugins/sudoers/sudoers.c:254
+#: plugins/sudoers/sudoers.c:301
 msgid "sudoers specifies that root is not allowed to sudo"
 msgstr "sudoers 指定 root 不允许执行 sudo"
 
-#: plugins/sudoers/sudoers.c:312
+#: plugins/sudoers/sudoers.c:362
 msgid "you are not permitted to use the -C option"
 msgstr "您无权使用 -C 选项"
 
-#: plugins/sudoers/sudoers.c:359
+#: plugins/sudoers/sudoers.c:426
 #, c-format
 msgid "timestamp owner (%s): No such user"
 msgstr "时间戳所有者(%s)：无此用户"
 
-#: plugins/sudoers/sudoers.c:374
+#: plugins/sudoers/sudoers.c:441
 msgid "no tty"
 msgstr "无终端"
 
-#: plugins/sudoers/sudoers.c:375
+#: plugins/sudoers/sudoers.c:442
 msgid "sorry, you must have a tty to run sudo"
 msgstr "抱歉，您必须拥有一个终端来执行 sudo"
 
-#: plugins/sudoers/sudoers.c:437
+#: plugins/sudoers/sudoers.c:513
 msgid "command in current directory"
 msgstr "当前目录中的命令"
 
-#: plugins/sudoers/sudoers.c:456
+#: plugins/sudoers/sudoers.c:533
 msgid "sorry, you are not allowed set a command timeout"
 msgstr "抱歉，您无权设置超时时间"
 
-#: plugins/sudoers/sudoers.c:464
+#: plugins/sudoers/sudoers.c:542
 msgid "sorry, you are not allowed to preserve the environment"
 msgstr "抱歉，您无权保留环境"
 
-#: plugins/sudoers/sudoers.c:815
+#: plugins/sudoers/sudoers.c:893
 msgid "command too long"
 msgstr "命令过长"
 
-#: plugins/sudoers/sudoers.c:947
+#: plugins/sudoers/sudoers.c:1034
 #, c-format
 msgid "%s is not a regular file"
 msgstr "%s 不是常规文件"
 
-#: plugins/sudoers/sudoers.c:951 plugins/sudoers/timestamp.c:259 toke.l:967
+#: plugins/sudoers/sudoers.c:1038 plugins/sudoers/timestamp.c:259 toke.l:967
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr "%s 属于用户 ID %u，应为 %u"
 
-#: plugins/sudoers/sudoers.c:955 toke.l:972
+#: plugins/sudoers/sudoers.c:1042 toke.l:972
 #, c-format
 msgid "%s is world writable"
 msgstr "%s 可被任何人写"
 
-#: plugins/sudoers/sudoers.c:959 toke.l:975
+#: plugins/sudoers/sudoers.c:1046 toke.l:975
 #, c-format
 msgid "%s is owned by gid %u, should be %u"
 msgstr "%s 属于组 ID %u，应为 %u"
 
-#: plugins/sudoers/sudoers.c:992
+#: plugins/sudoers/sudoers.c:1079
 #, c-format
 msgid "only root can use \"-c %s\""
 msgstr "只有 root 才能使用“-c %s”"
 
-#: plugins/sudoers/sudoers.c:1011
+#: plugins/sudoers/sudoers.c:1098
 #, c-format
 msgid "unknown login class: %s"
 msgstr "未知的登录类别：%s"
 
-#: plugins/sudoers/sudoers.c:1096 plugins/sudoers/sudoers.c:1110
+#: plugins/sudoers/sudoers.c:1183 plugins/sudoers/sudoers.c:1198
 #, c-format
 msgid "unable to resolve host %s"
 msgstr "无法解析主机：%s"
 
-#: plugins/sudoers/sudoreplay.c:250
+#: plugins/sudoers/sudoreplay.c:263
 #, c-format
 msgid "invalid filter option: %s"
 msgstr "无效的过滤器选项：%s"
 
-#: plugins/sudoers/sudoreplay.c:263
+#: plugins/sudoers/sudoreplay.c:276
 #, c-format
 msgid "invalid max wait: %s"
 msgstr "无效的最大等待：%s"
 
-#: plugins/sudoers/sudoreplay.c:286
+#: plugins/sudoers/sudoreplay.c:299
 #, c-format
 msgid "invalid speed factor: %s"
 msgstr "无法的速度系数：%s"
 
-#: plugins/sudoers/cvtsudoers.c:233 plugins/sudoers/sudoreplay.c:289
+#: logsrvd/logsrvd.c:1880 logsrvd/sendlog.c:1614
+#: plugins/sudoers/cvtsudoers.c:233 plugins/sudoers/sudoreplay.c:302
 #: plugins/sudoers/visudo.c:184
 #, c-format
 msgid "%s version %s\n"
@@ -1788,114 +1810,125 @@
 msgid "%s/%s/timing: %s"
 msgstr "%s/%s/时序：%s"
 
-#: plugins/sudoers/sudoreplay.c:346
+#: plugins/sudoers/sudoreplay.c:368
 #, c-format
 msgid "Replaying sudo session: %s"
 msgstr "回放 sudo 会话：%s"
 
-#: plugins/sudoers/sudoreplay.c:544 plugins/sudoers/sudoreplay.c:591
-#: plugins/sudoers/sudoreplay.c:789 plugins/sudoers/sudoreplay.c:898
-#: plugins/sudoers/sudoreplay.c:983 plugins/sudoers/sudoreplay.c:998
-#: plugins/sudoers/sudoreplay.c:1005 plugins/sudoers/sudoreplay.c:1012
-#: plugins/sudoers/sudoreplay.c:1019 plugins/sudoers/sudoreplay.c:1026
-#: plugins/sudoers/sudoreplay.c:1174
+#: logsrvd/logsrvd.c:1487 logsrvd/logsrvd.c:1609 logsrvd/logsrvd.c:1709
+#: logsrvd/sendlog.c:983 logsrvd/sendlog.c:1338 logsrvd/sendlog.c:1353
+#: logsrvd/sendlog.c:1411 plugins/sudoers/iolog.c:910
+#: plugins/sudoers/iolog.c:1043 plugins/sudoers/iolog.c:1141
+#: plugins/sudoers/iolog_client.c:113 plugins/sudoers/iolog_client.c:323
+#: plugins/sudoers/iolog_client.c:339 plugins/sudoers/iolog_client.c:385
+#: plugins/sudoers/iolog_client.c:565 plugins/sudoers/iolog_client.c:572
+#: plugins/sudoers/iolog_client.c:1148 plugins/sudoers/iolog_client.c:1184
+#: plugins/sudoers/iolog_client.c:1192 plugins/sudoers/iolog_client.c:1252
+#: plugins/sudoers/iolog_client.c:1359 plugins/sudoers/iolog_client.c:1475
+#: plugins/sudoers/iolog_client.c:1757 plugins/sudoers/iolog_client.c:1765
+#: plugins/sudoers/sudoreplay.c:515 plugins/sudoers/sudoreplay.c:562
+#: plugins/sudoers/sudoreplay.c:751 plugins/sudoers/sudoreplay.c:863
+#: plugins/sudoers/sudoreplay.c:953 plugins/sudoers/sudoreplay.c:968
+#: plugins/sudoers/sudoreplay.c:975 plugins/sudoers/sudoreplay.c:982
+#: plugins/sudoers/sudoreplay.c:989 plugins/sudoers/sudoreplay.c:996
+#: plugins/sudoers/sudoreplay.c:1123
 msgid "unable to add event to queue"
 msgstr "无法将事件添加到队列"
 
-#: plugins/sudoers/sudoreplay.c:659
+#: plugins/sudoers/sudoreplay.c:630
 msgid "unable to set tty to raw mode"
 msgstr "无法将终端设为原始模式"
 
-#: plugins/sudoers/sudoreplay.c:710
+#: plugins/sudoers/sudoreplay.c:681
 msgid "Warning: your terminal is too small to properly replay the log.\n"
 msgstr "警告：您的终端尺寸太小，不能正常地回放日志。\n"
 
-#: plugins/sudoers/sudoreplay.c:711
+#: plugins/sudoers/sudoreplay.c:682
 #, c-format
 msgid "Log geometry is %d x %d, your terminal's geometry is %d x %d."
 msgstr "日志的几何尺寸为 %dx%d，您终端的几何尺寸为 %dx%d。"
 
-#: plugins/sudoers/sudoreplay.c:739
+#: plugins/sudoers/sudoreplay.c:710
 msgid "Replay finished, press any key to restore the terminal."
 msgstr "回放完成，请按任意键返回终端。"
 
-#: plugins/sudoers/sudoreplay.c:772
+#: lib/iolog/iolog_util.c:432
 #, c-format
 msgid "invalid timing file line: %s"
 msgstr "无效的时序文件行：%s"
 
-#: plugins/sudoers/sudoreplay.c:1208 plugins/sudoers/sudoreplay.c:1233
+#: plugins/sudoers/sudoreplay.c:1157 plugins/sudoers/sudoreplay.c:1187
 #, c-format
 msgid "ambiguous expression \"%s\""
 msgstr "有歧义的表达式“%s”"
 
-#: plugins/sudoers/sudoreplay.c:1255
+#: plugins/sudoers/sudoreplay.c:1209
 msgid "unmatched ')' in expression"
 msgstr "表达式中的“)”不匹配"
 
-#: plugins/sudoers/sudoreplay.c:1259
+#: plugins/sudoers/sudoreplay.c:1213
 #, c-format
 msgid "unknown search term \"%s\""
 msgstr "未知的搜索词“%s”"
 
-#: plugins/sudoers/sudoreplay.c:1274
+#: plugins/sudoers/sudoreplay.c:1228
 #, c-format
 msgid "%s requires an argument"
 msgstr "%s 需要参数"
 
-#: plugins/sudoers/sudoreplay.c:1277 plugins/sudoers/sudoreplay.c:1518
+#: plugins/sudoers/sudoreplay.c:1231 plugins/sudoers/sudoreplay.c:1483
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "无效的正则表达式：%s"
 
-#: plugins/sudoers/sudoreplay.c:1281
+#: plugins/sudoers/sudoreplay.c:1236
 #, c-format
 msgid "could not parse date \"%s\""
 msgstr "无法解析日期“%s”"
 
-#: plugins/sudoers/sudoreplay.c:1290
+#: plugins/sudoers/sudoreplay.c:1245
 msgid "unmatched '(' in expression"
 msgstr "表达式中的“(”不匹配"
 
-#: plugins/sudoers/sudoreplay.c:1292
+#: plugins/sudoers/sudoreplay.c:1247
 msgid "illegal trailing \"or\""
 msgstr "非法的结尾字符“or”"
 
-#: plugins/sudoers/sudoreplay.c:1294
+#: plugins/sudoers/sudoreplay.c:1249
 msgid "illegal trailing \"!\""
 msgstr "非法的结尾字符“!”"
 
-#: plugins/sudoers/sudoreplay.c:1344
+#: plugins/sudoers/sudoreplay.c:1307
 #, c-format
 msgid "unknown search type %d"
 msgstr "未知的搜索类型 %d"
 
-#: plugins/sudoers/iolog_util.c:90
+#: lib/iolog/iolog_util.c:77
 #, c-format
 msgid "%s: invalid log file"
 msgstr "%s：无效的日志文件"
 
-#: plugins/sudoers/iolog_util.c:108
+#: lib/iolog/iolog_util.c:95
 #, c-format
 msgid "%s: time stamp field is missing"
 msgstr "%s：缺少 时间戳 字段"
 
-#: plugins/sudoers/iolog_util.c:114
+#: lib/iolog/iolog_util.c:101
 #, c-format
 msgid "%s: time stamp %s: %s"
 msgstr "%s：时间戳 %s：%s"
 
-#: plugins/sudoers/iolog_util.c:121
+#: lib/iolog/iolog_util.c:108
 #, c-format
 msgid "%s: user field is missing"
 msgstr "%s：缺少 用户 字段"
 
-#: plugins/sudoers/iolog_util.c:130
+#: lib/iolog/iolog_util.c:117
 #, c-format
 msgid "%s: runas user field is missing"
 msgstr "%s：缺少 runas 用户 字段"
 
-#: plugins/sudoers/iolog_util.c:139
+#: lib/iolog/iolog_util.c:126
 #, c-format
 msgid "%s: runas group field is missing"
 msgstr "%s：缺少 runas 组 字段"
@@ -1905,12 +1938,12 @@
 msgid "usage: %s [-hnR] [-d dir] [-m num] [-s num] ID\n"
 msgstr "用法：%s [-hnR] [-d 目录] [-m 数值] [-s 数值] ID\n"
 
-#: plugins/sudoers/sudoreplay.c:1614
+#: plugins/sudoers/sudoreplay.c:1577
 #, c-format
 msgid "usage: %s [-h] [-d dir] -l [search expression]\n"
 msgstr "用法：%s [-h] [-d 目录] -l [搜索表达式]\n"
 
-#: plugins/sudoers/sudoreplay.c:1623
+#: plugins/sudoers/sudoreplay.c:1586
 #, c-format
 msgid ""
 "%s - replay sudo session logs\n"
@@ -1919,7 +1952,7 @@
 "%s - 回放 sudo 会话记录\n"
 "\n"
 
-#: plugins/sudoers/sudoreplay.c:1211
+#: plugins/sudoers/sudoreplay.c:1820
 msgid ""
 "\n"
 "Options:\n"
@@ -1974,31 +2007,33 @@
 msgid "%s is group writable"
 msgstr "%s 可被组写"
 
-#: plugins/sudoers/timestamp.c:343
+#: plugins/sudoers/timestamp.c:343 plugins/sudoers/timestamp.c:687
 #, c-format
 msgid "unable to truncate time stamp file to %lld bytes"
 msgstr "无法将时间戳文件截短为 %lld 字节"
 
-#: plugins/sudoers/timestamp.c:829 plugins/sudoers/timestamp.c:921
-#: plugins/sudoers/visudo.c:498 plugins/sudoers/visudo.c:504
+#: plugins/sudoers/iolog.c:933 plugins/sudoers/iolog.c:1061
+#: plugins/sudoers/iolog.c:1166 plugins/sudoers/timestamp.c:862
+#: plugins/sudoers/timestamp.c:954 plugins/sudoers/visudo.c:498
+#: plugins/sudoers/visudo.c:504
 msgid "unable to read the clock"
 msgstr "无法读取时钟"
 
-#: plugins/sudoers/timestamp.c:840
+#: plugins/sudoers/timestamp.c:873
 msgid "ignoring time stamp from the future"
 msgstr "将忽略超前的时间戳"
 
-#: plugins/sudoers/timestamp.c:863
+#: plugins/sudoers/timestamp.c:896
 #, c-format
 msgid "time stamp too far in the future: %20.20s"
 msgstr "时间戳太超前：%20.20s"
 
-#: plugins/sudoers/timestamp.c:985
+#: plugins/sudoers/timestamp.c:1018
 #, c-format
 msgid "unable to lock time stamp file %s"
 msgstr "无法锁定时间戳文件 %s"
 
-#: plugins/sudoers/timestamp.c:1029 plugins/sudoers/timestamp.c:1049
+#: plugins/sudoers/timestamp.c:1062 plugins/sudoers/timestamp.c:1082
 #, c-format
 msgid "lecture status path too long: %s/%s"
 msgstr "致辞(lecture)状态路径过长：%s/%s"
@@ -2172,7 +2207,7 @@
 "%s - 安全地编辑 sudoers 文件\n"
 "\n"
 
-#: plugins/sudoers/visudo.c:1351
+#: plugins/sudoers/visudo.c:1435
 msgid ""
 "\n"
 "Options:\n"
@@ -2194,8 +2229,8 @@
 "  -V, --version          显示版本信息并退出\n"
 "  -x, --export=输出文件  以 JSON 格式将 sudoers 写入输出文件"
 
-#: plugins/sudoers/cvtsudoers_json.c:684 plugins/sudoers/cvtsudoers_json.c:720
-#: plugins/sudoers/cvtsudoers_json.c:938
+#: plugins/sudoers/cvtsudoers_json.c:487 plugins/sudoers/cvtsudoers_json.c:521
+#: plugins/sudoers/cvtsudoers_json.c:709
 #, c-format
 msgid "unknown defaults entry \"%s\""
 msgstr "未知的默认条目“%s”"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/swift.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/swift.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/swift.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/swift.po	2020-07-08 13:54:03.000000000 +0000
@@ -16,8 +16,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:08+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:47+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "Generated-By: Babel 2.0\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sysstat.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sysstat.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/sysstat.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/sysstat.po	2020-07-08 13:54:02.000000000 +0000
@@ -14,12 +14,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:22+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:11+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: iostat.c:89 tapestat.c:101 cifsiostat.c:73 mpstat.c:132 sar.c:102
+#: iostat.c:88 tapestat.c:104 cifsiostat.c:75 mpstat.c:134 sar.c:108
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ]\n"
 msgstr "用法: %s [ 选项 ] [ <时间间隔> [ <次数> ] ]\n"
@@ -51,12 +51,12 @@
 msgid "Cannot find disk data\n"
 msgstr "无法找到磁盘数据\n"
 
-#: iostat.c:1832 sa_common.c:2100
+#: iostat.c:1978 sa_common.c:2329
 #, c-format
 msgid "Invalid type of persistent device name\n"
 msgstr "固有设备名类型无效\n"
 
-#: sadc.c:91
+#: sadc.c:98
 #, c-format
 msgid "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <outfile> ]\n"
 msgstr "用法: %s [ 选项 ] [ <时间间隔> [ <次数> ] ] [ <输出文件> ]\n"
@@ -72,7 +72,7 @@
 "[ -C <注释> ] [ -D ] [ -F ] [ -L ] [ -V ]\n"
 "[ -S { INT | DISK | IPV6 | POWER | SNMP | XDISK | ALL | XALL } ]\n"
 
-#: sadc.c:253
+#: sadc.c:272
 #, c-format
 msgid "Cannot write data to system activity file: %s\n"
 msgstr "无法将数据写入系统运行记录文件: %s\n"
@@ -82,18 +82,18 @@
 msgid "Cannot write system activity file header: %s\n"
 msgstr "无法写系统运行记录文件开始部分: %s\n"
 
-#: sadc.c:692 sadc.c:755 count.c:118 ioconf.c:506 rd_stats.c:75
-#: sa_common.c:1656
+#: sadc.c:720 sadc.c:783 count.c:118 ioconf.c:507 rd_stats.c:75
+#: sa_common.c:1843
 #, c-format
 msgid "Cannot open %s: %s\n"
 msgstr "无法打开 %s: %s\n"
 
-#: sadc.c:974
+#: sadc.c:1005
 #, c-format
 msgid "Cannot append data to that file (%s)\n"
 msgstr "无法向文件 (%s) 中追加记录\n"
 
-#: common.c:78
+#: common.c:79
 #, c-format
 msgid "sysstat version %s\n"
 msgstr "sysstat 版本 %s\n"
@@ -120,11 +120,11 @@
 "[ -N { <node_list> | ALL } ] [ -o JSON ] [ -P { <cpu_list> | ON | ALL } ]\n"
 msgstr ""
 
-#: mpstat.c:1632 sar.c:370 pidstat.c:2406
+#: mpstat.c:1736 sar.c:376 pidstat.c:2288
 msgid "Average:"
 msgstr "平均时间:"
 
-#: sadf.c:91
+#: sadf.c:104
 #, c-format
 msgid ""
 "Usage: %s [ options ] [ <interval> [ <count> ] ] [ <datafile> | -[0-9]+ ]\n"
@@ -141,7 +141,7 @@
 "[ -- <sar_options> ]\n"
 msgstr ""
 
-#: pr_stats.c:2609 pr_stats.c:2616 pr_stats.c:2721 pr_stats.c:2766
+#: pr_stats.c:2623 pr_stats.c:2630 pr_stats.c:2735 pr_stats.c:2780
 msgid "Summary:"
 msgstr "总计:"
 
@@ -183,7 +183,7 @@
 msgid "\t-d\tBlock devices statistics\n"
 msgstr "\t-d\t块设备状况\n"
 
-#: sar.c:146
+#: sar.c:152
 #, c-format
 msgid "\t-F [ MOUNT ]\n"
 msgstr "\t-F [ MOUNT ]\n"
@@ -304,47 +304,47 @@
 msgid "\t-y\tTTY devices statistics\n"
 msgstr "\t-y\tTTY 设备信息\n"
 
-#: sar.c:206
+#: sar.c:212
 #, c-format
 msgid "Data collector will be sought in PATH\n"
-msgstr "将在PATH 中查找数据收集器\n"
+msgstr "将在 PATH 中查找数据收集器\n"
 
-#: sar.c:209
+#: sar.c:215
 #, c-format
 msgid "Data collector found: %s\n"
 msgstr "找到数据收集器: %s\n"
 
-#: sar.c:274
+#: sar.c:280
 #, c-format
 msgid "End of data collecting unexpected\n"
 msgstr "数据流结尾有未知错误\n"
 
-#: sar.c:874
+#: sar.c:890
 #, c-format
 msgid "Using a wrong data collector from a different sysstat version\n"
 msgstr "正在使用来自不同版本 sysstat 的错误的数据收集器\n"
 
-#: sar.c:279
+#: sar.c:285
 #, c-format
 msgid "Inconsistent input data\n"
 msgstr "所取数据前后不一致\n"
 
-#: pidstat.c:244 sa_common.c:353
+#: pidstat.c:207 sa_common.c:362
 #, c-format
 msgid "Requested activities not available\n"
 msgstr "所需的运行记录无法获得\n"
 
-#: sar.c:1481
+#: sar.c:1516
 #, c-format
 msgid "-f and -o options are mutually exclusive\n"
 msgstr "-f 和 -o 选项不能同时使用\n"
 
-#: sar.c:1487
+#: sar.c:1526
 #, c-format
 msgid "Not reading from a system activity file (use -f option)\n"
 msgstr "无法查看系统活动记录文件 (用 -f 选项)\n"
 
-#: sar.c:1630
+#: sar.c:1679
 #, c-format
 msgid "Cannot find the data collector (%s)\n"
 msgstr "无法找到数据收集器 (%s)\n"
@@ -370,7 +370,7 @@
 "Invalid data found. Aborting...\n"
 msgstr ""
 "\n"
-"发现无效信息。退出...\n"
+"发现无效数据。退出...\n"
 
 #: sa_conv.c:897
 #, c-format
@@ -386,7 +386,7 @@
 "\n"
 "文件已成功转化为sysstat 格式版本 %s\n"
 
-#: pidstat.c:91
+#: pidstat.c:89
 #, c-format
 msgid ""
 "Usage: %s [ options ] [ <interval> [ <count> ] ] [ -e <program> <args> ]\n"
@@ -403,22 +403,22 @@
 "[ -p { <pid> [,...] | SELF | ALL } ] [ -T { TASK | CHILD | ALL } ]\n"
 msgstr ""
 
-#: sa_common.c:1361
+#: sa_common.c:1437
 #, c-format
 msgid "Error while reading system activity file: %s\n"
 msgstr "查看系统运行记录时出错: %s\n"
 
-#: sa_common.c:1371
+#: sa_common.c:1447
 #, c-format
 msgid "End of system activity file unexpected\n"
 msgstr "系统运行记录文件的结尾有未知错误\n"
 
-#: sa_common.c:297
+#: sa_common.c:306
 #, c-format
 msgid "File created by sar/sadc from sysstat version %d.%d.%d"
-msgstr "文件由 sysstat 版本 %d.%d.%d 中的 sar/sadc 创建。"
+msgstr "文件由 sysstat 版本 %d.%d.%d 中的 sar/sadc 创建"
 
-#: sa_common.c:328
+#: sa_common.c:337
 #, c-format
 msgid "Invalid system activity file: %s\n"
 msgstr "无效的系统运行记录文件: %s\n"
@@ -428,22 +428,22 @@
 msgid "Endian format mismatch\n"
 msgstr "Endian 格式不匹配\n"
 
-#: sa_common.c:336
+#: sa_common.c:345
 #, c-format
 msgid "Current sysstat version cannot read the format of this file (%#x)\n"
 msgstr "当前版本的 sysstat 无法读取此文件格式 (%#x)\n"
 
-#: sa_common.c:1659
+#: sa_common.c:1846
 #, c-format
 msgid "Please check if data collecting is enabled\n"
 msgstr "请检查是否允许数据收集\n"
 
-#: sa_common.c:1979
+#: sa_common.c:2198
 #, c-format
 msgid "Requested activities not available in file %s\n"
 msgstr "所需的运行记录在此文件 %s 中无法获得\n"
 
-#: tapestat.c:103
+#: tapestat.c:106
 #, c-format
 msgid ""
 "Options are:\n"
@@ -452,7 +452,7 @@
 "选项：\n"
 "[ --human ] [ -k | -m ] [ -t ] [ -V ] [ -y ] [ -z ]\n"
 
-#: tapestat.c:269
+#: tapestat.c:272
 #, c-format
 msgid "No tape drives with statistics found\n"
 msgstr "未找到带统计信息的磁带设备\n"
@@ -462,50 +462,50 @@
 msgid "Cannot handle so many processors!\n"
 msgstr "处理器太多，无法处理！\n"
 
-#: sadf_misc.c:831
+#: sadf_misc.c:1214
 #, c-format
 msgid "System activity data file: %s (%#x)\n"
 msgstr "系统运行记录数据文件: %s (%#x)\n"
 
-#: sadf_misc.c:840
+#: sadf_misc.c:1223
 #, c-format
 msgid "Genuine sa datafile: %s (%x)\n"
 msgstr "Genuine sa 数据文件: %s (%x)\n"
 
-#: sadf_misc.c:841
+#: sadf_misc.c:1224
 msgid "no"
 msgstr "否"
 
-#: sadf_misc.c:841
+#: sadf_misc.c:1224
 msgid "yes"
 msgstr "是"
 
-#: sadf_misc.c:844
+#: sadf_misc.c:1227
 #, c-format
 msgid "Host: "
-msgstr "主机: "
+msgstr "主机： "
 
 #: sadf_misc.c:643
 #, c-format
 msgid "Number of CPU for last samples in file: %u\n"
 msgstr "文件中最后一次取样的CPU 数: %u\n"
 
-#: sadf_misc.c:854
+#: sadf_misc.c:1237
 #, c-format
 msgid "File date: %s\n"
-msgstr "文件日期: %s\n"
+msgstr "文件日期：%s\n"
 
-#: sadf_misc.c:857
+#: sadf_misc.c:1240
 #, c-format
 msgid "File time: "
-msgstr "文件时间: "
+msgstr "文件时间： "
 
-#: sadf_misc.c:868
+#: sadf_misc.c:1253
 #, c-format
 msgid "Size of a long int: %d\n"
-msgstr "长整型数的字节大小: %d\n"
+msgstr "长整型数的字节大小：%d\n"
 
-#: sadf_misc.c:873
+#: sadf_misc.c:1260
 #, c-format
 msgid "List of activities:\n"
 msgstr "运行记录列表:\n"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/systemd.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/systemd.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/systemd.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/systemd.po	2020-07-08 13:53:53.000000000 +0000
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: https://github.com/systemd/systemd/issues\n"
-"POT-Creation-Date: 2019-11-15 17:02+0000\n"
+"POT-Creation-Date: 2020-05-14 20:43+0000\n"
 "PO-Revision-Date: 2016-09-04 12:13+0000\n"
 "Last-Translator: Jeff Bai <jeffbai@aosc.xyz>\n"
 "Language-Team: Chinese <i18n-zh@googlegroups.com>\n"
@@ -19,8 +19,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:07+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:47+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: src/core/org.freedesktop.systemd1.policy.in:22
@@ -410,7 +410,7 @@
 msgid "Authentication is required to lock or unlock active sessions."
 msgstr "对活动会话进行锁定或解锁需要认证。"
 
-#: ../src/login/org.freedesktop.login1.policy.in.h:53
+#: src/login/org.freedesktop.login1.policy:341
 msgid "Allow indication to the firmware to boot to setup interface"
 msgstr "允许向固件发出指示以启动至设置界面"
 
@@ -548,40 +548,40 @@
 "shall be enabled."
 msgstr "打开或关闭网络时间同步需要认证。"
 
-#: src/core/dbus-unit.c:354
+#: src/core/dbus-unit.c:316
 msgid "Authentication is required to start '$(unit)'."
 msgstr "启动“$(unit)”需要认证。"
 
-#: src/core/dbus-unit.c:355
+#: src/core/dbus-unit.c:317
 msgid "Authentication is required to stop '$(unit)'."
 msgstr "停止“$(unit)”需要认证。"
 
-#: src/core/dbus-unit.c:356
+#: src/core/dbus-unit.c:318
 msgid "Authentication is required to reload '$(unit)'."
 msgstr "重新载入“$(unit)”需要认证。"
 
-#: src/core/dbus-unit.c:357 src/core/dbus-unit.c:358
+#: src/core/dbus-unit.c:319 src/core/dbus-unit.c:320
 msgid "Authentication is required to restart '$(unit)'."
 msgstr "重新启动“$(unit)”需要认证。"
 
-#: ../src/core/dbus-unit.c:557
+#: src/core/dbus-unit.c:607
 msgid "Authentication is required to kill '$(unit)'."
 msgstr "杀死“$(unit)”需要认证。"
 
-#: src/core/dbus-unit.c:561
+#: src/core/dbus-unit.c:523
 msgid ""
 "Authentication is required to reset the \"failed\" state of '$(unit)'."
 msgstr "重置“$(unit)”的失败（\"failed\"）状态需要认证。"
 
-#: src/core/dbus-unit.c:594
+#: src/core/dbus-unit.c:556
 msgid "Authentication is required to set properties on '$(unit)'."
 msgstr "设置“$(unit)”的属性需要认证。"
 
-#: src/fsckd/fsckd.c:306
+#: src/fsckd/fsckd.c:303
 msgid "Press Ctrl+C to cancel all filesystem checks in progress"
 msgstr "按 Ctrl+C 可以取消正在进行的所有文件系统检查。"
 
-#: src/fsckd/fsckd.c:352
+#: src/fsckd/fsckd.c:349
 #, c-format
 msgid "Checking in progress on %d disk (%3.1f%% complete)"
 msgid_plural "Checking in progress on %d disks (%3.1f%% complete)"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/tar.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/tar.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/tar.po	2020-01-23 16:51:54.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/tar.po	2020-07-08 13:53:55.000000000 +0000
@@ -17,8 +17,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:11+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:01+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: gnu/argmatch.c:134
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ubiquity-debconf.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ubiquity-debconf.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ubiquity-debconf.po	2020-01-23 16:51:52.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ubiquity-debconf.po	2020-07-08 13:53:53.000000000 +0000
@@ -15,8 +15,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:30+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: \n"
 
 #. Type: text
@@ -48,7 +48,7 @@
 #. This is used as a window title.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:7001 ../ubiquity.templates:183001
+#: ../ubiquity.templates:7001 ../ubiquity.templates:184001
 msgid "Install"
 msgstr "安装"
 
@@ -371,31 +371,31 @@
 #. Description
 #. This is used as a button label, and should be translated as an action.
 #. Omit the [ ... ] from the translation.
-#: ../ubiquity.templates:55001
+#: ../ubiquity.templates:56001
 msgid "_Install Now[ action ]"
 msgstr "现在安装(_I)"
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:56001
+#: ../ubiquity.templates:57001
 msgid "Quit the installation?"
 msgstr "退出安装？"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:57001
+#: ../ubiquity.templates:58001
 msgid "Do you really want to quit the installation now?"
 msgstr "您确定要退出安装吗？"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:58001
+#: ../ubiquity.templates:59001
 msgid "Bootloader install failed"
 msgstr "安装启动引导程序失败"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:59001
+#: ../ubiquity.templates:60001
 msgid ""
 "Sorry, an error occurred and it was not possible to install the bootloader "
 "at the specified location."
@@ -403,63 +403,63 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:60001
+#: ../ubiquity.templates:61001
 msgid "Choose a different device to install the bootloader on:"
 msgstr "选择另一个设备来安装启动程序："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:61001
+#: ../ubiquity.templates:62001
 msgid "Continue without a bootloader."
 msgstr "继续，不安装启动引导程序。"
 
 #. Type: text
 #. Description
 #. RELEASE is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:62001
+#: ../ubiquity.templates:63001
 msgid ""
 "You will need to manually install a bootloader in order to start ${RELEASE}."
 msgstr "您必须手动安装一个启动引导程序来启动 &{RELEASE}。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:63001
+#: ../ubiquity.templates:64001
 msgid "Cancel the installation."
 msgstr "取消安装。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:64001
+#: ../ubiquity.templates:65001
 msgid "This may leave your computer unable to boot."
 msgstr "这可能导致您的计算机无法启动。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:65001
+#: ../ubiquity.templates:66001
 msgid "How would you like to proceed?"
 msgstr "您希望如何处理？"
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:67001
+#: ../ubiquity.templates:68001
 msgid "Installation Complete"
 msgstr "安装完成"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:68001
+#: ../ubiquity.templates:69001
 msgid "Continue Testing"
 msgstr "继续试用"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:69001
+#: ../ubiquity.templates:70001
 msgid "Restart Now"
 msgstr "现在重启"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:70001
+#: ../ubiquity.templates:71001
 msgid "Shutdown Now"
 msgstr "现在关机"
 
@@ -467,13 +467,13 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:72001 ../ubiquity.templates:73001
+#: ../ubiquity.templates:73001 ../ubiquity.templates:74001
 msgid "Installer crashed"
 msgstr "安装程序崩溃"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:74001
+#: ../ubiquity.templates:75001
 msgid ""
 "We're sorry; the installer crashed. After you close this window, we'll allow "
 "you to file a bug report using the integrated bug reporting tool. This will "
@@ -487,56 +487,56 @@
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:75001
+#: ../ubiquity.templates:76001
 msgid "_High Contrast"
 msgstr "高对比度(_H)"
 
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:76001
+#: ../ubiquity.templates:77001
 msgid "_Screen Reader"
 msgstr "屏幕阅读器(_S)"
 
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:77001
+#: ../ubiquity.templates:78001
 msgid "_Keyboard Modifiers"
 msgstr "键盘修饰键(_K)"
 
 #. Type: text
 #. Description
 #. An indicator menu item.  The underscore goes before an accelerator key.
-#: ../ubiquity.templates:78001
+#: ../ubiquity.templates:79001
 msgid "_On-screen Keyboard"
 msgstr "屏幕键盘(_O)"
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:79001
+#: ../ubiquity.templates:80001
 msgid "New Partition Table..."
 msgstr "新建分区表..."
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:80001
+#: ../ubiquity.templates:81001
 msgid "Add..."
 msgstr "添加..."
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:81001
+#: ../ubiquity.templates:82001
 msgid "Change..."
 msgstr "更改..."
 
 #. Type: text
 #. Description
 #. An action, displayed on a button or as a menu item.
-#: ../ubiquity.templates:82001
+#: ../ubiquity.templates:83001
 msgid "Delete"
 msgstr "删除"
 
@@ -545,20 +545,20 @@
 #. An action, displayed on a button or as a menu item.
 #. Type: text
 #. Description
-#: ../ubiquity.templates:83001 ../ubiquity.templates:297001
+#: ../ubiquity.templates:84001 ../ubiquity.templates:303001
 msgid "Revert"
 msgstr "还原"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:84001
+#: ../ubiquity.templates:85001
 msgid "Recalculating partitions..."
 msgstr "正在重新计算分区..."
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:85001
+#: ../ubiquity.templates:86001
 msgid "Device"
 msgstr "设备"
 
@@ -566,28 +566,28 @@
 #. Description
 #. A column heading in the partitioner. Indicates how the partition is to be
 #. used (ext2, swap, etc.).
-#: ../ubiquity.templates:86001
+#: ../ubiquity.templates:87001
 msgid "Type"
 msgstr "类型"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:87001
+#: ../ubiquity.templates:88001
 msgid "Mount point"
 msgstr "挂载点"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:88001
+#: ../ubiquity.templates:89001
 msgid "Format?"
 msgstr "格式化？"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:89001
+#: ../ubiquity.templates:90001
 msgid "Size"
 msgstr "大小"
 
@@ -595,89 +595,89 @@
 #. Description
 #. A column heading in the partitioner. Indicates how much of the space on
 #. this partition is used by data.
-#: ../ubiquity.templates:90001
+#: ../ubiquity.templates:91001
 msgid "Used"
 msgstr "已用"
 
 #. Type: text
 #. Description
 #. A column heading in the partitioner.
-#: ../ubiquity.templates:91001
+#: ../ubiquity.templates:92001
 msgid "System"
 msgstr "已装系统"
 
 #. Type: text
 #. Description
 #. Indicates unpartitioned free space on a disk.
-#: ../ubiquity.templates:92001
+#: ../ubiquity.templates:93001
 msgid "free space"
 msgstr "空闲"
 
 #. Type: text
 #. Description
 #. Indicates that we do not know how much space is used on this partition.
-#: ../ubiquity.templates:93001
+#: ../ubiquity.templates:94001
 msgid "unknown"
 msgstr "未知"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:94001
+#: ../ubiquity.templates:95001
 msgid "Create partition"
 msgstr "创建分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:95001
+#: ../ubiquity.templates:96001
 msgid "Size:"
 msgstr "大小："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:96001
+#: ../ubiquity.templates:97001
 msgid "Beginning of this space"
 msgstr "空间起始位置"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:97001
+#: ../ubiquity.templates:98001
 msgid "End of this space"
 msgstr "空间结束位置"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:98001
+#: ../ubiquity.templates:99001
 msgid "Primary"
 msgstr "主分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:99001
+#: ../ubiquity.templates:100001
 msgid "Logical"
 msgstr "逻辑分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:100001
+#: ../ubiquity.templates:101001
 msgid "Edit partition"
 msgstr "编辑分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:101001
+#: ../ubiquity.templates:102001
 msgid "Edit a partition"
 msgstr "编辑一个分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:102001
+#: ../ubiquity.templates:103001
 msgid "Boot loader"
 msgstr "引导程序"
 
 #. Type: text
 #. Description
 #. RELEASE is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:103001
+#: ../ubiquity.templates:104001
 msgid ""
 "Installation has finished.  You can continue testing ${RELEASE} now, but "
 "until you restart the computer, any changes you make or documents you save "
@@ -687,7 +687,7 @@
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:104001
+#: ../ubiquity.templates:105001
 msgid "Go Back"
 msgstr "后退"
 
@@ -697,34 +697,34 @@
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:105001 ../ubiquity.templates:108001
+#: ../ubiquity.templates:106001 ../ubiquity.templates:109001
 msgid "Continue"
 msgstr "继续"
 
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:106001
+#: ../ubiquity.templates:107001
 msgid "Connect"
 msgstr "连接"
 
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:107001
+#: ../ubiquity.templates:108001
 msgid "Stop"
 msgstr "停止"
 
 #. Type: text
 #. Description
 #. Translators, this text will appear on a button, so KEEP IT SHORT
-#: ../ubiquity.templates:109001
+#: ../ubiquity.templates:110001
 msgid "Continue in UEFI mode"
 msgstr "在 UEFI 模式中继续"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:110001
+#: ../ubiquity.templates:111001
 msgid ""
 "Installation is complete. You need to restart the computer in order to use "
 "the new installation."
@@ -732,31 +732,31 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:111001
+#: ../ubiquity.templates:112001
 msgid "Verifying the installation configuration..."
 msgstr "正在验证安装配置..."
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:112001
+#: ../ubiquity.templates:113001
 msgid "Installing system"
 msgstr "正在安装系统"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:113001
+#: ../ubiquity.templates:114001
 msgid "Finding the distribution to copy..."
 msgstr "正在寻找要复制的发行版..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:115001
+#: ../ubiquity.templates:116001
 msgid "Copying files..."
 msgstr "正在复制文件..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:116001
+#: ../ubiquity.templates:117001
 msgid "Almost finished copying files..."
 msgstr "正在完成文件复制..."
 
@@ -770,9 +770,9 @@
 #. Description
 #. Type: select
 #. Description
-#: ../ubiquity.templates:117001 ../ubiquity.templates:118001
-#: ../ubiquity.templates:119001 ../ubiquity.templates:120001
-#: ../ubiquity.templates:121001
+#: ../ubiquity.templates:118001 ../ubiquity.templates:119001
+#: ../ubiquity.templates:120001 ../ubiquity.templates:121001
+#: ../ubiquity.templates:122001
 msgid "Installation Failed"
 msgstr "安装失败"
 
@@ -784,14 +784,14 @@
 #. Description
 #. Type: error
 #. Description
-#: ../ubiquity.templates:117001 ../ubiquity.templates:118001
-#: ../ubiquity.templates:119001 ../ubiquity.templates:120001
+#: ../ubiquity.templates:118001 ../ubiquity.templates:119001
+#: ../ubiquity.templates:120001 ../ubiquity.templates:121001
 msgid "The installer encountered an error copying files to the hard disk:"
 msgstr "安装程序向硬盘复制文件时遇到错误："
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:117001
+#: ../ubiquity.templates:118001
 msgid ""
 "This is due to there being insufficient disk space for the install to "
 "complete on the target partition.  Please run the installer again and select "
@@ -800,7 +800,7 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:118001
+#: ../ubiquity.templates:119001
 msgid ""
 "This is often due to a faulty CD/DVD disk or drive. It may help to clean the "
 "CD/DVD, to burn the CD/DVD at a lower speed, or to clean the CD/DVD drive "
@@ -810,7 +810,7 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:119001
+#: ../ubiquity.templates:120001
 msgid ""
 "This is often due to a faulty hard disk. It may help to check whether the "
 "hard disk is old and in need of replacement, or to move the system to a "
@@ -825,7 +825,7 @@
 #. Description
 #. This is used when there was an md5 mismatch during copying, meaning that
 #. the source file and destination file are not equal.
-#: ../ubiquity.templates:120001 ../ubiquity.templates:121001
+#: ../ubiquity.templates:121001 ../ubiquity.templates:122001
 msgid ""
 "This is often due to a faulty CD/DVD disk or drive, or a faulty hard disk. "
 "It may help to clean the CD/DVD, to burn the CD/DVD at a lower speed, to "
@@ -838,151 +838,151 @@
 
 #. Type: select
 #. Description
-#: ../ubiquity.templates:121001
+#: ../ubiquity.templates:122001
 msgid "The following file did not match its source copy on the CD/DVD:"
 msgstr "CD/DVD 中的以下文件与原始文件不同："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:122001
+#: ../ubiquity.templates:123001
 msgid "Copying installation logs..."
 msgstr "正在复制安装日志..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:123001
+#: ../ubiquity.templates:124001
 msgid "Configuring target system..."
 msgstr "正在配置目标系统..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:124001
+#: ../ubiquity.templates:125001
 msgid "Configuring system locales..."
 msgstr "正在配置区域设置..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:125001
+#: ../ubiquity.templates:126001
 msgid "Configuring apt..."
 msgstr "正在配置 APT..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:126001
+#: ../ubiquity.templates:127001
 msgid "Configuring time zone..."
 msgstr "正在配置时区..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:127001
+#: ../ubiquity.templates:128001
 msgid "Configuring keyboard..."
 msgstr "正在配置键盘..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:128001
+#: ../ubiquity.templates:129001
 msgid "Creating user..."
 msgstr "正在创建用户..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:129001
+#: ../ubiquity.templates:130001
 msgid "Configuring hardware..."
 msgstr "正在配置硬件..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:130001
+#: ../ubiquity.templates:131001
 msgid "Installing third-party software..."
 msgstr "正在安装第三方软件..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:131001
+#: ../ubiquity.templates:132001
 msgid "Configuring network..."
 msgstr "正在配置网络..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:132001
+#: ../ubiquity.templates:133001
 msgid "Configuring boot loader..."
 msgstr "正在配置引导程序..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:133001
+#: ../ubiquity.templates:134001
 msgid "Saving installed packages..."
 msgstr "正在保存安装的软件包..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:134001
+#: ../ubiquity.templates:135001
 msgid "Restoring previously installed packages..."
 msgstr "正在恢复刚刚安装的软件包..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:135001
+#: ../ubiquity.templates:136001
 msgid "Installing additional packages..."
 msgstr "正在安装附加软件包..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:136001
+#: ../ubiquity.templates:137001
 msgid "Checking for packages to install..."
 msgstr "正在检查要安装的软件包..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:137001
+#: ../ubiquity.templates:138001
 msgid "Removing extra packages..."
 msgstr "正在删除额外的软件包..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:138001
+#: ../ubiquity.templates:139001
 msgid "Checking for packages to remove..."
 msgstr "正在检查要删除的软件包…"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:139001
+#: ../ubiquity.templates:140001
 msgid "Downloading packages (${TIME} remaining)..."
 msgstr "正在下载软件包 (剩余时间 ${TIME})..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:140001
+#: ../ubiquity.templates:141001
 msgid "Downloading package lists..."
 msgstr "正在下载软件包列表..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:141001
+#: ../ubiquity.templates:142001
 msgid "Downloading package lists (${TIME} remaining)..."
 msgstr "正在下载软件包列表 (剩余时间 ${TIME})..."
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:143001
+#: ../ubiquity.templates:144001
 msgid "Error installing ${PACKAGE}"
 msgstr "安装 ${PACKAGE} 时出错"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:144001
+#: ../ubiquity.templates:145001
 msgid "Error removing ${PACKAGE}"
 msgstr "删除 ${PACKAGE} 时出错"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001
+#: ../ubiquity.templates:146001
 msgid "Error while installing packages"
 msgstr "安装软件包时发生错误"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001
+#: ../ubiquity.templates:146001
 msgid "An error occurred while installing packages:"
 msgstr "安装软件包时发生了一个错误："
 
@@ -990,7 +990,7 @@
 #. Description
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001 ../ubiquity.templates:146001
+#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
 msgid "The following packages are in a broken state:"
 msgstr "下列软件包已损坏："
 
@@ -998,7 +998,7 @@
 #. Description
 #. Type: error
 #. Description
-#: ../ubiquity.templates:145001 ../ubiquity.templates:146001
+#: ../ubiquity.templates:146001 ../ubiquity.templates:147001
 msgid ""
 "This may be due to using an old installer image, or it may be due to a bug "
 "in some of the packages listed above. More details may be found in "
@@ -1014,25 +1014,25 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:146001
+#: ../ubiquity.templates:147001
 msgid "Error while removing packages"
 msgstr "删除软件包时发生错误"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:146001
+#: ../ubiquity.templates:147001
 msgid "An error occurred while removing packages:"
 msgstr "删除软件包时发生了一个错误："
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:147001
+#: ../ubiquity.templates:148001
 msgid "Error copying network configuration"
 msgstr "复制网络设置错误"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:147001
+#: ../ubiquity.templates:148001
 msgid ""
 "An error occurred while copying the network settings.  The installation will "
 "continue, but the network configuration will have to be set up again in the "
@@ -1041,13 +1041,13 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:148001
+#: ../ubiquity.templates:149001
 msgid "Error copying bluetooth configuration"
 msgstr "复制蓝牙配置时发生错误"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:148001
+#: ../ubiquity.templates:149001
 msgid ""
 "An error occurred while copying the bluetooth settings.  The installation "
 "will continue, but the bluetooth configuration will have to be set up again "
@@ -1056,13 +1056,13 @@
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:149001
+#: ../ubiquity.templates:150001
 msgid "Error restoring installed applications"
 msgstr "恢复安装的应用程序时出现错误"
 
 #. Type: error
 #. Description
-#: ../ubiquity.templates:149001
+#: ../ubiquity.templates:150001
 msgid ""
 "An error occurred while restoring previously-installed applications.  The "
 "installation will continue, but you may have to manually reinstall some "
@@ -1071,31 +1071,31 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:153001
+#: ../ubiquity.templates:154001
 msgid "Calculating files to skip copying..."
 msgstr "正在计算要跳过复制的文件..."
 
 #. Type: title
 #. Description
-#: ../ubiquity.templates:154001
+#: ../ubiquity.templates:155001
 msgid "Installing language packs"
 msgstr "正在安装语言包"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:155001
+#: ../ubiquity.templates:156001
 msgid "Downloading language packs (${TIME} remaining)..."
 msgstr "正在下载语言包 (剩余 ${TIME})..."
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid "Failed to unmount partitions"
 msgstr "卸载分区失败"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid ""
 "The installer needs to commit changes to partition tables, but cannot do so "
 "because partitions on the following mount points could not be unmounted:"
@@ -1103,26 +1103,26 @@
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid "Please close any applications using these mount points."
 msgstr "请关闭所有正在使用这些挂载点的应用程序。"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:164001
+#: ../ubiquity.templates:165001
 msgid ""
 "Would you like the installer to try to unmount these partitions again?"
 msgstr "您是否想让安装程序再次尝试卸载这些分区？"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:170001
+#: ../ubiquity.templates:171001
 msgid "Do you want to return to the partitioner?"
 msgstr "您希望返回到分区工具吗？"
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:170001
+#: ../ubiquity.templates:171001
 msgid ""
 "Some of the partitions you created are too small.  Please make the following "
 "partitions at least this large:"
@@ -1130,7 +1130,7 @@
 
 #. Type: boolean
 #. Description
-#: ../ubiquity.templates:170001
+#: ../ubiquity.templates:171001
 msgid ""
 "If you do not go back to the partitioner and increase the size of these "
 "partitions, the installation may fail."
@@ -1138,7 +1138,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:172001
+#: ../ubiquity.templates:173001
 msgid "System Configuration"
 msgstr "系统设置"
 
@@ -1146,25 +1146,25 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:173001 ../ubiquity.templates:251001
+#: ../ubiquity.templates:174001 ../ubiquity.templates:257001
 msgid "Welcome"
 msgstr "欢迎"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:174001
+#: ../ubiquity.templates:175001
 msgid "Network configuration"
 msgstr "网络设置"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:175001
+#: ../ubiquity.templates:176001
 msgid "Software selection"
 msgstr "软件选择"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:176001
+#: ../ubiquity.templates:177001
 msgid "Language"
 msgstr "语言"
 
@@ -1172,111 +1172,111 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:177001 ../ubiquity.templates:201001
+#: ../ubiquity.templates:178001 ../ubiquity.templates:202001
 msgid "Wireless"
 msgstr "无线"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:178001
+#: ../ubiquity.templates:179001
 msgid "Software"
 msgstr "软件"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:179001
+#: ../ubiquity.templates:180001
 msgid "Timezone"
 msgstr "时区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:180001
+#: ../ubiquity.templates:181001
 msgid "Keyboard"
 msgstr "键盘"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:181001
+#: ../ubiquity.templates:182001
 msgid "Disk Setup"
 msgstr "磁盘配置"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:182001
+#: ../ubiquity.templates:183001
 msgid "User Info"
 msgstr "用户信息"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:184001
+#: ../ubiquity.templates:185001
 msgid "installation process"
 msgstr "安装进程"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:186001
+#: ../ubiquity.templates:187001
 msgid "Checking for installer updates"
 msgstr "正在检查安装程序更新"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:187001
+#: ../ubiquity.templates:188001
 msgid "Reading package information"
 msgstr "正在读取软件包信息"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:188001
+#: ../ubiquity.templates:189001
 msgid "Updating package information"
 msgstr "正在更新软件包信息"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:189001
+#: ../ubiquity.templates:190001
 msgid "File ${INDEX} of ${TOTAL} at ${SPEED}/s"
 msgstr "文件 ${INDEX}/${TOTAL}，下载速度 ${SPEED}/s"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:190001
+#: ../ubiquity.templates:191001
 msgid "File ${INDEX} of ${TOTAL}"
 msgstr "文件 ${INDEX}/${TOTAL}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:191001
+#: ../ubiquity.templates:192001
 msgid "Installing update"
 msgstr "正在安装更新"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:192001
+#: ../ubiquity.templates:193001
 msgid "Error updating installer"
 msgstr "升级安装程序时发生错误"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:192001
+#: ../ubiquity.templates:193001
 msgid "The installer encountered an error while trying to update itself:"
 msgstr "安装程序在自我更新时发生一个错误："
 
 #. Type: text
 #. Description
 #. Translated acronym for Universal Serial Bus.
-#: ../ubiquity.templates:193001
+#: ../ubiquity.templates:194001
 msgid "USB disk"
 msgstr "USB 盘"
 
 #. Type: text
 #. Description
 #. Translated acronym for Compact Disc.
-#: ../ubiquity.templates:194001
+#: ../ubiquity.templates:195001
 msgid "CD"
 msgstr "CD"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:195001
+#: ../ubiquity.templates:196001
 msgid ""
 "Please choose the language to use for the install process. This language "
 "will be the default language for this computer."
@@ -1284,7 +1284,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:196001
+#: ../ubiquity.templates:197001
 msgid ""
 "Please choose the language used for the configuration process. This language "
 "will be the default language for this computer."
@@ -1294,13 +1294,13 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:197001 ../ubiquity.templates:198001
+#: ../ubiquity.templates:198001 ../ubiquity.templates:199001
 msgid "Installation failed"
 msgstr "安装失败"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:197001
+#: ../ubiquity.templates:198001
 msgid ""
 "The installer encountered an unrecoverable error.  A desktop session will "
 "now be run so that you may investigate the problem or try installing again."
@@ -1308,19 +1308,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:198001
+#: ../ubiquity.templates:199001
 msgid "The installer encountered an unrecoverable error and will now reboot."
 msgstr "安装程序遇到了一个不可修复的错误，现在将会重新启动。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:200001
+#: ../ubiquity.templates:201001
 msgid "Updates and other software"
 msgstr "更新和其他软件"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:202001
+#: ../ubiquity.templates:203001
 msgid ""
 "Connecting this computer to a wi-fi network allows you to install third-"
 "party software, download updates, automatically detect your timezone, and "
@@ -1329,49 +1329,49 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:203001
+#: ../ubiquity.templates:204001
 msgid "Password:"
 msgstr "密码："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:204001
+#: ../ubiquity.templates:205001
 msgid "Display password"
 msgstr "显示密码"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:205001
+#: ../ubiquity.templates:206001
 msgid "I don't want to connect to a wi-fi network right now"
 msgstr "我现在不想链接 wi-fi 无线网路"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:206001
+#: ../ubiquity.templates:207001
 msgid "Connect to this network"
 msgstr "连接到这个网络"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:211001
+#: ../ubiquity.templates:213001
 msgid "Select drive:"
 msgstr "选择磁盘："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:212001
+#: ../ubiquity.templates:214001
 msgid "Allocate drive space by dragging the divider below:"
 msgstr "拖曳下面的分隔符分配磁盘空间："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:213001
+#: ../ubiquity.templates:215001
 msgid "The entire disk will be used:"
 msgstr "将使用整个磁盘："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:214001
+#: ../ubiquity.templates:216001
 #, no-c-format
 msgid ""
 "<small>%d smaller partitions are hidden, use the <a href=\"\">advanced "
@@ -1380,7 +1380,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:215001
+#: ../ubiquity.templates:217001
 msgid ""
 "<small>1 smaller partition is hidden, use the <a href=\"\">advanced "
 "partitioning tool</a> for more control</small>"
@@ -1388,7 +1388,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:216001
+#: ../ubiquity.templates:218001
 #, no-c-format
 msgid ""
 "%d partitions will be deleted, use the <a href=\"\">advanced partitioning "
@@ -1397,7 +1397,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:217001
+#: ../ubiquity.templates:219001
 msgid ""
 "1 partition will be deleted, use the <a href=\"\">advanced partitioning "
 "tool</a> for more control"
@@ -1405,19 +1405,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:218001
+#: ../ubiquity.templates:220001
 msgid "Split Largest Partition"
 msgstr "分割最大的分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:220001
+#: ../ubiquity.templates:222001
 msgid "For best results, please ensure that this computer:"
 msgstr "要获得最佳的体验，请确定这台计算机："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:221001
+#: ../ubiquity.templates:223001
 msgid "Sorry"
 msgstr "抱歉"
 
@@ -1425,32 +1425,32 @@
 #. Description
 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
 #. RELEASE is a variable substituted into this string, the Ubuntu flavor'
-#: ../ubiquity.templates:222001
+#: ../ubiquity.templates:228001
 msgid "You need at least ${SIZE} disk space to install ${RELEASE}."
 msgstr "安装 ${RELEASE} 至少需要 ${SIZE} 的磁盘空间"
 
 #. Type: text
 #. Description
 #. SIZE is a variable substituted into this string, and may be '3.7 GB'
-#: ../ubiquity.templates:223001
+#: ../ubiquity.templates:229001
 msgid "This computer has only ${SIZE}."
 msgstr "此电脑仅有 ${SIZE}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:224001
+#: ../ubiquity.templates:230001
 msgid "is plugged in to a power source"
 msgstr "已经插入电源"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:225001
+#: ../ubiquity.templates:231001
 msgid "is connected to the Internet"
 msgstr "已经连接到互联网"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:226001
+#: ../ubiquity.templates:232001
 msgid ""
 "This software is subject to license terms included with its documentation. "
 "Some is proprietary."
@@ -1458,7 +1458,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:227001
+#: ../ubiquity.templates:233001
 msgid ""
 "Install third-party software for graphics and Wi-Fi hardware and additional "
 "media formats"
@@ -1466,67 +1466,67 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:228001
+#: ../ubiquity.templates:234001
 msgid "Download updates while installing ${RELEASE}"
 msgstr "安装 ${RELEASE} 时下载更新"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:229001
+#: ../ubiquity.templates:235001
 msgid "This saves time after installation."
 msgstr "这能节约安装后的时间。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:230001
+#: ../ubiquity.templates:236001
 msgid "Not available because there is no Internet connection."
 msgstr "因无网络连接而不可用。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:231001
+#: ../ubiquity.templates:237001
 msgid "What apps would you like to install to start with?"
 msgstr "您希望先安装哪些应用？"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:232001
+#: ../ubiquity.templates:238001
 msgid "Which applications would you like to start with?"
 msgstr "您希望先安装那个应用？"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:233001
+#: ../ubiquity.templates:239001
 msgid "Minimal installation"
 msgstr "最小安装"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:234001
+#: ../ubiquity.templates:240001
 msgid "Web browser and basic utilities."
 msgstr "网络浏览器和基本工具"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:235001
+#: ../ubiquity.templates:241001
 msgid "Web browser plus basic utilities and applications."
 msgstr "网络浏览器和基本的工具应用程序"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:236001
+#: ../ubiquity.templates:242001
 msgid "Normal installation"
 msgstr "正常安装"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:237001
+#: ../ubiquity.templates:243001
 msgid "Web browser, utilities, office software, games, and media players."
 msgstr "网络浏览器、工具、办公软件、游戏和媒体播放器。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:238001
+#: ../ubiquity.templates:244001
 msgid ""
 "Web browser, utilities, office software, KDE PIM suite plus additional "
 "internet applications and media players."
@@ -1534,7 +1534,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:239001
+#: ../ubiquity.templates:245001
 msgid "Other options"
 msgstr "其他选项"
 
@@ -1548,25 +1548,25 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:244001
+#: ../ubiquity.templates:250001
 msgid "Layout:"
 msgstr "布局："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:245001
+#: ../ubiquity.templates:251001
 msgid "Variant:"
 msgstr "变种："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:246001
+#: ../ubiquity.templates:252001
 msgid "Below is an image of your current layout:"
 msgstr "下面是您当前布局的图像："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:247001
+#: ../ubiquity.templates:253001
 msgid ""
 "Select your location, so that the system can use appropriate display "
 "conventions for your country, fetch updates from sites close to you, and set "
@@ -1575,19 +1575,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:248001
+#: ../ubiquity.templates:254001
 msgid "Time Zone:"
 msgstr "时区："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:249001
+#: ../ubiquity.templates:255001
 msgid "Region:"
 msgstr "地区："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:250001
+#: ../ubiquity.templates:256001
 msgid "[type here to change]"
 msgstr "[在此输入以更改]"
 
@@ -1595,14 +1595,14 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:259001
 msgid "Replace ${OS} with ${DISTRO}"
 msgstr "将 ${OS} 替换为 ${DISTRO}"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:253001
+#: ../ubiquity.templates:259001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all of your "
 "${OS} programs, documents, photos, music, and any other files."
@@ -1613,7 +1613,7 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:254001
+#: ../ubiquity.templates:260001
 msgid "Install ${DISTRO} alongside ${OS}"
 msgstr "安装 ${DISTRO}，与 ${OS} 共存"
 
@@ -1625,8 +1625,8 @@
 #. Description
 #. Type: text
 #. Description
-#: ../ubiquity.templates:254001 ../ubiquity.templates:255001
-#: ../ubiquity.templates:258001 ../ubiquity.templates:263001
+#: ../ubiquity.templates:260001 ../ubiquity.templates:261001
+#: ../ubiquity.templates:264001 ../ubiquity.templates:269001
 msgid ""
 "Documents, music, and other personal files will be kept. You can choose "
 "which operating system you want each time the computer starts up."
@@ -1636,20 +1636,20 @@
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:255001
+#: ../ubiquity.templates:261001
 msgid "Install ${DISTRO} inside ${OS}"
 msgstr "安装 ${DISTRO}，替代 ${OS}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:262001
 msgid "Something else"
 msgstr "其他选项"
 
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:256001
+#: ../ubiquity.templates:262001
 msgid ""
 "You can create or resize partitions yourself, or choose multiple partitions "
 "for ${DISTRO}."
@@ -1658,14 +1658,14 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:263001
 msgid "Erase ${CURDISTRO} and reinstall"
 msgstr "卸载 ${CURDISTRO} 并重新安装"
 
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:257001
+#: ../ubiquity.templates:263001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "${CURDISTRO} programs, documents, photos, music, and any other files."
@@ -1683,7 +1683,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:267001
 msgid ""
 "Documents, music, and other personal files will be kept. Installed software "
 "will be kept where possible. System-wide settings will be cleared."
@@ -1694,7 +1694,7 @@
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
 #. VER is a variable substituted into this string, and may be '11.04'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:258001
+#: ../ubiquity.templates:264001
 msgid "Install ${DISTRO} ${VER} alongside ${CURDISTRO}"
 msgstr "安装 ${DISTRO} ${VER}，与 ${CURDISTRO} 共存"
 
@@ -1704,13 +1704,13 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:259001 ../ubiquity.templates:262001
+#: ../ubiquity.templates:265001 ../ubiquity.templates:268001
 msgid "Erase disk and install ${DISTRO}"
 msgstr "清除整个磁盘并安装 ${DISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:259001
+#: ../ubiquity.templates:265001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete any files on "
 "the disk."
@@ -1718,7 +1718,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:266001
 msgid "Erase everything and reinstall"
 msgstr "删除全部并重新安装"
 
@@ -1726,7 +1726,7 @@
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:260001
+#: ../ubiquity.templates:266001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and other files in both ${OS} and "
@@ -1738,13 +1738,13 @@
 #. Type: text
 #. Description
 #. CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-#: ../ubiquity.templates:261001
+#: ../ubiquity.templates:267001
 msgid "Reinstall ${CURDISTRO}"
 msgstr "重新安装 ${CURDISTRO}"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:262001
+#: ../ubiquity.templates:268001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> This will delete all your "
 "programs, documents, photos, music, and any other files in all operating "
@@ -1755,14 +1755,14 @@
 #. Type: text
 #. Description
 #. DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-#: ../ubiquity.templates:263001
+#: ../ubiquity.templates:269001
 msgid "Install ${DISTRO} alongside them"
 msgstr "安装 ${DISTRO}，与其他系统共存"
 
 #. Type: text
 #. Description
 #. OS is a variable substituted into this string, and may be 'Windows 7'
-#: ../ubiquity.templates:264001
+#: ../ubiquity.templates:270001
 msgid "This computer currently has ${OS} on it. What would you like to do?"
 msgstr "这台计算机已经安装了 ${OS}。您准备怎么做？"
 
@@ -1770,7 +1770,7 @@
 #. Description
 #. OS1 is a variable substituted into this string, and may be 'Windows 7'
 #. OS2 is a variable substituted into this string, and may be 'Mac OS X'
-#: ../ubiquity.templates:265001
+#: ../ubiquity.templates:271001
 msgid ""
 "This computer currently has ${OS1} and ${OS2} on it. What would you like to "
 "do?"
@@ -1778,7 +1778,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:266001
+#: ../ubiquity.templates:272001
 msgid ""
 "This computer currently has multiple operating systems on it. What would you "
 "like to do?"
@@ -1786,7 +1786,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:267001
+#: ../ubiquity.templates:273001
 msgid ""
 "This computer currently has no detected operating systems. What would you "
 "like to do?"
@@ -1794,37 +1794,37 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:268001
+#: ../ubiquity.templates:274001
 msgid "Before:"
 msgstr "之前："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:269001
+#: ../ubiquity.templates:275001
 msgid "After:"
 msgstr "之后："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:270001
+#: ../ubiquity.templates:276001
 msgid "Encrypt the new ${RELEASE} installation for security"
 msgstr "加密 ${RELEASE} 新安装以提高安全性。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:271001
+#: ../ubiquity.templates:277001
 msgid "You will choose a security key in the next step."
 msgstr "下一步，你需要选择一个安全密钥。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:272001
+#: ../ubiquity.templates:278001
 msgid "Use LVM with the new ${RELEASE} installation"
 msgstr "在 ${RELEASE} 新安装中使用 LVM"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:273001
+#: ../ubiquity.templates:279001
 msgid ""
 "This will set up Logical Volume Management. It allows taking snapshots and "
 "easier partition resizing."
@@ -1832,19 +1832,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:285001
+#: ../ubiquity.templates:291001
 msgid "Confirm the security key:"
 msgstr "确认你的安全密钥："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:286001
+#: ../ubiquity.templates:292001
 msgid "Choose a security key:"
 msgstr "请选择一个安全密钥："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:287001
+#: ../ubiquity.templates:293001
 msgid ""
 "Disk encryption protects your files in case you lose your computer. It "
 "requires you to enter a security key each time the computer starts up."
@@ -1852,13 +1852,13 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:288001
+#: ../ubiquity.templates:294001
 msgid "Any files outside of ${RELEASE} will not be encrypted."
 msgstr "${RELEASE} 之外的文件不会被加密。"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:289001
+#: ../ubiquity.templates:295001
 msgid ""
 "<span foreground=\"darkred\">Warning:</span> If you lose this security key, "
 "all data will be lost. If you need to, write down your key and keep it in a "
@@ -1870,61 +1870,61 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:290001
+#: ../ubiquity.templates:296001
 msgid "For more security:"
 msgstr "为了能更安全："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:291001
+#: ../ubiquity.templates:297001
 msgid "Overwrite empty disk space"
 msgstr "覆盖空磁盘空间"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:292001
+#: ../ubiquity.templates:298001
 msgid "The installation may take much longer."
 msgstr "安装过程可能需要更长的时间。"
 
 #. Type: text
 #. description
-#: ../ubiquity.templates:293001
+#: ../ubiquity.templates:299001
 msgid "LVM..."
 msgstr "逻辑卷管理..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:294001
+#: ../ubiquity.templates:300001
 msgid "Volume groups:"
 msgstr "卷组："
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:295001
+#: ../ubiquity.templates:301001
 msgid "Encryption Options"
 msgstr "加密选项"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:296001
+#: ../ubiquity.templates:302001
 msgid "Physical volumes:"
 msgstr "物理分区"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:298001
+#: ../ubiquity.templates:304001
 msgid "Encrypt this partition (LUKS)"
 msgstr "加密该分区 (LUKS)"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:299001
+#: ../ubiquity.templates:305001
 msgid "MB"
 msgstr "MB"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:300001
+#: ../ubiquity.templates:306001
 msgid ""
 "Logical Volume Management (LVM) lets ${RELEASE} treat multiple physical "
 "volumes as a single volume."
@@ -1932,19 +1932,19 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:301001
+#: ../ubiquity.templates:307001
 msgid "Logical Volume Management"
 msgstr "逻辑分区管理"
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:302001
+#: ../ubiquity.templates:308001
 msgid "Encryption options..."
 msgstr "加密选项..."
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:303001
+#: ../ubiquity.templates:309001
 msgid "UEFI Secure Boot"
 msgstr "UEFI 安全启动"
 
@@ -1974,7 +1974,7 @@
 
 #. Type: text
 #. Description
-#: ../ubiquity.templates:304001
+#: ../ubiquity.templates:310001
 msgid ""
 "<span foreground=\"darkred\">Warning</span>: If you choose not to install "
 "these drivers, or if you proceed but do not confirm the password upon "
@@ -1987,7 +1987,7 @@
 
 #. Type: password
 #. Description
-#: ../ubiquity.templates:305001
+#: ../ubiquity.templates:311001
 msgid "SecureBoot key for MokPW"
 msgstr "MokPW 的安全引导密钥"
 
@@ -2045,6 +2045,6 @@
 
 #. Type: text
 #. Description
-#: ../oem-config.templates:2001
+#: ../oem-config.templates:3001
 msgid "Removing packages"
 msgstr "正在删除软件包"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ubiquity-desktop.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ubiquity-desktop.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ubiquity-desktop.po	2020-01-23 16:51:55.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ubiquity-desktop.po	2020-07-08 13:53:56.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:30+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:17+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: \n"
 
 #. Do not translate the word "RELEASE".  It is used as a marker by casper.
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ubuntu-default-launchers.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ubuntu-default-launchers.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ubuntu-default-launchers.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ubuntu-default-launchers.po	2020-07-08 13:54:02.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:24+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 12:02+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: data/ubuntu/applications/gnome-initial-setup.desktop.in:3
 msgid "Welcome to Ubuntu"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/udisks2.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/udisks2.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/udisks2.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/udisks2.po	2020-07-08 13:54:03.000000000 +0000
@@ -21,8 +21,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:09+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:48+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh-CN\n"
 
 #: data/org.freedesktop.UDisks2.policy.in:16
@@ -360,15 +360,15 @@
 msgid "Authentication is required to manage Bcache"
 msgstr "管理 Bcache 需要身份验证"
 
-#: modules/bcache/udiskslinuxblockbcache.c:269
+#: modules/bcache/udiskslinuxblockbcache.c:308
 msgid "Authentication is required to destroy bcache device."
 msgstr "删除 bcache 设备需要身份验证。"
 
-#: modules/bcache/udiskslinuxblockbcache.c:325
+#: modules/bcache/udiskslinuxblockbcache.c:367
 msgid "Authentication is required to set mode of bcache device."
 msgstr "设定 bcache 设备的模式需要身份验证。"
 
-#: modules/bcache/udiskslinuxmanagerbcache.c:248
+#: modules/bcache/udiskslinuxmanagerbcache.c:238
 msgid "Authentication is required to create bcache device."
 msgstr "创建 bcache 设备需要身份验证。"
 
@@ -380,28 +380,28 @@
 msgid "Authentication is required to manage BTRFS"
 msgstr "管理 BRTFS 需要身份验证"
 
-#: modules/btrfs/udiskslinuxfilesystembtrfs.c:332
-#: modules/btrfs/udiskslinuxfilesystembtrfs.c:598
+#: modules/btrfs/udiskslinuxfilesystembtrfs.c:350
+#: modules/btrfs/udiskslinuxfilesystembtrfs.c:622
 msgid "Authentication is required to change label for BTRFS volume"
 msgstr "更改 BRTFS 卷的标签需要身份验证"
 
-#: modules/btrfs/udiskslinuxfilesystembtrfs.c:456
+#: modules/btrfs/udiskslinuxfilesystembtrfs.c:479
 msgid "Authentication is required to add the device to the volume"
 msgstr "将设备添加到卷需要身份验证"
 
-#: modules/btrfs/udiskslinuxfilesystembtrfs.c:666
+#: modules/btrfs/udiskslinuxfilesystembtrfs.c:692
 msgid "Authentication is required to create a new snapshot"
 msgstr "创建新的快照需要身份验证"
 
-#: modules/btrfs/udiskslinuxfilesystembtrfs.c:725
+#: modules/btrfs/udiskslinuxfilesystembtrfs.c:753
 msgid "Authentication is required to check and repair the volume"
 msgstr "检查和修复卷需要身份验证"
 
-#: modules/btrfs/udiskslinuxfilesystembtrfs.c:779
+#: modules/btrfs/udiskslinuxfilesystembtrfs.c:811
 msgid "Authentication is required to resize the volume"
 msgstr "改变卷的容量"
 
-#: modules/btrfs/udiskslinuxmanagerbtrfs.c:209
+#: modules/btrfs/udiskslinuxmanagerbtrfs.c:207
 msgid "Authentication is required to create a new volume"
 msgstr "创建一个新的卷需要身份验证"
 
@@ -414,12 +414,12 @@
 msgstr "管理 iSCSI 需要身份验证"
 
 #: modules/iscsi/udiskslinuxiscsisession.c:136
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:759
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:684
 msgid "Authentication is required to perform iSCSI logout"
 msgstr "执行 iSCSI 登出需要身份验证"
 
-#: modules/iscsi/udiskslinuxiscsisession.c:169
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:784
+#: modules/iscsi/udiskslinuxiscsisession.c:160
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:702
 #, c-format
 msgid "Logout failed: %s"
 msgstr "登出失败：%s"
@@ -435,11 +435,11 @@
 msgid "Error reading %s: %s"
 msgstr "读取 %s 时出错：%s"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:415
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:358
 msgid "Authentication is required change iSCSI initiator name"
 msgstr "变更 iSCSI initiator 名称需要身份验证"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:424
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:367
 msgid "Empty initiator name"
 msgstr "空的 initiator 名称"
 
@@ -448,25 +448,25 @@
 msgid "Error writing to %s: %s"
 msgstr "写入 %s 时出错：%s"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:552
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:493
 msgid "Authentication is required to discover targets"
 msgstr "寻找 Targets 时需要身份验证"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:576
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:625
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:511
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:557
 #, c-format
 msgid "Discovery failed: %s"
 msgstr "寻找失败：%s"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:610
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:545
 msgid "Authentication is required to discover firmware targets"
 msgstr "发现 firmware Targets 时需要身份验证"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:665
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:596
 msgid "Authentication is required to perform iSCSI login"
 msgstr "执行 iSCSI 登入需要身份验证"
 
-#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:690
+#: modules/iscsi/udiskslinuxmanageriscsiinitiator.c:614
 #, c-format
 msgid "Login failed: %s"
 msgstr "登入失败：%s"
@@ -479,82 +479,82 @@
 msgid "Authentication is required to manage LVM"
 msgstr "管理 LVM 时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:441
+#: modules/lvm2/udiskslinuxlogicalvolume.c:442
 msgid "Authentication is required to delete a logical volume"
 msgstr "删除逻辑卷时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:563
+#: modules/lvm2/udiskslinuxlogicalvolume.c:566
 msgid "Authentication is required to rename a logical volume"
 msgstr "重命名逻辑卷时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:625
+#: modules/lvm2/udiskslinuxlogicalvolume.c:628
 msgid "Authentication is required to resize a logical volume"
 msgstr "更改逻辑卷大小时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:719
+#: modules/lvm2/udiskslinuxlogicalvolume.c:722
 msgid "Authentication is required to activate a logical volume"
 msgstr "激活逻辑卷时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:787
+#: modules/lvm2/udiskslinuxlogicalvolume.c:790
 msgid "Authentication is required to deactivate a logical volume"
 msgstr "关闭逻辑卷时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:854
+#: modules/lvm2/udiskslinuxlogicalvolume.c:857
 msgid "Authentication is required to create a snapshot of a logical volume"
 msgstr "给逻辑卷创建快照时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:911
-#: modules/lvm2/udiskslinuxlogicalvolume.c:974
+#: modules/lvm2/udiskslinuxlogicalvolume.c:914
+#: modules/lvm2/udiskslinuxlogicalvolume.c:977
 msgid "LVMCache not enabled at compile time."
 msgstr "编译时没有启用 LVMCache"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:925
+#: modules/lvm2/udiskslinuxlogicalvolume.c:928
 msgid "Authentication is required to convert logical volume to cache"
 msgstr "转换逻辑卷到缓存时需要身份验证"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:947
-#: modules/lvm2/udiskslinuxlogicalvolume.c:1010
+#: modules/lvm2/udiskslinuxlogicalvolume.c:950
+#: modules/lvm2/udiskslinuxlogicalvolume.c:1013
 #, c-format
 msgid "Error converting volume: %s"
 msgstr "转换卷错误：%s"
 
-#: modules/lvm2/udiskslinuxlogicalvolume.c:988
+#: modules/lvm2/udiskslinuxlogicalvolume.c:991
 msgid "Authentication is required to split cache pool LV off of a cache LV"
 msgstr "从一个缓存池 LV 分出一个缓存 LV 时需要身份验证"
 
-#: modules/lvm2/udiskslinuxmanagerlvm2.c:241
+#: modules/lvm2/udiskslinuxmanagerlvm2.c:259
 msgid "Authentication is required to create a volume group"
 msgstr "创建卷组时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:301
+#: modules/lvm2/udiskslinuxvolumegroup.c:299
 msgid "Authentication is required to delete a volume group"
 msgstr "删除卷组时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:407
+#: modules/lvm2/udiskslinuxvolumegroup.c:414
 msgid "Authentication is required to rename a volume group"
 msgstr "重命名卷组时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:517
+#: modules/lvm2/udiskslinuxvolumegroup.c:528
 msgid "Authentication is required to add a device to a volume group"
 msgstr "向卷组添加设备时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:615
+#: modules/lvm2/udiskslinuxvolumegroup.c:627
 msgid "Authentication is required to remove a device from a volume group"
 msgstr "从卷组移除一个设备时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:624
+#: modules/lvm2/udiskslinuxvolumegroup.c:636
 msgid "Authentication is required to empty a device in a volume group"
 msgstr "从卷组清空一个设备时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:835
+#: modules/lvm2/udiskslinuxvolumegroup.c:856
 msgid "Authentication is required to create a logical volume"
 msgstr "创建逻辑卷时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:841
+#: modules/lvm2/udiskslinuxvolumegroup.c:862
 msgid "Authentication is required to create a thin volume"
 msgstr "创建一个瘦部署卷时需要身份验证"
 
-#: modules/lvm2/udiskslinuxvolumegroup.c:847
+#: modules/lvm2/udiskslinuxvolumegroup.c:868
 msgid "Authentication is required to create a thin pool volume"
 msgstr "创建一个瘦部署池卷时需要身份验证"
 
@@ -574,19 +574,19 @@
 msgid "Authentication is required to manage zRAM"
 msgstr "管理 zRAM 时需要身份验证"
 
-#: modules/zram/udiskslinuxmanagerzram.c:391
+#: modules/zram/udiskslinuxmanagerzram.c:383
 msgid "Authentication is required to add zRAM kernel module"
 msgstr "添加 zRAM 内核模块时需要身份验证"
 
-#: modules/zram/udiskslinuxmanagerzram.c:486
+#: modules/zram/udiskslinuxmanagerzram.c:479
 msgid "Authentication is required to remove zRAM kernel module"
 msgstr "移除 zRAM 内核模块时需要身份验证"
 
-#: modules/zram/udiskslinuxblockzram.c:281
+#: modules/zram/udiskslinuxblockzram.c:321
 msgid "Authentication is required to enable zRAM device"
 msgstr "启用 zRAM 设备时需要身份验证"
 
-#: modules/zram/udiskslinuxblockzram.c:382
+#: modules/zram/udiskslinuxblockzram.c:425
 msgid "Authentication is required to disable zRAM device"
 msgstr "禁用 zRAM 设备时需要身份验证"
 
@@ -594,38 +594,38 @@
 #. * the user is editing settings that involve system-level
 #. * passwords and secrets
 #. 
-#: src/udiskslinuxblock.c:1323
+#: src/udiskslinuxblock.c:1328
 msgid "Authentication is required to read system-level secrets"
 msgstr "读取系统级别的机密信息需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: src/udiskslinuxblock.c:2002
+#: src/udiskslinuxblock.c:2007
 msgid "Authentication is required to add an entry to the /etc/fstab file"
 msgstr "向 /etc/fstab 文件中添加条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not tranlsate /etc/crypttab
-#: src/udiskslinuxblock.c:2020
+#: src/udiskslinuxblock.c:2026
 msgid "Authentication is required to add an entry to the /etc/crypttab file"
 msgstr "向 /etc/crypttab 文件中添加条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: src/udiskslinuxblock.c:2079
+#: src/udiskslinuxblock.c:2086
 msgid "Authentication is required to remove an entry from /etc/fstab file"
 msgstr "从 /etc/fstab 文件中移除条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/crypttab
-#: src/udiskslinuxblock.c:2097
+#: src/udiskslinuxblock.c:2105
 msgid ""
 "Authentication is required to remove an entry from the /etc/crypttab file"
 msgstr "来从 /etc/crypttab 文件中移除条目需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/fstab
-#: src/udiskslinuxblock.c:2169
+#: src/udiskslinuxblock.c:2178
 msgid "Authentication is required to modify the /etc/fstab file"
 msgstr "修改 /etc/fstab 文件需要身份验证"
 
 #. Translators: shown in authentication dialog - do not translate /etc/crypttab
-#: src/udiskslinuxblock.c:2187
+#: src/udiskslinuxblock.c:2197
 msgid "Authentication is required to modify the /etc/crypttab file"
 msgstr "修改 /etc/crypttab 文件需要身份验证"
 
@@ -642,7 +642,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3034 src/udiskslinuxdriveata.c:2291
+#: src/udiskslinuxblock.c:3059 src/udiskslinuxdriveata.c:2294
 msgid "Authentication is required to perform a secure erase of $(drive)"
 msgstr "执行安全擦除 $(drive) 需要身份验证"
 
@@ -653,11 +653,11 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3046
+#: src/udiskslinuxblock.c:3071
 msgid "Authentication is required to format $(drive)"
 msgstr "格式化 $(drive) 需要身份验证"
 
-#: src/udiskslinuxblock.c:3088 src/udiskslinuxmdraid.c:1529
+#: src/udiskslinuxblock.c:3113 src/udiskslinuxmdraid.c:1512
 msgid "Authentication is required to modify the system configuration"
 msgstr "修改系统配置时需要身份验证"
 
@@ -671,7 +671,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3588
+#: src/udiskslinuxblock.c:3629
 msgid "Authentication is required to open $(drive) for reading"
 msgstr "打开$(drive) 进行读取需要身份验证"
 
@@ -681,7 +681,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3650
+#: src/udiskslinuxblock.c:3700
 msgid "Authentication is required to open $(drive) for writing"
 msgstr "打开 $(drive) 进行写入需要身份验证"
 
@@ -691,7 +691,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3715
+#: src/udiskslinuxblock.c:3774
 msgid "Authentication is required to open $(drive) for benchmarking"
 msgstr "打开 $(drive) 进行性能测试需要身份验证"
 
@@ -701,7 +701,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3789
+#: src/udiskslinuxblock.c:3857
 msgid "Authentication is required to open $(drive)."
 msgstr ""
 
@@ -711,7 +711,7 @@
 #. * Do not translate $(drive), it's a placeholder and will
 #. * be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxblock.c:3842
+#: src/udiskslinuxblock.c:3914
 msgid "Authentication is required to rescan $(drive)"
 msgstr "重新扫描 $(drive) 需要认证"
 
@@ -721,7 +721,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdrive.c:1015
+#: src/udiskslinuxdrive.c:1023
 msgid "Authentication is required to eject $(drive)"
 msgstr "弹出 $(drive) 需要身份验证"
 
@@ -731,7 +731,7 @@
 #. * Do not translate $(drive), it's a placeholder and will be
 #. * replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdrive.c:1103
+#: src/udiskslinuxdrive.c:1111
 msgid "Authentication is required to configure settings for $(drive)"
 msgstr "配置 $(drive) 设置需要身份验证"
 
@@ -741,7 +741,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdrive.c:1418
+#: src/udiskslinuxdrive.c:1426
 msgid "Authentication is required to power off $(drive)"
 msgstr "给 $(drive) 断电需要认证"
 
@@ -751,7 +751,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:820
+#: src/udiskslinuxdriveata.c:821
 msgid "Authentication is required to update SMART data from $(drive)"
 msgstr "使用 $(drive) 的 SMART 数据需要身份验证"
 
@@ -761,7 +761,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:831
+#: src/udiskslinuxdriveata.c:832
 msgid "Authentication is required to set SMART data from a blob on $(drive)"
 msgstr "从 $(drive) 上的 blob 设置 SMART 数据需要身份验证"
 
@@ -771,7 +771,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:965
+#: src/udiskslinuxdriveata.c:966
 msgid "Authentication is required to abort a SMART self-test on $(drive)"
 msgstr "中止 $(drive) SMART 自检需要身份验证"
 
@@ -781,7 +781,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:1213
+#: src/udiskslinuxdriveata.c:1214
 msgid "Authentication is required to start a SMART self-test on $(drive)"
 msgstr "启动 $(drive) SMART 自检需要身份验证"
 
@@ -791,7 +791,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:1353
+#: src/udiskslinuxdriveata.c:1354
 msgid "Authentication is required to check power state for $(drive)"
 msgstr "检查 $(drive) 电源状态需要身份验证"
 
@@ -802,11 +802,11 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:1449
+#: src/udiskslinuxdriveata.c:1450
 msgid "Authentication is required to wake up $(drive) from standby mode"
 msgstr "从待机模式唤醒 $(drive) 需要身份验证"
 
-#: src/udiskslinuxdriveata.c:1450
+#: src/udiskslinuxdriveata.c:1451
 msgid "Authentication is required to put $(drive) in standby mode"
 msgstr "将  $(drive) 转入待机模式需要身份验证"
 
@@ -816,7 +816,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:2376
+#: src/udiskslinuxdriveata.c:2381
 msgid "Authentication is required to enable SMART on $(drive)"
 msgstr "在 $(drive) 上启用 SMART 需要认证"
 
@@ -826,7 +826,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxdriveata.c:2386
+#: src/udiskslinuxdriveata.c:2391
 msgid "Authentication is required to disable SMART on $(drive)"
 msgstr "在 $(drive) 上禁用 SMART 需要身份验证"
 
@@ -836,7 +836,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxencrypted.c:488 src/udiskslinuxencrypted.c:909
+#: src/udiskslinuxencrypted.c:494 src/udiskslinuxencrypted.c:959
 msgid "Authentication is required to unlock the encrypted device $(drive)"
 msgstr "解锁加密的设备 $(drive) 需要身份验证"
 
@@ -847,7 +847,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxencrypted.c:746
+#: src/udiskslinuxencrypted.c:771
 msgid ""
 "Authentication is required to lock the encrypted device $(drive) unlocked by "
 "another user"
@@ -859,7 +859,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:1450 src/udiskslinuxfilesystem.c:1628
+#: src/udiskslinuxfilesystem.c:893 src/udiskslinuxfilesystem.c:1075
 msgid "Authentication is required to mount $(drive)"
 msgstr "挂载 $(drive) 需要身份验证"
 
@@ -873,7 +873,7 @@
 #. *
 #. * Do not translate /etc/fstab
 #. 
-#: src/udiskslinuxfilesystem.c:1536
+#: src/udiskslinuxfilesystem.c:980
 msgid ""
 "Authentication is required to mount $(drive) referenced in the /etc/fstab "
 "file"
@@ -889,7 +889,7 @@
 #. *
 #. * Do not translate /etc/fstab
 #. 
-#: src/udiskslinuxfilesystem.c:1911
+#: src/udiskslinuxfilesystem.c:1374
 msgid ""
 "Authentication is required to unmount $(drive) referenced in the /etc/fstab "
 "file"
@@ -902,7 +902,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:1959
+#: src/udiskslinuxfilesystem.c:1422
 msgid ""
 "Authentication is required to unmount $(drive) mounted by another user"
 msgstr "需要授权来卸载由其他用户挂载的 $(drive)"
@@ -913,7 +913,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:2152
+#: src/udiskslinuxfilesystem.c:1626
 msgid "Authentication is required to change the filesystem label on $(drive)"
 msgstr "更改  $(drive) 的文件系统标签需要身份验证"
 
@@ -923,7 +923,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:2331
+#: src/udiskslinuxfilesystem.c:1815
 msgid "Authentication is required to resize the filesystem on $(drive)"
 msgstr "改变 $(drive) 上文件系统大小需要身份验证"
 
@@ -933,7 +933,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:2492
+#: src/udiskslinuxfilesystem.c:1986
 msgid "Authentication is required to repair the filesystem on $(drive)"
 msgstr "修复 $(drive) 的文件系统需要身份验证"
 
@@ -943,7 +943,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:2649
+#: src/udiskslinuxfilesystem.c:2154
 msgid "Authentication is required to check the filesystem on $(drive)"
 msgstr "检查 $(drive) 上文件系统需要身份验证"
 
@@ -953,7 +953,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxfilesystem.c:2790
+#: src/udiskslinuxfilesystem.c:2306
 msgid ""
 "Authentication is required to change ownership of the filesystem on $(drive)"
 msgstr "改变 $(drive) 上文件系统所有者需要身份验证"
@@ -965,7 +965,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxloop.c:250
+#: src/udiskslinuxloop.c:253
 msgid "Authentication is required to delete the loop device $(drive)"
 msgstr "删除回环设备 $(drive) 需要身份验证"
 
@@ -976,7 +976,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxloop.c:339
+#: src/udiskslinuxloop.c:346
 msgid "Authentication is required to modify the loop device $(drive)"
 msgstr "修改回环设备 $(drive) 需要身份验证"
 
@@ -992,7 +992,7 @@
 #. * attempts to start a RAID Array.
 #. 
 #. TODO: variables
-#: src/udiskslinuxmdraid.c:646
+#: src/udiskslinuxmdraid.c:629
 msgid "Authentication is required to start a RAID array"
 msgstr "启动 RAID 阵列需要身份验证"
 
@@ -1000,7 +1000,7 @@
 #. * attempts to stop a RAID Array.
 #. 
 #. TODO: variables
-#: src/udiskslinuxmdraid.c:812
+#: src/udiskslinuxmdraid.c:795
 msgid "Authentication is required to stop a RAID array"
 msgstr "停止 RAID 阵列需要身份验证"
 
@@ -1008,7 +1008,7 @@
 #. * attempts to remove a device from a RAID Array.
 #. 
 #. TODO: variables
-#: src/udiskslinuxmdraid.c:1035
+#: src/udiskslinuxmdraid.c:1018
 msgid "Authentication is required to remove a device from a RAID array"
 msgstr "从 RAID 阵列中移除设备需要身份验证"
 
@@ -1016,7 +1016,7 @@
 #. * attempts to add a device to a RAID Array.
 #. 
 #. TODO: variables
-#: src/udiskslinuxmdraid.c:1186
+#: src/udiskslinuxmdraid.c:1169
 msgid "Authentication is required to add a device to a RAID array"
 msgstr "向 RAID 阵列添加设备需要身份验证"
 
@@ -1024,7 +1024,7 @@
 #. * attempts to change whether it has a write-intent bitmap
 #. 
 #. TODO: variables
-#: src/udiskslinuxmdraid.c:1305
+#: src/udiskslinuxmdraid.c:1288
 msgid ""
 "Authentication is required to configure the write-intent bitmap on a RAID "
 "array"
@@ -1034,12 +1034,12 @@
 #. * attempts to start/stop data scrubbing operations
 #. 
 #. TODO: variables
-#: src/udiskslinuxmdraid.c:1424
+#: src/udiskslinuxmdraid.c:1407
 msgid ""
 "Authentication is required to start/stop data scrubbing of a RAID array"
 msgstr "启动/停止 RAID 阵列的数据清理需要身份验证"
 
-#: src/udiskslinuxmdraid.c:1510
+#: src/udiskslinuxmdraid.c:1493
 msgid "Authentication is required to delete a RAID array"
 msgstr "删除 RAID 阵列时需要身份验证"
 
@@ -1049,7 +1049,7 @@
 #. * Do not translate $(drive), it's a placeholder and
 #. * will be replaced by the name of the drive/device in question
 #. 
-#: src/udiskslinuxpartition.c:149
+#: src/udiskslinuxpartition.c:150
 msgid "Authentication is required to modify the partition on device $(drive)"
 msgstr "修改设备 $(drive) 上的分区需要身份验证"
 
@@ -1094,7 +1094,7 @@
 msgstr ""
 
 #. Translators: Corresponds to the DOS/Master-Boot-Record "bootable" flag for a partition
-#: udisks/udisksclient.c:1061
+#: udisks/udisksclient.c:1179
 msgctxt "dos-part-flag"
 msgid "Bootable"
 msgstr "可启动"
@@ -1102,7 +1102,7 @@
 #. Translators: Corresponds to the GPT "system" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: udisks/udisksclient.c:1071
+#: udisks/udisksclient.c:1189
 msgctxt "gpt-part-flag"
 msgid "System"
 msgstr "系统"
@@ -1110,7 +1110,7 @@
 #. Translators: Corresponds to the GPT "legacy bios bootable" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: udisks/udisksclient.c:1078
+#: udisks/udisksclient.c:1196
 msgctxt "gpt-part-flag"
 msgid "Legacy BIOS Bootable"
 msgstr "旧式 BIOS 可启动"
@@ -1118,7 +1118,7 @@
 #. Translators: Corresponds to the GPT "read-only" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: udisks/udisksclient.c:1085
+#: udisks/udisksclient.c:1203
 msgctxt "gpt-part-flag"
 msgid "Read-only"
 msgstr "只读"
@@ -1126,7 +1126,7 @@
 #. Translators: Corresponds to the GPT "hidden" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: udisks/udisksclient.c:1092
+#: udisks/udisksclient.c:1210
 msgctxt "gpt-part-flag"
 msgid "Hidden"
 msgstr "隐藏"
@@ -1134,68 +1134,68 @@
 #. Translators: Corresponds to the GPT "no automount" flag for a partition,
 #. * see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. 
-#: udisks/udisksclient.c:1099
+#: udisks/udisksclient.c:1217
 msgctxt "gpt-part-flag"
 msgid "No Automount"
 msgstr "不自动挂载"
 
 #. Translators: Partition info. First %s is the type, second %s is a list of flags
-#: udisks/udisksclient.c:1112
+#: udisks/udisksclient.c:1230
 #, c-format
 msgctxt "partition-info"
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. Translators: The Partition info when unknown
-#: udisks/udisksclient.c:1123
+#: udisks/udisksclient.c:1241
 msgctxt "partition-info"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1595
+#: udisks/udisksclient.c:1713
 msgctxt "byte-size-pow2"
 msgid "KiB"
 msgstr "KiB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1601
+#: udisks/udisksclient.c:1719
 msgctxt "byte-size-pow2"
 msgid "MiB"
 msgstr "MiB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1607
+#: udisks/udisksclient.c:1725
 msgctxt "byte-size-pow2"
 msgid "GiB"
 msgstr "GiB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1613
+#: udisks/udisksclient.c:1731
 msgctxt "byte-size-pow2"
 msgid "TiB"
 msgstr "TiB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1638
+#: udisks/udisksclient.c:1756
 msgctxt "byte-size-pow10"
 msgid "KB"
 msgstr "KB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1644
+#: udisks/udisksclient.c:1762
 msgctxt "byte-size-pow10"
 msgid "MB"
 msgstr "MB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1650
+#: udisks/udisksclient.c:1768
 msgctxt "byte-size-pow10"
 msgid "GB"
 msgstr "GB"
 
 #. Translators: SI prefix and standard unit symbol, translate cautiously (or not at all)
-#: udisks/udisksclient.c:1656
+#: udisks/udisksclient.c:1774
 msgctxt "byte-size-pow10"
 msgid "TB"
 msgstr "TB"
@@ -1203,7 +1203,7 @@
 #. Translators: The first %s is the size in power-of-2 units, e.g. '64 KiB'
 #. * the second %s is the size as a number e.g. '65,536' (always > 1)
 #. 
-#: udisks/udisksclient.c:1699
+#: udisks/udisksclient.c:1817
 #, c-format
 msgctxt "byte-size-pow2"
 msgid "%s (%s bytes)"
@@ -1212,62 +1212,62 @@
 #. Translators: The first %s is the size in power-of-10 units, e.g. '100 kB'
 #. * the second %s is the size as a number e.g. '100,000' (always > 1)
 #. 
-#: udisks/udisksclient.c:1709
+#: udisks/udisksclient.c:1827
 #, c-format
 msgctxt "byte-size-pow10"
 msgid "%s (%s bytes)"
 msgstr "%s (%s 字节)"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1770
+#: udisks/udisksclient.c:1888
 msgctxt "media"
 msgid "CompactFlash"
 msgstr "CompactFlash"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1775
+#: udisks/udisksclient.c:1893
 msgctxt "media"
 msgid "MemoryStick"
 msgstr "记忆棒"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1780
+#: udisks/udisksclient.c:1898
 msgctxt "media"
 msgid "SmartMedia"
 msgstr "SmartMedia"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1785
+#: udisks/udisksclient.c:1903
 msgctxt "media"
 msgid "SecureDigital"
 msgstr "SD卡"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1790
+#: udisks/udisksclient.c:1908
 msgctxt "media"
 msgid "SD High Capacity"
 msgstr "SD 大容量"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1795
+#: udisks/udisksclient.c:1913
 msgctxt "media"
 msgid "Floppy"
 msgstr "软盘"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1800
+#: udisks/udisksclient.c:1918
 msgctxt "media"
 msgid "Zip"
 msgstr "Zip"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1805
+#: udisks/udisksclient.c:1923
 msgctxt "media"
 msgid "Jaz"
 msgstr "Jaz"
 
 #. Translators: This word is used to describe the media inserted into a device
-#: udisks/udisksclient.c:1810
+#: udisks/udisksclient.c:1928
 msgctxt "media"
 msgid "Flash"
 msgstr "闪存"
@@ -1275,7 +1275,7 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: udisks/udisksclient.c:1844
+#: udisks/udisksclient.c:1962
 msgctxt "disc-type"
 msgid "CD"
 msgstr "CD光盘"
@@ -1283,7 +1283,7 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: udisks/udisksclient.c:1853
+#: udisks/udisksclient.c:1971
 msgctxt "disc-type"
 msgid "DVD"
 msgstr "DVD 光盘"
@@ -1291,7 +1291,7 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: udisks/udisksclient.c:1862
+#: udisks/udisksclient.c:1980
 msgctxt "disc-type"
 msgid "Blu-Ray"
 msgstr "蓝光光盘"
@@ -1299,297 +1299,297 @@
 #. Translators: This word is used to describe the optical disc type, it may appear
 #. * in a slash-separated list e.g. 'CD/DVD/Blu-Ray'
 #. 
-#: udisks/udisksclient.c:1871
+#: udisks/udisksclient.c:1989
 msgctxt "disc-type"
 msgid "HDDVD"
 msgstr "HDDVD 光盘"
 
-#: udisks/udisksclient.c:1892
+#: udisks/udisksclient.c:2010
 msgctxt "fs-type"
 msgid "FAT (12-bit version)"
 msgstr "FAT (12位版本)"
 
-#: udisks/udisksclient.c:1892 udisks/udisksclient.c:1893
-#: udisks/udisksclient.c:1894 udisks/udisksclient.c:1895
-#: udisks/udisksclient.c:1896
+#: udisks/udisksclient.c:2010 udisks/udisksclient.c:2011
+#: udisks/udisksclient.c:2012 udisks/udisksclient.c:2013
+#: udisks/udisksclient.c:2014
 msgctxt "fs-type"
 msgid "FAT"
 msgstr "FAT"
 
-#: udisks/udisksclient.c:1893
+#: udisks/udisksclient.c:2011
 msgctxt "fs-type"
 msgid "FAT (16-bit version)"
 msgstr "FAT (16位版本)"
 
-#: udisks/udisksclient.c:1894
+#: udisks/udisksclient.c:2012
 msgctxt "fs-type"
 msgid "FAT (32-bit version)"
 msgstr "FAT (32位版本)"
 
-#: udisks/udisksclient.c:1895
+#: udisks/udisksclient.c:2013
 #, c-format
 msgctxt "fs-type"
 msgid "FAT (version %s)"
 msgstr "FAT (版本 %s)"
 
-#: udisks/udisksclient.c:1897
+#: udisks/udisksclient.c:2015
 #, c-format
 msgctxt "fs-type"
 msgid "NTFS (version %s)"
 msgstr "NTFS (版本 %s)"
 
-#: udisks/udisksclient.c:1897 udisks/udisksclient.c:1898
+#: udisks/udisksclient.c:2015 udisks/udisksclient.c:2016
 msgctxt "fs-type"
 msgid "NTFS"
 msgstr "NTFS"
 
-#: udisks/udisksclient.c:1899
+#: udisks/udisksclient.c:2017
 msgctxt "fs-type"
 msgid "HFS"
 msgstr "HFS"
 
-#: udisks/udisksclient.c:1900
+#: udisks/udisksclient.c:2018
 msgctxt "fs-type"
 msgid "HFS+"
 msgstr "HFS+"
 
-#: udisks/udisksclient.c:1902
+#: udisks/udisksclient.c:2020
 #, c-format
 msgctxt "fs-type"
 msgid "Ext2 (version %s)"
 msgstr "Ext2 (版本 %s)"
 
-#: udisks/udisksclient.c:1902 udisks/udisksclient.c:1903
+#: udisks/udisksclient.c:2020 udisks/udisksclient.c:2021
 msgctxt "fs-type"
 msgid "Ext2"
 msgstr "Ext2"
 
-#: udisks/udisksclient.c:1904
+#: udisks/udisksclient.c:2022
 #, c-format
 msgctxt "fs-type"
 msgid "Ext3 (version %s)"
 msgstr "Ext3 (版本 %s)"
 
-#: udisks/udisksclient.c:1904 udisks/udisksclient.c:1905
+#: udisks/udisksclient.c:2022 udisks/udisksclient.c:2023
 msgctxt "fs-type"
 msgid "Ext3"
 msgstr "Ext3"
 
-#: udisks/udisksclient.c:1906
+#: udisks/udisksclient.c:2024
 #, c-format
 msgctxt "fs-type"
 msgid "Ext4 (version %s)"
 msgstr "Ext4 (版本 %s)"
 
-#: udisks/udisksclient.c:1906 udisks/udisksclient.c:1907
+#: udisks/udisksclient.c:2024 udisks/udisksclient.c:2025
 msgctxt "fs-type"
 msgid "Ext4"
 msgstr "Ext4"
 
-#: udisks/udisksclient.c:1908
+#: udisks/udisksclient.c:2026
 #, c-format
 msgctxt "fs-type"
 msgid "Journal for Ext (version %s)"
 msgstr "Ext 日志(版本 %s)"
 
-#: udisks/udisksclient.c:1908 udisks/udisksclient.c:1909
+#: udisks/udisksclient.c:2026 udisks/udisksclient.c:2027
 msgctxt "fs-type"
 msgid "JDB"
 msgstr "JDB"
 
-#: udisks/udisksclient.c:1909
+#: udisks/udisksclient.c:2027
 msgctxt "fs-type"
 msgid "Journal for Ext"
 msgstr "Ext 日志"
 
-#: udisks/udisksclient.c:1910
+#: udisks/udisksclient.c:2028
 #, c-format
 msgctxt "fs-type"
 msgid "XFS (version %s)"
 msgstr "XFS (版本 %s)"
 
-#: udisks/udisksclient.c:1910 udisks/udisksclient.c:1911
+#: udisks/udisksclient.c:2028 udisks/udisksclient.c:2029
 msgctxt "fs-type"
 msgid "XFS"
 msgstr "XFS"
 
 #. TODO: No ID_FS_VERSION yet for btrfs...
-#: udisks/udisksclient.c:1913
+#: udisks/udisksclient.c:2031
 msgctxt "fs-type"
 msgid "Btrfs"
 msgstr "Btrfs"
 
-#: udisks/udisksclient.c:1914
+#: udisks/udisksclient.c:2032
 #, c-format
 msgctxt "fs-type"
 msgid "ISO 9660 (version %s)"
 msgstr "ISO 9660 (版本 %s)"
 
-#: udisks/udisksclient.c:1914 udisks/udisksclient.c:1915
+#: udisks/udisksclient.c:2032 udisks/udisksclient.c:2033
 msgctxt "fs-type"
 msgid "ISO9660"
 msgstr "ISO9660"
 
-#: udisks/udisksclient.c:1915
+#: udisks/udisksclient.c:2033
 msgctxt "fs-type"
 msgid "ISO 9660"
 msgstr "ISO 9660"
 
-#: udisks/udisksclient.c:1916
+#: udisks/udisksclient.c:2034
 #, c-format
 msgctxt "fs-type"
 msgid "UDF (version %s)"
 msgstr "UDF (版本 %s)"
 
-#: udisks/udisksclient.c:1916 udisks/udisksclient.c:1917
+#: udisks/udisksclient.c:2034 udisks/udisksclient.c:2035
 msgctxt "fs-type"
 msgid "UDF"
 msgstr "UDF"
 
-#: udisks/udisksclient.c:1918 udisks/udisksclient.c:1919
+#: udisks/udisksclient.c:2036 udisks/udisksclient.c:2037
 msgctxt "fs-type"
 msgid "exFAT"
 msgstr "exFAT"
 
-#: udisks/udisksclient.c:1919
+#: udisks/udisksclient.c:2037
 #, c-format
 msgctxt "fs-type"
 msgid "exFAT (version %s)"
 msgstr "exFAT (版本 %s)"
 
-#: udisks/udisksclient.c:1920
+#: udisks/udisksclient.c:2038
 #, c-format
 msgctxt "fs-type"
 msgid "Swap (version %s)"
 msgstr "Swap (版本 %s)"
 
-#: udisks/udisksclient.c:1920 udisks/udisksclient.c:1921
+#: udisks/udisksclient.c:2038 udisks/udisksclient.c:2039
 msgctxt "fs-type"
 msgid "Swap"
 msgstr "Swap"
 
-#: udisks/udisksclient.c:1922
+#: udisks/udisksclient.c:2040
 #, c-format
 msgctxt "fs-type"
 msgid "LVM2 Physical Volume (%s)"
 msgstr "LVM2 物理卷(%s)"
 
-#: udisks/udisksclient.c:1922 udisks/udisksclient.c:1923
+#: udisks/udisksclient.c:2040 udisks/udisksclient.c:2041
 msgctxt "fs-type"
 msgid "LVM2 PV"
 msgstr "LVM2 PV"
 
-#: udisks/udisksclient.c:1923
+#: udisks/udisksclient.c:2041
 msgctxt "fs-type"
 msgid "LVM2 Physical Volume"
 msgstr "LVM2 物理卷"
 
-#: udisks/udisksclient.c:1924
+#: udisks/udisksclient.c:2042
 #, c-format
 msgctxt "fs-type"
 msgid "Linux RAID Member (version %s)"
 msgstr "Linux RAID 成员(版本 %s)"
 
-#: udisks/udisksclient.c:1924 udisks/udisksclient.c:1925
+#: udisks/udisksclient.c:2042 udisks/udisksclient.c:2043
 msgctxt "fs-type"
 msgid "Linux RAID Member"
 msgstr "Linux RAID 成员"
 
-#: udisks/udisksclient.c:1926
+#: udisks/udisksclient.c:2044
 #, c-format
 msgctxt "fs-type"
 msgid "ZFS Device (ZPool version %s)"
 msgstr "ZFS 设备(ZPool 版本 %s)"
 
-#: udisks/udisksclient.c:1926
+#: udisks/udisksclient.c:2044
 #, c-format
 msgctxt "fs-type"
 msgid "ZFS (v%s)"
 msgstr "ZFS (v%s)"
 
-#: udisks/udisksclient.c:1927
+#: udisks/udisksclient.c:2045
 msgctxt "fs-type"
 msgid "ZFS Device"
 msgstr "ZFS 设备"
 
-#: udisks/udisksclient.c:1927
+#: udisks/udisksclient.c:2045
 msgctxt "fs-type"
 msgid "ZFS"
 msgstr "ZFS"
 
-#: udisks/udisksclient.c:1928
+#: udisks/udisksclient.c:2046
 #, c-format
 msgctxt "fs-type"
 msgid "Intel Rapid Storage Technology enterprise RAID Member (version %s)"
 msgstr "Intel 快速存储技术 RAID 成员（版本 %s）"
 
-#: udisks/udisksclient.c:1928
+#: udisks/udisksclient.c:2046
 #, c-format
 msgctxt "fs-type"
 msgid "Intel RSTe RAID Member (%s)"
 msgstr "Intel RSTe RAID 成员（%s）"
 
-#: udisks/udisksclient.c:1929
+#: udisks/udisksclient.c:2047
 msgctxt "fs-type"
 msgid "Intel Rapid Storage Technology enterprise RAID Member"
 msgstr "Intel快速存储技术 RAID 成员"
 
-#: udisks/udisksclient.c:1929
+#: udisks/udisksclient.c:2047
 msgctxt "fs-type"
 msgid "Intel RSTe RAID Member"
 msgstr "Intel RSTe RAID 成员"
 
-#: udisks/udisksclient.c:1931
+#: udisks/udisksclient.c:2049
 #, c-format
 msgctxt "fs-type"
 msgid "LUKS Encryption (version %s)"
 msgstr "LUKS 加密(版本 %s)"
 
-#: udisks/udisksclient.c:1931 udisks/udisksclient.c:1932
+#: udisks/udisksclient.c:2049 udisks/udisksclient.c:2050
 msgctxt "fs-type"
 msgid "LUKS"
 msgstr "LUKS"
 
-#: udisks/udisksclient.c:1932
+#: udisks/udisksclient.c:2050
 msgctxt "fs-type"
 msgid "LUKS Encryption"
 msgstr "LUKS 加密"
 
-#: udisks/udisksclient.c:1934
+#: udisks/udisksclient.c:2053
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS (version %s)"
 msgstr "VMFS (版本 %s)"
 
-#: udisks/udisksclient.c:1934
+#: udisks/udisksclient.c:2053
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS (v%s)"
 msgstr "VMFS (v%s)"
 
-#: udisks/udisksclient.c:1935
+#: udisks/udisksclient.c:2054
 msgctxt "fs-type"
 msgid "VMFS"
 msgstr "VMFS"
 
-#: udisks/udisksclient.c:1936
+#: udisks/udisksclient.c:2055
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS Volume Member (version %s)"
 msgstr "VMFS 卷成员(版本 %s)"
 
-#: udisks/udisksclient.c:1936
+#: udisks/udisksclient.c:2055
 #, c-format
 msgctxt "fs-type"
 msgid "VMFS Member (v%s)"
 msgstr "VMFS 成员(v%s)"
 
-#: udisks/udisksclient.c:1937
+#: udisks/udisksclient.c:2056
 msgctxt "fs-type"
 msgid "VMFS Volume Member"
 msgstr "VMFS 卷成员"
 
-#: udisks/udisksclient.c:1937
+#: udisks/udisksclient.c:2056
 msgctxt "fs-type"
 msgid "VMFS Member"
 msgstr "VMFS 成员"
@@ -1597,7 +1597,7 @@
 #. Translators: Shown for unknown filesystem types.
 #. * First %s is the raw filesystem type obtained from udev, second %s is version.
 #. 
-#: udisks/udisksclient.c:2013
+#: udisks/udisksclient.c:2132
 #, c-format
 msgctxt "fs-type"
 msgid "Unknown (%s %s)"
@@ -1606,7 +1606,7 @@
 #. Translators: Shown for unknown filesystem types.
 #. * First %s is the raw filesystem type obtained from udev.
 #. 
-#: udisks/udisksclient.c:2022
+#: udisks/udisksclient.c:2141
 #, c-format
 msgctxt "fs-type"
 msgid "Unknown (%s)"
@@ -1614,372 +1614,372 @@
 
 #. Translators: Shown for unknown filesystem types.
 #. 
-#: udisks/udisksclient.c:2028 udisks/udisksclient.c:2042
+#: udisks/udisksclient.c:2147 udisks/udisksclient.c:2161
 msgctxt "fs-type"
 msgid "Unknown"
 msgstr "未知"
 
 #. Translators: name of partition table format
-#: udisks/udisksclient.c:2059
+#: udisks/udisksclient.c:2178
 msgid "Master Boot Record"
 msgstr "主引导记录"
 
 #. Translators: name of partition table format
-#: udisks/udisksclient.c:2061
+#: udisks/udisksclient.c:2180
 msgid "GUID Partition Table"
 msgstr "GUID 分区表"
 
 #. Translators: name of partition table format
-#: udisks/udisksclient.c:2063
+#: udisks/udisksclient.c:2182
 msgid "Apple Partition Map"
 msgstr "Apple 分区映射"
 
 #. Translators: name of partition table format
-#: udisks/udisksclient.c:2106 udisks/udisksclient.c:2111
+#: udisks/udisksclient.c:2225 udisks/udisksclient.c:2230
 msgctxt "partition-subtype"
 msgid "Generic"
 msgstr "常规"
 
-#: udisks/udisksclient.c:2107 udisks/udisksclient.c:2112
+#: udisks/udisksclient.c:2226 udisks/udisksclient.c:2231
 msgctxt "partition-subtype"
 msgid "Linux"
 msgstr "Linux"
 
-#: udisks/udisksclient.c:2108 udisks/udisksclient.c:2113
-#: udisks/udisksclient.c:2118
+#: udisks/udisksclient.c:2227 udisks/udisksclient.c:2232
+#: udisks/udisksclient.c:2237
 msgctxt "partition-subtype"
 msgid "Windows"
 msgstr "Windows"
 
-#: udisks/udisksclient.c:2109 udisks/udisksclient.c:2115
+#: udisks/udisksclient.c:2228 udisks/udisksclient.c:2234
 msgctxt "partition-subtype"
 msgid "Other"
 msgstr "其他"
 
-#: udisks/udisksclient.c:2114 udisks/udisksclient.c:2117
+#: udisks/udisksclient.c:2233 udisks/udisksclient.c:2236
 msgctxt "partition-subtype"
 msgid "Mac OS X"
 msgstr "Mac OS X"
 
 #. see http://en.wikipedia.org/wiki/GUID_Partition_Table
 #. Not associated with any OS
-#: udisks/udisksclient.c:2206
+#: udisks/udisksclient.c:2325
 msgctxt "part-type"
 msgid "MBR Partition Scheme"
 msgstr "MBR 分区方案"
 
-#: udisks/udisksclient.c:2207
+#: udisks/udisksclient.c:2326
 msgctxt "part-type"
 msgid "EFI System"
 msgstr "EFI 系统"
 
-#: udisks/udisksclient.c:2208
+#: udisks/udisksclient.c:2327
 msgctxt "part-type"
 msgid "BIOS Boot"
 msgstr "BIOS 启动区"
 
 #. This is also defined in the Apple and Solaris section
-#: udisks/udisksclient.c:2210
+#: udisks/udisksclient.c:2329
 msgctxt "part-type"
 msgid "ZFS"
 msgstr "ZFS"
 
 #. Extended Boot Partition, see http://www.freedesktop.org/wiki/Specifications/BootLoaderSpec/
-#: udisks/udisksclient.c:2212
+#: udisks/udisksclient.c:2331
 msgctxt "part-type"
 msgid "Extended Boot Partition"
 msgstr "扩展引导分区"
 
 #. Discoverable Linux Partitions, see http://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec
-#: udisks/udisksclient.c:2214
+#: udisks/udisksclient.c:2333
 msgctxt "part-type"
 msgid "Linux Root Partition (x86)"
 msgstr "Linux 根分区 (x86)"
 
-#: udisks/udisksclient.c:2215
+#: udisks/udisksclient.c:2334
 msgctxt "part-type"
 msgid "Linux Root Partition (x86_64)"
 msgstr "Linux 根分区 (x86_64)"
 
-#: udisks/udisksclient.c:2216
+#: udisks/udisksclient.c:2335
 msgctxt "part-type"
 msgid "Linux Home Partition"
 msgstr "Linux 用户目录分区"
 
-#: udisks/udisksclient.c:2217
+#: udisks/udisksclient.c:2336
 msgctxt "part-type"
 msgid "Linux Server Data Partition"
 msgstr "Linux 服务器数据分区"
 
 #. Linux
-#: udisks/udisksclient.c:2219
+#: udisks/udisksclient.c:2338
 msgctxt "part-type"
 msgid "Linux Swap"
 msgstr "Linux Swap"
 
-#: udisks/udisksclient.c:2220
+#: udisks/udisksclient.c:2339
 msgctxt "part-type"
 msgid "Linux Filesystem"
 msgstr "Linux 文件系统"
 
-#: udisks/udisksclient.c:2221
+#: udisks/udisksclient.c:2340
 msgctxt "part-type"
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: udisks/udisksclient.c:2222 udisks/udisksclient.c:2308
+#: udisks/udisksclient.c:2341 udisks/udisksclient.c:2427
 msgctxt "part-type"
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
-#: udisks/udisksclient.c:2223
+#: udisks/udisksclient.c:2342
 msgctxt "part-type"
 msgid "Linux Reserved"
 msgstr "Linux 保留区"
 
 #. Microsoft
-#: udisks/udisksclient.c:2225
+#: udisks/udisksclient.c:2344
 msgctxt "part-type"
 msgid "Basic Data"
 msgstr "基础数据"
 
-#: udisks/udisksclient.c:2226
+#: udisks/udisksclient.c:2345
 msgctxt "part-type"
 msgid "Microsoft Reserved"
 msgstr "Microsoft 保留区"
 
-#: udisks/udisksclient.c:2227
+#: udisks/udisksclient.c:2346
 msgctxt "part-type"
 msgid "Microsoft LDM metadata"
 msgstr "Microsoft LDM 元数据"
 
-#: udisks/udisksclient.c:2228
+#: udisks/udisksclient.c:2347
 msgctxt "part-type"
 msgid "Microsoft LDM data"
 msgstr "Microsoft LDM 数据"
 
-#: udisks/udisksclient.c:2229
+#: udisks/udisksclient.c:2348
 msgctxt "part-type"
 msgid "Microsoft Windows Recovery Environment"
 msgstr "Microsoft Windows 还原环境"
 
 #. Apple OS X
-#: udisks/udisksclient.c:2231
+#: udisks/udisksclient.c:2350
 msgctxt "part-type"
 msgid "Apple HFS/HFS+"
 msgstr "Apple HFS/HFS+"
 
 #. see http://developer.apple.com/documentation/mac/devices/devices-126.html
 #. *     http://lists.apple.com/archives/Darwin-drivers/2003/May/msg00021.html
-#: udisks/udisksclient.c:2233 udisks/udisksclient.c:2287
+#: udisks/udisksclient.c:2352 udisks/udisksclient.c:2406
 msgctxt "part-type"
 msgid "Apple UFS"
 msgstr "Apple UFS"
 
-#: udisks/udisksclient.c:2234
+#: udisks/udisksclient.c:2353
 msgctxt "part-type"
 msgid "Apple ZFS"
 msgstr "Apple ZFS"
 
 #. same as ZFS
-#: udisks/udisksclient.c:2235
+#: udisks/udisksclient.c:2354
 msgctxt "part-type"
 msgid "Apple RAID"
 msgstr "Apple RAID"
 
-#: udisks/udisksclient.c:2236
+#: udisks/udisksclient.c:2355
 msgctxt "part-type"
 msgid "Apple RAID (offline)"
 msgstr "Apple RAID (离线)"
 
-#: udisks/udisksclient.c:2237
+#: udisks/udisksclient.c:2356
 msgctxt "part-type"
 msgid "Apple Boot"
 msgstr "Apple 启动区"
 
-#: udisks/udisksclient.c:2238
+#: udisks/udisksclient.c:2357
 msgctxt "part-type"
 msgid "Apple Label"
 msgstr "Apple 标识区"
 
-#: udisks/udisksclient.c:2239
+#: udisks/udisksclient.c:2358
 msgctxt "part-type"
 msgid "Apple TV Recovery"
 msgstr "Apple TV 恢复区"
 
-#: udisks/udisksclient.c:2240
+#: udisks/udisksclient.c:2359
 msgctxt "part-type"
 msgid "Apple Core Storage"
 msgstr "Apple 内核存储"
 
 #. HP-UX
-#: udisks/udisksclient.c:2242
+#: udisks/udisksclient.c:2361
 msgctxt "part-type"
 msgid "HP-UX Data"
 msgstr "HP-UX 数据区"
 
-#: udisks/udisksclient.c:2243
+#: udisks/udisksclient.c:2362
 msgctxt "part-type"
 msgid "HP-UX Service"
 msgstr "HP-UX 服务区"
 
 #. FreeBSD
-#: udisks/udisksclient.c:2245
+#: udisks/udisksclient.c:2364
 msgctxt "part-type"
 msgid "FreeBSD Boot"
 msgstr "FreeBSD 启动区"
 
-#: udisks/udisksclient.c:2246
+#: udisks/udisksclient.c:2365
 msgctxt "part-type"
 msgid "FreeBSD Data"
 msgstr "FreeBSD 数据区"
 
-#: udisks/udisksclient.c:2247
+#: udisks/udisksclient.c:2366
 msgctxt "part-type"
 msgid "FreeBSD Swap"
 msgstr "FreeBSD Swap"
 
-#: udisks/udisksclient.c:2248
+#: udisks/udisksclient.c:2367
 msgctxt "part-type"
 msgid "FreeBSD UFS"
 msgstr "FreeBSD UFS"
 
-#: udisks/udisksclient.c:2249
+#: udisks/udisksclient.c:2368
 msgctxt "part-type"
 msgid "FreeBSD Vinum"
 msgstr "FreeBSD Vinum"
 
-#: udisks/udisksclient.c:2250
+#: udisks/udisksclient.c:2369
 msgctxt "part-type"
 msgid "FreeBSD ZFS"
 msgstr "FreeBSD ZFS"
 
 #. Solaris
-#: udisks/udisksclient.c:2252
+#: udisks/udisksclient.c:2371
 msgctxt "part-type"
 msgid "Solaris Boot"
 msgstr "Solaris 启动区"
 
-#: udisks/udisksclient.c:2253
+#: udisks/udisksclient.c:2372
 msgctxt "part-type"
 msgid "Solaris Root"
 msgstr "Solaris Root"
 
-#: udisks/udisksclient.c:2254
+#: udisks/udisksclient.c:2373
 msgctxt "part-type"
 msgid "Solaris Swap"
 msgstr "Solaris Swap"
 
-#: udisks/udisksclient.c:2255
+#: udisks/udisksclient.c:2374
 msgctxt "part-type"
 msgid "Solaris Backup"
 msgstr "Solaris Backup"
 
-#: udisks/udisksclient.c:2256
+#: udisks/udisksclient.c:2375
 msgctxt "part-type"
 msgid "Solaris /usr"
 msgstr "Solaris /usr"
 
 #. same as ZFS
-#: udisks/udisksclient.c:2257
+#: udisks/udisksclient.c:2376
 msgctxt "part-type"
 msgid "Solaris /var"
 msgstr "Solaris /var"
 
-#: udisks/udisksclient.c:2258
+#: udisks/udisksclient.c:2377
 msgctxt "part-type"
 msgid "Solaris /home"
 msgstr "Solaris /home"
 
-#: udisks/udisksclient.c:2259
+#: udisks/udisksclient.c:2378
 msgctxt "part-type"
 msgid "Solaris Alternate Sector"
 msgstr "Solaris 替换扇区"
 
-#: udisks/udisksclient.c:2260
+#: udisks/udisksclient.c:2379
 msgctxt "part-type"
 msgid "Solaris Reserved"
 msgstr "Solaris 保留区"
 
-#: udisks/udisksclient.c:2261
+#: udisks/udisksclient.c:2380
 msgctxt "part-type"
 msgid "Solaris Reserved (2)"
 msgstr "Solaris 保留区(2)"
 
-#: udisks/udisksclient.c:2262
+#: udisks/udisksclient.c:2381
 msgctxt "part-type"
 msgid "Solaris Reserved (3)"
 msgstr "Solaris 保留区(3)"
 
-#: udisks/udisksclient.c:2263
+#: udisks/udisksclient.c:2382
 msgctxt "part-type"
 msgid "Solaris Reserved (4)"
 msgstr "Solaris 保留区(4)"
 
-#: udisks/udisksclient.c:2264
+#: udisks/udisksclient.c:2383
 msgctxt "part-type"
 msgid "Solaris Reserved (5)"
 msgstr "Solaris 保留区(5)"
 
 #. NetBSD
-#: udisks/udisksclient.c:2266
+#: udisks/udisksclient.c:2385
 msgctxt "part-type"
 msgid "NetBSD Swap"
 msgstr "NetBSD Swap"
 
-#: udisks/udisksclient.c:2267
+#: udisks/udisksclient.c:2386
 msgctxt "part-type"
 msgid "NetBSD FFS"
 msgstr "NetBSD FFS"
 
-#: udisks/udisksclient.c:2268
+#: udisks/udisksclient.c:2387
 msgctxt "part-type"
 msgid "NetBSD LFS"
 msgstr "NetBSD LFS"
 
-#: udisks/udisksclient.c:2269
+#: udisks/udisksclient.c:2388
 msgctxt "part-type"
 msgid "NetBSD RAID"
 msgstr "NetBSD RAID"
 
-#: udisks/udisksclient.c:2270
+#: udisks/udisksclient.c:2389
 msgctxt "part-type"
 msgid "NetBSD Concatenated"
 msgstr "NetBSD 联结区"
 
-#: udisks/udisksclient.c:2271
+#: udisks/udisksclient.c:2390
 msgctxt "part-type"
 msgid "NetBSD Encrypted"
 msgstr "NetBSD 加密区"
 
 #. VMWare, see http://blogs.vmware.com/vsphere/2011/08/vsphere-50-storage-features-part-7-gpt.html
-#: udisks/udisksclient.c:2273
+#: udisks/udisksclient.c:2392
 msgctxt "part-type"
 msgid "VMWare VMFS"
 msgstr "VMWare VMFS"
 
-#: udisks/udisksclient.c:2274
+#: udisks/udisksclient.c:2393
 msgctxt "part-type"
 msgid "VMWare vmkcore"
 msgstr "VMWare vmkcore"
 
 #. ChromeOS, see http://www.chromium.org/chromium-os/chromiumos-design-docs/disk-format
-#: udisks/udisksclient.c:2276
+#: udisks/udisksclient.c:2395
 msgctxt "part-type"
 msgid "ChromeOS Firmware"
 msgstr "ChromeOS 固件"
 
-#: udisks/udisksclient.c:2277
+#: udisks/udisksclient.c:2396
 msgctxt "part-type"
 msgid "ChromeOS Kernel"
 msgstr "ChromeOS 内核"
 
-#: udisks/udisksclient.c:2278
+#: udisks/udisksclient.c:2397
 msgctxt "part-type"
 msgid "ChromeOS Root Filesystem"
 msgstr "ChromeOS 根文件系统"
 
-#: udisks/udisksclient.c:2279
+#: udisks/udisksclient.c:2398
 msgctxt "part-type"
 msgid "ChromeOS Reserved"
 msgstr "ChromeOS 保留区"
@@ -1987,394 +1987,394 @@
 #. Intel Partition Types
 #. FFS = Fast Flash Standby, aka Intel Rapid start
 #. http://downloadmirror.intel.com/22647/eng/Intel%20Rapid%20Start%20Technology%20Deployment%20Guide%20v1.0.pdf
-#: udisks/udisksclient.c:2283
+#: udisks/udisksclient.c:2402
 msgctxt "part-type"
 msgid "Intel FFS Reserved"
 msgstr "Intel FFS 保留"
 
-#: udisks/udisksclient.c:2288
+#: udisks/udisksclient.c:2407
 msgctxt "part-type"
 msgid "Apple HFS/HFS"
 msgstr "Apple HFS/HFS"
 
-#: udisks/udisksclient.c:2289
+#: udisks/udisksclient.c:2408
 msgctxt "part-type"
 msgid "Apple Partition Map"
 msgstr "Apple 分区映射"
 
-#: udisks/udisksclient.c:2290
+#: udisks/udisksclient.c:2409
 msgctxt "part-type"
 msgid "Unused"
 msgstr "未使用"
 
-#: udisks/udisksclient.c:2291
+#: udisks/udisksclient.c:2410
 msgctxt "part-type"
 msgid "Empty"
 msgstr "空"
 
-#: udisks/udisksclient.c:2292
+#: udisks/udisksclient.c:2411
 msgctxt "part-type"
 msgid "Driver"
 msgstr "Driver"
 
-#: udisks/udisksclient.c:2293
+#: udisks/udisksclient.c:2412
 msgctxt "part-type"
 msgid "Driver 4.3"
 msgstr "Driver 4.3"
 
-#: udisks/udisksclient.c:2294
+#: udisks/udisksclient.c:2413
 msgctxt "part-type"
 msgid "ProDOS file system"
 msgstr "ProDOS 文件系统"
 
-#: udisks/udisksclient.c:2295
+#: udisks/udisksclient.c:2414
 msgctxt "part-type"
 msgid "FAT 12"
 msgstr "FAT 12"
 
-#: udisks/udisksclient.c:2296
+#: udisks/udisksclient.c:2415
 msgctxt "part-type"
 msgid "FAT 16"
 msgstr "FAT 16"
 
-#: udisks/udisksclient.c:2297
+#: udisks/udisksclient.c:2416
 msgctxt "part-type"
 msgid "FAT 32"
 msgstr "FAT 32"
 
-#: udisks/udisksclient.c:2298
+#: udisks/udisksclient.c:2417
 msgctxt "part-type"
 msgid "FAT 16 (Windows)"
 msgstr "FAT 16 (Windows)"
 
-#: udisks/udisksclient.c:2299
+#: udisks/udisksclient.c:2418
 msgctxt "part-type"
 msgid "FAT 32 (Windows)"
 msgstr "FAT 32 (Windows)"
 
 #. see http://www.win.tue.nl/~aeb/partitions/partition_types-1.html
-#: udisks/udisksclient.c:2302
+#: udisks/udisksclient.c:2421
 msgctxt "part-type"
 msgid "Extended"
 msgstr "扩展"
 
-#: udisks/udisksclient.c:2303
+#: udisks/udisksclient.c:2422
 msgctxt "part-type"
 msgid "EFI GPT"
 msgstr "EFI GPT"
 
-#: udisks/udisksclient.c:2304
+#: udisks/udisksclient.c:2423
 msgctxt "part-type"
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#: udisks/udisksclient.c:2305
+#: udisks/udisksclient.c:2424
 msgctxt "part-type"
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: udisks/udisksclient.c:2306
+#: udisks/udisksclient.c:2425
 msgctxt "part-type"
 msgid "Linux"
 msgstr "Linux"
 
-#: udisks/udisksclient.c:2307
+#: udisks/udisksclient.c:2426
 msgctxt "part-type"
 msgid "Linux Extended"
 msgstr "Linux 扩展"
 
-#: udisks/udisksclient.c:2309
+#: udisks/udisksclient.c:2428
 msgctxt "part-type"
 msgid "Linux RAID auto"
 msgstr "Linux RAID 自动"
 
-#: udisks/udisksclient.c:2310
+#: udisks/udisksclient.c:2429
 msgctxt "part-type"
 msgid "FAT12"
 msgstr "FAT12"
 
-#: udisks/udisksclient.c:2311
+#: udisks/udisksclient.c:2430
 msgctxt "part-type"
 msgid "FAT16 <32M"
 msgstr "FAT16 <32M"
 
-#: udisks/udisksclient.c:2312
+#: udisks/udisksclient.c:2431
 msgctxt "part-type"
 msgid "FAT16"
 msgstr "FAT16"
 
-#: udisks/udisksclient.c:2313
+#: udisks/udisksclient.c:2432
 msgctxt "part-type"
 msgid "NTFS/exFAT/HPFS"
 msgstr ""
 
-#: udisks/udisksclient.c:2314
+#: udisks/udisksclient.c:2433
 msgctxt "part-type"
 msgid "W95 FAT32"
 msgstr "W95 FAT32"
 
-#: udisks/udisksclient.c:2315
+#: udisks/udisksclient.c:2434
 msgctxt "part-type"
 msgid "W95 FAT32 (LBA)"
 msgstr "W95 FAT32 (LBA)"
 
-#: udisks/udisksclient.c:2316
+#: udisks/udisksclient.c:2435
 msgctxt "part-type"
 msgid "W95 FAT16 (LBA)"
 msgstr "W95 FAT16 (LBA)"
 
-#: udisks/udisksclient.c:2317
+#: udisks/udisksclient.c:2436
 msgctxt "part-type"
 msgid "W95 Ext d (LBA)"
 msgstr "W95 Ext d (LBA)"
 
-#: udisks/udisksclient.c:2318
+#: udisks/udisksclient.c:2437
 msgctxt "part-type"
 msgid "Hidden FAT12"
 msgstr "隐藏 FAT12"
 
-#: udisks/udisksclient.c:2319
+#: udisks/udisksclient.c:2438
 msgctxt "part-type"
 msgid "Hidden FAT16 <32M"
 msgstr "隐藏 FAT16 <32M"
 
-#: udisks/udisksclient.c:2320
+#: udisks/udisksclient.c:2439
 msgctxt "part-type"
 msgid "Hidden FAT16"
 msgstr "隐藏 FAT16"
 
-#: udisks/udisksclient.c:2321
+#: udisks/udisksclient.c:2440
 msgctxt "part-type"
 msgid "Hidden HPFS/NTFS"
 msgstr "隐藏 HPFS/NTFS"
 
-#: udisks/udisksclient.c:2322
+#: udisks/udisksclient.c:2441
 msgctxt "part-type"
 msgid "Hidden W95 FAT32"
 msgstr "隐藏 W95 FAT32"
 
-#: udisks/udisksclient.c:2323
+#: udisks/udisksclient.c:2442
 msgctxt "part-type"
 msgid "Hidden W95 FAT32 (LBA)"
 msgstr "隐藏 W95 FAT32 (LBA)"
 
-#: udisks/udisksclient.c:2324
+#: udisks/udisksclient.c:2443
 msgctxt "part-type"
 msgid "Hidden W95 FAT16 (LBA)"
 msgstr "隐藏 W95 FAT16 (LBA)"
 
-#: udisks/udisksclient.c:2325
+#: udisks/udisksclient.c:2444
 msgctxt "part-type"
 msgid "OPUS"
 msgstr "OPUS"
 
-#: udisks/udisksclient.c:2326
+#: udisks/udisksclient.c:2445
 msgctxt "part-type"
 msgid "Compaq diagnostics"
 msgstr "Compaq 诊断"
 
-#: udisks/udisksclient.c:2327
+#: udisks/udisksclient.c:2446
 msgctxt "part-type"
 msgid "PartitionMagic"
 msgstr "PartitionMagic"
 
-#: udisks/udisksclient.c:2328
+#: udisks/udisksclient.c:2447
 msgctxt "part-type"
 msgid "Minix"
 msgstr "Minix"
 
 #. cf. http://en.wikipedia.org/wiki/MINIX_file_system
-#: udisks/udisksclient.c:2329 udisks/udisksclient.c:2330
+#: udisks/udisksclient.c:2448 udisks/udisksclient.c:2449
 msgctxt "part-type"
 msgid "Hibernation"
 msgstr "休眠"
 
-#: udisks/udisksclient.c:2331
+#: udisks/udisksclient.c:2450
 msgctxt "part-type"
 msgid "FreeBSD"
 msgstr "FreeBSD"
 
-#: udisks/udisksclient.c:2332
+#: udisks/udisksclient.c:2451
 msgctxt "part-type"
 msgid "OpenBSD"
 msgstr "OpenBSD"
 
-#: udisks/udisksclient.c:2333 udisks/udisksclient.c:2334
+#: udisks/udisksclient.c:2452 udisks/udisksclient.c:2453
 msgctxt "part-type"
 msgid "Mac OS X"
 msgstr "Mac OS X"
 
-#: udisks/udisksclient.c:2335
+#: udisks/udisksclient.c:2454
 msgctxt "part-type"
 msgid "Solaris boot"
 msgstr "Solaris 启动区"
 
-#: udisks/udisksclient.c:2336
+#: udisks/udisksclient.c:2455
 msgctxt "part-type"
 msgid "Solaris"
 msgstr "Solaris"
 
-#: udisks/udisksclient.c:2337
+#: udisks/udisksclient.c:2456
 msgctxt "part-type"
 msgid "BeOS BFS"
 msgstr "BeOS BFS"
 
-#: udisks/udisksclient.c:2338
+#: udisks/udisksclient.c:2457
 msgctxt "part-type"
 msgid "SkyOS SkyFS"
 msgstr "SkyOS SkyFS"
 
-#: udisks/udisksclient.c:2481
+#: udisks/udisksclient.c:2600
 msgctxt "job"
 msgid "SMART self-test"
 msgstr "SMART 自检"
 
-#: udisks/udisksclient.c:2482
+#: udisks/udisksclient.c:2601
 msgctxt "job"
 msgid "Ejecting Medium"
 msgstr "弹出媒体"
 
-#: udisks/udisksclient.c:2483
+#: udisks/udisksclient.c:2602
 msgctxt "job"
 msgid "Unlocking Device"
 msgstr "解锁设备"
 
-#: udisks/udisksclient.c:2484
+#: udisks/udisksclient.c:2603
 msgctxt "job"
 msgid "Locking Device"
 msgstr "锁定设备"
 
-#: udisks/udisksclient.c:2485
+#: udisks/udisksclient.c:2604
 msgctxt "job"
 msgid "Modifying Encrypted Device"
 msgstr "修改加密设备"
 
-#: udisks/udisksclient.c:2487
+#: udisks/udisksclient.c:2606
 msgctxt "job"
 msgid "Starting Swap Device"
 msgstr "启动交换设备"
 
-#: udisks/udisksclient.c:2488
+#: udisks/udisksclient.c:2607
 msgctxt "job"
 msgid "Stopping Swap Device"
 msgstr "停止交换设备"
 
-#: udisks/udisksclient.c:2489
+#: udisks/udisksclient.c:2608
 msgctxt "job"
 msgid "Modifying Swap Device"
 msgstr ""
 
-#: udisks/udisksclient.c:2490
+#: udisks/udisksclient.c:2609
 msgctxt "job"
 msgid "Checking Filesystem"
 msgstr "正在检查文件系统"
 
-#: udisks/udisksclient.c:2491
+#: udisks/udisksclient.c:2610
 msgctxt "job"
 msgid "Mounting Filesystem"
 msgstr "挂载文件系统"
 
-#: udisks/udisksclient.c:2492
+#: udisks/udisksclient.c:2611
 msgctxt "job"
 msgid "Unmounting Filesystem"
 msgstr "卸载文件系统"
 
-#: udisks/udisksclient.c:2493
+#: udisks/udisksclient.c:2612
 msgctxt "job"
 msgid "Modifying Filesystem"
 msgstr "修改文件系统"
 
-#: udisks/udisksclient.c:2494
+#: udisks/udisksclient.c:2613
 msgctxt "job"
 msgid "Repairing Filesystem"
 msgstr ""
 
-#: udisks/udisksclient.c:2495
+#: udisks/udisksclient.c:2614
 msgctxt "job"
 msgid "Resizing Filesystem"
 msgstr "正在重新定义文件系统大小"
 
-#: udisks/udisksclient.c:2496
+#: udisks/udisksclient.c:2615
 msgctxt "job"
 msgid "Erasing Device"
 msgstr "擦除设备"
 
-#: udisks/udisksclient.c:2497
+#: udisks/udisksclient.c:2616
 msgctxt "job"
 msgid "Creating Filesystem"
 msgstr "创建文件系统"
 
-#: udisks/udisksclient.c:2498
+#: udisks/udisksclient.c:2617
 msgctxt "job"
 msgid "Setting Up Loop Device"
 msgstr "设置回环设备"
 
-#: udisks/udisksclient.c:2499
+#: udisks/udisksclient.c:2618
 msgctxt "job"
 msgid "Modifying Partition"
 msgstr "修改分区"
 
-#: udisks/udisksclient.c:2500
+#: udisks/udisksclient.c:2619
 msgctxt "job"
 msgid "Deleting Partition"
 msgstr "删除分区"
 
-#: udisks/udisksclient.c:2501
+#: udisks/udisksclient.c:2620
 msgctxt "job"
 msgid "Creating Partition"
 msgstr "创建分区"
 
-#: udisks/udisksclient.c:2502
+#: udisks/udisksclient.c:2621
 msgctxt "job"
 msgid "Cleaning Up"
 msgstr "清理"
 
-#: udisks/udisksclient.c:2503
+#: udisks/udisksclient.c:2622
 msgctxt "job"
 msgid "ATA Secure Erase"
 msgstr "ATA 安全擦除"
 
-#: udisks/udisksclient.c:2504
+#: udisks/udisksclient.c:2623
 msgctxt "job"
 msgid "ATA Enhanced Secure Erase"
 msgstr "ATA 增强安全擦除"
 
-#: udisks/udisksclient.c:2505
+#: udisks/udisksclient.c:2624
 msgctxt "job"
 msgid "Stopping RAID Array"
 msgstr "停止 RAID 阵列"
 
-#: udisks/udisksclient.c:2506
+#: udisks/udisksclient.c:2625
 msgctxt "job"
 msgid "Starting RAID Array"
 msgstr "启动 RAID 阵列"
 
-#: udisks/udisksclient.c:2507
+#: udisks/udisksclient.c:2626
 msgctxt "job"
 msgid "Marking Device as Faulty"
 msgstr "将设备标志为有错误"
 
-#: udisks/udisksclient.c:2508
+#: udisks/udisksclient.c:2627
 msgctxt "job"
 msgid "Removing Device from Array"
 msgstr "从阵列中移除设备"
 
-#: udisks/udisksclient.c:2509
+#: udisks/udisksclient.c:2628
 msgctxt "job"
 msgid "Adding Device to Array"
 msgstr "将设备添加到阵列"
 
-#: udisks/udisksclient.c:2510
+#: udisks/udisksclient.c:2629
 msgctxt "job"
 msgid "Setting Write-Intent Bitmap"
 msgstr "设置 Write-Intent 位图"
 
-#: udisks/udisksclient.c:2511
+#: udisks/udisksclient.c:2630
 msgctxt "job"
 msgid "Creating RAID Array"
 msgstr "创建 RAID 阵列"
 
-#: udisks/udisksclient.c:2518
+#: udisks/udisksclient.c:2637
 #, c-format
 msgctxt "unknown-job"
 msgid "Unknown (%s)"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ufw.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ufw.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ufw.po	2020-01-23 16:51:53.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ufw.po	2020-07-08 13:53:53.000000000 +0000
@@ -14,443 +14,443 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:51+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:35+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: src/ufw:74
 msgid ": Need at least python 2.6)\n"
 msgstr ": 至少需要 python 2.6)\n"
 
-#: src/ufw:139 src/frontend.py:625 src/frontend.py:927
+#: src/ufw:139 src/frontend.py:632 src/frontend.py:934
 msgid "Aborted"
 msgstr "已中止"
 
-#: src/backend.py:70
+#: src/backend.py:77
 msgid "Couldn't determine iptables version"
 msgstr "无法确定 iptables 版本"
 
-#: src/backend.py:149
+#: src/backend.py:156
 msgid "problem running sysctl"
 msgstr "运行 sysctl 时出现问题"
 
-#: src/backend.py:188
+#: src/backend.py:195
 msgid "Checks disabled"
 msgstr "检查被禁用"
 
-#: src/backend.py:194
+#: src/backend.py:201
 msgid "ERROR: this script should not be SUID"
 msgstr "错误： 这个脚本不能被 SUID"
 
-#: src/backend.py:197
+#: src/backend.py:204
 msgid "ERROR: this script should not be SGID"
 msgstr "错误： 这个脚本不能被 SGID"
 
-#: src/backend.py:202
+#: src/backend.py:209
 msgid "You need to be root to run this script"
 msgstr "只有 root 用户才能运行此脚本"
 
-#: src/backend.py:212
+#: src/backend.py:219
 #, python-format
 msgid "'%s' does not exist"
 msgstr "“%s” 不存在"
 
-#: src/backend.py:235 src/backend_iptables.py:1416
+#: src/backend.py:242 src/backend_iptables.py:1427
 #, python-format
 msgid "Couldn't stat '%s'"
 msgstr "无法在 “%s” 上运行 stat 命令"
 
-#: src/backend.py:253
+#: src/backend.py:260
 #, python-format
 msgid "uid is %(uid)s but '%(path)s' is owned by %(st_uid)s"
 msgstr "uid 是 %(uid)s 但是 “%(path)s” 属于 %(st_uid)s"
 
-#: src/backend.py:260
+#: src/backend.py:267
 #, python-format
 msgid "%s is world writable!"
 msgstr "%s 全局可写！"
 
-#: src/backend.py:265
+#: src/backend.py:272
 #, python-format
 msgid "%s is group writable!"
 msgstr "%s 全组可写！"
 
-#: src/backend.py:281
+#: src/backend.py:288
 #, python-format
 msgid "'%(f)s' file '%(name)s' does not exist"
 msgstr "“%(f)s” 文件 “%(name)s” 不存在"
 
-#: src/backend.py:292 src/backend_iptables.py:690
+#: src/backend.py:299 src/backend_iptables.py:701
 #, python-format
 msgid "Couldn't open '%s' for reading"
 msgstr "无法打开 “%s” 进行读操作"
 
-#: src/backend.py:306
+#: src/backend.py:313
 #, python-format
 msgid "Missing policy for '%s'"
 msgstr "针对 “%s” 的策略不存在"
 
-#: src/backend.py:310
+#: src/backend.py:317
 #, python-format
 msgid "Invalid policy '%(policy)s' for '%(chain)s'"
 msgstr "针对 “%(chain)s” 的策略 “%(policy)s” 无效"
 
-#: src/backend.py:317
+#: src/backend.py:324
 msgid "Invalid option"
 msgstr "无效选项"
 
-#: src/backend.py:323 src/backend_iptables.py:790
+#: src/backend.py:330 src/backend_iptables.py:801
 #, python-format
 msgid "'%s' is not writable"
 msgstr "“%s” 不可写"
 
-#: src/backend.py:370 src/backend_iptables.py:94
+#: src/backend.py:377 src/backend_iptables.py:105
 #, python-format
 msgid "Unsupported policy '%s'"
 msgstr "策略 “%s” 未被支持"
 
-#: src/backend.py:373
+#: src/backend.py:380
 #, python-format
 msgid "Default application policy changed to '%s'"
 msgstr "默认应用程序策略已被改变为 “%s”"
 
-#: src/backend.py:440
+#: src/backend.py:447
 msgid "No rules found for application profile"
 msgstr "没有发现程序配置的规则"
 
-#: src/backend.py:496
+#: src/backend.py:503
 #, python-format
 msgid "Rules updated for profile '%s'"
 msgstr "配置 “%s” 的规则已经升级"
 
-#: src/backend.py:502
+#: src/backend.py:509
 msgid "Couldn't update application rules"
 msgstr "不能更新应用程序规则"
 
-#: src/backend.py:524
+#: src/backend.py:531
 #, python-format
 msgid "Found multiple matches for '%s'. Please use exact profile name"
 msgstr "“%s” 找到了多个匹配。请使用更精确的配置名称。"
 
-#: src/backend.py:527
+#: src/backend.py:534
 #, python-format
 msgid "Could not find a profile matching '%s'"
 msgstr "无法为 “%s” 找到相匹配的配置"
 
-#: src/backend.py:594
+#: src/backend.py:601
 msgid "Logging: "
 msgstr "日志： "
 
-#: src/backend.py:598
+#: src/backend.py:605
 msgid "unknown"
 msgstr "未知"
 
-#: src/backend.py:610 src/backend_iptables.py:1284
+#: src/backend.py:617 src/backend_iptables.py:1295
 #, python-format
 msgid "Invalid log level '%s'"
 msgstr "无效的日志级别 “%s”"
 
-#: src/backend.py:625
+#: src/backend.py:632
 msgid "Logging disabled"
 msgstr "日志被禁用"
 
-#: src/backend.py:627
+#: src/backend.py:634
 msgid "Logging enabled"
 msgstr "日志被启用"
 
-#: src/common.py:196
+#: src/common.py:204
 #, python-format
 msgid "Bad port '%s'"
 msgstr "错误的端口 “%s”"
 
-#: src/common.py:252
+#: src/common.py:260
 #, python-format
 msgid "Unsupported protocol '%s'"
 msgstr "未被支持的协议 “%s”"
 
-#: src/common.py:280
+#: src/common.py:288
 msgid "Bad source address"
 msgstr "错误的源地址"
 
-#: src/common.py:290
+#: src/common.py:298
 msgid "Bad destination address"
 msgstr "错误的目标地址"
 
-#: src/common.py:309
+#: src/common.py:317
 msgid "Bad interface type"
 msgstr "错误的接口类型"
 
-#: src/common.py:314
+#: src/common.py:322
 msgid "Bad interface name: reserved character: '!'"
 msgstr "错误的接口名称：保留字符：“！”"
 
-#: src/common.py:318
+#: src/common.py:326
 msgid "Bad interface name: can't use interface aliases"
 msgstr "错误的接口名称：无法使用接口别名"
 
-#: src/common.py:322
+#: src/common.py:330
 msgid "Bad interface name: can't use '.' or '..'"
 msgstr ""
 
-#: src/common.py:326
+#: src/common.py:334
 msgid "Bad interface name: interface name is empty"
 msgstr ""
 
-#: src/common.py:330
+#: src/common.py:338
 msgid "Bad interface name: interface name too long"
 msgstr ""
 
-#: src/common.py:335
+#: src/common.py:343
 msgid "Bad interface name"
 msgstr "错误的接口名称"
 
-#: src/common.py:349
+#: src/common.py:357
 #, python-format
 msgid "Insert position '%s' is not a valid position"
 msgstr "插入位置 “%s” 不是一个有效的位置"
 
-#: src/common.py:359
+#: src/common.py:367
 #, python-format
 msgid "Invalid log type '%s'"
 msgstr "无效的日志类型 “%s”"
 
-#: src/common.py:367
+#: src/common.py:375
 #, python-format
 msgid "Unsupported direction '%s'"
 msgstr "不支持的方向 “%s”"
 
-#: src/common.py:386
+#: src/common.py:394
 msgid "Could not normalize source address"
 msgstr "不能标准化源地址"
 
-#: src/common.py:397
+#: src/common.py:405
 msgid "Could not normalize destination address"
 msgstr "不能标准化目标地址"
 
-#: src/common.py:463
+#: src/common.py:471
 msgid "Found exact match"
 msgstr "找到完全匹配项"
 
-#: src/common.py:468
+#: src/common.py:476
 msgid "Found exact match, excepting comment"
 msgstr "找到完全匹配项，除了注释"
 
-#: src/common.py:472
+#: src/common.py:480
 #, python-format
 msgid ""
 "Found non-action/non-logtype/comment match (%(xa)s/%(ya)s/'%(xc)s' "
 "%(xl)s/%(yl)s/'%(yc)s')"
 msgstr "找到非行为/非日志类型/注释匹配 (%(xa)s/%(ya)s/'%(xc)s' %(xl)s/%(yl)s/'%(yc)s')"
 
-#: src/common.py:630
+#: src/common.py:643
 #, python-format
 msgid "Improper rule syntax ('%s' specified with app rule)"
 msgstr "不正确的规则语法 ( “%s” 是由程序规则指定的)"
 
-#: src/common.py:637
+#: src/common.py:650
 #, python-format
 msgid "Invalid IPv6 address with protocol '%s'"
 msgstr "使用 “%s” 协议的无效 IPv6 地址"
 
-#: src/common.py:643 src/util.py:84
+#: src/common.py:656 src/util.py:92
 #, python-format
 msgid "Invalid port with protocol '%s'"
 msgstr "使用 “%s” 协议的无效端口"
 
-#: src/parser.py:110
+#: src/parser.py:117
 #, python-format
 msgid "Cannot insert rule at position '%s'"
 msgstr "无法在 “%s” 处插入规则"
 
-#: src/parser.py:148
+#: src/parser.py:155
 msgid "Invalid interface clause"
 msgstr "无效接口条款"
 
-#: src/parser.py:174
+#: src/parser.py:181
 msgid "Option 'log' not allowed here"
 msgstr "此处不允许使用 “log” 选项"
 
-#: src/parser.py:178
+#: src/parser.py:185
 msgid "Option 'log-all' not allowed here"
 msgstr "此处不允许使用 “log-all” 选项"
 
-#: src/parser.py:185
+#: src/parser.py:192
 msgid "Option 'comment' missing required argument"
 msgstr "“注释” 选项丢失要求的参数"
 
-#: src/parser.py:191
+#: src/parser.py:198
 msgid "Comment may not contain \"'\""
 msgstr ""
 
-#: src/parser.py:233 src/parser.py:359
+#: src/parser.py:240 src/parser.py:366
 msgid "Port ranges must be numeric"
 msgstr "端口范围必须为数字"
 
-#: src/parser.py:242 src/util.py:87
+#: src/parser.py:249 src/util.py:95
 msgid "Bad port"
 msgstr "错误的端口"
 
-#: src/parser.py:245
+#: src/parser.py:252
 msgid "Wrong number of arguments"
 msgstr "参数数目错误"
 
-#: src/parser.py:249
+#: src/parser.py:256
 msgid "Need 'to' or 'from' clause"
 msgstr "需要 “to”' 或者 “from” 子句"
 
-#: src/parser.py:264
+#: src/parser.py:271
 msgid "Improper rule syntax"
 msgstr "规则的语法不正确"
 
-#: src/parser.py:271
+#: src/parser.py:278
 #, python-format
 msgid "Invalid token '%s'"
 msgstr "无效的标记 “%s”"
 
-#: src/parser.py:283
+#: src/parser.py:290
 msgid "Invalid 'proto' clause"
 msgstr "无效的 “proto” 子句"
 
-#: src/parser.py:298
+#: src/parser.py:305
 #, python-format
 msgid "Invalid '%s' clause"
 msgstr "无效的 “%s” 子句"
 
-#: src/parser.py:320
+#: src/parser.py:327
 msgid "Invalid 'from' clause"
 msgstr "无效的 “from” 子句"
 
-#: src/parser.py:342
+#: src/parser.py:349
 msgid "Invalid 'to' clause"
 msgstr "无效的 “to” 子句"
 
-#: src/parser.py:347
+#: src/parser.py:354
 #, python-format
 msgid "Need 'from' or 'to' with '%s'"
 msgstr "需要 “from” 或者 “to” 使用 “%s”"
 
-#: src/parser.py:374
+#: src/parser.py:381
 msgid "Invalid 'port' clause"
 msgstr "无效的 “port” 子句"
 
-#: src/parser.py:383
+#: src/parser.py:390
 msgid "Mixed IP versions for 'from' and 'to'"
 msgstr "“from” 和 “to” 的 IP 版本不同"
 
-#: src/parser.py:400 src/parser.py:410 src/parser.py:419
+#: src/parser.py:407 src/parser.py:417 src/parser.py:426
 msgid "Could not find protocol"
 msgstr "无法找到协议"
 
-#: src/parser.py:426
+#: src/parser.py:433
 msgid "Protocol mismatch (from/to)"
 msgstr "from 和 to 的协议不匹配"
 
-#: src/parser.py:433
+#: src/parser.py:440
 #, python-format
 msgid "Protocol mismatch with specified protocol %s"
 msgstr "协议与指定的协议 %s 不匹配"
 
-#: src/parser.py:552
+#: src/parser.py:559
 msgid "'route delete NUM' unsupported. Use 'delete NUM' instead."
 msgstr "“删除路由 NUM” 未被支持。请使用 “删除 NUM” 代替。"
 
-#: src/parser.py:585
+#: src/parser.py:592
 msgid "Invalid interface clause for route rule"
 msgstr "针对路由规则的无效接口条款"
 
-#: src/parser.py:884
+#: src/parser.py:891
 #, python-format
 msgid "Command '%s' already exists"
 msgstr "命令 “%s” 已存在"
 
-#: src/util.py:446
+#: src/util.py:437
 msgid "Couldn't find pid (is /proc mounted?)"
 msgstr "无法找到 pid (/proc 是否已经加载？)"
 
-#: src/util.py:450
+#: src/util.py:441
 #, python-format
 msgid "Couldn't find parent pid for '%s'"
 msgstr "无法找到 “%s” 的父 pid"
 
-#: src/util.py:460
+#: src/util.py:451
 #, python-format
 msgid "Couldn't find '%s'"
 msgstr "无法找到 “%s”"
 
-#: src/util.py:466
+#: src/util.py:457
 #, python-format
 msgid "Could not find executable for '%s'"
 msgstr "无法找到 “%s” 的可执行文件"
 
-#: src/util.py:1026
+#: src/util.py:1043
 #, python-format
 msgid "Could not get statistics for '%s'"
 msgstr "无法获得 “%s” 的数据"
 
-#: src/backend_iptables.py:78
+#: src/backend_iptables.py:89
 msgid "New profiles:"
 msgstr "新建配置文件:"
 
-#: src/backend_iptables.py:99
+#: src/backend_iptables.py:110
 #, python-format
 msgid "Unsupported policy for direction '%s'"
 msgstr "“%s” 方向不支持的策略"
 
-#: src/backend_iptables.py:159
+#: src/backend_iptables.py:170
 #, python-format
 msgid "Default %(direction)s policy changed to '%(policy)s'\n"
 msgstr "默认的 %(direction)s 策略更改为 “%(policy)s”\n"
 
-#: src/backend_iptables.py:161
+#: src/backend_iptables.py:172
 msgid "(be sure to update your rules accordingly)"
 msgstr "（请相应地更新你的防火墙规则）"
 
-#: src/backend_iptables.py:168
+#: src/backend_iptables.py:179
 msgid "Checking raw iptables\n"
 msgstr "检查原始的 iptables\n"
 
-#: src/backend_iptables.py:169
+#: src/backend_iptables.py:180
 msgid "Checking raw ip6tables\n"
 msgstr "检查原始的 ip6tables\n"
 
-#: src/backend_iptables.py:262
+#: src/backend_iptables.py:273
 msgid "Checking iptables\n"
 msgstr "检查 iptables\n"
 
-#: src/backend_iptables.py:264
+#: src/backend_iptables.py:275
 msgid "Checking ip6tables\n"
 msgstr "检查 ip6tables\n"
 
-#: src/backend_iptables.py:267 src/backend_iptables.py:568
+#: src/backend_iptables.py:278 src/backend_iptables.py:579
 msgid "problem running"
 msgstr "运行时出现问题"
 
-#: src/backend_iptables.py:273
+#: src/backend_iptables.py:284
 msgid "Status: inactive"
 msgstr "状态：不活动"
 
-#: src/backend_iptables.py:443
+#: src/backend_iptables.py:454
 msgid "To"
 msgstr "至"
 
-#: src/backend_iptables.py:444
+#: src/backend_iptables.py:455
 msgid "From"
 msgstr "来自"
 
-#: src/backend_iptables.py:445
+#: src/backend_iptables.py:456
 msgid "Action"
 msgstr "动作"
 
-#: src/backend_iptables.py:461 src/backend_iptables.py:465
+#: src/backend_iptables.py:472 src/backend_iptables.py:476
 msgid "\n"
 msgstr "\n"
 
-#: src/backend_iptables.py:473
+#: src/backend_iptables.py:484
 #, python-format
 msgid "Default: %(in)s (incoming), %(out)s (outgoing), %(routed)s (routed)"
 msgstr "默认：%(in)s (incoming), %(out)s (outgoing), %(routed)s (routed)"
 
-#: src/backend_iptables.py:481
+#: src/backend_iptables.py:492
 #, python-format
 msgid ""
 "Status: active\n"
@@ -463,16 +463,16 @@
 "%(pol)s\n"
 "%(app)s%(status)s"
 
-#: src/backend_iptables.py:485
+#: src/backend_iptables.py:496
 #, python-format
 msgid "Status: active%s"
 msgstr "状态： 激活%s"
 
-#: src/backend_iptables.py:490 src/backend_iptables.py:508
+#: src/backend_iptables.py:501 src/backend_iptables.py:519
 msgid "running ufw-init"
 msgstr "运行 ufw-init"
 
-#: src/backend_iptables.py:502 src/backend_iptables.py:520
+#: src/backend_iptables.py:513 src/backend_iptables.py:531
 #, python-format
 msgid ""
 "problem running ufw-init\n"
@@ -481,148 +481,148 @@
 "运行 ufw-init 时出现问题\n"
 "%s"
 
-#: src/backend_iptables.py:529
+#: src/backend_iptables.py:540
 msgid "Could not set LOGLEVEL"
 msgstr "无法设置 LOGLEVEL"
 
-#: src/backend_iptables.py:535
+#: src/backend_iptables.py:546
 msgid "Could not load logging rules"
 msgstr "无法加载日志规则"
 
-#: src/backend_iptables.py:709
+#: src/backend_iptables.py:720
 #, python-format
 msgid "Skipping malformed tuple (bad length): %s"
 msgstr "忽略错误的元组(长度错误)： %s"
 
-#: src/backend_iptables.py:720
+#: src/backend_iptables.py:731
 #, python-format
 msgid "Skipping malformed tuple (iface): %s"
 msgstr "忽略错误的元组(iface)：%s"
 
-#: src/backend_iptables.py:768
+#: src/backend_iptables.py:779
 #, python-format
 msgid "Skipping malformed tuple: %s"
 msgstr "忽略错误的元组： %s"
 
-#: src/backend_iptables.py:966
+#: src/backend_iptables.py:977
 msgid "Adding IPv6 rule failed: IPv6 not enabled"
 msgstr "添加 IPv6 规则失败： IPv6 未被启用"
 
-#: src/backend_iptables.py:970
+#: src/backend_iptables.py:981
 #, python-format
 msgid "Skipping unsupported IPv6 '%s' rule"
 msgstr "忽略未被支持的 IPv6 “%s” 规则"
 
-#: src/backend_iptables.py:974
+#: src/backend_iptables.py:985
 #, python-format
 msgid "Skipping unsupported IPv4 '%s' rule"
 msgstr "忽略未被支持的 IPv4 “%s” 规则"
 
-#: src/backend_iptables.py:977
+#: src/backend_iptables.py:988
 msgid "Must specify 'tcp' or 'udp' with multiple ports"
 msgstr "必须在复合的端口中指定 “tcp” 或者 “udp”"
 
-#: src/backend_iptables.py:989
+#: src/backend_iptables.py:1000
 msgid "Skipping IPv6 application rule. Need at least iptables 1.4"
 msgstr "忽略 IPv6 应用规则。需要 iptables 1.4 以上"
 
-#: src/backend_iptables.py:994
+#: src/backend_iptables.py:1005
 #, python-format
 msgid "Invalid position '%d'"
 msgstr "无效的位置 “%d”"
 
-#: src/backend_iptables.py:998
+#: src/backend_iptables.py:1009
 msgid "Cannot specify insert and delete"
 msgstr "无法指定插入和删除"
 
-#: src/backend_iptables.py:1001
+#: src/backend_iptables.py:1012
 #, python-format
 msgid "Cannot insert rule at position '%d'"
 msgstr "无法在 “%d” 处插入规则"
 
-#: src/backend_iptables.py:1062
+#: src/backend_iptables.py:1073
 msgid "Skipping inserting existing rule"
 msgstr "跳过插入已存在的规则"
 
-#: src/backend_iptables.py:1073 src/frontend.py:415
+#: src/backend_iptables.py:1084 src/frontend.py:422
 msgid "Could not delete non-existent rule"
 msgstr "无法删除不存在的规则"
 
-#: src/backend_iptables.py:1078
+#: src/backend_iptables.py:1089
 msgid "Skipping adding existing rule"
 msgstr "跳过添加已经存在的规则"
 
-#: src/backend_iptables.py:1094
+#: src/backend_iptables.py:1105
 msgid "Couldn't update rules file"
 msgstr "无法更新防火墙规则文件"
 
-#: src/backend_iptables.py:1099
+#: src/backend_iptables.py:1110
 msgid "Rules updated"
 msgstr "防火墙规则已更新"
 
-#: src/backend_iptables.py:1101
+#: src/backend_iptables.py:1112
 msgid "Rules updated (v6)"
 msgstr "规则已更新(v6)"
 
-#: src/backend_iptables.py:1109
+#: src/backend_iptables.py:1120
 msgid "Rule inserted"
 msgstr "规则已插入"
 
-#: src/backend_iptables.py:1111
+#: src/backend_iptables.py:1122
 msgid "Rule updated"
 msgstr "规则已更新"
 
-#: src/backend_iptables.py:1121
+#: src/backend_iptables.py:1132
 msgid " (skipped reloading firewall)"
 msgstr " (跳过重新加载的防火墙)"
 
-#: src/backend_iptables.py:1124
+#: src/backend_iptables.py:1135
 msgid "Rule deleted"
 msgstr "规则已删除"
 
-#: src/backend_iptables.py:1127
+#: src/backend_iptables.py:1138
 msgid "Rule added"
 msgstr "规则已添加"
 
-#: src/backend_iptables.py:1144 src/backend_iptables.py:1235
+#: src/backend_iptables.py:1155 src/backend_iptables.py:1246
 msgid "Could not update running firewall"
 msgstr "无法更新正在运行的防火墙"
 
-#: src/backend_iptables.py:1199
+#: src/backend_iptables.py:1210
 #, python-format
 msgid "Could not perform '%s'"
 msgstr "无法进行 “%s”"
 
-#: src/backend_iptables.py:1226
+#: src/backend_iptables.py:1237
 msgid "Couldn't update rules file for logging"
 msgstr "无法为日志记录更新规则文件"
 
-#: src/backend_iptables.py:1382
+#: src/backend_iptables.py:1393
 #, python-format
 msgid "Could not find '%s'. Aborting"
 msgstr "找不到 “%s”。正在中止"
 
-#: src/backend_iptables.py:1394
+#: src/backend_iptables.py:1405
 #, python-format
 msgid "'%s' already exists. Aborting"
 msgstr "“%s” 已存在。正在中止"
 
-#: src/backend_iptables.py:1400
+#: src/backend_iptables.py:1411
 #, python-format
 msgid "Backing up '%(old)s' to '%(new)s'\n"
 msgstr "备份 “%(old)s” 至 “%(new)s”\n"
 
-#: src/backend_iptables.py:1421
+#: src/backend_iptables.py:1432
 #, python-format
 msgid "WARN: '%s' is world writable"
 msgstr "警告：“%s” 可被任意用户修改"
 
-#: src/backend_iptables.py:1423
+#: src/backend_iptables.py:1434
 #, python-format
 msgid "WARN: '%s' is world readable"
 msgstr "警告：“%s” 可被任意用户读取"
 
-#: src/frontend.py:93
+#: src/frontend.py:100
 #, python-format
 msgid ""
 "\n"
@@ -687,35 +687,35 @@
 " %(appupdate)-31s 更新 %(profile)s\n"
 " %(appdefault)-31s 设置默认程序策略\n"
 
-#: src/frontend.py:176
+#: src/frontend.py:183
 msgid "n"
 msgstr "n"
 
-#: src/frontend.py:177
+#: src/frontend.py:184
 msgid "y"
 msgstr "y"
 
-#: src/frontend.py:178
+#: src/frontend.py:185
 msgid "yes"
 msgstr "是"
 
-#: src/frontend.py:223
+#: src/frontend.py:230
 msgid "Firewall is active and enabled on system startup"
 msgstr "在系统启动时启用和激活防火墙"
 
-#: src/frontend.py:230
+#: src/frontend.py:237
 msgid "Firewall stopped and disabled on system startup"
 msgstr "防火墙在系统启动时自动禁用"
 
-#: src/frontend.py:282
+#: src/frontend.py:289
 msgid "Could not get listening status"
 msgstr "无法取得监听状态"
 
-#: src/frontend.py:351
+#: src/frontend.py:358
 msgid "Added user rules (see 'ufw status' for running firewall):"
 msgstr "已添加的用户规则(查看正在运行的防火墙的 “ufw 状态”)："
 
-#: src/frontend.py:354
+#: src/frontend.py:361
 msgid ""
 "\n"
 "(None)"
@@ -723,29 +723,29 @@
 "\n"
 "(无)"
 
-#: src/frontend.py:410 src/frontend.py:521 src/frontend.py:534
+#: src/frontend.py:417 src/frontend.py:528 src/frontend.py:541
 #, python-format
 msgid "Invalid IP version '%s'"
 msgstr "错误的 IP 协议版本 “%s”"
 
-#: src/frontend.py:441
+#: src/frontend.py:448
 msgid "Invalid position '"
 msgstr "无效位置 '"
 
-#: src/frontend.py:531
+#: src/frontend.py:538
 msgid "IPv6 support not enabled"
 msgstr "IPv6 支持未被启用"
 
-#: src/frontend.py:542
+#: src/frontend.py:549
 msgid "Rule changed after normalization"
 msgstr "标准化后规则被改变"
 
-#: src/frontend.py:566
+#: src/frontend.py:573
 #, python-format
 msgid "Could not back out rule '%s'"
 msgstr "无法备份规则 “%s”"
 
-#: src/frontend.py:570
+#: src/frontend.py:577
 msgid ""
 "\n"
 "Error applying application rules."
@@ -753,25 +753,25 @@
 "\n"
 "应用规则时出错。"
 
-#: src/frontend.py:572
+#: src/frontend.py:579
 msgid " Some rules could not be unapplied."
 msgstr " 一些规则不能被撤销。"
 
-#: src/frontend.py:574
+#: src/frontend.py:581
 msgid " Attempted rules successfully unapplied."
 msgstr " 成功撤销了对尝试规则的应用。"
 
-#: src/frontend.py:585
+#: src/frontend.py:592
 #, python-format
 msgid "Could not find rule '%s'"
 msgstr "无法找到规则 “%s”"
 
-#: src/frontend.py:590 src/frontend.py:595
+#: src/frontend.py:597 src/frontend.py:602
 #, python-format
 msgid "Could not find rule '%d'"
 msgstr "无法找到规则 “%d”"
 
-#: src/frontend.py:611
+#: src/frontend.py:618
 #, python-format
 msgid ""
 "Deleting:\n"
@@ -782,51 +782,51 @@
 "%(rule)s\n"
 "要继续吗 (%(yes)s|%(no)s)？ "
 
-#: src/frontend.py:643
+#: src/frontend.py:650
 msgid "Unsupported default policy"
 msgstr "不支持的默认策略"
 
-#: src/frontend.py:672 src/frontend.py:817
+#: src/frontend.py:679 src/frontend.py:824
 msgid "Firewall reloaded"
 msgstr "已经重新载入防火墙"
 
-#: src/frontend.py:674
+#: src/frontend.py:681
 msgid "Firewall not enabled (skipping reload)"
 msgstr "未启用防火墙(跳过重新载入)"
 
-#: src/frontend.py:691 src/frontend.py:705 src/frontend.py:742
+#: src/frontend.py:698 src/frontend.py:712 src/frontend.py:749
 msgid "Invalid profile name"
 msgstr "非法的配置文件名"
 
-#: src/frontend.py:710 src/frontend.py:892
+#: src/frontend.py:717 src/frontend.py:899
 #, python-format
 msgid "Unsupported action '%s'"
 msgstr "不支持的动作'%s'"
 
-#: src/frontend.py:729
+#: src/frontend.py:736
 msgid "Available applications:"
 msgstr "可用应用程序："
 
-#: src/frontend.py:750
+#: src/frontend.py:757
 #, python-format
 msgid "Could not find profile '%s'"
 msgstr "无法找到配置文件 '%s'"
 
-#: src/frontend.py:755
+#: src/frontend.py:762
 msgid "Invalid profile"
 msgstr "非法配置文件"
 
-#: src/frontend.py:758
+#: src/frontend.py:765
 #, python-format
 msgid "Profile: %s\n"
 msgstr "配置: %s\n"
 
-#: src/frontend.py:759
+#: src/frontend.py:766
 #, python-format
 msgid "Title: %s\n"
 msgstr "标题：%s\n"
 
-#: src/frontend.py:762
+#: src/frontend.py:769
 #, python-format
 msgid ""
 "Description: %s\n"
@@ -835,113 +835,113 @@
 "描述： %s\n"
 "\n"
 
-#: src/frontend.py:768
+#: src/frontend.py:775
 msgid "Ports:"
 msgstr "端口："
 
-#: src/frontend.py:770
+#: src/frontend.py:777
 msgid "Port:"
 msgstr "端口:"
 
-#: src/frontend.py:819
+#: src/frontend.py:826
 msgid "Skipped reloading firewall"
 msgstr "跳过重新加载防火墙"
 
-#: src/frontend.py:829
+#: src/frontend.py:836
 msgid "Cannot specify 'all' with '--add-new'"
 msgstr "不能指定 “all” 使用 “--add-new”"
 
-#: src/frontend.py:844
+#: src/frontend.py:851
 #, python-format
 msgid "Unknown policy '%s'"
 msgstr "未知的策略 “%s”"
 
-#: src/frontend.py:901
+#: src/frontend.py:908
 #, python-format
 msgid ""
 "Command may disrupt existing ssh connections. Proceed with operation "
 "(%(yes)s|%(no)s)? "
 msgstr "此命令可能会中断目前的 ssh 连接。要继续吗 (%(yes)s|%(no)s)？ "
 
-#: src/frontend.py:914
+#: src/frontend.py:921
 #, python-format
 msgid ""
 "Resetting all rules to installed defaults. Proceed with operation "
 "(%(yes)s|%(no)s)? "
 msgstr "所有规则将被重设为安装时的默认值。要继续吗 (%(yes)s|%(no)s)？ "
 
-#: src/frontend.py:918
+#: src/frontend.py:925
 #, python-format
 msgid ""
 "Resetting all rules to installed defaults. This may disrupt existing ssh "
 "connections. Proceed with operation (%(yes)s|%(no)s)? "
 msgstr "所有规则将被重设为安装时的默认值。这可能会中断目前的 ssh 连接。要继续吗 (%(yes)s|%(no)s)？ "
 
-#: src/applications.py:37
+#: src/applications.py:44
 msgid "Profiles directory does not exist"
 msgstr "配置目录不存在"
 
-#: src/applications.py:69
+#: src/applications.py:76
 #, python-format
 msgid "Skipping '%s': couldn't stat"
 msgstr "跳过 “%s”：不能进行 stat 操作"
 
-#: src/applications.py:74
+#: src/applications.py:81
 #, python-format
 msgid "Skipping '%s': too big"
 msgstr "跳过 “%s”：太大"
 
-#: src/applications.py:79
+#: src/applications.py:86
 #, python-format
 msgid "Skipping '%s': too many files read already"
 msgstr "跳过 “%s”：已经打开太多文件"
 
-#: src/applications.py:93
+#: src/applications.py:100
 #, python-format
 msgid "Skipping '%s': couldn't process"
 msgstr "跳过 “%s”：不能执行"
 
-#: src/applications.py:100
+#: src/applications.py:107
 #, python-format
 msgid "Skipping '%s': name too long"
 msgstr "跳过 “%s”：名称太长"
 
-#: src/applications.py:105
+#: src/applications.py:112
 #, python-format
 msgid "Skipping '%s': invalid name"
 msgstr "跳过 “%s”：非法名称"
 
-#: src/applications.py:111
+#: src/applications.py:118
 #, python-format
 msgid "Skipping '%s': also in /etc/services"
 msgstr "跳过 “%s”：在 /etc/services 中也存在"
 
-#: src/applications.py:120
+#: src/applications.py:127
 #, python-format
 msgid "Skipping '%s': field too long"
 msgstr "跳过 “%s”：域太长"
 
-#: src/applications.py:125
+#: src/applications.py:132
 #, python-format
 msgid "Skipping '%(value)s': value too long for '%(field)s'"
 msgstr "跳过 “%(value)s”： 对于 “%(field)s”来说，值过长"
 
-#: src/applications.py:135
+#: src/applications.py:142
 #, python-format
 msgid "Duplicate profile '%s', using last found"
 msgstr "重复的配置 “%s”，使用上次发现的配置"
 
-#: src/applications.py:178
+#: src/applications.py:185
 #, python-format
 msgid "Profile '%(fn)s' missing required field '%(f)s'"
 msgstr "配置 “%(fn)s” 缺少必需的字段 “%(f)s”"
 
-#: src/applications.py:183
+#: src/applications.py:190
 #, python-format
 msgid "Profile '%(fn)s' has empty required field '%(f)s'"
 msgstr "配置 “%(fn)s” 的必需字段 “%(f)s” 为空"
 
-#: src/applications.py:198
+#: src/applications.py:205
 #, python-format
 msgid "Invalid ports in profile '%s'"
 msgstr "配置 “%s” 中含有无效的端口"
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/unattended-upgrades.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/unattended-upgrades.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/unattended-upgrades.po	2020-01-23 16:52:01.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/unattended-upgrades.po	2020-07-08 13:54:02.000000000 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: unattended-upgrades\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2019-11-25 17:32+0000\n"
+"POT-Creation-Date: 2020-02-17 18:04+0000\n"
 "PO-Revision-Date: 2009-09-23 14:19+0000\n"
 "Last-Translator: Wylmer Wang <Unknown>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
@@ -15,53 +15,53 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:29+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:16+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
-#: ../unattended-upgrade:196 ../unattended-upgrade:784
-#: ../unattended-upgrade:1608
+#: ../unattended-upgrade:361 ../unattended-upgrade:915
+#: ../unattended-upgrade:1711
 #, c-format
 msgid "package %s upgradable but fails to be marked for upgrade (%s)"
 msgstr ""
 
-#: ../unattended-upgrade:300
+#: ../unattended-upgrade:461
 #, c-format
 msgid "Progress: %s %% (%s)"
 msgstr ""
 
-#: ../unattended-upgrade:548
+#: ../unattended-upgrade:685
 msgid "System is on metered connection, stopping"
 msgstr ""
 
-#: ../unattended-upgrade:634 ../unattended-upgrade:651
+#: ../unattended-upgrade:771 ../unattended-upgrade:788
 #, c-format
 msgid "Unable to parse %s."
 msgstr ""
 
-#: ../unattended-upgrade:735 ../unattended-upgrade:827
-#: ../unattended-upgrade:2346 ../unattended-upgrade-shutdown:113
+#: ../unattended-upgrade:874 ../unattended-upgrade:957
+#: ../unattended-upgrade:2421 ../unattended-upgrade-shutdown:113
 msgid "All upgrades installed"
 msgstr "安装了所有的更新"
 
-#: ../unattended-upgrade:737 ../unattended-upgrade:819
+#: ../unattended-upgrade:876 ../unattended-upgrade:949
 msgid "Installing the upgrades failed!"
 msgstr "安装更新失败！"
 
-#: ../unattended-upgrade:738 ../unattended-upgrade:820
-#: ../unattended-upgrade:1112 ../unattended-upgrade:1114
-#: ../unattended-upgrade:2049 ../unattended-upgrade:2051
+#: ../unattended-upgrade:877 ../unattended-upgrade:950
+#: ../unattended-upgrade:1240 ../unattended-upgrade:1242
+#: ../unattended-upgrade:2126 ../unattended-upgrade:2128
 #, c-format
 msgid "error message: %s"
 msgstr ""
 
-#: ../unattended-upgrade:739 ../unattended-upgrade:821
+#: ../unattended-upgrade:878 ../unattended-upgrade:951
 #, c-format
 msgid "dpkg returned a error! See %s for details"
 msgstr ""
 
-#: ../unattended-upgrade:1111 ../unattended-upgrade:1113
-#: ../unattended-upgrade:2048 ../unattended-upgrade:2050
-#: ../unattended-upgrade:2053
+#: ../unattended-upgrade:1239 ../unattended-upgrade:1241
+#: ../unattended-upgrade:2125 ../unattended-upgrade:2127
+#: ../unattended-upgrade:2130
 msgid "Apt returned an error, exiting"
 msgstr ""
 
@@ -71,15 +71,15 @@
 "to install the mailx package."
 msgstr ""
 
-#: ../unattended-upgrade:1322
+#: ../unattended-upgrade:1450
 msgid "[reboot required]"
 msgstr ""
 
-#: ../unattended-upgrade:1324
+#: ../unattended-upgrade:1452
 msgid "[package on hold]"
 msgstr ""
 
-#: ../unattended-upgrade:1328
+#: ../unattended-upgrade:1456
 msgid ""
 "{hold_flag}{reboot_flag} unattended-upgrades result for {machine}: {result}"
 msgstr ""
@@ -101,104 +101,104 @@
 "警告：需要重新启动以完成此次升级。\n"
 "\n"
 
-#: ../unattended-upgrade:1340
+#: ../unattended-upgrade:1468
 msgid "Packages that were upgraded:\n"
 msgstr ""
 
-#: ../unattended-upgrade:1342
+#: ../unattended-upgrade:1470
 msgid "Packages that attempted to upgrade:\n"
 msgstr ""
 
-#: ../unattended-upgrade:1346
+#: ../unattended-upgrade:1474
 msgid "Packages with upgradable origin but kept back:\n"
 msgstr "可更新但保留了原始版本的软件包:\n"
 
-#: ../unattended-upgrade:1353
+#: ../unattended-upgrade:1481
 msgid "Packages that were auto-removed:\n"
 msgstr ""
 
-#: ../unattended-upgrade:1357
+#: ../unattended-upgrade:1485
 msgid "Packages that were kept from being auto-removed:\n"
 msgstr ""
 
-#: ../unattended-upgrade:1361
+#: ../unattended-upgrade:1489
 msgid "Package installation log:"
 msgstr "软件包安装日志："
 
-#: ../unattended-upgrade:1364
+#: ../unattended-upgrade:1492
 msgid "Unattended-upgrades log:\n"
 msgstr "无人照管更新日志：\n"
 
-#: ../unattended-upgrade:1392
+#: ../unattended-upgrade:1518
 #, c-format
 msgid "Writing dpkg log to %s"
 msgstr ""
 
-#: ../unattended-upgrade:1544
+#: ../unattended-upgrade:1657
 #, c-format
 msgid "Found %s, but not rebooting because %s is logged in."
 msgid_plural "Found %s, but not rebooting because %s are logged in."
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../unattended-upgrade:1707
+#: ../unattended-upgrade:1803
 #, c-format
 msgid ""
 "Keeping the following auto-removable package(s) because they include %s "
 "which is set to be kept unmodified: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1714
+#: ../unattended-upgrade:1810
 #, c-format
 msgid ""
 "Keeping auto-removable %s package(s) because it would also remove the "
 "following packages which should be kept in this step: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1720
+#: ../unattended-upgrade:1816
 #, c-format
 msgid ""
 "Keeping %s auto-removable package(s) because it would also remove the "
 "following packages which should be kept in this step: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1730
+#: ../unattended-upgrade:1826
 #, c-format
 msgid ""
 "Keeping the following auto-removable package(s) because they include %s "
 "which package is related to the running kernel: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1799
+#: ../unattended-upgrade:1891
 #, c-format
 msgid "Packages that were successfully auto-removed: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1801
+#: ../unattended-upgrade:1893
 #, c-format
 msgid "Packages that are kept back: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1805
+#: ../unattended-upgrade:1897
 msgid "Auto-removing the packages failed!"
 msgstr ""
 
-#: ../unattended-upgrade:1806
+#: ../unattended-upgrade:1898
 #, c-format
 msgid "Error message: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1807
+#: ../unattended-upgrade:1899
 #, c-format
 msgid "dpkg returned an error! See %s for details"
 msgstr ""
 
-#: ../unattended-upgrade:1859
+#: ../unattended-upgrade:1951
 #, c-format
 msgid "Could not open %s for saving list of packages kept back."
 msgstr ""
 
-#: ../unattended-upgrade:1991 ../unattended-upgrade:1992
+#: ../unattended-upgrade:2084 ../unattended-upgrade:2085
 msgid "Not running on the development release."
 msgstr ""
 
@@ -212,113 +212,113 @@
 msgid "Initial whitelisted packages: %s"
 msgstr ""
 
-#: ../unattended-upgrade:2007
+#: ../unattended-upgrade:2088
 msgid "Starting unattended upgrades script"
 msgstr "启动无人照管的更新脚本"
 
-#: ../unattended-upgrade:2010
+#: ../unattended-upgrade:157
 #, c-format
 msgid "Allowed origins are: %s"
 msgstr "允许的源：%s"
 
-#: ../unattended-upgrade:2016
+#: ../unattended-upgrade:2094
 msgid "Lock could not be acquired (another package manager running?)"
 msgstr "无法获取锁(另一个软件包管理器在运行？)"
 
-#: ../unattended-upgrade:2018
+#: ../unattended-upgrade:2096
 msgid "Cache lock can not be acquired, exiting"
 msgstr "无法获取缓存锁，退出"
 
-#: ../unattended-upgrade:2029 ../unattended-upgrade:2030
+#: ../unattended-upgrade:2107 ../unattended-upgrade:2108
 msgid "Unclean dpkg state detected, trying to correct"
 msgstr ""
 
-#: ../unattended-upgrade:2041
+#: ../unattended-upgrade:2119
 #, c-format
 msgid ""
 "dpkg --configure -a output:\n"
 "%s"
 msgstr ""
 
-#: ../unattended-upgrade:2056 ../unattended-upgrade:2057
-#: ../unattended-upgrade:2059 ../unattended-upgrade:2295
-#: ../unattended-upgrade:2296 ../unattended-upgrade:2298
+#: ../unattended-upgrade:2133 ../unattended-upgrade:2134
+#: ../unattended-upgrade:2136 ../unattended-upgrade:2369
+#: ../unattended-upgrade:2370 ../unattended-upgrade:2372
 msgid "Cache has broken packages, exiting"
 msgstr "缓存存在不完整的软件包，退出"
 
-#: ../unattended-upgrade:2107
+#: ../unattended-upgrade:2183
 #, c-format
 msgid "GetArchives() failed: %s"
 msgstr ""
 
-#: ../unattended-upgrade:1920 ../unattended-upgrade:2127
-#: ../unattended-upgrade:2128
+#: ../unattended-upgrade:2012 ../unattended-upgrade:2204
+#: ../unattended-upgrade:2205
 #, c-format
 msgid "An error occurred: %s"
 msgstr ""
 
-#: ../unattended-upgrade:2130 ../unattended-upgrade:2132
-#: ../unattended-upgrade:2135
+#: ../unattended-upgrade:2207 ../unattended-upgrade:2209
+#: ../unattended-upgrade:2212
 #, c-format
 msgid "The URI %s failed to download, aborting"
 msgstr ""
 
-#: ../unattended-upgrade:2138 ../unattended-upgrade:2143
+#: ../unattended-upgrade:2215 ../unattended-upgrade:2220
 #, c-format
 msgid "Download finished, but file %s not there?!?"
 msgstr ""
 
-#: ../unattended-upgrade:2163 ../unattended-upgrade:2167
+#: ../unattended-upgrade:2240 ../unattended-upgrade:2244
 #, c-format
 msgid "Package %s has conffile prompt and needs to be upgraded manually"
 msgstr ""
 
-#: ../unattended-upgrade:2198
+#: ../unattended-upgrade:2272
 #, c-format
 msgid "package %s not upgraded"
 msgstr ""
 
-#: ../unattended-upgrade:2228
+#: ../unattended-upgrade:2302
 #, c-format
 msgid "Removing unused kernel packages: %s"
 msgstr ""
 
-#: ../unattended-upgrade:2249 ../unattended-upgrade:2253
+#: ../unattended-upgrade:2322 ../unattended-upgrade:2328
 msgid ""
 "No packages found that can be upgraded unattended and no pending auto-"
 "removals"
 msgstr ""
 
-#: ../unattended-upgrade:2276
+#: ../unattended-upgrade:2352
 #, c-format
 msgid "Packages that will be upgraded: %s"
 msgstr ""
 
-#: ../unattended-upgrade:2386
+#: ../unattended-upgrade:2461
 msgid "print debug messages"
 msgstr "打印调试信息"
 
-#: ../unattended-upgrade:2389
+#: ../unattended-upgrade:2464
 msgid "make apt/libapt print verbose debug messages"
 msgstr ""
 
-#: ../unattended-upgrade:2394
+#: ../unattended-upgrade:2469
 msgid "print info messages"
 msgstr ""
 
-#: ../unattended-upgrade:2397
+#: ../unattended-upgrade:2472
 msgid "Simulation, download but do not install"
 msgstr "模拟，下载但不安装"
 
-#: ../unattended-upgrade:2400
+#: ../unattended-upgrade:2475
 msgid "Only download, do not even try to install."
 msgstr ""
 
-#: ../unattended-upgrade:2408
+#: ../unattended-upgrade:2165
 msgid "Upgrade in minimal steps (and allow interrupting with SIGTERM"
 msgstr ""
 
-#: ../unattended-upgrade:2417
+#: ../unattended-upgrade:2492
 msgid "You need to be root to run this application"
 msgstr "您需要 roo t的权限来运行这个程序"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/upower.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/upower.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/upower.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/upower.po	2020-07-08 13:54:00.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:02+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:43+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #. TRANSLATORS: exit after we've started up, used for user profiling
 #: src/up-main.c:187
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ureadahead.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ureadahead.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/ureadahead.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/ureadahead.po	2020-07-08 13:53:59.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 12:01+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:43+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 
 #: src/ureadahead.c:111
 #, c-format
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/usbcreator.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/usbcreator.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/usbcreator.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/usbcreator.po	2020-07-08 13:53:59.000000000 +0000
@@ -14,8 +14,8 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:54+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:37+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 
 #: .././gui/usbcreator-gtk.ui.h:1
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/util-linux.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/util-linux.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/util-linux.po	2020-01-23 16:51:54.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/util-linux.po	2020-07-08 13:53:55.000000000 +0000
@@ -15,8 +15,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 10:39+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 10:37+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "X-Crowdin-Language: zh-CN\n"
@@ -33,48 +33,50 @@
 msgstr "通知内核，存在某个指定分区。\n"
 
 #: disk-utils/addpart.c:52 disk-utils/blockdev.c:244 disk-utils/delpart.c:52
-#: disk-utils/mkfs.bfs.c:127 disk-utils/resizepart.c:96 misc-utils/kill.c:267
-#: misc-utils/kill.c:309 misc-utils/rename.c:280 misc-utils/whereis.c:533
+#: disk-utils/mkfs.bfs.c:127 disk-utils/resizepart.c:96 misc-utils/kill.c:314
+#: misc-utils/kill.c:376 misc-utils/rename.c:280 misc-utils/whereis.c:533
 #: sys-utils/flock.c:177 sys-utils/ipcrm.c:160 sys-utils/ldattach.c:368
 #: sys-utils/renice.c:144 sys-utils/switch_root.c:240 sys-utils/tunelp.c:152
-#: term-utils/agetty.c:879 term-utils/agetty.c:880 term-utils/agetty.c:888
-#: term-utils/agetty.c:889
+#: term-utils/agetty.c:888 term-utils/agetty.c:889 term-utils/agetty.c:897
+#: term-utils/agetty.c:898
 msgid "not enough arguments"
 msgstr "参数不够"
 
 #: disk-utils/addpart.c:57 disk-utils/blockdev.c:293 disk-utils/blockdev.c:437
-#: disk-utils/blockdev.c:463 disk-utils/cfdisk.c:2720 disk-utils/delpart.c:58
-#: disk-utils/fdformat.c:228 disk-utils/fdisk.c:778 disk-utils/fdisk.c:1079
+#: disk-utils/blockdev.c:463 disk-utils/cfdisk.c:2724 disk-utils/delpart.c:58
+#: disk-utils/fdformat.c:229 disk-utils/fdisk.c:780 disk-utils/fdisk.c:1085
 #: disk-utils/fdisk-list.c:326 disk-utils/fdisk-list.c:366
 #: disk-utils/fdisk-list.c:385 disk-utils/fsck.c:1468
-#: disk-utils/fsck.cramfs.c:152 disk-utils/fsck.cramfs.c:512
-#: disk-utils/isosize.c:102 disk-utils/mkfs.bfs.c:186
+#: disk-utils/fsck.cramfs.c:152 disk-utils/fsck.cramfs.c:511
+#: disk-utils/isosize.c:53 disk-utils/mkfs.bfs.c:186
 #: disk-utils/mkfs.cramfs.c:171 disk-utils/mkfs.cramfs.c:660
 #: disk-utils/mkfs.cramfs.c:799 disk-utils/mkfs.minix.c:823
-#: disk-utils/mkswap.c:217 disk-utils/mkswap.c:246 disk-utils/partx.c:1020
-#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:655 disk-utils/sfdisk.c:711
-#: disk-utils/sfdisk.c:765 disk-utils/sfdisk.c:824 disk-utils/sfdisk.c:903
-#: disk-utils/sfdisk.c:944 disk-utils/sfdisk.c:974 disk-utils/sfdisk.c:1011
-#: disk-utils/sfdisk.c:1570 disk-utils/swaplabel.c:65 libfdisk/src/bsd.c:641
-#: login-utils/islocal.c:87 login-utils/last.c:668 login-utils/sulogin.c:444
-#: login-utils/sulogin.c:481 login-utils/utmpdump.c:134
-#: login-utils/utmpdump.c:355 login-utils/utmpdump.c:375 login-utils/vipw.c:261
-#: login-utils/vipw.c:279 misc-utils/findmnt.c:1106 misc-utils/logger.c:1241
-#: misc-utils/mcookie.c:115 misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:181
-#: sys-utils/blkzone.c:96 sys-utils/dmesg.c:524 sys-utils/eject.c:497
-#: sys-utils/eject.c:693 sys-utils/fallocate.c:399 sys-utils/fsfreeze.c:116
-#: sys-utils/fstrim.c:86 sys-utils/hwclock.c:229 sys-utils/hwclock.c:869
-#: sys-utils/hwclock-rtc.c:398 sys-utils/hwclock-rtc.c:433
-#: sys-utils/ldattach.c:392 sys-utils/lscpu.c:517 sys-utils/nsenter.c:129
+#: disk-utils/mkswap.c:217 disk-utils/mkswap.c:246 disk-utils/partx.c:1019
+#: disk-utils/resizepart.c:104 disk-utils/sfdisk.c:475 disk-utils/sfdisk.c:733
+#: disk-utils/sfdisk.c:789 disk-utils/sfdisk.c:843 disk-utils/sfdisk.c:902
+#: disk-utils/sfdisk.c:981 disk-utils/sfdisk.c:1022 disk-utils/sfdisk.c:1052
+#: disk-utils/sfdisk.c:1089 disk-utils/sfdisk.c:1650 disk-utils/swaplabel.c:65
+#: libfdisk/src/bsd.c:642 login-utils/islocal.c:87 login-utils/last.c:667
+#: login-utils/sulogin.c:444 login-utils/sulogin.c:481
+#: login-utils/utmpdump.c:134 login-utils/utmpdump.c:355
+#: login-utils/utmpdump.c:375 login-utils/vipw.c:261 login-utils/vipw.c:279
+#: misc-utils/findmnt.c:1106 misc-utils/logger.c:1241 misc-utils/mcookie.c:115
+#: misc-utils/uuidd.c:198 sys-utils/blkdiscard.c:181 sys-utils/blkzone.c:96
+#: sys-utils/dmesg.c:527 sys-utils/eject.c:500 sys-utils/eject.c:699
+#: sys-utils/fallocate.c:399 sys-utils/fsfreeze.c:116 sys-utils/fstrim.c:102
+#: sys-utils/hwclock.c:234 sys-utils/hwclock.c:877 sys-utils/hwclock-rtc.c:138
+#: sys-utils/hwclock-rtc.c:403 sys-utils/hwclock-rtc.c:438
+#: sys-utils/ldattach.c:392 sys-utils/lscpu.c:527 sys-utils/nsenter.c:129
 #: sys-utils/rfkill.c:192 sys-utils/rfkill.c:553 sys-utils/rtcwake.c:137
-#: sys-utils/rtcwake.c:290 sys-utils/setpriv.c:290 sys-utils/setpriv.c:659
-#: sys-utils/setpriv.c:682 sys-utils/swapon.c:375 sys-utils/swapon.c:518
-#: sys-utils/switch_root.c:167 sys-utils/unshare.c:110 sys-utils/unshare.c:125
-#: sys-utils/wdctl.c:322 sys-utils/wdctl.c:378 sys-utils/zramctl.c:515
-#: term-utils/agetty.c:2869 term-utils/mesg.c:143 term-utils/script.c:540
-#: term-utils/script.c:548 term-utils/script.c:633
-#: term-utils/scriptreplay.c:198 term-utils/scriptreplay.c:201
-#: term-utils/wall.c:420 text-utils/colcrt.c:282 text-utils/more.c:361
+#: sys-utils/rtcwake.c:290 sys-utils/setpriv.c:259 sys-utils/setpriv.c:628
+#: sys-utils/setpriv.c:651 sys-utils/swapon.c:375 sys-utils/swapon.c:518
+#: sys-utils/switch_root.c:167 sys-utils/unshare.c:116 sys-utils/unshare.c:131
+#: sys-utils/wdctl.c:361 sys-utils/zramctl.c:515 term-utils/agetty.c:2938
+#: term-utils/mesg.c:143 term-utils/script.c:382 term-utils/scriptlive.c:256
+#: term-utils/scriptlive.c:259 term-utils/scriptlive.c:262
+#: term-utils/scriptreplay.c:260 term-utils/scriptreplay.c:263
+#: term-utils/scriptreplay.c:266 term-utils/scriptreplay.c:269
+#: term-utils/wall.c:421 text-utils/colcrt.c:284 text-utils/more.c:361
 #: text-utils/rev.c:139 text-utils/ul.c:230
 #, c-format
 msgid "cannot open %s"
@@ -211,8 +213,8 @@
 msgid " %-25s get size in 512-byte sectors\n"
 msgstr " %-25s 获得 512-字节扇区的大小\n"
 
-#: disk-utils/blockdev.c:286 disk-utils/fdformat.c:218
-#: disk-utils/fsck.minix.c:1340 disk-utils/isosize.c:204
+#: disk-utils/blockdev.c:286 disk-utils/fdformat.c:219
+#: disk-utils/fsck.minix.c:1340 disk-utils/isosize.c:155
 #: disk-utils/mkfs.bfs.c:175 disk-utils/mkfs.c:110 disk-utils/mkfs.minix.c:812
 #: disk-utils/swaplabel.c:180 misc-utils/wipefs.c:756
 #: sys-utils/blkdiscard.c:170 sys-utils/blkzone.c:402 sys-utils/tunelp.c:241
@@ -249,7 +251,7 @@
 msgid "%s succeeded.\n"
 msgstr "%s 成功.\n"
 
-#: disk-utils/blockdev.c:457 misc-utils/lsblk.c:1188 misc-utils/lsblk.c:1195
+#: disk-utils/blockdev.c:476
 #, c-format
 msgid "%s: failed to initialize sysfs handler"
 msgstr "%s：初始化 sysfs 处理函数失败"
@@ -304,9 +306,9 @@
 msgid "Quit program without writing changes"
 msgstr "退出程序而不写入更改"
 
-#: disk-utils/cfdisk.c:195 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1030
-#: libfdisk/src/dos.c:2507 libfdisk/src/gpt.c:3142 libfdisk/src/sgi.c:1160
-#: libfdisk/src/sun.c:1128
+#: disk-utils/cfdisk.c:195 libfdisk/src/bsd.c:439 libfdisk/src/bsd.c:1031
+#: libfdisk/src/dos.c:2501 libfdisk/src/gpt.c:3009 libfdisk/src/sgi.c:1160
+#: libfdisk/src/sun.c:1136
 msgid "Type"
 msgstr "类型"
 
@@ -346,343 +348,343 @@
 msgid "Dump partition table to sfdisk compatible script file"
 msgstr "将分区表转储到与 sfdisk 兼容的脚本文件"
 
-#: disk-utils/cfdisk.c:644 disk-utils/fdisk.c:463
+#: disk-utils/cfdisk.c:644 disk-utils/fdisk.c:465
 #, c-format
 msgid "internal error: unsupported dialog type %d"
 msgstr "内部错误：不支持的对话类型 %d"
 
-#: disk-utils/cfdisk.c:1279
+#: disk-utils/cfdisk.c:1282
 #, c-format
 msgid "%s (mounted)"
 msgstr "%s (已挂载)"
 
-#: disk-utils/cfdisk.c:1299
+#: disk-utils/cfdisk.c:1302
 msgid "Partition name:"
 msgstr "分区名："
 
-#: disk-utils/cfdisk.c:1306
+#: disk-utils/cfdisk.c:1309
 msgid "Partition UUID:"
 msgstr "分区 UUID："
 
-#: disk-utils/cfdisk.c:1318
+#: disk-utils/cfdisk.c:1321
 msgid "Partition type:"
 msgstr "分区类型："
 
-#: disk-utils/cfdisk.c:1325
+#: disk-utils/cfdisk.c:1328
 msgid "Attributes:"
 msgstr "属性："
 
-#: disk-utils/cfdisk.c:1349
+#: disk-utils/cfdisk.c:1352
 msgid "Filesystem UUID:"
 msgstr "文件系统 UUID："
 
-#: disk-utils/cfdisk.c:1356
+#: disk-utils/cfdisk.c:1359
 msgid "Filesystem LABEL:"
 msgstr "文件系统标签："
 
-#: disk-utils/cfdisk.c:1362
+#: disk-utils/cfdisk.c:1365
 msgid "Filesystem:"
 msgstr "文件系统："
 
-#: disk-utils/cfdisk.c:1367
+#: disk-utils/cfdisk.c:1370
 msgid "Mountpoint:"
 msgstr "挂载点："
 
-#: disk-utils/cfdisk.c:1711
+#: disk-utils/cfdisk.c:1714
 #, c-format
 msgid "Disk: %s"
 msgstr "磁盘：%s"
 
-#: disk-utils/cfdisk.c:1703
+#: disk-utils/cfdisk.c:1710
 #, c-format
 msgid "Size: %s, %ju bytes, %ju sectors"
 msgstr "尺寸：%s，%ju 字节，%ju 个扇区"
 
-#: disk-utils/cfdisk.c:1716
+#: disk-utils/cfdisk.c:1719
 #, c-format
 msgid "Label: %s, identifier: %s"
 msgstr "标签：%s，标识符：%s"
 
-#: disk-utils/cfdisk.c:1719
+#: disk-utils/cfdisk.c:1722
 #, c-format
 msgid "Label: %s"
 msgstr "标签：%s"
 
-#: disk-utils/cfdisk.c:1869
+#: disk-utils/cfdisk.c:1872
 msgid "May be followed by M for MiB, G for GiB, T for TiB, or S for sectors."
 msgstr "后面可以加 M(MiB), G(GiB), T(TiB) 或 S(扇区)。"
 
-#: disk-utils/cfdisk.c:1875
+#: disk-utils/cfdisk.c:1878
 msgid "Please, specify size."
 msgstr "请指定文件大小。"
 
-#: disk-utils/cfdisk.c:1890
+#: disk-utils/cfdisk.c:1894
 #, c-format
 msgid "Minimum size is %ju bytes."
 msgstr "最小尺寸为 %ju 字节。"
 
-#: disk-utils/cfdisk.c:1899
+#: disk-utils/cfdisk.c:1903
 #, c-format
 msgid "Maximum size is %ju bytes."
 msgstr "最大尺寸为 %ju 字节。"
 
-#: disk-utils/cfdisk.c:1913
+#: disk-utils/cfdisk.c:1916
 msgid "Failed to parse size."
 msgstr "解析大小失败。"
 
-#: disk-utils/cfdisk.c:1971
+#: disk-utils/cfdisk.c:1974
 msgid "Select partition type"
 msgstr "选择分区类型"
 
-#: disk-utils/cfdisk.c:2021 disk-utils/cfdisk.c:2051
+#: disk-utils/cfdisk.c:2024 disk-utils/cfdisk.c:2054
 msgid "Enter script file name: "
 msgstr "输入脚本文件名： "
 
-#: disk-utils/cfdisk.c:2022
+#: disk-utils/cfdisk.c:2025
 msgid "The script file will be applied to in-memory partition table."
 msgstr "该脚本文件将应用于内存中的分区表。"
 
-#: disk-utils/cfdisk.c:2031 disk-utils/cfdisk.c:2073
-#: disk-utils/fdisk-menu.c:480 disk-utils/fdisk-menu.c:524
+#: disk-utils/cfdisk.c:2034 disk-utils/cfdisk.c:2076
+#: disk-utils/fdisk-menu.c:481 disk-utils/fdisk-menu.c:525
 #, c-format
 msgid "Cannot open %s"
 msgstr "打不开 %s"
 
-#: disk-utils/cfdisk.c:2033 disk-utils/fdisk-menu.c:482
+#: disk-utils/cfdisk.c:2036 disk-utils/fdisk-menu.c:483
 #, c-format
 msgid "Failed to parse script file %s"
 msgstr "解析脚本文件 %s 失败"
 
-#: disk-utils/cfdisk.c:2035 disk-utils/fdisk-menu.c:484
+#: disk-utils/cfdisk.c:2038 disk-utils/fdisk-menu.c:485
 #, c-format
 msgid "Failed to apply script %s"
 msgstr "应用脚本文件 %s 失败"
 
-#: disk-utils/cfdisk.c:2052
+#: disk-utils/cfdisk.c:2055
 msgid "The current in-memory partition table will be dumped to the file."
 msgstr "当前的内存中分区表将转储到该文件中。"
 
-#: disk-utils/cfdisk.c:2060 disk-utils/fdisk-menu.c:512
+#: disk-utils/cfdisk.c:2063 disk-utils/fdisk-menu.c:513
 msgid "Failed to allocate script handler"
 msgstr "分配脚本处理程序失败"
 
-#: disk-utils/cfdisk.c:2066
+#: disk-utils/cfdisk.c:2069
 msgid "Failed to read disk layout into script."
 msgstr "将磁盘布局读入脚本出错。"
 
-#: disk-utils/cfdisk.c:2080
+#: disk-utils/cfdisk.c:2083
 msgid "Disk layout successfully dumped."
 msgstr "成功转储了磁盘布局。"
 
-#: disk-utils/cfdisk.c:2083 disk-utils/fdisk-menu.c:530
+#: disk-utils/cfdisk.c:2086 disk-utils/fdisk-menu.c:531
 #, c-format
 msgid "Failed to write script %s"
 msgstr "写脚本文件 %s 失败"
 
-#: disk-utils/cfdisk.c:2119
+#: disk-utils/cfdisk.c:2122
 msgid "Select label type"
 msgstr "选择标签类型"
 
-#: disk-utils/cfdisk.c:2122 disk-utils/fdisk.c:1087 disk-utils/fdisk-menu.c:488
+#: disk-utils/cfdisk.c:2125 disk-utils/fdisk.c:1093 disk-utils/fdisk-menu.c:489
 msgid "Device does not contain a recognized partition table."
 msgstr "设备不包含可识别的分区表。"
 
-#: disk-utils/cfdisk.c:2130
+#: disk-utils/cfdisk.c:2133
 msgid "Select a type to create a new label or press 'L' to load script file."
 msgstr "选择一种类型来创建新标签，或按“L”加载脚本文件。"
 
 # 以下三句连贯，一起翻译
-#: disk-utils/cfdisk.c:2179
+#: disk-utils/cfdisk.c:2182
 msgid "This is cfdisk, a curses-based disk partitioning program."
 msgstr "这是 cfdisk，一款基于 curses 的磁盘分区程序，"
 
-#: disk-utils/cfdisk.c:2180
+#: disk-utils/cfdisk.c:2183
 msgid "It lets you create, delete, and modify partitions on a block device."
 msgstr "可以创建、删除和修改块设备上的分区。"
 
 # 以下两条注意对齐
-#: disk-utils/cfdisk.c:2182
+#: disk-utils/cfdisk.c:2185
 msgid "Command      Meaning"
 msgstr "命令         意义"
 
-#: disk-utils/cfdisk.c:2183
+#: disk-utils/cfdisk.c:2186
 msgid "-------      -------"
 msgstr "-------      -------"
 
-#: disk-utils/cfdisk.c:2184
+#: disk-utils/cfdisk.c:2187
 msgid "  b          Toggle bootable flag of the current partition"
 msgstr "  b          切换当前分区的 可启动 标志"
 
-#: disk-utils/cfdisk.c:2185
+#: disk-utils/cfdisk.c:2188
 msgid "  d          Delete the current partition"
 msgstr "  d          删除当前分区"
 
-#: disk-utils/cfdisk.c:2186
+#: disk-utils/cfdisk.c:2189
 msgid "  h          Print this screen"
 msgstr "  h          打印此屏幕"
 
-#: disk-utils/cfdisk.c:2187
+#: disk-utils/cfdisk.c:2190
 msgid "  n          Create new partition from free space"
 msgstr "  n          从空闲空间创建新分区"
 
-#: disk-utils/cfdisk.c:2188
+#: disk-utils/cfdisk.c:2191
 msgid "  q          Quit program without writing partition table"
 msgstr "  q          退出程序但不写入分区表"
 
-#: disk-utils/cfdisk.c:2189
+#: disk-utils/cfdisk.c:2192
 msgid "  s          Fix partitions order (only when in disarray)"
 msgstr "  s          修复分区顺序(仅磁盘阵列)"
 
-#: disk-utils/cfdisk.c:2190
+#: disk-utils/cfdisk.c:2193
 msgid "  t          Change the partition type"
 msgstr "  t          更改分区类型"
 
-#: disk-utils/cfdisk.c:2191
+#: disk-utils/cfdisk.c:2194
 msgid "  u          Dump disk layout to sfdisk compatible script file"
 msgstr "  u          将磁盘布局转储到兼容 sfdisk 的脚本文件"
 
-#: disk-utils/cfdisk.c:2192
+#: disk-utils/cfdisk.c:2195
 msgid ""
 "  W          Write partition table to disk (you must enter uppercase W);"
 msgstr "  W          将分区表写入磁盘(必须输入大写 W)；"
 
-#: disk-utils/cfdisk.c:2193
+#: disk-utils/cfdisk.c:2196
 msgid ""
 "               since this might destroy data on the disk, you must either"
 msgstr "               由于这可能破坏磁盘上的数据，您必须"
 
-#: disk-utils/cfdisk.c:2194
+#: disk-utils/cfdisk.c:2197
 msgid "               confirm or deny the write by entering 'yes' or 'no'"
 msgstr "               通过输入“yes”或“no”来确认或拒绝"
 
-#: disk-utils/cfdisk.c:2195
+#: disk-utils/cfdisk.c:2198
 msgid "  x          Display/hide extra information about a partition"
 msgstr "  x          显示/隐藏分区的额外信息"
 
-#: disk-utils/cfdisk.c:2196
+#: disk-utils/cfdisk.c:2199
 msgid "Up Arrow     Move cursor to the previous partition"
 msgstr "上箭头       光标移到上一分区"
 
-#: disk-utils/cfdisk.c:2197
+#: disk-utils/cfdisk.c:2200
 msgid "Down Arrow   Move cursor to the next partition"
 msgstr "下箭头       光标移到下一分区"
 
-#: disk-utils/cfdisk.c:2198
+#: disk-utils/cfdisk.c:2201
 msgid "Left Arrow   Move cursor to the previous menu item"
 msgstr "上箭头       光标移到上一菜单项"
 
-#: disk-utils/cfdisk.c:2199
+#: disk-utils/cfdisk.c:2202
 msgid "Right Arrow  Move cursor to the next menu item"
 msgstr "下箭头       光标移到下一菜单项"
 
-#: disk-utils/cfdisk.c:2201
+#: disk-utils/cfdisk.c:2204
 msgid "Note: All of the commands can be entered with either upper or lower"
 msgstr "注：所有命令均可以大写或小写"
 
-#: disk-utils/cfdisk.c:2202
+#: disk-utils/cfdisk.c:2205
 msgid "case letters (except for Write)."
 msgstr "字母输入(除了 写入)。"
 
-#: disk-utils/cfdisk.c:2204
+#: disk-utils/cfdisk.c:2207
 msgid "Use lsblk(8) or partx(8) to see more details about the device."
 msgstr "使用 lsblk(8) 或 partx(8) 了解有关磁盘的更多细节。"
 
-#: disk-utils/cfdisk.c:2214 disk-utils/cfdisk.c:2517
+#: disk-utils/cfdisk.c:2217 disk-utils/cfdisk.c:2520
 msgid "Press a key to continue."
 msgstr "按下一个键继续。"
 
-#: disk-utils/cfdisk.c:2300
+#: disk-utils/cfdisk.c:2303
 msgid "Could not toggle the flag."
 msgstr "无法切换标志。"
 
-#: disk-utils/cfdisk.c:2310
+#: disk-utils/cfdisk.c:2313
 #, c-format
 msgid "Could not delete partition %zu."
 msgstr "无法删除分区 %zu。"
 
-#: disk-utils/cfdisk.c:2312 disk-utils/fdisk-menu.c:660
+#: disk-utils/cfdisk.c:2315 disk-utils/fdisk-menu.c:662
 #, c-format
 msgid "Partition %zu has been deleted."
 msgstr "分区 %zu 已删除。"
 
-#: disk-utils/cfdisk.c:2333
+#: disk-utils/cfdisk.c:2336
 msgid "Partition size: "
 msgstr "分区大小： "
 
-#: disk-utils/cfdisk.c:2374
+#: disk-utils/cfdisk.c:2377
 #, c-format
 msgid "Changed type of partition %zu."
 msgstr "已更改分区 %zu 的类型。"
 
-#: disk-utils/cfdisk.c:2376
+#: disk-utils/cfdisk.c:2379
 #, c-format
 msgid "The type of partition %zu is unchanged."
 msgstr "分区 %zu 的类型未更改。"
 
-#: disk-utils/cfdisk.c:2397
+#: disk-utils/cfdisk.c:2400
 msgid "New size: "
 msgstr ""
 
-#: disk-utils/cfdisk.c:2412
+#: disk-utils/cfdisk.c:2415
 #, c-format
 msgid "Partition %zu resized."
 msgstr ""
 
-#: disk-utils/cfdisk.c:2430 disk-utils/cfdisk.c:2546 disk-utils/fdisk.c:1076
-#: disk-utils/fdisk-menu.c:591
+#: disk-utils/cfdisk.c:2433 disk-utils/cfdisk.c:2549 disk-utils/fdisk.c:1082
+#: disk-utils/fdisk-menu.c:592
 msgid "Device is open in read-only mode."
 msgstr "设备以只读方式打开。"
 
-#: disk-utils/cfdisk.c:2435
+#: disk-utils/cfdisk.c:2438
 msgid "Are you sure you want to write the partition table to disk? "
 msgstr "您确定想将分区表写入磁盘吗？ "
 
-#: disk-utils/cfdisk.c:2437
+#: disk-utils/cfdisk.c:2440
 msgid "Type \"yes\" or \"no\", or press ESC to leave this dialog."
 msgstr "输入“yes”或“no”或按 ESC 取消对话框。"
 
-#: disk-utils/cfdisk.c:2442 login-utils/lslogins.c:211 sys-utils/lscpu.c:1563
-#: sys-utils/lscpu.c:1573 sys-utils/lsmem.c:266
+#: disk-utils/cfdisk.c:2445 login-utils/lslogins.c:211 sys-utils/lscpu.c:1593
+#: sys-utils/lscpu.c:1603 sys-utils/lsmem.c:266
 msgid "yes"
 msgstr "是"
 
-#: disk-utils/cfdisk.c:2443
+#: disk-utils/cfdisk.c:2446
 msgid "Did not write partition table to disk."
 msgstr "未将分区表写入磁盘。"
 
-#: disk-utils/cfdisk.c:2448
+#: disk-utils/cfdisk.c:2451
 msgid "Failed to write disklabel."
 msgstr "写磁盘标签失败。"
 
-#: disk-utils/cfdisk.c:2454 disk-utils/fdisk-menu.c:599
+#: disk-utils/cfdisk.c:2457 disk-utils/fdisk-menu.c:599
 msgid "The partition table has been altered."
 msgstr "分区表已调整。"
 
-#: disk-utils/cfdisk.c:2477 disk-utils/cfdisk.c:2548
+#: disk-utils/cfdisk.c:2480 disk-utils/cfdisk.c:2551
 msgid "Note that partition table entries are not in disk order now."
 msgstr "注意，现在分区表记录没有按磁盘顺序。"
 
-#: disk-utils/cfdisk.c:2514
+#: disk-utils/cfdisk.c:2517
 #, c-format
 msgid ""
 "Device already contains a %s signature; it will be removed by a write "
 "command."
 msgstr "设备已包含一个 %s 签名；写入命令会将其移除。"
 
-#: disk-utils/cfdisk.c:2525
+#: disk-utils/cfdisk.c:2528
 msgid "failed to create a new disklabel"
 msgstr "创建新磁盘标签失败"
 
-#: disk-utils/cfdisk.c:2533
+#: disk-utils/cfdisk.c:2536
 msgid "failed to read partitions"
 msgstr "读分区失败"
 
-#: disk-utils/cfdisk.c:2632
+#: disk-utils/cfdisk.c:2635
 #, c-format
 msgid " %1$s [options] <disk>\n"
 msgstr " %1$s [选项] <磁盘>\n"
 
-#: disk-utils/cfdisk.c:2635 disk-utils/fdisk.c:822 disk-utils/sfdisk.c:1848
+#: disk-utils/cfdisk.c:2638 disk-utils/fdisk.c:825 disk-utils/sfdisk.c:1932
 msgid "Display or manipulate a disk partition table.\n"
 msgstr "显示或操作磁盘分区表。\n"
 
@@ -690,16 +692,16 @@
 msgid " -L, --color[=<when>]     colorize output (auto, always or never)\n"
 msgstr " -L, --color[=<何时>]     彩色输出(auto自动，always总是或never从不)\n"
 
-#: disk-utils/cfdisk.c:2641
+#: disk-utils/cfdisk.c:2645
 msgid " -z, --zero               start with zeroed partition table\n"
 msgstr " -z, --zero              以空分区表开始\n"
 
-#: disk-utils/cfdisk.c:2679 disk-utils/fdisk.c:964 disk-utils/sfdisk.c:2123
-#: misc-utils/cal.c:429 sys-utils/dmesg.c:1409 text-utils/hexdump.c:114
+#: disk-utils/cfdisk.c:2683 disk-utils/fdisk.c:970 disk-utils/sfdisk.c:2214
+#: misc-utils/cal.c:429 sys-utils/dmesg.c:1425 text-utils/hexdump.c:114
 msgid "unsupported color mode"
 msgstr "不支持的颜色模式"
 
-#: disk-utils/cfdisk.c:2698 disk-utils/fdisk.c:902 disk-utils/sfdisk.c:224
+#: disk-utils/cfdisk.c:2702 disk-utils/fdisk.c:908 disk-utils/sfdisk.c:227
 msgid "failed to allocate libfdisk context"
 msgstr "分配 libfdisk 环境(context)失败"
 
@@ -716,31 +718,31 @@
 msgid "failed to remove partition"
 msgstr "移除分区失败"
 
-#: disk-utils/fdformat.c:53
+#: disk-utils/fdformat.c:54
 #, c-format
 msgid "Formatting ... "
 msgstr "正在格式化 ... "
 
-#: disk-utils/fdformat.c:68 disk-utils/fdformat.c:138
+#: disk-utils/fdformat.c:69 disk-utils/fdformat.c:139
 #, c-format
 msgid "done\n"
 msgstr "完成\n"
 
-#: disk-utils/fdformat.c:80
+#: disk-utils/fdformat.c:81
 #, c-format
 msgid "Verifying ... "
 msgstr "正在验证 ... "
 
-#: disk-utils/fdformat.c:108
+#: disk-utils/fdformat.c:109
 msgid "Read: "
 msgstr "读: "
 
-#: disk-utils/fdformat.c:110
+#: disk-utils/fdformat.c:111
 #, c-format
 msgid "Problem reading track/head %u/%u, expected %d, read %d\n"
 msgstr "读磁道/磁头 %u/%u 时出问题, 期望 %d, 读取 %d\n"
 
-#: disk-utils/fdformat.c:127
+#: disk-utils/fdformat.c:128
 #, c-format
 msgid ""
 "bad data in track/head %u/%u\n"
@@ -749,26 +751,26 @@
 "磁道/磁头 %u/%u 有坏数据\n"
 "将继续 ... "
 
-#: disk-utils/fdformat.c:145 disk-utils/fsck.minix.c:183
+#: disk-utils/fdformat.c:146 disk-utils/fsck.minix.c:183
 #: disk-utils/swaplabel.c:123 misc-utils/wipefs.c:641 sys-utils/blkdiscard.c:85
 #: sys-utils/tunelp.c:95
 #, c-format
 msgid " %s [options] <device>\n"
 msgstr " %s [选项] <设备>\n"
 
-#: disk-utils/fdformat.c:149
+#: disk-utils/fdformat.c:150
 msgid "Do a low-level formatting of a floppy disk.\n"
 msgstr "对软盘进行低级格式化。\n"
 
-#: disk-utils/fdformat.c:152
+#: disk-utils/fdformat.c:153
 msgid " -f, --from <N>    start at the track N (default 0)\n"
 msgstr " -f, --from <N>    从磁道 N 开始(默认 0)\n"
 
-#: disk-utils/fdformat.c:153
+#: disk-utils/fdformat.c:154
 msgid " -t, --to <N>      stop at the track N\n"
 msgstr " -t, --to <N>      在磁道 N 停止\n"
 
-#: disk-utils/fdformat.c:154
+#: disk-utils/fdformat.c:155
 msgid ""
 " -r, --repair <N>  try to repair tracks failed during\n"
 "                     the verification (max N retries)\n"
@@ -776,166 +778,166 @@
 " -r, --repair <N>  尝试修复在验证时失败的磁道\n"
 "                     (最多尝试 N 次)\n"
 
-#: disk-utils/fdformat.c:156
+#: disk-utils/fdformat.c:157
 msgid " -n, --no-verify   disable the verification after the format\n"
 msgstr " -n, --no-verify   禁止格式化后的验证\n"
 
-#: disk-utils/fdformat.c:194
+#: disk-utils/fdformat.c:195
 msgid "invalid argument - from"
 msgstr "无效参数 - from"
 
-#: disk-utils/fdformat.c:198
+#: disk-utils/fdformat.c:199
 msgid "invalid argument - to"
 msgstr "无效参数 - to"
 
-#: disk-utils/fdformat.c:201
+#: disk-utils/fdformat.c:202
 msgid "invalid argument - repair"
 msgstr "无效参数 - repair"
 
-#: disk-utils/fdformat.c:222 disk-utils/fsck.cramfs.c:148
+#: disk-utils/fdformat.c:223 disk-utils/fsck.cramfs.c:148
 #: disk-utils/mkfs.bfs.c:182 disk-utils/mkfs.cramfs.c:337
 #: disk-utils/mkfs.cramfs.c:758 disk-utils/mkfs.cramfs.c:796
-#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:243 disk-utils/partx.c:958
-#: login-utils/last.c:682 login-utils/utmpdump.c:137 misc-utils/namei.c:135
+#: disk-utils/mkfs.minix.c:820 disk-utils/mkswap.c:243 disk-utils/partx.c:957
+#: login-utils/last.c:681 login-utils/utmpdump.c:137 misc-utils/namei.c:135
 #: misc-utils/rename.c:120 sys-utils/blkdiscard.c:184 sys-utils/blkzone.c:99
-#: sys-utils/dmesg.c:526 sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:119
-#: sys-utils/fstrim.c:91 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168
+#: sys-utils/dmesg.c:529 sys-utils/fallocate.c:198 sys-utils/fsfreeze.c:119
+#: sys-utils/fstrim.c:74 sys-utils/nsenter.c:164 sys-utils/nsenter.c:168
 #: sys-utils/swapon.c:523 sys-utils/switch_root.c:94
 #: sys-utils/switch_root.c:137 term-utils/mesg.c:145 text-utils/more.c:350
 #, c-format
 msgid "stat of %s failed"
 msgstr "对 %s stat 失败"
 
-#: disk-utils/fdformat.c:225 disk-utils/partx.c:1017 misc-utils/lsblk.c:1398
+#: disk-utils/fdformat.c:226 disk-utils/partx.c:1016 misc-utils/lsblk.c:1442
 #: sys-utils/blkdiscard.c:186 sys-utils/blkzone.c:101
-#: sys-utils/mountpoint.c:106
+#: sys-utils/mountpoint.c:107
 #, c-format
 msgid "%s: not a block device"
 msgstr "%s：不是一个块设备"
 
-#: disk-utils/fdformat.c:230
+#: disk-utils/fdformat.c:231
 msgid "could not determine current format type"
 msgstr "不能确定当前格式类型"
 
-#: disk-utils/fdformat.c:232
+#: disk-utils/fdformat.c:233
 #, c-format
 msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n"
 msgstr "%s-面, %d 磁道, %d 秒/磁道. 总容量 %d kB.\n"
 
-#: disk-utils/fdformat.c:233
+#: disk-utils/fdformat.c:234
 msgid "Double"
 msgstr "双面"
 
-#: disk-utils/fdformat.c:233
+#: disk-utils/fdformat.c:234
 msgid "Single"
 msgstr "单面"
 
-#: disk-utils/fdformat.c:240
+#: disk-utils/fdformat.c:241
 msgid "user defined start track exceeds the medium specific maximum"
 msgstr "用户定义的起始磁道超出了媒体的最大指定值"
 
-#: disk-utils/fdformat.c:242
+#: disk-utils/fdformat.c:243
 msgid "user defined end track exceeds the medium specific maximum"
 msgstr "用户定义的结束磁道超出了媒体的最大指定值"
 
-#: disk-utils/fdformat.c:244
+#: disk-utils/fdformat.c:245
 msgid "user defined start track exceeds the user defined end track"
 msgstr "用户定义的起始磁道超过了定义的终止磁道"
 
-#: disk-utils/fdformat.c:252 misc-utils/logger.c:1045
+#: disk-utils/fdformat.c:253 misc-utils/logger.c:1045
 msgid "close failed"
 msgstr "关闭失败"
 
-#: disk-utils/fdisk.c:204
+#: disk-utils/fdisk.c:206
 #, c-format
 msgid "Select (default %c): "
 msgstr "选择 (默认 %c)： "
 
-#: disk-utils/fdisk.c:209
+#: disk-utils/fdisk.c:211
 #, c-format
 msgid "Using default response %c."
 msgstr "将使用默认回应 %c。"
 
-#: disk-utils/fdisk.c:222 disk-utils/fdisk.c:296 disk-utils/fdisk.c:373
-#: libfdisk/src/dos.c:1298 libfdisk/src/gpt.c:2474
+#: disk-utils/fdisk.c:224 disk-utils/fdisk.c:298 disk-utils/fdisk.c:375
+#: libfdisk/src/dos.c:1287 libfdisk/src/gpt.c:2341
 msgid "Value out of range."
 msgstr "值超出范围。"
 
-#: disk-utils/fdisk.c:251
+#: disk-utils/fdisk.c:253
 #, c-format
 msgid "%s (%s, default %c): "
 msgstr "%s (%s，默认 %c)： "
 
-#: disk-utils/fdisk.c:254 disk-utils/fdisk.c:321
+#: disk-utils/fdisk.c:256 disk-utils/fdisk.c:323
 #, c-format
 msgid "%s (%s, default %<PRIu64>): "
 msgstr "%s (%s, 默认  %<PRIu64>): "
 
-#: disk-utils/fdisk.c:259
+#: disk-utils/fdisk.c:261
 #, c-format
 msgid "%s (%c-%c, default %c): "
 msgstr "%s (%c-%c，默认为 %c)： "
 
-#: disk-utils/fdisk.c:263 disk-utils/fdisk.c:325
+#: disk-utils/fdisk.c:265 disk-utils/fdisk.c:327
 #, c-format
 msgid "%s (%<PRIu64>-%<PRIu64>, default %<PRIu64>): "
 msgstr "%s (%<PRIu64>-%<PRIu64>, 默认 %<PRIu64>): "
 
-#: disk-utils/fdisk.c:266
+#: disk-utils/fdisk.c:268
 #, c-format
 msgid "%s (%c-%c): "
 msgstr "%s (%c-%c)： "
 
-#: disk-utils/fdisk.c:269 disk-utils/fdisk.c:328
+#: disk-utils/fdisk.c:271 disk-utils/fdisk.c:330
 #, c-format
 msgid "%s (%<PRIu64>-%<PRIu64>): "
 msgstr "%s (%<PRIu64>-%<PRIu64>): "
 
-#: disk-utils/fdisk.c:440 disk-utils/sfdisk.c:198
+#: disk-utils/fdisk.c:442 disk-utils/sfdisk.c:201
 msgid " [Y]es/[N]o: "
 msgstr " 是[Y]/否[N]： "
 
-#: disk-utils/fdisk.c:482
+#: disk-utils/fdisk.c:484
 msgid "Hex code (type L to list all codes): "
 msgstr "Hex 代码(输入 L 列出所有代码)： "
 
-#: disk-utils/fdisk.c:483
+#: disk-utils/fdisk.c:485
 msgid "Partition type (type L to list all types): "
 msgstr "分区类型(输入 L 列出所有类型)： "
 
-#: disk-utils/fdisk.c:593
+#: disk-utils/fdisk.c:595
 msgid "DOS Compatibility flag is set (DEPRECATED!)"
 msgstr "已设置 DOS 兼容性标志(已废弃！)"
 
-#: disk-utils/fdisk.c:594
+#: disk-utils/fdisk.c:596
 msgid "DOS Compatibility flag is not set"
 msgstr "DOS 兼容性标志未设置"
 
-#: disk-utils/fdisk.c:616 disk-utils/fdisk.c:654
+#: disk-utils/fdisk.c:618 disk-utils/fdisk.c:656
 #, c-format
 msgid "Partition %zu does not exist yet!"
 msgstr "分区 %zu 还不存在！"
 
-#: disk-utils/fdisk.c:621 disk-utils/fdisk.c:632 libfdisk/src/ask.c:1028
+#: disk-utils/fdisk.c:623 disk-utils/fdisk.c:634 libfdisk/src/ask.c:1028
 msgid "Unknown"
 msgstr "未知"
 
-#: disk-utils/fdisk.c:631
+#: disk-utils/fdisk.c:633
 #, c-format
 msgid "Changed type of partition '%s' to '%s'."
 msgstr "已将分区“%s”的类型更改为“%s”。"
 
-#: disk-utils/fdisk.c:635
+#: disk-utils/fdisk.c:637
 #, c-format
 msgid "Type of partition %zu is unchanged: %s."
 msgstr "分区 %zu 的类型未更改：%s。"
 
-#: disk-utils/fdisk.c:600
+#: disk-utils/fdisk.c:660
 #, c-format
 msgid "%15s: %s"
 msgstr "%15s: %s"
 
-#: disk-utils/fdisk.c:731
+#: disk-utils/fdisk.c:733
 #, c-format
 msgid ""
 "\n"
@@ -944,20 +946,20 @@
 "\n"
 "%s: 偏移 = %<PRIu64>, 大小 = %zu 字节。"
 
-#: disk-utils/fdisk.c:737
+#: disk-utils/fdisk.c:739
 msgid "cannot seek"
 msgstr "无法定位"
 
-#: disk-utils/fdisk.c:742
+#: disk-utils/fdisk.c:744
 msgid "cannot read"
 msgstr "不能读"
 
-#: disk-utils/fdisk.c:755 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:942
-#: libfdisk/src/gpt.c:2402
+#: disk-utils/fdisk.c:757 libfdisk/src/bsd.c:258 libfdisk/src/dos.c:948
+#: libfdisk/src/gpt.c:2269
 msgid "First sector"
 msgstr "第一个扇区"
 
-#: disk-utils/fdisk.c:782
+#: disk-utils/fdisk.c:784
 #, c-format
 msgid "BLKGETSIZE ioctl failed on %s"
 msgstr "对 %s 进行 BLKGETSIZE ioctl 失败"
@@ -974,7 +976,7 @@
 "device with wipefs(8) or fdisk --wipe, in order to avoid possible collisions."
 msgstr ""
 
-#: disk-utils/fdisk.c:817
+#: disk-utils/fdisk.c:820
 #, c-format
 msgid ""
 " %1$s [options] <disk>      change partition table\n"
@@ -983,17 +985,17 @@
 " %1$s [选项] <磁盘>         更改分区表\n"
 " %1$s [选项] -l [<磁盘>]     列出分区表\n"
 
-#: disk-utils/fdisk.c:825
+#: disk-utils/fdisk.c:828
 msgid " -b, --sector-size <size>      physical and logical sector size\n"
 msgstr " -b, --sectors-size <大小>     显示扇区计数和大小\n"
 
-#: disk-utils/fdisk.c:826
+#: disk-utils/fdisk.c:829
 msgid ""
 " -B, --protect-boot            don't erase bootbits when creating a new "
 "label\n"
 msgstr " -B, --protect-boot            创建新标签时不要擦除 bootbits\n"
 
-#: disk-utils/fdisk.c:827
+#: disk-utils/fdisk.c:830
 msgid " -c, --compatibility[=<mode>]  mode is 'dos' or 'nondos' (default)\n"
 msgstr " -c, --compatibility[=<模式>]  模式，为“dos”或“nondos”(默认)\n"
 
@@ -1002,33 +1004,33 @@
 " -L, --color[=<when>]          colorize output (auto, always or never)\n"
 msgstr " -L, --color[=<时机>]          彩色输出(auto, always 或 never)\n"
 
-#: disk-utils/fdisk.c:831
+#: disk-utils/fdisk.c:835
 msgid " -l, --list                    display partitions and exit\n"
 msgstr " -l, --list                    显示分区并退出\n"
 
-#: disk-utils/fdisk.c:832
+#: disk-utils/fdisk.c:836
 msgid " -o, --output <list>           output columns\n"
 msgstr " -o, --output <列表>           输出列\n"
 
-#: disk-utils/fdisk.c:833
+#: disk-utils/fdisk.c:837
 msgid ""
 " -t, --type <type>             recognize specified partition table type "
 "only\n"
 msgstr " -t, --type <类型>             只识别指定的分区表类型\n"
 
-#: disk-utils/fdisk.c:834
+#: disk-utils/fdisk.c:838
 msgid ""
 " -u, --units[=<unit>]          display units: 'cylinders' or 'sectors' "
 "(default)\n"
 msgstr " -u, --units[=<单位>]          显示单位，“cylinders”柱面或“sectors”扇区(默认)\n"
 
-#: disk-utils/fdisk.c:835
+#: disk-utils/fdisk.c:839
 msgid ""
 " -s, --getsz                   display device size in 512-byte sectors "
 "[DEPRECATED]\n"
 msgstr " -s, --getsz                   以 512-字节扇区显示设备大小[已废弃]\n"
 
-#: disk-utils/fdisk.c:836
+#: disk-utils/fdisk.c:840
 msgid ""
 "     --bytes                   print SIZE in bytes rather than in human "
 "readable format\n"
@@ -1045,88 +1047,88 @@
 "always or never)\n"
 msgstr " -W, --wipe-partitions <模式>  擦除新分区的签名(auto, always 或 never)\n"
 
-#: disk-utils/fdisk.c:841
+#: disk-utils/fdisk.c:847
 msgid " -C, --cylinders <number>      specify the number of cylinders\n"
 msgstr " -C, --cylinders <数字>        指定柱面数\n"
 
-#: disk-utils/fdisk.c:842
+#: disk-utils/fdisk.c:848
 msgid " -H, --heads <number>          specify the number of heads\n"
 msgstr " -H, --heads <数字>            指定磁头数\n"
 
-#: disk-utils/fdisk.c:843
+#: disk-utils/fdisk.c:849
 msgid ""
 " -S, --sectors <number>        specify the number of sectors per track\n"
 msgstr " -S, --sectors <数字>          指定每条磁道的扇区数\n"
 
-#: disk-utils/fdisk.c:912 disk-utils/fdisk.c:914 disk-utils/partx.c:881
+#: disk-utils/fdisk.c:918 disk-utils/fdisk.c:920 disk-utils/partx.c:880
 msgid "invalid sector size argument"
 msgstr "无效的 扇区大小 参数"
 
-#: disk-utils/fdisk.c:924
+#: disk-utils/fdisk.c:930
 msgid "invalid cylinders argument"
 msgstr "无效的 柱面数 参数"
 
-#: disk-utils/fdisk.c:936
+#: disk-utils/fdisk.c:942
 msgid "not found DOS label driver"
 msgstr "未找到 DOS 标签驱动"
 
-#: disk-utils/fdisk.c:942
+#: disk-utils/fdisk.c:948
 #, c-format
 msgid "unknown compatibility mode '%s'"
 msgstr "未知兼容模式“%s”"
 
-#: disk-utils/fdisk.c:949
+#: disk-utils/fdisk.c:955
 msgid "invalid heads argument"
 msgstr "无效的 磁头数 参数"
 
-#: disk-utils/fdisk.c:955
+#: disk-utils/fdisk.c:961
 msgid "invalid sectors argument"
 msgstr "无效的 扇区数 参数"
 
-#: disk-utils/fdisk.c:981
+#: disk-utils/fdisk.c:987
 #, c-format
 msgid "unsupported disklabel: %s"
 msgstr "不支持的磁盘标签：%s"
 
-#: disk-utils/fdisk.c:989
+#: disk-utils/fdisk.c:995
 msgid "unsupported unit"
 msgstr ""
 
-#: disk-utils/fdisk.c:997 disk-utils/fdisk.c:1002 disk-utils/sfdisk.c:2087
-#: disk-utils/sfdisk.c:2092
+#: disk-utils/fdisk.c:1003 disk-utils/fdisk.c:1008 disk-utils/sfdisk.c:2178
+#: disk-utils/sfdisk.c:2183
 msgid "unsupported wipe mode"
 msgstr "不支持的擦除模式"
 
-#: disk-utils/fdisk.c:1015
+#: disk-utils/fdisk.c:1021
 msgid ""
 "The device properties (sector size and geometry) should be used with one "
 "specified device only."
 msgstr "设备属性(扇区大小和几何属性)只能用于某个指定的设备。"
 
-#: disk-utils/fdisk.c:1046 disk-utils/fdisk.c:1061 disk-utils/fsck.cramfs.c:694
+#: disk-utils/fdisk.c:1052 disk-utils/fdisk.c:1067 disk-utils/fsck.cramfs.c:693
 #: disk-utils/mkfs.bfs.c:192 disk-utils/mkfs.cramfs.c:786
-#: disk-utils/partx.c:974 disk-utils/raw.c:136 disk-utils/raw.c:149
+#: disk-utils/partx.c:973 disk-utils/raw.c:136 disk-utils/raw.c:149
 #: disk-utils/raw.c:161 disk-utils/raw.c:202 misc-utils/cal.c:519
 #: misc-utils/findfs.c:58 misc-utils/look.c:149 misc-utils/whereis.c:586
 #: misc-utils/whereis.c:597 misc-utils/whereis.c:608 misc-utils/whereis.c:650
-#: schedutils/chrt.c:504 schedutils/ionice.c:262 schedutils/taskset.c:188
-#: sys-utils/chcpu.c:355 sys-utils/chmem.c:422 sys-utils/dmesg.c:1470
+#: schedutils/chrt.c:513 schedutils/ionice.c:262 schedutils/taskset.c:188
+#: sys-utils/chcpu.c:355 sys-utils/chmem.c:422 sys-utils/dmesg.c:1489
 #: sys-utils/ipcmk.c:134 sys-utils/ldattach.c:321 sys-utils/losetup.c:913
-#: sys-utils/lscpu.c:2349 sys-utils/lsmem.c:631 sys-utils/mount.c:809
-#: sys-utils/mount.c:817 sys-utils/mount.c:864 sys-utils/mount.c:877
-#: sys-utils/mount.c:949 sys-utils/mountpoint.c:179 sys-utils/pivot_root.c:71
+#: sys-utils/lscpu.c:2401 sys-utils/lsmem.c:631 sys-utils/mount.c:812
+#: sys-utils/mount.c:820 sys-utils/mount.c:867 sys-utils/mount.c:880
+#: sys-utils/mount.c:952 sys-utils/mountpoint.c:189 sys-utils/pivot_root.c:71
 #: sys-utils/swapoff.c:229 sys-utils/swapon.c:993 sys-utils/switch_root.c:249
-#: sys-utils/umount.c:587 term-utils/setterm.c:1179 text-utils/col.c:233
+#: sys-utils/umount.c:598 term-utils/setterm.c:1200 text-utils/col.c:233
 #: text-utils/more.c:1986
 msgid "bad usage"
 msgstr ""
 
-#: disk-utils/fdisk.c:1067
+#: disk-utils/fdisk.c:1073
 #, c-format
 msgid "Welcome to fdisk (%s)."
 msgstr "欢迎使用 fdisk (%s)。"
 
-#: disk-utils/fdisk.c:1069 disk-utils/sfdisk.c:1621
+#: disk-utils/fdisk.c:1075 disk-utils/sfdisk.c:1701
 msgid ""
 "Changes will remain in memory only, until you decide to write them.\n"
 "Be careful before using the write command.\n"
@@ -1134,7 +1136,7 @@
 "更改将停留在内存中，直到您决定将更改写入磁盘。\n"
 "使用写入命令前请三思。\n"
 
-#: disk-utils/fdisk.c:1092
+#: disk-utils/fdisk.c:1098
 msgid ""
 "A hybrid GPT was detected. You have to sync the hybrid MBR manually (expert "
 "command 'M')."
@@ -1186,38 +1188,38 @@
 msgstr "分配迭代器失败"
 
 #: disk-utils/fdisk-list.c:126 disk-utils/fdisk-list.c:246
-#: disk-utils/partx.c:668 login-utils/lslogins.c:1013 misc-utils/fincore.c:356
-#: misc-utils/findmnt.c:1625 misc-utils/lsblk.c:2031 misc-utils/lslocks.c:456
+#: disk-utils/partx.c:667 login-utils/lslogins.c:1025 misc-utils/fincore.c:356
+#: misc-utils/findmnt.c:1625 misc-utils/lsblk.c:2077 misc-utils/lslocks.c:456
 #: misc-utils/uuidparse.c:252 misc-utils/wipefs.c:156 sys-utils/losetup.c:325
-#: sys-utils/lscpu.c:1634 sys-utils/lscpu.c:1825 sys-utils/lscpu.c:1957
+#: sys-utils/lscpu.c:1664 sys-utils/lscpu.c:1877 sys-utils/lscpu.c:2009
 #: sys-utils/lsipc.c:351 sys-utils/prlimit.c:297 sys-utils/rfkill.c:459
-#: sys-utils/swapon.c:284 sys-utils/wdctl.c:260 sys-utils/zramctl.c:494
-#: text-utils/column.c:208
+#: sys-utils/swapon.c:284 sys-utils/wdctl.c:299 sys-utils/zramctl.c:494
+#: text-utils/column.c:209
 msgid "failed to allocate output table"
 msgstr "分配输出表失败"
 
 #: disk-utils/fdisk-list.c:167 disk-utils/fdisk-list.c:270
-#: disk-utils/partx.c:582 login-utils/lslogins.c:1071 misc-utils/fincore.c:123
-#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1034
+#: disk-utils/partx.c:581 login-utils/lslogins.c:1083 misc-utils/fincore.c:123
+#: misc-utils/findmnt.c:688 misc-utils/findmnt.c:706 misc-utils/lsblk.c:1073
 #: misc-utils/lslocks.c:393 misc-utils/uuidparse.c:154 misc-utils/wipefs.c:223
-#: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:1653
-#: sys-utils/lscpu.c:1853 sys-utils/lscpu.c:1881 sys-utils/lsipc.c:480
+#: sys-utils/losetup.c:348 sys-utils/losetup.c:377 sys-utils/lscpu.c:1683
+#: sys-utils/lscpu.c:1905 sys-utils/lscpu.c:1933 sys-utils/lsipc.c:480
 #: sys-utils/lsipc.c:555 sys-utils/lsipc.c:657 sys-utils/lsipc.c:749
 #: sys-utils/lsipc.c:910 sys-utils/prlimit.c:229 sys-utils/rfkill.c:376
-#: sys-utils/swapon.c:179 sys-utils/wdctl.c:214 sys-utils/zramctl.c:412
-#: text-utils/column.c:452 text-utils/column.c:473
+#: sys-utils/swapon.c:179 sys-utils/wdctl.c:249 sys-utils/zramctl.c:412
+#: text-utils/column.c:453 text-utils/column.c:474
 msgid "failed to allocate output line"
 msgstr "分配输出行失败"
 
 #: disk-utils/fdisk-list.c:177 disk-utils/fdisk-list.c:277
-#: disk-utils/partx.c:645 login-utils/lslogins.c:1172 misc-utils/fincore.c:159
-#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1075
+#: disk-utils/partx.c:644 login-utils/lslogins.c:1184 misc-utils/fincore.c:159
+#: misc-utils/findmnt.c:692 misc-utils/findmnt.c:711 misc-utils/lsblk.c:1114
 #: misc-utils/lslocks.c:443 misc-utils/uuidparse.c:239 misc-utils/wipefs.c:263
-#: sys-utils/losetup.c:305 sys-utils/lscpu.c:1699 sys-utils/lscpu.c:1861
-#: sys-utils/lscpu.c:1885 sys-utils/lscpu.c:1893 sys-utils/lsipc.c:514
+#: sys-utils/losetup.c:305 sys-utils/lscpu.c:1750 sys-utils/lscpu.c:1913
+#: sys-utils/lscpu.c:1937 sys-utils/lscpu.c:1945 sys-utils/lsipc.c:514
 #: sys-utils/lsipc.c:639 sys-utils/prlimit.c:261 sys-utils/rfkill.c:404
-#: sys-utils/swapon.c:227 sys-utils/wdctl.c:242 sys-utils/zramctl.c:479
-#: text-utils/column.c:459
+#: sys-utils/swapon.c:227 sys-utils/wdctl.c:277 sys-utils/zramctl.c:479
+#: text-utils/column.c:460
 msgid "failed to add output data"
 msgstr ""
 
@@ -1235,23 +1237,23 @@
 msgid "Partition table entries are not in disk order."
 msgstr "分区表记录没有按磁盘顺序。"
 
-#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1025 libfdisk/src/dos.c:2501
-#: libfdisk/src/gpt.c:3138 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1122
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2495
+#: libfdisk/src/gpt.c:3005 libfdisk/src/sgi.c:1154 libfdisk/src/sun.c:1130
 msgid "Start"
 msgstr "起点"
 
-#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1026 libfdisk/src/dos.c:2502
-#: libfdisk/src/gpt.c:3139 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1123
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2496
+#: libfdisk/src/gpt.c:3006 libfdisk/src/sgi.c:1155 libfdisk/src/sun.c:1131
 msgid "End"
 msgstr "末尾"
 
-#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1027 libfdisk/src/dos.c:2503
-#: libfdisk/src/gpt.c:3140 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1124
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2497
+#: libfdisk/src/gpt.c:3007 libfdisk/src/sgi.c:1156 libfdisk/src/sun.c:1132
 msgid "Sectors"
 msgstr "扇区"
 
-#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2505
-#: libfdisk/src/gpt.c:3141 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1126
+#: disk-utils/fdisk-list.c:232 libfdisk/src/bsd.c:1030 libfdisk/src/dos.c:2499
+#: libfdisk/src/gpt.c:3008 libfdisk/src/sgi.c:1158 libfdisk/src/sun.c:1134
 msgid "Size"
 msgstr "大小"
 
@@ -1265,127 +1267,127 @@
 msgid "%s unknown column: %s"
 msgstr "%s 未知列: %s"
 
-#: disk-utils/fdisk-menu.c:97
+#: disk-utils/fdisk-menu.c:96
 msgid "Generic"
 msgstr "常规"
 
-#: disk-utils/fdisk-menu.c:98
+#: disk-utils/fdisk-menu.c:97
 msgid "delete a partition"
 msgstr "删除分区"
 
-#: disk-utils/fdisk-menu.c:99
+#: disk-utils/fdisk-menu.c:98
 msgid "list free unpartitioned space"
 msgstr "列出未分区的空闲区"
 
-#: disk-utils/fdisk-menu.c:100
+#: disk-utils/fdisk-menu.c:99
 msgid "list known partition types"
 msgstr "列出已知分区类型"
 
-#: disk-utils/fdisk-menu.c:101
+#: disk-utils/fdisk-menu.c:100
 msgid "add a new partition"
 msgstr "添加新分区"
 
-#: disk-utils/fdisk-menu.c:102
+#: disk-utils/fdisk-menu.c:101
 msgid "print the partition table"
 msgstr "打印分区表"
 
-#: disk-utils/fdisk-menu.c:103
+#: disk-utils/fdisk-menu.c:102
 msgid "change a partition type"
 msgstr "更改分区类型"
 
-#: disk-utils/fdisk-menu.c:104
+#: disk-utils/fdisk-menu.c:103
 msgid "verify the partition table"
 msgstr "检查分区表"
 
-#: disk-utils/fdisk-menu.c:105
+#: disk-utils/fdisk-menu.c:104
 msgid "print information about a partition"
 msgstr "打印某个分区的相关信息"
 
-#: disk-utils/fdisk-menu.c:107
+#: disk-utils/fdisk-menu.c:106
 msgid "print the raw data of the first sector from the device"
 msgstr "打印设备第1个扇区的原始数据"
 
-#: disk-utils/fdisk-menu.c:108
+#: disk-utils/fdisk-menu.c:107
 msgid "print the raw data of the disklabel from the device"
 msgstr "打印设备磁盘标签的原始数据"
 
-#: disk-utils/fdisk-menu.c:109
+#: disk-utils/fdisk-menu.c:108
 msgid "fix partitions order"
 msgstr "修复分区顺序"
 
-#: disk-utils/fdisk-menu.c:111
+#: disk-utils/fdisk-menu.c:110
 msgid "Misc"
 msgstr "杂项"
 
-#: disk-utils/fdisk-menu.c:112
+#: disk-utils/fdisk-menu.c:111
 msgid "print this menu"
 msgstr "打印此菜单"
 
-#: disk-utils/fdisk-menu.c:113
+#: disk-utils/fdisk-menu.c:112
 msgid "change display/entry units"
 msgstr "更改 显示/记录 单位"
 
-#: disk-utils/fdisk-menu.c:114
+#: disk-utils/fdisk-menu.c:113
 msgid "extra functionality (experts only)"
 msgstr "更多功能(仅限专业人员)"
 
-#: disk-utils/fdisk-menu.c:116
+#: disk-utils/fdisk-menu.c:115
 msgid "Script"
 msgstr "脚本"
 
-#: disk-utils/fdisk-menu.c:117
+#: disk-utils/fdisk-menu.c:116
 msgid "load disk layout from sfdisk script file"
 msgstr "从 sfdisk 脚本文件加载磁盘布局"
 
-#: disk-utils/fdisk-menu.c:118
+#: disk-utils/fdisk-menu.c:117
 msgid "dump disk layout to sfdisk script file"
 msgstr "将磁盘布局转储为 sfdisk 脚本文件"
 
-#: disk-utils/fdisk-menu.c:120
+#: disk-utils/fdisk-menu.c:119
 msgid "Save & Exit"
 msgstr "保存并退出"
 
-#: disk-utils/fdisk-menu.c:121
+#: disk-utils/fdisk-menu.c:120
 msgid "write table to disk and exit"
 msgstr "将分区表写入磁盘并退出"
 
-#: disk-utils/fdisk-menu.c:122
+#: disk-utils/fdisk-menu.c:121
 msgid "write table to disk"
 msgstr "将分区表写入磁盘"
 
-#: disk-utils/fdisk-menu.c:123
+#: disk-utils/fdisk-menu.c:122
 msgid "quit without saving changes"
 msgstr "退出而不保存更改"
 
-#: disk-utils/fdisk-menu.c:124
+#: disk-utils/fdisk-menu.c:123
 msgid "return to main menu"
 msgstr "返回主菜单"
 
-#: disk-utils/fdisk-menu.c:126
+#: disk-utils/fdisk-menu.c:125
 msgid "return from BSD to DOS"
 msgstr "从 BSD 回到 DOS"
 
-#: disk-utils/fdisk-menu.c:137
+#: disk-utils/fdisk-menu.c:138
 msgid "Create a new label"
 msgstr "新建空磁盘标签"
 
-#: disk-utils/fdisk-menu.c:138
+#: disk-utils/fdisk-menu.c:139
 msgid "create a new empty GPT partition table"
 msgstr "新建一份 GPT 分区表"
 
-#: disk-utils/fdisk-menu.c:139
+#: disk-utils/fdisk-menu.c:140
 msgid "create a new empty SGI (IRIX) partition table"
 msgstr "新建一份空 GPT (IRIX) 分区表"
 
-#: disk-utils/fdisk-menu.c:140
+#: disk-utils/fdisk-menu.c:141
 msgid "create a new empty DOS partition table"
 msgstr "新建一份的空 DOS 分区表"
 
-#: disk-utils/fdisk-menu.c:141
+#: disk-utils/fdisk-menu.c:142
 msgid "create a new empty Sun partition table"
 msgstr "新建一份空 Sun 分区表"
 
-#: disk-utils/fdisk-menu.c:145
+#: disk-utils/fdisk-menu.c:146
 msgid "create an IRIX (SGI) partition table"
 msgstr "创建一份 IRIX(SGI) 分区表"
 
@@ -1393,159 +1395,159 @@
 msgid "Geometry"
 msgstr "几何属性"
 
-#: disk-utils/fdisk-menu.c:155
+#: disk-utils/fdisk-menu.c:156
 msgid "change number of cylinders"
 msgstr "更改柱面数"
 
-#: disk-utils/fdisk-menu.c:156
+#: disk-utils/fdisk-menu.c:157
 msgid "change number of heads"
 msgstr "更改磁头数"
 
-#: disk-utils/fdisk-menu.c:157
+#: disk-utils/fdisk-menu.c:158
 msgid "change number of sectors/track"
 msgstr "更改扇区/磁道数"
 
-#: disk-utils/fdisk-menu.c:166 include/pt-mbr-partnames.h:95
+#: disk-utils/fdisk-menu.c:167 include/pt-mbr-partnames.h:98
 msgid "GPT"
 msgstr "GPT"
 
-#: disk-utils/fdisk-menu.c:167
+#: disk-utils/fdisk-menu.c:168
 msgid "change disk GUID"
 msgstr "更改磁盘 GUID"
 
-#: disk-utils/fdisk-menu.c:168
+#: disk-utils/fdisk-menu.c:169
 msgid "change partition name"
 msgstr "更改分区名"
 
-#: disk-utils/fdisk-menu.c:169
+#: disk-utils/fdisk-menu.c:170
 msgid "change partition UUID"
 msgstr "更改分区 UUID"
 
-#: disk-utils/fdisk-menu.c:170
+#: disk-utils/fdisk-menu.c:171
 msgid "change table length"
 msgstr "更改表长度"
 
-#: disk-utils/fdisk-menu.c:171
+#: disk-utils/fdisk-menu.c:172
 msgid "enter protective/hybrid MBR"
 msgstr "进入 保护/混合 MBR"
 
-#: disk-utils/fdisk-menu.c:174
+#: disk-utils/fdisk-menu.c:175
 msgid "toggle the legacy BIOS bootable flag"
 msgstr "开关旧 BIOS 的 可启动 标志"
 
-#: disk-utils/fdisk-menu.c:175
+#: disk-utils/fdisk-menu.c:176
 msgid "toggle the no block IO protocol flag"
 msgstr "开关 不阻塞 IO 协议 标志"
 
-#: disk-utils/fdisk-menu.c:176
+#: disk-utils/fdisk-menu.c:177
 msgid "toggle the required partition flag"
 msgstr "开关 必需分区 标志"
 
-#: disk-utils/fdisk-menu.c:177
+#: disk-utils/fdisk-menu.c:178
 msgid "toggle the GUID specific bits"
 msgstr "开/关 GUID 特定位"
 
-#: disk-utils/fdisk-menu.c:187
+#: disk-utils/fdisk-menu.c:188
 msgid "Sun"
 msgstr "Sun"
 
-#: disk-utils/fdisk-menu.c:188
+#: disk-utils/fdisk-menu.c:189
 msgid "toggle the read-only flag"
 msgstr "开关 只读 标志"
 
-#: disk-utils/fdisk-menu.c:189
+#: disk-utils/fdisk-menu.c:190
 msgid "toggle the mountable flag"
 msgstr "开关 可挂臷 标志"
 
-#: disk-utils/fdisk-menu.c:191
+#: disk-utils/fdisk-menu.c:192
 msgid "change number of alternate cylinders"
 msgstr "更改备选柱面数"
 
-#: disk-utils/fdisk-menu.c:192
+#: disk-utils/fdisk-menu.c:193
 msgid "change number of extra sectors per cylinder"
 msgstr "更改每柱面的额外扇区数"
 
-#: disk-utils/fdisk-menu.c:193
+#: disk-utils/fdisk-menu.c:194
 msgid "change interleave factor"
 msgstr "更改交错系数"
 
-#: disk-utils/fdisk-menu.c:194
+#: disk-utils/fdisk-menu.c:195
 msgid "change rotation speed (rpm)"
 msgstr "更改转速(转/分)"
 
-#: disk-utils/fdisk-menu.c:195
+#: disk-utils/fdisk-menu.c:196
 msgid "change number of physical cylinders"
 msgstr "更改物理柱面数"
 
-#: disk-utils/fdisk-menu.c:204
+#: disk-utils/fdisk-menu.c:205
 msgid "SGI"
 msgstr "SGI"
 
-#: disk-utils/fdisk-menu.c:205
+#: disk-utils/fdisk-menu.c:206
 msgid "select bootable partition"
 msgstr "选择可启动分区"
 
-#: disk-utils/fdisk-menu.c:206
+#: disk-utils/fdisk-menu.c:207
 msgid "edit bootfile entry"
 msgstr "编辑启动文件记录"
 
-#: disk-utils/fdisk-menu.c:207
+#: disk-utils/fdisk-menu.c:208
 msgid "select sgi swap partition"
 msgstr "选择 sgi 交换分区"
 
-#: disk-utils/fdisk-menu.c:208
+#: disk-utils/fdisk-menu.c:209
 msgid "create SGI info"
 msgstr "创建 SGI 信息"
 
-#: disk-utils/fdisk-menu.c:217
+#: disk-utils/fdisk-menu.c:218
 msgid "DOS (MBR)"
 msgstr "DOS (MBR)"
 
-#: disk-utils/fdisk-menu.c:218
+#: disk-utils/fdisk-menu.c:219
 msgid "toggle a bootable flag"
 msgstr "开关 可启动 标志"
 
-#: disk-utils/fdisk-menu.c:219
+#: disk-utils/fdisk-menu.c:220
 msgid "edit nested BSD disklabel"
 msgstr "编辑嵌套的 BSD 磁盘标签"
 
-#: disk-utils/fdisk-menu.c:220
+#: disk-utils/fdisk-menu.c:221
 msgid "toggle the dos compatibility flag"
 msgstr "开关 dos 兼容性标志"
 
-#: disk-utils/fdisk-menu.c:222
+#: disk-utils/fdisk-menu.c:223
 msgid "move beginning of data in a partition"
 msgstr "移动分区数据的起始点"
 
-#: disk-utils/fdisk-menu.c:223
+#: disk-utils/fdisk-menu.c:224
 msgid "change the disk identifier"
 msgstr "更改磁盘标识符"
 
-#: disk-utils/fdisk-menu.c:225
+#: disk-utils/fdisk-menu.c:127 disk-utils/fdisk-menu.c:226
 msgid "return from protective/hybrid MBR to GPT"
 msgstr "从 保护/混合 MBR 回到 GPT"
 
-#: disk-utils/fdisk-menu.c:235
+#: disk-utils/fdisk-menu.c:236
 msgid "BSD"
 msgstr "BSD"
 
-#: disk-utils/fdisk-menu.c:236
+#: disk-utils/fdisk-menu.c:237
 msgid "edit drive data"
 msgstr "编辑驱动数据"
 
-#: disk-utils/fdisk-menu.c:237
+#: disk-utils/fdisk-menu.c:238
 msgid "install bootstrap"
 msgstr "安装引导程序"
 
-#: disk-utils/fdisk-menu.c:238
+#: disk-utils/fdisk-menu.c:239
 msgid "show complete disklabel"
 msgstr "显示完整磁盘标签"
 
-#: disk-utils/fdisk-menu.c:239
+#: disk-utils/fdisk-menu.c:240
 msgid "link BSD partition to non-BSD partition"
 msgstr "将 BSD 分区链接到非 BSD 分区"
 
-#: disk-utils/fdisk-menu.c:371
+#: disk-utils/fdisk-menu.c:372
 #, c-format
 msgid ""
 "\n"
@@ -1554,7 +1556,7 @@
 "\n"
 "帮助 (专业命令)：\n"
 
-#: disk-utils/fdisk-menu.c:373 disk-utils/sfdisk.c:1288
+#: disk-utils/fdisk-menu.c:374 disk-utils/sfdisk.c:1366
 #, c-format
 msgid ""
 "\n"
@@ -1563,17 +1565,17 @@
 "\n"
 "帮助：\n"
 
-#: disk-utils/fdisk-menu.c:393
+#: disk-utils/fdisk-menu.c:394
 #, c-format
 msgid ""
 "You're editing nested '%s' partition table, primary partition table is '%s'."
 msgstr "您正在编辑嵌套的“%s”分区表，主分区表为“%s”。"
 
-#: disk-utils/fdisk-menu.c:423
+#: disk-utils/fdisk-menu.c:424
 msgid "Expert command (m for help): "
 msgstr "专家命令(输入 m 显示帮助)： "
 
-#: disk-utils/fdisk-menu.c:425
+#: disk-utils/fdisk-menu.c:426
 msgid "Command (m for help): "
 msgstr "命令(输入 m 获取帮助)： "
 
@@ -1585,102 +1587,102 @@
 "\n"
 "您确实要退出吗？ "
 
-#: disk-utils/fdisk-menu.c:448
+#: disk-utils/fdisk-menu.c:449
 #, c-format
 msgid "%c: unknown command"
 msgstr "%c：未知命令"
 
-#: disk-utils/fdisk-menu.c:473 disk-utils/fdisk-menu.c:506
+#: disk-utils/fdisk-menu.c:474 disk-utils/fdisk-menu.c:507
 msgid "Enter script file name"
 msgstr "输入脚本文件名"
 
-#: disk-utils/fdisk-menu.c:485
+#: disk-utils/fdisk-menu.c:486
 msgid "Resetting fdisk!"
 msgstr ""
 
-#: disk-utils/fdisk-menu.c:492
+#: disk-utils/fdisk-menu.c:493
 msgid "Script successfully applied."
 msgstr "成功应用了脚本。"
 
-#: disk-utils/fdisk-menu.c:518
+#: disk-utils/fdisk-menu.c:519
 msgid "Failed to transform disk layout into script"
 msgstr "将磁盘布局转换成脚本失败"
 
-#: disk-utils/fdisk-menu.c:532
+#: disk-utils/fdisk-menu.c:533
 msgid "Script successfully saved."
 msgstr "成本保存了脚本。"
 
-#: disk-utils/fdisk-menu.c:555 disk-utils/sfdisk.c:1509
+#: disk-utils/fdisk-menu.c:556 disk-utils/sfdisk.c:1589
 #, c-format
 msgid "Partition #%zu contains a %s signature."
 msgstr "分区 #%zu 包含一个 %s 签名。"
 
-#: disk-utils/fdisk-menu.c:558 disk-utils/sfdisk.c:1512
+#: disk-utils/fdisk-menu.c:559 disk-utils/sfdisk.c:1592
 msgid "Do you want to remove the signature?"
 msgstr "您想移除该签名吗？"
 
-#: disk-utils/fdisk-menu.c:563 disk-utils/sfdisk.c:1517
+#: disk-utils/fdisk-menu.c:564 disk-utils/sfdisk.c:1597
 msgid "The signature will be removed by a write command."
 msgstr "写入命令将移除该签名。"
 
-#: disk-utils/fdisk-menu.c:596
+#: disk-utils/fdisk-menu.c:597
 msgid "failed to write disklabel"
 msgstr "写磁盘标签失败"
 
-#: disk-utils/fdisk-menu.c:638
+#: disk-utils/fdisk-menu.c:640
 msgid "Failed to fix partitions order."
 msgstr "修复分区顺序失败。"
 
-#: disk-utils/fdisk-menu.c:640
+#: disk-utils/fdisk-menu.c:642
 msgid "Partitions order fixed."
 msgstr "已修复分区顺序。"
 
-#: disk-utils/fdisk-menu.c:658
+#: disk-utils/fdisk-menu.c:660
 #, c-format
 msgid "Could not delete partition %zu"
 msgstr "无法删除分区 %zu"
 
-#: disk-utils/fdisk-menu.c:687
+#: disk-utils/fdisk-menu.c:689
 msgid "Changing display/entry units to cylinders (DEPRECATED!)."
 msgstr "将显示/记录单位更改为柱面(已废弃！)。"
 
-#: disk-utils/fdisk-menu.c:689
+#: disk-utils/fdisk-menu.c:691
 msgid "Changing display/entry units to sectors."
 msgstr "将显示/记录单位更改为盲区。"
 
-#: disk-utils/fdisk-menu.c:699 disk-utils/fdisk-menu.c:870
+#: disk-utils/fdisk-menu.c:701 disk-utils/fdisk-menu.c:872
 msgid "Leaving nested disklabel."
 msgstr "离开嵌套的磁盘标签。"
 
-#: disk-utils/fdisk-menu.c:736
+#: disk-utils/fdisk-menu.c:738
 msgid "New maximum entries"
 msgstr "新的最大记录数"
 
-#: disk-utils/fdisk-menu.c:747
+#: disk-utils/fdisk-menu.c:749
 msgid "Entering protective/hybrid MBR disklabel."
 msgstr "进入 保护/混合 MBR 磁盘标签。"
 
-#: disk-utils/fdisk-menu.c:763
+#: disk-utils/fdisk-menu.c:765
 msgid "New UUID (in 8-4-4-4-12 format)"
 msgstr "新 UUID (以 8-4-4-4-12 格式)"
 
-#: disk-utils/fdisk-menu.c:778
+#: disk-utils/fdisk-menu.c:780
 msgid "New name"
 msgstr "新名称"
 
-#: disk-utils/fdisk-menu.c:841
+#: disk-utils/fdisk-menu.c:843
 msgid "Entering nested BSD disklabel."
 msgstr "进入嵌套的 BSD 磁盘标签。"
 
-#: disk-utils/fdisk-menu.c:1039
+#: disk-utils/fdisk-menu.c:1041
 msgid "Number of cylinders"
 msgstr "柱面数"
 
-#: disk-utils/fdisk-menu.c:1046
+#: disk-utils/fdisk-menu.c:1048
 msgid "Number of heads"
 msgstr "磁头数"
 
-#: disk-utils/fdisk-menu.c:1052
+#: disk-utils/fdisk-menu.c:1054
 msgid "Number of sectors"
 msgstr "扇区数"
 
@@ -1696,12 +1698,12 @@
 
 #: disk-utils/fsck.c:329 disk-utils/fsck.cramfs.c:171
 #: disk-utils/fsck.cramfs.c:178 disk-utils/fsck.cramfs.c:234
-#: disk-utils/fsck.cramfs.c:255 disk-utils/sfdisk.c:298 libfdisk/src/bsd.c:646
+#: disk-utils/fsck.cramfs.c:255 disk-utils/sfdisk.c:301 libfdisk/src/bsd.c:647
 #: login-utils/last.c:208 login-utils/last.c:245 login-utils/sulogin.c:657
 #: misc-utils/hardlink.c:290 misc-utils/hardlink.c:292
-#: sys-utils/ctrlaltdel.c:44 sys-utils/rfkill.c:213 sys-utils/setpriv.c:299
-#: term-utils/setterm.c:726 term-utils/setterm.c:783 term-utils/setterm.c:787
-#: term-utils/setterm.c:794
+#: sys-utils/ctrlaltdel.c:44 sys-utils/rfkill.c:213 sys-utils/setpriv.c:268
+#: term-utils/setterm.c:747 term-utils/setterm.c:804 term-utils/setterm.c:808
+#: term-utils/setterm.c:815
 #, c-format
 msgid "cannot read %s"
 msgstr "不能读 %s"
@@ -1746,7 +1748,7 @@
 msgstr "设置 %s 描述 失败"
 
 #: disk-utils/fsck.c:472 misc-utils/findmnt.c:784 misc-utils/lsblk-mnt.c:17
-#: sys-utils/mount.c:101 sys-utils/swapon-common.c:19 sys-utils/umount.c:51
+#: sys-utils/mount.c:95 sys-utils/swapon-common.c:19 sys-utils/umount.c:51
 #, c-format
 msgid "%s: parse error at line %d -- ignored"
 msgstr "%s：第 %d 行解析出错 -- 已忽略"
@@ -1758,8 +1760,7 @@
 
 #: disk-utils/fsck.c:687 login-utils/login.c:943 login-utils/sulogin.c:1024
 #: login-utils/vipw.c:208 sys-utils/flock.c:348 sys-utils/nsenter.c:180
-#: sys-utils/swapon.c:320 sys-utils/unshare.c:223 sys-utils/unshare.c:466
-#: term-utils/script.c:880
+#: sys-utils/swapon.c:320 sys-utils/unshare.c:229 sys-utils/unshare.c:494
 msgid "fork failed"
 msgstr "fork 失败"
 
@@ -1773,7 +1774,7 @@
 msgstr "等待：没有剩余子进程了？！？"
 
 #: disk-utils/fsck.c:785 sys-utils/flock.c:366 sys-utils/swapon.c:352
-#: sys-utils/unshare.c:450 sys-utils/unshare.c:471
+#: sys-utils/unshare.c:478 sys-utils/unshare.c:499
 msgid "waitpid failed"
 msgstr "waitpid 失败"
 
@@ -1928,8 +1929,8 @@
 msgid "couldn't find matching filesystem: %s"
 msgstr "找不到匹配的文件系统：%s"
 
-#: disk-utils/fsck.c:1490 disk-utils/fsck.c:1587 misc-utils/kill.c:234
-#: sys-utils/eject.c:276
+#: disk-utils/fsck.c:1490 disk-utils/fsck.c:1587 misc-utils/kill.c:281
+#: sys-utils/eject.c:279
 msgid "too many arguments"
 msgstr "参数过多"
 
@@ -1942,7 +1943,7 @@
 msgid "option '%s' may be specified only once"
 msgstr ""
 
-#: disk-utils/fsck.c:1567 misc-utils/kill.c:280
+#: disk-utils/fsck.c:1567 misc-utils/kill.c:327 misc-utils/kill.c:343
 #, c-format
 msgid "option '%s' requires an argument"
 msgstr "“%s”选项需要一个参数"
@@ -2001,7 +2002,7 @@
 msgstr "文件长度过短"
 
 #: disk-utils/fsck.cramfs.c:176 disk-utils/fsck.cramfs.c:231
-#: disk-utils/fsck.cramfs.c:251 libfdisk/src/bsd.c:718 libfdisk/src/bsd.c:900
+#: disk-utils/fsck.cramfs.c:251 libfdisk/src/bsd.c:719 libfdisk/src/bsd.c:901
 #: login-utils/last.c:203 login-utils/last.c:237 sys-utils/fallocate.c:203
 #, c-format
 msgid "seek on %s failed"
@@ -2085,7 +2086,7 @@
 msgid "  hole at %lu (%zu)\n"
 msgstr "  位于 %lu 的空洞(%zu)\n"
 
-#: disk-utils/fsck.cramfs.c:399 disk-utils/fsck.cramfs.c:552
+#: disk-utils/fsck.cramfs.c:399 disk-utils/fsck.cramfs.c:551
 #, c-format
 msgid "  uncompressing block at %lu to %lu (%lu)\n"
 msgstr "  正在将 %lu 处的块解压到 %lu (%lu)\n"
@@ -2100,122 +2101,122 @@
 msgid "non-size (%ld vs %ld) bytes"
 msgstr "无大小(%ld ： %ld)字节"
 
-#: disk-utils/fsck.cramfs.c:415 disk-utils/fsck.cramfs.c:518
+#: disk-utils/fsck.cramfs.c:415 disk-utils/fsck.cramfs.c:517
 #: disk-utils/swaplabel.c:109 misc-utils/uuidd.c:369 sys-utils/fallocate.c:411
-#: sys-utils/rfkill.c:560 sys-utils/setpriv.c:665 sys-utils/setpriv.c:688
-#: sys-utils/swapon.c:393 term-utils/ttymsg.c:175
+#: sys-utils/rfkill.c:560 sys-utils/setpriv.c:634 sys-utils/setpriv.c:657
+#: sys-utils/swapon.c:393 term-utils/script.c:318 term-utils/ttymsg.c:175
 #, c-format
 msgid "write failed: %s"
 msgstr "写失败：%s"
 
-#: disk-utils/fsck.cramfs.c:426
+#: disk-utils/fsck.cramfs.c:425
 #, c-format
 msgid "lchown failed: %s"
 msgstr "lchown 失败：%s"
 
-#: disk-utils/fsck.cramfs.c:430
+#: disk-utils/fsck.cramfs.c:429
 #, c-format
 msgid "chown failed: %s"
 msgstr "chown 失败：%s"
 
-#: disk-utils/fsck.cramfs.c:435
+#: disk-utils/fsck.cramfs.c:431
 #, c-format
 msgid "utime failed: %s"
 msgstr "utime 失败：%s"
 
-#: disk-utils/fsck.cramfs.c:447
+#: disk-utils/fsck.cramfs.c:446
 #, c-format
 msgid "directory inode has zero offset and non-zero size: %s"
 msgstr "目录 inode 偏移为 0，大小不为 0：%s"
 
-#: disk-utils/fsck.cramfs.c:462
+#: disk-utils/fsck.cramfs.c:461
 #, c-format
 msgid "mkdir failed: %s"
 msgstr "mkdir 失败：%s"
 
-#: disk-utils/fsck.cramfs.c:478
+#: disk-utils/fsck.cramfs.c:477
 msgid "filename length is zero"
 msgstr "文件名长度为 0"
 
-#: disk-utils/fsck.cramfs.c:480
+#: disk-utils/fsck.cramfs.c:479
 msgid "bad filename length"
 msgstr "文件名长度有误"
 
-#: disk-utils/fsck.cramfs.c:486
+#: disk-utils/fsck.cramfs.c:485
 msgid "bad inode offset"
 msgstr "inode 偏移有误"
 
-#: disk-utils/fsck.cramfs.c:501
+#: disk-utils/fsck.cramfs.c:500
 msgid "file inode has zero offset and non-zero size"
 msgstr "文件 inode 偏移为 0，大小不为 0"
 
-#: disk-utils/fsck.cramfs.c:504
+#: disk-utils/fsck.cramfs.c:503
 msgid "file inode has zero size and non-zero offset"
 msgstr "文件 inode 大小为 0，偏移不为 0"
 
-#: disk-utils/fsck.cramfs.c:533
+#: disk-utils/fsck.cramfs.c:532
 msgid "symbolic link has zero offset"
 msgstr "符号链接偏移为 0"
 
-#: disk-utils/fsck.cramfs.c:535
+#: disk-utils/fsck.cramfs.c:534
 msgid "symbolic link has zero size"
 msgstr "符号链接大小为 0"
 
-#: disk-utils/fsck.cramfs.c:544
+#: disk-utils/fsck.cramfs.c:543
 #, c-format
 msgid "size error in symlink: %s"
 msgstr "符号链接大小出错：%s"
 
-#: disk-utils/fsck.cramfs.c:558
+#: disk-utils/fsck.cramfs.c:557
 #, c-format
 msgid "symlink failed: %s"
 msgstr "symlink 失败：%s"
 
-#: disk-utils/fsck.cramfs.c:571
+#: disk-utils/fsck.cramfs.c:570
 #, c-format
 msgid "special file has non-zero offset: %s"
 msgstr "特殊文件的偏移不为 0：%s"
 
-#: disk-utils/fsck.cramfs.c:581
+#: disk-utils/fsck.cramfs.c:580
 #, c-format
 msgid "fifo has non-zero size: %s"
 msgstr "FIFO 的大小不为 0：%s"
 
-#: disk-utils/fsck.cramfs.c:587
+#: disk-utils/fsck.cramfs.c:586
 #, c-format
 msgid "socket has non-zero size: %s"
 msgstr "套接字的大小不为 0：%s"
 
-#: disk-utils/fsck.cramfs.c:590
+#: disk-utils/fsck.cramfs.c:589
 #, c-format
 msgid "bogus mode: %s (%o)"
 msgstr "伪(bogus)模式：%s (%o)"
 
-#: disk-utils/fsck.cramfs.c:599
+#: disk-utils/fsck.cramfs.c:598
 #, c-format
 msgid "mknod failed: %s"
 msgstr "mknod 失败：%s"
 
-#: disk-utils/fsck.cramfs.c:631
+#: disk-utils/fsck.cramfs.c:630
 #, c-format
 msgid ""
 "directory data start (%lu) < sizeof(struct cramfs_super) + start (%zu)"
 msgstr "目录数据起点(%lu) < sizeof(struct cramfs_super) + 起点 (%zu)"
 
-#: disk-utils/fsck.cramfs.c:635
+#: disk-utils/fsck.cramfs.c:634
 #, c-format
 msgid "directory data end (%lu) != file data start (%lu)"
 msgstr "目录数据终点 (%lu) != 文件数据起点 (%lu)"
 
-#: disk-utils/fsck.cramfs.c:639
+#: disk-utils/fsck.cramfs.c:638
 msgid "invalid file data offset"
 msgstr "无效的文件数据偏移"
 
-#: disk-utils/fsck.cramfs.c:687 disk-utils/mkfs.cramfs.c:736
+#: disk-utils/fsck.cramfs.c:686 disk-utils/mkfs.cramfs.c:736
 msgid "invalid blocksize argument"
 msgstr "无效的 块大小 参数"
 
-#: disk-utils/fsck.cramfs.c:710
+#: disk-utils/fsck.cramfs.c:709
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s：OK\n"
@@ -2671,47 +2672,45 @@
 "----------------\n"
 
 #: disk-utils/fsck.minix.c:1431 disk-utils/mkfs.minix.c:837
-#: disk-utils/mkswap.c:541 disk-utils/partx.c:1067 disk-utils/resizepart.c:115
-#: login-utils/su-common.c:327 login-utils/su-common.c:404
-#: login-utils/utmpdump.c:392 sys-utils/dmesg.c:661 sys-utils/wdctl.c:347
-#: sys-utils/wdctl.c:412 term-utils/script.c:363 term-utils/script.c:442
-#: term-utils/setterm.c:890 text-utils/pg.c:1256
+#: disk-utils/mkswap.c:541 disk-utils/partx.c:1066 disk-utils/resizepart.c:115
+#: login-utils/utmpdump.c:392 sys-utils/dmesg.c:675 sys-utils/wdctl.c:386
+#: sys-utils/wdctl.c:446 term-utils/setterm.c:911 text-utils/pg.c:1256
 msgid "write failed"
 msgstr "写失败"
 
-#: disk-utils/isosize.c:106
+#: disk-utils/isosize.c:57
 #, c-format
 msgid "%s: might not be an ISO filesystem"
 msgstr "%s：可能不是 ISO 文件系统"
 
-#: disk-utils/isosize.c:111 disk-utils/isosize.c:113
+#: disk-utils/isosize.c:62 disk-utils/isosize.c:64
 #, c-format
 msgid "read error on %s"
 msgstr "%s 读出错"
 
-#: disk-utils/isosize.c:124
+#: disk-utils/isosize.c:75
 #, c-format
 msgid "sector count: %d, sector size: %d\n"
 msgstr "扇区计数：%d，扇区大小：%d\n"
 
-#: disk-utils/isosize.c:148
+#: disk-utils/isosize.c:99
 #, c-format
 msgid " %s [options] <iso9660_image_file> ...\n"
 msgstr ""
 
-#: disk-utils/isosize.c:152
+#: disk-utils/isosize.c:103
 msgid "Show the length of an ISO-9660 filesystem.\n"
 msgstr "显示 ISO-9660 文件系统的长度。\n"
 
-#: disk-utils/isosize.c:155
+#: disk-utils/isosize.c:106
 msgid " -d, --divisor=<number>  divide the amount of bytes by <number>\n"
 msgstr " -d, --divisor=<数字>    将字节数除以 <数字>\n"
 
-#: disk-utils/isosize.c:156
+#: disk-utils/isosize.c:107
 msgid " -x, --sectors           show sector count and size\n"
 msgstr " -x, --sectors           显示扇区计数和大小\n"
 
-#: disk-utils/isosize.c:187
+#: disk-utils/isosize.c:138
 msgid "invalid divisor argument"
 msgstr "无效的 divisor(除数) 参数"
 
@@ -2879,9 +2878,9 @@
 " -V, --verbose      解释正在进行的操作；\n"
 "                      多次指定 -V 将导致空运行(dry-run)\n"
 
-#: disk-utils/mkfs.c:133 include/c.h:252 login-utils/su-common.c:1519
+#: disk-utils/mkfs.c:133 include/c.h:254 login-utils/su-common.c:1207
 #: login-utils/sulogin.c:793 login-utils/sulogin.c:797 sys-utils/flock.c:123
-#: sys-utils/rtcwake.c:609 term-utils/script.c:692
+#: sys-utils/rtcwake.c:609
 #, c-format
 msgid "failed to execute %s"
 msgstr "执行 %s 失败"
@@ -3478,7 +3477,7 @@
 msgid "partition name"
 msgstr "分区名"
 
-#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:171
+#: disk-utils/partx.c:92 misc-utils/findmnt.c:108 misc-utils/lsblk.c:175
 msgid "partition UUID"
 msgstr "分区 UUID"
 
@@ -3486,7 +3485,7 @@
 msgid "partition table type (dos, gpt, ...)"
 msgstr "分区表类型(dos、gpt、...)"
 
-#: disk-utils/partx.c:94 misc-utils/lsblk.c:172
+#: disk-utils/partx.c:94 misc-utils/lsblk.c:176
 msgid "partition flags"
 msgstr "分区标志"
 
@@ -3519,11 +3518,11 @@
 msgstr "%s：设置回环设备失败"
 
 #: disk-utils/partx.c:161 login-utils/lslogins.c:311 misc-utils/fincore.c:92
-#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:311 misc-utils/lslocks.c:344
+#: misc-utils/findmnt.c:376 misc-utils/lsblk.c:315 misc-utils/lslocks.c:344
 #: misc-utils/uuidparse.c:125 misc-utils/wipefs.c:131 sys-utils/losetup.c:112
-#: sys-utils/lscpu.c:235 sys-utils/lscpu.c:250 sys-utils/lsipc.c:232
+#: sys-utils/lscpu.c:245 sys-utils/lscpu.c:260 sys-utils/lsipc.c:232
 #: sys-utils/lsmem.c:178 sys-utils/lsns.c:223 sys-utils/prlimit.c:277
-#: sys-utils/rfkill.c:159 sys-utils/swapon.c:150 sys-utils/wdctl.c:151
+#: sys-utils/rfkill.c:159 sys-utils/swapon.c:150 sys-utils/wdctl.c:161
 #: sys-utils/zramctl.c:147
 #, c-format
 msgid "unknown column: %s"
@@ -3534,7 +3533,7 @@
 msgid "%s: failed to get partition number"
 msgstr "%s：获取分区号失败"
 
-#: disk-utils/partx.c:287 disk-utils/partx.c:325 disk-utils/partx.c:478
+#: disk-utils/partx.c:287 disk-utils/partx.c:325 disk-utils/partx.c:477
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr "指定的范围 <%d:%d> 无效"
@@ -3554,121 +3553,121 @@
 msgid "%s: error deleting partitions %d-%d"
 msgstr "%s：删除分区 %d-%d 出错"
 
-#: disk-utils/partx.c:334
+#: disk-utils/partx.c:333
 #, c-format
 msgid "%s: partition #%d removed\n"
 msgstr "%s：分区 #%d 已移除\n"
 
-#: disk-utils/partx.c:338
+#: disk-utils/partx.c:337
 #, c-format
 msgid "%s: partition #%d doesn't exist\n"
 msgstr "%s：分区 #%d 不存在\n"
 
-#: disk-utils/partx.c:343
+#: disk-utils/partx.c:342
 #, c-format
 msgid "%s: deleting partition #%d failed"
 msgstr "%s：删除分区 #%d 失败"
 
-#: disk-utils/partx.c:363
+#: disk-utils/partx.c:362
 #, c-format
 msgid "%s: error adding partition %d"
 msgstr "%s：添加分区 %d 出错"
 
-#: disk-utils/partx.c:365
+#: disk-utils/partx.c:364
 #, c-format
 msgid "%s: error adding partitions %d-%d"
 msgstr "%s：添加分区 %d-%d 出错"
 
-#: disk-utils/partx.c:406 disk-utils/partx.c:514
+#: disk-utils/partx.c:405 disk-utils/partx.c:513
 #, c-format
 msgid "%s: partition #%d added\n"
 msgstr "%s：分区 #%d 已添加\n"
 
-#: disk-utils/partx.c:411
+#: disk-utils/partx.c:410
 #, c-format
 msgid "%s: adding partition #%d failed"
 msgstr "%s：添加分区 #%d 失败"
 
-#: disk-utils/partx.c:446
+#: disk-utils/partx.c:445
 #, c-format
 msgid "%s: error updating partition %d"
 msgstr "%s：更新分区 %d 出错"
 
-#: disk-utils/partx.c:448
+#: disk-utils/partx.c:447
 #, c-format
 msgid "%s: error updating partitions %d-%d"
 msgstr "%s：更新分区 %d-%d 出错"
 
-#: disk-utils/partx.c:487
+#: disk-utils/partx.c:486
 #, c-format
 msgid "%s: no partition #%d"
 msgstr "%s：无分区 #%d"
 
-#: disk-utils/partx.c:508
+#: disk-utils/partx.c:507
 #, c-format
 msgid "%s: partition #%d resized\n"
 msgstr "%s：已调整分区 #%d 的大小\n"
 
-#: disk-utils/partx.c:522
+#: disk-utils/partx.c:521
 #, c-format
 msgid "%s: updating partition #%d failed"
 msgstr "%s：更新分区 #%d 失败"
 
-#: disk-utils/partx.c:563
+#: disk-utils/partx.c:562
 #, c-format
 msgid "#%2d: %9ju-%9ju (%9ju sector, %6ju MB)\n"
 msgid_plural "#%2d: %9ju-%9ju (%9ju sectors, %6ju MB)\n"
 msgstr[0] "#%2d：%9ju-%9ju (%9ju 扇区%6ju MB)\n"
 
-#: disk-utils/partx.c:679 misc-utils/fincore.c:370 misc-utils/findmnt.c:1653
-#: misc-utils/lsblk.c:2070 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
-#: sys-utils/lscpu.c:1643 sys-utils/lscpu.c:1834 sys-utils/prlimit.c:306
-#: sys-utils/rfkill.c:471 sys-utils/swapon.c:293 sys-utils/wdctl.c:271
+#: disk-utils/partx.c:678 misc-utils/fincore.c:370 misc-utils/findmnt.c:1653
+#: misc-utils/lsblk.c:2116 misc-utils/lslocks.c:471 sys-utils/losetup.c:339
+#: sys-utils/lscpu.c:1673 sys-utils/lscpu.c:1886 sys-utils/prlimit.c:306
+#: sys-utils/rfkill.c:471 sys-utils/swapon.c:293 sys-utils/wdctl.c:310
 msgid "failed to allocate output column"
 msgstr ""
 
-#: disk-utils/partx.c:723
+#: disk-utils/partx.c:722
 #, c-format
 msgid "failed to initialize blkid filter for '%s'"
 msgstr "初始化“%s”的 blkid 过滤器失败"
 
-#: disk-utils/partx.c:731
+#: disk-utils/partx.c:730
 #, c-format
 msgid "%s: failed to read partition table"
 msgstr "%s：读取分区表失败"
 
-#: disk-utils/partx.c:737
+#: disk-utils/partx.c:736
 #, c-format
 msgid "%s: partition table type '%s' detected\n"
 msgstr "%s：检测到分区表类型“%s”\n"
 
-#: disk-utils/partx.c:741
+#: disk-utils/partx.c:740
 #, c-format
 msgid "%s: partition table with no partitions"
 msgstr "%s：分区表中无分区"
 
-#: disk-utils/partx.c:754
+#: disk-utils/partx.c:753
 #, c-format
 msgid " %s [-a|-d|-s|-u] [--nr <n:m> | <partition>] <disk>\n"
 msgstr " %s [-a|-d|-s|-u] [--nr <n:m> | <分区>] <磁盘>\n"
 
-#: disk-utils/partx.c:758
+#: disk-utils/partx.c:757
 msgid "Tell the kernel about the presence and numbering of partitions.\n"
 msgstr "告知内核分区的存在和排列情况。\n"
 
-#: disk-utils/partx.c:761
+#: disk-utils/partx.c:760
 msgid " -a, --add            add specified partitions or all of them\n"
 msgstr " -a, --add            添加指定的分区或所有分区\n"
 
-#: disk-utils/partx.c:762
+#: disk-utils/partx.c:761
 msgid " -d, --delete         delete specified partitions or all of them\n"
 msgstr " -d, --delete         删除指定的分区或所有分区\n"
 
-#: disk-utils/partx.c:763
+#: disk-utils/partx.c:762
 msgid " -u, --update         update specified partitions or all of them\n"
 msgstr " -u, --update         更新指定的分区或所有分区\n"
 
-#: disk-utils/partx.c:764
+#: disk-utils/partx.c:763
 msgid ""
 " -s, --show           list partitions\n"
 "\n"
@@ -3676,77 +3675,77 @@
 " -s, --show           列出分区\n"
 "\n"
 
-#: disk-utils/partx.c:765 misc-utils/lsblk.c:1731 sys-utils/lsmem.c:503
+#: disk-utils/partx.c:764 misc-utils/lsblk.c:1775 sys-utils/lsmem.c:503
 msgid ""
 " -b, --bytes          print SIZE in bytes rather than in human readable "
 "format\n"
 msgstr " -b, --bytes          以字节为单位而非易读的格式来打印 SIZE\n"
 
-#: disk-utils/partx.c:766
+#: disk-utils/partx.c:765
 msgid " -g, --noheadings     don't print headings for --show\n"
 msgstr " -g, --noheadings     --show 时不打印标题\n"
 
-#: disk-utils/partx.c:767
+#: disk-utils/partx.c:766
 msgid ""
 " -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
 msgstr " -n, --nr <n:m>       指定分区范围(例如：--nr 2:4)\n"
 
-#: disk-utils/partx.c:768
+#: disk-utils/partx.c:767
 msgid " -o, --output <list>  define which output columns to use\n"
 msgstr " -o, --output <列表>  定义使用哪个输出列\n"
 
-#: disk-utils/partx.c:770 misc-utils/lsblk.c:1727 sys-utils/lsmem.c:501
+#: disk-utils/partx.c:769 misc-utils/lsblk.c:1771 sys-utils/lsmem.c:501
 msgid " -P, --pairs          use key=\"value\" output format\n"
 msgstr " -P, --pairs          使用 key=“value” 输出格式\n"
 
-#: disk-utils/partx.c:771 misc-utils/lsblk.c:1742 sys-utils/lsmem.c:507
+#: disk-utils/partx.c:770 misc-utils/lsblk.c:1786 sys-utils/lsmem.c:507
 msgid " -r, --raw            use raw output format\n"
 msgstr " -r, --raw            使用原生输出格式\n"
 
-#: disk-utils/partx.c:772
+#: disk-utils/partx.c:771
 msgid " -S, --sector-size <num>  overwrite sector size\n"
 msgstr ""
 
-#: disk-utils/partx.c:773
+#: disk-utils/partx.c:772
 msgid " -t, --type <type>    specify the partition type\n"
 msgstr ""
 
-#: disk-utils/partx.c:774
+#: disk-utils/partx.c:773
 msgid "     --list-types     list supported partition types and exit\n"
 msgstr ""
 
-#: disk-utils/partx.c:775 sys-utils/fallocate.c:101
+#: disk-utils/partx.c:774 sys-utils/fallocate.c:101
 msgid " -v, --verbose        verbose mode\n"
 msgstr " -v, --verbose        详尽模式\n"
 
-#: disk-utils/partx.c:860
+#: disk-utils/partx.c:859
 msgid "failed to parse --nr <M-N> range"
 msgstr "解析 --nr <M-N> 范围失败"
 
-#: disk-utils/partx.c:949
+#: disk-utils/partx.c:948
 msgid "partition and disk name do not match"
 msgstr "分区和磁盘名不符"
 
-#: disk-utils/partx.c:978
+#: disk-utils/partx.c:977
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "--nr 和 <分区> 相互排斥"
 
-#: disk-utils/partx.c:997
+#: disk-utils/partx.c:996
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr "分区：%s，磁盘：%s，从分区：%d,到分区：%d\n"
 
-#: disk-utils/partx.c:1009
+#: disk-utils/partx.c:1008
 #, c-format
 msgid "%s: cannot delete partitions"
 msgstr "%s：不能删除分区"
 
-#: disk-utils/partx.c:1012
+#: disk-utils/partx.c:1011
 #, c-format
 msgid "%s: partitioned loop devices unsupported"
 msgstr "%s：不支持已分区的回环设备"
 
-#: disk-utils/partx.c:1029
+#: disk-utils/partx.c:1028
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "%s：初始化 blkid 探针失败"
@@ -3849,71 +3848,72 @@
 msgid "failed to resize partition"
 msgstr "调整分区大小失败"
 
-#: disk-utils/sfdisk.c:232
+#: disk-utils/sfdisk.c:235
 msgid "failed to allocate nested libfdisk context"
 msgstr "分配嵌套 libfdisk 环境(context)失败"
 
-#: disk-utils/sfdisk.c:292
+#: disk-utils/sfdisk.c:295
 #, c-format
 msgid "cannot seek %s"
 msgstr "无法定位 %s"
 
-#: disk-utils/sfdisk.c:303 libfdisk/src/bsd.c:723 libfdisk/src/bsd.c:904
+#: disk-utils/sfdisk.c:306 libfdisk/src/bsd.c:724 libfdisk/src/bsd.c:905
+#: term-utils/script.c:461
 #, c-format
 msgid "cannot write %s"
 msgstr "无法写 %s"
 
-#: disk-utils/sfdisk.c:310
+#: disk-utils/sfdisk.c:313
 #, c-format
 msgid "%12s (offset %5ju, size %5ju): %s"
 msgstr "%12s (偏移  %5ju, 大小 %5ju): %s"
 
-#: disk-utils/sfdisk.c:316
+#: disk-utils/sfdisk.c:319
 #, c-format
 msgid "%s: failed to create a backup"
 msgstr "%s：创建备份失败"
 
-#: disk-utils/sfdisk.c:329
+#: disk-utils/sfdisk.c:332
 msgid "failed to create a backup file, $HOME undefined"
 msgstr "创建备份失败，未定义 $HOME"
 
-#: disk-utils/sfdisk.c:355
+#: disk-utils/sfdisk.c:358
 msgid "Backup files:"
 msgstr "备份文件："
 
-#: disk-utils/sfdisk.c:380
+#: disk-utils/sfdisk.c:385
 msgid "failed to read new partition from device; ignoring --move-data"
 msgstr "从设备读取新分区失败；将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:382
+#: disk-utils/sfdisk.c:387
 msgid "failed to get size of the new partition; ignoring --move-data"
 msgstr "获取新分区大小失败，将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:384
+#: disk-utils/sfdisk.c:389
 msgid "failed to get start of the new partition; ignoring --move-data"
 msgstr "获取新分区起点失败，将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:386
+#: disk-utils/sfdisk.c:391
 msgid "failed to get size of the old partition; ignoring --move-data"
 msgstr "获取新分区大小失败，将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:388
+#: disk-utils/sfdisk.c:393
 msgid "failed to get start of the old partition; ignoring --move-data"
 msgstr "获取旧分区起点失败，将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:390
+#: disk-utils/sfdisk.c:395
 msgid "start of the partition has not been moved; ignoring --move-data"
 msgstr "分区起点未移动；将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:392
+#: disk-utils/sfdisk.c:397
 msgid "new partition is smaller than original; ignoring --move-data"
 msgstr "新分区小于原分区；将忽略 --move-data"
 
-#: disk-utils/sfdisk.c:442
+#: disk-utils/sfdisk.c:448
 msgid "Data move:"
 msgstr "数据移动︰"
 
-#: disk-utils/sfdisk.c:444
+#: disk-utils/sfdisk.c:451
 #, c-format
 msgid " typescript file: %s"
 msgstr " typescript 文件：%s"
@@ -3923,24 +3923,24 @@
 msgid " old start: %ju, new start: %ju (move %ju sectors)\n"
 msgstr " 原起点：%ju，新起点：%ju (移动 %ju 个扇区)\n"
 
-#: disk-utils/sfdisk.c:452
+#: disk-utils/sfdisk.c:464
 msgid "Do you want to move partition data?"
 msgstr "您想移动分区数据吗？"
 
-#: disk-utils/sfdisk.c:454 disk-utils/sfdisk.c:1819
+#: disk-utils/sfdisk.c:466 disk-utils/sfdisk.c:1902
 msgid "Leaving."
 msgstr "离开中。"
 
-#: disk-utils/sfdisk.c:527
+#: disk-utils/sfdisk.c:608
 #, c-format
 msgid "%s: failed to move data"
 msgstr "%s：移动数据失败"
 
-#: disk-utils/sfdisk.c:542
+#: disk-utils/sfdisk.c:618
 msgid "The partition table is unchanged (--no-act)."
 msgstr "分区表未更改(--no-act)。"
 
-#: disk-utils/sfdisk.c:548
+#: disk-utils/sfdisk.c:626
 msgid ""
 "\n"
 "The partition table has been altered."
@@ -3948,12 +3948,12 @@
 "\n"
 "分区表已调整。"
 
-#: disk-utils/sfdisk.c:631
+#: disk-utils/sfdisk.c:709
 #, c-format
 msgid "unsupported label '%s'"
 msgstr "不支持的标签：“%s”"
 
-#: disk-utils/sfdisk.c:634
+#: disk-utils/sfdisk.c:712
 msgid ""
 "Id  Name\n"
 "\n"
@@ -3961,167 +3961,167 @@
 "Id 名称\n"
 "\n"
 
-#: disk-utils/sfdisk.c:664
+#: disk-utils/sfdisk.c:742
 msgid "unrecognized partition table type"
 msgstr "未识别的分区表类型"
 
-#: disk-utils/sfdisk.c:717
+#: disk-utils/sfdisk.c:795
 #, c-format
 msgid "Cannot get size of %s"
 msgstr "无法获得 %s 的大小"
 
-#: disk-utils/sfdisk.c:754
+#: disk-utils/sfdisk.c:832
 #, c-format
 msgid "total: %ju blocks\n"
 msgstr "共计：%ju 个块\n"
 
-#: disk-utils/sfdisk.c:816 disk-utils/sfdisk.c:899 disk-utils/sfdisk.c:940
-#: disk-utils/sfdisk.c:970 disk-utils/sfdisk.c:1037 disk-utils/sfdisk.c:1101
-#: disk-utils/sfdisk.c:1156 disk-utils/sfdisk.c:1212 disk-utils/sfdisk.c:1566
+#: disk-utils/sfdisk.c:894 disk-utils/sfdisk.c:977 disk-utils/sfdisk.c:1018
+#: disk-utils/sfdisk.c:1048 disk-utils/sfdisk.c:1115 disk-utils/sfdisk.c:1179
+#: disk-utils/sfdisk.c:1234 disk-utils/sfdisk.c:1290 disk-utils/sfdisk.c:1646
 msgid "no disk device specified"
 msgstr "未指定磁盘设备"
 
-#: disk-utils/sfdisk.c:598
+#: disk-utils/sfdisk.c:820
 msgid "toggle boot flags is supported for MBR only"
 msgstr "开/关启动标志 只支持 MBR"
 
-#: disk-utils/sfdisk.c:872 disk-utils/sfdisk.c:919 disk-utils/sfdisk.c:1042
-#: disk-utils/sfdisk.c:1106 disk-utils/sfdisk.c:1161 disk-utils/sfdisk.c:1217
-#: disk-utils/sfdisk.c:1564 disk-utils/sfdisk.c:2061
+#: disk-utils/sfdisk.c:950 disk-utils/sfdisk.c:997 disk-utils/sfdisk.c:1120
+#: disk-utils/sfdisk.c:1184 disk-utils/sfdisk.c:1239 disk-utils/sfdisk.c:1295
+#: disk-utils/sfdisk.c:1644 disk-utils/sfdisk.c:2152
 msgid "failed to parse partition number"
 msgstr "解析分区号失败"
 
-#: disk-utils/sfdisk.c:877
+#: disk-utils/sfdisk.c:955
 #, c-format
 msgid "%s: partition %d: failed to toggle bootable flag"
 msgstr "%s：分区 %d：开/关启动标志失败"
 
-#: disk-utils/sfdisk.c:914 disk-utils/sfdisk.c:922
+#: disk-utils/sfdisk.c:992 disk-utils/sfdisk.c:1000
 #, c-format
 msgid "%s: partition %zu: failed to delete"
 msgstr "%s：分区 %zu：删除失败"
 
-#: disk-utils/sfdisk.c:977
+#: disk-utils/sfdisk.c:1055
 #, c-format
 msgid "%s: does not contain a recognized partition table"
 msgstr ""
 
-#: disk-utils/sfdisk.c:981
+#: disk-utils/sfdisk.c:1059
 msgid "failed to allocate dump struct"
 msgstr "分配转储结构失败"
 
-#: disk-utils/sfdisk.c:985
+#: disk-utils/sfdisk.c:1063
 #, c-format
 msgid "%s: failed to dump partition table"
 msgstr ""
 
-#: disk-utils/sfdisk.c:1015
+#: disk-utils/sfdisk.c:1093
 #, c-format
 msgid "%s: no partition table found"
 msgstr "%s：找不到分区表"
 
-#: disk-utils/sfdisk.c:1019
+#: disk-utils/sfdisk.c:1097
 #, c-format
 msgid "%s: partition %zu: partition table contains only %zu partitions"
 msgstr "%s：分区 %zu：分区表中只包含 %zu 个分区"
 
-#: disk-utils/sfdisk.c:1022
+#: disk-utils/sfdisk.c:1100
 #, c-format
 msgid "%s: partition %zu: partition is unused"
 msgstr "%s: 分区 %zu: 分区未使用"
 
-#: disk-utils/sfdisk.c:1041 disk-utils/sfdisk.c:1105 disk-utils/sfdisk.c:1160
-#: disk-utils/sfdisk.c:1216
+#: disk-utils/sfdisk.c:1119 disk-utils/sfdisk.c:1183 disk-utils/sfdisk.c:1238
+#: disk-utils/sfdisk.c:1294
 msgid "no partition number specified"
 msgstr "未指定分区号"
 
-#: disk-utils/sfdisk.c:1047 disk-utils/sfdisk.c:1111 disk-utils/sfdisk.c:1166
-#: disk-utils/sfdisk.c:1222 sys-utils/losetup.c:778
+#: disk-utils/sfdisk.c:1125 disk-utils/sfdisk.c:1189 disk-utils/sfdisk.c:1244
+#: disk-utils/sfdisk.c:1300 sys-utils/losetup.c:778
 msgid "unexpected arguments"
 msgstr "参数异常"
 
-#: disk-utils/sfdisk.c:1062
+#: disk-utils/sfdisk.c:1140
 #, c-format
 msgid "%s: partition %zu: failed to get partition type"
 msgstr "%s: 分区 %zu:获取分区类型失败"
 
-#: disk-utils/sfdisk.c:1081
+#: disk-utils/sfdisk.c:1159
 #, c-format
 msgid "failed to parse %s partition type '%s'"
 msgstr "解析 %s 的分区类型“%s”失败"
 
-#: disk-utils/sfdisk.c:1085
+#: disk-utils/sfdisk.c:1163
 #, c-format
 msgid "%s: partition %zu: failed to set partition type"
 msgstr "%s: 分区 %zu: 设置分区类型失败"
 
-#: disk-utils/sfdisk.c:1123
+#: disk-utils/sfdisk.c:1201
 #, c-format
 msgid "%s: partition %zu: failed to get partition UUID"
 msgstr "%s: 分区 %zu: 获取分区 UUID 失败"
 
-#: disk-utils/sfdisk.c:1136 disk-utils/sfdisk.c:1191 disk-utils/sfdisk.c:1245
+#: disk-utils/sfdisk.c:1214 disk-utils/sfdisk.c:1269 disk-utils/sfdisk.c:1323
 msgid "failed to allocate partition object"
 msgstr "分配分区对象失败"
 
-#: disk-utils/sfdisk.c:1140
+#: disk-utils/sfdisk.c:1218
 #, c-format
 msgid "%s: partition %zu: failed to set partition UUID"
 msgstr "%s: 分区 %zu: 设置分区 UUID 失败"
 
-#: disk-utils/sfdisk.c:1178
+#: disk-utils/sfdisk.c:1256
 #, c-format
 msgid "%s: partition %zu: failed to get partition name"
 msgstr "%s: 分区 %zu: 获取分区名失败"
 
-#: disk-utils/sfdisk.c:1195
+#: disk-utils/sfdisk.c:1273
 #, c-format
 msgid "%s: partition %zu: failed to set partition name"
 msgstr "%s: 分区 %zu: 设置分区名失败"
 
-#: disk-utils/sfdisk.c:1249
+#: disk-utils/sfdisk.c:1327
 #, c-format
 msgid "%s: partition %zu: failed to set partition attributes"
 msgstr "%s: 分区 %zu: 设置分区属性失败"
 
-#: disk-utils/sfdisk.c:1292
+#: disk-utils/sfdisk.c:1370
 msgid " Commands:\n"
 msgstr " 命令：\n"
 
-#: disk-utils/sfdisk.c:1294
+#: disk-utils/sfdisk.c:1372
 msgid "   write    write table to disk and exit\n"
 msgstr "   write    将分区表写入磁盘并退出\n"
 
-#: disk-utils/sfdisk.c:1295
+#: disk-utils/sfdisk.c:1373
 msgid ""
 "   quit     show new situation and wait for user's feedback before write\n"
 msgstr "   quit     显示新状况并等待用户反馈后再写入\n"
 
-#: disk-utils/sfdisk.c:1296
+#: disk-utils/sfdisk.c:1374
 msgid "   abort    exit sfdisk shell\n"
 msgstr "   abort    退出 sfdisk shell\n"
 
-#: disk-utils/sfdisk.c:1297
+#: disk-utils/sfdisk.c:1375
 msgid "   print    display the partition table\n"
 msgstr "   print    显示分区表\n"
 
-#: disk-utils/sfdisk.c:1298
+#: disk-utils/sfdisk.c:1376
 msgid "   help     show this help text\n"
 msgstr "   help     显示帮助并退出\n"
 
-#: disk-utils/sfdisk.c:1300
+#: disk-utils/sfdisk.c:1378
 msgid "   Ctrl-D   the same as 'quit'\n"
 msgstr "   Ctrl-D   同“quit”\n"
 
-#: disk-utils/sfdisk.c:1304
+#: disk-utils/sfdisk.c:1382
 msgid " Input format:\n"
 msgstr " 输入格式：\n"
 
-#: disk-utils/sfdisk.c:1306
+#: disk-utils/sfdisk.c:1384
 msgid "   <start>, <size>, <type>, <bootable>\n"
 msgstr "   <起点>, <大小>, <类型>, <可启动>\n"
 
-#: disk-utils/sfdisk.c:1309
+#: disk-utils/sfdisk.c:1387
 msgid ""
 "   <start>  Beginning of the partition in sectors, or bytes if\n"
 "            specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
@@ -4131,7 +4131,7 @@
 "            <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
 "            默认为第一处可用空间。\n"
 
-#: disk-utils/sfdisk.c:1314
+#: disk-utils/sfdisk.c:1392
 msgid ""
 "   <size>   Size of the partition in sectors, or bytes if\n"
 "            specified in the format <number>{K,M,G,T,P,E,Z,Y}.\n"
@@ -4141,35 +4141,35 @@
 "            <数值>{K,M,G,T,P,E,Z,Y} 格式指定。\n"
 "            默认为所有可用空间。\n"
 
-#: disk-utils/sfdisk.c:1319
+#: disk-utils/sfdisk.c:1397
 msgid "   <type>   The partition type.  Default is a Linux data partition.\n"
 msgstr "   <类型>   分区类型。默认为 Linux 数据分区。\n"
 
-#: disk-utils/sfdisk.c:1005
+#: disk-utils/sfdisk.c:1298
 msgid "            MBR: hex or L,S,E,X shortcuts.\n"
 msgstr "            MBR：hex 或 L,S,E,X 快捷方式。\n"
 
-#: disk-utils/sfdisk.c:1006
+#: disk-utils/sfdisk.c:1299
 msgid "            GPT: UUID or L,S,H shortcuts.\n"
 msgstr "            GPT：UUID 或 L,S,H 快捷方式。\n"
 
-#: disk-utils/sfdisk.c:1324
+#: disk-utils/sfdisk.c:1402
 msgid "   <bootable>  Use '*' to mark an MBR partition as bootable.\n"
 msgstr "   <可启动>    使用“*”将 MBR 分区标记为 可启动。\n"
 
-#: disk-utils/sfdisk.c:1328
+#: disk-utils/sfdisk.c:1406
 msgid " Example:\n"
 msgstr " 示例：\n"
 
-#: disk-utils/sfdisk.c:1330
+#: disk-utils/sfdisk.c:1408
 msgid "   , 4G     Creates a 4GiB partition at default start offset.\n"
 msgstr "   , 4G     在默认起始偏移位置创建一个 4GiB 分区。\n"
 
-#: disk-utils/sfdisk.c:1362 sys-utils/dmesg.c:1540
+#: disk-utils/sfdisk.c:1440 sys-utils/dmesg.c:1559
 msgid "unsupported command"
 msgstr "不支持的命令"
 
-#: disk-utils/sfdisk.c:1364
+#: disk-utils/sfdisk.c:1442
 #, c-format
 msgid "line %d: unsupported command"
 msgstr "第 %d 行：不支持的命令"
@@ -4182,31 +4182,31 @@
 "collisions."
 msgstr ""
 
-#: disk-utils/sfdisk.c:1533
+#: disk-utils/sfdisk.c:1613
 msgid "failed to allocate partition name"
 msgstr "分配分区名失败"
 
-#: disk-utils/sfdisk.c:1574
+#: disk-utils/sfdisk.c:1654
 msgid "failed to allocate script handler"
 msgstr "分配脚本处理程序失败"
 
-#: disk-utils/sfdisk.c:1590
+#: disk-utils/sfdisk.c:1670
 #, c-format
 msgid "%s: cannot modify partition %d: no partition table was found"
 msgstr "%s：无法修改分区 %d：未找到分区表"
 
-#: disk-utils/sfdisk.c:1595
+#: disk-utils/sfdisk.c:1675
 #, c-format
 msgid ""
 "%s: cannot modify partition %d: partition table contains only %zu partitions"
 msgstr "%s: 无法修改分区 %d: 分区表只包含 %zu 个分区"
 
-#: disk-utils/sfdisk.c:1601
+#: disk-utils/sfdisk.c:1681
 #, c-format
 msgid "warning: %s: partition %d is not defined yet"
 msgstr "警告：%s: 分区 %d 尚未定义"
 
-#: disk-utils/sfdisk.c:1619
+#: disk-utils/sfdisk.c:1699
 #, c-format
 msgid ""
 "\n"
@@ -4215,11 +4215,11 @@
 "\n"
 "欢迎使用 sfdisk (%s)。"
 
-#: disk-utils/sfdisk.c:1627
+#: disk-utils/sfdisk.c:1707
 msgid "Checking that no-one is using this disk right now ..."
 msgstr "请检查现在是不是有人在使用此磁盘..."
 
-#: disk-utils/sfdisk.c:1630
+#: disk-utils/sfdisk.c:1710
 msgid ""
 " FAILED\n"
 "\n"
@@ -4227,7 +4227,7 @@
 " 失败\n"
 "\n"
 
-#: disk-utils/sfdisk.c:1633
+#: disk-utils/sfdisk.c:1713
 msgid ""
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
 "Umount all file systems, and swapoff all swap partitions on this disk.\n"
@@ -4237,11 +4237,11 @@
 "请卸载此磁盘上所有的文件系统，并关闭(swapoff)上面的交换分区。\n"
 "可使用 --no-reread 标志阻止此检查。\n"
 
-#: disk-utils/sfdisk.c:1638
+#: disk-utils/sfdisk.c:1718
 msgid "Use the --force flag to overrule all checks."
 msgstr "使用 --force 标志否决所有检查。"
 
-#: disk-utils/sfdisk.c:1640
+#: disk-utils/sfdisk.c:1720
 msgid ""
 " OK\n"
 "\n"
@@ -4249,7 +4249,7 @@
 " 好的\n"
 "\n"
 
-#: disk-utils/sfdisk.c:1652
+#: disk-utils/sfdisk.c:1732
 msgid ""
 "\n"
 "Old situation:"
@@ -4257,7 +4257,7 @@
 "\n"
 "旧状况："
 
-#: disk-utils/sfdisk.c:1670
+#: disk-utils/sfdisk.c:1750
 #, c-format
 msgid ""
 "\n"
@@ -4269,7 +4269,7 @@
 "sfdisk 即将创建一个新的磁盘标签“%s”。\n"
 "在定义第一个分区之前使用“label: <名字>”可覆盖默认值。"
 
-#: disk-utils/sfdisk.c:1673
+#: disk-utils/sfdisk.c:1753
 msgid ""
 "\n"
 "Type 'help' to get more information.\n"
@@ -4277,32 +4277,32 @@
 "\n"
 "请执行“%s --help”了解更多信息。\n"
 
-#: disk-utils/sfdisk.c:1691
+#: disk-utils/sfdisk.c:1771
 msgid "All partitions used."
 msgstr "所有分区均已使用。"
 
-#: disk-utils/sfdisk.c:1719
+#: disk-utils/sfdisk.c:1803
 msgid "Done.\n"
 msgstr "完成。\n"
 
-#: disk-utils/sfdisk.c:1731
+#: disk-utils/sfdisk.c:1815
 msgid "Ignoring partition."
 msgstr "忽略分区。"
 
-#: disk-utils/sfdisk.c:1740 disk-utils/sfdisk.c:1800
+#: disk-utils/sfdisk.c:1824 disk-utils/sfdisk.c:1883
 msgid "Failed to apply script headers, disk label not created."
 msgstr "无法应用脚本标头(header)，未创建磁盘标签。"
 
-#: disk-utils/sfdisk.c:1759
+#: disk-utils/sfdisk.c:1843
 #, c-format
 msgid "Failed to add #%d partition"
 msgstr ""
 
-#: disk-utils/sfdisk.c:1782
+#: disk-utils/sfdisk.c:1866
 msgid "Script header accepted."
 msgstr "已接受脚本标头(header)。"
 
-#: disk-utils/sfdisk.c:1807
+#: disk-utils/sfdisk.c:1890
 msgid ""
 "\n"
 "New situation:"
@@ -4310,15 +4310,15 @@
 "\n"
 "新状况："
 
-#: disk-utils/sfdisk.c:1817
+#: disk-utils/sfdisk.c:1900
 msgid "Do you want to write this to disk?"
 msgstr "您想写入该磁盘吗？"
 
-#: disk-utils/sfdisk.c:1830
+#: disk-utils/sfdisk.c:1913
 msgid "Leaving.\n"
 msgstr "离开中。\n"
 
-#: disk-utils/sfdisk.c:1844
+#: disk-utils/sfdisk.c:1928
 #, c-format
 msgid ""
 " %1$s [options] <dev> [[-N] <part>]\n"
@@ -4327,115 +4327,115 @@
 " %1$s [选项] <设备> [[-N] <分区>]\n"
 " %1$s [选项] <命令>\n"
 
-#: disk-utils/sfdisk.c:1432
+#: disk-utils/sfdisk.c:1829
 msgid ""
 " -A, --activate <dev> [<part> ...] list or set bootable MBR partitions\n"
 msgstr " -A, --activate <设备> [<分区> ...] 列出或设置可启动的 MBR 分区\n"
 
-#: disk-utils/sfdisk.c:1852
+#: disk-utils/sfdisk.c:1936
 msgid ""
 " -d, --dump <dev>                  dump partition table (usable for later "
 "input)\n"
 msgstr " -d, --dump <设备>                 转储分区表(用于后续输入)\n"
 
-#: disk-utils/sfdisk.c:1853
+#: disk-utils/sfdisk.c:1937
 msgid ""
 " -J, --json <dev>                  dump partition table in JSON format\n"
 msgstr " -J, --json <设备>                 以 JSON 格式转储分区表\n"
 
-#: disk-utils/sfdisk.c:1854
+#: disk-utils/sfdisk.c:1938
 msgid ""
 " -g, --show-geometry [<dev> ...]   list geometry of all or specified "
 "devices\n"
 msgstr " -g, --show-geometry [<设备> ...]  列出所有或指定设备的几何属性\n"
 
-#: disk-utils/sfdisk.c:1855
+#: disk-utils/sfdisk.c:1939
 msgid " -l, --list [<dev> ...]            list partitions of each device\n"
 msgstr " -l, --list [<设备> ...]           列出每台设备上的分区\n"
 
-#: disk-utils/sfdisk.c:1856
+#: disk-utils/sfdisk.c:1940
 msgid ""
 " -F, --list-free [<dev> ...]       list unpartitioned free areas of each "
 "device\n"
 msgstr " -F, --list-free [<设备> ...]      列出每台设备上的未分区空间\n"
 
-#: disk-utils/sfdisk.c:1857
+#: disk-utils/sfdisk.c:1941
 msgid ""
 " -r, --reorder <dev>               fix partitions order (by start offset)\n"
 msgstr " -r, --reorder <设备>              (通过起始偏移量)修复分区顺序\n"
 
-#: disk-utils/sfdisk.c:1858
+#: disk-utils/sfdisk.c:1942
 msgid ""
 " -s, --show-size [<dev> ...]       list sizes of all or specified devices\n"
 msgstr " -s, --show-size [<设备> ...]       列出所有或指定设备的大小\n"
 
-#: disk-utils/sfdisk.c:1859
+#: disk-utils/sfdisk.c:1943
 msgid ""
 " -T, --list-types                  print the recognized types (see -X)\n"
 msgstr " -T, --list-types                  打印识别的类型(见 -X)\n"
 
-#: disk-utils/sfdisk.c:1860
+#: disk-utils/sfdisk.c:1944
 msgid ""
 " -V, --verify [<dev> ...]          test whether partitions seem correct\n"
 msgstr " -V, --verify [<设备> ...]         测试分区是否正确\n"
 
-#: disk-utils/sfdisk.c:1861
+#: disk-utils/sfdisk.c:1945
 msgid ""
 "     --delete <dev> [<part> ...]   delete all or specified partitions\n"
 msgstr "     --delete <设备> [<分区> ...]  删除所有或指定分区\n"
 
-#: disk-utils/sfdisk.c:1864
+#: disk-utils/sfdisk.c:1948
 msgid " --part-label <dev> <part> [<str>] print or change partition label\n"
 msgstr " --part-label <设备> <分区> [<字符串>] 打印或更改分区标签\n"
 
-#: disk-utils/sfdisk.c:1865
+#: disk-utils/sfdisk.c:1949
 msgid " --part-type <dev> <part> [<type>] print or change partition type\n"
 msgstr " --part-type <设备> <分区> [<类型>]    打印或更改分区类型\n"
 
-#: disk-utils/sfdisk.c:1866
+#: disk-utils/sfdisk.c:1950
 msgid " --part-uuid <dev> <part> [<uuid>] print or change partition uuid\n"
 msgstr " --part-uuid <设备> <分区> [<uuid>]    打印或更改分区 uuid\n"
 
-#: disk-utils/sfdisk.c:1867
+#: disk-utils/sfdisk.c:1951
 msgid ""
 " --part-attrs <dev> <part> [<str>] print or change partition attributes\n"
 msgstr " --part-attrs <设备> <分区> [<字符串>] 打印或更改分区属性\n"
 
-#: disk-utils/sfdisk.c:1870
+#: disk-utils/sfdisk.c:1954
 msgid " <dev>                     device (usually disk) path\n"
 msgstr " <设备>                    设备(通常是磁盘)的路径\n"
 
-#: disk-utils/sfdisk.c:1871
+#: disk-utils/sfdisk.c:1955
 msgid " <part>                    partition number\n"
 msgstr " <分区>                   分区号\n"
 
-#: disk-utils/sfdisk.c:1872
+#: disk-utils/sfdisk.c:1956
 msgid ""
 " <type>                    partition type, GUID for GPT, hex for MBR\n"
 msgstr " <类型>                    分区类型，GUID 对应 GPT，hex 对应 MBR\n"
 
-#: disk-utils/sfdisk.c:1875
+#: disk-utils/sfdisk.c:1959
 msgid ""
 " -a, --append              append partitions to existing partition table\n"
 msgstr " -a, --append              将分区附加到已有分区表\n"
 
-#: disk-utils/sfdisk.c:1876
+#: disk-utils/sfdisk.c:1960
 msgid " -b, --backup              backup partition table sectors (see -O)\n"
 msgstr " -b, --backup              备份分区表扇区(见 -O)\n"
 
-#: disk-utils/sfdisk.c:1877
+#: disk-utils/sfdisk.c:1961
 msgid ""
 "     --bytes               print SIZE in bytes rather than in human readable "
 "format\n"
 msgstr "     -b, --bytes               以字节为单位而非易读的格式来打印 SIZE\n"
 
-#: disk-utils/sfdisk.c:1878
+#: disk-utils/sfdisk.c:1962
 msgid ""
 "     --move-data[=<typescript>] move partition data after relocation "
 "(requires -N)\n"
 msgstr "     --move-data[=<typescript>] 重新定位后移动分区数据(需要 -N)\n"
 
-#: disk-utils/sfdisk.c:1879
+#: disk-utils/sfdisk.c:1964
 msgid " -f, --force               disable all consistency checking\n"
 msgstr " -f, --force               禁用所有的一致性检查\n"
 
@@ -4443,32 +4443,32 @@
 msgid "     --color[=<when>]      colorize output (auto, always or never)\n"
 msgstr "     --color[=<何时>]     彩色输出(auto，always 或 never)\n"
 
-#: disk-utils/sfdisk.c:1883
+#: disk-utils/sfdisk.c:1969
 msgid " -N, --partno <num>        specify partition number\n"
 msgstr " -N, --partno <数字>       指定分区号\n"
 
-#: disk-utils/sfdisk.c:1884
+#: disk-utils/sfdisk.c:1970
 msgid " -n, --no-act              do everything except write to device\n"
 msgstr " -n, --no-act              不真正执行写入设备\n"
 
-#: disk-utils/sfdisk.c:1885
+#: disk-utils/sfdisk.c:1971
 msgid ""
 "     --no-reread           do not check whether the device is in use\n"
 msgstr "     --no-reread           不检查设备是否正在使用\n"
 
-#: disk-utils/sfdisk.c:1886
+#: disk-utils/sfdisk.c:1972
 msgid "     --no-tell-kernel      do not tell kernel about changes\n"
 msgstr "     --no-tell-kernel      更改而不告诉内核\n"
 
-#: disk-utils/sfdisk.c:1887
+#: disk-utils/sfdisk.c:1973
 msgid " -O, --backup-file <path>  override default backup file name\n"
 msgstr " -O, --backup-file <路径>  覆盖默认的备份文件名\n"
 
-#: disk-utils/sfdisk.c:1888
+#: disk-utils/sfdisk.c:1974
 msgid " -o, --output <list>       output columns\n"
 msgstr " -o, --output <列表>       输出列\n"
 
-#: disk-utils/sfdisk.c:1889
+#: disk-utils/sfdisk.c:1975
 msgid " -q, --quiet               suppress extra info messages\n"
 msgstr " -q, --quiet               禁止输出额外信息\n"
 
@@ -4476,56 +4476,56 @@
 msgid " -w, --wipe <mode>         wipe signatures (auto, always or never)\n"
 msgstr " -w, --wipe <模式>         擦除签名(auto, always 或 never)\n"
 
-#: disk-utils/sfdisk.c:1892
+#: disk-utils/sfdisk.c:1980
 msgid " -X, --label <name>        specify label type (dos, gpt, ...)\n"
 msgstr " -X, --label <名称>        指定标签类型(dos, gpt, ...)\n"
 
-#: disk-utils/sfdisk.c:1893
+#: disk-utils/sfdisk.c:1981
 msgid " -Y, --label-nested <name> specify nested label type (dos, bsd)\n"
 msgstr " -Y, --label-nested <名称> 指定嵌套标签类型(dos, bsd)\n"
 
-#: disk-utils/sfdisk.c:1895
+#: disk-utils/sfdisk.c:1983
 msgid " -G, --show-pt-geometry    deprecated, alias to --show-geometry\n"
 msgstr " -G, --show-pt-geometry    已废弃，同 --show-geometry\n"
 
-#: disk-utils/sfdisk.c:1896
+#: disk-utils/sfdisk.c:1984
 msgid ""
 " -L, --Linux               deprecated, only for backward compatibility\n"
 msgstr " -L, --Linux               已废弃，仅为向后兼容\n"
 
-#: disk-utils/sfdisk.c:1897
+#: disk-utils/sfdisk.c:1985
 msgid ""
 " -u, --unit S              deprecated, only sector unit is supported\n"
 msgstr " -u, --unit S              已废弃，只支持扇区单位\n"
 
-#: disk-utils/sfdisk.c:2015
+#: disk-utils/sfdisk.c:2106
 #, c-format
 msgid "%s is deprecated in favour of --part-type"
 msgstr "%s 已废弃，请改用 --part-type"
 
-#: disk-utils/sfdisk.c:2020
+#: disk-utils/sfdisk.c:2111
 msgid "--id is deprecated in favour of --part-type"
 msgstr "--id 已废弃，请改用 --part-type"
 
-#: disk-utils/sfdisk.c:2036
+#: disk-utils/sfdisk.c:2127
 msgid "--show-pt-geometry is no more implemented. Using --show-geometry."
 msgstr "--show-pt-geometry 不再实现。请使用 --show-geometry。"
 
-#: disk-utils/sfdisk.c:2048
+#: disk-utils/sfdisk.c:2139
 msgid "--Linux option is unnecessary and deprecated"
 msgstr "--Linux 选项没必要，并且已废弃"
 
-#: disk-utils/sfdisk.c:2077
+#: disk-utils/sfdisk.c:2168
 #, c-format
 msgid "unsupported unit '%c'"
 msgstr "不支持的单位“%c”"
 
-#: include/c.h:365
+#: include/c.h:367
 #, c-format
 msgid "%s from %s\n"
 msgstr "%s，来自 %s\n"
 
-#: disk-utils/sfdisk.c:2155
+#: disk-utils/sfdisk.c:2249
 msgid "--movedata requires -N"
 msgstr "--movedata  需要 -N"
 
@@ -4575,12 +4575,12 @@
 msgid "ignore -U (UUIDs are unsupported)"
 msgstr "忽略 -U (不支持 UUID)"
 
-#: include/c.h:243
+#: include/c.h:245
 #, c-format
 msgid "Try '%s --help' for more information.\n"
 msgstr ""
 
-#: include/c.h:347
+#: include/c.h:349
 msgid ""
 "\n"
 "Usage:\n"
@@ -4588,7 +4588,7 @@
 "\n"
 "用法：\n"
 
-#: include/c.h:348
+#: include/c.h:350
 msgid ""
 "\n"
 "Options:\n"
@@ -4596,7 +4596,7 @@
 "\n"
 "选项：\n"
 
-#: include/c.h:349
+#: include/c.h:351
 msgid ""
 "\n"
 "Functions:\n"
@@ -4604,7 +4604,7 @@
 "\n"
 "功能：\n"
 
-#: include/c.h:350
+#: include/c.h:352
 msgid ""
 "\n"
 "Commands:\n"
@@ -4612,21 +4612,21 @@
 "\n"
 "命令：\n"
 
-#: include/c.h:351
+#: include/c.h:353
 msgid ""
 "\n"
 "Available output columns:\n"
 msgstr ""
 
-#: include/c.h:354
+#: include/c.h:356
 msgid "display this help"
 msgstr ""
 
-#: include/c.h:355
+#: include/c.h:357
 msgid "display version"
 msgstr ""
 
-#: include/c.h:363
+#: include/c.h:365
 #, c-format
 msgid ""
 "\n"
@@ -4635,8 +4635,8 @@
 "\n"
 "更多信息请参阅 %s。\n"
 
-#: include/closestream.h:44 include/closestream.h:46 login-utils/vipw.c:276
-#: login-utils/vipw.c:295 sys-utils/rtcwake.c:302 term-utils/setterm.c:814
+#: include/closestream.h:70 include/closestream.h:72 login-utils/vipw.c:276
+#: login-utils/vipw.c:295 sys-utils/rtcwake.c:302 term-utils/setterm.c:835
 #: text-utils/col.c:160
 msgid "write error"
 msgstr "写出错"
@@ -4650,7 +4650,7 @@
 msgstr "默认禁用颜色"
 
 #: include/env.h:18 lib/pager.c:153 login-utils/login.c:1029
-#: login-utils/login.c:1033 term-utils/agetty.c:1189
+#: login-utils/login.c:1033 term-utils/agetty.c:1198
 #, c-format
 msgid "failed to set the %s environment variable"
 msgstr "设置环境变量 %s 失败"
@@ -4833,7 +4833,7 @@
 msgstr "Priam Edisk"
 
 #: include/pt-mbr-partnames.h:44 include/pt-mbr-partnames.h:91
-#: include/pt-mbr-partnames.h:98 include/pt-mbr-partnames.h:99
+#: include/pt-mbr-partnames.h:101 include/pt-mbr-partnames.h:102
 msgid "SpeedStor"
 msgstr "SpeedStor"
 
@@ -4889,8 +4889,8 @@
 msgid "Linux plaintext"
 msgstr "Linux 纯文本"
 
-#: include/pt-mbr-partnames.h:61 libfdisk/src/gpt.c:204 libfdisk/src/sgi.c:62
-#: libfdisk/src/sun.c:53
+#: include/pt-gpt-partnames.h:60 include/pt-mbr-partnames.h:61
+#: libfdisk/src/sgi.c:62 libfdisk/src/sun.c:53
 msgid "Linux LVM"
 msgstr "Linux LVM"
 
@@ -4954,7 +4954,7 @@
 msgid "Acronis FAT32 LBA"
 msgstr "Acronis FAT32 LBA"
 
-#: include/pt-mbr-partnames.h:77 libfdisk/src/gpt.c:229
+#: include/pt-gpt-partnames.h:88 include/pt-mbr-partnames.h:77
 msgid "Solaris boot"
 msgstr "Solaris 启动"
 
@@ -5006,39 +5006,39 @@
 msgid "Rufus alignment"
 msgstr "Rufus 对齐"
 
-#: include/pt-mbr-partnames.h:94
+#: include/pt-mbr-partnames.h:97
 msgid "BeOS fs"
 msgstr "BeOS fs"
 
-#: include/pt-mbr-partnames.h:96
+#: include/pt-mbr-partnames.h:99
 msgid "EFI (FAT-12/16/32)"
 msgstr "EFI (FAT-12/16/32)"
 
-#: include/pt-mbr-partnames.h:97
+#: include/pt-mbr-partnames.h:100
 msgid "Linux/PA-RISC boot"
 msgstr "Linux/PA-RISC 启动"
 
-#: include/pt-mbr-partnames.h:100
+#: include/pt-mbr-partnames.h:103
 msgid "DOS secondary"
 msgstr "DOS 次要"
 
-#: include/pt-mbr-partnames.h:101 libfdisk/src/gpt.c:274
+#: include/pt-gpt-partnames.h:133 include/pt-mbr-partnames.h:104
 msgid "VMware VMFS"
 msgstr "VMware VMFS"
 
-#: include/pt-mbr-partnames.h:102
+#: include/pt-mbr-partnames.h:105
 msgid "VMware VMKCORE"
 msgstr "VMware VMKCORE"
 
-#: include/pt-mbr-partnames.h:103 libfdisk/src/sun.c:54
+#: include/pt-mbr-partnames.h:106 libfdisk/src/sun.c:54
 msgid "Linux raid autodetect"
 msgstr "Linux raid 自动检测"
 
-#: include/pt-mbr-partnames.h:106
+#: include/pt-mbr-partnames.h:109
 msgid "LANstep"
 msgstr "LANstep"
 
-#: include/pt-mbr-partnames.h:107
+#: include/pt-mbr-partnames.h:110
 msgid "BBT"
 msgstr "BBT"
 
@@ -5079,15 +5079,15 @@
 msgid "There is no *BSD partition on %s."
 msgstr "%s 上没有 *BSD 分区。"
 
-#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:942
+#: libfdisk/src/bsd.c:258 libfdisk/src/dos.c:948
 msgid "First cylinder"
 msgstr "第一个柱面"
 
-#: libfdisk/src/bsd.c:292 libfdisk/src/dos.c:1161
+#: libfdisk/src/bsd.c:291 libfdisk/src/dos.c:1213
 msgid "Last cylinder, +cylinders or +size{K,M,G,T,P}"
 msgstr "最后一个柱面, +cylinders 或 +size{K,M,G,T,P}"
 
-#: libfdisk/src/bsd.c:297 libfdisk/src/dos.c:1166 libfdisk/src/gpt.c:2243
+#: libfdisk/src/bsd.c:296 libfdisk/src/dos.c:1218 libfdisk/src/gpt.c:2358
 msgid "Last sector, +sectors or +size{K,M,G,T,P}"
 msgstr "上个扇区，+sectors 或 +size{K,M,G,T,P}"
 
@@ -5108,7 +5108,7 @@
 msgid "Packname"
 msgstr "包名"
 
-#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1129
+#: libfdisk/src/bsd.c:463 libfdisk/src/sun.c:1137
 msgid "Flags"
 msgstr "标志"
 
@@ -5136,16 +5136,16 @@
 msgid "Sectors/Cylinder"
 msgstr "扇区/柱面"
 
-#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1028 libfdisk/src/dos.c:2504
-#: libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:197 libfdisk/src/sun.c:1125
+#: libfdisk/src/bsd.c:491 libfdisk/src/bsd.c:1029 libfdisk/src/dos.c:2498
+#: libfdisk/src/sgi.c:1157 libfdisk/src/sun.c:203 libfdisk/src/sun.c:1133
 msgid "Cylinders"
 msgstr "柱面"
 
-#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:775
+#: libfdisk/src/bsd.c:496 libfdisk/src/sun.c:783
 msgid "Rpm"
 msgstr "转每分"
 
-#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:795
+#: libfdisk/src/bsd.c:501 libfdisk/src/sgi.c:291 libfdisk/src/sun.c:803
 msgid "Interleave"
 msgstr "交错"
 
@@ -5181,103 +5181,103 @@
 msgid "cylinders"
 msgstr "柱面"
 
-#: libfdisk/src/bsd.c:620
+#: libfdisk/src/bsd.c:621
 msgid "sectors/cylinder"
 msgstr "扇区/柱面"
 
-#: libfdisk/src/bsd.c:623
+#: libfdisk/src/bsd.c:624
 msgid "rpm"
 msgstr "rpm"
 
-#: libfdisk/src/bsd.c:624
+#: libfdisk/src/bsd.c:625
 msgid "interleave"
 msgstr "交错"
 
-#: libfdisk/src/bsd.c:625
+#: libfdisk/src/bsd.c:626
 msgid "trackskew"
 msgstr "磁道螺距"
 
-#: libfdisk/src/bsd.c:626
+#: libfdisk/src/bsd.c:627
 msgid "cylinderskew"
 msgstr "柱头螺距"
 
-#: libfdisk/src/bsd.c:628
+#: libfdisk/src/bsd.c:629
 msgid "headswitch"
 msgstr "磁头切换"
 
-#: libfdisk/src/bsd.c:629
+#: libfdisk/src/bsd.c:630
 msgid "track-to-track seek"
 msgstr "跨磁道定位"
 
-#: libfdisk/src/bsd.c:651
+#: libfdisk/src/bsd.c:652
 #, c-format
 msgid "The bootstrap file %s successfully loaded."
 msgstr "成功加载了引导程序文件 %s。"
 
-#: libfdisk/src/bsd.c:673
+#: libfdisk/src/bsd.c:674
 #, c-format
 msgid "Bootstrap: %1$sboot -> boot%1$s (default %1$s)"
 msgstr "引导：%1$sboot -> boot%1$s (默认 %1$s)"
 
-#: libfdisk/src/bsd.c:704
+#: libfdisk/src/bsd.c:705
 msgid "Bootstrap overlaps with disklabel!"
 msgstr "引导程序与磁盘标签重叠！"
 
-#: libfdisk/src/bsd.c:728
+#: libfdisk/src/bsd.c:729
 #, c-format
 msgid "Bootstrap installed on %s."
 msgstr "已在 %s 上安装引导程序。"
 
-#: libfdisk/src/bsd.c:910
+#: libfdisk/src/bsd.c:911
 #, c-format
 msgid ""
 "Disklabel written to %s.  (Don't forget to write the %s disklabel too.)"
 msgstr "磁盘标签已写入 %s。(不要忘了也写入 %s 磁盘标签。)"
 
-#: libfdisk/src/bsd.c:913
+#: libfdisk/src/bsd.c:914
 #, c-format
 msgid "Disklabel written to %s."
 msgstr "磁盘标签已写入 %s。"
 
-#: libfdisk/src/bsd.c:919 libfdisk/src/context.c:696
+#: libfdisk/src/bsd.c:920 libfdisk/src/context.c:750
 msgid "Syncing disks."
 msgstr "正在同步磁盘。"
 
-#: libfdisk/src/bsd.c:960
+#: libfdisk/src/bsd.c:961
 msgid "BSD label is not nested within a DOS partition."
 msgstr "BSD 标签未嵌套在 DOS 分区中。"
 
-#: libfdisk/src/bsd.c:988
+#: libfdisk/src/bsd.c:989
 #, c-format
 msgid "BSD partition '%c' linked to DOS partition %zu."
 msgstr "BSD 分区“%c”已链接到 DOS 分区 %zu。"
 
-#: libfdisk/src/bsd.c:1024
+#: libfdisk/src/bsd.c:1025
 msgid "Slice"
 msgstr "片"
 
-#: libfdisk/src/bsd.c:1031
+#: libfdisk/src/bsd.c:1032
 msgid "Fsize"
 msgstr "Fsize"
 
-#: libfdisk/src/bsd.c:1032
+#: libfdisk/src/bsd.c:1033
 msgid "Bsize"
 msgstr "Bsize"
 
-#: libfdisk/src/bsd.c:1033
+#: libfdisk/src/bsd.c:1034
 msgid "Cpg"
 msgstr "Cpg"
 
-#: libfdisk/src/context.c:690
+#: libfdisk/src/context.c:745
 #, c-format
 msgid "%s: close device failed"
 msgstr "%s：关闭设备失败"
 
-#: libfdisk/src/context.c:764
+#: libfdisk/src/context.c:825
 msgid "Calling ioctl() to re-read partition table."
 msgstr "将调用 ioctl() 来重新读分区表。"
 
-#: libfdisk/src/context.c:773
+#: libfdisk/src/context.c:834
 msgid "Re-reading the partition table failed."
 msgstr "重新读取分区表失败。"
 
@@ -5287,38 +5287,38 @@
 "reboot or after you run partprobe(8) or kpartx(8)."
 msgstr "内核仍在使用旧分区表。新分区表将在下次重启或运行 partprobe(8) 或 kpartx(8) 后生效。"
 
-#: libfdisk/src/context.c:861
+#: libfdisk/src/context.c:926
 #, c-format
 msgid "Failed to remove partition %zu from system"
 msgstr ""
 
-#: libfdisk/src/context.c:869
+#: libfdisk/src/context.c:935
 #, c-format
 msgid "Failed to update system information about partition %zu"
 msgstr ""
 
-#: libfdisk/src/context.c:877
+#: libfdisk/src/context.c:944
 #, c-format
 msgid "Failed to add partition %zu to system"
 msgstr ""
 
-#: libfdisk/src/context.c:883
+#: libfdisk/src/context.c:950
 msgid ""
 "The kernel still uses the old partitions. The new table will be used at the "
 "next reboot. "
 msgstr ""
 
-#: libfdisk/src/context.c:1093
+#: libfdisk/src/context.c:1161
 msgid "cylinder"
 msgid_plural "cylinders"
 msgstr[0] "柱面"
 
-#: libfdisk/src/context.c:1094
+#: libfdisk/src/context.c:1162
 msgid "sector"
 msgid_plural "sectors"
 msgstr[0] "扇区"
 
-#: libfdisk/src/context.c:1450
+#: libfdisk/src/context.c:1518
 msgid "Incomplete geometry setting."
 msgstr "不完整的几何属性设置。"
 
@@ -5406,150 +5406,150 @@
 msgid "Disk identifier changed from 0x%08x to 0x%08x."
 msgstr "磁盘标识从 0x%08x 改为 0x%08x。"
 
-#: libfdisk/src/dos.c:838
+#: libfdisk/src/dos.c:844
 #, c-format
 msgid "Ignoring extra extended partition %zu"
 msgstr "将忽略额外的扩展分区 %zu"
 
-#: libfdisk/src/dos.c:852
+#: libfdisk/src/dos.c:858
 #, c-format
 msgid ""
 "Invalid flag 0x%02x%02x of EBR (for partition %zu) will be corrected by "
 "w(rite)."
 msgstr "分区表 %3$zu 的无效标志 0x%1$02x%2$02x 将通过写入来更正"
 
-#: libfdisk/src/dos.c:929
+#: libfdisk/src/dos.c:935
 #, c-format
 msgid "Start sector %ju out of range."
 msgstr "起始扇区 %ju 超出范围。"
 
-#: libfdisk/src/dos.c:1134 libfdisk/src/gpt.c:2325 libfdisk/src/sgi.c:838
-#: libfdisk/src/sun.c:520
+#: libfdisk/src/dos.c:1127 libfdisk/src/gpt.c:2192 libfdisk/src/sgi.c:838
+#: libfdisk/src/sun.c:528
 #, c-format
 msgid "Partition %zu is already defined.  Delete it before re-adding it."
 msgstr "分区 %zu 已经定义过。请删除后再重新添加它。"
 
-#: libfdisk/src/dos.c:1202
+#: libfdisk/src/dos.c:1191
 #, c-format
 msgid "Sector %llu is already allocated."
 msgstr "扇区 %llu 已经分配."
 
-#: libfdisk/src/dos.c:1142 libfdisk/src/dos.c:1178 libfdisk/src/dos.c:1240
-#: libfdisk/src/gpt.c:2334
+#: libfdisk/src/dos.c:1142 libfdisk/src/dos.c:1167 libfdisk/src/dos.c:1229
+#: libfdisk/src/gpt.c:2201
 msgid "No free sectors available."
 msgstr "无空闲扇区可用。"
 
-#: libfdisk/src/dos.c:1398
+#: libfdisk/src/dos.c:1385
 #, c-format
 msgid "Adding logical partition %zu"
 msgstr "添加逻辑分区 %zu"
 
-#: libfdisk/src/dos.c:1429
+#: libfdisk/src/dos.c:1416
 #, c-format
 msgid "Partition %zu: contains sector 0"
 msgstr "分区 %zu：包含扇区 0"
 
-#: libfdisk/src/dos.c:1431
+#: libfdisk/src/dos.c:1418
 #, c-format
 msgid "Partition %zu: head %d greater than maximum %d"
 msgstr "分区 %zu：磁头 %d 大于最大值 %d"
 
-#: libfdisk/src/dos.c:1434
+#: libfdisk/src/dos.c:1421
 #, c-format
 msgid "Partition %zu: sector %d greater than maximum %llu"
 msgstr "分区 %zu：扇区 %d 大于最大值 %llu"
 
-#: libfdisk/src/dos.c:1437
+#: libfdisk/src/dos.c:1424
 #, c-format
 msgid "Partition %zu: cylinder %d greater than maximum %llu"
 msgstr "分区 %zu：柱面 %d 大于最大值 %llu"
 
-#: libfdisk/src/dos.c:1443
+#: libfdisk/src/dos.c:1430
 #, c-format
 msgid "Partition %zu: previous sectors %u disagrees with total %u"
 msgstr "分区 %zu：之前的扇区数 %u 与总数 %u 不符"
 
-#: libfdisk/src/dos.c:1496
+#: libfdisk/src/dos.c:1483
 #, c-format
 msgid ""
 "Partition %zu: different physical/logical beginnings (non-Linux?): phys=(%d, "
 "%d, %d), logical=(%d, %d, %d)"
 msgstr "分区 %zu 的物理/逻辑起点不同(非 Linux 分区？)：物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
 
-#: libfdisk/src/dos.c:1507
+#: libfdisk/src/dos.c:1494
 #, c-format
 msgid ""
 "Partition %zu: different physical/logical endings: phys=(%d, %d, %d), "
 "logical=(%d, %d, %d)"
 msgstr "分区 %zu 的物理/逻辑终点不同：物理=(%d, %d, %d), 逻辑=(%d, %d, %d)"
 
-#: libfdisk/src/dos.c:1516
+#: libfdisk/src/dos.c:1503
 #, c-format
 msgid "Partition %zu: does not end on cylinder boundary."
 msgstr "分区 %zu 未结束在柱面边界上。"
 
-#: libfdisk/src/dos.c:1563
+#: libfdisk/src/dos.c:1550
 #, c-format
 msgid "Partition %zu: bad start-of-data."
 msgstr "分区 %zu：数据起点错误。"
 
-#: libfdisk/src/dos.c:1576
+#: libfdisk/src/dos.c:1563
 #, c-format
 msgid "Partition %zu: overlaps partition %zu."
 msgstr "分区 %zu：与 分区 %zu 重叠。"
 
-#: libfdisk/src/dos.c:1604
+#: libfdisk/src/dos.c:1591
 #, c-format
 msgid "Partition %zu: empty."
 msgstr "分区 %zu：空分区。"
 
-#: libfdisk/src/dos.c:1609
+#: libfdisk/src/dos.c:1596
 #, c-format
 msgid "Logical partition %zu: not entirely in partition %zu."
 msgstr "逻辑分区 %zu：没有完全在分区 %zu 中。"
 
-#: libfdisk/src/dos.c:1617
+#: libfdisk/src/dos.c:1604
 #, c-format
 msgid "Total allocated sectors %llu greater than the maximum %llu."
 msgstr "分配的总扇区数 %llu 大于最大值 %llu。"
 
-#: libfdisk/src/dos.c:1620
+#: libfdisk/src/dos.c:1607
 #, c-format
 msgid "Remaining %lld unallocated %ld-byte sectors."
 msgstr "剩余 %lld 未分配的 %ld字节 扇区。"
 
-#: libfdisk/src/dos.c:1678 libfdisk/src/dos.c:1693 libfdisk/src/dos.c:2139
+#: libfdisk/src/dos.c:1666 libfdisk/src/dos.c:1681 libfdisk/src/dos.c:2133
 msgid "Extended partition already exists."
 msgstr "扩展分区已存在。"
 
-#: libfdisk/src/dos.c:1708
+#: libfdisk/src/dos.c:1696
 msgid "Extended partition does not exists. Failed to add logical partition."
 msgstr ""
 
-#: libfdisk/src/dos.c:1744
+#: libfdisk/src/dos.c:1738
 msgid "The maximum number of partitions has been created."
 msgstr "已创建分区达到最大数量。"
 
-#: libfdisk/src/dos.c:1757
+#: libfdisk/src/dos.c:1751
 msgid "All primary partitions are in use."
 msgstr "所有主分区都在使用中。"
 
-#: libfdisk/src/dos.c:1759 libfdisk/src/dos.c:1770
+#: libfdisk/src/dos.c:1753 libfdisk/src/dos.c:1764
 msgid "All space for primary partitions is in use."
 msgstr "所有主分区的空间都在使用中。"
 
 #. TRANSLATORS: Try to keep this within 80 characters.
-#: libfdisk/src/dos.c:1773
+#: libfdisk/src/dos.c:1767
 msgid ""
 "To create more partitions, first replace a primary with an extended "
 "partition."
 msgstr "要创建更多分区，请先将一个主分区替换为扩展分区。"
 
-#: libfdisk/src/dos.c:1778
+#: libfdisk/src/dos.c:1772
 msgid "All logical partitions are in use. Adding a primary partition."
 msgstr "所有逻辑分区都在使用中。将添加一个主分区。"
 
-#: libfdisk/src/dos.c:1800
+#: libfdisk/src/dos.c:1794
 msgid "Partition type"
 msgstr "分区类型"
 
@@ -5558,434 +5558,434 @@
 msgid "%zu primary, %d extended, %zu free"
 msgstr "%zu个主分区，%d个扩展分区，%zu空闲"
 
-#: libfdisk/src/dos.c:1809
+#: libfdisk/src/dos.c:1803
 msgid "primary"
 msgstr "主分区"
 
-#: libfdisk/src/dos.c:1811
+#: libfdisk/src/dos.c:1805
 msgid "extended"
 msgstr "扩展分区"
 
-#: libfdisk/src/dos.c:1811
+#: libfdisk/src/dos.c:1805
 msgid "container for logical partitions"
 msgstr "逻辑分区容器"
 
-#: libfdisk/src/dos.c:1813
+#: libfdisk/src/dos.c:1807
 msgid "logical"
 msgstr "逻辑分区"
 
-#: libfdisk/src/dos.c:1813
+#: libfdisk/src/dos.c:1807
 msgid "numbered from 5"
 msgstr "从 5 开始编号"
 
-#: libfdisk/src/dos.c:1852
+#: libfdisk/src/dos.c:1846
 #, c-format
 msgid "Invalid partition type `%c'."
 msgstr "无效的分区类型“%c”。"
 
-#: libfdisk/src/dos.c:1870
+#: libfdisk/src/dos.c:1864
 #, c-format
 msgid "Cannot write sector %jd: seek failed"
 msgstr "写扇区 %jd 失败：定位失败"
 
-#: libfdisk/src/dos.c:2030 libfdisk/src/gpt.c:1225
+#: libfdisk/src/dos.c:2024 libfdisk/src/gpt.c:1095
 msgid "Disk identifier"
 msgstr "磁盘标识符"
 
-#: libfdisk/src/dos.c:2144
+#: libfdisk/src/dos.c:2138
 msgid ""
 "Type 0 means free space to many systems. Having partitions of type 0 is "
 "probably unwise."
 msgstr "很多系统将类型 0 视为空闲空间。不建议设置类型为 0 的分区。"
 
-#: libfdisk/src/dos.c:2149
+#: libfdisk/src/dos.c:2143
 msgid ""
 "Cannot change type of the extended partition which is already used by "
 "logical partitions. Delete logical partitions first."
 msgstr "无法更改已被逻辑分区使用的扩展分区的类型。请先删除逻辑分区。"
 
-#: libfdisk/src/dos.c:2335 libfdisk/src/gpt.c:3047
+#: libfdisk/src/dos.c:2329 libfdisk/src/gpt.c:2914
 msgid "Nothing to do. Ordering is correct already."
 msgstr "无须操作。顺序已经是正确的了。"
 
-#: libfdisk/src/dos.c:2390
+#: libfdisk/src/dos.c:2384
 #, c-format
 msgid "Partition %zu: no data area."
 msgstr "分区 %zu：无数据区。"
 
-#: libfdisk/src/dos.c:2423
+#: libfdisk/src/dos.c:2417
 msgid "New beginning of data"
 msgstr "新数据起点"
 
-#: libfdisk/src/dos.c:2479
+#: libfdisk/src/dos.c:2473
 #, c-format
 msgid "Partition %zu: is an extended partition."
 msgstr "分区 %zu：是一个扩展分区。"
 
-#: libfdisk/src/dos.c:2485
+#: libfdisk/src/dos.c:2479
 #, c-format
 msgid "The bootable flag on partition %zu is enabled now."
 msgstr "分区 %zu 的 可启动 标志已启用。"
 
-#: libfdisk/src/dos.c:2486
+#: libfdisk/src/dos.c:2480
 #, c-format
 msgid "The bootable flag on partition %zu is disabled now."
 msgstr "分区 %zu 的 可启动 标志已禁用。"
 
-#: libfdisk/src/dos.c:2499 libfdisk/src/gpt.c:3137 libfdisk/src/sgi.c:1153
-#: libfdisk/src/sun.c:1121
+#: libfdisk/src/dos.c:2493 libfdisk/src/gpt.c:3004 libfdisk/src/sgi.c:1153
+#: libfdisk/src/sun.c:1129
 msgid "Device"
 msgstr "设备"
 
-#: libfdisk/src/dos.c:2500 libfdisk/src/sun.c:40
+#: libfdisk/src/dos.c:2494 libfdisk/src/sun.c:40
 msgid "Boot"
 msgstr "启动"
 
-#: libfdisk/src/dos.c:2506 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1127
+#: libfdisk/src/dos.c:2500 libfdisk/src/sgi.c:1159 libfdisk/src/sun.c:1135
 msgid "Id"
 msgstr "Id"
 
-#: libfdisk/src/dos.c:2510
+#: libfdisk/src/dos.c:2504
 msgid "Start-C/H/S"
 msgstr "起始-C/H/S"
 
-#: libfdisk/src/dos.c:2511
+#: libfdisk/src/dos.c:2505
 msgid "End-C/H/S"
 msgstr "终-C/H/S"
 
-#: libfdisk/src/dos.c:2512 libfdisk/src/gpt.c:3147 libfdisk/src/sgi.c:1161
+#: libfdisk/src/dos.c:2506 libfdisk/src/gpt.c:3014 libfdisk/src/sgi.c:1161
 msgid "Attrs"
 msgstr "属性"
 
-#: libfdisk/src/gpt.c:159
+#: include/pt-gpt-partnames.h:16
 msgid "EFI System"
 msgstr "EFI 系统"
 
-#: libfdisk/src/gpt.c:161
+#: include/pt-gpt-partnames.h:18
 msgid "MBR partition scheme"
 msgstr "MBR 分区方案"
 
-#: libfdisk/src/gpt.c:162
+#: include/pt-gpt-partnames.h:19
 msgid "Intel Fast Flash"
 msgstr "Intel Fast Flash"
 
-#: libfdisk/src/gpt.c:165
+#: include/pt-gpt-partnames.h:22
 msgid "BIOS boot"
 msgstr "BIOS 启动"
 
-#: libfdisk/src/gpt.c:168
+#: include/pt-gpt-partnames.h:25
 msgid "Sony boot partition"
 msgstr "Sony 启动分区"
 
-#: libfdisk/src/gpt.c:169
+#: include/pt-gpt-partnames.h:26
 msgid "Lenovo boot partition"
 msgstr "Lenovo 启动分区"
 
-#: libfdisk/src/gpt.c:172
+#: include/pt-gpt-partnames.h:29
 msgid "PowerPC PReP boot"
 msgstr "PowerPC PReP boot"
 
-#: libfdisk/src/gpt.c:175
+#: include/pt-gpt-partnames.h:32
 msgid "ONIE boot"
 msgstr "ONIE boot"
 
-#: libfdisk/src/gpt.c:176
+#: include/pt-gpt-partnames.h:33
 msgid "ONIE config"
 msgstr "ONIE 配置"
 
-#: libfdisk/src/gpt.c:179
+#: include/pt-gpt-partnames.h:36
 msgid "Microsoft reserved"
 msgstr "Microsoft 保留"
 
-#: libfdisk/src/gpt.c:180
+#: include/pt-gpt-partnames.h:37
 msgid "Microsoft basic data"
 msgstr "Microsoft 基本数据"
 
-#: libfdisk/src/gpt.c:181
+#: include/pt-gpt-partnames.h:38
 msgid "Microsoft LDM metadata"
 msgstr "Microsoft LDM 元数据"
 
-#: libfdisk/src/gpt.c:182
+#: include/pt-gpt-partnames.h:39
 msgid "Microsoft LDM data"
 msgstr "Microsoft LDM 数据"
 
-#: libfdisk/src/gpt.c:183
+#: include/pt-gpt-partnames.h:40
 msgid "Windows recovery environment"
 msgstr "Windows 恢复环境"
 
-#: libfdisk/src/gpt.c:184
+#: include/pt-gpt-partnames.h:41
 msgid "IBM General Parallel Fs"
 msgstr "IBM 通用并行文件系统"
 
-#: libfdisk/src/gpt.c:185
+#: include/pt-gpt-partnames.h:42
 msgid "Microsoft Storage Spaces"
 msgstr "Microsoft 存储空间"
 
-#: libfdisk/src/gpt.c:188
+#: include/pt-gpt-partnames.h:45
 msgid "HP-UX data"
 msgstr "HP-UX 数据"
 
-#: libfdisk/src/gpt.c:189
+#: include/pt-gpt-partnames.h:46
 msgid "HP-UX service"
 msgstr "HP-UX 服务"
 
-#: libfdisk/src/gpt.c:192 libfdisk/src/sgi.c:60 libfdisk/src/sun.c:51
+#: include/pt-gpt-partnames.h:49 libfdisk/src/sgi.c:60 libfdisk/src/sun.c:51
 msgid "Linux swap"
 msgstr "Linux swap"
 
-#: libfdisk/src/gpt.c:193
+#: include/pt-gpt-partnames.h:50
 msgid "Linux filesystem"
 msgstr "Linux 文件系统"
 
-#: libfdisk/src/gpt.c:194
+#: include/pt-gpt-partnames.h:51
 msgid "Linux server data"
 msgstr "Linux 保留数据"
 
-#: libfdisk/src/gpt.c:195
+#: include/pt-gpt-partnames.h:52
 msgid "Linux root (x86)"
 msgstr "Linux root (x86)"
 
-#: libfdisk/src/gpt.c:196
+#: include/pt-gpt-partnames.h:53
 msgid "Linux root (ARM)"
 msgstr "Linux root (ARM)"
 
-#: libfdisk/src/gpt.c:197
+#: include/pt-gpt-partnames.h:54
 msgid "Linux root (x86-64)"
 msgstr "Linux root (x86-64)"
 
-#: libfdisk/src/gpt.c:198
+#: include/pt-gpt-partnames.h:55
 msgid "Linux root (ARM-64)"
 msgstr "Linux root (ARM-64)"
 
-#: libfdisk/src/gpt.c:199
+#: include/pt-gpt-partnames.h:56
 msgid "Linux root\t(IA-64)"
 msgstr "Linux root\t(IA-64)"
 
-#: libfdisk/src/gpt.c:200
+#: include/pt-gpt-partnames.h:57
 msgid "Linux reserved"
 msgstr "Linux 保留"
 
-#: libfdisk/src/gpt.c:201
+#: include/pt-gpt-partnames.h:58
 msgid "Linux home"
 msgstr "Linux home"
 
-#: libfdisk/src/gpt.c:202 libfdisk/src/sgi.c:63
+#: include/pt-gpt-partnames.h:59 libfdisk/src/sgi.c:63
 msgid "Linux RAID"
 msgstr "Linux RAID"
 
-#: libfdisk/src/gpt.c:203
+#: include/pt-gpt-partnames.h:66 include/pt-mbr-partnames.h:95
 msgid "Linux extended boot"
 msgstr "Linux 扩展启动"
 
-#: libfdisk/src/gpt.c:211
+#: include/pt-gpt-partnames.h:69
 msgid "FreeBSD data"
 msgstr "FreeBSD 数据"
 
-#: libfdisk/src/gpt.c:212
+#: include/pt-gpt-partnames.h:70
 msgid "FreeBSD boot"
 msgstr "FreeBSD 启动"
 
-#: libfdisk/src/gpt.c:213
+#: include/pt-gpt-partnames.h:71
 msgid "FreeBSD swap"
 msgstr "FreeBSD 交换"
 
-#: libfdisk/src/gpt.c:214
+#: include/pt-gpt-partnames.h:72
 msgid "FreeBSD UFS"
 msgstr "FreeBSD UFS"
 
-#: libfdisk/src/gpt.c:215
+#: include/pt-gpt-partnames.h:73
 msgid "FreeBSD ZFS"
 msgstr "FreeBSD ZFS"
 
-#: libfdisk/src/gpt.c:216
+#: include/pt-gpt-partnames.h:74
 msgid "FreeBSD Vinum"
 msgstr "FreeBSD Vinum"
 
-#: libfdisk/src/gpt.c:219
+#: include/pt-gpt-partnames.h:77
 msgid "Apple HFS/HFS+"
 msgstr "Apple HFS/HFS+"
 
-#: libfdisk/src/gpt.c:220
+#: include/pt-gpt-partnames.h:79
 msgid "Apple UFS"
 msgstr "Apple UFS"
 
-#: libfdisk/src/gpt.c:221
+#: include/pt-gpt-partnames.h:80
 msgid "Apple RAID"
 msgstr "Apple RAID"
 
-#: libfdisk/src/gpt.c:222
+#: include/pt-gpt-partnames.h:81
 msgid "Apple RAID offline"
 msgstr "Apple RAID 离线"
 
-#: libfdisk/src/gpt.c:223
+#: include/pt-gpt-partnames.h:82
 msgid "Apple boot"
 msgstr "Apple 启动"
 
-#: libfdisk/src/gpt.c:224
+#: include/pt-gpt-partnames.h:83
 msgid "Apple label"
 msgstr "Apple 标签"
 
-#: libfdisk/src/gpt.c:225
+#: include/pt-gpt-partnames.h:84
 msgid "Apple TV recovery"
 msgstr "Apple TV 恢复"
 
-#: libfdisk/src/gpt.c:226
+#: include/pt-gpt-partnames.h:85
 msgid "Apple Core storage"
 msgstr "Apple Core 存储"
 
-#: libfdisk/src/gpt.c:230
+#: include/pt-gpt-partnames.h:89
 msgid "Solaris root"
 msgstr "Solaris root"
 
-#: libfdisk/src/gpt.c:232
+#: include/pt-gpt-partnames.h:91
 msgid "Solaris /usr & Apple ZFS"
 msgstr "Solaris /usr & Apple ZFS"
 
-#: libfdisk/src/gpt.c:233
+#: include/pt-gpt-partnames.h:92
 msgid "Solaris swap"
 msgstr "Solaris 交换"
 
-#: libfdisk/src/gpt.c:234
+#: include/pt-gpt-partnames.h:93
 msgid "Solaris backup"
 msgstr "Solaris 备份"
 
-#: libfdisk/src/gpt.c:235
+#: include/pt-gpt-partnames.h:94
 msgid "Solaris /var"
 msgstr "Solaris /var"
 
-#: libfdisk/src/gpt.c:236
+#: include/pt-gpt-partnames.h:95
 msgid "Solaris /home"
 msgstr "Solaris /home"
 
-#: libfdisk/src/gpt.c:237
+#: include/pt-gpt-partnames.h:96
 msgid "Solaris alternate sector"
 msgstr "Solaris 备选扇区"
 
-#: libfdisk/src/gpt.c:238
+#: include/pt-gpt-partnames.h:97
 msgid "Solaris reserved 1"
 msgstr "Solaris 保留 1"
 
-#: libfdisk/src/gpt.c:239
+#: include/pt-gpt-partnames.h:98
 msgid "Solaris reserved 2"
 msgstr "Solaris 保留 2"
 
-#: libfdisk/src/gpt.c:240
+#: include/pt-gpt-partnames.h:99
 msgid "Solaris reserved 3"
 msgstr "Solaris 保留 3"
 
-#: libfdisk/src/gpt.c:241
+#: include/pt-gpt-partnames.h:100
 msgid "Solaris reserved 4"
 msgstr "Solaris 保留 4"
 
-#: libfdisk/src/gpt.c:242
+#: include/pt-gpt-partnames.h:101
 msgid "Solaris reserved 5"
 msgstr "Solaris 保留 5"
 
-#: libfdisk/src/gpt.c:245
+#: include/pt-gpt-partnames.h:104
 msgid "NetBSD swap"
 msgstr "NetBSD 交换"
 
-#: libfdisk/src/gpt.c:246
+#: include/pt-gpt-partnames.h:105
 msgid "NetBSD FFS"
 msgstr "NetBSD FFS"
 
-#: libfdisk/src/gpt.c:247
+#: include/pt-gpt-partnames.h:106
 msgid "NetBSD LFS"
 msgstr "NetBSD LFS"
 
-#: libfdisk/src/gpt.c:248
+#: include/pt-gpt-partnames.h:107
 msgid "NetBSD concatenated"
 msgstr "NetBSD concatenated"
 
-#: libfdisk/src/gpt.c:249
+#: include/pt-gpt-partnames.h:108
 msgid "NetBSD encrypted"
 msgstr "NetBSD 加密"
 
-#: libfdisk/src/gpt.c:250
+#: include/pt-gpt-partnames.h:109
 msgid "NetBSD RAID"
 msgstr "NetBSD RAID"
 
-#: libfdisk/src/gpt.c:253
+#: include/pt-gpt-partnames.h:112
 msgid "ChromeOS kernel"
 msgstr "ChromeOS 内核"
 
-#: libfdisk/src/gpt.c:254
+#: include/pt-gpt-partnames.h:113
 msgid "ChromeOS root fs"
 msgstr "ChromeOS 根文件系统"
 
-#: libfdisk/src/gpt.c:255
+#: include/pt-gpt-partnames.h:114
 msgid "ChromeOS reserved"
 msgstr "ChromeOS 保留"
 
-#: libfdisk/src/gpt.c:258
+#: include/pt-gpt-partnames.h:117
 msgid "MidnightBSD data"
 msgstr "MidnightBSD 数据"
 
-#: libfdisk/src/gpt.c:259
+#: include/pt-gpt-partnames.h:118
 msgid "MidnightBSD boot"
 msgstr "MidnightBSD 启动"
 
-#: libfdisk/src/gpt.c:260
+#: include/pt-gpt-partnames.h:119
 msgid "MidnightBSD swap"
 msgstr "MidnightBSD 交换"
 
-#: libfdisk/src/gpt.c:261
+#: include/pt-gpt-partnames.h:120
 msgid "MidnightBSD UFS"
 msgstr "MidnightBSD UFS"
 
-#: libfdisk/src/gpt.c:262
+#: include/pt-gpt-partnames.h:121
 msgid "MidnightBSD ZFS"
 msgstr "MidnightBSD ZFS"
 
-#: libfdisk/src/gpt.c:263
+#: include/pt-gpt-partnames.h:122
 msgid "MidnightBSD Vinum"
 msgstr "MidnightBSD Vinum"
 
-#: libfdisk/src/gpt.c:266
+#: include/pt-gpt-partnames.h:125
 msgid "Ceph Journal"
 msgstr "Ceph 日志"
 
-#: libfdisk/src/gpt.c:267
+#: include/pt-gpt-partnames.h:126
 msgid "Ceph Encrypted Journal"
 msgstr "Ceph 加密日志"
 
-#: libfdisk/src/gpt.c:268
+#: include/pt-gpt-partnames.h:127
 msgid "Ceph OSD"
 msgstr "Ceph OSD"
 
-#: libfdisk/src/gpt.c:269
+#: include/pt-gpt-partnames.h:128
 msgid "Ceph crypt OSD"
 msgstr "Ceph 加密 OSD"
 
-#: libfdisk/src/gpt.c:270
+#: include/pt-gpt-partnames.h:129
 msgid "Ceph disk in creation"
 msgstr "创建中的 Ceph 磁盘"
 
-#: libfdisk/src/gpt.c:271
+#: include/pt-gpt-partnames.h:130
 msgid "Ceph crypt disk in creation"
 msgstr "创建中的加密 Ceph 磁盘"
 
-#: libfdisk/src/gpt.c:281
+#: include/pt-gpt-partnames.h:140
 msgid "OpenBSD data"
 msgstr "OpenBSD 数据"
 
-#: libfdisk/src/gpt.c:284
+#: include/pt-gpt-partnames.h:143
 msgid "QNX6 file system"
 msgstr "QNX6 文件系统"
 
-#: libfdisk/src/gpt.c:287
+#: include/pt-gpt-partnames.h:146
 msgid "Plan 9 partition"
 msgstr "Plan 9 分区"
 
-#: libfdisk/src/gpt.c:665
+#: libfdisk/src/gpt.c:529
 msgid "failed to allocate GPT header"
 msgstr "分配 GPT 头失败"
 
-#: libfdisk/src/gpt.c:748
+#: libfdisk/src/gpt.c:612
 msgid "First LBA specified by script is out of range."
 msgstr "脚本指定的第一个 LBA 超出范围。"
 
-#: libfdisk/src/gpt.c:760
+#: libfdisk/src/gpt.c:624
 msgid "Last LBA specified by script is out of range."
 msgstr "脚本指定的最后一个 LBA 超出范围。"
 
@@ -5995,82 +5995,82 @@
 "GPT PMBR size mismatch (%<PRIu64> != %<PRIu64>) will be corrected by w(rite)."
 msgstr "GPT PMBR 大小不符(%<PRIu64> != %<PRIu64>)，将用 w(写) 予以更正。"
 
-#: libfdisk/src/gpt.c:921
+#: libfdisk/src/gpt.c:791
 msgid "gpt: stat() failed"
 msgstr "gpt：stat() 失败"
 
-#: libfdisk/src/gpt.c:931
+#: libfdisk/src/gpt.c:801
 #, c-format
 msgid "gpt: cannot handle files with mode %o"
 msgstr "gpt：无法操作模式为 %o 的文件"
 
-#: libfdisk/src/gpt.c:1195
+#: libfdisk/src/gpt.c:1065
 msgid "GPT Header"
 msgstr "GPT 头"
 
-#: libfdisk/src/gpt.c:1200
+#: libfdisk/src/gpt.c:1070
 msgid "GPT Entries"
 msgstr "GPT 记录项"
 
-#: libfdisk/src/gpt.c:1232
+#: libfdisk/src/gpt.c:1102
 msgid "First LBA"
 msgstr "第一个 LBA"
 
-#: libfdisk/src/gpt.c:1237
+#: libfdisk/src/gpt.c:1107
 msgid "Last LBA"
 msgstr "最后一个 LBA"
 
 #. TRANSLATORS: The LBA (Logical Block Address) of the backup GPT header.
-#: libfdisk/src/gpt.c:1243
+#: libfdisk/src/gpt.c:1113
 msgid "Alternative LBA"
 msgstr "替代 LBA"
 
 #. TRANSLATORS: The start of the array of partition entries.
-#: libfdisk/src/gpt.c:1249
+#: libfdisk/src/gpt.c:1119
 msgid "Partition entries LBA"
 msgstr "分区记录项 LBA"
 
-#: libfdisk/src/gpt.c:1254
+#: libfdisk/src/gpt.c:1124
 msgid "Allocated partition entries"
 msgstr "已分配的分区项"
 
-#: libfdisk/src/gpt.c:1599
+#: libfdisk/src/gpt.c:1466
 msgid ""
 "The backup GPT table is corrupt, but the primary appears OK, so that will be "
 "used."
 msgstr "备份 GPT 表损坏，但主表似乎正常，将使用它。"
 
-#: libfdisk/src/gpt.c:1609
+#: libfdisk/src/gpt.c:1476
 msgid ""
 "The primary GPT table is corrupt, but the backup appears OK, so that will be "
 "used."
 msgstr "主 GPT 表损坏，但备份似乎正常，将使用它。"
 
-#: libfdisk/src/gpt.c:1804
+#: libfdisk/src/gpt.c:1671
 #, c-format
 msgid "unsupported GPT attribute bit '%s'"
 msgstr "不支持的 GPT 属性位“%s”"
 
-#: libfdisk/src/gpt.c:1809
+#: libfdisk/src/gpt.c:1676
 #, c-format
 msgid "failed to parse GPT attribute string '%s'"
 msgstr ""
 
-#: libfdisk/src/gpt.c:1909
+#: libfdisk/src/gpt.c:1776
 #, c-format
 msgid "Partition UUID changed from %s to %s."
 msgstr "分区 UUID 已从 %s 更改为 %s。"
 
-#: libfdisk/src/gpt.c:1920
+#: libfdisk/src/gpt.c:1787
 #, c-format
 msgid "Partition name changed from '%s' to '%.*s'."
 msgstr "分区名已由“%s”改为“%.*s”。"
 
-#: libfdisk/src/gpt.c:1949
+#: libfdisk/src/gpt.c:1816
 msgid "The start of the partition understeps FirstUsableLBA."
 msgstr "分区起点未到首个可用 LBA。"
 
-#: libfdisk/src/gpt.c:1956
+#: libfdisk/src/gpt.c:1823
 msgid "The end of the partition oversteps LastUsableLBA."
 msgstr "分区终点超过了最后可用 LBA。"
 
@@ -6080,217 +6080,217 @@
 "manually."
 msgstr "该设备包含混合 MBR -- 将只写入 GPT。您需要手动同步 MBR。"
 
-#: libfdisk/src/gpt.c:2155
+#: libfdisk/src/gpt.c:2022
 msgid "Disk does not contain a valid backup header."
 msgstr "磁盘不含有效的备用磁头。"
 
-#: libfdisk/src/gpt.c:2160
+#: libfdisk/src/gpt.c:2027
 msgid "Invalid primary header CRC checksum."
 msgstr "无效的主磁头 CRC 校验和。"
 
-#: libfdisk/src/gpt.c:2164
+#: libfdisk/src/gpt.c:2031
 msgid "Invalid backup header CRC checksum."
 msgstr "无效的备份磁头 CRC 校验和。"
 
-#: libfdisk/src/gpt.c:2169
+#: libfdisk/src/gpt.c:2036
 msgid "Invalid partition entry checksum."
 msgstr "无效的分区记录校验和。"
 
-#: libfdisk/src/gpt.c:2174
+#: libfdisk/src/gpt.c:2041
 msgid "Invalid primary header LBA sanity checks."
 msgstr "无效的主磁头 LBA 完整性检查。"
 
-#: libfdisk/src/gpt.c:2178
+#: libfdisk/src/gpt.c:2045
 msgid "Invalid backup header LBA sanity checks."
 msgstr "无效的备用磁头 LBA 完整性检查。"
 
-#: libfdisk/src/gpt.c:2183
+#: libfdisk/src/gpt.c:2050
 msgid "MyLBA mismatch with real position at primary header."
 msgstr "MyLBA 不匹配，真正位置在主磁头。"
 
-#: libfdisk/src/gpt.c:2187
+#: libfdisk/src/gpt.c:2054
 msgid "MyLBA mismatch with real position at backup header."
 msgstr "MyLBA 不匹配，真正位置在备份磁头。"
 
-#: libfdisk/src/gpt.c:2192
+#: libfdisk/src/gpt.c:2059
 msgid "Disk is too small to hold all data."
 msgstr "磁盘太小，放不下所有数据。"
 
-#: libfdisk/src/gpt.c:2202
+#: libfdisk/src/gpt.c:2069
 msgid "Primary and backup header mismatch."
 msgstr "主磁头和备份磁头不匹配。"
 
-#: libfdisk/src/gpt.c:2208
+#: libfdisk/src/gpt.c:2075
 #, c-format
 msgid "Partition %u overlaps with partition %u."
 msgstr "分区 %u 与 %u 重叠。"
 
-#: libfdisk/src/gpt.c:2215
+#: libfdisk/src/gpt.c:2082
 #, c-format
 msgid "Partition %u is too big for the disk."
 msgstr "分区 %u 对于该磁盘而言过大。"
 
-#: libfdisk/src/gpt.c:2222
+#: libfdisk/src/gpt.c:2089
 #, c-format
 msgid "Partition %u ends before it starts."
 msgstr "分区 %u 结束于起点之前。"
 
-#: libfdisk/src/gpt.c:2231
+#: libfdisk/src/gpt.c:2098
 msgid "No errors detected."
 msgstr "未检测到错误。"
 
-#: libfdisk/src/gpt.c:2232
+#: libfdisk/src/gpt.c:2099
 #, c-format
 msgid "Header version: %s"
 msgstr "磁头版本：%s"
 
-#: libfdisk/src/gpt.c:2233
+#: libfdisk/src/gpt.c:2100
 #, c-format
 msgid "Using %zu out of %zu partitions."
 msgstr ""
 
-#: libfdisk/src/gpt.c:2243
+#: libfdisk/src/gpt.c:2110
 #, c-format
 msgid "A total of %ju free sectors is available in %u segment."
 msgid_plural ""
 "A total of %ju free sectors is available in %u segments (the largest is %s)."
 msgstr[0] "%2$u 个片段中共有 %1$ju 个空闲扇区(最大的是 %3$s)。"
 
-#: libfdisk/src/gpt.c:2251
+#: libfdisk/src/gpt.c:2118
 #, c-format
 msgid "%d error detected."
 msgid_plural "%d errors detected."
 msgstr[0] "检测到 %d 个错误。"
 
-#: libfdisk/src/gpt.c:2330
+#: libfdisk/src/gpt.c:2197
 msgid "All partitions are already in use."
 msgstr "所有分区均已占用。"
 
-#: libfdisk/src/gpt.c:2387 libfdisk/src/gpt.c:2414
+#: libfdisk/src/gpt.c:2254 libfdisk/src/gpt.c:2281
 #, c-format
 msgid "Sector %ju already used."
 msgstr "扇区 %ju 已使用。"
 
-#: libfdisk/src/gpt.c:2480
+#: libfdisk/src/gpt.c:2347
 #, c-format
 msgid "Could not create partition %zu"
 msgstr "无法创建分区 %zu"
 
-#: libfdisk/src/gpt.c:2487
+#: libfdisk/src/gpt.c:2354
 #, c-format
 msgid "The last usable GPT sector is %ju, but %ju is requested."
 msgstr "最后一个可用的 GPT 扇区是 %ju，但请求了 %ju。"
 
-#: libfdisk/src/gpt.c:2494
+#: libfdisk/src/gpt.c:2361
 #, c-format
 msgid "The first usable GPT sector is %ju, but %ju is requested."
 msgstr "第一个可用的 GPT 扇区是 %ju，但请求了 %ju。"
 
-#: libfdisk/src/gpt.c:2633
+#: libfdisk/src/gpt.c:2500
 #, c-format
 msgid "Created a new GPT disklabel (GUID: %s)."
 msgstr "已创建新的 GPT 磁盘标签(GUID: %s)。"
 
-#: libfdisk/src/gpt.c:2651
+#: libfdisk/src/gpt.c:2518
 msgid "Enter new disk UUID (in 8-4-4-4-12 format)"
 msgstr "输入新磁盘 UUID(以 8-4-4-4-12 格式)"
 
-#: libfdisk/src/gpt.c:2658
+#: libfdisk/src/gpt.c:2525
 msgid "Failed to parse your UUID."
 msgstr "解析您的 UUID 失败。"
 
-#: libfdisk/src/gpt.c:2672
+#: libfdisk/src/gpt.c:2539
 #, c-format
 msgid "Disk identifier changed from %s to %s."
 msgstr "将磁盘标识从 %s 更改为 %s 失败。"
 
-#: libfdisk/src/gpt.c:2692
+#: libfdisk/src/gpt.c:2559
 msgid "Not enough space for new partition table!"
 msgstr "创建新分区表的空闲空间不够！"
 
-#: libfdisk/src/gpt.c:2703
+#: libfdisk/src/gpt.c:2570
 #, c-format
 msgid "Partition #%zu out of range (minimal start is %<PRIu64> sectors)"
 msgstr ""
 
-#: libfdisk/src/gpt.c:2708
+#: libfdisk/src/gpt.c:2575
 #, c-format
 msgid "Partition #%zu out of range (maximal end is %<PRIu64> sectors)"
 msgstr ""
 
-#: libfdisk/src/gpt.c:2756
+#: libfdisk/src/gpt.c:2623
 #, c-format
 msgid "The number of the partition has to be smaller than %zu."
 msgstr ""
 
-#: libfdisk/src/gpt.c:2779
+#: libfdisk/src/gpt.c:2646
 msgid "Cannot allocate memory!"
 msgstr "无法分配内存！"
 
-#: libfdisk/src/gpt.c:2809
+#: libfdisk/src/gpt.c:2676
 #, c-format
 msgid "Partition table length changed from %<PRIu32> to %<PRIu64>."
 msgstr "分区表长度已从 %<PRIu32> 改为 %<PRIu64>。"
 
-#: libfdisk/src/gpt.c:2918
+#: libfdisk/src/gpt.c:2785
 #, c-format
 msgid "The attributes on partition %zu changed to 0x%016<PRIx64>."
 msgstr "分区 %zu 的属性已改为 0x%016<PRIx64>。"
 
-#: libfdisk/src/gpt.c:2968
+#: libfdisk/src/gpt.c:2835
 msgid "Enter GUID specific bit"
 msgstr "输入 GUID 特定位"
 
-#: libfdisk/src/gpt.c:2983
+#: libfdisk/src/gpt.c:2850
 #, c-format
 msgid "failed to toggle unsupported bit %lu"
 msgstr "开/关不支持的位 %lu 失败"
 
-#: libfdisk/src/gpt.c:2996
+#: libfdisk/src/gpt.c:2863
 #, c-format
 msgid "The GUID specific bit %d on partition %zu is enabled now."
 msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已启用。"
 
-#: libfdisk/src/gpt.c:2997
+#: libfdisk/src/gpt.c:2864
 #, c-format
 msgid "The GUID specific bit %d on partition %zu is disabled now."
 msgstr "分区 %2$zu 上的 GUID 特定位 %1$d 现已禁用。"
 
-#: libfdisk/src/gpt.c:3001
+#: libfdisk/src/gpt.c:2868
 #, c-format
 msgid "The %s flag on partition %zu is enabled now."
 msgstr "分区 %2$zu 上的标志 %1$s 现已启用。"
 
-#: libfdisk/src/gpt.c:3002
+#: libfdisk/src/gpt.c:2869
 #, c-format
 msgid "The %s flag on partition %zu is disabled now."
 msgstr "分区 %2$zu 上的标志 %1$s 现已禁用。"
 
-#: libfdisk/src/gpt.c:3144
+#: libfdisk/src/gpt.c:3011
 msgid "Type-UUID"
 msgstr "类型-UUID"
 
-#: libfdisk/src/gpt.c:3145
+#: libfdisk/src/gpt.c:3012
 msgid "UUID"
 msgstr "UUID"
 
-#: libfdisk/src/gpt.c:3146 login-utils/chfn.c:156 login-utils/chfn.c:158
+#: libfdisk/src/gpt.c:3013 login-utils/chfn.c:156 login-utils/chfn.c:158
 #: login-utils/chfn.c:323
 msgid "Name"
 msgstr "名称"
 
-#: libfdisk/src/partition.c:848
+#: libfdisk/src/partition.c:847
 msgid "Free space"
 msgstr "剩余空间"
 
-#: libfdisk/src/partition.c:1265
+#: libfdisk/src/partition.c:1271
 #, c-format
 msgid "Failed to resize partition #%zu."
 msgstr "调整分区 #%zu 的大小失败。"
 
-#: libfdisk/src/parttype.c:258 misc-utils/findmnt.c:655
+#: libfdisk/src/parttype.c:239 misc-utils/findmnt.c:655
 #: misc-utils/uuidparse.c:199 misc-utils/uuidparse.c:217 schedutils/chrt.c:205
-#: schedutils/ionice.c:79 sys-utils/hwclock.c:270
+#: schedutils/ionice.c:79 sys-utils/hwclock.c:275
 msgid "unknown"
 msgstr "未知"
 
@@ -6362,11 +6362,11 @@
 msgid "Detected an SGI disklabel with wrong checksum."
 msgstr "检测到校验和错误的 sgi 磁盘标签。"
 
-#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:785
+#: libfdisk/src/sgi.c:281 libfdisk/src/sun.c:793
 msgid "Physical cylinders"
 msgstr "物理柱面数"
 
-#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:790
+#: libfdisk/src/sgi.c:286 libfdisk/src/sun.c:798
 msgid "Extra sects/cyl"
 msgstr "额外扇区/柱面"
 
@@ -6418,7 +6418,7 @@
 msgid "More than one entire disk entry present."
 msgstr "存在超过一个整磁盘记录。"
 
-#: libfdisk/src/sgi.c:602 libfdisk/src/sun.c:459
+#: libfdisk/src/sgi.c:602 libfdisk/src/sun.c:467
 msgid "No partitions defined."
 msgstr "未定义分区。"
 
@@ -6479,7 +6479,7 @@
 msgid "You got a partition overlap on the disk. Fix it first!"
 msgstr "磁盘上有重叠分区。请先修复它！"
 
-#: libfdisk/src/sgi.c:874 libfdisk/src/sun.c:555
+#: libfdisk/src/sgi.c:874 libfdisk/src/sun.c:563
 #, c-format
 msgid "First %s"
 msgstr "起始 %s"
@@ -6495,7 +6495,7 @@
 msgid "Last %s or +%s or +size{K,M,G,T,P}"
 msgstr "最后 %s 或+%s 或 +大小{K,M,G,T,P}"
 
-#: libfdisk/src/sgi.c:985 libfdisk/src/sun.c:242
+#: libfdisk/src/sgi.c:985 libfdisk/src/sun.c:248
 #, c-format
 msgid ""
 "BLKGETSIZE ioctl failed on %s. Using geometry cylinder value of %llu. This "
@@ -6572,88 +6572,88 @@
 msgid "SunOS reserved"
 msgstr "SunOS 保留"
 
-#: libfdisk/src/sun.c:130
+#: libfdisk/src/sun.c:136
 msgid ""
 "Detected sun disklabel with wrong checksum. Probably you'll have to set all "
 "the values, e.g. heads, sectors, cylinders and partitions or force a fresh "
 "label (s command in main menu)"
 msgstr "检测到校验和错误的 sun 磁盘标签。您可能要设置所有的值(如磁头、扇区、柱面和分区)或强制一个新标签(主菜单中的 s 命令)"
 
-#: libfdisk/src/sun.c:147
+#: libfdisk/src/sun.c:153
 #, c-format
 msgid "Detected sun disklabel with wrong version [%d]."
 msgstr "检测到带错误版本 [%d] 的 sun 磁盘标签 。"
 
-#: libfdisk/src/sun.c:152
+#: libfdisk/src/sun.c:158
 #, c-format
 msgid "Detected sun disklabel with wrong vtoc.sanity [0x%08x]."
 msgstr "检测到带错误的 vtoc.sanity [0x%08x] 的 sun 磁盘标签。"
 
-#: libfdisk/src/sun.c:157
+#: libfdisk/src/sun.c:163
 #, c-format
 msgid "Detected sun disklabel with wrong vtoc.nparts [%u]."
 msgstr "检测到带错误 vtoc.nparts [%u] 的 sun 磁盘标签。"
 
-#: libfdisk/src/sun.c:162
+#: libfdisk/src/sun.c:168
 msgid ""
 "Warning: Wrong values need to be fixed up and will be corrected by w(rite)"
 msgstr "警告：错误值需要修复，并且将通过 w(写) 操作修正。"
 
-#: libfdisk/src/sun.c:187
+#: libfdisk/src/sun.c:193
 msgid "Heads"
 msgstr "磁头"
 
-#: libfdisk/src/sun.c:192
+#: libfdisk/src/sun.c:198
 msgid "Sectors/track"
 msgstr "扇区/磁道"
 
-#: libfdisk/src/sun.c:293
+#: libfdisk/src/sun.c:301
 msgid "Created a new Sun disklabel."
 msgstr "创建新的 Sun 磁盘标签。"
 
-#: libfdisk/src/sun.c:417
+#: libfdisk/src/sun.c:425
 #, c-format
 msgid "Partition %u doesn't end on cylinder boundary."
 msgstr "分区 %u 未结束在柱面边界上。"
 
-#: libfdisk/src/sun.c:436
+#: libfdisk/src/sun.c:444
 #, c-format
 msgid "Partition %u overlaps with others in sectors %u-%u."
 msgstr "分区 %u 在扇区 %u-%u 与其他分区重叠。"
 
-#: libfdisk/src/sun.c:464
+#: libfdisk/src/sun.c:472
 #, c-format
 msgid "Unused gap - sectors 0-%u."
 msgstr "未使用的间隙 - 扇区 0-%u。"
 
-#: libfdisk/src/sun.c:466 libfdisk/src/sun.c:472
+#: libfdisk/src/sun.c:474 libfdisk/src/sun.c:480
 #, c-format
 msgid "Unused gap - sectors %u-%u."
 msgstr "未使用的间隙 - 扇区 %u-%u。"
 
-#: libfdisk/src/sun.c:534
+#: libfdisk/src/sun.c:542
 msgid ""
 "Other partitions already cover the whole disk. Delete some/shrink them "
 "before retry."
 msgstr "其他分区已覆盖了整个磁盘。删除几个分区或压缩它们，然后重试。"
 
-#: libfdisk/src/sun.c:551
+#: libfdisk/src/sun.c:559
 msgid ""
 "It is highly recommended that the third partition covers the whole disk and "
 "is of type `Whole disk'"
 msgstr "强烈建议让第三个分区覆盖整个磁盘，并设为“整盘”类型"
 
-#: libfdisk/src/sun.c:593
+#: libfdisk/src/sun.c:601
 #, c-format
 msgid "Aligning the first sector from %u to %u to be on cylinder boundary."
 msgstr "将把从 %u 到 %u 的首个扇区对齐到柱面边界。"
 
-#: libfdisk/src/sun.c:621
+#: libfdisk/src/sun.c:629
 #, c-format
 msgid "Sector %d is already allocated"
 msgstr "扇区 %d 已分配"
 
-#: libfdisk/src/sun.c:698
+#: libfdisk/src/sun.c:706
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -6663,46 +6663,46 @@
 "您没有使第三个分区覆盖整个磁盘，但是值 %lu %s 覆盖了其他分区。\n"
 "您的记录已经更改为 %lu %s"
 
-#: libfdisk/src/sun.c:741
+#: libfdisk/src/sun.c:749
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this "
 "partition as Whole disk (5), starting at 0, with %u sectors"
 msgstr "如果您想与 SunOS/Solaris 兼容，请保持此分区为 整盘 (5)，以 0 开始，大小为 %u 个扇区"
 
-#: libfdisk/src/sun.c:765
+#: libfdisk/src/sun.c:773
 msgid "Label ID"
 msgstr "标签 ID"
 
-#: libfdisk/src/sun.c:770
+#: libfdisk/src/sun.c:778
 msgid "Volume ID"
 msgstr "卷 ID"
 
-#: libfdisk/src/sun.c:780
+#: libfdisk/src/sun.c:788
 msgid "Alternate cylinders"
 msgstr "备用柱面数"
 
-#: libfdisk/src/sun.c:886
+#: libfdisk/src/sun.c:894
 msgid "Number of alternate cylinders"
 msgstr "备用柱面的数量"
 
-#: libfdisk/src/sun.c:911
+#: libfdisk/src/sun.c:919
 msgid "Extra sectors per cylinder"
 msgstr "每个柱面的额外扇区数"
 
-#: libfdisk/src/sun.c:935
+#: libfdisk/src/sun.c:943
 msgid "Interleave factor"
 msgstr "交错系数"
 
-#: libfdisk/src/sun.c:959
+#: libfdisk/src/sun.c:967
 msgid "Rotation speed (rpm)"
 msgstr "转速(转/分)"
 
-#: libfdisk/src/sun.c:983
+#: libfdisk/src/sun.c:991
 msgid "Number of physical cylinders"
 msgstr "物理柱面数"
 
-#: libfdisk/src/sun.c:1048
+#: libfdisk/src/sun.c:1056
 msgid ""
 "Consider leaving partition 3 as Whole disk (5),\n"
 "as SunOS/Solaris expects it and even Linux likes it.\n"
@@ -6710,7 +6710,7 @@
 "考虑保持分区 3 为 整盘 (5)，\n"
 "这是 SunOS/Solaris 的规定，Linux 也建议这么做。\n"
 
-#: libfdisk/src/sun.c:1059
+#: libfdisk/src/sun.c:1067
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -6722,270 +6722,270 @@
 "和启动锁。\n"
 "您确信要把该分区标记为 Linux 交换分区吗？"
 
-#: libmount/src/context.c:2554
+#: libmount/src/context.c:2761
 #, c-format
 msgid "operation failed: %m"
 msgstr ""
 
-#: libmount/src/context_mount.c:1556
+#: libmount/src/context_mount.c:1593
 #, c-format
 msgid "WARNING: failed to apply propagation flags"
 msgstr "警告：应用传播标志失败"
 
-#: libmount/src/context_mount.c:1566
+#: libmount/src/context_mount.c:1603
 #, c-format
 msgid "WARNING: device write-protected, mounted read-only"
 msgstr ""
 
-#: libmount/src/context_mount.c:1580
+#: libmount/src/context_mount.c:1617
 #, c-format
 msgid "operation permitted for root only"
 msgstr ""
 
-#: libmount/src/context_mount.c:1584
+#: libmount/src/context_mount.c:1621
 #, c-format
 msgid "%s is already mounted"
 msgstr "%s 已经挂载"
 
-#: libmount/src/context_mount.c:1590
+#: libmount/src/context_mount.c:1627
 #, c-format
 msgid "can't find in %s"
 msgstr ""
 
-#: libmount/src/context_mount.c:1593
+#: libmount/src/context_mount.c:1630
 #, c-format
 msgid "can't find mount point in %s"
 msgstr ""
 
-#: libmount/src/context_mount.c:1596
+#: libmount/src/context_mount.c:1633
 #, c-format
 msgid "can't find mount source %s in %s"
 msgstr "在 %2$s 中找不到挂载源 %1$s"
 
-#: libmount/src/context_mount.c:1601
+#: libmount/src/context_mount.c:1638
 #, c-format
 msgid "more filesystems detected on %s; use -t <type> or wipefs(8)"
 msgstr ""
 
-#: libmount/src/context_mount.c:1606
+#: libmount/src/context_mount.c:1643
 #, c-format
 msgid "failed to determine filesystem type"
 msgstr ""
 
-#: libmount/src/context_mount.c:1607
+#: libmount/src/context_mount.c:1644
 #, c-format
 msgid "no filesystem type specified"
 msgstr ""
 
-#: libmount/src/context_mount.c:1614
+#: libmount/src/context_mount.c:1651
 #, c-format
 msgid "can't find %s"
 msgstr "找不到 %s"
 
-#: libmount/src/context_mount.c:1616
+#: libmount/src/context_mount.c:1653
 #, c-format
 msgid "no mount source specified"
 msgstr ""
 
-#: libmount/src/context_mount.c:1622
+#: libmount/src/context_mount.c:1659
 #, c-format
 msgid "failed to parse mount options: %m"
 msgstr ""
 
-#: libmount/src/context_mount.c:1623
+#: libmount/src/context_mount.c:1660
 #, c-format
 msgid "failed to parse mount options"
 msgstr "解析挂臷选项失败"
 
-#: libmount/src/context_mount.c:1627
+#: libmount/src/context_mount.c:1664
 #, c-format
 msgid "failed to setup loop device for %s"
 msgstr ""
 
-#: libmount/src/context_mount.c:1631
+#: libmount/src/context_mount.c:1668
 #, c-format
 msgid "overlapping loop device exists for %s"
 msgstr ""
 
-#: libmount/src/context_mount.c:1635 libmount/src/context_umount.c:1207
+#: libmount/src/context_mount.c:1672 libmount/src/context_umount.c:1207
 #, c-format
 msgid "locking failed"
 msgstr ""
 
-#: libmount/src/context_mount.c:1642
+#: libmount/src/context_mount.c:1679
 #, c-format
 msgid "mount failed: %m"
 msgstr ""
 
-#: libmount/src/context_mount.c:1652
+#: libmount/src/context_mount.c:1689
 #, c-format
 msgid "filesystem was mounted, but failed to update userspace mount table"
 msgstr ""
 
-#: libmount/src/context_mount.c:1661
+#: libmount/src/context_mount.c:1698
 #, c-format
 msgid "filesystem was mounted, but any subsequent operation failed: %m"
 msgstr ""
 
-#: libmount/src/context_mount.c:1679 libmount/src/context_mount.c:1736
+#: libmount/src/context_mount.c:1716 libmount/src/context_mount.c:1773
 #, c-format
 msgid "mount point is not a directory"
 msgstr ""
 
-#: libmount/src/context_mount.c:1681 login-utils/newgrp.c:226
+#: libmount/src/context_mount.c:1718 login-utils/newgrp.c:226
 #, c-format
 msgid "permission denied"
 msgstr "权限不足"
 
-#: libmount/src/context_mount.c:1683
+#: libmount/src/context_mount.c:1720
 #, c-format
 msgid "must be superuser to use mount"
 msgstr "必须以超级用户身份使用 mount"
 
-#: libmount/src/context_mount.c:1693
+#: libmount/src/context_mount.c:1730
 #, c-format
 msgid "mount point is busy"
 msgstr ""
 
-#: libmount/src/context_mount.c:1706
+#: libmount/src/context_mount.c:1743
 #, c-format
 msgid "%s already mounted on %s"
 msgstr ""
 
-#: libmount/src/context_mount.c:1712
+#: libmount/src/context_mount.c:1749
 #, c-format
 msgid "%s already mounted or mount point busy"
 msgstr ""
 
-#: libmount/src/context_mount.c:1718
+#: libmount/src/context_mount.c:1755
 #, c-format
 msgid "mount point does not exist"
 msgstr ""
 
-#: libmount/src/context_mount.c:1721
+#: libmount/src/context_mount.c:1758
 #, c-format
 msgid "mount point is a symbolic link to nowhere"
 msgstr ""
 
-#: libmount/src/context_mount.c:1726
+#: libmount/src/context_mount.c:1763
 #, c-format
 msgid "special device %s does not exist"
 msgstr "特殊设备 %s 不存在"
 
-#: libmount/src/context_mount.c:1729 libmount/src/context_mount.c:1745
-#: libmount/src/context_mount.c:1829 libmount/src/context_mount.c:1852
+#: libmount/src/context_mount.c:1766 libmount/src/context_mount.c:1782
+#: libmount/src/context_mount.c:1866 libmount/src/context_mount.c:1889
 #, c-format
 msgid "mount(2) system call failed: %m"
 msgstr ""
 
-#: libmount/src/context_mount.c:1741
+#: libmount/src/context_mount.c:1778
 #, c-format
 msgid "special device %s does not exist (a path prefix is not a directory)"
 msgstr "特殊设备 %s 不存在(路径前缀不是目录)"
 
-#: libmount/src/context_mount.c:1753
+#: libmount/src/context_mount.c:1790
 #, c-format
 msgid "mount point not mounted or bad option"
 msgstr ""
 
-#: libmount/src/context_mount.c:1755
+#: libmount/src/context_mount.c:1792
 #, c-format
 msgid "not mount point or bad option"
 msgstr ""
 
-#: libmount/src/context_mount.c:1758
+#: libmount/src/context_mount.c:1795
 #, c-format
 msgid ""
 "bad option; moving a mount residing under a shared mount is unsupported"
 msgstr ""
 
-#: libmount/src/context_mount.c:1762
+#: libmount/src/context_mount.c:1799
 #, c-format
 msgid ""
 "bad option; for several filesystems (e.g. nfs, cifs) you might need a "
 "/sbin/mount.<type> helper program"
 msgstr ""
 
-#: libmount/src/context_mount.c:1766
+#: libmount/src/context_mount.c:1803
 #, c-format
 msgid ""
 "wrong fs type, bad option, bad superblock on %s, missing codepage or helper "
 "program, or other error"
 msgstr ""
 
-#: libmount/src/context_mount.c:1773
+#: libmount/src/context_mount.c:1810
 #, c-format
 msgid "mount table full"
 msgstr "挂载表满"
 
-#: libmount/src/context_mount.c:1778
+#: libmount/src/context_mount.c:1815
 #, c-format
 msgid "can't read superblock on %s"
 msgstr ""
 
-#: libmount/src/context_mount.c:1785
+#: libmount/src/context_mount.c:1822
 #, c-format
 msgid "unknown filesystem type '%s'"
 msgstr "未知的文件系统类型“%s”"
 
-#: libmount/src/context_mount.c:1788
+#: libmount/src/context_mount.c:1825
 #, c-format
 msgid "unknown filesystem type"
 msgstr "未知的文件系统类型"
 
-#: libmount/src/context_mount.c:1797
+#: libmount/src/context_mount.c:1834
 #, c-format
 msgid "%s is not a block device, and stat(2) fails?"
 msgstr "%s 不是块设备，而且 stat(2) 失败？"
 
-#: libmount/src/context_mount.c:1800
+#: libmount/src/context_mount.c:1837
 #, c-format
 msgid ""
 "the kernel does not recognize %s as a block device; maybe \"modprobe "
 "driver\" is necessary"
 msgstr ""
 
-#: libmount/src/context_mount.c:1803
+#: libmount/src/context_mount.c:1840
 #, c-format
 msgid "%s is not a block device; try \"-o loop\""
 msgstr ""
 
-#: libmount/src/context_mount.c:1805
+#: libmount/src/context_mount.c:1842
 #, c-format
 msgid "%s is not a block device"
 msgstr ""
 
-#: libmount/src/context_mount.c:1812
+#: libmount/src/context_mount.c:1849
 #, c-format
 msgid "%s is not a valid block device"
 msgstr "%s 不是一个有效的块设备"
 
-#: libmount/src/context_mount.c:1820
+#: libmount/src/context_mount.c:1857
 #, c-format
 msgid "cannot mount %s read-only"
 msgstr "无法以只读方式挂载 %s"
 
-#: libmount/src/context_mount.c:1822
+#: libmount/src/context_mount.c:1859
 #, c-format
 msgid "%s is write-protected but explicit read-write mode requested"
 msgstr ""
 
-#: libmount/src/context_mount.c:1824
+#: libmount/src/context_mount.c:1861
 #, c-format
 msgid "cannot remount %s read-write, is write-protected"
 msgstr "无法以读写方式重新挂载 %s，它是写保护的"
 
-#: libmount/src/context_mount.c:1826
+#: libmount/src/context_mount.c:1863
 #, c-format
 msgid "bind %s failed"
 msgstr ""
 
-#: libmount/src/context_mount.c:1837
+#: libmount/src/context_mount.c:1874
 #, c-format
 msgid "no medium found on %s"
 msgstr "在 %s 上找不到媒体"
 
-#: libmount/src/context_mount.c:1844
+#: libmount/src/context_mount.c:1881
 #, c-format
 msgid "cannot mount; probably corrupted filesystem on %s"
 msgstr ""
@@ -7050,16 +7050,16 @@
 msgid "waitpid failed (%s)"
 msgstr "waitpid 失败(%s)"
 
-#: sys-utils/lscpu.c:2009
+#: sys-utils/lscpu.c:2061
 msgid "failed to callocate cpu set"
 msgstr "分配(callocate) CPU 组 失败"
 
-#: lib/path.c:213
+#: lib/path.c:229
 #, c-format
 msgid "failed to parse CPU list %s"
 msgstr "解析 CPU 列表 %s 失败"
 
-#: lib/path.c:216
+#: lib/path.c:232
 #, c-format
 msgid "failed to parse CPU mask %s"
 msgstr "解析 CPU 掩码 %s 失败"
@@ -7081,11 +7081,11 @@
 msgid "the plymouth request %c is not implemented"
 msgstr "plymouth 请求 %c 没有实现"
 
-#: lib/randutils.c:186
+#: lib/randutils.c:190
 msgid "getrandom() function"
 msgstr ""
 
-#: lib/randutils.c:199
+#: lib/randutils.c:203
 msgid "libc pseudo-random functions"
 msgstr "libc 伪随机函数"
 
@@ -7109,7 +7109,7 @@
 msgid "%s: unsupported swap version '%s'"
 msgstr "%s：不支持的 swap 版本“%s”"
 
-#: login-utils/chfn.c:96 login-utils/chsh.c:74 login-utils/lslogins.c:1326
+#: login-utils/chfn.c:96 login-utils/chsh.c:75 login-utils/lslogins.c:1338
 #, c-format
 msgid " %s [options] [<username>]\n"
 msgstr " %s [选项] [<用户名>]\n"
@@ -7139,7 +7139,7 @@
 msgid "field %s is too long"
 msgstr "字段 %s 过长"
 
-#: login-utils/chfn.c:127 login-utils/chsh.c:235
+#: login-utils/chfn.c:127 login-utils/chsh.c:236
 #, c-format
 msgid "%s: has illegal characters"
 msgstr "%s：含有非法字符"
@@ -7162,7 +7162,7 @@
 msgid "Home Phone"
 msgstr "住宅电话"
 
-#: login-utils/chfn.c:193 login-utils/chsh.c:186
+#: login-utils/chfn.c:193 login-utils/chsh.c:187
 msgid "cannot handle multiple usernames"
 msgstr ""
 
@@ -7190,17 +7190,17 @@
 msgid "Finger information changed.\n"
 msgstr "Finger 信息已更改。\n"
 
-#: login-utils/chfn.c:425 login-utils/chsh.c:272
+#: login-utils/chfn.c:425 login-utils/chsh.c:273
 #, c-format
 msgid "you (user %d) don't exist."
 msgstr "您(用户 %d)不存在。"
 
-#: login-utils/chfn.c:431 login-utils/chsh.c:277 login-utils/libuser.c:59
+#: login-utils/chfn.c:431 login-utils/chsh.c:278 login-utils/libuser.c:59
 #, c-format
 msgid "user \"%s\" does not exist."
 msgstr "用户“%s”不存在。"
 
-#: login-utils/chfn.c:437 login-utils/chsh.c:283
+#: login-utils/chfn.c:437 login-utils/chsh.c:284
 msgid "can only change local entries"
 msgstr "只能更改本地记录"
 
@@ -7209,11 +7209,11 @@
 msgid "%s is not authorized to change the finger info of %s"
 msgstr "%s 未得到授权更改 %s 的 finger 信息"
 
-#: login-utils/chfn.c:452 login-utils/chsh.c:299
+#: login-utils/chfn.c:452 login-utils/chsh.c:300
 msgid "Unknown user context"
 msgstr "未知用户环境(context)"
 
-#: login-utils/chfn.c:458 login-utils/chsh.c:305
+#: login-utils/chfn.c:458 login-utils/chsh.c:306
 #, c-format
 msgid "can't set default context for %s"
 msgstr "无法设置 %s 默认环境(context)"
@@ -7232,38 +7232,38 @@
 msgid "Finger information not changed.\n"
 msgstr "Finger 信息未更改。\n"
 
-#: login-utils/chsh.c:77
+#: login-utils/chsh.c:78
 msgid "Change your login shell.\n"
 msgstr "更改您的登录 shell。\n"
 
-#: login-utils/chsh.c:80
+#: login-utils/chsh.c:81
 msgid " -s, --shell <shell>  specify login shell\n"
 msgstr " -s, --shell <shell>  指定登录 shell\n"
 
-#: login-utils/chsh.c:81
+#: login-utils/chsh.c:82
 msgid " -l, --list-shells    print list of shells and exit\n"
 msgstr " -l, --list-shells    打印 shell 列表并退出\n"
 
-#: login-utils/chsh.c:229
+#: login-utils/chsh.c:230
 msgid "shell must be a full path name"
 msgstr "shell 必须为完整路径名称"
 
-#: login-utils/chsh.c:231
+#: login-utils/chsh.c:232
 #, c-format
 msgid "\"%s\" does not exist"
 msgstr "“%s”不存在"
 
-#: login-utils/chsh.c:233
+#: login-utils/chsh.c:234
 #, c-format
 msgid "\"%s\" is not executable"
 msgstr "“%s”不可执行"
 
-#: login-utils/chsh.c:239
+#: login-utils/chsh.c:240
 #, c-format
 msgid "Warning: \"%s\" is not listed in %s."
 msgstr "警告：“%s”未在 %s 中列出。"
 
-#: login-utils/chsh.c:243 login-utils/chsh.c:247
+#: login-utils/chsh.c:244 login-utils/chsh.c:248
 #, c-format
 msgid ""
 "\"%s\" is not listed in %s.\n"
@@ -7272,39 +7272,39 @@
 "“%s”未列在 %s 中。\n"
 "请使用 %s -l 查看列表。"
 
-#: login-utils/chsh.c:298
+#: login-utils/chsh.c:299
 #, c-format
 msgid "%s is not authorized to change the shell of %s"
 msgstr "%s 无权更改 %s 的 shell"
 
-#: login-utils/chsh.c:324
+#: login-utils/chsh.c:325
 msgid ""
 "running UID doesn't match UID of user we're altering, shell change denied"
 msgstr "运行 UID 与要更改的用户的 UID 不匹配，更改 shell 被拒绝"
 
-#: login-utils/chsh.c:329
+#: login-utils/chsh.c:330
 #, c-format
 msgid "your shell is not in %s, shell change denied"
 msgstr "您的 shell 不在 %s 中，更改 shell 被拒绝"
 
-#: login-utils/chsh.c:333
+#: login-utils/chsh.c:334
 #, c-format
 msgid "Changing shell for %s.\n"
 msgstr "正在更改 %s 的 shell。\n"
 
-#: login-utils/chsh.c:341
+#: login-utils/chsh.c:342
 msgid "New shell"
 msgstr "新 shell"
 
-#: login-utils/chsh.c:349
+#: login-utils/chsh.c:350
 msgid "Shell not changed."
 msgstr "shell 未更改。"
 
-#: login-utils/chsh.c:354
+#: login-utils/chsh.c:355
 msgid "Shell *NOT* changed.  Try again later."
 msgstr "Shell *未* 更改。请稍后重试。"
 
-#: login-utils/chsh.c:358
+#: login-utils/chsh.c:359
 msgid ""
 "setpwnam failed\n"
 "Shell *NOT* changed.  Try again later."
@@ -7312,7 +7312,7 @@
 "setpwnam 失败\n"
 "Shell *未* 更改。请稍后重试。"
 
-#: login-utils/chsh.c:362
+#: login-utils/chsh.c:363
 #, c-format
 msgid "Shell changed.\n"
 msgstr "shell 已更改。\n"
@@ -7322,7 +7322,7 @@
 msgid "Usage: %s <passwordfile> <username>...\n"
 msgstr "用法：%s <密码文件> <用户名>...\n"
 
-#: login-utils/last.c:169 login-utils/lslogins.c:1317 sys-utils/dmesg.c:1271
+#: login-utils/last.c:169 login-utils/lslogins.c:1329 sys-utils/dmesg.c:1285
 #: sys-utils/lsipc.c:282
 #, c-format
 msgid "unknown time format: %s"
@@ -7333,76 +7333,76 @@
 msgid "Interrupted %s"
 msgstr "中断的 %s"
 
-#: login-utils/last.c:435 login-utils/last.c:446 login-utils/last.c:886
+#: login-utils/last.c:434 login-utils/last.c:445 login-utils/last.c:885
 msgid "preallocation size exceeded"
 msgstr "超过了预分配大小"
 
-#: login-utils/last.c:565
+#: login-utils/last.c:564
 #, c-format
 msgid " %s [options] [<username>...] [<tty>...]\n"
 msgstr " %s [选项] [<用户名>...] [<tty>...]\n"
 
-#: login-utils/last.c:568
+#: login-utils/last.c:567
 msgid "Show a listing of last logged in users.\n"
 msgstr "显示上次登录用户的列表。\n"
 
-#: login-utils/last.c:571
+#: login-utils/last.c:570
 msgid " -<number>            how many lines to show\n"
 msgstr " -<数字>              显示行数\n"
 
-#: login-utils/last.c:572
+#: login-utils/last.c:571
 msgid " -a, --hostlast       display hostnames in the last column\n"
 msgstr " -a, --hostlast       最后一列显示主机名\n"
 
-#: login-utils/last.c:573
+#: login-utils/last.c:572
 msgid " -d, --dns            translate the IP number back into a hostname\n"
 msgstr " -d, --dns            将 IP 号转换回主机名\n"
 
-#: login-utils/last.c:575
+#: login-utils/last.c:574
 #, c-format
 msgid " -f, --file <file>    use a specific file instead of %s\n"
 msgstr " -F, --file <文件>    用指定文件代替 %s\n"
 
-#: login-utils/last.c:576
+#: login-utils/last.c:575
 msgid " -F, --fulltimes      print full login and logout times and dates\n"
 msgstr " -F, --fulltimes      打印完整的登录和注销时间和日期\n"
 
-#: login-utils/last.c:577
+#: login-utils/last.c:576
 msgid ""
 " -i, --ip             display IP numbers in numbers-and-dots notation\n"
 msgstr " -i, --ip             以数字和点的形式显示 IP 号\n"
 
-#: login-utils/last.c:578
+#: login-utils/last.c:577
 msgid " -n, --limit <number> how many lines to show\n"
 msgstr " -n, --limit <数字>   要显示的行数\n"
 
-#: login-utils/last.c:579
+#: login-utils/last.c:578
 msgid " -R, --nohostname     don't display the hostname field\n"
 msgstr " -R, --nohostname     不显示主机名字段\n"
 
-#: login-utils/last.c:580
+#: login-utils/last.c:579
 msgid " -s, --since <time>   display the lines since the specified time\n"
 msgstr " -s, --since <时间>   显示从指定时间起的行\n"
 
-#: login-utils/last.c:581
+#: login-utils/last.c:580
 msgid " -t, --until <time>   display the lines until the specified time\n"
 msgstr " -t, --until <时间>   显示到指定时间为止的行\n"
 
-#: login-utils/last.c:582
+#: login-utils/last.c:581
 msgid ""
 " -p, --present <time> display who were present at the specified time\n"
 msgstr " -p, --present <时间> 显示在指定时间谁在场(present)\n"
 
-#: login-utils/last.c:583
+#: login-utils/last.c:582
 msgid " -w, --fullnames      display full user and domain names\n"
 msgstr " -w, --fullnames      显示完整的用户名和域名\n"
 
-#: login-utils/last.c:584
+#: login-utils/last.c:583
 msgid ""
 " -x, --system         display system shutdown entries and run level changes\n"
 msgstr " -x, --system         显示系统关机项和运行级别更改\n"
 
-#: login-utils/last.c:585
+#: login-utils/last.c:584
 msgid ""
 "     --time-format <format>  show timestamps in the specified <format>:\n"
 "                               notime|short|full|iso\n"
@@ -7410,19 +7410,19 @@
 "     --time-format <格式>    以指定<格式>显示时间戳：\n"
 "                               notime|short|full|iso\n"
 
-#: login-utils/last.c:887
+#: login-utils/last.c:886
 #, c-format
 msgid ""
 "\n"
 "%s begins %s\n"
 msgstr ""
 
-#: login-utils/last.c:965 term-utils/scriptreplay.c:65
-#: term-utils/scriptreplay.c:69
+#: login-utils/last.c:964 term-utils/scriptlive.c:85 term-utils/scriptlive.c:89
+#: term-utils/scriptreplay.c:79 term-utils/scriptreplay.c:83
 msgid "failed to parse number"
 msgstr "解析数字失败"
 
-#: login-utils/last.c:986 login-utils/last.c:991 login-utils/last.c:996
+#: login-utils/last.c:985 login-utils/last.c:990 login-utils/last.c:995
 #: sys-utils/rtcwake.c:508
 #, c-format
 msgid "invalid time value \"%s\""
@@ -7574,7 +7574,7 @@
 "\n"
 "会话设置问题，中止。"
 
-#: login-utils/login.c:856
+#: login-utils/login.c:849
 #, c-format
 msgid "NULL user name in %s:%d. Abort."
 msgstr "%s:%d 中是空(NULL)用户名。中止。"
@@ -7609,17 +7609,17 @@
 msgid " -H             suppress hostname in the login prompt"
 msgstr ""
 
-#: login-utils/login.c:1154
+#: login-utils/login.c:1155
 #, c-format
 msgid "%s: timed out after %u seconds"
 msgstr ""
 
-#: login-utils/login.c:1187
+#: login-utils/login.c:1188
 #, c-format
 msgid "login: -h is for superuser only\n"
 msgstr "login：-h 是超级用户专用选项\n"
 
-#: login-utils/login.c:1247
+#: login-utils/login.c:1234
 #, c-format
 msgid "Invalid user name \"%s\" in %s:%d. Abort."
 msgstr "%2$s:%3$d 中是无效用户名“%1$s”。中止。"
@@ -7629,7 +7629,7 @@
 msgid "groups initialization failed: %m"
 msgstr "组初始化失败：%m"
 
-#: login-utils/login.c:1294
+#: login-utils/login.c:1294 sys-utils/mount.c:57 sys-utils/umount.c:122
 msgid "setgid() failed"
 msgstr "setgid() 失败"
 
@@ -7643,7 +7643,7 @@
 msgid "You have mail.\n"
 msgstr "有您的邮件。\n"
 
-#: login-utils/login.c:1340
+#: login-utils/login.c:1340 sys-utils/mount.c:60 sys-utils/umount.c:125
 msgid "setuid() failed"
 msgstr "setuid() 失败"
 
@@ -7657,11 +7657,11 @@
 msgid "Logging in with home = \"/\".\n"
 msgstr "以 home = “/” 登录。\n"
 
-#: login-utils/login.c:1382
+#: login-utils/login.c:1379
 msgid "couldn't exec shell script"
 msgstr "无法执行(exec) shell 脚本"
 
-#: login-utils/login.c:1384
+#: login-utils/login.c:1381
 msgid "no shell"
 msgstr "无 shell"
 
@@ -7674,12 +7674,12 @@
 msgid "hush login status: restore original IDs failed"
 msgstr "静默(hush)登录状态：恢复原 ID 失败"
 
-#: login-utils/lslogins.c:210 sys-utils/lscpu.c:1563 sys-utils/lscpu.c:1573
+#: login-utils/lslogins.c:210 sys-utils/lscpu.c:1593 sys-utils/lscpu.c:1603
 #: sys-utils/lsmem.c:266
 msgid "no"
 msgstr "否"
 
-#: login-utils/lslogins.c:219 misc-utils/lsblk.c:184
+#: login-utils/lslogins.c:219 misc-utils/lsblk.c:188
 msgid "user name"
 msgstr "用户名"
 
@@ -7879,7 +7879,7 @@
 msgid "Running processes"
 msgstr "运行中的进程"
 
-#: login-utils/lslogins.c:292 misc-utils/findmnt.c:136 misc-utils/lsblk.c:223
+#: login-utils/lslogins.c:292 misc-utils/findmnt.c:136 misc-utils/lsblk.c:227
 #: sys-utils/lsipc.c:204 sys-utils/lsmem.c:145
 #, c-format
 msgid "too many columns specified, the limit is %zu columns"
@@ -7897,11 +7897,11 @@
 msgid "failed to get supplementary groups"
 msgstr "获得附属组失败"
 
-#: login-utils/lslogins.c:1168
+#: login-utils/lslogins.c:1180
 msgid "internal error: unknown column"
 msgstr "内部错误：未知的列"
 
-#: login-utils/lslogins.c:1266
+#: login-utils/lslogins.c:1278
 #, c-format
 msgid ""
 "\n"
@@ -7911,114 +7911,115 @@
 "上次的日志：\n"
 
 #: login-utils/nologin.c:27 misc-utils/lslocks.c:528 misc-utils/mcookie.c:83
-#: misc-utils/uuidd.c:62 misc-utils/uuidgen.c:26 sys-utils/dmesg.c:266
-#: sys-utils/ipcmk.c:67 sys-utils/lscpu.c:2184 sys-utils/lsipc.c:291
+#: misc-utils/uuidd.c:62 misc-utils/uuidgen.c:26 sys-utils/dmesg.c:267
+#: sys-utils/ipcmk.c:67 sys-utils/lscpu.c:2236 sys-utils/lsipc.c:291
 #: sys-utils/lsmem.c:494 sys-utils/readprofile.c:104 sys-utils/rtcwake.c:99
+#: term-utils/scriptlive.c:57 term-utils/scriptreplay.c:46
 #: term-utils/setterm.c:382 text-utils/line.c:31
 #, c-format
 msgid " %s [options]\n"
 msgstr " %s [选项]\n"
 
-#: login-utils/lslogins.c:1329
+#: login-utils/lslogins.c:1341
 msgid "Display information about known users in the system.\n"
 msgstr "显示系统中已知用户的信息。\n"
 
-#: login-utils/lslogins.c:1332
+#: login-utils/lslogins.c:1344
 msgid " -a, --acc-expiration     display info about passwords expiration\n"
 msgstr " -a, --acc-expiration     显示关于密码过期的信息\n"
 
-#: login-utils/lslogins.c:1333
+#: login-utils/lslogins.c:1345
 msgid ""
 " -c, --colon-separate     display data in a format similar to /etc/passwd\n"
 msgstr " -c, --colon-separate     以与 /etc/passwd 相似的格式显示日期\n"
 
-#: login-utils/lslogins.c:1334 sys-utils/lsipc.c:310
+#: login-utils/lslogins.c:1346 sys-utils/lsipc.c:310
 msgid " -e, --export             display in an export-able output format\n"
 msgstr " -e, --export             以可导出的格式显示\n"
 
-#: login-utils/lslogins.c:1335
+#: login-utils/lslogins.c:1347
 msgid ""
 " -f, --failed             display data about the users' last failed logins\n"
 msgstr " -f, --failed             显示有关该用户上次登录失败的数据\n"
 
-#: login-utils/lslogins.c:1336
+#: login-utils/lslogins.c:1348
 msgid " -G, --supp-groups        display information about groups\n"
 msgstr " -G, --supp-groups        显示与组相关的信息\n"
 
-#: login-utils/lslogins.c:1337
+#: login-utils/lslogins.c:1349
 msgid ""
 " -g, --groups=<groups>    display users belonging to a group in <groups>\n"
 msgstr " -g, --groups=<groups>    显示属于<groups>中的组的用户\n"
 
-#: login-utils/lslogins.c:1338
+#: login-utils/lslogins.c:1350
 msgid ""
 " -L, --last               show info about the users' last login sessions\n"
 msgstr " -L, --last               显示关于该用户上次登录会话的信息\n"
 
-#: login-utils/lslogins.c:1339
+#: login-utils/lslogins.c:1351
 msgid " -l, --logins=<logins>    display only users from <logins>\n"
 msgstr " -l, --logins=<登录方式>  只显示以指定<登录方式>登录的用户\n"
 
-#: login-utils/lslogins.c:1340 sys-utils/lsipc.c:312
+#: login-utils/lslogins.c:1352 sys-utils/lsipc.c:312
 msgid ""
 " -n, --newline            display each piece of information on a new line\n"
 msgstr " -n, --newline            逐行显示每一部分信息\n"
 
-#: login-utils/lslogins.c:1341 sys-utils/lsipc.c:305
+#: login-utils/lslogins.c:1353 sys-utils/lsipc.c:305
 msgid "     --noheadings         don't print headings\n"
 msgstr "     --noheadings     不打印标题\n"
 
-#: login-utils/lslogins.c:1342 sys-utils/lsipc.c:306
+#: login-utils/lslogins.c:1354 sys-utils/lsipc.c:306
 msgid "     --notruncate         don't truncate output\n"
 msgstr "     --notruncate         不截断输出\n"
 
-#: login-utils/lslogins.c:1343 sys-utils/lsipc.c:314
+#: login-utils/lslogins.c:1355 sys-utils/lsipc.c:314
 msgid " -o, --output[=<list>]    define the columns to output\n"
 msgstr " -o, --output[=<列表>]    定义要输出的列\n"
 
-#: login-utils/lslogins.c:1345
+#: login-utils/lslogins.c:1357
 msgid ""
 " -p, --pwd                display information related to login by password.\n"
 msgstr " -p, --pwd                显示与 用密码登录 相关的信息。\n"
 
-#: login-utils/lslogins.c:1346 sys-utils/lsipc.c:316
+#: login-utils/lslogins.c:1358 sys-utils/lsipc.c:316
 msgid " -r, --raw                display in raw mode\n"
 msgstr " -r, --raw                以原始方式显示\n"
 
-#: login-utils/lslogins.c:1347
+#: login-utils/lslogins.c:1359
 msgid " -s, --system-accs        display system accounts\n"
 msgstr " -s, --system-accs        显示系统帐户\n"
 
-#: login-utils/lslogins.c:1348 sys-utils/lsipc.c:307
+#: login-utils/lslogins.c:1360 sys-utils/lsipc.c:307
 msgid ""
 "     --time-format=<type> display dates in short, full or iso format\n"
 msgstr "     --time-format=<格式>  以短、长或 iso 格式显示日期\n"
 
-#: login-utils/lslogins.c:1349
+#: login-utils/lslogins.c:1361
 msgid " -u, --user-accs          display user accounts\n"
 msgstr " -u, --user-accs          显示用户帐户\n"
 
-#: login-utils/lslogins.c:1350
+#: login-utils/lslogins.c:1362
 msgid " -Z, --context            display SELinux contexts\n"
 msgstr " -Z, --context            显示 SELinux 环境\n"
 
-#: login-utils/lslogins.c:1351
+#: login-utils/lslogins.c:1363
 msgid " -z, --print0             delimit user entries with a nul character\n"
 msgstr " -z, --print0             用空字符(nul)分隔用户记录项\n"
 
-#: login-utils/lslogins.c:1352
+#: login-utils/lslogins.c:1364
 msgid "     --wtmp-file <path>   set an alternate path for wtmp\n"
 msgstr "     --wtmp-file <路径>   设置 wtmp 的可选路径\n"
 
-#: login-utils/lslogins.c:1353
+#: login-utils/lslogins.c:1365
 msgid "     --btmp-file <path>   set an alternate path for btmp\n"
 msgstr "     --btmp-file <路径>   设置 btmp 的可选路径\n"
 
-#: login-utils/lslogins.c:1537
+#: login-utils/lslogins.c:1549
 msgid "failed to request selinux state"
 msgstr "请求 selinux 状态失败"
 
-#: login-utils/lslogins.c:1551 login-utils/lslogins.c:1556
+#: login-utils/lslogins.c:1563 login-utils/lslogins.c:1568
 msgid "Only one user may be specified. Use -l for multiple users."
 msgstr "只能指定一个用户。多用户请使用 -l。"
 
@@ -8052,7 +8053,7 @@
 msgstr "您是哪位？"
 
 #: login-utils/newgrp.c:216 login-utils/newgrp.c:228 sys-utils/nsenter.c:473
-#: sys-utils/unshare.c:522
+#: sys-utils/unshare.c:562
 msgid "setgid failed"
 msgstr "setgid 失败"
 
@@ -8060,7 +8061,7 @@
 msgid "no such group"
 msgstr "无此组"
 
-#: login-utils/newgrp.c:232 sys-utils/nsenter.c:475 sys-utils/unshare.c:525
+#: login-utils/newgrp.c:232 sys-utils/nsenter.c:475 sys-utils/unshare.c:565
 msgid "setuid failed"
 msgstr "setuid 失败"
 
@@ -8068,79 +8069,80 @@
 msgid "Politely refuse a login.\n"
 msgstr "客气的拒绝登录。\n"
 
-#: login-utils/nologin.c:85
+#: login-utils/nologin.c:113
 #, c-format
 msgid "This account is currently not available.\n"
 msgstr "此帐户目前不可用。\n"
 
-#: login-utils/su-common.c:229
+#: login-utils/su-common.c:222
 msgid " (core dumped)"
 msgstr " (核心已转储)"
 
-#: login-utils/su-common.c:282 misc-utils/rename.c:293 term-utils/script.c:706
+#: misc-utils/rename.c:293
 msgid "failed to get terminal attributes"
 msgstr "取终端属性失败"
 
-#: login-utils/su-common.c:304
+#: login-utils/su-common.c:512 term-utils/script.c:949
+#: term-utils/scriptlive.c:296
 msgid "failed to create pseudo-terminal"
 msgstr ""
 
-#: login-utils/su-common.c:495 login-utils/su-common.c:769
+#: login-utils/su-common.c:436
 msgid "cannot block signals"
 msgstr "无法阻塞信号"
 
-#: login-utils/su-common.c:531 misc-utils/uuidd.c:414 term-utils/script.c:573
+#: misc-utils/uuidd.c:414
 msgid "poll failed"
 msgstr "轮询失败"
 
-#: login-utils/su-common.c:677
+#: login-utils/su-common.c:344
 msgid "failed to modify environment"
 msgstr ""
 
-#: login-utils/su-common.c:713
+#: login-utils/su-common.c:380
 msgid "may not be used by non-root users"
 msgstr "非 root 用户不能使用"
 
-#: login-utils/su-common.c:508
+#: login-utils/su-common.c:735
 msgid "incorrect password"
 msgstr "密码错误"
 
-#: login-utils/su-common.c:750
+#: login-utils/su-common.c:417
 #, c-format
 msgid "cannot open session: %s"
 msgstr "无法打开会话：%s"
 
-#: login-utils/su-common.c:786
+#: login-utils/su-common.c:453
 msgid "cannot initialize signal mask for session"
 msgstr ""
 
-#: login-utils/su-common.c:794
+#: login-utils/su-common.c:461
 msgid "cannot initialize signal mask"
 msgstr ""
 
-#: login-utils/su-common.c:804
+#: login-utils/su-common.c:471
 msgid "cannot set signal handler for session"
 msgstr ""
 
-#: login-utils/su-common.c:812 misc-utils/uuidd.c:401 sys-utils/lscpu.c:868
-#: term-utils/script.c:871
+#: login-utils/su-common.c:479 misc-utils/uuidd.c:401 sys-utils/lscpu.c:880
 msgid "cannot set signal handler"
 msgstr "无法设置信号处理函数"
 
-#: login-utils/su-common.c:820
+#: login-utils/su-common.c:487
 msgid "cannot set signal mask"
 msgstr ""
 
-#: login-utils/su-common.c:848
+#: login-utils/su-common.c:524 term-utils/script.c:959
+#: term-utils/scriptlive.c:303
 msgid "cannot create child process"
 msgstr "无法创建子进程"
 
-#: login-utils/su-common.c:867
+#: login-utils/su-common.c:543
 #, c-format
 msgid "cannot change directory to %s"
 msgstr "无法更改到 %s 目录"
 
-#: login-utils/su-common.c:886
+#: login-utils/su-common.c:570 term-utils/scriptlive.c:352
 #, c-format
 msgid ""
 "\n"
@@ -8149,16 +8151,16 @@
 "\n"
 "会话已终止，正在杀死 shell..."
 
-#: login-utils/su-common.c:897
+#: login-utils/su-common.c:581
 #, c-format
 msgid " ...killed.\n"
 msgstr " ...已杀死。\n"
 
-#: login-utils/su-common.c:998
+#: login-utils/su-common.c:678
 msgid "failed to set the PATH environment variable"
 msgstr ""
 
-#: login-utils/su-common.c:1075
+#: login-utils/su-common.c:755
 msgid "cannot set groups"
 msgstr "无法设置 组"
 
@@ -8167,36 +8169,36 @@
 msgid "failed to user credentials: %s"
 msgstr ""
 
-#: login-utils/su-common.c:1091 sys-utils/eject.c:658
+#: login-utils/su-common.c:771 sys-utils/eject.c:661
 msgid "cannot set group id"
 msgstr "无法设置 组 id"
 
-#: login-utils/su-common.c:1093 sys-utils/eject.c:661
+#: login-utils/su-common.c:773 sys-utils/eject.c:664
 msgid "cannot set user id"
 msgstr "无法设置 用户 id"
 
-#: login-utils/su-common.c:703
+#: login-utils/su-common.c:1098
 msgid " -m, -p, --preserve-environment  do not reset environment variables\n"
 msgstr " -m, -p, --preserve-environment  不重置环境变量\n"
 
-#: login-utils/su-common.c:1165
+#: login-utils/su-common.c:845
 msgid " -g, --group <group>             specify the primary group\n"
 msgstr " -g, --group <组>                指定主组\n"
 
-#: login-utils/su-common.c:1166
+#: login-utils/su-common.c:846
 msgid " -G, --supp-group <group>        specify a supplemental group\n"
 msgstr ""
 
-#: login-utils/su-common.c:1169
+#: login-utils/su-common.c:849
 msgid " -, -l, --login                  make the shell a login shell\n"
 msgstr " -, -l, --login                  使 shell 成为登录 shell\n"
 
-#: login-utils/su-common.c:1170
+#: login-utils/su-common.c:850
 msgid ""
 " -c, --command <command>         pass a single command to the shell with -c\n"
 msgstr " -c, --command <命令>            使用 -c 向 shell 传递一条命令\n"
 
-#: login-utils/su-common.c:1171
+#: login-utils/su-common.c:851
 msgid ""
 " --session-command <command>     pass a single command to the shell with -c\n"
 "                                   and do not create a new session\n"
@@ -8204,28 +8206,28 @@
 " --session-command <命令>        使用 -c 向 shell 传递一条命令\n"
 "                                   而不创建新会话\n"
 
-#: login-utils/su-common.c:1173
+#: login-utils/su-common.c:853
 msgid ""
 " -f, --fast                      pass -f to the shell (for csh or tcsh)\n"
 msgstr " -f, --fast                      向shell 传递 -f 选项(csh 或 tcsh)\n"
 
-#: login-utils/su-common.c:1174
+#: login-utils/su-common.c:854
 msgid ""
 " -s, --shell <shell>             run <shell> if /etc/shells allows it\n"
 msgstr " -s, --shell <shell>             若 /etc/shells 允许，运行<shell>\n"
 
-#: login-utils/su-common.c:1175
+#: login-utils/su-common.c:855
 msgid " -P, --pty                       create a new pseudo-terminal\n"
 msgstr ""
 
-#: login-utils/su-common.c:1185
+#: login-utils/su-common.c:865
 #, c-format
 msgid ""
 " %1$s [options] -u <user> [[--] <command>]\n"
 " %1$s [options] [-] [<user> [<argument>...]]\n"
 msgstr ""
 
-#: login-utils/su-common.c:1190
+#: login-utils/su-common.c:870
 msgid ""
 "Run <command> with the effective user ID and group ID of <user>.  If -u is\n"
 "not given, fall back to su(1)-compatible semantics and execute standard "
@@ -8233,51 +8235,51 @@
 "The options -c, -f, -l, and -s are mutually exclusive with -u.\n"
 msgstr ""
 
-#: login-utils/su-common.c:1195
+#: login-utils/su-common.c:875
 msgid " -u, --user <user>               username\n"
 msgstr ""
 
-#: login-utils/su-common.c:1206
+#: login-utils/su-common.c:886
 #, c-format
 msgid " %s [options] [-] [<user> [<argument>...]]\n"
 msgstr " %s [选项] [-] [<用户> [<参数>...]]\n"
 
-#: login-utils/su-common.c:1210
+#: login-utils/su-common.c:890
 msgid ""
 "Change the effective user ID and group ID to that of <user>.\n"
 "A mere - implies -l.  If <user> is not given, root is assumed.\n"
 msgstr ""
 
-#: login-utils/su-common.c:1256
+#: login-utils/su-common.c:936
 #, c-format
 msgid "specifying more than %d supplemental group is not possible"
 msgid_plural "specifying more than %d supplemental groups is not possible"
 msgstr[0] "不能指定多于 %d 个补充组"
 
-#: login-utils/su-common.c:1262
+#: login-utils/su-common.c:942
 #, c-format
 msgid "group %s does not exist"
 msgstr "组 %s 不存在"
 
-#: login-utils/su-common.c:1376
+#: login-utils/su-common.c:1051
 msgid "--pty is not supported for your system"
 msgstr ""
 
-#: login-utils/su-common.c:1410
+#: login-utils/su-common.c:1085
 msgid "ignoring --preserve-environment, it's mutually exclusive with --login"
 msgstr "将忽略 --preserve-environment，它与 --login 互斥。"
 
-#: login-utils/su-common.c:1424
+#: login-utils/su-common.c:1099
 msgid ""
 "options --{shell,fast,command,session-command,login} and --user are mutually "
 "exclusive"
 msgstr "选项 --{shell,fast,command,session-command,login} 和 --user 互斥"
 
-#: login-utils/su-common.c:1427
+#: login-utils/su-common.c:1102
 msgid "no command was specified"
 msgstr "没有指定命令"
 
-#: login-utils/su-common.c:1439
+#: login-utils/su-common.c:1114
 msgid "only root can specify alternative groups"
 msgstr "只有 root 用户能指定替代组"
 
@@ -8286,12 +8288,12 @@
 msgid "user %s does not exist"
 msgstr "用户 %s 不存在"
 
-#: login-utils/su-common.c:1482
+#: login-utils/su-common.c:1160
 #, c-format
 msgid "using restricted shell %s"
 msgstr "将使用受限 shell %s"
 
-#: login-utils/su-common.c:1513
+#: login-utils/su-common.c:1201
 #, c-format
 msgid "warning: cannot change directory to %s"
 msgstr "警告：无法更改到 %s 目录"
@@ -8388,8 +8390,8 @@
 " -t, --timeout <秒数>     等待密码的最大时间(默认：无限制)\n"
 " -e, --force              如果 getpwnam(3) 失败，直接检查密码文件\n"
 
-#: login-utils/sulogin.c:867 misc-utils/findmnt.c:1489 sys-utils/wdctl.c:524
-#: term-utils/agetty.c:837 term-utils/wall.c:216
+#: login-utils/sulogin.c:867 misc-utils/findmnt.c:1489 sys-utils/wdctl.c:640
+#: term-utils/agetty.c:842 term-utils/wall.c:217
 msgid "invalid timeout argument"
 msgstr "无效的 timeout 超时参数"
 
@@ -8530,7 +8532,7 @@
 msgid "Would you like to edit %s now [y/n]? "
 msgstr "您想现在编辑 %s 吗[y/n]？ "
 
-#: misc-utils/blkid.c:794
+#: misc-utils/blkid.c:798
 #, c-format
 msgid "%s from %s  (libblkid %s, %s)\n"
 msgstr ""
@@ -8664,61 +8666,61 @@
 msgid "(not mounted)"
 msgstr ""
 
-#: misc-utils/blkid.c:504
+#: misc-utils/blkid.c:504 misc-utils/blkid.c:510
 #, c-format
 msgid "error: %s"
 msgstr ""
 
-#: misc-utils/blkid.c:549
+#: misc-utils/blkid.c:553
 #, c-format
 msgid ""
 "%s: ambivalent result (probably more filesystems on the device, use "
 "wipefs(8) to see more details)"
 msgstr ""
 
-#: misc-utils/blkid.c:595
+#: misc-utils/blkid.c:599
 #, c-format
 msgid "unknown keyword in -u <list> argument: '%s'"
 msgstr ""
 
-#: misc-utils/blkid.c:612
+#: misc-utils/blkid.c:616
 msgid "error: -u <list> argument is empty"
 msgstr ""
 
-#: misc-utils/blkid.c:761
+#: misc-utils/blkid.c:765
 #, c-format
 msgid "unsupported output format %s"
 msgstr ""
 
-#: misc-utils/blkid.c:764 misc-utils/wipefs.c:733
+#: misc-utils/blkid.c:768 misc-utils/wipefs.c:733
 msgid "invalid offset argument"
 msgstr "无效的 偏移 参数"
 
-#: misc-utils/blkid.c:771
+#: misc-utils/blkid.c:775
 msgid "Too many tags specified"
 msgstr ""
 
-#: misc-utils/blkid.c:777
+#: misc-utils/blkid.c:781
 msgid "invalid size argument"
 msgstr ""
 
-#: misc-utils/blkid.c:781
+#: misc-utils/blkid.c:785
 msgid "Can only search for one NAME=value pair"
 msgstr ""
 
-#: misc-utils/blkid.c:788
+#: misc-utils/blkid.c:792
 msgid "-t needs NAME=value pair"
 msgstr ""
 
-#: misc-utils/blkid.c:840
+#: misc-utils/blkid.c:844
 msgid "The low-level probing mode does not support 'list' output format"
 msgstr ""
 
-#: misc-utils/blkid.c:853
+#: misc-utils/blkid.c:857
 msgid "The low-level probing mode requires a device"
 msgstr ""
 
-#: misc-utils/blkid.c:903
+#: misc-utils/blkid.c:907
 msgid "The lookup option requires a search type specified using -t"
 msgstr ""
 
@@ -8770,7 +8772,7 @@
 msgid "illegal week value: year %d doesn't have week %d"
 msgstr "非法的 周 值：%d 年没有第 %d 周"
 
-#: misc-utils/cal.c:634
+#: misc-utils/cal.c:680
 #, c-format
 msgid "%s"
 msgstr "%s"
@@ -8828,7 +8830,7 @@
 msgid " -m, --monday          Monday as first day of week\n"
 msgstr " -m, --monday          周一作为一周的第一天\n"
 
-#: misc-utils/cal.c:960
+#: misc-utils/cal.c:1009
 msgid " -j, --julian          output Julian dates\n"
 msgstr " -j, --julian          输出儒略日期\n"
 
@@ -8937,7 +8939,7 @@
 msgid "mountpoint"
 msgstr "挂载点"
 
-#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:158
+#: misc-utils/findmnt.c:101 misc-utils/lsblk.c:160
 msgid "filesystem type"
 msgstr "文件系统类型"
 
@@ -8957,7 +8959,7 @@
 msgid "filesystem label"
 msgstr "文件系统标签"
 
-#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:164
+#: misc-utils/findmnt.c:106 misc-utils/lsblk.c:167
 msgid "filesystem UUID"
 msgstr "文件系统 UUID"
 
@@ -8965,7 +8967,7 @@
 msgid "partition label"
 msgstr "分区标签"
 
-#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:154
+#: misc-utils/findmnt.c:109 misc-utils/lsblk.c:156
 msgid "major:minor device number"
 msgstr "主:次 设备号"
 
@@ -8981,19 +8983,19 @@
 msgid "old mountpoint saved by --poll"
 msgstr "--poll 保存的旧挂载点"
 
-#: misc-utils/findmnt.c:113 misc-utils/lsblk.c:157
+#: misc-utils/findmnt.c:113 misc-utils/lsblk.c:159
 msgid "filesystem size"
 msgstr "文件系统大小"
 
-#: misc-utils/findmnt.c:114 misc-utils/lsblk.c:156
+#: misc-utils/findmnt.c:114 misc-utils/lsblk.c:158
 msgid "filesystem size available"
 msgstr "文件系统可用大小"
 
-#: misc-utils/findmnt.c:115 misc-utils/lsblk.c:159
+#: misc-utils/findmnt.c:115 misc-utils/lsblk.c:161
 msgid "filesystem size used"
 msgstr "文件系统已用大小"
 
-#: misc-utils/findmnt.c:116 misc-utils/lsblk.c:160
+#: misc-utils/findmnt.c:116 misc-utils/lsblk.c:162
 msgid "filesystem use percentage"
 msgstr "文件系统使用百分比"
 
@@ -9046,8 +9048,8 @@
 msgid "move"
 msgstr "移动"
 
-#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1084 sys-utils/eject.c:712
-#: sys-utils/mount.c:375
+#: misc-utils/findmnt.c:814 misc-utils/findmnt.c:1084 sys-utils/eject.c:718
+#: sys-utils/mount.c:369
 msgid "failed to initialize libmount table"
 msgstr "初始化 libmount table 失败"
 
@@ -9058,8 +9060,8 @@
 
 #: misc-utils/findmnt.c:1024 misc-utils/findmnt.c:1090
 #: misc-utils/findmnt-verify.c:95 misc-utils/findmnt-verify.c:487
-#: sys-utils/fstrim.c:279 sys-utils/mount.c:133 sys-utils/mount.c:181
-#: sys-utils/mount.c:248 sys-utils/swapoff.c:55 sys-utils/swapoff.c:154
+#: sys-utils/fstrim.c:285 sys-utils/mount.c:127 sys-utils/mount.c:175
+#: sys-utils/mount.c:242 sys-utils/swapoff.c:55 sys-utils/swapoff.c:154
 #: sys-utils/swapon.c:248 sys-utils/swapon.c:278 sys-utils/swapon.c:737
 #: sys-utils/umount.c:187
 msgid "failed to initialize libmount iterator"
@@ -9069,7 +9071,7 @@
 msgid "failed to initialize libmount tabdiff"
 msgstr "初始化 libmount tabdiff 失败"
 
-#: misc-utils/findmnt.c:1124
+#: misc-utils/findmnt.c:1124 misc-utils/kill.c:408
 msgid "poll() failed"
 msgstr "poll() 失败"
 
@@ -9275,7 +9277,7 @@
 "element that is not an option"
 msgstr "--target 和 --source 选项不能与非选项的命令行元素一起使用"
 
-#: misc-utils/findmnt.c:1602 sys-utils/fstrim.c:259
+#: misc-utils/findmnt.c:1602 sys-utils/fstrim.c:265
 msgid "failed to initialize libmount cache"
 msgstr "初始化 libmount 缓存失败"
 
@@ -9524,21 +9526,21 @@
 msgid "internal error, contact the author."
 msgstr "内部错误，请联系作者。"
 
-#: misc-utils/kill.c:151
+#: misc-utils/kill.c:168
 #, c-format
 msgid "unknown signal %s; valid signals:"
 msgstr "未知信号 %s；有效信号为："
 
-#: misc-utils/kill.c:176
+#: misc-utils/kill.c:193
 #, c-format
 msgid " %s [options] <pid>|<name>...\n"
 msgstr " %s [选项] <pid>|<名称> ...\n"
 
-#: misc-utils/kill.c:179
+#: misc-utils/kill.c:196
 msgid "Forcibly terminate a process.\n"
 msgstr "强制结束某个进程。\n"
 
-#: misc-utils/kill.c:182
+#: misc-utils/kill.c:199
 msgid ""
 " -a, --all              do not restrict the name-to-pid conversion to "
 "processes\n"
@@ -9547,79 +9549,80 @@
 " -a, --all              不限于只对和当前进程的 uid 相同的进程进行\n"
 "                          名称-pid 转换\n"
 
-#: misc-utils/kill.c:184
+#: misc-utils/kill.c:201
 msgid " -s, --signal <signal>  send this <signal> instead of SIGTERM\n"
 msgstr " -s, --signal <信号>    发送指定的<信号>而非 SIGTERM\n"
 
-#: misc-utils/kill.c:186
+#: misc-utils/kill.c:203
 msgid ""
 " -q, --queue <value>    use sigqueue(2), not kill(2), and pass <value> as "
 "data\n"
 msgstr " -q, --queue <值>       使用 sigqueue(2) 代替 kill(2)，并传递<值>数据\n"
 
-#: misc-utils/kill.c:188
+#: misc-utils/kill.c:209
 msgid " -p, --pid              print pids without signaling them\n"
 msgstr " -p, --pid              打印 pid 而不向它们发送信号\n"
 
-#: misc-utils/kill.c:189
+#: misc-utils/kill.c:210
 msgid ""
 " -l, --list[=<signal>]  list signal names, or convert a signal number to a "
 "name\n"
 msgstr " -l, --list [=<信号>]   列出信号名，或将一个信号数值转换为名称\n"
 
-#: misc-utils/kill.c:190
+#: misc-utils/kill.c:211
 msgid " -L, --table            list signal names and numbers\n"
 msgstr " -L, --table            列出信号名和数值\n"
 
-#: misc-utils/kill.c:191
+#: misc-utils/kill.c:212
 msgid "     --verbose          print pids that will be signaled\n"
 msgstr "     --verbose          打印将收到信号的 pid\n"
 
-#: misc-utils/kill.c:238 misc-utils/kill.c:247 sys-utils/setpriv.c:482
-#: sys-utils/unshare.c:398
+#: misc-utils/kill.c:285 misc-utils/kill.c:294 sys-utils/setpriv.c:451
+#: sys-utils/unshare.c:422
 #, c-format
 msgid "unknown signal: %s"
 msgstr "未知信号：%s"
 
-#: misc-utils/kill.c:258 misc-utils/kill.c:261 misc-utils/kill.c:270
-#: misc-utils/kill.c:282 misc-utils/kill.c:305
+#: misc-utils/kill.c:305 misc-utils/kill.c:308 misc-utils/kill.c:317
+#: misc-utils/kill.c:329 misc-utils/kill.c:372 sys-utils/mountpoint.c:193
 #, c-format
 msgid "%s and %s are mutually exclusive"
 msgstr "%s 和 %s 相互排斥"
 
-#: misc-utils/kill.c:285 sys-utils/eject.c:205 sys-utils/eject.c:227
-#: sys-utils/losetup.c:726 sys-utils/tunelp.c:164 sys-utils/tunelp.c:171
-#: sys-utils/tunelp.c:178 sys-utils/tunelp.c:185 sys-utils/tunelp.c:192
-#: sys-utils/tunelp.c:198 sys-utils/tunelp.c:202 sys-utils/tunelp.c:209
-#: term-utils/setterm.c:211 term-utils/setterm.c:214 term-utils/setterm.c:233
-#: term-utils/setterm.c:235 term-utils/setterm.c:273 term-utils/setterm.c:275
-#: term-utils/setterm.c:292 term-utils/setterm.c:299 term-utils/setterm.c:301
-#: term-utils/setterm.c:313 term-utils/setterm.c:315 term-utils/setterm.c:324
-#: term-utils/setterm.c:332 term-utils/setterm.c:347 term-utils/setterm.c:349
-#: term-utils/setterm.c:361 term-utils/setterm.c:363 term-utils/setterm.c:374
-#: term-utils/setterm.c:544 term-utils/setterm.c:549 term-utils/setterm.c:554
-#: term-utils/setterm.c:559 term-utils/setterm.c:583 term-utils/setterm.c:588
-#: term-utils/setterm.c:593 term-utils/setterm.c:598 term-utils/setterm.c:603
-#: term-utils/setterm.c:608 term-utils/setterm.c:616 term-utils/setterm.c:649
+#: misc-utils/kill.c:332 misc-utils/kill.c:347 sys-utils/eject.c:208
+#: sys-utils/eject.c:230 sys-utils/losetup.c:726 sys-utils/tunelp.c:164
+#: sys-utils/tunelp.c:171 sys-utils/tunelp.c:178 sys-utils/tunelp.c:185
+#: sys-utils/tunelp.c:192 sys-utils/tunelp.c:198 sys-utils/tunelp.c:202
+#: sys-utils/tunelp.c:209 term-utils/setterm.c:211 term-utils/setterm.c:214
+#: term-utils/setterm.c:233 term-utils/setterm.c:235 term-utils/setterm.c:273
+#: term-utils/setterm.c:275 term-utils/setterm.c:292 term-utils/setterm.c:299
+#: term-utils/setterm.c:301 term-utils/setterm.c:313 term-utils/setterm.c:315
+#: term-utils/setterm.c:324 term-utils/setterm.c:332 term-utils/setterm.c:347
+#: term-utils/setterm.c:349 term-utils/setterm.c:361 term-utils/setterm.c:363
+#: term-utils/setterm.c:374 term-utils/setterm.c:562 term-utils/setterm.c:567
+#: term-utils/setterm.c:572 term-utils/setterm.c:577 term-utils/setterm.c:601
+#: term-utils/setterm.c:606 term-utils/setterm.c:611 term-utils/setterm.c:616
+#: term-utils/setterm.c:621 term-utils/setterm.c:626 term-utils/setterm.c:635
+#: term-utils/setterm.c:670
 msgid "argument error"
 msgstr "参数出错"
 
-#: misc-utils/kill.c:302
+#: misc-utils/kill.c:369
 #, c-format
 msgid "invalid signal name or number: %s"
 msgstr "无效的信号名或数字：%s"
 
-#: misc-utils/kill.c:319
+#: misc-utils/kill.c:427
 #, c-format
 msgid "sending signal %d to pid %d\n"
 msgstr "将信号 %d 发送给 pid %d\n"
 
-#: misc-utils/kill.c:332
+#: misc-utils/kill.c:445
 #, c-format
 msgid "sending signal to %s failed"
 msgstr "向 %s 发送信号失败"
 
-#: misc-utils/kill.c:378
+#: misc-utils/kill.c:494
 #, c-format
 msgid "cannot find process \"%s\""
 msgstr "找不到进程“%s”"
@@ -9870,23 +9873,23 @@
 msgid " -t, --terminate <char>   define the string-termination character\n"
 msgstr " -t, --terminate <字符>   定义字符串终止字符\n"
 
-#: misc-utils/lsblk.c:150
+#: misc-utils/lsblk.c:152
 msgid "device name"
 msgstr "设备名"
 
-#: misc-utils/lsblk.c:151
+#: misc-utils/lsblk.c:153
 msgid "internal kernel device name"
 msgstr "内部内核设备名称"
 
-#: misc-utils/lsblk.c:152
+#: misc-utils/lsblk.c:154
 msgid "internal parent kernel device name"
 msgstr "内部上级内核设备名称"
 
-#: misc-utils/lsblk.c:162 sys-utils/zramctl.c:86
+#: misc-utils/lsblk.c:165 sys-utils/zramctl.c:86
 msgid "where the device is mounted"
 msgstr "设备挂载位置"
 
-#: misc-utils/lsblk.c:163 misc-utils/wipefs.c:109
+#: misc-utils/lsblk.c:166 misc-utils/wipefs.c:109
 msgid "filesystem LABEL"
 msgstr "文件系统标签"
 
@@ -9894,272 +9897,272 @@
 msgid "partition type UUID"
 msgstr "分区类型 UUID"
 
-#: misc-utils/lsblk.c:170
+#: misc-utils/lsblk.c:174
 msgid "partition LABEL"
 msgstr "分区 LABEL"
 
-#: misc-utils/lsblk.c:174
+#: misc-utils/lsblk.c:178
 msgid "read-ahead of the device"
 msgstr "该设备的预读(read-ahead)"
 
-#: misc-utils/lsblk.c:175 sys-utils/losetup.c:79
+#: misc-utils/lsblk.c:179 sys-utils/losetup.c:79
 msgid "read-only device"
 msgstr "只读设备"
 
-#: misc-utils/lsblk.c:176
+#: misc-utils/lsblk.c:180
 msgid "removable device"
 msgstr "可移动设备"
 
-#: misc-utils/lsblk.c:177
+#: misc-utils/lsblk.c:181
 msgid "removable or hotplug device (usb, pcmcia, ...)"
 msgstr "可移动或热插拔设备(usb, pcmcia, ...)"
 
-#: misc-utils/lsblk.c:178
+#: misc-utils/lsblk.c:182
 msgid "rotational device"
 msgstr "转动设备"
 
-#: misc-utils/lsblk.c:179
+#: misc-utils/lsblk.c:183
 msgid "adds randomness"
 msgstr "添加随机性"
 
-#: misc-utils/lsblk.c:180
+#: misc-utils/lsblk.c:184
 msgid "device identifier"
 msgstr "设备标识符"
 
-#: misc-utils/lsblk.c:181
+#: misc-utils/lsblk.c:185
 msgid "disk serial number"
 msgstr "磁盘序列号"
 
-#: misc-utils/lsblk.c:182
+#: misc-utils/lsblk.c:186
 msgid "size of the device"
 msgstr "磁盘容量"
 
-#: misc-utils/lsblk.c:183
+#: misc-utils/lsblk.c:187
 msgid "state of the device"
 msgstr "设备的状态"
 
-#: misc-utils/lsblk.c:185
+#: misc-utils/lsblk.c:189
 msgid "group name"
 msgstr "组名"
 
-#: misc-utils/lsblk.c:186
+#: misc-utils/lsblk.c:190
 msgid "device node permissions"
 msgstr "设备节点权限"
 
-#: misc-utils/lsblk.c:187
+#: misc-utils/lsblk.c:191
 msgid "alignment offset"
 msgstr "对齐偏移量"
 
-#: misc-utils/lsblk.c:188
+#: misc-utils/lsblk.c:192
 msgid "minimum I/O size"
 msgstr "最小 I/O 大小"
 
-#: misc-utils/lsblk.c:189
+#: misc-utils/lsblk.c:193
 msgid "optimal I/O size"
 msgstr "最优 I/O 大小"
 
-#: misc-utils/lsblk.c:190
+#: misc-utils/lsblk.c:194
 msgid "physical sector size"
 msgstr "物理扇区大小"
 
-#: misc-utils/lsblk.c:191
+#: misc-utils/lsblk.c:195
 msgid "logical sector size"
 msgstr "逻辑扇区大小"
 
-#: misc-utils/lsblk.c:192
+#: misc-utils/lsblk.c:196
 msgid "I/O scheduler name"
 msgstr "I/O 调度器名称"
 
-#: misc-utils/lsblk.c:193
+#: misc-utils/lsblk.c:197
 msgid "request queue size"
 msgstr "请求队列大小"
 
-#: misc-utils/lsblk.c:194
+#: misc-utils/lsblk.c:198
 msgid "device type"
 msgstr "设备类型"
 
-#: misc-utils/lsblk.c:195
+#: misc-utils/lsblk.c:199
 msgid "discard alignment offset"
 msgstr "忽略对齐偏移量"
 
-#: misc-utils/lsblk.c:196
+#: misc-utils/lsblk.c:200
 msgid "discard granularity"
 msgstr "忽略粒度"
 
-#: misc-utils/lsblk.c:197
+#: misc-utils/lsblk.c:201
 msgid "discard max bytes"
 msgstr "忽略最大字节数"
 
-#: misc-utils/lsblk.c:198
+#: misc-utils/lsblk.c:202
 msgid "discard zeroes data"
 msgstr "忽略零数据"
 
-#: misc-utils/lsblk.c:199
+#: misc-utils/lsblk.c:203
 msgid "write same max bytes"
 msgstr "写相同的最大字节数"
 
-#: misc-utils/lsblk.c:200
+#: misc-utils/lsblk.c:204
 msgid "unique storage identifier"
 msgstr "惟一存储标识符"
 
-#: misc-utils/lsblk.c:201
+#: misc-utils/lsblk.c:205
 msgid "Host:Channel:Target:Lun for SCSI"
 msgstr "SCSI 的 Host:Channel:Target:Lun"
 
-#: misc-utils/lsblk.c:202
+#: misc-utils/lsblk.c:206
 msgid "device transport type"
 msgstr "设备传输类型"
 
-#: misc-utils/lsblk.c:203
+#: misc-utils/lsblk.c:207
 msgid "de-duplicated chain of subsystems"
 msgstr "对成链的子系统去重"
 
-#: misc-utils/lsblk.c:204
+#: misc-utils/lsblk.c:208
 msgid "device revision"
 msgstr "设备修订版本"
 
-#: misc-utils/lsblk.c:205
+#: misc-utils/lsblk.c:209
 msgid "device vendor"
 msgstr "设备制造商"
 
-#: misc-utils/lsblk.c:206
+#: misc-utils/lsblk.c:210
 msgid "zone model"
 msgstr ""
 
-#: misc-utils/lsblk.c:1234
+#: misc-utils/lsblk.c:1278
 msgid "failed to open device directory in sysfs"
 msgstr "打开 sysfs 中的设备目录失败"
 
-#: misc-utils/lsblk.c:1458
+#: misc-utils/lsblk.c:1476
 #, c-format
 msgid "%s: failed to compose sysfs path"
 msgstr "%s：组成 sysfs 路径失败"
 
-#: misc-utils/lsblk.c:1464
+#: misc-utils/lsblk.c:1482
 #, c-format
 msgid "%s: failed to read link"
 msgstr "%s：读链接失败"
 
-#: misc-utils/lsblk.c:1416
+#: misc-utils/lsblk.c:1460
 #, c-format
 msgid "%s: failed to get sysfs name"
 msgstr "%s：获取 sysfs 名称失败"
 
-#: misc-utils/lsblk.c:1428
+#: misc-utils/lsblk.c:1472
 #, c-format
 msgid "%s: failed to get whole-disk device number"
 msgstr "%s：获取 整盘 设备号失败"
 
-#: misc-utils/lsblk.c:1609 misc-utils/lsblk.c:1611 misc-utils/lsblk.c:1640
-#: misc-utils/lsblk.c:1642
+#: misc-utils/lsblk.c:1653 misc-utils/lsblk.c:1655 misc-utils/lsblk.c:1684
+#: misc-utils/lsblk.c:1686
 #, c-format
 msgid "failed to parse list '%s'"
 msgstr "解析列表“%s”失败"
 
 #. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1616
+#: misc-utils/lsblk.c:1660
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr "排除设备列表过大(限制为 %d 台设备)"
 
 #. TRANSLATORS: The standard value for %d is 256.
-#: misc-utils/lsblk.c:1647
+#: misc-utils/lsblk.c:1691
 #, c-format
 msgid "the list of included devices is too large (limit is %d devices)"
 msgstr "包含设备列表过大(限制为 %d 台设备)"
 
-#: misc-utils/lsblk.c:1716 sys-utils/wdctl.c:175
+#: misc-utils/lsblk.c:1760 sys-utils/wdctl.c:207
 #, c-format
 msgid " %s [options] [<device> ...]\n"
 msgstr " %s [选项] [<设备> ...]\n"
 
-#: misc-utils/lsblk.c:1719
+#: misc-utils/lsblk.c:1763
 msgid "List information about block devices.\n"
 msgstr "列出块设备的信息。\n"
 
-#: misc-utils/lsblk.c:1730
+#: misc-utils/lsblk.c:1774
 msgid " -a, --all            print all devices\n"
 msgstr " -a, --all            打印所有设备\n"
 
-#: misc-utils/lsblk.c:1732
+#: misc-utils/lsblk.c:1776
 msgid " -d, --nodeps         don't print slaves or holders\n"
 msgstr " -d, --nodeps         不打印从属设备(slave)或占位设备(holder)\n"
 
-#: misc-utils/lsblk.c:1722
+#: misc-utils/lsblk.c:1766
 msgid " -D, --discard        print discard capabilities\n"
 msgstr " -D, --discard        打印时丢弃能力\n"
 
-#: misc-utils/lsblk.c:1745
+#: misc-utils/lsblk.c:1789
 msgid " -z, --zoned          print zone model\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1733
+#: misc-utils/lsblk.c:1777
 msgid ""
 " -e, --exclude <list> exclude devices by major number (default: RAM disks)\n"
 msgstr " -e, --exclude <列表> 根据主设备号排除设备(默认：内存盘)\n"
 
-#: misc-utils/lsblk.c:1734
+#: misc-utils/lsblk.c:1778
 msgid " -f, --fs             output info about filesystems\n"
 msgstr " -f, --fs             输出文件系统信息\n"
 
-#: misc-utils/lsblk.c:1735
+#: misc-utils/lsblk.c:1779
 msgid " -i, --ascii          use ascii characters only\n"
 msgstr " -i, --ascii          只使用 ascii 字符\n"
 
-#: misc-utils/lsblk.c:1724
+#: misc-utils/lsblk.c:1768
 msgid ""
 " -I, --include <list> show only devices with specified major numbers\n"
 msgstr " -I, --include <列表> 只显示有指定主设备号的设备\n"
 
-#: misc-utils/lsblk.c:1725 sys-utils/lsmem.c:500
+#: misc-utils/lsblk.c:1769 sys-utils/lsmem.c:500
 msgid " -J, --json           use JSON output format\n"
 msgstr " -J, --json           使用 JSON 输出格式\n"
 
-#: misc-utils/lsblk.c:1736
+#: misc-utils/lsblk.c:1780
 msgid " -l, --list           use list format output\n"
 msgstr " -l, --list           使用列表格式的输出\n"
 
-#: misc-utils/lsblk.c:1464
+#: misc-utils/lsblk.c:1648
 msgid " -T, --tree           use tree format output\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:1738
+#: misc-utils/lsblk.c:1782
 msgid " -m, --perms          output info about permissions\n"
 msgstr " -m, --perms          输出权限信息\n"
 
-#: misc-utils/lsblk.c:1739 sys-utils/lsmem.c:504
+#: misc-utils/lsblk.c:1783 sys-utils/lsmem.c:504
 msgid " -n, --noheadings     don't print headings\n"
 msgstr " -n, --noheadings     不打印标题\n"
 
-#: misc-utils/lsblk.c:1740 sys-utils/lsmem.c:505
+#: misc-utils/lsblk.c:1784 sys-utils/lsmem.c:505
 msgid " -o, --output <list>  output columns\n"
 msgstr " -o, --output <列表>  输出列\n"
 
-#: misc-utils/lsblk.c:1726
+#: misc-utils/lsblk.c:1770
 msgid " -O, --output-all     output all columns\n"
 msgstr " -O, --output-all     输出所有列\n"
 
-#: misc-utils/lsblk.c:1741
+#: misc-utils/lsblk.c:1785
 msgid " -p, --paths          print complete device path\n"
 msgstr " -p, --paths          打印完整设备路径\n"
 
-#: misc-utils/lsblk.c:1743
+#: misc-utils/lsblk.c:1787
 msgid " -s, --inverse        inverse dependencies\n"
 msgstr " -s, --inverse        反向依赖\n"
 
-#: misc-utils/lsblk.c:1728
+#: misc-utils/lsblk.c:1772
 msgid " -S, --scsi           output info about SCSI devices\n"
 msgstr " -S, --scsi           输出有关 SCSI 设备的信息\n"
 
-#: misc-utils/lsblk.c:1744
+#: misc-utils/lsblk.c:1788
 msgid " -t, --topology       output info about topology\n"
 msgstr " -t, --topology       输出拓扑信息\n"
 
-#: misc-utils/lsblk.c:1746
+#: misc-utils/lsblk.c:1790
 msgid " -x, --sort <column>  sort output by <column>\n"
 msgstr " -x, --sort <列>      按<列>对输出排序\n"
 
-#: misc-utils/lsblk.c:1764
+#: misc-utils/lsblk.c:1808
 #, c-format
 msgid "failed to access sysfs directory: %s"
 msgstr "无法访问 sysfs 目录：%s"
@@ -10248,7 +10251,7 @@
 msgid " -r, --raw              use the raw output format\n"
 msgstr " -r, --raw              使用原生输出格式\n"
 
-#: misc-utils/lslocks.c:606 schedutils/chrt.c:475 schedutils/ionice.c:177
+#: misc-utils/lslocks.c:606 schedutils/chrt.c:484 schedutils/ionice.c:177
 #: schedutils/taskset.c:171 sys-utils/choom.c:102 sys-utils/lsns.c:992
 #: sys-utils/prlimit.c:585
 msgid "invalid PID argument"
@@ -10281,7 +10284,7 @@
 msgid "closing %s failed"
 msgstr "关闭 %s 失败"
 
-#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:140 sys-utils/fstrim.c:439
+#: misc-utils/mcookie.c:164 sys-utils/blkdiscard.c:140 sys-utils/fstrim.c:446
 #: text-utils/hexdump.c:117
 msgid "failed to parse length"
 msgstr "解析长度失败"
@@ -10301,7 +10304,7 @@
 msgid "failed to read symlink: %s"
 msgstr "读符号链接失败：%s"
 
-#: misc-utils/namei.c:379
+#: misc-utils/namei.c:283
 #, c-format
 msgid "%s - No such file or directory\n"
 msgstr "%s - 无此文件或目录\n"
@@ -10536,8 +10539,8 @@
 msgid "timeout [%d sec]\n"
 msgstr "超时 [%d 秒]\n"
 
-#: misc-utils/uuidd.c:437 term-utils/setterm.c:902 text-utils/column.c:494
-#: text-utils/column.c:517
+#: misc-utils/uuidd.c:437 term-utils/setterm.c:923 text-utils/column.c:495
+#: text-utils/column.c:518
 msgid "read failed"
 msgstr "read 失败"
 
@@ -10732,7 +10735,7 @@
 msgid "sha1-based"
 msgstr ""
 
-#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:177 sys-utils/lscpu.c:1967
+#: misc-utils/uuidparse.c:267 misc-utils/wipefs.c:177 sys-utils/lscpu.c:2019
 #: sys-utils/lsns.c:806 sys-utils/zramctl.c:503
 msgid "failed to initialize output column"
 msgstr "初始化输出列失败"
@@ -11043,7 +11046,7 @@
 msgid "pid %d's current runtime/deadline/period parameters: %ju/%ju/%ju\n"
 msgstr "pid %d 当前的运行时/截止时间/周期参数︰ %ju/%ju/%ju\n"
 
-#: schedutils/chrt.c:299 schedutils/chrt.c:395
+#: schedutils/chrt.c:299 schedutils/chrt.c:404
 msgid "cannot obtain the list of tasks"
 msgstr "无法获取任务列表"
 
@@ -11057,48 +11060,48 @@
 msgid "%s not supported?\n"
 msgstr "%s 不支持？\n"
 
-#: schedutils/chrt.c:399
+#: schedutils/chrt.c:408
 #, c-format
 msgid "failed to set tid %d's policy"
 msgstr "设置 tid %d 策略失败"
 
-#: schedutils/chrt.c:404
+#: schedutils/chrt.c:413
 #, c-format
 msgid "failed to set pid %d's policy"
 msgstr "设置 pid %d 的策略失败"
 
-#: schedutils/chrt.c:484
+#: schedutils/chrt.c:493
 msgid "invalid runtime argument"
 msgstr "无效的运行时参数"
 
-#: schedutils/chrt.c:487
+#: schedutils/chrt.c:496
 msgid "invalid period argument"
 msgstr "无效的周期参数"
 
-#: schedutils/chrt.c:490
+#: schedutils/chrt.c:499
 msgid "invalid deadline argument"
 msgstr "无效的截止时间参数"
 
-#: schedutils/chrt.c:515
+#: schedutils/chrt.c:524
 msgid "invalid priority argument"
 msgstr "无效的 优先级 参数"
 
-#: schedutils/chrt.c:519
+#: schedutils/chrt.c:528
 msgid ""
 "--reset-on-fork option is supported for SCHED_FIFO and SCHED_RR policies only"
 msgstr "--reset-on-fork 选项只支持 SCHED_FIFO and SCHED_RR 策略"
 
-#: schedutils/chrt.c:524
+#: schedutils/chrt.c:533
 msgid ""
 "--sched-{runtime,deadline,period} options are supported for SCHED_DEADLINE "
 "only"
 msgstr "--sched-{runtime,deadline,period} 选项只支持 SCHED_DEADLINE"
 
-#: schedutils/chrt.c:539
+#: schedutils/chrt.c:548
 msgid "SCHED_DEADLINE is unsupported"
 msgstr "不支持 SCHED_DEADLINE"
 
-#: schedutils/chrt.c:546
+#: schedutils/chrt.c:555
 #, c-format
 msgid ""
 "unsupported priority value for the policy: %d: see --max for valid range"
@@ -11345,7 +11348,7 @@
 msgid " -v, --verbose       print aligned length and offset\n"
 msgstr " -v, --verbose       打印对齐的长度和偏移\n"
 
-#: sys-utils/blkdiscard.c:144 sys-utils/fstrim.c:443 sys-utils/losetup.c:706
+#: sys-utils/blkdiscard.c:144 sys-utils/fstrim.c:450 sys-utils/losetup.c:706
 #: text-utils/hexdump.c:124
 msgid "failed to parse offset"
 msgstr "解析偏移失败"
@@ -11355,7 +11358,7 @@
 msgstr "解析步长失败"
 
 #: sys-utils/blkdiscard.c:175 sys-utils/blkzone.c:406 sys-utils/fallocate.c:376
-#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:471 sys-utils/umount.c:577
+#: sys-utils/fsfreeze.c:110 sys-utils/fstrim.c:478 sys-utils/umount.c:588
 msgid "unexpected number of arguments"
 msgstr "参数数量异常"
 
@@ -11914,40 +11917,40 @@
 msgid "FTP daemon"
 msgstr "ftp 守护进程"
 
-#: sys-utils/dmesg.c:269
+#: sys-utils/dmesg.c:270
 msgid "Display or control the kernel ring buffer.\n"
 msgstr "显示或控制内核环形缓冲区。\n"
 
-#: sys-utils/dmesg.c:272
+#: sys-utils/dmesg.c:273
 msgid " -C, --clear                 clear the kernel ring buffer\n"
 msgstr " -C, --clear                 清除内核环形缓冲区(ring butter)\n"
 
-#: sys-utils/dmesg.c:273
+#: sys-utils/dmesg.c:274
 msgid " -c, --read-clear            read and clear all messages\n"
 msgstr " -c, --read-clear            读取并清除所有消息\n"
 
-#: sys-utils/dmesg.c:274
+#: sys-utils/dmesg.c:275
 msgid " -D, --console-off           disable printing messages to console\n"
 msgstr " -D, --console-off           禁止向终端打印消息\n"
 
-#: sys-utils/dmesg.c:275
+#: sys-utils/dmesg.c:276
 msgid " -E, --console-on            enable printing messages to console\n"
 msgstr " -E, --console-on            启用向终端打印消息\n"
 
-#: sys-utils/dmesg.c:276
+#: sys-utils/dmesg.c:277
 msgid ""
 " -F, --file <file>           use the file instead of the kernel log buffer\n"
 msgstr " -F, --file <文件>           用 文件 代替内核日志缓冲区\n"
 
-#: sys-utils/dmesg.c:277
+#: sys-utils/dmesg.c:278
 msgid " -f, --facility <list>       restrict output to defined facilities\n"
 msgstr " -f, --facility <列表>       将输出限制为定义的设施\n"
 
-#: sys-utils/dmesg.c:278
+#: sys-utils/dmesg.c:279
 msgid " -H, --human                 human readable output\n"
 msgstr " -H, --human                 易读格式输出\n"
 
-#: sys-utils/dmesg.c:279
+#: sys-utils/dmesg.c:280
 msgid " -k, --kernel                display kernel messages\n"
 msgstr " -k, --kernel                显示内核消息\n"
 
@@ -11956,68 +11959,68 @@
 " -L, --color[=<when>]        colorize messages (auto, always or never)\n"
 msgstr " -L, --color[=<时机>]        彩色显示消息(auto, always 或 never)\n"
 
-#: sys-utils/dmesg.c:283
+#: sys-utils/dmesg.c:285
 msgid " -l, --level <list>          restrict output to defined levels\n"
 msgstr " -l, --level <列表>          限制输出级别\n"
 
-#: sys-utils/dmesg.c:284
+#: sys-utils/dmesg.c:286
 msgid ""
 " -n, --console-level <level> set level of messages printed to console\n"
 msgstr " -n, --console-level <级别>  设置打印到终端的消息级别\n"
 
-#: sys-utils/dmesg.c:285
+#: sys-utils/dmesg.c:287
 msgid " -P, --nopager               do not pipe output into a pager\n"
 msgstr " -P, --nopager               不将输出通过管道传递给分页程序\n"
 
-#: sys-utils/dmesg.c:287
+#: sys-utils/dmesg.c:289
 msgid " -r, --raw                   print the raw message buffer\n"
 msgstr " -r, --raw                   打印原生消息缓冲区\n"
 
-#: sys-utils/dmesg.c:288
+#: sys-utils/dmesg.c:291
 msgid ""
 " -S, --syslog                force to use syslog(2) rather than /dev/kmsg\n"
 msgstr " -S, --syslog                强制使用 syslog(2) 而非 /dev/kmsg\n"
 
-#: sys-utils/dmesg.c:289
+#: sys-utils/dmesg.c:292
 msgid ""
 " -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
 msgstr " -s, --buffer-size <大小>    查询内核环形缓冲区所用的缓冲区大小\n"
 
-#: sys-utils/dmesg.c:290
+#: sys-utils/dmesg.c:293
 msgid " -u, --userspace             display userspace messages\n"
 msgstr " -u, --userspace             显示用户空间消息\n"
 
-#: sys-utils/dmesg.c:291
+#: sys-utils/dmesg.c:294
 msgid " -w, --follow                wait for new messages\n"
 msgstr " -w, --follow                等待新消息\n"
 
-#: sys-utils/dmesg.c:292
+#: sys-utils/dmesg.c:295
 msgid ""
 " -x, --decode                decode facility and level to readable string\n"
 msgstr " -x, --decode                将设施和级别解码为可读的字符串\n"
 
-#: sys-utils/dmesg.c:293
+#: sys-utils/dmesg.c:296
 msgid ""
 " -d, --show-delta            show time delta between printed messages\n"
 msgstr " -d, --show-delta            显示打印消息之间的时间差\n"
 
-#: sys-utils/dmesg.c:294
+#: sys-utils/dmesg.c:297
 msgid ""
 " -e, --reltime               show local time and time delta in readable "
 "format\n"
 msgstr " -e, --reltime               以易读格式显示本地时间和时间差\n"
 
-#: sys-utils/dmesg.c:295
+#: sys-utils/dmesg.c:298
 msgid ""
 " -T, --ctime                 show human-readable timestamp (may be "
 "inaccurate!)\n"
 msgstr " -T, --ctime                 显示易读的时间戳(可能不准确！)\n"
 
-#: sys-utils/dmesg.c:296
+#: sys-utils/dmesg.c:299
 msgid " -t, --notime                don't show any timestamp with messages\n"
 msgstr " -t, --notime                不显示任何消息的时间戳\n"
 
-#: sys-utils/dmesg.c:297
+#: sys-utils/dmesg.c:300
 msgid ""
 "     --time-format <format>  show timestamp using the given format:\n"
 "                               [delta|reltime|ctime|notime|iso]\n"
@@ -12027,7 +12030,7 @@
 "                               [delta|reltime|ctime|notime|iso]\n"
 "挂起/恢复会使 ctime 和 iso 时间戳不精确。\n"
 
-#: sys-utils/dmesg.c:302
+#: sys-utils/dmesg.c:305
 msgid ""
 "\n"
 "Supported log facilities:\n"
@@ -12035,7 +12038,7 @@
 "\n"
 "支持的日志设施：\n"
 
-#: sys-utils/dmesg.c:308
+#: sys-utils/dmesg.c:311
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
@@ -12043,63 +12046,63 @@
 "\n"
 "支持的日志级别(优先级)：\n"
 
-#: sys-utils/dmesg.c:362
+#: sys-utils/dmesg.c:365
 #, c-format
 msgid "failed to parse level '%s'"
 msgstr "解析级别“%s”失败"
 
-#: sys-utils/dmesg.c:364
+#: sys-utils/dmesg.c:367
 #, c-format
 msgid "unknown level '%s'"
 msgstr "未知级别“%s”"
 
-#: sys-utils/dmesg.c:400
+#: sys-utils/dmesg.c:403
 #, c-format
 msgid "failed to parse facility '%s'"
 msgstr "解析设施“%s”失败"
 
-#: sys-utils/dmesg.c:402
+#: sys-utils/dmesg.c:405
 #, c-format
 msgid "unknown facility '%s'"
 msgstr "未知设施“%s”"
 
-#: sys-utils/dmesg.c:530
+#: sys-utils/dmesg.c:533
 #, c-format
 msgid "cannot mmap: %s"
 msgstr "无法 mmap：%s"
 
-#: sys-utils/dmesg.c:1435
+#: sys-utils/dmesg.c:1451
 msgid "invalid buffer size argument"
 msgstr "无效的 缓冲区大小 参数"
 
-#: sys-utils/dmesg.c:1489
+#: sys-utils/dmesg.c:1508
 msgid "--show-delta is ignored when used together with iso8601 time format"
 msgstr "--show-delta 与 iso8601 时间格式共用时将忽略"
 
-#: sys-utils/dmesg.c:1512
+#: sys-utils/dmesg.c:1531
 msgid ""
 "--raw can be used together with --level or --facility only when reading "
 "messages from /dev/kmsg"
 msgstr "只有从 /dev/kmsg 读消息时，--raw 才可与 --level 或 --facility 共用"
 
-#: sys-utils/dmesg.c:1527
+#: sys-utils/dmesg.c:1546
 msgid "read kernel buffer failed"
 msgstr "读取内核缓冲区失败"
 
-#: sys-utils/dmesg.c:1546
+#: sys-utils/dmesg.c:1565
 msgid "klogctl failed"
 msgstr "klogctl 失败"
 
-#: sys-utils/eject.c:135
+#: sys-utils/eject.c:138
 #, c-format
 msgid " %s [options] [<device>|<mountpoint>]\n"
 msgstr " %s [选项] [<设备>|<挂臷点>]\n"
 
-#: sys-utils/eject.c:138
+#: sys-utils/eject.c:141
 msgid "Eject removable media.\n"
 msgstr "弹出可移动媒体\n"
 
-#: sys-utils/eject.c:141
+#: sys-utils/eject.c:144
 msgid ""
 " -a, --auto <on|off>         turn auto-eject feature on or off\n"
 " -c, --changerslot <slot>    switch discs on a CD-ROM changer\n"
@@ -12139,7 +12142,7 @@
 " -x, --cdspeed <速度>        设置 CD-ROM 最高速度\n"
 " -X, --listspeed             列出 CD-ROM 可用速度\n"
 
-#: sys-utils/eject.c:164
+#: sys-utils/eject.c:167
 msgid ""
 "\n"
 "By default tries -r, -s, -f, and -q in order until success.\n"
@@ -12147,280 +12150,280 @@
 "\n"
 "默认将依次尝试 -r、-s、-f 和 -q 直到成功。\n"
 
-#: sys-utils/eject.c:210
+#: sys-utils/eject.c:213
 msgid "invalid argument to --changerslot/-c option"
 msgstr "--changerslot/-c 选项的参数无效"
 
-#: sys-utils/eject.c:214
+#: sys-utils/eject.c:217
 msgid "invalid argument to --cdspeed/-x option"
 msgstr "--cdspeed/-x 选项的参数无效"
 
-#: sys-utils/eject.c:323
+#: sys-utils/eject.c:326
 msgid "CD-ROM auto-eject command failed"
 msgstr "CD-ROM 自动弹出命令失败"
 
-#: sys-utils/eject.c:337
+#: sys-utils/eject.c:340
 msgid "CD-ROM door lock is not supported"
 msgstr "不支持光盘仓门锁"
 
-#: sys-utils/eject.c:339
+#: sys-utils/eject.c:342
 msgid "other users have the drive open and not CAP_SYS_ADMIN"
 msgstr "其他用户开启了驱动器仓门，并且非 CAP_SYS_ADMIN"
 
-#: sys-utils/eject.c:341
+#: sys-utils/eject.c:344
 msgid "CD-ROM lock door command failed"
 msgstr "CD-ROM 锁仓门命令失败"
 
-#: sys-utils/eject.c:346
+#: sys-utils/eject.c:349
 msgid "CD-Drive may NOT be ejected with device button"
 msgstr "CD 驱动器不能通过设备上的按钮弹出"
 
-#: sys-utils/eject.c:348
+#: sys-utils/eject.c:351
 msgid "CD-Drive may be ejected with device button"
 msgstr "CD 驱动器可以通过设备上的按钮弹出"
 
-#: sys-utils/eject.c:359
+#: sys-utils/eject.c:362
 msgid "CD-ROM select disc command failed"
 msgstr "CD-ROM 选择光盘命令失败"
 
-#: sys-utils/eject.c:363
+#: sys-utils/eject.c:366
 msgid "CD-ROM load from slot command failed"
 msgstr "CD-ROM 从槽加载命令失败"
 
-#: sys-utils/eject.c:365
+#: sys-utils/eject.c:368
 msgid "IDE/ATAPI CD-ROM changer not supported by this kernel\n"
 msgstr "此内核不支持 IDE/ATAPI CD-ROM\n"
 
-#: sys-utils/eject.c:383
+#: sys-utils/eject.c:386
 msgid "CD-ROM tray close command failed"
 msgstr "CD-ROM 关闭仓门命令失败"
 
-#: sys-utils/eject.c:385
+#: sys-utils/eject.c:388
 msgid "CD-ROM tray close command not supported by this kernel\n"
 msgstr "此内核不支持 CD-ROM 关闭仓门命令\n"
 
-#: sys-utils/eject.c:402
+#: sys-utils/eject.c:405
 msgid "CD-ROM eject unsupported"
 msgstr "不支持 CD-ROM 弹出"
 
-#: sys-utils/eject.c:430 sys-utils/eject.c:453 sys-utils/eject.c:1007
+#: sys-utils/eject.c:433 sys-utils/eject.c:456 sys-utils/eject.c:1021
 msgid "CD-ROM eject command failed"
 msgstr "CD-ROM 弹出命令失败"
 
-#: sys-utils/eject.c:433
+#: sys-utils/eject.c:436
 msgid "no CD-ROM information available"
 msgstr "没有可用的 CD-ROM 信息"
 
-#: sys-utils/eject.c:436
+#: sys-utils/eject.c:439
 msgid "CD-ROM drive is not ready"
 msgstr "CD-ROM 驱动器未就绪"
 
-#: sys-utils/eject.c:479
+#: sys-utils/eject.c:482
 msgid "CD-ROM select speed command failed"
 msgstr "CD-ROM 选择速度命令失败"
 
-#: sys-utils/eject.c:481
+#: sys-utils/eject.c:484
 msgid "CD-ROM select speed command not supported by this kernel"
 msgstr "此内核不支持 CD-ROM 选择速度命令"
 
-#: sys-utils/eject.c:518
+#: sys-utils/eject.c:521
 #, c-format
 msgid "%s: failed to finding CD-ROM name"
 msgstr "%s：获取 CD-ROM 名称失败"
 
-#: sys-utils/eject.c:533
+#: sys-utils/eject.c:536
 #, c-format
 msgid "%s: failed to read speed"
 msgstr "%s：读 速度 失败"
 
-#: sys-utils/eject.c:541
+#: sys-utils/eject.c:544
 msgid "failed to read speed"
 msgstr "读 速度 失败"
 
-#: sys-utils/eject.c:581
+#: sys-utils/eject.c:584
 msgid "not an sg device, or old sg driver"
 msgstr "不是 sg 设备，或为旧 sg 驱动"
 
-#: sys-utils/eject.c:653
+#: sys-utils/eject.c:656
 #, c-format
 msgid "%s: unmounting"
 msgstr "%s：正在卸载"
 
-#: sys-utils/eject.c:675
+#: sys-utils/eject.c:674
 #, c-format
 msgid "unable to exec /bin/umount of `%s'"
 msgstr "无法对“%s”执行 /bin/umount"
 
-#: sys-utils/eject.c:671
+#: sys-utils/eject.c:674
 msgid "unable to fork"
 msgstr "无法 fork"
 
-#: sys-utils/eject.c:678
+#: sys-utils/eject.c:681
 #, c-format
 msgid "unmount of `%s' did not exit normally"
 msgstr "卸载“%s”未正常退出"
 
-#: sys-utils/eject.c:681
+#: sys-utils/eject.c:684
 #, c-format
 msgid "unmount of `%s' failed\n"
 msgstr "挂臷“%s”失败\n"
 
-#: sys-utils/eject.c:723
+#: sys-utils/eject.c:729
 msgid "failed to parse mount table"
 msgstr "解析挂臷表失败"
 
-#: sys-utils/eject.c:786 sys-utils/eject.c:888
+#: sys-utils/eject.c:795 sys-utils/eject.c:897
 #, c-format
 msgid "%s: mounted on %s"
 msgstr "%s：已挂臷于 %s"
 
-#: sys-utils/eject.c:829
+#: sys-utils/eject.c:838
 msgid "setting CD-ROM speed to auto"
 msgstr "正在将 CD-ROM 速度设置为自动"
 
-#: sys-utils/eject.c:831
+#: sys-utils/eject.c:840
 #, c-format
 msgid "setting CD-ROM speed to %ldX"
 msgstr "正在将 CD-ROM 速度设置为 %ldX"
 
-#: sys-utils/eject.c:857
+#: sys-utils/eject.c:866
 #, c-format
 msgid "default device: `%s'"
 msgstr "默认设备：“%s”"
 
-#: sys-utils/eject.c:863
+#: sys-utils/eject.c:872
 #, c-format
 msgid "using default device `%s'"
 msgstr "使用默认设备“%s”"
 
-#: sys-utils/eject.c:882 sys-utils/rtcwake.c:398
+#: sys-utils/rtcwake.c:398
 #, c-format
 msgid "%s: unable to find device"
 msgstr "%s：找不到设备"
 
-#: sys-utils/eject.c:884
+#: sys-utils/eject.c:893
 #, c-format
 msgid "device name is `%s'"
 msgstr "设备名称为“%s”"
 
-#: sys-utils/eject.c:890 sys-utils/umount.c:332 sys-utils/umount.c:356
+#: sys-utils/eject.c:899 sys-utils/umount.c:343 sys-utils/umount.c:367
 #, c-format
 msgid "%s: not mounted"
 msgstr "%s：未挂载"
 
-#: sys-utils/eject.c:894
+#: sys-utils/eject.c:903
 #, c-format
 msgid "%s: disc device: %s (disk device will be used for eject)"
 msgstr "%s：盘设备：%s(盘设备将用于弹出)"
 
-#: sys-utils/eject.c:902
+#: sys-utils/eject.c:911
 #, c-format
 msgid "%s: not found mountpoint or device with the given name"
 msgstr "%s：未找到指定名称的挂载点或设备"
 
-#: sys-utils/eject.c:905
+#: sys-utils/eject.c:914
 #, c-format
 msgid "%s: is whole-disk device"
 msgstr "%s：是 整盘 设备"
 
-#: sys-utils/eject.c:909
+#: sys-utils/eject.c:918
 #, c-format
 msgid "%s: is not hot-pluggable device"
 msgstr "%s：不是热插拔设备"
 
-#: sys-utils/eject.c:913
+#: sys-utils/eject.c:922
 #, c-format
 msgid "device is `%s'"
 msgstr "设备是“%s”"
 
-#: sys-utils/eject.c:914
+#: sys-utils/eject.c:923
 msgid "exiting due to -n/--noop option"
 msgstr "将因 -n/--noop 选项退出"
 
-#: sys-utils/eject.c:928
+#: sys-utils/eject.c:937
 #, c-format
 msgid "%s: enabling auto-eject mode"
 msgstr "%s：正在启用自动弹出模式"
 
-#: sys-utils/eject.c:930
+#: sys-utils/eject.c:939
 #, c-format
 msgid "%s: disabling auto-eject mode"
 msgstr "%s：正在禁用自动弹出模式"
 
-#: sys-utils/eject.c:938
+#: sys-utils/eject.c:947
 #, c-format
 msgid "%s: closing tray"
 msgstr "%s：正在关闭仓门"
 
-#: sys-utils/eject.c:947
+#: sys-utils/eject.c:956
 #, c-format
 msgid "%s: toggling tray"
 msgstr "%s：开关仓门"
 
-#: sys-utils/eject.c:956
+#: sys-utils/eject.c:965
 #, c-format
 msgid "%s: listing CD-ROM speed"
 msgstr "%s：正在列出 CD-ROM 速度"
 
-#: sys-utils/eject.c:982
+#: sys-utils/eject.c:991
 #, c-format
 msgid "error: %s: device in use"
 msgstr "错误：%s：设备正在使用"
 
-#: sys-utils/eject.c:988
+#: sys-utils/eject.c:1002
 #, c-format
 msgid "%s: selecting CD-ROM disc #%ld"
 msgstr "%s：正在选择 CD-ROM 盘 #%ld"
 
-#: sys-utils/eject.c:1004
+#: sys-utils/eject.c:1018
 #, c-format
 msgid "%s: trying to eject using CD-ROM eject command"
 msgstr "%s：正在尝试使用 CD-ROM 弹出命令弹出"
 
-#: sys-utils/eject.c:1006
+#: sys-utils/eject.c:1020
 msgid "CD-ROM eject command succeeded"
 msgstr "CD-ROM 弹出命令成功"
 
-#: sys-utils/eject.c:1011
+#: sys-utils/eject.c:1025
 #, c-format
 msgid "%s: trying to eject using SCSI commands"
 msgstr "%s：正在尝试使用 SCSI 命令弹出"
 
-#: sys-utils/eject.c:1013
+#: sys-utils/eject.c:1027
 msgid "SCSI eject succeeded"
 msgstr "SCSI 弹出成功"
 
-#: sys-utils/eject.c:1014
+#: sys-utils/eject.c:1028
 msgid "SCSI eject failed"
 msgstr "SCSI 弹出失败"
 
-#: sys-utils/eject.c:1018
+#: sys-utils/eject.c:1032
 #, c-format
 msgid "%s: trying to eject using floppy eject command"
 msgstr "%s：正在尝试使用软盘弹出命令弹出"
 
-#: sys-utils/eject.c:1020
+#: sys-utils/eject.c:1034
 msgid "floppy eject command succeeded"
 msgstr "软盘弹出命令成功"
 
-#: sys-utils/eject.c:1021
+#: sys-utils/eject.c:1035
 msgid "floppy eject command failed"
 msgstr "软盘弹出命令失败"
 
-#: sys-utils/eject.c:1025
+#: sys-utils/eject.c:1039
 #, c-format
 msgid "%s: trying to eject using tape offline command"
 msgstr "%s：正在尝试使用磁带离线命令弹出"
 
-#: sys-utils/eject.c:1027
+#: sys-utils/eject.c:1041
 msgid "tape offline command succeeded"
 msgstr "磁带离线命令成功"
 
-#: sys-utils/eject.c:1028
+#: sys-utils/eject.c:1042
 msgid "tape offline command failed"
 msgstr "磁带离线命令失败"
 
-#: sys-utils/eject.c:1032
+#: sys-utils/eject.c:1046
 msgid "unable to eject"
 msgstr "无法弹出"
 
@@ -12651,85 +12654,85 @@
 msgid "%s: unfreeze failed"
 msgstr "%s：解冻失败"
 
-#: sys-utils/fstrim.c:96
+#: sys-utils/fstrim.c:79
 #, c-format
 msgid "%s: not a directory"
 msgstr "%s：不是一个目录"
 
-#: sys-utils/fstrim.c:122
+#: sys-utils/fstrim.c:128
 #, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s：FITRIM ioctl 失败"
 
 #. TRANSLATORS: The standard value here is a very large number.
-#: sys-utils/fstrim.c:136
+#: sys-utils/fstrim.c:142
 #, c-format
 msgid "%s: %s (%<PRIu64> bytes) trimmed\n"
 msgstr "%s：%s (%<PRIu64> 字节) 已修剪\n"
 
-#: sys-utils/fstrim.c:249 sys-utils/lsns.c:1078 sys-utils/swapon.c:733
-#: sys-utils/umount.c:248
+#: sys-utils/fstrim.c:255 sys-utils/lsns.c:1078 sys-utils/swapon.c:733
+#: sys-utils/umount.c:259
 #, c-format
 msgid "failed to parse %s"
 msgstr "解析 %s 失败"
 
-#: sys-utils/fstrim.c:375
+#: sys-utils/fstrim.c:382
 #, c-format
 msgid " %s [options] <mount point>\n"
 msgstr " %s [选项] <挂臷点>\n"
 
-#: sys-utils/fstrim.c:378
+#: sys-utils/fstrim.c:385
 msgid "Discard unused blocks on a mounted filesystem.\n"
 msgstr "忽略已挂载文件系统上的未用锁。\n"
 
-#: sys-utils/fstrim.c:269
+#: sys-utils/fstrim.c:258
 msgid ""
 " -a, --all           trim all mounted filesystems that are supported\n"
 msgstr " -a, --all           修剪不支持的所有已挂载文件系统\n"
 
-#: sys-utils/fstrim.c:383
+#: sys-utils/fstrim.c:390
 msgid " -o, --offset <num>  the offset in bytes to start discarding from\n"
 msgstr " -o, --offset <数字> 开始丢弃的偏移量(字节)\n"
 
-#: sys-utils/fstrim.c:384
+#: sys-utils/fstrim.c:391
 msgid " -l, --length <num>  the number of bytes to discard\n"
 msgstr " -l, --length <数字> 要丢弃的字符数\n"
 
-#: sys-utils/fstrim.c:385
+#: sys-utils/fstrim.c:392
 msgid " -m, --minimum <num> the minimum extent length to discard\n"
 msgstr " -m, --minimum <数字> 要丢弃的最小限制长度\n"
 
-#: sys-utils/fstrim.c:386
+#: sys-utils/fstrim.c:393
 msgid " -v, --verbose       print number of discarded bytes\n"
 msgstr " -v, --verbose       打印丢弃的字节数\n"
 
-#: sys-utils/fstrim.c:447
+#: sys-utils/fstrim.c:454
 msgid "failed to parse minimum extent length"
 msgstr "解析 最小范围长度 失败"
 
-#: sys-utils/fstrim.c:466
+#: sys-utils/fstrim.c:473
 msgid "no mountpoint specified"
 msgstr "未指定挂载点"
 
-#: sys-utils/fstrim.c:354 sys-utils/fstrim.c:480
+#: sys-utils/fstrim.c:361 sys-utils/fstrim.c:490
 #, c-format
 msgid "%s: the discard operation is not supported"
 msgstr "%s：不支持丢弃操作"
 
-#: sys-utils/hwclock.c:205
+#: sys-utils/hwclock.c:210
 #, c-format
 msgid "Assuming hardware clock is kept in %s time.\n"
 msgstr "将假设硬件时钟保持为 %s 时间。\n"
 
-#: sys-utils/hwclock.c:206 sys-utils/hwclock.c:270
+#: sys-utils/hwclock.c:211 sys-utils/hwclock.c:275
 msgid "UTC"
 msgstr "UTC"
 
-#: sys-utils/hwclock.c:206 sys-utils/hwclock.c:269
+#: sys-utils/hwclock.c:211 sys-utils/hwclock.c:274
 msgid "local"
 msgstr "当地"
 
-#: sys-utils/hwclock.c:256
+#: sys-utils/hwclock.c:261
 msgid ""
 "Warning: unrecognized third line in adjtime file\n"
 "(Expected: `UTC' or `LOCAL' or nothing.)"
@@ -12737,63 +12740,63 @@
 "警告：adjtime 文件第三行无法识别\n"
 "(应为：“UTC”或“LOCAL”或空)"
 
-#: sys-utils/hwclock.c:263
+#: sys-utils/hwclock.c:268
 #, c-format
 msgid "Last drift adjustment done at %ld seconds after 1969\n"
 msgstr "上次漂移调整完成于1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:265
+#: sys-utils/hwclock.c:270
 #, c-format
 msgid "Last calibration done at %ld seconds after 1969\n"
 msgstr "上次校准完成于1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:267
+#: sys-utils/hwclock.c:272
 #, c-format
 msgid "Hardware clock is on %s time\n"
 msgstr "硬件时钟为 %s 时间\n"
 
-#: sys-utils/hwclock.c:294
+#: sys-utils/hwclock.c:299
 #, c-format
 msgid "Waiting for clock tick...\n"
 msgstr "正在等等时钟滴答...\n"
 
-#: sys-utils/hwclock.c:300
+#: sys-utils/hwclock.c:305
 #, c-format
 msgid "...synchronization failed\n"
 msgstr "...同步失败\n"
 
-#: sys-utils/hwclock.c:302
+#: sys-utils/hwclock.c:307
 #, c-format
 msgid "...got clock tick\n"
 msgstr "...已获取时钟滴答\n"
 
-#: sys-utils/hwclock.c:343
+#: sys-utils/hwclock.c:348
 #, c-format
 msgid "Invalid values in hardware clock: %4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 msgstr "硬件时钟值无效：%4d/%.2d/%.2d %.2d:%.2d:%.2d\n"
 
-#: sys-utils/hwclock.c:351
+#: sys-utils/hwclock.c:356
 #, c-format
 msgid ""
 "Hw clock time : %4d/%.2d/%.2d %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "硬件时钟时间：%4d/%.2d/%.2d %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:378
+#: sys-utils/hwclock.c:383
 #, c-format
 msgid "Time read from Hardware Clock: %4d/%.2d/%.2d %02d:%02d:%02d\n"
 msgstr "从硬件时钟读取的时间：%4d/%.2d/%.2d %02d:%02d:%02d\n"
 
-#: sys-utils/hwclock.c:405
+#: sys-utils/hwclock.c:410
 #, c-format
 msgid "Setting Hardware Clock to %.2d:%.2d:%.2d = %ld seconds since 1969\n"
 msgstr "正在将硬件时钟设置为 %.2d:%.2d:%.2d = 1969(年)后 %ld 秒\n"
 
-#: sys-utils/hwclock.c:604
+#: sys-utils/hwclock.c:479
 #, c-format
 msgid "sleeping ~%d usec\n"
 msgstr "将睡眠 ~%d 微秒\n"
 
-#: sys-utils/hwclock.c:560
+#: sys-utils/hwclock.c:565
 #, c-format
 msgid "time jumped backward %.6f seconds to %ld.%06ld - retargeting\n"
 msgstr "时间倒退了 %.6f 秒到 %ld.%06ld - 正在重新定位\n"
@@ -12803,12 +12806,12 @@
 msgid "%ld.%06ld < %ld.%06ld (%.6f)\n"
 msgstr "%ld.%06ld < %ld.%06ld (%.6f)\n"
 
-#: sys-utils/hwclock.c:582
+#: sys-utils/hwclock.c:587
 #, c-format
 msgid "missed it - %ld.%06ld is too far past %ld.%06ld (%.6f > %.6f)\n"
 msgstr "错过了- %ld.%06ld 在 %ld.%06ld 之后太长时间了(%.6f > %.6f)\n"
 
-#: sys-utils/hwclock.c:610
+#: sys-utils/hwclock.c:615
 #, c-format
 msgid ""
 "%ld.%06ld is close enough to %ld.%06ld (%.6f < %.6f)\n"
@@ -12819,44 +12822,44 @@
 msgid "iso-8601 format overflow"
 msgstr ""
 
-#: sys-utils/hwclock.c:680
+#: sys-utils/hwclock.c:685
 #, c-format
 msgid "Calling settimeofday(NULL, %d) to set persistent_clock_is_local.\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:683
+#: sys-utils/hwclock.c:688
 msgid "Calling settimeofday(NULL, 0) to lock the warp function."
 msgstr ""
 
-#: sys-utils/hwclock.c:686
+#: sys-utils/hwclock.c:691
 #, c-format
 msgid "Calling settimeofday(%ld.%06ld, %d)\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:689
+#: sys-utils/hwclock.c:694
 #, c-format
 msgid "Calling settimeofday(NULL, %d) "
 msgstr ""
 
-#: sys-utils/hwclock.c:691
+#: sys-utils/hwclock.c:696
 msgid "to set the kernel timezone."
 msgstr ""
 
-#: sys-utils/hwclock.c:693
+#: sys-utils/hwclock.c:698
 msgid "to warp System time."
 msgstr ""
 
-#: sys-utils/hwclock.c:710
+#: sys-utils/hwclock.c:718
 msgid "settimeofday() failed"
 msgstr "settimeofday() 失败"
 
-#: sys-utils/hwclock.c:734
+#: sys-utils/hwclock.c:742
 #, c-format
 msgid ""
 "Not adjusting drift factor because the --update-drift option was not used.\n"
 msgstr "将不调整漂移系数，因为没有使用 --update-drift 选项。\n"
 
-#: sys-utils/hwclock.c:738
+#: sys-utils/hwclock.c:746
 #, c-format
 msgid ""
 "Not adjusting drift factor because last calibration time is zero,\n"
@@ -12865,14 +12868,14 @@
 "将不调整漂移系数，因为上次校准时间为零，\n"
 "历史有问题；需要启动校准。\n"
 
-#: sys-utils/hwclock.c:744
+#: sys-utils/hwclock.c:752
 #, c-format
 msgid ""
 "Not adjusting drift factor because it has been less than four hours since "
 "the last calibration.\n"
 msgstr "将不调整漂移系数，因为距上次校正不到四个小时。\n"
 
-#: sys-utils/hwclock.c:782
+#: sys-utils/hwclock.c:790
 #, c-format
 msgid ""
 "Clock drift factor was calculated as %f seconds/day.\n"
@@ -12881,7 +12884,7 @@
 "时钟漂移系数会按 %f 秒/天计算。\n"
 "系数过大，将重置为 0。\n"
 
-#: sys-utils/hwclock.c:789
+#: sys-utils/hwclock.c:797
 #, c-format
 msgid ""
 "Clock drifted %f seconds in the past %f seconds\n"
@@ -12889,177 +12892,177 @@
 "Adjusting drift factor by %f seconds/day\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:833
+#: sys-utils/hwclock.c:841
 #, c-format
 msgid "Time since last adjustment is %ld second\n"
 msgid_plural "Time since last adjustment is %ld seconds\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: sys-utils/hwclock.c:837
+#: sys-utils/hwclock.c:845
 #, c-format
 msgid "Calculated Hardware Clock drift is %ld.%06ld seconds\n"
 msgstr "计算出的硬件锁偏差为 %ld.%06ld 秒\n"
 
-#: sys-utils/hwclock.c:862
+#: sys-utils/hwclock.c:870
 #, c-format
 msgid ""
 "New %s data:\n"
 "%s"
 msgstr ""
 
-#: sys-utils/hwclock.c:872
+#: sys-utils/hwclock.c:880
 #, c-format
 msgid "cannot update %s"
 msgstr ""
 
-#: sys-utils/hwclock.c:908
+#: sys-utils/hwclock.c:916
 #, c-format
 msgid ""
 "Not setting clock because last adjustment time is zero, so history is bad.\n"
 msgstr "将不设置时钟，因为上次调整时间为零，历史有误。\n"
 
-#: sys-utils/hwclock.c:912
+#: sys-utils/hwclock.c:920
 #, c-format
 msgid "Not setting clock because drift factor %f is far too high.\n"
 msgstr "将不设置时钟，因为上次漂移系数 %f 过高。\n"
 
-#: sys-utils/hwclock.c:940
+#: sys-utils/hwclock.c:950
 #, c-format
 msgid "No usable clock interface found.\n"
 msgstr "未找到可用的时钟接口。\n"
 
-#: sys-utils/hwclock.c:941
+#: sys-utils/hwclock.c:952
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "无法通过已知的任何方式访问硬件时钟。"
 
-#: sys-utils/hwclock.c:1927
+#: sys-utils/hwclock.c:885
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
 msgstr "请使用 --debug 选项来观察程序搜索访问方法的详情。"
 
-#: sys-utils/hwclock.c:994
+#: sys-utils/hwclock.c:1006
 #, c-format
 msgid "Target date:   %ld\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:995
+#: sys-utils/hwclock.c:1007
 #, c-format
 msgid "Predicted RTC: %ld\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1025
+#: sys-utils/hwclock.c:1037
 msgid "RTC read returned an invalid value."
 msgstr ""
 
-#: sys-utils/hwclock.c:1053
+#: sys-utils/hwclock.c:1065
 #, c-format
 msgid "Needed adjustment is less than one second, so not setting clock.\n"
 msgstr "需要的调整不到一秒，将不设置时钟。\n"
 
-#: sys-utils/hwclock.c:1090
+#: sys-utils/hwclock.c:1102
 msgid "unable to read the RTC epoch."
 msgstr ""
 
-#: sys-utils/hwclock.c:1092
+#: sys-utils/hwclock.c:1104
 #, c-format
 msgid "The RTC epoch is set to %lu.\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1095
+#: sys-utils/hwclock.c:1107
 msgid "--epoch is required for --setepoch."
 msgstr ""
 
-#: sys-utils/hwclock.c:1098
+#: sys-utils/hwclock.c:1110
 msgid "unable to set the RTC epoch."
 msgstr ""
 
-#: sys-utils/hwclock.c:1112
+#: sys-utils/hwclock.c:1124
 #, c-format
 msgid " %s [function] [option...]\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1115
+#: sys-utils/hwclock.c:1127
 msgid "Time clocks utility."
 msgstr ""
 
-#: sys-utils/hwclock.c:1118
+#: sys-utils/hwclock.c:1130
 msgid " -r, --show           display the RTC time"
 msgstr ""
 
-#: sys-utils/hwclock.c:1119
+#: sys-utils/hwclock.c:1131
 msgid "     --get            display drift corrected RTC time"
 msgstr ""
 
-#: sys-utils/hwclock.c:1120
+#: sys-utils/hwclock.c:1132
 msgid "     --set            set the RTC according to --date"
 msgstr ""
 
-#: sys-utils/hwclock.c:1121
+#: sys-utils/hwclock.c:1133
 msgid " -s, --hctosys        set the system time from the RTC"
 msgstr ""
 
-#: sys-utils/hwclock.c:1122
+#: sys-utils/hwclock.c:1134
 msgid " -w, --systohc        set the RTC from the system time"
 msgstr ""
 
-#: sys-utils/hwclock.c:1123
+#: sys-utils/hwclock.c:1135
 msgid "     --systz          send timescale configurations to the kernel"
 msgstr ""
 
-#: sys-utils/hwclock.c:1124
+#: sys-utils/hwclock.c:1136
 msgid " -a, --adjust         adjust the RTC to account for systematic drift"
 msgstr ""
 
-#: sys-utils/hwclock.c:1126
+#: sys-utils/hwclock.c:1138
 msgid "     --getepoch       display the RTC epoch"
 msgstr ""
 
-#: sys-utils/hwclock.c:1127
+#: sys-utils/hwclock.c:1139
 msgid "     --setepoch       set the RTC epoch according to --epoch"
 msgstr ""
 
-#: sys-utils/hwclock.c:1129
+#: sys-utils/hwclock.c:1141
 msgid ""
 "     --predict        predict the drifted RTC time according to --date"
 msgstr ""
 
-#: sys-utils/hwclock.c:1131
+#: sys-utils/hwclock.c:1143
 msgid " -u, --utc            the RTC timescale is UTC"
 msgstr ""
 
-#: sys-utils/hwclock.c:1132
+#: sys-utils/hwclock.c:1144
 msgid " -l, --localtime      the RTC timescale is Local"
 msgstr ""
 
-#: sys-utils/hwclock.c:1135
+#: sys-utils/hwclock.c:1147
 #, c-format
 msgid " -f, --rtc <file>     use an alternate file to %1$s\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1138
+#: sys-utils/hwclock.c:1150
 #, c-format
 msgid "     --directisa      use the ISA bus instead of %1$s access\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1139
+#: sys-utils/hwclock.c:1151
 msgid "     --date <time>    date/time input for --set and --predict"
 msgstr ""
 
-#: sys-utils/hwclock.c:1142
+#: sys-utils/hwclock.c:1154
 msgid "     --epoch <year>   epoch input for --setepoch"
 msgstr ""
 
-#: sys-utils/hwclock.c:1144
+#: sys-utils/hwclock.c:1156
 msgid "     --update-drift   update the RTC drift factor"
 msgstr ""
 
-#: sys-utils/hwclock.c:1146
+#: sys-utils/hwclock.c:1158
 #, c-format
 msgid "     --noadjfile      do not use %1$s\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1148
+#: sys-utils/hwclock.c:1160
 #, c-format
 msgid "     --adjfile <file> use an alternate file to %1$s\n"
 msgstr ""
@@ -13072,131 +13075,131 @@
 msgid " -D, --debug          display more details"
 msgstr ""
 
-#: sys-utils/hwclock.c:1247
+#: sys-utils/hwclock.c:1258
 msgid "Unable to connect to audit system"
 msgstr "无法连接到审计系统"
 
-#: sys-utils/hwclock.c:1373
+#: sys-utils/hwclock.c:1384
 #, c-format
 msgid "%d too many arguments given"
 msgstr ""
 
-#: sys-utils/hwclock.c:1381
+#: sys-utils/hwclock.c:1392
 msgid "--update-drift requires --set or --systohc"
 msgstr ""
 
-#: sys-utils/hwclock.c:1386
+#: sys-utils/hwclock.c:1397
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "指定 --noadjfile 时，您必须指定 --utc 或 --localtime"
 
-#: sys-utils/hwclock.c:1393
+#: sys-utils/hwclock.c:1404
 msgid "--date is required for --set or --predict"
 msgstr ""
 
-#: sys-utils/hwclock.c:1399
+#: sys-utils/hwclock.c:1421
 #, c-format
 msgid "invalid date '%s'"
 msgstr ""
 
-#: sys-utils/hwclock.c:1413
+#: sys-utils/hwclock.c:1435
 #, c-format
 msgid "System Time: %ld.%06ld\n"
 msgstr ""
 
-#: sys-utils/hwclock.c:1429
+#: sys-utils/hwclock.c:1451
 msgid "Test mode: nothing was changed."
 msgstr ""
 
-#: sys-utils/hwclock-cmos.c:389
+#: sys-utils/hwclock-cmos.c:360
 msgid "ISA port access is not implemented"
 msgstr ""
 
-#: sys-utils/hwclock-cmos.c:391
+#: sys-utils/hwclock-cmos.c:362
 msgid "iopl() port access failed"
 msgstr ""
 
-#: sys-utils/hwclock-cmos.c:402
+#: sys-utils/hwclock-cmos.c:373
 msgid "Using direct ISA access to the clock"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:129
+#: sys-utils/hwclock-rtc.c:131
 #, c-format
 msgid "Trying to open: %s\n"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:151 sys-utils/hwclock-rtc.c:254
+#: sys-utils/hwclock-rtc.c:156 sys-utils/hwclock-rtc.c:259
 msgid "cannot open rtc device"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:187
+#: sys-utils/hwclock-rtc.c:192
 #, c-format
 msgid "ioctl(%s) to %s to read the time failed"
 msgstr "对 %2$s 的读取时间 ioctl(%1$s) 失败"
 
-#: sys-utils/hwclock-rtc.c:215
+#: sys-utils/hwclock-rtc.c:220
 #, c-format
 msgid "Waiting in loop for time from %s to change\n"
 msgstr "正在循环等待来自 %s 的时间更改\n"
 
-#: sys-utils/hwclock-rtc.c:234
+#: sys-utils/hwclock-rtc.c:239
 msgid "Timed out waiting for time change."
 msgstr "等待时间更改超时。"
 
-#: sys-utils/hwclock-rtc.c:281
+#: sys-utils/hwclock-rtc.c:286
 #, c-format
 msgid "select() to %s to wait for clock tick timed out"
 msgstr "对 %s select() 以等待时钟嘀嗒超时"
 
-#: sys-utils/hwclock-rtc.c:284
+#: sys-utils/hwclock-rtc.c:289
 #, c-format
 msgid "select() to %s to wait for clock tick failed"
 msgstr "对 %s select() 以等待时钟嘀嗒失败"
 
-#: sys-utils/hwclock-rtc.c:289
+#: sys-utils/hwclock-rtc.c:294
 #, c-format
 msgid "ioctl() to %s to turn off update interrupts failed"
 msgstr "对 %s ioctl() 以关闭更新中断失败"
 
-#: sys-utils/hwclock-rtc.c:295
+#: sys-utils/hwclock-rtc.c:300
 #, c-format
 msgid "ioctl(%d, RTC_UIE_ON, 0) to %s failed"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:348
+#: sys-utils/hwclock-rtc.c:353
 #, c-format
 msgid "ioctl(%s) to %s to set the time failed"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:354
+#: sys-utils/hwclock-rtc.c:359
 #, c-format
 msgid "ioctl(%s) was successful.\n"
 msgstr "ioctl(%s) 成功。\n"
 
-#: sys-utils/hwclock-rtc.c:370
+#: sys-utils/hwclock-rtc.c:375
 msgid "Using the rtc interface to the clock."
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:403
+#: sys-utils/hwclock-rtc.c:408
 #, c-format
 msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s failed"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:409
+#: sys-utils/hwclock-rtc.c:414
 #, c-format
 msgid "ioctl(%d, RTC_EPOCH_READ, epoch_p) to %s succeeded.\n"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:427
+#: sys-utils/hwclock-rtc.c:432
 #, c-format
 msgid "invalid epoch '%s'."
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:438
+#: sys-utils/hwclock-rtc.c:443
 #, c-format
 msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s failed"
 msgstr ""
 
-#: sys-utils/hwclock-rtc.c:444
+#: sys-utils/hwclock-rtc.c:449
 #, c-format
 msgid "ioctl(%d, RTC_EPOCH_SET, %lu) to %s succeeded.\n"
 msgstr ""
@@ -14375,84 +14378,84 @@
 msgid "vertical"
 msgstr "竖直"
 
-#: sys-utils/lscpu.c:196
+#: sys-utils/lscpu.c:201
 msgid "logical CPU number"
 msgstr "逻辑 CPU 数量"
 
-#: sys-utils/lscpu.c:197
+#: sys-utils/lscpu.c:202
 msgid "logical core number"
 msgstr "逻辑核心数量"
 
-#: sys-utils/lscpu.c:198
+#: sys-utils/lscpu.c:203
 msgid "logical socket number"
 msgstr "逻辑(CPU)座数量"
 
-#: sys-utils/lscpu.c:199
+#: sys-utils/lscpu.c:204
 msgid "logical NUMA node number"
 msgstr "逻辑 NUMA 节点数量"
 
-#: sys-utils/lscpu.c:200
+#: sys-utils/lscpu.c:205
 msgid "logical book number"
 msgstr "逻辑 book 数"
 
-#: sys-utils/lscpu.c:201
+#: sys-utils/lscpu.c:206
 msgid "logical drawer number"
 msgstr "逻辑抽屉号"
 
-#: sys-utils/lscpu.c:202
+#: sys-utils/lscpu.c:207
 msgid "shows how caches are shared between CPUs"
 msgstr "显示 CPU 间是如何共享缓存的"
 
-#: sys-utils/lscpu.c:203
+#: sys-utils/lscpu.c:208
 msgid "CPU dispatching mode on virtual hardware"
 msgstr "虚拟硬件上的 CPU 调度模式"
 
-#: sys-utils/lscpu.c:204
+#: sys-utils/lscpu.c:209
 msgid "physical address of a CPU"
 msgstr "CPU 的物理地址"
 
-#: sys-utils/lscpu.c:205
+#: sys-utils/lscpu.c:210
 msgid "shows if the hypervisor has allocated the CPU"
 msgstr "显示超级监督(hypervisor)是否分配了 CPU"
 
-#: sys-utils/lscpu.c:206
+#: sys-utils/lscpu.c:211
 msgid "shows if Linux currently makes use of the CPU"
 msgstr "显示 Linux 当前是否在使用该 CPU"
 
-#: sys-utils/lscpu.c:207
+#: sys-utils/lscpu.c:212
 msgid "shows the maximum MHz of the CPU"
 msgstr "显示 CPU 的最大 MHz"
 
-#: sys-utils/lscpu.c:208
+#: sys-utils/lscpu.c:213
 msgid "shows the minimum MHz of the CPU"
 msgstr "显示 CPU 的最小 MHz"
 
-#: sys-utils/lscpu.c:513
+#: sys-utils/lscpu.c:523
 msgid "error: uname failed"
 msgstr "错误：uname 失败"
 
-#: sys-utils/lscpu.c:605
+#: sys-utils/lscpu.c:617
 #, c-format
 msgid "failed to determine number of CPUs: %s"
 msgstr "确定 CPU 数 失败：%s"
 
-#: sys-utils/lscpu.c:873
+#: sys-utils/lscpu.c:885
 msgid "cannot restore signal handler"
 msgstr ""
 
-#: sys-utils/lscpu.c:1433
+#: sys-utils/lscpu.c:1459
 msgid "Failed to extract the node number"
 msgstr "提取节点号失败"
 
-#: sys-utils/lscpu.c:1560 sys-utils/lscpu.c:1570
+#: sys-utils/lscpu.c:1590 sys-utils/lscpu.c:1600
 msgid "Y"
 msgstr "Y"
 
-#: sys-utils/lscpu.c:1560 sys-utils/lscpu.c:1570
+#: sys-utils/lscpu.c:1590 sys-utils/lscpu.c:1600
 msgid "N"
 msgstr "N"
 
-#: sys-utils/lscpu.c:1741
+#: sys-utils/lscpu.c:1792
 #, c-format
 msgid ""
 "# The following is the parsable format, which can be fed to other\n"
@@ -14462,204 +14465,204 @@
 "# 以下是可解析格式，可以输给其他程序。每列中的各个不同项有一个惟一\n"
 "# 的从 0 开始的 ID。\n"
 
-#: sys-utils/lscpu.c:1969
+#: sys-utils/lscpu.c:2021
 msgid "Architecture:"
 msgstr "架构："
 
-#: sys-utils/lscpu.c:1982
+#: sys-utils/lscpu.c:2034
 msgid "CPU op-mode(s):"
 msgstr "CPU 运行模式："
 
-#: sys-utils/lscpu.c:1985 sys-utils/lscpu.c:1987
+#: sys-utils/lscpu.c:2037 sys-utils/lscpu.c:2039
 msgid "Byte Order:"
 msgstr "字节序："
 
-#: sys-utils/lscpu.c:1993
+#: sys-utils/lscpu.c:2045
 msgid "CPU(s):"
 msgstr "CPU:"
 
-#: sys-utils/lscpu.c:1996
+#: sys-utils/lscpu.c:2048
 msgid "On-line CPU(s) mask:"
 msgstr "在线 CPU 掩码："
 
-#: sys-utils/lscpu.c:1997
+#: sys-utils/lscpu.c:2049
 msgid "On-line CPU(s) list:"
 msgstr "在线 CPU 列表："
 
-#: sys-utils/lscpu.c:2016
+#: sys-utils/lscpu.c:2068
 msgid "Off-line CPU(s) mask:"
 msgstr "离线 CPU 掩码："
 
-#: sys-utils/lscpu.c:2017
+#: sys-utils/lscpu.c:2069
 msgid "Off-line CPU(s) list:"
 msgstr "离线 CPU 列表："
 
-#: sys-utils/lscpu.c:2052
+#: sys-utils/lscpu.c:2104
 msgid "Thread(s) per core:"
 msgstr "每个核的线程数："
 
-#: sys-utils/lscpu.c:2054
+#: sys-utils/lscpu.c:2106
 msgid "Core(s) per socket:"
 msgstr "每个座的核数："
 
-#: sys-utils/lscpu.c:2057
+#: sys-utils/lscpu.c:2109
 msgid "Socket(s) per book:"
 msgstr "每个 book 的座数："
 
-#: sys-utils/lscpu.c:2060
+#: sys-utils/lscpu.c:2112
 msgid "Book(s) per drawer:"
 msgstr "每个抽屉里的 Book 数︰"
 
-#: sys-utils/lscpu.c:2062
+#: sys-utils/lscpu.c:2114
 msgid "Drawer(s):"
 msgstr "抽屉："
 
-#: sys-utils/lscpu.c:2064
+#: sys-utils/lscpu.c:2116
 msgid "Book(s):"
 msgstr "Book："
 
-#: sys-utils/lscpu.c:2067
+#: sys-utils/lscpu.c:2119
 msgid "Socket(s):"
 msgstr "座："
 
-#: sys-utils/lscpu.c:2071
+#: sys-utils/lscpu.c:2123
 msgid "NUMA node(s):"
 msgstr "NUMA 节点："
 
-#: sys-utils/lscpu.c:2073
+#: sys-utils/lscpu.c:2125
 msgid "Vendor ID:"
 msgstr "厂商 ID："
 
-#: sys-utils/lscpu.c:2075
+#: sys-utils/lscpu.c:2127
 msgid "Machine type:"
 msgstr "机器类型︰"
 
-#: sys-utils/lscpu.c:2077
+#: sys-utils/lscpu.c:2129
 msgid "CPU family:"
 msgstr "CPU 系列："
 
-#: sys-utils/lscpu.c:2079
+#: sys-utils/lscpu.c:2131
 msgid "Model:"
 msgstr "型号："
 
-#: sys-utils/lscpu.c:2081
+#: sys-utils/lscpu.c:2133
 msgid "Model name:"
 msgstr "型号名称："
 
-#: sys-utils/lscpu.c:2083
+#: sys-utils/lscpu.c:2135
 msgid "Stepping:"
 msgstr "步进："
 
-#: sys-utils/lscpu.c:2088
+#: sys-utils/lscpu.c:2140
 msgid "CPU MHz:"
 msgstr "CPU MHz："
 
-#: sys-utils/lscpu.c:2090
+#: sys-utils/lscpu.c:2142
 msgid "CPU dynamic MHz:"
 msgstr "CPU 动态 MHz:"
 
-#: sys-utils/lscpu.c:2092
+#: sys-utils/lscpu.c:2144
 msgid "CPU static MHz:"
 msgstr "CPU 静态 MHz:"
 
-#: sys-utils/lscpu.c:2094
+#: sys-utils/lscpu.c:2146
 msgid "CPU max MHz:"
 msgstr "CPU 最大 MHz："
 
-#: sys-utils/lscpu.c:2096
+#: sys-utils/lscpu.c:2148
 msgid "CPU min MHz:"
 msgstr "CPU 最小 MHz："
 
-#: sys-utils/lscpu.c:2098
+#: sys-utils/lscpu.c:2150
 msgid "BogoMIPS:"
 msgstr "BogoMIPS："
 
-#: sys-utils/lscpu.c:2101 sys-utils/lscpu.c:2103
+#: sys-utils/lscpu.c:2153 sys-utils/lscpu.c:2155
 msgid "Virtualization:"
 msgstr "虚拟化："
 
-#: sys-utils/lscpu.c:2106
+#: sys-utils/lscpu.c:2158
 msgid "Hypervisor:"
 msgstr "超管理器："
 
-#: sys-utils/lscpu.c:2108
+#: sys-utils/lscpu.c:2160
 msgid "Hypervisor vendor:"
 msgstr "超管理器厂商："
 
-#: sys-utils/lscpu.c:2109
+#: sys-utils/lscpu.c:2161
 msgid "Virtualization type:"
 msgstr "虚拟化类型："
 
-#: sys-utils/lscpu.c:2112
+#: sys-utils/lscpu.c:2164
 msgid "Dispatching mode:"
 msgstr "分派模式："
 
-#: sys-utils/lscpu.c:2129 sys-utils/lscpu.c:2147
+#: sys-utils/lscpu.c:2181 sys-utils/lscpu.c:2199
 #, c-format
 msgid "%s cache:"
 msgstr "%s 缓存："
 
-#: sys-utils/lscpu.c:2154
+#: sys-utils/lscpu.c:2206
 #, c-format
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA 节点%d CPU："
 
-#: sys-utils/lscpu.c:2159
+#: sys-utils/lscpu.c:2211
 msgid "Physical sockets:"
 msgstr "物理套接字︰"
 
-#: sys-utils/lscpu.c:2160
+#: sys-utils/lscpu.c:2212
 msgid "Physical chips:"
 msgstr "物理芯片︰"
 
-#: sys-utils/lscpu.c:2161
+#: sys-utils/lscpu.c:2213
 msgid "Physical cores/chip:"
 msgstr "物理核心/芯片︰"
 
-#: sys-utils/lscpu.c:2172
+#: sys-utils/lscpu.c:2224
 msgid "Flags:"
 msgstr "标记："
 
-#: sys-utils/lscpu.c:2187
+#: sys-utils/lscpu.c:2239
 msgid "Display information about the CPU architecture.\n"
 msgstr "显示 CPU 架构信息。\n"
 
-#: sys-utils/lscpu.c:2190
+#: sys-utils/lscpu.c:2242
 msgid ""
 " -a, --all               print both online and offline CPUs (default for -"
 "e)\n"
 msgstr " -a, --all               同时打印在线和离线 CPU (-e 选项默认值)\n"
 
-#: sys-utils/lscpu.c:2191
+#: sys-utils/lscpu.c:2243
 msgid " -b, --online            print online CPUs only (default for -p)\n"
 msgstr " -b, --online            只打印在线 CPU (-p 选项默认值)\n"
 
-#: sys-utils/lscpu.c:2194
+#: sys-utils/lscpu.c:2246
 msgid " -c, --offline           print offline CPUs only\n"
 msgstr " -c, --offline           只打印离线 CPU\n"
 
-#: sys-utils/lscpu.c:2195
+#: sys-utils/lscpu.c:2247
 msgid " -J, --json              use JSON for default or extended format\n"
 msgstr ""
 
-#: sys-utils/lscpu.c:2196
+#: sys-utils/lscpu.c:2248
 msgid " -e, --extended[=<list>] print out an extended readable format\n"
 msgstr " -e, --extended[=<列表>] 打印扩展的可读格式\n"
 
-#: sys-utils/lscpu.c:2197
+#: sys-utils/lscpu.c:2249
 msgid " -p, --parse[=<list>]    print out a parsable format\n"
 msgstr " -p, --parse[=<列表>]    打印可解析格式\n"
 
-#: sys-utils/lscpu.c:2198
+#: sys-utils/lscpu.c:2250
 msgid " -s, --sysroot <dir>     use specified directory as system root\n"
 msgstr " -s, --sysroot <目录>    以指定目录作为系统根目录\n"
 
-#: sys-utils/lscpu.c:2199
+#: sys-utils/lscpu.c:2251
 msgid ""
 " -x, --hex               print hexadecimal masks rather than lists of CPUs\n"
 msgstr " -x, --hex               打印十六进制掩码而非 CPU 列表\n"
 
-#: sys-utils/lscpu.c:2200
+#: sys-utils/lscpu.c:2252
 msgid " -y, --physical          print physical instead of logical IDs\n"
 msgstr " -y, --physical          打印物理 ID 而非逻辑 ID\n"
 
@@ -14668,7 +14671,7 @@
 msgid "invalid argument to %s"
 msgstr ""
 
-#: sys-utils/lscpu.c:2342
+#: sys-utils/lscpu.c:2394
 #, c-format
 msgid ""
 "%s: options --all, --online and --offline may only be used with options --"
@@ -15248,46 +15251,46 @@
 msgid "only root can do that"
 msgstr "只有 root 能执行该操作"
 
-#: sys-utils/mount.c:84 sys-utils/umount.c:64
+#: sys-utils/mount.c:78 sys-utils/umount.c:64
 #, c-format
 msgid "%s from %s (libmount %s"
 msgstr "%s，来自 %s(libmount %s"
 
-#: sys-utils/mount.c:129
+#: sys-utils/mount.c:123
 msgid "failed to read mtab"
 msgstr "读取 mtab 失败"
 
-#: sys-utils/mount.c:191 sys-utils/mount.c:258 sys-utils/umount.c:197
+#: sys-utils/mount.c:185 sys-utils/mount.c:252 sys-utils/umount.c:197
 #, c-format
 msgid "%-25s: ignored\n"
 msgstr "%-25s：已忽略\n"
 
-#: sys-utils/mount.c:192
+#: sys-utils/mount.c:186
 #, c-format
 msgid "%-25s: already mounted\n"
 msgstr "%-25s：已经挂载\n"
 
-#: sys-utils/mount.c:299
+#: sys-utils/mount.c:293
 #, c-format
 msgid "%s: %s moved to %s.\n"
 msgstr "%s：%s 已移到 %s。\n"
 
-#: sys-utils/mount.c:301
+#: sys-utils/mount.c:295
 #, c-format
 msgid "%s: %s bound on %s.\n"
 msgstr "%s：%s 已绑定到 %s 。\n"
 
-#: sys-utils/mount.c:304 sys-utils/mount.c:308
+#: sys-utils/mount.c:298 sys-utils/mount.c:302
 #, c-format
 msgid "%s: %s mounted on %s.\n"
 msgstr "%s：%s 已挂臷到 %s。\n"
 
-#: sys-utils/mount.c:306
+#: sys-utils/mount.c:300
 #, c-format
 msgid "%s: %s propagation flags changed.\n"
 msgstr "%s：%s 传播标志已更改。\n"
 
-#: sys-utils/mount.c:326
+#: sys-utils/mount.c:320
 #, c-format
 msgid ""
 "mount: %s does not contain SELinux labels.\n"
@@ -15306,22 +15309,22 @@
 msgid "%s: %s."
 msgstr ""
 
-#: sys-utils/mount.c:384
+#: sys-utils/mount.c:378
 #, c-format
 msgid "%s: failed to parse"
 msgstr "%s：解析失败"
 
-#: sys-utils/mount.c:423
+#: sys-utils/mount.c:418
 #, c-format
 msgid "unsupported option format: %s"
 msgstr "不支持的参数格式：%s"
 
-#: sys-utils/mount.c:425
+#: sys-utils/mount.c:420
 #, c-format
 msgid "failed to append option '%s'"
 msgstr "追加选项“%s”失败"
 
-#: sys-utils/mount.c:443
+#: sys-utils/mount.c:438
 #, c-format
 msgid ""
 " %1$s [-lhV]\n"
@@ -15336,11 +15339,11 @@
 " %1$s [选项] <源> <目录>\n"
 " %1$s <操作> <挂载点> [<目标>]\n"
 
-#: sys-utils/mount.c:451
+#: sys-utils/mount.c:446
 msgid "Mount a filesystem.\n"
 msgstr "挂载文件系统。\n"
 
-#: sys-utils/mount.c:455
+#: sys-utils/mount.c:450
 #, c-format
 msgid ""
 " -a, --all               mount all filesystems mentioned in fstab\n"
@@ -15355,22 +15358,22 @@
 " -F, --fork              对每个设备禁用 fork(和 -a 选项一起使用)\n"
 " -T, --fstab <路径>      /etc/fstab 的替代文件\n"
 
-#: sys-utils/mount.c:461
+#: sys-utils/mount.c:456
 #, c-format
 msgid " -i, --internal-only     don't call the mount.<type> helpers\n"
 msgstr " -i, --internal-only     不调用 mount.<type> 辅助程序\n"
 
-#: sys-utils/mount.c:463
+#: sys-utils/mount.c:458
 #, c-format
 msgid " -l, --show-labels       show also filesystem labels\n"
 msgstr " -l, --show-labels       也显示文件系统标签\n"
 
-#: sys-utils/mount.c:465 sys-utils/umount.c:98
+#: sys-utils/mount.c:460 sys-utils/umount.c:98
 #, c-format
 msgid " -n, --no-mtab           don't write to /etc/mtab\n"
 msgstr " -n, --no-mtab           不写 /etc/mtab\n"
 
-#: sys-utils/mount.c:474
+#: sys-utils/mount.c:469
 #, c-format
 msgid ""
 " -o, --options <list>    comma-separated list of mount options\n"
@@ -15383,7 +15386,7 @@
 " -r, --read-only         以只读方式挂载文件系统(同 -o ro)\n"
 " -t, --types <列表>      限制文件系统类型集合\n"
 
-#: sys-utils/mount.c:479
+#: sys-utils/mount.c:474
 #, c-format
 msgid ""
 "     --source <src>      explicitly specifies source (path, label, uuid)\n"
@@ -15392,17 +15395,17 @@
 "     --source <源>       指明源(路径、标签、uuid)\n"
 "     --target <目标>     指明挂载点\n"
 
-#: sys-utils/mount.c:482 sys-utils/umount.c:104
+#: sys-utils/mount.c:480 sys-utils/umount.c:104
 #, c-format
 msgid " -v, --verbose           say what is being done\n"
 msgstr " -v, --verbose           打印当前进行的操作\n"
 
-#: sys-utils/mount.c:484
+#: sys-utils/mount.c:482
 #, c-format
 msgid " -w, --rw, --read-write  mount the filesystem read-write (default)\n"
 msgstr " -w, --rw, --read-write  以读写方式挂载文件系统(默认)\n"
 
-#: sys-utils/mount.c:492
+#: sys-utils/mount.c:490
 #, c-format
 msgid ""
 "\n"
@@ -15423,7 +15426,7 @@
 " PARTLABEL=<标签>        按分区标签指定设备\n"
 " PARTUUID=<uuid>         按分区 UUID 指定设备\n"
 
-#: sys-utils/mount.c:501
+#: sys-utils/mount.c:499
 #, c-format
 msgid ""
 " <device>                specifies device by path\n"
@@ -15434,7 +15437,7 @@
 " <目录>                  绑定式挂载的挂载点(参阅 --bind/rbind)\n"
 " <文件>                  用于设置回环设备的常规文件\n"
 
-#: sys-utils/mount.c:506
+#: sys-utils/mount.c:504
 #, c-format
 msgid ""
 "\n"
@@ -15449,7 +15452,7 @@
 " -M, --move              将子树移动到其他位置\n"
 " -R, --rbind             挂载其他位置的子树及其包含的所有子挂载(submount)\n"
 
-#: sys-utils/mount.c:511
+#: sys-utils/mount.c:509
 #, c-format
 msgid ""
 " --make-shared           mark a subtree as shared\n"
@@ -15462,7 +15465,7 @@
 " --make-private          将子树标记为 私有\n"
 " --make-unbindable       将子树标记为 不可绑定\n"
 
-#: sys-utils/mount.c:516
+#: sys-utils/mount.c:514
 #, c-format
 msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
@@ -15475,19 +15478,19 @@
 " --make-rprivate         递归地将整个子树标记为 私有\n"
 " --make-runbindable      递归地将整个子树标记为 不可绑定\n"
 
-#: sys-utils/mount.c:665 sys-utils/umount.c:487
+#: sys-utils/mount.c:665 sys-utils/umount.c:498
 msgid "libmount context allocation failed"
 msgstr "libmount 环境(context)分配失败"
 
-#: sys-utils/mount.c:716 sys-utils/umount.c:540
+#: sys-utils/mount.c:716 sys-utils/umount.c:551
 msgid "failed to set options pattern"
 msgstr "设置选项模式失败"
 
-#: sys-utils/mount.c:926
+#: sys-utils/mount.c:929
 msgid "source specified more than once"
 msgstr "源指定了多次"
 
-#: sys-utils/mountpoint.c:118
+#: sys-utils/mountpoint.c:119
 #, c-format
 msgid ""
 " %1$s [-qd] /path/to/directory\n"
@@ -15496,7 +15499,7 @@
 " %1$s [-qd] /目录/的/路径\n"
 " %1$s -x /dev/设备\n"
 
-#: sys-utils/mountpoint.c:122
+#: sys-utils/mountpoint.c:123
 msgid "Check whether a directory or file is a mountpoint.\n"
 msgstr "检查目录或文件是否为挂载点。\n"
 
@@ -15510,17 +15513,17 @@
 " -d, --fs-devno     打印文件系统的 主：次 设备号\n"
 " -x, --devno        打印块设备的主：次设备号\n"
 
-#: sys-utils/mountpoint.c:194
+#: sys-utils/mountpoint.c:207
 #, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s 不是一个挂载点\n"
 
-#: sys-utils/mountpoint.c:200
+#: sys-utils/mountpoint.c:213
 #, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s 是一个挂载点\n"
 
-#: sys-utils/nsenter.c:73 sys-utils/setarch.c:99 sys-utils/unshare.c:250
+#: sys-utils/nsenter.c:73 sys-utils/setarch.c:99 sys-utils/unshare.c:256
 #, c-format
 msgid " %s [options] [<program> [<argument>...]]\n"
 msgstr " %s [选项] [<程序> [<参数>...]]\n"
@@ -15599,11 +15602,11 @@
 msgid "neither filename nor target pid supplied for %s"
 msgstr "没有为 %s 提供文件名或目标 pid"
 
-#: sys-utils/nsenter.c:304 sys-utils/unshare.c:405
+#: sys-utils/nsenter.c:304 sys-utils/unshare.c:433
 msgid "failed to parse uid"
 msgstr "解析 uid 失败"
 
-#: sys-utils/nsenter.c:308 sys-utils/unshare.c:409
+#: sys-utils/nsenter.c:308 sys-utils/unshare.c:437
 msgid "failed to parse gid"
 msgstr "解析 gid 失败"
 
@@ -15646,8 +15649,8 @@
 msgid "change directory by working directory file descriptor failed"
 msgstr "按工作目录文件描述符更改目录失败"
 
-#: sys-utils/nsenter.c:471 sys-utils/setpriv.c:1062 sys-utils/setpriv.c:1069
-#: sys-utils/unshare.c:520
+#: sys-utils/nsenter.c:471 sys-utils/setpriv.c:1031 sys-utils/setpriv.c:1038
+#: sys-utils/unshare.c:560
 msgid "setgroups failed"
 msgstr "setgroups 失败"
 
@@ -16446,32 +16449,32 @@
 msgid "Execute command `%s'.\n"
 msgstr "执行命令“%s”。\n"
 
-#: sys-utils/setpriv.c:125
+#: sys-utils/setpriv.c:119
 #, c-format
 msgid " %s [options] <program> [<argument>...]\n"
 msgstr " %s [选项] <程序> [<参数>...]\n"
 
-#: sys-utils/setpriv.c:129
+#: sys-utils/setpriv.c:123
 msgid "Run a program with different privilege settings.\n"
 msgstr "以不同的权限设置运行程序。\n"
 
-#: sys-utils/setpriv.c:132
+#: sys-utils/setpriv.c:126
 msgid " -d, --dump                  show current state (and do not exec)\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:133
+#: sys-utils/setpriv.c:127
 msgid " --nnp, --no-new-privs       disallow granting new privileges\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:134
+#: sys-utils/setpriv.c:128
 msgid " --ambient-caps <caps,...>   set ambient capabilities\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:135
+#: sys-utils/setpriv.c:129
 msgid " --inh-caps <caps,...>       set inheritable capabilities\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:136
+#: sys-utils/setpriv.c:130
 msgid " --bounding-set <caps>       set capability bounding set\n"
 msgstr ""
 
@@ -16499,15 +16502,15 @@
 msgid " --regid <gid>               set real and effective gid\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:143
+#: sys-utils/setpriv.c:137
 msgid " --clear-groups              clear supplementary groups\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:144
+#: sys-utils/setpriv.c:138
 msgid " --keep-groups               keep supplementary groups\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:145
+#: sys-utils/setpriv.c:139
 msgid " --init-groups               initialize supplementary groups\n"
 msgstr ""
 
@@ -16515,337 +16518,337 @@
 msgid " --groups <group,...>        set supplementary groups\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:147
+#: sys-utils/setpriv.c:141
 msgid " --securebits <bits>         set securebits\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:150
+#: sys-utils/setpriv.c:144
 msgid " --selinux-label <label>     set SELinux label\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:151
+#: sys-utils/setpriv.c:145
 msgid " --apparmor-profile <pr>     set AppArmor profile\n"
 msgstr ""
 
-#: sys-utils/setpriv.c:158
+#: sys-utils/setpriv.c:152
 msgid " This tool can be dangerous.  Read the manpage, and be careful.\n"
 msgstr " 运行此工具有风险。请阅读 man 手册，谨慎操作。\n"
 
-#: sys-utils/setpriv.c:201
+#: sys-utils/setpriv.c:170
 msgid "invalid capability type"
 msgstr ""
 
-#: sys-utils/setpriv.c:253 sys-utils/setpriv.c:597
+#: sys-utils/setpriv.c:222 sys-utils/setpriv.c:566
 msgid "getting process secure bits failed"
 msgstr "获取进程安全位失败"
 
-#: sys-utils/setpriv.c:257
+#: sys-utils/setpriv.c:226
 #, c-format
 msgid "Securebits: "
 msgstr "安全位： "
 
-#: sys-utils/setpriv.c:277
+#: sys-utils/setpriv.c:246
 #, c-format
 msgid "[none]\n"
 msgstr "[无]\n"
 
-#: sys-utils/setpriv.c:303
+#: sys-utils/setpriv.c:272
 #, c-format
 msgid "%s: too long"
 msgstr "%s：过长"
 
-#: sys-utils/setpriv.c:331
+#: sys-utils/setpriv.c:300
 #, c-format
 msgid "Supplementary groups: "
 msgstr "附属组： "
 
-#: sys-utils/setpriv.c:333 sys-utils/setpriv.c:399 sys-utils/setpriv.c:404
-#: sys-utils/setpriv.c:410 sys-utils/setpriv.c:416 sys-utils/setpriv.c:423
+#: sys-utils/setpriv.c:302 sys-utils/setpriv.c:368 sys-utils/setpriv.c:373
+#: sys-utils/setpriv.c:379 sys-utils/setpriv.c:385 sys-utils/setpriv.c:392
 #, c-format
 msgid "[none]"
 msgstr "[无]"
 
-#: sys-utils/setpriv.c:371
+#: sys-utils/setpriv.c:340
 #, c-format
 msgid "uid: %u\n"
 msgstr "uid：%u\n"
 
-#: sys-utils/setpriv.c:372
+#: sys-utils/setpriv.c:341
 #, c-format
 msgid "euid: %u\n"
 msgstr "euid：%u\n"
 
-#: sys-utils/setpriv.c:375
+#: sys-utils/setpriv.c:344
 #, c-format
 msgid "suid: %u\n"
 msgstr "suid：%u\n"
 
-#: sys-utils/setpriv.c:377 sys-utils/setpriv.c:490
+#: sys-utils/setpriv.c:346 sys-utils/setpriv.c:459
 msgid "getresuid failed"
 msgstr "getresuid 失败"
 
-#: sys-utils/setpriv.c:386 sys-utils/setpriv.c:505
+#: sys-utils/setpriv.c:355 sys-utils/setpriv.c:474
 msgid "getresgid failed"
 msgstr "getresgid 失败"
 
-#: sys-utils/setpriv.c:397
+#: sys-utils/setpriv.c:366
 #, c-format
 msgid "Effective capabilities: "
 msgstr "有效权能： "
 
-#: sys-utils/setpriv.c:402
+#: sys-utils/setpriv.c:371
 #, c-format
 msgid "Permitted capabilities: "
 msgstr "允许的权能： "
 
-#: sys-utils/setpriv.c:408
+#: sys-utils/setpriv.c:377
 #, c-format
 msgid "Inheritable capabilities: "
 msgstr "可继承的权能： "
 
-#: sys-utils/setpriv.c:413
+#: sys-utils/setpriv.c:382
 #, c-format
 msgid "Ambient capabilities: "
 msgstr ""
 
-#: sys-utils/setpriv.c:418
+#: sys-utils/setpriv.c:387
 #, c-format
 msgid "[unsupported]"
 msgstr ""
 
-#: sys-utils/setpriv.c:421
+#: sys-utils/setpriv.c:390
 #, c-format
 msgid "Capability bounding set: "
 msgstr "权能绑定集： "
 
-#: sys-utils/setpriv.c:430
+#: sys-utils/setpriv.c:399
 msgid "SELinux label"
 msgstr "SELinux 标签"
 
-#: sys-utils/setpriv.c:433
+#: sys-utils/setpriv.c:402
 msgid "AppArmor profile"
 msgstr "AppArmor 配置文件"
 
-#: sys-utils/setpriv.c:446
+#: sys-utils/setpriv.c:415
 #, c-format
 msgid "cap %d: libcap-ng is broken"
 msgstr "权能 %d：libcap-ng 损坏"
 
-#: sys-utils/setpriv.c:468
+#: sys-utils/setpriv.c:437
 msgid "Invalid supplementary group id"
 msgstr "无效的附属组 id"
 
-#: sys-utils/setpriv.c:498
+#: sys-utils/setpriv.c:467
 msgid "setresuid failed"
 msgstr "setresuid 失败"
 
-#: sys-utils/setpriv.c:513
+#: sys-utils/setpriv.c:482
 msgid "setresgid failed"
 msgstr "setresgid 失败"
 
-#: sys-utils/setpriv.c:545
+#: sys-utils/setpriv.c:514
 msgid "unsupported capability type"
 msgstr ""
 
-#: sys-utils/setpriv.c:562
+#: sys-utils/setpriv.c:531
 msgid "bad capability string"
 msgstr "错误的权能字符串"
 
-#: sys-utils/setpriv.c:570
+#: sys-utils/setpriv.c:539
 msgid "libcap-ng is too old for \"all\" caps"
 msgstr "对于“all”权能，libcap-ng 太旧"
 
-#: sys-utils/setpriv.c:582
+#: sys-utils/setpriv.c:551
 #, c-format
 msgid "unknown capability \"%s\""
 msgstr "未知权能“%s”"
 
-#: sys-utils/setpriv.c:606
+#: sys-utils/setpriv.c:575
 msgid "unrecognized securebit set -- refusing to adjust"
 msgstr "无法识别的安全位集 -- 拒绝调整"
 
-#: sys-utils/setpriv.c:610
+#: sys-utils/setpriv.c:579
 msgid "bad securebits string"
 msgstr "安全位字符串有误"
 
-#: sys-utils/setpriv.c:617
+#: sys-utils/setpriv.c:586
 msgid "+all securebits is not allowed"
 msgstr "+all 安全位是不允许的"
 
-#: sys-utils/setpriv.c:630
+#: sys-utils/setpriv.c:599
 msgid "adjusting keep_caps does not make sense"
 msgstr "调整 keep_caps(保持权能) 没有意义"
 
-#: sys-utils/setpriv.c:634
+#: sys-utils/setpriv.c:603
 msgid "unrecognized securebit"
 msgstr "无法识别的安全位"
 
-#: sys-utils/setpriv.c:654
+#: sys-utils/setpriv.c:623
 msgid "SELinux is not running"
 msgstr "SELinux 没有运行"
 
-#: sys-utils/setpriv.c:669
+#: sys-utils/setpriv.c:638
 #, c-format
 msgid "close failed: %s"
 msgstr "关闭失败：%s"
 
-#: sys-utils/setpriv.c:677
+#: sys-utils/setpriv.c:646
 msgid "AppArmor is not running"
 msgstr "AppArmor 没有运行"
 
-#: sys-utils/setpriv.c:856
+#: sys-utils/setpriv.c:825
 msgid "duplicate --no-new-privs option"
 msgstr "复制 --no-new-privs 选项"
 
-#: sys-utils/setpriv.c:861
+#: sys-utils/setpriv.c:830
 msgid "duplicate ruid"
 msgstr "复制 ruid"
 
-#: sys-utils/setpriv.c:863
+#: sys-utils/setpriv.c:832
 msgid "failed to parse ruid"
 msgstr "解析 ruid 失败"
 
-#: sys-utils/setpriv.c:871
+#: sys-utils/setpriv.c:840
 msgid "duplicate euid"
 msgstr "复制 euid"
 
-#: sys-utils/setpriv.c:873
+#: sys-utils/setpriv.c:842
 msgid "failed to parse euid"
 msgstr "解析 euid 失败"
 
-#: sys-utils/setpriv.c:877
+#: sys-utils/setpriv.c:846
 msgid "duplicate ruid or euid"
 msgstr "复制 ruid 或 euid"
 
-#: sys-utils/setpriv.c:879
+#: sys-utils/setpriv.c:848
 msgid "failed to parse reuid"
 msgstr "解析 reuid 失败"
 
-#: sys-utils/setpriv.c:888
+#: sys-utils/setpriv.c:857
 msgid "duplicate rgid"
 msgstr "复制 rgid"
 
-#: sys-utils/setpriv.c:890
+#: sys-utils/setpriv.c:859
 msgid "failed to parse rgid"
 msgstr "解析 rgid 失败"
 
-#: sys-utils/setpriv.c:894
+#: sys-utils/setpriv.c:863
 msgid "duplicate egid"
 msgstr "复制 egid"
 
-#: sys-utils/setpriv.c:896
+#: sys-utils/setpriv.c:865
 msgid "failed to parse egid"
 msgstr "解析 egid 失败"
 
-#: sys-utils/setpriv.c:900
+#: sys-utils/setpriv.c:869
 msgid "duplicate rgid or egid"
 msgstr "复制 rgid 或 egid"
 
-#: sys-utils/setpriv.c:902
+#: sys-utils/setpriv.c:871
 msgid "failed to parse regid"
 msgstr "解析 regid 失败"
 
-#: sys-utils/setpriv.c:907
+#: sys-utils/setpriv.c:876
 msgid "duplicate --clear-groups option"
 msgstr "复制  --clear-groups 选项"
 
-#: sys-utils/setpriv.c:913
+#: sys-utils/setpriv.c:882
 msgid "duplicate --keep-groups option"
 msgstr "复制 --keep-groups 选项"
 
-#: sys-utils/setpriv.c:919
+#: sys-utils/setpriv.c:888
 msgid "duplicate --init-groups option"
 msgstr ""
 
-#: sys-utils/setpriv.c:925
+#: sys-utils/setpriv.c:894
 msgid "duplicate --groups option"
 msgstr "复制 --groups 选项"
 
-#: sys-utils/setpriv.c:940
+#: sys-utils/setpriv.c:909
 msgid "duplicate --inh-caps option"
 msgstr "复制 --inh-caps 选项"
 
-#: sys-utils/setpriv.c:946
+#: sys-utils/setpriv.c:915
 msgid "duplicate --ambient-caps option"
 msgstr ""
 
-#: sys-utils/setpriv.c:952
+#: sys-utils/setpriv.c:921
 msgid "duplicate --bounding-set option"
 msgstr "复制 --bounding-set 选项"
 
-#: sys-utils/setpriv.c:958
+#: sys-utils/setpriv.c:927
 msgid "duplicate --securebits option"
 msgstr "复制 --securebits 选项"
 
-#: sys-utils/setpriv.c:964
+#: sys-utils/setpriv.c:933
 msgid "duplicate --selinux-label option"
 msgstr "复制 --selinux-label 选项"
 
-#: sys-utils/setpriv.c:970
+#: sys-utils/setpriv.c:939
 msgid "duplicate --apparmor-profile option"
 msgstr "复制 --apparmor-profile 选项"
 
-#: sys-utils/setpriv.c:989
+#: sys-utils/setpriv.c:958
 msgid "--dump is incompatible with all other options"
 msgstr "--dump 与其他所有选项不兼容"
 
-#: sys-utils/setpriv.c:997
+#: sys-utils/setpriv.c:966
 msgid "--list-caps must be specified alone"
 msgstr "--list-caps 必须作为单独选项指定"
 
-#: sys-utils/setpriv.c:1003
+#: sys-utils/setpriv.c:972
 msgid "No program specified"
 msgstr "未指定程序"
 
-#: sys-utils/setpriv.c:1009
+#: sys-utils/setpriv.c:978
 msgid ""
 "--[re]gid requires --keep-groups, --clear-groups, --init-groups, or --groups"
 msgstr ""
 
-#: sys-utils/setpriv.c:1013
+#: sys-utils/setpriv.c:982
 msgid "--init-groups requires --ruid or --reuid"
 msgstr ""
 
-#: sys-utils/setpriv.c:1017
+#: sys-utils/setpriv.c:986
 #, c-format
 msgid ""
 "uid %ld not found, --init-groups requires an user that can be found on the "
 "system"
 msgstr ""
 
-#: sys-utils/setpriv.c:1032
+#: sys-utils/setpriv.c:1001
 msgid "disallow granting new privileges failed"
 msgstr "禁止赋予新权限失败"
 
-#: sys-utils/setpriv.c:1040
+#: sys-utils/setpriv.c:1009
 msgid "keep process capabilities failed"
 msgstr "保持进程权能失败"
 
-#: sys-utils/setpriv.c:1048
+#: sys-utils/setpriv.c:1017
 msgid "activate capabilities"
 msgstr "激活权能"
 
-#: sys-utils/setpriv.c:1054
+#: sys-utils/setpriv.c:1023
 msgid "reactivate capabilities"
 msgstr "重新激活权能"
 
-#: sys-utils/setpriv.c:1065
+#: sys-utils/setpriv.c:1034
 msgid "initgroups failed"
 msgstr ""
 
-#: sys-utils/setpriv.c:1073
+#: sys-utils/setpriv.c:1042
 msgid "set process securebits failed"
 msgstr "设置进程安全位失败"
 
-#: sys-utils/setpriv.c:1079
+#: sys-utils/setpriv.c:1048
 msgid "apply bounding set"
 msgstr "应用绑定集"
 
-#: sys-utils/setpriv.c:1085
+#: sys-utils/setpriv.c:1054
 msgid "apply capabilities"
 msgstr "应用权能"
 
-#: sys-utils/setpriv.c:842
+#: sys-utils/setpriv.c:994
 #, c-format
 msgid "cannot execute: %s"
 msgstr "无法执行：%s"
@@ -17422,115 +17425,115 @@
 msgid "failed to set umount target"
 msgstr "设置卸载目标失败"
 
-#: sys-utils/umount.c:242
+#: sys-utils/umount.c:253
 msgid "libmount table allocation failed"
 msgstr "libmount 表分配失败"
 
-#: sys-utils/umount.c:288 sys-utils/umount.c:370
+#: sys-utils/umount.c:299 sys-utils/umount.c:381
 msgid "libmount iterator allocation failed"
 msgstr "分配 libmount 迭代器失败！"
 
-#: sys-utils/umount.c:294
+#: sys-utils/umount.c:305
 #, c-format
 msgid "failed to get child fs of %s"
 msgstr "获取 %s 的子文件系统失败"
 
-#: sys-utils/umount.c:333 sys-utils/umount.c:357
+#: sys-utils/umount.c:344 sys-utils/umount.c:368
 #, c-format
 msgid "%s: not found"
 msgstr "%s：找不到"
 
-#: sys-utils/umount.c:364
+#: sys-utils/umount.c:375
 #, c-format
 msgid ""
 "%s: failed to determine source (--all-targets is unsupported on systems with "
 "regular mtab file)."
 msgstr "%s：确定源失败(有常规 mtab 文件的系统不支持 --all-targets)"
 
-#: sys-utils/unshare.c:93
+#: sys-utils/unshare.c:99
 #, c-format
 msgid "unsupported --setgroups argument '%s'"
 msgstr "不支持的 --setgroups 参数“%s”"
 
-#: sys-utils/unshare.c:114 sys-utils/unshare.c:129
+#: sys-utils/unshare.c:120 sys-utils/unshare.c:135
 #, c-format
 msgid "write failed %s"
 msgstr "写失败：%s"
 
-#: sys-utils/unshare.c:152
+#: sys-utils/unshare.c:158
 #, c-format
 msgid "unsupported propagation mode: %s"
 msgstr "不受支持的传播模式︰%s"
 
-#: sys-utils/unshare.c:161
+#: sys-utils/unshare.c:167
 msgid "cannot change root filesystem propagation"
 msgstr "无法更改根文件系统传播"
 
-#: sys-utils/unshare.c:192
+#: sys-utils/unshare.c:198
 #, c-format
 msgid "mount %s on %s failed"
 msgstr "将 %s 挂载到 %s 失败"
 
-#: misc-utils/hardlink.c:306 sys-utils/unshare.c:206
+#: misc-utils/hardlink.c:306 sys-utils/unshare.c:212
 #, c-format
 msgid "cannot stat %s"
 msgstr "无法 stat %s"
 
-#: sys-utils/unshare.c:217
+#: sys-utils/unshare.c:223
 msgid "pipe failed"
 msgstr "pipe 失败"
 
-#: sys-utils/unshare.c:231
+#: sys-utils/unshare.c:237
 msgid "failed to read pipe"
 msgstr "读取管道失败"
 
-#: sys-utils/unshare.c:254
+#: sys-utils/unshare.c:260
 msgid "Run a program with some namespaces unshared from the parent.\n"
 msgstr "以某些未与父(进程)共享的名字空间运行某个程序。\n"
 
-#: sys-utils/unshare.c:257
+#: sys-utils/unshare.c:263
 msgid " -m, --mount[=<file>]      unshare mounts namespace\n"
 msgstr " -m, --mount[=<文件>]      取消共享 mounts 名字空间\n"
 
-#: sys-utils/unshare.c:258
+#: sys-utils/unshare.c:264
 msgid " -u, --uts[=<file>]        unshare UTS namespace (hostname etc)\n"
 msgstr " -u, --uts[=<文件>]        取消共享 UTS 名字空间(主机名等)\n"
 
-#: sys-utils/unshare.c:259
+#: sys-utils/unshare.c:265
 msgid " -i, --ipc[=<file>]        unshare System V IPC namespace\n"
 msgstr " -i, --ipc[=<文件>]        取消共享 System V IPC 名字空间\n"
 
-#: sys-utils/unshare.c:260
+#: sys-utils/unshare.c:266
 msgid " -n, --net[=<file>]        unshare network namespace\n"
 msgstr " -n, --net[=<file>]        取消共享网络名字空间\n"
 
-#: sys-utils/unshare.c:261
+#: sys-utils/unshare.c:267
 msgid " -p, --pid[=<file>]        unshare pid namespace\n"
 msgstr " -p, --pid[=<文件>]        取消共享 pid 名字空间\n"
 
-#: sys-utils/unshare.c:262
+#: sys-utils/unshare.c:268
 msgid " -U, --user[=<file>]       unshare user namespace\n"
 msgstr " -U, --user[=<文件>]       取消共享用户名字空间\n"
 
-#: sys-utils/unshare.c:263
+#: sys-utils/unshare.c:269
 msgid " -C, --cgroup[=<file>]     unshare cgroup namespace\n"
 msgstr " -C, --cgroup[=<文件>]     取消共享 cgroup 名字空间\n"
 
-#: sys-utils/unshare.c:265
+#: sys-utils/unshare.c:271
 msgid " -f, --fork                fork before launching <program>\n"
 msgstr " -f, --fork                在启动<程序>前 fork\n"
 
-#: sys-utils/unshare.c:246
+#: sys-utils/unshare.c:261
 msgid ""
 "     --mount-proc[=<dir>]  mount proc filesystem first (implies --mount)\n"
 msgstr "     --mount-proc[=<目录>] 先挂载 proc 文件系统(连带打开 --mount)\n"
 
-#: sys-utils/unshare.c:266
+#: sys-utils/unshare.c:272
 msgid ""
 " -r, --map-root-user       map current user to root (implies --user)\n"
 msgstr " -r, --map-root-user       将当前用户映射为 root (连带打开 --user)\n"
 
-#: sys-utils/unshare.c:248
+#: sys-utils/unshare.c:263
 msgid ""
 "     --propagation slave|shared|private|unchanged\n"
 "                           modify mount propagation in mount namespace\n"
@@ -17538,107 +17541,107 @@
 "     --propagation slave|shared|private|unchanged\n"
 "                           修改 mount 名字空间中的 mount 传播\n"
 
-#: sys-utils/unshare.c:250
+#: sys-utils/unshare.c:265
 msgid ""
 " -s, --setgroups allow|deny  control the setgroups syscall in user "
 "namespaces\n"
 msgstr " -s, --setgroups allow|deny  控制用户名字空间中的 setgroups 系统调用\n"
 
-#: sys-utils/unshare.c:432
+#: sys-utils/unshare.c:460
 msgid "unshare failed"
 msgstr "unshare 失败"
 
-#: sys-utils/unshare.c:476
+#: sys-utils/unshare.c:504
 msgid "child exit failed"
 msgstr "子进程退出失败"
 
-#: sys-utils/unshare.c:485
+#: sys-utils/unshare.c:518
 msgid "options --setgroups=allow and --map-root-user are mutually exclusive"
 msgstr "--setgroups=allow 和 --map-root-user 选项是互斥的"
 
-#: sys-utils/unshare.c:515
+#: sys-utils/unshare.c:555
 #, c-format
 msgid "mount %s failed"
 msgstr "挂载 %s 失败"
 
-#: sys-utils/wdctl.c:73
+#: sys-utils/wdctl.c:72
 msgid "Card previously reset the CPU"
 msgstr "卡曾经重置 CPU"
 
-#: sys-utils/wdctl.c:74
+#: sys-utils/wdctl.c:73
 msgid "External relay 1"
 msgstr "外部中继 1"
 
-#: sys-utils/wdctl.c:75
+#: sys-utils/wdctl.c:74
 msgid "External relay 2"
 msgstr "外部中继 2"
 
-#: sys-utils/wdctl.c:76
+#: sys-utils/wdctl.c:75
 msgid "Fan failed"
 msgstr "风扇失败"
 
-#: sys-utils/wdctl.c:77
+#: sys-utils/wdctl.c:76
 msgid "Keep alive ping reply"
 msgstr "保持活动 ping 回应"
 
-#: sys-utils/wdctl.c:78
+#: sys-utils/wdctl.c:77
 msgid "Supports magic close char"
 msgstr "支持 magic close 字符"
 
-#: sys-utils/wdctl.c:79
+#: sys-utils/wdctl.c:78
 msgid "Reset due to CPU overheat"
 msgstr "因 CPU 过热重置"
 
-#: sys-utils/wdctl.c:80
+#: sys-utils/wdctl.c:79
 msgid "Power over voltage"
 msgstr "供电电压过高"
 
-#: sys-utils/wdctl.c:81
+#: sys-utils/wdctl.c:80
 msgid "Power bad/power fault"
 msgstr "供电问题/供电故障"
 
-#: sys-utils/wdctl.c:82
+#: sys-utils/wdctl.c:81
 msgid "Pretimeout (in seconds)"
 msgstr "预超时(秒)"
 
-#: sys-utils/wdctl.c:83
+#: sys-utils/wdctl.c:82
 msgid "Set timeout (in seconds)"
 msgstr "设置超时(秒)"
 
-#: sys-utils/wdctl.c:84
+#: sys-utils/wdctl.c:83
 msgid "Not trigger reboot"
 msgstr "不触发重启"
 
-#: sys-utils/wdctl.c:100
+#: sys-utils/wdctl.c:99
 msgid "flag name"
 msgstr "标志名称"
 
-#: sys-utils/wdctl.c:101
+#: sys-utils/wdctl.c:100
 msgid "flag description"
 msgstr "标志描述"
 
-#: sys-utils/wdctl.c:102
+#: sys-utils/wdctl.c:101
 msgid "flag status"
 msgstr "标志状态"
 
-#: sys-utils/wdctl.c:103
+#: sys-utils/wdctl.c:102
 msgid "flag boot status"
 msgstr "标志启动状态"
 
-#: sys-utils/wdctl.c:104
+#: sys-utils/wdctl.c:103
 msgid "watchdog device name"
 msgstr "看门狗设备名称"
 
-#: sys-utils/wdctl.c:138
+#: sys-utils/wdctl.c:148
 #, c-format
 msgid "unknown flag: %s"
 msgstr "未知标志：%s"
 
-#: sys-utils/wdctl.c:178
+#: sys-utils/wdctl.c:210
 msgid "Show the status of the hardware watchdog.\n"
 msgstr "显示硬件看门狗的状态。\n"
 
-#: sys-utils/wdctl.c:181
+#: sys-utils/wdctl.c:213
 msgid ""
 " -f, --flags <list>     print selected flags only\n"
 " -F, --noflags          don't print information about flags\n"
@@ -17662,69 +17665,69 @@
 " -s, --settimeout <秒>  设置看门狗超时\n"
 " -x, --flags-only       只打印标志表格(同 -I -T)\n"
 
-#: sys-utils/wdctl.c:196
+#: sys-utils/wdctl.c:229
 #, c-format
 msgid "The default device is %s.\n"
 msgstr "默认设备为 %s。\n"
 
-#: sys-utils/wdctl.c:290
+#: sys-utils/wdctl.c:329
 #, c-format
 msgid "%s: unknown flags 0x%x\n"
 msgstr "%s：未知标志 0x%x\n"
 
-#: sys-utils/wdctl.c:320 sys-utils/wdctl.c:376
+#: sys-utils/wdctl.c:359
 #, c-format
 msgid "%s: watchdog already in use, terminating."
 msgstr "%s：看门狗正在使用，将终止。"
 
-#: sys-utils/wdctl.c:334 sys-utils/wdctl.c:404
+#: sys-utils/wdctl.c:373 sys-utils/wdctl.c:438
 #, c-format
 msgid "%s: failed to disarm watchdog"
 msgstr "%s：喂看门狗失败"
 
-#: sys-utils/wdctl.c:343
+#: sys-utils/wdctl.c:382
 #, c-format
 msgid "cannot set timeout for %s"
 msgstr "无法设置 %s 的超时"
 
-#: sys-utils/wdctl.c:349
+#: sys-utils/wdctl.c:388
 #, c-format
 msgid "Timeout has been set to %d second.\n"
 msgid_plural "Timeout has been set to %d seconds.\n"
 msgstr[0] "超时已调整为 %d 秒\n"
 
-#: sys-utils/wdctl.c:383
+#: sys-utils/wdctl.c:417
 #, c-format
 msgid "%s: failed to get information about watchdog"
 msgstr "%s：获取看门狗信息失败"
 
-#: sys-utils/wdctl.c:465 sys-utils/wdctl.c:468 sys-utils/wdctl.c:471
+#: sys-utils/wdctl.c:513 sys-utils/wdctl.c:516 sys-utils/wdctl.c:519
 #, c-format
 msgid "%-14s %2i second\n"
 msgid_plural "%-14s %2i seconds\n"
 msgstr[0] "%-14s %2i 秒\n"
 
-#: sys-utils/wdctl.c:466
+#: sys-utils/wdctl.c:514
 msgid "Timeout:"
 msgstr "超时："
 
-#: sys-utils/wdctl.c:469
+#: sys-utils/wdctl.c:517
 msgid "Pre-timeout:"
 msgstr "预超时："
 
-#: sys-utils/wdctl.c:472
+#: sys-utils/wdctl.c:520
 msgid "Timeleft:"
 msgstr "剩余时间："
 
-#: sys-utils/wdctl.c:604
+#: sys-utils/wdctl.c:576
 msgid "Device:"
 msgstr "设备："
 
-#: sys-utils/wdctl.c:606
+#: sys-utils/wdctl.c:578
 msgid "Identity:"
 msgstr "标识："
 
-#: sys-utils/wdctl.c:608
+#: sys-utils/wdctl.c:580
 msgid "version"
 msgstr "版本："
 
@@ -17790,7 +17793,7 @@
 msgid "Set up and control zram devices.\n"
 msgstr "设置和控制 zram 设备。\n"
 
-#: sys-utils/zramctl.c:473
+#: sys-utils/zramctl.c:542
 msgid " -a, --algorithm lzo|lz4   compression algorithm to use\n"
 msgstr " -a, --algorithm lzo|lz4   要使用的压缩算法\n"
 
@@ -17828,7 +17831,7 @@
 msgid " -t, --streams <number>    number of compression streams\n"
 msgstr " -t, --streams <数字>      压缩流数量\n"
 
-#: sys-utils/zramctl.c:547
+#: sys-utils/zramctl.c:615
 #, c-format
 msgid "unsupported algorithm: %s"
 msgstr "不支持的算法︰%s"
@@ -17873,144 +17876,144 @@
 msgid "%s: failed to set disksize (%ju bytes)"
 msgstr "%s：设置磁盘大小失败(%ju 个字节)"
 
-#: term-utils/agetty.c:489
+#: term-utils/agetty.c:492
 #, c-format
 msgid "%s%s (automatic login)\n"
 msgstr "%s%s (自动登录)\n"
 
-#: term-utils/agetty.c:546
+#: term-utils/agetty.c:549
 #, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s：无法更改根目录 %s：%m"
 
-#: term-utils/agetty.c:549
+#: term-utils/agetty.c:552
 #, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s：无法更改工作目录 %s：%m"
 
-#: term-utils/agetty.c:552
+#: term-utils/agetty.c:555
 #, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s：无法更改进程优先级：%m"
 
-#: term-utils/agetty.c:563
+#: term-utils/agetty.c:566
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s：无法执行 %s：%m"
 
-#: term-utils/agetty.c:594 term-utils/agetty.c:921 term-utils/agetty.c:1457
-#: term-utils/agetty.c:1475 term-utils/agetty.c:1512 term-utils/agetty.c:1522
-#: term-utils/agetty.c:1564 term-utils/agetty.c:2203 term-utils/agetty.c:2772
+#: term-utils/agetty.c:597 term-utils/agetty.c:930 term-utils/agetty.c:1466
+#: term-utils/agetty.c:1484 term-utils/agetty.c:1521 term-utils/agetty.c:1531
+#: term-utils/agetty.c:1573 term-utils/agetty.c:2277 term-utils/agetty.c:2841
 #, c-format
 msgid "failed to allocate memory: %m"
 msgstr "分配内存失败：%m"
 
-#: term-utils/agetty.c:684
+#: misc-utils/kill.c:232 term-utils/agetty.c:687
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: term-utils/agetty.c:768
+#: term-utils/agetty.c:773
 msgid "invalid delay argument"
 msgstr "无效的延迟参数"
 
-#: term-utils/agetty.c:806
+#: term-utils/agetty.c:811
 msgid "invalid argument of --local-line"
 msgstr "--local-line 选项参数无效"
 
-#: term-utils/agetty.c:825
+#: term-utils/agetty.c:830
 msgid "invalid nice argument"
 msgstr "无效的 nice 参数"
 
-#: term-utils/agetty.c:926
+#: term-utils/agetty.c:935
 #, c-format
 msgid "bad speed: %s"
 msgstr "速度有误：%s"
 
-#: term-utils/agetty.c:928
+#: term-utils/agetty.c:937
 msgid "too many alternate speeds"
 msgstr "备选速度过多"
 
-#: term-utils/agetty.c:1035 term-utils/agetty.c:1039 term-utils/agetty.c:1092
+#: term-utils/agetty.c:1044 term-utils/agetty.c:1048 term-utils/agetty.c:1101
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s：无法以标准输入打开：%m"
 
-#: term-utils/agetty.c:1058
+#: term-utils/agetty.c:1067
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s：不是字符设备"
 
-#: term-utils/agetty.c:1060
+#: term-utils/agetty.c:1069
 #, c-format
 msgid "/dev/%s: not a tty"
 msgstr "/dev/%s：不是终端"
 
-#: term-utils/agetty.c:1064 term-utils/agetty.c:1096
+#: term-utils/agetty.c:1073 term-utils/agetty.c:1105
 #, c-format
 msgid "/dev/%s: cannot get controlling tty: %m"
 msgstr "/dev/%s：无法获取控制 tty：%m"
 
-#: term-utils/agetty.c:1086
+#: term-utils/agetty.c:1095
 #, c-format
 msgid "/dev/%s: vhangup() failed: %m"
 msgstr "/dev/%s：vhangup() 失败：%m"
 
-#: term-utils/agetty.c:1107
+#: term-utils/agetty.c:1116
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s：未打开(就)读/写"
 
-#: term-utils/agetty.c:1112
+#: term-utils/agetty.c:1121
 #, c-format
 msgid "/dev/%s: cannot set process group: %m"
 msgstr "/dev/%s：无法设置进程组：%m"
 
-#: term-utils/agetty.c:1126
+#: term-utils/agetty.c:1135
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s：dup 问题：%m"
 
-#: term-utils/agetty.c:1143
+#: term-utils/agetty.c:1152
 #, c-format
 msgid "%s: failed to get terminal attributes: %m"
 msgstr "%s：获取终端属性失败：%m"
 
-#: term-utils/agetty.c:1354 term-utils/agetty.c:1383
+#: term-utils/agetty.c:1363 term-utils/agetty.c:1392
 #, c-format
 msgid "setting terminal attributes failed: %m"
 msgstr "设置终端属性失败：%m"
 
-#: term-utils/agetty.c:1502
+#: term-utils/agetty.c:1511
 msgid "cannot open os-release file"
 msgstr "无法打开 os-release 文件"
 
-#: term-utils/agetty.c:1669
+#: term-utils/agetty.c:1678
 #, c-format
 msgid "failed to create reload file: %s: %m"
 msgstr "未能创建 reload 文件︰%s：%m"
 
-#: term-utils/agetty.c:1936
+#: term-utils/agetty.c:2010
 msgid "[press ENTER to login]"
 msgstr "[按 ENTER 键登录]"
 
-#: term-utils/agetty.c:1963
+#: term-utils/agetty.c:2037
 msgid "Num Lock off"
 msgstr "Num Lock 关"
 
-#: term-utils/agetty.c:1966
+#: term-utils/agetty.c:2040
 msgid "Num Lock on"
 msgstr "Num Lock 开"
 
-#: term-utils/agetty.c:1969
+#: term-utils/agetty.c:2043
 msgid "Caps Lock on"
 msgstr "Caps Lock 开"
 
-#: term-utils/agetty.c:1972
+#: term-utils/agetty.c:2046
 msgid "Scroll Lock on"
 msgstr "Scroll Lock 开"
 
-#: term-utils/agetty.c:1975
+#: term-utils/agetty.c:2049
 #, c-format
 msgid ""
 "Hint: %s\n"
@@ -18019,32 +18022,32 @@
 "提示：%s\n"
 "\n"
 
-#: term-utils/agetty.c:2117
+#: term-utils/agetty.c:2191
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s：read：%m"
 
-#: term-utils/agetty.c:2179
+#: term-utils/agetty.c:2253
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s：输入过载"
 
-#: term-utils/agetty.c:2199 term-utils/agetty.c:2207
+#: term-utils/agetty.c:2273 term-utils/agetty.c:2281
 #, c-format
 msgid "%s: invalid character conversion for login name"
 msgstr "%s：登录名字符转换无效"
 
-#: term-utils/agetty.c:2213
+#: term-utils/agetty.c:2287
 #, c-format
 msgid "%s: invalid character 0x%x in login name"
 msgstr "%s：登录名中的字符 0x%x 无效"
 
-#: term-utils/agetty.c:2298
+#: term-utils/agetty.c:2372
 #, c-format
 msgid "%s: failed to set terminal attributes: %m"
 msgstr "%s：设置终端属性失败：%m"
 
-#: term-utils/agetty.c:2336
+#: term-utils/agetty.c:2410
 #, c-format
 msgid ""
 " %1$s [options] <line> [<baud_rate>,...] [<termtype>]\n"
@@ -18053,160 +18056,160 @@
 " %1$s [选项] <线路> [<波特率>,...] [<终端类型>]\n"
 " %1$s [选项] <波特率>,... <线路> [<终端类型>]\n"
 
-#: term-utils/agetty.c:2340
+#: term-utils/agetty.c:2414
 msgid "Open a terminal and set its mode.\n"
 msgstr "打开一个终端并设置其模式。\n"
 
-#: term-utils/agetty.c:2343
+#: term-utils/agetty.c:2417
 msgid " -8, --8bits                assume 8-bit tty\n"
 msgstr " -8, --8bits                采用 8 位 tty\n"
 
-#: term-utils/agetty.c:2344
+#: term-utils/agetty.c:2418
 msgid " -a, --autologin <user>     login the specified user automatically\n"
 msgstr " -a, --autologin <用户>     以指定用户自动登录\n"
 
-#: term-utils/agetty.c:2345
+#: term-utils/agetty.c:2419
 msgid " -c, --noreset              do not reset control mode\n"
 msgstr " -c, --noreset              不重置控制模式\n"
 
-#: term-utils/agetty.c:2346
+#: term-utils/agetty.c:2420
 msgid " -E, --remote               use -r <hostname> for login(1)\n"
 msgstr " -E, --remote               使用 -r <主机名> 选项调用 login(1)\n"
 
-#: term-utils/agetty.c:2347
+#: term-utils/agetty.c:2421
 msgid " -f, --issue-file <file>    display issue file\n"
 msgstr " -f, --issue-file <文件>    指定要显示的预登录消息(issue)文件\n"
 
-#: term-utils/agetty.c:2348
+#: term-utils/agetty.c:2423
 msgid " -h, --flow-control         enable hardware flow control\n"
 msgstr " -h, --flow-control         启用硬件流控制\n"
 
-#: term-utils/agetty.c:2349
+#: term-utils/agetty.c:2424
 msgid " -H, --host <hostname>      specify login host\n"
 msgstr " -H, --host <主机名>        指定登录主机\n"
 
-#: term-utils/agetty.c:2350
+#: term-utils/agetty.c:2425
 msgid " -i, --noissue              do not display issue file\n"
 msgstr " -i, --noissue              不显示预登录消息(issue)文件\n"
 
-#: term-utils/agetty.c:2351
+#: term-utils/agetty.c:2426
 msgid " -I, --init-string <string> set init string\n"
 msgstr " -I, --init-string <字符串> 设置初始字符串\n"
 
-#: term-utils/agetty.c:2352
+#: term-utils/agetty.c:2427
 msgid " -J  --noclear              do not clear the screen before prompt\n"
 msgstr " -J  --noclear              提示之前不清屏\n"
 
-#: term-utils/agetty.c:2353
+#: term-utils/agetty.c:2428
 msgid " -l, --login-program <file> specify login program\n"
 msgstr " -l, --login-program <文件> 指定登录程序\n"
 
-#: term-utils/agetty.c:2354
+#: term-utils/agetty.c:2429
 msgid " -L, --local-line[=<mode>]  control the local line flag\n"
 msgstr " -L, --local-line[=<模式>]  控制本地线路标志\n"
 
-#: term-utils/agetty.c:2355
+#: term-utils/agetty.c:2430
 msgid " -m, --extract-baud         extract baud rate during connect\n"
 msgstr " -m, --extract-baud         连接过程中提取波特率\n"
 
-#: term-utils/agetty.c:2356
+#: term-utils/agetty.c:2431
 msgid " -n, --skip-login           do not prompt for login\n"
 msgstr " -n, --skip-login           不提示登录\n"
 
-#: term-utils/agetty.c:2357
+#: term-utils/agetty.c:2432
 msgid " -N  --nonewline            do not print a newline before issue\n"
 msgstr " -N  --nonewline            预登录消息(issue)前不打印换行(newline)\n"
 
-#: term-utils/agetty.c:2358
+#: term-utils/agetty.c:2433
 msgid " -o, --login-options <opts> options that are passed to login\n"
 msgstr " -o, --login-options <选项> 传递给登录程序的选项\n"
 
-#: term-utils/agetty.c:2359
+#: term-utils/agetty.c:2434
 msgid " -p, --login-pause          wait for any key before the login\n"
 msgstr " -p, --login-pause          登录前等待按下任意键来继续\n"
 
-#: term-utils/agetty.c:2360
+#: term-utils/agetty.c:2435
 msgid " -r, --chroot <dir>         change root to the directory\n"
 msgstr " -r, --chroot <目录>        将根目录更改为指定目录\n"
 
-#: term-utils/agetty.c:2361
+#: term-utils/agetty.c:2436
 msgid " -R, --hangup               do virtually hangup on the tty\n"
 msgstr " -R, --hangup               对 tty 执行虚拟挂起(virtual hangup)\n"
 
-#: term-utils/agetty.c:2362
+#: term-utils/agetty.c:2437
 msgid " -s, --keep-baud            try to keep baud rate after break\n"
 msgstr " -s, --keep-baud            中断(break)后尝试保持波特率\n"
 
-#: term-utils/agetty.c:2363
+#: term-utils/agetty.c:2438
 msgid " -t, --timeout <number>     login process timeout\n"
 msgstr " -t, --timeout <数字>       登录进程超时(秒)\n"
 
-#: term-utils/agetty.c:2364
+#: term-utils/agetty.c:2439
 msgid " -U, --detect-case          detect uppercase terminal\n"
 msgstr " -U, --detect-case          检测纯大写终端\n"
 
-#: term-utils/agetty.c:2365
+#: term-utils/agetty.c:2440
 msgid " -w, --wait-cr              wait carriage-return\n"
 msgstr " -w, --wait-cr              等待回车\n"
 
-#: term-utils/agetty.c:2366
+#: term-utils/agetty.c:2441
 msgid "     --nohints              do not print hints\n"
 msgstr "     --nohints              不打印提示信息\n"
 
-#: term-utils/agetty.c:2367
+#: term-utils/agetty.c:2442
 msgid "     --nohostname           no hostname at all will be shown\n"
 msgstr "     --nohostname           将完全不显示主机名\n"
 
-#: term-utils/agetty.c:2368
+#: term-utils/agetty.c:2443
 msgid "     --long-hostname        show full qualified hostname\n"
 msgstr "     --long-hostname        显示完全限定主机名\n"
 
-#: term-utils/agetty.c:2369
+#: term-utils/agetty.c:2444
 msgid "     --erase-chars <string> additional backspace chars\n"
 msgstr "     --erase-chars <字符串> 附加的退格字符\n"
 
-#: term-utils/agetty.c:2370
+#: term-utils/agetty.c:2445
 msgid "     --kill-chars <string>  additional kill chars\n"
 msgstr "     --kill-chars <字符串>  附加的杀死(kill)字符\n"
 
-#: term-utils/agetty.c:2371
+#: term-utils/agetty.c:2446
 msgid "     --chdir <directory>    chdir before the login\n"
 msgstr "     --chdir <目录>         登录前切换目录(chdir)\n"
 
-#: term-utils/agetty.c:2372
+#: term-utils/agetty.c:2447
 msgid "     --delay <number>       sleep seconds before prompt\n"
 msgstr "     --delay <数字>         提示前睡眠的秒数\n"
 
-#: term-utils/agetty.c:2373
+#: term-utils/agetty.c:2448
 msgid "     --nice <number>        run login with this priority\n"
 msgstr "     --nice <数字>          以指定优先级运行 login\n"
 
-#: term-utils/agetty.c:2374
+#: term-utils/agetty.c:2449
 msgid ""
 "     --reload               reload prompts on running agetty instances\n"
 msgstr "     --reload               在运行 agetty 实例时重新载入提示\n"
 
-#: term-utils/agetty.c:2375
+#: term-utils/agetty.c:2450
 msgid "     --list-speeds          display supported baud rates\n"
 msgstr ""
 
-#: term-utils/agetty.c:2729
+#: term-utils/agetty.c:2798
 #, c-format
 msgid "%d user"
 msgid_plural "%d users"
 msgstr[0] "%d 位用户"
 
-#: term-utils/agetty.c:2860
+#: term-utils/agetty.c:2929
 #, c-format
 msgid "checkname failed: %m"
 msgstr "checkname 失败：%m"
 
-#: term-utils/agetty.c:2872
+#: term-utils/agetty.c:2941
 #, c-format
 msgid "cannot touch file %s"
 msgstr "无法 touch 文件 %s"
 
-#: term-utils/agetty.c:2876
+#: term-utils/agetty.c:2945
 msgid "--reload is unsupported on your system"
 msgstr "您的系统不支持 --reload"
 
@@ -18253,12 +18256,12 @@
 msgid "invalid argument: %s"
 msgstr "无效参数：%s"
 
-#: term-utils/script.c:164
+#: term-utils/script.c:190
 #, c-format
 msgid " %s [options] [file]\n"
 msgstr " %s [选项] [文件]\n"
 
-#: term-utils/script.c:167
+#: term-utils/script.c:193
 msgid "Make a typescript of a terminal session.\n"
 msgstr "创建终端会话的 typescript。\n"
 
@@ -18273,7 +18276,7 @@
 " -t[<file>], --timing[=<file>] output timing data to stderr or to FILE\n"
 msgstr ""
 
-#: term-utils/script.c:241
+#: term-utils/script.c:743
 #, c-format
 msgid ""
 "output file `%s' is a link\n"
@@ -18327,12 +18330,12 @@
 msgid "Script started, file is %s\n"
 msgstr "脚本已启动，文件为 %s\n"
 
-#: term-utils/scriptreplay.c:44
+#: term-utils/scriptreplay.c:49
 #, c-format
 msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr " %s [-t] timingfile [typescript] [divisor]\n"
 
-#: term-utils/scriptreplay.c:48
+#: term-utils/scriptreplay.c:53
 msgid "Play back terminal typescripts, using timing information.\n"
 msgstr "使用定时信息回话终端 typescript。\n"
 
@@ -18448,7 +18451,7 @@
 msgid " --ulcolor       [bright] <color>  set underlined text color\n"
 msgstr " --ulcolor       [bright] <颜色>   设置下划线颜色\n"
 
-#: term-utils/setterm.c:407
+#: term-utils/setterm.c:399
 msgid " --hbcolor       [bright] <color>  set bold text color\n"
 msgstr " --hbcolor       [bright] <颜色>   设置粗体字颜色\n"
 
@@ -18550,71 +18553,71 @@
 msgid " --bfreq         <number>          bell frequency in Hertz\n"
 msgstr " --bfreq         <数字>            响铃频率，单位为 Hz\n"
 
-#: term-utils/setterm.c:434
+#: term-utils/setterm.c:452
 msgid "duplicate use of an option"
 msgstr "重复使用某选项"
 
-#: term-utils/setterm.c:743
+#: term-utils/setterm.c:764
 msgid "cannot force blank"
 msgstr "无法强制清空(blank)"
 
-#: term-utils/setterm.c:748
+#: term-utils/setterm.c:769
 msgid "cannot force unblank"
 msgstr "无法强制反清空(unblank)"
 
-#: term-utils/setterm.c:754
+#: term-utils/setterm.c:775
 msgid "cannot get blank status"
 msgstr "无法获取空白状态"
 
-#: term-utils/setterm.c:780
+#: term-utils/setterm.c:801
 #, c-format
 msgid "cannot open dump file %s for output"
 msgstr ""
 
-#: term-utils/setterm.c:822
+#: term-utils/setterm.c:843
 #, c-format
 msgid "terminal %s does not support %s"
 msgstr "终端 %s 不支持 %s"
 
-#: term-utils/setterm.c:860
+#: term-utils/setterm.c:881
 msgid "select failed"
 msgstr ""
 
-#: term-utils/setterm.c:886
+#: term-utils/setterm.c:907
 msgid "stdin does not refer to a terminal"
 msgstr ""
 
-#: term-utils/setterm.c:914
+#: term-utils/setterm.c:935
 #, c-format
 msgid "invalid cursor position: %s"
 msgstr ""
 
-#: term-utils/setterm.c:936
+#: term-utils/setterm.c:957
 msgid "reset failed"
 msgstr ""
 
-#: term-utils/setterm.c:1100
+#: term-utils/setterm.c:1121
 msgid "cannot (un)set powersave mode"
 msgstr "无法设置(取消)节能模式"
 
-#: term-utils/setterm.c:1119 term-utils/setterm.c:1128
+#: term-utils/setterm.c:1140 term-utils/setterm.c:1149
 msgid "klogctl error"
 msgstr "klogctl 出错"
 
-#: term-utils/setterm.c:1149
+#: term-utils/setterm.c:1170
 msgid "$TERM is not defined."
 msgstr "$TERM 未定义。"
 
-#: term-utils/setterm.c:1156
+#: term-utils/setterm.c:1177
 msgid "terminfo database cannot be found"
 msgstr "找不到 terminfo 数据库"
 
-#: term-utils/setterm.c:1158
+#: term-utils/setterm.c:1179
 #, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s：未知终端类型"
 
-#: term-utils/setterm.c:1160
+#: term-utils/setterm.c:1181
 msgid "terminal is hardcopy"
 msgstr "终端为硬拷贝(hardcopy)"
 
@@ -18648,63 +18651,63 @@
 msgid "%s: BAD ERROR, message is far too long"
 msgstr "%s：严重错误，消息太长太长了"
 
-#: term-utils/wall.c:86
+#: term-utils/wall.c:87
 #, c-format
 msgid " %s [options] [<file> | <message>]\n"
 msgstr " %s [选项] [<文件> | <消息>]\n"
 
-#: term-utils/wall.c:89
+#: term-utils/wall.c:90
 msgid "Write a message to all users.\n"
 msgstr "向所有用户发消息。\n"
 
-#: term-utils/wall.c:92
+#: term-utils/wall.c:93
 msgid " -g, --group <group>     only send message to group\n"
 msgstr ""
 
-#: term-utils/wall.c:93
+#: term-utils/wall.c:94
 msgid " -n, --nobanner          do not print banner, works only for root\n"
 msgstr " -n, --nobanner          不打印欢迎消息，只对 root 用户生效\n"
 
-#: term-utils/wall.c:94
+#: term-utils/wall.c:95
 msgid " -t, --timeout <timeout> write timeout in seconds\n"
 msgstr " -t, --timeout <超时>    写超时(秒)\n"
 
-#: term-utils/wall.c:122
+#: term-utils/wall.c:123
 msgid "invalid group argument"
 msgstr ""
 
-#: term-utils/wall.c:124
+#: term-utils/wall.c:125
 #, c-format
 msgid "%s: unknown gid"
 msgstr ""
 
-#: term-utils/wall.c:167
+#: term-utils/wall.c:168
 msgid "getgrouplist found more groups than sysconf allows"
 msgstr ""
 
-#: term-utils/wall.c:213
+#: term-utils/wall.c:214
 msgid "--nobanner is available only for root"
 msgstr "--nobanner 只有 root 能用"
 
-#: term-utils/wall.c:218
+#: term-utils/wall.c:219
 #, c-format
 msgid "invalid timeout argument: %s"
 msgstr "无效的超时参数：%s"
 
-#: term-utils/wall.c:359
+#: term-utils/wall.c:360
 msgid "cannot get passwd uid"
 msgstr "无法获取 passwd uid"
 
-#: term-utils/wall.c:274
+#: term-utils/wall.c:362
 msgid "cannot get tty name"
 msgstr "无法获得 tty 名称"
 
-#: term-utils/wall.c:383
+#: term-utils/wall.c:384
 #, c-format
 msgid "Broadcast message from %s@%s (%s) (%s):"
 msgstr "来自 %s@%s (%s) (%s) 的广播消息："
 
-#: term-utils/wall.c:416
+#: term-utils/wall.c:417
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr "将不读 %s - 使用 stdin。"
@@ -18813,7 +18816,7 @@
 msgid "-- line already flushed"
 msgstr "-- 行已经被冲洗(flushed)"
 
-#: text-utils/colcrt.c:82 text-utils/column.c:625
+#: text-utils/colcrt.c:82 text-utils/column.c:626
 #, c-format
 msgid " %s [options] [<file>...]\n"
 msgstr " %s [选项] [<文件>...]\n"
@@ -18853,153 +18856,153 @@
 msgid "second argument"
 msgstr "第二个参数"
 
-#: text-utils/column.c:234
+#: text-utils/column.c:235
 msgid "failed to parse column"
 msgstr ""
 
-#: text-utils/column.c:244
+#: text-utils/column.c:245
 #, c-format
 msgid "undefined column name '%s'"
 msgstr ""
 
-#: text-utils/column.c:320
+#: text-utils/column.c:321
 msgid "failed to parse --table-order list"
 msgstr ""
 
-#: text-utils/column.c:396
+#: text-utils/column.c:397
 msgid "failed to parse --table-right list"
 msgstr ""
 
-#: text-utils/column.c:400
+#: text-utils/column.c:401
 msgid "failed to parse --table-trunc list"
 msgstr ""
 
-#: text-utils/column.c:404
+#: text-utils/column.c:405
 msgid "failed to parse --table-noextreme list"
 msgstr ""
 
-#: text-utils/column.c:408
+#: text-utils/column.c:409
 msgid "failed to parse --table-wrap list"
 msgstr ""
 
-#: text-utils/column.c:412
+#: text-utils/column.c:413
 msgid "failed to parse --table-hide list"
 msgstr ""
 
-#: text-utils/column.c:443
+#: text-utils/column.c:444
 #, c-format
 msgid "line %zu: for JSON the name of the column %zu is required"
 msgstr ""
 
-#: text-utils/column.c:457
+#: text-utils/column.c:458
 msgid "failed to allocate output data"
 msgstr ""
 
-#: text-utils/column.c:628
+#: text-utils/column.c:629
 msgid "Columnate lists.\n"
 msgstr "成列输出内容。\n"
 
-#: text-utils/column.c:631
+#: text-utils/column.c:632
 msgid " -t, --table                      create a table\n"
 msgstr ""
 
-#: text-utils/column.c:632
+#: text-utils/column.c:633
 msgid " -n, --table-name <name>          table name for JSON output\n"
 msgstr ""
 
-#: text-utils/column.c:633
+#: text-utils/column.c:634
 msgid " -O, --table-order <columns>      specify order of output columns\n"
 msgstr ""
 
-#: text-utils/column.c:634
+#: text-utils/column.c:635
 msgid " -N, --table-columns <names>      comma separated columns names\n"
 msgstr ""
 
-#: text-utils/column.c:635
+#: text-utils/column.c:636
 msgid ""
 " -E, --table-noextreme <columns>  don't count long text from the columns to "
 "column width\n"
 msgstr ""
 
-#: text-utils/column.c:637
+#: text-utils/column.c:638
 msgid " -e, --table-header-repeat        repeat header for each page\n"
 msgstr ""
 
-#: text-utils/column.c:638
+#: text-utils/column.c:639
 msgid " -H, --table-hide <columns>       don't print the columns\n"
 msgstr ""
 
-#: text-utils/column.c:639
+#: text-utils/column.c:640
 msgid " -R, --table-right <columns>      right align text in these columns\n"
 msgstr ""
 
-#: text-utils/column.c:640
+#: text-utils/column.c:641
 msgid ""
 " -T, --table-truncate <columns>   truncate text in the columns when "
 "necessary\n"
 msgstr ""
 
-#: text-utils/column.c:641
+#: text-utils/column.c:642
 msgid ""
 " -W, --table-wrap <columns>       wrap text in the columns when necessary\n"
 msgstr ""
 
-#: text-utils/column.c:643
+#: text-utils/column.c:644
 msgid " -J, --json                       use JSON output format for table\n"
 msgstr ""
 
-#: text-utils/column.c:646
+#: text-utils/column.c:647
 msgid ""
 " -r, --tree <column>              column to use tree-like output for the "
 "table\n"
 msgstr ""
 
-#: text-utils/column.c:647
+#: text-utils/column.c:648
 msgid ""
 " -i, --tree-id <column>           line ID to specify child-parent relation\n"
 msgstr ""
 
-#: text-utils/column.c:648
+#: text-utils/column.c:649
 msgid ""
 " -p, --tree-parent <column>       parent to specify child-parent relation\n"
 msgstr ""
 
-#: text-utils/column.c:651
+#: text-utils/column.c:652
 msgid ""
 " -c, --output-width <width>       width of output in number of characters\n"
 msgstr ""
 
-#: text-utils/column.c:652
+#: text-utils/column.c:653
 msgid ""
 " -o, --output-separator <string>  columns separator for table output "
 "(default is two spaces)\n"
 msgstr ""
 
-#: text-utils/column.c:653
+#: text-utils/column.c:654
 msgid " -s, --separator <string>         possible table delimiters\n"
 msgstr ""
 
-#: text-utils/column.c:654
+#: text-utils/column.c:655
 msgid " -x, --fillrows                   fill rows before columns\n"
 msgstr ""
 
-#: text-utils/column.c:723
+#: text-utils/column.c:724
 msgid "invalid columns argument"
 msgstr "无效的 列数 参数"
 
-#: text-utils/column.c:748
+#: text-utils/column.c:749
 msgid "failed to parse column names"
 msgstr ""
 
-#: text-utils/column.c:803
+#: text-utils/column.c:804
 msgid "options --tree-id and --tree-parent are required for tree formatting"
 msgstr ""
 
-#: text-utils/column.c:811
+#: text-utils/column.c:812
 msgid "option --table required for all --table-*"
 msgstr ""
 
-#: text-utils/column.c:814
+#: text-utils/column.c:815
 msgid "option --table-columns required for --json"
 msgstr ""
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/wget.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/wget.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/wget.po	2020-01-23 16:51:58.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/wget.po	2020-07-08 13:53:59.000000000 +0000
@@ -22,8 +22,8 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:14+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:03+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
diff -Nru language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/xkeyboard-config.po language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/xkeyboard-config.po
--- language-pack-zh-hans-18.04+20200123/data/zh_CN/LC_MESSAGES/xkeyboard-config.po	2020-01-23 16:51:59.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/data/zh_CN/LC_MESSAGES/xkeyboard-config.po	2020-07-08 13:54:00.000000000 +0000
@@ -17,12 +17,12 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2020-01-23 11:26+0000\n"
-"X-Generator: Launchpad (build b8d1327fd820d6bf500589d6da587d5037c7d88e)\n"
+"X-Launchpad-Export-Date: 2020-07-02 11:13+0000\n"
+"X-Generator: Launchpad (build 1cbd0aa39df153c901321817f9b57cf3f232b507)\n"
 "Language: zh_CN\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 
-#: ../rules/base.xml.in.h:1
+#: rules/base.xml:8
 msgid "Generic 101-key PC"
 msgstr "通用 101 键电脑"
 
@@ -30,251 +30,251 @@
 msgid "Generic 101-key PC (intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:3
+#: rules/base.xml:22
 msgid "Generic 104-key PC"
 msgstr "通用 104 键电脑"
 
-#: ../rules/base.xml.in.h:4
+#: rules/base.xml:29
 msgid "Generic 105-key PC (intl.)"
 msgstr "通用 105 键（国际）电脑"
 
-#: ../rules/base.xml.in.h:5
+#: rules/base.xml:36
 msgid "Dell 101-key PC"
 msgstr "Dell 101 键电脑"
 
-#: ../rules/base.xml.in.h:6
+#: rules/base.xml:43
 msgid "Dell Latitude laptop"
 msgstr "戴尔 Latitude 笔记本电脑"
 
-#: ../rules/base.xml.in.h:7
+#: rules/base.xml:50
 msgid "Dell Precision M65 laptop"
 msgstr "戴尔 Precision M65 笔记本电脑"
 
-#: ../rules/base.xml.in.h:8
+#: rules/base.xml:57
 msgid "Everex STEPnote"
 msgstr "Everex STEPnote"
 
-#: ../rules/base.xml.in.h:9
+#: rules/base.xml:64
 msgid "Keytronic FlexPro"
 msgstr "Keytronic FlexPro"
 
-#: ../rules/base.xml.in.h:10
+#: rules/base.xml:71
 msgid "Microsoft Natural"
 msgstr "微软自然键盘"
 
-#: ../rules/base.xml.in.h:11
+#: rules/base.xml:78
 msgid "Northgate OmniKey 101"
 msgstr "Northgate OmniKey 101"
 
-#: ../rules/base.xml.in.h:12
+#: rules/base.xml:85
 msgid "Winbook Model XP5"
 msgstr "Winbook Model XP5"
 
-#: ../rules/base.xml.in.h:13
+#: rules/base.xml:92
 msgid "PC-98"
-msgstr ""
+msgstr "PC-98"
 
-#: ../rules/base.xml.in.h:14
+#: rules/base.xml:99
 msgid "A4Tech KB-21"
 msgstr "A4Tech KB-21"
 
-#: ../rules/base.xml.in.h:15
+#: rules/base.xml:106
 msgid "A4Tech KBS-8"
 msgstr "A4Tech KBS-8"
 
-#: ../rules/base.xml.in.h:16
+#: rules/base.xml:113
 msgid "A4Tech Wireless Desktop RFKB-23"
-msgstr ""
+msgstr "A4Tech 无线桌面 RFKB-23"
 
-#: ../rules/base.xml.in.h:17
+#: rules/base.xml:120
 msgid "Acer AirKey V"
 msgstr "Acer AirKey V"
 
-#: ../rules/base.xml.in.h:18
+#: rules/base.xml:127
 msgid "Azona RF2300 wireless Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:19
+#: rules/base.xml:134
 msgid "Advance Scorpius KI"
 msgstr "高级 Scorpius KI"
 
-#: ../rules/base.xml.in.h:20
+#: rules/base.xml:141
 msgid "Brother Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:21
+#: rules/base.xml:148
 msgid "BTC 5113RF Multimedia"
 msgstr "BTC 5113RF 多媒体"
 
-#: ../rules/base.xml.in.h:22
+#: rules/base.xml:155
 msgid "BTC 5126T"
 msgstr "BTC 5126T"
 
-#: ../rules/base.xml.in.h:23
+#: rules/base.xml:162
 msgid "BTC 6301URF"
 msgstr "BTC 6301URF"
 
-#: ../rules/base.xml.in.h:24
+#: rules/base.xml:169
 msgid "BTC 9000"
 msgstr "BTC 9000"
 
-#: ../rules/base.xml.in.h:25
+#: rules/base.xml:176
 msgid "BTC 9000A"
 msgstr "BTC 9000A"
 
-#: ../rules/base.xml.in.h:26
+#: rules/base.xml:183
 msgid "BTC 9001AH"
 msgstr "BTC 9001AH"
 
-#: ../rules/base.xml.in.h:27
+#: rules/base.xml:190
 msgid "BTC 5090"
 msgstr "BTC 5090"
 
-#: ../rules/base.xml.in.h:28
+#: rules/base.xml:197
 msgid "BTC 9019U"
 msgstr "BTC 9019U"
 
-#: ../rules/base.xml.in.h:29
+#: rules/base.xml:204
 msgid "BTC 9116U Mini Wireless Internet and Gaming"
 msgstr ""
 
-#: ../rules/base.xml.in.h:30
+#: rules/base.xml:210
 msgid "Cherry Blue Line CyBo@rd"
 msgstr "Cherry Blue Line CyBo@rd"
 
-#: ../rules/base.xml.in.h:31
+#: rules/base.xml:216
 msgid "Cherry CyMotion Master XPress"
 msgstr ""
 
-#: ../rules/base.xml.in.h:32
+#: rules/base.xml:223
 msgid "Cherry Blue Line CyBo@rd (alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:33
+#: rules/base.xml:230
 msgid "Cherry CyBo@rd USB-Hub"
 msgstr ""
 
-#: ../rules/base.xml.in.h:34
+#: rules/base.xml:237
 msgid "Cherry CyMotion Expert"
 msgstr ""
 
-#: ../rules/base.xml.in.h:35
+#: rules/base.xml:244
 msgid "Cherry B.UNLIMITED"
 msgstr ""
 
-#: ../rules/base.xml.in.h:36
+#: rules/base.xml:251
 msgid "Chicony Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:37
+#: rules/base.xml:258
 msgid "Chicony KU-0108"
 msgstr ""
 
-#: ../rules/base.xml.in.h:38
+#: rules/base.xml:265
 msgid "Chicony KU-0420"
 msgstr "Chicony KU-0420"
 
-#: ../rules/base.xml.in.h:39
+#: rules/base.xml:272
 msgid "Chicony KB-9885"
 msgstr "Chicony KB-9885"
 
-#: ../rules/base.xml.in.h:40
+#: rules/base.xml:279
 msgid "Compaq Easy Access"
-msgstr ""
+msgstr "康柏 Easy Access"
 
-#: ../rules/base.xml.in.h:41
+#: rules/base.xml:286
 msgid "Compaq Internet (7 keys)"
-msgstr ""
+msgstr "康柏网际（7键）"
 
-#: ../rules/base.xml.in.h:42
+#: rules/base.xml:293
 msgid "Compaq Internet (13 keys)"
-msgstr ""
+msgstr "康柏网际（13键）"
 
-#: ../rules/base.xml.in.h:43
+#: rules/base.xml:300
 msgid "Compaq Internet (18 keys)"
-msgstr ""
+msgstr "康柏网际（18键）"
 
-#: ../rules/base.xml.in.h:44
+#: rules/base.xml:307
 msgid "Cherry CyMotion Master Linux"
 msgstr ""
 
-#: ../rules/base.xml.in.h:45
+#: rules/base.xml:314
 msgid "Compaq Armada laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:46
+#: rules/base.xml:321
 msgid "Compaq Presario laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:47
+#: rules/base.xml:328
 msgid "Compaq iPaq"
-msgstr ""
+msgstr "康柏 iPaq"
 
-#: ../rules/base.xml.in.h:48
+#: rules/base.xml:335
 msgid "Dell"
 msgstr "戴尔"
 
-#: ../rules/base.xml.in.h:49
+#: rules/base.xml:342
 msgid "Dell SK-8125"
 msgstr "Dell SK-8125"
 
-#: ../rules/base.xml.in.h:50
+#: rules/base.xml:349
 msgid "Dell SK-8135"
 msgstr "Dell SK-8135"
 
-#: ../rules/base.xml.in.h:51
+#: rules/base.xml:356
 msgid "Dell USB Multimedia"
-msgstr ""
+msgstr "戴尔 USB 多媒体"
 
-#: ../rules/base.xml.in.h:52
+#: rules/base.xml:363
 msgid "Dell Inspiron 6000/8000 laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:53
+#: rules/base.xml:370
 msgid "Dell Precision M laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:54
+#: rules/base.xml:377
 msgid "Dexxa Wireless Desktop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:55
+#: rules/base.xml:384
 msgid "Diamond 9801/9802"
 msgstr ""
 
-#: ../rules/base.xml.in.h:56
+#: rules/base.xml:391
 msgid "DTK2000"
 msgstr "DTK2000"
 
-#: ../rules/base.xml.in.h:57
+#: rules/base.xml:397
 msgid "Ennyah DKB-1008"
 msgstr "Ennyah DKB-1008"
 
-#: ../rules/base.xml.in.h:58
+#: rules/base.xml:404
 msgid "Fujitsu-Siemens Amilo laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:59
+#: rules/base.xml:411
 msgid "Genius Comfy KB-16M/Multimedia KWD-910"
 msgstr ""
 
-#: ../rules/base.xml.in.h:60
+#: rules/base.xml:418
 msgid "Genius Comfy KB-12e"
 msgstr "通用 Comfy KB-12e"
 
-#: ../rules/base.xml.in.h:61
+#: rules/base.xml:425
 msgid "Genius Comfy KB-21e-Scroll"
 msgstr ""
 
-#: ../rules/base.xml.in.h:62
+#: rules/base.xml:432
 msgid "Genius KB-19e NB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:63
+#: rules/base.xml:439
 msgid "Genius KKB-2050HS"
 msgstr ""
 
-#: ../rules/base.xml.in.h:64
+#: rules/base.xml:446
 msgid "Gyration"
 msgstr ""
 
@@ -282,471 +282,471 @@
 msgid "HTC Dream"
 msgstr "HTC Dream(Google G1)"
 
-#: ../rules/base.xml.in.h:66
+#: rules/base.xml:453
 msgid "Kinesis"
-msgstr ""
+msgstr "Kinesis"
 
-#: ../rules/base.xml.in.h:67
+#: rules/base.xml:460
 msgid "Logitech"
 msgstr "罗技"
 
-#: ../rules/base.xml.in.h:68
+#: rules/base.xml:467
 msgid "Logitech G15 extra keys via G15daemon"
 msgstr ""
 
-#: ../rules/base.xml.in.h:69
+#: rules/base.xml:474
 msgid "Hewlett-Packard Internet"
-msgstr ""
+msgstr "惠普网际"
 
-#: ../rules/base.xml.in.h:70
+#: rules/base.xml:481
 msgid "Hewlett-Packard NEC SK-2500 Multimedia"
-msgstr ""
+msgstr "惠普 SK-250x 多媒体"
 
-#: ../rules/base.xml.in.h:71
+#: rules/base.xml:488
 msgid "Hewlett-Packard Omnibook XE3 GC"
 msgstr "惠普 Omnibook XE3 GC"
 
-#: ../rules/base.xml.in.h:72
+#: rules/base.xml:495
 msgid "Hewlett-Packard Omnibook XE3 GF"
 msgstr "惠普 Omnibook XE3 CF"
 
-#: ../rules/base.xml.in.h:73
+#: rules/base.xml:502
 msgid "Hewlett-Packard Omnibook XT1000"
 msgstr "惠普 Omnibook XT1000"
 
-#: ../rules/base.xml.in.h:74
+#: rules/base.xml:509
 msgid "Hewlett-Packard Pavilion dv5"
 msgstr "惠普 Pavilion dv5"
 
-#: ../rules/base.xml.in.h:75
+#: rules/base.xml:516
 msgid "Hewlett-Packard Pavilion ZT1100"
 msgstr "惠普 Pavilion ZT1100"
 
-#: ../rules/base.xml.in.h:76
+#: rules/base.xml:523
 msgid "Hewlett-Packard Omnibook 500 FA"
 msgstr "惠普 Omnibook 500 FA"
 
-#: ../rules/base.xml.in.h:77
+#: rules/base.xml:530
 msgid "Hewlett-Packard Omnibook 500"
 msgstr "惠普 Omnibook 500"
 
-#: ../rules/base.xml.in.h:78
+#: rules/base.xml:537
 msgid "Hewlett-Packard nx9020"
 msgstr "惠普 nx9020"
 
-#: ../rules/base.xml.in.h:79
+#: rules/base.xml:544
 msgid "Hewlett-Packard Omnibook 6000/6100"
 msgstr "惠普 Omnibook 6000/6100"
 
-#: ../rules/base.xml.in.h:80
+#: rules/base.xml:551
 msgid "Honeywell Euroboard"
 msgstr "Honeywell 欧洲键盘"
 
-#: ../rules/base.xml.in.h:81
+#: rules/base.xml:558
 msgid "Hewlett-Packard Mini 110 laptop"
 msgstr "惠普 Mini 110 笔记本电脑"
 
-#: ../rules/base.xml.in.h:82
+#: rules/base.xml:565
 msgid "IBM Rapid Access"
 msgstr "IBM Rapid Access"
 
-#: ../rules/base.xml.in.h:83
+#: rules/base.xml:572
 msgid "IBM Rapid Access II"
 msgstr "IBM Rapid Access II"
 
-#: ../rules/base.xml.in.h:84
+#: rules/base.xml:579
 msgid "IBM ThinkPad 560Z/600/600E/A22E"
 msgstr "IBM ThinkPad 560Z/600/600E/A22E"
 
-#: ../rules/base.xml.in.h:85
+#: rules/base.xml:586
 msgid "IBM ThinkPad R60/T60/R61/T61"
 msgstr "IBM ThinkPad R60/T60/R61/T61"
 
-#: ../rules/base.xml.in.h:86
+#: rules/base.xml:593
 msgid "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 msgstr "IBM ThinkPad Z60m/Z60t/Z61m/Z61t"
 
-#: ../rules/base.xml.in.h:87
+#: rules/base.xml:600
 msgid "IBM Space Saver"
 msgstr ""
 
-#: ../rules/base.xml.in.h:88
+#: rules/base.xml:607
 msgid "Logitech Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:89
+#: rules/base.xml:614
 msgid "Logitech Cordless Desktop LX-300"
 msgstr "罗技无影手 LX-300"
 
-#: ../rules/base.xml.in.h:90
+#: rules/base.xml:621 rules/base.xml:629
 msgid "Logitech Internet 350"
 msgstr "罗技网际 350"
 
-#: ../rules/base.xml.in.h:91
+#: rules/base.xml:636
 msgid "Logitech Cordless Desktop"
 msgstr "罗技无影手"
 
-#: ../rules/base.xml.in.h:92
+#: rules/base.xml:643
 msgid "Logitech Cordless Desktop iTouch"
 msgstr "罗技网际无影手 iTouch"
 
-#: ../rules/base.xml.in.h:93
+#: rules/base.xml:650 rules/base.xml:685
 msgid "Logitech Cordless Desktop Navigator"
 msgstr "罗技无影手桌面导航器"
 
-#: ../rules/base.xml.in.h:94
+#: rules/base.xml:657
 msgid "Logitech Cordless Desktop Optical"
 msgstr "罗技无影手光学组合"
 
-#: ../rules/base.xml.in.h:95
+#: rules/base.xml:664
 msgid "Logitech Cordless Desktop (alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:96
+#: rules/base.xml:671
 msgid "Logitech Cordless Desktop Pro (2nd alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:97
+#: rules/base.xml:678
 msgid "Logitech Cordless Freedom/Desktop Navigator"
 msgstr "罗技极光无影手组合/桌面导航器"
 
-#: ../rules/base.xml.in.h:98
+#: rules/base.xml:692
 msgid "Logitech iTouch Cordless Y-RB6"
 msgstr ""
 
-#: ../rules/base.xml.in.h:99
+#: rules/base.xml:699
 msgid "Logitech Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:100
+#: rules/base.xml:706
 msgid "Logitech iTouch"
 msgstr "罗技 iTouch"
 
-#: ../rules/base.xml.in.h:101
+#: rules/base.xml:713
 msgid "Logitech Internet Navigator"
 msgstr ""
 
-#: ../rules/base.xml.in.h:102
+#: rules/base.xml:720
 msgid "Logitech Cordless Desktop EX110"
 msgstr "罗技无影手 EX110"
 
-#: ../rules/base.xml.in.h:103
+#: rules/base.xml:727
 msgid "Logitech iTouch Internet Navigator SE"
 msgstr ""
 
-#: ../rules/base.xml.in.h:104
+#: rules/base.xml:734
 msgid "Logitech iTouch Internet Navigator SE USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:105
+#: rules/base.xml:741
 msgid "Logitech Ultra-X"
 msgstr ""
 
-#: ../rules/base.xml.in.h:106
+#: rules/base.xml:748
 msgid "Logitech Ultra-X Cordless Media Desktop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:107
+#: rules/base.xml:755
 msgid "Logitech diNovo"
 msgstr ""
 
-#: ../rules/base.xml.in.h:108
+#: rules/base.xml:762
 msgid "Logitech diNovo Edge"
 msgstr ""
 
-#: ../rules/base.xml.in.h:109
+#: rules/base.xml:769
 msgid "Memorex MX1998"
 msgstr "Memorex MX1998"
 
-#: ../rules/base.xml.in.h:110
+#: rules/base.xml:776
 msgid "Memorex MX2500 EZ-Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:111
+#: rules/base.xml:783
 msgid "Memorex MX2750"
 msgstr "Memorex MX2750"
 
-#: ../rules/base.xml.in.h:112
+#: rules/base.xml:790
 msgid "Microsoft Natural Ergonomic 4000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:113
+#: rules/base.xml:797
 msgid "Microsoft Natural Wireless Ergonomic 7000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:114
+#: rules/base.xml:804
 msgid "Microsoft Internet"
 msgstr "微软网际"
 
-#: ../rules/base.xml.in.h:115
+#: rules/base.xml:811
 msgid "Microsoft Natural Pro/Internet Pro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:116
+#: rules/base.xml:818
 msgid "Microsoft Natural Pro USB/Internet Pro"
 msgstr ""
 
-#: ../rules/base.xml.in.h:117
+#: rules/base.xml:825
 msgid "Microsoft Natural Pro OEM"
 msgstr ""
 
-#: ../rules/base.xml.in.h:118
+#: rules/base.xml:832
 msgid "ViewSonic KU-306 Internet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:119
+#: rules/base.xml:839
 msgid "Microsoft Internet Pro (Swedish)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:120
+#: rules/base.xml:846
 msgid "Microsoft Office Keyboard"
 msgstr "微软 Office 键盘"
 
-#: ../rules/base.xml.in.h:121
+#: rules/base.xml:853
 msgid "Microsoft Wireless Multimedia 1.0A"
 msgstr ""
 
-#: ../rules/base.xml.in.h:122
+#: rules/base.xml:867
 msgid "Microsoft Natural Elite"
 msgstr ""
 
-#: ../rules/base.xml.in.h:123
+#: rules/base.xml:874
 msgid "Microsoft Comfort Curve 2000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:124
+#: rules/base.xml:881
 msgid "Ortek Multimedia/Internet MCK-800"
 msgstr ""
 
-#: ../rules/base.xml.in.h:125
+#: rules/base.xml:888
 msgid "Propeller Voyager KTEZ-1000"
 msgstr ""
 
-#: ../rules/base.xml.in.h:126
+#: rules/base.xml:895
 msgid "QTronix Scorpius 98N+"
 msgstr "QTronix Scorpius 98N+"
 
-#: ../rules/base.xml.in.h:127
+#: rules/base.xml:902
 msgid "Samsung SDM 4500P"
 msgstr "三星 SDM 4500P"
 
-#: ../rules/base.xml.in.h:128
+#: rules/base.xml:909
 msgid "Samsung SDM 4510P"
 msgstr "三星 SDM 4510P"
 
-#: ../rules/base.xml.in.h:129
+#: rules/base.xml:916
 msgid "Sanwa Supply SKB-KG3"
 msgstr ""
 
-#: ../rules/base.xml.in.h:130
+#: rules/base.xml:923
 msgid "NEC SK-1300"
 msgstr ""
 
-#: ../rules/base.xml.in.h:131
+#: rules/base.xml:930
 msgid "NEC SK-2500"
 msgstr ""
 
-#: ../rules/base.xml.in.h:132
+#: rules/base.xml:937
 msgid "NEC SK-6200"
 msgstr ""
 
-#: ../rules/base.xml.in.h:133
+#: rules/base.xml:944
 msgid "NEC SK-7100"
 msgstr ""
 
-#: ../rules/base.xml.in.h:134
+#: rules/base.xml:951
 msgid "Super Power Multimedia"
 msgstr ""
 
-#: ../rules/base.xml.in.h:135
+#: rules/base.xml:958
 msgid "SVEN Ergonomic 2500"
 msgstr "SVEN Ergonomic 2500"
 
-#: ../rules/base.xml.in.h:136
+#: rules/base.xml:965
 msgid "SVEN Slim 303"
 msgstr "SVEN Slim 303"
 
-#: ../rules/base.xml.in.h:137
+#: rules/base.xml:972
 msgid "Symplon PaceBook tablet"
 msgstr ""
 
-#: ../rules/base.xml.in.h:138
+#: rules/base.xml:979
 msgid "Toshiba Satellite S3000"
 msgstr "东芝 Satellite S3000"
 
-#: ../rules/base.xml.in.h:139
+#: rules/base.xml:986
 msgid "Trust Wireless Classic"
 msgstr "Trust 无线经典"
 
-#: ../rules/base.xml.in.h:140
+#: rules/base.xml:993
 msgid "Trust Direct Access"
 msgstr ""
 
-#: ../rules/base.xml.in.h:141
+#: rules/base.xml:1000
 msgid "Trust Slimline"
 msgstr ""
 
-#: ../rules/base.xml.in.h:142
+#: rules/base.xml:1007
 msgid "TypeMatrix EZ-Reach 2020"
 msgstr ""
 
-#: ../rules/base.xml.in.h:143
+#: rules/base.xml:1014
 msgid "TypeMatrix EZ-Reach 2030 PS2"
 msgstr ""
 
-#: ../rules/base.xml.in.h:144
+#: rules/base.xml:1021
 msgid "TypeMatrix EZ-Reach 2030 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:145
+#: rules/base.xml:1028
 msgid "TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:146
+#: rules/base.xml:1035
 msgid "TypeMatrix EZ-Reach 2030 USB (106:JP mode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:147
+#: rules/base.xml:1042
 msgid "Yahoo! Internet"
 msgstr "雅虎网际"
 
-#: ../rules/base.xml.in.h:148
+#: rules/base.xml:1049
 msgid "MacBook/MacBook Pro"
 msgstr "MacBook/MacBook Pro"
 
-#: ../rules/base.xml.in.h:149
+#: rules/base.xml:1056
 msgid "MacBook/MacBook Pro (intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:150
+#: rules/base.xml:1063
 msgid "Macintosh"
 msgstr "Macintosh"
 
-#: ../rules/base.xml.in.h:151
+#: rules/base.xml:1070
 msgid "Macintosh Old"
 msgstr "传统 Macintosh"
 
-#: ../rules/base.xml.in.h:152
+#: rules/base.xml:1077
 msgid "Happy Hacking for Mac"
 msgstr ""
 
-#: ../rules/base.xml.in.h:153
+#: rules/base.xml:1084
 msgid "Acer C300"
 msgstr "宏碁 C300"
 
-#: ../rules/base.xml.in.h:154
+#: rules/base.xml:1091
 msgid "Acer Ferrari 4000"
 msgstr "宏碁法拉利 4000"
 
-#: ../rules/base.xml.in.h:155
+#: rules/base.xml:1098
 msgid "Acer laptop"
 msgstr "宏碁笔记本电脑"
 
-#: ../rules/base.xml.in.h:156
+#: rules/base.xml:1105
 msgid "Asus laptop"
 msgstr "华硕笔记本电脑"
 
-#: ../rules/base.xml.in.h:157
+#: rules/base.xml:1112
 msgid "Apple"
 msgstr "苹果"
 
-#: ../rules/base.xml.in.h:158
+#: rules/base.xml:1119
 msgid "Apple laptop"
 msgstr "苹果笔记本电脑"
 
-#: ../rules/base.xml.in.h:159
+#: rules/base.xml:1126
 msgid "Apple Aluminium (ANSI)"
 msgstr "苹果铝（ANSI）"
 
-#: ../rules/base.xml.in.h:160
+#: rules/base.xml:1133
 msgid "Apple Aluminium (ISO)"
 msgstr "苹果铝（ISO）"
 
-#: ../rules/base.xml.in.h:161
+#: rules/base.xml:1140
 msgid "Apple Aluminium (JIS)"
 msgstr "苹果铝（JIS）"
 
-#: ../rules/base.xml.in.h:162
+#: rules/base.xml:1147
 msgid "Silvercrest Multimedia Wireless"
 msgstr ""
 
-#: ../rules/base.xml.in.h:163
+#: rules/base.xml:1154
 msgid "eMachines m6800 laptop"
 msgstr ""
 
-#: ../rules/base.xml.in.h:164
+#: rules/base.xml:1161
 msgid "BenQ X-Touch"
 msgstr "明基 X-Touch"
 
-#: ../rules/base.xml.in.h:165
+#: rules/base.xml:1168
 msgid "BenQ X-Touch 730"
 msgstr "明基 X-Touch 730"
 
-#: ../rules/base.xml.in.h:166
+#: rules/base.xml:1175
 msgid "BenQ X-Touch 800"
 msgstr "明基 X-Touch 800"
 
-#: ../rules/base.xml.in.h:167
+#: rules/base.xml:1182
 msgid "Happy Hacking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:168
+#: rules/base.xml:1189
 msgid "Classmate PC"
 msgstr "Classmate PC"
 
-#: ../rules/base.xml.in.h:169
+#: rules/base.xml:1196
 msgid "OLPC"
 msgstr "OLPC"
 
-#: ../rules/base.xml.in.h:170
+#: rules/base.xml:1203
 msgid "Sun Type 7 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:171
+#: rules/base.xml:1210
 msgid "Sun Type 7 USB (European)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:172
+#: rules/base.xml:1217
 msgid "Sun Type 7 USB (Unix)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:173
+#: rules/base.xml:1224
 msgid "Sun Type 7 USB (Japanese)/Japanese 106-key"
 msgstr ""
 
-#: ../rules/base.xml.in.h:174
+#: rules/base.xml:1231
 msgid "Sun Type 6/7 USB"
 msgstr ""
 
-#: ../rules/base.xml.in.h:175
+#: rules/base.xml:1238
 msgid "Sun Type 6/7 USB (European)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:176
+#: rules/base.xml:1245
 msgid "Sun Type 6 USB (Unix)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:177
+#: rules/base.xml:1252
 msgid "Sun Type 6 USB (Japanese)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:178
+#: rules/base.xml:1259
 msgid "Sun Type 6 (Japanese)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:179
+#: rules/base.xml:1266
 msgid "Targa Visionary 811"
 msgstr ""
 
-#: ../rules/base.xml.in.h:180
+#: rules/base.xml:1273
 msgid "Unitek KB-1925"
 msgstr ""
 
-#: ../rules/base.xml.in.h:181
+#: rules/base.xml:1280
 msgid "FL90"
 msgstr "FL90"
 
-#: ../rules/base.xml.in.h:182
+#: rules/base.xml:1287
 msgid "Creative Desktop Wireless 7000"
 msgstr "创新台式机无限键盘 7000"
 
@@ -754,449 +754,468 @@
 msgid "Htc Dream phone"
 msgstr "Htc Dream 电话(Google G1)"
 
-#: ../rules/base.xml.in.h:184
+#: rules/base.xml:1294
 msgid "Truly Ergonomic 227"
 msgstr ""
 
-#: ../rules/base.xml.in.h:185
+#: rules/base.xml:1301
 msgid "Truly Ergonomic 229"
 msgstr ""
 
-#: ../rules/base.xml.in.h:186
+#: rules/base.xml:1308
 msgid "SteelSeries Apex 300 (Apex RAW)"
 msgstr ""
 
 #. Keyboard indicator for English layouts
-#: ../rules/base.xml.in.h:191 ../rules/base.extras.xml.in.h:61
+#. Keyboard indicator for Australian layouts
+#. Keyboard indicator for English layouts
+#: rules/base.xml:1339 rules/base.xml:1737 rules/base.xml:2257
+#: rules/base.xml:2684 rules/base.xml:3362 rules/base.xml:5576
+#: rules/base.xml:5823 rules/base.xml:5866 rules/base.xml:6011
+#: rules/base.xml:6022 rules/base.extras.xml:337 rules/base.extras.xml:1171
 msgid "en"
 msgstr "en"
 
-#: ../rules/base.xml.in.h:192 ../rules/base.extras.xml.in.h:62
+#: rules/base.xml:1340 rules/base.extras.xml:338
 msgid "English (US)"
 msgstr "英语（美国）"
 
 #. Keyboard indicator for Cherokee layouts
-#: ../rules/base.xml.in.h:194
+#: rules/base.xml:1350
 msgid "chr"
 msgstr "chr"
 
-#: ../rules/base.xml.in.h:195
+#: rules/base.xml:1351
 msgid "Cherokee"
 msgstr ""
 
-#: ../rules/base.xml.in.h:196
+#: rules/base.xml:1360
 msgid "English (US, euro on 5)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:197
+#: rules/base.xml:1366
 msgid "English (US, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:198
+#: rules/base.xml:1372
 msgid "English (US, alt. intl.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:199
+#: rules/base.xml:1378
 msgid "English (Colemak)"
 msgstr "英语（阔码键盘）"
 
-#: ../rules/base.xml.in.h:200
+#: rules/base.xml:1384
 msgid "English (Dvorak)"
 msgstr "英语（Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:201
+#: rules/base.xml:1390
 msgid "English (Dvorak, intl., with dead keys)"
 msgstr "英语（Dvorak 布局，国际，带死键）"
 
-#: ../rules/base.xml.in.h:202
+#: rules/base.xml:1396
 msgid "English (Dvorak, alt. intl.)"
-msgstr ""
+msgstr "英语（Dvorak 布局，替代，国际）"
 
-#: ../rules/base.xml.in.h:203
+#: rules/base.xml:1402
 msgid "English (Dvorak, left-handed)"
 msgstr "英语（左手 Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:204
+#: rules/base.xml:1408
 msgid "English (Dvorak, right-handed)"
 msgstr "英语（右手 Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:205
+#: rules/base.xml:1414
 msgid "English (classic Dvorak)"
 msgstr "英语（经典 Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:206
+#: rules/base.xml:1420
 msgid "English (programmer Dvorak)"
 msgstr "英语（适合程序员的 Dvorak 布局）"
 
 #. Keyboard indicator for Russian layouts
-#: ../rules/base.xml.in.h:208 ../rules/base.extras.xml.in.h:35
+#: rules/base.xml:1427 rules/base.xml:2908 rules/base.xml:3488
+#: rules/base.xml:3626 rules/base.xml:4055 rules/base.xml:4549
+#: rules/base.xml:4669 rules/base.xml:5069 rules/base.xml:5080
+#: rules/base.extras.xml:177 rules/base.extras.xml:188
+#: rules/base.extras.xml:566 rules/base.extras.xml:582
+#: rules/base.extras.xml:618
 msgid "ru"
 msgstr "ru"
 
-#: ../rules/base.xml.in.h:209
+#: rules/base.xml:1428
 msgid "Russian (US, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:210
+#: rules/base.xml:1437
 msgid "English (Macintosh)"
 msgstr "英语(Macintosh)"
 
-#: ../rules/base.xml.in.h:211
+#: rules/base.xml:1443
 msgid "English (intl., with AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:212
+#: rules/base.xml:1454
 msgid "English (the divide/multiply keys toggle the layout)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:213
+#: rules/base.xml:1460
 msgid "Serbo-Croatian (US)"
 msgstr "塞尔维亚-克罗地亚语(美国键盘)"
 
-#: ../rules/base.xml.in.h:214
+#: rules/base.xml:1479
 msgid "English (Workman)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:215
+#: rules/base.xml:1485
 msgid "English (Workman, intl., with dead keys)"
 msgstr ""
 
+#. Keyboard indicator for Afghani layouts
 #. Keyboard indicator for Persian layouts
-#: ../rules/base.xml.in.h:217 ../rules/base.extras.xml.in.h:43
+#: rules/base.xml:1494 rules/base.xml:1535 rules/base.xml:3037
+#: rules/base.extras.xml:226
 msgid "fa"
 msgstr "fa"
 
-#: ../rules/base.xml.in.h:218
+#: rules/base.xml:1495
 msgid "Afghani"
 msgstr "阿富汗"
 
 #. Keyboard indicator for Pashto layouts
-#: ../rules/base.xml.in.h:220
+#: rules/base.xml:1502 rules/base.xml:1524
 msgid "ps"
 msgstr "ps"
 
-#: ../rules/base.xml.in.h:221
+#: rules/base.xml:1503
 msgid "Pashto"
-msgstr "普什图式"
+msgstr "普什图语"
 
 #. Keyboard indicator for Uzbek layouts
-#: ../rules/base.xml.in.h:223
+#: rules/base.xml:1513 rules/base.xml:1543 rules/base.xml:5642
 msgid "uz"
 msgstr "uz"
 
-#: ../rules/base.xml.in.h:224
+#: rules/base.xml:1514
 msgid "Uzbek (Afghanistan)"
-msgstr "乌兹别克语(阿富汗)"
+msgstr "乌兹别克语（阿富汗）"
 
-#: ../rules/base.xml.in.h:225
+#: rules/base.xml:1525
 msgid "Pashto (Afghanistan, OLPC)"
-msgstr ""
+msgstr "普什图语（阿富汗，OLPC）"
 
-#: ../rules/base.xml.in.h:226
+#: rules/base.xml:1536
 msgid "Persian (Afghanistan, Dari OLPC)"
 msgstr "波斯语（阿富汗，Dari OLPC）"
 
-#: ../rules/base.xml.in.h:227
+#: rules/base.xml:1544
 msgid "Uzbek (Afghanistan, OLPC)"
 msgstr "乌兹别克语(阿富汗，OLPC)"
 
 #. Keyboard indicator for Arabic layouts
-#: ../rules/base.xml.in.h:229 ../rules/base.extras.xml.in.h:106
+#. Keyboard indicator for Iraqi layouts
+#. Keyboard indicator for Arabic layouts
+#: rules/base.xml:1556 rules/base.xml:2400 rules/base.xml:2413
+#: rules/base.xml:3100 rules/base.xml:5223 rules/base.xml:5787
+#: rules/base.extras.xml:734
 msgid "ar"
 msgstr "ar"
 
-#: ../rules/base.xml.in.h:230 ../rules/base.extras.xml.in.h:107
+#: rules/base.xml:1557 rules/base.extras.xml:735
 msgid "Arabic"
 msgstr "阿拉伯语"
 
-#: ../rules/base.xml.in.h:231
+#: rules/base.xml:1587
 msgid "Arabic (AZERTY)"
-msgstr ""
+msgstr "阿拉伯语（AZERTY）"
 
-#: ../rules/base.xml.in.h:232
+#: rules/base.xml:1593
 msgid "Arabic (AZERTY/digits)"
-msgstr ""
+msgstr "阿拉伯语（AZERTY/数字）"
 
-#: ../rules/base.xml.in.h:233
+#: rules/base.xml:1599
 msgid "Arabic (digits)"
-msgstr "阿拉伯语(数字)"
+msgstr "阿拉伯语（数字）"
 
-#: ../rules/base.xml.in.h:234
+#: rules/base.xml:1605
 msgid "Arabic (QWERTY)"
 msgstr "阿拉伯语（QWERTY 布局）"
 
-#: ../rules/base.xml.in.h:235
+#: rules/base.xml:1611
 msgid "Arabic (qwerty/digits)"
 msgstr "阿拉伯语(qwerty/数字)"
 
-#: ../rules/base.xml.in.h:236
+#: rules/base.xml:1617
 msgid "Arabic (Buckwalter)"
 msgstr "阿拉伯语(Buckwalter)"
 
-#: ../rules/base.xml.in.h:237
+#: rules/base.xml:1623
 msgid "Arabic (OLPC)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:238
+#: rules/base.xml:1629
 msgid "Arabic (Macintosh)"
 msgstr "阿拉伯语（Mac）"
 
 #. Keyboard indicator for Albanian layouts
-#: ../rules/base.xml.in.h:240
+#: rules/base.xml:1638
 msgid "sq"
 msgstr "sq"
 
-#: ../rules/base.xml.in.h:241
+#: rules/base.xml:1639
 msgid "Albanian"
 msgstr "阿尔巴尼亚"
 
-#: ../rules/base.xml.in.h:242
+#: rules/base.xml:1648
 msgid "Albanian (Plisi)"
 msgstr ""
 
 #. Keyboard indicator for Armenian layouts
-#: ../rules/base.xml.in.h:244 ../rules/base.extras.xml.in.h:100
+#: rules/base.xml:1663 rules/base.extras.xml:695
 msgid "hy"
 msgstr "hy"
 
-#: ../rules/base.xml.in.h:245 ../rules/base.extras.xml.in.h:101
+#: rules/base.xml:1664 rules/base.extras.xml:696
 msgid "Armenian"
 msgstr "亚美尼亚语"
 
-#: ../rules/base.xml.in.h:246
+#: rules/base.xml:1673
 msgid "Armenian (phonetic)"
 msgstr "亚美尼亚语(音标)"
 
-#: ../rules/base.xml.in.h:247
+#: rules/base.xml:1679
 msgid "Armenian (alt. phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:248
+#: rules/base.xml:1685
 msgid "Armenian (eastern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:249
+#: rules/base.xml:1691
 msgid "Armenian (western)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:250
+#: rules/base.xml:1697
 msgid "Armenian (alt. eastern)"
 msgstr ""
 
 #. Keyboard indicator for German layouts
-#: ../rules/base.xml.in.h:252 ../rules/base.extras.xml.in.h:22
+#: rules/base.xml:1706 rules/base.xml:3510 rules/base.xml:5135
+#: rules/base.xml:5153 rules/base.xml:5161 rules/base.xml:5213
+#: rules/base.extras.xml:95 rules/base.extras.xml:1120
 msgid "de"
 msgstr "de"
 
-#: ../rules/base.xml.in.h:253
+#: rules/base.xml:1707
 msgid "German (Austria)"
 msgstr "德语(奥地利)"
 
-#: ../rules/base.xml.in.h:254
+#: rules/base.xml:1716
 msgid "German (Austria, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:255
+#: rules/base.xml:1722
 msgid "German (Austria, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:256
+#: rules/base.xml:1728
 msgid "German (Austria, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:257
+#: rules/base.xml:1738
 msgid "English (Australian)"
 msgstr ""
 
 #. Keyboard indicator for Azerbaijani layouts
-#: ../rules/base.xml.in.h:259
+#: rules/base.xml:1748
 msgid "az"
 msgstr "az"
 
-#: ../rules/base.xml.in.h:260
+#: rules/base.xml:1749
 msgid "Azerbaijani"
 msgstr "阿塞拜疆语"
 
-#: ../rules/base.xml.in.h:261
+#: rules/base.xml:1758
 msgid "Azerbaijani (Cyrillic)"
 msgstr "阿塞拜疆语(西里尔)"
 
 #. Keyboard indicator for Belarusian layouts
-#: ../rules/base.xml.in.h:263
+#: rules/base.xml:1767
 msgid "by"
 msgstr ""
 
-#: ../rules/base.xml.in.h:264
+#: rules/base.xml:1768
 msgid "Belarusian"
 msgstr "白俄罗斯语"
 
-#: ../rules/base.xml.in.h:265
+#: rules/base.xml:1777
 msgid "Belarusian (legacy)"
 msgstr "白俄罗斯语(的)"
 
-#: ../rules/base.xml.in.h:266
+#: rules/base.xml:1783
 msgid "Belarusian (Latin)"
 msgstr "白俄罗斯语(拉丁)"
 
 #. Keyboard indicator for Belgian layouts
-#: ../rules/base.xml.in.h:268 ../rules/base.extras.xml.in.h:112
+#: rules/base.xml:1792 rules/base.extras.xml:767
 msgid "be"
 msgstr "be"
 
-#: ../rules/base.xml.in.h:269 ../rules/base.extras.xml.in.h:113
+#: rules/base.xml:1793 rules/base.extras.xml:768
 msgid "Belgian"
 msgstr "比利时语"
 
-#: ../rules/base.xml.in.h:270
+#: rules/base.xml:1804
 msgid "Belgian (alt.)"
-msgstr ""
+msgstr "比利时语（替代）"
 
-#: ../rules/base.xml.in.h:271
+#: rules/base.xml:1810
 msgid "Belgian (alt., Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:272
+#: rules/base.xml:1816
 msgid "Belgian (alt., with Sun dead keys)"
-msgstr ""
+msgstr "比利时语（替代，带有 Sun 死键）"
 
-#: ../rules/base.xml.in.h:273
+#: rules/base.xml:1822
 msgid "Belgian (alt. ISO)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:274
+#: rules/base.xml:1828
 msgid "Belgian (no dead keys)"
-msgstr ""
+msgstr "比利时语（无死键）"
 
-#: ../rules/base.xml.in.h:275
+#: rules/base.xml:1834
 msgid "Belgian (with Sun dead keys)"
-msgstr ""
+msgstr "比利时语（带有 Sun 死键）"
 
-#: ../rules/base.xml.in.h:276
+#: rules/base.xml:1840
 msgid "Belgian (Wang 724 AZERTY)"
 msgstr ""
 
 #. Keyboard indicator for Bangla layouts
-#: ../rules/base.xml.in.h:278
+#: rules/base.xml:1849 rules/base.xml:1878 rules/base.xml:1891
 msgid "bn"
 msgstr "bn"
 
-#: ../rules/base.xml.in.h:279
+#: rules/base.xml:1850
 msgid "Bangla"
-msgstr ""
+msgstr "孟加拉语"
 
-#: ../rules/base.xml.in.h:280
+#: rules/base.xml:1861
 msgid "Bangla (Probhat)"
 msgstr ""
 
 #. Keyboard indicator for Indian layouts
-#: ../rules/base.xml.in.h:282
+#: rules/base.xml:1870
 msgid "in"
 msgstr "in"
 
-#: ../rules/base.xml.in.h:283
+#: rules/base.xml:1871
 msgid "Indian"
 msgstr "印地语"
 
-#: ../rules/base.xml.in.h:284
+#: rules/base.xml:1879
 msgid "Bangla (India)"
-msgstr ""
+msgstr "孟加拉语（印度）"
 
-#: ../rules/base.xml.in.h:285
+#: rules/base.xml:1892
 msgid "Bangla (India, Probhat)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:286
+#: rules/base.xml:1903
 msgid "Bangla (India, Baishakhi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:287
+#: rules/base.xml:1914
 msgid "Bangla (India, Bornona)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:288
+#: rules/base.xml:1925
 msgid "Bangla (India, Uni Gitanjali)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:289
+#: rules/base.xml:1936
 msgid "Bangla (India, Baishakhi Inscript)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:290
+#: rules/base.xml:1947
 msgid "Manipuri (Eeyek)"
 msgstr ""
 
 #. Keyboard indicator for Gujarati layouts
-#: ../rules/base.xml.in.h:292
+#: rules/base.xml:1957
 msgid "gu"
 msgstr "gu"
 
-#: ../rules/base.xml.in.h:293
+#: rules/base.xml:1958
 msgid "Gujarati"
 msgstr "古吉拉特"
 
 #. Keyboard indicator for Punjabi layouts
-#: ../rules/base.xml.in.h:295
+#: rules/base.xml:1968 rules/base.xml:1979
 msgid "pa"
 msgstr "pa"
 
-#: ../rules/base.xml.in.h:296
+#: rules/base.xml:1969
 msgid "Punjabi (Gurmukhi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:297
+#: rules/base.xml:1980
 msgid "Punjabi (Gurmukhi Jhelum)"
 msgstr ""
 
 #. Keyboard indicator for Kannada layouts
-#: ../rules/base.xml.in.h:299
+#: rules/base.xml:1990 rules/base.xml:2001
 msgid "kn"
 msgstr "kn"
 
-#: ../rules/base.xml.in.h:300
+#: rules/base.xml:1991
 msgid "Kannada"
 msgstr "埃纳德"
 
-#: ../rules/base.xml.in.h:301
+#: rules/base.xml:2002
 msgid "Kannada (KaGaPa phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Malayalam layouts
-#: ../rules/base.xml.in.h:303
+#: rules/base.xml:2012 rules/base.xml:2023 rules/base.xml:2034
 msgid "ml"
 msgstr "ml"
 
-#: ../rules/base.xml.in.h:304
+#: rules/base.xml:2013
 msgid "Malayalam"
 msgstr "马来西亚"
 
-#: ../rules/base.xml.in.h:305
+#: rules/base.xml:2024
 msgid "Malayalam (Lalitha)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:306
+#: rules/base.xml:2035
 msgid "Malayalam (enhanced Inscript, with rupee)"
 msgstr ""
 
 #. Keyboard indicator for Oriya layouts
-#: ../rules/base.xml.in.h:308
+#: rules/base.xml:2045
 msgid "or"
 msgstr "or"
 
-#: ../rules/base.xml.in.h:309
+#: rules/base.xml:2046
 msgid "Oriya"
 msgstr "Oriya"
 
 #. Keyboard indicator for Ol Chiki layouts
-#: ../rules/base.xml.in.h:311
+#: rules/base.xml:2058
 msgid "sat"
 msgstr ""
 
-#: ../rules/base.xml.in.h:312
+#: rules/base.xml:2059
 msgid "Ol Chiki"
 msgstr ""
 
 #. Keyboard indicator for Tamil layouts
-#: ../rules/base.xml.in.h:314
+#: rules/base.xml:2070 rules/base.xml:2081 rules/base.xml:2092
+#: rules/base.xml:2103 rules/base.xml:2114 rules/base.xml:5315
 msgid "ta"
 msgstr "ta"
 
@@ -1221,1723 +1240,1739 @@
 msgstr "泰米尔语"
 
 #. Keyboard indicator for Telugu layouts
-#: ../rules/base.xml.in.h:321
+#: rules/base.xml:2125 rules/base.xml:2136 rules/base.xml:2147
+#: rules/base.xml:2158
 msgid "te"
 msgstr "te"
 
-#: ../rules/base.xml.in.h:322
+#: rules/base.xml:2126
 msgid "Telugu"
 msgstr "泰卢固"
 
-#: ../rules/base.xml.in.h:323
+#: rules/base.xml:2137 rules/base.xml:2159
 msgid "Telugu (KaGaPa phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:324
+#: rules/base.xml:2148
 msgid "Telugu (Sarala)"
 msgstr ""
 
 #. Keyboard indicator for Urdu layouts
-#: ../rules/base.xml.in.h:326
+#: rules/base.xml:2169 rules/base.xml:2180 rules/base.xml:2191
+#: rules/base.xml:5765
 msgid "ur"
 msgstr "ur"
 
-#: ../rules/base.xml.in.h:327
+#: rules/base.xml:2170
 msgid "Urdu (phonetic)"
 msgstr "乌尔都语(音标)"
 
-#: ../rules/base.xml.in.h:328
+#: rules/base.xml:2181
 msgid "Urdu (alt. phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:329
+#: rules/base.xml:2192
 msgid "Urdu (Win keys)"
 msgstr ""
 
 #. Keyboard indicator for Hindi layouts
-#: ../rules/base.xml.in.h:331
+#: rules/base.xml:2202 rules/base.xml:2213 rules/base.xml:2224
 msgid "hi"
 msgstr "hi"
 
-#: ../rules/base.xml.in.h:332
+#: rules/base.xml:2203
 msgid "Hindi (Bolnagri)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:333
+#: rules/base.xml:2214
 msgid "Hindi (Wx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:334
+#: rules/base.xml:2225
 msgid "Hindi (KaGaPa phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Sanskrit layouts
-#: ../rules/base.xml.in.h:336
+#: rules/base.xml:2235
 msgid "sa"
 msgstr ""
 
-#: ../rules/base.xml.in.h:337
+#: rules/base.xml:2236
 msgid "Sanskrit (KaGaPa phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Marathi layouts
-#: ../rules/base.xml.in.h:339
+#: rules/base.xml:2246
 msgid "mr"
 msgstr ""
 
-#: ../rules/base.xml.in.h:340
+#: rules/base.xml:2247
 msgid "Marathi (KaGaPa phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:341
+#: rules/base.xml:2258
 msgid "English (India, with rupee)"
 msgstr ""
 
 #. Keyboard indicator for Bosnian layouts
-#: ../rules/base.xml.in.h:343
+#: rules/base.xml:2270
 msgid "bs"
 msgstr "bs"
 
-#: ../rules/base.xml.in.h:344
+#: rules/base.xml:2271
 msgid "Bosnian"
 msgstr "波斯尼亚语"
 
-#: ../rules/base.xml.in.h:345
+#: rules/base.xml:2280
 msgid "Bosnian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:346
+#: rules/base.xml:2286
 msgid "Bosnian (with Bosnian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:347
+#: rules/base.xml:2292
 msgid "Bosnian (US, with Bosnian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:348
+#: rules/base.xml:2298
 msgid "Bosnian (US, with Bosnian letters)"
 msgstr ""
 
 #. Keyboard indicator for Portuguese layouts
-#: ../rules/base.xml.in.h:350 ../rules/base.extras.xml.in.h:115
+#: rules/base.xml:2307 rules/base.xml:4568 rules/base.extras.xml:782
+#: rules/base.extras.xml:1024 rules/base.extras.xml:1039
 msgid "pt"
 msgstr "pt"
 
-#: ../rules/base.xml.in.h:351 ../rules/base.extras.xml.in.h:116
+#: rules/base.xml:2308 rules/base.extras.xml:783
 msgid "Portuguese (Brazil)"
 msgstr "葡萄牙(巴西)"
 
-#: ../rules/base.xml.in.h:352
+#: rules/base.xml:2317
 msgid "Portuguese (Brazil, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:353
+#: rules/base.xml:2323
 msgid "Portuguese (Brazil, Dvorak)"
 msgstr "葡萄牙语(巴西，Dvorak)"
 
-#: ../rules/base.xml.in.h:354
+#: rules/base.xml:2329
 msgid "Portuguese (Brazil, Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:355
+#: rules/base.xml:2335
 msgid "Portuguese (Brazil, Nativo for US keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:356
+#: rules/base.xml:2341
 msgid "Esperanto (Brazil, Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:357
+#: rules/base.xml:2350
 msgid "Portuguese (Brazil, IBM/Lenovo ThinkPad)"
 msgstr ""
 
 #. Keyboard indicator for Bulgarian layouts
-#: ../rules/base.xml.in.h:359
+#: rules/base.xml:2359
 msgid "bg"
 msgstr "bg"
 
-#: ../rules/base.xml.in.h:360
+#: rules/base.xml:2360
 msgid "Bulgarian"
 msgstr "保加利亚"
 
-#: ../rules/base.xml.in.h:361
+#: rules/base.xml:2369
 msgid "Bulgarian (traditional phonetic)"
 msgstr "保加利亚(传统音标)"
 
-#: ../rules/base.xml.in.h:362
+#: rules/base.xml:2375
 msgid "Bulgarian (new phonetic)"
 msgstr "保加利亚(新音标)"
 
-#: ../rules/base.xml.in.h:363
+#: rules/base.xml:2383
 msgid "la"
 msgstr ""
 
-#: ../rules/base.xml.in.h:364
+#: rules/base.xml:2384
 msgid "Berber (Algeria, Latin)"
 msgstr ""
 
 #. Keyboard indicator for Berber layouts
-#: ../rules/base.xml.in.h:366
+#: rules/base.xml:2390 rules/base.xml:2432 rules/base.xml:2443
+#: rules/base.xml:2454 rules/base.xml:2465 rules/base.xml:2476
+#: rules/base.xml:2487
 msgid "ber"
 msgstr "ber"
 
-#: ../rules/base.xml.in.h:367
+#: rules/base.xml:2391
 msgid "Berber (Algeria, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:368
+#: rules/base.xml:2401
 msgid "Arabic (Algeria)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:369
+#: rules/base.xml:2414
 msgid "Arabic (Morocco)"
 msgstr "阿拉伯语(摩洛哥)"
 
 #. Keyboard indicator for French layouts
-#: ../rules/base.xml.in.h:371 ../rules/base.extras.xml.in.h:15
+#: rules/base.xml:2421 rules/base.xml:2628 rules/base.xml:2639
+#: rules/base.xml:2647 rules/base.xml:2697 rules/base.xml:3223
+#: rules/base.xml:3453 rules/base.xml:5169 rules/base.xml:5180
+#: rules/base.xml:5191 rules/base.xml:5202 rules/base.xml:6000
+#: rules/base.extras.xml:63 rules/base.extras.xml:908
 msgid "fr"
 msgstr "fr"
 
-#: ../rules/base.xml.in.h:372
+#: rules/base.xml:2422
 msgid "French (Morocco)"
 msgstr "法语(摩洛哥)"
 
-#: ../rules/base.xml.in.h:373
+#: rules/base.xml:2433
 msgid "Berber (Morocco, Tifinagh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:374
+#: rules/base.xml:2444
 msgid "Berber (Morocco, Tifinagh alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:375
+#: rules/base.xml:2455
 msgid "Berber (Morocco, Tifinagh alt. phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:376
+#: rules/base.xml:2466
 msgid "Berber (Morocco, Tifinagh extended)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:377
+#: rules/base.xml:2477
 msgid "Berber (Morocco, Tifinagh phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:378
+#: rules/base.xml:2488
 msgid "Berber (Morocco, Tifinagh extended phonetic)"
 msgstr ""
 
 #. Keyboard indicator for Cameroon layouts
-#: ../rules/base.xml.in.h:380 ../rules/base.extras.xml.in.h:193
+#: rules/base.xml:2500 rules/base.extras.xml:1253
 msgid "cm"
 msgstr ""
 
-#: ../rules/base.xml.in.h:381 ../rules/base.extras.xml.in.h:194
+#: rules/base.xml:2501 rules/base.extras.xml:1254
 msgid "English (Cameroon)"
-msgstr ""
+msgstr "英语（喀麦隆）"
 
-#: ../rules/base.xml.in.h:382
+#: rules/base.xml:2510
 msgid "French (Cameroon)"
-msgstr ""
+msgstr "法语（喀麦隆）"
 
-#: ../rules/base.xml.in.h:383
+#: rules/base.xml:2519
 msgid "Cameroon Multilingual (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:384
+#: rules/base.xml:2556
 msgid "Cameroon Multilingual (AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:385
+#: rules/base.xml:2593
 msgid "Cameroon Multilingual (Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:386 ../rules/base.extras.xml.in.h:195
+#: rules/base.xml:2599 rules/base.extras.xml:1260
 msgid "Mmuock"
 msgstr ""
 
 #. Keyboard indicator for Burmese layouts
-#: ../rules/base.xml.in.h:388
+#: rules/base.xml:2608
 msgid "my"
 msgstr "my"
 
-#: ../rules/base.xml.in.h:389
+#: rules/base.xml:2609
 msgid "Burmese"
 msgstr "缅甸"
 
-#: ../rules/base.xml.in.h:392 ../rules/base.extras.xml.in.h:16
+#: rules/base.xml:2629 rules/base.extras.xml:64
 msgid "French (Canada)"
 msgstr "法语(加拿大)"
 
-#: ../rules/base.xml.in.h:393
+#: rules/base.xml:2640
 msgid "French (Canada, Dvorak)"
 msgstr "法语(加拿大，Dvorak)"
 
-#: ../rules/base.xml.in.h:394
+#: rules/base.xml:2648
 msgid "French (Canada, legacy)"
 msgstr "法语(加拿大，传统)"
 
-#: ../rules/base.xml.in.h:395
+#: rules/base.xml:2654
 msgid "Canadian Multilingual"
 msgstr ""
 
-#: ../rules/base.xml.in.h:396
+#: rules/base.xml:2660
 msgid "Canadian Multilingual (1st part)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:397
+#: rules/base.xml:2666
 msgid "Canadian Multilingual (2nd part)"
 msgstr ""
 
 #. Keyboard indicator for Inuktikut layouts
-#: ../rules/base.xml.in.h:399
+#: rules/base.xml:2673
 msgid "ike"
 msgstr "ike"
 
-#: ../rules/base.xml.in.h:400
+#: rules/base.xml:2674
 msgid "Inuktitut"
 msgstr "因纽特语"
 
-#: ../rules/base.xml.in.h:401
+#: rules/base.xml:2685
 msgid "English (Canada)"
-msgstr "英语(加拿大)"
+msgstr "英语（加拿大）"
 
-#: ../rules/base.xml.in.h:402
+#: rules/base.xml:2698
 msgid "French (Democratic Republic of the Congo)"
 msgstr "法语(刚果民主共和国，刚果(金))"
 
+#. Keyboard indicator for Chinese layouts
 #. Keyboard indicator for Taiwanese layouts
-#: ../rules/base.xml.in.h:404
+#: rules/base.xml:2709 rules/base.xml:5473
 msgid "zh"
 msgstr "zh"
 
-#: ../rules/base.xml.in.h:405
+#: rules/base.xml:2710
 msgid "Chinese"
 msgstr "汉语"
 
-#: ../rules/base.xml.in.h:406
+#: rules/base.xml:2784
 msgid "Tibetan"
-msgstr ""
+msgstr "藏语"
 
-#: ../rules/base.xml.in.h:407
+#: rules/base.xml:2793
 msgid "Tibetan (with ASCII numerals)"
-msgstr ""
+msgstr "藏语（带有 ASCII 数字）"
 
-#: ../rules/base.xml.in.h:408
+#: rules/base.xml:2802
 msgid "ug"
-msgstr ""
+msgstr "ug"
 
-#: ../rules/base.xml.in.h:409
+#: rules/base.xml:2803
 msgid "Uyghur"
-msgstr ""
+msgstr "维吾尔语"
 
 #. Keyboard indicator for Croatian layouts
-#: ../rules/base.xml.in.h:412
+#: rules/base.xml:2824
 msgid "hr"
 msgstr "hr"
 
-#: ../rules/base.xml.in.h:413
+#: rules/base.xml:2825
 msgid "Croatian"
 msgstr "克罗地亚"
 
-#: ../rules/base.xml.in.h:414
+#: rules/base.xml:2834
 msgid "Croatian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:415
+#: rules/base.xml:2840
 msgid "Croatian (with Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:416
+#: rules/base.xml:2846
 msgid "Croatian (US, with Croatian digraphs)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:417
+#: rules/base.xml:2852
 msgid "Croatian (US, with Croatian letters)"
 msgstr ""
 
 #. Keyboard indicator for Chech layouts
-#: ../rules/base.xml.in.h:419 ../rules/base.extras.xml.in.h:118
+#: rules/base.xml:2861 rules/base.extras.xml:797
 msgid "cs"
 msgstr "cs"
 
-#: ../rules/base.xml.in.h:420 ../rules/base.extras.xml.in.h:119
+#: rules/base.xml:2862 rules/base.extras.xml:798
 msgid "Czech"
 msgstr "捷克"
 
-#: ../rules/base.xml.in.h:421
+#: rules/base.xml:2871
 msgid "Czech (with &lt;\\|&gt; key)"
 msgstr "捷克(带 &lt;\\|&gt; 键)"
 
-#: ../rules/base.xml.in.h:422
+#: rules/base.xml:2877
 msgid "Czech (QWERTY)"
 msgstr "捷克语（QWERTY 布局）"
 
-#: ../rules/base.xml.in.h:423
+#: rules/base.xml:2883
 msgid "Czech (QWERTY, extended backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:424
+#: rules/base.xml:2895
 msgid "Czech (UCW, only accented letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:425
+#: rules/base.xml:2901
 msgid "Czech (US, Dvorak, UCW support)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:426
+#: rules/base.xml:2909
 msgid "Russian (Czech, phonetic)"
 msgstr "俄语（捷克，音标）"
 
 #. Keyboard indicator for Danish layouts
-#: ../rules/base.xml.in.h:428 ../rules/base.extras.xml.in.h:121
+#: rules/base.xml:2921 rules/base.extras.xml:836
 msgid "da"
 msgstr "da"
 
-#: ../rules/base.xml.in.h:429 ../rules/base.extras.xml.in.h:122
+#: rules/base.xml:2922 rules/base.extras.xml:837
 msgid "Danish"
 msgstr "丹麦语"
 
-#: ../rules/base.xml.in.h:430
+#: rules/base.xml:2931
 msgid "Danish (no dead keys)"
 msgstr "丹麦语（无死键）"
 
-#: ../rules/base.xml.in.h:431
+#: rules/base.xml:2937
 msgid "Danish (Win keys)"
 msgstr "丹麦语（Win 键）"
 
-#: ../rules/base.xml.in.h:432
+#: rules/base.xml:2943
 msgid "Danish (Macintosh)"
 msgstr "丹麦语（Mac）"
 
-#: ../rules/base.xml.in.h:433
+#: rules/base.xml:2949
 msgid "Danish (Macintosh, no dead keys)"
 msgstr "丹麦语（Mac，无死键）"
 
-#: ../rules/base.xml.in.h:434
+#: rules/base.xml:2955
 msgid "Danish (Dvorak)"
 msgstr "丹麦语（Dvorak 布局）"
 
 #. Keyboard indicator for Dutch layouts
-#: ../rules/base.xml.in.h:436 ../rules/base.extras.xml.in.h:124
+#: rules/base.xml:2964 rules/base.extras.xml:851
 msgid "nl"
 msgstr "nl"
 
-#: ../rules/base.xml.in.h:437 ../rules/base.extras.xml.in.h:125
+#: rules/base.xml:2965 rules/base.extras.xml:852
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: ../rules/base.xml.in.h:438
+#: rules/base.xml:2974
 msgid "Dutch (with Sun dead keys)"
 msgstr "荷兰语（Sun 死键）"
 
-#: ../rules/base.xml.in.h:439
+#: rules/base.xml:2980
 msgid "Dutch (Macintosh)"
 msgstr "荷兰语（Mac）"
 
-#: ../rules/base.xml.in.h:440
+#: rules/base.xml:2986
 msgid "Dutch (standard)"
 msgstr "荷兰（标准）"
 
 #. Keyboard indicator for Dzongkha layouts
-#: ../rules/base.xml.in.h:442
+#: rules/base.xml:2995
 msgid "dz"
 msgstr "dz"
 
-#: ../rules/base.xml.in.h:443
+#: rules/base.xml:2996
 msgid "Dzongkha"
 msgstr "宗喀语"
 
 #. Keyboard indicator for Estonian layouts
-#: ../rules/base.xml.in.h:445 ../rules/base.extras.xml.in.h:127
+#: rules/base.xml:3006 rules/base.extras.xml:866
 msgid "et"
 msgstr "et"
 
-#: ../rules/base.xml.in.h:446 ../rules/base.extras.xml.in.h:128
+#: rules/base.xml:3007 rules/base.extras.xml:867
 msgid "Estonian"
 msgstr "爱沙尼亚"
 
-#: ../rules/base.xml.in.h:447
+#: rules/base.xml:3016
 msgid "Estonian (no dead keys)"
-msgstr ""
+msgstr "爱沙尼亚语（无死键）"
 
-#: ../rules/base.xml.in.h:448
+#: rules/base.xml:3022
 msgid "Estonian (Dvorak)"
-msgstr "爱沙尼亚(Dvorak)"
+msgstr "爱沙尼亚语（Dvorak）"
 
-#: ../rules/base.xml.in.h:449
+#: rules/base.xml:3028
 msgid "Estonian (US, with Estonian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:450 ../rules/base.extras.xml.in.h:44
+#: rules/base.xml:3038 rules/base.extras.xml:227
 msgid "Persian"
 msgstr "波斯语"
 
-#: ../rules/base.xml.in.h:451
+#: rules/base.xml:3047
 msgid "Persian (with Persian keypad)"
 msgstr "波斯语（带波斯键盘）"
 
 #. Keyboard indicator for Kurdish layouts
-#: ../rules/base.xml.in.h:453
+#: rules/base.xml:3054 rules/base.xml:3065 rules/base.xml:3076
+#: rules/base.xml:3087 rules/base.xml:3112 rules/base.xml:3123
+#: rules/base.xml:3134 rules/base.xml:3145 rules/base.xml:5250
+#: rules/base.xml:5261 rules/base.xml:5272 rules/base.xml:5399
+#: rules/base.xml:5410 rules/base.xml:5421
 msgid "ku"
 msgstr "ku"
 
-#: ../rules/base.xml.in.h:454
+#: rules/base.xml:3055
 msgid "Kurdish (Iran, Latin Q)"
 msgstr "库尔德语(伊朗，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:455
+#: rules/base.xml:3066
 msgid "Kurdish (Iran, F)"
 msgstr "库尔德语(伊朗，F)"
 
-#: ../rules/base.xml.in.h:456
+#: rules/base.xml:3077
 msgid "Kurdish (Iran, Latin Alt-Q)"
 msgstr "库尔德语（伊朗，拉丁 Alt-Q）"
 
-#: ../rules/base.xml.in.h:457
+#: rules/base.xml:3088
 msgid "Kurdish (Iran, Arabic-Latin)"
 msgstr "库尔德语(伊朗，阿拉伯-拉丁)"
 
-#: ../rules/base.xml.in.h:458
+#: rules/base.xml:3101
 msgid "Iraqi"
 msgstr "伊拉克"
 
-#: ../rules/base.xml.in.h:459
+#: rules/base.xml:3113
 msgid "Kurdish (Iraq, Latin Q)"
 msgstr "库尔德语(伊拉克，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:460
+#: rules/base.xml:3124
 msgid "Kurdish (Iraq, F)"
 msgstr "库尔德语(伊拉克，F)"
 
-#: ../rules/base.xml.in.h:461
+#: rules/base.xml:3135
 msgid "Kurdish (Iraq, Latin Alt-Q)"
 msgstr "库尔德语(伊拉克，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:462
+#: rules/base.xml:3146
 msgid "Kurdish (Iraq, Arabic-Latin)"
 msgstr "库尔德语(伊拉克，阿拉伯-拉丁)"
 
 #. Keyboard indicator for Faroese layouts
-#: ../rules/base.xml.in.h:464
+#: rules/base.xml:3158
 msgid "fo"
 msgstr "fo"
 
-#: ../rules/base.xml.in.h:465
+#: rules/base.xml:3159
 msgid "Faroese"
-msgstr "法罗"
+msgstr "法罗语"
 
-#: ../rules/base.xml.in.h:466
+#: rules/base.xml:3168
 msgid "Faroese (no dead keys)"
-msgstr ""
+msgstr "法罗语（无死键）"
 
 #. Keyboard indicator for Finnish layouts
-#: ../rules/base.xml.in.h:468 ../rules/base.extras.xml.in.h:130
+#: rules/base.xml:3177 rules/base.extras.xml:881
 msgid "fi"
 msgstr "fi"
 
-#: ../rules/base.xml.in.h:469 ../rules/base.extras.xml.in.h:131
+#: rules/base.xml:3178 rules/base.extras.xml:882
 msgid "Finnish"
 msgstr "芬兰语"
 
-#: ../rules/base.xml.in.h:470
+#: rules/base.xml:3193
 msgid "Finnish (classic)"
-msgstr "芬兰语(经典)"
+msgstr "芬兰语（经典）"
 
-#: ../rules/base.xml.in.h:471
+#: rules/base.xml:3199
 msgid "Finnish (classic, no dead keys)"
-msgstr ""
+msgstr "芬兰语（经典，无死键）"
 
-#: ../rules/base.xml.in.h:472
+#: rules/base.xml:3187
 msgid "Finnish (Winkeys)"
-msgstr ""
+msgstr "芬兰语（Winkeys）"
 
-#: ../rules/base.xml.in.h:473
+#: rules/base.xml:3205
 msgid "Northern Saami (Finland)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:474
+#: rules/base.xml:3214
 msgid "Finnish (Macintosh)"
 msgstr "芬兰语(Mac)"
 
-#: ../rules/base.xml.in.h:475 ../rules/base.extras.xml.in.h:135
+#: rules/base.xml:3224 rules/base.extras.xml:909
 msgid "French"
 msgstr "法语"
 
-#: ../rules/base.xml.in.h:476
+#: rules/base.xml:3233
 msgid "French (no dead keys)"
-msgstr ""
+msgstr "法语（无死键）"
 
-#: ../rules/base.xml.in.h:477
+#: rules/base.xml:3239
 msgid "French (with Sun dead keys)"
-msgstr ""
+msgstr "法语（带 Sun 死键）"
 
-#: ../rules/base.xml.in.h:478
+#: rules/base.xml:3245
 msgid "French (alt.)"
-msgstr ""
+msgstr "法语（替代）"
 
-#: ../rules/base.xml.in.h:479
+#: rules/base.xml:3251
 msgid "French (alt., Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:480
+#: rules/base.xml:3257
 msgid "French (alt., no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:481
+#: rules/base.xml:3263
 msgid "French (alt., with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:482
+#: rules/base.xml:3269
 msgid "French (legacy, alt.)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:483
+#: rules/base.xml:3275
 msgid "French (legacy, alt., no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:484
+#: rules/base.xml:3281
 msgid "French (legacy, alt., with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:485
+#: rules/base.xml:3287
 msgid "French (Bepo, ergonomic, Dvorak way)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:486
+#: rules/base.xml:3293
 msgid "French (Bepo, ergonomic, Dvorak way, Latin-9 only)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:487
+#: rules/base.xml:3305
 msgid "French (Dvorak)"
 msgstr "法语(Dvorak)"
 
-#: ../rules/base.xml.in.h:488
+#: rules/base.xml:3311
 msgid "French (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:489
+#: rules/base.xml:3317
 msgid "French (AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:490
+#: rules/base.xml:3329
 msgid "French (Breton)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:491
+#: rules/base.xml:3335
 msgid "Occitan"
 msgstr ""
 
-#: ../rules/base.xml.in.h:492
+#: rules/base.xml:3344
 msgid "Georgian (France, AZERTY Tskapo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:494
+#: rules/base.xml:3363
 msgid "English (Ghana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:495
+#: rules/base.xml:3372
 msgid "English (Ghana, multilingual)"
 msgstr ""
 
 #. Keyboard indicator for Akan layouts
-#: ../rules/base.xml.in.h:497
+#: rules/base.xml:3379
 msgid "ak"
 msgstr "ak"
 
-#: ../rules/base.xml.in.h:498
+#: rules/base.xml:3380
 msgid "Akan"
 msgstr "阿肯"
 
 #. Keyboard indicator for Ewe layouts
-#: ../rules/base.xml.in.h:500
+#: rules/base.xml:3390
 msgid "ee"
 msgstr "ee"
 
-#: ../rules/base.xml.in.h:501
+#: rules/base.xml:3391
 msgid "Ewe"
 msgstr "Ewe"
 
 #. Keyboard indicator for Fula layouts
-#: ../rules/base.xml.in.h:503
+#: rules/base.xml:3401
 msgid "ff"
 msgstr "ff"
 
-#: ../rules/base.xml.in.h:504
+#: rules/base.xml:3402
 msgid "Fula"
 msgstr "富拉尼语式"
 
 #. Keyboard indicator for Ga layouts
-#: ../rules/base.xml.in.h:506
+#: rules/base.xml:3412
 msgid "gaa"
 msgstr "gaa"
 
-#: ../rules/base.xml.in.h:507
+#: rules/base.xml:3413
 msgid "Ga"
 msgstr "加纳式"
 
 #. Keyboard indicator for Hausa layouts
-#: ../rules/base.xml.in.h:509
+#: rules/base.xml:3423 rules/base.xml:5899
 msgid "ha"
 msgstr "ha"
 
-#: ../rules/base.xml.in.h:510
+#: rules/base.xml:3424
 msgid "Hausa (Ghana)"
 msgstr ""
 
 #. Keyboard indicator for Avatime layouts
-#: ../rules/base.xml.in.h:512
+#: rules/base.xml:3434
 msgid "avn"
 msgstr "avn"
 
-#: ../rules/base.xml.in.h:513
+#: rules/base.xml:3435
 msgid "Avatime"
 msgstr ""
 
-#: ../rules/base.xml.in.h:514
+#: rules/base.xml:3444
 msgid "English (Ghana, GILLBT)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:515
+#: rules/base.xml:3454
 msgid "French (Guinea)"
 msgstr "法语（几内亚）"
 
 #. Keyboard indicator for Georgian layouts
-#: ../rules/base.xml.in.h:517
+#: rules/base.xml:3465
 msgid "ka"
 msgstr "ka"
 
-#: ../rules/base.xml.in.h:518
+#: rules/base.xml:3466
 msgid "Georgian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:519
+#: rules/base.xml:3475
 msgid "Georgian (ergonomic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:520
+#: rules/base.xml:3481
 msgid "Georgian (MESS)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:521
+#: rules/base.xml:3489
 msgid "Russian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:522
+#: rules/base.xml:3498
 msgid "Ossetian (Georgia)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:523 ../rules/base.extras.xml.in.h:23
+#: rules/base.xml:3511 rules/base.extras.xml:96
 msgid "German"
 msgstr "德语"
 
-#: ../rules/base.xml.in.h:524
+#: rules/base.xml:3520
 msgid "German (dead acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:525
+#: rules/base.xml:3526
 msgid "German (dead grave acute)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:526
+#: rules/base.xml:3532
 msgid "German (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:527
+#: rules/base.xml:3538
 msgid "German (T3)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:528
+#: rules/base.xml:3544
 msgid "Romanian (Germany)"
-msgstr ""
+msgstr "罗马尼亚语（德国）"
 
-#: ../rules/base.xml.in.h:529
+#: rules/base.xml:3553
 msgid "Romanian (Germany, no dead keys)"
-msgstr ""
+msgstr "罗马尼亚语（德国，无死键）"
 
-#: ../rules/base.xml.in.h:530
+#: rules/base.xml:3562
 msgid "German (Dvorak)"
-msgstr "德语(Dvorak)"
+msgstr "德语（Dvorak）"
 
-#: ../rules/base.xml.in.h:531
+#: rules/base.xml:3568
 msgid "German (with Sun dead keys)"
-msgstr ""
+msgstr "德语（带 Sun 死键）"
 
-#: ../rules/base.xml.in.h:532
+#: rules/base.xml:3574
 msgid "German (Neo 2)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:533
+#: rules/base.xml:3580
 msgid "German (Macintosh)"
 msgstr "德语（Mac）"
 
-#: ../rules/base.xml.in.h:534
+#: rules/base.xml:3586
 msgid "German (Macintosh, no dead keys)"
 msgstr "德语（Mac，无死键）"
 
-#: ../rules/base.xml.in.h:535
+#: rules/base.xml:3592
 msgid "Lower Sorbian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:536
+#: rules/base.xml:3601
 msgid "Lower Sorbian (QWERTZ)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:537
+#: rules/base.xml:3610
 msgid "German (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:538
+#: rules/base.xml:3616
 msgid "Turkish (Germany)"
-msgstr ""
+msgstr "土耳其语（德国）"
 
-#: ../rules/base.xml.in.h:539
+#: rules/base.xml:3627
 msgid "Russian (Germany, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:540
+#: rules/base.xml:3636
 msgid "German (dead tilde)"
 msgstr ""
 
 #. Keyboard indicator for Greek layouts
-#: ../rules/base.xml.in.h:542 ../rules/base.extras.xml.in.h:139
+#: rules/base.xml:3645 rules/base.extras.xml:935
 msgid "gr"
 msgstr "gr"
 
-#: ../rules/base.xml.in.h:543 ../rules/base.extras.xml.in.h:140
+#: rules/base.xml:3646 rules/base.extras.xml:936
 msgid "Greek"
 msgstr "希腊语"
 
-#: ../rules/base.xml.in.h:544
+#: rules/base.xml:3655
 msgid "Greek (simple)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:545
+#: rules/base.xml:3661
 msgid "Greek (extended)"
 msgstr "希腊语(扩展)"
 
-#: ../rules/base.xml.in.h:546
+#: rules/base.xml:3667
 msgid "Greek (no dead keys)"
 msgstr "希腊语（无死键）"
 
-#: ../rules/base.xml.in.h:547
+#: rules/base.xml:3673
 msgid "Greek (polytonic)"
 msgstr ""
 
 #. Keyboard indicator for Hungarian layouts
-#: ../rules/base.xml.in.h:549
+#: rules/base.xml:3682
 msgid "hu"
 msgstr "hu"
 
-#: ../rules/base.xml.in.h:550 ../rules/base.extras.xml.in.h:40
+#: rules/base.xml:3683 rules/base.extras.xml:211
 msgid "Hungarian"
-msgstr "匈牙利"
+msgstr "匈牙利语"
 
-#: ../rules/base.xml.in.h:551
+#: rules/base.xml:3692
 msgid "Hungarian (standard)"
-msgstr "匈牙利(标准)"
+msgstr "匈牙利语（标准）"
 
-#: ../rules/base.xml.in.h:552
+#: rules/base.xml:3698
 msgid "Hungarian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:553
+#: rules/base.xml:3704
 msgid "Hungarian (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:554
+#: rules/base.xml:3710
 msgid "Hungarian (101/QWERTZ/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:555
+#: rules/base.xml:3716
 msgid "Hungarian (101/QWERTZ/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:556
+#: rules/base.xml:3722
 msgid "Hungarian (101/QWERTZ/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:557
+#: rules/base.xml:3728
 msgid "Hungarian (101/QWERTZ/dot/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:558
+#: rules/base.xml:3734
 msgid "Hungarian (101/QWERTY/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:559
+#: rules/base.xml:3740
 msgid "Hungarian (101/QWERTY/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:560
+#: rules/base.xml:3746
 msgid "Hungarian (101/QWERTY/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:561
+#: rules/base.xml:3752
 msgid "Hungarian (101/QWERTY/dot/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:562
+#: rules/base.xml:3758
 msgid "Hungarian (102/QWERTZ/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:563
+#: rules/base.xml:3764
 msgid "Hungarian (102/QWERTZ/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:564
+#: rules/base.xml:3770
 msgid "Hungarian (102/QWERTZ/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:565
+#: rules/base.xml:3776
 msgid "Hungarian (102/QWERTZ/dot/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:566
+#: rules/base.xml:3782
 msgid "Hungarian (102/QWERTY/comma/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:567
+#: rules/base.xml:3788
 msgid "Hungarian (102/QWERTY/comma/no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:568
+#: rules/base.xml:3794
 msgid "Hungarian (102/QWERTY/dot/dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:569
+#: rules/base.xml:3800
 msgid "Hungarian (102/QWERTY/dot/no dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Icelandic layouts
-#: ../rules/base.xml.in.h:571
+#: rules/base.xml:3809
 msgid "is"
 msgstr "is"
 
-#: ../rules/base.xml.in.h:572
+#: rules/base.xml:3810
 msgid "Icelandic"
 msgstr "冰岛"
 
-#: ../rules/base.xml.in.h:573
+#: rules/base.xml:3819
 msgid "Icelandic (with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:574
+#: rules/base.xml:3825
 msgid "Icelandic (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:575
+#: rules/base.xml:3831
 msgid "Icelandic (Macintosh, legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:576
+#: rules/base.xml:3837
 msgid "Icelandic (Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:577
+#: rules/base.xml:3843
 msgid "Icelandic (Dvorak)"
 msgstr "冰岛语（Dvorak 布局）"
 
 #. Keyboard indicator for Hebrew layouts
-#: ../rules/base.xml.in.h:579 ../rules/base.extras.xml.in.h:103
+#: rules/base.xml:3852 rules/base.extras.xml:713
 msgid "he"
 msgstr "he"
 
-#: ../rules/base.xml.in.h:580 ../rules/base.extras.xml.in.h:104
+#: rules/base.xml:3853 rules/base.extras.xml:714
 msgid "Hebrew"
 msgstr "希伯来语"
 
-#: ../rules/base.xml.in.h:581
+#: rules/base.xml:3862
 msgid "Hebrew (lyx)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:582
+#: rules/base.xml:3868
 msgid "Hebrew (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:583
+#: rules/base.xml:3874
 msgid "Hebrew (Biblical, Tiro)"
 msgstr ""
 
 #. Keyboard indicator for Italian layouts
-#: ../rules/base.xml.in.h:585 ../rules/base.extras.xml.in.h:143
+#: rules/base.xml:3883 rules/base.extras.xml:956
 msgid "it"
 msgstr "it"
 
-#: ../rules/base.xml.in.h:586 ../rules/base.extras.xml.in.h:144
+#: rules/base.xml:3884 rules/base.extras.xml:957
 msgid "Italian"
 msgstr "意大利语"
 
-#: ../rules/base.xml.in.h:587
+#: rules/base.xml:3893
 msgid "Italian (no dead keys)"
 msgstr "意大利语（无死键）"
 
-#: ../rules/base.xml.in.h:588
+#: rules/base.xml:3899
 msgid "Italian (Winkeys)"
 msgstr "意大利语（Win 键）"
 
-#: ../rules/base.xml.in.h:589
+#: rules/base.xml:3905
 msgid "Italian (Macintosh)"
 msgstr "意大利语（Mac）"
 
-#: ../rules/base.xml.in.h:590
+#: rules/base.xml:3911
 msgid "Italian (US, with Italian letters)"
 msgstr "意大利语（带意大利语字母的美国键盘）"
 
-#: ../rules/base.xml.in.h:591
+#: rules/base.xml:3917
 msgid "Georgian (Italy)"
 msgstr "格鲁吉亚语（意大利）"
 
-#: ../rules/base.xml.in.h:592
+#: rules/base.xml:3926
 msgid "Italian (IBM 142)"
 msgstr "意大利语（IBM 142）"
 
-#: ../rules/base.xml.in.h:593
+#: rules/base.xml:3932
 msgid "Italian (intl., with dead keys)"
 msgstr "意大利语（国际，带死键）"
 
-#: ../rules/base.xml.in.h:594
+#: rules/base.xml:3948
 msgid "Sicilian"
 msgstr ""
 
 #. Keyboard indicator for Japaneses
-#: ../rules/base.xml.in.h:596 ../rules/base.extras.xml.in.h:149
+#: rules/base.xml:3970 rules/base.xml:5705 rules/base.extras.xml:982
 msgid "ja"
 msgstr "ja"
 
-#: ../rules/base.xml.in.h:597 ../rules/base.extras.xml.in.h:150
+#: rules/base.xml:3971 rules/base.extras.xml:983
 msgid "Japanese"
 msgstr "日语"
 
-#: ../rules/base.xml.in.h:598
+#: rules/base.xml:3980
 msgid "Japanese (Kana)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:599
+#: rules/base.xml:3986
 msgid "Japanese (Kana 86)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:600
+#: rules/base.xml:3992
 msgid "Japanese (OADG 109A)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:601
+#: rules/base.xml:3998
 msgid "Japanese (Macintosh)"
 msgstr "日语（Mac）"
 
-#: ../rules/base.xml.in.h:602
+#: rules/base.xml:4004
 msgid "Japanese (Dvorak)"
 msgstr "日语（Dvorak 布局）"
 
+#. Keyboard indicator for Kyrgyz layouts
 #. Keyboard indicator for Kikuyu layouts
-#: ../rules/base.xml.in.h:604
+#: rules/base.xml:4013 rules/base.xml:6084
 msgid "ki"
 msgstr "ki"
 
-#: ../rules/base.xml.in.h:605
+#: rules/base.xml:4014
 msgid "Kyrgyz"
 msgstr "柯尔克孜语(吉尔吉斯语)"
 
-#: ../rules/base.xml.in.h:606
+#: rules/base.xml:4023
 msgid "Kyrgyz (phonetic)"
 msgstr "柯尔克孜语(吉尔吉斯语，音标)"
 
 #. Keyboard indicator for Khmer layouts
-#: ../rules/base.xml.in.h:608
+#: rules/base.xml:4032
 msgid "km"
 msgstr "km"
 
-#: ../rules/base.xml.in.h:609
+#: rules/base.xml:4033
 msgid "Khmer (Cambodia)"
 msgstr ""
 
 #. Keyboard indicator for Kazakh layouts
-#: ../rules/base.xml.in.h:611
+#: rules/base.xml:4044
 msgid "kk"
 msgstr "kk"
 
-#: ../rules/base.xml.in.h:612
+#: rules/base.xml:4045
 msgid "Kazakh"
 msgstr "哈萨克语"
 
-#: ../rules/base.xml.in.h:613
+#: rules/base.xml:4056
 msgid "Russian (Kazakhstan, with Kazakh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:614
+#: rules/base.xml:4066
 msgid "Kazakh (with Russian)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:615
+#: rules/base.xml:4076
 msgid "Kazakh (extended)"
 msgstr ""
 
 #. Keyboard indicator for Lao layouts
-#: ../rules/base.xml.in.h:618
+#: rules/base.xml:4097
 msgid "lo"
 msgstr "lo"
 
-#: ../rules/base.xml.in.h:619
+#: rules/base.xml:4098
 msgid "Lao"
 msgstr "老挝语(寮语)"
 
-#: ../rules/base.xml.in.h:620
+#: rules/base.xml:4107
 msgid "Lao (STEA proposed standard layout)"
 msgstr ""
 
 #. Keyboard indicator for Spanish layouts
-#: ../rules/base.xml.in.h:622 ../rules/base.extras.xml.in.h:163
+#: rules/base.xml:4119 rules/base.xml:4977 rules/base.extras.xml:1075
 msgid "es"
 msgstr "es"
 
-#: ../rules/base.xml.in.h:623
+#: rules/base.xml:4120
 msgid "Spanish (Latin American)"
 msgstr "西班牙语(拉丁美洲)"
 
-#: ../rules/base.xml.in.h:624
+#: rules/base.xml:4152
 msgid "Spanish (Latin American, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:625
+#: rules/base.xml:4158
 msgid "Spanish (Latin American, dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:626
+#: rules/base.xml:4164
 msgid "Spanish (Latin American, with Sun dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:627
+#: rules/base.xml:4170
 msgid "Spanish (Latin American, Dvorak)"
 msgstr ""
 
 #. Keyboard indicator for Lithuanian layouts
-#: ../rules/base.xml.in.h:631 ../rules/base.extras.xml.in.h:46
+#: rules/base.xml:4191 rules/base.extras.xml:247
 msgid "lt"
 msgstr "lt"
 
-#: ../rules/base.xml.in.h:632 ../rules/base.extras.xml.in.h:47
+#: rules/base.xml:4192 rules/base.extras.xml:248
 msgid "Lithuanian"
 msgstr "立陶宛语"
 
-#: ../rules/base.xml.in.h:633
+#: rules/base.xml:4201
 msgid "Lithuanian (standard)"
 msgstr "立陶宛语(标准)"
 
-#: ../rules/base.xml.in.h:634
+#: rules/base.xml:4207
 msgid "Lithuanian (US, with Lithuanian letters)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:635
+#: rules/base.xml:4213
 msgid "Lithuanian (IBM LST 1205-92)"
 msgstr "立陶宛语 (IBM LST 1205-92)"
 
-#: ../rules/base.xml.in.h:636
+#: rules/base.xml:4219
 msgid "Lithuanian (LEKP)"
 msgstr "立陶宛语 (LEKP)"
 
-#: ../rules/base.xml.in.h:637
+#: rules/base.xml:4225
 msgid "Lithuanian (LEKPa)"
 msgstr "立陶宛语 (LEKPa)"
 
 #. Keyboard indicator for Latvian layouts
-#: ../rules/base.xml.in.h:639 ../rules/base.extras.xml.in.h:50
+#: rules/base.xml:4243 rules/base.extras.xml:271
 msgid "lv"
 msgstr "lv"
 
-#: ../rules/base.xml.in.h:640 ../rules/base.extras.xml.in.h:51
+#: rules/base.xml:4244 rules/base.extras.xml:272
 msgid "Latvian"
 msgstr "拉脱维亚"
 
-#: ../rules/base.xml.in.h:641
+#: rules/base.xml:4253
 msgid "Latvian (apostrophe)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:642
+#: rules/base.xml:4259
 msgid "Latvian (tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:643
+#: rules/base.xml:4265
 msgid "Latvian (F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:644
+#: rules/base.xml:4271
 msgid "Latvian (modern)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:645
+#: rules/base.xml:4277
 msgid "Latvian (ergonomic, ŪGJRMV)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:646
+#: rules/base.xml:4283
 msgid "Latvian (adapted)"
 msgstr ""
 
 #. Keyboard indicator for Maori layouts
-#: ../rules/base.xml.in.h:648
+#: rules/base.xml:4292
 msgid "mi"
 msgstr "mi"
 
-#: ../rules/base.xml.in.h:649
+#: rules/base.xml:4293
 msgid "Maori"
 msgstr ""
 
+#. Keyboard indicator for Montenegrin layouts
 #. Keyboard indicator for Serbian layouts
-#: ../rules/base.xml.in.h:651 ../rules/base.extras.xml.in.h:90
+#: rules/base.xml:4304 rules/base.xml:4857 rules/base.extras.xml:548
 msgid "sr"
 msgstr "sr"
 
-#: ../rules/base.xml.in.h:652
+#: rules/base.xml:4305
 msgid "Montenegrin"
 msgstr "黑山语"
 
-#: ../rules/base.xml.in.h:653
+#: rules/base.xml:4314
 msgid "Montenegrin (Cyrillic)"
 msgstr "黑山语(西里尔)"
 
-#: ../rules/base.xml.in.h:654
+#: rules/base.xml:4320
 msgid "Montenegrin (Cyrillic, ZE and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:655
+#: rules/base.xml:4326
 msgid "Montenegrin (Latin, Unicode)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:656
+#: rules/base.xml:4332
 msgid "Montenegrin (Latin, QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:657
+#: rules/base.xml:4338
 msgid "Montenegrin (Latin, Unicode, QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:658
+#: rules/base.xml:4344
 msgid "Montenegrin (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:659
+#: rules/base.xml:4350
 msgid "Montenegrin (Latin with guillemets)"
 msgstr ""
 
 #. Keyboard indicator for Macedonian layouts
-#: ../rules/base.xml.in.h:661
+#: rules/base.xml:4359
 msgid "mk"
 msgstr "mk"
 
-#: ../rules/base.xml.in.h:662
+#: rules/base.xml:4360
 msgid "Macedonian"
 msgstr "马其顿语"
 
-#: ../rules/base.xml.in.h:663
+#: rules/base.xml:4369
 msgid "Macedonian (no dead keys)"
 msgstr ""
 
 #. Keyboard indicator for Maltese layouts
-#: ../rules/base.xml.in.h:665
+#: rules/base.xml:4378
 msgid "mt"
 msgstr "mt"
 
-#: ../rules/base.xml.in.h:666
+#: rules/base.xml:4379
 msgid "Maltese"
 msgstr "马耳他语"
 
-#: ../rules/base.xml.in.h:667
+#: rules/base.xml:4388
 msgid "Maltese (with US layout)"
 msgstr "马耳他语(美国布局)"
 
 #. Keyboard indicator for Mongolian layouts
-#: ../rules/base.xml.in.h:669
+#: rules/base.xml:4409
 msgid "mn"
 msgstr "mn"
 
-#: ../rules/base.xml.in.h:670
+#: rules/base.xml:4410
 msgid "Mongolian"
 msgstr "蒙古"
 
 #. Keyboard indicator for Norwegian layouts
-#: ../rules/base.xml.in.h:672 ../rules/base.extras.xml.in.h:154
+#: rules/base.xml:4421 rules/base.extras.xml:1009
 msgid "no"
 msgstr "no"
 
-#: ../rules/base.xml.in.h:673 ../rules/base.extras.xml.in.h:155
+#: rules/base.xml:4422 rules/base.extras.xml:1010
 msgid "Norwegian"
 msgstr "挪威语"
 
-#: ../rules/base.xml.in.h:674
+#: rules/base.xml:4433
 msgid "Norwegian (no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:675
+#: rules/base.xml:4439
 msgid "Norwegian (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:676
+#: rules/base.xml:4445
 msgid "Norwegian (Dvorak)"
 msgstr "挪威语(Dvorak)"
 
-#: ../rules/base.xml.in.h:677
+#: rules/base.xml:4451
 msgid "Northern Saami (Norway)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:678
+#: rules/base.xml:4460
 msgid "Northern Saami (Norway, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:679
+#: rules/base.xml:4469
 msgid "Norwegian (Macintosh)"
 msgstr "挪威语(Mac)"
 
-#: ../rules/base.xml.in.h:680
+#: rules/base.xml:4475
 msgid "Norwegian (Macintosh, no dead keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:681
+#: rules/base.xml:4481
 msgid "Norwegian (Colemak)"
 msgstr ""
 
 #. Keyboard indicator for Polish layouts
-#: ../rules/base.xml.in.h:683 ../rules/base.extras.xml.in.h:78
+#: rules/base.xml:4490 rules/base.xml:5629 rules/base.extras.xml:478
 msgid "pl"
 msgstr "pl"
 
-#: ../rules/base.xml.in.h:684 ../rules/base.extras.xml.in.h:79
+#: rules/base.xml:4491 rules/base.extras.xml:479
 msgid "Polish"
 msgstr "波兰语"
 
-#: ../rules/base.xml.in.h:685
+#: rules/base.xml:4500
 msgid "Polish (legacy)"
 msgstr "瑞士语（传统）"
 
-#: ../rules/base.xml.in.h:686
+#: rules/base.xml:4506
 msgid "Polish (QWERTZ)"
 msgstr "波兰语（QWERTZ 布局）"
 
-#: ../rules/base.xml.in.h:687
+#: rules/base.xml:4512
 msgid "Polish (Dvorak)"
 msgstr "波兰语（Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:688
+#: rules/base.xml:4518
 msgid "Polish (Dvorak, with Polish quotes on quotemark key)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:689
+#: rules/base.xml:4524
 msgid "Polish (Dvorak, with Polish quotes on key 1)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:690
+#: rules/base.xml:4530
 msgid "Kashubian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:691
+#: rules/base.xml:4539
 msgid "Silesian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:692
+#: rules/base.xml:4550
 msgid "Russian (Poland, phonetic Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:693
+#: rules/base.xml:4559
 msgid "Polish (programmer Dvorak)"
 msgstr "波兰语(适合程序员的Dvorak)"
 
-#: ../rules/base.xml.in.h:694 ../rules/base.extras.xml.in.h:157
+#: rules/base.xml:4569 rules/base.extras.xml:1025 rules/base.extras.xml:1040
 msgid "Portuguese"
 msgstr "葡萄牙语"
 
-#: ../rules/base.xml.in.h:695
+#: rules/base.xml:4578
 msgid "Portuguese (no dead keys)"
 msgstr "葡萄牙语（无死键）"
 
-#: ../rules/base.xml.in.h:696
+#: rules/base.xml:4584
 msgid "Portuguese (with Sun dead keys)"
 msgstr "葡萄牙语（Sun 死键）"
 
-#: ../rules/base.xml.in.h:697
+#: rules/base.xml:4590
 msgid "Portuguese (Macintosh)"
 msgstr "葡萄牙语（Mac）"
 
-#: ../rules/base.xml.in.h:698
+#: rules/base.xml:4596
 msgid "Portuguese (Macintosh, no dead keys)"
 msgstr "葡萄牙语（Mac，无死键）"
 
-#: ../rules/base.xml.in.h:699
+#: rules/base.xml:4602
 msgid "Portuguese (Macintosh, with Sun dead keys)"
 msgstr "葡萄牙语（Mac，Sun 死键）"
 
-#: ../rules/base.xml.in.h:700
+#: rules/base.xml:4608
 msgid "Portuguese (Nativo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:701
+#: rules/base.xml:4614
 msgid "Portuguese (Nativo for US keyboards)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:702
+#: rules/base.xml:4620
 msgid "Esperanto (Portugal, Nativo)"
 msgstr ""
 
 #. Keyboard indicator for Romanian layouts
-#: ../rules/base.xml.in.h:704 ../rules/base.extras.xml.in.h:84
+#: rules/base.xml:4632 rules/base.extras.xml:514
 msgid "ro"
 msgstr "ro"
 
-#: ../rules/base.xml.in.h:705 ../rules/base.extras.xml.in.h:85
+#: rules/base.xml:4633 rules/base.extras.xml:515
 msgid "Romanian"
 msgstr "罗马尼亚语"
 
-#: ../rules/base.xml.in.h:706
+#: rules/base.xml:4642
 msgid "Romanian (cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:707
+#: rules/base.xml:4648
 msgid "Romanian (standard)"
 msgstr "罗马尼亚语(标准)"
 
-#: ../rules/base.xml.in.h:708
+#: rules/base.xml:4654
 msgid "Romanian (standard cedilla)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:709
+#: rules/base.xml:4660
 msgid "Romanian (Win keys)"
 msgstr "罗马尼亚语（Win 键）"
 
-#: ../rules/base.xml.in.h:710 ../rules/base.extras.xml.in.h:93
+#: rules/base.xml:4670 rules/base.extras.xml:567
 msgid "Russian"
 msgstr "俄语"
 
-#: ../rules/base.xml.in.h:711
+#: rules/base.xml:4679
 msgid "Russian (phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:712
+#: rules/base.xml:4685
 msgid "Russian (phonetic, with Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:714
+#: rules/base.xml:4697
 msgid "Russian (typewriter)"
 msgstr "俄语(打字机)"
 
-#: ../rules/base.xml.in.h:715
+#: rules/base.xml:4703
 msgid "Russian (legacy)"
 msgstr "俄语(传统)"
 
-#: ../rules/base.xml.in.h:716
+#: rules/base.xml:4709
 msgid "Russian (typewriter, legacy)"
 msgstr "俄语(打字机，传统)"
 
-#: ../rules/base.xml.in.h:717
+#: rules/base.xml:4715
 msgid "Tatar"
 msgstr ""
 
-#: ../rules/base.xml.in.h:718
+#: rules/base.xml:4724
 msgid "Ossetian (legacy)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:719
+#: rules/base.xml:4733
 msgid "Ossetian (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:720
+#: rules/base.xml:4742
 msgid "Chuvash"
 msgstr ""
 
-#: ../rules/base.xml.in.h:721
+#: rules/base.xml:4751
 msgid "Chuvash (Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:722
+#: rules/base.xml:4760
 msgid "Udmurt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:723
+#: rules/base.xml:4769
 msgid "Komi"
 msgstr ""
 
-#: ../rules/base.xml.in.h:724
+#: rules/base.xml:4778
 msgid "Yakut"
 msgstr ""
 
-#: ../rules/base.xml.in.h:725
+#: rules/base.xml:4787
 msgid "Kalmyk"
 msgstr ""
 
-#: ../rules/base.xml.in.h:726
+#: rules/base.xml:4796
 msgid "Russian (DOS)"
 msgstr "俄语（DOS）"
 
-#: ../rules/base.xml.in.h:727
+#: rules/base.xml:4802
 msgid "Russian (Macintosh)"
 msgstr "俄语（Mac）"
 
-#: ../rules/base.xml.in.h:728
+#: rules/base.xml:4808
 msgid "Serbian (Russia)"
 msgstr "塞尔维亚语（俄罗斯）"
 
-#: ../rules/base.xml.in.h:729
+#: rules/base.xml:4818
 msgid "Bashkirian"
 msgstr "巴什基尔语"
 
-#: ../rules/base.xml.in.h:730
+#: rules/base.xml:4827
 msgid "Mari"
 msgstr ""
 
-#: ../rules/base.xml.in.h:731
+#: rules/base.xml:4836
 msgid "Russian (phonetic, AZERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:732
+#: rules/base.xml:4842
 msgid "Russian (phonetic, Dvorak)"
 msgstr "亚美尼亚语（音标，Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:733
+#: rules/base.xml:4848
 msgid "Russian (phonetic, French)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:734 ../rules/base.extras.xml.in.h:91
+#: rules/base.xml:4858 rules/base.extras.xml:549
 msgid "Serbian"
 msgstr "塞尔维亚语"
 
-#: ../rules/base.xml.in.h:735
+#: rules/base.xml:4867
 msgid "Serbian (Cyrillic, ZE and ZHE swapped)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:736
+#: rules/base.xml:4873
 msgid "Serbian (Latin)"
 msgstr "塞尔维亚语（拉丁）"
 
-#: ../rules/base.xml.in.h:737
+#: rules/base.xml:4879
 msgid "Serbian (Latin, Unicode)"
 msgstr "塞尔维亚语（拉丁，Unicode）"
 
-#: ../rules/base.xml.in.h:738
+#: rules/base.xml:4885
 msgid "Serbian (Latin, QWERTY)"
 msgstr "塞尔维亚（拉丁，QWERTY 布局）"
 
-#: ../rules/base.xml.in.h:739
+#: rules/base.xml:4891
 msgid "Serbian (Latin, Unicode, QWERTY)"
 msgstr "塞尔维亚（拉丁，Unicode，QWERTY 布局）"
 
-#: ../rules/base.xml.in.h:740
+#: rules/base.xml:4897
 msgid "Serbian (Cyrillic with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:741
+#: rules/base.xml:4903
 msgid "Serbian (Latin with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:742
+#: rules/base.xml:4909
 msgid "Pannonian Rusyn"
 msgstr ""
 
 #. Keyboard indicator for Slovenian layouts
-#: ../rules/base.xml.in.h:744
+#: rules/base.xml:4921
 msgid "sl"
 msgstr "sl"
 
-#: ../rules/base.xml.in.h:745
+#: rules/base.xml:4922
 msgid "Slovenian"
 msgstr ""
 
-#: ../rules/base.xml.in.h:746
+#: rules/base.xml:4931
 msgid "Slovenian (with guillemets)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:747
+#: rules/base.xml:4937
 msgid "Slovenian (US, with Slovenian letters)"
 msgstr ""
 
 #. Keyboard indicator for Slovak layouts
-#: ../rules/base.xml.in.h:749 ../rules/base.extras.xml.in.h:160
+#: rules/base.xml:4946 rules/base.extras.xml:1054
 msgid "sk"
 msgstr "sk"
 
-#: ../rules/base.xml.in.h:750 ../rules/base.extras.xml.in.h:161
+#: rules/base.xml:4947 rules/base.extras.xml:1055
 msgid "Slovak"
 msgstr "斯洛伐克语"
 
-#: ../rules/base.xml.in.h:751
+#: rules/base.xml:4956
 msgid "Slovak (extended backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:752
+#: rules/base.xml:4962
 msgid "Slovak (QWERTY)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:753
+#: rules/base.xml:4968
 msgid "Slovak (QWERTY, extended backslash)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:754 ../rules/base.extras.xml.in.h:164
+#: rules/base.xml:4978 rules/base.extras.xml:1076
 msgid "Spanish"
 msgstr "西班牙"
 
-#: ../rules/base.xml.in.h:755
+#: rules/base.xml:4987
 msgid "Spanish (no dead keys)"
 msgstr "西班牙语（无死键）"
 
-#: ../rules/base.xml.in.h:756
+#: rules/base.xml:4993
 msgid "Spanish (Win keys)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:757
+#: rules/base.xml:4999
 msgid "Spanish (dead tilde)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:758
+#: rules/base.xml:5005
 msgid "Spanish (with Sun dead keys)"
 msgstr "西班牙语（Sun 死键）"
 
-#: ../rules/base.xml.in.h:759
+#: rules/base.xml:5011
 msgid "Spanish (Dvorak)"
 msgstr "西班牙语（Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:760
+#: rules/base.xml:5017
 msgid "ast"
 msgstr ""
 
-#: ../rules/base.xml.in.h:761
+#: rules/base.xml:5018
 msgid "Asturian (Spain, with bottom-dot H and bottom-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:762
+#: rules/base.xml:5027
 msgid "ca"
 msgstr "ca"
 
-#: ../rules/base.xml.in.h:763
+#: rules/base.xml:5028
 msgid "Catalan (Spain, with middle-dot L)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:764
+#: rules/base.xml:5037
 msgid "Spanish (Macintosh)"
 msgstr "西班牙语(Mac)"
 
 #. Keyboard indicator for Swedish layouts
-#: ../rules/base.xml.in.h:766 ../rules/base.extras.xml.in.h:166
+#: rules/base.xml:5046 rules/base.extras.xml:1090
 msgid "sv"
 msgstr "sv"
 
-#: ../rules/base.xml.in.h:767 ../rules/base.extras.xml.in.h:167
+#: rules/base.xml:5047 rules/base.extras.xml:1091
 msgid "Swedish"
 msgstr "瑞典语"
 
-#: ../rules/base.xml.in.h:768
+#: rules/base.xml:5056
 msgid "Swedish (no dead keys)"
 msgstr "瑞典语（无死键）"
 
-#: ../rules/base.xml.in.h:769
+#: rules/base.xml:5062
 msgid "Swedish (Dvorak)"
 msgstr "瑞典语（Dvorak）"
 
-#: ../rules/base.xml.in.h:770
+#: rules/base.xml:5070
 msgid "Russian (Sweden, phonetic)"
 msgstr "俄语（瑞典，音标）"
 
-#: ../rules/base.xml.in.h:771
+#: rules/base.xml:5081
 msgid "Russian (Sweden, phonetic, no dead keys)"
 msgstr "俄语（瑞典，音标，无死键）"
 
-#: ../rules/base.xml.in.h:772
+#: rules/base.xml:5090
 msgid "Northern Saami (Sweden)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:773
+#: rules/base.xml:5099
 msgid "Swedish (Macintosh)"
 msgstr "瑞典语(Mac)"
 
-#: ../rules/base.xml.in.h:774
+#: rules/base.xml:5105
 msgid "Swedish (Svdvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:775
+#: rules/base.xml:5111
 msgid "Swedish (based on US Intl. Dvorak)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:777
+#: rules/base.xml:5123
 msgid "Swedish Sign Language"
 msgstr ""
 
-#: ../rules/base.xml.in.h:778 ../rules/base.extras.xml.in.h:171
+#: rules/base.xml:5136 rules/base.extras.xml:1121
 msgid "German (Switzerland)"
 msgstr "德语（瑞士）"
 
-#: ../rules/base.xml.in.h:779
+#: rules/base.xml:5146
 msgid "German (Switzerland, legacy)"
 msgstr "德语（瑞士，传统）"
 
-#: ../rules/base.xml.in.h:780
+#: rules/base.xml:5154
 msgid "German (Switzerland, no dead keys)"
 msgstr "德语（瑞士，无死键）"
 
-#: ../rules/base.xml.in.h:781
+#: rules/base.xml:5162
 msgid "German (Switzerland, with Sun dead keys)"
 msgstr "德语（瑞士，Sun 死键）"
 
-#: ../rules/base.xml.in.h:782
+#: rules/base.xml:5170
 msgid "French (Switzerland)"
 msgstr "法语（瑞士）"
 
-#: ../rules/base.xml.in.h:783
+#: rules/base.xml:5181
 msgid "French (Switzerland, no dead keys)"
 msgstr "法语（瑞士，无死键）"
 
-#: ../rules/base.xml.in.h:784
+#: rules/base.xml:5192
 msgid "French (Switzerland, with Sun dead keys)"
 msgstr "法语（瑞士，Sun 死键）"
 
-#: ../rules/base.xml.in.h:785
+#: rules/base.xml:5203
 msgid "French (Switzerland, Macintosh)"
 msgstr "法语（瑞士，Mac）"
 
-#: ../rules/base.xml.in.h:786
+#: rules/base.xml:5214
 msgid "German (Switzerland, Macintosh)"
 msgstr "德语（瑞士，Mac）"
 
-#: ../rules/base.xml.in.h:787
+#: rules/base.xml:5224
 msgid "Arabic (Syria)"
 msgstr "阿拉伯语（叙利亚）"
 
 #. Keyboard indicator for Syriac layouts
-#: ../rules/base.xml.in.h:789
+#: rules/base.xml:5234 rules/base.xml:5242
 msgid "syc"
 msgstr "syc"
 
-#: ../rules/base.xml.in.h:790
+#: rules/base.xml:5235
 msgid "Syriac"
 msgstr "叙利亚语"
 
-#: ../rules/base.xml.in.h:791
+#: rules/base.xml:5243
 msgid "Syriac (phonetic)"
 msgstr "叙利亚语(音标)"
 
-#: ../rules/base.xml.in.h:792
+#: rules/base.xml:5251
 msgid "Kurdish (Syria, Latin Q)"
 msgstr "库尔德语(叙利亚，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:793
+#: rules/base.xml:5262
 msgid "Kurdish (Syria, F)"
 msgstr "库尔德语(叙利亚，F)"
 
-#: ../rules/base.xml.in.h:794
+#: rules/base.xml:5273
 msgid "Kurdish (Syria, Latin Alt-Q)"
 msgstr "库尔德语(叙利亚，拉丁 Alt-Q)"
 
 #. Keyboard indicator for Tajik layouts
-#: ../rules/base.xml.in.h:796
+#: rules/base.xml:5285
 msgid "tg"
 msgstr "tg"
 
-#: ../rules/base.xml.in.h:797
+#: rules/base.xml:5286
 msgid "Tajik"
 msgstr "塔吉克"
 
-#: ../rules/base.xml.in.h:798
+#: rules/base.xml:5295
 msgid "Tajik (legacy)"
 msgstr ""
 
 #. Keyboard indicator for Sinhala layouts
-#: ../rules/base.xml.in.h:800
+#: rules/base.xml:5304
 msgid "si"
 msgstr "si"
 
-#: ../rules/base.xml.in.h:801
+#: rules/base.xml:5305
 msgid "Sinhala (phonetic)"
 msgstr ""
 
@@ -2950,481 +2985,482 @@
 msgstr ""
 
 #. Keyboard indicator for US layouts
-#: ../rules/base.xml.in.h:805
+#: rules/base.xml:5335
 msgid "us"
-msgstr ""
+msgstr "us"
 
-#: ../rules/base.xml.in.h:806
+#: rules/base.xml:5336
 msgid "Sinhala (US, with Sinhala letters)"
 msgstr ""
 
 #. Keyboard indicator for Thai layouts
-#: ../rules/base.xml.in.h:808
+#: rules/base.xml:5345
 msgid "th"
 msgstr "th"
 
-#: ../rules/base.xml.in.h:809
+#: rules/base.xml:5346
 msgid "Thai"
 msgstr "泰语"
 
-#: ../rules/base.xml.in.h:810
+#: rules/base.xml:5355
 msgid "Thai (TIS-820.2538)"
 msgstr "泰语(TIS-820.2538)"
 
-#: ../rules/base.xml.in.h:811
+#: rules/base.xml:5361
 msgid "Thai (Pattachote)"
 msgstr "泰语(Pattachote)"
 
 #. Keyboard indicator for Turkish layouts
-#: ../rules/base.xml.in.h:813 ../rules/base.extras.xml.in.h:174
+#: rules/base.xml:5370 rules/base.extras.xml:1141
 msgid "tr"
 msgstr "tr"
 
-#: ../rules/base.xml.in.h:814 ../rules/base.extras.xml.in.h:175
+#: rules/base.xml:5371 rules/base.extras.xml:1142
 msgid "Turkish"
 msgstr "土耳其"
 
-#: ../rules/base.xml.in.h:815
+#: rules/base.xml:5380
 msgid "Turkish (F)"
 msgstr "土耳其(F)"
 
-#: ../rules/base.xml.in.h:816
+#: rules/base.xml:5386
 msgid "Turkish (Alt-Q)"
 msgstr "土耳其(Alt-Q)"
 
-#: ../rules/base.xml.in.h:817
+#: rules/base.xml:5392
 msgid "Turkish (with Sun dead keys)"
 msgstr "土耳其语（Sun 死键）"
 
-#: ../rules/base.xml.in.h:818
+#: rules/base.xml:5400
 msgid "Kurdish (Turkey, Latin Q)"
 msgstr "库尔德语(土耳其，拉丁 Q)"
 
-#: ../rules/base.xml.in.h:819
+#: rules/base.xml:5411
 msgid "Kurdish (Turkey, F)"
 msgstr "库尔德语(土耳其，F)"
 
-#: ../rules/base.xml.in.h:820
+#: rules/base.xml:5422
 msgid "Kurdish (Turkey, Latin Alt-Q)"
 msgstr "库尔德语(土耳其，拉丁 Alt-Q)"
 
-#: ../rules/base.xml.in.h:821
+#: rules/base.xml:5431
 msgid "Turkish (intl., with dead keys)"
 msgstr "土耳其语（国际，带死键）"
 
 #. Keyboard indicator for Crimean Tatar layouts
-#: ../rules/base.xml.in.h:823 ../rules/base.extras.xml.in.h:86
+#: rules/base.xml:5438 rules/base.xml:5449 rules/base.xml:5460
+#: rules/base.extras.xml:524
 msgid "crh"
 msgstr "crh"
 
-#: ../rules/base.xml.in.h:824
+#: rules/base.xml:5439
 msgid "Crimean Tatar (Turkish Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:825
+#: rules/base.xml:5450
 msgid "Crimean Tatar (Turkish F)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:826
+#: rules/base.xml:5461
 msgid "Crimean Tatar (Turkish Alt-Q)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:827
+#: rules/base.xml:5474
 msgid "Taiwanese"
 msgstr "台湾"
 
-#: ../rules/base.xml.in.h:828
+#: rules/base.xml:5483
 msgid "Taiwanese (indigenous)"
 msgstr "台湾原住民语言"
 
 #. Keyboard indicator for Saisiyat layouts
-#: ../rules/base.xml.in.h:830
+#: rules/base.xml:5508
 msgid "xsy"
 msgstr "xsy"
 
-#: ../rules/base.xml.in.h:831
+#: rules/base.xml:5509
 msgid "Saisiyat (Taiwan)"
 msgstr ""
 
 #. Keyboard indicator for Ukranian layouts
-#: ../rules/base.xml.in.h:833 ../rules/base.extras.xml.in.h:177
+#: rules/base.xml:5521 rules/base.extras.xml:1156
 msgid "uk"
 msgstr "uk"
 
-#: ../rules/base.xml.in.h:834 ../rules/base.extras.xml.in.h:178
+#: rules/base.xml:5522 rules/base.extras.xml:1157
 msgid "Ukrainian"
 msgstr "乌克兰语"
 
-#: ../rules/base.xml.in.h:835
+#: rules/base.xml:5531
 msgid "Ukrainian (phonetic)"
 msgstr "乌克兰语（音标）"
 
-#: ../rules/base.xml.in.h:836
+#: rules/base.xml:5537
 msgid "Ukrainian (typewriter)"
 msgstr "乌克兰语（打字机）"
 
-#: ../rules/base.xml.in.h:837
+#: rules/base.xml:5543
 msgid "Ukrainian (Win keys)"
 msgstr "乌克兰语（Win 键）"
 
-#: ../rules/base.xml.in.h:838
+#: rules/base.xml:5549
 msgid "Ukrainian (legacy)"
 msgstr "乌克兰语（传统）"
 
-#: ../rules/base.xml.in.h:839
+#: rules/base.xml:5555
 msgid "Ukrainian (standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:840
+#: rules/base.xml:5561
 msgid "Russian (Ukraine, standard RSTU)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:841
+#: rules/base.xml:5567
 msgid "Ukrainian (homophonic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:842 ../rules/base.extras.xml.in.h:180
+#: rules/base.xml:5577 rules/base.extras.xml:1172
 msgid "English (UK)"
 msgstr "英语（英国）"
 
-#: ../rules/base.xml.in.h:843
+#: rules/base.xml:5586
 msgid "English (UK, extended, with Win keys)"
 msgstr "英语（英国，扩展，带 Win 键）"
 
-#: ../rules/base.xml.in.h:844
+#: rules/base.xml:5592
 msgid "English (UK, intl., with dead keys)"
 msgstr "英语（英国，带死键的国际布局）"
 
-#: ../rules/base.xml.in.h:845
+#: rules/base.xml:5598
 msgid "English (UK, Dvorak)"
 msgstr "英语（英国，Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:846
+#: rules/base.xml:5604
 msgid "English (UK, Dvorak, with UK punctuation)"
 msgstr "英语（英国，Mac 带英国标点的 Dvorak 布局）"
 
-#: ../rules/base.xml.in.h:847
+#: rules/base.xml:5610
 msgid "English (UK, Macintosh)"
 msgstr "英语（英国，Mac）"
 
-#: ../rules/base.xml.in.h:848
+#: rules/base.xml:5616
 msgid "English (UK, intl., Macintosh)"
 msgstr "英语（英国，国际布局，Mac）"
 
-#: ../rules/base.xml.in.h:849
+#: rules/base.xml:5622
 msgid "English (UK, Colemak)"
 msgstr "英语（英国，阔码布局）"
 
-#: ../rules/base.xml.in.h:851
+#: rules/base.xml:5643
 msgid "Uzbek"
 msgstr "乌兹别克语"
 
-#: ../rules/base.xml.in.h:852
+#: rules/base.xml:5652
 msgid "Uzbek (Latin)"
 msgstr "乌兹别克语(拉丁)"
 
 #. Keyboard indicator for Vietnamese layouts
-#: ../rules/base.xml.in.h:854 ../rules/base.extras.xml.in.h:186
+#: rules/base.xml:5661 rules/base.extras.xml:1202
 msgid "vi"
 msgstr "vi"
 
-#: ../rules/base.xml.in.h:855 ../rules/base.extras.xml.in.h:187
+#: rules/base.xml:5662 rules/base.extras.xml:1203
 msgid "Vietnamese"
 msgstr "越南语"
 
 #. Keyboard indicator for Korean layouts
-#: ../rules/base.xml.in.h:859 ../rules/base.extras.xml.in.h:182
+#: rules/base.xml:5686 rules/base.extras.xml:1186
 msgid "ko"
 msgstr "ko"
 
-#: ../rules/base.xml.in.h:860 ../rules/base.extras.xml.in.h:183
+#: rules/base.xml:5687 rules/base.extras.xml:1187
 msgid "Korean"
 msgstr "朝鲜语"
 
-#: ../rules/base.xml.in.h:861
+#: rules/base.xml:5696
 msgid "Korean (101/104 key compatible)"
 msgstr "朝鲜语(兼容 101/104 键)"
 
-#: ../rules/base.xml.in.h:862
+#: rules/base.xml:5706
 msgid "Japanese (PC-98)"
 msgstr "日语（PC-98 系列）"
 
 #. Keyboard indicator for Irish layouts
-#: ../rules/base.xml.in.h:864
+#: rules/base.xml:5719
 msgid "ie"
 msgstr "ie"
 
-#: ../rules/base.xml.in.h:865
+#: rules/base.xml:5720
 msgid "Irish"
 msgstr "爱尔兰"
 
-#: ../rules/base.xml.in.h:866
+#: rules/base.xml:5729
 msgid "CloGaelach"
 msgstr "CloGaelach"
 
-#: ../rules/base.xml.in.h:867
+#: rules/base.xml:5738
 msgid "Irish (UnicodeExpert)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:868
+#: rules/base.xml:5744
 msgid "Ogham"
 msgstr "欧甘"
 
-#: ../rules/base.xml.in.h:869
+#: rules/base.xml:5753
 msgid "Ogham (IS434)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:870
+#: rules/base.xml:5766
 msgid "Urdu (Pakistan)"
 msgstr "乌尔都语（巴基斯坦）"
 
-#: ../rules/base.xml.in.h:871
+#: rules/base.xml:5775
 msgid "Urdu (Pakistan, CRULP)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:872
+#: rules/base.xml:5781
 msgid "Urdu (Pakistan, NLA)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:873
+#: rules/base.xml:5788
 msgid "Arabic (Pakistan)"
 msgstr "阿拉伯语（巴基斯坦）"
 
 #. Keyboard indicator for Sindhi layouts
-#: ../rules/base.xml.in.h:875
+#: rules/base.xml:5798
 msgid "sd"
 msgstr "sd"
 
-#: ../rules/base.xml.in.h:876
+#: rules/base.xml:5799
 msgid "Sindhi"
 msgstr "信德语"
 
 #. Keyboard indicator for Dhivehi layouts
-#: ../rules/base.xml.in.h:878
+#: rules/base.xml:5811
 msgid "dv"
 msgstr "dv"
 
-#: ../rules/base.xml.in.h:879
+#: rules/base.xml:5812
 msgid "Dhivehi"
 msgstr "迪维希语"
 
-#: ../rules/base.xml.in.h:880
+#: rules/base.xml:5824
 msgid "English (South Africa)"
 msgstr "英语(南非)"
 
 #. Keyboard indicator for Esperanto layouts
-#: ../rules/base.xml.in.h:882
+#: rules/base.xml:5834
 msgid "eo"
 msgstr "eo"
 
-#: ../rules/base.xml.in.h:883
+#: rules/base.xml:5835
 msgid "Esperanto"
 msgstr "世界语"
 
-#: ../rules/base.xml.in.h:884
+#: rules/base.xml:5844
 msgid "Esperanto (displaced semicolon and quote, obsolete)"
 msgstr ""
 
 #. Keyboard indicator for Nepali layouts
-#: ../rules/base.xml.in.h:886
+#: rules/base.xml:5853
 msgid "ne"
 msgstr "ne"
 
-#: ../rules/base.xml.in.h:887
+#: rules/base.xml:5854
 msgid "Nepali"
 msgstr "尼泊尔语"
 
-#: ../rules/base.xml.in.h:888
+#: rules/base.xml:5867
 msgid "English (Nigeria)"
 msgstr "英语(尼日利亚)"
 
 #. Keyboard indicator for Igbo layouts
-#: ../rules/base.xml.in.h:890
+#: rules/base.xml:5877
 msgid "ig"
 msgstr "ig"
 
-#: ../rules/base.xml.in.h:891
+#: rules/base.xml:5878
 msgid "Igbo"
 msgstr "伊博语"
 
 #. Keyboard indicator for Yoruba layouts
-#: ../rules/base.xml.in.h:893
+#: rules/base.xml:5888
 msgid "yo"
 msgstr "yo"
 
-#: ../rules/base.xml.in.h:894
+#: rules/base.xml:5889
 msgid "Yoruba"
 msgstr ""
 
-#: ../rules/base.xml.in.h:895
+#: rules/base.xml:5900
 msgid "Hausa (Nigeria)"
 msgstr ""
 
 #. Keyboard indicator for Amharic layouts
-#: ../rules/base.xml.in.h:897
+#: rules/base.xml:5912
 msgid "am"
 msgstr "am"
 
-#: ../rules/base.xml.in.h:898
+#: rules/base.xml:5913
 msgid "Amharic"
 msgstr "阿姆哈拉语"
 
 #. Keyboard indicator for Wolof layouts
-#: ../rules/base.xml.in.h:900
+#: rules/base.xml:5924
 msgid "wo"
 msgstr "wo"
 
-#: ../rules/base.xml.in.h:901
+#: rules/base.xml:5925
 msgid "Wolof"
 msgstr ""
 
 #. Keyboard indicator for Braille layouts
-#: ../rules/base.xml.in.h:903
+#: rules/base.xml:5936
 msgid "brl"
 msgstr "brl"
 
-#: ../rules/base.xml.in.h:904
+#: rules/base.xml:5937
 msgid "Braille"
 msgstr ""
 
-#: ../rules/base.xml.in.h:905
+#: rules/base.xml:5943
 msgid "Braille (left-handed)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:907
+#: rules/base.xml:5955
 msgid "Braille (right-handed)"
 msgstr ""
 
 #. Keyboard indicator for Turkmen layouts
-#: ../rules/base.xml.in.h:910
+#: rules/base.xml:5970
 msgid "tk"
 msgstr "tk"
 
-#: ../rules/base.xml.in.h:911
+#: rules/base.xml:5971
 msgid "Turkmen"
 msgstr ""
 
-#: ../rules/base.xml.in.h:912
+#: rules/base.xml:5980
 msgid "Turkmen (Alt-Q)"
 msgstr ""
 
 #. Keyboard indicator for Bambara layouts
-#: ../rules/base.xml.in.h:914
+#: rules/base.xml:5989
 msgid "bm"
 msgstr "bm"
 
-#: ../rules/base.xml.in.h:915
+#: rules/base.xml:5990
 msgid "Bambara"
 msgstr "班巴拉语"
 
-#: ../rules/base.xml.in.h:916
+#: rules/base.xml:6001
 msgid "French (Mali, alt.)"
 msgstr "法语（马里，替代）"
 
-#: ../rules/base.xml.in.h:917
+#: rules/base.xml:6012
 msgid "English (Mali, US, Macintosh)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:918
+#: rules/base.xml:6023
 msgid "English (Mali, US, intl.)"
 msgstr ""
 
 #. Keyboard indicator for Swahili layouts
-#: ../rules/base.xml.in.h:920
+#: rules/base.xml:6035 rules/base.xml:6073
 msgid "sw"
 msgstr "sw"
 
-#: ../rules/base.xml.in.h:921
+#: rules/base.xml:6036
 msgid "Swahili (Tanzania)"
-msgstr ""
+msgstr "斯瓦希里语（坦桑尼亚）"
 
-#: ../rules/base.xml.in.h:922
+#: rules/base.xml:6045
 msgid "fr-tg"
-msgstr ""
+msgstr "fr-tg"
 
-#: ../rules/base.xml.in.h:923
+#: rules/base.xml:6046
 msgid "French (Togo)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:924
+#: rules/base.xml:6074
 msgid "Swahili (Kenya)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:925
+#: rules/base.xml:6085
 msgid "Kikuyu"
 msgstr ""
 
 #. Keyboard indicator for Tswana layouts
-#: ../rules/base.xml.in.h:927
+#: rules/base.xml:6097
 msgid "tn"
 msgstr "tn"
 
-#: ../rules/base.xml.in.h:928
+#: rules/base.xml:6098
 msgid "Tswana"
 msgstr ""
 
 #. Keyboard indicator for Filipino layouts
-#: ../rules/base.xml.in.h:930
+#: rules/base.xml:6108
 msgid "ph"
 msgstr "ph"
 
-#: ../rules/base.xml.in.h:931
+#: rules/base.xml:6109
 msgid "Filipino"
 msgstr "菲律宾语"
 
-#: ../rules/base.xml.in.h:932
+#: rules/base.xml:6128
 msgid "Filipino (QWERTY, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:933
+#: rules/base.xml:6146
 msgid "Filipino (Capewell-Dvorak, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:934
+#: rules/base.xml:6152
 msgid "Filipino (Capewell-Dvorak, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:935
+#: rules/base.xml:6170
 msgid "Filipino (Capewell-QWERF 2006, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:936
+#: rules/base.xml:6176
 msgid "Filipino (Capewell-QWERF 2006, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:937
+#: rules/base.xml:6194
 msgid "Filipino (Colemak, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:938
+#: rules/base.xml:6200
 msgid "Filipino (Colemak, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:939
+#: rules/base.xml:6218
 msgid "Filipino (Dvorak, Latin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:940
+#: rules/base.xml:6224
 msgid "Filipino (Dvorak, Baybayin)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:941
+#: rules/base.xml:6244
 msgid "md"
 msgstr ""
 
-#: ../rules/base.xml.in.h:942
+#: rules/base.xml:6245
 msgid "Moldavian"
 msgstr "摩尔多瓦语"
 
-#: ../rules/base.xml.in.h:943
+#: rules/base.xml:6254
 msgid "gag"
 msgstr ""
 
-#: ../rules/base.xml.in.h:944
+#: rules/base.xml:6255
 msgid "Moldavian (Gagauz)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:945
+#: rules/base.xml:6266
 msgid "id"
 msgstr ""
 
@@ -3432,724 +3468,725 @@
 msgid "Indonesian (Jawi)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:947
+#: rules/base.xml:6301
 msgid "ms"
 msgstr ""
 
-#: ../rules/base.xml.in.h:948
+#: rules/base.xml:6302
 msgid "Malay (Jawi, Arabic Keyboard)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:949
+#: rules/base.xml:6317
 msgid "Malay (Jawi, phonetic)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:950
+#: rules/base.xml:6328
 msgid "Switching to another layout"
-msgstr ""
+msgstr "切换至其它布局"
 
-#: ../rules/base.xml.in.h:951
+#: rules/base.xml:6333
 msgid "Right Alt (while pressed)"
 msgstr "右 Alt（按下时）"
 
-#: ../rules/base.xml.in.h:952
+#: rules/base.xml:6339
 msgid "Left Alt (while pressed)"
 msgstr "左 Alt（按下时）"
 
-#: ../rules/base.xml.in.h:953
+#: rules/base.xml:6345
 msgid "Left Win (while pressed)"
 msgstr "左 Win（按下时）"
 
-#: ../rules/base.xml.in.h:954
+#: rules/base.xml:6357
 msgid "Any Win (while pressed)"
 msgstr "任意 Win（按下时）"
 
-#: ../rules/base.xml.in.h:955
+#: rules/base.xml:6363
 msgid "Menu (while pressed), Shift+Menu for Menu"
-msgstr ""
+msgstr "菜单（按下时），Shift+Menu 作为菜单键"
 
-#: ../rules/base.xml.in.h:956
+#: rules/base.xml:6369
 msgid ""
 "Caps Lock (while pressed), Alt+Caps Lock for the original Caps Lock action"
 msgstr ""
 
-#: ../rules/base.xml.in.h:957
+#: rules/base.xml:6375
 msgid "Right Ctrl (while pressed)"
 msgstr "右 Ctrl（按下时）"
 
-#: ../rules/base.xml.in.h:958
+#: rules/base.xml:6381 rules/base.xml:6605 rules/base.xml:7093
 msgid "Right Alt"
 msgstr "右 Alt"
 
-#: ../rules/base.xml.in.h:959
+#: rules/base.xml:6387 rules/base.xml:6599
 msgid "Left Alt"
 msgstr "左 Alt"
 
-#: ../rules/base.xml.in.h:960
+#: rules/base.xml:6393 rules/base.xml:6629 rules/base.xml:6756
+#: rules/base.xml:7159
 msgid "Caps Lock"
 msgstr "大写锁定"
 
-#: ../rules/base.xml.in.h:961
+#: rules/base.xml:6399
 msgid "Shift+Caps Lock"
 msgstr "Shift+Caps Lock"
 
-#: ../rules/base.xml.in.h:962
+#: rules/base.xml:6405
 msgid "Caps Lock to first layout; Shift+Caps Lock to last layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:963
+#: rules/base.xml:6411
 msgid "Left Win to first layout; Right Win/Menu to last layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:964
+#: rules/base.xml:6417
 msgid "Left Ctrl to first layout; Right Ctrl to last layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:965
+#: rules/base.xml:6423
 msgid "Alt+Caps Lock"
 msgstr "Alt+Caps Lock"
 
-#: ../rules/base.xml.in.h:966
+#: rules/base.xml:6429
 msgid "Both Shift together"
 msgstr "同时按两个 Shift"
 
-#: ../rules/base.xml.in.h:967
+#: rules/base.xml:6435
 msgid "Both Alt together"
 msgstr "同时按两个 Alt"
 
-#: ../rules/base.xml.in.h:968
+#: rules/base.xml:6441
 msgid "Both Ctrl together"
 msgstr "同时按两个 Ctrl"
 
-#: ../rules/base.xml.in.h:969
+#: rules/base.xml:6447
 msgid "Ctrl+Shift"
 msgstr "Ctrl+Shift"
 
-#: ../rules/base.xml.in.h:970
+#: rules/base.xml:6453
 msgid "Left Ctrl+Left Shift"
 msgstr "左 Ctrl+左 Shift"
 
-#: ../rules/base.xml.in.h:971
+#: rules/base.xml:6459
 msgid "Right Ctrl+Right Shift"
 msgstr "右 Ctrl+右 Shift"
 
-#: ../rules/base.xml.in.h:972
+#: rules/base.xml:6465
 msgid "Alt+Ctrl"
 msgstr "Alt+Ctrl"
 
-#: ../rules/base.xml.in.h:973
+#: rules/base.xml:6471
 msgid "Alt+Shift"
 msgstr "Alt+Shift"
 
-#: ../rules/base.xml.in.h:974
+#: rules/base.xml:6477
 msgid "Left Alt+Left Shift"
 msgstr "左 Alt+左 Shift"
 
-#: ../rules/base.xml.in.h:975
+#: rules/base.xml:6483
 msgid "Alt+Space"
 msgstr "Alt+Space"
 
-#: ../rules/base.xml.in.h:976
+#: rules/base.xml:6489 rules/base.xml:6569 rules/base.xml:7123
 msgid "Menu"
 msgstr "菜单"
 
-#: ../rules/base.xml.in.h:977
+#: rules/base.xml:6495 rules/base.xml:6581 rules/base.xml:7099
 msgid "Left Win"
 msgstr "左 Win"
 
-#: ../rules/base.xml.in.h:978
+#: rules/base.xml:6501
 msgid "Win+Space"
 msgstr "Win+Space"
 
-#: ../rules/base.xml.in.h:979
+#: rules/base.xml:6507 rules/base.xml:6587 rules/base.xml:7111
 msgid "Right Win"
 msgstr "右 Win"
 
-#: ../rules/base.xml.in.h:980
+#: rules/base.xml:6513
 msgid "Left Shift"
 msgstr "左 Shift"
 
-#: ../rules/base.xml.in.h:981
+#: rules/base.xml:6519
 msgid "Right Shift"
 msgstr "右 Shift"
 
-#: ../rules/base.xml.in.h:982
+#: rules/base.xml:6525 rules/base.xml:7135
 msgid "Left Ctrl"
 msgstr "左 Ctrl"
 
-#: ../rules/base.xml.in.h:983
+#: rules/base.xml:6531 rules/base.xml:6563 rules/base.xml:7147
 msgid "Right Ctrl"
 msgstr "右 Ctrl"
 
-#: ../rules/base.xml.in.h:984
+#: rules/base.xml:6537 rules/base.xml:6762 rules/base.xml:7195
 msgid "Scroll Lock"
 msgstr "滚动锁定"
 
-#: ../rules/base.xml.in.h:985
+#: rules/base.xml:6543
 msgid "Left Ctrl+Left Win to first layout; Right Ctrl+Menu to second layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:986
+#: rules/base.xml:6549
 msgid "Left Ctrl+Left Win"
-msgstr ""
+msgstr "左 Ctrl+左 Win"
 
-#: ../rules/base.xml.in.h:987
+#: rules/base.xml:6558 rules/base.extras.xml:1280
 msgid "Key to choose the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:988
+#: rules/base.xml:6575
 msgid "Any Win"
 msgstr "任意 Win"
 
-#: ../rules/base.xml.in.h:989
+#: rules/base.xml:6593
 msgid "Any Alt"
 msgstr "任意 Alt"
 
-#: ../rules/base.xml.in.h:990
+#: rules/base.xml:6611
 msgid "Right Alt; Shift+Right Alt as Compose"
 msgstr ""
 
-#: ../rules/base.xml.in.h:991
+#: rules/base.xml:6617
 msgid "Right Alt never chooses 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:992
+#: rules/base.xml:6623
 msgid "Enter on keypad"
 msgstr "小键盘上的回车"
 
-#: ../rules/base.xml.in.h:993
+#: rules/base.xml:6635
 msgid "Backslash"
 msgstr "反斜杠"
 
-#: ../rules/base.xml.in.h:994
+#: rules/base.xml:6641 rules/base.xml:7171
 msgid "&lt;Less/Greater&gt;"
 msgstr "&lt;小于/大于&gt;"
 
-#: ../rules/base.xml.in.h:995
+#: rules/base.xml:6647
 msgid ""
 "Caps Lock; acts as onetime lock when pressed together with another 3rd-level "
 "chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:996
+#: rules/base.xml:6653
 msgid ""
 "Backslash; acts as onetime lock when pressed together with another 3rd level "
 "chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:997
+#: rules/base.xml:6659
 msgid ""
 "&lt;Less/Greater&gt;; acts as onetime lock when pressed together with "
 "another 3rd level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:998
+#: rules/base.xml:6667
 msgid "Ctrl position"
 msgstr "Ctrl 键位置"
 
-#: ../rules/base.xml.in.h:999
+#: rules/base.xml:6672
 msgid "Caps Lock as Ctrl"
 msgstr "大写锁定键作为 Ctrl"
 
-#: ../rules/base.xml.in.h:1000
+#: rules/base.xml:6678
 msgid "Left Ctrl as Meta"
 msgstr "左 Ctrl 作为 Meta"
 
-#: ../rules/base.xml.in.h:1001
+#: rules/base.xml:6684
 msgid "Swap Ctrl and Caps Lock"
 msgstr "交换 Ctrl 和大写锁定"
 
-#: ../rules/base.xml.in.h:1002
+#: rules/base.xml:6696
 msgid "At left of 'A'"
 msgstr "在“A”左侧"
 
-#: ../rules/base.xml.in.h:1003
+#: rules/base.xml:6702
 msgid "At bottom left"
 msgstr "在左下角"
 
-#: ../rules/base.xml.in.h:1004
+#: rules/base.xml:6708
 msgid "Right Ctrl as Right Alt"
 msgstr "右 Ctrl 作为 Alt"
 
-#: ../rules/base.xml.in.h:1005
+#: rules/base.xml:6714
 msgid "Menu as Right Ctrl"
-msgstr ""
+msgstr "菜单键作为右 Ctrl"
 
-#: ../rules/base.xml.in.h:1006
+#: rules/base.xml:6720
 msgid "Swap Left Alt with Left Ctrl"
 msgstr "左 Alt 和左 Ctrl 对换"
 
-#: ../rules/base.xml.in.h:1007
+#: rules/base.xml:6726
 msgid "Swap Left Win with Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1008
+#: rules/base.xml:6731
 msgid "Swap Right Win with Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1009
+#: rules/base.xml:6737
 msgid "Left Alt as Ctrl, Left Ctrl as Win, Left Win as Left Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1010
+#: rules/base.xml:6745
 msgid "Use keyboard LED to show alternative layout"
 msgstr "使用键盘灯显示替代布局"
 
-#: ../rules/base.xml.in.h:1011
+#: rules/base.xml:6750
 msgid "Num Lock"
 msgstr "数字锁定"
 
-#: ../rules/base.xml.in.h:1012
+#: rules/base.xml:6783
 msgid "Layout of numeric keypad"
 msgstr "数字小键盘布局"
 
-#: ../rules/base.xml.in.h:1013
+#: rules/base.xml:6788
 msgid "Legacy"
 msgstr "传统"
 
-#: ../rules/base.xml.in.h:1014
+#: rules/base.xml:6794
 msgid "Unicode additions (arrows and math operators)"
 msgstr "Unicode 扩展(箭头和数学操作符)"
 
-#: ../rules/base.xml.in.h:1015
+#: rules/base.xml:6800
 msgid ""
 "Unicode additions (arrows and math operators; math operators on default "
 "level)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1016
+#: rules/base.xml:6806
 msgid "Legacy Wang 724"
 msgstr "传统王安 724"
 
-#: ../rules/base.xml.in.h:1017
+#: rules/base.xml:6812
 msgid "Wang 724 keypad with Unicode additions (arrows and math operators)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1018
+#: rules/base.xml:6818
 msgid ""
 "Wang 724 keypad with Unicode additions (arrows and math operators; math "
 "operators on default level)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1019
+#: rules/base.xml:6824
 msgid "Hexadecimal"
 msgstr "十六进制"
 
-#: ../rules/base.xml.in.h:1020
+#: rules/base.xml:6830
 msgid "ATM/phone-style"
-msgstr ""
+msgstr "ATM/电话风格"
 
-#: ../rules/base.xml.in.h:1021
+#: rules/base.xml:6839
 msgid "Numeric keypad Delete behavior"
 msgstr "数字小键盘上删除键的行为"
 
-#: ../rules/base.xml.in.h:1022
+#: rules/base.xml:6845
 msgid "Legacy key with dot"
 msgstr ""
 
 #. Actually, with KP_SEPARATOR, as the old keypad(comma)
-#: ../rules/base.xml.in.h:1024
+#: rules/base.xml:6852
 msgid "Legacy key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1025
+#: rules/base.xml:6858
 msgid "Four-level key with dot"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1026
+#: rules/base.xml:6864
 msgid "Four-level key with dot, Latin-9 only"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1027
+#: rules/base.xml:6870
 msgid "Four-level key with comma"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1028
+#: rules/base.xml:6876
 msgid "Four-level key with momayyez"
 msgstr ""
 
 #. This assumes the KP_ abstract symbols are actually useful for some apps
 #. The description needs to be rewritten
-#: ../rules/base.xml.in.h:1031
+#: rules/base.xml:6884
 msgid "Four-level key with abstract separators"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1032
+#: rules/base.xml:6890
 msgid "Semicolon on third level"
 msgstr "第三层上的分号"
 
-#: ../rules/base.xml.in.h:1033
+#: rules/base.xml:6900
 msgid "Caps Lock behavior"
 msgstr "大写锁定行为"
 
-#: ../rules/base.xml.in.h:1034
+#: rules/base.xml:6905
 msgid "Caps Lock uses internal capitalization; Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1035
+#: rules/base.xml:6911
 msgid ""
 "Caps Lock uses internal capitalization; Shift does not affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1036
+#: rules/base.xml:6917
 msgid "Caps Lock acts as Shift with locking; Shift \"pauses\" Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1037
+#: rules/base.xml:6923
 msgid "Caps Lock acts as Shift with locking; Shift does not affect Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1038
+#: rules/base.xml:6929
 msgid "Caps Lock toggles normal capitalization of alphabetic characters"
-msgstr ""
+msgstr "大写锁定切换正常的字母字符的大小写"
 
-#: ../rules/base.xml.in.h:1039
+#: rules/base.xml:6935
 msgid "Caps Lock toggles ShiftLock (affects all keys)"
 msgstr "大写锁定切换 ShiftLock（影响所有键）"
 
-#: ../rules/base.xml.in.h:1040
+#: rules/base.xml:6941
 msgid "Swap ESC and Caps Lock"
 msgstr "交换 ESC 和大写锁定"
 
-#: ../rules/base.xml.in.h:1041
+#: rules/base.xml:6947
 msgid "Make Caps Lock an additional Esc"
 msgstr "将 CapsLock 作为额外的 Esc 键"
 
-#: ../rules/base.xml.in.h:1042
+#: rules/base.xml:6959
 msgid "Make Caps Lock an additional Backspace"
 msgstr "将 CapsLock 作为额外的 Backspace"
 
-#: ../rules/base.xml.in.h:1043
+#: rules/base.xml:6965
 msgid "Make Caps Lock an additional Super"
 msgstr "将 CapsLock 作为额外的 Super"
 
-#: ../rules/base.xml.in.h:1044
+#: rules/base.xml:6971
 msgid "Make Caps Lock an additional Hyper"
 msgstr "将 CapsLock 作为额外的 Hyper"
 
-#: ../rules/base.xml.in.h:1045
+#: rules/base.xml:6977
 msgid "Make Caps Lock an additional Menu key"
 msgstr "将 CapsLock 作为额外的 Menu 键"
 
-#: ../rules/base.xml.in.h:1046
+#: rules/base.xml:6983
 msgid "Make Caps Lock an additional Num Lock"
 msgstr "将 CapsLock 作为额外的 Num Lock"
 
-#: ../rules/base.xml.in.h:1047
+#: rules/base.xml:6989
 msgid "Caps Lock is also a Ctrl"
 msgstr "大写锁定也是 Ctrl 键"
 
-#: ../rules/base.xml.in.h:1048
+#: rules/base.xml:6995
 msgid "Caps Lock is disabled"
 msgstr "大写锁定被禁用"
 
-#: ../rules/base.xml.in.h:1049
+#: rules/base.xml:7003
 msgid "Alt/Win key behavior"
 msgstr "Alt/Win 键行为"
 
-#: ../rules/base.xml.in.h:1050
+#: rules/base.xml:7008
 msgid "Add the standard behavior to Menu key"
 msgstr "将标准行为添加到菜单键"
 
-#: ../rules/base.xml.in.h:1051
+#: rules/base.xml:7020
 msgid "Alt and Meta are on Alt"
 msgstr "Alt 和 Meta 都是 Alt 键"
 
-#: ../rules/base.xml.in.h:1052
+#: rules/base.xml:7026
 msgid "Alt is mapped to Win and the usual Alt"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1053
+#: rules/base.xml:7032
 msgid "Ctrl is mapped to Win and the usual Ctrl keys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1054
+#: rules/base.xml:7038
 msgid "Ctrl is mapped to Alt; Alt is mapped to Win"
-msgstr ""
+msgstr "Ctrl 被映射到 Alt 键；Alt 被映射到 Win 键"
 
-#: ../rules/base.xml.in.h:1055
+#: rules/base.xml:7044
 msgid "Meta is mapped to Win"
-msgstr ""
+msgstr "Meta 被映射到 Win 键"
 
-#: ../rules/base.xml.in.h:1056
+#: rules/base.xml:7050
 msgid "Meta is mapped to Left Win"
-msgstr "Meta 被映射到左 Win 键。"
+msgstr "Meta 被映射到左 Win 键"
 
-#: ../rules/base.xml.in.h:1057
+#: rules/base.xml:7056
 msgid "Hyper is mapped to Win"
-msgstr ""
+msgstr "Hyper 被映射到 Win 键"
 
-#: ../rules/base.xml.in.h:1058
+#: rules/base.xml:7062
 msgid "Alt is mapped to Right Win, Super to Menu"
 msgstr "Alt 键映射到右 Win，Super 映射到菜单键"
 
-#: ../rules/base.xml.in.h:1059
+#: rules/base.xml:7068
 msgid "Left Alt is swapped with Left Win"
 msgstr "左 Alt 和左 Win 对换"
 
-#: ../rules/base.xml.in.h:1060
+#: rules/base.xml:7074
 msgid "Alt is swapped with Win"
 msgstr "Alt 和 Win 对换"
 
-#: ../rules/base.xml.in.h:1061
+#: rules/base.xml:7080
 msgid "Win is mapped to PrtSc and the usual Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1062
+#: rules/base.xml:7088
 msgid "Position of Compose key"
 msgstr "Compose 键的位置"
 
-#: ../rules/base.xml.in.h:1063
+#: rules/base.xml:7105
 msgid "3rd level of Left Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1064
+#: rules/base.xml:7117
 msgid "3rd level of Right Win"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1065
+#: rules/base.xml:7129
 msgid "3rd level of Menu"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1066
+#: rules/base.xml:7141
 msgid "3rd level of Left Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1067
+#: rules/base.xml:7153
 msgid "3rd level of Right Ctrl"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1068
+#: rules/base.xml:7165
 msgid "3rd level of Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1069
+#: rules/base.xml:7177
 msgid "3rd level of &lt;Less/Greater&gt;"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1070
+#: rules/base.xml:7183
 msgid "Pause"
 msgstr "暂停"
 
-#: ../rules/base.xml.in.h:1071
+#: rules/base.xml:7189
 msgid "PrtSc"
 msgstr "截屏"
 
-#: ../rules/base.xml.in.h:1072
+#: rules/base.xml:7202
 msgid "Miscellaneous compatibility options"
 msgstr "其它兼容选项"
 
-#: ../rules/base.xml.in.h:1073
+#: rules/base.xml:7207
 msgid "Default numeric keypad keys"
 msgstr "默认数字小键盘键"
 
-#: ../rules/base.xml.in.h:1074
+#: rules/base.xml:7213
 msgid "Numeric keypad always enters digits (as in macOS)"
-msgstr ""
+msgstr "数字小键盘总是输入数字（类似 macOS）"
 
-#: ../rules/base.xml.in.h:1075
+#: rules/base.xml:7219
 msgid ""
 "Num Lock on: digits; Shift for arrow keys. Num Lock off: arrow keys (as in "
 "Windows)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1076
+#: rules/base.xml:7225
 msgid "Shift does not cancel Num Lock, chooses 3rd level instead"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1077
+#: rules/base.xml:7231
 msgid "Special keys (Ctrl+Alt+&lt;key&gt;) handled in a server"
 msgstr "服务器处理的特殊键（Ctrl+Alt+&lt;key&gt;）"
 
-#: ../rules/base.xml.in.h:1078
+#: rules/base.xml:7237
 msgid ""
 "Apple Aluminium: emulate PC keys (PrtSc, Scroll Lock, Pause, Num Lock)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1079
+#: rules/base.xml:7243
 msgid "Shift cancels Caps Lock"
 msgstr "Shift 取消大写锁定"
 
-#: ../rules/base.xml.in.h:1080
+#: rules/base.xml:7249
 msgid "Enable extra typographic characters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1081
+#: rules/base.xml:7255
 msgid "Both Shift together enable Caps Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1082
+#: rules/base.xml:7261
 msgid "Both Shift together enable Caps Lock; one Shift key disables it"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1083
+#: rules/base.xml:7267
 msgid "Both Shift together enable Shift Lock"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1084
+#: rules/base.xml:7273
 msgid "Shift + Num Lock enables PointerKeys"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1085
+#: rules/base.xml:7279
 msgid "Allow breaking grabs with keyboard actions (warning: security risk)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1086
+#: rules/base.xml:7285
 msgid "Allow grab and window tree logging"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1087
+#: rules/base.xml:7293
 msgid "Adding currency signs to certain keys"
 msgstr "向特定键添加货币符号"
 
-#: ../rules/base.xml.in.h:1088
+#: rules/base.xml:7298
 msgid "Euro on E"
 msgstr "欧元符号在 E 键上"
 
-#: ../rules/base.xml.in.h:1089
+#: rules/base.xml:7304
 msgid "Euro on 2"
 msgstr "欧元符号在 2 键上"
 
-#: ../rules/base.xml.in.h:1090
+#: rules/base.xml:7310
 msgid "Euro on 4"
 msgstr "欧元符号在 4 键上"
 
-#: ../rules/base.xml.in.h:1091
+#: rules/base.xml:7316
 msgid "Euro on 5"
 msgstr "欧元符号在 5 键上"
 
-#: ../rules/base.xml.in.h:1092
+#: rules/base.xml:7322
 msgid "Rupee on 4"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1093
+#: rules/base.xml:7329
 msgid "Key to choose 5th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1094
+#: rules/base.xml:7346
 msgid ""
 "&lt;Less/Greater&gt; chooses 5th level; acts as onetime lock when pressed "
 "together with another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1095
+#: rules/base.xml:7352
 msgid ""
 "Right Alt chooses 5th level; acts as onetime lock when pressed together with "
 "another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1096
+#: rules/base.xml:7358
 msgid ""
 "Left Win chooses 5th level; acts as onetime lock when pressed together with "
 "another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1097
+#: rules/base.xml:7364
 msgid ""
 "Right Win chooses 5th level; acts as onetime lock when pressed together with "
 "another 5th level chooser"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1098
+#: rules/base.xml:7410
 msgid "Using space key to input non-breaking space"
 msgstr "使用空格键输入不可中断空白"
 
-#: ../rules/base.xml.in.h:1099
+#: rules/base.xml:7415
 msgid "Usual space at any level"
-msgstr ""
+msgstr "任何层上为通常空格"
 
-#: ../rules/base.xml.in.h:1100
+#: rules/base.xml:7421
 msgid "Non-breaking space at the 2nd level"
-msgstr ""
+msgstr "第二层上为不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1101
+#: rules/base.xml:7427
 msgid "Non-breaking space at the 3rd level"
-msgstr ""
+msgstr "第三层上为不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1102
+#: rules/base.xml:7433
 msgid "Non-breaking space at the 3rd level, nothing at the 4th level"
-msgstr ""
+msgstr "第三层上为不可打断空白字符，第四层上无效果"
 
-#: ../rules/base.xml.in.h:1103
+#: rules/base.xml:7439
 msgid ""
 "Non-breaking space at the 3rd level, thin non-breaking space at the 4th level"
-msgstr ""
+msgstr "第三层上为不可打断空白字符，第四层上为短不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1104
+#: rules/base.xml:7445
 msgid "Non-breaking space at the 4th level"
-msgstr ""
+msgstr "第四层上为不可打断空白字符"
 
-#: ../rules/base.xml.in.h:1105
+#: rules/base.xml:7451
 msgid ""
 "Non-breaking space at the 4th level, thin non-breaking space at the 6th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1106
+#: rules/base.xml:7457
 msgid ""
 "Non-breaking space at the 4th level, thin non-breaking space at the 6th "
 "level (via Ctrl+Shift)"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1107
+#: rules/base.xml:7463
 msgid "Zero-width non-joiner at the 2nd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1108
+#: rules/base.xml:7469
 msgid ""
 "Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1109
+#: rules/base.xml:7475
 msgid ""
 "Zero-width non-joiner at the 2nd level, zero-width joiner at the 3rd level, "
 "non-breaking space at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1110
+#: rules/base.xml:7481
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1111
+#: rules/base.xml:7487
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, "
 "nothing at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1112
+#: rules/base.xml:7493
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, "
 "zero-width joiner at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1113
+#: rules/base.xml:7499
 msgid ""
 "Zero-width non-joiner at the 2nd level, non-breaking space at the 3rd level, "
 "thin non-breaking space at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1114
+#: rules/base.xml:7505
 msgid ""
 "Zero-width non-joiner at the 3rd level, zero-width joiner at the 4th level"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1115
+#: rules/base.xml:7512
 msgid "Japanese keyboard options"
 msgstr "日语键盘选项"
 
-#: ../rules/base.xml.in.h:1116
+#: rules/base.xml:7517
 msgid "Kana Lock key is locking"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1117
+#: rules/base.xml:7523
 msgid "NICOLA-F style Backspace"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1118
+#: rules/base.xml:7529
 msgid "Make Zenkaku Hankaku an additional Esc"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1119
+#: rules/base.xml:7536
 msgid "Korean Hangul/Hanja keys"
 msgstr "韩语谚文/汉字键"
 
@@ -4165,395 +4202,395 @@
 msgid "Right Ctrl as Hangul, right Alt as Hanja"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1122
+#: rules/base.xml:7566
 msgid "Adding Esperanto supersigned letters"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1123
+#: rules/base.xml:7571
 msgid "To the corresponding key in a QWERTY layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1124
+#: rules/base.xml:7577
 msgid "To the corresponding key in a Dvorak layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1125
+#: rules/base.xml:7583
 msgid "To the corresponding key in a Colemak layout"
 msgstr ""
 
-#: ../rules/base.xml.in.h:1126
+#: rules/base.xml:7590
 msgid "Maintain key compatibility with old Solaris keycodes"
 msgstr "维持与旧的 Solaris keycodes 的键盘兼容性"
 
-#: ../rules/base.xml.in.h:1127
+#: rules/base.xml:7595
 msgid "Sun Key compatibility"
 msgstr "Sun 键盘兼容性"
 
-#: ../rules/base.xml.in.h:1128
+#: rules/base.xml:7602
 msgid "Key sequence to kill the X server"
 msgstr "杀死 X 服务器的按键序列"
 
-#: ../rules/base.xml.in.h:1129
+#: rules/base.xml:7607
 msgid "Ctrl+Alt+Backspace"
 msgstr "Ctrl+Alt+Backspace"
 
-#: ../rules/base.extras.xml.in.h:1
+#: rules/base.extras.xml:9
 msgid "apl"
 msgstr "apl"
 
-#: ../rules/base.extras.xml.in.h:2
+#: rules/base.extras.xml:10
 msgid "APL"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:3
+#: rules/base.extras.xml:19
 msgid "dlg"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:4
+#: rules/base.extras.xml:20
 msgid "Dyalog APL complete"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:5
+#: rules/base.extras.xml:26
 msgid "sax"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:6
+#: rules/base.extras.xml:27
 msgid "APL Keyboard Symbols: sax"
 msgstr "APL 键盘符号：sax"
 
-#: ../rules/base.extras.xml.in.h:7
+#: rules/base.extras.xml:33
 msgid "ufd"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:8
+#: rules/base.extras.xml:34
 msgid "APL Keyboard Symbols: Unified Layout"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:9
+#: rules/base.extras.xml:40
 msgid "apl2"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:10
+#: rules/base.extras.xml:41
 msgid "APL Keyboard Symbols: IBM APL2"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:11
+#: rules/base.extras.xml:47
 msgid "aplII"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:12
+#: rules/base.extras.xml:48
 msgid "APL Keyboard Symbols: Manugistics APL*PLUS II"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:13
+#: rules/base.extras.xml:54
 msgid "aplx"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:14
+#: rules/base.extras.xml:55
 msgid "APL Keyboard Symbols: APLX Unified APL Layout"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:17
+#: rules/base.extras.xml:73
 msgid "kut"
 msgstr "kut"
 
-#: ../rules/base.extras.xml.in.h:18
+#: rules/base.extras.xml:74
 msgid "Kutenai"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:19
+#: rules/base.extras.xml:80
 msgid "shs"
 msgstr "shs"
 
-#: ../rules/base.extras.xml.in.h:20
+#: rules/base.extras.xml:81
 msgid "Secwepemctsin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:21
+#: rules/base.extras.xml:87
 msgid "Multilingual (Canada, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:24
+#: rules/base.extras.xml:105
 msgid "German (US, with German letters)"
 msgstr "德语（带德语字母的美式键盘）"
 
-#: ../rules/base.extras.xml.in.h:25
+#: rules/base.extras.xml:114
 msgid "German (with Hungarian letters and no dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:26
+#: rules/base.extras.xml:124
 msgid "Polish (Germany, no dead keys)"
 msgstr "波兰语（德国，无死键）"
 
-#: ../rules/base.extras.xml.in.h:27
+#: rules/base.extras.xml:134
 msgid "German (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:28
+#: rules/base.extras.xml:140
 msgid "German (Aus der Neo-Welt)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:29
+#: rules/base.extras.xml:146
 msgid "German (KOY)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:30
+#: rules/base.extras.xml:152
 msgid "German (Bone)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:31
+#: rules/base.extras.xml:158
 msgid "German (Bone, eszett home row)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:32
+#: rules/base.extras.xml:164
 msgid "German (Neo qwertz)"
 msgstr "德语（Neo qwertz 布局）"
 
-#: ../rules/base.extras.xml.in.h:33
+#: rules/base.extras.xml:170
 msgid "German (Neo qwerty)"
 msgstr "德语（Neo qwerty 布局）"
 
-#: ../rules/base.extras.xml.in.h:36
+#: rules/base.extras.xml:178
 msgid "Russian (Germany, recommended)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:37
+#: rules/base.extras.xml:189
 msgid "Russian (Germany, transliteration)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:38
+#: rules/base.extras.xml:199
 msgid "German Ladin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:39
+#: rules/base.extras.xml:198
 msgid "de_lld"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:41
+#: rules/base.extras.xml:218
 msgid "Old Hungarian"
 msgstr "旧匈牙利语"
 
-#: ../rules/base.extras.xml.in.h:42
+#: rules/base.extras.xml:217
 msgid "oldhun"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:45
+#: rules/base.extras.xml:236
 msgid "Avestan"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:48
+#: rules/base.extras.xml:257
 msgid "Lithuanian (US Dvorak with Lithuanian letters)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:49
+#: rules/base.extras.xml:263
 msgid "Lithuanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:52
+#: rules/base.extras.xml:281
 msgid "Latvian (US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:53
+#: rules/base.extras.xml:287
 msgid "Latvian (US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:54
+#: rules/base.extras.xml:293
 msgid "Latvian (US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:55
+#: rules/base.extras.xml:299
 msgid "Latvian (programmer US Dvorak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:56
+#: rules/base.extras.xml:305
 msgid "Latvian (programmer US Dvorak, Y variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:57
+#: rules/base.extras.xml:311
 msgid "Latvian (programmer US Dvorak, minus variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:58
+#: rules/base.extras.xml:317
 msgid "Latvian (US Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:59
+#: rules/base.extras.xml:323
 msgid "Latvian (US Colemak, apostrophe variant)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:60
+#: rules/base.extras.xml:329
 msgid "Latvian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:63
+#: rules/base.extras.xml:347
 msgid "English (US, international AltGr Unicode combining)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:64
+#: rules/base.extras.xml:353
 msgid "English (US, international AltGr Unicode combining, alternative)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:65
+#: rules/base.extras.xml:359
 msgid "Atsina"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:66
+#: rules/base.extras.xml:366
 msgid "Coeur d'Alene Salish"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:67
+#: rules/base.extras.xml:375
 msgid "Czech Slovak and German (US)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:68
+#: rules/base.extras.xml:405
 msgid "English (US, IBM Arabic 238_L)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:69
+#: rules/base.extras.xml:411
 msgid "English (US, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:70
+#: rules/base.xml:1473
 msgid "English (Norman)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:71
+#: rules/base.extras.xml:417
 msgid "English (Carpalx)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:72
+#: rules/base.extras.xml:423
 msgid "English (Carpalx, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:73
+#: rules/base.extras.xml:429
 msgid "English (Carpalx, intl., with AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:74
+#: rules/base.extras.xml:435
 msgid "English (Carpalx, full optimization)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:75
+#: rules/base.extras.xml:441
 msgid "English (Carpalx, full optimization, intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:76
+#: rules/base.extras.xml:447
 msgid "English (Carpalx, full optimization, intl., with AltGr dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:77
+#: rules/base.extras.xml:465
 msgid "Sicilian (US keyboard)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:80
+#: rules/base.extras.xml:488
 msgid "Polish (intl., with dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:81
+#: rules/base.extras.xml:494
 msgid "Polish (Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:82
+#: rules/base.extras.xml:500
 msgid "Polish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:83
+#: rules/base.extras.xml:506
 msgid "Polish (Glagolica)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:87
+#: rules/base.extras.xml:525
 msgid "Crimean Tatar (Dobruja Q)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:88
+#: rules/base.extras.xml:534
 msgid "Romanian (ergonomic Touchtype)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:89
+#: rules/base.extras.xml:540
 msgid "Romanian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:92
+#: rules/base.extras.xml:558
 msgid "Serbian (combining accents instead of dead keys)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:94
+#: rules/base.extras.xml:573
 msgid "Church Slavonic"
 msgstr "教会斯拉夫语"
 
-#: ../rules/base.extras.xml.in.h:95
+#: rules/base.extras.xml:583
 msgid "Russian (with Ukrainian-Belorussian layout)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:96
+#: rules/base.extras.xml:594
 msgid "Russian (Rulemak, phonetic Colemak)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:97
+#: rules/base.extras.xml:606
 msgid "Russian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:99
+#: rules/base.extras.xml:619
 msgid "Russian (Polyglot and Reactionary)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:102
+#: rules/base.extras.xml:705
 msgid "Armenian (OLPC phonetic)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:105
+#: rules/base.extras.xml:723
 msgid "Hebrew (Biblical, SIL phonetic)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:108
+#: rules/base.extras.xml:741
 msgid "Arabic (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:109
+#: rules/base.extras.xml:747
 msgid ""
 "Arabic (with extensions for Arabic-written other languages and European "
 "digits preferred)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:110
+#: rules/base.extras.xml:753
 msgid ""
 "Arabic (with extensions for Arabic-written other languages and Arabic digits "
 "preferred)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:111
+#: rules/base.extras.xml:759
 msgid "Ugaritic instead of Arabic"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:114
+#: rules/base.extras.xml:774
 msgid "Belgian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:117
+#: rules/base.extras.xml:789
 msgid "Portuguese (Brazil, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:120
+#: rules/base.extras.xml:804
 msgid "Czech (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:123
+#: rules/base.extras.xml:843
 msgid "Danish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:126
+#: rules/base.extras.xml:858
 msgid "Dutch (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:129
+#: rules/base.extras.xml:873
 msgid "Estonian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:132
+#: rules/base.extras.xml:894
 msgid "Finnish (DAS)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:133
+#: rules/base.extras.xml:888
 msgid "Finnish (Sun Type 6/7)"
 msgstr ""
 
@@ -4561,96 +4598,96 @@
 msgid "Finnish Dvorak"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:136
+#: rules/base.extras.xml:915
 msgid "French (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:141
+#: rules/base.extras.xml:942
 msgid "Greek (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:145
+#: rules/base.extras.xml:963
 msgid "Italian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:146
+#: rules/base.xml:3958
 msgid "Friulian (Italy)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:147
+#: rules/base.extras.xml:970
 msgid "Italian Ladin"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:148
+#: rules/base.extras.xml:969
 msgid "it_lld"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:151
+#: rules/base.extras.xml:989
 msgid "Japanese (Sun Type 6)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:152
+#: rules/base.extras.xml:995
 msgid "Japanese (Sun Type 7 - pc compatible)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:153
+#: rules/base.extras.xml:1001
 msgid "Japanese (Sun Type 7 - sun compatible)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:156
+#: rules/base.extras.xml:1016
 msgid "Norwegian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:158
+#: rules/base.extras.xml:1031
 msgid "Portuguese (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:162
+#: rules/base.extras.xml:1067
 msgid "Slovak (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:165
+#: rules/base.extras.xml:1082
 msgid "Spanish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:168
+#: rules/base.extras.xml:1097
 msgid "Swedish (Dvorak A5)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:169
+#: rules/base.extras.xml:1103
 msgid "Swedish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:170
+#: rules/base.extras.xml:1109
 msgid "Elfdalian (Swedish, with combining ogonek)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:172
+#: rules/base.extras.xml:1127
 msgid "German (Switzerland, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:173
+#: rules/base.extras.xml:1133
 msgid "French (Switzerland, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:176
+#: rules/base.extras.xml:1148
 msgid "Turkish (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:179
+#: rules/base.extras.xml:1163
 msgid "Ukrainian (Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:181
+#: rules/base.extras.xml:1178
 msgid "English (UK, Sun Type 6/7)"
 msgstr ""
 
-#: ../rules/base.extras.xml.in.h:184
+#: rules/base.extras.xml:1193
 msgid "Korean (Sun Type 6/7)"
 msgstr ""
 
 #. Keyboard indicator for European layouts
-#: ../rules/base.extras.xml.in.h:191
+#: rules/base.extras.xml:1227
 msgid "eu"
 msgstr "eu"
 
@@ -4659,14 +4696,14 @@
 msgstr ""
 
 #. Keyboard layouts for transcription and transliteration systems
-#: ../rules/base.extras.xml.in.h:197
+#: rules/base.extras.xml:1269
 msgid "International Phonetic Alphabet"
-msgstr ""
+msgstr "国际音标"
 
-#: ../rules/base.extras.xml.in.h:198
+#: rules/base.extras.xml:1299
 msgid "Parentheses position"
 msgstr "圆括号位置"
 
-#: ../rules/base.extras.xml.in.h:199
+#: rules/base.extras.xml:1304
 msgid "Swap with square brackets"
 msgstr ""
diff -Nru language-pack-zh-hans-18.04+20200123/debian/changelog language-pack-zh-hans-18.04+20200702/debian/changelog
--- language-pack-zh-hans-18.04+20200123/debian/changelog	2020-01-23 16:51:52.000000000 +0000
+++ language-pack-zh-hans-18.04+20200702/debian/changelog	2020-07-08 13:53:53.000000000 +0000
@@ -1,3 +1,9 @@
+language-pack-zh-hans (1:18.04+20200702) bionic-proposed; urgency=low
+
+  * Automatic update to latest translation data.
+
+ -- Ubuntu automatic language-pack builder <language-packs@ubuntu.com>  Wed, 08 Jul 2020 13:53:53 +0000
+
 language-pack-zh-hans (1:18.04+20200123) bionic-proposed; urgency=low
 
   * Automatic update to latest translation data.