updated pot file; corrected use of N()

1 files changed, 1182 insertions, 1125 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3435535a..c6e341b8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: urpmi 3.3\n"
-"POT-Creation-Date: 2003-12-26 23:14+0100\n"
+"POT-Creation-Date: 2004-01-19 17:18+0100\n"
 "PO-Revision-Date: 2004-01-17 19:08+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandrake Simplified Chinese <cooker-i18n@linux-mandrake.com>\n"
@@ -38,796 +38,773 @@ msgstr "yY 是"
 msgid "Nn"
 msgstr "nN 否"
 
-#: ../urpmi.addmedia:1
+#: ../_irpm:23
+#, c-format
+msgid "installing %s\n"
+msgstr "正在安装 %s\n"
+
+#: ../_irpm:33
 #, c-format
 msgid ""
-"  --distrib      - automatically create all media from an installation\n"
-"                   medium.\n"
-msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
+"Automatic installation of packages...\n"
+"You requested installation of package %s\n"
+msgstr ""
+"自动安装软件包...\n"
+"您要求安装软件包 %s\n"
 
-#: ../urpm.pm:1
+#: ../_irpm:33 ../urpme:31 ../urpmi:523
 #, c-format
-msgid "unable to open rpmdb"
-msgstr "无法打开 rpmdb"
+msgid "Is this OK?"
+msgstr "这样好了吗?"
 
-#: ../urpme:1 ../urpmf:1 ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.removemedia:1
-#: ../urpmi.update:1 ../urpmq:1
+#: ../_irpm:35 ../urpmi:141
 #, c-format
-msgid "  --help         - print this help message.\n"
-msgstr "  --help         - 打印帮助信息。\n"
+msgid "Ok"
+msgstr "确定"
 
-#: ../urpmi:1
+#: ../_irpm:36 ../urpmi:142
 #, c-format
-msgid "One of the following packages is needed to install %s:"
-msgstr "需要下列软件包之一才能安装 %s:"
+msgid "Cancel"
+msgstr "取消"
 
-#: ../urpm.pm:1
+#: ../_irpm:44 ../urpmi:459 ../urpmi:531
 #, c-format
-msgid "removing package %s"
-msgstr "无法删除软件包 %s"
+msgid " (Y/n) "
+msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpm.pm:1
+#: ../_irpm:63
 #, c-format
-msgid "\"%s\""
-msgstr "“%s”"
+msgid "%s: command not found\n"
+msgstr "%s: 命令没找到\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:108
 #, c-format
-msgid "Everything already installed"
-msgstr "全部安装完成"
+msgid "Unknown webfetch `%s' !!!\n"
+msgstr "未知 webfetch“%s”!!!\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../urpm.pm:127
 #, c-format
-msgid "  -c             - clean headers cache directory.\n"
-msgstr "  -c             - 直接清除软件包头缓存。\n"
+msgid "unknown protocol defined for %s"
+msgstr "%s 中定义了未知的协议"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:140
 #, c-format
-msgid "using process %d for executing transaction"
-msgstr "使用进程 %d 执行交易"
+msgid "no webfetch (curl or wget currently) found\n"
+msgstr "没有发现下载工具(curl 或 wget)\n"
 
-#: ../urpmf:1
+#: ../urpm.pm:156
 #, c-format
-msgid "  --provides     - print tag provides: all provides.\n"
-msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
+msgid "unable to handle protocol: %s"
+msgstr "无法处理协议: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:177
 #, c-format
-msgid "What is your choice? (1-%d) "
-msgstr "请输入您的选择:(1-%d)"
+msgid "copy failed: %s"
+msgstr "复制失败: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:182
 #, c-format
-msgid "found %d headers in cache"
-msgstr "缓存中找到了 %d 个头"
+msgid "wget is missing\n"
+msgstr "没有 wget\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:227
 #, c-format
-msgid "there are multiple packages with the same rpm filename \"%s\""
-msgstr "有多个文件名都为“%s”的 rpm 软件包"
+msgid "wget failed: exited with %d or signal %d\n"
+msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:230
 #, c-format
-msgid ""
-"  --proxy-user   - specify user and password to use for proxy\n"
-"                   authentication (format is <user:password>).\n"
-msgstr ""
-"  --proxy-user   - 指定用于代理认证的用户和\n"
-"                   口令(格式如 <用户: 口令>)。\n"
+msgid "curl is missing\n"
+msgstr "没有 curl\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:324
 #, c-format
-msgid "performing second pass to compute dependencies\n"
-msgstr "正在执行第二遍依赖关系的计算\n"
+msgid "curl failed: exited with %d or signal %d\n"
+msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:330 ../urpm.pm:377
 #, c-format
-msgid "retrieving rpm file [%s] ..."
-msgstr "正在获取 rpm 文件[%s]..."
+msgid "rsync is missing\n"
+msgstr "没有 rsync\n"
 
-#: ../urpmq:1
+#: ../urpm.pm:374 ../urpm.pm:421
 #, c-format
-msgid "  --list-aliases - list available parallel aliases.\n"
-msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
+msgid "rsync failed: exited with %d or signal %d\n"
+msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:378
 #, c-format
-msgid "...retrieving failed: %s"
-msgstr "...获取失败: %s"
+msgid "ssh is missing\n"
+msgstr "没有 ssh\n"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:431 ../urpmi:608
 #, c-format
-msgid "unable to inspect list file for \"%s\", medium ignored"
-msgstr "无法检查“%s”的列表文件，介质被忽略"
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:433 ../urpmi:611
 #, c-format
-msgid ""
-"  -o             - binary OR operator, true if one expression is true.\n"
-msgstr ""
-"  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
+msgid "        %s%% completed, speed = %s"
+msgstr "        已完成 %s%%，速度 = %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:480 ../urpm.pm:493 ../urpm.pm:506
 #, c-format
-msgid "Package installation..."
-msgstr "软件包安装..."
+msgid "syntax error in config file at line %s"
+msgstr "配置文件的第 %s 行语法错误"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:517
 #, c-format
-msgid "invalid rpm file name [%s]"
-msgstr "无效的 rpm 文件名[%s]"
+msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
+msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:523
+#, c-format
+msgid "medium \"%s\" trying to use an already used list, medium ignored"
+msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
+
+#: ../urpm.pm:539
 #, c-format
 msgid ""
-"%s\n"
-"no need to give <relative path of hdlist> with --distrib"
-msgstr ""
-"%s\n"
-"使用 --distrib 不需要提供 <hdlist的相对路径>"
+"unable to take care of medium \"%s\" as list file is already used by another "
+"medium"
+msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:545
 #, c-format
-msgid "bad proxy declaration on command line\n"
-msgstr "命令的代理声明无效\n"
+msgid "unable to use name \"%s\" for unnamed medium because it is already used"
+msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
 
-#: ../urpmi:1
+#: ../urpm.pm:552
 #, c-format
-msgid "%d installation transactions failed"
-msgstr "%d 安装交易失败"
+msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
+msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:556
 #, c-format
-msgid ""
-"unable to access first installation medium (no Mandrake/base/hdlists file "
-"found)"
-msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
+msgid "unable to determine medium of this hdlist file [%s]"
+msgstr "无法决定此 hdlist 文件[%s]的介质"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:565
 #, c-format
-msgid "Sorry, bad choice, try again\n"
-msgstr "对不起，选择无效，请再试一次\n"
+msgid "unable to access hdlist file of \"%s\", medium ignored"
+msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpmf:1
+#: ../urpm.pm:567 ../urpm.pm:2641
 #, c-format
-msgid "  --summary      - print tag summary: summary.\n"
-msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
+msgid "unable to access list file of \"%s\", medium ignored"
+msgstr "无法访问“%s”的列表文件，介质被忽略"
 
-#: ../urpm.pm:1 ../urpme:1
+#: ../urpm.pm:591
 #, c-format
-msgid "The following packages contain %s: %s"
-msgstr "下列软件包里有 %s: %s"
+msgid "trying to bypass existing medium \"%s\", avoiding"
+msgstr "试图跳过已有介质“%s”，避免中"
 
-#: ../urpmi:1
+#: ../urpm.pm:599
 #, c-format
-msgid "  --X            - use X interface.\n"
-msgstr "  --X            - 使用 X 界面。\n"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
+msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:604
 #, c-format
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件包之一:"
+msgid "virtual medium \"%s\" should have a clear url, medium ignored"
+msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
 
-#: ../urpme:1
+#: ../urpm.pm:613
 #, c-format
-msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
-msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
+msgid "unable to find hdlist file for \"%s\", medium ignored"
+msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:620
 #, c-format
-msgid ""
-"  --best-output  - choose best interface according to the environment:\n"
-"                   X or text mode.\n"
-msgstr ""
-"  --best-output  - 根据运行环境选择最好的界面:\n"
-"                   X 或文本模式。\n"
+msgid "unable to find list file for \"%s\", medium ignored"
+msgstr "找不到“%s”的列表文件，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:643
 #, c-format
-msgid "Downloading package `%s'..."
-msgstr "正在下载软件包“%s”..."
+msgid "incoherent list file for \"%s\", medium ignored"
+msgstr "“%s”的列表文件不连贯，介质被忽略"
 
-#: ../urpmi:1
+#: ../urpm.pm:651
 #, c-format
-msgid "What can be done with binary rpm files when using --install-src"
-msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
+msgid "unable to inspect list file for \"%s\", medium ignored"
+msgstr "无法检查“%s”的列表文件，介质被忽略"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:684
 #, c-format
-msgid ""
-"  --auto-select  - automatically select packages to upgrade the system.\n"
-msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
+msgid "too many mount points for removable medium \"%s\""
+msgstr "可移动介质“%s”的载入点太多"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:685
 #, c-format
-msgid "no package named %s"
-msgstr "没有叫做 %s 的软件包"
+msgid "taking removable device as \"%s\""
+msgstr "将可移动设备认作“%s”"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:689
 #, c-format
-msgid "  -a             - select all matches on command line.\n"
-msgstr "  -a             - 在命令行选择所有匹配。\n"
+msgid "using different removable device [%s] for \"%s\""
+msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:694 ../urpm.pm:697
 #, c-format
-msgid ""
-"Installation failed, some files are missing:\n"
-"%s\n"
-"You may want to update your urpmi database"
-msgstr ""
-"安装失败，缺少下列文件:\n"
-"%s\n"
-"您可能需要更新您的 urpmi 数据库"
+msgid "unable to retrieve pathname for removable medium \"%s\""
+msgstr "无法获取可移动介质“%s”的路径名称"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:710
 #, c-format
-msgid ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
-"where <name> is a medium name to remove.\n"
-msgstr ""
-"用法: urpmi.removemedia -a <名称> ...\n"
-"其中 <名称> 是要删除的介质名。\n"
+msgid "unable to write config file [%s]"
+msgstr "无法写入配置文件[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:732
 #, c-format
-msgid "curl failed: exited with %d or signal %d\n"
-msgstr "curl 失败: 退出代码 %d 或信号 %d\n"
+msgid "write config file [%s]"
+msgstr "写入配置文件[%s]"
 
-#: ../urpmi:1
+#: ../urpm.pm:744
 #, c-format
-msgid ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
+msgid "Can't use parallele mode with use-distrib mode"
 msgstr ""
