Iupdated pot file

1 files changed, 139 insertions, 123 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 083f2e49..7459f230 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2002-12-15 17:13+0100\n"
+"POT-Creation-Date: 2002-12-19 13:14+0100\n"
 "PO-Revision-Date: 2002-12-17 23:31+0800\n"
 "Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -45,18 +45,18 @@ msgid "Cancel"
 msgstr "取消"
 
 #. Translator: Add here the keys which might be pressed in the "No"-case.
-#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:380 ../urpmi_.c:397
+#: ../_irpm_.c:42 ../urpme_.c:34 ../urpmi_.c:380 ../urpmi_.c:397
 #: ../urpmi_.c:446 ../urpmi_.c:496 ../urpmi_.c:560 placeholder.h:17
 msgid "Nn"
 msgstr "nN不否"
 
 #. Translator: Add here the keys which might be pressed in the "Yes"-case.
-#: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:381 ../urpmi_.c:398
+#: ../_irpm_.c:43 ../urpme_.c:36 ../urpmi_.c:381 ../urpmi_.c:398
 #: ../urpmi_.c:447 ../urpmi_.c:497 ../urpmi_.c:561 placeholder.h:11
 msgid "Yy"
 msgstr "yY是"
 
-#: ../_irpm_.c:44 ../urpme_.c:192 ../urpmi_.c:382 ../urpmi_.c:399
+#: ../_irpm_.c:44 ../urpme_.c:106 ../urpmi_.c:382 ../urpmi_.c:399
 #: ../urpmi_.c:448
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
@@ -243,381 +243,383 @@ msgstr "将相关的介质用于并行处理: %s"
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行处理选项“%s”"
 
-#: ../urpm.pm_.c:609
+#: ../urpm.pm_.c:610
 msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr "--synthesis 不能和 --media, --update 或 --parallel 一起使用"
 
-#: ../urpm.pm_.c:624 ../urpm.pm_.c:1212 ../urpm.pm_.c:1227 ../urpm.pm_.c:1369
+#: ../urpm.pm_.c:626 ../urpm.pm_.c:1214 ../urpm.pm_.c:1229 ../urpm.pm_.c:1371
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm_.c:628 ../urpm.pm_.c:638 ../urpm.pm_.c:900 ../urpm.pm_.c:999
-#: ../urpm.pm_.c:1155 ../urpm.pm_.c:1217 ../urpm.pm_.c:1222 ../urpm.pm_.c:1294
-#: ../urpm.pm_.c:1364
+#: ../urpm.pm_.c:630 ../urpm.pm_.c:640 ../urpm.pm_.c:902 ../urpm.pm_.c:1001
+#: ../urpm.pm_.c:1157 ../urpm.pm_.c:1219 ../urpm.pm_.c:1224 ../urpm.pm_.c:1296
+#: ../urpm.pm_.c:1366
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm_.c:633
+#: ../urpm.pm_.c:635
 #, c-format
 msgid "problem reading hdlist file of medium \"%s\""
 msgstr "读取“%s”的 hdlist 文件有问题"
 
-#: ../urpm.pm_.c:642 ../urpm.pm_.c:904 ../urpm.pm_.c:1002 ../urpm.pm_.c:1159
-#: ../urpm.pm_.c:1297
+#: ../urpm.pm_.c:644 ../urpm.pm_.c:906 ../urpm.pm_.c:1004 ../urpm.pm_.c:1161
+#: ../urpm.pm_.c:1299
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "无法读取介质“%s”的综合文件"
 
-#: ../urpm.pm_.c:692
+#: ../urpm.pm_.c:694
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已经存在"
 
-#: ../urpm.pm_.c:720
+#: ../urpm.pm_.c:722
 #, c-format
 msgid "added medium %s"
 msgstr "添加介质 %s"
 
-#: ../urpm.pm_.c:735
+#: ../urpm.pm_.c:737
 msgid "unable to access first installation medium"
 msgstr "无法访问最初的安装介质"
 
