merge new strings

1 files changed, 313 insertions, 301 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 94c0925b..afdd7d45 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 10.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-03 14:02+0100\n"
+"POT-Creation-Date: 2005-04-21 14:52+0200\n"
 "PO-Revision-Date: 2005-01-31 23:45+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrakelinux Simplified Chinese <cooker-i18n@linux-mandrake."
@@ -54,7 +54,7 @@ msgstr ""
 "自动安装软件包...\n"
 "您要求安装软件包 %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:465
+#: ../_irpm:33 ../urpme:29 ../urpmi:477
 #, c-format
 msgid "Is this OK?"
 msgstr "这样好了吗?"
@@ -69,7 +69,7 @@ msgstr "确定"
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:381 ../urpmi:399 ../urpmi:469
+#: ../_irpm:44 ../urpmi:383 ../urpmi:401 ../urpmi:481
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
@@ -186,7 +186,7 @@ msgstr "(升级)"
 msgid " (to install)"
 msgstr "(安装)"
 
-#: ../gurpmi2:120 ../urpmi:346
+#: ../gurpmi2:120 ../urpmi:348
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件包之一:"
@@ -227,12 +227,12 @@ msgstr ""
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../gurpmi2:185 ../urpmi:477 ../urpmq:305
+#: ../gurpmi2:185 ../urpmi:488 ../urpmq:306
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "无法读取源软件包，中止"
 
-#: ../gurpmi2:199 ../urpmi:488
+#: ../gurpmi2:199 ../urpmi:499
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请将标签为“%s”的介质插入到设备 [%s]"
@@ -256,7 +256,7 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../gurpmi2:249 ../gurpmi2:298 ../urpmi:559 ../urpmi:675
+#: ../gurpmi2:249 ../gurpmi2:298 ../urpmi:570 ../urpmi:688
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -267,12 +267,12 @@ msgstr ""
 "%s\n"
 "您可能需要更新您的 urpmi 数据库"
 
-#: ../gurpmi2:256 ../urpme:115 ../urpmi:600
+#: ../gurpmi2:256 ../urpme:116 ../urpmi:613
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:264 ../urpm.pm:2779
+#: ../gurpmi2:264 ../urpm.pm:2847
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
@@ -282,7 +282,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:284 ../urpmi:569 ../urpmi:613 ../urpmi:634 ../urpmi:654
+#: ../gurpmi2:284 ../urpmi:580 ../urpmi:626 ../urpmi:647 ../urpmi:667
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
@@ -292,7 +292,7 @@ msgstr "安装失败"
 msgid "_Done"
 msgstr "完成(_D)"
 
-#: ../gurpmi2:301 ../urpmi:691
+#: ../gurpmi2:301 ../urpmi:704
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "软件包已经安装"
@@ -331,149 +331,149 @@ msgstr "   -g [组]        - 限制结果为给定组。\n"
 msgid "                    defaults is %s.\n"
 msgstr "                    默认为 %s。\n"
 
-#: ../urpm.pm:68
+#: ../urpm.pm:71
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:101
+#: ../urpm.pm:104
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm.pm:117
+#: ../urpm.pm:120
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm:200
+#: ../urpm.pm:207
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpm.pm:201
+#: ../urpm.pm:208
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
 
-#: ../urpm.pm:214 ../urpm.pm:1240 ../urpm.pm:1250
+#: ../urpm.pm:221 ../urpm.pm:1285 ../urpm.pm:1295
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:217 ../urpm.pm:2398
+#: ../urpm.pm:224 ../urpm.pm:2469
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:245
+#: ../urpm.pm:254
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpm.pm:253
+#: ../urpm.pm:262
 #, c-format
 msgid ""
 "virtual medium \"%s\" should not have defined hdlist or list file, medium "
 "ignored"
 msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpm.pm:258
+#: ../urpm.pm:267
 #, c-format
 msgid "virtual medium \"%s\" should have a clear url, medium ignored"
 msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpm.pm:267
+#: ../urpm.pm:276
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpm.pm:274
+#: ../urpm.pm:283
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:296
+#: ../urpm.pm:307
 #, c-format
 msgid "inconsistent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpm.pm:304
+#: ../urpm.pm:315
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:344
+#: ../urpm.pm:355
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:345
+#: ../urpm.pm:356
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "将可移动设备认作“%s”"
 
-#: ../urpm.pm:349
-#, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
-
-#: ../urpm.pm:354
+#: ../urpm.pm:359
 #, c-format
 msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
 msgstr "介质“%s”是一个 ISO 映像，将会被实时挂载"
 
