sync with code

1 files changed, 273 insertions, 312 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2c9f5147..4b8f2de1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: urpmi\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-09-01 19:38+0200\n"
+"POT-Creation-Date: 2012-10-05 17:55+0200\n"
 "PO-Revision-Date: 2008-03-30 14:22+0800\n"
 "Last-Translator: 汤诗语 <shiyu@mandriva.org>\n"
 "Language-Team: Mandriva Linux Simplified Chinese <cooker-i18n@mandrivalinux."
@@ -116,7 +116,7 @@ msgid "Options:"
 msgstr "选项："
 
 #: ../gurpmi.pm:42 ../urpme:42 ../urpmf:30 ../urpmi:67 ../urpmi.addmedia:55
-#: ../urpmi.recover:29 ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
+#: ../urpmi.removemedia:40 ../urpmi.update:32 ../urpmq:41
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 打印帮助信息。\n"
@@ -154,12 +154,12 @@ msgstr ""
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用列出的介质，介质之间用逗号分隔。\n"
 
-#: ../gurpmi.pm:49 ../urpmi:146
+#: ../gurpmi.pm:49 ../urpmi:145
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允许在 provides 字段中查找软件包。\n"
 
-#: ../gurpmi.pm:50 ../urpmi:147
+#: ../gurpmi.pm:50 ../urpmi:146
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 字段中查找软件包。\n"
@@ -212,7 +212,7 @@ msgstr "软件包安装"
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../gurpmi2:113 ../urpmi:505
+#: ../gurpmi2:113 ../urpmi:504
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -278,13 +278,13 @@ msgstr ""
 "%s\n"
 "仍然继续安装吗?"
 
-#: ../gurpmi2:277 ../urpmi:605
+#: ../gurpmi2:277 ../urpmi:604
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
 msgstr "为了满足依赖关系，将安装下列软件包:"
 
-#: ../gurpmi2:278 ../urpmi:606
+#: ../gurpmi2:278 ../urpmi:605
 #, c-format
 msgid ""
 "To satisfy dependencies, the following packages are going to be installed:"
@@ -311,7 +311,7 @@ msgstr "正在准备..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../gurpmi2:344 ../urpmi:633
+#: ../gurpmi2:344 ../urpmi:632
 #, c-format
 msgid "Please insert the medium named \"%s\""
 msgstr "请插入介质“%s”"
@@ -321,8 +321,8 @@ msgstr "请插入介质“%s”"
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../gurpmi2:371 ../urpm.pm:338 ../urpm/download.pm:863
-#: ../urpm/get_pkgs.pm:286 ../urpm/media.pm:994 ../urpm/media.pm:1506
+#: ../gurpmi2:371 ../urpm.pm:389 ../urpm/download.pm:859
+#: ../urpm/get_pkgs.pm:278 ../urpm/media.pm:994 ../urpm/media.pm:1506
 #: ../urpm/media.pm:1657
 #, c-format
 msgid "...retrieving failed: %s"
@@ -362,12 +362,12 @@ msgstr "软件包已经安装"
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../gurpmi2:419 ../urpme:165
+#: ../gurpmi2:419 ../urpme:164
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../gurpmi2:430 ../urpmi:691
+#: ../gurpmi2:430 ../urpmi:690
 #, c-format
 msgid "restarting urpmi"
 msgstr "重新启动 urpmi"
@@ -406,7 +406,7 @@ msgstr "                    默认为 %s。\n"
 msgid "   -f             - output rpm full name (NVRA)\n"
 msgstr "  -f              - 输出 rpm 的完整名称(NVRA)。\n"
 
-#: ../rurpmi:11 ../urpmi:265
+#: ../rurpmi:11 ../urpmi:264
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只允许超级用户安装软件包"
@@ -421,137 +421,137 @@ msgstr "正在以限制模式运行 urpmi..."
 msgid "While some packages may have been installed, there were failures.\n"
 msgstr ""
 
-#: ../urpm.pm:110
+#: ../urpm.pm:142
 #, c-format
 msgid "fail to create directory %s"
 msgstr "创建目录 %s 失败"
 
-#: ../urpm.pm:111
+#: ../urpm.pm:143
 #, c-format
 msgid "invalid owner for directory %s"
 msgstr "目录 %s 的所有者无效"
 
-#: ../urpm.pm:135
+#: ../urpm.pm:175
 #, c-format
 msgid "Can not download packages into %s"
 msgstr "无法将软件包下载到 %s"
 
-#: ../urpm.pm:150
+#: ../urpm.pm:190
 #, c-format
 msgid "Environment directory %s does not exist"
 msgstr "环境目录 %s 不存在"
 
-#: ../urpm.pm:151 ../urpmf:243 ../urpmq:163
+#: ../urpm.pm:191 ../urpmf:243 ../urpmq:163
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "在 %s 使用指定环境\n"
 
-#: ../urpm.pm:313
+#: ../urpm.pm:359
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "无法打开 rpmdb"
 
-#: ../urpm.pm:327
+#: ../urpm.pm:378
 #, c-format
 msgid "invalid rpm file name [%s]"
 msgstr "无效的 rpm 文件名[%s]"
 
-#: ../urpm.pm:333
+#: ../urpm.pm:384
 #, c-format
 msgid "retrieving rpm file [%s] ..."
 msgstr "正在获取 rpm 文件[%s]..."
 
-#: ../urpm.pm:335 ../urpm/get_pkgs.pm:284
+#: ../urpm.pm:386 ../urpm/get_pkgs.pm:276
 #, c-format
 msgid "...retrieving done"
 msgstr "...获取完成"
 
-#: ../urpm.pm:343
+#: ../urpm.pm:394
 #, c-format
 msgid "unable to access rpm file [%s]"
 msgstr "无法访问 rpm 文件[%s]"
 
