usync with code

1 files changed, 455 insertions, 443 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8e0ec278..a115f08b 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-10 21:25+0200\n"
+"POT-Creation-Date: 2008-08-29 19:51+0200\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -23,7 +23,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../gurpmi:32 ../gurpmi2:72
+#: ../gurpmi:32 ../gurpmi2:73
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 安装"
@@ -33,7 +33,7 @@ msgstr "RPM 安装"
 msgid "Error: unable to find file %s, will cancel operation"
 msgstr "错误: 找不到文件 %s，将取消操作"
 
-#: ../gurpmi:47 ../gurpmi2:166 ../gurpmi2:190
+#: ../gurpmi:47 ../gurpmi2:171 ../gurpmi2:195
 #, c-format
 msgid "_Ok"
 msgstr "确定(_O)"
@@ -99,7 +99,7 @@ msgstr "安装(_I)"
 msgid "_Save"
 msgstr "保存(_S)"
 
-#: ../gurpmi:101 ../gurpmi2:166
+#: ../gurpmi:101 ../gurpmi2:171
 #, c-format
 msgid "_Cancel"
 msgstr "取消(_C)"
@@ -130,8 +130,9 @@ msgstr ""
 msgid "Options:"
 msgstr "选项："
 
-#: ../gurpmi.pm:46 ../urpme:46 ../urpmf:35 ../urpmi:72 ../urpmi.addmedia:54
-#: ../urpmi.recover:33 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:45
+#: ../gurpmi.pm:46 ../urpm/search.pm:35 ../urpme:46 ../urpmf:35 ../urpmi:72
+#: ../urpmi.addmedia:54 ../urpmi.recover:33 ../urpmi.removemedia:40
+#: ../urpmi.update:32 ../urpmq:45
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
@@ -164,7 +165,7 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../gurpmi.pm:52 ../urpmf:41 ../urpmi:73 ../urpmq:47
+#: ../gurpmi.pm:52 ../urpm/search.pm:41 ../urpmf:41 ../urpmi:73 ../urpmq:47
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
@@ -212,7 +213,7 @@ msgstr "请稍候..."
 msgid "Must be root"
 msgstr "必须是 root"
 
-#: ../gurpmi2:102
+#: ../gurpmi2:103
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -223,42 +224,42 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:126
+#: ../gurpmi2:131
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../gurpmi2:126 ../urpmi:640
+#: ../gurpmi2:131 ../urpmi:640
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../gurpmi2:162
+#: ../gurpmi2:167
 #, c-format
 msgid " (to upgrade)"
 msgstr "(升级)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:168
 #, c-format
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:166
+#: ../gurpmi2:171
 #, c-format
 msgid "Package choice"
 msgstr "软件包选择"
 
-#: ../gurpmi2:167
+#: ../gurpmi2:172
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
 
-#: ../gurpmi2:191
+#: ../gurpmi2:196
 #, c-format
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: ../gurpmi2:213
+#: ../gurpmi2:218
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -269,60 +270,60 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:232 ../urpmi:607
+#: ../gurpmi2:237 ../urpmi:607
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:233 ../urpmi:608
+#: ../gurpmi2:238 ../urpmi:608
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:235
+#: ../gurpmi2:240
 #, c-format
 msgid "(%d package, %d MB)"
 msgid_plural "(%d packages, %d MB)"
 msgstr[0] "(%d 个软件包，%d MB)"
 
-#: ../gurpmi2:241
+#: ../gurpmi2:246
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:243 ../urpm/main_loop.pm:49
+#: ../gurpmi2:248 ../urpm/main_loop.pm:49
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:257 ../urpm/install.pm:88
+#: ../gurpmi2:262 ../urpm/install.pm:88
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../gurpmi2:261
+#: ../gurpmi2:266
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:278 ../urpmi:635
+#: ../gurpmi2:283 ../urpmi:635
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
 
-#: ../gurpmi2:289
+#: ../gurpmi2:294
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:308
+#: ../gurpmi2:320
 #, c-format
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:316 ../urpm/main_loop.pm:111
+#: ../gurpmi2:328 ../urpm/main_loop.pm:111
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -333,28 +334,28 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:322 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
+#: ../gurpmi2:334 ../urpm/main_loop.pm:223 ../urpm/main_loop.pm:241
 #: ../urpm/main_loop.pm:259 ../urpm/main_loop.pm:282
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../gurpmi2:327
+#: ../gurpmi2:339
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
 
-#: ../gurpmi2:329
+#: ../gurpmi2:341
 #, c-format
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:330 ../urpme:165
+#: ../gurpmi2:342 ../urpme:167
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:338 ../urpmi:702
+#: ../gurpmi2:350 ../urpmi:702
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -434,8 +435,8 @@ msgid "...retrieving done"
 msgstr "...获取完成"
 
 #: ../urpm.pm:283 ../urpm/download.pm:734 ../urpm/get_pkgs.pm:228
-#: ../urpm/media.pm:824 ../urpm/media.pm:1274 ../urpm/media.pm:1419
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:825 ../urpm/media.pm:1275 ../urpm/media.pm:1420
+#: ../urpm/media.pm:1474
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
@@ -475,52 +476,52 @@ msgstr "运行于限制模式运行时，禁止执行此操作"
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:299
+#: ../urpm/args.pm:298
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:376
+#: ../urpm/args.pm:375
 #, fuzzy, c-format
 msgid "unexpected expression %s"
 msgstr "模式表达式: \n"
 
