From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Mon, 20 Jun 2011 12:30:10 +0000 (-0400)
Subject: Sync Chinese (simplified) PO files from translationproject.org
X-Git-Tag: SUDO_1_8_2~60^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bd874febcf3467e137fa610d602eea5d9287033;p=sudo

Sync Chinese (simplified) PO files from translationproject.org
---

diff --git a/plugins/sudoers/po/zh_CN.mo b/plugins/sudoers/po/zh_CN.mo
index e47c4550f..45c68b824 100644
Binary files a/plugins/sudoers/po/zh_CN.mo and b/plugins/sudoers/po/zh_CN.mo differ
diff --git a/plugins/sudoers/po/zh_CN.po b/plugins/sudoers/po/zh_CN.po
index 735fab848..ef67f9067 100644
--- a/plugins/sudoers/po/zh_CN.po
+++ b/plugins/sudoers/po/zh_CN.po
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sudoers 1.8.2-rc1\n"
+"Project-Id-Version: sudoers 1.8.2-rc2\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2011-05-20 15:33-0400\n"
-"PO-Revision-Date: 2011-05-27 16:10+0800\n"
+"POT-Creation-Date: 2011-06-04 18:27-0400\n"
+"PO-Revision-Date: 2011-06-20 19:11+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: \n"
@@ -16,535 +16,508 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../../../trunk/plugins/sudoers/alias.c:117
+#: plugins/sudoers/alias.c:122
 #, c-format
 msgid "Alias `%s' already defined"
 msgstr "别名“%s”已定义"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:58
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:61
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:109
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:113
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:163
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:167
+#: plugins/sudoers/bsm_audit.c:58 plugins/sudoers/bsm_audit.c:61
+#: plugins/sudoers/bsm_audit.c:109 plugins/sudoers/bsm_audit.c:113
+#: plugins/sudoers/bsm_audit.c:163 plugins/sudoers/bsm_audit.c:167
 msgid "getaudit: failed"
 msgstr "getaudit：失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:87
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:148
+#: plugins/sudoers/bsm_audit.c:87 plugins/sudoers/bsm_audit.c:148
 msgid "Could not determine audit condition"
 msgstr "无法确定审核条件"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:98
+#: plugins/sudoers/bsm_audit.c:98
 msgid "getauid failed"
 msgstr "getauid 失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:100
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:157
+#: plugins/sudoers/bsm_audit.c:100 plugins/sudoers/bsm_audit.c:157
 msgid "au_open: failed"
 msgstr "au_open：失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:115
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:169
+#: plugins/sudoers/bsm_audit.c:115 plugins/sudoers/bsm_audit.c:169
 msgid "au_to_subject: failed"
 msgstr "au_to_subject：失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:119
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:173
+#: plugins/sudoers/bsm_audit.c:119 plugins/sudoers/bsm_audit.c:173
 msgid "au_to_exec_args: failed"
 msgstr "au_to_exec_args：失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:123
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:182
+#: plugins/sudoers/bsm_audit.c:123 plugins/sudoers/bsm_audit.c:182
 msgid "au_to_return32: failed"
 msgstr "au_to_return32：失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:126
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:185
+#: plugins/sudoers/bsm_audit.c:126 plugins/sudoers/bsm_audit.c:185
 msgid "unable to commit audit record"
 msgstr "无法提交审核记录"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:155
+#: plugins/sudoers/bsm_audit.c:155
 msgid "getauid: failed"
 msgstr "getauid：失败"
 
-#: ../../../trunk/plugins/sudoers/bsm_audit.c:178
+#: plugins/sudoers/bsm_audit.c:178
 msgid "au_to_text: failed"
 msgstr "au_to_text：失败"
 
-#: ../../../trunk/plugins/sudoers/check.c:141
+#: plugins/sudoers/check.c:141
 #, c-format
 msgid "sorry, a password is required to run %s"
 msgstr "抱歉，执行 %s 需要密码"
 
-#: ../../../trunk/plugins/sudoers/check.c:225
-#: ../../../trunk/plugins/sudoers/iolog.c:169
-#: ../../../trunk/plugins/sudoers/sudoers.c:939
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:326
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:335
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:674
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:766
-#: ../../../trunk/plugins/sudoers/visudo.c:702
+#: plugins/sudoers/check.c:225 plugins/sudoers/iolog.c:169
+#: plugins/sudoers/sudoers.c:939 plugins/sudoers/sudoreplay.c:325
+#: plugins/sudoers/sudoreplay.c:334 plugins/sudoers/sudoreplay.c:675
+#: plugins/sudoers/sudoreplay.c:767 plugins/sudoers/visudo.c:700
 #, c-format
 msgid "unable to open %s"
 msgstr "无法打开 %s"
 
-#: ../../../trunk/plugins/sudoers/check.c:229
-#: ../../../trunk/plugins/sudoers/iolog.c:199
+#: plugins/sudoers/check.c:229 plugins/sudoers/iolog.c:199
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: ../../../trunk/plugins/sudoers/check.c:237
-#: ../../../trunk/plugins/sudoers/check.c:475
-#: ../../../trunk/plugins/sudoers/check.c:525
-#: ../../../trunk/plugins/sudoers/iolog.c:122
-#: ../../../trunk/plugins/sudoers/iolog.c:153
+#: plugins/sudoers/check.c:237 plugins/sudoers/check.c:475
+#: plugins/sudoers/check.c:525 plugins/sudoers/iolog.c:122
+#: plugins/sudoers/iolog.c:153
 #, c-format
 msgid "unable to mkdir %s"
 msgstr "无法创建目录 %s"
 
-#: ../../../trunk/plugins/sudoers/check.c:370
+#: plugins/sudoers/check.c:370
 #, c-format
 msgid "internal error, expand_prompt() overflow"
 msgstr "内部错误，expand_prompt() 溢出"
 
-#: ../../../trunk/plugins/sudoers/check.c:426
+#: plugins/sudoers/check.c:426
 #, c-format
 msgid "timestamp path too long: %s"
 msgstr "时间戳路径过长：%s"
 
-#: ../../../trunk/plugins/sudoers/check.c:454
-#: ../../../trunk/plugins/sudoers/check.c:498
-#: ../../../trunk/plugins/sudoers/iolog.c:155
+#: plugins/sudoers/check.c:454 plugins/sudoers/check.c:498
+#: plugins/sudoers/iolog.c:155
 #, c-format
 msgid "%s exists but is not a directory (0%o)"
 msgstr "%s 存在，但不是目录(0%o)"
 
-#: ../../../trunk/plugins/sudoers/check.c:457
-#: ../../../trunk/plugins/sudoers/check.c:501
-#: ../../../trunk/plugins/sudoers/check.c:546
+#: plugins/sudoers/check.c:457 plugins/sudoers/check.c:501
+#: plugins/sudoers/check.c:546
 #, c-format
 msgid "%s owned by uid %u, should be uid %u"
 msgstr "%s 属于用户 ID %u，应为用户 ID %u"
 
-#: ../../../trunk/plugins/sudoers/check.c:462
-#: ../../../trunk/plugins/sudoers/check.c:506
+#: plugins/sudoers/check.c:462 plugins/sudoers/check.c:506
 #, c-format
 msgid "%s writable by non-owner (0%o), should be mode 0700"
 msgstr "%s 对非所有者可写(0%o)，模式应该为 0700"
 
-#: ../../../trunk/plugins/sudoers/check.c:470
-#: ../../../trunk/plugins/sudoers/check.c:514
-#: ../../../trunk/plugins/sudoers/check.c:582
-#: ../../../trunk/plugins/sudoers/sudoers.c:925
-#: ../../../trunk/plugins/sudoers/visudo.c:286
-#: ../../../trunk/plugins/sudoers/visudo.c:502
+#: plugins/sudoers/check.c:470 plugins/sudoers/check.c:514
+#: plugins/sudoers/check.c:582 plugins/sudoers/sudoers.c:925
+#: plugins/sudoers/visudo.c:284 plugins/sudoers/visudo.c:500
 #, c-format
 msgid "unable to stat %s"
 msgstr "无法 stat %s"
 
-#: ../../../trunk/plugins/sudoers/check.c:540
+#: plugins/sudoers/check.c:540
 #, c-format
 msgid "%s exists but is not a regular file (0%o)"
 msgstr "%s 存在，但不是常规文件(0%o)"
 
-#: ../../../trunk/plugins/sudoers/check.c:552
+#: plugins/sudoers/check.c:552
 #, c-format
 msgid "%s writable by non-owner (0%o), should be mode 0600"
 msgstr "%s 对非所有者可写(0%o)，模式应该为 0600"
 
-#: ../../../trunk/plugins/sudoers/check.c:606
+#: plugins/sudoers/check.c:606
 #, c-format
 msgid "timestamp too far in the future: %20.20s"
 msgstr "时间戳太超前：%20.20s"
 
-#: ../../../trunk/plugins/sudoers/check.c:652
+#: plugins/sudoers/check.c:652
 #, c-format
 msgid "unable to remove %s (%s), will reset to the epoch"
 msgstr "无法移除 %s (%s)，将重设为戳记"
 
-#: ../../../trunk/plugins/sudoers/check.c:659
+#: plugins/sudoers/check.c:659
 #, c-format
 msgid "unable to reset %s to the epoch"
 msgstr "无法将 %s 重设为戳记"
 
-#: ../../../trunk/plugins/sudoers/check.c:713
-#: ../../../trunk/plugins/sudoers/check.c:719
+#: plugins/sudoers/check.c:713 plugins/sudoers/check.c:719
 #, c-format
 msgid "unknown uid: %u"
 msgstr "未知的用户 ID：%u"
 
-#: ../../../trunk/plugins/sudoers/check.c:716
-#: ../../../trunk/plugins/sudoers/sudoers.c:736
-#: ../../../trunk/plugins/sudoers/sudoers.c:802
-#: ../../../trunk/plugins/sudoers/sudoers.c:803
-#: ../../../trunk/plugins/sudoers/sudoers.c:1056
-#: ../../../trunk/plugins/sudoers/sudoers.c:1057
-#: ../../../trunk/plugins/sudoers/testsudoers.c:200
-#: ../../../trunk/plugins/sudoers/testsudoers.c:330
+#: plugins/sudoers/check.c:716 plugins/sudoers/sudoers.c:736
+#: plugins/sudoers/sudoers.c:802 plugins/sudoers/sudoers.c:803
+#: plugins/sudoers/sudoers.c:1056 plugins/sudoers/sudoers.c:1057
+#: plugins/sudoers/testsudoers.c:200 plugins/sudoers/testsudoers.c:330
 #, c-format
 msgid "unknown user: %s"
 msgstr "未知用户：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:27
+#: plugins/sudoers/def_data.c:27
 #, c-format
 msgid "Syslog facility if syslog is being used for logging: %s"
 msgstr "若使用了 syslog，用于记录日志的 syslog 设施：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:31
+#: plugins/sudoers/def_data.c:31
 #, c-format
 msgid "Syslog priority to use when user authenticates successfully: %s"
 msgstr "用户认证成功时使用的 syslog 优先级：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:35
+#: plugins/sudoers/def_data.c:35
 #, c-format
 msgid "Syslog priority to use when user authenticates unsuccessfully: %s"
 msgstr "用户认证不成功时使用的 syslog 优先级：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:39
+#: plugins/sudoers/def_data.c:39
 msgid "Put OTP prompt on its own line"
 msgstr "将 OPT 提示放在独自的行中"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:43
+#: plugins/sudoers/def_data.c:43
 msgid "Ignore '.' in $PATH"
 msgstr "忽略 $PATH 中的“.”"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:47
+#: plugins/sudoers/def_data.c:47
 msgid "Always send mail when sudo is run"
 msgstr "在运行 sudo 时总是发送邮件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:51
+#: plugins/sudoers/def_data.c:51
 msgid "Send mail if user authentication fails"
 msgstr "在用户认证失败时发送邮件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:55
+#: plugins/sudoers/def_data.c:55
 msgid "Send mail if the user is not in sudoers"
 msgstr "在用户不在 sudoers 列表中时发送邮件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:59
+#: plugins/sudoers/def_data.c:59
 msgid "Send mail if the user is not in sudoers for this host"
 msgstr "在用户不在此主机的 sudoers 列表中时发送邮件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:63
+#: plugins/sudoers/def_data.c:63
 msgid "Send mail if the user is not allowed to run a command"
 msgstr "在用户不允许执行某个命令时发送邮件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:67
+#: plugins/sudoers/def_data.c:67
 msgid "Use a separate timestamp for each user/tty combo"
 msgstr "对每个用户/终端组合使用独立的时间戳"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:71
+#: plugins/sudoers/def_data.c:71
 msgid "Lecture user the first time they run sudo"
 msgstr "在用户第一次运行 sudo 时向他致辞"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:75
+#: plugins/sudoers/def_data.c:75
 #, c-format
 msgid "File containing the sudo lecture: %s"
 msgstr "包含 sudo 致辞的文件：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:79
+#: plugins/sudoers/def_data.c:79
 msgid "Require users to authenticate by default"
 msgstr "默认要求用户认证"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:83
+#: plugins/sudoers/def_data.c:83
 msgid "Root may run sudo"
 msgstr "root 可以运行 sudo"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:87
+#: plugins/sudoers/def_data.c:87
 msgid "Log the hostname in the (non-syslog) log file"
 msgstr "将主机名记录在(非 syslog)的日志文件中"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:91
+#: plugins/sudoers/def_data.c:91
 msgid "Log the year in the (non-syslog) log file"
 msgstr "将年份记录在(非 syslog)的日志文件中"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:95
+#: plugins/sudoers/def_data.c:95
 msgid "If sudo is invoked with no arguments, start a shell"
 msgstr "如果不带参数调用 sudo，启动一个 shell"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:99
+#: plugins/sudoers/def_data.c:99
 msgid "Set $HOME to the target user when starting a shell with -s"
 msgstr "若使用 -s 选项启动 shell，将 $HOME 设为目标用户的主目录"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:103
+#: plugins/sudoers/def_data.c:103
 msgid "Always set $HOME to the target user's home directory"
 msgstr "总是将 $HOME 设为目标用户的主目录"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:107
