Adding upstream version 1:4.15.2.upstream/1%4.15.2upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 533 insertions, 499 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 46067be..d429d78 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: shadow 4.0.15\n"
 "Report-Msgid-Bugs-To: pkg-shadow-devel@lists.alioth.debian.org\n"
-"POT-Creation-Date: 2022-11-08 10:37-0600\n"
+"POT-Creation-Date: 2024-06-21 11:23+0200\n"
 "PO-Revision-Date: 2022-07-27 23:04+0800\n"
 "Last-Translator: Celeste Liu <coelacanthus@outlook.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -23,222 +23,6 @@ msgstr ""
 "X-Generator: Poedit 2.0.8\n"
 
 #, c-format
-msgid ""
-"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
-msgstr "多个名为“%s”的条目同时存在于 %s 中，请使用 pwck 或 grpck 来修复。\n"
-
-#, c-format
-msgid "crypt method not supported by libcrypt? (%s)\n"
-msgstr "libcrypt 不支持此加密方法？(%s)\n"
-
-#, c-format
-msgid "configuration error - cannot parse %s value: '%s'"
-msgstr "配置错误 - 无法解析 %s 值：“%s”"
-
-msgid "Could not allocate space for config info.\n"
-msgstr "无法为配置信息分配空间。\n"
-
-#, c-format
-msgid "configuration error - unknown item '%s' (notify administrator)\n"
-msgstr "配置错误 - 未知项目“%s”(请通知管理员)\n"
-
-#, c-format
-msgid "%s: nscd did not terminate normally (signal %d)\n"
-msgstr "%s：nscd 异常结束 (信号 %d)\n"
-
-#, c-format
-msgid "%s: nscd exited with status %d\n"
-msgstr "%s：nscd 以状态 %d 退出\n"
-
-msgid "Password: "
-msgstr "密码："
-
-#, c-format
-msgid "%s's Password: "
-msgstr "%s 的密码："
-
-#, fuzzy
-#| msgid "Cannot open audit interface - aborting.\n"
-msgid "Cannot open audit interface.\n"
-msgstr "无法打开审计接口 - 退出。\n"
-
-#, c-format
-msgid "%s: can not get previous SELinux process context: %s\n"
-msgstr ""
-
-#, c-format
-msgid "[libsemanage]: %s\n"
-msgstr "[libsemanage]：%s\n"
-
-#, c-format
-msgid "Cannot create SELinux management handle\n"
-msgstr "无法创建 SELinux 管理句柄\n"
-
-#, c-format
-msgid "SELinux policy not managed\n"
-msgstr "SELinux 策略未被托管\n"
-
-#, c-format
-msgid "Cannot read SELinux policy store\n"
-msgstr "无法读取 SELinux 策略存储\n"
-
-#, c-format
-msgid "Cannot establish SELinux management connection\n"
-msgstr "无法建立 SELinux 管理连接\n"
-
-#, c-format
-msgid "Cannot begin SELinux transaction\n"
-msgstr "无法开始 SELinux 事务\n"
-
-#, c-format
-msgid "Could not query seuser for %s\n"
-msgstr "无法为 %s 查询 seuser\n"
-
-#, c-format
-msgid "Could not set serange for %s\n"
-msgstr "无法为 %s 设置 serange\n"
-
-#, c-format
-msgid "Could not set sename for %s\n"
-msgstr "无法为 %s 设置 sename\n"
-
-#, c-format
-msgid "Could not modify login mapping for %s\n"
-msgstr "无法为 %s 修改登录映射\n"
-
-#, c-format
-msgid "Cannot create SELinux login mapping for %s\n"
-msgstr "无法为 %s 创建登录映射\n"
-
-#, c-format
-msgid "Could not set name for %s\n"
-msgstr "无法为 %s 设置名称\n"
-
-#, c-format
-msgid "Could not set SELinux user for %s\n"
-msgstr "无法为 %s 设置 SELinux 用户\n"
-
-#, c-format
-msgid "Could not add login mapping for %s\n"
-msgstr "无法为 %s 添加登录映射\n"
-
-#, c-format
-msgid "Cannot init SELinux management\n"
-msgstr "无法初始化 SELinux 管理\n"
-
-#, c-format
-msgid "Cannot create SELinux user key\n"
-msgstr "无法创建 SELinux 用户密钥\n"
-
-#, c-format
-msgid "Cannot verify the SELinux user\n"
-msgstr "无法验证 SELinux 用户\n"
-
-#, c-format
-msgid "Cannot modify SELinux user mapping\n"
-msgstr "无法修改 SELinux 用户映射\n"
-
-#, c-format
-msgid "Cannot add SELinux user mapping\n"
-msgstr "无法添加 SELinux 用户映射\n"
-
-#, c-format
-msgid "Cannot commit SELinux transaction\n"
-msgstr "无法提交 SELinux 事务\n"
-
-#, c-format
-msgid "Login mapping for %s is not defined, OK if default mapping was used\n"
-msgstr "未定义 %s 的登录映射，使用默认映射时这是正常的\n"
-
-#, c-format
-msgid "Login mapping for %s is defined in policy, cannot be deleted\n"
-msgstr "在策略中定义了 %s 的登录映射，无法被删除\n"
-
-#, c-format
-msgid "Could not delete login mapping for %s"
-msgstr "无法删除 %s 的登录映射"
-
-#, c-format
-msgid "%s: out of memory\n"
-msgstr "%s：内存溢出\n"
-
-#, c-format
-msgid "%s: Cannot stat %s: %s\n"
-msgstr "%s：无法获取文件 %s 的信息：%s\n"
-
-#, c-format
-msgid "%s: %s is neither a directory, nor a symlink.\n"
-msgstr "%s：%s 既不是目录也不是符号链接。\n"
-
-#, c-format
-msgid "%s: Cannot read symbolic link %s: %s\n"
-msgstr "%s：无法读取符号链接 %s：%s\n"
-
-#, c-format
-msgid "%s: Suspiciously long symlink: %s\n"
-msgstr "%s：可疑的长符合链接：%s\n"
-
-#, c-format
-msgid "%s: Cannot create directory %s: %s\n"
-msgstr "%s：无法创建目录 %s：%s\n"
-
-#, c-format
-msgid "%s: Cannot change owner of %s: %s\n"
-msgstr "%s：无法更改 %s 的属主：%s\n"
-
-#, c-format
-msgid "%s: Cannot change mode of %s: %s\n"
-msgstr "%s：无法更改 %s 的模式：%s\n"
-
-#, c-format
-msgid "%s: unlink: %s: %s\n"
-msgstr "%s：删除(unlink)：%s：%s\n"
-
-#, c-format
-msgid "%s: Cannot remove directory %s: %s\n"
-msgstr "%s：无法删除目录 %s：%s\n"
-
-#, c-format
-msgid "%s: Cannot rename %s to %s: %s\n"
-msgstr "%s：无法将目录 %s 改名为 %s：%s\n"
-
-#, c-format
-msgid "%s: Cannot remove %s: %s\n"
-msgstr "%s：无法删除 %s：%s\n"
-
-#, c-format
-msgid "%s: Cannot create symbolic link %s: %s\n"
-msgstr "%s：无法创建符号链接 %s：%s\n"
-
-#, c-format
-msgid "%s: Cannot change owners of %s: %s\n"
-msgstr "%s：无法更改 %s 的属主：%s\n"
-
-#, c-format
-msgid "%s: Cannot lstat %s: %s\n"
-msgstr "%s：无法获取符号链接 %s 的信息(lstat)：%s\n"
-
-#, c-format
-msgid "%s: Warning, user %s has no tcb shadow file.\n"
-msgstr "%s：警告，用户 %s 没有 tcb 影子文件。\n"
-
-#, c-format
-msgid ""
-"%s: Emergency: %s's tcb shadow is not a regular file with st_nlink=1.\n"
-"The account is left locked.\n"
-msgstr ""
-"%s：紧急：%s 的 tcb 影子不是一个 st_nlink=1 的普通文件。\n"
-"已锁定该帐号。\n"
-
-#, c-format
-msgid "%s: mkdir: %s: %s\n"
-msgstr "%s：创建目录：%s：%s\n"
-
-#, c-format
-msgid "%s: Cannot open %s: %s\n"
-msgstr "%s：无法打开 %s：%s\n"
-
-#, c-format
 msgid "Warning: unknown group %s\n"
 msgstr "警告：未知组 %s\n"
 
