Changed remaining gettext("foo $bar") into _("foo %s", $bar)

Added russian man pages
redo the way the *.pot file is created
rebuild *.po files

1 files changed, 941 insertions, 1003 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b39730b1..f4f4491b 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-08-13 16:00+0200\n"
+"POT-Creation-Date: 2002-08-24 02:19+0200\n"
 "PO-Revision-Date: 2002-8-15 15:00+0800\n"
 "Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
 "Language-Team: Chinese (GB) <future-cjk@mandrakesoft.com>\n"
@@ -17,1170 +17,854 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: _irpm:18
-msgid "installing $rpm\n"
-msgstr "正在安装 $rpm\n"
+#: ../_irpm_.c:23 ../urpmi_.c:495
+#, c-format
+msgid "installing %s\n"
+msgstr "正在安装 %s\n"
 
-#: _irpm:28
+#: ../_irpm_.c:33
+#, c-format
 msgid ""
 "Automatic installation of packages...\n"
-"You requested installation of package $rpm\n"
+"You requested installation of package %s\n"
 msgstr ""
 "自动安装软件包...\n"
-"你要求安装软件包 $rpm\n"
+"你要求安装软件包 %s\n"
 
-#: _irpm:28 po/placeholder.h:260 po/placeholder.h:377 po/placeholder.h:464
-#: urpme:32 urpmi:438
+#: ../_irpm_.c:33 ../urpme_.c:32 ../urpmi_.c:410
 msgid "Is it OK?"
 msgstr "这样好了吗?"
 
-#: _irpm:30 po/placeholder.h:250 po/placeholder.h:448 urpmi:375 urpmi:392
-#: urpmi:441 urpmi:469 urpmi:497
+#: ../_irpm_.c:35 ../urpmi_.c:347 ../urpmi_.c:364 ../urpmi_.c:413
+#: ../urpmi_.c:441 ../urpmi_.c:469
 msgid "Ok"
 msgstr "确认"
 
-#: _irpm:31 po/placeholder.h:212 po/placeholder.h:383 urpmi:376 urpmi:393
-#: urpmi:442 urpmi:470 urpmi:498
+#: ../_irpm_.c:36 ../urpmi_.c:348 ../urpmi_.c:365 ../urpmi_.c:414
+#: ../urpmi_.c:442 ../urpmi_.c:470
 msgid "Cancel"
 msgstr "取消"
 
-#. This is a list of chars acceptable as a 'no' answer to a Yes/No question;
-#. you can put here the letters for 'no' for your language, so people
-#. can hit those keys in their keyboard to reply.
-#. please keep the 'Nn' for compatibility reasons
-#.
-#: _irpm:37 po/placeholder.h:17 po/placeholder.h:230 po/placeholder.h:382
-#: po/placeholder.h:413 urpme:35 urpmi:380 urpmi:397 urpmi:446 urpmi:502
-#: urpmi:543
+#. Translator: Add here the keys which might be pressed in the "No"-case.
+#: ../_irpm_.c:42 ../urpme_.c:35 ../urpmi_.c:352 ../urpmi_.c:369
+#: ../urpmi_.c:418 ../urpmi_.c:474 ../urpmi_.c:522 placeholder.h:17
 msgid "Nn"
 msgstr "nN不否"
 
-#. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
-#. you can put here the letters for 'yes' for your language, so people
-#. can hit those keys in their keyboard to reply.
-#. please keep the 'Yy' for compatibility reasons
-#.
-#: _irpm:38 po/placeholder.h:11 po/placeholder.h:117 po/placeholder.h:375
-#: po/placeholder.h:415 urpme:37 urpmi:381 urpmi:398 urpmi:447 urpmi:503
-#: urpmi:544
+#. Translator: Add here the keys which might be pressed in the "Yes"-case.
+#: ../_irpm_.c:43 ../urpme_.c:37 ../urpmi_.c:353 ../urpmi_.c:370
+#: ../urpmi_.c:419 ../urpmi_.c:475 ../urpmi_.c:523 placeholder.h:11
 msgid "Yy"
 msgstr "yY是"
 
-#: _irpm:39 po/placeholder.h:253 po/placeholder.h:372 po/placeholder.h:452
-#: urpme:126 urpmi:382 urpmi:399 urpmi:448
+#: ../_irpm_.c:44 ../urpme_.c:126 ../urpmi_.c:354 ../urpmi_.c:371
+#: ../urpmi_.c:420
 msgid " (Y/n) "
 msgstr " (是(Y)/不(n)) [是] "
 
-#: _irpm:58
-msgid "$rpm: command not found\n"
-msgstr "$rpm: 命令没找到\n"
-
-#: po/placeholder.h:18 po/placeholder.h:198
+#: ../_irpm_.c:63
 #, c-format
-msgid "urpmf version %s"
-msgstr "urpmf 版本 %s"
-
-#: po/placeholder.h:19 po/placeholder.h:153
-msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+msgid "%s: command not found\n"
+msgstr "%s: 命令没找到\n"
 
-#: po/placeholder.h:20 po/placeholder.h:194
-msgid ""
-"This is free software and may be redistributed under the terms of the GNU "
-"GPL."
-msgstr "这是一个自由软件, 可以按照 GNU GPL 重新发布."
-
-#: po/placeholder.h:21 po/placeholder.h:38 po/placeholder.h:168
-msgid "usage: urpmf [options] <file>"
-msgstr "用法: rpmf [选项] <文件>"
-
-#: po/placeholder.h:22 po/placeholder.h:141
-msgid ""
-"  --quiet         - do not print tag name (default if no tag given on command"
-msgstr "  --quiet         - 不打印标题名称(如果没有在命令行指定标签,"
-
-#: po/placeholder.h:23 po/placeholder.h:195
-msgid "                    line, incompatible with interactive mode)."
-msgstr "\t\t缺省设置就是不打印, 与交互模是不兼容)"
-
-#: po/placeholder.h:24 po/placeholder.h:163
-msgid "  --all           - print all tags."
-msgstr "  --all           -打印全部标签."
-
-#: po/placeholder.h:25 po/placeholder.h:204
-msgid ""
-"  --name          - print tag name: rpm filename (assumed if no tag given on"
-msgstr "  --name          - 打印名称标签: rpm 文件名 (假设没有在命令行"
-
-#: po/placeholder.h:26 po/placeholder.h:208
-msgid "                    command line but without package name)."
-msgstr "\t\t给出标签，没有软件包名称"
-
-#: po/placeholder.h:27 po/placeholder.h:133
-msgid "  --group         - print tag group: group."
-msgstr "  --group         - 打印分组标签： 分组."
-
-#: po/placeholder.h:28 po/placeholder.h:115
-msgid "  --size          - print tag size: size."
-msgstr "  --size          - 打印大小标签: 大小"
-
-#: po/placeholder.h:29 po/placeholder.h:173
-msgid "  --serial        - print tag serial: serial."
-msgstr "  --serial        - 打印序列号标签: serial."
-
-#: po/placeholder.h:30 po/placeholder.h:186
-msgid "  --summary       - print tag summary: summary."
-msgstr "  --summary       - 打印摘要标签: 摘要"
-
-#: po/placeholder.h:31 po/placeholder.h:157
-msgid "  --description   - print tag description: description."
-msgstr "  --description   -打印描述标签: 描述"
-
-#: po/placeholder.h:32 po/placeholder.h:177
-msgid "  --provides      - print tag provides: all provides (multiple lines)."
-msgstr "  --provides      - 打印提供标签: 提供的所有程序"
-
-#: po/placeholder.h:33 po/placeholder.h:241
-msgid "  --requires      - print tag requires: all requires (multiple lines)."
-msgstr "  --requires      - 打印需要标签: 需要得所有程序"
-
-#: po/placeholder.h:34 po/placeholder.h:55
-msgid "  --files         - print tag files: all files (multiple lines)."
-msgstr "  --files         - 打印文件标签：所有的文件．"
-
-#: po/placeholder.h:35 po/placeholder.h:47
-msgid ""
-"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
-msgstr "  --conflicts     - 打印冲突标签：所有的冲突"
-
-#: po/placeholder.h:36 po/placeholder.h:137
-msgid ""
-"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
-msgstr "  --obsoletes     - 打印废除标签：所有被废除的包"
-
-#: po/placeholder.h:37 po/placeholder.h:165
-msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
-msgstr "  --prereqs       - 打印前提条件标签：前提条件"
-
-#: po/placeholder.h:39 po/placeholder.h:85
-msgid "try urpmf --help for more options"
-msgstr "尝试 urpmf --help 了解更多选项"
-
-#: po/placeholder.h:40 po/placeholder.h:66
-msgid "no full media list was found"
-msgstr "没有找到完整的介质清单"
-
-#: po/placeholder.h:41 po/placeholder.h:272
+#. Translator: the %s here is a program name
+#: ../urpm.pm_.c:178
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "无法写入配置文件 [%s]"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "未知 webfetch `%s' !!!\n"
 
-#: po/placeholder.h:42 po/placeholder.h:273 urpm.pm:1891
+#: ../urpm.pm_.c:197
 #, c-format
-msgid "%s conflicts with %s"
-msgstr "%s 与 %s 冲突"
-
-#: po/placeholder.h:43
-msgid "examining whole urpmi database"
-msgstr "检查整个 urpmi 数据库"
+msgid "unknown protocol defined for %s"
+msgstr "%s 中定义了未知的协议"
 
-#: po/placeholder.h:44
-msgid "  -y             - impose fuzzy search.\n"
-msgstr "  -y             - 利用模糊搜索.\n"
+#: ../urpm.pm_.c:206
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "没有发现下载工具(curl 或 wget) \n"
 
-#: po/placeholder.h:45 po/placeholder.h:276
+#: ../urpm.pm_.c:218
 #, c-format
-msgid "nothing to write in list file for \"%s\""
-msgstr " \"%s\" 没有需要写入列表文件"
+msgid "unable to handle protocol: %s"
+msgstr "无法处理协议: %s"
+
+#: ../urpm.pm_.c:221
+msgid "wget is missing\n"
+msgstr "没有 wget\n"
 
-#: po/placeholder.h:46 po/placeholder.h:278 urpm.pm:429
+#: ../urpm.pm_.c:227
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "无法找到 \"%s\" 的列表文件, 忽略该介质"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget 失败: 退出代码%d 或信号 %d\n"
 