+#: plugins/sudoers/def_data.c:107
 msgid "Allow some information gathering to give useful error messages"
 msgstr "允许收集一些信息，以提供有用的错误消息"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:111
+#: plugins/sudoers/def_data.c:111
 msgid "Require fully-qualified hostnames in the sudoers file"
 msgstr "要求 sudoers 文件中包含完全限定的主机名"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:115
+#: plugins/sudoers/def_data.c:115
 #, fuzzy
 msgid "Insult the user when they enter an incorrect password"
 msgstr "在用户输入错误密码时对其警告"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:119
+#: plugins/sudoers/def_data.c:119
 msgid "Only allow the user to run sudo if they have a tty"
 msgstr "只允许拥有终端的用户执行 sudo"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:123
+#: plugins/sudoers/def_data.c:123
 msgid "Visudo will honor the EDITOR environment variable"
 msgstr "Visudo 将优先考虑 EDITOR 环境变量"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:127
+#: plugins/sudoers/def_data.c:127
 msgid "Prompt for root's password, not the users's"
 msgstr "询问 root 用户的密码而非用户的密码"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:131
+#: plugins/sudoers/def_data.c:131
 msgid "Prompt for the runas_default user's password, not the users's"
 msgstr "询问 runas_default 用户的密码，而非用户密码"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:135
+#: plugins/sudoers/def_data.c:135
 msgid "Prompt for the target user's password, not the users's"
 msgstr "询问目标用户的密码，而非用户密码"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:139
+#: plugins/sudoers/def_data.c:139
 msgid "Apply defaults in the target user's login class if there is one"
 msgstr "应用目标用户登录类别中的默认设置，如果没有设置的话"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:143
+#: plugins/sudoers/def_data.c:143
 msgid "Set the LOGNAME and USER environment variables"
 msgstr "设置 LOGNAME 和 USER 环境变量"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:147
+#: plugins/sudoers/def_data.c:147
 msgid "Only set the effective uid to the target user, not the real uid"
 msgstr "只将有效用户 ID 设为目标用户的，而不是实际用户 ID"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:151
+#: plugins/sudoers/def_data.c:151
 msgid "Don't initialize the group vector to that of the target user"
 msgstr "不将组向量初始化为目标用户的"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:155
+#: plugins/sudoers/def_data.c:155
 #, c-format
 msgid "Length at which to wrap log file lines (0 for no wrap): %d"
 msgstr "日志文件折行的长度(0 则不折行)：%d"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:159
+#: plugins/sudoers/def_data.c:159
 #, c-format
 msgid "Authentication timestamp timeout: %.1f minutes"
 msgstr "认证时间戳延时：%.1f 分钟"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:163
+#: plugins/sudoers/def_data.c:163
 #, c-format
 msgid "Password prompt timeout: %.1f minutes"
 msgstr "密码提示延时：%.1f 分钟"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:167
+#: plugins/sudoers/def_data.c:167
 #, c-format
 msgid "Number of tries to enter a password: %d"
 msgstr "输入密码的尝试次数：%d"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:171
+#: plugins/sudoers/def_data.c:171
 #, c-format
 msgid "Umask to use or 0777 to use user's: 0%o"
 msgstr "要使用的 umask，或 0777 使用用户的：0%o"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:175
+#: plugins/sudoers/def_data.c:175
 #, c-format
 msgid "Path to log file: %s"
 msgstr "日志文件路径：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:179
+#: plugins/sudoers/def_data.c:179
 #, c-format
 msgid "Path to mail program: %s"
 msgstr "邮件程序路径：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:183
+#: plugins/sudoers/def_data.c:183
 #, c-format
 msgid "Flags for mail program: %s"
 msgstr "邮件程序标志：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:187
+#: plugins/sudoers/def_data.c:187
 #, c-format
 msgid "Address to send mail to: %s"
 msgstr "发送邮件的地址：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:191
+#: plugins/sudoers/def_data.c:191
 #, c-format
 msgid "Address to send mail from: %s"
 msgstr "接收邮件的地址：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:195
+#: plugins/sudoers/def_data.c:195
 #, c-format
 msgid "Subject line for mail messages: %s"
 msgstr "邮件消息的主题行：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:199
+#: plugins/sudoers/def_data.c:199
 #, c-format
 msgid "Incorrect password message: %s"
 msgstr "密码错误消息：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:203
+#: plugins/sudoers/def_data.c:203
 #, c-format
 msgid "Path to authentication timestamp dir: %s"
 msgstr "认证时间戳文件夹的路径：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:207
+#: plugins/sudoers/def_data.c:207
 #, c-format
 msgid "Owner of the authentication timestamp dir: %s"
 msgstr "认证时间戳的所有者：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:211
+#: plugins/sudoers/def_data.c:211
 #, c-format
 msgid "Users in this group are exempt from password and PATH requirements: %s"
 msgstr "此组的用户不要求密码和 PATH：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:215
+#: plugins/sudoers/def_data.c:215
 #, c-format
 msgid "Default password prompt: %s"
 msgstr "默认密码提示：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:219
+#: plugins/sudoers/def_data.c:219
 msgid "If set, passprompt will override system prompt in all cases."
 msgstr "如果设置，密码提示将覆盖各种情况下的系统提示。"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:223
+#: plugins/sudoers/def_data.c:223
 #, c-format
 msgid "Default user to run commands as: %s"
 msgstr "运行命令的默认用户：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:227
+#: plugins/sudoers/def_data.c:227
 #, c-format
 msgid "Value to override user's $PATH with: %s"
 msgstr "覆盖用户的 $PATH 变量的值：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:231
+#: plugins/sudoers/def_data.c:231
 #, c-format
 msgid "Path to the editor for use by visudo: %s"
 msgstr "visudo 所使用的编辑器的路径：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:235
+#: plugins/sudoers/def_data.c:235
 #, c-format
 msgid "When to require a password for 'list' pseudocommand: %s"
 msgstr "何时为“list”伪命令请求密码：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:239
+#: plugins/sudoers/def_data.c:239
 #, c-format
 msgid "When to require a password for 'verify' pseudocommand: %s"
 msgstr "何时为“verify”伪命令请求密码：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:243
+#: plugins/sudoers/def_data.c:243
 #, fuzzy
 msgid "Preload the dummy exec functions contained in 'noexec_file'"
 msgstr "预加载“noexec_file”中包含的哑 exec 函数"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:247
+#: plugins/sudoers/def_data.c:247
 #, fuzzy, c-format
 msgid "File containing dummy exec functions: %s"
 msgstr "含有哑 exec 函数的文件：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:251
+#: plugins/sudoers/def_data.c:251
 msgid "If LDAP directory is up, do we ignore local sudoers file"
 msgstr "如果 LDAP 目录有效，是不是忽略本地的 sudoers 文件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:255
+#: plugins/sudoers/def_data.c:255
 #, c-format
 msgid "File descriptors >= %d will be closed before executing a command"
 msgstr ">= %d 的文件描述符将会在执行命令前关闭"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:259
+#: plugins/sudoers/def_data.c:259
 msgid "If set, users may override the value of `closefrom' with the -C option"
 msgstr "如果设置，用户可以通过 -C 选项覆盖“closefrom”的值"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:263
+#: plugins/sudoers/def_data.c:263
 msgid "Allow users to set arbitrary environment variables"
 msgstr "允许用户设置任意的环境变量"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:267
+#: plugins/sudoers/def_data.c:267
 msgid "Reset the environment to a default set of variables"
 msgstr "将环境重设为默认的变量集"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:271
+#: plugins/sudoers/def_data.c:271
 msgid "Environment variables to check for sanity:"
 msgstr "要检查完整性的环境变量："
 
-#: ../../../trunk/plugins/sudoers/def_data.c:275
+#: plugins/sudoers/def_data.c:275
 msgid "Environment variables to remove:"
 msgstr "要移除的环境变量："
 
-#: ../../../trunk/plugins/sudoers/def_data.c:279
+#: plugins/sudoers/def_data.c:279
 msgid "Environment variables to preserve:"
 msgstr "要保留的环境变量："
 
-#: ../../../trunk/plugins/sudoers/def_data.c:283
+#: plugins/sudoers/def_data.c:283
 #, c-format
 msgid "SELinux role to use in the new security context: %s"
 msgstr "在新的安全环境中使用的 SELinux 角色：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:287
+#: plugins/sudoers/def_data.c:287
 #, c-format
 msgid "SELinux type to use in the new security context: %s"
 msgstr "在新的安全环境中使用的 SELinux 类型：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:291
+#: plugins/sudoers/def_data.c:291
 #, c-format
 msgid "Path to the sudo-specific environment file: %s"
 msgstr "sudo 特定环境文件的路径：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:295
+#: plugins/sudoers/def_data.c:295
 #, c-format
 msgid "Locale to use while parsing sudoers: %s"
 msgstr "解析 sudoers 时使用的区域设置：%s"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:299
+#: plugins/sudoers/def_data.c:299
 msgid "Allow sudo to prompt for a password even if it would be visisble"
 msgstr "允许 sudo 询问密码，即使它不可见"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:303
+#: plugins/sudoers/def_data.c:303
 msgid "Provide visual feedback at the password prompt when there is user input"
 msgstr "用户在询问密码窗口输入时提供视觉反馈"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:307
+#: plugins/sudoers/def_data.c:307
 msgid "Use faster globbing that is less accurate but does not access the filesystem"
 msgstr "使用不太精确但不访问文件系统的较快通配方法"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:311
+#: plugins/sudoers/def_data.c:311
 msgid "The umask specified in sudoers will override the user's, even if it is more permissive"
 msgstr "sudoers 中指定的 umask 会覆盖用户的，即使它允许的权限更多"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:315
+#: plugins/sudoers/def_data.c:315
 msgid "Log user's input for the command being run"
 msgstr "记录用户在所执行命令中的输入"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:319
+#: plugins/sudoers/def_data.c:319
 msgid "Log the output of the command being run"
 msgstr "记录所执行命令的输出"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:323
+#: plugins/sudoers/def_data.c:323
 msgid "Compress I/O logs using zlib"
 msgstr "使用 zlib 压缩 I/O 日志"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:327
+#: plugins/sudoers/def_data.c:327
 msgid "Always run commands in a pseudo-tty"
 msgstr "总是在伪终端中运行命令"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:331
+#: plugins/sudoers/def_data.c:331
 msgid "Plugin for non-Unix group support"
 msgstr "用于非 Unix 组支持的插件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:335
+#: plugins/sudoers/def_data.c:335
 msgid "Directory in which to store input/output logs"
 msgstr "用于保存输入/输出日志的目录"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:339
+#: plugins/sudoers/def_data.c:339
 msgid "File in which to store the input/output log"
 msgstr "用于保存输入/输出日志的文件"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:343
+#: plugins/sudoers/def_data.c:343
 msgid "Add an entry to the utmp/utmpx file when allocating a pty"
 msgstr "在分配伪终端时向 utmp/utmpx 文件中添加一条记录"
 
-#: ../../../trunk/plugins/sudoers/def_data.c:347
+#: plugins/sudoers/def_data.c:347
 msgid "Set the user in utmp to the runas user, not the invoking user"
 msgstr "将 utmp 中的用户设为 runas 用户，而不是调用用户"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:197
+#: plugins/sudoers/defaults.c:197
 msgid ""
 "Available options in a sudoers ``Defaults'' line:\n"
 "\n"
@@ -552,78 +525,67 @@ msgstr ""
 "sudoers 中“Defaults”行中的可用选项：\n"
 "\n"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:204
-#: ../../../trunk/plugins/sudoers/defaults.c:215
+#: plugins/sudoers/defaults.c:204 plugins/sudoers/defaults.c:215
 #, c-format
 msgid "%s: %s\n"
 msgstr "%s：%s\n"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:211
+#: plugins/sudoers/defaults.c:211
 #, c-format
 msgid "%s: %.*s\n"
 msgstr "%s：%.*s\n"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:241
+#: plugins/sudoers/defaults.c:241
 #, c-format
 msgid "unknown defaults entry `%s'"
 msgstr "未知的默认条目“%s”"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:249
-#: ../../../trunk/plugins/sudoers/defaults.c:259
-#: ../../../trunk/plugins/sudoers/defaults.c:279
-#: ../../../trunk/plugins/sudoers/defaults.c:292
-#: ../../../trunk/plugins/sudoers/defaults.c:305
-#: ../../../trunk/plugins/sudoers/defaults.c:318
-#: ../../../trunk/plugins/sudoers/defaults.c:331
-#: ../../../trunk/plugins/sudoers/defaults.c:351
-#: ../../../trunk/plugins/sudoers/defaults.c:361
+#: plugins/sudoers/defaults.c:249 plugins/sudoers/defaults.c:259
+#: plugins/sudoers/defaults.c:279 plugins/sudoers/defaults.c:292
+#: plugins/sudoers/defaults.c:305 plugins/sudoers/defaults.c:318
+#: plugins/sudoers/defaults.c:331 plugins/sudoers/defaults.c:351
+#: plugins/sudoers/defaults.c:361
 #, c-format
 msgid "value `%s' is invalid for option `%s'"
 msgstr "值“%s”对选项“%s”无效"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:252
-#: ../../../trunk/plugins/sudoers/defaults.c:262
-#: ../../../trunk/plugins/sudoers/defaults.c:270
-#: ../../../trunk/plugins/sudoers/defaults.c:287
-#: ../../../trunk/plugins/sudoers/defaults.c:300
-#: ../../../trunk/plugins/sudoers/defaults.c:313
-#: ../../../trunk/plugins/sudoers/defaults.c:326
-#: ../../../trunk/plugins/sudoers/defaults.c:346
-#: ../../../trunk/plugins/sudoers/defaults.c:357
+#: plugins/sudoers/defaults.c:252 plugins/sudoers/defaults.c:262
+#: plugins/sudoers/defaults.c:270 plugins/sudoers/defaults.c:287
+#: plugins/sudoers/defaults.c:300 plugins/sudoers/defaults.c:313
+#: plugins/sudoers/defaults.c:326 plugins/sudoers/defaults.c:346
+#: plugins/sudoers/defaults.c:357
 #, c-format
 msgid "no value specified for `%s'"
 msgstr "没有给“%s”指定值"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:275