-#: ../urpm.pm_.c:739
+#: ../urpm.pm_.c:741
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm_.c:741 ../urpm.pm_.c:960 ../urpm.pm_.c:968 ../urpm.pm_.c:1016
+#: ../urpm.pm_.c:743 ../urpm.pm_.c:962 ../urpm.pm_.c:970 ../urpm.pm_.c:1018
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm_.c:741 ../urpm.pm_.c:960 ../urpm.pm_.c:968 ../urpm.pm_.c:1016
+#: ../urpm.pm_.c:743 ../urpm.pm_.c:962 ../urpm.pm_.c:970 ../urpm.pm_.c:1018
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm_.c:743 ../urpm.pm_.c:757 ../urpm.pm_.c:782
+#: ../urpm.pm_.c:745 ../urpm.pm_.c:759 ../urpm.pm_.c:784
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
 
-#: ../urpm.pm_.c:749
+#: ../urpm.pm_.c:751
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm_.c:751 ../urpm.pm_.c:1071 ../urpm.pm_.c:1124 ../urpm.pm_.c:1612
-#: ../urpm.pm_.c:2093
+#: ../urpm.pm_.c:753 ../urpm.pm_.c:1073 ../urpm.pm_.c:1126 ../urpm.pm_.c:1614
+#: ../urpm.pm_.c:2097
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm_.c:753 ../urpm.pm_.c:1119 ../urpm.pm_.c:1615 ../urpm.pm_.c:2096
+#: ../urpm.pm_.c:755 ../urpm.pm_.c:1121 ../urpm.pm_.c:1617 ../urpm.pm_.c:2100
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm_.c:773
+#: ../urpm.pm_.c:775
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlist 文件中错误的描述“%s”"
 
-#: ../urpm.pm_.c:815
+#: ../urpm.pm_.c:817
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm_.c:817
+#: ../urpm.pm_.c:819
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm_.c:817
+#: ../urpm.pm_.c:819
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质 %s"
 
-#: ../urpm.pm_.c:834
+#: ../urpm.pm_.c:836
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm_.c:880 ../urpm.pm_.c:2017
+#: ../urpm.pm_.c:882 ../urpm.pm_.c:2019
 msgid "urpmi database locked"
 msgstr "urpmi 数据库被锁定"
 
-#: ../urpm.pm_.c:928 ../urpm.pm_.c:2027
+#: ../urpm.pm_.c:930 ../urpm.pm_.c:2029
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm_.c:958
+#: ../urpm.pm_.c:960
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "复制“%s”的描述文件"
 
-#: ../urpm.pm_.c:966
+#: ../urpm.pm_.c:968
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制源“%s”的 hdlist 或综合文件..."
 
-#: ../urpm.pm_.c:971
+#: ../urpm.pm_.c:973
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "复制 [%s] 失败"
 
-#: ../urpm.pm_.c:976 ../urpm.pm_.c:1134
+#: ../urpm.pm_.c:978 ../urpm.pm_.c:1136
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm_.c:1014
+#: ../urpm.pm_.c:1016
 #, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "正在复制“%s”的源文件列表..."
 
-#: ../urpm.pm_.c:1031
+#: ../urpm.pm_.c:1033
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "从 [%s] 读取 rpm 文件"
 
-#: ../urpm.pm_.c:1050
+#: ../urpm.pm_.c:1052
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从 [%s] 读取 rpm 文件: %s"
 
-#: ../urpm.pm_.c:1055
+#: ../urpm.pm_.c:1057
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: ../urpm.pm_.c:1068
+#: ../urpm.pm_.c:1070
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "正在获取“%s”的描述文件..."
 
-#: ../urpm.pm_.c:1080
+#: ../urpm.pm_.c:1082
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist (或综合文件)..."
 
-#: ../urpm.pm_.c:1184
+#: ../urpm.pm_.c:1186
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "获取源的 hdlist (或 synthesis)失败"
 