-#: po/placeholder.h:48 po/placeholder.h:403
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包.\n"
+#: ../urpm.pm_.c:230
+msgid "curl is missing\n"
+msgstr "没有 curl\n"
 
-#: po/placeholder.h:49 po/placeholder.h:279
+#: ../urpm.pm_.c:287
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "无法分析hdlist文件 \"%s\""
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl 失败: 退出代码 %d, 信号 %d\n"
 
-#: po/placeholder.h:50 po/placeholder.h:280
-#, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "\"%s\"没有写入列表文件"
+#: ../urpm.pm_.c:291
+msgid "rsync is missing\n"
+msgstr "没有 rsync\n"
 
-#: po/placeholder.h:51 po/placeholder.h:583
-msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - 下载前给出所有的源文件包 (root 专用).\n"
+#: ../urpm.pm_.c:292
+msgid "ssh is missing\n"
+msgstr "没有 ssh\n"
 
-#: po/placeholder.h:52 po/placeholder.h:282
+#: ../urpm.pm_.c:302
 #, c-format
-msgid "retrieving description file of \"%s\"..."
-msgstr "找回 \"%s\" 的描述文件..."
-
-#: po/placeholder.h:53
-msgid ""
-"  --auto-select  - automatically select packages for upgrading the system.\n"
-msgstr "  --auto-select  - 自动选择升级系统需要的软件包.\n"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
-#: po/placeholder.h:54 po/placeholder.h:284 urpm.pm:1661
+#: ../urpm.pm_.c:338 ../urpm.pm_.c:350
 #, c-format
-msgid "package %s is not found."
-msgstr "没有找到软件包 %s."
+msgid "syntax error in config file at line %s"
+msgstr "配置文件的的 %s 行由语法错误"
 
-#: po/placeholder.h:56
+#: ../urpm.pm_.c:359
 #, c-format
-msgid "trying to select multiple media: %s"
-msgstr "试图选择多个介质: %s\""
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "介质 \"%s\" 试图使用一个已经使用的hdlist, 忽略介质"
 
-#: po/placeholder.h:57
+#: ../urpm.pm_.c:362
 #, c-format
-msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
-msgstr "介质 \"%s\" 试图使用已经存在的 hdlist, 忽略介质"
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "介质 \"%s\" 试图使用已经使用的列表, 忽略介质"
 
-#: po/placeholder.h:58 po/placeholder.h:288
+#: ../urpm.pm_.c:377
 #, c-format
-msgid "selecting multiple media: %s"
-msgstr "选择多个介质\"%s\""
-
-#: po/placeholder.h:59 po/placeholder.h:426
-msgid "  --verify-rpm   - verify rpm signature before installation.\n"
-msgstr "  --verify-rpm   - 安装之前验证 rpm 签署.\n"
-
-#: po/placeholder.h:60
-msgid "problem reading hdlist file, trying again"
-msgstr "读取 hdlist 文件有问题，正在重新尝试"
+msgid ""
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "无法处理介质 \"%s\", 其它介质在使用列表文件"
 
-#: po/placeholder.h:61 po/placeholder.h:289 urpm.pm:382
+#: ../urpm.pm_.c:383
 #, c-format
 msgid "unable to use name \"%s\" for unnamed medium because it is already used"
 msgstr "不能把这个介质命名为 \"%s\", 这个名字已经被使用"
 
-#: po/placeholder.h:62 po/placeholder.h:371 urpme:53
-msgid "unknown package(s) "
-msgstr "未知的软件包"
-
-#: po/placeholder.h:63 po/placeholder.h:292 urpm.pm:389
+#: ../urpm.pm_.c:390
 #, c-format
 msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
 msgstr "不能计算介质 \"%s\", 它的列表文件 [%s] 不存在"
 
-#: po/placeholder.h:64
-msgid "keeping only files referenced in provides"
-msgstr "只保留提供标签中提到的文件"
-
-#: po/placeholder.h:65 po/placeholder.h:293
+#: ../urpm.pm_.c:394
 #, c-format
-msgid "found %d headers in cache"
-msgstr "缓存中有 %d 个文件头"
-
-#: po/placeholder.h:67 po/placeholder.h:439 po/placeholder.h:563
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - 下一个软件包是源程序包, (和 -s 一样).\n"
-
-#: po/placeholder.h:68 po/placeholder.h:486 urpmi.addmedia:96
-#: urpmi.addmedia:113
-#, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法更新介质\"%s\"\n"
-
-#: po/placeholder.h:69 po/placeholder.h:441
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - 保留缓存中没有使用的rpm.\n"
-
-#: po/placeholder.h:70 po/placeholder.h:491 po/placeholder.h:529
-#: po/placeholder.h:548
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - 直接清除软件包头缓存.\n"
-
-#: po/placeholder.h:71 po/placeholder.h:295 urpm.pm:196
-#, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s 中定义了未知的协议"
-
-#: po/placeholder.h:72 po/placeholder.h:296
-#, c-format
-msgid "medium \"%s\" already exists"
-msgstr "介质 \"%s\" 已经存在"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "无法判断 hdlist文件的介质 [%s]"
 
-#: po/placeholder.h:73 po/placeholder.h:297
+#: ../urpm.pm_.c:403
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "无法写入 列表文件\"%s\""
-
-#: po/placeholder.h:74 po/placeholder.h:574
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  需要在命令行给出名称或 rpm 文件.\n"
-
-#: po/placeholder.h:75 po/placeholder.h:446 po/placeholder.h:580
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - 自动选择升级系统的软件包.\n"
-
-#: po/placeholder.h:76 po/placeholder.h:299 urpm.pm:177
-msgid "Unknown webfetch `$proxy->{type}' !!!\n"
-msgstr "未知 webfetch `$proxy->{type}' !!!\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "无法访问 \"%s\" 的 hdlist 文件, 忽略该介质"
 
-#: po/placeholder.h:77 po/placeholder.h:300 urpm.pm:1536
+#: ../urpm.pm_.c:405
 #, c-format
-msgid "no package named %s"
-msgstr "没有名为 %s 的软件包"
-
-#: po/placeholder.h:78 po/placeholder.h:447 urpmi:553
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "无法访问 \"%s\"的列表文件, 忽略介质"
 
-#: po/placeholder.h:79 po/placeholder.h:302
+#: ../urpm.pm_.c:419
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "为介质\"%s\"创建 hdlist 综合文件"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "试图略过现有的介质 \"%s\", 避免"
 
-#: po/placeholder.h:80 po/placeholder.h:303 urpm.pm:424
+#: ../urpm.pm_.c:425
 #, c-format
 msgid "unable to find hdlist file for \"%s\", medium ignored"
 msgstr "无法找到 \"%s\"的 hdlist 文件, 忽略这个介质"
 
-#: po/placeholder.h:81 po/placeholder.h:304
-msgid "urpmi database locked"
-msgstr "urpmi 数据库已经锁定"
-
-#: po/placeholder.h:82 po/placeholder.h:305
+#: ../urpm.pm_.c:430
 #, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "文件 [%s] 已经被同样的介质 \"%s\"使用"
-
-#: po/placeholder.h:83 po/placeholder.h:373 po/placeholder.h:451 urpme:64
-#: urpmi:504
-msgid " (y/N) "
-msgstr " (y/N) "
-
-#: po/placeholder.h:84 po/placeholder.h:455
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - 在命令行选择所有匹配.\n"
-
-#: po/placeholder.h:86
-msgid ""
-"some packages have to be removed for being upgraded, this is not supported "
-"yet\n"
-msgstr "有些软件包要求先删除再升级, 暂不支持\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "无法找到 \"%s\" 的列表文件, 忽略该介质"
 
-#: po/placeholder.h:87 po/placeholder.h:308 urpm.pm:1403
+#: ../urpm.pm_.c:449
 #, c-format
-msgid "mounting %s"
-msgstr "正在安装 %s"
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "\"%s\" 的列表文件不连贯, 忽略该介质"
 
-#: po/placeholder.h:88 po/placeholder.h:312 urpm.pm:226
+#: ../urpm.pm_.c:457
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失败: 退出代码%d 或信号 %d\n"
-
-#: po/placeholder.h:89 po/placeholder.h:509 po/placeholder.h:553
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - 强迫生成 hdlist 文件.\n"
-
-#: po/placeholder.h:90 po/placeholder.h:520 urpmi.removemedia:47
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "没有可删除的(用urpmi.addmedia增加介质)\n"
-
-#: po/placeholder.h:91 po/placeholder.h:466
-msgid "  --env          - use specific environment (typically a bug report).\n"
-msgstr "  --env          - 使用指定的环境 (特别是进行故障报告时).\n"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "无法检查 \"%s\" 的列表文件, 忽略该介质"
 
-#: po/placeholder.h:92 po/placeholder.h:316 urpm.pm:1791
+#: ../urpm.pm_.c:488
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "输入格式错误: [%s]"
-
-#: po/placeholder.h:93 po/placeholder.h:469 po/placeholder.h:603
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样).\n"
-
-#: po/placeholder.h:94 po/placeholder.h:319 urpm.pm:291
-msgid "ssh is missing\n"
-msgstr "没有 ssh\n"
-
-#: po/placeholder.h:95 po/placeholder.h:318
-msgid "...copying failed"
-msgstr "...复制失败"
-
-#: po/placeholder.h:96
-msgid "Press Enter when it's done..."
-msgstr "准备好后按 Enter 键..."
+msgid "too many mount points for removable medium \"%s\""
+msgstr "可移动介质 \"%s\" 加载次数太多"
 
-#: po/placeholder.h:97 po/placeholder.h:475 urpmi:326
+#: ../urpm.pm_.c:489
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一才能安装 %s:"
-
-#: po/placeholder.h:98
-msgid ""
-"  -u             - remove package if a better version is already installed.\n"
-msgstr "  -u             - 如果已经安装了更好的版本, 删除软件包.\n"
+msgid "taking removable device as \"%s\""
+msgstr "把可移动设备当作 \"%s\""
 
-#: po/placeholder.h:99
+#: ../urpm.pm_.c:493
 #, c-format
-msgid "medium \"%s\" tries to use an already used list, medium ignored"
-msgstr "介质 \"%s\" 试图使用一个使用中的列表，忽略介质"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "不同的可移动 [%s] 用于 \"%s\""
 
