--- embedaddon/sudo/src/po/zh_CN.po	2013/07/22 10:46:14	1.1.1.4
+++ embedaddon/sudo/src/po/zh_CN.po	2013/10/14 07:56:36	1.1.1.5
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sudo-1.8.7b1\n"
+"Project-Id-Version: sudo-1.8.8b3\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2013-04-02 10:40-0400\n"
-"PO-Revision-Date: 2013-04-07 09:43+0800\n"
+"POT-Creation-Date: 2013-09-03 14:44-0600\n"
+"PO-Revision-Date: 2013-09-05 10:15+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
@@ -31,81 +31,102 @@ msgstr "无法为 %2$s 切换到注册表“%1$s”"
 msgid "unable to restore registry"
 msgstr "无法恢复注册表"
 
-#: common/alloc.c:82
+#: common/alloc.c:81
 msgid "internal error, tried to emalloc(0)"
 msgstr "内部错误，试图 emalloc(0)"
 
-#: common/alloc.c:99
+#: common/alloc.c:98
 msgid "internal error, tried to emalloc2(0)"
 msgstr "内部错误，试图 emalloc2(0)"
 
-#: common/alloc.c:101 common/alloc.c:123 common/alloc.c:163 common/alloc.c:187
+#: common/alloc.c:100 common/alloc.c:122 common/alloc.c:162 common/alloc.c:186
 #, c-format
 msgid "internal error, %s overflow"
 msgstr "内部错误，%s 溢出"
 
-#: common/alloc.c:120
+#: common/alloc.c:119
 msgid "internal error, tried to ecalloc(0)"
 msgstr "内部错误，试图 ecalloc(0)"
 
-#: common/alloc.c:142
+#: common/alloc.c:141
 msgid "internal error, tried to erealloc(0)"
 msgstr "内部错误，试图 erealloc(0)"
 
-#: common/alloc.c:161
+#: common/alloc.c:160
 msgid "internal error, tried to erealloc3(0)"
 msgstr "内部错误，试图 erealloc3(0)"
 
-#: common/alloc.c:185
+#: common/alloc.c:184
 msgid "internal error, tried to erecalloc(0)"
 msgstr "内部错误，试图 erecalloc(0)"
 
-#: common/error.c:154
+#: common/atoid.c:77 common/atoid.c:99 src/sudo.c:561 src/sudo.c:586
+#: src/sudo.c:694 src/sudo.c:710
+msgid "invalid value"
+msgstr "值无效"
+
+#: common/atoid.c:84 src/sudo.c:565 src/sudo.c:590 src/sudo.c:698
+#: src/sudo.c:714
+msgid "value out of range"
+msgstr "值超出范围"
+
+#: common/atoid.c:105
+msgid "value too large"
+msgstr "值过大"
+
+#: common/fatal.c:154
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr "%s：%s：%s\n"
 
-#: common/error.c:157 common/error.c:161
+#: common/fatal.c:157 common/fatal.c:161
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s：%s\n"
 
-#: common/sudo_conf.c:172
+#: common/gidlist.c:80 src/load_plugins.c:72 src/sudo.c:561 src/sudo.c:565
+#: src/sudo.c:586 src/sudo.c:590 src/sudo.c:613 src/sudo.c:622 src/sudo.c:631
+#: src/sudo.c:646 src/sudo.c:694 src/sudo.c:698 src/sudo.c:710 src/sudo.c:714
 #, c-format
+msgid "%s: %s"
+msgstr "%s：%s"
+
+#: common/sudo_conf.c:176
+#, c-format
 msgid "unsupported group source `%s' in %s, line %d"
 msgstr "不支持 %2$s 第 %3$d 行的组来源“%1$s”"
 
-#: common/sudo_conf.c:186
+#: common/sudo_conf.c:190
 #, c-format
 msgid "invalid max groups `%s' in %s, line %d"
 msgstr "%2$s 第 %3$d 行的最大组数“%1$s”无效"
 
-#: common/sudo_conf.c:382
+#: common/sudo_conf.c:394
 #, c-format
 msgid "unable to stat %s"
 msgstr "无法 stat %s"
 