-"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
-"%s\n"
 
-#: ../urpme:1
+#: ../urpm.pm:754
 #, c-format
-msgid "unknown package"
-msgstr "未知的软件包"
+msgid "unable to parse \"%s\" in file [%s]"
+msgstr "无法处理文件[%2$s]中的“%1$s”"
 
-#: ../urpmi:1
+#: ../urpm.pm:765
 #, c-format
-msgid "Installation is possible"
-msgstr "可以安装"
+msgid "examining parallel handler in file [%s]"
+msgstr "正在检查文件[%s]中的并行处理"
 
-#: ../urpmi:1
+#: ../urpm.pm:775
+#, c-format
+msgid "found parallel handler for nodes: %s"
+msgstr "找到结点的并行处理: %s"
+
+#: ../urpm.pm:779
+#, c-format
+msgid "using associated media for parallel mode: %s"
+msgstr "并行模式时使用关联介质: %s"
+
+#: ../urpm.pm:783
+#, c-format
+msgid "unable to use parallel option \"%s\""
+msgstr "无法使用并行选项“%s”"
+
+#: ../urpm.pm:794
 #, c-format
 msgid ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
 msgstr ""
-"要升级其它软件包，需要先删除下列软件包:\n"
-"%s"
+"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
+"parallel 一起使用"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:845 ../urpm.pm:867 ../urpm.pm:1215 ../urpm.pm:1226
+#: ../urpm.pm:1287 ../urpm.pm:1304 ../urpm.pm:1387 ../urpm.pm:1444
+#: ../urpm.pm:1616 ../urpm.pm:1716 ../urpm.pm:1814 ../urpm.pm:1820
+#: ../urpm.pm:1919 ../urpm.pm:1998 ../urpm.pm:2002
 #, c-format
-msgid "retrieve of source hdlist (or synthesis) failed"
-msgstr "获取源 hdlist(或综合文件) 失败"
+msgid "examining synthesis file [%s]"
+msgstr "正在检查综合文件 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:849 ../urpm.pm:862 ../urpm.pm:871 ../urpm.pm:1218
+#: ../urpm.pm:1229 ../urpm.pm:1293 ../urpm.pm:1299 ../urpm.pm:1392
+#: ../urpm.pm:1448 ../urpm.pm:1620 ../urpm.pm:1720 ../urpm.pm:1808
+#: ../urpm.pm:1826 ../urpm.pm:2008
 #, c-format
-msgid "unable to take medium \"%s\" into account as no list file [%s] exists"
-msgstr "无法考虑“%s”，因为不存在列表文件[%s]"
+msgid "examining hdlist file [%s]"
+msgstr "正在检查 hdlist 文件 [%s]"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpm.pm:857 ../urpm.pm:1222
 #, c-format
-msgid " (y/N) "
-msgstr "(是(y)/否(N))[否]"
+msgid "virtual medium \"%s\" is not local, medium ignored"
+msgstr "虚拟介质“%s”不是本地的，介质被忽略"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:880 ../urpm.pm:1236 ../urpm.pm:1312 ../urpm.pm:1396
+#: ../urpm.pm:1724
 #, c-format
-msgid "cannot add updates of a cooker distribution\n"
-msgstr "无法添加 cooker 发行版的更新\n"
+msgid "problem reading hdlist or synthesis file of medium \"%s\""
+msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:886 ../urpm.pm:1958
 #, c-format
-msgid "  -v             - verbose mode.\n"
-msgstr "  -v             -详细的提示。\n"
+msgid "performing second pass to compute dependencies\n"
+msgstr "正在执行第二遍依赖关系的计算\n"
 
-#: ../urpmi:1
+#: ../urpm.pm:898
 #, c-format
-msgid "Initializing..."
-msgstr "正在初始化..."
+msgid "skipping package %s"
+msgstr "跳过软件包 %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:907
 #, c-format
-msgid "  --list         - list available packages.\n"
-msgstr "  --list         - 列出可用的软件包。\n"
+msgid "would install instead of upgrade package %s"
+msgstr "将安装而非升级软件包 %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:918 ../urpm.pm:2441 ../urpm.pm:2502 ../urpm.pm:3075
+#: ../urpm.pm:3173
 #, c-format
-msgid "  --all          - print all tags.\n"
-msgstr "  --all           - 打印全部标识符。\n"
+msgid "unable to open rpmdb"
+msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:957
 #, c-format
-msgid "incoherent medium \"%s\" marked removable but not really"
-msgstr "非连贯介质“%s”标为可移动但实际不是"
+msgid "medium \"%s\" already exists"
+msgstr "介质“%s”已存在"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:964
 #, c-format
-msgid ""
-"virtual medium \"%s\" should not have defined hdlist or list file, medium "
-"ignored"
-msgstr "虚拟介质“%s”不应在 hdlist 或列表文件中定义，介质被忽略"
+msgid "virtual medium need to be local"
+msgstr "虚拟介质必须位于本地"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:996
 #, c-format
-msgid "computing md5sum of copied source hdlist (or synthesis)"
-msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
+msgid "added medium %s"
+msgstr "已添加介质 %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:1012
 #, c-format
-msgid "  --excludepath  - exclude path separated by comma.\n"
-msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
+msgid "unable to access first installation medium"
+msgstr "无法访问介质的首次安装"
 
-#: ../urpmi:1
+#: ../urpm.pm:1016
 #, c-format
-msgid "Press Enter when ready..."
-msgstr "准备好后按 Enter 键..."
+msgid "copying hdlists file..."
+msgstr "正在复制 hdlists 文件..."
 
-#: ../urpmi.addmedia:1 ../urpmi.removemedia:1 ../urpmi.update:1
+#: ../urpm.pm:1018 ../urpm.pm:1327 ../urpm.pm:1416
 #, c-format
-msgid ""
-"\n"
-"unknown options '%s'\n"
-msgstr ""
-"\n"
-"未知的选项“%s”\n"
+msgid "...copying failed"
+msgstr "...复制失败"
 
-#: ../urpmi:1
+#: ../urpm.pm:1018 ../urpm.pm:1327 ../urpm.pm:1420
 #, c-format
-msgid ""
-"  --split-level  - split in small transaction if more than given packages\n"
-"                   are going to be installed or upgraded,\n"
-"                   default is %d.\n"
-msgstr ""
-"  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
-"                   较小的交易。默认为 %d。\n"
+msgid "...copying done"
+msgstr "...复制完成"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1020 ../urpm.pm:1039 ../urpm.pm:1064
 #, c-format
-msgid "rsync is missing\n"
-msgstr "没有 rsync\n"
+msgid ""
+"unable to access first installation medium (no Mandrake/base/hdlists file "
+"found)"
+msgstr "无法访问首次安装介质(未发现 Mandrake/base/hdlists 文件)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1026
 #, c-format
-msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "读取介质“%s”的 hdlist 或综合文件出现问题"
+msgid "retrieving hdlists file..."
+msgstr "正在获取 hdlists 文件..."
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1033 ../urpm.pm:1706 ../urpm.pm:2269 ../urpm.pm:2949
+#: ../urpmi.addmedia:162
 #, c-format
-msgid "  --wget         - use wget to retrieve distant files.\n"
-msgstr "  --wget         - 用 wget 取远程文件。\n"
+msgid "...retrieving done"
+msgstr "...获取完成"
 
-#: ../urpmi:1
+#: ../urpm.pm:1035 ../urpm.pm:1690 ../urpm.pm:1699 ../urpm.pm:2272
+#: ../urpm.pm:2952 ../urpmi.addmedia:164
 #, c-format
-msgid "  -p             - allow search in provides to find package.\n"
-msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
+msgid "...retrieving failed: %s"
+msgstr "...获取失败: %s"
 
-#: ../urpmq:1
+#: ../urpm.pm:1055
 #, c-format
-msgid "  --list-nodes   - list available nodes when using --parallel.\n"
-msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
+msgid "invalid hdlist description \"%s\" in hdlists file"
+msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1097
 #, c-format
-msgid "building hdlist [%s]"
-msgstr "正在创建 hdlist [%s]"
+msgid "trying to select nonexistent medium \"%s\""
+msgstr "试图选择不存在的介质“%s”"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:1099
 #, c-format
-msgid ""
-"  --keep         - keep existing packages if possible, reject requested\n"
-"                   packages that leads to remove.\n"
-msgstr ""
-"  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
+msgid "selecting multiple media: %s"
+msgstr "选择多个介质: %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1099
 #, c-format
-msgid "examining MD5SUM file"
-msgstr "正在检查 MD5SUM 文件"
+msgid "\"%s\""
+msgstr "“%s”"
 
-#: ../_irpm:1
+#: ../urpm.pm:1115
 #, c-format
-msgid "%s: command not found\n"
-msgstr "%s: 命令没找到\n"
+msgid "removing medium \"%s\""
+msgstr "删除介质“%s”"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1263
 #, c-format
-msgid "unable to register rpm file"
-msgstr "无法访问注册 rpm 文件"
+msgid ""
+"unable to access medium \"%s\",\n"
+"this could happen if you mounted manually the directory when creating the "
+"medium."
+msgstr ""
+"无法访问介质“%s”，\n"
+"这可能是因为您在创建介质时是手动装载的目录。"
 
-#: ../urpmi:1
+#: ../urpm.pm:1316
 #, c-format
 msgid ""
-"  --allow-nodeps - allow asking user to install packages without\n"
-"                   dependencies checking.\n"
-msgstr ""
-"  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
-"                   就安装软件包。\n"
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
 
-#: ../urpmq:1
+#: ../urpm.pm:1324
 #, c-format
-msgid "  -i             - print usefull information in human readeable form.\n"
-msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
+msgid "copying description file of \"%s\"..."
+msgstr "正在复制“%s”的描述文件..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1347 ../urpm.pm:1576
 #, c-format
-msgid "unable to handle protocol: %s"
-msgstr "无法处理协议: %s"
+msgid "computing md5sum of existing source hdlist (or synthesis)"
+msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1358 ../urpm.pm:1587
 #, c-format
-msgid "retrieving hdlists file..."
-msgstr "正在获取 hdlists 文件..."
+msgid "examining MD5SUM file"
+msgstr "正在检查 MD5SUM 文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1412
 #, c-format
-msgid "added medium %s"
-msgstr "已添加介质 %s"
+msgid "copying source hdlist (or synthesis) of \"%s\"..."
+msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpmi:1
+#: ../urpm.pm:1425 ../urpm.pm:1431
 #, c-format
-msgid "  --noclean      - keep rpm not used in cache.\n"
-msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
+msgid "copy of [%s] failed"
+msgstr "复制[%s]失败"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1429
 #, c-format
-msgid ""
-"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
+msgid "computing md5sum of copied source hdlist (or synthesis)"
+msgstr "正在计算已复制源 hdlist(或综合文件)的 md5sum..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1452 ../urpm.pm:1624 ../urpm.pm:1922
 #, c-format
-msgid "md5sum mismatch"
-msgstr "md5sum 不匹配"
+msgid "problem reading synthesis file of medium \"%s\""
+msgstr "读取介质“%s”的综合文件出现问题"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1491
 #, c-format
