Updated po files

1 files changed, 78 insertions, 230 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0c0578bf..48d51ca9 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-11-26 20:09+0100\n"
-"PO-Revision-Date: 2002-11-26 22:10+0800\n"
+"POT-Creation-Date: 2002-11-28 14:47+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"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,7 @@ msgstr "无法创建介质。"
 
 #: ../edit-urpm-sources.pl_.c:40
 msgid "Unable to update medium; it will be automatically disabled."
-msgstr "无法更新介质; 将被自动停用。"
+msgstr "无法更新介质; 该介质将被自动停用。"
 
 #: ../edit-urpm-sources.pl_.c:51
 msgid "Add a source"
@@ -56,7 +56,7 @@ msgstr "路径或装载点:"
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:508
+#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:519
 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:880
-#: ../rpmdrake_.c:915
+#: ../rpmdrake.pm_.c:289 ../rpmdrake_.c:350 ../rpmdrake_.c:891
+#: ../rpmdrake_.c:926
 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:915
+#: ../rpmdrake_.c:926
 msgid "Cancel"
 msgstr "取消"
 
@@ -160,7 +160,7 @@ msgstr "代理服务器主机名:"
 
 #: ../edit-urpm-sources.pl_.c:211
 msgid "You may specify a user/password for the proxy authentication:"
-msgstr "在登陆代理服务器时, 您可能要指定用户名和密码:"
+msgstr "在登录代理服务器时, 您可能要指定用户名和密码:"
 
 #: ../edit-urpm-sources.pl_.c:213
 msgid "User:"
@@ -172,13 +172,13 @@ msgstr "配置来源"
 
 #: ../edit-urpm-sources.pl_.c:242
 msgid "Enabled?"
-msgstr "启用?"
+msgstr "启用吗?"
 
 #: ../edit-urpm-sources.pl_.c:243
 msgid "Source"
 msgstr "来源"
 
-#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:688
+#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:699
 msgid "Remove"
 msgstr "可卸装"
 
@@ -202,7 +202,7 @@ msgstr "代理服务器..."
 msgid "Save and quit"
 msgstr "保存并退出"
 
-#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:691
+#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:702
 msgid "Quit"
 msgstr "退出"
 
@@ -343,7 +343,7 @@ msgstr "没有镜像"
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm_.c:309 ../rpmdrake_.c:587
+#: ../rpmdrake.pm_.c:309 ../rpmdrake_.c:598
 msgid "Update source(s)"
 msgstr "更新源"
 
@@ -357,7 +357,7 @@ msgstr "更新"
 
 #: ../rpmdrake.pm_.c:328
 msgid "Please wait, updating media..."
-msgstr "更新介质, 请稍候..."
+msgstr "正在更新介质, 请稍候..."
 
 #: ../rpmdrake_.c:97
 msgid "Other"
@@ -409,7 +409,7 @@ msgstr "rpmdrake"
 
 #: ../rpmdrake_.c:256
 msgid "More information on package..."
-msgstr "更多有关该软件包的信息..."
+msgstr "该软件包的更多信息..."
 
 #: ../rpmdrake_.c:257
 msgid "One of the following packages is needed:"
@@ -485,7 +485,7 @@ msgstr ""
 "对不起, 不能选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:421 ../rpmdrake_.c:644
+#: ../rpmdrake_.c:421 ../rpmdrake_.c:655
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
@@ -548,192 +548,191 @@ msgstr "摘要: "
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:519
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:508
+#: ../rpmdrake_.c:519
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:527
+#: ../rpmdrake_.c:538
 msgid "Mandrake choices"
 msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:539
 msgid "All packages, alphabetical"
-msgstr "全部软件包, 字母次序"
+msgstr "全部软件包, 按字母次序"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:540
 msgid "All packages,"
 msgstr "全部软件包,"
 
-#: ../rpmdrake_.c:552
+#: ../rpmdrake_.c:563
 msgid "by group"
 msgstr "按照分组"
 
-#: ../rpmdrake_.c:552
+#: ../rpmdrake_.c:563
 msgid "by size"
 msgstr "按照大小"
 
-#: ../rpmdrake_.c:553
+#: ../rpmdrake_.c:564
 msgid "by selection state"
 msgstr "按照选择状态"
 
-#: ../rpmdrake_.c:554
+#: ../rpmdrake_.c:565
 msgid "by source repository"
 msgstr "按照来源库"
 
-#: ../rpmdrake_.c:554
+#: ../rpmdrake_.c:565
 msgid "by update availability"
 msgstr "按照是否可更新"
 
-#: ../rpmdrake_.c:575
+#: ../rpmdrake_.c:586
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:575
+#: ../rpmdrake_.c:586
 msgid "in files"
 msgstr "在文件中"
 
-#: ../rpmdrake_.c:575
+#: ../rpmdrake_.c:586
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:597
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:597
 msgid "Reset the selection"
 msgstr "重置选中"
 