+#: plugins/sudoers/defaults.c:275
 #, c-format
 msgid "values for `%s' must start with a '/'"
 msgstr "“%s”的值必须以“/”开头"
 
-#: ../../../trunk/plugins/sudoers/defaults.c:337
+#: plugins/sudoers/defaults.c:337
 #, c-format
 msgid "option `%s' does not take a value"
 msgstr "“%s”选项不带值"
 
-#: ../../../trunk/plugins/sudoers/env.c:259
+#: plugins/sudoers/env.c:259
 #, c-format
 msgid "internal error, sudo_setenv() overflow"
 msgstr "内部错误，sudo_setenv()溢出"
 
-#: ../../../trunk/plugins/sudoers/env.c:289
+#: plugins/sudoers/env.c:289
 #, c-format
 msgid "sudo_putenv: corrupted envp, length mismatch"
 msgstr "sudo_putenv：envp 损坏，长度不符"
 
-#: ../../../trunk/plugins/sudoers/env.c:694
+#: plugins/sudoers/env.c:694
 #, c-format
 msgid "sorry, you are not allowed to set the following environment variables: %s"
 msgstr "对不起，您无权设置以下环境变量：%s"
 
-#: ../../../trunk/plugins/sudoers/find_path.c:68
-#: ../../../trunk/plugins/sudoers/find_path.c:107
-#: ../../../trunk/plugins/sudoers/find_path.c:122
-#: ../../../trunk/plugins/sudoers/iolog.c:124
-#: ../../../trunk/plugins/sudoers/sudoers.c:868 toke.l:663 toke.l:814
+#: plugins/sudoers/find_path.c:68 plugins/sudoers/find_path.c:107
+#: plugins/sudoers/find_path.c:122 plugins/sudoers/iolog.c:124
+#: plugins/sudoers/sudoers.c:868 toke.l:663 toke.l:814
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"
@@ -633,131 +595,125 @@ msgstr "%s：%s"
 msgid ">>> %s: %s near line %d <<<"
 msgstr ">>> %s：%s 在行 %d 附近<<<"
 
-#: ../../../trunk/plugins/sudoers/group_plugin.c:91
+#: plugins/sudoers/group_plugin.c:91
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s：%s"
 
-#: ../../../trunk/plugins/sudoers/group_plugin.c:103
+#: plugins/sudoers/group_plugin.c:103
 #, c-format
 msgid "%s must be owned by uid %d"
 msgstr "%s 必须属于用户 ID %d"
 
-#: ../../../trunk/plugins/sudoers/group_plugin.c:107
+#: plugins/sudoers/group_plugin.c:107
 #, c-format
 msgid "%s must only be writable by owner"
 msgstr "%s 必须只对所有者可写"
 
-#: ../../../trunk/plugins/sudoers/group_plugin.c:114
+#: plugins/sudoers/group_plugin.c:114
 #, c-format
 msgid "unable to dlopen %s: %s"
 msgstr "无法执行 dlopen %s：%s"
 
-#: ../../../trunk/plugins/sudoers/group_plugin.c:119
+#: plugins/sudoers/group_plugin.c:119
 #, c-format
 msgid "unable to find symbol \"group_plugin\" in %s"
 msgstr "无法在 %s 中找到符号“group_plugin”"
 
-#: ../../../trunk/plugins/sudoers/group_plugin.c:124
+#: plugins/sudoers/group_plugin.c:124
 #, c-format
 msgid "%s: incompatible group plugin major version %d, expected %d"
 msgstr "%s：不兼容的组插件主版本号 %d，应为 %d"
 
-#: ../../../trunk/plugins/sudoers/interfaces.c:109
+#: plugins/sudoers/interfaces.c:109
 msgid "Local IP address and netmask pairs:\n"
 msgstr "本地 IP 地址和网络掩码对：\n"
 
-#: ../../../trunk/plugins/sudoers/iolog.c:176
-#: ../../../trunk/plugins/sudoers/sudoers.c:946
+#: plugins/sudoers/iolog.c:176 plugins/sudoers/sudoers.c:946
 #, c-format
 msgid "unable to read %s"
 msgstr "无法读取 %s"
 
-#: ../../../trunk/plugins/sudoers/iolog.c:179
+#: plugins/sudoers/iolog.c:179
 #, c-format
 msgid "invalid sequence number %s"
 msgstr "无效的序列号：%s"
 
-#: ../../../trunk/plugins/sudoers/iolog.c:225
-#: ../../../trunk/plugins/sudoers/iolog.c:228
-#: ../../../trunk/plugins/sudoers/iolog.c:478
-#: ../../../trunk/plugins/sudoers/iolog.c:483
-#: ../../../trunk/plugins/sudoers/iolog.c:489
-#: ../../../trunk/plugins/sudoers/iolog.c:497
-#: ../../../trunk/plugins/sudoers/iolog.c:505
-#: ../../../trunk/plugins/sudoers/iolog.c:513
-#: ../../../trunk/plugins/sudoers/iolog.c:521
+#: plugins/sudoers/iolog.c:225 plugins/sudoers/iolog.c:228
+#: plugins/sudoers/iolog.c:478 plugins/sudoers/iolog.c:483
+#: plugins/sudoers/iolog.c:489 plugins/sudoers/iolog.c:497
+#: plugins/sudoers/iolog.c:505 plugins/sudoers/iolog.c:513
+#: plugins/sudoers/iolog.c:521
 #, c-format
 msgid "unable to create %s"
 msgstr "无法创建 %s"
 
-#: ../../../trunk/plugins/sudoers/iolog_path.c:245
-#: ../../../trunk/plugins/sudoers/sudoers.c:357
+#: plugins/sudoers/iolog_path.c:245 plugins/sudoers/sudoers.c:361
 #, c-format
 msgid "unable to set locale to \"%s\", using \"C\""
 msgstr "无法将区域设置为“%s”，将使用“C”"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:363
+#: plugins/sudoers/ldap.c:363
 #, c-format
 msgid "sudo_ldap_conf_add_ports: port too large"
 msgstr "sudo_ldap_conf_add_ports：端口太大"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:386
+#: plugins/sudoers/ldap.c:386
 #, c-format
 msgid "sudo_ldap_conf_add_ports: out of space expanding hostbuf"
 msgstr "sudo_ldap_conf_add_ports：扩展主机缓存时空间不足"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:415
+#: plugins/sudoers/ldap.c:415
 #, c-format
 msgid "unsupported LDAP uri type: %s"
 msgstr "不支持的 LDAP URI 类型：%s"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:444
+#: plugins/sudoers/ldap.c:444
 #, c-format
 msgid "invalid uri: %s"
 msgstr "无效的 URI：%s"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:450
+#: plugins/sudoers/ldap.c:450
 #, c-format
 msgid "unable to mix ldap and ldaps URIs"
 msgstr "无法混合 ldap 和 ldaps URI"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:454
+#: plugins/sudoers/ldap.c:454
 #, c-format
 msgid "unable to mix ldaps and starttls"
 msgstr "无法混合 ldaps 和 starttls"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:473
+#: plugins/sudoers/ldap.c:473
 #, c-format
 msgid "sudo_ldap_parse_uri: out of space building hostbuf"
 msgstr "sudo_ldap_parse_uri：构建主机缓存时空间不足"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:536
+#: plugins/sudoers/ldap.c:536
 #, c-format
 msgid "unable to initialize SSL cert and key db: %s"
 msgstr "无法初始化 SSL 证书和密钥数据库：%s"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:932
+#: plugins/sudoers/ldap.c:932
 #, c-format
 msgid "unable to get GMT time"
 msgstr "无法获取 GMT 时间"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:938
+#: plugins/sudoers/ldap.c:938
 #, c-format
 msgid "unable to format timestamp"
 msgstr "无法格式化时间戳"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:946
+#: plugins/sudoers/ldap.c:946
 #, c-format
 msgid "unable to build time filter"
 msgstr "无法构建时间过滤器"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1044
+#: plugins/sudoers/ldap.c:1044
 #, c-format
 msgid "sudo_ldap_build_pass1 allocation mismatch"
 msgstr "sudo_ldap_build_pass1 分配不匹配"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1544
+#: plugins/sudoers/ldap.c:1539
 #, c-format
 msgid ""
 "\n"
@@ -766,7 +722,7 @@ msgstr ""
 "\n"
 "LDAP 角色：%s\n"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1546
+#: plugins/sudoers/ldap.c:1541
 #, c-format
 msgid ""
 "\n"
@@ -775,125 +731,124 @@ msgstr ""
 "\n"
 "LDAP 角色：未知\n"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1593
+#: plugins/sudoers/ldap.c:1588
 #, c-format
 msgid "    Order: %s\n"
 msgstr "    顺序：%s\n"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1601
+#: plugins/sudoers/ldap.c:1596
 #, c-format
 msgid "    Commands:\n"
 msgstr "    命令：\n"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:1988
+#: plugins/sudoers/ldap.c:1983
 #, c-format
 msgid "unable to initialize LDAP: %s"
 msgstr "无法初始化 LDAP：%s"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:2019
+#: plugins/sudoers/ldap.c:2014
 #, c-format
 msgid "start_tls specified but LDAP libs do not support ldap_start_tls_s() or ldap_start_tls_s_np()"
 msgstr "指定了 start_tls，但 LDAP 库不支持 ldap_start_tls_s() 或 ldap_start_tls_s_np()"
 
-#: ../../../trunk/plugins/sudoers/ldap.c:2250
+#: plugins/sudoers/ldap.c:2245
 #, c-format
 msgid "invalid sudoOrder attribute: %s"
 msgstr "无效的 sudoOrder 属性：%s"
 
-#: ../../../trunk/plugins/sudoers/linux_audit.c:54
+#: plugins/sudoers/linux_audit.c:55
 #, c-format
 msgid "unable to open audit system"
 msgstr "无法打开审核系统"
 
-#: ../../../trunk/plugins/sudoers/linux_audit.c:78
+#: plugins/sudoers/linux_audit.c:79
 #, c-format
 msgid "internal error, linux_audit_command() overflow"
 msgstr "内部错误，linux_audit_command() 溢出"
 
-#: ../../../trunk/plugins/sudoers/linux_audit.c:87
+#: plugins/sudoers/linux_audit.c:88
 #, c-format
 msgid "unable to send audit message"
 msgstr "无法发送审核消息"
 
-#: ../../../trunk/plugins/sudoers/logging.c:193
+#: plugins/sudoers/logging.c:193
 #, c-format
 msgid "unable to open log file: %s: %s"
 msgstr "无法打开日志文件：%s：%s"
 
-#: ../../../trunk/plugins/sudoers/logging.c:196
+#: plugins/sudoers/logging.c:196
 #, c-format
 msgid "unable to lock log file: %s: %s"
 msgstr "无法锁定日志文件：%s：%s"
 
-#: ../../../trunk/plugins/sudoers/logging.c:295
+#: plugins/sudoers/logging.c:295
 msgid "user NOT in sudoers"
 msgstr "用户不在 sudoers 中"
 
-#: ../../../trunk/plugins/sudoers/logging.c:297
+#: plugins/sudoers/logging.c:297
 msgid "user NOT authorized on host"
 msgstr "用户未获得此主机上的授权"
 
-#: ../../../trunk/plugins/sudoers/logging.c:299
+#: plugins/sudoers/logging.c:299
 msgid "command not allowed"
 msgstr "命令禁止使用"
 
-#: ../../../trunk/plugins/sudoers/logging.c:309
+#: plugins/sudoers/logging.c:309
 #, c-format
 msgid "%s is not in the sudoers file.  This incident will be reported.\n"
 msgstr "%s 不在 sudoers 文件中。此事将被报告。\n"
 
-#: ../../../trunk/plugins/sudoers/logging.c:312
+#: plugins/sudoers/logging.c:312
 #, c-format
 msgid "%s is not allowed to run sudo on %s.  This incident will be reported.\n"
 msgstr "%s 无权在 %s 上运行 sudo。此事将被报告。\n"
 
-#: ../../../trunk/plugins/sudoers/logging.c:316
+#: plugins/sudoers/logging.c:316
 #, c-format
 msgid "Sorry, user %s may not run sudo on %s.\n"
 msgstr "对不起，用户 %s 不能在 %s 上运行 sudo。\n"
 
-#: ../../../trunk/plugins/sudoers/logging.c:319
+#: plugins/sudoers/logging.c:319
 #, c-format
 msgid "Sorry, user %s is not allowed to execute '%s%s%s' as %s%s%s on %s.\n"
 msgstr "对不起，用户 %1$s 无权以 %5$s%6$s%7$s 的身份在 %8$s 上执行 %2$s%3$s%4$s。\n"
 
-#: ../../../trunk/plugins/sudoers/logging.c:454
+#: plugins/sudoers/logging.c:454
 #, c-format
 msgid "unable to fork"
 msgstr "无法执行 fork"
 
-#: ../../../trunk/plugins/sudoers/logging.c:461
-#: ../../../trunk/plugins/sudoers/logging.c:518
+#: plugins/sudoers/logging.c:461 plugins/sudoers/logging.c:518
 #, c-format
 msgid "unable to fork: %m"
 msgstr "无法执行 fork：%m"
 
-#: ../../../trunk/plugins/sudoers/logging.c:511
+#: plugins/sudoers/logging.c:511
 #, c-format
 msgid "unable to open pipe: %m"
 msgstr "无法打开管道：%m"
 
-#: ../../../trunk/plugins/sudoers/logging.c:530
+#: plugins/sudoers/logging.c:530
 #, c-format
 msgid "unable to dup stdin: %m"
 msgstr "无法 dup stdin：%m"
 
-#: ../../../trunk/plugins/sudoers/logging.c:564
+#: plugins/sudoers/logging.c:564
 #, c-format
 msgid "unable to execute %s: %m"
 msgstr "无法执行 %s：%m"
 
-#: ../../../trunk/plugins/sudoers/logging.c:774
+#: plugins/sudoers/logging.c:774
 #, c-format
 msgid "internal error: insufficient space for log line"
 msgstr "内部错误：没有足够的空间存放日志行"
 