@@ -285,14 +69,20 @@ msgid "%s: failed to unlock %s\n"
 msgstr "%s：解锁 %s 失败\n"
 
 #, c-format
+msgid ""
+"Multiple entries named '%s' in %s. Please fix this with pwck or grpck.\n"
+msgstr "多个名为“%s”的条目同时存在于 %s 中，请使用 pwck 或 grpck 来修复。\n"
+
+#, c-format
 msgid "%s: "
 msgstr "%s："
 
 msgid ": "
 msgstr "："
 
-msgid "Environment overflow\n"
-msgstr "环境溢出\n"
+#, c-format
+msgid "crypt method not supported by libcrypt? (%s)\n"
+msgstr "libcrypt 不支持此加密方法？(%s)\n"
 
 #, c-format
 msgid "You may not change $%s\n"
@@ -327,48 +117,40 @@ msgstr ""
 msgid "%s: failed to allocate memory: %s\n"
 msgstr "%s：申请内存失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique system GID (no more available GIDs)\n"
+#, c-format
 msgid ""
 "%s: Can't get unique system GID (%s). Suppressing additional messages.\n"
-msgstr "%s：无法获取唯一的系统 GID (没有更多可用的 GID 了)\n"
+msgstr "%s：无法获取唯一的系统 GID (%s)。抑制额外的消息。\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique GID (no more available GIDs)\n"
+#, c-format
 msgid "%s: Can't get unique GID (%s). Suppressing additional messages.\n"
-msgstr "%s：无法获取唯一的 GID (没有更多可用的 GID 了)\n"
+msgstr "%s：无法获取唯一的 GID (%s)。抑制额外的消息。\n"
 
 #, c-format
 msgid "%s: Can't get unique GID (no more available GIDs)\n"
 msgstr "%s：无法获取唯一的 GID (没有更多可用的 GID 了)\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
-#| "(%lu)\n"
+#, c-format
 msgid ""
 "%s: Invalid configuration: SUB_GID_MIN (%lu), SUB_GID_MAX (%lu), "
 "SUB_GID_COUNT (%lu)\n"
-msgstr "%s：无效的配置：SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
+msgstr ""
+"%s：无效的配置：SYS_GID_MIN (%lu), iSUB_GID_MAX (%lu), SUB_GID_COUNT (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "%s: can't find subordinate user range\n"
+#, c-format
 msgid "%s: Can't get unique subordinate GID range\n"
-msgstr "%s：找不到子用户范围\n"
+msgstr "%s：不能获得唯一的从属GID范围\n"
 
-#, fuzzy, c-format
-#| msgid ""
-#| "%s: Invalid configuration: SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX "
-#| "(%lu)\n"
+#, c-format
 msgid ""
 "%s: Invalid configuration: SUB_UID_MIN (%lu), SUB_UID_MAX (%lu), "
 "SUB_UID_COUNT (%lu)\n"
-msgstr "%s：无效的配置：SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%lu)\n"
+msgstr ""
+"%s：无效的配置：SYS_UID_MIN (%lu), SUB_UID_MAX (%lu), SUB_UID_COUNT (%lu)\n"
 
-#, fuzzy, c-format
-#| msgid "%s: can't find subordinate user range\n"
+#, c-format
 msgid "%s: Can't get unique subordinate UID range\n"
-msgstr "%s：找不到子用户范围\n"
+msgstr "%s：不能获得唯一的从属GID范围\n"
 
 #, c-format
 msgid ""
@@ -384,71 +166,83 @@ msgstr "%s：无效的配置：UID_MIN (%lu), UID_MAX (%lu)\n"
 msgid "%s: Encountered error attempting to use preferred UID: %s\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique system UID (no more available UIDs)\n"
+#, c-format
 msgid ""
 "%s: Can't get unique system UID (%s). Suppressing additional messages.\n"
-msgstr "%s：无法获取唯一的系统 UID (没有更多可用的 UID 了)\n"
+msgstr "%s：无法获取唯一的系统 UID (%s)。抑制额外的消息。\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+#, c-format
 msgid "%s: Can't get unique UID (%s). Suppressing additional messages.\n"
-msgstr "%s：无法获取唯一的 UID (没有更多可用的 UID 了)\n"
+msgstr "%s：无法获取唯一的UID (%s)。抑制额外的消息。\n"
 
 #, c-format
 msgid "%s: Can't get unique UID (no more available UIDs)\n"
 msgstr "%s：无法获取唯一的 UID (没有更多可用的 UID 了)\n"
 
 #, c-format
-msgid "%s: Not enough arguments to form %u mappings\n"
-msgstr ""
+msgid "configuration error - cannot parse %s value: '%s'"
+msgstr "配置错误 - 无法解析 %s 值：“%s”"
 
-#, fuzzy, c-format
-#| msgid "%s: Authentication failure\n"
+msgid "Could not allocate space for config info.\n"
+msgstr "无法为配置信息分配空间。\n"
+
+#, c-format
+msgid "configuration error - unknown item '%s' (notify administrator)\n"
+msgstr "配置错误 - 未知项目“%s”(请通知管理员)\n"
+
+#, c-format
 msgid "%s: Memory allocation failure\n"
-msgstr "%s：验证失败\n"
+msgstr "%s：内存分配失败\n"
 
 #, c-format
 msgid "%s: subuid overflow detected.\n"
-msgstr ""
+msgstr "%s：检测到subuid溢出。\n"
 
-#, fuzzy, c-format
-#| msgid "%s: invalid field '%s'\n"
+#, c-format
 msgid "%s: Invalid map file %s specified\n"
-msgstr "%s：无效的字段“%s”\n"
+msgstr "%s：指定的映射文件“%s无效”\n"
 
 #, c-format
 msgid "%s: Could not prctl(PR_SET_KEEPCAPS)\n"
-msgstr ""
+msgstr "%s：无法执行prctl(PR_SET_KEEPCAPS)\n"
 
-#, fuzzy, c-format
-#| msgid "Could not set name for %s\n"
+#, c-format
 msgid "%s: Could not seteuid to %d\n"
-msgstr "无法为 %s 设置名称\n"
+msgstr "%s：不能seteuid为%d\n"
 
-#, fuzzy, c-format
-#| msgid "Could not set name for %s\n"
+#, c-format
 msgid "%s: Could not set caps\n"
-msgstr "无法为 %s 设置名称\n"
+msgstr "%s：无法设置上限\n"
 
 #, fuzzy, c-format
-#| msgid "%s: can't open file\n"
-msgid "%s: snprintf failed!\n"
-msgstr "%s：无法打开文件\n"
+#| msgid "%s: snprintf failed!\n"
+msgid "%s: stpeprintf failed!\n"
+msgstr "%s：snprintf 失败\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: open of %s failed: %s\n"
-msgstr "%s：第 %d 行：改变 %s 的属主失败：%s\n"
+msgstr "%s：打开%s失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: write to %s failed: %s\n"
-msgstr "%s：第 %d 行：改变 %s 的属主失败：%s\n"
+msgstr "%s：写入%s失败：%s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: open of %s failed: %s\n"
+msgid "%s: closing %s failed: %s\n"
+msgstr "%s：打开%s失败：%s\n"
 
 msgid "Too many logins.\n"
 msgstr "当前登录数量过多。\n"
 