-#: ../urpm/args.pm:377
+#: ../urpm/args.pm:376
 #, fuzzy, c-format
 msgid "missing expression before %s"
 msgstr "缺少签名(%s)"
 
-#: ../urpm/args.pm:383
+#: ../urpm/args.pm:382
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr ""
 
-#: ../urpm/args.pm:387
+#: ../urpm/args.pm:386
 #, fuzzy, c-format
 msgid "no expression to close"
 msgstr "模式表达式: \n"
 
-#: ../urpm/args.pm:396
+#: ../urpm/args.pm:395
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:464
+#: ../urpm/args.pm:463
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:483
+#: ../urpm/args.pm:482
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:486 ../urpm/args.pm:489 ../urpmq:157
+#: ../urpm/args.pm:485 ../urpm/args.pm:488 ../urpmq:157
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:497
+#: ../urpm/args.pm:496
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
@@ -947,217 +948,217 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update, --use-"
 "distrib 或 --parallel 一起使用"
 
-#: ../urpm/media.pm:654
+#: ../urpm/media.pm:655
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始: %s 结束: %s"
 
-#: ../urpm/media.pm:671
+#: ../urpm/media.pm:672
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm/media.pm:687
+#: ../urpm/media.pm:688
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm/media.pm:712
+#: ../urpm/media.pm:713
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm/media.pm:755
+#: ../urpm/media.pm:756
 #, c-format
 msgid "(ignored by default)"
 msgstr "(默认忽略)"
 
-#: ../urpm/media.pm:761
+#: ../urpm/media.pm:762
 #, c-format
 msgid "adding medium \"%s\" before remote medium \"%s\""
 msgstr "在远程介质“%2$s”之前添加介质“%1$s”"
 
-#: ../urpm/media.pm:767
+#: ../urpm/media.pm:768
 #, c-format
 msgid "adding medium \"%s\""
 msgstr "添加介质“%s”"
 
-#: ../urpm/media.pm:796
+#: ../urpm/media.pm:797
 #, c-format
 msgid "directory %s does not exist"
 msgstr "目录 %s 不存在"
 
-#: ../urpm/media.pm:804
+#: ../urpm/media.pm:805
 #, c-format
 msgid "this location doesn't seem to contain any distribution"
 msgstr "此位置似乎不包含任何发行版"
 
-#: ../urpm/media.pm:822
+#: ../urpm/media.pm:823
 #, c-format
 msgid "unable to parse media.cfg"
 msgstr "无法分析 media.cfg"
 
-#: ../urpm/media.pm:825
+#: ../urpm/media.pm:826
 #, c-format
 msgid "unable to access the distribution medium (no media.cfg file found)"
 msgstr "无法访问发行版介质(未发现 media.cfg 文件)"
 
-#: ../urpm/media.pm:843
+#: ../urpm/media.pm:844
 #, c-format
 msgid "skipping non compatible media `%s' (for %s)"
 msgstr "跳过不兼容的介质“%s”(原因是 %s)"
 
-#: ../urpm/media.pm:895
+#: ../urpm/media.pm:896
 #, c-format
 msgid "retrieving media.cfg file..."
 msgstr "正在获取 media.cfg 文件..."
 
-#: ../urpm/media.pm:936
+#: ../urpm/media.pm:937
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm/media.pm:939
+#: ../urpm/media.pm:940
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm/media.pm:959
+#: ../urpm/media.pm:960
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm/media.pm:1042
+#: ../urpm/media.pm:1043
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm/media.pm:1076
+#: ../urpm/media.pm:1077
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm/media.pm:1082
+#: ../urpm/media.pm:1083
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm/media.pm:1098
+#: ../urpm/media.pm:1099
 #, c-format
 msgid "Error generating names file: dependency %d not found"
 msgstr "生成命名文件出错：依赖关系 %d 未找到"
 
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
 #, c-format
 msgid "medium \"%s\" is up-to-date"
 msgstr "介质“%s”已为最新"
 
-#: ../urpm/media.pm:1130
+#: ../urpm/media.pm:1131
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm/media.pm:1150
+#: ../urpm/media.pm:1151
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm/media.pm:1163 ../urpm/media.pm:1246
+#: ../urpm/media.pm:1164 ../urpm/media.pm:1247
 #, c-format
 msgid "copying [%s] for medium \"%s\"..."
 msgstr "正在复制介质“%2$s”的 [%1$s]..."
 
-#: ../urpm/media.pm:1165 ../urpm/media.pm:1220 ../urpm/media.pm:1489
+#: ../urpm/media.pm:1166 ../urpm/media.pm:1221 ../urpm/media.pm:1490
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm/media.pm:1216
+#: ../urpm/media.pm:1217
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm/media.pm:1218 ../urpm/media.pm:1250
+#: ../urpm/media.pm:1219 ../urpm/media.pm:1251
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm/media.pm:1252
+#: ../urpm/media.pm:1253
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm/media.pm:1297
+#: ../urpm/media.pm:1298
 #, c-format
 msgid "computing md5sum of retrieved source synthesis"
 msgstr "正在计算所获取的源综合文件的 md5sum"
 
