There is no space before a colon (:) in English,

updated pot and po files

1 files changed, 178 insertions, 133 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7e88959b..14dfabfa 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2002-11-28 20:30+0100\n"
+"POT-Creation-Date: 2002-11-29 14:16+0100\n"
 "PO-Revision-Date: 2002-11-28 23:29+0800\n"
 "Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -81,498 +81,504 @@ msgstr "%s 中定义了未知的协议"
 msgid "no webfetch (curl or wget currently) found\n"
 msgstr "没有发现下载工具(curl 或 wget) \n"
 
-#: ../urpm.pm_.c:217
+#: ../urpm.pm_.c:221
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
 
-#: ../urpm.pm_.c:220
+#: ../urpm.pm_.c:224
 msgid "wget is missing\n"
 msgstr "没有 wget\n"
 
-#: ../urpm.pm_.c:226
+#: ../urpm.pm_.c:230
 #, c-format
 msgid "wget failed: exited with %d or signal %d\n"
 msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm_.c:229
+#: ../urpm.pm_.c:233
 msgid "curl is missing\n"
 msgstr "没有 curl\n"
 
-#: ../urpm.pm_.c:286
+#: ../urpm.pm_.c:290
 #, c-format
 msgid "curl failed: exited with %d or signal %d\n"
 msgstr "curl 失败: 退出代码 %d, 信号 %d\n"
 
-#: ../urpm.pm_.c:290
+#: ../urpm.pm_.c:294 ../urpm.pm_.c:308
 msgid "rsync is missing\n"
 msgstr "没有 rsync\n"
 
-#: ../urpm.pm_.c:291
+#: ../urpm.pm_.c:295 ../urpm.pm_.c:309
 msgid "ssh is missing\n"
 msgstr "没有 ssh\n"
 
-#: ../urpm.pm_.c:301
+#: ../urpm.pm_.c:305 ../urpm.pm_.c:319
 #, c-format
 msgid "rsync failed: exited with %d or signal %d\n"
 msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm_.c:337 ../urpm.pm_.c:349
+#: ../urpm.pm_.c:355 ../urpm.pm_.c:367
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件的的 %s 行由语法错误"
 
-#: ../urpm.pm_.c:358
+#: ../urpm.pm_.c:376
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "介质“%s”试图使用一个已经使用的hdlist, 忽略介质"
 
-#: ../urpm.pm_.c:361
+#: ../urpm.pm_.c:379
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "介质“%s”试图使用已经使用的列表, 忽略介质"
 
-#: ../urpm.pm_.c:376
+#: ../urpm.pm_.c:394
 #, c-format
 msgid ""
 "unable to take care of medium \"%s\" as list file is already used by another "
 "medium"
 msgstr "无法处理介质“%s”, 其它介质在使用列表文件"
 
-#: ../urpm.pm_.c:382
+#: ../urpm.pm_.c:400
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "不能把这个介质命名为“%s”, 这个名字已经被使用"
 
-#: ../urpm.pm_.c:389
+#: ../urpm.pm_.c:407
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不能计算介质“%s”, 它的列表文件 [%s] 不存在"
 
-#: ../urpm.pm_.c:393
+#: ../urpm.pm_.c:411
 #, c-format
 msgid "unable to determine medium of this hdlist file [%s]"
 msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: ../urpm.pm_.c:402
+#: ../urpm.pm_.c:420
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的 hdlist 文件, 忽略该介质"
 
-#: ../urpm.pm_.c:404
+#: ../urpm.pm_.c:422
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "无法访问“%s”的列表文件, 忽略介质"
 
-#: ../urpm.pm_.c:418
+#: ../urpm.pm_.c:436
 #, c-format
 msgid "trying to bypass existing medium \"%s\", avoiding"
 msgstr "试图略过现有的介质“%s”, 避免"
 
-#: ../urpm.pm_.c:426
+#: ../urpm.pm_.c:444
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "无法找到“%s”的 hdlist 文件, 忽略这个介质"
 