-#: ../urpm.pm:348
+#: ../urpm.pm:399
 #, c-format
 msgid "unable to parse spec file %s [%s]"
 msgstr "无法处理 spec 文件 %s [%s]"
 
-#: ../urpm.pm:356
+#: ../urpm.pm:407
 #, c-format
 msgid "unable to register rpm file"
 msgstr "无法访问注册 rpm 文件"
 
-#: ../urpm.pm:358
+#: ../urpm.pm:409
 #, c-format
 msgid "Incompatible architecture for rpm [%s]"
 msgstr "RPM 的架构不兼容[%s]"
 
-#: ../urpm.pm:362
+#: ../urpm.pm:413
 #, c-format
 msgid "error registering local packages"
 msgstr "注册本地软件包出错"
 
-#: ../urpm.pm:450
+#: ../urpm.pm:525
 #, c-format
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "运行于限制模式运行时，禁止执行此操作"
 
-#: ../urpm/args.pm:151 ../urpm/args.pm:160
+#: ../urpm/args.pm:149 ../urpm/args.pm:158
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令行声明的代理服务器无效\n"
 
-#: ../urpm/args.pm:306
+#: ../urpm/args.pm:303
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq: 无法读取 rpm 文件“%s”\n"
 
-#: ../urpm/args.pm:384
+#: ../urpm/args.pm:371
 #, c-format
 msgid "unexpected expression %s"
 msgstr "意外表达式 %s"
 
-#: ../urpm/args.pm:385
+#: ../urpm/args.pm:372
 #, c-format
 msgid "missing expression before %s"
 msgstr "%s 前缺少表达式"
 
-#: ../urpm/args.pm:391
+#: ../urpm/args.pm:378
 #, c-format
 msgid "unexpected expression %s (suggestion: use -a or -o ?)"
 msgstr "意外表达式 %s(建议：使用 -a 或 -o?)"
 
-#: ../urpm/args.pm:395
+#: ../urpm/args.pm:382
 #, c-format
 msgid "no expression to close"
 msgstr "没有要关闭的表达式"
 
-#: ../urpm/args.pm:404
+#: ../urpm/args.pm:391
 #, c-format
 msgid "by default urpmf awaits a regexp. you should use option \"--literal\""
 msgstr "默认情况下，urpmf 使用正则表达式。您应该使用选项“--literal”"
 
-#: ../urpm/args.pm:478
+#: ../urpm/args.pm:465
 #, c-format
 msgid "chroot directory doesn't exist"
 msgstr "chroot 目录不存在"
 
-#: ../urpm/args.pm:501
+#: ../urpm/args.pm:488
 #, c-format
 msgid "Can't use %s without %s"
 msgstr "没有 %2$s 无法使用 %1$s"
 
-#: ../urpm/args.pm:504 ../urpm/args.pm:507 ../urpmq:155
+#: ../urpm/args.pm:491 ../urpm/args.pm:494 ../urpmq:155
 #, c-format
 msgid "Can't use %s with %s"
 msgstr "无法和 %2$s 一起使用 %1$s"
 
-#: ../urpm/args.pm:515
+#: ../urpm/args.pm:502
 #, c-format
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../urpm/args.pm:523
+#: ../urpm/args.pm:510
 #, c-format
 msgid ""
 "%s version %s\n"
@@ -567,12 +567,12 @@ msgstr ""
 "\n"
 "用法:\n"
 
-#: ../urpm/args.pm:529
+#: ../urpm/args.pm:516
 #, c-format
 msgid "Copyright (C) %s by %s"
 msgstr "版权 (C) %s %s"
 
-#: ../urpm/bug_report.pm:67 ../urpmi:255
+#: ../urpm/bug_report.pm:67 ../urpmi:254
 #, c-format
 msgid "Copying failed"
 msgstr "复制失败"
@@ -599,152 +599,147 @@ msgstr "介质“%s”不可用"
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "无法从介质“%2$s”读取 rpm 文件[%1$s]"
 
-#: ../urpm/cfg.pm:82
+#: ../urpm/cfg.pm:80
 #, c-format
 msgid "syntax error in config file at line %s"
 msgstr "配置文件第 %s 行语法有错"
 
-#: ../urpm/cfg.pm:115
+#: ../urpm/cfg.pm:113
 #, c-format
 msgid "unable to read config file [%s]"
 msgstr "无法读取配置文件[%s]"
 
-#: ../urpm/cfg.pm:141
+#: ../urpm/cfg.pm:139
 #, c-format
 msgid "medium `%s' is defined twice, aborting"
 msgstr "介质“%s”定义了两次，正在退出"
 
-#: ../urpm/cfg.pm:254 ../urpm/media.pm:553
+#: ../urpm/cfg.pm:251 ../urpm/media.pm:553
 #, c-format
 msgid "unable to write config file [%s]"
 msgstr "无法写入配置文件[%s]"
 
-#: ../urpm/download.pm:95
+#: ../urpm/download.pm:93
 #, c-format
 msgid "%s is not available, falling back on %s"
 msgstr "%s 不可用，默认回到 %s"
 
-#: ../urpm/download.pm:178
+#: ../urpm/download.pm:176
 #, c-format
 msgid "can not read proxy settings (not enough rights to read %s)"
 msgstr "无法读取代理服务器设置(没有足够的权限读取 %s)"
 
-#: ../urpm/download.pm:208
+#: ../urpm/download.pm:206
 #, c-format
 msgid "Please enter your credentials for accessing proxy\n"
 msgstr "请输入访问代理服务器所需的认证信息\n"
 
-#: ../urpm/download.pm:209
+#: ../urpm/download.pm:207
 #, c-format
 msgid "User name:"
 msgstr "用户名:"
 
-#: ../urpm/download.pm:209
+#: ../urpm/download.pm:207
 #, c-format
 msgid "Password:"
 msgstr "密码:"
 