+#, c-format
+msgid ""
+"\n"
+"%s login: "
+msgstr ""
+"\n"
+"%s 用户名："
+
 msgid "You have new mail."
 msgstr "您有新信件。"
 
@@ -458,6 +252,14 @@ msgstr "无信件。"
 msgid "You have mail."
 msgstr "您有信件。"
 
+#, c-format
+msgid "%s: nscd did not terminate normally (signal %d)\n"
+msgstr "%s：nscd 异常结束 (信号 %d)\n"
+
+#, c-format
+msgid "%s: nscd exited with status %d\n"
+msgstr "%s：nscd 以状态 %d 退出\n"
+
 msgid "no change"
 msgstr "没有改变"
 
@@ -470,9 +272,6 @@ msgstr "仅有大小写改动"
 msgid "too similar"
 msgstr "太相似"
 
-msgid "too simple"
-msgstr "太简单"
-
 msgid "rotated"
 msgstr "已轮转"
 
@@ -501,22 +300,28 @@ msgstr "passwd：已成功更新密码\n"
 msgid "%s: PAM modules requesting echoing are not supported.\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "%s: repository %s not supported\n"
+#, c-format
 msgid "%s: conversation type %d not supported.\n"
-msgstr "%s：不支持 %s 存储。\n"
+msgstr "%s：不支持会话类型%d。\n"
 
-#, fuzzy, c-format
-#| msgid "%s: pam_start: error %d\n"
+#, c-format
 msgid "%s: (user %s) pam_start failure %d\n"
-msgstr "%s：pam_start：错误 %d\n"
+msgstr "%s：(user %s) pam_start 失败 %d\n"
 
-#, fuzzy, c-format
-#| msgid "passwd: pam_start() failed, error %d\n"
+#, c-format
 msgid ""
 "%s: (user %s) pam_chauthtok() failed, error:\n"
 "%s\n"
-msgstr "passwd：pam_start() 失败，错误 %d\n"
+msgstr ""
+"%s：(user %s) pam_chauthtok() 失败, 错误:\n"
+"%s\n"
+
+msgid "Password: "
+msgstr "密码："
+
+#, c-format
+msgid "%s's Password: "
+msgstr "%s 的密码："
 
 #, c-format
 msgid "Incorrect password for %s.\n"
@@ -543,16 +348,13 @@ msgid "%s: cannot access chroot directory %s: %s\n"
 msgstr "%s：无法访问 chroot 目录 %s：%s\n"
 
 #, c-format
-msgid "%s: cannot chdir to chroot directory %s: %s\n"
-msgstr "%s：无法进入 chroot 目录 %s：%s\n"
-
-#, c-format
 msgid "%s: unable to chroot to directory %s: %s\n"
 msgstr "%s：无法 chroot 到目录 %s：%s\n"
 
-#, c-format
-msgid "Unable to obtain random bytes.\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: cannot chdir to chroot directory %s: %s\n"
+msgid "%s: cannot chdir in chroot directory %s: %s\n"
+msgstr "%s：无法进入 chroot 目录 %s：%s\n"
 
 #, c-format
 msgid ""
@@ -569,6 +371,106 @@ msgid ""
 "method.\n"
 msgstr ""
 
+msgid "Cannot open audit interface.\n"
+msgstr "无法打开审计接口。\n"
+
+#, c-format
+msgid "%s: can not get previous SELinux process context: %s\n"
+msgstr "%s：无法获取以前的SELinux进程上下文：%s\n"
+
+#, c-format
+msgid "[libsemanage]: %s\n"
+msgstr "[libsemanage]：%s\n"
+
+#, c-format
+msgid "Cannot create SELinux management handle\n"
+msgstr "无法创建 SELinux 管理句柄\n"
+
+#, c-format
+msgid "SELinux policy not managed\n"
+msgstr "SELinux 策略未被托管\n"
+
+#, c-format
+msgid "Cannot read SELinux policy store\n"
+msgstr "无法读取 SELinux 策略存储\n"
+
+#, c-format
+msgid "Cannot establish SELinux management connection\n"
+msgstr "无法建立 SELinux 管理连接\n"
+
+#, c-format
+msgid "Cannot begin SELinux transaction\n"
+msgstr "无法开始 SELinux 事务\n"
+
+#, c-format
+msgid "Could not query seuser for %s\n"
+msgstr "无法为 %s 查询 seuser\n"
+
+#, fuzzy, c-format
+#| msgid "Could not set serange for %s\n"
+msgid "Could not set serange for %s to %s\n"
+msgstr "无法为 %s 设置 serange\n"
+
+#, c-format
+msgid "Could not set sename for %s\n"
+msgstr "无法为 %s 设置 sename\n"
+
+#, c-format
+msgid "Could not modify login mapping for %s\n"
+msgstr "无法为 %s 修改登录映射\n"
+
+#, c-format
+msgid "Cannot create SELinux login mapping for %s\n"
+msgstr "无法为 %s 创建登录映射\n"
+
+#, c-format
+msgid "Could not set name for %s\n"
+msgstr "无法为 %s 设置名称\n"
+
+#, c-format
+msgid "Could not set SELinux user for %s\n"
+msgstr "无法为 %s 设置 SELinux 用户\n"
+
+#, c-format
+msgid "Could not add login mapping for %s\n"
+msgstr "无法为 %s 添加登录映射\n"
+
+#, c-format
+msgid "Cannot init SELinux management\n"
+msgstr "无法初始化 SELinux 管理\n"
+
+#, c-format
+msgid "Cannot create SELinux user key\n"
+msgstr "无法创建 SELinux 用户密钥\n"
+
+#, c-format
+msgid "Cannot verify the SELinux user\n"
+msgstr "无法验证 SELinux 用户\n"
+
+#, c-format
+msgid "Cannot modify SELinux user mapping\n"
+msgstr "无法修改 SELinux 用户映射\n"
+
+#, c-format
+msgid "Cannot add SELinux user mapping\n"
+msgstr "无法添加 SELinux 用户映射\n"
+
+#, c-format
+msgid "Cannot commit SELinux transaction\n"
+msgstr "无法提交 SELinux 事务\n"
+
+#, c-format
+msgid "Login mapping for %s is not defined, OK if default mapping was used\n"
+msgstr "未定义 %s 的登录映射，使用默认映射时这是正常的\n"
+
+#, c-format
+msgid "Login mapping for %s is defined in policy, cannot be deleted\n"
+msgstr "在策略中定义了 %s 的登录映射，无法被删除\n"
+
+#, c-format
+msgid "Could not delete login mapping for %s"
+msgstr "无法删除 %s 的登录映射"
+
 #, c-format
 msgid "Unable to cd to '%s'\n"
 msgstr "无法 cd 进入“%s”\n"
@@ -581,6 +483,10 @@ msgid "Cannot execute %s"
 msgstr "无法执行 %s"
 
 #, c-format
+msgid "Maximum subsystem depth reached\n"
+msgstr ""
+
+#, c-format
 msgid "Invalid root directory '%s'\n"
 msgstr "无效的根目录“%s”\n"
 
@@ -589,13 +495,92 @@ msgid "Can't change root directory to '%s'\n"
 msgstr "无法将根目录改变为“%s”\n"
 
 #, c-format