-#: common/sudo_conf.c:385
+#: common/sudo_conf.c:397
 #, c-format
 msgid "%s is not a regular file"
 msgstr "%s 不是常规文件"
 
-#: common/sudo_conf.c:388
+#: common/sudo_conf.c:400
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr "%s 属于用户 ID %u，应为 %u"
 
-#: common/sudo_conf.c:392
+#: common/sudo_conf.c:404
 #, c-format
 msgid "%s is world writable"
 msgstr "%s 可被任何人写"
 
-#: common/sudo_conf.c:395
+#: common/sudo_conf.c:407
 #, c-format
 msgid "%s is group writable"
 msgstr "%s 可被用户组写"
 
-#: common/sudo_conf.c:405 src/selinux.c:196 src/selinux.c:209 src/sudo.c:328
+#: common/sudo_conf.c:417 src/selinux.c:196 src/selinux.c:209 src/sudo.c:329
 #, c-format
 msgid "unable to open %s"
 msgstr "打不开 %s"
@@ -119,7 +140,7 @@ msgstr "未知信号"
 msgid "policy plugin failed session initialization"
 msgstr "策略插件会话初始化失败"
 
-#: src/exec.c:132 src/exec_pty.c:701 src/exec_pty.c:1066 src/tgetpass.c:220
+#: src/exec.c:132 src/exec_pty.c:701 src/exec_pty.c:1066 src/tgetpass.c:221
 #, c-format
 msgid "unable to fork"
 msgstr "无法执行 fork"
@@ -150,7 +171,7 @@ msgid "unable to allocate pty"
 msgstr "无法分配伪终端"
 
 #: src/exec_pty.c:623 src/exec_pty.c:632 src/exec_pty.c:640 src/exec_pty.c:986
-#: src/exec_pty.c:1063 src/signal.c:126 src/tgetpass.c:217
+#: src/exec_pty.c:1063 src/signal.c:126 src/tgetpass.c:218
 #, c-format
 msgid "unable to create pipe"
 msgstr "无法创建管道"
@@ -192,11 +213,6 @@ msgstr "联络通道的回应类型异常：%d"
 msgid "error in %s, line %d while loading plugin `%s'"
 msgstr "在加载插件“%3$s”时在 %1$s 第 %2$d 行出错"
 
-#: src/load_plugins.c:72
-#, c-format
-msgid "%s: %s"
-msgstr "%s：%s"
-
 #: src/load_plugins.c:81
 #, c-format
 msgid "%s%s: %s"
@@ -268,57 +284,52 @@ msgstr "load_interfaces：检测到溢出"
 msgid "unable to open socket"
 msgstr "无法打开套接字"
 
-#: src/parse_args.c:197
+#: src/parse_args.c:246
 #, c-format
 msgid "the argument to -C must be a number greater than or equal to 3"
 msgstr "-C 选项的参数必须是一个大于等于 3 的数字"
 
-#: src/parse_args.c:286
+#: src/parse_args.c:408
 #, c-format
-msgid "unknown user: %s"
-msgstr "未知用户：%s"
-
-#: src/parse_args.c:345
-#, c-format
 msgid "you may not specify both the `-i' and `-s' options"
 msgstr "您不能同时指定“-i”和“-s”选项"
 
-#: src/parse_args.c:349
+#: src/parse_args.c:412
 #, c-format
 msgid "you may not specify both the `-i' and `-E' options"
 msgstr "您不能同时指定“-i”和“-E”选项"
 
-#: src/parse_args.c:359
+#: src/parse_args.c:422
 #, c-format
 msgid "the `-E' option is not valid in edit mode"
 msgstr "“-E”选项在编辑模式中无效"
 
-#: src/parse_args.c:361
+#: src/parse_args.c:424
 #, c-format
 msgid "you may not specify environment variables in edit mode"
 msgstr "在编辑模式中您不能指定环境变量"
 