-#: ../../../trunk/plugins/sudoers/parse.c:115
+#: plugins/sudoers/parse.c:115
 #, c-format
 msgid "parse error in %s near line %d"
 msgstr "%s 中第 %d 行附近有解析错误"
 
-#: ../../../trunk/plugins/sudoers/parse.c:369
+#: plugins/sudoers/parse.c:369
 #, c-format
 msgid ""
 "\n"
@@ -902,17 +857,17 @@ msgstr ""
 "\n"
 "Sudoers 条目：\n"
 
-#: ../../../trunk/plugins/sudoers/parse.c:371
+#: plugins/sudoers/parse.c:371
 #, c-format
 msgid "    RunAsUsers: "
 msgstr "    RunAs 用户："
 
-#: ../../../trunk/plugins/sudoers/parse.c:386
+#: plugins/sudoers/parse.c:386
 #, c-format
 msgid "    RunAsGroups: "
 msgstr "    RunAs 组："
 
-#: ../../../trunk/plugins/sudoers/parse.c:395
+#: plugins/sudoers/parse.c:395
 #, c-format
 msgid ""
 "    Commands:\n"
@@ -921,149 +876,138 @@ msgstr ""
 "    命令：\n"
 "\t"
 
-#: ../../../trunk/plugins/sudoers/plugin_error.c:100
-#: ../../../trunk/plugins/sudoers/plugin_error.c:105
+#: plugins/sudoers/plugin_error.c:100 plugins/sudoers/plugin_error.c:105
 msgid ": "
 msgstr "："
 
-#: ../../../trunk/plugins/sudoers/pwutil.c:244
+#: plugins/sudoers/pwutil.c:244
 #, c-format
 msgid "unable to cache uid %u (%s), already exists"
 msgstr "无法缓存用户 ID %u(%s)，已存在"
 
-#: ../../../trunk/plugins/sudoers/pwutil.c:252
+#: plugins/sudoers/pwutil.c:252
 #, c-format
 msgid "unable to cache uid %u, already exists"
 msgstr "无法缓存用户 ID %u，已存在"
 
-#: ../../../trunk/plugins/sudoers/pwutil.c:288
-#: ../../../trunk/plugins/sudoers/pwutil.c:297
+#: plugins/sudoers/pwutil.c:288 plugins/sudoers/pwutil.c:297
 #, c-format
 msgid "unable to cache user %s, already exists"
 msgstr "无法缓存用户 %s，已存在"
 
-#: ../../../trunk/plugins/sudoers/pwutil.c:511
+#: plugins/sudoers/pwutil.c:511
 #, c-format
 msgid "unable to cache gid %u (%s), already exists"
 msgstr "无法缓存组 ID %u(%s)，已存在"
 
-#: ../../../trunk/plugins/sudoers/pwutil.c:519
+#: plugins/sudoers/pwutil.c:519
 #, c-format
 msgid "unable to cache gid %u, already exists"
 msgstr "无法缓存组 ID %u，已存在"
 
-#: ../../../trunk/plugins/sudoers/pwutil.c:548
-#: ../../../trunk/plugins/sudoers/pwutil.c:557
+#: plugins/sudoers/pwutil.c:548 plugins/sudoers/pwutil.c:557
 #, c-format
 msgid "unable to cache group %s, already exists"
 msgstr "无法缓存组 %s，已存在"
 
-#: ../../../trunk/plugins/sudoers/set_perms.c:249
-#: ../../../trunk/plugins/sudoers/set_perms.c:476
-#: ../../../trunk/plugins/sudoers/set_perms.c:710
+#: plugins/sudoers/set_perms.c:249 plugins/sudoers/set_perms.c:476
+#: plugins/sudoers/set_perms.c:710
 #, c-format
 msgid "unable to change to sudoers gid"
 msgstr "无法切换为 sudoers 组 ID"
 
-#: ../../../trunk/plugins/sudoers/set_perms.c:290
-#: ../../../trunk/plugins/sudoers/set_perms.c:514
-#: ../../../trunk/plugins/sudoers/set_perms.c:748
-#: ../../../trunk/plugins/sudoers/set_perms.c:882
+#: plugins/sudoers/set_perms.c:290 plugins/sudoers/set_perms.c:514
+#: plugins/sudoers/set_perms.c:748 plugins/sudoers/set_perms.c:882
 msgid "too many processes"
 msgstr "进程过多"
 
-#: ../../../trunk/plugins/sudoers/set_perms.c:943
-#: ../../../trunk/plugins/sudoers/set_perms.c:959
+#: plugins/sudoers/set_perms.c:943 plugins/sudoers/set_perms.c:959
 msgid "unable to set runas group vector"
 msgstr "无法设置 runas 组向量"
 
-#: ../../../trunk/plugins/sudoers/set_perms.c:952
+#: plugins/sudoers/set_perms.c:952
 msgid "unable to get runas group vector"
 msgstr "无法获取 runas 组向量"
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:217
+#: plugins/sudoers/sudo_nss.c:217
 msgid "unable to reset group vector"
 msgstr "无法重设组向量"
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:223
+#: plugins/sudoers/sudo_nss.c:223
 msgid "unable to get group vector"
 msgstr "无法获取组向量"
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:266
+#: plugins/sudoers/sudo_nss.c:266
 #, c-format
 msgid "Matching Defaults entries for %s on this host:\n"
 msgstr "匹配此主机上 %s 的默认条目：\n"
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:279
+#: plugins/sudoers/sudo_nss.c:279
 #, c-format
 msgid "Runas and Command-specific defaults for %s:\n"
 msgstr "%s Runas 和命令特定的默认值：\n"
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:292
+#: plugins/sudoers/sudo_nss.c:292
 #, c-format
 msgid "User %s may run the following commands on this host:\n"
 msgstr "用户 %s 可以在该主机上运行以下命令：\n"
 
-#: ../../../trunk/plugins/sudoers/sudo_nss.c:302
+#: plugins/sudoers/sudo_nss.c:302
 #, c-format
 msgid "User %s is not allowed to run sudo on %s.\n"
 msgstr "用户 %s 无权在 %s 上运行 sudo。\n"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:206
-#: ../../../trunk/plugins/sudoers/sudoers.c:241
-#: ../../../trunk/plugins/sudoers/sudoers.c:876
+#: plugins/sudoers/sudoers.c:206 plugins/sudoers/sudoers.c:241
+#: plugins/sudoers/sudoers.c:876
 msgid "problem with defaults entries"
 msgstr "默认条目有问题"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:210
+#: plugins/sudoers/sudoers.c:210
 #, c-format
 msgid "no valid sudoers sources found, quitting"
 msgstr "没有找到有效的 sudoers 资源，退出"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:264
+#: plugins/sudoers/sudoers.c:264
 #, c-format
 msgid "unable to execute %s: %s"
 msgstr "无法执行 %s：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:311
+#: plugins/sudoers/sudoers.c:311
 #, c-format
 msgid "sudoers specifies that root is not allowed to sudo"
 msgstr "sudoers 指定 root 不允许执行 sudo"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:318
+#: plugins/sudoers/sudoers.c:318
 #, c-format
 msgid "you are not permitted to use the -C option"
 msgstr "您无权使用 -C 选项"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:403
+#: plugins/sudoers/sudoers.c:407
 #, c-format
 msgid "timestamp owner (%s): No such user"
 msgstr "时间戳所有者(%s)：无此用户"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:423
+#: plugins/sudoers/sudoers.c:423
 msgid "no tty"
 msgstr "无终端"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:424
+#: plugins/sudoers/sudoers.c:424
 #, c-format
 msgid "sorry, you must have a tty to run sudo"
 msgstr "抱歉，您必须拥有一个终端来执行 sudo"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:470
+#: plugins/sudoers/sudoers.c:470
 msgid "No user or host"
 msgstr "无用户或主机"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:484
-#: ../../../trunk/plugins/sudoers/sudoers.c:505
-#: ../../../trunk/plugins/sudoers/sudoers.c:506
-#: ../../../trunk/plugins/sudoers/sudoers.c:1413
-#: ../../../trunk/plugins/sudoers/sudoers.c:1414
+#: plugins/sudoers/sudoers.c:484 plugins/sudoers/sudoers.c:505
+#: plugins/sudoers/sudoers.c:506 plugins/sudoers/sudoers.c:1413
+#: plugins/sudoers/sudoers.c:1414
 #, c-format
 msgid "%s: command not found"
 msgstr "%s：找不到命令"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:486
-#: ../../../trunk/plugins/sudoers/sudoers.c:502
+#: plugins/sudoers/sudoers.c:486 plugins/sudoers/sudoers.c:502
 #, c-format
 msgid ""
 "ignoring `%s' found in '.'\n"
@@ -1072,96 +1016,95 @@ msgstr ""
 "忽略在“.”中找到的“%s”\n"
 "请使用“sudo ./%s”，如果这是您想运行的“%s”。"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:491
+#: plugins/sudoers/sudoers.c:491
 msgid "validation failure"
 msgstr "校验失败"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:501
+#: plugins/sudoers/sudoers.c:501
 msgid "command in current directory"
 msgstr "当前目录中的命令"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:513
+#: plugins/sudoers/sudoers.c:513
 #, c-format
 msgid "sorry, you are not allowed to preserve the environment"
 msgstr "抱歉，您无权保留环境"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:860
+#: plugins/sudoers/sudoers.c:860
 #, c-format
 msgid "internal error, set_cmnd() overflow"
 msgstr "内部错误：set_cmnd() 溢出"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:904
+#: plugins/sudoers/sudoers.c:904
 #, fuzzy, c-format
 msgid "fixed mode on %s"
 msgstr "对 %s 修正了模式"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:908
+#: plugins/sudoers/sudoers.c:908
 #, c-format
 msgid "set group on %s"
 msgstr "对 %s 设置组"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:911
+#: plugins/sudoers/sudoers.c:911
 #, c-format
 msgid "unable to set group on %s"
 msgstr "无法对 %s 设置组"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:914
+#: plugins/sudoers/sudoers.c:914
 #, c-format
 msgid "unable to fix mode on %s"
 msgstr "无法对 %s 修正模式"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:927
+#: plugins/sudoers/sudoers.c:927
 #, c-format
 msgid "%s is not a regular file"
 msgstr "%s 不是常规文件"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:929
+#: plugins/sudoers/sudoers.c:929
 #, c-format
 msgid "%s is mode 0%o, should be 0%o"
 msgstr "%s 的模式为 0%o，应为 0%o"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:933
+#: plugins/sudoers/sudoers.c:933
 #, c-format
 msgid "%s is owned by uid %u, should be %u"
 msgstr "%s 属于用户 ID %u，应为 %u"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:936
+#: plugins/sudoers/sudoers.c:936
 #, c-format
 msgid "%s is owned by gid %u, should be %u"
 msgstr "%s 属于组 ID %u，应为 %u"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:980
+#: plugins/sudoers/sudoers.c:980
 #, c-format
 msgid "only root can use `-c %s'"
 msgstr "只有 root 才能使用“-c %s”"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:990
+#: plugins/sudoers/sudoers.c:990
 #, c-format
 msgid "unknown login class: %s"
 msgstr "未知的登录类别：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1024
+#: plugins/sudoers/sudoers.c:1024
 #, c-format
 msgid "unable to resolve host %s"
 msgstr "无法解析主机：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1076
-#: ../../../trunk/plugins/sudoers/testsudoers.c:342
+#: plugins/sudoers/sudoers.c:1076 plugins/sudoers/testsudoers.c:342
 #, c-format
 msgid "unknown group: %s"
 msgstr "未知组：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1108
+#: plugins/sudoers/sudoers.c:1108
 #, c-format
 msgid "Sudoers policy plugin version %s\n"
 msgstr "Sudoers 策略插件版本 %s\n"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1110
+#: plugins/sudoers/sudoers.c:1110
 #, c-format
 msgid "Sudoers file grammar version %d\n"
 msgstr "Sudoers 文件语法版本 %d\n"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1114
+#: plugins/sudoers/sudoers.c:1114
 #, c-format
 msgid ""
 "\n"
@@ -1170,149 +1113,147 @@ msgstr ""
 "\n"
 "Sudoers 路径：%s\n"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1117
+#: plugins/sudoers/sudoers.c:1117
 #, c-format
 msgid "nsswitch path: %s\n"
 msgstr "nsswitch 路径：%s\n"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1119
+#: plugins/sudoers/sudoers.c:1119
 #, c-format
 msgid "ldap.conf path: %s\n"
 msgstr "ldap.conf 路径：%s\n"
 
-#: ../../../trunk/plugins/sudoers/sudoers.c:1120
+#: plugins/sudoers/sudoers.c:1120
 #, c-format
 msgid "ldap.secret path: %s\n"
 msgstr "ldap.secret 路径：%s\n"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:265
+#: plugins/sudoers/sudoreplay.c:265
 #, c-format
 msgid "invalid filter option: %s"
 msgstr "无效的过滤器选项：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:278
+#: plugins/sudoers/sudoreplay.c:278
 #, c-format
 msgid "invalid max wait: %s"
 msgstr "无效的最大等待：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:284
+#: plugins/sudoers/sudoreplay.c:284
 #, c-format
 msgid "invalid speed factor: %s"
 msgstr "无法的速度系数：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:287
-#: ../../../trunk/plugins/sudoers/visudo.c:176
+#: plugins/sudoers/sudoreplay.c:287 plugins/sudoers/visudo.c:174
 #, c-format
 msgid "%s version %s\n"
 msgstr "%s 版本 %s\n"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:310
+#: plugins/sudoers/sudoreplay.c:310
 #, fuzzy, c-format
 msgid "%s/%.2s/%.2s/%.2s/timing: %s"
 msgstr "%s/%.2s/%.2s/%.2s/时序：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:316
+#: plugins/sudoers/sudoreplay.c:316
 #, fuzzy, c-format
 msgid "%s/%s/timing: %s"
 msgstr "%s/%s/时序：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:342
+#: plugins/sudoers/sudoreplay.c:341
 #, c-format
 msgid "invalid log file %s"
 msgstr "无效的日志文件 %s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:344