-#: ../urpm/media.pm:1299 ../urpm/media.pm:1739
+#: ../urpm/media.pm:1300 ../urpm/media.pm:1740
 #, c-format
 msgid "retrieval of [%s] failed (md5sum mismatch)"
 msgstr "获取[%s]失败(md5sum 不匹配)"
 
-#: ../urpm/media.pm:1314
+#: ../urpm/media.pm:1315
 #, c-format
 msgid "genhdlist2 failed on %s"
 msgstr "在 %s 上 genhdlist2 失败"
 
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
 #, c-format
 msgid "comparing %s and %s"
 msgstr "比较 %s 和 %s"
 
-#: ../urpm/media.pm:1349
+#: ../urpm/media.pm:1350
 #, c-format
 msgid "invalid hdlist file %s for medium \"%s\""
 msgstr "介质“%2$s”的 hdlist 文件 %1$s 无效"
 
-#: ../urpm/media.pm:1375
+#: ../urpm/media.pm:1376
 #, c-format
 msgid "copying MD5SUM file of \"%s\"..."
 msgstr "正在复制“%s”的 MD5SUM..."
 
-#: ../urpm/media.pm:1417
+#: ../urpm/media.pm:1418
 #, fuzzy, c-format
 msgid "invalid MD5SUM file (downloaded from %s)"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm/media.pm:1448
+#: ../urpm/media.pm:1449
 #, c-format
 msgid "retrieving source synthesis of \"%s\"..."
 msgstr "正在获取“%s”的源综合文件..."
 
-#: ../urpm/media.pm:1465
+#: ../urpm/media.pm:1466
 #, c-format
 msgid "found probed synthesis as %s"
 msgstr "发现探测的综合文件 为 %s"
 
-#: ../urpm/media.pm:1472 ../urpm/media.pm:1580
+#: ../urpm/media.pm:1473 ../urpm/media.pm:1581
 #, c-format
 msgid "no synthesis file found for medium \"%s\""
 msgstr "介质“%s”未发现综合文件"
 
-#: ../urpm/media.pm:1523
+#: ../urpm/media.pm:1524
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm/media.pm:1535
+#: ../urpm/media.pm:1536
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm/media.pm:1539
+#: ../urpm/media.pm:1540
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm/media.pm:1613
+#: ../urpm/media.pm:1614
 #, c-format
 msgid "updated medium \"%s\""
 msgstr "已更新介质“%s”"
 
-#: ../urpm/media.pm:1733
+#: ../urpm/media.pm:1734
 #, c-format
 msgid "retrieval of [%s] failed"
 msgstr "获取[%s]失败"
@@ -1189,7 +1190,7 @@ msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
 #: ../urpm/msg.pm:64 ../urpme:38 ../urpmi:568 ../urpmi:663 ../urpmi:669
-#: ../urpmi.addmedia:140
+#: ../urpmi.addmedia:141
 #, c-format
 msgid "Yy"
 msgstr "yY是"
@@ -1259,7 +1260,7 @@ msgstr "GB"
 msgid "TB"
 msgstr "TB"
 
-#: ../urpm/orphans.pm:305
+#: ../urpm/orphans.pm:307
 #, c-format
 msgid ""
 "The following package is now orphan, use \"urpme --auto-orphans\" to remove "