-#: po/placeholder.h:100 po/placeholder.h:322 urpm.pm:1873
+#: ../urpm.pm_.c:497 ../urpm.pm_.c:500
 #, c-format
-msgid "unable to remove package %s"
-msgstr "无法删除软件包 %s"
-
-#: po/placeholder.h:101 po/placeholder.h:564
-msgid "  -h             - print this help message.\n"
-msgstr "  -h             - 打印帮助信息.\n"
-
-#: po/placeholder.h:102 po/placeholder.h:530
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - 选择所有介质.\n"
-
-#: po/placeholder.h:103
-msgid "  -g             - print groups too with name.\n"
-msgstr "  -g             - 和名称一起打印分组.\n"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "无法取得可移动介质 \"%s\" 的路径"
 
-#: po/placeholder.h:104 po/placeholder.h:328
+#: ../urpm.pm_.c:513
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlist 文件中错误的描述 \"%s\""
-
-#: po/placeholder.h:105 po/placeholder.h:566
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - 和名称一起打印版本和发行号.\n"
-
-#: po/placeholder.h:106 po/placeholder.h:493
-msgid "  -h             - try to find and use synthesis or hdlist file.\n"
-msgstr "  -h             - 使用综合文件或 hdlist 文件\n"
-
-#: po/placeholder.h:107
-msgid "  -r             - print version and release too with name.\n"
-msgstr "  -r             - 和名称一起打印版本和发行号.\n"
+msgid "unable to write config file [%s]"
+msgstr "无法写入配置文件 [%s]"
 
-#: po/placeholder.h:108
-msgid "  --auto         - automatically select a good package in choices.\n"
-msgstr "  --auto         - 自动选择软件包.\n"
+#: ../urpm.pm_.c:525
+#, c-format
+msgid "write config file [%s]"
+msgstr "写入 [%s]"
 
-#: po/placeholder.h:109 po/placeholder.h:581
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 和名称一起打印版本, 发行号和平台.\n"
+#: ../urpm.pm_.c:539
+msgid "--synthesis cannot be used with --media, --update or --parallel"
+msgstr ""
 
-#: po/placeholder.h:110
+#: ../urpm.pm_.c:555 ../urpm.pm_.c:1138 ../urpm.pm_.c:1153 ../urpm.pm_.c:1283
 #, c-format
-msgid "unable to parse correctly [%s]"
-msgstr "无法正确分析 [%s]"
+msgid "examining hdlist file [%s]"
+msgstr "检查 hdlist 文件 [%s]"
 
-#: po/placeholder.h:111
+#: ../urpm.pm_.c:559
 #, c-format
-msgid "read synthesis file [%s]"
-msgstr "读取综合文件 [%s]"
-
-#: po/placeholder.h:112 po/placeholder.h:560 urpmi.update:78
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
-
-#: po/placeholder.h:113 po/placeholder.h:333 urpm.pm:205
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "没有发现下载工具(curl 或 wget) \n"
-
-#: po/placeholder.h:114 po/placeholder.h:584
-msgid ""
-"  -c             - choose complete method for resolving requires closure.\n"
-msgstr "  -c             - 采用完成方法解决需求.\n"
+msgid "problem reading hdlist file of medium \"%s\""
+msgstr "读取 \"%s\"的 hdlist 文件有问题"
 
-#: po/placeholder.h:116 po/placeholder.h:507 urpmi.addmedia:112
+#: ../urpm.pm_.c:570 ../urpm.pm_.c:864 ../urpm.pm_.c:946 ../urpm.pm_.c:1081
+#: ../urpm.pm_.c:1143 ../urpm.pm_.c:1148 ../urpm.pm_.c:1210 ../urpm.pm_.c:1278
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质\"%s\"\n"
-
-#: po/placeholder.h:118 po/placeholder.h:376 urpme:85
-msgid "unknown package "
-msgstr "未知的软件包"
+msgid "examining synthesis file [%s]"
+msgstr "检查综合文件 [%s]"
 
-#: po/placeholder.h:119 po/placeholder.h:336
+#: ../urpm.pm_.c:574 ../urpm.pm_.c:868 ../urpm.pm_.c:949 ../urpm.pm_.c:1085
+#: ../urpm.pm_.c:1213
 #, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "复制源 \"%s\" 的 hdlist 或 synthesis..."
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "无法读取介质\"%s\"的综合文件"
 
-#: po/placeholder.h:120 po/placeholder.h:379 urpme:42
-msgid "usage: urpme [-a] [--auto] <packages...>\n"
-msgstr "用法: urpmi [-a] [--auto] <软件包列表...>\n"
+#: ../urpm.pm_.c:607
+#, fuzzy, c-format
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:121 po/placeholder.h:588 urpmq:122
-#, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+#: ../urpm.pm_.c:618
+#, fuzzy, c-format
+msgid "examining parallel handler in file [%s]"
+msgstr "检查 hdlist 文件 [%s]"
 
-#: po/placeholder.h:122 po/placeholder.h:338
-#, c-format
-msgid "building hdlist [%s]"
-msgstr "创建hdlist [%s]"
+#: ../urpm.pm_.c:628
+#, fuzzy, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "列表文件 %s"
 
-#: po/placeholder.h:123 po/placeholder.h:340 urpm.pm:1718
+#: ../urpm.pm_.c:632
+#, fuzzy, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "无法更新介质\"%s\"\n"
+
+#: ../urpm.pm_.c:653
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
+msgid "medium \"%s\" already exists"
+msgstr "介质 \"%s\" 已经存在"
 
-#: po/placeholder.h:124 po/placeholder.h:341
+#: ../urpm.pm_.c:684
 #, c-format
 msgid "added medium %s"
 msgstr "添加介质 %s"
 
-#: po/placeholder.h:125 po/placeholder.h:420 po/placeholder.h:598
-msgid "  --media        - use only the media listed by comma.\n"
-msgstr "  --media        - 只使用列出的介质.\n"
+#: ../urpm.pm_.c:699
+msgid "unable to access first installation medium"
+msgstr "无法访问最初的安装介质"
 
-#: po/placeholder.h:126 po/placeholder.h:342
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "获取源的 hdlist (或 synthesis)失败"
+#: ../urpm.pm_.c:703
+msgid "copying hdlists file..."
+msgstr "复制 hdlists..."
 
-#: po/placeholder.h:127 po/placeholder.h:345 urpm.pm:1803
-#, c-format
-msgid "...retrieving failed: %s"
-msgstr "...收取失败: %s"
+#: ../urpm.pm_.c:705 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
+msgid "...copying done"
+msgstr "...复制完成"
 
-#: po/placeholder.h:128 po/placeholder.h:433
+#: ../urpm.pm_.c:705 ../urpm.pm_.c:923 ../urpm.pm_.c:931 ../urpm.pm_.c:964
+msgid "...copying failed"
+msgstr "...复制失败"
+
+#: ../urpm.pm_.c:707 ../urpm.pm_.c:721 ../urpm.pm_.c:746
 msgid ""
-"  --bug          - output a bug report in directory indicated by next arg.\n"
-msgstr "  --bug          - 在指定的目录中输出故障报告.\n"
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
 
-#: po/placeholder.h:129 po/placeholder.h:346 urpm.pm:1845
-msgid "Preparing..."
-msgstr "准备中..."
+#: ../urpm.pm_.c:713
+msgid "retrieving hdlists file..."
+msgstr "取出 hdlists 文件..."
 
-#: po/placeholder.h:130 po/placeholder.h:347 urpm.pm:1734
-#, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "不连贯的介质 \"%s\" 标记为可移动但其实不是"
+#: ../urpm.pm_.c:715 ../urpm.pm_.c:1019 ../urpm.pm_.c:1071 ../urpm.pm_.c:1895
+msgid "...retrieving done"
+msgstr "...收取完成"
 
-#: po/placeholder.h:131 po/placeholder.h:350 urpm.pm:1441
+#: ../urpm.pm_.c:717 ../urpm.pm_.c:1066 ../urpm.pm_.c:1897
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "非法rpm文件 [%s]"
+msgid "...retrieving failed: %s"
+msgstr "...收取失败: %s"
 
-#: po/placeholder.h:132
+#: ../urpm.pm_.c:737
 #, c-format
-msgid "unknown data associated with %s"
-msgstr "有关 %s 的未知数据"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlist 文件中错误的描述 \"%s\""
 
-#: po/placeholder.h:134 po/placeholder.h:442 urpmi:335
+#: ../urpm.pm_.c:779
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:  (1-%d) "
+msgid "trying to select inexistent medium \"%s\""
+msgstr "试图选择不存在的介质\"%s\""
 
-#: po/placeholder.h:135 po/placeholder.h:353 urpm.pm:404
+#: ../urpm.pm_.c:781
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "无法访问 \"%s\"的列表文件, 忽略介质"
-
-#: po/placeholder.h:136 po/placeholder.h:443 po/placeholder.h:492
-#: po/placeholder.h:554 po/placeholder.h:565
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - 用 wget 取远处的文件.\n"
-
-#: po/placeholder.h:138 po/placeholder.h:444 urpmi:489
-msgid "The following packages have bad signatures"
-msgstr "下列软件包的签署有错误"
+msgid "\"%s\""
+msgstr "\"%s\""
 
-#: po/placeholder.h:139
+#: ../urpm.pm_.c:781
 #, c-format
-msgid "avoid selecting %s as not enough files will be updated"
-msgstr "避免选择 %s 没有足够的文件将被更新"
+msgid "selecting multiple media: %s"
+msgstr "选择多个介质\"%s\""
 
-#: po/placeholder.h:140 po/placeholder.h:354 urpm.pm:1442 urpm.pm:1903
+#: ../urpm.pm_.c:798
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "无法访问rpm 文件[%s]"
+msgid "removing medium \"%s\""
+msgstr "删除介质\"%s\""
 
-#: po/placeholder.h:142 po/placeholder.h:355 urpm.pm:1427
-#, c-format
-msgid "relocated %s entries in depslist"
-msgstr "在depslist中重新定位 %s"
+#: ../urpm.pm_.c:844
+msgid "urpmi database locked"
+msgstr "urpmi 数据库已经锁定"
 
-#: po/placeholder.h:143 po/placeholder.h:356 urpm.pm:1745
+#: ../urpm.pm_.c:888 ../urpm.pm_.c:890 ../urpm.pm_.c:1839
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "无法访问介质\"%s\""
 