-#: ../urpm.pm_.c:1191
+#: ../urpm.pm_.c:1193
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "没有找到介质“%s”的 hdlist 文件"
 
-#: ../urpm.pm_.c:1203 ../urpm.pm_.c:1247
+#: ../urpm.pm_.c:1205 ../urpm.pm_.c:1249
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件 [%s] 已经被同样的介质“%s”使用"
 
-#: ../urpm.pm_.c:1234
+#: ../urpm.pm_.c:1236
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件“%s”"
 
-#: ../urpm.pm_.c:1270
+#: ../urpm.pm_.c:1272
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入列表文件“%s”"
 
-#: ../urpm.pm_.c:1277
+#: ../urpm.pm_.c:1279
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm_.c:1279
+#: ../urpm.pm_.c:1281
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”没有写入列表文件"
 
-#: ../urpm.pm_.c:1329
+#: ../urpm.pm_.c:1331
 msgid "performing second pass to compute dependencies\n"
 msgstr "进行第二轮, 计算依赖性\n"
 
-#: ../urpm.pm_.c:1342
+#: ../urpm.pm_.c:1344
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取软件包头信息"
 
-#: ../urpm.pm_.c:1347
+#: ../urpm.pm_.c:1349
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建hdlist [%s]"
 
-#: ../urpm.pm_.c:1359 ../urpm.pm_.c:1378
+#: ../urpm.pm_.c:1361 ../urpm.pm_.c:1380
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "为介质“%s”创建 hdlist 综合文件"
 
-#: ../urpm.pm_.c:1396
+#: ../urpm.pm_.c:1398
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中有 %d 个文件头"
 
-#: ../urpm.pm_.c:1400
+#: ../urpm.pm_.c:1402
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "从缓存删除 %d 过时的头"
 
-#: ../urpm.pm_.c:1556
+#: ../urpm.pm_.c:1558
 #, c-format
 msgid "mounting %s"
 msgstr "正在装配 %s"
 
-#: ../urpm.pm_.c:1568
+#: ../urpm.pm_.c:1570
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm_.c:1590
+#: ../urpm.pm_.c:1592
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: ../urpm.pm_.c:1591
+#: ../urpm.pm_.c:1593
 msgid "no entries relocated in depslist"
 msgstr "在depslist中没有重新定位的条目"
 
-#: ../urpm.pm_.c:1604
+#: ../urpm.pm_.c:1606
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法 rpm 文件名 [%s]"
 
-#: ../urpm.pm_.c:1610
+#: ../urpm.pm_.c:1612
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm_.c:1617 ../urpm.pm_.c:2217
+#: ../urpm.pm_.c:1619 ../urpm.pm_.c:2221
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: ../urpm.pm_.c:1622
+#: ../urpm.pm_.c:1624
 msgid "unable to register rpm file"
 msgstr "无法注册 rpm 文件"
 
-#: ../urpm.pm_.c:1625
+#: ../urpm.pm_.c:1627
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm_.c:1717
+#: ../urpm.pm_.c:1719
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: ../urpm.pm_.c:1720
+#: ../urpm.pm_.c:1722 ../urpme_.c:88
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm_.c:1860 ../urpm.pm_.c:1892 ../urpm.pm_.c:1913
+#: ../urpm.pm_.c:1862 ../urpm.pm_.c:1894 ../urpm.pm_.c:1915
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "多个软件包使用相同的 rpm 文件名“%s”"
 
-#: ../urpm.pm_.c:1902
+#: ../urpm.pm_.c:1904
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确的解析 [%s] 的值“%s”"
 
-#: ../urpm.pm_.c:1923
+#: ../urpm.pm_.c:1925
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义 rpm 文件的任何位置"
 
-#: ../urpm.pm_.c:1932
+#: ../urpm.pm_.c:1934
 #, c-format
 msgid "package %s is not found."
 msgstr "没有找到软件包 %s."
 