@@ -1341,264 +1342,7 @@ msgstr "正在装载 %s"
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm/select.pm:28
-#, c-format
-msgid "urpmi was restarted, and the list of priority packages did not change"
-msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
-
-#: ../urpm/select.pm:30
-#, c-format
-msgid ""
-"urpmi was restarted, and the list of priority packages did change: %s vs %s"
-msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
-
-#: ../urpm/select.pm:191
-#, c-format
-msgid "No package named %s"
-msgstr "没有叫做 %s 的软件包"
-
-#: ../urpm/select.pm:193 ../urpme:114
-#, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
-
-#: ../urpm/select.pm:296
-#, fuzzy, c-format
-msgid "found package(s) %s in urpmi db, but none are installed"
-msgstr "软件包 %s 无法安装"
-
-#: ../urpm/select.pm:539
-#, c-format
-msgid "Package %s is already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpm/select.pm:540
-#, c-format
-msgid "Packages %s are already installed"
-msgstr "软件包 %s 已经安装"
-
-#: ../urpm/select.pm:558 ../urpm/select.pm:609
-#, c-format
-msgid "due to missing %s"
-msgstr "原因是丢失 %s"
-
-#: ../urpm/select.pm:559
-#, c-format
-msgid "due to already installed %s"
-msgstr "原因是已经安装 %s"
-
-#: ../urpm/select.pm:560 ../urpm/select.pm:607
-#, c-format
-msgid "due to unsatisfied %s"
-msgstr "原因是不满足 %s"
-
-#: ../urpm/select.pm:566
-#, c-format
-msgid "trying to promote %s"
-msgstr "正在试图推广 %s"
-
-#: ../urpm/select.pm:567
-#, c-format
-msgid "in order to keep %s"
-msgstr "为了保留 %s"
-
-#: ../urpm/select.pm:603
-#, c-format
-msgid "in order to install %s"
-msgstr "为了安装 %s"
-
-#: ../urpm/select.pm:613
-#, c-format
-msgid "due to conflicts with %s"
-msgstr "原因是与 %s 冲突"
-
-#: ../urpm/signature.pm:29
-#, c-format
-msgid "Invalid signature (%s)"
-msgstr "无效的签名(%s)"
-
-#: ../urpm/signature.pm:60
-#, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "无效的密钥 ID(%s)"
-
-#: ../urpm/signature.pm:62
-#, c-format
-msgid "Missing signature (%s)"
-msgstr "缺少签名(%s)"
-
-#: ../urpm/sys.pm:156
-#, c-format
-msgid "system"
-msgstr ""
-
-#: ../urpm/sys.pm:191
-#, c-format
-msgid "You should restart %s for %s"
-msgstr ""
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't write file"
-msgstr "无法写入文件"
-
-#: ../urpm/sys.pm:276
-#, c-format
-msgid "Can't open file"
-msgstr "无法打开文件"
-
-#: ../urpm/sys.pm:289
-#, c-format
-msgid "Can't move file %s to %s"
-msgstr "无法将文件 %s 移动到 %s"
-
-#: ../urpme:41
-#, c-format
-msgid ""
-"urpme version %s\n"
-"Copyright (C) 1999-2008 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL.\n"
-"\n"
-"usage:\n"
-msgstr ""
-"urpmf 版本 %s\n"
-"版权 (C) 1999-2008 Mandriva。\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
-
-#: ../urpme:47
-#, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包。\n"
-
-#: ../urpme:48
-#, c-format
-msgid "  --auto-orphans - remove orphans\n"
-msgstr ""
-
-#: ../urpme:49
-#, c-format
-msgid "  --test         - verify if the removal can be achieved correctly.\n"
-msgstr "  --test         - 验证删除是否可以正确进行。\n"
-
-#: ../urpme:51 ../urpmi:109 ../urpmq:68
-#, c-format
-msgid "  --parallel     - distributed urpmi across machines of alias.\n"
-msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
-
-#: ../urpme:52 ../urpmi:141
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在删除之前重新对文件打包\n"
-
-#: ../urpme:53
-#, c-format
-msgid "  --root         - use another root for rpm removal.\n"
-msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
-
-#: ../urpme:54 ../urpmf:40 ../urpmi:111 ../urpmi.addmedia:71
-#: ../urpmi.recover:36 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:70
-#, c-format
-msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
-msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
-
-#: ../urpme:55
-#, c-format
-msgid "  --noscripts    - do not execute package scriptlet(s).\n"
-msgstr "  --noscripts    - 不执行软件包脚本。\n"
-
-#: ../urpme:56
-#, c-format
-msgid ""
-"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
-"                   to (un)install a chroot with --root option.\n"
-msgstr ""
-"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
-"                   下安装/卸载 chroot。\n"
-
-#: ../urpme:58 ../urpmi:152 ../urpmq:89
-#, c-format
-msgid "  --verbose, -v  - verbose mode.\n"
-msgstr "  --verbose, -v  - 详细提示。\n"
-
-#: ../urpme:59
-#, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
-
-#: ../urpme:72
-#, c-format
-msgid "Only superuser is allowed to remove packages"
-msgstr "只允许超级用户删除软件包"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown packages"
-msgstr "未知的软件包"
-
-#: ../urpme:105
-#, c-format
-msgid "unknown package"
-msgstr "未知的软件包"
-
-#: ../urpme:119
-#, fuzzy, c-format
-msgid "Removing the following package will break your system:"
-msgid_plural "Removing the following packages will break your system:"
-msgstr[0] "如果删除软件包 %s 会破坏您的系统"
-
-#: ../urpme:124
-#, c-format
-msgid "Nothing to remove"
-msgstr "不需要删除任何东西。"
-
-#: ../urpme:141
-#, fuzzy, c-format
-msgid "No orphans to remove"
-msgstr "不需要删除任何东西。"
-
-#: ../urpme:147
-#, c-format
-msgid "To satisfy dependencies, the following package will be removed"
-msgid_plural ""
-"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
-
-#: ../urpme:152
-#, fuzzy, c-format
-msgid "(orphan package)"
-msgid_plural "(orphan packages)"
-msgstr[0] "未知的软件包"
-
-#: ../urpme:159
-#, c-format
-msgid "Remove %d package?"
-msgid_plural "Remove %d packages?"
-msgstr[0] "删除 %d 个软件包吗?"
-
-#: ../urpme:159 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:143
-#, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
-
-#: ../urpme:164
-#, c-format
-msgid "testing removal of %s"
-msgstr ""
-
-#: ../urpme:178
-#, c-format
-msgid "Removal failed"
-msgstr "删除失败"
-
-#: ../urpme:180
-#, fuzzy, c-format
-msgid "Removal is possible"
-msgstr "删除失败"
-
-#: ../urpmf:29
+#: ../urpm/search.pm:29 ../urpmf:29
 #, c-format
 msgid ""
 "urpmf version %s\n"
@@ -1614,278 +1358,546 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:36
+#: ../urpm/search.pm:36 ../urpmf:36
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../urpmf:37 ../urpmi:132 ../urpmq:80
+#: ../urpm/search.pm:37 ../urpmf:37 ../urpmi:132 ../urpmq:80
 #, c-format
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpmf:38 ../urpmi:74 ../urpmq:49
+#: ../urpm/search.pm:38 ../urpmf:38 ../urpmi:74 ../urpmq:49
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:39
+#: ../urpm/search.pm:39 ../urpmf:39
 #, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr "  --literal, -l  - 不匹配模式，参数为字面字符串。\n"
 