+msgid "%s: out of memory\n"
+msgstr "%s：内存溢出\n"
+
+#, c-format
+msgid "%s: Cannot stat %s: %s\n"
+msgstr "%s：无法获取文件 %s 的信息：%s\n"
+
+#, c-format
+msgid "%s: %s is neither a directory, nor a symlink.\n"
+msgstr "%s：%s 既不是目录也不是符号链接。\n"
+
+#, c-format
+msgid "%s: Cannot read symbolic link %s: %s\n"
+msgstr "%s：无法读取符号链接 %s：%s\n"
+
+#, c-format
+msgid "%s: Suspiciously long symlink: %s\n"
+msgstr "%s：可疑的长符合链接：%s\n"
+
+#, c-format
+msgid "%s: Cannot create directory %s: %s\n"
+msgstr "%s：无法创建目录 %s：%s\n"
+
+#, c-format
+msgid "%s: Cannot change owner of %s: %s\n"
+msgstr "%s：无法更改 %s 的属主：%s\n"
+
+#, c-format
+msgid "%s: Cannot change mode of %s: %s\n"
+msgstr "%s：无法更改 %s 的模式：%s\n"
+
+#, c-format
+msgid "%s: unlink: %s: %s\n"
+msgstr "%s：删除(unlink)：%s：%s\n"
+
+#, c-format
+msgid "%s: Cannot remove directory %s: %s\n"
+msgstr "%s：无法删除目录 %s：%s\n"
+
+#, c-format
+msgid "%s: Cannot rename %s to %s: %s\n"
+msgstr "%s：无法将目录 %s 改名为 %s：%s\n"
+
+#, c-format
+msgid "%s: Cannot remove %s: %s\n"
+msgstr "%s：无法删除 %s：%s\n"
+
+#, c-format
+msgid "%s: Cannot create symbolic link %s: %s\n"
+msgstr "%s：无法创建符号链接 %s：%s\n"
+
+#, c-format
+msgid "%s: Cannot change owners of %s: %s\n"
+msgstr "%s：无法更改 %s 的属主：%s\n"
+
+#, c-format
+msgid "%s: Cannot lstat %s: %s\n"
+msgstr "%s：无法获取符号链接 %s 的信息(lstat)：%s\n"
+
+#, c-format
+msgid "%s: Warning, user %s has no tcb shadow file.\n"
+msgstr "%s：警告，用户 %s 没有 tcb 影子文件。\n"
+
+#, c-format
+msgid ""
+"%s: Emergency: %s's tcb shadow is not a regular file with st_nlink=1.\n"
+"The account is left locked.\n"
+msgstr ""
+"%s：紧急：%s 的 tcb 影子不是一个 st_nlink=1 的普通文件。\n"
+"已锁定该帐号。\n"
+
+#, c-format
+msgid "%s: mkdir: %s: %s\n"
+msgstr "%s：创建目录：%s：%s\n"
+
+#, c-format
+msgid "%s: Cannot open %s: %s\n"
+msgstr "%s：无法打开 %s：%s\n"
+
+#, c-format
 msgid "%s: user %s is currently logged in\n"
 msgstr "%s：用户 %s 目前已登录\n"
 
-#, fuzzy, c-format
-#| msgid "%s: user %s is currently logged in\n"
+#, c-format
 msgid "%s: user %s is currently used by process %d\n"
-msgstr "%s：用户 %s 目前已登录\n"
+msgstr "%s：用户 %s 当前被进程使用 %d\n"
 
 msgid "Unable to determine your tty name."
 msgstr "无法确定您的 tty 终端名。"
@@ -625,10 +610,8 @@ msgstr "  -E, --expiredate 过期日期     将帐户过期时间设为“过期
 msgid "  -h, --help                    display this help message and exit\n"
 msgstr "  -h, --help                    显示此帮助信息并退出\n"
 
-#, fuzzy
-#| msgid "  -g, --group                   edit group database\n"
 msgid "  -i, --iso8601                 use YYYY-MM-DD when printing dates\n"
-msgstr "  -g, --group                   编辑 group 数据库\n"
+msgstr "  -i, --iso8601                   打印日期时使用YYYY-MM-DD\n"
 
 msgid ""
 "  -I, --inactive INACTIVE       set password inactive after expiration\n"
@@ -657,6 +640,11 @@ msgstr ""
 msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
 msgstr "  -R, --root CHROOT_DIR         chroot 到的目录\n"
 
+#, fuzzy
+#| msgid "  -P, --prefix PREFIX_DI        directory prefix\n"
+msgid "  -P, --prefix PREFIX_DIR       directory prefix\n"
+msgstr "  -R, --root CHROOT_DIR         目录前缀\n"
+
 msgid ""
 "  -W, --warndays WARN_DAYS      set expiration warning days to WARN_DAYS\n"
 msgstr "  -W, --warndays 警告天数       将过期警告天数设为“警告天数”\n"
@@ -682,12 +670,15 @@ msgstr "密码失效"
 msgid "Account Expiration Date (YYYY-MM-DD)"
 msgstr "帐户过期时间 (YYYY-MM-DD)"
 
-msgid "Last password change\t\t\t\t\t: "
-msgstr "最近一次密码修改时间\t\t\t\t\t："
-
 msgid "never"
 msgstr "从不"
 
+msgid "future"
+msgstr ""
+
+msgid "Last password change\t\t\t\t\t: "
+msgstr "最近一次密码修改时间\t\t\t\t\t："
+
 msgid "password must be changed"
 msgstr "密码必须更改"
 
@@ -859,14 +850,6 @@ msgid "%s: user '%s' does not exist\n"
 msgstr "%s：用户“%s”不存在\n"
 
 #, c-format
-msgid "%s: cannot change user '%s' on NIS client.\n"
-msgstr "%s：不能在 NIS 客户端上修改用户“%s”。\n"
-
-#, c-format
-msgid "%s: '%s' is the NIS master for this client.\n"
-msgstr "%s：“%s”是此客户端的 NIS 管理员。\n"
-
-#, c-format
 msgid "Changing the user information for %s\n"
 msgstr "正在改变 %s 的用户信息\n"
 
@@ -901,6 +884,11 @@ msgid ""
 "                                or YESCRYPT crypt algorithms\n"
 msgstr "  -s, --sha-rounds              使用 SHA* 加密算法的轮数\n"
 
+#, fuzzy, c-format
+#| msgid "%s: unsupported crypt method: %s\n"
+msgid "%s: no crypt method defined\n"
+msgstr "%s：不支持的加密方法：%s\n"
+
 #, c-format
 msgid "%s: %s flag is only allowed with the %s flag\n"
 msgstr "%s：%s 标记只能和 %s 标记一起使用\n"
@@ -951,6 +939,16 @@ msgstr "  -s, --shell SHELL             该用户帐号的新登录 shell\n"
 msgid "Login Shell"
 msgstr "登录 Shell"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot get the size of %s: %s\n"
+msgid "Cannot parse shell files: %s"
+msgstr "%s：无法获得 %s 的大小：%s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create new defaults file: %s\n"
+msgid "Cannot evaluate entries in shell files: %s"
+msgstr "%s：无法创建新的默认文件：%s\n"
+
 #, c-format
 msgid "You may not change the shell for '%s'.\n"
 msgstr "您不能为“%s”更改 shell。\n"
@@ -963,6 +961,11 @@ msgstr "正在更改 %s 的 shell\n"
 msgid "%s: Invalid entry: %s\n"
 msgstr "%s：无效的条目：%s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: %s is an invalid shell\n"
+msgid "%s: Warning: %s is an invalid shell\n"
+msgstr "%s：%s 是无效的 shell\n"
+
 #, c-format
 msgid "%s: %s is an invalid shell\n"
 msgstr "%s：%s 是无效的 shell\n"
@@ -1183,25 +1186,22 @@ msgstr "  -p, --password PASSWORD       为新组使用此加密过的密码\n"
 msgid "  -r, --system                  create a system account\n"
 msgstr "  -r, --system                  创建一个系统账户\n"
 
-#, fuzzy
-#| msgid "  -R, --root CHROOT_DIR         directory to chroot into\n"
-msgid "  -P, --prefix PREFIX_DI        directory prefix\n"
-msgstr "  -R, --root CHROOT_DIR         chroot 到的目录\n"
-
-#, fuzzy
-#| msgid "  -l, --list                    list the members of the group\n"
 msgid "  -U, --users USERS             list of user members of this group\n"
-msgstr "  -l, --list                    列出组中的所有成员\n"
+msgstr "  -l, --list                    该组的用户成员列表\n"
 