-#: po/placeholder.h:144 po/placeholder.h:450 urpmi:338
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起, 选择无效, 请再试一次\n"
-
-#: po/placeholder.h:145 po/placeholder.h:454 po/placeholder.h:508
-#: po/placeholder.h:543 po/placeholder.h:587
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - 用 crul 取远处的文件.\n"
-
-#: po/placeholder.h:146
+#: ../urpm.pm_.c:921
 #, c-format
-msgid "unable to parse correctly [%s] on value \"%s\""
-msgstr "无法正确处理 [%s] 的值 \"%s\""
-
-#: po/placeholder.h:147 po/placeholder.h:357
-#, c-format
-msgid "trying to select inexistent medium \"%s\""
-msgstr "试图选择不存在的介质\"%s\""
+msgid "copying description file of \"%s\"..."
+msgstr "复制 \"%s\" 的描述文件"
 
-#: po/placeholder.h:148 po/placeholder.h:360
+#: ../urpm.pm_.c:929
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] 没有发现rpm 文件"
-
-#: po/placeholder.h:149 po/placeholder.h:463 urpmi:490
-msgid "Do you want to continue installation ?"
-msgstr "您想继续安装吗?"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "复制源 \"%s\" 的 hdlist 或 synthesis..."
 
-#: po/placeholder.h:150 po/placeholder.h:468 urpmi:185
+#: ../urpm.pm_.c:934
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "无法创建故障报告的目录 [%s]"
+msgid "copy of [%s] failed"
+msgstr "拷贝 [%s] 失败"
 
-#: po/placeholder.h:151 po/placeholder.h:365 urpm.pm:358
+#: ../urpm.pm_.c:962
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "介质 \"%s\" 试图使用一个已经使用的hdlist, 忽略介质"
-
-#: po/placeholder.h:152 po/placeholder.h:364 urpm.pm:290
-msgid "rsync is missing\n"
-msgstr "没有 rsync\n"
-
-#: po/placeholder.h:154 po/placeholder.h:366 urpm.pm:229
-msgid "curl is missing\n"
-msgstr "没有 curl\n"
+msgid "copying source list of \"%s\"..."
+msgstr "复制 \"%s\" 的源文件列表"
 
-#: po/placeholder.h:155 po/placeholder.h:368 urpm.pm:393
+#: ../urpm.pm_.c:979
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "无法判断 hdlist文件的介质 [%s]"
-
-#: po/placeholder.h:156 po/placeholder.h:384
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 打印帮助信息.\n"
-
-#: po/placeholder.h:158 po/placeholder.h:385 urpmi:564
-msgid "everything already installed"
-msgstr "全部安装完成"
-
-#: po/placeholder.h:159 po/placeholder.h:274 urpm.pm:1796
-msgid "retrieving rpms files..."
-msgstr "收取 rpms 文件..."
+msgid "reading rpms files from [%s]"
+msgstr "从 [%s]读取 rpm 文件"
 
-#: po/placeholder.h:160 po/placeholder.h:275
+#: ../urpm.pm_.c:998
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "不同的可移动 [%s] 用于 \"%s\""
-
-#: po/placeholder.h:161 po/placeholder.h:391 urpmi:327
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
-
-#: po/placeholder.h:162 po/placeholder.h:277
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "无法访问最初的安装介质 (没有找到 Mandrake/base/hdlists) "
+msgid "unable to read rpms files from [%s]: %s"
+msgstr "无法从介质 [%s] 读取 rpm 文件: %s"
 
-#: po/placeholder.h:164 po/placeholder.h:573 urpmq:125
+#: ../urpm.pm_.c:1003
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] 没有发现rpm 文件"
 
-#: po/placeholder.h:166 po/placeholder.h:281 urpm.pm:301
+#: ../urpm.pm_.c:1016
 #, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
-
-#: po/placeholder.h:167 po/placeholder.h:378 urpme:90
-msgid "Nothing to remove.\n"
-msgstr "不需要删除如何东西.\n"
-
-#: po/placeholder.h:169 po/placeholder.h:414 urpmi:215 urpmi:521 urpmi:531
-#: urpmi:538 urpmi:551 urpmi:558
-msgid "Installation failed"
-msgstr "安装失败"
-
-#: po/placeholder.h:170 po/placeholder.h:283
-msgid "unable to access first installation medium"
-msgstr "无法访问最初的安装介质"
-
-#: po/placeholder.h:171 po/placeholder.h:418 po/placeholder.h:589
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - 部搜索提供标签中的软件包.\n"
+msgid "retrieving description file of \"%s\"..."
+msgstr "找回 \"%s\" 的描述文件..."
 
-#: po/placeholder.h:172 po/placeholder.h:285 urpm.pm:1414
+#: ../urpm.pm_.c:1028
 #, c-format
-msgid "unmounting %s"
-msgstr "卸载 %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "收取 \"%s\"的源 hdlist (synthesis)..."
 
-#: po/placeholder.h:174 po/placeholder.h:286
-#, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "从缓存删除 %d 过时的头"
+#: ../urpm.pm_.c:1110
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "获取源的 hdlist (或 synthesis)失败"
 
-#: po/placeholder.h:175 po/placeholder.h:287
+#: ../urpm.pm_.c:1117
 #, c-format
 msgid "no hdlist file found for medium \"%s\""
 msgstr "没有找到介质 \"%s\"的 hdlist 文件"
 
-#: po/placeholder.h:176
-msgid "<non printable chars>"
-msgstr "<不能显示的字符>"
-
-#: po/placeholder.h:178 po/placeholder.h:290
+#: ../urpm.pm_.c:1129 ../urpm.pm_.c:1173
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "无法读取介质\"%s\"的综合文件"
-
-#: po/placeholder.h:179 po/placeholder.h:431 po/placeholder.h:600
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             -详细的提示.\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "文件 [%s] 已经被同样的介质 \"%s\"使用"
 
-#: po/placeholder.h:180 po/placeholder.h:291
+#: ../urpm.pm_.c:1160
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "删除介质\"%s\""
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "无法分析hdlist文件 \"%s\""
 
-#: po/placeholder.h:181
+#: ../urpm.pm_.c:1187
 #, c-format
-msgid "unable to build synthesis file for medium \"%s\""
-msgstr "无法为介质\"%s\"创建 synthesis文件"
+msgid "nothing to write in list file for \"%s\""
+msgstr " \"%s\" 没有需要写入列表文件"
 
-#: po/placeholder.h:182
+#: ../urpm.pm_.c:1194
 #, c-format
-msgid "trying to select multiple medium: %s"
-msgstr "试图选择多个介质: %s"
+msgid "unable to write list file of \"%s\""
+msgstr "无法写入 列表文件\"%s\""
 
-#: po/placeholder.h:183 po/placeholder.h:562
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - 选择所有不可移动的介质.\n"
+#: ../urpm.pm_.c:1201
+#, c-format
+msgid "nothing written in list file for \"%s\""
+msgstr "\"%s\"没有写入列表文件"
 
-#: po/placeholder.h:184 po/placeholder.h:438
-msgid "  names or rpm files given on command line are installed.\n"
-msgstr "  命令行给出的软件包名或 rpm 文件已经安装.\n"
+#: ../urpm.pm_.c:1243
+msgid "performing second pass to compute dependencies\n"
+msgstr "进行第二轮, 计算依赖性\n"
 
-#: po/placeholder.h:185
+#: ../urpm.pm_.c:1256
 #, c-format
-msgid "avoid selecting %s as its locales language is not already selected"
-msgstr "请不要选择 %s， 因为还没有安装它的语言支持"
+msgid "reading headers from medium \"%s\""
+msgstr "从介质\"%s\"读取软件包头信息"
 
-#: po/placeholder.h:187 po/placeholder.h:294
+#: ../urpm.pm_.c:1261
 #, c-format
-msgid "reading rpms files from [%s]"
-msgstr "从 [%s]读取 rpm 文件"
-
-#: po/placeholder.h:188
-msgid "  --complete     - use parsehdlist server to complete selection.\n"
-msgstr "  --complete     - 使用 parsehdlist 完成选择.\n"
+msgid "building hdlist [%s]"
+msgstr "创建hdlist [%s]"
 
-#: po/placeholder.h:189 po/placeholder.h:298
+#: ../urpm.pm_.c:1273 ../urpm.pm_.c:1292
 #, c-format
-msgid "write config file [%s]"
-msgstr "写入 [%s]"
-
-#: po/placeholder.h:190 po/placeholder.h:445 urpmi:467
-msgid "Press Enter when ready..."
-msgstr "准备好后按 Enter 键..."
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "为介质\"%s\"创建 hdlist 综合文件"
 
-#: po/placeholder.h:191 po/placeholder.h:301 urpm.pm:217
+#: ../urpm.pm_.c:1310
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "无法处理协议: %s"
-
-#: po/placeholder.h:192
-msgid "unable to build hdlist synthesis, using parsehdlist method"
-msgstr "无法创建hdlist综合文件，使用 parsehdlist 解释方法"
-
-#: po/placeholder.h:193 po/placeholder.h:502
-msgid ""
-"  --distrib      - automatically create all media from an installation "
-"medium.\n"
-msgstr " --distrib      - 自动从安装介质创建全部介质\n"
+msgid "found %d headers in cache"
+msgstr "缓存中有 %d 个文件头"
 
-#: po/placeholder.h:196 po/placeholder.h:306 urpm.pm:1649
+#: ../urpm.pm_.c:1314
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "无法正确的解析 [%s] 的值 \"%s\""
+msgid "removing %d obsolete headers in cache"
+msgstr "从缓存删除 %d 过时的头"
 
-#: po/placeholder.h:197 po/placeholder.h:453 po/placeholder.h:586
-msgid "  -s             - next package is a source package (same as --src).\n"
-msgstr "  -s             - 下一个软件包是源程序包 ( 和 --src 一样).\n"
+#: ../urpm.pm_.c:1470
+#, c-format
+msgid "mounting %s"
+msgstr "正在安装 %s"
 
-#: po/placeholder.h:199 po/placeholder.h:307 urpm.pm:1878 urpm.pm:1883
+#: ../urpm.pm_.c:1481
 #, c-format