-#: ../urpm.pm:356 ../urpm.pm:359
+#: ../urpm.pm:362
+#, c-format
+msgid "using different removable device [%s] for \"%s\""
+msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
+
+#: ../urpm.pm:367 ../urpm.pm:370
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpm.pm:384
+#: ../urpm.pm:396
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:388
-#, c-format
-msgid "unable to write file [%s]"
-msgstr "无法写入文件[%s]"
-
-#: ../urpm.pm:395
+#: ../urpm.pm:406
 #, c-format
 msgid "wrote config file [%s]"
 msgstr "写入配置文件[%s]"
 
-#: ../urpm.pm:407
+#: ../urpm.pm:418
 #, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "无法与发行模式一起使用并行模式"
 
-#: ../urpm.pm:416
+#: ../urpm.pm:428
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm:426
+#: ../urpm.pm:440
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpm.pm:436
+#: ../urpm.pm:451
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "找到结点的并行处理: %s"
 
-#: ../urpm.pm:440
+#: ../urpm.pm:455
 #, c-format
 msgid "using associated media for parallel mode: %s"
 msgstr "并行模式时使用关联介质: %s"
 
-#: ../urpm.pm:444
+#: ../urpm.pm:459
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行选项“%s”"
 
-#: ../urpm.pm:455
+#: ../urpm.pm:467
+#, c-format
+msgid "there doesn't seem to be devices in the chroot in \"%s\""
+msgstr ""
+
+#: ../urpm.pm:473
 #, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -482,158 +482,157 @@ msgstr ""
 "--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
 "parallel 一起使用"
 
-#: ../urpm.pm:516 ../urpm.pm:542 ../urpm.pm:994 ../urpm.pm:1005
-#: ../urpm.pm:1077 ../urpm.pm:1094 ../urpm.pm:1164 ../urpm.pm:1223
-#: ../urpm.pm:1435 ../urpm.pm:1556 ../urpm.pm:1671 ../urpm.pm:1677
-#: ../urpm.pm:1777 ../urpm.pm:1862 ../urpm.pm:1866
+#: ../urpm.pm:534 ../urpm.pm:560 ../urpm.pm:1039 ../urpm.pm:1050
+#: ../urpm.pm:1122 ../urpm.pm:1139 ../urpm.pm:1209 ../urpm.pm:1268
+#: ../urpm.pm:1483 ../urpm.pm:1606 ../urpm.pm:1723 ../urpm.pm:1729
+#: ../urpm.pm:1832 ../urpm.pm:1917 ../urpm.pm:1921
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:520 ../urpm.pm:535 ../urpm.pm:548 ../urpm.pm:997 ../urpm.pm:1008
-#: ../urpm.pm:1083 ../urpm.pm:1089 ../urpm.pm:1169 ../urpm.pm:1227
-#: ../urpm.pm:1439 ../urpm.pm:1560 ../urpm.pm:1665 ../urpm.pm:1683
-#: ../urpm.pm:1872
+#: ../urpm.pm:538 ../urpm.pm:553 ../urpm.pm:566 ../urpm.pm:1042
+#: ../urpm.pm:1053 ../urpm.pm:1128 ../urpm.pm:1134 ../urpm.pm:1214
+#: ../urpm.pm:1272 ../urpm.pm:1487 ../urpm.pm:1610 ../urpm.pm:1717
+#: ../urpm.pm:1735 ../urpm.pm:1927
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm:530 ../urpm.pm:1001
+#: ../urpm.pm:548 ../urpm.pm:1046
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpm.pm:560
+#: ../urpm.pm:578
 #, c-format
 msgid "Search start: %s end: %s"
 msgstr "搜索开始：%s 结束：%s"
 
-#: ../urpm.pm:565 ../urpm.pm:1015 ../urpm.pm:1102 ../urpm.pm:1173
-#: ../urpm.pm:1564
+#: ../urpm.pm:583 ../urpm.pm:1060 ../urpm.pm:1147 ../urpm.pm:1218
+#: ../urpm.pm:1614
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpm.pm:571 ../urpm.pm:1815
+#: ../urpm.pm:589 ../urpm.pm:1870
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpm.pm:586
+#: ../urpm.pm:604
 #, c-format
 msgid "skipping package %s"
 msgstr "跳过软件包 %s"
 
-#: ../urpm.pm:599
+#: ../urpm.pm:617
 #, c-format
 msgid "would install instead of upgrade package %s"
 msgstr "将安装而非升级软件包 %s"
 