-#: src/parse_args.c:369
+#: src/parse_args.c:432
 #, c-format
 msgid "the `-U' option may only be used with the `-l' option"
 msgstr "“-U”选项只能与“-l”选项一起使用"
 
-#: src/parse_args.c:373
+#: src/parse_args.c:436
 #, c-format
 msgid "the `-A' and `-S' options may not be used together"
 msgstr "“-A”和“-S”选项不可同时使用"
 
-#: src/parse_args.c:456
+#: src/parse_args.c:519
 #, c-format
 msgid "sudoedit is not supported on this platform"
 msgstr "此平台不支持 sudoedit"
 
-#: src/parse_args.c:529
+#: src/parse_args.c:592
 #, c-format
 msgid "Only one of the -e, -h, -i, -K, -l, -s, -v or -V options may be specified"
 msgstr "只能指定 -e、-h、-i、-K、-l、-s、-v 或 -V 选项中的一个"
 
-#: src/parse_args.c:543
+#: src/parse_args.c:606
 #, c-format
 msgid ""
 "%s - edit files as another user\n"
@@ -327,7 +338,7 @@ msgstr ""
 "%s - 以其他用户身份编辑文件\n"
 "\n"
 
-#: src/parse_args.c:545
+#: src/parse_args.c:608
 #, c-format
 msgid ""
 "%s - execute a command as another user\n"
@@ -336,7 +347,7 @@ msgstr ""
 "%s - 以其他用户身份执行一条命令\n"
 "\n"
 
-#: src/parse_args.c:550
+#: src/parse_args.c:613
 #, c-format
 msgid ""
 "\n"
@@ -345,106 +356,114 @@ msgstr ""
 "\n"
 "选项：\n"
 
-#: src/parse_args.c:552
-msgid "use helper program for password prompting\n"
-msgstr "使用助手程序进行密码提示\n"
+#: src/parse_args.c:615
+msgid "use a helper program for password prompting"
+msgstr "使用助手程序进行密码提示"
 
-#: src/parse_args.c:555
-msgid "use specified BSD authentication type\n"
-msgstr "使用指定的 BSD 认证类型\n"
+#: src/parse_args.c:618
+msgid "use specified BSD authentication type"
+msgstr "使用指定的 BSD 认证类型"
 
-#: src/parse_args.c:558
-msgid "run command in the background\n"
-msgstr "在后台运行命令\n"
+#: src/parse_args.c:621
+msgid "run command in the background"
+msgstr "在后台运行命令"
 
-#: src/parse_args.c:560
-msgid "close all file descriptors >= fd\n"
-msgstr "关闭所有 >= fd 的文件描述符\n"
+#: src/parse_args.c:623
+msgid "close all file descriptors >= num"
+msgstr "关闭所有 >= num 的文件描述符"
 
-#: src/parse_args.c:563
-msgid "run command with specified login class\n"
-msgstr "以指定的登录类别运行命令\n"
+#: src/parse_args.c:626
+msgid "run command with the specified BSD login class"
+msgstr "以指定的 BSD 登录类别运行命令"
 
-#: src/parse_args.c:566
-msgid "preserve user environment when executing command\n"
-msgstr "在执行命令时保留用户环境\n"
+#: src/parse_args.c:629
+msgid "preserve user environment when running command"
+msgstr "在执行命令时保留用户环境"
 
-#: src/parse_args.c:568
-msgid "edit files instead of running a command\n"
-msgstr "编辑文件而非执行命令\n"
+#: src/parse_args.c:631
+msgid "edit files instead of running a command"
+msgstr "编辑文件而非执行命令"
 
-#: src/parse_args.c:570
-msgid "execute command as the specified group\n"
-msgstr "以指定的用户组执行命令\n"
+#: src/parse_args.c:633
+msgid "run command as the specified group name or ID"
+msgstr "以指定的用户组或 ID 执行命令"
 
-#: src/parse_args.c:572
-msgid "set HOME variable to target user's home dir.\n"
-msgstr "将 HOME 变量设为目标用户的主目录。\n"
+#: src/parse_args.c:635
+msgid "set HOME variable to target user's home dir"
+msgstr "将 HOME 变量设为目标用户的主目录。"
 