-#: ../rpmdrake_.c:612
+#: ../rpmdrake_.c:623
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake_.c:612
+#: ../rpmdrake_.c:623
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake_.c:634
+#: ../rpmdrake_.c:645
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake_.c:678
+#: ../rpmdrake_.c:689
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake_.c:683
+#: ../rpmdrake_.c:694
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake_.c:689
+#: ../rpmdrake_.c:700
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake_.c:697 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:708 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:697
+#: ../rpmdrake_.c:708
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:697
+#: ../rpmdrake_.c:708
 msgid "Software Packages Removal"
 msgstr "软件包删除"
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:749
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "正在连接镜像服务器以得到最新的更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:740
+#: ../rpmdrake_.c:751
 msgid "Error updating medium"
 msgstr "更新介质出错"
 
-#: ../rpmdrake_.c:741
+#: ../rpmdrake_.c:752
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "更新软件包信息时发生不可恢复的错误。"
 
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:757
 msgid "How to choose manually your mirror"
 msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:765
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "正在联系服务器来初始化更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:757
+#: ../rpmdrake_.c:768
 msgid "Error adding update medium"
 msgstr "添加更新介质出错"
 
-#: ../rpmdrake_.c:789
+#: ../rpmdrake_.c:800
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:818
+#: ../rpmdrake_.c:829
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:833
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake_.c:841
-#, fuzzy
+#: ../rpmdrake_.c:852
 msgid "changes:"
-msgstr "保存修改"
+msgstr "更改:"
 
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:856
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake_.c:847
+#: ../rpmdrake_.c:858
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake_.c:849
+#: ../rpmdrake_.c:860
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake_.c:867
+#: ../rpmdrake_.c:878
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake_.c:889
+#: ../rpmdrake_.c:900
 msgid "Program missing"
 msgstr "缺少程序"
 
-#: ../rpmdrake_.c:890
+#: ../rpmdrake_.c:901
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "缺少一个需要的程序(grpmi)。请检查您的安装。"
 
-#: ../rpmdrake_.c:905
+#: ../rpmdrake_.c:916
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake_.c:906
+#: ../rpmdrake_.c:917
 msgid "Unable to get source packages, sorry."
 msgstr "对不起, 无法得到源软件包。"
 
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:924
 msgid "Change medium"
 msgstr "更换介质"
 
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:925
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake_.c:922
+#: ../rpmdrake_.c:933
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:923
+#: ../rpmdrake_.c:934
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -741,11 +740,11 @@ msgstr ""
 "安装失败, 缺少某些文件。\n"
 "您可能需要更新您的来源数据库。"
 
-#: ../rpmdrake_.c:926
+#: ../rpmdrake_.c:937
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "为了升级软件包, 正在删除旧的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:947
+#: ../rpmdrake_.c:958
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -758,7 +757,7 @@ msgstr ""
 "一些配置文件被保存为“.rpmnew”或“.rpmsave”, \n"
 "在执行动作以前, 您需要检查一下:"
 
-#: ../rpmdrake_.c:947
+#: ../rpmdrake_.c:958
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -766,31 +765,31 @@ msgstr ""
 "有些软件包出现安装\n"
 "失败"
 
-#: ../rpmdrake_.c:948
+#: ../rpmdrake_.c:959
 msgid "everything was installed correctly"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:950
+#: ../rpmdrake_.c:961
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:951
+#: ../rpmdrake_.c:962
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake_.c:953
+#: ../rpmdrake_.c:964
 msgid "Everything already installed."
 msgstr "所有软件包已经安装了。"
 
-#: ../rpmdrake_.c:954
+#: ../rpmdrake_.c:965
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "所有软件包已经安装了(这是您希望的吗?)。"
 
-#: ../rpmdrake_.c:957
+#: ../rpmdrake_.c:968
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake_.c:958
+#: ../rpmdrake_.c:969
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -801,15 +800,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake_.c:968
+#: ../rpmdrake_.c:979
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库, 请稍候..."
 
-#: ../rpmdrake_.c:1006
+#: ../rpmdrake_.c:1017
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包, 请稍候..."
 
-#: ../rpmdrake_.c:1035
+#: ../rpmdrake_.c:1046
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -821,7 +820,7 @@ msgstr ""
 "这个工具帮助您选择想要从您的电脑中删除\n"
 "的软件包。"
 
-#: ../rpmdrake_.c:1040
+#: ../rpmdrake_.c:1051
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -833,7 +832,7 @@ msgstr ""
 "这个工具帮助您为您的电脑中安装\n"
 "更新的软件包。"
 
-#: ../rpmdrake_.c:1045
+#: ../rpmdrake_.c:1056
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -857,154 +856,3 @@ msgstr "软件来源管理器"
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
 msgstr "安装软件"
