updated po files

1 files changed, 113 insertions, 91 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 48d51ca9..247f13c7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-11-28 14:47+0100\n"
+"POT-Creation-Date: 2002-12-11 22:06+0100\n"
 "PO-Revision-Date: 2002-11-27 23:20+0800\n"
 "Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -56,7 +56,7 @@ msgstr "路径或装载点:"
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:519
+#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:528
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -98,15 +98,15 @@ msgstr "来源类型:"
 
 #: ../edit-urpm-sources.pl_.c:121 ../edit-urpm-sources.pl_.c:187
 #: ../edit-urpm-sources.pl_.c:219 ../rpmdrake.pm_.c:86 ../rpmdrake.pm_.c:107
-#: ../rpmdrake.pm_.c:289 ../rpmdrake_.c:350 ../rpmdrake_.c:891
-#: ../rpmdrake_.c:926
+#: ../rpmdrake.pm_.c:289 ../rpmdrake_.c:350 ../rpmdrake_.c:898
+#: ../rpmdrake_.c:932
 msgid "Ok"
 msgstr "确定"
 
 #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:180
 #: ../edit-urpm-sources.pl_.c:187 ../edit-urpm-sources.pl_.c:220
 #: ../rpmdrake.pm_.c:289 ../rpmdrake.pm_.c:322 ../rpmdrake_.c:350
-#: ../rpmdrake_.c:926
+#: ../rpmdrake_.c:932
 msgid "Cancel"
 msgstr "取消"
 
@@ -178,7 +178,7 @@ msgstr "启用吗?"
 msgid "Source"
 msgstr "来源"
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:699
+#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:707
 msgid "Remove"
 msgstr "可卸装"
 
@@ -202,7 +202,7 @@ msgstr "代理服务器..."
 msgid "Save and quit"
 msgstr "保存并退出"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:702
+#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:710
 msgid "Quit"
 msgstr "退出"
 
@@ -343,7 +343,7 @@ msgstr "没有镜像"
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm_.c:309 ../rpmdrake_.c:598
+#: ../rpmdrake.pm_.c:309 ../rpmdrake_.c:607
 msgid "Update source(s)"
 msgstr "更新源"
 
@@ -367,7 +367,7 @@ msgstr "其他"
 msgid "(none)"
 msgstr "(无)"
 
-#: ../rpmdrake_.c:139 ../rpmdrake_.c:453 ../rpmdrake_.c:454
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:462 ../rpmdrake_.c:463
 msgid "(Not available)"
 msgstr "(不可用)"
 
@@ -445,11 +445,17 @@ msgstr ""
 "需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:363
+#: ../rpmdrake_.c:363 ../rpmdrake_.c:371
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake_.c:364 ../rpmdrake_.c:422
+#: ../rpmdrake_.c:364
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr ""
+
+#: ../rpmdrake_.c:372 ../rpmdrake_.c:431
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -459,11 +465,11 @@ msgstr ""
 "下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:392
+#: ../rpmdrake_.c:401
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake_.c:393
+#: ../rpmdrake_.c:402
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -473,11 +479,11 @@ msgstr ""
 "下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:406
+#: ../rpmdrake_.c:415
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:407
+#: ../rpmdrake_.c:416
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -485,254 +491,254 @@ msgstr ""
 "对不起, 不能选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:421 ../rpmdrake_.c:655
+#: ../rpmdrake_.c:430 ../rpmdrake_.c:664
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake_.c:443
+#: ../rpmdrake_.c:452
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件:%d MB / 剩余磁盘空间:%d MB"
 
-#: ../rpmdrake_.c:445
+#: ../rpmdrake_.c:454
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小:%d MB"
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:462
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:463
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake_.c:457
+#: ../rpmdrake_.c:466
 msgid "Source: "
 msgstr "来源: "
 
-#: ../rpmdrake_.c:458
+#: ../rpmdrake_.c:467
 msgid "Currently installed version: "
 msgstr "当前安装的版本: "
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:471
 msgid "Reason for update: "
 msgstr "更新原因: "
 
-#: ../rpmdrake_.c:464
+#: ../rpmdrake_.c:473
 msgid "Name: "
 msgstr "名称: "
 
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:474
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake_.c:466
+#: ../rpmdrake_.c:475
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake_.c:466
+#: ../rpmdrake_.c:475
 msgid "Size: "
 msgstr "大小: "
 
-#: ../rpmdrake_.c:468
+#: ../rpmdrake_.c:477
 msgid "Importance: "
 msgstr "重要性: "
 
-#: ../rpmdrake_.c:469
+#: ../rpmdrake_.c:478
 msgid "Summary: "
 msgstr "摘要: "
 
-#: ../rpmdrake_.c:470
+#: ../rpmdrake_.c:479
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake_.c:519
+#: ../rpmdrake_.c:528
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:519
+#: ../rpmdrake_.c:528
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:538
+#: ../rpmdrake_.c:547
 msgid "Mandrake choices"
 msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:539
+#: ../rpmdrake_.c:548
 msgid "All packages, alphabetical"
 msgstr "全部软件包, 按字母次序"
 
-#: ../rpmdrake_.c:540
+#: ../rpmdrake_.c:549
 msgid "All packages,"
 msgstr "全部软件包,"
 
-#: ../rpmdrake_.c:563
+#: ../rpmdrake_.c:572
 msgid "by group"
 msgstr "按照分组"
 
-#: ../rpmdrake_.c:563
+#: ../rpmdrake_.c:572
 msgid "by size"
 msgstr "按照大小"
 