-#: ../urpm.pm_.c:434
+#: ../urpm.pm_.c:452
 #, c-format
 msgid "unable to find list file for \"%s\", medium ignored"
 msgstr "无法找到“%s”的列表文件, 忽略该介质"
 
-#: ../urpm.pm_.c:455
+#: ../urpm.pm_.c:473
 #, c-format
 msgid "incoherent list file for \"%s\", medium ignored"
 msgstr "“%s”的列表文件不连贯, 忽略该介质"
 
-#: ../urpm.pm_.c:463
+#: ../urpm.pm_.c:481
 #, c-format
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "无法检查“%s”的列表文件, 忽略该介质"
 
-#: ../urpm.pm_.c:493
+#: ../urpm.pm_.c:511
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
 msgstr "可移动介质“%s”加载次数太多"
 
-#: ../urpm.pm_.c:494
+#: ../urpm.pm_.c:512
 #, c-format
 msgid "taking removable device as \"%s\""
 msgstr "把可移动设备当作“%s”"
 
-#: ../urpm.pm_.c:498
+#: ../urpm.pm_.c:516
 #, c-format
 msgid "using different removable device [%s] for \"%s\""
 msgstr "不同的可移动 [%s] 用于“%s”"
 
-#: ../urpm.pm_.c:502 ../urpm.pm_.c:505
+#: ../urpm.pm_.c:520 ../urpm.pm_.c:523
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "无法取得可移动介质“%s”的路径"
 
-#: ../urpm.pm_.c:518
+#: ../urpm.pm_.c:536
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件 [%s]"
 
-#: ../urpm.pm_.c:530
+#: ../urpm.pm_.c:548
 #, c-format
 msgid "write config file [%s]"
 msgstr "写入 [%s]"
 
-#: ../urpm.pm_.c:550
+#: ../urpm.pm_.c:568
 #, c-format
 msgid "unable to parse \"%s\" in file [%s]"
 msgstr "无法解读文件[%2$s]中的“%1$s”"
 
-#: ../urpm.pm_.c:561
+#: ../urpm.pm_.c:579
 #, c-format
 msgid "examining parallel handler in file [%s]"
 msgstr "检查文件 [%s] 中的并行处理"
 
-#: ../urpm.pm_.c:571
+#: ../urpm.pm_.c:589
 #, c-format
 msgid "found parallel handler for nodes: %s"
 msgstr "发现下列节点的并行处理: %s"
 
-#: ../urpm.pm_.c:575
-#, c-format
-msgid "using associated media for parallel mode : %s"
+#: ../urpm.pm_.c:593
+#, fuzzy, c-format
+msgid "using associated media for parallel mode: %s"
 msgstr "将相关的介质用于并行处理: %s"
 
-#: ../urpm.pm_.c:579
+#: ../urpm.pm_.c:597
 #, c-format
 msgid "unable to use parallel option \"%s\""
 msgstr "无法使用并行处理选项“%s”"
 
-#: ../urpm.pm_.c:589
+#: ../urpm.pm_.c:607
 msgid "--synthesis cannot be used with --media, --update or --parallel"
 msgstr "--synthesis 不能和 --media, --update 或 --parallel 一起使用"
 
-#: ../urpm.pm_.c:604 ../urpm.pm_.c:1181 ../urpm.pm_.c:1196 ../urpm.pm_.c:1337
+#: ../urpm.pm_.c:622 ../urpm.pm_.c:1199 ../urpm.pm_.c:1214 ../urpm.pm_.c:1355
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "检查 hdlist 文件 [%s]"
 
-#: ../urpm.pm_.c:608
+#: ../urpm.pm_.c:626
 #, c-format
 msgid "problem reading hdlist file of medium \"%s\""
 msgstr "读取“%s”的 hdlist 文件有问题"
 
-#: ../urpm.pm_.c:619 ../urpm.pm_.c:869 ../urpm.pm_.c:968 ../urpm.pm_.c:1124
-#: ../urpm.pm_.c:1186 ../urpm.pm_.c:1191 ../urpm.pm_.c:1262 ../urpm.pm_.c:1332
+#: ../urpm.pm_.c:637 ../urpm.pm_.c:887 ../urpm.pm_.c:986 ../urpm.pm_.c:1142
+#: ../urpm.pm_.c:1204 ../urpm.pm_.c:1209 ../urpm.pm_.c:1280 ../urpm.pm_.c:1350
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "检查综合文件 [%s]"
 