+#: plugins/sudoers/sudoreplay.c:343
 #, c-format
 msgid "Replaying sudo session: %s"
 msgstr "回放 sudo 会话：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:370
+#: plugins/sudoers/sudoreplay.c:369
 #, c-format
 msgid "unable to set tty to raw mode"
 msgstr "无法将终端设为原始模式"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:384
+#: plugins/sudoers/sudoreplay.c:383
 #, fuzzy, c-format
 msgid "invalid timing file line: %s"
 msgstr "无效的时序文件行：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:426
+#: plugins/sudoers/sudoreplay.c:425
 #, c-format
 msgid "writing to standard output"
 msgstr "写入标准输出"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:456
+#: plugins/sudoers/sudoreplay.c:455
 #, c-format
 msgid "nanosleep: tv_sec %ld, tv_nsec %ld"
 msgstr "nanosleep：tv_sec %ld，tv_nsec %ld"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:502
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:527
+#: plugins/sudoers/sudoreplay.c:503 plugins/sudoers/sudoreplay.c:528
 #, c-format
 msgid "ambiguous expression \"%s\""
 msgstr "有歧义的表达式“%s”"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:544
+#: plugins/sudoers/sudoreplay.c:545
 #, c-format
 msgid "too many parenthesized expressions, max %d"
 msgstr "括号表达式过多，最多 %d"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:555
+#: plugins/sudoers/sudoreplay.c:556
 #, c-format
 msgid "unmatched ')' in expression"
 msgstr "表达式中的“)”不匹配"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:561
+#: plugins/sudoers/sudoreplay.c:562
 #, c-format
 msgid "unknown search term \"%s\""
 msgstr "未知的搜索词“%s”"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:575
+#: plugins/sudoers/sudoreplay.c:576
 #, c-format
 msgid "%s requires an argument"
 msgstr "%s 需要参数"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:579
+#: plugins/sudoers/sudoreplay.c:580
 #, c-format
 msgid "invalid regular expression: %s"
 msgstr "无效的正则表达式：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:585
+#: plugins/sudoers/sudoreplay.c:586
 #, c-format
 msgid "could not parse date \"%s\""
 msgstr "无法解析日期“%s”"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:598
+#: plugins/sudoers/sudoreplay.c:599
 #, c-format
 msgid "unmatched '(' in expression"
 msgstr "表达式中的“(”不匹配"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:600
+#: plugins/sudoers/sudoreplay.c:601
 #, c-format
 msgid "illegal trailing \"or\""
 msgstr "非法的结尾字符“or”"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:602
+#: plugins/sudoers/sudoreplay.c:603
 #, c-format
 msgid "illegal trailing \"!\""
 msgstr "非法的结尾字符“!”"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:818
+#: plugins/sudoers/sudoreplay.c:819
 #, c-format
 msgid "invalid regex: %s"
 msgstr "无效的正则表达式：%s"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:940
+#: plugins/sudoers/sudoreplay.c:941
 #, c-format
 msgid "usage: %s [-h] [-d directory] [-m max_wait] [-s speed_factor] ID\n"
 msgstr "用法：%s [-h] [-d 目录] [-m 最长等待] [-s 速度系数] ID\n"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:943
+#: plugins/sudoers/sudoreplay.c:944
 #, c-format
 msgid "usage: %s [-h] [-d directory] -l [search expression]\n"
 msgstr "用法：%s [-h] [-d 目录] -l [搜索表达式]\n"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:952
+#: plugins/sudoers/sudoreplay.c:953
 #, c-format
 msgid ""
 "%s - replay sudo session logs\n"
@@ -1321,7 +1262,7 @@ msgstr ""
 "%s - 回放 sudo 会话记录\n"
 "\n"
 
-#: ../../../trunk/plugins/sudoers/sudoreplay.c:954
+#: plugins/sudoers/sudoreplay.c:955
 msgid ""
 "\n"
 "Options:\n"
@@ -1343,16 +1284,16 @@ msgstr ""
 "  -s 速度系数      加速或减慢输出\n"
 "  -V               显示版本信息并退出"
 
-#: ../../../trunk/plugins/sudoers/testsudoers.c:228
+#: plugins/sudoers/testsudoers.c:228
 #, c-format
 msgid "internal error, init_vars() overflow"
 msgstr "内部错误，init_vars() 溢出"
 
-#: ../../../trunk/plugins/sudoers/testsudoers.c:304
+#: plugins/sudoers/testsudoers.c:304
 msgid "\thost  unmatched"
 msgstr "\t主机不匹配"
 
-#: ../../../trunk/plugins/sudoers/testsudoers.c:307
+#: plugins/sudoers/testsudoers.c:307
 msgid ""
 "\n"
 "Command allowed"
@@ -1360,7 +1301,7 @@ msgstr ""
 "\n"
 "命令允许"
 
-#: ../../../trunk/plugins/sudoers/testsudoers.c:308
+#: plugins/sudoers/testsudoers.c:308
 msgid ""
 "\n"
 "Command denied"
@@ -1368,7 +1309,7 @@ msgstr ""
 "\n"
 "命令被拒"
 
-#: ../../../trunk/plugins/sudoers/testsudoers.c:308
+#: plugins/sudoers/testsudoers.c:308
 msgid ""
 "\n"
 "Command unmatched"
@@ -1376,10 +1317,8 @@ msgstr ""
 "\n"
 "命令不匹配"
 
-#: toke.l:667 toke.l:793 toke.l:818 toke.l:904
-#: ../../../trunk/plugins/sudoers/toke_util.c:111
-#: ../../../trunk/plugins/sudoers/toke_util.c:163
-#: ../../../trunk/plugins/sudoers/toke_util.c:202
+#: toke.l:667 toke.l:793 toke.l:818 toke.l:904 plugins/sudoers/toke_util.c:111
+#: plugins/sudoers/toke_util.c:163 plugins/sudoers/toke_util.c:202
 msgid "unable to allocate memory"
 msgstr "无法分配内存"
 
@@ -1388,100 +1327,95 @@ msgstr "无法分配内存"
 msgid "too many levels of includes"
 msgstr "include 嵌套层数过多"
 
-#: ../../../trunk/plugins/sudoers/toke_util.c:213
+#: plugins/sudoers/toke_util.c:213
 msgid "fill_args: buffer overflow"
 msgstr "fill_args：缓存溢出"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:177
+#: plugins/sudoers/visudo.c:175
 #, c-format
 msgid "%s grammar version %d\n"
 msgstr "%s 语法版本 %d\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:210
-#: ../../../trunk/plugins/sudoers/auth/rfc1938.c:103
+#: plugins/sudoers/visudo.c:208 plugins/sudoers/auth/rfc1938.c:103
 #, c-format
 msgid "you do not exist in the %s database"
 msgstr "%s 数据库中没有您"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:240
-#: ../../../trunk/plugins/sudoers/visudo.c:472
+#: plugins/sudoers/visudo.c:238 plugins/sudoers/visudo.c:470
 #, c-format
 msgid "press return to edit %s: "
 msgstr "按回车键编辑 %s："
 
-#: ../../../trunk/plugins/sudoers/visudo.c:302
-#: ../../../trunk/plugins/sudoers/visudo.c:308
+#: plugins/sudoers/visudo.c:300 plugins/sudoers/visudo.c:306
 #, c-format
 msgid "write error"
 msgstr "写错误"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:362
+#: plugins/sudoers/visudo.c:360
 #, c-format
 msgid "unable to stat temporary file (%s), %s unchanged"
 msgstr "无法 stat 临时文件(%s)，%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:367
+#: plugins/sudoers/visudo.c:365
 #, c-format
 msgid "zero length temporary file (%s), %s unchanged"
 msgstr "零长度的临时文件(%s)，%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:373
+#: plugins/sudoers/visudo.c:371
 #, c-format
 msgid "editor (%s) failed, %s unchanged"
 msgstr "编辑器(%s)失败，%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:396
+#: plugins/sudoers/visudo.c:394
 #, c-format
 msgid "%s unchanged"
 msgstr "%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:420
+#: plugins/sudoers/visudo.c:418
 #, c-format
 msgid "unable to re-open temporary file (%s), %s unchanged."
 msgstr "无法重新打开临时文件(%s)，%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:430
+#: plugins/sudoers/visudo.c:428
 #, c-format
 msgid "unabled to parse temporary file (%s), unknown error"
 msgstr "无法解析临时文件(%s)，未知错误"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:465
+#: plugins/sudoers/visudo.c:463
 #, c-format
 msgid "internal error, unable to find %s in list!"
 msgstr "内部错误，在列表中找不到 %s！"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:504
-#: ../../../trunk/plugins/sudoers/visudo.c:513
+#: plugins/sudoers/visudo.c:502 plugins/sudoers/visudo.c:511
 #, c-format
 msgid "unable to set (uid, gid) of %s to (%d, %d)"
 msgstr "无法将 %s 的 (uid, gid) 设为 (%d, %d)"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:508
-#: ../../../trunk/plugins/sudoers/visudo.c:518
+#: plugins/sudoers/visudo.c:506 plugins/sudoers/visudo.c:516
 #, c-format
 msgid "unable to change mode of %s to 0%o"
 msgstr "无法将 %s 的模式更改为 0%o"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:535
+#: plugins/sudoers/visudo.c:533
 #, c-format
 msgid "%s and %s not on the same file system, using mv to rename"
 msgstr "%s 和 %s 不在同一个文件系统，使用 mv 进行重命名"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:549
+#: plugins/sudoers/visudo.c:547
 #, c-format
 msgid "command failed: '%s %s %s', %s unchanged"
 msgstr "命令失败：“%s %s %s”，%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:559
+#: plugins/sudoers/visudo.c:557
 #, c-format
 msgid "error renaming %s, %s unchanged"
 msgstr "重命名 %s 出错，%s 未更改"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:619
+#: plugins/sudoers/visudo.c:617
 msgid "What now? "
 msgstr "现在做什么？"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:633
+#: plugins/sudoers/visudo.c:631
 msgid ""
 "Options are:\n"
 "  (e)dit sudoers file again\n"
@@ -1493,82 +1427,92 @@ msgstr ""
 "  退出，不保存对 sudoers 文件的更改(x)\n"
 "  退出并将更改保存到 sudoers 文件(危险！)(Q)\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:670
+#: plugins/sudoers/visudo.c:668
 #, c-format
 msgid "unable to execute %s"
 msgstr "无法执行 %s"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:677
+#: plugins/sudoers/visudo.c:675
 #, c-format
 msgid "unable to run %s"
 msgstr "无法运行 %s"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:708
+#: plugins/sudoers/visudo.c:706
 #, c-format
 msgid "failed to parse %s file, unknown error"
 msgstr "解析 %s 文件失败，未知错误"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:720
+#: plugins/sudoers/visudo.c:718
 #, c-format
 msgid "parse error in %s near line %d\n"
 msgstr "%s 中第 %d 行附近出现解析错误\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:723
+#: plugins/sudoers/visudo.c:721
 #, c-format
 msgid "parse error in %s\n"
 msgstr "%s 中出现解析错误\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:725
+#: plugins/sudoers/visudo.c:723
 #, c-format
 msgid "%s: parsed OK\n"
 msgstr "%s：解析正确\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:739
+#: plugins/sudoers/visudo.c:737
 #, c-format
 msgid "%s: wrong owner (uid, gid) should be (%d, %d)\n"
 msgstr "%s：错误的所有者(uid, gid)，应为(%d, %d)\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:746
+#: plugins/sudoers/visudo.c:744
 #, c-format
 msgid "%s: bad permissions, should be mode 0%o\n"
 msgstr "%s：权限不正确，模式应该是 0%o\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:785
+#: plugins/sudoers/visudo.c:783
 #, c-format
 msgid "%s busy, try again later"
 msgstr "%s 忙，请稍后重试"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:828
+#: plugins/sudoers/visudo.c:826
 #, c-format
 msgid "specified editor (%s) doesn't exist"
 msgstr "指定的编辑器(%s)不存在"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:851
+#: plugins/sudoers/visudo.c:849
 #, c-format
 msgid "unable to stat editor (%s)"
 msgstr "无法 stat 编辑器(%s)"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:899
+#: plugins/sudoers/visudo.c:897
 #, c-format
 msgid "no editor found (editor path = %s)"
 msgstr "未找到编辑器(编辑器路径 = %s)"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:1100
+#: plugins/sudoers/visudo.c:986
 #, c-format
-msgid "%s: %s_Alias `%s' referenced but not defined"
-msgstr "%s：引用了 %s_Alias “%s”但未定义"
+msgid "Error: cycle in %s_Alias `%s'"
+msgstr "错误：在 %s_Alias “%s”中循环"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:1116
+#: plugins/sudoers/visudo.c:987
 #, c-format
-msgid "%s: %s_Alias `%s' references self"
-msgstr "%s：%s_Alias “%s”引用了自己"
+msgid "Warning: cycle in %s_Alias `%s'"
+msgstr "警告：在 %s_Alias “%s”中循环"
+
+#: plugins/sudoers/visudo.c:990
+#, fuzzy, c-format
+msgid "Error: %s_Alias `%s' referenced but not defined"
+msgstr "%s：引用了 %s_Alias “%s”但未定义"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:1130
+#: plugins/sudoers/visudo.c:991
+#, fuzzy, c-format
+msgid "Warning: %s_Alias `%s' referenced but not defined"
+msgstr "%s：引用了 %s_Alias “%s”但未定义"
+
+#: plugins/sudoers/visudo.c:1128
 #, c-format
 msgid "%s: unused %s_Alias %s"
 msgstr "%s：未使用的 %s_Alias %s"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:1187
+#: plugins/sudoers/visudo.c:1185
 #, c-format
 msgid ""
 "%s - safely edit the sudoers file\n"
@@ -1577,7 +1521,7 @@ msgstr ""
 "%s - 安全地编辑 sudoers 文件\n"
 "\n"
 
-#: ../../../trunk/plugins/sudoers/visudo.c:1189
+#: plugins/sudoers/visudo.c:1187
 msgid ""
 "\n"
 "Options:\n"