-#: ../urpm.pm:610 ../urpm.pm:2211 ../urpm.pm:2275 ../urpm.pm:2844
-#: ../urpm.pm:2958
+#: ../urpm.pm:628 ../urpm.pm:2277 ../urpm.pm:2341 ../urpm.pm:2912
+#: ../urpm.pm:3025
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:649
+#: ../urpm.pm:668
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:656
+#: ../urpm.pm:675
 #, c-format
 msgid "virtual medium needs to be local"
 msgstr "虚拟介质必须是本地的"
 
-#: ../urpm.pm:682
+#: ../urpm.pm:702
 #, c-format
 msgid "added medium %s"
 msgstr "已添加介质 %s"
 
-#: ../urpm.pm:709
+#: ../urpm.pm:744
 #, c-format
 msgid "unable to access first installation medium"
 msgstr "无法访问介质的首次安装"
 
-#: ../urpm.pm:713
+#: ../urpm.pm:748
 #, c-format
 msgid "copying hdlists file..."
 msgstr "正在复制 hdlists 文件..."
 
-#: ../urpm.pm:715 ../urpm.pm:1118 ../urpm.pm:1193
+#: ../urpm.pm:750 ../urpm.pm:1163 ../urpm.pm:1238
 #, c-format
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm:716 ../urpm.pm:1119 ../urpm.pm:1268 ../urpm.pm:1327
-#: ../urpm.pm:1503 ../urpm.pm:1510
+#: ../urpm.pm:751 ../urpm.pm:1164 ../urpm.pm:1313 ../urpm.pm:1372
+#: ../urpm.pm:1552 ../urpm.pm:1559
 #, c-format
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm:719 ../urpm.pm:743 ../urpm.pm:778
+#: ../urpm.pm:754 ../urpm.pm:779 ../urpm.pm:818
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "无法访问首次安装介质(未发现 hdlists 文件)"
 
-#: ../urpm.pm:726
+#: ../urpm.pm:761
 #, c-format
 msgid "retrieving hdlists file..."
 msgstr "正在获取 hdlists 文件..."
 
-#: ../urpm.pm:737 ../urpm.pm:1546 ../urpm.pm:2020 ../urpm.pm:2712
-#: ../urpmi.addmedia:167
+#: ../urpm.pm:773 ../urpm.pm:1596 ../urpm.pm:2086 ../urpm.pm:2780
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:739 ../urpm.pm:1530 ../urpm.pm:1539 ../urpm.pm:2023
-#: ../urpm.pm:2714 ../urpmi.addmedia:169
+#: ../urpm.pm:775 ../urpm.pm:1580 ../urpm.pm:1589 ../urpm.pm:2089
+#: ../urpm.pm:2782
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...获取失败: %s"
 
-#: ../urpm.pm:761
+#: ../urpm.pm:799
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:815
+#: ../urpm.pm:855
 #, c-format
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm:817
+#: ../urpm.pm:857
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:817 ../urpmi.update:94
+#: ../urpm.pm:857 ../urpmi.update:94
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm:833
+#: ../urpm.pm:873
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm:884
+#: ../urpm.pm:924
 #, c-format
 msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在从介质“%s”重新配置 urpmi"
 
-#: ../urpm.pm:913
+#: ../urpm.pm:953
 #, c-format
 msgid "...reconfiguration failed"
 msgstr "...重新配置失败"
 
-#: ../urpm.pm:920
+#: ../urpm.pm:960
 #, c-format
 msgid "reconfiguration done"
 msgstr "重新配置完成"
 
-#: ../urpm.pm:1055
+#: ../urpm.pm:1100
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
@@ -643,231 +642,231 @@ msgstr ""
 "无法访问介质“%s”，\n"
 "这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpm.pm:1106
+#: ../urpm.pm:1151
 #, c-format
 msgid ""
 "virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
 "ignored"
 msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpm.pm:1116
+#: ../urpm.pm:1161
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1140 ../urpm.pm:1411
+#: ../urpm.pm:1185 ../urpm.pm:1459
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1189
+#: ../urpm.pm:1234
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1203
+#: ../urpm.pm:1248
 #, c-format
 msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "复制 [%s] 失败(文件太小了)"
 
-#: ../urpm.pm:1208
+#: ../urpm.pm:1253
 #, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1210
+#: ../urpm.pm:1255
 #, c-format
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "复制[%s]失败(md5sum 不匹配)"
 