-#: ../urpm.pm_.c:623 ../urpm.pm_.c:873 ../urpm.pm_.c:971 ../urpm.pm_.c:1128
-#: ../urpm.pm_.c:1265
+#: ../urpm.pm_.c:641 ../urpm.pm_.c:891 ../urpm.pm_.c:989 ../urpm.pm_.c:1146
+#: ../urpm.pm_.c:1283
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "无法读取介质“%s”的综合文件"
 
-#: ../urpm.pm_.c:661
+#: ../urpm.pm_.c:679
 #, c-format
 msgid "medium \"%s\" already exists"
 msgstr "介质“%s”已经存在"
 
-#: ../urpm.pm_.c:689
+#: ../urpm.pm_.c:707
 #, c-format
 msgid "added medium %s"
 msgstr "添加介质 %s"
 
-#: ../urpm.pm_.c:704
+#: ../urpm.pm_.c:722
 msgid "unable to access first installation medium"
 msgstr "无法访问最初的安装介质"
 
-#: ../urpm.pm_.c:708
+#: ../urpm.pm_.c:726
 msgid "copying hdlists file..."
 msgstr "复制 hdlists..."
 
-#: ../urpm.pm_.c:710 ../urpm.pm_.c:929 ../urpm.pm_.c:937 ../urpm.pm_.c:985
+#: ../urpm.pm_.c:728 ../urpm.pm_.c:947 ../urpm.pm_.c:955 ../urpm.pm_.c:1003
 msgid "...copying done"
 msgstr "...复制完成"
 
-#: ../urpm.pm_.c:710 ../urpm.pm_.c:929 ../urpm.pm_.c:937 ../urpm.pm_.c:985
+#: ../urpm.pm_.c:728 ../urpm.pm_.c:947 ../urpm.pm_.c:955 ../urpm.pm_.c:1003
 msgid "...copying failed"
 msgstr "...复制失败"
 
-#: ../urpm.pm_.c:712 ../urpm.pm_.c:726 ../urpm.pm_.c:751
+#: ../urpm.pm_.c:730 ../urpm.pm_.c:744 ../urpm.pm_.c:769
 msgid ""
 "unable to access first installation medium (no Mandrake/base/hdlists file "
 "found)"
 msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
 
-#: ../urpm.pm_.c:718
+#: ../urpm.pm_.c:736
 msgid "retrieving hdlists file..."
 msgstr "取出 hdlists 文件..."
 
-#: ../urpm.pm_.c:720 ../urpm.pm_.c:1040 ../urpm.pm_.c:1093 ../urpm.pm_.c:2027
+#: ../urpm.pm_.c:738 ../urpm.pm_.c:1058 ../urpm.pm_.c:1111 ../urpm.pm_.c:1598
+#: ../urpm.pm_.c:2058
 msgid "...retrieving done"
 msgstr "...收取完成"
 
-#: ../urpm.pm_.c:722 ../urpm.pm_.c:1088 ../urpm.pm_.c:2030
+#: ../urpm.pm_.c:740 ../urpm.pm_.c:1106 ../urpm.pm_.c:1601 ../urpm.pm_.c:2061
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...收取失败: %s"
 
-#: ../urpm.pm_.c:742
+#: ../urpm.pm_.c:760
 #, c-format
 msgid "invalid hdlist description \"%s\" in hdlists file"
 msgstr "hdlist 文件中错误的描述“%s”"
 
-#: ../urpm.pm_.c:784
+#: ../urpm.pm_.c:802
 #, c-format
 msgid "trying to select inexistent medium \"%s\""
 msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpm.pm_.c:786
+#: ../urpm.pm_.c:804
 #, c-format
 msgid "\"%s\""
 msgstr "“%s”"
 