-#: ../urpm/download.pm:295
+#: ../urpm/download.pm:293
 #, c-format
 msgid "Unknown webfetch `%s' !!!\n"
 msgstr "未知的 webfetch“%s”!!!\n"
 
-#: ../urpm/download.pm:303
+#: ../urpm/download.pm:301
 #, c-format
 msgid "%s failed: exited with signal %d"
 msgstr "%s 失败: 退出信号为 %d"
 
-#: ../urpm/download.pm:304
+#: ../urpm/download.pm:302
 #, c-format
 msgid "%s failed: exited with %d"
 msgstr "%s 失败: 退出代码为 %d"
 
-#: ../urpm/download.pm:338
+#: ../urpm/download.pm:336
 #, c-format
 msgid "copy failed"
 msgstr "复制失败"
 
-#: ../urpm/download.pm:344
+#: ../urpm/download.pm:342
 #, c-format
 msgid "wget is missing\n"
 msgstr "缺少 wget\n"
 
-#: ../urpm/download.pm:411
+#: ../urpm/download.pm:409
 #, c-format
 msgid "curl is missing\n"
 msgstr "缺少 curl\n"
 
-#: ../urpm/download.pm:547
-#, c-format
-msgid "curl failed: upload canceled\n"
-msgstr "curl 失败: 上传已取消\n"
-
-#: ../urpm/download.pm:548
+#: ../urpm/download.pm:544
 #, c-format
 msgid "curl failed: download canceled\n"
 msgstr "curl 失败: 下载已取消\n"
 
-#: ../urpm/download.pm:583
+#: ../urpm/download.pm:579
 #, c-format
 msgid "rsync is missing\n"
 msgstr "缺少 rsync\n"
 
-#: ../urpm/download.pm:651
+#: ../urpm/download.pm:647
 #, c-format
 msgid "ssh is missing\n"
 msgstr "缺少 ssh\n"
 
-#: ../urpm/download.pm:670
+#: ../urpm/download.pm:666
 #, c-format
 msgid "prozilla is missing\n"
 msgstr "缺少 prozilla\n"
 
-#: ../urpm/download.pm:686
+#: ../urpm/download.pm:682
 #, c-format
 msgid "Couldn't execute prozilla\n"
 msgstr "无法执行 prozilla\n"
 
-#: ../urpm/download.pm:696
+#: ../urpm/download.pm:692
 #, c-format
 msgid "aria2 is missing\n"
 msgstr "缺少 aria2\n"
 
-#: ../urpm/download.pm:740
+#: ../urpm/download.pm:736
 #, c-format
 msgid "Failed to download %s"
 msgstr "下载 %s 失败"
 
-#: ../urpm/download.pm:835
+#: ../urpm/download.pm:831
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../urpm/download.pm:836
+#: ../urpm/download.pm:832
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../urpm/download.pm:921
+#: ../urpm/download.pm:917
 #, c-format
 msgid "retrieving %s"
 msgstr "正在获取 %s"
 
-#: ../urpm/download.pm:932
+#: ../urpm/download.pm:928
 #, c-format
 msgid "retrieved %s"
 msgstr "已获取 %s"
 
-#: ../urpm/download.pm:994
+#: ../urpm/download.pm:990
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定义了未知的协议"
 
-#: ../urpm/download.pm:1008
+#: ../urpm/download.pm:1004
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "未找到 webfetch，支持的 webfetch 是: %s\n"
 
-#: ../urpm/download.pm:1023
+#: ../urpm/download.pm:1019
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "无法处理协议: %s"
@@ -759,7 +754,7 @@ msgstr "清除 %s 和 %s"
 msgid "package %s is not found."
 msgstr "未找到软件包 %s。"
 
-#: ../urpm/get_pkgs.pm:277
+#: ../urpm/get_pkgs.pm:269
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在从介质“%s”上获取 rpm 文件..."
@@ -769,78 +764,78 @@ msgstr "正在从介质“%s”上获取 rpm 文件..."
 msgid "[repackaging]"
 msgstr "[重新打包]"
 
-#: ../urpm/install.pm:201
+#: ../urpm/install.pm:200
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已创建在 %s 上安装的交易(删除=%d，安装=%d，升级=%d)"
 
-#: ../urpm/install.pm:204
+#: ../urpm/install.pm:203
 #, c-format
 msgid "unable to create transaction"
 msgstr "无法创建交易"
 
-#: ../urpm/install.pm:229
+#: ../urpm/install.pm:228
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "无法从 delta-rpm 软件包 %s 中提取 rpm"
 
-#: ../urpm/install.pm:242
+#: ../urpm/install.pm:241
 #, c-format
 msgid "unable to install package %s"
 msgstr "无法安装软件包 %s"
 
-#: ../urpm/install.pm:245
+#: ../urpm/install.pm:244
 #, c-format
 msgid "removing bad rpm (%s) from %s"
 msgstr "正在从 %2$s 删除错误的 rpm(%1$s)"
 
-#: ../urpm/install.pm:246 ../urpm/install.pm:311
+#: ../urpm/install.pm:245 ../urpm/install.pm:310
 #, c-format
 msgid "removing %s failed: %s"
 msgstr "删除 %s 失败: %s"
 
-#: ../urpm/install.pm:292
+#: ../urpm/install.pm:291
 #, c-format
 msgid "Removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:293
+#: ../urpm/install.pm:292
 #, c-format
 msgid "removing package %s"
 msgstr "删除软件包 %s"
 
-#: ../urpm/install.pm:309
+#: ../urpm/install.pm:308
 #, c-format
 msgid "removing installed rpms (%s) from %s"
 msgstr "正在从 %2$s 删除已安装的 rpm(%1$s)"
 
-#: ../urpm/install.pm:318
+#: ../urpm/install.pm:317
 #, c-format
 msgid "More information on package %s"
 msgstr "关于软件包 %s 的更多信息"
 