-#: ../urpmf:42 ../urpmi:77 ../urpmq:50
+#: ../urpm/search.pm:40 ../urpme:54 ../urpmf:40 ../urpmi:111
+#: ../urpmi.addmedia:72 ../urpmi.recover:36 ../urpmi.removemedia:45
+#: ../urpmi.update:48 ../urpmq:70
+#, c-format
+msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
+msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
+
+#: ../urpm/search.pm:42 ../urpmf:42 ../urpmi:77 ../urpmq:50
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmf:43
+#: ../urpm/search.pm:43 ../urpmf:43
 #, c-format
 msgid "  --use-distrib  - use the given path to access media\n"
 msgstr "  --use-distrib  - 使用给定的路径访问介质\n"
 
-#: ../urpmf:44 ../urpmi:78 ../urpmq:51
+#: ../urpm/search.pm:44 ../urpmf:44 ../urpmi:78 ../urpmq:51
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:45
+#: ../urpm/search.pm:45 ../urpmf:45
 #, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不打印相同行。\n"
 
-#: ../urpmf:46 ../urpmi:75 ../urpmq:46
+#: ../urpm/search.pm:46 ../urpmf:46 ../urpmi:75 ../urpmq:46
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:47
+#: ../urpm/search.pm:47 ../urpmf:47
 #, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 详细提示。\n"
 
-#: ../urpmf:48
+#: ../urpm/search.pm:48 ../urpmf:48
 #, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmf:49
+#: ../urpm/search.pm:49 ../urpmf:49
 #, c-format
 msgid "  -I             - honor case distinctions in patterns (default).\n"
 msgstr "  -I             - 在模式中遵从大小写(默认值)。\n"
 
-#: ../urpmf:50
+#: ../urpm/search.pm:50 ../urpmf:50
 #, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr "  -F<字符串>     - 更改字段分隔符(默认为“:”)。\n"
 
-#: ../urpmf:51
+#: ../urpm/search.pm:51 ../urpmf:51
 #, c-format
 msgid "Pattern expressions:\n"
 msgstr "模式表达式: \n"
 
-#: ../urpmf:52
+#: ../urpm/search.pm:52 ../urpmf:52
 #, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr "  文本           - 任何文本都将被处理为正则表达式，除非使用了 -l。\n"
 
-#: ../urpmf:53
+#: ../urpm/search.pm:53 ../urpmf:53
 #, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmf:54
+#: ../urpm/search.pm:54 ../urpmf:54
 #, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 操作符。\n"
 
-#: ../urpmf:55
+#: ../urpm/search.pm:55 ../urpmf:55
 #, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 操作符。\n"
 
-#: ../urpmf:56
+#: ../urpm/search.pm:56 ../urpmf:56
 #, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT。\n"
 
-#: ../urpmf:57
+#: ../urpm/search.pm:57 ../urpmf:57
 #, c-format
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  ( )            - 左右括号。\n"
 
-#: ../urpmf:58
+#: ../urpm/search.pm:58 ../urpmf:58
 #, c-format
 msgid "List of tags:\n"
 msgstr "标记清单:\n"
 
-#: ../urpmf:59
+#: ../urpm/search.pm:59 ../urpmf:59
 #, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 指定类似 printf 的输出格式\n"
 
-#: ../urpmf:60
+#: ../urpm/search.pm:60 ../urpmf:60
 #, c-format
 msgid "                   example: '%%name:%%files'\n"
 msgstr "                   例如:“%%name:%%files”\n"
 
-#: ../urpmf:61
+#: ../urpm/search.pm:61 ../urpmf:61
 #, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 体系\n"
 
-#: ../urpmf:62
+#: ../urpm/search.pm:62 ../urpmf:62
 #, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 编译主机\n"
 
-#: ../urpmf:63
+#: ../urpm/search.pm:63 ../urpmf:63
 #, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 编译时间\n"
 
-#: ../urpmf:64
+#: ../urpm/search.pm:64 ../urpmf:64
 #, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 配置文件\n"
 
-#: ../urpmf:65
+#: ../urpm/search.pm:65 ../urpmf:65
 #, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - conflict 标签\n"
 
-#: ../urpmf:66
+#: ../urpm/search.pm:66 ../urpmf:66
 #, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description  - 软件包描述\n"
 
-#: ../urpmf:67
+#: ../urpm/search.pm:67 ../urpmf:67
 #, c-format
 msgid "  --distribution - distribution\n"
 msgstr "  --distribution - 发行版\n"
 
-#: ../urpmf:68
+#: ../urpm/search.pm:68 ../urpmf:68
 #, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 周期\n"
 
-#: ../urpmf:69
+#: ../urpm/search.pm:69 ../urpmf:69
 #, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --fiename      - 软件包文件名\n"
 
-#: ../urpmf:70
+#: ../urpm/search.pm:70 ../urpmf:70
 #, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出软件包中包含的文件\n"
 
-#: ../urpmf:71
+#: ../urpm/search.pm:71 ../urpmf:71
 #, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 分组\n"
 