-#, fuzzy, c-format
-#| msgid "invalid user name '%s'\n"
+#, c-format
 msgid "Invalid member username %s\n"
-msgstr "无效的用户名“%s”\n"
+msgstr "无效的成员用户名“%s”\n"
 
 #, c-format
 msgid "%s: '%s' is not a valid group name\n"
 msgstr "%s：“%s”不是有效的组名\n"
 
+#, fuzzy, c-format
+#| msgid "%s: Cannot open %s: %s\n"
+msgid "%s: cannot open %s: %s\n"
+msgstr "%s：无法打开 %s：%s\n"
+
 #, c-format
 msgid "%s: invalid group ID '%s'\n"
 msgstr "%s：无效的组 ID “%s”\n"
@@ -1245,14 +1245,6 @@ msgid "%s: group '%s' does not exist\n"
 msgstr "%s：“%s”组不存在\n"
 
 #, c-format
-msgid "%s: group '%s' is a NIS group\n"
-msgstr "%s：“%s”组是一个 NIS 组。\n"
-
-#, c-format
-msgid "%s: %s is the NIS master\n"
-msgstr "%s：%s 是 NIS 管理员\n"
-
-#, c-format
 msgid "%s: user '%s' is already a member of '%s'\n"
 msgstr "%s：用户“%s”已经是“%s”的成员\n"
 
@@ -1306,20 +1298,13 @@ msgstr "%s：您的组名和用户名不匹配\n"
 msgid "%s: only root can use the -g/--group option\n"
 msgstr "%s：只有 root 才可以使用 -g/--group 选项\n"
 
-#, fuzzy
-#| msgid ""
-#| "  -a, --append                  append the user to the supplemental "
-#| "GROUPS\n"
-#| "                                mentioned by the -G option without "
-#| "removing\n"
-#| "                                the user from other groups\n"
 msgid ""
 "  -a, --append                  append the users mentioned by -U option to "
 "the group \n"
 "                                without removing existing user members\n"
 msgstr ""
-"  -a, --append GROUP            将用户追加至上边 -G 中提到的附加组中，\n"
-"                                并不从其它组中删除此用户\n"
+"  -a, --append                  将-U选项提到的用户添加到组中\n"
+"                                无需删除现有用户成员\n"
 
 msgid "  -g, --gid GID                 change the group ID to GID\n"
 msgstr "  -g, --gid GID                 将组 ID 改为 GID\n"
@@ -1341,10 +1326,6 @@ msgid "%s: invalid group name '%s'\n"
 msgstr "%s：无效的组名“%s”\n"
 
 #, c-format
-msgid "%s: group %s is a NIS group\n"
-msgstr "%s：%s 组是一个 NIS 组\n"
-
-#, c-format
 msgid "%s: unknown user %s\n"
 msgstr "%s：未知用户 %s\n"
 
@@ -1463,8 +1444,12 @@ msgid ""
 "  -b, --before DAYS             print only lastlog records older than DAYS\n"
 msgstr "  -b, --before DAYS             仅打印早于 DAYS 的最近登录记录\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -C, --clear                   clear lastlog record of an user (usable "
+#| "only with -u)\n"
 msgid ""
-"  -C, --clear                   clear lastlog record of an user (usable only "
+"  -C, --clear                   clear lastlog record of a user (usable only "
 "with -u)\n"
 msgstr ""
 "  -C, --clear                   清除一个用户的最近登录记录(须配合 -u 使用)\n"
@@ -1484,10 +1469,9 @@ msgid ""
 "  -u, --user LOGIN              print lastlog record of the specified LOGIN\n"
 msgstr "  -u, --user LOGIN              打印 LOGIN 用户的最近登录记录\n"
 
-#, fuzzy, c-format
-#| msgid "Username                Port     Latest"
+#, c-format
 msgid "Username         Port     From%*sLatest\n"
-msgstr "用户名                  端口     最后登录时间"
+msgstr "用户名                  端口     从最近的%*s\n"
 
 msgid "Username                Port     Latest"
 msgstr "用户名                  端口     最后登录时间"
@@ -1560,9 +1544,6 @@ msgstr ""
 msgid "%s: Cannot possibly work without effective root\n"
 msgstr "%s：必须持有效 root 身份才能工作\n"
 
-msgid "No utmp entry.  You must exec \"login\" from the lowest level \"sh\""
-msgstr "没有 utmp 条目。您必须在最底层的“sh”里执行“login”"
-
 #, c-format
 msgid ""
 "\n"
@@ -1597,14 +1578,6 @@ msgid "Cannot find user (%s)\n"
 msgstr "无法找到用户 (%s)\n"
 
 #, c-format
-msgid ""
-"\n"
-"%s login: "
-msgstr ""
-"\n"
-"%s 用户名："
-
-#, c-format
 msgid "%s: failure forking: %s"
 msgstr "%s：fork 失败：%s"
 
@@ -1639,47 +1612,39 @@ msgstr ""
 
 #, c-format
 msgid ""
-"usage: %s <pid> <gid> <lowergid> <count> [ <gid> <lowergid> <count> ] ... \n"
+"usage: %s [<pid|fd:<pidfd>] <gid> <lowergid> <count> [ <gid> <lowergid> "
+"<count> ] ... \n"
 msgstr ""
 
 #, c-format
 msgid "%s: kernel doesn't support setgroups restrictions\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "%s: can't open group file\n"
+#, c-format
 msgid "%s: couldn't open process setgroups: %s\n"
-msgstr "%s：无法打开组文件\n"
+msgstr "%s：无法打开进程setgroups：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to remove %s\n"
+#, c-format
 msgid "%s: failed to read setgroups: %s\n"
-msgstr "%s：移除 %s 失败\n"
+msgstr "%s：读取setgroups失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to remove %s\n"
+#, c-format
 msgid "%s: failed to seek setgroups: %s\n"
-msgstr "%s：移除 %s 失败\n"
+msgstr "%s：查询setgroups失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to unlock %s\n"
+#, c-format
 msgid "%s: failed to setgroups %s policy: %s\n"
-msgstr "%s：解锁 %s 失败\n"
+msgstr "%s：setgroups%s策略失败：%s\n"
 
 #, fuzzy, c-format
-#| msgid "%s: failed to find tcb directory for %s\n"
-msgid "%s: Could not open proc directory for target %u\n"
-msgstr "%s：无法为“%s”找到 tcb 目录\n"
-
-#, fuzzy, c-format
-#| msgid "%s: Failed to create tcb directory for %s\n"
-msgid "%s: Could not stat directory for target %u\n"
-msgstr "%s：为 %s 创建 tcb 目录失败\n"
+#| msgid "%s: Could not stat directory for target %u\n"
+msgid "%s: Could not stat directory for process\n"
+msgstr "%s：无法统计目标目录%u\n"
 
 #, c-format
 msgid ""
-"%s: Target %u is owned by a different user: uid:%lu pw_uid:%lu st_uid:%lu, "
-"gid:%lu pw_gid:%lu st_gid:%lu\n"
+"%s: Target process is owned by a different user: uid:%lu pw_uid:%lu st_uid:"
+"%lu, gid:%lu pw_gid:%lu st_gid:%lu\n"
 msgstr ""
 
 msgid "Usage: newgrp [-] [group]\n"
@@ -1712,19 +1677,17 @@ msgstr ""
 
 #, c-format
 msgid ""
-"usage: %s <pid> <uid> <loweruid> <count> [ <uid> <loweruid> <count> ] ... \n"
+"usage: %s [<pid>|fd:<pidfd>] <uid> <loweruid> <count> [ <uid> <loweruid> "
+"<count> ] ... \n"
 msgstr ""
 