-#: ../urpm/ldap.pm:44
+#: ../urpm/ldap.pm:42
 #, c-format
 msgid "Cannot create ldap cache directory"
 msgstr "无法创建 ldap 缓存目录"
 
-#: ../urpm/ldap.pm:46
+#: ../urpm/ldap.pm:44
 #, c-format
 msgid "Cannot write cache file for ldap\n"
 msgstr "无法写入 ldap 的缓存文件\n"
 
-#: ../urpm/ldap.pm:181
+#: ../urpm/ldap.pm:179
 #, c-format
 msgid "No server defined, missing uri or host"
 msgstr "未定义服务器，缺少 uri 或 主机"
 
-#: ../urpm/ldap.pm:182
+#: ../urpm/ldap.pm:180
 #, c-format
 msgid "No base defined"
 msgstr "未定义基础"
 
-#: ../urpm/ldap.pm:192 ../urpm/ldap.pm:195
+#: ../urpm/ldap.pm:190 ../urpm/ldap.pm:193
 #, c-format
 msgid "Cannot connect to ldap uri:"
 msgstr "无法连接到 ldap uri:"
@@ -1259,83 +1254,83 @@ msgstr "找到地理位置较近的 %s %.2f %.2f，从时区 %s"
 msgid "getting mirror list from %s"
 msgstr "从 %s 中获得镜像列表"
 
-#: ../urpm/msg.pm:76 ../urpmi:491 ../urpmi:509 ../urpmi:625
+#: ../urpm/msg.pm:74 ../urpmi:490 ../urpmi:508 ../urpmi:624
 #, c-format
 msgid "Nn"
 msgstr "nN否"
 
 #. -PO: Add here the keys which might be pressed in the "Yes"-case.
-#: ../urpm/msg.pm:77 ../urpme:38 ../urpmi.addmedia:133
+#: ../urpm/msg.pm:75 ../urpme:38 ../urpmi.addmedia:133
 #, c-format
 msgid "Yy"
 msgstr "yY是"
 
-#: ../urpm/msg.pm:107 ../urpme:159 ../urpmi.addmedia:136
+#: ../urpm/msg.pm:105 ../urpme:158 ../urpmi.addmedia:136
 #, c-format
 msgid " (y/N) "
 msgstr "(是(y)/否(N))[否]"
 
-#: ../urpm/msg.pm:139
+#: ../urpm/msg.pm:134
 #, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "对不起，选择无效，请再试一次\n"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Package"
 msgstr "软件包"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Version"
 msgstr "版本"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Release"
 msgstr "释放"
 
-#: ../urpm/msg.pm:170
+#: ../urpm/msg.pm:165
 #, c-format
 msgid "Arch"
 msgstr "架构"
 
-#: ../urpm/msg.pm:179
+#: ../urpm/msg.pm:174
 #, c-format
 msgid "(suggested)"
 msgstr "(建议安装)"
 
-#: ../urpm/msg.pm:194
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "medium \"%s\""
 msgstr "介质“%s”"
 
-#: ../urpm/msg.pm:194
+#: ../urpm/msg.pm:189
 #, c-format
 msgid "command line"
 msgstr "命令行"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "B"
 msgstr "B"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "KB"
 msgstr "KB"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "MB"
 msgstr "MB"
 
-#: ../urpm/msg.pm:208
+#: ../urpm/msg.pm:203
 #, c-format
 msgid "GB"
 msgstr "GB"
 
-#: ../urpm/msg.pm:208 ../urpm/msg.pm:217
+#: ../urpm/msg.pm:203 ../urpm/msg.pm:212
 #, c-format
 msgid "TB"
 msgstr "TB"
@@ -1410,27 +1405,27 @@ msgstr "于节点 %s"
 msgid "Installation failed on node %s"
 msgstr "节点 %s 安装失败"
 
-#: ../urpm/parallel_ka_run.pm:58
+#: ../urpm/parallel_ka_run.pm:57
 #, c-format
 msgid "rshp failed, maybe a node is unreacheable"
 msgstr "rshp 失败，可能节点无法连接"
 
-#: ../urpm/parallel_ka_run.pm:80
+#: ../urpm/parallel_ka_run.pm:79
 #, c-format
 msgid "mput failed, maybe a node is unreacheable"
 msgstr "mput 失败，可能节点无法连接"
 
-#: ../urpm/parallel_ssh.pm:27
+#: ../urpm/parallel_ssh.pm:25
 #, c-format
 msgid "scp failed on host %s (%d)"
 msgstr "主机 %s scp 失败 (%d)"
 
-#: ../urpm/parallel_ssh.pm:39
+#: ../urpm/parallel_ssh.pm:37
 #, c-format
 msgid "cp failed on host %s (%d)"
 msgstr "主机 %s cp 失败 (%d)"
 
-#: ../urpm/parallel_ssh.pm:86
+#: ../urpm/parallel_ssh.pm:84
 #, c-format
 msgid ""
 "%s failed on host %s (maybe it does not have a good version of urpmi?) (exit "
@@ -1468,7 +1463,7 @@ msgstr "urpmi 已经重新启动，优先的软件包列表进行了如下更改
 msgid "No package named %s"
 msgstr "没有叫做 %s 的软件包"
 
-#: ../urpm/select.pm:219 ../urpme:113
+#: ../urpm/select.pm:219 ../urpme:112
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "下列软件包里有 %s: %s"
@@ -1576,37 +1571,37 @@ msgstr ""
 msgid "Medium without key (%s)"
 msgstr ""
 
-#: ../urpm/sys.pm:225
+#: ../urpm/sys.pm:213
 #, c-format
 msgid "system"
 msgstr "系统"
 