-#: ../urpmf:72
+#: ../urpm/search.pm:72 ../urpmf:72
 #, c-format
 msgid "  --license      - license\n"
 msgstr "  --license      - 许可协议\n"
 
-#: ../urpmf:73
+#: ../urpm/search.pm:73 ../urpmf:73
 #, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name         - 软件包名称\n"
 
-#: ../urpmf:74
+#: ../urpm/search.pm:74 ../urpmf:74
 #, c-format
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - obsolets 标签\n"
 
-#: ../urpmf:75
+#: ../urpm/search.pm:75 ../urpmf:75
 #, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
-#: ../urpmf:76
+#: ../urpm/search.pm:76 ../urpmf:76
 #, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - provides 标签\n"
 
-#: ../urpmf:77
+#: ../urpm/search.pm:77 ../urpmf:77
 #, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - requires 标签\n"
 
-#: ../urpmf:78
+#: ../urpm/search.pm:78 ../urpmf:78
 #, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安装大小\n"
 
-#: ../urpmf:79
+#: ../urpm/search.pm:79 ../urpmf:79
 #, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 源 rpm 名称\n"
 
-#: ../urpmf:80
+#: ../urpm/search.pm:80 ../urpmf:80
 #, c-format
 msgid "  --suggests     - suggests tags\n"
 msgstr "  --suggests     - suggests 标签\n"
 
-#: ../urpmf:81
+#: ../urpm/search.pm:81 ../urpmf:81
 #, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
-#: ../urpmf:82
+#: ../urpm/search.pm:82 ../urpmf:82
 #, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - url\n"
 
-#: ../urpmf:83
+#: ../urpm/search.pm:83 ../urpmf:83
 #, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
-#: ../urpmf:84
+#: ../urpm/search.pm:84 ../urpmf:84
 #, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 软件包所在介质\n"
 
-#: ../urpmf:85 ../urpmq:99
+#: ../urpm/search.pm:85 ../urpmf:85 ../urpmq:99
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:153
-#, fuzzy, c-format
-msgid "unterminated expression (%s)"
-msgstr "模式表达式: \n"
-
-#: ../urpmf:198
+#: ../urpm/search.pm:197 ../urpmf:198
 #, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr "格式不对: 您只能使用一个多值标签"
 
-#: ../urpmf:248 ../urpmi:265 ../urpmq:165
+#: ../urpm/search.pm:247 ../urpmf:248 ../urpmi:265 ../urpmq:165
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:291
+#: ../urpm/search.pm:290 ../urpmf:291
 #, c-format
 msgid "no hdlist available for medium \"%s\""
 msgstr "介质“%s”的 hdlist 不可用"
 
-#: ../urpmf:298
+#: ../urpm/search.pm:297 ../urpmf:298
 #, c-format
 msgid "no synthesis available for medium \"%s\""
 msgstr "介质“%s”的综合文件不可用"
 
-#: ../urpmf:307
+#: ../urpm/search.pm:304 ../urpmf:307
 #, c-format
 msgid "no xml-info available for medium \"%s\""
 msgstr "介质“%s”没有可用的 xml-info"
 