-#: ../urpm.pm:1231 ../urpm.pm:1443 ../urpm.pm:1780
+#: ../urpm.pm:1276 ../urpm.pm:1491 ../urpm.pm:1835
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1285
+#: ../urpm.pm:1330
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpm.pm:1300
+#: ../urpm.pm:1345
 #, c-format
 msgid "no rpms read"
 msgstr "没有读到 rpm"
 
-#: ../urpm.pm:1310
+#: ../urpm.pm:1355
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpm.pm:1315
+#: ../urpm.pm:1360
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1461
+#: ../urpm.pm:1509
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1488
+#: ../urpm.pm:1537
 #, c-format
 msgid "found probed hdlist (or synthesis) as %s"
 msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpm.pm:1537
+#: ../urpm.pm:1587
 #, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1539
+#: ../urpm.pm:1589
 #, c-format
 msgid "md5sum mismatch"
 msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1635
+#: ../urpm.pm:1687
 #, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpm.pm:1642
+#: ../urpm.pm:1694
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpm.pm:1653 ../urpm.pm:1707
+#: ../urpm.pm:1705 ../urpm.pm:1759
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1693
+#: ../urpm.pm:1745
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpm.pm:1730
+#: ../urpm.pm:1784
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入“%s”的列表文件"
 
-#: ../urpm.pm:1737
+#: ../urpm.pm:1792
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1739
+#: ../urpm.pm:1794
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../urpm.pm:1754
+#: ../urpm.pm:1809
 #, c-format
 msgid "examining pubkey file of \"%s\"..."
 msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpm.pm:1761
+#: ../urpm.pm:1816
 #, c-format
 msgid "...imported key %s from pubkey file of \"%s\""
 msgstr "...从公钥文件“%2$s”中导入了密钥 %1$s"
 
-#: ../urpm.pm:1764
+#: ../urpm.pm:1819
 #, c-format
 msgid "unable to import pubkey file of \"%s\""
 msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1829
+#: ../urpm.pm:1884
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1834
+#: ../urpm.pm:1889
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "正在创建 hdlist [%s]"
 
-#: ../urpm.pm:1849 ../urpm.pm:1884
+#: ../urpm.pm:1904 ../urpm.pm:1939
 #, c-format
 msgid ""
 "Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
 "corrupted."
 msgstr "无法创建介质“%s”的综合文件。您的 hdlist 文件可能已经损坏。"
 
-#: ../urpm.pm:1852 ../urpm.pm:1887 ../urpmi:303
+#: ../urpm.pm:1907 ../urpm.pm:1942 ../urpmi:305
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpm.pm:1908
+#: ../urpm.pm:1965
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1912
+#: ../urpm.pm:1969
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:1966
+#: ../urpm.pm:2025
 #, c-format
 msgid "mounting %s"
 msgstr "正在装载 %s"
 
-#: ../urpm.pm:1988
+#: ../urpm.pm:2047
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm:2012
+#: ../urpm.pm:2071
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:2018
+#: ../urpm.pm:2077
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:2025 ../urpm.pm:2886
+#: ../urpm.pm:2091
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:2030
+#: ../urpm.pm:2096
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:2033
+#: ../urpm.pm:2099
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:2057
+#: ../urpm.pm:2123
 #, c-format
 msgid "Search"
 msgstr "搜索"
 
-#: ../urpm.pm:2148
+#: ../urpm.pm:2214
 #, c-format
 msgid "no package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:2151 ../urpme:92
+#: ../urpm.pm:2216 ../urpme:92
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm:2335 ../urpm.pm:2379 ../urpm.pm:2405
+#: ../urpm.pm:2404 ../urpm.pm:2449 ../urpm.pm:2476
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpm.pm:2390
+#: ../urpm.pm:2460
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpm.pm:2417
+#: ../urpm.pm:2488
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -876,163 +875,163 @@ msgstr ""
 "介质“%s”使用了无效的列表文件:\n"
 "  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpm.pm:2421
+#: ../urpm.pm:2492
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:2433
+#: ../urpm.pm:2504
 #, c-format
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:2473 ../urpm.pm:2488 ../urpm.pm:2512 ../urpm.pm:2527
+#: ../urpm.pm:2544 ../urpm.pm:2559 ../urpm.pm:2583 ../urpm.pm:2598
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:2579 ../urpm.pm:2582 ../urpm.pm:2612
+#: ../urpm.pm:2651 ../urpm.pm:2656 ../urpm.pm:2682
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:2608
+#: ../urpm.pm:2678
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:2616
+#: ../urpm.pm:2686
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpm.pm:2628
+#: ../urpm.pm:2698
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm:2690
+#: ../urpm.pm:2757
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:2697
+#: ../urpm.pm:2764
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpm.pm:2817
+#: ../urpm.pm:2885
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:2848
+#: ../urpm.pm:2916
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:2851
+#: ../urpm.pm:2919
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm.pm:2858
+#: ../urpm.pm:2926
 #, c-format
 msgid "removing package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2860