-msgid "unable to install package %s"
-msgstr "无法安装软件包 %s"
+msgid "unmounting %s"
+msgstr "卸载 %s"
 
-#: po/placeholder.h:200 po/placeholder.h:309 urpm.pm:376
+#: ../urpm.pm_.c:1494
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "无法处理介质 \"%s\", 其它介质在使用列表文件"
+msgid "relocated %s entries in depslist"
+msgstr "在depslist中重新定位 %s"
+
+#: ../urpm.pm_.c:1495
+msgid "no entries relocated in depslist"
+msgstr "在depslist中没有重新定位的条目"
 
-#: po/placeholder.h:201 po/placeholder.h:310
+#: ../urpm.pm_.c:1508
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "检查综合文件 [%s]"
+msgid "invalid rpm file name [%s]"
+msgstr "非法rpm文件 [%s]"
 
-#: po/placeholder.h:202 po/placeholder.h:311
+#: ../urpm.pm_.c:1509 ../urpm.pm_.c:1997
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "从介质\"%s\"读取软件包头信息"
+msgid "unable to access rpm file [%s]"
+msgstr "无法访问rpm 文件[%s]"
 
-#: po/placeholder.h:203 po/placeholder.h:313
-msgid "performing second pass to compute dependencies\n"
-msgstr "进行第二轮, 计算依赖性\n"
+#: ../urpm.pm_.c:1513
+msgid "unable to register rpm file"
+msgstr "无法登记 rpm 文件"
 
-#: po/placeholder.h:205 po/placeholder.h:314 urpm.pm:361
+#: ../urpm.pm_.c:1516
+msgid "error registering local packages"
+msgstr "登记本地软件包出错"
+
+#: ../urpm.pm_.c:1604
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "介质 \"%s\" 试图使用已经使用的列表, 忽略介质"
+msgid "no package named %s"
+msgstr "没有名为 %s 的软件包"
 
-#: po/placeholder.h:206 po/placeholder.h:315
+#: ../urpm.pm_.c:1607
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "无法取得可移动介质 \"%s\" 的路径"
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
 
-#: po/placeholder.h:207 po/placeholder.h:317 urpm.pm:1614 urpm.pm:1640
+#: ../urpm.pm_.c:1708 ../urpm.pm_.c:1734
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "多个软件包是用相同的 rpm 文件名 \"%s\""
 
-#: po/placeholder.h:209 po/placeholder.h:604
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - 打印组名.\n"
-
-#: po/placeholder.h:210 po/placeholder.h:605
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - 列出可用的软件包.\n"
-
-#: po/placeholder.h:211 po/placeholder.h:320 urpm.pm:1890
+#: ../urpm.pm_.c:1743
 #, c-format
-msgid "%s is needed by %s"
-msgstr "%s 是 %s 需要的"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "无法正确的解析 [%s] 的值 \"%s\""
 