-msgid "syntax error in config file at line %s"
-msgstr "配置文件的第 %s 行语法错误"
+msgid "reading rpm files from [%s]"
+msgstr "正在从[%s]读取 rpm 文件"
 
-#: ../urpmi:1
+#: ../urpm.pm:1510
 #, c-format
-msgid "  names or rpm files given on command line will be installed.\n"
-msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
+msgid "unable to read rpm files from [%s]: %s"
+msgstr "无法从[%s]读取 rpm 文件: %s"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:1515
 #, c-format
-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"
+msgid "no rpm files found from [%s]"
+msgstr "[%s] 中未发现 rpm 文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1642
 #, c-format
-msgid "in order to install %s"
-msgstr "为了安装 %s"
+msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
+msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1661
 #, c-format
-msgid "relocated %s entries in depslist"
-msgstr "depslist 中重新分配了 %s 项"
+msgid "found probed hdlist (or synthesis) as %s"
+msgstr "发现探测的 hdlist(或综合文件) 为 %s"
 
-#: ../urpmf:1
+#: ../urpm.pm:1697
 #, c-format
-msgid "  -i             - ignore case distinctions in every pattern.\n"
-msgstr "  -i             - 忽略各种情况下的冲突。\n"
+msgid "computing md5sum of retrieved source hdlist (or synthesis)"
+msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
 
-#: ../urpmi:1
+#: ../urpm.pm:1699
 #, c-format
-msgid "Unable to create directory [%s] for bug report"
-msgstr "无法创建故障报告的目录 [%s]"
+msgid "md5sum mismatch"
+msgstr "md5sum 不匹配"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1780
 #, c-format
-msgid "would install instead of upgrade package %s"
-msgstr "将安装而非升级软件包 %s"
+msgid "retrieve of source hdlist (or synthesis) failed"
+msgstr "获取源 hdlist(或综合文件) 失败"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:1787
 #, c-format
-msgid "retrieving mirrors at %s ..."
-msgstr "正在获取 %s 处的镜像..."
+msgid "no hdlist file found for medium \"%s\""
+msgstr "介质“%s”未发现 hdlist 文件"
 
-#: ../urpmf:1
+#: ../urpm.pm:1798 ../urpm.pm:1850
 #, c-format
-msgid "  --url          - print tag url: url.\n"
-msgstr "  --url          - 打印标识符 url: url。\n"
+msgid "file [%s] already used in the same medium \"%s\""
+msgstr "文件[%s]已经在相同的介质“%s”中使用"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1834
 #, c-format
-msgid "unknown protocol defined for %s"
-msgstr "%s 中定义了未知的协议"
+msgid "unable to parse hdlist file of \"%s\""
+msgstr "无法处理“%s”的 hdlist 文件"
 
-#: ../urpmq:1
+#: ../urpm.pm:1874
 #, c-format
-msgid "  -r             - print version and release with name also.\n"
-msgstr "  -r             - 和名称一起打印版本和发行号。\n"
+msgid "unable to write list file of \"%s\""
+msgstr "无法写入“%s”的列表文件"
 
-#: ../urpmf:1
+#: ../urpm.pm:1881
 #, c-format
-msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
-msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
+msgid "writing list file for medium \"%s\""
+msgstr "正在写入介质“%s”的列表文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1883
 #, c-format
-msgid "medium \"%s\" already exists"
-msgstr "介质“%s”已存在"
+msgid "nothing written in list file for \"%s\""
+msgstr "“%s”的列表文件中没有写入内容"
 
-#: ../_irpm:1
+#: ../urpm.pm:1896
 #, c-format
-msgid "installing %s\n"
-msgstr "正在安装 %s\n"
+msgid "examining pubkey file of \"%s\"..."
+msgstr "正在检查“%s”的公共密钥文件..."
 
-#: ../urpmi.update:1
+#: ../urpm.pm:1903
 #, c-format
-msgid ""
-"the entry to update is missing\n"
-"(one of %s)\n"
-msgstr ""
-"找不到要升级的项\n"
-"(%s 中之一)\n"
+msgid "...imported key %s from pubkey file of \"%s\""
+msgstr "...从公钥文件“%s”中导入了密钥 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1906
 #, c-format
-msgid "trying to promote %s"
-msgstr "正在试图推广 %s"
+msgid "unable to import pubkey file of \"%s\""
+msgstr "无法导入“%s”的公共密钥文件"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1972
 #, c-format
-msgid "unable to remove package %s"
-msgstr "无法删除软件包 %s"
+msgid "reading headers from medium \"%s\""
+msgstr "正在从介质“%s”读取头"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:1977
 #, c-format
-msgid "problem reading synthesis file of medium \"%s\""
-msgstr "读取介质“%s”的综合文件出现问题"
+msgid "building hdlist [%s]"
+msgstr "正在创建 hdlist [%s]"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:1989 ../urpm.pm:2018 ../urpmi:369
 #, c-format
-msgid ""
-"the entry to remove is missing\n"
-"(one of %s)\n"
-msgstr ""
-"找不到要删除的项\n"
-"(%s中的一个)\n"
+msgid "built hdlist synthesis file for medium \"%s\""
+msgstr "创建介质“%s”的 hdlist 综合文件"
 
-#: ../urpmi.removemedia:1
+#: ../urpm.pm:2038
 #, c-format
-msgid "  -a             - select all media.\n"
-msgstr "  -a             - 选择所有介质。\n"
+msgid "found %d headers in cache"
+msgstr "缓存中找到了 %d 个头"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2042
 #, c-format
-msgid "Missing signature (%s)"
-msgstr "缺少签名(%s)"
+msgid "removing %d obsolete headers in cache"
+msgstr "删除缓存中的 %d 个过时头"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2212
 #, c-format
-msgid "unable to read rpm files from [%s]: %s"
-msgstr "无法从[%s]读取 rpm 文件: %s"
+msgid "mounting %s"
+msgstr "正在装载 %s"
 
-#: ../urpmi.update:1
+#: ../urpm.pm:2225
 #, c-format
-msgid "  --update       - update only update media.\n"
-msgstr "  --update       - 只使用更新介质。\n"
+msgid "unmounting %s"
+msgstr "正在拆卸 %s"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpm.pm:2247
 #, c-format
-msgid " (Y/n) "
-msgstr "(是(Y)/否(n))[是]"
+msgid "relocated %s entries in depslist"
+msgstr "depslist 中重新分配了 %s 项"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2248
 #, c-format
-msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "介质“%s”试图打开已经用过的列表，介质被忽略"
+msgid "no entries relocated in depslist"
+msgstr "depslist 中没有重新分配项"
 
-#: ../urpmi:1
+#: ../urpm.pm:2261
 #, c-format
-msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
+msgid "invalid rpm file name [%s]"
+msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2267
 #, c-format
-msgid "malformed input: [%s]"
-msgstr "输入格式错误: [%s]"
+msgid "retrieving rpm file [%s] ..."
+msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpme:1
+#: ../urpm.pm:2274 ../urpm.pm:3117
 #, c-format
-msgid "removing package %s will break your system"
-msgstr "如果删除软件包 %s 会破坏您的系统"
+msgid "unable to access rpm file [%s]"
+msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpmq:1
+#: ../urpm.pm:2279
 #, c-format
-msgid "  --list-media   - list available media.\n"
-msgstr "  --list-media   - 列出可用的介质。\n"
+msgid "unable to register rpm file"
+msgstr "无法访问注册 rpm 文件"
 
-#: ../urpmi:1
+#: ../urpm.pm:2282
 #, c-format
-msgid ""
-"Some package requested cannot be installed:\n"
-"%s"
-msgstr ""
-"某些要求的软件包无法安装:\n"
-"%s"
+msgid "error registering local packages"
+msgstr "注册本地软件包出错"
 
-#: ../urpmi:1
+#: ../urpm.pm:2383
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安装软件包“%s”(%s/%s)..."
+msgid "no package named %s"
+msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2386 ../urpme:99
 #, c-format
-msgid "no entries relocated in depslist"
-msgstr "depslist 中没有重新分配项"
+msgid "The following packages contain %s: %s"
+msgstr "下列软件包里有 %s: %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:2578 ../urpm.pm:2622 ../urpm.pm:2648
 #, c-format
-msgid "  --install-src  - install only source package (no binaries).\n"
-msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
+msgid "there are multiple packages with the same rpm filename \"%s\""
+msgstr "有多个文件名都为“%s”的 rpm 软件包"
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1 ../urpmq:1
+#: ../urpm.pm:2633
 #, c-format
-msgid "  --curl         - use curl to retrieve distant files.\n"
-msgstr "  --curl         - 用 crul 取远程文件。\n"
+msgid "unable to correctly parse [%s] on value \"%s\""
+msgstr "无法正确处理[%s]为值“%s”"
 
-#: ../urpmf:1
+#: ../urpm.pm:2660
 #, c-format
-msgid "  -e             - include perl code directly as perl -e.\n"
-msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
+msgid ""
+"medium \"%s\" uses an invalid list file:\n"
+"  mirror is probably not up-to-date, trying to use alternate method"
+msgstr ""
+"介质“%s”使用了无效的列表文件:\n"
+"  介质可能不是最新，正在尝试使用其它方式"
 
-#: ../urpmi:1
+#: ../urpm.pm:2664
 #, c-format
-msgid "do you agree ?"
-msgstr "您同意吗?"
+msgid "medium \"%s\" does not define any location for rpm files"
+msgstr "介质“%s”没有定义任何 rpm 文件的位置"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2676
 #, c-format
-msgid "incoherent list file for \"%s\", medium ignored"
-msgstr "“%s”的列表文件不连贯，介质被忽略"
+msgid "package %s is not found."
+msgstr "未找到软件包 %s。"
 
-#: ../urpm.pm:1 ../urpmi.addmedia:1
+#: ../urpm.pm:2716 ../urpm.pm:2731 ../urpm.pm:2755 ../urpm.pm:2770
 #, c-format
-msgid "...retrieving done"
-msgstr "...获取完成"
+msgid "urpmi database locked"
+msgstr "urpmi 数据库已锁定"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2822 ../urpm.pm:2825 ../urpm.pm:2855
 #, c-format
-msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
-msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
+msgid "medium \"%s\" is not selected"
+msgstr "介质“%s”未选中"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2851
 #, c-format
-msgid "skipping package %s"
-msgstr "跳过软件包 %s"
+msgid "unable to read rpm file [%s] from medium \"%s\""
+msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2859
 #, c-format
-msgid "Invalid signature (%s)"
-msgstr "无效的签名(%s)"
+msgid "incoherent medium \"%s\" marked removable but not really"
+msgstr "非连贯介质“%s”标为可移动但实际不是"
 
-#: ../urpmq:1
+#: ../urpm.pm:2872
 #, c-format
-msgid "  names or rpm files given on command line are queried.\n"
-msgstr "  需要在命令行给出名称或 rpm 文件。\n"
+msgid "unable to access medium \"%s\""
+msgstr "无法访问介质“%s”"
 
-#: ../urpmi:1
+#: ../urpm.pm:2933
 #, 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"
-"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"这是自由软件, 可以依照 GNU GPL 重新发布。\n"
-"\n"
-"用法:\n"
+msgid "malformed input: [%s]"
+msgstr "输入格式错误: [%s]"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:2940
 #, c-format
-msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "无法正确处理[%s]为值“%s”"
+msgid "retrieving rpm files from medium \"%s\"..."
+msgstr "正在从介质“%s”上获取 rpm 文件..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3018 ../urpmi:694
 #, c-format
-msgid "  --excludemedia - do not use the given media, separated by comma.\n"
-msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
+msgid "Preparing..."
+msgstr "正在准备..."
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3049
 #, c-format
-msgid "unable to determine medium of this hdlist file [%s]"
-msgstr "无法决定此 hdlist 文件[%s]的介质"
+msgid "using process %d for executing transaction"
+msgstr "使用进程 %d 执行交易"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3079
 #, c-format
-msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "介质“%s”试图使用已经用过的 hdlist，介质被忽略"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3082
 #, c-format
-msgid "unable to parse hdlist file of \"%s\""
-msgstr "无法处理“%s”的 hdlist 文件"
+msgid "unable to create transaction"
+msgstr "无法创建交易"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3090
 #, c-format
-msgid "due to conflicts with %s"
-msgstr "原因是与 %s 冲突"
+msgid "removing package %s"
+msgstr "无法删除软件包 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3092
 #, c-format
-msgid "removing %d obsolete headers in cache"
-msgstr "删除缓存中的 %d 个过时头"
+msgid "unable to remove package %s"
+msgstr "无法删除软件包 %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3102
 #, c-format
-msgid "unable to update medium \"%s\"\n"
-msgstr "无法更新介质“%s”\n"
+msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
+msgstr "添加软件包 %s (id=%d, eid=%d, 更新=%d, 文件=%s)"
 
-#: ../urpmi:1
+#: ../urpm.pm:3105
 #, c-format
-msgid "Try installation without checking dependencies? (y/N) "
-msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
+msgid "unable to install package %s"
+msgstr "无法安装软件包 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3304 ../urpm.pm:3335
 #, c-format
-msgid "virtual medium \"%s\" is not local, medium ignored"
-msgstr "虚拟介质“%s”不是本地的，介质被忽略"
+msgid "due to missing %s"
+msgstr "原因是丢失 %s"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpm.pm:3305 ../urpm.pm:3333
 #, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
+msgid "due to unsatisfied %s"
+msgstr "原因是不满足 %s"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3306
 #, c-format
-msgid "using different removable device [%s] for \"%s\""
-msgstr "为“%2$s”使用不同的可移动设备[%1$s]"
+msgid "trying to promote %s"
+msgstr "正在试图推广 %s"
 
-#: ../urpmi.addmedia:1
+#: ../urpm.pm:3307
 #, c-format
-msgid ""
-"  --no-probe     - do not try to find any synthesis or\n"
-"                   hdlist file.\n"
-msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
+msgid "in order to keep %s"
+msgstr "为了保留 %s"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpm.pm:3328
 #, c-format
-msgid "  -P             - do not search in provides to find package.\n"
-msgstr "  -P             - 不搜索提供标签中的软件包。\n"
+msgid "in order to install %s"
+msgstr "为了安装 %s"
 
-#: ../urpmi:1
+#: ../urpm.pm:3340
 #, c-format
-msgid "  --clean        - remove rpm from cache before anything else.\n"
-msgstr "   --clean        -  首先删除缓存中的rpm。\n"
+msgid "due to conflicts with %s"
+msgstr "原因是与 %s 冲突"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3342
 #, c-format
-msgid "unable to use name \"%s\" for unnamed medium because it is already used"
-msgstr "无法给未命名介质起名为“%s”，因为该名称已被使用"
+msgid "unrequested"
+msgstr "未请求"
 
-#: ../urpmf:1
+#: ../urpm.pm:3358
 #, c-format
-msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
-msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
+msgid "Invalid signature (%s)"
+msgstr "无效的签名(%s)"
 
-#: ../urpm.pm:1
+#: ../urpm.pm:3385
 #, c-format
-msgid ""
-"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
-"ignored"
-msgstr "虚拟介质“%s”应该有有效的源 hdlist 或综合文件，介质被忽略"
+msgid "Invalid Key ID (%s)"
+msgstr "无效的密钥 ID(%s)"
 
-#: ../urpme:1
+#: ../urpm.pm:3387
+#, c-format
+msgid "Missing signature (%s)"
+msgstr "缺少签名(%s)"
+
+#: ../urpme:38
 #, c-format
 msgid ""
 "urpme version %s\n"
@@ -843,345 +820,300 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpme:43 ../urpmf:31 ../urpmi:78 ../urpmi.addmedia:53
+#: ../urpmi.removemedia:36 ../urpmi.update:62 ../urpmq:40
 #, c-format
-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"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "copying source hdlist (or synthesis) of \"%s\"..."
-msgstr "正在复制“%s”的源 hdlist(或综合文件)..."
+msgid "  --help         - print this help message.\n"
+msgstr "  --help         - 打印帮助信息。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:44 ../urpmi:84
 #, c-format
-msgid "...copying done"
-msgstr "...复制完成"
+msgid "  --auto         - automatically select a package in choices.\n"
+msgstr "  --auto         - 自动选中软件包。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:45 ../urpmi:123
 #, c-format
-msgid "unable to use parallel option \"%s\""
-msgstr "无法使用并行选项“%s”"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
+msgstr "  --test         - 验证安装是否可以正确进行。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:46 ../urpmi:98 ../urpmq:60
 #, c-format
 msgid ""
-"medium \"%s\" uses an invalid list file:\n"
-"  mirror is probably not up-to-date, trying to use alternate method"
-msgstr ""
-"介质“%s”使用了无效的列表文件:\n"
-"  介质可能不是最新，正在尝试使用其它方式"
+"  --force        - force invocation even if some packages do not exist.\n"
+msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:47 ../urpmi:103 ../urpmq:61
 #, c-format
-msgid "unable to access first installation medium"
-msgstr "无法访问介质的首次安装"
+msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
+msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpm.pm:1
-#, c-format
-msgid "virtual medium need to be local"
-msgstr "虚拟介质必须位于本地"
+#: ../urpme:48 ../urpmi:104
+#, fuzzy, c-format
+msgid "  --root         - use another root for rpm installation.\n"
+msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:49
 #, c-format
-msgid "error registering local packages"
-msgstr "注册本地软件包出错"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to (un)install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpmi:1 ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpme:51 ../urpmi:132 ../urpmq:73
 #, c-format
-msgid "  --limit-rate   - limit the download speed.\n"
-msgstr "  --limit-rate   - 降低下载速度。\n"
+msgid "  -v             - verbose mode.\n"
+msgstr "  -v             -详细的提示。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:52
 #, c-format
-msgid "found probed hdlist (or synthesis) as %s"
-msgstr "发现探测的 hdlist(或综合文件) 为 %s"
+msgid "  -a             - select all packages matching expression.\n"
+msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpm.pm:1
+#: ../urpme:71
 #, c-format
-msgid "no rpm files found from [%s]"
-msgstr "[%s] 中未发现 rpm 文件"
+msgid "urpme: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
 
-#: ../urpm.pm:1
+#: ../urpme:94
 #, c-format
-msgid "nothing written in list file for \"%s\""
-msgstr "“%s”的列表文件中没有写入内容"
+msgid "unknown packages"
+msgstr "未知的软件包"
 
-#: ../urpmi:1
+#: ../urpme:94
 #, c-format
-msgid "The following packages have bad signatures"
-msgstr "下列软件包的签名有错误"
+msgid "unknown package"
+msgstr "未知的软件包"
 
-#: ../urpmq:1
+#: ../urpme:104
 #, c-format
-msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpmq: 未知选项“-%s”，请用--help 检查用法\n"
+msgid "removing package %s will break your system"
+msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpm.pm:1
+#: ../urpme:106
 #, c-format
-msgid "computing md5sum of existing source hdlist (or synthesis)"
-msgstr "正在计算已有源 hdlist(或综合文件)的 md5sum"
+msgid "Nothing to remove"
+msgstr "不需要删除任何东西。"
 
-#: ../urpmq:1
+#: ../urpme:110
 #, c-format
-msgid "  -c             - complete output with package to be removed.\n"
-msgstr "  -c             - 要删除的软件包的完整输出。\n"
+msgid "Checking to remove the following packages"
+msgstr "检查删除下列软件包"
 
-#: ../urpm.pm:1
+#: ../urpme:117
 #, c-format
-msgid "unable to install package %s"
-msgstr "无法安装软件包 %s"
+msgid "To satisfy dependencies, the following packages will be removed (%d MB)"
+msgstr "为满足相关性要求，需要删除下列软件包(%d MB)"
 
-#: ../urpmi:1
+#: ../urpme:119 ../urpmi:485 ../urpmi:640
 #, c-format
-msgid ""
-"  --allow-force  - allow asking user to install packages without\n"
-"                   dependencies checking and integrity.\n"
-msgstr ""
-"  --allow-force  - 允许提示用户安装软件包而不\n"
-"                   检查依赖性和完整性。\n"
+msgid " (y/N) "
+msgstr "(是(y)/否(N))[否]"
 
-#: ../urpmq:1
+#: ../urpme:122 ../urpmi:683
 #, c-format
-msgid "urpmq: cannot read rpm file \"%s\"\n"
-msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
+msgid "removing %s"
+msgstr "正在删除 %s"
 
-#: ../urpm.pm:1
+#: ../urpme:126
 #, c-format
-msgid "unable to write config file [%s]"
-msgstr "无法写入配置文件[%s]"
+msgid "Removing failed"
+msgstr "删除失败"
 
-#: ../urpm.pm:1
+#: ../urpme:155 ../urpmi:878
 #, c-format
-msgid "no webfetch (curl or wget currently) found\n"
-msgstr "没有发现下载工具(curl 或 wget)\n"
+msgid "Sorry, bad choice, try again\n"
+msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpme:1
+#: ../urpmf:26
 #, c-format
-msgid "  -a             - select all packages matching expression.\n"
-msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
+msgid ""
+"urpmf version %s\n"
+"Copyright (C) 2002 MandrakeSoft.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
+"\n"
+"usage:\n"
+msgstr ""
+"urpmf 版本 %s\n"
+"版权 (C) 2002 MandrakeSoft.\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:32 ../urpmi:79 ../urpmq:41
 #, c-format
-msgid "Invalid Key ID (%s)"
-msgstr "无效的密钥 ID(%s)"
+msgid "  --update       - use only update media.\n"
+msgstr "  --update       - 只使用升级介质。\n"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmf:33 ../urpmi:80 ../urpmq:42
 #, c-format
-msgid ""
-"  --force        - force invocation even if some packages do not exist.\n"
-msgstr "  --force        - 强制执行, 即使某些软件包并不存在。\n"
+msgid "  --media        - use only the given media, separated by comma.\n"
+msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:34 ../urpmi:81 ../urpmq:43
 #, c-format
-msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "无法获取可移动介质“%s”的路径名称"
+msgid "  --excludemedia - do not use the given media, separated by comma.\n"
+msgstr "  --excludemedia - 不使用给定介质，介质之间用逗号分隔。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:35 ../urpmi:82 ../urpmq:44
 #, c-format
-msgid "  --probe-synthesis - try to find and use synthesis file.\n"
-msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
 