+#: ../urpm.pm:2928
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:2870
+#: ../urpm.pm:2938
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpm.pm:2873
+#: ../urpm.pm:2941
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:2933
+#: ../urpm.pm:3000
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm.pm:3090 ../urpm.pm:3123
+#: ../urpm.pm:3162 ../urpm.pm:3195
 #, c-format
 msgid "due to missing %s"
 msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:3091 ../urpm.pm:3121
+#: ../urpm.pm:3163 ../urpm.pm:3193
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:3092
+#: ../urpm.pm:3164
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在试图推广 %s"
 
-#: ../urpm.pm:3093
+#: ../urpm.pm:3165
 #, c-format
 msgid "in order to keep %s"
 msgstr "为了保留 %s"
 
-#: ../urpm.pm:3116
+#: ../urpm.pm:3188
 #, c-format
 msgid "in order to install %s"
 msgstr "为了安装 %s"
 
-#: ../urpm.pm:3128
+#: ../urpm.pm:3200
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:3130
+#: ../urpm.pm:3202
 #, c-format
 msgid "unrequested"
 msgstr "未请求"
 
-#: ../urpm.pm:3146
+#: ../urpm.pm:3218
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:3178
+#: ../urpm.pm:3250
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "无效的密钥 ID(%s)"
 
-#: ../urpm.pm:3180
+#: ../urpm.pm:3252
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "缺少签名(%s)"
 
-#: ../urpm.pm:3229
+#: ../urpm.pm:3301
 #, c-format
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:3238
+#: ../urpm.pm:3312
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：%s 的 md5 校验和未在 MD5SUM 文件中找到"
 
-#: ../urpm/args.pm:91 ../urpm/args.pm:98
+#: ../urpm/args.pm:93 ../urpm/args.pm:100
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令的代理声明无效\n"
 
-#: ../urpm/args.pm:230
+#: ../urpm/args.pm:233
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/msg.pm:63
+#: ../urpm/msg.pm:77
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
@@ -1053,13 +1052,13 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:76 ../urpmi.addmedia:47
+#: ../urpme:41 ../urpmf:32 ../urpmi:77 ../urpmi.addmedia:43
 #: ../urpmi.removemedia:45 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpme:42 ../urpmi:83
+#: ../urpme:42 ../urpmi:84
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自动选中软件包。\n"
@@ -1069,13 +1068,13 @@ msgstr "  --auto         - 自动选中软件包。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 验证删除是否可以正确进行。\n"
 
-#: ../urpme:44 ../urpmi:97 ../urpmq:64
+#: ../urpme:44 ../urpmi:99 ../urpmq:64
 #, c-format
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpme:45 ../urpmi:102 ../urpmq:65
+#: ../urpme:45 ../urpmi:104 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
@@ -1094,7 +1093,7 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:49 ../urpmi:135 ../urpmi.addmedia:79 ../urpmi.removemedia:50
+#: ../urpme:49 ../urpmi:137 ../urpmi.addmedia:73 ../urpmi.removemedia:50
 #: ../urpmi.update:48 ../urpmq:90
 #, c-format
 msgid "  -v             - verbose mode.\n"
@@ -1120,33 +1119,33 @@ msgstr "未知的软件包"
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:97
+#: ../urpme:97 ../urpmi:416
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpme:99
+#: ../urpme:100
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:103
+#: ../urpme:104
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "检查删除下列软件包"
 
-#: ../urpme:110
+#: ../urpme:111
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "为满足相关性要求，需要删除下列%d个软件包(%d MB)"
 
-#: ../urpme:112 ../urpmi:423 ../urpmi:552
+#: ../urpme:113 ../urpmi:435 ../urpmi:563
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpme:119
+#: ../urpme:120
 #, c-format
 msgid "Removing failed"
 msgstr "删除失败"