-#: src/parse_args.c:574
-msgid "display help message and exit\n"
-msgstr "显示帮助消息并退出\n"
+#: src/parse_args.c:637
+msgid "display help message and exit"
+msgstr "显示帮助消息并退出"
 
-#: src/parse_args.c:576
-msgid "run a login shell as target user\n"
-msgstr "以目标用户身份运行一个登录 shell\n"
+#: src/parse_args.c:639
+msgid "run command on host (if supported by plugin)"
+msgstr "在主机上运行命令(如果插件支持)"
 
-#: src/parse_args.c:578
-msgid "remove timestamp file completely\n"
-msgstr "完全移除时间戳文件\n"
+#: src/parse_args.c:641
+msgid "run login shell as the target user; a command may also be specified"
+msgstr "以目标用户身份运行一个登录 shell；可同时指定一条命令"
 
-#: src/parse_args.c:580
-msgid "invalidate timestamp file\n"
-msgstr "无效的时间戳文件\n"
+#: src/parse_args.c:643
+msgid "remove timestamp file completely"
+msgstr "完全移除时间戳文件"
 
-#: src/parse_args.c:582
-msgid "list user's available commands\n"
-msgstr "列出用户能执行的命令\n"
+#: src/parse_args.c:645
+msgid "invalidate timestamp file"
+msgstr "无效的时间戳文件"
 
-#: src/parse_args.c:584
-msgid "non-interactive mode, will not prompt user\n"
-msgstr "非交互模式，将不提示用户\n"
+#: src/parse_args.c:647
+msgid "list user's privileges or check a specific command; use twice for longer format"
+msgstr "列出用户权限或检查某个特定命令；对于长格式，使用两次"
 
-#: src/parse_args.c:586
-msgid "preserve group vector instead of setting to target's\n"
-msgstr "保留组向量，而非设置为目标的组向量\n"
+#: src/parse_args.c:649
+msgid "non-interactive mode, no prompts are used"
+msgstr "非交互模式，不提示"
 
-#: src/parse_args.c:588
-msgid "use specified password prompt\n"
-msgstr "使用指定的密码提示\n"
+#: src/parse_args.c:651
+msgid "preserve group vector instead of setting to target's"
+msgstr "保留组向量，而非设置为目标的组向量"
 
-#: src/parse_args.c:591 src/parse_args.c:599
-msgid "create SELinux security context with specified role\n"
-msgstr "以指定的角色创建 SELinux 安全环境\n"
+#: src/parse_args.c:653
+msgid "use the specified password prompt"
+msgstr "使用指定的密码提示"
 
-#: src/parse_args.c:594
-msgid "read password from standard input\n"
-msgstr "从标准输入读取密码\n"
+#: src/parse_args.c:656
+msgid "create SELinux security context with specified role"
+msgstr "以指定的角色创建 SELinux 安全环境"
 
-#: src/parse_args.c:596
-msgid "run a shell as target user\n"
-msgstr "以目标用户身份运行 shell\n"
+#: src/parse_args.c:659
+msgid "read password from standard input"
+msgstr "从标准输入读取密码"
 
-#: src/parse_args.c:602
-msgid "when listing, list specified user's privileges\n"
-msgstr "在列表时，列出指定用户的权限\n"
+#: src/parse_args.c:661
+msgid "run shell as the target user; a command may also be specified"
+msgstr "以目标用户运行 shell；可同时指定一条命令"
 
-#: src/parse_args.c:604
-msgid "run command (or edit file) as specified user\n"
-msgstr "以指定用户身份运行命令(或编辑文件)\n"
+#: src/parse_args.c:664
+msgid "create SELinux security context with specified type"
+msgstr "以指定的类型创建 SELinux 安全环境"
 
-#: src/parse_args.c:606
-msgid "display version information and exit\n"
-msgstr "显示版本信息并退出\n"
+#: src/parse_args.c:667
+msgid "in list mode, display privileges for user"
+msgstr "在列表模式中显示用户的权限"
 