+#: ../urpm/select.pm:28
+#, c-format
+msgid "urpmi was restarted, and the list of priority packages did not change"
+msgstr "urpmi 已经重新启动，而优先的软件包列表未更新"
+
+#: ../urpm/select.pm:30
+#, c-format
+msgid ""
+"urpmi was restarted, and the list of priority packages did change: %s vs %s"
+msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改：%s vs %s"
+
+#: ../urpm/select.pm:168
+#, c-format
+msgid "No package named %s"
+msgstr "没有叫做 %s 的软件包"
+
+#: ../urpm/select.pm:170 ../urpme:115
+#, c-format
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
+
+#: ../urpm/select.pm:172
+#, c-format
+msgid "You should use \"-a\" to use all of them"
+msgstr ""
+
+#: ../urpm/select.pm:300
+#, fuzzy, c-format
+msgid "found package(s) %s in urpmi db, but none are installed"
+msgstr "软件包 %s 无法安装"
+
+#: ../urpm/select.pm:543
+#, c-format
+msgid "Package %s is already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:544
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "软件包 %s 已经安装"
+
+#: ../urpm/select.pm:562 ../urpm/select.pm:613
+#, c-format
+msgid "due to missing %s"
+msgstr "原因是丢失 %s"
+
+#: ../urpm/select.pm:563
+#, c-format
+msgid "due to already installed %s"
+msgstr "原因是已经安装 %s"
+
+#: ../urpm/select.pm:564 ../urpm/select.pm:611
+#, c-format
+msgid "due to unsatisfied %s"
+msgstr "原因是不满足 %s"
+
+#: ../urpm/select.pm:570
+#, c-format
+msgid "trying to promote %s"
+msgstr "正在试图推广 %s"
+
+#: ../urpm/select.pm:571
+#, c-format
+msgid "in order to keep %s"
+msgstr "为了保留 %s"
+
+#: ../urpm/select.pm:607
+#, c-format
+msgid "in order to install %s"
+msgstr "为了安装 %s"
+
+#: ../urpm/select.pm:617
+#, c-format
+msgid "due to conflicts with %s"
+msgstr "原因是与 %s 冲突"
+
+#: ../urpm/signature.pm:29
+#, c-format
+msgid "Invalid signature (%s)"
+msgstr "无效的签名(%s)"
+
+#: ../urpm/signature.pm:60
+#, c-format
+msgid "Invalid Key ID (%s)"
+msgstr "无效的密钥 ID(%s)"
+
+#: ../urpm/signature.pm:62
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "缺少签名(%s)"
+
+#: ../urpm/sys.pm:156
+#, c-format
+msgid "system"
+msgstr ""
+
+#: ../urpm/sys.pm:191
+#, c-format
+msgid "You should restart %s for %s"
+msgstr ""
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't write file"
+msgstr "无法写入文件"
+
+#: ../urpm/sys.pm:276
+#, c-format
+msgid "Can't open file"
+msgstr "无法打开文件"
+
+#: ../urpm/sys.pm:289
+#, c-format
+msgid "Can't move file %s to %s"
+msgstr "无法将文件 %s 移动到 %s"
+
+#: ../urpme:41
+#, c-format
+msgid ""
+"urpme version %s\n"
+"Copyright (C) 1999-2008 Mandriva.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 1999-2008 Mandriva。\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
+
+#: ../urpme:47
+#, c-format
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包。\n"
+
+#: ../urpme:48
+#, c-format
+msgid "  --auto-orphans - remove orphans\n"
+msgstr ""
+
+#: ../urpme:49
+#, c-format
+msgid "  --test         - verify if the removal can be achieved correctly.\n"
+msgstr "  --test         - 验证删除是否可以正确进行。\n"
+
+#: ../urpme:51 ../urpmi:109 ../urpmq:68
+#, c-format
+msgid "  --parallel     - distributed urpmi across machines of alias.\n"
+msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
+
+#: ../urpme:52 ../urpmi:141
+#, c-format
+msgid "  --repackage    - Re-package the files before erasing\n"
+msgstr "  --repackage    - 在删除之前重新对文件打包\n"
+
+#: ../urpme:53
+#, c-format
+msgid "  --root         - use another root for rpm removal.\n"
+msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
+
+#: ../urpme:55 ../urpmi:101
+#, c-format
+msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
+msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
+
+#: ../urpme:56
+#, c-format
+msgid "  --noscripts    - do not execute package scriptlet(s).\n"
+msgstr "  --noscripts    - 不执行软件包脚本。\n"
+
+#: ../urpme:57
+#, c-format
+msgid ""
+"  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
+"  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
+"                   下安装/卸载 chroot。\n"
+
+#: ../urpme:59 ../urpmi:152 ../urpmq:89
+#, c-format
+msgid "  --verbose, -v  - verbose mode.\n"
+msgstr "  --verbose, -v  - 详细提示。\n"
+
+#: ../urpme:60
+#, c-format
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
+
+#: ../urpme:73
+#, c-format
+msgid "Only superuser is allowed to remove packages"
+msgstr "只允许超级用户删除软件包"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown packages"
+msgstr "未知的软件包"
+
+#: ../urpme:106
+#, c-format
+msgid "unknown package"
+msgstr "未知的软件包"
+
+#: ../urpme:121
+#, fuzzy, c-format
+msgid "Removing the following package will break your system:"
+msgid_plural "Removing the following packages will break your system:"
+msgstr[0] "如果删除软件包 %s 会破坏您的系统"
+
+#: ../urpme:126
+#, c-format
+msgid "Nothing to remove"
+msgstr "不需要删除任何东西。"
+
+#: ../urpme:143
+#, fuzzy, c-format
+msgid "No orphans to remove"
+msgstr "不需要删除任何东西。"
+
+#: ../urpme:149
+#, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
+
+#: ../urpme:154
+#, fuzzy, c-format
+msgid "(orphan package)"
+msgid_plural "(orphan packages)"
+msgstr[0] "未知的软件包"
+
+#: ../urpme:161
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "删除 %d 个软件包吗?"
+
+#: ../urpme:161 ../urpmi:569 ../urpmi:664 ../urpmi.addmedia:144
+#, c-format
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
+
+#: ../urpme:166
+#, c-format
+msgid "testing removal of %s"
+msgstr ""
+
+#: ../urpme:181
+#, c-format
+msgid "Removal failed"
+msgstr "删除失败"
+
+#: ../urpme:183
+#, fuzzy, c-format
+msgid "Removal is possible"
+msgstr "删除失败"
+
+#: ../urpmf:153
+#, fuzzy, c-format
+msgid "unterminated expression (%s)"
+msgstr "模式表达式: \n"
+
 #: ../urpmi:81
 #, c-format
 msgid "  --auto-update  - update media then upgrade the system.\n"
@@ -1971,11 +1983,6 @@ msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
 
-#: ../urpmi:101
-#, c-format
-msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
-msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
-
 #: ../urpmi:102
 #, c-format
 msgid ""
@@ -2292,7 +2299,7 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:143
+#: ../urpmi:516 ../urpmi:531 ../urpmi:628 ../urpmi.addmedia:144
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -2480,10 +2487,12 @@ msgstr "  --curl         - 用 crul 取远程文件。\n"
 
 #: ../urpmi.addmedia:65
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 创建一个更新介质。\n"
+msgid ""
+"  --update       - create an update medium, \n"
+"                   or discard non-update media (when used with --distrib)\n"
+msgstr ""
 