@@ -1167,22 +1166,22 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmf:33 ../urpmi:77 ../urpmq:44
+#: ../urpmf:33 ../urpmi:78 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpmf:34 ../urpmi:78 ../urpmq:45
+#: ../urpmf:34 ../urpmi:79 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:35 ../urpmi:80 ../urpmq:47
+#: ../urpmf:35 ../urpmi:81 ../urpmq:47
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmf:36 ../urpmi:81 ../urpmq:48
+#: ../urpmf:36 ../urpmi:82 ../urpmq:48
 #, c-format
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
@@ -1293,7 +1292,7 @@ msgstr "  --conflicts    - 打印标签 conflicts: 所有的冲突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - 打印标签 obsoletes: 所有的废除。\n"
 
-#: ../urpmf:58 ../urpmi:117 ../urpmq:74
+#: ../urpmf:58 ../urpmi:119 ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1352,7 +1351,7 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmf:124 ../urpmi:198 ../urpmq:114
+#: ../urpmf:124 ../urpmi:200 ../urpmq:114
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
@@ -1369,7 +1368,7 @@ msgstr "注意：由于没有介质使用 hdlists 搜索，urpmf 无法返回任
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您可能想要使用 --name 来搜索软件包名称。\n"
 
-#: ../urpmi:71
+#: ../urpmi:72
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1385,32 +1384,37 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi:79 ../urpmq:46
+#: ../urpmi:80 ../urpmq:46
 #, c-format
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用给定介质来搜索请求(或更新的)的软件包。\n"
 
-#: ../urpmi:82
+#: ../urpmi:83
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmi:84 ../urpmq:50
+#: ../urpmi:85 ../urpmq:50
 #, c-format
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmi:85
+#: ../urpmi:86
 #, c-format
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpmi:86 ../urpmq:52
+#: ../urpmi:87
+#, fuzzy, c-format
+msgid "  --no-install   - don't install packages (only download)\n"
+msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
+
+#: ../urpmi:88
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1418,7 +1422,7 @@ msgid ""
 msgstr ""
 "  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi:88
+#: ../urpmi:90
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1428,56 +1432,56 @@ msgstr ""
 "  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
 "                   较小的交易。默认为 %d。\n"
 
-#: ../urpmi:91
+#: ../urpmi:93
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:92 ../urpmq:51
+#: ../urpmi:94 ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpmi:93 ../urpmq:60
+#: ../urpmi:95 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpmi:94
+#: ../urpmi:96
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpmi:95
+#: ../urpmi:97
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "   --clean       - 首先删除缓存中的 rpm。\n"
 
-#: ../urpmi:96
-#, c-format
+#: ../urpmi:98
+#, fuzzy, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmi:98
+#: ../urpmi:100
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允许要求用户不经过依赖性检验就安装软件包。\n"
 
-#: ../urpmi:100
+#: ../urpmi:102
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
 msgstr "  --allow-force  - 允许提示用户安装软件包而不检查依赖性和完整性。\n"
 
-#: ../urpmi:103
+#: ../urpmi:105
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一个 root 安装 rpm。\n"
 
-#: ../urpmi:104
+#: ../urpmi:106
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1486,22 +1490,22 @@ msgstr ""
 "  --use-distrib  - 配置 urpmi 实时从发行树中抓取，特别用于在 --root 选项\n"
 "                   下安装 chroot。\n"
 
-#: ../urpmi:106 ../urpmi.addmedia:48 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:108 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpmi:107 ../urpmi.addmedia:49 ../urpmi.update:32 ../urpmq:69
+#: ../urpmi:109 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmi:108 ../urpmi.addmedia:50 ../urpmi.update:33
+#: ../urpmi:110 ../urpmi.addmedia:46 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmi:109
+#: ../urpmi:111
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1510,7 +1514,7 @@ msgstr ""
 "  --resume       - 续传未下载完成的文件\n"
 "                   (--no-resume 禁用它，默认是禁用的)。\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:51 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:113 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1519,7 +1523,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理，默认的端口号是\n"
 "                   1080(格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:113 ../urpmi.addmedia:53 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:115 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1528,7 +1532,7 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   密码(格式如 <用户: 密码>)。\n"
 
-#: ../urpmi:115
+#: ../urpmi:117
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
@@ -1537,7 +1541,7 @@ msgstr ""
 "  --bug          - 输出故障报告\n"
 "                   下一个参数指定输出目录。\n"
 
-#: ../urpmi:119
+#: ../urpmi:121
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1546,28 +1550,28 @@ msgstr ""
 "  --verify-rpm   - 安装之前验证 rpm 签署。\n"
 "                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi:121