-
-#~ msgid ""
-#~ "There is already a medium by that name, do you\n"
-#~ "really want to replace it?"
-#~ msgstr ""
-#~ "已经有一个介质使用这个名字, \n"
-#~ "您确实要替换它吗?"
-
-#~ msgid ""
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "%s\n"
-#~ "\n"
-#~ "要继续吗?"
-
-#~ msgid ""
-#~ "Welcome to the packages source editor!\n"
-#~ "\n"
-#~ "This tool will help you configure the packages sources you wish to use "
-#~ "on\n"
-#~ "your computer. They will then be available to install new software "
-#~ "package\n"
-#~ "or to perform updates."
-#~ msgstr ""
-#~ "欢迎使用软件包来源编辑器!\n"
-#~ "\n"
-#~ "这个工具帮助您配置您的电脑将使用的软件包来源。\n"
-#~ "以后安装新的软件包或者进行更新时, \n"
-#~ "可以使用这里定义的软件包来源。"
-
-#~ msgid ""
-#~ "I need to contact MandrakeSoft website to get the mirrors list.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "我需要连接 MandrakeSoft 网站下载镜像站点的清单。\n"
-#~ "请确认您的网络正在工作。\n"
-#~ "\n"
-#~ "可以继续吗?"
-
-#~ msgid ""
-#~ "There was an error downloading the mirrors list:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "The network, or MandrakeSoft website, are maybe unavailable.\n"
-#~ "Please try again later."
-#~ msgstr ""
-#~ "下载镜像站点的清单时出错:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "您的网络连接, 或者 MandrakeSoft 网站, 现在有些问题。\n"
-#~ "请过一会儿再试。"
-
-#~ msgid ""
-#~ "I can't find any suitable mirror.\n"
-#~ "\n"
-#~ "There can be many reasons for this problem; the most frequent is\n"
-#~ "the case when the architecture of your processor is not supported\n"
-#~ "by Mandrake Linux Official Updates."
-#~ msgstr ""
-#~ "没有找到合适的镜像站点。这个问题的出现可能有很多原因; 最经常出现的原因就"
-#~ "是\n"
-#~ "您的处理器的架构不被 Mandrake Linux 官方升级所\n"
-#~ "支持。"
-
-#~ 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"
-#~ "or you already installed all of them."
-#~ msgstr ""
-#~ "更新列表是空的。这表明或者现在您电脑上\n"
-#~ "安装的这些软件包没有更新, \n"
-#~ "或者您已经安装过所有的更新。"
-
-#~ msgid ""
-#~ "Warning: it seems that you are attempting to add so much\n"
-#~ "packages that your filesystem may run out of free diskspace,\n"
-#~ "during or after package installation ; this is particularly\n"
-#~ "dangerous and should be considered with care.\n"
-#~ "\n"
-#~ "Do you really want to install all the selected packages?"
-#~ msgstr ""
-#~ "警告: 您好像试图添加可能在包安装时或安装后超过文件系统剩余\n"
-#~ "空间的包; 这种情况非常危险, 应该小心考虑。\n"
-#~ "\n"
-#~ "您真的想要安装选中包吗?"
-
-#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "要安装其它软件包, 必须删除下列软件包:\n"
-#~ "\n"
-#~ "%s\n"
-#~ "\n"
-#~ "可以继续吗?"
-
-#~ msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#~ msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-
-#~ msgid ""
-#~ "I need to contact the mirror to get latest update packages.\n"
-#~ "Please check that your network is currently running.\n"
-#~ "\n"
-#~ "Is it ok to continue?"
-#~ msgstr ""
-#~ "我需要连接镜像服务器以得到最新的更新软件包。\n"
-#~ "请检查您的网络是否已经接通。\n"
-#~ "\n"
-#~ "可以继续吗?"
-
-#~ msgid ""
-#~ "You may also choose your desired mirror manually: to do so,\n"
-#~ "launch the Software Sources Manager, and then add a `Security\n"
-#~ "updates' source.\n"
-#~ "\n"
-#~ "Then, restart MandrakeUpdate."
-#~ msgstr ""
-#~ "也可以手工挑选您的镜像: 要这样做, \n"
-#~ "启动软件来源管理员, 并添加一个“安全更新”\n"
-#~ "来源。\n"
-#~ "\n"
-#~ "然后, 重新启动 MandrakeUpdate。"
-
-#~ msgid ""
-#~ "There was an error while adding the update medium via urpmi.\n"
-#~ "\n"
-#~ "This may be due to a broken or temporary unavailable mirror, or when "
-#~ "your\n"
-#~ "Mandrake Linux version (%s) is not yet / no more supported by Mandrake "
-#~ "Linux\n"
-#~ "Official Updates.\n"
-#~ "\n"
-#~ "Do you want to try another mirror?"
-#~ msgstr ""
-#~ "通过 urpmi 添加更新介质时出错。\n"
-#~ "\n"
-#~ "可能是由于镜像服务器出错或暂时不能连接, 或者您的\n"
-#~ "Mandrake Linux 版本(%s)没有被 Mandrake Linux \n"
-#~ "官方升级所支持。\n"
-#~ "\n"
-#~ "要尝试另外的镜像服务器吗?"
-
-#~ msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#~ msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"