update

1 files changed, 109 insertions, 101 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 544eabc9..946f9c8e 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-08-29 16:03+0200\n"
+"POT-Creation-Date: 2002-08-29 17:02+0200\n"
 "PO-Revision-Date: 2002-08-20 11:20+0800\n"
 "Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
 "Language-Team: Simplified Chinese <future-cjk@mandrakesoft.com>\n"
@@ -56,7 +56,7 @@ msgstr "路径或装载点:"
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:462
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -106,13 +106,13 @@ msgstr "介质类型:"
 
 #: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
 #: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:319 ../rpmdrake_.c:776 ../rpmdrake_.c:802
+#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
 msgid "Ok"
 msgstr "确定"
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
 #: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:319 ../rpmdrake_.c:802
+#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
 msgid "Cancel"
 msgstr "取消"
 
@@ -174,7 +174,7 @@ msgstr "激活?"
 msgid "Source"
 msgstr "来源"
 
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:598
+#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
 msgid "Remove"
 msgstr "可卸装"
 
@@ -194,11 +194,11 @@ msgstr "更新..."
 msgid "Save and quit"
 msgstr "保存并退出"
 
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
 msgid "Quit"
 msgstr "离开"
 
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:901
+#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
 #, c-format
 msgid ""
 "%s\n"
@@ -400,11 +400,11 @@ msgstr "请选择喜欢的镜像站点."
 msgid "Other"
 msgstr ""
 
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:422 ../rpmdrake_.c:423
+#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
 msgid "(Non available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:196
+#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
 msgid "Search results"
 msgstr "搜寻结果"
 
@@ -420,35 +420,51 @@ msgstr "正在搜寻, 请稍候..."
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake_.c:229
+#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+msgid "Addable"
+msgstr "可添加的"
+
+#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+msgid "Upgradable"
+msgstr "可升级的"
+
+#: ../rpmdrake_.c:197
+msgid "Not selected"
+msgstr ""
+
+#: ../rpmdrake_.c:197
+msgid "Selected"
+msgstr ""
+
+#: ../rpmdrake_.c:232
 msgid "More information on package..."
 msgstr ""
 
-#: ../rpmdrake_.c:231
+#: ../rpmdrake_.c:234
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件之一:"
 
-#: ../rpmdrake_.c:231
+#: ../rpmdrake_.c:234
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake_.c:247
+#: ../rpmdrake_.c:250
 msgid "unknown package "
 msgstr "未知软件包"
 
-#: ../rpmdrake_.c:257
+#: ../rpmdrake_.c:260
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake_.c:271
+#: ../rpmdrake_.c:274
 msgid "(none)"
 msgstr "(无)"
 
-#: ../rpmdrake_.c:273
+#: ../rpmdrake_.c:276
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:277
 msgid ""
 "The list of updates is void. This means that either there is\n"
 "no available update for the packages installed on your computer,\n"
@@ -458,19 +474,11 @@ msgstr ""
 "安装的这些软件包没有更新,\n"
 "或者您已经安装过所有的更新."
 
-#: ../rpmdrake_.c:292
-msgid "Addable"
-msgstr "可添加的"
-
-#: ../rpmdrake_.c:292
-msgid "Upgradable"
-msgstr "可升级的"
-
-#: ../rpmdrake_.c:325
+#: ../rpmdrake_.c:328
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake_.c:326
+#: ../rpmdrake_.c:329
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -480,11 +488,11 @@ msgstr ""
 "需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:332
+#: ../rpmdrake_.c:335
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake_.c:333 ../rpmdrake_.c:391
+#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -494,11 +502,11 @@ msgstr ""
 "下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:361
+#: ../rpmdrake_.c:364
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake_.c:362
+#: ../rpmdrake_.c:365
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -508,11 +516,11 @@ msgstr ""
 "下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:375
+#: ../rpmdrake_.c:378
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:376
+#: ../rpmdrake_.c:379
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -520,21 +528,21 @@ msgstr ""
 "对不起，不能选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:390 ../rpmdrake_.c:561