+#: ../urpmi:123
 #, c-format
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpmi:122
+#: ../urpmi:124
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmi:123
+#: ../urpmi:125
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpmi:124
+#: ../urpmi:126
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:125
+#: ../urpmi:127
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -1575,80 +1579,80 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:127 ../urpmi.addmedia:75 ../urpmi.update:41
+#: ../urpmi:129 ../urpmi.addmedia:68 ../urpmi.update:41
 #, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr "  --norebuild    - 如果 hdlist 不可读的话，不尝试重新创建。\n"
 
-#: ../urpmi:128
+#: ../urpmi:130
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:129 ../urpmq:77
+#: ../urpmi:131 ../urpmq:77
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:130
+#: ../urpmi:132
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
 
-#: ../urpmi:131
+#: ../urpmi:133
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不搜索提供标签中的软件包。\n"
 
-#: ../urpmi:132 ../urpmq:91
+#: ../urpmi:134 ../urpmq:91
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
 
-#: ../urpmi:133 ../urpmq:88
+#: ../urpmi:135 ../urpmq:88
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:134 ../urpmi.addmedia:78 ../urpmi.removemedia:49
+#: ../urpmi:136 ../urpmi.addmedia:72 ../urpmi.removemedia:49
 #: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安静模式。\n"
 
-#: ../urpmi:136
+#: ../urpmi:138
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:179
+#: ../urpmi:181
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi:188
+#: ../urpmi:190
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:189
+#: ../urpmi:191
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:192 ../urpmi:313
+#: ../urpmi:194 ../urpmi:315
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
 
-#: ../urpmi:209
+#: ../urpmi:211
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
 
-#: ../urpmi:218
+#: ../urpmi:220
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1657,12 +1661,12 @@ msgstr ""
 "错误：%s 似乎是以只读方式挂载的。\n"
 "请使用 --allow-force 强制操作。"
 
-#: ../urpmi:348
+#: ../urpmi:350
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:373
+#: ../urpmi:375
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1672,7 +1676,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本：\n"
 "%s"
 
-#: ../urpmi:381 ../urpmi:399
+#: ../urpmi:383 ../urpmi:401
 #, c-format
 msgid ""
 "\n"
@@ -1681,7 +1685,7 @@ msgstr ""
 "\n"
 "继续吗?"
 
-#: ../urpmi:392
+#: ../urpmi:394
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1690,7 +1694,7 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:412
+#: ../urpmi:424
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1700,7 +1704,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:417
+#: ../urpmi:429
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1709,21 +1713,21 @@ msgstr ""
 "要升级其它软件包，需要先删除下列软件包:\n"
 "%s"
 
-#: ../urpmi:452 ../urpmi:463
+#: ../urpmi:464 ../urpmi:475
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "为了满足依赖性要求，将另外安装以下%d个软件包(%d MB)"
 
-#: ../urpmi:453 ../urpmi:464
+#: ../urpmi:465 ../urpmi:476
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "为了满足依赖性要求，将另外安装下列软件包(%d MB)"
 
-#: ../urpmi:459
+#: ../urpmi:471
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1732,62 +1736,62 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpmi:489
+#: ../urpmi:500
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "准备好后按 Enter 键..."
 
-#: ../urpmi:543
+#: ../urpmi:554
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列软件包的签名有错误"
 
-#: ../urpmi:544
+#: ../urpmi:555
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您想继续安装吗?"
 
-#: ../urpmi:584
+#: ../urpmi:597
 #, c-format
 msgid "distributing %s"
 msgstr "正在分发 %s"
 
-#: ../urpmi:595
+#: ../urpmi:608
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../urpmi:597
+#: ../urpmi:610
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../urpmi:620
+#: ../urpmi:633
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpmi:639
+#: ../urpmi:652
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpmi:680
+#: ../urpmi:693
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 安装交易失败"
 
-#: ../urpmi:688
+#: ../urpmi:701
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安装"
 
-#: ../urpmi:707
+#: ../urpmi:720
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
 
-#: ../urpmi.addmedia:38
+#: ../urpmi.addmedia:34
 #, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
@@ -1811,53 +1815,43 @@ msgstr ""
 "\n"
 "而 [options] 可以来自\n"
 
-#: ../urpmi.addmedia:55
+#: ../urpmi.addmedia:51
 #, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmi.addmedia:56
+#: ../urpmi.addmedia:52
 #, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpmi.addmedia:57
+#: ../urpmi.addmedia:53
 #, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:58
+#: ../urpmi.addmedia:54
 #, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:60
+#: ../urpmi.addmedia:56
 #, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
 msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia:62