-#: ../urpm/sys.pm:262
+#: ../urpm/sys.pm:250
 #, c-format
 msgid "You should restart your computer for %s"
 msgstr "为了 %s，您应该重新启动您的计算机"
 
-#: ../urpm/sys.pm:264
+#: ../urpm/sys.pm:252
 #, c-format
 msgid "You should restart your session for %s"
 msgstr "为了 %s，您应该重新启动您的会话"
 
-#: ../urpm/sys.pm:266
+#: ../urpm/sys.pm:254
 #, c-format
 msgid "You should restart %s for %s"
 msgstr "为了 %2$s，您应该重新启动 %1$s"
 
-#: ../urpm/sys.pm:404
+#: ../urpm/sys.pm:392
 #, c-format
 msgid "Can't write file"
 msgstr "无法写入文件"
 
-#: ../urpm/sys.pm:404
+#: ../urpm/sys.pm:392
 #, c-format
 msgid "Can't open file"
 msgstr "无法打开文件"
 
-#: ../urpm/sys.pm:417
+#: ../urpm/sys.pm:405
 #, c-format
 msgid "Can't move file %s to %s"
 msgstr "无法将文件 %s 移动到 %s"
@@ -1631,33 +1626,28 @@ msgstr "  --test         - 验证删除是否可以正确进行。\n"
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在多个机器上分布的运行 urpmi。\n"
 
-#: ../urpme:48 ../urpmi:138
-#, c-format
-msgid "  --repackage    - Re-package the files before erasing\n"
-msgstr "  --repackage    - 在删除之前重新对文件打包\n"
-
-#: ../urpme:49
+#: ../urpme:48
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一个 root 删除 rpm。\n"
 
-#: ../urpme:50 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
-#: ../urpmi.recover:32 ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
+#: ../urpme:49 ../urpmf:35 ../urpmi:106 ../urpmi.addmedia:73
+#: ../urpmi.removemedia:45 ../urpmi.update:48 ../urpmq:68
 #, c-format
 msgid "  --urpmi-root   - use another root for urpmi db & rpm installation.\n"
 msgstr "  --urpmi-root   - 使用另一个 root 来存储 urpmi db 和安装 rpm。\n"
 
-#: ../urpme:51 ../urpmi:96
+#: ../urpme:50 ../urpmi:96
 #, c-format
 msgid "  --justdb       - update only the rpm db, not the filesystem.\n"
 msgstr "  --justdb       - 只使用 rpm 数据库，不更新文件系统。\n"
 
-#: ../urpme:52
+#: ../urpme:51
 #, c-format
 msgid "  --noscripts    - do not execute package scriptlet(s).\n"
 msgstr "  --noscripts    - 不执行软件包脚本。\n"
 
-#: ../urpme:53
+#: ../urpme:52
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpme on the fly from a distrib tree, useful\n"
@@ -1666,77 +1656,77 @@ msgstr ""
 "  --use-distrib  - 从发行版树中实时配置 urpme，特别用于在 --root 选项\n"
 "                   下安装/卸载 chroot。\n"
 
-#: ../urpme:55 ../urpmi:149 ../urpmq:87
+#: ../urpme:54 ../urpmi:148 ../urpmq:87
 #, c-format
 msgid "  --verbose, -v  - verbose mode.\n"
 msgstr "  --verbose, -v  - 详细提示。\n"
 
-#: ../urpme:56
+#: ../urpme:55
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 在命令行选择匹配表达式的所有包。\n"
 
-#: ../urpme:71
+#: ../urpme:70
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只允许超级用户删除软件包"
 
-#: ../urpme:104
+#: ../urpme:103
 #, c-format
 msgid "unknown packages"
 msgstr "未知的软件包"
 
-#: ../urpme:104
+#: ../urpme:103
 #, c-format
 msgid "unknown package"
 msgstr "未知的软件包"
 
-#: ../urpme:119
+#: ../urpme:118
 #, c-format
 msgid "Removing the following package will break your system:"
 msgid_plural "Removing the following packages will break your system:"
 msgstr[0] "删除下列软件包将会破坏您的系统:"
 
-#: ../urpme:124
+#: ../urpme:123
 #, c-format
 msgid "Nothing to remove"
 msgstr "不需要删除任何东西。"
 
-#: ../urpme:141
+#: ../urpme:140
 #, c-format
 msgid "No orphans to remove"
 msgstr "没有可删除的孤立软件包"
 
-#: ../urpme:147
+#: ../urpme:146
 #, c-format
 msgid "To satisfy dependencies, the following package will be removed"
 msgid_plural ""
 "To satisfy dependencies, the following %d packages will be removed"
 msgstr[0] "为满足相关性要求，需要删除下列%d个软件包"
 
-#: ../urpme:152
+#: ../urpme:151
 #, c-format
 msgid "(orphan package)"
 msgid_plural "(orphan packages)"
 msgstr[0] "(孤立的软件包)"
 
-#: ../urpme:159
+#: ../urpme:158
 #, c-format
 msgid "Remove %d package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../urpme:164
+#: ../urpme:163
 #, c-format
 msgid "testing removal of %s"
 msgstr "测试删除 %s"
 
-#: ../urpme:181
+#: ../urpme:180
 #, c-format
 msgid "Removal failed"
 msgstr "删除失败"
 
-#: ../urpme:183
+#: ../urpme:182
 #, c-format
 msgid "Removal is possible"
 msgstr "可以删除"
@@ -2244,17 +2234,17 @@ msgstr "  --noscripts    - 不执行软件包脚本。\n"
 msgid "  --replacefiles - ignore file conflicts\n"
 msgstr "  --replacefiles - 忽略文件冲突\n"
 
-#: ../urpmi:139
+#: ../urpmi:138
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安装要跳过的软件包。\n"
 
-#: ../urpmi:140
+#: ../urpmi:139
 #, c-format
 msgid "  --prefer       - packages which should be preferred\n"
 msgstr "  --prefer       - 首选的软件包\n"
 