-#: ../urpm.pm_.c:786
+#: ../urpm.pm_.c:804
 #, c-format
 msgid "selecting multiple media: %s"
 msgstr "选择多个介质 %s"
 
-#: ../urpm.pm_.c:803
+#: ../urpm.pm_.c:821
 #, c-format
 msgid "removing medium \"%s\""
 msgstr "删除介质“%s”"
 
-#: ../urpm.pm_.c:849
+#: ../urpm.pm_.c:867
 msgid "urpmi database locked"
 msgstr "urpmi 数据库被锁定"
 
-#: ../urpm.pm_.c:897 ../urpm.pm_.c:1961
+#: ../urpm.pm_.c:915 ../urpm.pm_.c:1992
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质“%s”"
 
-#: ../urpm.pm_.c:927
+#: ../urpm.pm_.c:945
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "复制“%s”的描述文件"
 
-#: ../urpm.pm_.c:935
+#: ../urpm.pm_.c:953
 #, c-format
 msgid "copying source hdlist (or synthesis) of \"%s\"..."
 msgstr "复制源“%s”的 hdlist 或 synthesis..."
 
-#: ../urpm.pm_.c:940
+#: ../urpm.pm_.c:958
 #, c-format
 msgid "copy of [%s] failed"
 msgstr "拷贝 [%s] 失败"
 
-#: ../urpm.pm_.c:945 ../urpm.pm_.c:1103
+#: ../urpm.pm_.c:963 ../urpm.pm_.c:1121
 msgid "examining MD5SUM file"
 msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm_.c:983
+#: ../urpm.pm_.c:1001
 #, c-format
 msgid "copying source list of \"%s\"..."
 msgstr "复制“%s”的源文件列表"
 
-#: ../urpm.pm_.c:1000
+#: ../urpm.pm_.c:1018
 #, c-format
 msgid "reading rpm files from [%s]"
 msgstr "从 [%s] 读取 rpm 文件"
 
-#: ../urpm.pm_.c:1019
+#: ../urpm.pm_.c:1037
 #, c-format
 msgid "unable to read rpm files from [%s]: %s"
 msgstr "无法从 [%s] 读取 rpm 文件: %s"
 
-#: ../urpm.pm_.c:1024
+#: ../urpm.pm_.c:1042
 #, c-format
 msgid "no rpm files found from [%s]"
 msgstr "[%s] 没有发现rpm 文件"
 
-#: ../urpm.pm_.c:1037
+#: ../urpm.pm_.c:1055
 #, c-format
 msgid "retrieving description file of \"%s\"..."
 msgstr "获取“%s”的描述文件..."
 
-#: ../urpm.pm_.c:1049
+#: ../urpm.pm_.c:1067
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
 msgstr "获取“%s”的源 hdlist (synthesis)..."
 
-#: ../urpm.pm_.c:1153
+#: ../urpm.pm_.c:1171
 msgid "retrieve of source hdlist (or synthesis) failed"
 msgstr "获取源的 hdlist (或 synthesis)失败"
 
-#: ../urpm.pm_.c:1160
+#: ../urpm.pm_.c:1178
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "没有找到介质“%s”的 hdlist 文件"
 
-#: ../urpm.pm_.c:1172 ../urpm.pm_.c:1216
+#: ../urpm.pm_.c:1190 ../urpm.pm_.c:1234
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "文件 [%s] 已经被同样的介质“%s”使用"
 
-#: ../urpm.pm_.c:1203
+#: ../urpm.pm_.c:1221
 #, c-format
 msgid "unable to parse hdlist file of \"%s\""
 msgstr "无法分析hdlist文件“%s”"
 
-#: ../urpm.pm_.c:1239
+#: ../urpm.pm_.c:1257
 #, c-format
 msgid "unable to write list file of \"%s\""
 msgstr "无法写入列表文件“%s”"
 
-#: ../urpm.pm_.c:1246
+#: ../urpm.pm_.c:1264
 #, c-format
 msgid "writing list file for medium \"%s\""
 msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm_.c:1248