-#, c-format
-msgid ""
-"%s: Target process %u is owned by a different user: uid:%lu pw_uid:%lu "
-"st_uid:%lu, gid:%lu pw_gid:%lu st_gid:%lu\n"
-msgstr ""
+#, fuzzy, c-format
+#| msgid "%s: Could not stat directory for target %u\n"
+msgid "%s: Could not stat directory for target process\n"
+msgstr "%s：无法统计目标目录%u\n"
 
-#, fuzzy
-#| msgid "  -q, --quiet                   quiet mode\n"
 msgid "  -b, --badname                 allow bad names\n"
-msgstr "  -q, --quiet                   安静模式\n"
+msgstr "  -q, --badname                 允许 bad name\n"
 
 msgid "  -r, --system                  create system accounts\n"
 msgstr "  -r, --system                  创建系统帐号\n"
@@ -1737,10 +1700,13 @@ msgstr "%s：“%s”组是影子组，但是不存在于 /etc/group\n"
 msgid "%s: invalid user ID '%s'\n"
 msgstr "%s：无效的用户 ID“%s”\n"
 
-#, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
+#, c-format
 msgid "%s: invalid user name '%s': use --badname to ignore\n"
-msgstr "%s：无效的用户名“%s”\n"
+msgstr "%s：无效的用户名“%s”: 使用 --badname 忽略\n"
+
+#, c-format
+msgid "%s: Provide '--crypt-method' before number of rounds\n"
+msgstr ""
 
 #, c-format
 msgid "%s: line %d: invalid line\n"
@@ -1762,14 +1728,18 @@ msgstr "%s：第 %d 行：无法创建组\n"
 msgid "%s: line %d: user '%s' does not exist in %s\n"
 msgstr "%s：第 %d 行：用户“%s”不存在于 %s 中\n"
 
+#, fuzzy, c-format
+#| msgid "%s: unlink: %s: %s\n"
+msgid "%s: line %d: %s\n"
+msgstr "%s：删除(unlink)：%s：%s\n"
+
 #, c-format
 msgid "%s: line %d: can't update password\n"
 msgstr "%s：第 %d 行：无法更新密码\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: mkdir %s failed: %s\n"
+#, c-format
 msgid "%s: line %d: homedir must be an absolute path\n"
-msgstr "%s：第 %d 行：创建目录 %s 失败：%s\n"
+msgstr "%s：第 %d 行：Homedir必须是绝对路径\n"
 
 #, c-format
 msgid "%s: line %d: mkdir %s failed: %s\n"
@@ -1784,14 +1754,14 @@ msgid "%s: line %d: can't update entry\n"
 msgstr "%s：第 %d 行：无法更新条目\n"
 
 #, c-format
-msgid "%s: failed to prepare new %s entry\n"
-msgstr "%s：准备新 %s 条目失败\n"
-
-#, c-format
 msgid "%s: can't find subordinate user range\n"
 msgstr "%s：找不到子用户范围\n"
 
 #, c-format
+msgid "%s: failed to prepare new %s entry\n"
+msgstr "%s：准备新 %s 条目失败\n"
+
+#, c-format
 msgid "%s: can't find subordinate group range\n"
 msgstr "%s：找不到子用户组范围\n"
 
@@ -1853,6 +1823,11 @@ msgstr ""
 "  -x, --maxdays MAX_DAYS        设置到下次修改密码所须等待的最多天数\n"
 "                                为 MAX_DAYS\n"
 
+#, fuzzy
+#| msgid "  -l, --list                    show account aging information\n"
+msgid "  -s, --stdin                   read new token from stdin\n"
+msgstr "  -l, --list                    显示帐户年龄信息\n"
+
 msgid "Old password: "
 msgstr "旧密码："
 
@@ -1872,6 +1847,11 @@ msgstr ""
 "请输入新密码(最少 %d 最多 %d 个字符)\n"
 "请混合使用大小写字母和数字。\n"
 
+#, fuzzy
+#| msgid "%s: fields too long\n"
+msgid "Password is too long.\n"
+msgstr "%s：字段太长\n"
+
 msgid "New password: "
 msgstr "新密码："
 
@@ -1896,10 +1876,9 @@ msgstr "无法更改 %s 的密码。\n"
 msgid "The password for %s cannot be changed yet.\n"
 msgstr "尚无法更改 %s 的密码。\n"
 
-#, fuzzy, c-format
-#| msgid "%s: shadow passwords required for -e\n"
+#, c-format
 msgid "%s: malformed password data obtained for user %s\n"
-msgstr "%s：-e 参数需要有影子密码\n"
+msgstr "%s：获取的用户密码数据不正确%s\n"
 
 #, c-format
 msgid ""
@@ -1915,9 +1894,13 @@ msgid "%s: repository %s not supported\n"
 msgstr "%s：不支持 %s 存储。\n"
 
 #, fuzzy, c-format
-#| msgid "%s: %s is not authorized to change the password of %s\n"
+#| msgid "%s: only root can use the -g/--group option\n"
+msgid "%s: only root can use --stdin/-s option\n"
+msgstr "%s：只有 root 才可以使用 -g/--group 选项\n"
+
+#, c-format
 msgid "%s: root is not authorized by SELinux to change the password of %s\n"
-msgstr "%s：%s 没有被授权更改 %s 的密码\n"
+msgstr "%s：root没有被SELinux授权修改密码%s\n"
 
 #, c-format
 msgid "%s: You may not view or modify password information for %s.\n"
@@ -1968,10 +1951,9 @@ msgstr "无效的密码文件项"
 msgid "duplicate password entry"
 msgstr "重复的用户条目"
 
-#, fuzzy, c-format
-#| msgid "%s: invalid user name '%s'\n"
+#, c-format
 msgid "invalid user name '%s': use --badname to ignore\n"
-msgstr "%s：无效的用户名“%s”\n"
+msgstr "无效的用户名'%s'：使用 --badname 忽略\n"
 
 #, c-format
 msgid "invalid user ID '%lu'\n"
@@ -2064,11 +2046,9 @@ msgstr "%s：信号故障\n"
 msgid "Session terminated, terminating shell..."
 msgstr "会话结束，结束 shell ..."
 
-#, c-format
 msgid " ...killed.\n"
 msgstr " ...已被杀死。\n"
 
-#, c-format
 msgid " ...waiting for child to terminate.\n"
 msgstr " ...等待子进程结束。\n"
 
@@ -2079,20 +2059,6 @@ msgstr " ...已结束。\n"
 msgid "%s: %s\n"
 msgstr "%s：%s\n"
 
-#, fuzzy
-#| msgid ""
-#| "Usage: su [options] [LOGIN]\n"
-#| "\n"
-#| "Options:\n"
-#| "  -c, --command COMMAND         pass COMMAND to the invoked shell\n"
-#| "  -h, --help                    display this help message and exit\n"
-#| "  -, -l, --login                make the shell a login shell\n"
-#| "  -m, -p,\n"
-#| "  --preserve-environment        do not reset environment variables, and\n"
-#| "                                keep the same shell\n"
-#| "  -s, --shell SHELL             use SHELL instead of the default in "
-#| "passwd\n"
-#| "\n"
 msgid ""
 "Usage: su [options] [-] [username [args]]\n"
 "\n"
@@ -2107,7 +2073,7 @@ msgid ""
 "\n"
 "If no username is given, assume root.\n"
 msgstr ""
-"用法：su [选项] [登录名]\n"
+"用法：su [选项] [-] [username [args]]\n"
 "\n"
 "选项：\n"
 "  -c, --command COMMAND         将 COMMAND 传递至启动的 shell\n"
@@ -2117,6 +2083,7 @@ msgstr ""
 "  --preserve-environment        不重置环境变量并保持同一 shell\n"
 "  -s, --shell SHELL             使用 SHELL 而非 passwd 中的默认值\n"
 "\n"
+"                                如果没有给出用户名，假设为root\n"
 
 #, c-format
 msgid ""
@@ -2153,6 +2120,11 @@ msgstr "%s：那时，您没有被授权 su\n"
 msgid "No passwd entry for user '%s'\n"
 msgstr "没有用户“%s”的密码项\n"
 