-#: ../urpmi:1
+#: ../urpmf:36 ../urpmq:45
 #, c-format
-msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:37
 #, c-format
-msgid "wget is missing\n"
-msgstr "没有 wget\n"
-
-#: ../urpmi.update:1
-#, c-format
-msgid "  --force-key    - force update of gpg key.\n"
-msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
+msgid "  --verbose      - verbose mode.\n"
+msgstr "  -v             -详细的提示。\n"
 
-#: ../urpme:1
+#: ../urpmf:38
 #, c-format
-msgid "Checking to remove the following packages"
-msgstr "检查删除下列软件包"
+msgid ""
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
+"                   line, incompatible with interactive mode).\n"
+msgstr ""
+"  --quiet         - 不打印标题名称(如果没有在命令行指定标识符，默认设置\n"
+"就是不打印，\n"
+"与会话方式不相兼容)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:40
 #, c-format
-msgid "unrequested"
-msgstr "未请求"
+msgid "  --uniq         - do not print identical lines.\n"
+msgstr "  --uniq          - 不打印相同行。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:41
 #, c-format
-msgid "unable to access rpm file [%s]"
-msgstr "无法访问 rpm 文件[%s]"
+msgid "  --all          - print all tags.\n"
+msgstr "  --all           - 打印全部标识符。\n"
 
-#: ../urpmf:1
+#: ../urpmf:42
 #, c-format
-msgid "  --files        - print tag files: all files.\n"
-msgstr "  --files         - 打印文件标识符: 所有文件。\n"
+msgid "  --group        - print tag group: group.\n"
+msgstr "  --group         - 打印标识符组: 分组。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:43
 #, c-format
-msgid "unable to parse \"%s\" in file [%s]"
-msgstr "无法处理文件[%2$s]中的“%1$s”"
+msgid "  --size         - print tag size: size.\n"
+msgstr "  --size          - 打印标识符大小: 大小。\n"
 
-#: ../urpmi:1
+#: ../urpmf:44
 #, c-format
-msgid "Do you want to continue installation ?"
-msgstr "您想继续安装吗?"
+msgid "  --epoch        - print tag epoch: epoch.\n"
+msgstr "  --epoch          - 打印标识符周期: 周期。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:45
 #, c-format
-msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
+msgid "  --summary      - print tag summary: summary.\n"
+msgstr "  --summary       - 打印标识符摘要: 摘要。\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:46
 #, c-format
-msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "创建介质“%s”的 hdlist 综合文件"
+msgid "  --description  - print tag description: description.\n"
+msgstr "  --description   -打印标识符描述: 描述。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:47
 #, c-format
-msgid ""
-"  --version      - use specified distribution version, the default is taken\n"
-"                   from the version of the distribution told by the\n"
-"                   installed mandrake-release package.\n"
-msgstr ""
-"  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
+msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
+msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmf:48
 #, c-format
-msgid ""
-"  --from         - use specified url for list of mirrors, the default is\n"
-"                   %s\n"
-msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
+msgid "  --packager     - print tag packager: packager.\n"
+msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
 
-#: ../urpmf:1
+#: ../urpmf:49
 #, c-format
-msgid "  !              - unary NOT, true if expression is false.\n"
-msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
+msgid "  --buildhost    - print tag buildhost: build host.\n"
+msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:50
 #, c-format
-msgid "unmounting %s"
-msgstr "正在拆卸 %s"
+msgid "  --url          - print tag url: url.\n"
+msgstr "  --url          - 打印标识符 url: url。\n"
 
-#: ../urpmi.update:1
+#: ../urpmf:51
 #, c-format
-msgid "nothing to update (use urpmi.addmedia to add a media)\n"
-msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
+msgid "  --provides     - print tag provides: all provides.\n"
+msgstr "  --provides      - 打印提供标识符: 所有的提供。\n"
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmf:52
 #, c-format
-msgid "        %s%% completed, speed = %s"
-msgstr "        已完成 %s%%，速度 = %s"
+msgid "  --requires     - print tag requires: all requires.\n"
+msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
 
-#: ../urpmi:1
+#: ../urpmf:53
 #, c-format
-msgid "restarting urpmi"
-msgstr "正在重新启动 urpmi"
+msgid "  --files        - print tag files: all files.\n"
+msgstr "  --files         - 打印文件标识符: 所有文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:54
 #, c-format
-msgid "examining synthesis file [%s]"
-msgstr "正在检查综合文件 [%s]"
+msgid "  --conflicts    - print tag conflicts: all conflicts.\n"
+msgstr "  --conflicts     - 打印冲突标识符: 所有的冲突。\n"
 
-#: ../urpmi:1
+#: ../urpmf:55
 #, c-format
-msgid "Try installation even more strongly (--force)? (y/N) "
-msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
+msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
+msgstr "  --obsoletes     - 打印废除标识符: 所有的废除。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:56 ../urpmi:116 ../urpmq:70
 #, c-format
-msgid "...copying failed"
-msgstr "...复制失败"
+msgid ""
+"  --env          - use specific environment (typically a bug\n"
+"                   report).\n"
+msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:58
 #, c-format
-msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "无法访问“%s”的 hdlist 文件，介质被忽略"
+msgid "  -i             - ignore case distinctions in every pattern.\n"
+msgstr "  -i             - 忽略各种情况下的冲突。\n"
 
-#: ../urpmi:1
+#: ../urpmf:59 ../urpmq:85
 #, c-format
-msgid "  -q             - quiet mode.\n"
-msgstr "  -q             - 安静模式。\n"
+msgid "  -f             - print version, release and arch with name.\n"
+msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
 
-#: ../urpmf:1
+#: ../urpmf:60
 #, c-format
-msgid "  --verbose      - verbose mode.\n"
-msgstr "  -v             -详细的提示。\n"
+msgid "  -e             - include perl code directly as perl -e.\n"
+msgstr "  -e             - 直接保留 perl 代码，就像 perl -e。\n"
 
-#: ../urpmq:1
+#: ../urpmf:61
 #, c-format
 msgid ""
-"  --sources      - give all source packages before downloading (root only).\n"
-msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
+"  -a             - binary AND operator, true if both expression are true.\n"
+msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
 
-#: ../urpmq:1
+#: ../urpmf:62
 #, c-format
 msgid ""
-"  --headers      - extract headers for package listed from urpmi db to\n"
-"                   stdout (root only).\n"
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr ""
-"  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
-"                   用 stdout 输出(root 专用)。\n"
-
-#: ../urpme:1
-#, c-format
-msgid "unknown packages"
-msgstr "未知的软件包"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "selecting multiple media: %s"
-msgstr "选择多个介质: %s"
-
-#: ../urpmf:1 ../urpmq:1
-#, c-format
-msgid "  -f             - print version, release and arch with name.\n"
-msgstr "  -f             - 和名称一起打印版本、发行号和平台。\n"
-
-#: ../urpm.pm:1
-#, c-format
-msgid "file [%s] already used in the same medium \"%s\""
-msgstr "文件[%s]已经在相同的介质“%s”中使用"
-
-#: ../urpmi.removemedia:1
-#, c-format
-msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
+"  -o             - 二元 OR 操作符，如果两个表达中的一个为真，则为真。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:63
 #, c-format
-msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "找不到“%s”的列表文件，介质被忽略"
+msgid "  !              - unary NOT, true if expression is false.\n"
+msgstr "  !              - 一元 NOT，如果表达为假，则为真。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:64
 #, c-format
-msgid "curl is missing\n"
-msgstr "没有 curl\n"
+msgid "  (              - left parenthesis to open group expression.\n"
+msgstr "  (              - 左括号用来打开一组表达。\n"
 
-#: ../urpm.pm:1
+#: ../urpmf:65
 #, c-format
-msgid "found parallel handler for nodes: %s"
-msgstr "找到结点的并行处理: %s"
+msgid "  )              - right parenthesis to close group expression.\n"
+msgstr "  )              - 右括号用来关闭一组表达。\n"
 
-#: ../urpmf:1
+#: ../urpmf:143
 #, c-format
 msgid ""
 "callback is :\n"
@@ -1190,289 +1122,327 @@ msgstr ""
 "召回是:\n"
 "%s\n"
 
-#: ../urpmq:1
+#: ../urpmf:148 ../urpmi:263 ../urpmq:183
 #, c-format
-msgid "  -R             - reverse search to what requires package.\n"
-msgstr "  -R             - 逆序搜索所需的软件包。\n"
+msgid "using specific environment on %s\n"
+msgstr "在 %s 使用指定环境\n"
 
-#: ../urpmf:1
+#: ../urpmi:73
 #, c-format
 msgid ""
-"urpmf version %s\n"
-"Copyright (C) 2002 MandrakeSoft.\n"
+"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 ""
-"urpmf 版本 %s\n"
-"版权 (C) 2002 MandrakeSoft.\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"urpmi 版本 %s\n"
+"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"这是自由软件, 可以依照 GNU GPL 重新发布。\n"
 "\n"
 "用法:\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:83
 #, c-format
-msgid "Unknown webfetch `%s' !!!\n"
-msgstr "未知 webfetch“%s”!!!\n"
+msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
+msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
 
-#: ../urpmf:1
+#: ../urpmi:85 ../urpmq:46
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on "
-"command\n"
-"                   line, incompatible with interactive mode).\n"
-msgstr ""
-"  --quiet         - 不打印标题名称(如果没有在命令行指定标识符，默认设置\n"
-"就是不打印，\n"
-"与会话方式不相兼容)。\n"
+"  --auto-select  - automatically select packages to upgrade the system.\n"
+msgstr "  --auto-select  - 自动选择升级系统的软件包。\n"
 
-#: ../urpmf:1
+#: ../urpmi:86
 #, c-format
-msgid "  --uniq         - do not print identical lines.\n"
-msgstr "  --uniq          - 不打印相同行。\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
+msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:87 ../urpmq:48
 #, c-format
 msgid ""
-"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-"update or --parallel"
+"  --keep         - keep existing packages if possible, reject requested\n"
+"                   packages that leads to remove.\n"
 msgstr ""
-"--synthesis 仅能和 --media, --excludemedia, --sortmedia, --update 或 --"
-"parallel 一起使用"
+"  --keep         - 如果有可能就保留已有软件包，拒绝导致删除的软件包。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:89
 #, c-format
 msgid ""
-"  --arch         - use specified architecture, the default is arch of\n"
-"                   mandrake-release package installed.\n"
+"  --split-level  - split in small transaction if more than given packages\n"
+"                   are going to be installed or upgraded,\n"
+"                   default is %d.\n"
 msgstr ""
-"  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
-"                   架构。\n"
-
-#: ../_irpm:1 ../urpme:1 ../urpmi:1
-#, c-format
-msgid "Is this OK?"
-msgstr "这样好了吗?"
-
-#: ../urpmi:1
-#, c-format
-msgid "  --excludedocs  - exclude docs files.\n"
-msgstr "  --excludedocs  - 排除文档文件。\n"
+"  --split-level  - 如果将要安装或升级的软件包多于给定的软件包，就拆分为\n"
+"                   较小的交易。默认为 %d。\n"
 
-#: ../urpmf:1 ../urpmq:1
+#: ../urpmi:92
 #, c-format
-msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
-msgstr "  --synthesis    - 使用指定的综合文件而不是 urpmi db。\n"
+msgid "  --split-length - small transaction length, default is %d.\n"
+msgstr "  --split-length - 小交易长度，默认为 %d。\n"
 
-#: ../urpmi:1
+#: ../urpmi:93 ../urpmq:47
 #, c-format
-msgid ""
-"To satisfy dependencies, the following packages are going to be installed (%"
-"d MB)"
-msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
+msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
+msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:94 ../urpmq:56
 #, c-format
-msgid "examining parallel handler in file [%s]"
-msgstr "正在检查文件[%s]中的并行处理"
+msgid "  --src          - next package is a source package (same as -s).\n"
+msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
 
-#: ../urpme:1
+#: ../urpmi:95
 #, c-format
-msgid "Nothing to remove"
-msgstr "不需要删除任何东西。"
+msgid "  --install-src  - install only source package (no binaries).\n"
+msgstr "  --install-src  - 只安装源代码包(无二进制文件)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:96
 #, c-format
-msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "...从公钥文件“%s”中导入了密钥 %s"
+msgid "  --clean        - remove rpm from cache before anything else.\n"
+msgstr "   --clean        -  首先删除缓存中的rpm。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:97
 #, c-format
-msgid "reading headers from medium \"%s\""
-msgstr "正在从介质“%s”读取头"
+msgid "  --noclean      - keep rpm not used in cache.\n"
+msgstr "  --noclean      - 保留缓存中没有使用的rpm。\n"
 
-#: ../urpmq:1
+#: ../urpmi:99
 #, c-format
-msgid "  -d             - extend query to package dependencies.\n"
-msgstr "  -d             - 扩展软件包依赖性查询。\n"
+msgid ""
+"  --allow-nodeps - allow asking user to install packages without\n"
+"                   dependencies checking.\n"
+msgstr ""
+"  --allow-nodeps - 允许要求用户不经过依赖性检验\n"
+"                   就安装软件包。\n"
 
-#: ../urpmi:1
+#: ../urpmi:101
 #, c-format
 msgid ""
-"  --bug          - output a bug report in directory indicated by\n"
-"                   next arg.\n"
+"  --allow-force  - allow asking user to install packages without\n"
+"                   dependencies checking and integrity.\n"
 msgstr ""
-"  --bug          - 输出故障报告\n"
-"                   下一个参数指定输出目录。\n"
+"  --allow-force  - 允许提示用户安装软件包而不\n"
+"                   检查依赖性和完整性。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:105
 #, c-format
-msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "介质“%s”没有定义任何 rpm 文件的位置"
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
+"                   to install a chroot with --root option.\n"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:107 ../urpmi.addmedia:54 ../urpmi.update:63 ../urpmq:64
 #, c-format
-msgid "wget failed: exited with %d or signal %d\n"
-msgstr "wget 失败: 退出代码 %d 或信号 %d\n"
+msgid "  --wget         - use wget to retrieve distant files.\n"
+msgstr "  --wget         - 用 wget 取远程文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:108 ../urpmi.addmedia:55 ../urpmi.update:64 ../urpmq:65
 #, c-format
-msgid "copy failed: %s"
-msgstr "复制失败: %s"
+msgid "  --curl         - use curl to retrieve distant files.\n"
+msgstr "  --curl         - 用 crul 取远程文件。\n"
 
-#: ../urpmf:1
+#: ../urpmi:109 ../urpmi.addmedia:56 ../urpmi.update:65
 #, c-format
-msgid "  --sourcerpm    - print tag sourcerpm: source rpm.\n"
-msgstr "  --sourcerpm    - 打印标识符源 rpm: 源 rpm。\n"
+msgid "  --limit-rate   - limit the download speed.\n"
+msgstr "  --limit-rate   - 降低下载速度。\n"
 
-#: ../urpmf:1
+#: ../urpmi:110 ../urpmi.addmedia:57 ../urpmi.update:66 ../urpmq:66
 #, c-format
-msgid "  --requires     - print tag requires: all requires.\n"
-msgstr "  --requires      - 打印需要标识符: 所有需要。\n"
+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"
 
-#: ../urpm.pm:1
+#: ../urpmi:112 ../urpmi.addmedia:59 ../urpmi.update:68 ../urpmq:68
 #, c-format
-msgid "unable to write list file of \"%s\""
-msgstr "无法写入“%s”的列表文件"
+msgid ""
+"  --proxy-user   - specify user and password to use for proxy\n"
+"                   authentication (format is <user:password>).\n"
+msgstr ""
+"  --proxy-user   - 指定用于代理认证的用户和\n"
+"                   口令(格式如 <用户: 口令>)。\n"
 
-#: ../urpme:1
+#: ../urpmi:114
 #, c-format
-msgid "urpme: unknown option \"-%s\", check usage with --help\n"
-msgstr "urpme: 未知选项“-%s”，请用--help 检查用法\n"
+msgid ""
+"  --bug          - output a bug report in directory indicated by\n"
+"                   next arg.\n"
+msgstr ""
+"  --bug          - 输出故障报告\n"
+"                   下一个参数指定输出目录。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:118
 #, c-format
-msgid "trying to select nonexistent medium \"%s\""
-msgstr "试图选择不存在的介质“%s”"
+msgid "  --X            - use X interface.\n"
+msgstr "  --X            - 使用 X 界面。\n"
 
-#: ../urpmf:1
+#: ../urpmi:119
 #, c-format
-msgid "  --description  - print tag description: description.\n"
-msgstr "  --description   -打印标识符描述: 描述。\n"
+msgid ""
+"  --best-output  - choose best interface according to the environment:\n"
+"                   X or text mode.\n"
+msgstr ""
+"  --best-output  - 根据运行环境选择最好的界面:\n"
+"                   X 或文本模式。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:121
 #, c-format
 msgid ""
-"%s\n"
-"`with' missing for network media\n"
+"  --verify-rpm   - verify rpm signature before installation\n"
+"                   (--no-verify-rpm disable it, default is enabled).\n"
 msgstr ""
-"%s\n"
-"“with”找不到网络介质\n"
+"  --verify-rpm   - 安装之前验证 rpm 签署。\n"
+"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmi:124
 #, c-format
-msgid "  -f             - force generation of hdlist files.\n"
-msgstr "  -f             - 强迫生成 hdlist 文件。\n"
+msgid "  --excludepath  - exclude path separated by comma.\n"
+msgstr "  --excludepath  - 排除按逗号分隔的路径。\n"
 
-#: ../urpmq:1
+#: ../urpmi:125
 #, c-format
-msgid "--list-nodes can only be used with --parallel"
-msgstr "--list-nodes 仅能和 --parallel 一起使用"
+msgid "  --excludedocs  - exclude docs files.\n"
+msgstr "  --excludedocs  - 排除文档文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:126 ../urpmq:76
 #, c-format
-msgid "no hdlist file found for medium \"%s\""
-msgstr "介质“%s”未发现 hdlist 文件"
+msgid "  -a             - select all matches on command line.\n"
+msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:127
+#, c-format
+msgid "  -p             - allow search in provides to find package.\n"
+msgstr "  -p             - 允许在提供的项目中寻找软件包。\n"
+
+#: ../urpmi:128 ../urpmq:78
+#, c-format
+msgid "  -P             - do not search in provides to find package.\n"
+msgstr "  -P             - 不搜索提供标签中的软件包。\n"
+
+#: ../urpmi:129 ../urpmq:80
+#, c-format
+msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
+msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
+
+#: ../urpmi:130 ../urpmq:81
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下一个软件包是源程序包(和 --src 一样)。\n"
 
-#: ../urpmi:1
+#: ../urpmi:131
 #, c-format
-msgid "installing %s"
-msgstr "正在安装 %s"
+msgid "  -q             - quiet mode.\n"
+msgstr "  -q             - 安静模式。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:133
 #, c-format
-msgid "reading rpm files from [%s]"
-msgstr "正在从[%s]读取 rpm 文件"
+msgid "  names or rpm files given on command line will be installed.\n"
+msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:189 ../urpmi:196 ../urpmi.addmedia:101 ../urpmi.addmedia:108
+#: ../urpmi.update:45 ../urpmi.update:52 ../urpmq:130 ../urpmq:137
 #, c-format
-msgid "copying description file of \"%s\"..."
-msgstr "正在复制“%s”的描述文件..."
+msgid "bad proxy declaration on command line\n"
+msgstr "命令的代理声明无效\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi:228
 #, c-format
-msgid "  --auto         - automatically select a package in choices.\n"
-msgstr "  --auto         - 自动选中软件包。\n"
+msgid "urpmi: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmi: 未知选项“-%s”，用--help 检查用法\n"
 
-#: ../urpme:1
+#: ../urpmi:248
 #, c-format
-msgid "Removing failed"
-msgstr "删除失败"
+msgid "What can be done with binary rpm files when using --install-src"
+msgstr "对二进制 rpm 文件使用 --install-src 将会达到什么效果"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:255
 #, c-format
 msgid ""
-"  --virtual      - create virtual media wich are always up-to-date,\n"
-"                   only file:// protocol is allowed.\n"
-msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
+"Directory [%s] allready exist, please use another directory for bug report "
+"or delete it"
+msgstr ""
 
-#: ../urpm.pm:1
+#: ../urpmi:255
 #, c-format
-msgid "package %s is not found."
-msgstr "未找到软件包 %s。"
+msgid "Unable to create directory [%s] for bug report"
+msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:274
 #, c-format
-msgid "removing medium \"%s\""
-msgstr "删除介质“%s”"
+msgid "Only superuser is allowed to install packages"
+msgstr "只允许超级用户安装软件包"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpmi:410
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "One of the following packages is needed to install %s:"
+msgstr "需要下列软件包之一才能安装 %s:"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:411
 #, c-format
-msgid "  --src          - next package is a source package (same as -s).\n"
-msgstr "  --src          - 下一个软件包是源程序包(和 -s 一样)。\n"
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件包之一:"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:418
 #, c-format
-msgid ""
-"  --env          - use specific environment (typically a bug\n"
-"                   report).\n"
-msgstr "  --env          - 使用指定的环境(特别是进行故障报告时)。\n"
+msgid "What is your choice? (1-%d) "
+msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpm.pm:1
+#: ../urpmi:428 ../urpmi:545
 #, c-format
-msgid "ssh is missing\n"
-msgstr "没有 ssh\n"
+msgid "Package installation..."
+msgstr "软件包安装..."
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:428 ../urpmi:545
 #, c-format
-msgid ""
-"  --sortmedia    - sort media according to substrings separated by comma.\n"
-msgstr "  --sortmedia    - 根据用逗号分隔的子字符串排序介质。\n"
+msgid "Initializing..."
+msgstr "正在初始化..."
 
-#: ../urpm.pm:1
+#: ../urpmi:449
 #, c-format
-msgid "unable to access medium \"%s\""
-msgstr "无法访问介质“%s”"
+msgid ""
+"Some package requested cannot be installed:\n"
+"%s"
+msgstr ""
+"某些要求的软件包无法安装:\n"
+"%s"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi:454 ../urpmi:480
 #, c-format
-msgid "unable to create medium \"%s\"\n"
-msgstr "无法创建介质“%s”\n"
+msgid "do you agree ?"
+msgstr "您同意吗?"
 