-#: ../urpmi:141
+#: ../urpmi:140
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
@@ -2262,82 +2252,82 @@ msgid ""
 msgstr ""
 "  --more-choices - 如果找到了多个软件包，则提供多个选择而不是默认选择。\n"
 
-#: ../urpmi:143
+#: ../urpmi:142
 #, c-format
 msgid "  --nolock       - don't lock rpm db.\n"
 msgstr "  --nolock       - 不锁定 rpm 数据库。\n"
 
-#: ../urpmi:144
+#: ../urpmi:143
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 更新只限于相同体系的软件包。\n"
 
-#: ../urpmi:145 ../urpmq:95
+#: ../urpmi:144 ../urpmq:95
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 在命令行选择所有匹配。\n"
 
-#: ../urpmi:148
+#: ../urpmi:147
 #, c-format
 msgid "  --quiet, -q    - quiet mode.\n"
 msgstr "  --quiet, -q    - 安静模式。\n"
 
-#: ../urpmi:150
+#: ../urpmi:149
 #, c-format
 msgid "  --debug        - very verbose mode.\n"
 msgstr "  --debug        - 非常详细模式。\n"
 
-#: ../urpmi:151
+#: ../urpmi:150
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  命令行给出的软件包名或 rpm 文件将会被安装。\n"
 
-#: ../urpmi:179
+#: ../urpmi:178
 #, c-format
 msgid "Error: can't use --auto-select along with package list.\n"
 msgstr "错误: 无法在使用软件包列表时使用 --auto-select。\n"
 
-#: ../urpmi:186
+#: ../urpmi:185
 #, c-format
 msgid ""
 "Error: To generate a bug report, specify the usual command-line arguments\n"
 "along with --bug.\n"
 msgstr "错误: 要生成错误报告，请在指定命令行参数时多加 --bug。\n"
 
-#: ../urpmi:216
+#: ../urpmi:215
 #, c-format
 msgid "You can't install binary rpm files when using --install-src"
 msgstr "您无法使用 --install-src 安装二进制 RPM 文件"
 
-#: ../urpmi:217
+#: ../urpmi:216
 #, c-format
 msgid "You can't install spec files"
 msgstr "您不能安装 spec 文件"
 
-#: ../urpmi:224
+#: ../urpmi:223
 #, c-format
 msgid "defaulting to --buildrequires"
 msgstr "正在设置默认为 --buildrequires"
 
-#: ../urpmi:229
+#: ../urpmi:228
 #, c-format
 msgid ""
 "please use --buildrequires or --install-src, defaulting to --buildrequires"
 msgstr "请使用 --buildrequires 或 --install-src，默认为 --buildrequires"
 
-#: ../urpmi:249
+#: ../urpmi:248
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目录 [%s] 已存在，请使用另外一个目录进行错误报告或者删除该目录"
 
-#: ../urpmi:250
+#: ../urpmi:249
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "无法创建故障报告的目录 [%s]"
 
-#: ../urpmi:271
+#: ../urpmi:270
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -2347,42 +2337,42 @@ msgstr ""
 "请使用 --allow-force 强制操作。"
 
 #. -PO: here format is "<package_name>: <summary> (to upgrade)"
-#: ../urpmi:425
+#: ../urpmi:424
 #, c-format
 msgid "%s: %s (to upgrade)"
 msgstr "%s: %s (即将升级)"
 
 #. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:427
+#: ../urpmi:426
 #, c-format
 msgid "%s (to upgrade)"
 msgstr "%s (即将升级)"
 
 #. -PO: here format is "<package_name>: <summary> (to install)"
-#: ../urpmi:431
+#: ../urpmi:430
 #, c-format
 msgid "%s: %s (to install)"
 msgstr "%s: %s (即将安装)"
 
 #. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:433
+#: ../urpmi:432
 #, c-format
 msgid "%s (to install)"
 msgstr "%s (即将安装)"
 
-#: ../urpmi:439
+#: ../urpmi:438
 #, c-format
 msgid ""
 "In order to satisfy the '%s' dependency, one of the following packages is "
 "needed:"
 msgstr "为满足“%s”的依赖关系，需要安装下列软件包之一："
 
-#: ../urpmi:442
+#: ../urpmi:441
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "请输入您的选择:(1-%d)"
 
-#: ../urpmi:484
+#: ../urpmi:483
 #, c-format
 msgid ""
 "The following package cannot be installed because it depends on packages\n"
@@ -2392,7 +2382,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:486
+#: ../urpmi:485
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -2402,7 +2392,7 @@ msgstr ""
 "下列软件包无法安装，因为它们所依赖的软件包版本低于目前所安装的版本: \n"
 "%s"
 
-#: ../urpmi:492 ../urpmi:510
+#: ../urpmi:491 ../urpmi:509
 #, c-format
 msgid ""
 "\n"
@@ -2411,12 +2401,12 @@ msgstr ""
 "\n"
 "仍然继续安装吗?"
 
-#: ../urpmi:493 ../urpmi:511 ../urpmi:626 ../urpmi.addmedia:136
+#: ../urpmi:492 ../urpmi:510 ../urpmi:625 ../urpmi.addmedia:136
 #, c-format
 msgid " (Y/n) "
 msgstr "(是(Y)/否(n))[是]"
 
-#: ../urpmi:504
+#: ../urpmi:503
 #, c-format
 msgid ""
 "A requested package cannot be installed:\n"
@@ -2425,12 +2415,12 @@ msgstr ""
 "某些要求的软件包无法安装:\n"
 "%s"
 
-#: ../urpmi:525
+#: ../urpmi:524
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "如果删除软件包 %s 会破坏您的系统"
 
-#: ../urpmi:533
+#: ../urpmi:532
 #, c-format
 msgid ""
 "The installation cannot continue because the following package\n"