-#: po/placeholder.h:213 po/placeholder.h:370 urpme:125
+#: ../urpm.pm_.c:1755
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be removed (%d "
-"MB)"
-msgstr "为满足相关性要求, 需要删除下列软件包 (%d MB)"
+msgid "package %s is not found."
+msgstr "没有找到软件包 %s."
 
-#: po/placeholder.h:214 po/placeholder.h:321
-msgid "retrieving hdlists file..."
-msgstr "取出 hdlists 文件..."
+#: ../urpm.pm_.c:1803 ../urpm.pm_.c:1806 ../urpm.pm_.c:1824
+#, c-format
+msgid "medium \"%s\" is not selected"
+msgstr "介质 \"%s\" 没有选中"
 
-#: po/placeholder.h:215 po/placeholder.h:386 urpmi:160
+#: ../urpm.pm_.c:1812
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知选项 \"-%s\", 用--help 检查用法\n"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质\"%2$s\" 读取rpm文件[%1$s]"
 
-#: po/placeholder.h:216 po/placeholder.h:323 urpm.pm:402
+#: ../urpm.pm_.c:1828
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "无法访问 \"%s\" 的 hdlist 文件, 忽略该介质"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "不连贯的介质 \"%s\" 标记为可移动但其实不是"
 
-#: po/placeholder.h:217 po/placeholder.h:325
+#: ../urpm.pm_.c:1885
 #, c-format
-msgid "\"%s\""
-msgstr "\"%s\""
+msgid "malformed input: [%s]"
+msgstr "输入格式错误: [%s]"
 
-#: po/placeholder.h:218 po/placeholder.h:324 urpm.pm:1446
-msgid "unable to register rpm file"
-msgstr "无法登记 rpm 文件"
+#: ../urpm.pm_.c:1890
+msgid "retrieving rpms files..."
+msgstr "收取 rpms 文件..."
 
-#: po/placeholder.h:219 po/placeholder.h:327
-#, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "可移动介质 \"%s\" 加载次数太多"
+#: ../urpm.pm_.c:1939
+msgid "Preparing..."
+msgstr "准备中..."
 
-#: po/placeholder.h:220 po/placeholder.h:326 urpm.pm:456
+#: ../urpm.pm_.c:1967
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "无法检查 \"%s\" 的列表文件, 忽略该介质"
+msgid "unable to remove package %s"
+msgstr "无法删除软件包 %s"
 
-#: po/placeholder.h:221 po/placeholder.h:329
+#: ../urpm.pm_.c:1972 ../urpm.pm_.c:1977
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "列表文件 %s"
+msgid "unable to install package %s"
+msgstr "无法安装软件包 %s"
 
-#: po/placeholder.h:222 po/placeholder.h:330 urpm.pm:448
+#: ../urpm.pm_.c:1984
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "\"%s\" 的列表文件不连贯, 忽略该介质"
+msgid "%s is needed by %s"
+msgstr "%s 是 %s 需要的"
 
-#: po/placeholder.h:223 po/placeholder.h:331
+#: ../urpm.pm_.c:1985
 #, c-format
-msgid "problem reading hdlist file of medium \"%s\""
-msgstr "读取 \"%s\"的 hdlist 文件有问题"
+msgid "%s conflicts with %s"
+msgstr "%s 与 %s 冲突"
 
-#: po/placeholder.h:224 po/placeholder.h:398 po/placeholder.h:575
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用升级介质.\n"
+#: ../urpme_.c:33
+msgid "Remove them all?"
+msgstr "全部删除?"
 
-#: po/placeholder.h:225 po/placeholder.h:332
-#, c-format
-msgid "copy of [%s] failed"
-msgstr "拷贝 [%s] 失败"
+#: ../urpme_.c:42
+msgid "usage: urpme [-a] [--auto] <packages...>\n"
+msgstr "用法: urpmi [-a] [--auto] <软件包列表...>\n"
 
-#: po/placeholder.h:226
+#: ../urpme_.c:53
+msgid "unknown package(s) "
+msgstr "未知的软件包"
+
+#: ../urpme_.c:63
 #, c-format
-msgid "unable to analyse synthesis data of %s"
-msgstr "无法分析 %s 的综合数据"
+msgid "Using \"%s\" as a substring, I found"
+msgstr "搜索包含 \"%s\" 的项目, 我发现"
 
-#: po/placeholder.h:227 po/placeholder.h:582
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - 扩展软件包依赖性查询.\n"
+#: ../urpme_.c:64 ../urpmi_.c:476
+msgid " (y/N) "
+msgstr " (y/N) "
 
-#: po/placeholder.h:228 po/placeholder.h:334
-#, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "收取 \"%s\"的源 hdlist (synthesis)..."
+#: ../urpme_.c:85
+msgid "unknown package "
+msgstr "未知的软件包"
 
-#: po/placeholder.h:229 po/placeholder.h:381 urpme:116
+#: ../urpme_.c:90
+msgid "Nothing to remove.\n"
+msgstr "不需要删除如何东西.\n"
+
+#: ../urpme_.c:116
 #, c-format
 msgid "removing package %s will break your system\n"
 msgstr "如果删除软件包 %s 会破坏您的系统\n"
 
-#: po/placeholder.h:231 po/placeholder.h:335
-msgid "...copying done"
-msgstr "...复制完成"
-
-#: po/placeholder.h:232 po/placeholder.h:416
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - 使用 X 界面.\n"
-
-#: po/placeholder.h:233 po/placeholder.h:337
-msgid "copying hdlists file..."
-msgstr "复制 hdlists..."
-
-#: po/placeholder.h:234 po/placeholder.h:417 urpmi:428 urpmi:437
+#: ../urpme_.c:125
 #, c-format
 msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
+"To satisfy dependencies, the following packages are going to be removed (%d "
+"MB)"
+msgstr "为满足相关性要求, 需要删除下列软件包 (%d MB)"
 
-#: po/placeholder.h:235 po/placeholder.h:339 urpm.pm:337 urpm.pm:349
-#, c-format
-msgid "syntax error in config file at line %s"
-msgstr "配置文件的的 %s 行由语法错误"
+#: ../urpmi.addmedia_.c:29
+msgid ""
+"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"where <url> is one of\n"
+"       file://<path>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
+"       ftp://<host>/<path> with <relative filename of hdlist>\n"
+"       http://<host>/<path> with <relative filename of hdlist>\n"
+"       removable://<path>\n"
+"\n"
+"and [options] are from\n"
+msgstr ""
+"用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
+"  <url> 为以下之一\n"
+"       file://<路径>\n"
+"       ftp://<登录名>:<口令>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       removable://<路径>\n"
+"\n"
+"而 [options] 可以是\n"
 
-#: po/placeholder.h:236 po/placeholder.h:419 urpmi:545
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
+#: ../urpmi.addmedia_.c:38 ../urpmi.removemedia_.c:37 ../urpmi.update_.c:61
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - 直接清除软件包头缓存.\n"
 
-#: po/placeholder.h:237 po/placeholder.h:425 po/placeholder.h:599
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - 利用模糊查询 (和 -y 一样).\n"
+#: ../urpmi.addmedia_.c:39
+msgid "  -h             - try to find and use synthesis or hdlist file.\n"
+msgstr "  -h             - 使用综合文件或 hdlist 文件\n"
 
-#: po/placeholder.h:238 po/placeholder.h:343 urpm.pm:1449
-msgid "error registering local packages"
-msgstr "登记本地软件包出错"
+#: ../urpmi.addmedia_.c:40 ../urpmi.update_.c:63
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - 强迫生成 hdlist 文件.\n"
 
-#: po/placeholder.h:239 po/placeholder.h:344
-#, c-format
-msgid "taking removable device as \"%s\""
-msgstr "把可移动设备当作 \"%s\""
+#: ../urpmi.addmedia_.c:41 ../urpmi.update_.c:64 ../urpmi_.c:83 ../urpmq_.c:62
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - 用 wget 取远处的文件.\n"
 
-#: po/placeholder.h:240 po/placeholder.h:432
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - 允许在提供的项目中寻找软件包.\n"
+#: ../urpmi.addmedia_.c:42 ../urpmi.update_.c:65 ../urpmi_.c:84 ../urpmq_.c:63
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - 用 crul 取远处的文件.\n"
 
-#: po/placeholder.h:242 po/placeholder.h:348
-#, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "复制 \"%s\" 的描述文件"
+#: ../urpmi.addmedia_.c:43 ../urpmi.update_.c:66 ../urpmi_.c:85 ../urpmq_.c:64
+msgid ""
+"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
+"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+msgstr ""
+"  --proxy        - 使用指定的 HTTP 代理, 缺省的端口号是\n"
+"                   1080 (格式如 <proxyhost[:port]>).\n"
 
-#: po/placeholder.h:243 po/placeholder.h:602
+#: ../urpmi.addmedia_.c:45 ../urpmi.update_.c:68 ../urpmi_.c:87 ../urpmq_.c:66
 msgid ""
-"  -u             - remove package if a more recent version is already "
-"installed.\n"
-msgstr "  -u             - 如果更新的版本已经安装, 就删除软件包\n"
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - 指定用于代理认证的用户和\n"
+"                   口令(格式如 <用户:口令>).\n"
 
-#: po/placeholder.h:244
-#, c-format
-msgid "unable to build hdlist: %s"
-msgstr "无法创建 hdlist: %s"
+#: ../urpmi.addmedia_.c:47
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - 创建一个更新介质.\n"
 
-#: po/placeholder.h:245 po/placeholder.h:349 urpm.pm:1709 urpm.pm:1712
-#: urpm.pm:1730
-#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "介质 \"%s\" 没有选中"
+#: ../urpmi.addmedia_.c:48
+msgid ""
+"  --distrib      - automatically create all media from an installation "
+"medium.\n"
+msgstr " --distrib      - 自动从安装介质创建全部介质\n"
 
-#: po/placeholder.h:246 po/placeholder.h:351 urpm.pm:418
+#: ../urpmi.addmedia_.c:90
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "试图略过现有的介质 \"%s\", 避免"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"%s\n"
+"使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: po/placeholder.h:247 po/placeholder.h:352
+#: ../urpmi.addmedia_.c:96 ../urpmi.addmedia_.c:113
 #, c-format
-msgid "unable to read rpms files from [%s]: %s"
-msgstr "无法从介质 [%s] 读取 rpm 文件: %s"
-
-#: po/placeholder.h:248 po/placeholder.h:440
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - 安静模式.\n"
-
-#: po/placeholder.h:249
-msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
-msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
+msgid "unable to update medium \"%s\"\n"
+msgstr "无法更新介质\"%s\"\n"
 
-#: po/placeholder.h:251 po/placeholder.h:449 po/placeholder.h:585
+#: ../urpmi.addmedia_.c:102
+#, c-format
 msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 强制执行, 即使某些软件包并不存在.\n"
+"%s\n"
+"<relative path of hdlist> missing\n"
+msgstr ""
+"%s\n"
+"<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:252 po/placeholder.h:374 urpme:63
+#: ../urpmi.addmedia_.c:104
 #, c-format
-msgid "Using \"%s\" as a substring, I found"
-msgstr "搜索包含 \"%s\" 的项目, 我发现"
-
-#: po/placeholder.h:254 po/placeholder.h:380 urpme:33
-msgid "Remove them all?"
-msgstr "全部删除?"
+msgid ""
+"%s\n"
+"`with' missing for ftp media\n"
+msgstr ""
+"%s\n"
+"`with'找不到ftp介质\n"
 
-#: po/placeholder.h:255 po/placeholder.h:456 urpmi:510
+#: ../urpmi.addmedia_.c:112
 #, c-format
-msgid "installing %s\n"
-msgstr "正在安装 %s\n"
+msgid "unable to create medium \"%s\"\n"
+msgstr "无法创建介质\"%s\"\n"
 
-#: po/placeholder.h:256 po/placeholder.h:457 urpmi:466
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
+#: ../urpmi.removemedia_.c:34
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"用法: urpmi.removemedia -a <名称> ...\n"
+"其中 <名称> 是要删除的介质名.\n"
 
-#: po/placeholder.h:257 po/placeholder.h:359
-#, c-format
-msgid "examining hdlist file [%s]"
-msgstr "检查 hdlist 文件 [%s]"
+#: ../urpmi.removemedia_.c:36
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - 选择所有介质.\n"
 
-#: po/placeholder.h:258 po/placeholder.h:358 urpm.pm:1539
+#: ../urpmi.removemedia_.c:38 ../urpmi.update_.c:70
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
+msgid ""
+"\n"
+"unknown options '%s'\n"
+msgstr ""
+"\n"
+"未知的选项 '%s'\n"
 
-#: po/placeholder.h:259 po/placeholder.h:361 urpm.pm:1428
-msgid "no entries relocated in depslist"
-msgstr "在depslist中没有重新定位的条目"
+#: ../urpmi.removemedia_.c:47
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "没有可删除的(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:261 po/placeholder.h:518
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 创建一个更新介质.\n"
+#: ../urpmi.removemedia_.c:49
+#, c-format
+msgid ""
+"the entry to remove is missing\n"
+"(one of %s)\n"
+msgstr ""
+"找不到要删除的项\n"
+"(%s中的一个)\n"
 
-#: po/placeholder.h:262 po/placeholder.h:362 urpm.pm:1801
-msgid "...retrieving done"
-msgstr "...收取完成"
+#: ../urpmi.update_.c:58
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"用法: urpmi.update [选项] <名称> ...\n"
+"其中 <名称> 是要删除的介质名.\n"
 
-#: po/placeholder.h:263 po/placeholder.h:465 po/placeholder.h:601 urpmi:455
-#: urpmq:216
-msgid "unable to get source packages, aborting"
-msgstr "无法读取源软件包， 中止"
+#: ../urpmi.update_.c:60
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - 选择所有不可移动的介质.\n"
 
-#: po/placeholder.h:264 po/placeholder.h:559
+#: ../urpmi.update_.c:62
 msgid ""
 "  -d             - force complete computation of depslist.ordered file.\n"
 msgstr "  -d             - 强迫完成 depslist.ordered 文件的计算.\n"
 
-#. [^:]+(:\d+)?)/*$, or
-#: po/placeholder.h:265 po/placeholder.h:467 po/placeholder.h:519
-#: po/placeholder.h:561 urpmi:126 urpmi:133 urpmi.addmedia:65
-#: urpmi.addmedia:72 urpmi.update:45 urpmi.update:52
-msgid "bad proxy declaration on command line\n"
-msgstr "命令行定义的代理有误\n"
-
-#: po/placeholder.h:266 po/placeholder.h:363 urpm.pm:286
-#, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失败: 退出代码 %d, 信号 %d\n"
-
-#: po/placeholder.h:267
-#, c-format
-msgid "selecting %s using obsoletes"
-msgstr "使用过期选择 %s"
-
-#: po/placeholder.h:268
-#, c-format
-msgid "selecting %s by selection on files"
-msgstr "正在文件上选择 %s"
+#: ../urpmi.update_.c:78
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "没有东西升级(用urpmi.addmedia增加介质)\n"
 
-#: po/placeholder.h:269 po/placeholder.h:367
+#: ../urpmi.update_.c:80
 #, c-format
-msgid "copying source list of \"%s\"..."
-msgstr "复制 \"%s\" 的源文件列表"
-
-#: po/placeholder.h:270 po/placeholder.h:369 urpm.pm:220
-msgid "wget is missing\n"
-msgstr "没有 wget\n"
-
-#: po/placeholder.h:271 po/placeholder.h:474 urpmi:210
-msgid "Only superuser is allowed to install packages"
-msgstr "只允许超级用户安装软件包"
-
-#: po/placeholder.h:387
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
+"the entry to update is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
-"                   就安装软件包.\n"
+"找不到要升级的项\n"
+"(%s中之一)\n"
 
-#: po/placeholder.h:392
+#: ../urpmi_.c:63
 #, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
+"\n"
 "usage:\n"
 msgstr ""
 "urpmi 版本 %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "这是自由软件, 可以依照 GNU GPL 重新发布.\n"
+"\n"
 "用法:\n"
 
-#: po/placeholder.h:399 po/placeholder.h:498 po/placeholder.h:555
-#: po/placeholder.h:576
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
+#: ../urpmi_.c:68
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 打印帮助信息.\n"
+
+#: ../urpmi_.c:69 ../urpmq_.c:51
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用升级介质.\n"
+
+#: ../urpmi_.c:70 ../urpmq_.c:52
+msgid "  --media        - use only the media listed by comma.\n"
+msgstr "  --media        - 只使用列出的介质.\n"
+
+#: ../urpmi_.c:71 ../urpmq_.c:53
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr ""
-"  --proxy-user   - 指定用于代理认证的用户和\n"
-"                   口令(格式如 <用户:口令>).\n"
 
-#: po/placeholder.h:404 urpmi:515
+#: ../urpmi_.c:72
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包.\n"
+
+#: ../urpmi_.c:73 ../urpmq_.c:54
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your urpmi database"
-msgstr ""
-"安装失败, 缺少某些文件.\n"
-"最好更新您的 urpmi 数据库"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - 自动选择升级系统的软件包.\n"
 
-#: po/placeholder.h:408 urpmi:390
-#, c-format
+#: ../urpmi_.c:74 ../urpmq_.c:55
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - 利用模糊查询 (和 -y 一样).\n"
+
+#: ../urpmi_.c:75 ../urpmq_.c:57
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - 下一个软件包是源程序包, (和 -s 一样).\n"
+
+#: ../urpmi_.c:76
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - 保留缓存中没有使用的rpm.\n"
+
+#: ../urpmi_.c:77 ../urpmq_.c:61
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s\n"
-"do you agree ?"
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 强制执行, 即使某些软件包并不存在.\n"
+
+#: ../urpmi_.c:78
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
 msgstr ""
-"要升级其它软件包, 需要先删除下列软件包:\n"
-"%s\n"
-"您同意吗?"
+"  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
+"                   就安装软件包.\n"
 
-#: po/placeholder.h:421 po/placeholder.h:510 po/placeholder.h:549
-#: po/placeholder.h:594
+#: ../urpmi_.c:80
 msgid ""
-"  --proxy        - use specified HTTP proxy, the port number is assumed\n"
-"                   to be 1080 by default (format is <proxyhost[:port]>).\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
+msgstr ""
+"  --allow-force  - 允许提示用户安装软件包而不\n"
+"                   检查依赖性和完整性.\n"
+
+#: ../urpmi_.c:82
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
 msgstr ""
-"  --proxy        - 使用指定的 HTTP 代理, 缺省的端口号是\n"
-"                   1080 (格式如 <proxyhost[:port]>).\n"
 
-#: po/placeholder.h:427
+#: ../urpmi_.c:89
+msgid ""
+"  --bug          - output a bug report in directory indicated by next arg.\n"
+msgstr "  --bug          - 在指定的目录中输出故障报告.\n"
+
+#: ../urpmi_.c:90
+msgid "  --env          - use specific environment (typically a bug report).\n"
+msgstr "  --env          - 使用指定的环境 (特别是进行故障报告时).\n"
+
+#: ../urpmi_.c:91
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - 使用 X 界面.\n"
+
+#: ../urpmi_.c:92
 msgid ""
 "  --best-output  - choose best interface according to the environment:\n"
 "                   X or text mode.\n"
@@ -1188,16 +872,80 @@ msgstr ""
 "  --best-output  - 根据运行环境选择最好的界面:\n"
 "                   X 或文本模式.\n"
 
-#: po/placeholder.h:434 urpmi:434
+#: ../urpmi_.c:94
+msgid "  --verify-rpm   - verify rpm signature before installation.\n"
+msgstr "  --verify-rpm   - 安装之前验证 rpm 签署.\n"
+
+#: ../urpmi_.c:95
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - 在命令行选择所有匹配.\n"
+
+#: ../urpmi_.c:96
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - 允许在提供的项目中寻找软件包.\n"
+
+#: ../urpmi_.c:97 ../urpmq_.c:45
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - 部搜索提供标签中的软件包.\n"
+
+#: ../urpmi_.c:98 ../urpmq_.c:46
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样).\n"
+
+#: ../urpmi_.c:99 ../urpmq_.c:47
+msgid "  -s             - next package is a source package (same as --src).\n"
+msgstr "  -s             - 下一个软件包是源程序包 ( 和 --src 一样).\n"
+
+#: ../urpmi_.c:100
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - 安静模式.\n"
+
+#: ../urpmi_.c:101 ../urpmq_.c:41
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             -详细的提示.\n"
+
+#: ../urpmi_.c:102
+msgid "  names or rpm files given on command line are installed.\n"
+msgstr "  命令行给出的软件包名或 rpm 文件已经安装.\n"
+
+#: ../urpmi_.c:166
 #, c-format
