sync with code & sync translations with urpmi

1 files changed, 59 insertions, 49 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index e863af41..eee072c6 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-07 15:00+0100\n"
+"POT-Creation-Date: 2007-03-07 15:42+0100\n"
 "PO-Revision-Date: 2006-09-18 22:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -224,7 +224,7 @@ msgstr "介质类型:"
 #: ../Rpmdrake/edit_urpm_sources.pm:521 ../Rpmdrake/edit_urpm_sources.pm:608
 #: ../Rpmdrake/edit_urpm_sources.pm:649 ../Rpmdrake/edit_urpm_sources.pm:707
 #: ../Rpmdrake/edit_urpm_sources.pm:857 ../Rpmdrake/gui.pm:502
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:571
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:568
 #: ../rpmdrake.pm:296 ../rpmdrake.pm:609 ../rpmdrake.pm:694 ../rpmdrake.pm:767
 #, c-format
 msgid "Cancel"
@@ -236,7 +236,7 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:700 ../Rpmdrake/edit_urpm_sources.pm:773
 #: ../Rpmdrake/edit_urpm_sources.pm:903 ../Rpmdrake/edit_urpm_sources.pm:1063
 #: ../Rpmdrake/gui.pm:502 ../Rpmdrake/gui.pm:518 ../Rpmdrake/gui.pm:523
-#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:525 ../Rpmdrake/pkg.pm:754
+#: ../Rpmdrake/init.pm:126 ../Rpmdrake/pkg.pm:523 ../Rpmdrake/pkg.pm:760
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:126 ../rpmdrake.pm:236
 #: ../rpmdrake.pm:298 ../rpmdrake.pm:609
 #, c-format
@@ -830,7 +830,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/gui.pm:615 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
@@ -1687,23 +1687,23 @@ msgstr "您真的想要删除源“%s”吗?"
 msgid "Fatal error"
 msgstr "致命错误"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #: ../rpmdrake.pm:323
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:784
+#: ../Rpmdrake/pkg.pm:192 ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:790
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
 
-#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:215 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1781,17 +1781,17 @@ msgstr "正在列出基本软件包，请稍候..."
 msgid "Please wait, finding installed packages..."
 msgstr "正在寻找已安装的软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:731
+#: ../Rpmdrake/pkg.pm:443 ../Rpmdrake/pkg.pm:737
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:447 ../Rpmdrake/pkg.pm:716
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:712 ../Rpmdrake/pkg.pm:770
+#: ../Rpmdrake/pkg.pm:448 ../Rpmdrake/pkg.pm:718 ../Rpmdrake/pkg.pm:776
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1802,17 +1802,17 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:473
+#: ../Rpmdrake/pkg.pm:472
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:473
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:475 ../Rpmdrake/pkg.pm:700
+#: ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:706
 #, c-format
 msgid ""
 "\n"
@@ -1825,7 +1825,7 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:492
+#: ../Rpmdrake/pkg.pm:491
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed:"
@@ -1833,68 +1833,78 @@ msgid_plural ""
 "To satisfy dependencies, the following %d packages are going to be installed:"
 msgstr[0] "为了满足依赖性要求，将另外安装以下%d个软件包:"
 
-#: ../Rpmdrake/pkg.pm:497
+#: ../Rpmdrake/pkg.pm:496
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:499
+#: ../Rpmdrake/pkg.pm:498
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:500
+#: ../Rpmdrake/pkg.pm:499
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:523
+#: ../Rpmdrake/pkg.pm:521
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:522
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:545
+#: ../Rpmdrake/pkg.pm:543
 #, c-format
 msgid "Preparing..."
 msgstr "正在准备..."
 
-#: ../Rpmdrake/pkg.pm:548
+#: ../Rpmdrake/pkg.pm:546
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:569
+#: ../Rpmdrake/pkg.pm:567 ../Rpmdrake/pkg.pm:572
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "正在下载软件包“%s”(%s/%s)..."
+msgid "Downloading package `%s'..."
+msgstr "正在下载软件包“%s”..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:574
+#, c-format
+msgid "        %s%% of %s completed, ETA = %s, speed = %s"
+msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
+
+#: ../Rpmdrake/pkg.pm:575
+#, c-format
+msgid "        %s%% completed, speed = %s"
+msgstr "        %s%% 已完成，速度为 %s"
+
+#: ../Rpmdrake/pkg.pm:595
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:602 ../rpmdrake.pm:750 ../rpmdrake.pm:859
+#: ../Rpmdrake/pkg.pm:608 ../rpmdrake.pm:750 ../rpmdrake.pm:859
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:603
+#: ../Rpmdrake/pkg.pm:609
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1909,48 +1919,48 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:622
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:624
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../Rpmdrake/pkg.pm:622
+#: ../Rpmdrake/pkg.pm:628
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../Rpmdrake/pkg.pm:648 ../Rpmdrake/pkg.pm:666 ../Rpmdrake/pkg.pm:759
+#: ../Rpmdrake/pkg.pm:654 ../Rpmdrake/pkg.pm:672 ../Rpmdrake/pkg.pm:765
 #: ../rpmdrake.pm:737 ../rpmdrake.pm:818 ../rpmdrake.pm:842
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../Rpmdrake/pkg.pm:649 ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:655 ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../Rpmdrake/pkg.pm:650
+#: ../Rpmdrake/pkg.pm:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../Rpmdrake/pkg.pm:668
+#: ../Rpmdrake/pkg.pm:674
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../Rpmdrake/pkg.pm:680 ../Rpmdrake/pkg.pm:697 ../Rpmdrake/pkg.pm:769
+#: ../Rpmdrake/pkg.pm:686 ../Rpmdrake/pkg.pm:703 ../Rpmdrake/pkg.pm:775
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:698
+#: ../Rpmdrake/pkg.pm:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1963,12 +1973,12 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../Rpmdrake/pkg.pm:711
+#: ../Rpmdrake/pkg.pm:717
 #, fuzzy, c-format
 msgid "%d installation transactions failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:726
+#: ../Rpmdrake/pkg.pm:732
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -1981,42 +1991,42 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:734
+#: ../Rpmdrake/pkg.pm:740
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../Rpmdrake/pkg.pm:736
+#: ../Rpmdrake/pkg.pm:742
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../Rpmdrake/pkg.pm:744
+#: ../Rpmdrake/pkg.pm:750
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../Rpmdrake/pkg.pm:747
+#: ../Rpmdrake/pkg.pm:753
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:760
+#: ../Rpmdrake/pkg.pm:766
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:784 ../Rpmdrake/pkg.pm:789
+#: ../Rpmdrake/pkg.pm:790 ../Rpmdrake/pkg.pm:795
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:800
+#: ../Rpmdrake/pkg.pm:806
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:801
+#: ../Rpmdrake/pkg.pm:807
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"