+#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake_.c:412
+#: ../rpmdrake_.c:415
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中: %d MB / 空闲磁盘空间: %d MB"
 
-#: ../rpmdrake_.c:414
+#: ../rpmdrake_.c:417
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中的: %d MB"
 
-#: ../rpmdrake_.c:420
+#: ../rpmdrake_.c:423
 #, c-format
 msgid ""
 "%sFiles:\n"
@@ -544,12 +552,12 @@ msgid ""
 "%s"
 msgstr ""
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake_.c:424
 #, fuzzy, c-format
 msgid "Source: %s\n"
 msgstr "来源"
 
-#: ../rpmdrake_.c:426
+#: ../rpmdrake_.c:429
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -570,7 +578,7 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../rpmdrake_.c:430
+#: ../rpmdrake_.c:433
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -589,68 +597,68 @@ msgstr ""
 "\n"
 "%s\n"
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:465
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:462
+#: ../rpmdrake_.c:465
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:481
+#: ../rpmdrake_.c:484
 msgid "Mandrake choices"
 msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:482
+#: ../rpmdrake_.c:485
 msgid "All packages, alphabetical"
 msgstr "全部软件包, 字母次序"
 
-#: ../rpmdrake_.c:483
+#: ../rpmdrake_.c:486
 msgid "All packages,"
 msgstr "全部软件包,"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:509
 msgid "by group"
 msgstr "按照分组"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:509
 msgid "by size"
 msgstr "按照大小"
 
-#: ../rpmdrake_.c:507
+#: ../rpmdrake_.c:510
 msgid "by selection state"
 msgstr "按照选择状态"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:511
 msgid "by source repository"
 msgstr "按照来源"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:511
 msgid "by update availability"
 msgstr "按照是否可更新"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:532
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:532
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "in files"
 msgstr "在文件中"
 
-#: ../rpmdrake_.c:541
+#: ../rpmdrake_.c:544
 msgid "Maximum information"
 msgstr ""
 
-#: ../rpmdrake_.c:541
+#: ../rpmdrake_.c:544
 #, fuzzy
 msgid "Normal information"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -665,35 +673,35 @@ msgstr ""
 "\n"
 "可以继续吗?"
 
-#: ../rpmdrake_.c:582
+#: ../rpmdrake_.c:585
 msgid "Find:"
 msgstr "找到:"
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:590
 msgid "Search"
 msgstr "搜寻"
 
-#: ../rpmdrake_.c:599
+#: ../rpmdrake_.c:602
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake_.c:610
+#: ../rpmdrake_.c:613
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:611
+#: ../rpmdrake_.c:614
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:611
+#: ../rpmdrake_.c:614
 msgid "Software Packages Removal"
 msgstr " 软件包删除"
 
-#: ../rpmdrake_.c:612
+#: ../rpmdrake_.c:615
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:644
+#: ../rpmdrake_.c:647
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -705,23 +713,23 @@ msgstr ""
 "\n"
 "可以继续吗?"
 
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:651
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "正在连接镜像服务器以得到最新的更新软件包, 请稍候."
 
-#: ../rpmdrake_.c:650
+#: ../rpmdrake_.c:653
 msgid "Error updating medium"
 msgstr "更新介质出错"
 
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:654
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "更新软件包信息时发生不可恢复的错误."
 
-#: ../rpmdrake_.c:657
+#: ../rpmdrake_.c:660
 msgid "How to choose manually your mirror"
 msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake_.c:658
+#: ../rpmdrake_.c:661
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -735,15 +743,15 @@ msgstr ""
 "\n"
 "然后, 重新启动 MandrakeUpdate."
 
-#: ../rpmdrake_.c:664
+#: ../rpmdrake_.c:667
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "正在联系服务器来初始化更新软件包， 请稍候."
 
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:671
 msgid "Error adding update medium"
 msgstr "添加更新介质出错"
 