-#: ../urpmf:1
+#: ../urpmi:469
 #, c-format
-msgid "  --packager     - print tag packager: packager.\n"
-msgstr "  --packager     - 打印标识符打包者: 打包者。\n"
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
+"安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
+"%s\n"
 
-#: ../urpmq:1
+#: ../urpmi:475
 #, c-format
 msgid ""
-"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
 msgstr ""
-"  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
+"要升级其它软件包，需要先删除下列软件包:\n"
+"%s"
 
-#: ../urpmi:1
+#: ../urpmi:513 ../urpmi:522
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed (%"
+"d MB)"
+msgstr "我将另外安装下列软件包(%d MB)，以满足相关性要求"
+
+#: ../urpmi:519
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1481,188 +1451,240 @@ msgstr ""
 "您必须以 root 身份安装下列满足依赖性需要的软件包:\n"
 "%s\n"
 
-#: ../urpm.pm:1
+#: ../urpmi:540 ../urpmq:356
 #, c-format
-msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "无法访问“%s”的列表文件，介质被忽略"
+msgid "unable to get source packages, aborting"
+msgstr "无法读取源软件包，中止"
 
-#: ../urpmf:1
+#: ../urpmi:555
 #, c-format
-msgid "  )              - right parenthesis to close group expression.\n"
-msgstr "  )              - 右括号用来关闭一组表达。\n"
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请插入标签“%s”的介质到设备 [%s]"
 
-#: ../urpm.pm:1
+#: ../urpmi:556
 #, c-format
-msgid "examining hdlist file [%s]"
-msgstr "正在检查 hdlist 文件 [%s]"
+msgid "Press Enter when ready..."
+msgstr "准备好后按 Enter 键..."
 
-#: ../urpm.pm:1
+#: ../urpmi:596
 #, c-format
-msgid "copying hdlists file..."
-msgstr "正在复制 hdlists 文件..."
+msgid "Downloading package `%s'..."
+msgstr "正在下载软件包“%s”..."
 
-#: ../urpm.pm:1
+#: ../urpmi:627
 #, c-format
-msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "虚拟介质“%s”应该有清楚的 URL，介质被忽略"
+msgid "The following packages have bad signatures"
+msgstr "下列软件包的签名有错误"
 
-#: ../urpmf:1
+#: ../urpmi:628
 #, c-format
-msgid "  --buildhost    - print tag buildhost: build host.\n"
-msgstr "  --buildhost    - 打印标识符创建主机: 创建主机。\n"
+msgid "Do you want to continue installation ?"
+msgstr "您想继续安装吗?"
 
-#: ../urpm.pm:1
+#: ../urpmi:648 ../urpmi:770
 #, c-format
-msgid "writing list file for medium \"%s\""
-msgstr "正在写入介质“%s”的列表文件"
+msgid ""
+"Installation failed, some files are missing:\n"
+"%s\n"
+"You may want to update your urpmi database"
+msgstr ""
+"安装失败，缺少下列文件:\n"
+"%s\n"
+"您可能需要更新您的 urpmi 数据库"
 
-#: ../urpme:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi:658 ../urpmi:711 ../urpmi:730 ../urpmi:748
 #, c-format
-msgid "  --parallel     - distributed urpmi accross machines of alias.\n"
-msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
+msgid "Installation failed"
+msgstr "安装失败"
 
-#: ../urpm.pm:1
+#: ../urpmi:673
 #, c-format
-msgid "using associated media for parallel mode: %s"
-msgstr "并行模式时使用关联介质: %s"
+msgid "distributing %s"
+msgstr "正在分发 %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:681
 #, c-format
-msgid "mounting %s"
-msgstr "正在装载 %s"
+msgid "installing %s"
+msgstr "正在安装 %s"
 
-#: ../urpm.pm:1
+#: ../urpmi:696
 #, c-format
-msgid ""
-"unable to take care of medium \"%s\" as list file is already used by another "
-"medium"
-msgstr "无法照顾介质“%s”，因为列表文件已经被另外的介质所用"
+msgid "Installing package `%s' (%s/%s)..."
+msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi:718
 #, c-format
-msgid "unable to get source packages, aborting"
-msgstr "无法读取源软件包，中止"
+msgid "Try installation without checking dependencies? (y/N) "
+msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../urpm.pm:1
+#: ../urpmi:735
 #, c-format
-msgid "rsync failed: exited with %d or signal %d\n"
-msgstr "rsync 失败: 退出代码 %d 或信号 %d\n"
+msgid "Try installation even more strongly (--force)? (y/N) "
+msgstr "尝试更激烈的安装方式吗?(使用 --force)(是(y)/否(N))[否] "
 
-#: ../urpm.pm:1 ../urpmi:1
+#: ../urpmi:775
 #, c-format
-msgid "        %s%% of %s completed, ETA = %s, speed = %s"
-msgstr "        已完成 %s%%，总共 %s，ETA = %s，速度 = %s"
+msgid "%d installation transactions failed"
+msgstr "%d 安装交易失败"
 
-#: ../urpm.pm:1
+#: ../urpmi:783
 #, c-format
-msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "正在计算所获取的源 hdlist(或综合文件)的 md5sum"
+msgid "Installation is possible"
+msgstr "可以安装"
 
-#: ../urpm.pm:1
+#: ../urpmi:786
 #, c-format
-msgid "unable to import pubkey file of \"%s\""
-msgstr "无法导入“%s”的公共密钥文件"
+msgid "Everything already installed"
+msgstr "全部安装完成"
 
-#: ../urpmi:1
+#: ../urpmi:800
 #, c-format
-msgid ""
-"  --no-uninstall - never ask to uninstall a package, abort the "
-"installation.\n"
-msgstr "  --no-uninstall - 从不询问卸载软件包，直接中断安装。\n"
+msgid "restarting urpmi"
+msgstr "正在重新启动 urpmi"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:44
 #, 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"
+"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"
-"usage:\n"
+"and [options] are from\n"
 msgstr ""
-"urpmq 版本 %s\n"
-"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
-"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"用法: urpmi.addmedia [选项] <名称> <url> [with <相对路径>]\n"
+"  <url> 为以下之一\n"
+"       file://<路径>\n"
+"       ftp://<登录名>:<口令>@<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       http://<主机>/<路径> with <hdlist 的相对路径文件名>\n"
+"       removable://<路径>\n"
 "\n"
-"用法:\n"
+"而 [options] 可以来自\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:61
 #, c-format
-msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
-msgstr "正在获取“%s”的源 hdlist(或综合文件)..."
+msgid "  --update       - create an update medium.\n"
+msgstr "  --update       - 创建一个更新介质。\n"
 
-#: ../urpmq:1
+#: ../urpmi.addmedia:62
 #, c-format
-msgid "  -g             - print groups with name also.\n"
-msgstr "  -g             - 打印组名。\n"
+msgid "  --probe-synthesis - try to find and use synthesis file.\n"
+msgstr "  --probe-synthesis - 试图查找并使用综合文件。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:63
 #, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "介质“%s”未选中"
+msgid "  --probe-hdlist - try to find and use hdlist file.\n"
+msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:64
 #, c-format
-msgid "Only superuser is allowed to install packages"
-msgstr "只允许超级用户安装软件包"
+msgid ""
+"  --no-probe     - do not try to find any synthesis or\n"
+"                   hdlist file.\n"
+msgstr "  --no-probe     - 不试图查找任何综合文件或 hdlist 文件。\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:66
 #, c-format
-msgid "using specific environment on %s\n"
-msgstr "在 %s 使用指定环境\n"
+msgid ""
+"  --distrib      - automatically create all media from an installation\n"
+"                   medium.\n"
+msgstr "  --distrib      - 自动从安装介质创建全部介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:68
 #, c-format
-msgid "unable to find hdlist file for \"%s\", medium ignored"
-msgstr "找不到“%s”的 hdlist 文件，介质被忽略"
+msgid ""
+"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
+"                   distribution, XXX may be main, contrib, updates or\n"
+"                   anything else that has been configured ;-)\n"
+msgstr ""
+"  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
+"                   主要、贡献、更新或任何其它的配置。 ;-)\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:71
 #, c-format
-msgid "  --split-length - small transaction length, default is %d.\n"
-msgstr "  --split-length - 小交易长度，默认为 %d。\n"
+msgid ""
+"  --from         - use specified url for list of mirrors, the default is\n"
+"                   %s\n"
+msgstr "  --from         - 使用指定的 URL 列出镜像，默认为 %s。\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:73
 #, c-format
-msgid "  (              - left parenthesis to open group expression.\n"
-msgstr "  (              - 左括号用来打开一组表达。\n"
+msgid ""
+"  --version      - use specified distribution version, the default is taken\n"
+"                   from the version of the distribution told by the\n"
+"                   installed mandrake-release package.\n"
+msgstr ""
+"  --version      - 使用指定发行版本，默认版本是所安装的 mandrake 发行包。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:76
 #, c-format
-msgid "too many mount points for removable medium \"%s\""
-msgstr "可移动介质“%s”的载入点太多"
+msgid ""
+"  --arch         - use specified architecture, the default is arch of\n"
+"                   mandrake-release package installed.\n"
+msgstr ""
+"  --arch         - 使用指定的架构，默认是所安装的 mandrake 发行版本的软件包\n"
+"                   架构。\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:78
 #, c-format
 msgid ""
-"  -a             - binary AND operator, true if both expression are true.\n"
-msgstr "  -a             - 二元 AND 操作符，如果两个表达都为真，则为真。\n"
+"  --virtual      - create virtual media wich are always up-to-date,\n"
+"                   only file:// protocol is allowed.\n"
+msgstr "  --virtual      - 创建常为最新的虚拟介质，只允许 file:// 协议。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:80 ../urpmi.update:71
+#, c-format
+msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
+msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
+
+#: ../urpmi.addmedia:81 ../urpmi.removemedia:38 ../urpmi.update:74
+#, c-format
+msgid "  -c             - clean headers cache directory.\n"
+msgstr "  -c             - 直接清除软件包头缓存。\n"
+
+#: ../urpmi.addmedia:82 ../urpmi.update:75
+#, c-format
+msgid "  -f             - force generation of hdlist files.\n"
+msgstr "  -f             - 强迫生成 hdlist 文件。\n"
+
+#: ../urpmi.addmedia:124 ../urpmi.removemedia:39 ../urpmi.update:76
 #, c-format
 msgid ""
-"unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the "
-"medium."
+"\n"
+"unknown options '%s'\n"
 msgstr ""
-"无法访问介质“%s”，\n"
-"这可能是因为您在创建介质时是手动装载的目录。"
+"\n"
+"未知的选项“%s”\n"
 
-#: ../urpmf:1
+#: ../urpmi.addmedia:155
 #, c-format
-msgid "  --group        - print tag group: group.\n"
-msgstr "  --group         - 打印标识符组: 分组。\n"
+msgid "cannot add updates of a cooker distribution\n"
+msgstr "无法添加 cooker 发行版的更新\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmi.addmedia:160
 #, c-format
-msgid "  --media        - use only the given media, separated by comma.\n"
-msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
+msgid "retrieving mirrors at %s ..."
+msgstr "正在获取 %s 处的镜像..."
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:196
 #, c-format
-msgid "unable to create transaction"
-msgstr "无法创建交易"
+msgid ""
+"%s\n"
+"no need to give <relative path of hdlist> with --distrib"
+msgstr ""
+"%s\n"
+"使用 --distrib 不需要提供 <hdlist的相对路径>"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.addmedia:203 ../urpmi.addmedia:226
+#, c-format
+msgid "unable to update medium \"%s\"\n"
+msgstr "无法更新介质“%s”\n"
+
+#: ../urpmi.addmedia:214
 #, c-format
 msgid ""
 "%s\n"
@@ -1671,183 +1693,218 @@ msgstr ""
 "%s\n"
 "<hdlist相对路径>找不到\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.addmedia:216
 #, c-format
-msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "正在从介质“%s”上获取 rpm 文件..."
-
-#: ../urpmi:1
-#, c-format
-msgid "distributing %s"
-msgstr "正在分发 %s"
+msgid ""
+"%s\n"
+"`with' missing for network media\n"
+msgstr ""
+"%s\n"
+"“with”找不到网络介质\n"
 
-#: ../urpmi:1
+#: ../urpmi.addmedia:224
 #, c-format
-msgid "Installation failed"
-msgstr "安装失败"
+msgid "unable to create medium \"%s\"\n"
+msgstr "无法创建介质“%s”\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.removemedia:34
 #, c-format
-msgid "write config file [%s]"
-msgstr "写入配置文件[%s]"
+msgid ""
+"usage: urpmi.removemedia [-a] <name> ...\n"
+"where <name> is a medium name to remove.\n"
+msgstr ""
+"用法: urpmi.removemedia -a <名称> ...\n"
+"其中 <名称> 是要删除的介质名。\n"
 
-#: ../urpmi.update:1
+#: ../urpmi.removemedia:37
 #, c-format
-msgid "  -a             - select all non-removable media.\n"
-msgstr "  -a             - 选择所有不可移动的介质。\n"
+msgid "  -a             - select all media.\n"
+msgstr "  -a             - 选择所有介质。\n"
 
-#: ../urpmf:1
+#: ../urpmi.removemedia:48
 #, c-format
-msgid "  --epoch        - print tag epoch: epoch.\n"
-msgstr "  --epoch          - 打印标识符周期: 周期。\n"
+msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
+msgstr "没有可删除的(用 urpmi.addmedia 增加介质)\n"
 
-#: ../urpmi:1
+#: ../urpmi.removemedia:50
 #, c-format
 msgid ""
-"  --verify-rpm   - verify rpm signature before installation\n"
-"                   (--no-verify-rpm disable it, default is enabled).\n"
+"the entry to remove is missing\n"
+"(one of %s)\n"
 msgstr ""
-"  --verify-rpm   - 安装之前验证 rpm 签署。\n"
-"                   (--no-verify-rpm 禁止它，默认是激活的)。\n"
-
-#: ../urpmi:1
-#, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请插入标签“%s”的介质到设备 [%s]"
+"找不到要删除的项\n"
+"(%s中的一个)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmi.update:60
 #, c-format
-msgid "  --update       - create an update medium.\n"
-msgstr "  --update       - 创建一个更新介质。\n"
+msgid ""
+"usage: urpmi.update [options] <name> ...\n"
+"where <name> is a medium name to update.\n"
+msgstr ""
+"用法: urpmi.update [选项] <名称> ...\n"
+"其中 <名称> 是要删除的介质名...\n"
 
-#: ../urpmq:1
+#: ../urpmi.update:70
 #, c-format
-msgid "  --list-url     - list available media and their url.\n"
-msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
+msgid "  --update       - update only update media.\n"
+msgstr "  --update       - 只使用更新介质。\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmi.update:72
 #, c-format
-msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
-msgstr "  -y             - 利用模糊查询(和 --fuzzy 一样)。\n"
+msgid "  --force-key    - force update of gpg key.\n"
+msgstr "  --force-key    - 强制更新 gpg 密钥。\n"
 
-#: ../_irpm:1 ../urpmi:1
+#: ../urpmi.update:73
 #, c-format
-msgid "Ok"
-msgstr "确定"
+msgid "  -a             - select all non-removable media.\n"
+msgstr "  -a             - 选择所有不可移动的介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmi.update:86
 #, c-format
-msgid "invalid hdlist description \"%s\" in hdlists file"
-msgstr "hdlists 文件中的 hdlist 描述“%s”无效"
+msgid "nothing to update (use urpmi.addmedia to add a media)\n"
+msgstr "没有要升级的软件(用 urpmi.addmedia 添加介质)\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmi.update:98
 #, c-format
-msgid "removing %s"
-msgstr "正在删除 %s"
+msgid ""
+"the entry to update is missing\n"
+"(one of %s)\n"
+msgstr ""
+"找不到要升级的项\n"
+"(%s 中之一)\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:35
 #, c-format
 msgid ""
-"  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-"                   distribution, XXX may be main, contrib, updates or\n"
-"                   anything else that has been configured ;-)\n"
+"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 ""
-"  --distrib-XXX  - 自动为发行版的某一部分创建介质，这些部分可能包括\n"
-"                   主要、贡献、更新或任何其它的配置。 ;-)\n"
+"urpmq 版本 %s\n"
+"版权 (C) 1999, 2000, 2001, 2002 MandrakeSoft.\n"
+"这是自由软件，可以依照 GNU GPL 重新发布。\n"
+"\n"
+"用法:\n"
 
-#: ../urpmf:1
+#: ../urpmq:50
 #, c-format
-msgid "  --size         - print tag size: size.\n"
-msgstr "  --size          - 打印标识符大小: 大小。\n"
+msgid "  --list         - list available packages.\n"
+msgstr "  --list         - 列出可用的软件包。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:51
 #, c-format
-msgid "in order to keep %s"
-msgstr "为了保留 %s"
+msgid "  --list-media   - list available media.\n"
+msgstr "  --list-media   - 列出可用的介质。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:52
 #, c-format
-msgid "due to unsatisfied %s"
-msgstr "原因是不满足 %s"
+msgid "  --list-url     - list available media and their url.\n"
+msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
 
-#: ../_irpm:1
+#: ../urpmq:53
 #, c-format
 msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
-msgstr ""
-"自动安装软件包...\n"
-"您要求安装软件包 %s\n"
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgstr "  --dump-config  - 以 urpmi.addmedia 参数的格式导出配置。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:54
 #, c-format
-msgid "urpmi database locked"
-msgstr "urpmi 数据库已锁定"
+msgid "  --list-nodes   - list available nodes when using --parallel.\n"
+msgstr "  --list-nodes   - 如果使用了 --parallel，列出所有可用的节点。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:55
 #, c-format
-msgid "copy of [%s] failed"
-msgstr "复制[%s]失败"
+msgid "  --list-aliases - list available parallel aliases.\n"
+msgstr "  --list-aliases - 列出可用的并行处理别名。\n"
 
-#: ../urpmi.addmedia:1 ../urpmi.update:1
+#: ../urpmq:57
 #, c-format
-msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
-msgstr "  --no-md5sum    - 禁用 MD5SUM 文件检查。\n"
+msgid ""
+"  --headers      - extract headers for package listed from urpmi db to\n"
+"                   stdout (root only).\n"
+msgstr ""
+"  --headers      - 从 urpmi 数据库提取软件包的头信息\n"
+"                   用 stdout 输出(root 专用)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:59
 #, c-format
-msgid "taking removable device as \"%s\""
-msgstr "将可移动设备认作“%s”"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
+msgstr "  --sources      - 下载前给出所有的源文件包(root 专用)。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:62
 #, c-format
-msgid "examining pubkey file of \"%s\"..."
-msgstr "正在检查“%s”的公共密钥文件..."
+msgid ""
+"  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
+"                   This permit to querying a distro.\n"
+msgstr ""
+
+#: ../urpmq:72
+#, fuzzy, c-format
+msgid "  --changelog    - print changelog.\n"
+msgstr "  --all           - 打印全部标识符。\n"
 
-#: ../urpmi:1 ../urpmq:1
+#: ../urpmq:74
 #, c-format
-msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
-msgstr "  --fuzzy        - 利用模糊查询(和 -y 一样)。\n"
+msgid "  -d             - extend query to package dependencies.\n"
+msgstr "  -d             - 扩展软件包依赖性查询。\n"
 
-#: ../urpmq:1
+#: ../urpmq:75
 #, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 如果更新的版本已经安装，就删除软件包。\n"
 
-#: ../urpmi.addmedia:1
+#: ../urpmq:77
 #, c-format
-msgid "  --probe-hdlist - try to find and use hdlist file.\n"
-msgstr "  --probe-hdlist - 试图查找并使用 hdlist 文件。\n"
+msgid "  -c             - complete output with package to be removed.\n"
+msgstr "  -c             - 要删除的软件包的完整输出。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:79
 #, c-format
-msgid "due to missing %s"
-msgstr "原因是丢失 %s"
+msgid "  -R             - reverse search to what requires package.\n"
+msgstr "  -R             - 逆序搜索所需的软件包。\n"
 
-#: ../urpmf:1 ../urpmi:1 ../urpmq:1
+#: ../urpmq:82
+#, fuzzy, c-format
+msgid "  -i             - print useful information in human readeable form.\n"
+msgstr "  -i             - 以人类可读的格式打印有用信息。\n"
+
+#: ../urpmq:83
 #, c-format
-msgid "  --update       - use only update media.\n"
-msgstr "  --update       - 只使用升级介质。\n"
+msgid "  -g             - print groups with name also.\n"
+msgstr "  -g             - 打印组名。\n"
 
-#: ../urpmi.update:1
+#: ../urpmq:84
 #, c-format
-msgid ""
-"usage: urpmi.update [options] <name> ...\n"
-"where <name> is a medium name to update.\n"
-msgstr ""
-"用法: urpmi.update [选项] <名称> ...\n"
-"其中 <名称> 是要删除的介质名...\n"
+msgid "  -r             - print version and release with name also.\n"
+msgstr "  -r             - 和名称一起打印版本和发行号。\n"
 
-#: ../urpm.pm:1
+#: ../urpmq:86
+#, fuzzy, c-format
+msgid "  -l             - list files in package.\n"
+msgstr "  --list         - 列出可用的软件包。\n"
+
+#: ../urpmq:87
 #, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
-msgstr "试图跳过已有介质“%s”，避免中"
+msgid "  names or rpm files given on command line are queried.\n"
+msgstr "  需要在命令行给出名称或 rpm 文件。\n"
 
-#: ../urpme:1 ../urpmi:1
+#: ../urpmq:163
 #, c-format
-msgid ""
-"  --test         - verify if the installation can be achieved correctly.\n"
-msgstr "  --test         - 验证安装是否可以正确进行。\n"
+msgid "urpmq: unknown option \"-%s\", check usage with --help\n"
+msgstr "urpmq: 未知选项“-%s”，请用--help 检查用法\n"
+
+#: ../urpmq:166
+#, c-format
+msgid "urpmq: cannot read rpm file \"%s\"\n"
+msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
+#: ../urpmq:219
+#, c-format
+msgid "--list-nodes can only be used with --parallel"
+msgstr "--list-nodes 仅能和 --parallel 一起使用"