better phrasing

1 files changed, 80 insertions, 77 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8300957f..858dbdd7 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-08-02 22:39+0200\n"
+"POT-Creation-Date: 2007-08-03 16:14+0200\n"
 "PO-Revision-Date: 2007-03-08 12:39+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrakelinux.org>\n"
@@ -234,7 +234,7 @@ msgstr "介质类型:"
 #: ../Rpmdrake/edit_urpm_sources.pm:540 ../Rpmdrake/edit_urpm_sources.pm:627
 #: ../Rpmdrake/edit_urpm_sources.pm:668 ../Rpmdrake/edit_urpm_sources.pm:726
 #: ../Rpmdrake/edit_urpm_sources.pm:876 ../Rpmdrake/gui.pm:459
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:612
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:611
 #: ../rpmdrake.pm:301 ../rpmdrake.pm:616 ../rpmdrake.pm:701 ../rpmdrake.pm:774
 #, c-format
 msgid "Cancel"
@@ -246,7 +246,7 @@ msgstr "取消"
 #: ../Rpmdrake/edit_urpm_sources.pm:719 ../Rpmdrake/edit_urpm_sources.pm:792
 #: ../Rpmdrake/edit_urpm_sources.pm:922 ../Rpmdrake/edit_urpm_sources.pm:1082
 #: ../Rpmdrake/gui.pm:459 ../Rpmdrake/gui.pm:475 ../Rpmdrake/gui.pm:480
-#: ../Rpmdrake/init.pm:139 ../Rpmdrake/pkg.pm:564 ../Rpmdrake/pkg.pm:815
+#: ../Rpmdrake/init.pm:132 ../Rpmdrake/pkg.pm:563 ../Rpmdrake/pkg.pm:807
 #: ../Rpmdrake/rpmnew.pm:172 ../rpmdrake.pm:125 ../rpmdrake.pm:239
 #: ../rpmdrake.pm:304 ../rpmdrake.pm:616
 #, c-format
@@ -588,7 +588,7 @@ msgstr "并行..."
 msgid "Global options..."
 msgstr "全局选项..."
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:145
+#: ../Rpmdrake/edit_urpm_sources.pm:1097 ../Rpmdrake/init.pm:138
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -845,7 +845,7 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/gui.pm:582 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
@@ -1522,51 +1522,51 @@ msgstr "网络计算机服务器"
 msgid "Web/FTP"
 msgstr "Web/FTP"
 
-#: ../Rpmdrake/init.pm:46
+#: ../Rpmdrake/init.pm:39
 #, c-format
 msgid "Usage: %s [OPTION]..."
 msgstr "用法：%s [选项]..."
 
-#: ../Rpmdrake/init.pm:47
+#: ../Rpmdrake/init.pm:40
 #, c-format
 msgid ""
 "  --changelog-first      display changelog before filelist in the "
 "description window"
 msgstr "  --changelog-first      描述窗口中更改日志排在文件列表之前"
 
-#: ../Rpmdrake/init.pm:48
+#: ../Rpmdrake/init.pm:41
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
 msgstr "  --media=介质1,..       限制使用指定的介质"
 
-#: ../Rpmdrake/init.pm:49
+#: ../Rpmdrake/init.pm:42
 #, c-format
 msgid ""
 "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     合并找到的全部 .rpmnew/.rpmsave 文件"
 
-#: ../Rpmdrake/init.pm:50
+#: ../Rpmdrake/init.pm:43
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
 msgstr "  --mode=模式            设定模式(安装(默认)、删除、更新)"
 
-#: ../Rpmdrake/init.pm:51
+#: ../Rpmdrake/init.pm:44
 #, c-format
 msgid ""
 "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      更新模式中不询问第一个确认问题"
 
-#: ../Rpmdrake/init.pm:52
+#: ../Rpmdrake/init.pm:45
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
 msgstr "  --no-media-update      启动时不更新介质"
 
-#: ../Rpmdrake/init.pm:53
+#: ../Rpmdrake/init.pm:46
 #, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
 msgstr "  --no-verify-rpm        不校验软件包签名"
 
-#: ../Rpmdrake/init.pm:54
+#: ../Rpmdrake/init.pm:47
 #, c-format
 msgid ""
 "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
@@ -1574,37 +1574,37 @@ msgid ""
 msgstr ""
 "  --parallel=别名,主机   在并行模式中使用[别名]组和[主机]来显示所需的依赖关系"
 