+#, fuzzy, c-format
+#| msgid "invalid user name '%s'\n"
+msgid "Overlong user name '%s'\n"
+msgstr "无效的用户名“%s”\n"
+
 #, c-format
 msgid "%s: must be run from a terminal\n"
 msgstr "%s：必须从终端中执行\n"
@@ -2199,18 +2171,19 @@ msgid "%s: the %s configuration in %s will be ignored\n"
 msgstr "%s：%s 配置(位于 %s) 将被忽略\n"
 
 #, fuzzy, c-format
-#| msgid "%s: cannot create new defaults file\n"
-msgid "%s: cannot create new defaults file: %s\n"
-msgstr "%s：无法创建新的默认文件\n"
+#| msgid "%s: the %s configuration in %s will be ignored\n"
+msgid ""
+"%s: the '%s' configuration in %s has an invalid group, ignoring the bad "
+"group\n"
+msgstr "%s：%s 配置(位于 %s) 将被忽略\n"
 
-#, fuzzy, c-format
-#| msgid "%s: cannot create new defaults file\n"
-msgid "%s: cannot create directory for defaults file\n"
-msgstr "%s：无法创建新的默认文件\n"
+#, c-format
+msgid "%s: cannot create new defaults file: %s\n"
+msgstr "%s：无法创建新的默认文件：%s\n"
 
 #, c-format
-msgid "%s: cannot create new defaults file\n"
-msgstr "%s：无法创建新的默认文件\n"
+msgid "%s: cannot create directory for defaults file\n"
+msgstr "%s：无法为默认文件创建目录\n"
 
 #, c-format
 msgid "%s: cannot open new defaults file\n"
@@ -2229,17 +2202,12 @@ msgid "%s: rename: %s: %s\n"
 msgstr "%s：改名：%s：%s\n"
 
 #, c-format
-msgid "%s: group '%s' is a NIS group.\n"
-msgstr "%s：“%s”组是一个 NIS 组。\n"
-
-#, c-format
 msgid "%s: too many groups specified (max %d).\n"
 msgstr "%s：指定了过多组(最多 %d)。\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Out of memory. Cannot update %s.\n"
+#, c-format
 msgid "%s: Out of memory. Cannot find group '%s'.\n"
-msgstr "%s：超出内存。不能更新 %s。\n"
+msgstr "%s：超出内存。找不到组 '%s'。\n"
 
 #, c-format
 msgid ""
@@ -2255,10 +2223,8 @@ msgstr ""
 "\n"
 "选项：\n"
 
-#, fuzzy
-#| msgid "  -s, --shadow                  edit shadow or gshadow database\n"
 msgid "      --badname                 do not check for bad names\n"
-msgstr "  -s, --shadow                  编辑 shadow 或 gshadow 数据库\n"
+msgstr "     --badname                    不检查 bad names\n"
 
 msgid ""
 "  -b, --base-dir BASE_DIR       base directory for the home directory of "
@@ -2350,6 +2316,15 @@ msgid ""
 "mapping\n"
 msgstr "  -Z, --selinux-user SEUSER     为 SELinux 用户映射使用指定 SEUSER\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user SEUSER     use a specific SEUSER for the SELinux "
+#| "user mapping\n"
+msgid ""
+"      --selinux-range SERANGE   use a specific MLS range for the SELinux "
+"user mapping\n"
+msgstr "  -Z, --selinux-user SEUSER     为 SELinux 用户映射使用指定 SEUSER\n"
+
 #, c-format
 msgid "%s: invalid base directory '%s'\n"
 msgstr "%s：无效的基目录“%s”\n"
@@ -2378,108 +2353,93 @@ msgstr "%s：无效的字段“%s”\n"
 msgid "%s: invalid shell '%s'\n"
 msgstr "%s：无效的 shell“%s”\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Warning: %s is not executable\n"
+#, c-format
 msgid "%s: Warning: missing or non-executable shell '%s'\n"
-msgstr "%s：警告：%s 不可执行\n"
+msgstr "%s：警告：缺少或不可执行 shell '%s'\n"
 
-#, fuzzy, c-format
-#| msgid "%s: Option -C cannot be used together with option -S\n"
+#, c-format
 msgid "%s: -Z cannot be used with --prefix\n"
-msgstr "%s：选项 -C 不能与 -S 选项一起使用\n"
+msgstr "%s：-Z 不能与 --prefix一起使用\n"
 
 #, c-format
 msgid "%s: -Z requires SELinux enabled kernel\n"
 msgstr "%s：-Z 选项要求内核启用 SELinux\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to open the faillog file for UID %lu: %s\n"
-msgstr "%s：重置 UID %lu 的登录失败条目失败：%s\n"
+msgstr "%s：打开 UID %lu 的登录失败文件失败：%s\n"
 
 #, c-format
 msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
 msgstr "%s：重置 UID %lu 的登录失败条目失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to close the faillog file for UID %lu: %s\n"
-msgstr "%s：重置 UID %lu 的登录失败条目失败：%s\n"
+msgstr "%s：关闭 UID %lu 的登录失败文件失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to open the lastlog file for UID %lu: %s\n"
-msgstr "%s：重置 UID %lu 的最近登录条目失败：%s\n"
+msgstr "%s：打开 UID %lu 的最近登录文件失败：%s\n"
 
 #, c-format
 msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
 msgstr "%s：重置 UID %lu 的最近登录条目失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the lastlog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to close the lastlog file for UID %lu: %s\n"
-msgstr "%s：重置 UID %lu 的最近登录条目失败：%s\n"
+msgstr "%s：打开 UID %lu 的最近登录文件失败：%s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+#, c-format
 msgid "%s: failed to reset the tallylog entry of user \"%s\"\n"
-msgstr "%s：重置 UID %lu 的登录失败条目失败：%s\n"
+msgstr "%s：重置 的记录认证失败条目失败：%s\n"
 
 #, c-format
 msgid "%s: failed to prepare the new %s entry\n"
 msgstr "%s：准备新 %s 条目失败\n"
 
-#, fuzzy, c-format
-#| msgid "%s: error updating files\n"
+#, c-format
 msgid "%s: error while duplicating string %s\n"
-msgstr "%s：更新文件出错\n"
+msgstr "%s：复制字符串时出错 %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: cannot create directory %s\n"
+#, c-format
 msgid "%s: cannot set SELinux context for home directory %s\n"
-msgstr "%s：无法创建目录 %s\n"
+msgstr "%s：无法为主目录设置SELinux上下文 %s\n"
 
 #, c-format
 msgid "%s: error while duplicating string in BTRFS check %s\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "%s: %s home directory (%s) not found\n"
+#, c-format
 msgid "%s: home directory \"%s\" must be mounted on BTRFS\n"
-msgstr "%s：未找到 %s 的主目录“%s”\n"
+msgstr "%s：home目录\"%s\"必须挂载在BTRFS上\n"
 
-#, fuzzy, c-format
-#| msgid "%s: failed to allocate memory: %s\n"
+#, c-format
 msgid "%s: failed to create BTRFS subvolume: %s\n"
-msgstr "%s：申请内存失败：%s\n"
+msgstr "%s：创建BTRFS子卷失败：%s\n"
 
 #, c-format
 msgid "%s: cannot create directory %s\n"
 msgstr "%s：无法创建目录 %s\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: warning: chown on `%s' failed: %m\n"
-msgstr "%s：第 %d 行：改变 %s 的属主失败：%s\n"
+msgstr "%s 警告：改变 `%s' 的属主失败：%m\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: warning: chmod on `%s' failed: %m\n"
-msgstr "%s：第 %d 行：改变 %s 的属主失败：%s\n"
+msgstr "%s：警告：改变 `%s' 的属主失败：%m\n"
 