-#: ../rpmdrake_.c:564
+#: ../rpmdrake_.c:573
 msgid "by selection state"
 msgstr "按照选择状态"
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:574
 msgid "by source repository"
 msgstr "按照来源库"
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:574
 msgid "by update availability"
 msgstr "按照是否可更新"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:595
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:595
 msgid "in files"
 msgstr "在文件中"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:595
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake_.c:597
+#: ../rpmdrake_.c:606
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake_.c:597
+#: ../rpmdrake_.c:606
 msgid "Reset the selection"
 msgstr "重置选中"
 
-#: ../rpmdrake_.c:623
+#: ../rpmdrake_.c:632
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake_.c:623
+#: ../rpmdrake_.c:632
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake_.c:645
+#: ../rpmdrake_.c:654
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake_.c:689
+#: ../rpmdrake_.c:697
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake_.c:694
+#: ../rpmdrake_.c:702
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake_.c:700
+#: ../rpmdrake_.c:708
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake_.c:708 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:715 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:708
+#: ../rpmdrake_.c:715
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:708
+#: ../rpmdrake_.c:715
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:756
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "正在连接镜像服务器以得到最新的更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:758
 msgid "Error updating medium"
 msgstr "更新介质出错"
 
-#: ../rpmdrake_.c:752
+#: ../rpmdrake_.c:759
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "更新软件包信息时发生不可恢复的错误。"
 
-#: ../rpmdrake_.c:757
+#: ../rpmdrake_.c:764
 msgid "How to choose manually your mirror"
 msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake_.c:765
+#: ../rpmdrake_.c:772
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "正在联系服务器来初始化更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:768
+#: ../rpmdrake_.c:775
 msgid "Error adding update medium"
 msgstr "添加更新介质出错"
 
-#: ../rpmdrake_.c:800
+#: ../rpmdrake_.c:807
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:836
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake_.c:833
+#: ../rpmdrake_.c:840
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake_.c:852
+#: ../rpmdrake_.c:859
 msgid "changes:"
 msgstr "更改:"
 
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:863
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake_.c:858
+#: ../rpmdrake_.c:865
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake_.c:860
+#: ../rpmdrake_.c:867
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake_.c:878
+#: ../rpmdrake_.c:885
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake_.c:900
+#: ../rpmdrake_.c:907
 msgid "Program missing"
 msgstr "缺少程序"
 
-#: ../rpmdrake_.c:901
+#: ../rpmdrake_.c:908
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "缺少一个需要的程序(grpmi)。请检查您的安装。"
 
-#: ../rpmdrake_.c:916
+#: ../rpmdrake_.c:922
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake_.c:917
+#: ../rpmdrake_.c:923
 msgid "Unable to get source packages, sorry."
 msgstr "对不起, 无法得到源软件包。"
 
-#: ../rpmdrake_.c:924
+#: ../rpmdrake_.c:930
 msgid "Change medium"
 msgstr "更换介质"
 
-#: ../rpmdrake_.c:925
+#: ../rpmdrake_.c:931
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake_.c:933
+#: ../rpmdrake_.c:939
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:940
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -740,11 +746,11 @@ msgstr ""
 "安装失败, 缺少某些文件。\n"
 "您可能需要更新您的来源数据库。"
 
-#: ../rpmdrake_.c:937
+#: ../rpmdrake_.c:943
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "为了升级软件包, 正在删除旧的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake_.c:964
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -757,7 +763,7 @@ msgstr ""
 "一些配置文件被保存为“.rpmnew”或“.rpmsave”, \n"
 "在执行动作以前, 您需要检查一下:"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake_.c:964
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -765,31 +771,31 @@ msgstr ""
 "有些软件包出现安装\n"
 "失败"
 
-#: ../rpmdrake_.c:959
+#: ../rpmdrake_.c:965
 msgid "everything was installed correctly"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:961
+#: ../rpmdrake_.c:967
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:962
+#: ../rpmdrake_.c:968
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake_.c:964
+#: ../rpmdrake_.c:970
 msgid "Everything already installed."
 msgstr "所有软件包已经安装了。"
 
-#: ../rpmdrake_.c:965
+#: ../rpmdrake_.c:971
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "所有软件包已经安装了(这是您希望的吗?)。"
 
-#: ../rpmdrake_.c:968
+#: ../rpmdrake_.c:974
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake_.c:969
+#: ../rpmdrake_.c:975
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -800,15 +806,31 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake_.c:979
+#: ../rpmdrake_.c:985
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库, 请稍候..."
 
-#: ../rpmdrake_.c:1017
+#: ../rpmdrake_.c:1026
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包, 请稍候..."
 
-#: ../rpmdrake_.c:1046
+#: ../rpmdrake_.c:1028
+#, fuzzy
+msgid "Problem during removal"
+msgstr "在安装过程中发生问题"
+
+#: ../rpmdrake_.c:1029
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"安装过程中有一个问题:\n"
+"\n"
+"%s"
+
+#: ../rpmdrake_.c:1057
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -820,7 +842,7 @@ msgstr ""
 "这个工具帮助您选择想要从您的电脑中删除\n"
 "的软件包。"
 
-#: ../rpmdrake_.c:1051
+#: ../rpmdrake_.c:1062
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -832,7 +854,7 @@ msgstr ""
 "这个工具帮助您为您的电脑中安装\n"
 "更新的软件包。"
 
-#: ../rpmdrake_.c:1056
+#: ../rpmdrake_.c:1067
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"