@@ -1597,36 +1541,35 @@ msgstr ""
 "  -s          严格语法检查\n"
 "  -V          显示版本信息并退出"
 
-#: ../../../trunk/plugins/sudoers/auth/bsdauth.c:64
+#: plugins/sudoers/auth/bsdauth.c:64
 msgid "unable to begin bsd authentication"
 msgstr "无法开始 bsd 认证"
 
-#: ../../../trunk/plugins/sudoers/auth/bsdauth.c:71
+#: plugins/sudoers/auth/bsdauth.c:71
 msgid "invalid authentication type"
 msgstr "无效的认证类型"
 
-#: ../../../trunk/plugins/sudoers/auth/bsdauth.c:79
+#: plugins/sudoers/auth/bsdauth.c:79
 msgid "unable to setup authentication"
 msgstr "无法设置认证"
 
-#: ../../../trunk/plugins/sudoers/auth/fwtk.c:59
+#: plugins/sudoers/auth/fwtk.c:59
 #, c-format
 msgid "unable to read fwtk config"
 msgstr "无法读取 fwtk 配置"
 
-#: ../../../trunk/plugins/sudoers/auth/fwtk.c:64
+#: plugins/sudoers/auth/fwtk.c:64
 #, c-format
 msgid "unable to connect to authentication server"
 msgstr "无法连接到认证服务器"
 
-#: ../../../trunk/plugins/sudoers/auth/fwtk.c:70
-#: ../../../trunk/plugins/sudoers/auth/fwtk.c:93
-#: ../../../trunk/plugins/sudoers/auth/fwtk.c:126
+#: plugins/sudoers/auth/fwtk.c:70 plugins/sudoers/auth/fwtk.c:93
+#: plugins/sudoers/auth/fwtk.c:126
 #, c-format
 msgid "lost connection to authentication server"
 msgstr "丢失了到认证服务器的连接"
 
-#: ../../../trunk/plugins/sudoers/auth/fwtk.c:74
+#: plugins/sudoers/auth/fwtk.c:74
 #, c-format
 msgid ""
 "authentication server error:\n"
@@ -1635,152 +1578,151 @@ msgstr ""
 "认证服务器错误：\n"
 "%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:114
+#: plugins/sudoers/auth/kerb5.c:114
 #, c-format
 msgid "%s: unable to parse '%s': %s"
 msgstr "%s：无法解析“%s”：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:127
+#: plugins/sudoers/auth/kerb5.c:127
 #, c-format
 msgid "%s: unable to unparse princ ('%s'): %s"
 msgstr "%s：无法解析 princ(“%s”)：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:144
+#: plugins/sudoers/auth/kerb5.c:144
 #, c-format
 msgid "%s: unable to resolve ccache: %s"
 msgstr "%s：无法解析 ccache：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:188
+#: plugins/sudoers/auth/kerb5.c:188
 #, c-format
 msgid "%s: unable to allocate options: %s"
 msgstr "%s：无法分配选项：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:204
+#: plugins/sudoers/auth/kerb5.c:204
 #, c-format
 msgid "%s: unable to get credentials: %s"
 msgstr "%s：无法获取凭据：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:217
+#: plugins/sudoers/auth/kerb5.c:217
 #, c-format
 msgid "%s: unable to initialize ccache: %s"
 msgstr "%s：无法初始化 ccache：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:221
+#: plugins/sudoers/auth/kerb5.c:221
 #, fuzzy, c-format
 msgid "%s: unable to store cred in ccache: %s"
 msgstr "%s：无法储存 ccache 中的凭据"
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:284
+#: plugins/sudoers/auth/kerb5.c:284
 #, c-format
 msgid "%s: unable to get host principal: %s"
 msgstr ""
 
-#: ../../../trunk/plugins/sudoers/auth/kerb5.c:299
+#: plugins/sudoers/auth/kerb5.c:299
 #, fuzzy, c-format
 msgid "%s: Cannot verify TGT! Possible attack!: %s"
 msgstr "%s：无法验证目标！可能遭到了攻击！：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:99
+#: plugins/sudoers/auth/pam.c:99
 msgid "unable to initialize PAM"
 msgstr "无法初始化 PAM"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:142
+#: plugins/sudoers/auth/pam.c:142
 msgid "account validation failure, is your account locked?"
 msgstr "账户验证失败，您的账户是不是上锁了？"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:146
+#: plugins/sudoers/auth/pam.c:146
 msgid "Account or password is expired, reset your password and try again"
 msgstr "账户或密码过期，重置您的密码并重试"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:153
+#: plugins/sudoers/auth/pam.c:153
 #, c-format
 msgid "pam_chauthtok: %s"
 msgstr "pam_chauthtok：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:157
+#: plugins/sudoers/auth/pam.c:157
 msgid "Password expired, contact your system administrator"
 msgstr "密码过期，联系您的系统管理员"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:161
+#: plugins/sudoers/auth/pam.c:161
 msgid "Account expired or PAM config lacks an \"account\" section for sudo, contact your system administrator"
 msgstr "账户过期，或 PAM 配置缺少 sudo 使用的“account”节，联系您的系统管理员"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:176
+#: plugins/sudoers/auth/pam.c:176
 #, c-format
 msgid "pam_authenticate: %s"
 msgstr "pam_authenticate：%s"
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:296
+#: plugins/sudoers/auth/pam.c:296
 msgid "Password: "
 msgstr "密码："
 
-#: ../../../trunk/plugins/sudoers/auth/pam.c:297
+#: plugins/sudoers/auth/pam.c:297
 msgid "Password:"
 msgstr "密码："
 
-#: ../../../trunk/plugins/sudoers/auth/securid.c:82
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:106
+#: plugins/sudoers/auth/securid.c:82 plugins/sudoers/auth/securid5.c:106
 #, c-format
 msgid "unable to contact the SecurID server"
 msgstr "无法联络 SecurID 服务器"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:81
+#: plugins/sudoers/auth/securid5.c:81
 #, c-format
 msgid "failed to initialise the ACE API library"
 msgstr "初始化 ACE API 库失败"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:115
+#: plugins/sudoers/auth/securid5.c:115
 #, c-format
 msgid "User ID locked for SecurID Authentication"
 msgstr "为进行 SecurID 认证，已锁定用户 ID"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:119
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:169
+#: plugins/sudoers/auth/securid5.c:119 plugins/sudoers/auth/securid5.c:169
 #, c-format
 msgid "invalid username length for SecurID"
 msgstr "SecurID 的用户名长度无效"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:123
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:174
+#: plugins/sudoers/auth/securid5.c:123 plugins/sudoers/auth/securid5.c:174
 #, fuzzy, c-format
 msgid "invalid Authentication Handle for SecurID"
 msgstr "SecurID 的认证句柄无效"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:127
+#: plugins/sudoers/auth/securid5.c:127
 #, c-format
 msgid "SecurID communication failed"
 msgstr "SecurID 通讯失败"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:131
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:213
+#: plugins/sudoers/auth/securid5.c:131 plugins/sudoers/auth/securid5.c:213
 #, c-format
 msgid "unknown SecurID error"
 msgstr "未知的 SecurID 错误"
 
-#: ../../../trunk/plugins/sudoers/auth/securid5.c:164
+#: plugins/sudoers/auth/securid5.c:164
 #, c-format
 msgid "invalid passcode length for SecurID"
 msgstr "无效的 SecurID 密码长度"
 
-#: ../../../trunk/plugins/sudoers/auth/sia.c:106
+#: plugins/sudoers/auth/sia.c:106
 msgid "unable to initialize SIA session"
 msgstr "无法初始化 SIA 会话"
 
-#: ../../../trunk/plugins/sudoers/auth/sudo_auth.c:124
+#: plugins/sudoers/auth/sudo_auth.c:124
 msgid "There are no authentication methods compiled into sudo!  If you want to turn off authentication, use the --disable-authentication configure option."
 msgstr "sudo 编译时没有加入任何认证方法！如果您想关闭认证，使用 --disable-authentication 配置选项。"
 
-#: ../../../trunk/plugins/sudoers/auth/sudo_auth.c:134
+#: plugins/sudoers/auth/sudo_auth.c:134
 #, fuzzy
 msgid "Invalid authentication methods compiled into sudo!  You may mix standalone and non-standalone authentication."
 msgstr "编译进 sudo 的认证方法无效！您可以混用独立和非独立认证。"
 
-#: ../../../trunk/plugins/sudoers/auth/sudo_auth.c:243
+#: plugins/sudoers/auth/sudo_auth.c:243
 #, c-format
 msgid "%d incorrect password attempt"
 msgid_plural "%d incorrect password attempts"
 msgstr[0] "%d 次错误密码尝试"
 
-#: ../../../trunk/plugins/sudoers/auth/sudo_auth.c:335
+#: plugins/sudoers/auth/sudo_auth.c:335
 msgid "Authentication methods:"
 msgstr "认证方法："
+
+#~ msgid "%s: %s_Alias `%s' references self"
+#~ msgstr "%s：%s_Alias “%s”引用了自己"
diff --git a/src/po/zh_CN.mo b/src/po/zh_CN.mo
index c66942f99..fb64fbd67 100644
Binary files a/src/po/zh_CN.mo and b/src/po/zh_CN.mo differ
diff --git a/src/po/zh_CN.po b/src/po/zh_CN.po
index 1771a065e..19f741f2a 100644
--- a/src/po/zh_CN.po
+++ b/src/po/zh_CN.po
@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sudo 1.8.2-rc1\n"
+"Project-Id-Version: sudo 1.8.2rc2\n"
 "Report-Msgid-Bugs-To: http://www.sudo.ws/bugs\n"
-"POT-Creation-Date: 2011-05-20 15:33-0400\n"
-"PO-Revision-Date: 2011-05-26 15:47+0800\n"
+"POT-Creation-Date: 2011-06-04 18:27-0400\n"
+"PO-Revision-Date: 2011-06-20 19:21+0800\n"
 "Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: \n"
@@ -16,208 +16,200 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../trunk/src/error.c:82 ../../trunk/src/error.c:86
+#: src/error.c:82 src/error.c:86
 msgid ": "
 msgstr "："
 
-#: ../../trunk/src/exec.c:125 ../../trunk/src/exec_pty.c:569
-#: ../../trunk/src/exec_pty.c:876 ../../trunk/src/tgetpass.c:224
+#: src/exec.c:125 src/exec_pty.c:573 src/exec_pty.c:880 src/tgetpass.c:224
 #, c-format
 msgid "unable to fork"
 msgstr "无法执行 fork"
 
-#: ../../trunk/src/exec.c:247
+#: src/exec.c:246
 #, c-format
 msgid "unable to create sockets"
 msgstr "无法创建套接字"
 
-#: ../../trunk/src/exec.c:254 ../../trunk/src/exec_pty.c:522
-#: ../../trunk/src/exec_pty.c:530 ../../trunk/src/exec_pty.c:537
-#: ../../trunk/src/exec_pty.c:822 ../../trunk/src/exec_pty.c:873
-#: ../../trunk/src/tgetpass.c:221
+#: src/exec.c:253 src/exec_pty.c:526 src/exec_pty.c:534 src/exec_pty.c:541
+#: src/exec_pty.c:826 src/exec_pty.c:877 src/tgetpass.c:221
 #, c-format
 msgid "unable to create pipe"
 msgstr "无法创建管道"
 
-#: ../../trunk/src/exec.c:320 ../../trunk/src/exec_pty.c:940
-#: ../../trunk/src/exec_pty.c:1073
+#: src/exec.c:319 src/exec_pty.c:944 src/exec_pty.c:1077
 #, c-format
 msgid "select failed"
 msgstr "select 失败"
 
-#: ../../trunk/src/exec.c:388
+#: src/exec.c:387
 #, c-format
 msgid "unable to restore tty label"
 msgstr "无法恢复终端标签"
 
-#: ../../trunk/src/exec_pty.c:136
+#: src/exec_pty.c:136
 #, c-format
 msgid "unable to allocate pty"
 msgstr "无法分配伪终端"
 
-#: ../../trunk/src/exec_pty.c:562
+#: src/exec_pty.c:566
 #, c-format
 msgid "unable to set terminal to raw mode"
 msgstr "无法将终端设为原始模式"
 
-#: ../../trunk/src/exec_pty.c:854
+#: src/exec_pty.c:858
 #, c-format
 msgid "unable to set controlling tty"
 msgstr "无法设置控制终端"
 
-#: ../../trunk/src/exec_pty.c:948
+#: src/exec_pty.c:952
 #, c-format
 msgid "error reading from signal pipe"
 msgstr "从单管道读取出错"
 
-#: ../../trunk/src/exec_pty.c:967
+#: src/exec_pty.c:971
 #, c-format
 msgid "error reading from pipe"
 msgstr "从管道读取出错"
 
-#: ../../trunk/src/exec_pty.c:983
+#: src/exec_pty.c:987
 #, c-format
 msgid "error reading from socketpair"
 msgstr "从套接字对读取出错"
 
-#: ../../trunk/src/exec_pty.c:987
+#: src/exec_pty.c:991
 #, c-format
 msgid "unexpected reply type on backchannel: %d"
 msgstr "联络通道的回应类型异常：%d"
 
-#: ../../trunk/src/load_plugins.c:154
+#: src/load_plugins.c:154
 #, c-format
 msgid "%s: %s"
 msgstr "%s：%s"
 
-#: ../../trunk/src/load_plugins.c:160
+#: src/load_plugins.c:160
 #, c-format
 msgid "%s%s: %s"
 msgstr "%s%s：%s"
 
-#: ../../trunk/src/load_plugins.c:170
+#: src/load_plugins.c:170
 #, c-format
 msgid "%s must be owned by uid %d"
 msgstr "%s 必须属于用户 ID %d(的用户)"
 
-#: ../../trunk/src/load_plugins.c:174
+#: src/load_plugins.c:174
 #, c-format
 msgid "%s must be only be writable by owner"
 msgstr "%s 必须只对其所有者可写"
 
-#: ../../trunk/src/load_plugins.c:181
+#: src/load_plugins.c:181
 #, c-format
 msgid "unable to dlopen %s: %s"
 msgstr "无法 dlopen %s：%s"
 