-#: ../Rpmdrake/init.pm:55
+#: ../Rpmdrake/init.pm:48
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
 msgstr "  --pkg-nosel=包1,..     只显示这些软件包"
 
-#: ../Rpmdrake/init.pm:56
+#: ../Rpmdrake/init.pm:49
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
 msgstr "  --pkg-sel=包1,..       预先选择这些软件包"
 
-#: ../Rpmdrake/init.pm:57
+#: ../Rpmdrake/init.pm:50
 #, c-format
 msgid "  --root                 force to run as root"
 msgstr "  --root                 强制以 root 身份运行"
 
-#: ../Rpmdrake/init.pm:58
+#: ../Rpmdrake/init.pm:51
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
 msgstr "  --search=包            搜索“包”"
 
-#: ../Rpmdrake/init.pm:59
+#: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 打印此工具的版本号。\n"
 
-#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/init.pm:129
 #, c-format
 msgid "Running in user mode"
 msgstr "以用户模式运行"
 
-#: ../Rpmdrake/init.pm:137
+#: ../Rpmdrake/init.pm:130
 #, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
@@ -1615,12 +1615,12 @@ msgstr ""
 "您将无法执行对系统的修改，\n"
 "但您仍然可以浏览已有数据库。"
 
-#: ../Rpmdrake/init.pm:144 ../Rpmdrake/init.pm:169
+#: ../Rpmdrake/init.pm:137 ../Rpmdrake/init.pm:162
 #, c-format
 msgid "Welcome"
 msgstr "欢迎"
 
-#: ../Rpmdrake/init.pm:149
+#: ../Rpmdrake/init.pm:142
 #, c-format
 msgid ""
 "Welcome to the software removal tool!\n"
@@ -1632,7 +1632,7 @@ msgstr ""
 "\n"
 "本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
-#: ../Rpmdrake/init.pm:154
+#: ../Rpmdrake/init.pm:147
 #, c-format
 msgid ""
 "Welcome to %s!\n"
@@ -1644,12 +1644,12 @@ msgstr ""
 "\n"
 "本工具将帮助您为您的电脑中安装更新的软件包。"
 
-#: ../Rpmdrake/init.pm:159
+#: ../Rpmdrake/init.pm:152
 #, c-format
 msgid "Welcome to the software installation tool!"
 msgstr "欢迎使用软件安装工具!"
 
-#: ../Rpmdrake/init.pm:160
+#: ../Rpmdrake/init.pm:153
 #, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
@@ -1663,17 +1663,17 @@ msgstr ""
 "您的 Mandriva Linux 的安装光盘包含有数千个软件包。\n"
 "本工具将帮助您选择要为您的电脑安装的软件包。"
 
-#: ../Rpmdrake/init.pm:171
+#: ../Rpmdrake/init.pm:164
 #, c-format
 msgid "The software installation tool can set up media sources."
 msgstr "软件安装工具可设置介质源。"
 
-#: ../Rpmdrake/init.pm:172
+#: ../Rpmdrake/init.pm:165
 #, c-format
 msgid "Do you want to add media sources now?"
 msgstr "您想要现在就添加介质源吗?"
 
-#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:527
+#: ../Rpmdrake/pkg.pm:187 ../Rpmdrake/pkg.pm:526
 #, c-format
 msgid "Confirmation"
 msgstr "确认"
@@ -1731,18 +1731,18 @@ msgstr ""
 "\n"
 "然后，重新启动 %s。"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #: ../rpmdrake.pm:329
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541
 #, c-format
 msgid "Package installation..."
 msgstr "软件包安装..."
 
-#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:542 ../Rpmdrake/pkg.pm:836
+#: ../Rpmdrake/pkg.pm:250 ../Rpmdrake/pkg.pm:541 ../Rpmdrake/pkg.pm:828
 #, c-format
 msgid "Initializing..."
 msgstr "正在初始化..."
@@ -1772,17 +1772,17 @@ msgstr "正在寻找已安装的软件包，请稍候..."
 msgid "Could not create temporary directory '%s'"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:792