-msgid ""
-"You need to be root to install the following dependencies:\n"
-"%s\n"
-msgstr ""
-"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
-"%s\n"
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: 未知选项 \"-%s\", 用--help 检查用法\n"
+
+#: ../urpmi_.c:191
+#, c-format
+msgid "Unable to create directory [%s] for bug report"
+msgstr "无法创建故障报告的目录 [%s]"
+
+#: ../urpmi_.c:216
+msgid "Only superuser is allowed to install packages"
+msgstr "只允许超级用户安装软件包"
 
-#: po/placeholder.h:458 urpmi:373
+#: ../urpmi_.c:221 ../urpmi_.c:500 ../urpmi_.c:510 ../urpmi_.c:517
+#: ../urpmi_.c:530 ../urpmi_.c:537
+msgid "Installation failed"
+msgstr "安装失败"
+
+#: ../urpmi_.c:314
+#, c-format
+msgid "One of the following packages is needed to install %s:"
+msgstr "需要下列软件包之一才能安装 %s:"
+
+#: ../urpmi_.c:315
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
+
+#: ../urpmi_.c:323
+#, c-format
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:  (1-%d) "
+
+#: ../urpmi_.c:326
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起, 选择无效, 请再试一次\n"
+
+#: ../urpmi_.c:345
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1208,120 +956,131 @@ msgstr ""
 "%s\n"
 "可以吗 ?"
 
-#: po/placeholder.h:470
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - 允许提示用户安装软件包而不\n"
-"                   检查依赖性和完整性.\n"
-
-#: po/placeholder.h:476
-msgid ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
-"where <url> is one of\n"
-"       file://<path>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-"       ftp://<host>/<path> with <relative filename of hdlist>\n"
-"       http://<host>/<path> with <relative filename of hdlist>\n"
-"       removable://<path>\n"
-"and [options] are from\n"
-msgstr ""
-"用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
-"  <url> 为以下之一\n"
-"       file://<路径>\n"
-"       ftp://<登录名>:<口令>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
-"       removable://<路径>\n"
-"而 [options] 可以是\n"
-
-#: po/placeholder.h:487 po/placeholder.h:521 po/placeholder.h:539
-#: urpmi.addmedia:79
-#, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知的选项 '%s'\n"
-
-#: po/placeholder.h:494 urpmi.addmedia:104
+#: ../urpmi_.c:362
 #, c-format
 msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
 "%s\n"
-"`with' missing for ftp media\n"
+"do you agree ?"
 msgstr ""
+"要升级其它软件包, 需要先删除下列软件包:\n"
 "%s\n"
-"`with'找不到ftp介质\n"
+"您同意吗?"
 
-#: po/placeholder.h:503 urpmi.addmedia:90
+#: ../urpmi_.c:400 ../urpmi_.c:409
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"使用 --distrib 不需要提供 <hdlist的相对路径>"
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "我将另外安装下列软件包 (%d MB), 以满足相关性要求"
 
-#: po/placeholder.h:514 urpmi.addmedia:102
+#: ../urpmi_.c:406
 #, c-format
 msgid ""
+"You need to be root to install the following dependencies:\n"
 "%s\n"
-"<relative path of hdlist> missing\n"
 msgstr ""
+"您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
-"<hdlist相对路径>找不到\n"
 
-#: po/placeholder.h:525 urpmi.removemedia:49
+#: ../urpmi_.c:427 ../urpmq_.c:200
+msgid "unable to get source packages, aborting"
+msgstr "无法读取源软件包， 中止"
+
+#: ../urpmi_.c:438
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"找不到要删除的项\n"
-"(%s中的一个)\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请插入标签 \"%s\" 的介质到设备 [%s]"
 
-#: po/placeholder.h:531
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"用法: urpmi.removemedia -a <名称> ...\n"
-"其中 <名称> 是要删除的介质名.\n"
+#: ../urpmi_.c:439
+msgid "Press Enter when ready..."
+msgstr "准备好后按 Enter 键..."
 
-#: po/placeholder.h:535
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"用法: urpmi.update [选项] <名称> ...\n"
-"其中 <名称> 是要删除的介质名.\n"
+#: ../urpmi_.c:461
+msgid "The following packages have bad signatures"
+msgstr "下列软件包的签署有错误"
 
-#: po/placeholder.h:544 urpmi.update:80
-#, c-format
+#: ../urpmi_.c:462
+msgid "Do you want to continue installation ?"
+msgstr "您想继续安装吗?"
+
+#: ../urpmi_.c:485
 msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your urpmi database"
 msgstr ""
-"找不到要升级的项\n"
-"(%s中之一)\n"
+"安装失败, 缺少某些文件.\n"
+"最好更新您的 urpmi 数据库"
+
+#: ../urpmi_.c:490
+#, fuzzy, c-format
+msgid "distributing %s\n"
+msgstr "正在安装 %s\n"
+
+#: ../urpmi_.c:524
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗? (是(y)/不(N)) [不] "
 
-#: po/placeholder.h:567
+#: ../urpmi_.c:532
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "尝试更激烈的安装方式吗? (使用 --force) (是(y)/不(N)) [不] "
+
+#: ../urpmi_.c:544
+msgid "everything already installed"
+msgstr "全部安装完成"
+
+#: ../urpmq_.c:35
 #, c-format
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000, 2001, 2002 MandrakeSoft.\n"
 "This is free software and may be redistributed under the terms of the GNU "
 "GPL.\n"
+"\n"
 "usage:\n"
 msgstr ""
 "urpmq 版本 %s\n"
 "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
 "这是自由软件, 可以依照 GNU GPL 重新发布.\n"
+"\n"
 "用法:\n"
 
-#: po/placeholder.h:590
+#: ../urpmq_.c:40
+msgid "  -h             - print this help message.\n"
+msgstr "  -h             - 打印帮助信息.\n"
+
+#: ../urpmq_.c:42
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - 扩展软件包依赖性查询.\n"
+
+#: ../urpmq_.c:43
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
+msgstr "  -u             - 如果更新的版本已经安装, 就删除软件包\n"
+
+#: ../urpmq_.c:44
+msgid ""
+"  -c             - choose complete method for resolving requires closure.\n"
+msgstr "  -c             - 采用完成方法解决需求.\n"
+
+#: ../urpmq_.c:48
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - 打印组名.\n"
+
+#: ../urpmq_.c:49
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - 和名称一起打印版本和发行号.\n"
+
+#: ../urpmq_.c:50
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 和名称一起打印版本, 发行号和平台.\n"
+
+#: ../urpmq_.c:56
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - 列出可用的软件包.\n"
+
+#: ../urpmq_.c:58
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -1329,54 +1088,233 @@ msgstr ""
 "  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
 "                   用 stdout 输出 (root 专用).\n"
 
-#: urpmi:61
+#: ../urpmq_.c:60
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - 下载前给出所有的源文件包 (root 专用).\n"
+
+#: ../urpmq_.c:68
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  需要在命令行给出名称或 rpm 文件.\n"
+
+#: ../urpmq_.c:124
+#, c-format
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项 \"-%s\", 用--help 检查用法\n"
+
+#: ../urpmq_.c:127
 #, c-format