-#, c-format
-msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
-msgstr ""
-"  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
-"                   主要、贡献、更新或任何其它的配置。 ;-)\n"
-
-#: ../urpmi.addmedia:65
+#: ../urpmi.addmedia:58
 #, c-format
 msgid ""
 "  --from         - use specified url for list of mirrors, the default is\n"
 "                   %s\n"
 msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmi.addmedia:67
+#: ../urpmi.addmedia:60
 #, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
@@ -1868,7 +1862,7 @@ msgstr ""
 "release\n"
 "                   软件包确定。\n"
 
-#: ../urpmi.addmedia:70
+#: ../urpmi.addmedia:63
 #, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
@@ -1877,79 +1871,69 @@ msgstr ""
 "  --arch         - 使用指定的架构，默认值根据所安装的 mandrakelinux-release\n"
 "                   软件包确定。\n"
 
-#: ../urpmi.addmedia:72
+#: ../urpmi.addmedia:65
 #, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
 msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpmi.addmedia:74 ../urpmi.update:39
+#: ../urpmi.addmedia:67 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
 
-#: ../urpmi.addmedia:76 ../urpmi.removemedia:47 ../urpmi.update:45
+#: ../urpmi.addmedia:69
+#, c-format
+msgid "  --raw          - add the media in config, but don't update it.\n"
+msgstr ""
+
+#: ../urpmi.addmedia:70 ../urpmi.removemedia:47 ../urpmi.update:45
 #, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia:77 ../urpmi.update:46
+#: ../urpmi.addmedia:71 ../urpmi.update:46
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia:116
+#: ../urpmi.addmedia:83
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "无法更新介质“%s”\n"
+
+#: ../urpmi.addmedia:113
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只允许超级用户添加介质"
 
-#: ../urpmi.addmedia:119
+#: ../urpmi.addmedia:116
 #, c-format
 msgid "Will create config file [%s]"
 msgstr "将创建配置文件[%s]"
 
-#: ../urpmi.addmedia:120
+#: ../urpmi.addmedia:117
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "无法创建配置文件[%s]"
 
-#: ../urpmi.addmedia:149
-#, c-format
-msgid "found version %s and arch %s ..."
-msgstr "找到了版本 %s 架构 %s..."
-
-#: ../urpmi.addmedia:153
-#, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "无法添加 cooker 发行版的更新\n"
-
-#: ../urpmi.addmedia:158
-#, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "正在获取 %s 处的镜像..."
-
-#: ../urpmi.addmedia:211
+#: ../urpmi.addmedia:124
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:218 ../urpmi.addmedia:242
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法更新介质“%s”\n"
-
-#: ../urpmi.addmedia:229
+#: ../urpmi.addmedia:134
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 相对路径>找不到\n"
 
-#: ../urpmi.addmedia:231
+#: ../urpmi.addmedia:136
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr "“with”找不到网络介质\n"
 
-#: ../urpmi.addmedia:240
+#: ../urpmi.addmedia:152
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -2080,6 +2064,14 @@ msgstr ""
 "\n"
 "用法:\n"
 
+#: ../urpmq:52
+#, fuzzy, c-format
+msgid ""
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
+msgstr ""
+"  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
+
 #: ../urpmq:54
 #, c-format
 msgid "  --list         - list available packages.\n"
@@ -2207,17 +2199,37 @@ msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 仅能和 --parallel 一起使用"
 
-#: ../urpmq:340
+#: ../urpmq:342
 #, c-format
 msgid "skipping media %s: no hdlist\n"
 msgstr "跳过介质 %s：无 hdlist\n"
 
-#: ../urpmq:402
+#: ../urpmq:412
 #, c-format
 msgid "No filelist found\n"
 msgstr "没有找到文件列表\n"
 
-#: ../urpmq:412
+#: ../urpmq:422
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
+
+#~ msgid "unable to write file [%s]"
+#~ msgstr "无法写入文件[%s]"
+
+#~ msgid ""
+#~ "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+#~ "                   distribution, XXX may be main, contrib, updates or\n"
+#~ "                   anything else that has been configured ;-)\n"
+#~ msgstr ""
+#~ "  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
+#~ "                   主要、贡献、更新或任何其它的配置。 ;-)\n"
+
+#~ msgid "found version %s and arch %s ..."
+#~ msgstr "找到了版本 %s 架构 %s..."
+
+#~ msgid "cannot add updates of a cooker distribution\n"
+#~ msgstr "无法添加 cooker 发行版的更新\n"
+
+#~ msgid "retrieving mirrors at %s ..."
+#~ msgstr "正在获取 %s 处的镜像..."