-#: ../rpmdrake_.c:669
+#: ../rpmdrake_.c:672
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -763,48 +771,48 @@ msgstr ""
 "\n"
 "要尝试另外的镜像服务器吗?"
 
-#: ../rpmdrake_.c:698
+#: ../rpmdrake_.c:701
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可安装的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:721
+#: ../rpmdrake_.c:724
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装."
 
-#: ../rpmdrake_.c:721
+#: ../rpmdrake_.c:724
 msgid "Everything installed successfully"
 msgstr "所有东西已成功安装"
 
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:727
 #, fuzzy
 msgid "Installation finished"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:730
 #, c-format
 msgid "Inspecting %s"
 msgstr ""
 
-#: ../rpmdrake_.c:743
+#: ../rpmdrake_.c:746
 #, fuzzy, c-format
 msgid "Remove .%s"
 msgstr "可卸装"
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:748
 #, c-format
 msgid "Use .%s as main file"
 msgstr ""
 
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:750
 msgid "Do nothing"
 msgstr ""
 
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:753
 #, fuzzy
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 
-#: ../rpmdrake_.c:757
+#: ../rpmdrake_.c:760
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -813,44 +821,44 @@ msgid ""
 "you may now inspect some in order to take actions:"
 msgstr ""
 
-#: ../rpmdrake_.c:758
+#: ../rpmdrake_.c:761
 #, fuzzy
 msgid ""
 "some packages failed to install\n"
 "correctly"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:759
+#: ../rpmdrake_.c:762
 #, fuzzy
 msgid "everything was installed correctly"
 msgstr "所有东西已成功安装"
 
-#: ../rpmdrake_.c:764
+#: ../rpmdrake_.c:767
 msgid "Inspect..."
 msgstr ""
 
-#: ../rpmdrake_.c:792
+#: ../rpmdrake_.c:795
 msgid "Unable to get source packages."
 msgstr "源软件包未找到."
 
-#: ../rpmdrake_.c:793
+#: ../rpmdrake_.c:796
 msgid "Unable to get source packages, sorry."
 msgstr "对不起, 无法得到源软件包."
 
-#: ../rpmdrake_.c:800
+#: ../rpmdrake_.c:803
 msgid "Change medium"
 msgstr "更换介质"
 
-#: ../rpmdrake_.c:801
+#: ../rpmdrake_.c:804
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把标记为 \"%s\" 的介质放进设备 [%s]"
 
-#: ../rpmdrake_.c:809
+#: ../rpmdrake_.c:812
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:810
+#: ../rpmdrake_.c:813
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -858,35 +866,35 @@ msgstr ""
 "安装失败, 缺少某些文件.\n"
 "您可能需要更新您的来源数据库.."
 
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:816
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "为了升级软件包, 正在删除旧的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:825
 msgid "Program missing"
 msgstr "缺少程序"
 
-#: ../rpmdrake_.c:823
+#: ../rpmdrake_.c:826
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "缺少一个需要的程序 (grpmi). 请检查您的安装."
 
-#: ../rpmdrake_.c:841
+#: ../rpmdrake_.c:844
 msgid "Everything already installed."
 msgstr "所有软件包已经安装了."
 
-#: ../rpmdrake_.c:842
+#: ../rpmdrake_.c:845
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "所有软件包已经安装了(这是您希望的吗?)."
 
-#: ../rpmdrake_.c:852
+#: ../rpmdrake_.c:855
 msgid "Please wait, reading packages database..."
 msgstr "读取软件包数据库, 请稍候..."
 
-#: ../rpmdrake_.c:890
+#: ../rpmdrake_.c:893
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:908
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -898,7 +906,7 @@ msgstr ""
 "这个工具帮助您选择想要从您的电脑中删除\n"
 "的软件包."
 
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:913
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -910,7 +918,7 @@ msgstr ""
 "这个工具帮助您为您的电脑中安装\n"
 "更新的软件包."
 
-#: ../rpmdrake_.c:915
+#: ../rpmdrake_.c:918
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"