+#: ../urpm.pm_.c:1266
 #, c-format
 msgid "nothing written in list file for \"%s\""
 msgstr "“%s”没有写入列表文件"
 
-#: ../urpm.pm_.c:1297
+#: ../urpm.pm_.c:1315
 msgid "performing second pass to compute dependencies\n"
 msgstr "进行第二轮, 计算依赖性\n"
 
-#: ../urpm.pm_.c:1310
+#: ../urpm.pm_.c:1328
 #, c-format
 msgid "reading headers from medium \"%s\""
 msgstr "从介质“%s”读取软件包头信息"
 
-#: ../urpm.pm_.c:1315
+#: ../urpm.pm_.c:1333
 #, c-format
 msgid "building hdlist [%s]"
 msgstr "创建hdlist [%s]"
 
-#: ../urpm.pm_.c:1327 ../urpm.pm_.c:1346
+#: ../urpm.pm_.c:1345 ../urpm.pm_.c:1364
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "为介质“%s”创建 hdlist 综合文件"
 
-#: ../urpm.pm_.c:1364
+#: ../urpm.pm_.c:1382
 #, c-format
 msgid "found %d headers in cache"
 msgstr "缓存中有 %d 个文件头"
 
-#: ../urpm.pm_.c:1368
+#: ../urpm.pm_.c:1386
 #, c-format
 msgid "removing %d obsolete headers in cache"
 msgstr "从缓存删除 %d 过时的头"
 
-#: ../urpm.pm_.c:1524
+#: ../urpm.pm_.c:1542
 #, c-format
 msgid "mounting %s"
 msgstr "正在装配 %s"
 
-#: ../urpm.pm_.c:1536
+#: ../urpm.pm_.c:1554
 #, c-format
 msgid "unmounting %s"
 msgstr "正在拆卸 %s"
 
-#: ../urpm.pm_.c:1558
+#: ../urpm.pm_.c:1576
 #, c-format
 msgid "relocated %s entries in depslist"
 msgstr "在depslist中重新定位 %s"
 
-#: ../urpm.pm_.c:1559
+#: ../urpm.pm_.c:1577
 msgid "no entries relocated in depslist"
 msgstr "在depslist中没有重新定位的条目"
 
-#: ../urpm.pm_.c:1572
+#: ../urpm.pm_.c:1590
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "非法rpm文件 [%s]"
 
-#: ../urpm.pm_.c:1573 ../urpm.pm_.c:2140
+#: ../urpm.pm_.c:1596
+#, fuzzy, c-format
+msgid "retrieving rpm file [%s] ..."
+msgstr "正在从介质“%s”收取 rpm 文件..."
+
+#: ../urpm.pm_.c:1603 ../urpm.pm_.c:2171
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问rpm 文件[%s]"
 
-#: ../urpm.pm_.c:1577
+#: ../urpm.pm_.c:1608
 msgid "unable to register rpm file"
 msgstr "无法登记 rpm 文件"
 
-#: ../urpm.pm_.c:1580
+#: ../urpm.pm_.c:1611
 msgid "error registering local packages"
 msgstr "登记本地软件包出错"
 
-#: ../urpm.pm_.c:1669
+#: ../urpm.pm_.c:1700
 #, c-format
 msgid "no package named %s"
 msgstr "没有名为 %s 的软件包"
 
-#: ../urpm.pm_.c:1672
+#: ../urpm.pm_.c:1703
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
 
-#: ../urpm.pm_.c:1803 ../urpm.pm_.c:1835 ../urpm.pm_.c:1856
+#: ../urpm.pm_.c:1834 ../urpm.pm_.c:1866 ../urpm.pm_.c:1887
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "多个软件包是用相同的 rpm 文件名“%s”"
 
-#: ../urpm.pm_.c:1845
+#: ../urpm.pm_.c:1876
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "无法正确的解析 [%s] 的值“%s”"
 
-#: ../urpm.pm_.c:1866
+#: ../urpm.pm_.c:1897
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "介质“%s”没有定义 rpm 文件的任何位置"
 
-#: ../urpm.pm_.c:1875
+#: ../urpm.pm_.c:1906
 #, c-format
 msgid "package %s is not found."
 msgstr "没有找到软件包 %s."
 