-#: ../../trunk/src/load_plugins.c:186
+#: src/load_plugins.c:186
 #, c-format
 msgid "%s: unable to find symbol %s"
 msgstr "%s：找不到符号 %s"
 
-#: ../../trunk/src/load_plugins.c:192
+#: src/load_plugins.c:192
 #, c-format
 msgid "%s: unknown policy type %d"
 msgstr "%s：未知的策略类型 %d"
 
-#: ../../trunk/src/load_plugins.c:196
+#: src/load_plugins.c:196
 #, c-format
 msgid "%s: incompatible policy major version %d, expected %d"
 msgstr "%s：不兼容的策略主版本号 %d，应为 %d"
 
-#: ../../trunk/src/load_plugins.c:203
+#: src/load_plugins.c:203
 #, c-format
 msgid "%s: only a single policy plugin may be loaded"
 msgstr "%s：只能加载一个策略插件"
 
-#: ../../trunk/src/load_plugins.c:221
+#: src/load_plugins.c:221
 #, c-format
 msgid "%s: at least one policy plugin must be specified"
 msgstr "%s：至少要指定一个策略插件"
 
-#: ../../trunk/src/load_plugins.c:226
+#: src/load_plugins.c:226
 #, c-format
 msgid "policy plugin %s does not include a check_policy method"
 msgstr "策略插件 %s 不包含 check_policy 方法"
 
-#: ../../trunk/src/net_ifs.c:155 ../../trunk/src/net_ifs.c:164
-#: ../../trunk/src/net_ifs.c:176 ../../trunk/src/net_ifs.c:185
-#: ../../trunk/src/net_ifs.c:295 ../../trunk/src/net_ifs.c:319
+#: src/net_ifs.c:155 src/net_ifs.c:164 src/net_ifs.c:176 src/net_ifs.c:185
+#: src/net_ifs.c:295 src/net_ifs.c:319
 #, c-format
 msgid "load_interfaces: overflow detected"
 msgstr "load_interfaces：检测到溢出"
 
-#: ../../trunk/src/net_ifs.c:224
+#: src/net_ifs.c:224
 #, c-format
 msgid "unable to open socket"
 msgstr "无法打开套接字"
 
-#: ../../trunk/src/parse_args.c:180
+#: src/parse_args.c:180
 #, c-format
 msgid "the argument to -C must be a number greater than or equal to 3"
 msgstr "-C 选项的参数必须是一个大于等于 3 的数字"
 
-#: ../../trunk/src/parse_args.c:192
+#: src/parse_args.c:192
 #, c-format
 msgid "the argument to -D must be between 1 and 9 inclusive"
 msgstr "-D 选项的参数必须介于 1 到 9(含 1 和 9)"
 
-#: ../../trunk/src/parse_args.c:273
+#: src/parse_args.c:273
 #, c-format
 msgid "unknown user: %s"
 msgstr "未知用户：%s"
 
-#: ../../trunk/src/parse_args.c:332
+#: src/parse_args.c:332
 #, c-format
 msgid "you may not specify both the `-i' and `-s' options"
 msgstr "您不能同时指定“-i”和“-s”选项"
 
-#: ../../trunk/src/parse_args.c:336
+#: src/parse_args.c:336
 #, c-format
 msgid "you may not specify both the `-i' and `-E' options"
 msgstr "您不能同时指定“-i”和“-E”选项"
 
-#: ../../trunk/src/parse_args.c:346
+#: src/parse_args.c:346
 #, c-format
 msgid "the `-E' option is not valid in edit mode"
 msgstr "“-E”选项在编辑模式中无效"
 
-#: ../../trunk/src/parse_args.c:348
+#: src/parse_args.c:348
 #, c-format
 msgid "you may not specify environment variables in edit mode"
 msgstr "在编辑模式中您不能指定环境变量"
 
-#: ../../trunk/src/parse_args.c:356
+#: src/parse_args.c:356
 #, c-format
 msgid "the `-U' option may only be used with the `-l' option"
 msgstr "“-U”选项只能与“-l”选项一起使用"
 
-#: ../../trunk/src/parse_args.c:360
+#: src/parse_args.c:360
 #, c-format
 msgid "the `-A' and `-S' options may not be used together"
 msgstr "“-A”和“-S”选项不可同时使用"
 
-#: ../../trunk/src/parse_args.c:418 ../../trunk/src/sudo.c:398
-#: ../../trunk/src/sudo.c:418 ../../trunk/src/sudo.c:426
-#: ../../trunk/src/sudo.c:436 ../../trunk/common/alloc.c:85
-#: ../../trunk/common/alloc.c:105 ../../trunk/common/alloc.c:123
-#: ../../trunk/common/alloc.c:145 ../../trunk/common/alloc.c:203
-#: ../../trunk/common/alloc.c:217
+#: src/parse_args.c:418 src/sudo.c:398 src/sudo.c:418 src/sudo.c:426
+#: src/sudo.c:436 common/alloc.c:85 common/alloc.c:105 common/alloc.c:123
+#: common/alloc.c:145 common/alloc.c:203 common/alloc.c:217
 #, c-format
 msgid "unable to allocate memory"
 msgstr "无法分配内存"
 
-#: ../../trunk/src/parse_args.c:431
+#: src/parse_args.c:431
 #, c-format
 msgid "sudoedit is not supported on this platform"
 msgstr "此平台不支持 sudoedit"
 
-#: ../../trunk/src/parse_args.c:502
+#: src/parse_args.c:502
 #, 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 选项中的一个"
 
-#: ../../trunk/src/parse_args.c:515
+#: src/parse_args.c:515
 #, c-format
 msgid ""
 "%s - edit files as another user\n"
@@ -226,7 +218,7 @@ msgstr ""
 "%s - 以其他用户身份编辑文件\n"
 "\n"
 
-#: ../../trunk/src/parse_args.c:517
+#: src/parse_args.c:517
 #, c-format
 msgid ""
 "%s - execute a command as another user\n"
@@ -235,7 +227,7 @@ msgstr ""
 "%s - 以其他用户身份执行一条命令\n"
 "\n"
 
-#: ../../trunk/src/parse_args.c:522
+#: src/parse_args.c:522
 #, c-format
 msgid ""
 "\n"
@@ -244,508 +236,505 @@ msgstr ""
 "\n"
 "选项：\n"
 
-#: ../../trunk/src/parse_args.c:525
+#: src/parse_args.c:525
 msgid "use helper program for password prompting\n"
 msgstr "使用助手程序进行密码提示\n"
 
-#: ../../trunk/src/parse_args.c:528
+#: src/parse_args.c:528
 msgid "use specified BSD authentication type\n"
 msgstr "使用指定的 BSD 认证类型\n"
 
-#: ../../trunk/src/parse_args.c:530
+#: src/parse_args.c:530
 msgid "run command in the background\n"
 msgstr "在后台运行命令\n"
 
-#: ../../trunk/src/parse_args.c:532
+#: src/parse_args.c:532
 msgid "close all file descriptors >= fd\n"
 msgstr "关闭所有 >= fd 的文件描述符\n"
 
-#: ../../trunk/src/parse_args.c:535
+#: src/parse_args.c:535
 msgid "run command with specified login class\n"
 msgstr "以指定的登录类别运行命令\n"
 
-#: ../../trunk/src/parse_args.c:538
+#: src/parse_args.c:538
 msgid "preserve user environment when executing command\n"
 msgstr "在执行命令时保留用户环境\n"
 
-#: ../../trunk/src/parse_args.c:540
+#: src/parse_args.c:540
 msgid "edit files instead of running a command\n"
 msgstr "编辑文件而非执行命令\n"
 
-#: ../../trunk/src/parse_args.c:542
+#: src/parse_args.c:542
 msgid "execute command as the specified group\n"
 msgstr "以指定的用户组执行命令\n"
 
-#: ../../trunk/src/parse_args.c:544
+#: src/parse_args.c:544
 msgid "set HOME variable to target user's home dir.\n"
 msgstr "将 HOME 变量设为目标用户的主目录。\n"
 
-#: ../../trunk/src/parse_args.c:546
+#: src/parse_args.c:546
 msgid "display help message and exit\n"
 msgstr "显示帮助消息并退出\n"
 
-#: ../../trunk/src/parse_args.c:548
+#: src/parse_args.c:548
 msgid "run a login shell as target user\n"
 msgstr "以目标用户身份运行一个登录 shell\n"
 
-#: ../../trunk/src/parse_args.c:550
+#: src/parse_args.c:550
 msgid "remove timestamp file completely\n"
 msgstr "完全移除时间戳文件\n"
 
-#: ../../trunk/src/parse_args.c:552
+#: src/parse_args.c:552
 msgid "invalidate timestamp file\n"
 msgstr "无效的时间戳文件\n"
 
-#: ../../trunk/src/parse_args.c:554
+#: src/parse_args.c:554
 msgid "list user's available commands\n"
 msgstr "列出用户能执行的命令\n"
 
-#: ../../trunk/src/parse_args.c:556
+#: src/parse_args.c:556
 msgid "non-interactive mode, will not prompt user\n"
 msgstr "非交互模式，将不提示用户\n"
 
-#: ../../trunk/src/parse_args.c:558
+#: src/parse_args.c:558
 msgid "preserve group vector instead of setting to target's\n"
 msgstr "保留组向量，而非设置为目标的组向量\n"
 
-#: ../../trunk/src/parse_args.c:560
+#: src/parse_args.c:560
 msgid "use specified password prompt\n"
 msgstr "使用指定的密码提示\n"
 
-#: ../../trunk/src/parse_args.c:563 ../../trunk/src/parse_args.c:571
+#: src/parse_args.c:563 src/parse_args.c:571
 msgid "create SELinux security context with specified role\n"
 msgstr "以指定的角色创建 SELinux 安全环境\n"
 
-#: ../../trunk/src/parse_args.c:566
+#: src/parse_args.c:566
 msgid "read password from standard input\n"
 msgstr "从标准输入读取密码\n"
 
-#: ../../trunk/src/parse_args.c:568
+#: src/parse_args.c:568
 msgid "run a shell as target user\n"
 msgstr "以目标用户身份运行 shell\n"
 
-#: ../../trunk/src/parse_args.c:574
+#: src/parse_args.c:574
 msgid "when listing, list specified user's privileges\n"
 msgstr "在列表时，列出指定用户的权限\n"
 
-#: ../../trunk/src/parse_args.c:576
+#: src/parse_args.c:576
 msgid "run command (or edit file) as specified user\n"
 msgstr "以指定用户身份运行命令(或编辑文件)\n"
 
-#: ../../trunk/src/parse_args.c:578
+#: src/parse_args.c:578
 msgid "display version information and exit\n"
 msgstr "显示版本信息并退出\n"
 
-#: ../../trunk/src/parse_args.c:580
+#: src/parse_args.c:580
 msgid "update user's timestamp without running a command\n"
 msgstr "更新用户的时间戳而不执行命令\n"
 
-#: ../../trunk/src/parse_args.c:582
+#: src/parse_args.c:582
 msgid "stop processing command line arguments\n"
 msgstr "停止处理命令行参数\n"
 
-#: ../../trunk/src/selinux.c:75
+#: src/selinux.c:75
 #, c-format
 msgid "unable to open audit system"
 msgstr "无法打开审查系统"
 
-#: ../../trunk/src/selinux.c:85
+#: src/selinux.c:85
 #, c-format
 msgid "unable to send audit message"
 msgstr "无法发送审查消息"
 
-#: ../../trunk/src/selinux.c:112
+#: src/selinux.c:112
 #, c-format
 msgid "unable to fgetfilecon %s"
 msgstr "无法 fgetfilecon %s"
 
-#: ../../trunk/src/selinux.c:117
+#: src/selinux.c:117
 #, c-format
 msgid "%s changed labels"
 msgstr "%s 修改了标签"
 
-#: ../../trunk/src/selinux.c:122
+#: src/selinux.c:122
 #, c-format
 msgid "unable to restore context for %s"
 msgstr "无法恢复 %s 的环境"
 
-#: ../../trunk/src/selinux.c:161
+#: src/selinux.c:161
 #, c-format
 msgid "unable to open %s, not relabeling tty"
 msgstr "无法打开 %s，将不重新标记终端"
 
-#: ../../trunk/src/selinux.c:170
+#: src/selinux.c:170
 #, c-format
 msgid "unable to get current tty context, not relabeling tty"
 msgstr "无法获取当前终端的环境，将不重新标记终端"
 
-#: ../../trunk/src/selinux.c:177
+#: src/selinux.c:177
 #, c-format
 msgid "unable to get new tty context, not relabeling tty"
 msgstr "无法获取新终端的环境，将不重新标记终端"
 
-#: ../../trunk/src/selinux.c:184
+#: src/selinux.c:184
 #, c-format
 msgid "unable to set new tty context"
 msgstr "无法设置新终端的环境"
 
-#: ../../trunk/src/selinux.c:194 ../../trunk/src/selinux.c:207
-#: ../../trunk/src/sudo.c:330
+#: src/selinux.c:194 src/selinux.c:207 src/sudo.c:330
 #, c-format
 msgid "unable to open %s"
 msgstr "打不开 %s"
 
-#: ../../trunk/src/selinux.c:249
+#: src/selinux.c:249
 #, c-format
 msgid "you must specify a role for type %s"
 msgstr "您必须为 %s 类型指定一个角色"
 
-#: ../../trunk/src/selinux.c:255
+#: src/selinux.c:255
 #, c-format
 msgid "unable to get default type for role %s"
 msgstr "无法获取 %s 角色的默认类型"
 
-#: ../../trunk/src/selinux.c:273
+#: src/selinux.c:273
 #, c-format
 msgid "failed to set new role %s"
 msgstr "设置新角色 %s 失败"
 
-#: ../../trunk/src/selinux.c:277
+#: src/selinux.c:277
 #, c-format
 msgid "failed to set new type %s"
 msgstr "设置新类型 %s 失败"
 
-#: ../../trunk/src/selinux.c:286
+#: src/selinux.c:286
 #, c-format
 msgid "%s is not a valid context"
 msgstr "%s 不是有效的环境"
 
