summaryrefslogtreecommitdiff
path: root/po/zh_CN.po
diff options
context:
space:
mode:
authorBalint Reczey <balint.reczey@canonical.com>2019-06-23 22:06:37 +0200
committerBalint Reczey <balint.reczey@canonical.com>2019-06-23 22:06:37 +0200
commitb28d45d2bd2462414b9dbbe38e6c7f3d5f7b462b (patch)
tree4b068e3513ef5c60228cddfcda72be0a31d09b14 /po/zh_CN.po
parentb0729855e8fb744192a0395ea24673557818172c (diff)
downloadshadow-b28d45d2bd2462414b9dbbe38e6c7f3d5f7b462b.tar.gz
New upstream version 4.7upstream/4.7
Diffstat (limited to 'po/zh_CN.po')
-rw-r--r--po/zh_CN.po551
1 files changed, 323 insertions, 228 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f7496be1..8bbc3158 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,20 +4,22 @@
# Ming Hua <minghua@ubuntu.com>, 2005,2006,2007.
# Carlos Z.F. Liu <carlosliu@users.sourceforge.net>, 2004,2006.
# YunQiang Su <wzssyqa@gmail.com>, 2010, 2012.
+# Daming Yang <lion@aosc.io>, 2018.
#
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: 2016-09-18 14:03-0500\n"
-"PO-Revision-Date: 2012-01-10 01:23+0800\n"
-"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"POT-Creation-Date: 2019-06-13 11:45-0500\n"
+"PO-Revision-Date: 2018-06-16 18:17+0800\n"
+"Last-Translator: Daming Yang <lion@aosc.io>\n"
"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
-"Language: \n"
+"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.8\n"
#, c-format
msgid ""
@@ -41,12 +43,11 @@ msgstr "配置错误 - 未知项目“%s”(请通知管理员)\n"
#, c-format
msgid "%s: nscd did not terminate normally (signal %d)\n"
-msgstr "%s: nscd 异常结束 (信号 %d)\n"
+msgstr "%s:nscd 异常结束 (信号 %d)\n"
-#, fuzzy, c-format
-#| msgid "%s: nscd exited with status %d"
+#, c-format
msgid "%s: nscd exited with status %d\n"
-msgstr "%s: nscd 以状态 %d 退出"
+msgstr "%s:nscd 以状态 %d 退出\n"
msgid "Password: "
msgstr "密码:"
@@ -57,7 +58,7 @@ msgstr "%s 的密码:"
#, c-format
msgid "[libsemanage]: %s\n"
-msgstr "[libsemanage]: %s\n"
+msgstr "[libsemanage]:%s\n"
#, c-format
msgid "Cannot create SELinux management handle\n"
@@ -65,11 +66,11 @@ msgstr "无法创建 SELinux 管理句柄\n"
#, c-format
msgid "SELinux policy not managed\n"
-msgstr ""
+msgstr "SELinux 策略未被托管\n"
#, c-format
msgid "Cannot read SELinux policy store\n"
-msgstr ""
+msgstr "无法读取 SELinux 策略存储\n"
#, c-format
msgid "Cannot establish SELinux management connection\n"
@@ -113,7 +114,7 @@ msgstr "无法为 %s 添加登录映射\n"
#, c-format
msgid "Cannot init SELinux management\n"
-msgstr ""
+msgstr "无法初始化 SELinux 管理\n"
#, c-format
msgid "Cannot create SELinux user key\n"
@@ -135,13 +136,13 @@ msgstr "无法添加 SELinux 用户映射\n"
msgid "Cannot commit SELinux transaction\n"
msgstr "无法提交 SELinux 事务\n"
-#, fuzzy, c-format
+#, c-format
msgid "Login mapping for %s is not defined, OK if default mapping was used\n"
-msgstr "%s 的登录映射已经定义,如果"
+msgstr "未定义 %s 的登录映射,使用默认映射时这是正常的\n"
#, c-format
msgid "Login mapping for %s is defined in policy, cannot be deleted\n"
-msgstr "策略中,已经定义了 %s 的登录映射,无法删除\n"
+msgstr "在策略中定义了 %s 的登录映射,无法被删除\n"
#, c-format
msgid "Could not delete login mapping for %s"
@@ -157,9 +158,7 @@ msgstr "%s:无法获取文件 %s 的信息:%s\n"
#, c-format
msgid "%s: %s is neither a directory, nor a symlink.\n"
-msgstr ""
-"%s:%s 既不是目录也不是符号链接。\n"
-"\n"
+msgstr "%s:%s 既不是目录也不是符号链接。\n"
#, c-format
msgid "%s: Cannot read symbolic link %s: %s\n"
@@ -207,13 +206,11 @@ msgstr "%s:无法更改 %s 的属主:%s\n"
#, c-format
msgid "%s: Cannot lstat %s: %s\n"
-msgstr "%s:无法获取符号链接 %s 自身的信息(lstat):%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"
-"\n"
+msgstr "%s:警告,用户 %s 没有 tcb 影子文件。\n"
#, c-format
msgid ""
@@ -221,7 +218,7 @@ msgid ""
"The account is left locked.\n"
msgstr ""
"%s:紧急:%s 的 tcb 影子不是一个 st_nlink=1 的普通文件。\n"
-"帐号将锁定。\n"
+"已锁定该帐号。\n"
#, c-format
msgid "%s: mkdir: %s: %s\n"
@@ -254,7 +251,7 @@ msgid " Choose a new password."
msgstr " 请选择一个新密码。"
msgid "You must change your password."
-msgstr "您必须要更改自己的密码。"
+msgstr "您必须更改自己的密码。"
#, c-format
msgid "Your password will expire in %ld days.\n"
@@ -303,30 +300,37 @@ msgstr[0] ""
"最后一次是 %s 在 %s 上。\n"
#, c-format
-msgid "%s: Invalid configuration: GID_MIN (%lu), GID_MAX (%lu)\n"
-msgstr "%s:无效的配置:GID_MIN (%lu), GID_MAX (%lu)\n"
-
-#, c-format
msgid ""
"%s: Invalid configuration: SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX "
"(%lu)\n"
msgstr "%s:无效的配置:SYS_GID_MIN (%lu), GID_MIN (%lu), SYS_GID_MAX (%lu)\n"
#, c-format
-msgid "%s: failed to allocate memory: %s\n"
-msgstr "%s:申请内存失败:%s\n"
+msgid "%s: Invalid configuration: GID_MIN (%lu), GID_MAX (%lu)\n"
+msgstr "%s:无效的配置:GID_MIN (%lu), GID_MAX (%lu)\n"
#, c-format
-msgid "%s: Can't get unique system GID (no more available GIDs)\n"
-msgstr "%s:无法获取独有的系统 GID (没有更多可用的 GID 了)\n"
+msgid "%s: Encountered error attempting to use preferred GID: %s\n"
+msgstr ""
#, c-format
-msgid "%s: Can't get unique GID (no more available GIDs)\n"
-msgstr "%s:无法获取独有的 GID (no more available GIDs)\n"
+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"
+msgid ""
+"%s: Can't get unique system GID (%s). Suppressing additional messages.\n"
+msgstr "%s:无法获取唯一的系统 GID (没有更多可用的 GID 了)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgid "%s: Can't get unique GID (%s). Suppressing additional messages.\n"
+msgstr "%s:无法获取唯一的 GID (没有更多可用的 GID 了)\n"
#, c-format
-msgid "%s: Invalid configuration: UID_MIN (%lu), UID_MAX (%lu)\n"
-msgstr "%s:无效的配置:UID_MIN (%lu), UID_MAX (%lu)\n"
+msgid "%s: Can't get unique GID (no more available GIDs)\n"
+msgstr "%s:无法获取唯一的 GID (没有更多可用的 GID 了)\n"
#, c-format
msgid ""
@@ -335,15 +339,30 @@ msgid ""
msgstr "%s:无效的配置:SYS_UID_MIN (%lu), UID_MIN (%lu), SYS_UID_MAX (%lu)\n"
#, c-format
-msgid "%s: Can't get unique system UID (no more available UIDs)\n"
-msgstr "%s:无法获取独有的系统 UID (没有更多可用的 UID 了)\n"
+msgid "%s: Invalid configuration: UID_MIN (%lu), UID_MAX (%lu)\n"
+msgstr "%s:无效的配置:UID_MIN (%lu), UID_MAX (%lu)\n"
+
+#, c-format
+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"
+msgid ""
+"%s: Can't get unique system UID (%s). Suppressing additional messages.\n"
+msgstr "%s:无法获取唯一的系统 UID (没有更多可用的 UID 了)\n"
+
+#, fuzzy, c-format
+#| msgid "%s: Can't get unique UID (no more available UIDs)\n"
+msgid "%s: Can't get unique UID (%s). Suppressing additional messages.\n"
+msgstr "%s:无法获取唯一的 UID (没有更多可用的 UID 了)\n"
#, c-format
msgid "%s: Can't get unique UID (no more available UIDs)\n"
-msgstr "%s:无法获取独有的系统 UID (没有更多可用的 UID 了)\n"
+msgstr "%s:无法获取唯一的 UID (没有更多可用的 UID 了)\n"
msgid "Too many logins.\n"
-msgstr "登录数量过多。\n"
+msgstr "当前登录数量过多。\n"
msgid "You have new mail."
msgstr "您有新信件。"
@@ -381,7 +400,7 @@ msgstr "错误的密码:%s。 "
#, c-format
msgid "passwd: pam_start() failed, error %d\n"
-msgstr "passwd: pam_start() 失败,错误 %d\n"
+msgstr "passwd:pam_start() 失败,错误 %d\n"
#, c-format
msgid "passwd: %s\n"
@@ -399,11 +418,11 @@ msgstr "%s 的密码不正确。\n"
#, c-format
msgid "%s: multiple --root options\n"
-msgstr ""
+msgstr "%s:有多个 --root 选项\n"
#, c-format
msgid "%s: option '%s' requires an argument\n"
-msgstr "%s: 选项“%s”需要一个选项\n"
+msgstr "%s:选项“%s”需要一个选项\n"
#, c-format
msgid "%s: failed to drop privileges (%s)\n"
@@ -417,14 +436,13 @@ msgstr "%s:无效的 chroot 路径“%s”\n"
msgid "%s: cannot access chroot directory %s: %s\n"
msgstr "%s:无法访问 chroot 目录 %s:%s\n"
-#, fuzzy, c-format
-#| msgid "%s: cannot access chroot directory %s: %s\n"
+#, c-format
msgid "%s: cannot chdir to chroot directory %s: %s\n"
-msgstr "%s:无法访问 chroot 目录 %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"
+msgstr "%s:无法 chroot 到目录 %s:%s\n"
#, c-format
msgid ""
@@ -465,7 +483,7 @@ msgid ""
"\n"
"Options:\n"
msgstr ""
-"用法:%s [选项] 登录\n"
+"用法:%s [选项] 登录名\n"
"\n"
"选项:\n"
@@ -479,7 +497,7 @@ msgid ""
msgstr " -E, --expiredate 过期日期 将帐户过期时间设为“过期日期”\n"
msgid " -h, --help display this help message and exit\n"
-msgstr " -h, --help 显示此帮助信息并推出\n"
+msgstr " -h, --help 显示此帮助信息并退出\n"
msgid ""
" -I, --inactive INACTIVE set password inactive after expiration\n"
@@ -497,8 +515,9 @@ msgstr ""
" -m, --mindays 最小天数 将两次改变密码之间相距的最小天数设为“最小天"
"数”\n"
+#, fuzzy
msgid ""
-" -M, --maxdays MAX_DAYS set maximim number of days before password\n"
+" -M, --maxdays MAX_DAYS set maximum number of days before password\n"
" change to MAX_DAYS\n"
msgstr ""
" -M, --maxdays 最大天数 将两次改变密码之间相距的最大天数设为“最大天"
@@ -572,7 +591,7 @@ msgstr "%s:无效的数字参数“%s”\n"
#, c-format
msgid "%s: do not include \"l\" with other flags\n"
-msgstr "%s:请不要与其它标志一同使用“l”\n"
+msgstr "%s:请不要将“l”与其它标志一同使用\n"
#, c-format
msgid "%s: Permission denied.\n"
@@ -584,7 +603,7 @@ msgstr "%s:无法确定您的用户名。\n"
#, c-format
msgid "%s: PAM: %s\n"
-msgstr "%s: PAM: %s\n"
+msgstr "%s:PAM:%s\n"
#, c-format
msgid "%s: cannot lock %s; try again later.\n"
@@ -608,7 +627,7 @@ msgstr "%s:影子密码文件不存在\n"
#, c-format
msgid "%s: user '%s' does not exist in %s\n"
-msgstr "%s:用户 %s 不存在于 %s 中\n"
+msgstr "%s:用户“%s”不存在于 %s 中\n"
#, c-format
msgid "Changing the aging information for %s\n"
@@ -624,7 +643,7 @@ msgid ""
"\n"
"Options:\n"
msgstr ""
-"用法:%s [选项] [登录]\n"
+"用法:%s [选项] [登录名]\n"
"\n"
"选项:\n"
@@ -641,7 +660,7 @@ msgid " -r, --room ROOM_NUMBER change user's room number\n"
msgstr " -r, --room ROOM_NUMBER 更改用户的房间号\n"
msgid " -u, --help display this help message and exit\n"
-msgstr " -u, --help 显示此帮助信息并推出\n"
+msgstr " -u, --help 显示此帮助信息并退出\n"
msgid " -w, --work-phone WORK_PHONE change user's office phone number\n"
msgstr " -w, --work-phone WORK_PHONE 更改用户的办公室电话号码\n"
@@ -666,7 +685,7 @@ msgid "Other"
msgstr "其它"
msgid "Cannot change ID to root.\n"
-msgstr "无法改变 ID 到 root。\n"
+msgstr "无法将 ID 改为 root。\n"
#, c-format
msgid "%s: name with non-ASCII characters: '%s'\n"
@@ -732,20 +751,20 @@ msgstr ""
#, c-format
msgid " -c, --crypt-method METHOD the crypt method (one of %s)\n"
-msgstr " -c, --crypt-method 方法 加密方法(%s 中的一个)\n"
+msgstr " -c, --crypt-method METHOD 加密方法(%s 中的一个)\n"
msgid " -e, --encrypted supplied passwords are encrypted\n"
-msgstr " -e, --encrypted\t\t提供的密码已经加密\n"
+msgstr " -e, --encrypted 提供的密码已经加密\n"
msgid ""
" -m, --md5 encrypt the clear text password using\n"
" the MD5 algorithm\n"
-msgstr " -m, --md5\t\t使用 MD5 算法加密明文密码\n"
+msgstr " -m, --md5 使用 MD5 算法加密明文密码\n"
msgid ""
" -s, --sha-rounds number of SHA rounds for the SHA*\n"
" crypt algorithms\n"
-msgstr " -s, --sha-rounds\t\tSHA* 加密算法中的 SHA 旁边的数字\n"
+msgstr " -s, --sha-rounds 使用 SHA* 加密算法的轮数\n"
#, c-format
msgid "%s: %s flag is only allowed with the %s flag\n"
@@ -753,7 +772,7 @@ msgstr "%s:%s 标记只能和 %s 标记一起使用\n"
#, c-format
msgid "%s: the -c, -e, and -m flags are exclusive\n"
-msgstr "%s:-c, -e 和 -m 选项互斥\n"
+msgstr "%s:-c、-e 和 -m 选项互斥\n"
#, c-format
msgid "%s: unsupported crypt method: %s\n"
@@ -767,10 +786,9 @@ msgstr "%s:第 %d 行:此行太长\n"
msgid "%s: line %d: missing new password\n"
msgstr "%s:第 %d 行:缺少新密码\n"
-#, fuzzy, c-format
-#| msgid "%s: Failed to write %s: %s\n"
+#, c-format
msgid "%s: failed to crypt password with salt '%s': %s\n"
-msgstr "%s: 写入 %s 失败: %s\n"
+msgstr "%s:使用盐“%s”对密码加密失败:%s\n"
#, c-format
msgid "%s: line %d: group '%s' does not exist\n"
@@ -778,9 +796,7 @@ msgstr "%s:第 %d 行:组“%s”不存在\n"
#, c-format
msgid "%s: line %d: failed to prepare the new %s entry '%s'\n"
-msgstr ""
-"%s:第 %d 行:准备新 %s 条目“%s”失败\n"
-"\n"
+msgstr "%s:第 %d 行:准备新 %s 条目“%s”失败\n"
#, c-format
msgid "%s: error detected, changes ignored\n"
@@ -788,7 +804,7 @@ msgstr "%s:发现错误,忽略改动\n"
#, c-format
msgid "%s: (line %d, user %s) password not changed\n"
-msgstr "%s:(第 %d 行,用户 %s) 不存在\n"
+msgstr "%s:(第 %d 行,用户 %s) 密码未更改\n"
#, c-format
msgid "%s: line %d: user '%s' does not exist\n"
@@ -814,7 +830,7 @@ msgstr "%s:无效的条目:%s\n"
#, c-format
msgid "%s: %s is an invalid shell\n"
-msgstr "%s:%s 是无效的 shell。\n"
+msgstr "%s:%s 是无效的 shell\n"
#, c-format
msgid "%s: Warning: %s does not exist\n"
@@ -842,32 +858,32 @@ msgid "%s: unexpected argument: %s\n"
msgstr "%s:意外的参数:%s\n"
msgid " -a, --all display faillog records for all users\n"
-msgstr " -a, --all\t\t\t为所有用户显示登陆失败记录\n"
+msgstr " -a, --all 为所有用户显示登录失败记录\n"
msgid ""
" -l, --lock-secs SEC after failed login lock account for SEC "
"seconds\n"
-msgstr " -l, --lock-secs SEC\t登陆失败后临时锁定账户 %s 秒\n"
+msgstr " -l, --lock-secs SEC 登录失败后临时锁定账户 %s 秒\n"
msgid ""
" -m, --maximum MAX set maximum failed login counters to MAX\n"
-msgstr " -m, --maximum MAX\t\t将最大登陆失败计数设置为 MAX\n"
+msgstr " -m, --maximum MAX 将最大登录失败计数设置为 MAX\n"
msgid " -r, --reset reset the counters of login failures\n"
-msgstr " -r, --reset\t\t重置登陆失败计数\n"
+msgstr " -r, --reset 重置登录失败计数\n"
msgid ""
" -t, --time DAYS display faillog records more recent than "
"DAYS\n"
-msgstr " -t, --time DAYS\t\t显示 DAYS 天来的登陆失败记录\n"
+msgstr " -t, --time DAYS 显示 DAYS 天来的登录失败记录\n"
msgid ""
" -u, --user LOGIN/RANGE display faillog record or maintains failure\n"
" counters and limits (if used with -r, -m,\n"
" or -l) only for the specified LOGIN(s)\n"
msgstr ""
-" -u, --user LOGIN/RANGE\t只为指定的登录显示登录失败记录或维护失败\n"
-"\t\t\t\t\t计数和限制(如果使用了 -r, -m 或 -l)\n"
+" -u, --user LOGIN/RANGE 只显示指定用户(或用户范围)的登录失败记录、\n"
+" 维护故障计数或用户限制(对应 -r, -m 或 -l)\n"
#, c-format
msgid "%s: Failed to get the entry for UID %lu\n"
@@ -878,11 +894,11 @@ msgstr "登录 失败次数 最多 最近 于\n"
#, c-format
msgid " [%lus left]"
-msgstr " [还剩 %lus]"
+msgstr " [还剩 %lu 秒]"
#, c-format
msgid " [%lds lock]"
-msgstr " [锁定 %lds]"
+msgstr " [锁定 %ld 秒]"
#, c-format
msgid "%s: Failed to reset fail count for UID %lu\n"
@@ -906,7 +922,7 @@ msgstr "%s:无法获得 %s 的大小:%s\n"
#, c-format
msgid "%s: Failed to write %s: %s\n"
-msgstr "%s: 写入 %s 失败: %s\n"
+msgstr "%s:写入 %s 失败:%s\n"
#, c-format
msgid ""
@@ -940,7 +956,9 @@ msgstr " -M, --members USER,... 设置组 GROUP 的成员列表\n"
msgid ""
" -A, --administrators ADMIN,...\n"
" set the list of administrators for GROUP\n"
-msgstr " -A, --administrators ADMIN,...\t设置组的管理员列表\n"
+msgstr ""
+" -A, --administrators ADMIN,...\n"
+" 设置组的管理员列表\n"
msgid "Except for the -A and -M options, the options cannot be combined.\n"
msgstr "除非使用 -A 或 -M 选项,不能结合使用这些选项。\n"
@@ -1008,8 +1026,8 @@ msgid ""
"exists,\n"
" and cancel -g if the GID is already used\n"
msgstr ""
-" -f, --force\t\t如果组已经存在则成功退出\n"
-"\t\t\t并且如果 GID 已经存在则取消 -g\n"
+" -f, --force 如果组已经存在则成功退出\n"
+" 并且如果 GID 已被使用则取消 -g\n"
msgid " -g, --gid GID use GID for the new group\n"
msgstr " -g, --gid GID 为新组使用 GID\n"
@@ -1030,6 +1048,11 @@ 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_DIR directory prefix\n"
+msgstr " -R, --root CHROOT_DIR chroot 到的目录\n"
+
#, c-format
msgid "%s: '%s' is not a valid group name\n"
msgstr "%s:“%s”不是有效的组名\n"
@@ -1050,22 +1073,23 @@ msgstr "%s:“%s”组已存在\n"
msgid "%s: GID '%lu' already exists\n"
msgstr "%s:GID “%lu”已经存在\n"
-#, fuzzy, c-format
-#| msgid "%s: Cannot determine your user name.\n"
+#, c-format
msgid "%s: Cannot setup cleanup service.\n"
-msgstr "%s:无法确定您的用户名。\n"
+msgstr "%s:无法设置清理服务。\n"
+
+msgid ""
+" -P, --prefix PREFIX_DIR prefix directory where are located the /etc/"
+"* files\n"
+msgstr ""
-#, fuzzy
-#| msgid ""
-#| " -r, --reset reset the counters of login failures\n"
msgid ""
" -f, --force delete group even if it is the primary group "
"of a user\n"
-msgstr " -r, --reset\t\t重置登陆失败计数\n"
+msgstr " -f, --force 即便是用户的主组也继续删除\n"
#, c-format
msgid "%s: cannot remove entry '%s' from %s\n"
-msgstr "%1$s:无法从 %3$s 中移除 %2$s\n"
+msgstr "%1$s:无法从 %3$s 中移除“%2$s”\n"
#, c-format
msgid "%s: cannot remove the primary group of user '%s'\n"
@@ -1085,7 +1109,7 @@ msgstr "%s:%s 是 NIS 管理员\n"
#, c-format
msgid "%s: user '%s' is already a member of '%s'\n"
-msgstr "%s:用户“%s”已经是 %s 的成员\n"
+msgstr "%s:用户“%s”已经是“%s”的成员\n"
#, c-format
msgid "%s: Out of memory. Cannot update %s.\n"
@@ -1106,7 +1130,7 @@ msgid ""
"group\n"
" (root only)\n"
msgstr ""
-" -g, --group groupname 更改组 groupname,而不是用户的组(只 root)\n"
+" -g, --group groupname 更改组 groupname,而不是用户的组(仅限 root)\n"
msgid "\n"
msgstr "\n"
@@ -1150,7 +1174,7 @@ msgstr " -o, --non-unique 允许使用重复的 GID\n"
msgid ""
" -p, --password PASSWORD change the password to this (encrypted)\n"
" PASSWORD\n"
-msgstr " -p, --password PASSWORD\t将密码更改为(加密过的) PASSWORD\n"
+msgstr " -p, --password PASSWORD 将密码更改为(加密过的) PASSWORD\n"
#, c-format
msgid "%s: invalid group name '%s'\n"
@@ -1194,7 +1218,7 @@ msgstr " -s, --sort 通过 UID 排序项目\n"
#, c-format
msgid "%s: -s and -r are incompatible\n"
-msgstr "%s:-s 和 -r 不兼容\n"
+msgstr "%s:-s 与 -r 不兼容\n"
msgid "invalid group file entry"
msgstr "无效的组文件条目"
@@ -1204,7 +1228,7 @@ msgid "delete line '%s'? "
msgstr "删除“%s”一行?"
msgid "duplicate group entry"
-msgstr "复制组条目"
+msgstr "重复的组条目"
#, c-format
msgid "invalid group name '%s'\n"
@@ -1239,7 +1263,7 @@ msgid "invalid shadow group file entry"
msgstr "无效的影子组文件条目"
msgid "duplicate shadow group entry"
-msgstr "重复的影子组条目"
+msgstr "重复的组影子条目"
#, c-format
msgid "shadow group %s: no administrative user %s\n"
@@ -1278,21 +1302,17 @@ msgid ""
" -b, --before DAYS print only lastlog records older than DAYS\n"
msgstr " -b, --before DAYS 仅打印早于 DAYS 的最近登录记录\n"
-#, fuzzy
-#| msgid ""
-#| " -a, --all display faillog records for all users\n"
msgid ""
" -C, --clear clear lastlog record of an user (usable only "
"with -u)\n"
-msgstr " -a, --all\t\t\t为所有用户显示登陆失败记录\n"
+msgstr ""
+" -C, --clear 清除一个用户的最近登录记录(须配合 -u 使用)\n"
-#, fuzzy
-#| msgid ""
-#| " -a, --all display faillog records for all users\n"
msgid ""
" -S, --set set lastlog record to current time (usable "
"only with -u)\n"
-msgstr " -a, --all\t\t\t为所有用户显示登陆失败记录\n"
+msgstr ""
+" -S, --set 设置最近登录记录为当前时间(须配合 -u 使用)\n"
msgid ""
" -t, --time DAYS print only lastlog records more recent than "
@@ -1304,31 +1324,41 @@ msgid ""
msgstr " -u, --user LOGIN 打印 LOGIN 用户的最近登录记录\n"
msgid "Username Port From Latest"
-msgstr "用户名 端口 来自 最后登陆时间"
+msgstr "用户名 端口 来自 最后登录时间"
msgid "Username Port Latest"
-msgstr "用户名 端口 最后登陆时间"
+msgstr "用户名 端口 最后登录时间"
msgid "**Never logged in**"
msgstr "**从未登录过**"
-#, fuzzy, c-format
-#| msgid "%s: Failed to get the entry for UID %lu\n"
+#, c-format
+msgid ""
+"%s: Selected uid(s) are higher than LASTLOG_UID_MAX (%lu),\n"
+"\tthe output might be incorrect.\n"
+msgstr ""
+
+#, c-format
msgid "%s: Failed to update the entry for UID %lu\n"
-msgstr "%s:获取 UID %lu 的条目失败\n"
+msgstr "%s:更新 UID %lu 的条目失败\n"
-#, fuzzy, c-format
-#| msgid "%s: can't update password file\n"
+#, c-format
+msgid ""
+"%s: Selected uid(s) are higher than LASTLOG_UID_MAX (%lu),\n"
+"\tthey will not be updated.\n"
+msgstr ""
+
+#, c-format
msgid "%s: Failed to update the lastlog file\n"
-msgstr "%s:无法更新密码文件\n"
+msgstr "%s:无法更新登录记录文件\n"
#, c-format
msgid "%s: Option -C cannot be used together with option -S\n"
-msgstr ""
+msgstr "%s:选项 -C 不能与 -S 选项一起使用\n"
#, c-format
msgid "%s: Options -C and -S require option -u to specify the user\n"
-msgstr ""
+msgstr "%s:-C 和 -S 选项需要配合使用 -u 指定用户\n"
#, c-format
msgid "Usage: %s [-p] [name]\n"
@@ -1344,7 +1374,7 @@ msgstr " %s [-p] -r 主机\n"
#, c-format
msgid "configuration error - cannot parse %s value: '%d'"
-msgstr "配置出错 - 无法解析 %s 值:”%d“"
+msgstr "配置出错 - 无法解析 %s 值:“%d”"
msgid "Invalid login time"
msgstr "无效的登录时间"
@@ -1365,7 +1395,7 @@ msgstr ""
#, c-format
msgid "%s: Cannot possibly work without effective root\n"
-msgstr "%s:没有有效 root 的情况下,不可能工作\n"
+msgstr "%s:必须持有效 root 身份才能工作\n"
msgid "No utmp entry. You must exec \"login\" from the lowest level \"sh\""
msgstr "没有 utmp 条目。您必须在最底层的“sh”里执行“login”"
@@ -1380,7 +1410,7 @@ msgstr ""
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
-msgstr "login: PAM 错误,正在退出:%s\n"
+msgstr "login:PAM 错误,正在退出:%s\n"
#, c-format
msgid "%s login: "
@@ -1394,7 +1424,7 @@ msgid "Maximum number of tries exceeded (%u)\n"
msgstr "已经超过最大尝试次数 (%u)\n"
msgid "login: abort requested by PAM\n"
-msgstr "login: PAM 中止请求\n"
+msgstr "login:PAM 请求中止\n"
msgid "Login incorrect"
msgstr "登录错误"
@@ -1420,7 +1450,7 @@ msgid "TIOCSCTTY failed on %s"
msgstr "%s 上 TIOCSCTTY 失败"
msgid "Warning: login re-enabled after temporary lockout."
-msgstr "警告:在短暂的锁定后将恢复登录。"
+msgstr "警告:将在暂时锁定一段时间后恢复登录。"
#, c-format
msgid "Last login: %s on %s"
@@ -1438,7 +1468,7 @@ msgid ""
"login time exceeded\n"
"\n"
msgstr ""
-"超过登录时间\n"
+"登录超时\n"
"\n"
msgid "Usage: logoutd\n"
@@ -1450,10 +1480,9 @@ msgstr "用法:newgrp [-] [组]\n"
msgid "Usage: sg group [[-c] command]\n"
msgstr "用法:sg 组 [[-c] 命令]\n"
-#, fuzzy, c-format
-#| msgid "%s: Failed to write %s: %s\n"
+#, c-format
msgid "%s: failed to crypt password with previous salt: %s\n"
-msgstr "%s: 写入 %s 失败: %s\n"
+msgstr "%s:使用之前的盐对密码加密失败:%s\n"
msgid "Invalid password.\n"
msgstr "无效的密码。\n"
@@ -1502,7 +1531,7 @@ msgstr "%s:第 %d 行:无法创建组\n"
#, c-format
msgid "%s: line %d: user '%s' does not exist in %s\n"
-msgstr "%s:第 %d 行:用户”%s“不存在于 %s 中\n"
+msgstr "%s:第 %d 行:用户“%s”不存在于 %s 中\n"
#, c-format
msgid "%s: line %d: can't update password\n"
@@ -1520,20 +1549,17 @@ msgstr "%s:第 %d 行:改变 %s 的属主失败:%s\n"
msgid "%s: line %d: can't update entry\n"
msgstr "%s:第 %d 行:无法更新条目\n"
-#, fuzzy, c-format
-#| msgid "%s: failed to prepare the new %s entry '%s'\n"
+#, c-format
msgid "%s: failed to prepare new %s entry\n"
-msgstr "%s:准备新 %s 条目“%s”失败\n"
+msgstr "%s:准备新 %s 条目失败\n"
-#, fuzzy, c-format
-#| msgid "%s: can't create user\n"
+#, c-format
msgid "%s: can't find subordinate user range\n"
-msgstr "%s:无法创建用户\n"
+msgstr "%s:找不到子用户范围\n"
-#, fuzzy, c-format
-#| msgid "%s: can't update group file\n"
+#, c-format
msgid "%s: can't find subordinate group range\n"
-msgstr "%s 无法更新组文件\n"
+msgstr "%s:找不到子用户组范围\n"
msgid ""
" -a, --all report password status on all accounts\n"
@@ -1704,7 +1730,7 @@ msgid "invalid password file entry"
msgstr "无效的密码文件项"
msgid "duplicate password entry"
-msgstr "重复的密码项"
+msgstr "重复的用户条目"
#, c-format
msgid "invalid user name '%s'\n"
@@ -1732,7 +1758,7 @@ msgstr "没有 %s 的 tcb 目录\n"
#, c-format
msgid "create tcb directory for %s?"
-msgstr "为 %s 创建 tcb 文件?"
+msgstr "为 %s 创建 tcb 文件夹?"
#, c-format
msgid "failed to create tcb directory for %s\n"
@@ -1740,7 +1766,7 @@ msgstr "为 %s 创建 tcb 目录失败\n"
#, c-format
msgid "%s: cannot lock %s.\n"
-msgstr "%s:无法锁定 %s\n"
+msgstr "%s:无法锁定 %s。\n"
#, c-format
msgid "no matching password file entry in %s\n"
@@ -1759,7 +1785,7 @@ msgid "invalid shadow password file entry"
msgstr "无效的影子密码文件项"
msgid "duplicate shadow password entry"
-msgstr "重复的影子密码文项"
+msgstr "重复的用户影子条目"
#, c-format
msgid "user %s: last password change in the future\n"
@@ -1767,7 +1793,7 @@ msgstr "用户 %s:未来最近的密码改动\n"
#, c-format
msgid "%s: cannot sort entries in %s\n"
-msgstr "%s:在 %s 中无法排序条目\n"
+msgstr "%s:无法排序 %s 中的条目\n"
#, c-format
msgid "%s: can't work with tcb enabled\n"
@@ -1784,7 +1810,7 @@ msgid "Password authentication bypassed.\n"
msgstr "忽略密码认证\n"
msgid "Please enter your OWN password as authentication.\n"
-msgstr "请输入您*自己*的密码作为验证。\n"
+msgstr "请输入您“自己”的密码作为验证。\n"
#, c-format
msgid "%s: Cannot fork user shell\n"
@@ -1801,9 +1827,11 @@ msgstr "%s:信号屏蔽(mask)故障\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"
@@ -1814,8 +1842,22 @@ msgstr " ...已结束。\n"
msgid "%s: %s\n"
msgstr "%s:%s\n"
-msgid ""
-"Usage: su [options] [LOGIN]\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"
"Options:\n"
" -c, --command COMMAND pass COMMAND to the invoked shell\n"
@@ -1826,16 +1868,17 @@ msgid ""
" keep the same shell\n"
" -s, --shell SHELL use SHELL instead of the default in passwd\n"
"\n"
+"If no username is given, assume root.\n"
msgstr ""
-"用法:su [选项] [登录]\n"
+"用法:su [选项] [登录名]\n"
"\n"
"选项:\n"
-" -c, --command COMMAND\t\t将 COMMAND 传递至启动的 shell\n"
-" -h, --help\t\t\t显示此帮助信息并退出\n"
-" -, -l, --login\t\t将 shell 设为登录 shell\n"
+" -c, --command COMMAND 将 COMMAND 传递至启动的 shell\n"
+" -h, --help 显示此帮助信息并退出\n"
+" -, -l, --login 将 shell 设为登录 shell\n"
" -m, -p,\n"
-" --preserve-environment\t不重置环境变量并保持同一 shell\n"
-" -s, --shell SHELL\t\t使用 SHELL 而非 passwd 中的默认值\n"
+" --preserve-environment 不重置环境变量并保持同一 shell\n"
+" -s, --shell SHELL 使用 SHELL 而非 passwd 中的默认值\n"
"\n"
#, c-format
@@ -1908,7 +1951,12 @@ msgstr "%s:%s 已经创建,但是不能删除\n"
#, c-format
msgid "%s: the %s configuration in %s will be ignored\n"
-msgstr "%s: %s 配置(位于 %s) 将被忽略\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"
#, c-format
msgid "%s: cannot create new defaults file\n"
@@ -1922,10 +1970,9 @@ msgstr "%s:无法打开新的默认文件\n"
msgid "%s: line too long in %s: %s..."
msgstr "%s:%s 中行太长:%s..."
-#, fuzzy, c-format
-#| msgid "%s: Cannot create symbolic link %s: %s\n"
+#, c-format
msgid "%s: Cannot create backup file (%s): %s\n"
-msgstr "%s:无法创建符号链接 %s:%s\n"
+msgstr "%s:无法创建备份文件(%s):%s\n"
#, c-format
msgid "%s: rename: %s: %s\n"
@@ -1947,7 +1994,7 @@ msgid ""
"\n"
"Options:\n"
msgstr ""
-"用法:%s [选项] 登录\n"
+"用法:%s [选项] 登录名\n"
" %s -D\n"
" %s -D [选项]\n"
"\n"
@@ -1957,7 +2004,11 @@ msgid ""
" -b, --base-dir BASE_DIR base directory for the home directory of "
"the\n"
" new account\n"
-msgstr " -b, --base-dir BASE_DIR\t新账户的主目录的基目录\n"
+msgstr " -b, --base-dir BASE_DIR 新账户的主目录的基目录\n"
+
+msgid ""
+" --btrfs-subvolume-home use BTRFS subvolume for home directory\n"
+msgstr ""
msgid " -c, --comment COMMENT GECOS field of the new account\n"
msgstr " -c, --comment COMMENT 新账户的 GECOS 字段\n"
@@ -1968,10 +2019,10 @@ msgstr " -d, --home-dir HOME_DIR 新账户的主目录\n"
msgid ""
" -D, --defaults print or change default useradd "
"configuration\n"
-msgstr " -D, --defaults\t\t显示或更改默认的 useradd 配置\n"
+msgstr " -D, --defaults 显示或更改默认的 useradd 配置\n"
msgid " -e, --expiredate EXPIRE_DATE expiration date of the new account\n"
-msgstr " -e, --expiredate EXPIRE_DATE 新账户的过期日期\n"
+msgstr " -e, --expiredate EXPIRE_DATE 新账户的过期日期\n"
msgid ""
" -f, --inactive INACTIVE password inactivity period of the new "
@@ -1981,57 +2032,58 @@ msgstr " -f, --inactive INACTIVE 新账户的密码不活动期\n"
msgid ""
" -g, --gid GROUP name or ID of the primary group of the new\n"
" account\n"
-msgstr " -g, --gid GROUP\t\t新账户主组的名称或 ID\n"
+msgstr " -g, --gid GROUP 新账户主组的名称或 ID\n"
msgid ""
" -G, --groups GROUPS list of supplementary groups of the new\n"
" account\n"
-msgstr " -G, --groups GROUPS\t新账户的附加组列表\n"
+msgstr " -G, --groups GROUPS 新账户的附加组列表\n"
msgid ""
" -k, --skel SKEL_DIR use this alternative skeleton directory\n"
-msgstr " -k, --skel SKEL_DIR\t使用此目录作为骨架目录\n"
+msgstr " -k, --skel SKEL_DIR 使用此目录作为骨架目录\n"
msgid ""
" -l, --no-log-init do not add the user to the lastlog and\n"
" faillog databases\n"
-msgstr " -l, --no-log-init\t不要将此用户添加到最近登录和登录失败数据库\n"
+msgstr ""
+" -l, --no-log-init 不要将此用户添加到最近登录和登录失败数据库\n"
msgid " -m, --create-home create the user's home directory\n"
-msgstr " -m, --create-home\t创建用户的主目录\n"
+msgstr " -m, --create-home 创建用户的主目录\n"
msgid ""
" -M, --no-create-home do not create the user's home directory\n"
-msgstr " -M, --no-create-home\t\t不创建用户的主目录\n"
+msgstr " -M, --no-create-home 不创建用户的主目录\n"
msgid ""
" -N, --no-user-group do not create a group with the same name as\n"
" the user\n"
-msgstr " -N, --no-user-group\t不创建同名的组\n"
+msgstr " -N, --no-user-group 不创建同名的组\n"
msgid ""
" -o, --non-unique allow to create users with duplicate\n"
" (non-unique) UID\n"
-msgstr " -o, --non-unique\t\t允许使用重复的 UID 创建用户\n"
+msgstr " -o, --non-unique 允许使用重复的 UID 创建用户\n"
msgid " -p, --password PASSWORD encrypted password of the new account\n"
-msgstr " -p, --password PASSWORD\t\t加密后的新账户密码\n"
+msgstr " -p, --password PASSWORD 加密后的新账户密码\n"
msgid " -s, --shell SHELL login shell of the new account\n"
-msgstr " -s, --shell SHELL\t\t新账户的登录 shell\n"
+msgstr " -s, --shell SHELL 新账户的登录 shell\n"
msgid " -u, --uid UID user ID of the new account\n"
-msgstr " -u, --uid UID\t\t\t新账户的用户 ID\n"
+msgstr " -u, --uid UID 新账户的用户 ID\n"
msgid ""
" -U, --user-group create a group with the same name as the "
"user\n"
-msgstr " -U, --user-group\t\t创建与用户同名的组\n"
+msgstr " -U, --user-group 创建与用户同名的组\n"
msgid ""
" -Z, --selinux-user SEUSER use a specific SEUSER for the SELinux user "
"mapping\n"
-msgstr " -Z, --selinux-user SEUSER\t\t为 SELinux 用户映射使用指定 SEUSER\n"
+msgstr " -Z, --selinux-user SEUSER 为 SELinux 用户映射使用指定 SEUSER\n"
#, c-format
msgid "%s: invalid base directory '%s'\n"
@@ -2061,9 +2113,14 @@ msgstr "%s:无效的字段“%s”\n"
msgid "%s: invalid shell '%s'\n"
msgstr "%s:无效的 shell“%s”\n"
+#, fuzzy, c-format
+#| msgid "%s: Option -C cannot be used together with option -S\n"
+msgid "%s: -Z cannot be used with --prefix\n"
+msgstr "%s:选项 -C 不能与 -S 选项一起使用\n"
+
#, c-format
msgid "%s: -Z requires SELinux enabled kernel\n"
-msgstr "%s: -Z 选项要求内核启用 SELinux\n"
+msgstr "%s:-Z 选项要求内核启用 SELinux\n"
#, c-format
msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
@@ -2074,14 +2131,56 @@ 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 prepare the new %s entry '%s'\n"
+#| msgid "%s: failed to reset the faillog entry of UID %lu: %s\n"
+msgid "%s: failed to reset the tallylog entry of user \"%s\"\n"
+msgstr "%s:重置 UID %lu 的登录失败条目失败:%s\n"
+
+#, c-format
msgid "%s: failed to prepare the new %s entry\n"
-msgstr "%s:准备新 %s 条目“%s”失败\n"
+msgstr "%s:准备新 %s 条目失败\n"
+
+#, fuzzy, c-format
+#| msgid "%s: error updating files\n"
+msgid "%s: error while duplicating string %s\n"
+msgstr "%s:更新文件出错\n"
+
+#, fuzzy, c-format
+#| msgid "%s: cannot create directory %s\n"
+msgid "%s: cannot set SELinux context for home directory %s\n"
+msgstr "%s:无法创建目录 %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"
+msgid "%s: home directory \"%s\" must be mounted on BTRFS\n"
+msgstr "%s:未找到 %s 的主目录“%s”\n"
+
+#, fuzzy, c-format
+#| msgid "%s: failed to allocate memory: %s\n"
+msgid "%s: failed to create BTRFS subvolume: %s\n"
+msgstr "%s:申请内存失败:%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"
+msgid "%s: warning: chown on `%s' failed: %m\n"
+msgstr "%s:第 %d 行:改变 %s 的属主失败:%s\n"
+
+#, fuzzy, c-format
+#| msgid "%s: line %d: chown %s failed: %s\n"
+msgid "%s: warning: chmod on `%s' failed: %m\n"
+msgstr "%s:第 %d 行:改变 %s 的属主失败:%s\n"
+
+#, c-format
+msgid "%s: cannot reset SELinux file creation context\n"
+msgstr ""
+
msgid "Creating mailbox file"
msgstr "正在创建信箱文件"
@@ -2117,15 +2216,13 @@ msgstr "%s:为 %s 创建 tcb 目录失败\n"
msgid "%s: can't create group\n"
msgstr "%s:无法创建用户组\n"
-#, fuzzy, c-format
-#| msgid "%s: can't create user\n"
+#, c-format
msgid "%s: can't create subordinate user IDs\n"
-msgstr "%s:无法创建用户\n"
+msgstr "%s:无法创建子用户 ID\n"
-#, fuzzy, c-format
-#| msgid "%s: can't create group\n"
+#, c-format
msgid "%s: can't create subordinate group IDs\n"
-msgstr "%s:无法创建用户组\n"
+msgstr "%s:无法创建子用户组 ID\n"
#, c-format
msgid ""
@@ -2145,7 +2242,7 @@ msgid ""
msgstr " -f, --force 即使不属于此用户,也强制删除文件\n"
msgid " -r, --remove remove home directory and mail spool\n"
-msgstr " -r, --remove 删除主目录和邮件池\n"
+msgstr " -r, --remove 删除主目录和信件池\n"
msgid ""
" -Z, --selinux-user remove any SELinux user mapping for the "
@@ -2165,14 +2262,13 @@ msgstr "%s:组“%s”没有移除,因为它包含其它成员。\n"
msgid "%s: group %s is the primary group of another user and is not removed.\n"
msgstr "%s:没有删除 %s 组,因为它是另外一个用户的主组。\n"
-#, fuzzy, c-format
-#| msgid "%s: cannot remove entry '%s' from %s\n"
+#, c-format
msgid "%s: cannot remove entry %lu from %s\n"
-msgstr "%1$s:无法从 %3$s 中移除 %2$s\n"
+msgstr "%1$s:无法从 %3$s 中移除 %2$lu\n"
#, c-format
msgid "%s: %s mail spool (%s) not found\n"
-msgstr "%s: %s 邮件池 (%s) 未找到\n"
+msgstr "%s:%s 信件池 (%s) 未找到\n"
#, c-format
msgid "%s: warning: can't remove %s: %s\n"
@@ -2210,6 +2306,11 @@ 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"
+msgid "%s: error removing subvolume %s\n"
+msgstr "%s:删除目录 %s 时出错\n"
+
#, c-format
msgid "%s: error removing directory %s\n"
msgstr "%s:删除目录 %s 时出错\n"
@@ -2219,7 +2320,7 @@ msgid "%s: warning: the user name %s to SELinux user mapping removal failed.\n"
msgstr "%s:警告:将用户名 %s 到 SELinux 的用户映射失败。\n"
msgid " -c, --comment COMMENT new value of the GECOS field\n"
-msgstr " -c, --comment 注释 GECOS 字段的新值\n"
+msgstr " -c, --comment COMMENT GECOS 字段的新值\n"
msgid ""
" -d, --home HOME_DIR new home directory for the user account\n"
@@ -2250,7 +2351,7 @@ msgstr ""
" 并不从其它组中删除此用户\n"
msgid " -l, --login NEW_LOGIN new value of the login name\n"
-msgstr " -l, --login LOGIN 新的登录名称\n"
+msgstr " -l, --login NEW_LOGIN 新的登录名称\n"
msgid " -L, --lock lock the user account\n"
msgstr " -L, --lock 锁定用户帐号\n"
@@ -2276,21 +2377,21 @@ msgid " -U, --unlock unlock the user account\n"
msgstr " -U, --unlock 解锁用户帐号\n"
msgid " -v, --add-subuids FIRST-LAST add range of subordinate uids\n"
-msgstr ""
+msgstr " -v, --add-subuids FIRST-LAST 添加子 UID 范围\n"
msgid " -V, --del-subuids FIRST-LAST remove range of subordinate uids\n"
-msgstr ""
+msgstr " -V, --del-subuids FIRST-LAST 移除子 UID 范围\n"
msgid " -w, --add-subgids FIRST-LAST add range of subordinate gids\n"
-msgstr ""
+msgstr " -w, --add-subgids FIRST-LAST 添加子 GID 范围\n"
msgid " -W, --del-subgids FIRST-LAST remove range of subordinate gids\n"
-msgstr ""
+msgstr " -W, --del-subgids FIRST-LAST 移除子 GID 范围\n"
msgid ""
" -Z, --selinux-user SEUSER new SELinux user mapping for the user "
"account\n"
-msgstr " -Z, --selinux-user SEUSER 用户账户的新 SELinux 用户映射\n"
+msgstr " -Z, --selinux-user SEUSER 用户的新的 SELinux 用户映射\n"
#, c-format
msgid ""
@@ -2302,17 +2403,15 @@ msgstr ""
#, c-format
msgid "%s: user '%s' already exists in %s\n"
-msgstr "%s:用户 %s 已存在于 %s 中\n"
+msgstr "%s:用户“%s”已存在于 %s 中\n"
-#, fuzzy, c-format
-#| msgid "%s: invalid date '%s'\n"
+#, c-format
msgid "%s: invalid subordinate uid range '%s'\n"
-msgstr "%s:无效的日期“%s”\n"
+msgstr "%s:无效的子 UID 范围“%s”\n"
-#, fuzzy, c-format
-#| msgid "%s: invalid date '%s'\n"
+#, c-format
msgid "%s: invalid subordinate gid range '%s'\n"
-msgstr "%s:无效的日期“%s”\n"
+msgstr "%s:无效的子 GID 范围“%s”\n"
#, c-format
msgid "%s: no options\n"
@@ -2320,7 +2419,7 @@ msgstr "%s:无选项\n"
#, c-format
msgid "%s: the -L, -p, and -U flags are exclusive\n"
-msgstr "%s:-L ,-p 和 -U 标志互斥\n"
+msgstr "%s:-L、-p 和 -U 标志互斥\n"
#, c-format
msgid "%s: shadow passwords required for -e and -f\n"
@@ -2328,12 +2427,11 @@ msgstr "%s:-e 和 -f 参数需要影子密码\n"
#, c-format
msgid "%s: UID '%lu' already exists\n"
-msgstr "%s:UID “%lu”已经存在\n"
+msgstr "%s:UID“%lu”已经存在\n"
-#, fuzzy, c-format
-#| msgid "%s: %s is not authorized to change the password of %s\n"
+#, c-format
msgid "%s: %s does not exist, you cannot use the flags %s or %s\n"
-msgstr "%s:%s 没有被授权更改 %s 的密码\n"
+msgstr "%s:不存在 %s,您不能使用 %s 或 %s 标志\n"
#, c-format
msgid "%s: directory %s exists\n"
@@ -2343,13 +2441,17 @@ msgstr "%s:目录 %s 不存在\n"
msgid ""
"%s: The previous home directory (%s) was not a directory. It is not removed "
"and no home directories are created.\n"
-msgstr "%s:先前的用户目录 (%s) 不是目录。没有移除它也没有创建主目录。\n"
+msgstr "%s:先前的主目录 (%s) 不是一个目录。没有移除它,也没有创建主目录。\n"
#, c-format
msgid "%s: Failed to change ownership of the home directory"
msgstr "%s:更改主目录的属主失败"
#, c-format
+msgid "%s: error: cannot move subvolume from %s to %s - different device\n"
+msgstr ""
+
+#, c-format
msgid "%s: warning: failed to completely remove old home directory %s"
msgstr "%s:警告:无法将旧的主目录 %s 完全删除"
@@ -2373,27 +2475,25 @@ msgid "failed to change mailbox owner"
msgstr "改变信箱所有者失败"
msgid "failed to rename mailbox"
-msgstr "无法为信箱改名"
+msgstr "信箱改名失败"
-#, fuzzy, c-format
-#| msgid "%s: failed to prepare the new %s entry '%s'\n"
+#, c-format
msgid "%s: failed to remove uid range %lu-%lu from '%s'\n"
-msgstr "%s:准备新 %s 条目“%s”失败\n"
+msgstr "%1$s:从“%4$s”移除 UID 范围 %2$lu~%3$lu 失败\n"
#, fuzzy, c-format
-#| msgid "%s: failed to prepare the new %s entry '%s'\n"
-msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
-msgstr "%s:准备新 %s 条目“%s”失败\n"
+#| msgid "%s: failed to add uid range %lu-%lu from '%s'\n"
+msgid "%s: failed to add uid range %lu-%lu to '%s'\n"
+msgstr "%1$s:向“%4$s”添加 UID 范围 %2$lu~%3$lu 失败\n"
-#, fuzzy, c-format
-#| msgid "%s: failed to prepare the new %s entry '%s'\n"
+#, c-format
msgid "%s: failed to remove gid range %lu-%lu from '%s'\n"
-msgstr "%s:准备新 %s 条目“%s”失败\n"
+msgstr "%1$s:从“%4$s”移除 GID 范围 %2$lu~%3$lu 失败\n"
#, fuzzy, c-format
-#| msgid "%s: failed to prepare the new %s entry '%s'\n"
-msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
-msgstr "%s:准备新 %s 条目“%s”失败\n"
+#| msgid "%s: failed to add gid range %lu-%lu from '%s'\n"
+msgid "%s: failed to add gid range %lu-%lu to '%s'\n"
+msgstr "%1$s:向“%4$s”添加 GID 范围 %2$lu~%3$lu 失败\n"
#, c-format
msgid ""
@@ -2432,7 +2532,7 @@ msgid "failed to drop privileges"
msgstr "放弃特权失败"
msgid "Couldn't get file context"
-msgstr "无法获取上下文"
+msgstr "无法获取文件的上下文"
msgid "setfscreatecon () failed"
msgstr "setfscreatecon () 失败"
@@ -2444,21 +2544,19 @@ msgid "Couldn't lock file"
msgstr "无法锁定文件"
msgid "Couldn't make backup"
-msgstr "无法备份"
+msgstr "无法创建备份"
-#, fuzzy, c-format
-#| msgid "%s: PAM: %s\n"
+#, c-format
msgid "%s: %s: %s\n"
-msgstr "%s: PAM: %s\n"
+msgstr "%s:%s:%s\n"
-#, fuzzy, c-format
-#| msgid "%s: nscd exited with status %d"
+#, c-format
msgid "%s: %s returned with status %d\n"
-msgstr "%s: nscd 以状态 %d 退出"
+msgstr "%s:%s 以状态 %d 退出\n"
#, c-format
msgid "%s: %s killed by signal %d\n"
-msgstr ""
+msgstr "%s:%s 被信号 %d 杀死\n"
msgid "failed to open scratch file"
msgstr "打开临时文件失败"
@@ -3243,9 +3341,6 @@ msgstr "%s:无法为“%s”找到 tcb 目录\n"
#~ msgid "%s: can't open files\n"
#~ msgstr "%s:无法打开文件\n"
-#~ msgid "%s: error updating files\n"
-#~ msgstr "%s:更新文件出错\n"
-
#~ msgid "%s: can't update passwd entry for %s\n"
#~ msgstr "%s:无法为 %s 更新密码条目\n"