-#: ../urpm.pm_.c:1922 ../urpm.pm_.c:1925 ../urpm.pm_.c:1946
+#: ../urpm.pm_.c:1953 ../urpm.pm_.c:1956 ../urpm.pm_.c:1977
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "介质“%s”没有选中"
 
-#: ../urpm.pm_.c:1939
+#: ../urpm.pm_.c:1970
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取rpm文件[%1$s]"
 
-#: ../urpm.pm_.c:1950
+#: ../urpm.pm_.c:1981
 #, c-format
 msgid "incoherent medium \"%s\" marked removable but not really"
 msgstr "不连贯的介质“%s”标记为可移动但其实不是"
 
-#: ../urpm.pm_.c:2015
+#: ../urpm.pm_.c:2046
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm_.c:2022
+#: ../urpm.pm_.c:2053
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”收取 rpm 文件..."
 
-#: ../urpm.pm_.c:2080
+#: ../urpm.pm_.c:2111
 msgid "Preparing..."
 msgstr "准备中..."
 
-#: ../urpm.pm_.c:2108
+#: ../urpm.pm_.c:2139
 #, c-format
 msgid "unable to remove package %s"
 msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm_.c:2114 ../urpm.pm_.c:2120
+#: ../urpm.pm_.c:2145 ../urpm.pm_.c:2151
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm_.c:2127
+#: ../urpm.pm_.c:2158
 #, c-format
 msgid "%s is needed by %s"
 msgstr "%s 是 %s 需要的"
 
-#: ../urpm.pm_.c:2128
+#: ../urpm.pm_.c:2159
 #, c-format
 msgid "%s conflicts with %s"
 msgstr "%s 与 %s 冲突"
@@ -611,8 +617,8 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpme_.c:47 ../urpmi.addmedia_.c:42 ../urpmi.removemedia_.c:36
-#: ../urpmi.update_.c:60 ../urpmi_.c:74 ../urpmq_.c:40
+#: ../urpme_.c:47 ../urpmi.addmedia_.c:43 ../urpmi.removemedia_.c:36
+#: ../urpmi.update_.c:61 ../urpmi_.c:74 ../urpmq_.c:40
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
 
@@ -661,7 +667,7 @@ msgstr "为满足相关性要求, 需要删除下列软件包 (%d MB)"
 #. Translator: and 'removable:' must not be translated!
 #. Translator: neither the ``with''.
 #. Translator: only what is between <brakets> can be translated.
-#: ../urpmi.addmedia_.c:33
+#: ../urpmi.addmedia_.c:34
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -683,15 +689,15 @@ msgstr ""
 "\n"
 "而 [options] 可以是\n"
 
-#: ../urpmi.addmedia_.c:43 ../urpmi.update_.c:61 ../urpmi_.c:90 ../urpmq_.c:56
+#: ../urpmi.addmedia_.c:44 ../urpmi.update_.c:62 ../urpmi_.c:90 ../urpmq_.c:56
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 用 wget 取远处的文件。\n"
 
-#: ../urpmi.addmedia_.c:44 ../urpmi.update_.c:62 ../urpmi_.c:91 ../urpmq_.c:57
+#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:63 ../urpmi_.c:91 ../urpmq_.c:57
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 用 crul 取远处的文件。\n"
 
-#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:63 ../urpmi_.c:92 ../urpmq_.c:58
+#: ../urpmi.addmedia_.c:46 ../urpmi.update_.c:64 ../urpmi_.c:92 ../urpmq_.c:58
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -699,7 +705,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理, 缺省的端口号是\n"
 "                   1080 (格式如 <proxyhost[:port]>)。\n"
 
-#: ../urpmi.addmedia_.c:47 ../urpmi.update_.c:65 ../urpmi_.c:94 ../urpmq_.c:60
+#: ../urpmi.addmedia_.c:48 ../urpmi.update_.c:66 ../urpmi_.c:94 ../urpmq_.c:60
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -707,29 +713,63 @@ msgstr ""
 "  --proxy-user   - 指定用于代理认证的用户和\n"
 "                   口令(格式如 <用户:口令>)。\n"
 