-#: ../../trunk/src/selinux.c:320
+#: src/selinux.c:320
 #, c-format
 msgid "failed to get old_context"
 msgstr "无法获取 old_context"
 
-#: ../../trunk/src/selinux.c:326
+#: src/selinux.c:326
 #, c-format
 msgid "unable to determine enforcing mode."
 msgstr "无法确定强制模式。"
 
-#: ../../trunk/src/selinux.c:338
+#: src/selinux.c:338
 #, c-format
 msgid "unable to setup tty context for %s"
 msgstr "无法设置 %s 的终端环境"
 
-#: ../../trunk/src/selinux.c:367
+#: src/selinux.c:367
 #, c-format
 msgid "unable to set exec context to %s"
 msgstr "无法向 %s 设置 exec 环境"
 
-#: ../../trunk/src/selinux.c:374
+#: src/selinux.c:374
 #, c-format
 msgid "unable to set key creation context to %s"
 msgstr "无法向 %s 设置键创建环境"
 
-#: ../../trunk/src/sesh.c:48
+#: src/sesh.c:48
 msgid "requires at least one argument"
 msgstr "要求至少有一个参数"
 
-#: ../../trunk/src/sesh.c:64
+#: src/sesh.c:64
 #, c-format
 msgid "unable to execute %s"
 msgstr "无法执行 %s"
 
-#: ../../trunk/src/sudo.c:192
+#: src/sudo.c:192
 #, c-format
 msgid "must be setuid root"
 msgstr "必须为 setuid root"
 
-#: ../../trunk/src/sudo.c:210
+#: src/sudo.c:210
 #, c-format
 msgid "Sudo version %s\n"
 msgstr "Sudo 版本 %s\n"
 
-#: ../../trunk/src/sudo.c:212
+#: src/sudo.c:212
 #, c-format
 msgid "Configure options: %s\n"
 msgstr "当前选项：%s\n"
 
-#: ../../trunk/src/sudo.c:217
+#: src/sudo.c:217
 #, c-format
 msgid "fatal error, unable to load plugins"
 msgstr "致命错误，无法加载插件"
 
-#: ../../trunk/src/sudo.c:225
+#: src/sudo.c:225
 #, c-format
 msgid "unable to initialize policy plugin"
 msgstr "无法初始化策略插件"
 
-#: ../../trunk/src/sudo.c:280
+#: src/sudo.c:280
 #, c-format
 msgid "error initializing I/O plugin %s"
 msgstr "初始化 I/O 插件 %s 出错"
 
-#: ../../trunk/src/sudo.c:307
+#: src/sudo.c:307
 #, c-format
 msgid "unexpected sudo mode 0x%x"
 msgstr "异常的 sudo 模式 0x%x"
 
-#: ../../trunk/src/sudo.c:356
+#: src/sudo.c:356
 #, c-format
 msgid "unable to get group vector"
 msgstr "无法获取组向量"
 
-#: ../../trunk/src/sudo.c:394
+#: src/sudo.c:394
 #, c-format
 msgid "unknown uid %u: who are you?"
 msgstr "未知的用户 ID %u：您是？"
 
-#: ../../trunk/src/sudo.c:734
+#: src/sudo.c:734
 #, c-format
 msgid "resource control limit has been reached"
 msgstr "达到了资源控制限制"
 
-#: ../../trunk/src/sudo.c:737
+#: src/sudo.c:737
 #, c-format
 msgid "user \"%s\" is not a member of project \"%s\""
 msgstr "用户“%s”不是项目“%s”的成员"
 
-#: ../../trunk/src/sudo.c:741
+#: src/sudo.c:741
 #, fuzzy, c-format
 msgid "the invoking task is final"
 msgstr "调用任务是最终的"
 
-#: ../../trunk/src/sudo.c:744
+#: src/sudo.c:744
 #, c-format
 msgid "could not join project \"%s\""
 msgstr "无法加入项目“%s”"
 
-#: ../../trunk/src/sudo.c:749
+#: src/sudo.c:749
 #, c-format
 msgid "no resource pool accepting default bindings exists for project \"%s\""
-msgstr ""
+msgstr "不存在对应于项目“%s”的、接受默认绑定的资源池"
 
-#: ../../trunk/src/sudo.c:753
+#: src/sudo.c:753
 #, c-format
 msgid "specified resource pool does not exist for project \"%s\""
 msgstr "指定的对应于项目“%s”的资源池不存在"
 
-#: ../../trunk/src/sudo.c:757
+#: src/sudo.c:757
 #, c-format
 msgid "could not bind to default resource pool for project \"%s\""
 msgstr "无法为项目“%s”绑定到默认的资源池"
 
-#: ../../trunk/src/sudo.c:763
+#: src/sudo.c:763
 #, c-format
 msgid "setproject failed for project \"%s\""
 msgstr "对项目“%s”执行 setproject 失败"
 
-#: ../../trunk/src/sudo.c:765
+#: src/sudo.c:765
 #, c-format
 msgid "warning, resource control assignment failed for project \"%s\""
 msgstr "警告，对项目“%s”的资源控制分配失败"
 
-#: ../../trunk/src/sudo.c:791
+#: src/sudo.c:791
 #, c-format
 msgid "unable to remove PRIV_PROC_EXEC from PRIV_LIMIT"
 msgstr "无法从 PRIV_LIMIT 中移除 PRIV_PROC_EXEC"
 
-#: ../../trunk/src/sudo.c:895
+#: src/sudo.c:895
 #, c-format
 msgid "unknown login class %s"
 msgstr "未知的登录类别 %s"
 
-#: ../../trunk/src/sudo.c:902 ../../trunk/src/sudo.c:905
+#: src/sudo.c:902 src/sudo.c:905
 #, c-format
 msgid "unable to set user context"
 msgstr "无法设置用户环境"
 
-#: ../../trunk/src/sudo.c:916
+#: src/sudo.c:916
 #, c-format
 msgid "unable to set effective gid to runas gid %u"
 msgstr "无法设置有效组 ID 来以组 ID %u 运行"
 
-#: ../../trunk/src/sudo.c:921
+#: src/sudo.c:921
 #, c-format
 msgid "unable to set gid to runas gid %u"
 msgstr "无法设置组 ID 来以组 ID %u 运行"
 
-#: ../../trunk/src/sudo.c:929 ../../trunk/src/sudo.c:935
+#: src/sudo.c:929 src/sudo.c:935
 #, c-format
 msgid "unable to set supplementary group IDs"
 msgstr "无法设置补充组 ID"
 
-#: ../../trunk/src/sudo.c:943
+#: src/sudo.c:943
 #, c-format
 msgid "unable to set process priority"
 msgstr "无法设置进程优先级"
 
-#: ../../trunk/src/sudo.c:951
+#: src/sudo.c:951
 #, c-format
 msgid "unable to change root to %s"
 msgstr "无法从 root 切换到 %s"
 
-#: ../../trunk/src/sudo.c:961 ../../trunk/src/sudo.c:967
-#: ../../trunk/src/sudo.c:973
+#: src/sudo.c:961 src/sudo.c:967 src/sudo.c:973
 #, c-format
 msgid "unable to change to runas uid (%u, %u)"
 msgstr "无法切换到以用户 ID(%u，%u)运行"
 
-#: ../../trunk/src/sudo.c:987
+#: src/sudo.c:987
 #, c-format
 msgid "unable to change directory to %s"
 msgstr "无法将目录切换到 %s"
 
-#: ../../trunk/src/sudo.c:1078
+#: src/sudo.c:1078
 #, c-format
 msgid "unexpected child termination condition: %d"
 msgstr "异常的子进程终止条件：%d"
 
-#: ../../trunk/src/sudo.c:1118
+#: src/sudo.c:1118
 #, c-format
 msgid "policy plugin %s does not support listing privileges"
 msgstr "策略插件 %s 不支持列出权限"
 
-#: ../../trunk/src/sudo.c:1129
+#: src/sudo.c:1129
 #, c-format
 msgid "policy plugin %s does not support the -v option"
 msgstr "策略插件 %s不支持 -v 选项"
 
-#: ../../trunk/src/sudo.c:1140
+#: src/sudo.c:1140
 #, c-format
 msgid "policy plugin %s does not support the -k/-K options"
 msgstr "策略插件 %s 不支持 -k/-K 选项"
 
-#: ../../trunk/src/sudo_edit.c:108
+#: src/sudo_edit.c:108
 #, c-format
 msgid "unable to change uid to root (%u)"
 msgstr "无法将用户 ID 切换到 root(%u)"
 
-#: ../../trunk/src/sudo_edit.c:140
+#: src/sudo_edit.c:140
 #, c-format
 msgid "plugin error: missing file list for sudoedit"
 msgstr "插件错误：缺少 sudoedit 的文件列表"
 
-#: ../../trunk/src/sudo_edit.c:172 ../../trunk/src/sudo_edit.c:280
+#: src/sudo_edit.c:172 src/sudo_edit.c:280
 #, c-format
 msgid "%s: not a regular file"
 msgstr "%s：不是常规文件"
 
-#: ../../trunk/src/sudo_edit.c:206 ../../trunk/src/sudo_edit.c:316
+#: src/sudo_edit.c:206 src/sudo_edit.c:316
 #, fuzzy, c-format
 msgid "%s: short write"
 msgstr "%s：短写入"
 
-#: ../../trunk/src/sudo_edit.c:281
+#: src/sudo_edit.c:281
 #, c-format
 msgid "%s left unmodified"
 msgstr "%s 并未修改"
 
-#: ../../trunk/src/sudo_edit.c:294
+#: src/sudo_edit.c:294
 #, c-format
 msgid "%s unchanged"
 msgstr "%s 已更改"
 
-#: ../../trunk/src/sudo_edit.c:306 ../../trunk/src/sudo_edit.c:327
+#: src/sudo_edit.c:306 src/sudo_edit.c:327
 #, c-format
 msgid "unable to write to %s"
 msgstr "无法写入 %s"
 
-#: ../../trunk/src/sudo_edit.c:307 ../../trunk/src/sudo_edit.c:325
-#: ../../trunk/src/sudo_edit.c:328
+#: src/sudo_edit.c:307 src/sudo_edit.c:325 src/sudo_edit.c:328
 #, c-format
 msgid "contents of edit session left in %s"
-msgstr ""
+msgstr "编辑会话的内容留在了 %s 中"
 
-#: ../../trunk/src/sudo_edit.c:324
+#: src/sudo_edit.c:324
 #, c-format
 msgid "unable to read temporary file"
 msgstr "无法读取临时文件"
 
-#: ../../trunk/src/tgetpass.c:95
+#: src/tgetpass.c:95
 #, c-format
 msgid "no tty present and no askpass program specified"
 msgstr "没有终端存在，且未指定 askpass 程序"
 
-#: ../../trunk/src/tgetpass.c:104
+#: src/tgetpass.c:104
 #, c-format
 msgid "no askpass program specified, try setting SUDO_ASKPASS"
 msgstr "没有指定 askpass 程序，尝试设置 SUDO_ASKPASS"
 
-#: ../../trunk/src/tgetpass.c:234
+#: src/tgetpass.c:234
 #, c-format
 msgid "unable to set gid to %u"
 msgstr "无法将组 ID 设为 %u"
 
-#: ../../trunk/src/tgetpass.c:238
+#: src/tgetpass.c:238
 #, c-format
 msgid "unable to set uid to %u"
 msgstr "无法将用户 ID 设为 %u"
 
-#: ../../trunk/src/tgetpass.c:243
+#: src/tgetpass.c:243
 #, c-format
 msgid "unable to run %s"
 msgstr "无法执行 %s"
 
-#: ../../trunk/src/utmp.c:263
+#: src/utmp.c:263
 #, c-format
 msgid "unable to save stdin"
 msgstr "无法保存 stdin"
 
-#: ../../trunk/src/utmp.c:265
+#: src/utmp.c:265
 #, c-format
 msgid "unable to dup2 stdin"
 msgstr "无法 dup2 stdin"
 
-#: ../../trunk/src/utmp.c:268
+#: src/utmp.c:268
 #, c-format
 msgid "unable to restore stdin"
 msgstr "无法恢复 stdin"
 
-#: ../../trunk/common/aix.c:144
+#: common/aix.c:144
 #, c-format
 msgid "unable to open userdb"
 msgstr "无法打开 userdb"
 
-#: ../../trunk/common/aix.c:147
+#: common/aix.c:147
 #, c-format
 msgid "unable to switch to registry \"%s\" for %s"
-msgstr ""
+msgstr "无法为 %2$s 切换到注册表“%1$s”"
 
-#: ../../trunk/common/aix.c:161
+#: common/aix.c:161
 #, c-format
 msgid "unable to restore registry"
-msgstr ""
+msgstr "无法恢复注册表"
 
-#: ../../trunk/common/alloc.c:82
+#: common/alloc.c:82
 #, c-format
 msgid "internal error, tried to emalloc(0)"
 msgstr "内部错误，试图 emalloc(0)"
 
-#: ../../trunk/common/alloc.c:99
+#: common/alloc.c:99
 #, c-format
 msgid "internal error, tried to emalloc2(0)"
 msgstr "内部错误，试图 emalloc2(0)"
 
-#: ../../trunk/common/alloc.c:101
+#: common/alloc.c:101
 #, c-format
 msgid "internal error, emalloc2() overflow"
 msgstr "内部错误，emalloc2() 溢出"
 
-#: ../../trunk/common/alloc.c:119
+#: common/alloc.c:119
 #, c-format
 msgid "internal error, tried to erealloc(0)"
 msgstr "内部错误，试图 erealloc(0)"
 
-#: ../../trunk/common/alloc.c:138
+#: common/alloc.c:138
 #, c-format
 msgid "internal error, tried to erealloc3(0)"
 msgstr "内部错误，试图 erealloc3(0)"
 
-#: ../../trunk/common/alloc.c:140
+#: common/alloc.c:140
 #, c-format
 msgid "internal error, erealloc3() overflow"
 msgstr "内部错误，erealloc3() 错误"
 
-#: ../../trunk/compat/strsignal.c:47
+#: compat/strsignal.c:47
 msgid "Unknown signal"
 msgstr "未知信号"