-#, fuzzy, c-format
-#| msgid "%s: line %d: chown %s failed: %s\n"
+#, c-format
 msgid "%s: warning: chown on '%s' failed: %m\n"
-msgstr "%s：第 %d 行：改变 %s 的属主失败：%s\n"
+msgstr "%s：警告：改变 %s 的属主失败：%m\n"
 
 #, c-format
 msgid "%s: cannot reset SELinux file creation context\n"
 msgstr ""
 
-#, fuzzy, c-format
-#| msgid "Cannot create SELinux login mapping for %s\n"
+#, c-format
 msgid "%s: cannot set SELinux context for mailbox file %s\n"
-msgstr "无法为 %s 创建登录映射\n"
+msgstr "%s: 无法为邮箱文件设置SELinux上下文 %s\n"
 
 msgid "Creating mailbox file"
 msgstr "正在创建信箱文件"
@@ -2491,6 +2451,16 @@ msgstr "没有找到“mail”组。以 0600 权限模式创建用户的信箱�
 msgid "Setting mailbox file permissions"
 msgstr "正在设置信箱文件访问权限"
 
+#, fuzzy
+#| msgid "Creating mailbox file"
+msgid "Synchronize mailbox file"
+msgstr "正在创建信箱文件"
+
+#, fuzzy
+#| msgid "Creating mailbox file"
+msgid "Closing mailbox file"
+msgstr "正在创建信箱文件"
+
 #, c-format
 msgid "%s warning: %s's uid %d is greater than SYS_UID_MAX %d\n"
 msgstr ""
@@ -2613,10 +2583,6 @@ msgid "%s: Cannot remove tcb files for %s: %s\n"
 msgstr "%s：无法从 %s 中删除 tcb 文件：%s\n"
 
 #, c-format
-msgid "%s: user %s is a NIS user\n"
-msgstr "%s：用户 %s 是 NIS 用户\n"
-
-#, c-format
 msgid "%s: %s home directory (%s) not found\n"
 msgstr "%s：未找到 %s 的主目录“%s”\n"
 
@@ -2624,10 +2590,9 @@ msgstr "%s：未找到 %s 的主目录“%s”\n"
 msgid "%s: not removing directory %s (would remove home of user %s)\n"
 msgstr "%s：不删除目录 %s (因为这将删除用户 %s 的主目录)\n"
 
-#, fuzzy, c-format
-#| msgid "%s: error removing directory %s\n"
+#, c-format
 msgid "%s: error removing subvolume %s\n"
-msgstr "%s：删除目录 %s 时出错\n"
+msgstr "%s：删除分卷 %s 时出错\n"
 
 #, c-format
 msgid "%s: error removing directory %s\n"
@@ -2727,6 +2692,14 @@ msgid ""
 "account\n"
 msgstr "  -Z, --selinux-user SEUSER     用户的新的 SELinux 用户映射\n"
 
+#, fuzzy
+#| msgid ""
+#| "  -Z, --selinux-user SEUSER     new SELinux user mapping for the user "
+#| "account\n"
+msgid ""
+"      --selinux-range SERANGE   new SELinux MLS range for the user account\n"
+msgstr "  -Z, --selinux-user SEUSER     用户的新的 SELinux 用户映射\n"
+
 #, c-format
 msgid ""
 "%s: unlocking the user's password would result in a passwordless account.\n"
@@ -2814,10 +2787,20 @@ msgstr "%s：先前的主目录 (%s) 不是一个目录。没有移除它，也�
 msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
 msgstr "%s：将用户 %lu 的登录失败条目复制给用户 %lu 失败：%s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: failed to copy the lastlog entry of user %lu to user %lu: %s\n"
+msgid "%s: failed to copy the lastlog entry of user %ju to user %ju: %s\n"
+msgstr "%s：将用户 %lu 的登录失败条目复制给用户 %lu 失败：%s\n"
+
 #, c-format
 msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
 msgstr "%s：将用户 %lu 的登录失败条目复制给用户 %lu 失败：%s\n"
 
+#, fuzzy, c-format
+#| msgid "%s: failed to copy the faillog entry of user %lu to user %lu: %s\n"
+msgid "%s: failed to copy the faillog entry of user %ju to user %ju: %s\n"
+msgstr "%s：将用户 %lu 的登录失败条目复制给用户 %lu 失败：%s\n"
+
 #, c-format
 msgid "%s: warning: %s not owned by %s\n"
 msgstr "%s：警告：%s 不属于 %s\n"
@@ -2918,8 +2901,10 @@ msgstr "删除(unlink)临时文件失败"
 msgid "failed to stat edited file"
 msgstr "获取编辑过的文件的信息失败"
 
-msgid "failed to allocate memory"
-msgstr "申请内存失败"
+#, fuzzy
+#| msgid "%s: snprintf failed!\n"
+msgid "asprintf(3) failed"
+msgstr "%s：snprintf 失败\n"
 
 msgid "failed to create backup file"
 msgstr "创建备份文件失败"
@@ -2932,6 +2917,59 @@ msgstr "%s：无法恢复 %s：%s (您的修改在 %s 中)\n"
 msgid "%s: failed to find tcb directory for %s\n"
 msgstr "%s：无法为“%s”找到 tcb 目录\n"
 
+#~ msgid "Environment overflow\n"
+#~ msgstr "环境溢出\n"
+
+#, c-format
+#~ msgid "%s: cannot change user '%s' on NIS client.\n"
+#~ msgstr "%s：不能在 NIS 客户端上修改用户“%s”。\n"
+
+#, c-format
+#~ msgid "%s: '%s' is the NIS master for this client.\n"
+#~ msgstr "%s：“%s”是此客户端的 NIS 管理员。\n"
+
+#, c-format
+#~ msgid "%s: group '%s' is a NIS group\n"
+#~ msgstr "%s：“%s”组是一个 NIS 组。\n"
+
+#, c-format
+#~ msgid "%s: %s is the NIS master\n"
+#~ msgstr "%s：%s 是 NIS 管理员\n"
+
+#, c-format
+#~ msgid "%s: group %s is a NIS group\n"
+#~ msgstr "%s：%s 组是一个 NIS 组\n"
+
+#, c-format
+#~ msgid "%s: cannot create new defaults file\n"
+#~ msgstr "%s：无法创建新的默认文件\n"
+
+#, c-format
+#~ msgid "%s: group '%s' is a NIS group.\n"
+#~ msgstr "%s：“%s”组是一个 NIS 组。\n"
+
+#, c-format
+#~ msgid "%s: user %s is a NIS user\n"
+#~ msgstr "%s：用户 %s 是 NIS 用户\n"
+
+#, c-format
+#~ msgid "%s: Not enough arguments to form %u mappings\n"
+#~ msgstr "%s：没有足够的参数来形成%u映射\n"
+
+#~ msgid "too simple"
+#~ msgstr "太简单"
+
+#~ msgid "No utmp entry.  You must exec \"login\" from the lowest level \"sh\""
+#~ msgstr "没有 utmp 条目。您必须在最底层的“sh”里执行“login”"
+
+#, c-format
+#~| msgid "%s: failed to find tcb directory for %s\n"
+#~ msgid "%s: Could not open proc directory for target %u\n"
+#~ msgstr "%s：无法打开目标的proc目录%u\n"
+
+#~ msgid "failed to allocate memory"
+#~ msgstr "申请内存失败"
+
 #~ msgid "Usage: id\n"
 #~ msgstr "用法：id\n"
 
@@ -2947,10 +2985,6 @@ msgstr "%s：无法为“%s”找到 tcb 目录\n"
 #~ msgid "%s: password expiry information changed.\n"
 #~ msgstr "%s：密码过期信息已更改。\n"
 
-#, c-format
-#~ msgid "invalid user name '%s'\n"
-#~ msgstr "无效的用户名“%s”\n"
-
 #~ msgid "Username         Port     From             Latest"
 #~ msgstr "用户名           端口     来自             最后登录时间"