-msgid "urpmi version %s"
-msgstr "urpmi 版本 %s"
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取rpm文件 \"%s\"\n"
+
+#: placeholder.h:18
+#, c-format
+msgid "urpmf version %s"
+msgstr "urpmf 版本 %s"
+
+#: placeholder.h:19
+msgid "Copyright (C) 1999, 2000, 2001, 2002 MandrakeSoft."
+msgstr "Copyright (C) 1999,2000,2001,2002 MandrakeSoft."
+
+#: placeholder.h:20
+msgid ""
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL."
+msgstr "这是一个自由软件, 可以按照 GNU GPL 重新发布."
 
-#: urpmi.addmedia:29
-msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
-msgstr "用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]"
+#: placeholder.h:21 placeholder.h:38
+msgid "usage: urpmf [options] <file>"
+msgstr "用法: rpmf [选项] <文件>"
 
-#: urpmi.addmedia:38 urpmi.addmedia:39 urpmi.addmedia:40 urpmi.addmedia:41
-#: urpmi.addmedia:42 urpmi.addmedia:43 urpmi.removemedia:36
-#: urpmi.removemedia:37 urpmi.removemedia:38 urpmi.update:60 urpmi.update:61
-#: urpmi.update:62 urpmi.update:63 urpmi.update:64 urpmi.update:65
-#: urpmi.update:66
-msgid ") . _("
-msgstr ") . _("
+#: placeholder.h:22
+msgid ""
+"  --quiet         - do not print tag name (default if no tag given on command"
+msgstr "  --quiet         - 不打印标题名称(如果没有在命令行指定标签,"
 
-#: urpmi.removemedia:34
-msgid "usage: urpmi.removemedia [-a] <name> ..."
-msgstr "用法: urpmi.removemedia [-a] <名称> ..."
+#: placeholder.h:23
+msgid "                    line, incompatible with interactive mode)."
+msgstr "\t\t缺省设置就是不打印, 与交互模是不兼容)"
 
-#: urpmi.removemedia:38
-msgid ", $_);"
-msgstr ", $_);"
+#: placeholder.h:24
+msgid "  --all           - print all tags."
+msgstr "  --all           -打印全部标签."
 
-#: urpmi.update:58
-msgid "usage: urpmi.update [options] <name> ..."
-msgstr "用法: urpmi.update [选项] <名称>..."
+#: placeholder.h:25
+msgid ""
+"  --name          - print tag name: rpm filename (assumed if no tag given on"
+msgstr "  --name          - 打印名称标签: rpm 文件名 (假设没有在命令行"
 
-#: urpmq:35
-#, c-format
-msgid "urpmq version %s"
-msgstr "urpmq 版本 %s"
+#: placeholder.h:26
+msgid "                    command line but without package name)."
+msgstr "\t\t给出标签，没有软件包名称"
+
+#: placeholder.h:27
+msgid "  --group         - print tag group: group."
+msgstr "  --group         - 打印分组标签： 分组."
+
+#: placeholder.h:28
+msgid "  --size          - print tag size: size."
+msgstr "  --size          - 打印大小标签: 大小"
+
+#: placeholder.h:29
+msgid "  --serial        - print tag serial: serial."
+msgstr "  --serial        - 打印序列号标签: serial."
+
+#: placeholder.h:30
+msgid "  --summary       - print tag summary: summary."
+msgstr "  --summary       - 打印摘要标签: 摘要"
+
+#: placeholder.h:31
+msgid "  --description   - print tag description: description."
+msgstr "  --description   -打印描述标签: 描述"
+
+#: placeholder.h:32
+msgid "  --provides      - print tag provides: all provides (multiple lines)."
+msgstr "  --provides      - 打印提供标签: 提供的所有程序"
+
+#: placeholder.h:33
+msgid "  --requires      - print tag requires: all requires (multiple lines)."
+msgstr "  --requires      - 打印需要标签: 需要得所有程序"
+
+#: placeholder.h:34
+msgid "  --files         - print tag files: all files (multiple lines)."
+msgstr "  --files         - 打印文件标签：所有的文件．"
+
+#: placeholder.h:35
+msgid ""
+"  --conflicts     - print tag conflicts: all conflicts (multiple lines)."
+msgstr "  --conflicts     - 打印冲突标签：所有的冲突"
+
+#: placeholder.h:36
+msgid ""
+"  --obsoletes     - print tag obsoletes: all obsoletes (multiple lines)."
+msgstr "  --obsoletes     - 打印废除标签：所有被废除的包"
+
+#: placeholder.h:37
+msgid "  --prereqs       - print tag prereqs: all prereqs (multiple lines)."
+msgstr "  --prereqs       - 打印前提条件标签：前提条件"
+
+#: placeholder.h:39
+msgid "try urpmf --help for more options"
+msgstr "尝试 urpmf --help 了解更多选项"
+
+#: placeholder.h:40
+msgid "no full media list was found"
+msgstr "没有找到完整的介质清单"
+
+#~ msgid "examining whole urpmi database"
+#~ msgstr "检查整个 urpmi 数据库"
+
+#~ msgid "  -y             - impose fuzzy search.\n"
+#~ msgstr "  -y             - 利用模糊搜索.\n"
+
+#~ msgid ""
+#~ "  --auto-select  - automatically select packages for upgrading the "
+#~ "system.\n"
+#~ msgstr "  --auto-select  - 自动选择升级系统需要的软件包.\n"
+
+#~ msgid "trying to select multiple media: %s"
+#~ msgstr "试图选择多个介质: %s\""
+
+#~ msgid "medium \"%s\" tries to use an already used hdlist, medium ignored"
+#~ msgstr "介质 \"%s\" 试图使用已经存在的 hdlist, 忽略介质"
+
+#~ msgid "problem reading hdlist file, trying again"
+#~ msgstr "读取 hdlist 文件有问题，正在重新尝试"
+
+#~ msgid "keeping only files referenced in provides"
+#~ msgstr "只保留提供标签中提到的文件"
+
+#~ msgid ""
+#~ "some packages have to be removed for being upgraded, this is not "
+#~ "supported yet\n"
+#~ msgstr "有些软件包要求先删除再升级, 暂不支持\n"
+
+#~ msgid "Press Enter when it's done..."
+#~ msgstr "准备好后按 Enter 键..."
+
+#~ msgid ""
+#~ "  -u             - remove package if a better version is already "
+#~ "installed.\n"
+#~ msgstr "  -u             - 如果已经安装了更好的版本, 删除软件包.\n"
+
+#~ msgid "medium \"%s\" tries to use an already used list, medium ignored"
+#~ msgstr "介质 \"%s\" 试图使用一个使用中的列表，忽略介质"
+
+#~ msgid "  -g             - print groups too with name.\n"
+#~ msgstr "  -g             - 和名称一起打印分组.\n"
+
+#~ msgid "  -r             - print version and release too with name.\n"
+#~ msgstr "  -r             - 和名称一起打印版本和发行号.\n"
+
+#~ msgid "  --auto         - automatically select a good package in choices.\n"
+#~ msgstr "  --auto         - 自动选择软件包.\n"
+
+#~ msgid "unable to parse correctly [%s]"
+#~ msgstr "无法正确分析 [%s]"
+
+#~ msgid "read synthesis file [%s]"
+#~ msgstr "读取综合文件 [%s]"
+
+#~ msgid "unknown data associated with %s"
+#~ msgstr "有关 %s 的未知数据"
+
+#~ msgid "avoid selecting %s as not enough files will be updated"
+#~ msgstr "避免选择 %s 没有足够的文件将被更新"
+
+#~ msgid "unable to parse correctly [%s] on value \"%s\""
+#~ msgstr "无法正确处理 [%s] 的值 \"%s\""
+
+#~ msgid "<non printable chars>"
+#~ msgstr "<不能显示的字符>"
+
+#~ msgid "unable to build synthesis file for medium \"%s\""
+#~ msgstr "无法为介质\"%s\"创建 synthesis文件"
+
+#~ msgid "trying to select multiple medium: %s"
+#~ msgstr "试图选择多个介质: %s"
+
+#~ msgid "avoid selecting %s as its locales language is not already selected"
+#~ msgstr "请不要选择 %s， 因为还没有安装它的语言支持"
+
+#~ msgid "  --complete     - use parsehdlist server to complete selection.\n"
+#~ msgstr "  --complete     - 使用 parsehdlist 完成选择.\n"
+
+#~ msgid "unable to build hdlist synthesis, using parsehdlist method"
+#~ msgstr "无法创建hdlist综合文件，使用 parsehdlist 解释方法"
+
+#~ msgid "unable to analyse synthesis data of %s"
+#~ msgstr "无法分析 %s 的综合数据"
+
+#~ msgid "unable to build hdlist: %s"
+#~ msgstr "无法创建 hdlist: %s"
+
+#~ msgid "Copyright (C) 1999,2000,2001 MandrakeSoft."
+#~ msgstr "Copyright (C) 1999,2000,2001 MandrakeSoft."
+
+#~ msgid "bad proxy declaration on command line\n"
+#~ msgstr "命令行定义的代理有误\n"
+
+#~ msgid "selecting %s using obsoletes"
+#~ msgstr "使用过期选择 %s"
+
+#~ msgid "selecting %s by selection on files"
+#~ msgstr "正在文件上选择 %s"
 
-#~ msgid ");"
-#~ msgstr ");"
+#~ msgid "urpmi version %s"
+#~ msgstr "urpmi 版本 %s"
 
-#~ msgid ", $otherPackage, "
-#~ msgstr ", $otherPackage, "
+#~ msgid "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]"
+#~ msgstr "用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]"
 
-#~ msgid "));"
-#~ msgstr "));"
+#~ msgid "usage: urpmi.removemedia [-a] <name> ..."
+#~ msgstr "用法: urpmi.removemedia [-a] <名称> ..."
 
-#~ msgid "$p->{name}-$p->{version}-$p->{release}"
-#~ msgstr "$p->{name}-$p->{version}-$p->{release}"
+#~ msgid "usage: urpmi.update [options] <name> ..."
+#~ msgstr "用法: urpmi.update [选项] <名称>..."
 
-#~ msgid "$prefix/$_"
-#~ msgstr "$prefix/$_"
+#~ msgid "urpmq version %s"
+#~ msgstr "urpmq 版本 %s"
 
 #~ msgid "Only superuser is allowed to install local packages"
 #~ msgstr "只有超级用户可以安装本机软件包"