-#: ../urpm.pm_.c:1979 ../urpm.pm_.c:1982 ../urpm.pm_.c:2003
+#: ../urpm.pm_.c:1981 ../urpm.pm_.c:1984 ../urpm.pm_.c:2005
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”没有选中"
 
-#: ../urpm.pm_.c:1996
+#: ../urpm.pm_.c:1998
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取rpm文件[%1$s]"
 
-#: ../urpm.pm_.c:2007
+#: ../urpm.pm_.c:2009
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "不连贯的介质“%s”标记为可移动但其实不是"
 
-#: ../urpm.pm_.c:2081
+#: ../urpm.pm_.c:2085
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm_.c:2088
+#: ../urpm.pm_.c:2092
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”获取 rpm 文件..."
 
-#: ../urpm.pm_.c:2158
+#: ../urpm.pm_.c:2162
 msgid "Preparing..."
 msgstr "准备中..."
 
-#: ../urpm.pm_.c:2186
+#: ../urpm.pm_.c:2190 ../urpm.pm_.c:2397
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm_.c:2195
+#: ../urpm.pm_.c:2199
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm_.c:2204
+#: ../urpm.pm_.c:2208 ../urpm.pm_.c:2404
 #, c-format
 msgid "%s is needed by %s"
 msgstr "%s 是 %s 需要的"
 
-#: ../urpm.pm_.c:2205
+#: ../urpm.pm_.c:2209 ../urpm.pm_.c:2405
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 与 %s 冲突"
 
-#: ../urpm/parallel_ka_run.pm_.c:9 ../urpm/parallel_ka_run.pm_.c:26
-#: ../urpm/parallel_ka_run.pm_.c:116
+#: ../urpm/parallel_ka_run.pm_.c:9 ../urpm/parallel_ka_run.pm_.c:91
+#: ../urpm/parallel_ka_run.pm_.c:178
 msgid "mput failed, maybe a node is unreacheable"
 msgstr "mput 失败, 可能节点无法连接"
 
-#: ../urpm/parallel_ka_run.pm_.c:98 ../urpm/parallel_ka_run.pm_.c:130
+#: ../urpm/parallel_ka_run.pm_.c:65 ../urpm/parallel_ka_run.pm_.c:163
+#: ../urpm/parallel_ka_run.pm_.c:192
 msgid "rshp failed, maybe a node is unreacheable"
 msgstr "rshp 失败, 可能节点无法连接"
 
-#: ../urpm/parallel_ka_run.pm_.c:134 ../urpm/parallel_ssh.pm_.c:139
+#: ../urpm/parallel_ka_run.pm_.c:74 ../urpm/parallel_ssh.pm_.c:78
+#, c-format
+msgid "on node %s"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm_.c:196 ../urpm/parallel_ssh.pm_.c:202
 #, c-format
 msgid "Installation failed on node %s"
 msgstr "在节点 %s 安装失败"
 
-#: ../urpm/parallel_ka_run.pm_.c:139 ../urpm/parallel_ssh.pm_.c:144
+#: ../urpm/parallel_ka_run.pm_.c:201 ../urpm/parallel_ssh.pm_.c:207
 #: ../urpmi_.c:582
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:29
-#: ../urpm/parallel_ssh.pm_.c:122
+#: ../urpm/parallel_ssh.pm_.c:11 ../urpm/parallel_ssh.pm_.c:95
+#: ../urpm/parallel_ssh.pm_.c:185
 #, c-format
 msgid "scp failed on host %s"
 msgstr "在主机 %s scp 失败"
 
-#: ../urpm/parallel_ssh.pm_.c:101
+#: ../urpm/parallel_ssh.pm_.c:167
 #, c-format
 msgid "host %s does not have a good version of urpmi"
 msgstr "主机 %s 没有合适版本的 urpmi"
 