+#: ../Rpmdrake/pkg.pm:455 ../Rpmdrake/pkg.pm:782
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:772
+#: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:762
 #, c-format
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:480 ../Rpmdrake/pkg.pm:774
+#: ../Rpmdrake/pkg.pm:460 ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1793,22 +1793,22 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:479 ../Rpmdrake/pkg.pm:761
+#: ../Rpmdrake/pkg.pm:478 ../Rpmdrake/pkg.pm:751
 #, c-format
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../Rpmdrake/pkg.pm:508
+#: ../Rpmdrake/pkg.pm:507
 #, c-format
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../Rpmdrake/pkg.pm:509
+#: ../Rpmdrake/pkg.pm:508
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
 msgstr "对不起，无法得到源软件包。%s"
 
-#: ../Rpmdrake/pkg.pm:510 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:509 ../Rpmdrake/pkg.pm:754
 #, c-format
 msgid ""
 "\n"
@@ -1821,89 +1821,89 @@ msgstr ""
 "报告的错误:\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:524
+#: ../Rpmdrake/pkg.pm:523
 #, fuzzy, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
 msgstr[0] "为了满足依赖性要求，将另外安装以下%d个软件包:"
 
-#: ../Rpmdrake/pkg.pm:529
+#: ../Rpmdrake/pkg.pm:528
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
 msgstr[0] "删除 %d 个软件包吗?"
 
-#: ../Rpmdrake/pkg.pm:531
+#: ../Rpmdrake/pkg.pm:530
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
 msgstr "要升级其它软件包，必须删除下列软件包:"
 
-#: ../Rpmdrake/pkg.pm:532
+#: ../Rpmdrake/pkg.pm:531
 #, c-format
 msgid "Is it ok to continue?"
 msgstr "确定继续吗?"
 
-#: ../Rpmdrake/pkg.pm:562
+#: ../Rpmdrake/pkg.pm:561
 #, c-format
 msgid "Change medium"
 msgstr "更改介质"
 
-#: ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:562
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把名为“%s”的介质放进设备 [%s]"
 
-#: ../Rpmdrake/pkg.pm:586
+#: ../Rpmdrake/pkg.pm:585
 #, c-format
 msgid "Preparing packages installation..."
 msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:586
-#, c-format
-msgid "Preparing..."
-msgstr "正在准备..."
+#: ../Rpmdrake/pkg.pm:585
+#, fuzzy, c-format
+msgid "Preparing package installation transaction..."
+msgstr "准备安装软件包..."
 
-#: ../Rpmdrake/pkg.pm:589
+#: ../Rpmdrake/pkg.pm:588
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安装软件包“%s”(%s/%s)..."
 
-#: ../Rpmdrake/pkg.pm:590
+#: ../Rpmdrake/pkg.pm:589
 #, c-format
 msgid "Total: %s/%s"
 msgstr ""
 
-#: ../Rpmdrake/pkg.pm:611 ../Rpmdrake/pkg.pm:616
+#: ../Rpmdrake/pkg.pm:610 ../Rpmdrake/pkg.pm:615
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下载软件包“%s”..."
 
-#: ../Rpmdrake/pkg.pm:618
+#: ../Rpmdrake/pkg.pm:617
 #, c-format
 msgid "        %s%% of %s completed, ETA = %s, speed = %s"
 msgstr "        已完成 %s%%，共 %s，预计剩余时间 %s，速度为 %s"
 
-#: ../Rpmdrake/pkg.pm:619
+#: ../Rpmdrake/pkg.pm:618
 #, c-format
 msgid "        %s%% completed, speed = %s"
 msgstr "        %s%% 已完成，速度为 %s"
 
-#: ../Rpmdrake/pkg.pm:640
+#: ../Rpmdrake/pkg.pm:639
 #, c-format
 msgid "Verifying package signatures..."
 msgstr "正在校验软件包的签名..."
 
-#: ../Rpmdrake/pkg.pm:653 ../rpmdrake.pm:757 ../rpmdrake.pm:866
+#: ../Rpmdrake/pkg.pm:652 ../rpmdrake.pm:757 ../rpmdrake.pm:866
 #, c-format
 msgid "Warning"
 msgstr "警告"
 
-#: ../Rpmdrake/pkg.pm:654
+#: ../Rpmdrake/pkg.pm:653
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -1918,43 +1918,43 @@ msgstr ""
 "\n"
 "您想要继续安装吗?"
 
-#: ../Rpmdrake/pkg.pm:667
+#: ../Rpmdrake/pkg.pm:666
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在从 %2$s 安装 %1$s"
 