@@ -2440,7 +2430,7 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:535
+#: ../urpmi:534
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -2450,12 +2440,12 @@ msgstr ""
 "安装无法继续，原因是要升级其它软件包，需要先删除下列软件包:\n"
 "%s\n"
 
-#: ../urpmi:543
+#: ../urpmi:542
 #, c-format
 msgid "(test only, removal will not be actually done)"
 msgstr "(只是测试，删除将不会实际发生)"
 
-#: ../urpmi:562
+#: ../urpmi:561
 #, c-format
 msgid ""
 "You must first call urpmi with --buildrequires to install the following "
@@ -2465,44 +2455,44 @@ msgstr ""
 "您必须首先用 --buildrequires 调用 urpmi，以便安装下列依赖关系：\n"
 "%s\n"
 
-#: ../urpmi:572
+#: ../urpmi:571
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
 msgstr[0] "下列孤立软件包将被删除。"
 
-#: ../urpmi:596
+#: ../urpmi:595
 #, c-format
 msgid "WARNING: %s option is in use. Some strange problems may happen"
 msgstr ""
 
-#: ../urpmi:608
+#: ../urpmi:607
 #, c-format
 msgid "(test only, installation will not be actually done)"
 msgstr "(只是测试，安装将不会实际发生)"
 
-#: ../urpmi:614
+#: ../urpmi:613
 #, c-format
 msgid "%s of additional disk space will be used."
 msgstr "将会使用 %s 的额外磁盘空间。"
 
-#: ../urpmi:615
+#: ../urpmi:614
 #, c-format
 msgid "%s of disk space will be freed."
 msgstr "将会释放 %s 的磁盘空间。"
 
-#: ../urpmi:616
+#: ../urpmi:615
 #, c-format
 msgid "%s of packages will be retrieved."
 msgstr "将会获取 %s 的软件包。"
 
-#: ../urpmi:617
+#: ../urpmi:616
 #, c-format
 msgid "Proceed with the installation of one package?"
 msgid_plural "Proceed with the installation of the %d packages?"
 msgstr[0] "继续安装 %d 个软件包吗？"
 
-#: ../urpmi:639
+#: ../urpmi:638
 #, c-format
 msgid "Press Enter when mounted..."
 msgstr "挂载后按 Enter..."
@@ -2712,125 +2702,6 @@ msgstr "<综合文件的相对路径>找不到\n"
 msgid "Can't use %s with remote medium"
 msgstr "远程介质无法使用 %s"
 
-#: ../urpmi.recover:30
-#, c-format
-msgid "  --checkpoint   - set repackaging start now\n"
-msgstr "  --checkpoint   - 设定重新打包立即开始\n"
-
-#: ../urpmi.recover:31
-#, fuzzy, c-format
-msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
-msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
-
-#: ../urpmi.recover:33
-#, c-format
-msgid ""
-"  --list         - list transactions since provided date/duration argument\n"
-msgstr "  --list         - 列出自所提供日期/时长参数之后的交易\n"
-
-#: ../urpmi.recover:34
-#, fuzzy, c-format
-msgid "  --list-all     - list all transactions in rpmdb (long)\n"
-msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
-
-#: ../urpmi.recover:35
-#, c-format
-msgid "  --list-safe    - list transactions since checkpoint\n"
-msgstr "  --list-safe    - 列出自检查点之后的交易\n"
-
-#: ../urpmi.recover:36
-#, c-format
-msgid ""
-"  --rollback     - rollback until specified date,\n"
-"                   or rollback the specified number of transactions\n"
-msgstr "  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
-
-#: ../urpmi.recover:38
-#, fuzzy, c-format
-msgid "  --disable      - turn off repackaging\n"
-msgstr "  --fiename      - 软件包文件名\n"
-
-#: ../urpmi.recover:53
-#, fuzzy, c-format
-msgid "Invalid date or duration [%s]\n"
-msgstr "目录 %s 的所有者无效"
-
-#: ../urpmi.recover:61
-#, fuzzy, c-format
-msgid "Repackage directory not defined\n"
-msgstr "未找到软件包 %s。"
-
-#: ../urpmi.recover:64
-#, fuzzy, c-format
-msgid "Can't write to repackage directory [%s]\n"
-msgstr "创建目录 %s 失败"
-
-#: ../urpmi.recover:66
-#, fuzzy, c-format
-msgid "Cleaning up repackage directory [%s]...\n"
-msgstr "创建目录 %s 失败"
-
-#: ../urpmi.recover:68
-#, c-format
-msgid "%d file removed\n"
-msgid_plural "%d files removed\n"
-msgstr[0] "删除了 %d 个文件\n"
-
-#: ../urpmi.recover:78
-#, c-format
-msgid "Spurious command-line arguments [%s]\n"
-msgstr "冲突的命令行参数[%s]\n"
-
-#: ../urpmi.recover:80
-#, c-format
-msgid "You can't specify --checkpoint and --rollback at the same time\n"
-msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
-
-#: ../urpmi.recover:82
-#, c-format
-msgid "You can't specify --checkpoint and --list at the same time\n"
-msgstr "您不能同时指定 --checkpoint 和 --list\n"
-
-#: ../urpmi.recover:84
-#, c-format
-msgid "You can't specify --rollback and --list at the same time\n"
-msgstr "您不能同时指定 --rollback 和 --list\n"
-
-#: ../urpmi.recover:86
-#, c-format
-msgid "You can't specify --disable along with another option"
-msgstr "您不能将 --disable 与其它选项一起使用"
-
-#: ../urpmi.recover:111
-#, c-format
-msgid "No transaction found since %s\n"
-msgstr "自 %s 后无交易\n"
-
-#: ../urpmi.recover:126
-#, c-format
-msgid "You must be superuser to do this"
-msgstr "您必须是超级用户才能执行此操作"
-
-#: ../urpmi.recover:139 ../urpmi.recover:205
-#, fuzzy, c-format
-msgid "Writing rpm macros file [%s]...\n"
-msgstr "正在获取 rpm 文件[%s]..."
-
-#: ../urpmi.recover:181
-#, fuzzy, c-format
-msgid "No rollback date found\n"
-msgstr "没有找到更新日志\n"
-
-#: ../urpmi.recover:184
-#, c-format
-msgid "Rollback until %s...\n"
-msgstr "回滚至 %s...\n"
-
-#: ../urpmi.recover:191
-#, fuzzy, c-format
-msgid "Disabling repackaging\n"
-msgstr "[重新打包]"
-
 #: ../urpmi.removemedia:38
 #, c-format
 msgid ""