-#: ../urpmi.addmedia_.c:49
+#: ../urpmi.addmedia_.c:50
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmi.addmedia_.c:50
+#: ../urpmi.addmedia_.c:51
+#, fuzzy
 msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
 msgstr " --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpmi.addmedia_.c:51 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:68
+#: ../urpmi.addmedia_.c:53
+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 ""
+
+#: ../urpmi.addmedia_.c:56
+#, fuzzy, c-format
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr "  --env          - 使用指定的环境 (特别是进行故障报告时)。\n"
+
+#: ../urpmi.addmedia_.c:58
+msgid ""
+"  --version      - use specified version, the default is version of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+
+#: ../urpmi.addmedia_.c:60
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+
+#: ../urpmi.addmedia_.c:62 ../urpmi.removemedia_.c:38 ../urpmi.update_.c:70
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 直接清除软件包头缓存。\n"
 
-#: ../urpmi.addmedia_.c:52
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+#: ../urpmi.addmedia_.c:63
+#, fuzzy
+msgid ""
+"  -h             - try to find and use synthesis or hdlist\n"
+"                   file.\n"
 msgstr "  -h             - 使用综合文件或 hdlist 文件。\n"
 
-#: ../urpmi.addmedia_.c:53 ../urpmi.update_.c:70
+#: ../urpmi.addmedia_.c:65 ../urpmi.update_.c:72
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 强迫生成 hdlist 文件。\n"
 
-#: ../urpmi.addmedia_.c:95
+#: ../urpmi.addmedia_.c:130
+msgid "cannot add updates of a cooker distribution\n"
+msgstr ""
+
+#: ../urpmi.addmedia_.c:159
 #, c-format
 msgid ""
 "%s\n"
@@ -738,12 +778,12 @@ msgstr ""
 "%s\n"
 "使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia_.c:101 ../urpmi.addmedia_.c:118
+#: ../urpmi.addmedia_.c:166 ../urpmi.addmedia_.c:189
 #, c-format
 msgid "unable to update medium \"%s\"\n"
 msgstr "无法更新介质“%s”\n"
 
-#: ../urpmi.addmedia_.c:107
+#: ../urpmi.addmedia_.c:177
 #, c-format
 msgid ""
 "%s\n"
@@ -752,7 +792,7 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: ../urpmi.addmedia_.c:109
+#: ../urpmi.addmedia_.c:179
 #, c-format
 msgid ""
 "%s\n"
@@ -761,7 +801,7 @@ msgstr ""
 "%s\n"
 "“with”找不到ftp介质\n"
 
-#: ../urpmi.addmedia_.c:117
+#: ../urpmi.addmedia_.c:187
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "无法创建介质“%s”\n"
@@ -778,7 +818,7 @@ msgstr ""
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:71
+#: ../urpmi.removemedia_.c:39 ../urpmi.update_.c:73
 #, c-format
 msgid ""
 "\n"
@@ -800,7 +840,7 @@ msgstr ""
 "找不到要删除的项\n"
 "(%s中的一个)\n"
 
-#: ../urpmi.update_.c:58
+#: ../urpmi.update_.c:59
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -808,20 +848,25 @@ msgstr ""
 "用法: urpmi.update [选项] <名称> ...\n"
 "其中 <名称> 是要删除的介质名.\n"
 
-#: ../urpmi.update_.c:67
+#: ../urpmi.update_.c:68
+#, fuzzy
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - 只使用升级介质。\n"
+
+#: ../urpmi.update_.c:69
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpmi.update_.c:69
+#: ../urpmi.update_.c:71
 msgid ""
 "  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "  -d             - 强迫完成 depslist.ordered 文件的计算。\n"
 
-#: ../urpmi.update_.c:79
+#: ../urpmi.update_.c:81
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
 
-#: ../urpmi.update_.c:81
+#: ../urpmi.update_.c:93
 #, c-format
 msgid ""
 "the entry to update is missing\n"