-#: ../Rpmdrake/pkg.pm:669
+#: ../Rpmdrake/pkg.pm:668
 #, c-format
 msgid "installing %s"
 msgstr "正在安装 %s"
 
-#: ../Rpmdrake/pkg.pm:673
+#: ../Rpmdrake/pkg.pm:672
 #, c-format
 msgid "removing %s"
 msgstr "正在删除 %s"
 
-#: ../Rpmdrake/pkg.pm:708 ../Rpmdrake/pkg.pm:726 ../Rpmdrake/pkg.pm:819
+#: ../Rpmdrake/pkg.pm:698 ../Rpmdrake/pkg.pm:716 ../Rpmdrake/pkg.pm:811
 #: ../rpmdrake.pm:744 ../rpmdrake.pm:825 ../rpmdrake.pm:849
 #, c-format
 msgid "Error"
 msgstr "错误"
 
-#: ../Rpmdrake/pkg.pm:709 ../Rpmdrake/pkg.pm:727 ../Rpmdrake/pkg.pm:740
+#: ../Rpmdrake/pkg.pm:699 ../Rpmdrake/pkg.pm:717 ../Rpmdrake/pkg.pm:730
 #, c-format
 msgid "Installation failed:"
 msgstr "安装失败: "
 
-#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:700
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "尝试忽略相关性检查而安装吗?(是(y)/否(N))[否]"
 
-#: ../Rpmdrake/pkg.pm:728
+#: ../Rpmdrake/pkg.pm:718
 #, c-format
 msgid "Try harder to install (--force)? (y/N) "
 msgstr "尝试强制安装吗(使用 --force)(是(y)/否(N))[否]?"
 
-#: ../Rpmdrake/pkg.pm:762
+#: ../Rpmdrake/pkg.pm:752
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -1967,12 +1967,12 @@ msgstr ""
 "\n"
 "您可能需要更新您的介质数据库。"
 
-#: ../Rpmdrake/pkg.pm:773
+#: ../Rpmdrake/pkg.pm:763
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 个安装交易失败"
 
-#: ../Rpmdrake/pkg.pm:787
+#: ../Rpmdrake/pkg.pm:777
 #, c-format
 msgid ""
 "The installation is finished; everything was installed correctly.\n"
@@ -1985,42 +1985,42 @@ msgstr ""
 "某些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
 "在执行操作以前，您需要检查一下:"
 
-#: ../Rpmdrake/pkg.pm:795
+#: ../Rpmdrake/pkg.pm:787
 #, c-format
 msgid "Upgrade information"
 msgstr "升级信息"
 
-#: ../Rpmdrake/pkg.pm:797
+#: ../Rpmdrake/pkg.pm:789
 #, c-format
 msgid "These packages come with upgrade information"
 msgstr "这些软件包带有升级信息"
 
-#: ../Rpmdrake/pkg.pm:805
+#: ../Rpmdrake/pkg.pm:797
 #, c-format
 msgid "Upgrade information about this package"
 msgstr "关于此软件包的升级信息"
 
-#: ../Rpmdrake/pkg.pm:808
+#: ../Rpmdrake/pkg.pm:800
 #, c-format
 msgid "Upgrade information about package %s"
 msgstr "关于软件包 %s 的升级信息"
 
-#: ../Rpmdrake/pkg.pm:820
+#: ../Rpmdrake/pkg.pm:812
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
 msgstr "不可恢复的错误: 对不起，没有发现可安装的软件包。"
 
-#: ../Rpmdrake/pkg.pm:836 ../Rpmdrake/pkg.pm:853
+#: ../Rpmdrake/pkg.pm:828 ../Rpmdrake/pkg.pm:845
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../Rpmdrake/pkg.pm:864
+#: ../Rpmdrake/pkg.pm:856
 #, c-format
 msgid "Problem during removal"
 msgstr "在删除过程中发生问题"
 
-#: ../Rpmdrake/pkg.pm:865
+#: ../Rpmdrake/pkg.pm:857
 #, c-format
 msgid ""
 "There was a problem during the removal of packages:\n"
@@ -3100,6 +3100,9 @@ msgstr "删除软件"
 msgid "Software Media Manager"
 msgstr "软件介质管理器"
 
+#~ msgid "Preparing..."
+#~ msgstr "正在准备..."
+
 #~ msgid "Message Passing"
 #~ msgstr "信息传递"