-#: src/parse_args.c:608
-msgid "update user's timestamp without running a command\n"
-msgstr "更新用户的时间戳而不执行命令\n"
+#: src/parse_args.c:669
+msgid "run command (or edit file) as specified user name or ID"
+msgstr "以指定用户或 ID 运行命令(或编辑文件)"
 
-#: src/parse_args.c:610
-msgid "stop processing command line arguments\n"
-msgstr "停止处理命令行参数\n"
+#: src/parse_args.c:671
+msgid "display version information and exit"
+msgstr "显示版本信息并退出"
 
+#: src/parse_args.c:673
+msgid "update user's timestamp without running a command"
+msgstr "更新用户的时间戳而不执行命令"
+
+#: src/parse_args.c:675
+msgid "stop processing command line arguments"
+msgstr "停止处理命令行参数"
+
 #: src/selinux.c:77
 #, c-format
 msgid "unable to open audit system"
@@ -527,8 +546,8 @@ msgstr "无法确定强制模式。"
 
 #: src/selinux.c:342
 #, c-format
-msgid "unable to setup tty context for %s"
-msgstr "无法设置 %s 的终端环境"
+msgid "unable to set tty context to %s"
+msgstr "无法将终端环境设置为 %s"
 
 #: src/selinux.c:381
 #, c-format
@@ -545,7 +564,7 @@ msgstr "无法向 %s 设置键创建环境"
 msgid "requires at least one argument"
 msgstr "要求至少有一个参数"
 
-#: src/sesh.c:78 src/sudo.c:1126
+#: src/sesh.c:78 src/sudo.c:1114
 #, c-format
 msgid "unable to execute %s"
 msgstr "无法执行 %s"
@@ -620,102 +639,102 @@ msgstr "无法初始化策略插件"
 msgid "error initializing I/O plugin %s"
 msgstr "初始化 I/O 插件 %s 出错"
 
-#: src/sudo.c:293
+#: src/sudo.c:294
 #, c-format
 msgid "unexpected sudo mode 0x%x"
 msgstr "异常的 sudo 模式 0x%x"
 
-#: src/sudo.c:413
+#: src/sudo.c:414
 #, c-format
 msgid "unable to get group vector"
 msgstr "无法获取组向量"
 
-#: src/sudo.c:465
+#: src/sudo.c:466
 #, c-format
 msgid "unknown uid %u: who are you?"
 msgstr "未知的用户 ID %u：您是？"
 
-#: src/sudo.c:802
+#: src/sudo.c:788
 #, c-format
 msgid "%s must be owned by uid %d and have the setuid bit set"
 msgstr "%s 必须属于用户 ID %d(的用户)并且设置 setuid 位"
 
-#: src/sudo.c:805
+#: src/sudo.c:791
 #, c-format
 msgid "effective uid is not %d, is %s on a file system with the 'nosuid' option set or an NFS file system without root privileges?"
 msgstr "有效用户 ID 不是 %d，%s 位于一个设置了“nosuid”选项的文件系统或没有 root 权限的 NFS 文件系统中吗？"
 
-#: src/sudo.c:811
+#: src/sudo.c:797
 #, c-format
 msgid "effective uid is not %d, is sudo installed setuid root?"
 msgstr "有效用户 ID 不是 %d，sudo 属于 root 并设置了 setuid 位吗？"
 
-#: src/sudo.c:915
+#: src/sudo.c:923
 #, c-format
 msgid "unknown login class %s"
 msgstr "未知的登录类别 %s"
 
-#: src/sudo.c:929 src/sudo.c:932
+#: src/sudo.c:936
 #, c-format
 msgid "unable to set user context"
 msgstr "无法设置用户环境"
 
-#: src/sudo.c:944
+#: src/sudo.c:950
 #, c-format
 msgid "unable to set supplementary group IDs"
 msgstr "无法设置补充组 ID"
 
-#: src/sudo.c:951
+#: src/sudo.c:957
 #, c-format
 msgid "unable to set effective gid to runas gid %u"
 msgstr "无法设置有效组 ID 来以组 ID %u 运行"
 