@@ -3175,29 +3046,29 @@ msgstr "--list-nodes 仅能和 --parallel 一起使用"
 msgid "use -l to list files"
 msgstr "使用 -l 可列出文件"
 
-#: ../urpmq:416
+#: ../urpmq:415
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结果"
 
-#: ../urpmq:417
+#: ../urpmq:416
 #, c-format
 msgid "no xml info for medium \"%s\", only partial result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 只返回部分结果"
 
-#: ../urpmq:420
+#: ../urpmq:419
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for package %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:421
+#: ../urpmq:420
 #, c-format
 msgid ""
 "no xml info for medium \"%s\", unable to return any result for packages %s"
 msgstr "由于介质“%s”没有 xml 信息，软件包 %s 无法返回任何结果"
 
-#: ../urpmq:488
+#: ../urpmq:487
 #, c-format
 msgid "No changelog found\n"
 msgstr "没有找到更新日志\n"
@@ -3210,6 +3081,96 @@ msgstr "软件安装程序"
 msgid "Graphical front end to install RPM files"
 msgstr "图形化安装 RPM 软件包"
 
+#~ msgid "curl failed: upload canceled\n"
+#~ msgstr "curl 失败: 上传已取消\n"
+
+#~ msgid "  --repackage    - Re-package the files before erasing\n"
+#~ msgstr "  --repackage    - 在删除之前重新对文件打包\n"
+
+#~ msgid "  --checkpoint   - set repackaging start now\n"
+#~ msgstr "  --checkpoint   - 设定重新打包立即开始\n"
+
+#, fuzzy
+#~ msgid "  --noclean      - don't clean repackage directory on checkpoint\n"
+#~ msgstr "  --noclean      - 不从缓存中清除 rpm。\n"
+
+#~ msgid ""
+#~ "  --list         - list transactions since provided date/duration "
+#~ "argument\n"
+#~ msgstr "  --list         - 列出自所提供日期/时长参数之后的交易\n"
+
+#, fuzzy
+#~ msgid "  --list-all     - list all transactions in rpmdb (long)\n"
+#~ msgstr "  --list-url     - 列出可用的介质及其 URL。\n"
+
+#~ msgid "  --list-safe    - list transactions since checkpoint\n"
+#~ msgstr "  --list-safe    - 列出自检查点之后的交易\n"
+
+#~ msgid ""
+#~ "  --rollback     - rollback until specified date,\n"
+#~ "                   or rollback the specified number of transactions\n"
+#~ msgstr "  --rollback     - 回滚到指定的日期或回滚指定数量的交易\n"
+
+#, fuzzy
+#~ msgid "  --disable      - turn off repackaging\n"
+#~ msgstr "  --fiename      - 软件包文件名\n"
+
+#, fuzzy
+#~ msgid "Invalid date or duration [%s]\n"
+#~ msgstr "目录 %s 的所有者无效"
+
+#, fuzzy
+#~ msgid "Repackage directory not defined\n"
+#~ msgstr "未找到软件包 %s。"
+
+#, fuzzy
+#~ msgid "Can't write to repackage directory [%s]\n"
+#~ msgstr "创建目录 %s 失败"
+
+#, fuzzy
+#~ msgid "Cleaning up repackage directory [%s]...\n"
+#~ msgstr "创建目录 %s 失败"
+
+#~ msgid "%d file removed\n"
+#~ msgid_plural "%d files removed\n"
+#~ msgstr[0] "删除了 %d 个文件\n"
+
+#~ msgid "Spurious command-line arguments [%s]\n"
+#~ msgstr "冲突的命令行参数[%s]\n"
+
+#~ msgid "You can't specify --checkpoint and --rollback at the same time\n"
+#~ msgstr "您不能同时指定 --checkpoint 和 --rollback\n"
+
+#~ msgid "You can't specify --checkpoint and --list at the same time\n"
+#~ msgstr "您不能同时指定 --checkpoint 和 --list\n"
+
+#~ msgid "You can't specify --rollback and --list at the same time\n"
+#~ msgstr "您不能同时指定 --rollback 和 --list\n"
+
+#~ msgid "You can't specify --disable along with another option"
+#~ msgstr "您不能将 --disable 与其它选项一起使用"
+
+#~ msgid "No transaction found since %s\n"
+#~ msgstr "自 %s 后无交易\n"
+
+#~ msgid "You must be superuser to do this"
+#~ msgstr "您必须是超级用户才能执行此操作"
+
+#, fuzzy
+#~ msgid "Writing rpm macros file [%s]...\n"
+#~ msgstr "正在获取 rpm 文件[%s]..."
+
+#, fuzzy
+#~ msgid "No rollback date found\n"
+#~ msgstr "没有找到更新日志\n"
+
+#~ msgid "Rollback until %s...\n"
+#~ msgstr "回滚至 %s...\n"
+
+#, fuzzy
+#~ msgid "Disabling repackaging\n"
+#~ msgstr "[重新打包]"
+
 #~ msgid ""
 #~ "urpme version %s\n"
 #~ "%s\n"