-#: ../urpmi.addmedia:66
+#: ../urpmi.addmedia:67
 #, c-format
 msgid ""
 "  --xml-info     - use the specific policy for downloading xml info files\n"
@@ -2494,111 +2503,111 @@ msgstr ""
 "                   以下中的一个: never, on-demand, update-only, always. cf "
 "urpmi.cfg(5)\n"
 
-#: ../urpmi.addmedia:68
+#: ../urpmi.addmedia:69
 #, c-format
 msgid "  --probe-synthesis - use synthesis file.\n"
 msgstr "  --probe-synthesis - 使用综合文件。\n"
 
-#: ../urpmi.addmedia:69
+#: ../urpmi.addmedia:70
 #, c-format
 msgid "  --probe-rpms   - use rpm files (instead of synthesis).\n"
 msgstr "  --probe-rpms   - 使用 rpm 文件(而不是综合文件)。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:71
 #, c-format
 msgid "  --no-probe     - do not try to find any synthesis file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件文件。\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:73
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:74
+#: ../urpmi.addmedia:75
 #, c-format
 msgid "  --interactive  - with --distrib, ask confirmation for each media\n"
 msgstr "  --interactive  - 对于 --distrib，请求每个介质的确认\n"
 
-#: ../urpmi.addmedia:75
+#: ../urpmi.addmedia:76
 #, c-format
 msgid "  --all-media    - with --distrib, add every listed media\n"
 msgstr "  --all-media    - 对于 --distrib，添加列出的每个介质\n"
 
-#: ../urpmi.addmedia:76
+#: ../urpmi.addmedia:77
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:78
+#: ../urpmi.addmedia:79
 #, c-format
 msgid "  --virtual      - create virtual media wich are always up-to-date.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质。\n"
 
-#: ../urpmi.addmedia:79 ../urpmi.update:44
+#: ../urpmi.addmedia:80 ../urpmi.update:44
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:80
+#: ../urpmi.addmedia:81
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不导入所添加介质的密钥\n"
 
-#: ../urpmi.addmedia:81
+#: ../urpmi.addmedia:82
 #, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 在配置中添加介质，但不进行更新。\n"
 
-#: ../urpmi.addmedia:82 ../urpmi.removemedia:43 ../urpmi.update:53
+#: ../urpmi.addmedia:83 ../urpmi.removemedia:43 ../urpmi.update:53
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi.addmedia:83 ../urpmi.removemedia:44 ../urpmi.update:54
+#: ../urpmi.addmedia:84 ../urpmi.removemedia:44 ../urpmi.update:54
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 详细的提示。\n"
 
-#: ../urpmi.addmedia:103
+#: ../urpmi.addmedia:104
 #, c-format
 msgid "known xml-info policies are %s"
 msgstr "已知的 xml-info 策略是 %s"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:115
 #, c-format
 msgid "no argument needed for --distrib --mirrorlist <url>"
 msgstr "没有参数需要于 --distrib --mirrorlist <url>"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "bad <url> (for local directory, the path must be absolute)"
 msgstr "无效的 <url> (如果是本地目录，必须是绝对路径)"
 
-#: ../urpmi.addmedia:123
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:126
+#: ../urpmi.addmedia:127
 #, c-format
 msgid "creating config file [%s]"
 msgstr "创建配置文件[%s]"
 
-#: ../urpmi.addmedia:127
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "no need to give <relative path of synthesis> with --distrib"
 msgstr "使用 --distrib 不需要提供 <综合文件的相对路径>"
 
-#: ../urpmi.addmedia:143
+#: ../urpmi.addmedia:144
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2607,17 +2616,17 @@ msgstr ""
 "\n"
 "您是否想要添加介质“%s”"
 
-#: ../urpmi.addmedia:169
+#: ../urpmi.addmedia:170
 #, c-format
 msgid "<relative path of synthesis> missing\n"
 msgstr "<综合文件的相对路径>找不到\n"
 
-#: ../urpmi.addmedia:172
+#: ../urpmi.addmedia:173
 #, c-format
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.addmedia:184
+#: ../urpmi.addmedia:185
 #, c-format
 msgid "unable to add medium"
 msgstr "无法添加介质"
@@ -2849,12 +2858,12 @@ msgstr "  -ff            - 强迫更新综合文件。\n"
 msgid "Only superuser is allowed to update media"
 msgstr "只允许超级用户更新介质"
 
-#: ../urpmi.update:77
+#: ../urpmi.update:78
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:87
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2863,17 +2872,17 @@ msgstr ""
 "找不到要升级的项\n"
 "(%s 中之一)\n"
 
-#: ../urpmi.update:99
+#: ../urpmi.update:102
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "ignoring media %s"
 msgstr "忽略介质 %s"
 
-#: ../urpmi.update:100
+#: ../urpmi.update:103
 #, c-format
 msgid "enabling media %s"
 msgstr "启用介质 %s"
@@ -3136,6 +3145,9 @@ msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何�
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
 
+#~ msgid "  --update       - create an update medium.\n"
+#~ msgstr "  --update       - 创建一个更新介质。\n"
+
 #~ msgid "malformed URL: [%s]"
 #~ msgstr "URL 格式错误: [%s]"