-#: src/sudo.c:957
+#: src/sudo.c:963
 #, c-format
 msgid "unable to set gid to runas gid %u"
 msgstr "无法设置组 ID 来以组 ID %u 运行"
 
-#: src/sudo.c:964
+#: src/sudo.c:970
 #, c-format
 msgid "unable to set process priority"
 msgstr "无法设置进程优先级"
 
-#: src/sudo.c:972
+#: src/sudo.c:978
 #, c-format
 msgid "unable to change root to %s"
 msgstr "无法从 root 切换到 %s"
 
-#: src/sudo.c:979 src/sudo.c:985 src/sudo.c:991
+#: src/sudo.c:991 src/sudo.c:997 src/sudo.c:1003
 #, c-format
 msgid "unable to change to runas uid (%u, %u)"
 msgstr "无法切换到以用户 ID(%u，%u)运行"
 
-#: src/sudo.c:1005
+#: src/sudo.c:1020
 #, c-format
 msgid "unable to change directory to %s"
 msgstr "无法将目录切换到 %s"
 
-#: src/sudo.c:1089
+#: src/sudo.c:1077
 #, c-format
 msgid "unexpected child termination condition: %d"
 msgstr "异常的子进程终止条件：%d"
 
-#: src/sudo.c:1146
+#: src/sudo.c:1134
 #, c-format
 msgid "policy plugin %s is missing the `check_policy' method"
 msgstr "“check_policy”方法中缺少策略插件 %s"
 
-#: src/sudo.c:1159
+#: src/sudo.c:1147
 #, c-format
 msgid "policy plugin %s does not support listing privileges"
 msgstr "策略插件 %s 不支持列出权限"
 
-#: src/sudo.c:1171
+#: src/sudo.c:1159
 #, c-format
 msgid "policy plugin %s does not support the -v option"
 msgstr "策略插件 %s不支持 -v 选项"
 
-#: src/sudo.c:1183
+#: src/sudo.c:1171
 #, c-format
 msgid "policy plugin %s does not support the -k/-K options"
 msgstr "策略插件 %s 不支持 -k/-K 选项"
@@ -765,27 +784,27 @@ msgstr "编辑会话的内容留在了 %s 中"
 msgid "unable to read temporary file"
 msgstr "无法读取临时文件"
 
-#: src/tgetpass.c:89
+#: src/tgetpass.c:90
 #, c-format
 msgid "no tty present and no askpass program specified"
 msgstr "没有终端存在，且未指定 askpass 程序"
 
-#: src/tgetpass.c:98
+#: src/tgetpass.c:99
 #, c-format
 msgid "no askpass program specified, try setting SUDO_ASKPASS"
 msgstr "没有指定 askpass 程序，尝试设置 SUDO_ASKPASS"
 
-#: src/tgetpass.c:230
+#: src/tgetpass.c:232
 #, c-format
 msgid "unable to set gid to %u"
 msgstr "无法将组 ID 设为 %u"
 
-#: src/tgetpass.c:234
+#: src/tgetpass.c:236
 #, c-format
 msgid "unable to set uid to %u"
 msgstr "无法将用户 ID 设为 %u"
 
-#: src/tgetpass.c:239
+#: src/tgetpass.c:241
 #, c-format
 msgid "unable to run %s"
 msgstr "无法执行 %s"
@@ -804,6 +823,18 @@ msgstr "无法 dup2 stdin"
 #, c-format
 msgid "unable to restore stdin"
 msgstr "无法恢复 stdin"
+
+#~ msgid "unknown user: %s"
+#~ msgstr "未知用户：%s"
+
+#~ msgid "list user's available commands\n"
+#~ msgstr "列出用户能执行的命令\n"
+
+#~ msgid "run a shell as target user\n"
+#~ msgstr "以目标用户身份运行 shell\n"
+
+#~ msgid "when listing, list specified user's privileges\n"
+#~ msgstr "在列表时，列出指定用户的权限\n"
 
 #~ msgid "unable to allocate memory"
 #~ msgstr "无法分配内存"