-#: ../urpme_.c:33
-msgid "Remove them all?"
-msgstr "全部删除吗?"
-
-#: ../urpme_.c:42
+#: ../urpme_.c:39
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -633,53 +635,66 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme_.c:47 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
+#: ../urpme_.c:44 ../urpmi.addmedia_.c:53 ../urpmi.removemedia_.c:36
 #: ../urpmi.update_.c:61 ../urpmi_.c:76 ../urpmq_.c:40
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme_.c:48 ../urpmi_.c:80
+#: ../urpme_.c:45 ../urpmi_.c:80
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpme_.c:49
+#: ../urpme_.c:46 ../urpmi_.c:108
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - 验证安装是否可以正确进行。\n"
+
+#: ../urpme_.c:47 ../urpmi_.c:92 ../urpmq_.c:55
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
+
+#: ../urpme_.c:48
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme_.c:119
-msgid "unknown package "
-msgstr "未知的软件包"
+#: ../urpme_.c:64
+#, fuzzy, c-format
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: 未知选项“-%s”, 用--help 检查用法\n"
 
-#: ../urpme_.c:119
-msgid "unknown packages "
+#: ../urpme_.c:83
+#, fuzzy
+msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme_.c:142
-#, c-format
-msgid "Using \"%s\" as a substring, I found"
-msgstr "搜索包含“%s”的项目, 我发现"
+#: ../urpme_.c:83
+#, fuzzy
+msgid "unknown packages"
+msgstr "未知的软件包"
 
-#: ../urpme_.c:143 ../urpmi_.c:498
-msgid " (y/N) "
-msgstr " (y/N) "
+#: ../urpme_.c:93
+#, fuzzy, c-format
+msgid "removing package %s will break your system"
+msgstr "如果删除软件包 %s 会破坏您的系统\n"
 
-#: ../urpme_.c:150
-msgid "Nothing to remove.\n"
+#: ../urpme_.c:95
+#, fuzzy
+msgid "Nothing to remove"
 msgstr "不需要删除如何东西。\n"
 
-#: ../urpme_.c:180
-#, c-format
-msgid "removing package %s will break your system\n"
-msgstr "如果删除软件包 %s 会破坏您的系统\n"
+#: ../urpme_.c:98
+#, fuzzy
+msgid "Checking to remove the following packages"
+msgstr "需要下列软件包之一:"
 
-#: ../urpme_.c:191
+#: ../urpme_.c:105
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be removed (%d "
 "MB)"
 msgstr "为满足相关性要求, 需要删除下列软件包 (%d MB)"
 
-#: ../urpme_.c:198
+#: ../urpme_.c:113
 msgid "Removing failed"
 msgstr "删除失败"
 
@@ -971,10 +986,6 @@ msgstr ""
 "  --allow-force  - 允许提示用户安装软件包而不\n"
 "                   检查依赖性和完整性。\n"
 
-#: ../urpmi_.c:92 ../urpmq_.c:55
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
-
 #: ../urpmi_.c:99
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1009,11 +1020,6 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "\t\t(--no-verify-rpm 禁止它, 缺省是激活的)。\n"
 
-#: ../urpmi_.c:108
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - 验证安装是否可以正确进行。\n"
-
 #: ../urpmi_.c:109
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
@@ -1150,6 +1156,10 @@ msgstr "下列软件包的签名有错误"
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
+#: ../urpmi_.c:498
+msgid " (y/N) "
+msgstr " (y/N) "
+
 #: ../urpmi_.c:506
 #, c-format
 msgid ""
@@ -1360,3 +1370,9 @@ msgstr "尝试 urpmf --help 了解更多选项"
 #: placeholder.h:40
 msgid "no full media list was found"
 msgstr "没有找到完整的介质清单"
+
+#~ msgid "Remove them all?"
+#~ msgstr "全部删除吗?"
+
+#~ msgid "Using \"%s\" as a substring, I found"
+#~ msgstr "搜索包含“%s”的项目, 我发现"