updated po files

2 files changed, 396 insertions, 378 deletions

diff --git a/po/uk.po b/po/uk.po
index 2e17b6d7..77402373 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake-uk\n"
 "POT-Creation-Date: 2003-05-16 18:58+0200\n"
-"PO-Revision-Date: 2003-05-21 10:32+0300\n"
+"PO-Revision-Date: 2003-05-24 07:44+0300\n"
 "Last-Translator: Taras Boychuk <btr1@torba.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -111,7 +111,7 @@ msgid "%s KB"
 msgstr "%s ��"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Medias Manager, and then add a `Security\n"
@@ -172,9 +172,9 @@ msgid "Security updates"
 msgstr "���������� �������"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Already existing update medias"
-msgstr "���������, ����-�����, ������������ ��Ӧ�..."
+msgstr "��� �����ަ ������� ����������"
 
 #: ../rpmdrake:1
 #, c-format
@@ -187,7 +187,7 @@ msgid "Proxy..."
 msgstr "����Ӧ..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your medias database."
@@ -231,7 +231,7 @@ msgid "Finland"
 msgstr "�����Ħ�"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -239,21 +239,21 @@ msgid ""
 "\n"
 "Do you want to continue installation?"
 msgstr ""
-"������Φ ������� �����Φ ���� ������Φ, ��� ��ۦ ����� ���� ��������:\n"
+"������Φ ������� ����� ���������Φ Ц�����:\n"
 "\n"
 "%s\n"
 "\n"
-"����������?"
+"�� ������ ���������� ������������?"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Examining distant file of media `%s'..."
-msgstr "����צ��� צ��������� ����� ������� `%s'..."
+msgstr "����צ��� צ��������� ����� ������� `%s'..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
-msgstr ""
+msgstr "����צ������� Ц����� �����˦�..."
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -303,7 +303,7 @@ msgid "All packages,"
 msgstr "�Ӧ �������,"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Type of media:"
 msgstr "��� �������:"
 
@@ -498,9 +498,9 @@ msgid "Everything installed successfully"
 msgstr "��� ����������� �����"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Select the media(s) you wish to update:"
-msgstr "����Ҧ�� ��������, �˦ �� ������ ��������:"
+msgstr "����Ҧ�� �������, �˦ �� ������ ��������:"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -577,9 +577,9 @@ msgid "Error during download"
 msgstr "������� � ��� ������������"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Package installation..."
-msgstr "������� ������� �� ���������..."
+msgstr "�������������� �������..."
 
 #: ../rpmdrake:1
 #, c-format
@@ -641,9 +641,9 @@ msgid "You need to insert the medium to continue"
 msgstr "��� ���Ҧ��� �������� ��Ӧ� ��� �����������"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Copying file for media `%s'..."
-msgstr "�������� ����� � ������� `%s'..."
+msgstr "�������� ���� � ������� `%s'..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -651,12 +651,12 @@ msgid "Remove"
 msgstr "��������"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing packages installation..."
-msgstr "������� ������� �� ���������..."
+msgstr "�������������� ������� �� ������������..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "by media repository"
 msgstr "�� ��������"
 
@@ -723,7 +723,7 @@ msgid "Inspect..."
 msgstr "������..."
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Editing media \"%s\":"
 msgstr "����������� ������� \"%s\":"
 
@@ -818,9 +818,9 @@ msgid "Search"
 msgstr "�����"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Edit a media"
-msgstr "���������� ������� "
+msgstr "���������� �������"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -837,6 +837,12 @@ msgid ""
 "\n"
 "Then, restart MandrakeUpdate."
 msgstr ""
+"�� ��� ����� ������������� �� ͦΦ��� ������ ��Ӧ� � ������������,\n"
+"��� צ� � ����� ��� �� � �����������. ��� ���Ҧ��� ���������\n"
+"�������� ������, ��� ���� ���������� (��ͦ���� �������\n"
+"��������?).\n"
+"\n"
+"���� ����� ���������Ԧ�� ���������� ��������."
 
 #: ../rpmdrake:1
 #, c-format
@@ -861,7 +867,7 @@ msgstr "���������� �������æ�"
 #: ../rpmdrake:1
 #, c-format
 msgid "Media: "
-msgstr ""
+msgstr "��Ӧ�:"
 
 #: ../rpmdrake:1
 #, c-format
@@ -876,7 +882,7 @@ msgstr "�������: %d � / ������ �� �����: %d �"
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media"
-msgstr ""
+msgstr "��Ӧ�"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -906,7 +912,7 @@ msgid "Login:"
 msgstr "��'�:"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Adding a media:"
 msgstr "������������ �������:"
 
@@ -1025,12 +1031,12 @@ msgid "No"
 msgstr "�"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Configure medias"
 msgstr "����Ʀ�������� �������"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Add a media"
 msgstr "������ �������"
 
@@ -1158,9 +1164,9 @@ msgstr ""
 "��� ���� �Ӧ ��� ���������Φ."
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Examining file of media `%s'..."
-msgstr "����צ��� ����� ������� `%s'..."
+msgstr "����צ��� ����� ������� `%s'..."
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1192,9 +1198,9 @@ msgstr ""
 "����������?"
 
 #: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Update media(s)"
-msgstr "�������� �������(�)"
+msgstr "�������� �������"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
@@ -1217,7 +1223,7 @@ msgid "Too many packages are selected"
 msgstr "������� ������� ������ �����˦�"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Welcome to the Software Medias Manager!\n"
 "\n"
@@ -1227,10 +1233,9 @@ msgid ""
 msgstr ""
 "������� ������� �� ��������� ������ �����˦�!\n"
 "\n"
-"��� ���������� �������� ��� ����������� ������� �����˦�, �˦ �� ������ "
-"��������������� ��\n"
-" ������ ����'���Ҧ. ���� ������� ���������� ��� ������������ ����� �����˦� "
-"� ����������\n"
+"��� ���������� �������� ��� ����������� ������� �����˦�, �˦ �� \n"
+"������ ��������������� ��  ������ ����'���Ҧ. ���� ������� \n"
+" ���������� ��� ������������ ����� �����˦� � ����������\n"
 "��� ��� �Ħ������� ���������."
 
 #: ../rpmdrake:1
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0f81bda3..cf64563d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,27 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
 "POT-Creation-Date: 2003-05-16 18:58+0200\n"
-"PO-Revision-Date: 2003-03-13 22:13+0800\n"
+"PO-Revision-Date: 2003-05-24 11:13+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
-"Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
+"Language-Team: Mandrake i18n Team <cooker-i18n@linux-mandrake.com>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=GB2312\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Enabled?"
-msgstr "�����ã�"
+msgstr "已启用？"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path or mount point:"
-msgstr "·����װ�ص㣺"
+msgstr "路径或装载点："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Portugal"
-msgstr "������"
+msgstr "葡萄牙"
 
 #: ../rpmdrake:1
 #, c-format
@@ -40,30 +40,30 @@ msgid ""
 "packages on CDROM or DVD. This tool will help you choose which software\n"
 "you want to install on your computer."
 msgstr ""
-"��ӭʹ����������װ���ߣ�\n"
+"欢迎使用软件包安装工具！\n"
 "\n"
-"���� Mandrake Linux �İ�װ���̰�������ǧ����������\n"
-"�����߽�������ѡ��ҪΪ���ĵ��԰�װ����������"
+"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
+"本工具将帮助您选择要为您的电脑安装的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "by group"
-msgstr "�����������"
+msgstr "按照组别排列"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Name:"
-msgstr "���ƣ�"
+msgstr "名称："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Italy"
-msgstr "�����"
+msgstr "意大利"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "How to choose manually your mirror"
-msgstr "����ֹ�ѡ�����ľ���"
+msgstr "如何手工选择您的镜像"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -73,17 +73,17 @@ msgstr "URL:"
 #: ../rpmdrake:1
 #, c-format
 msgid "Some packages need to be removed"
-msgstr "��Ҫɾ��һЩ������"
+msgstr "需要删除一些软件包"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "More information on package..."
-msgstr "���������ĸ�����Ϣ..."
+msgstr "该软件包的更多信息..."
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
-msgstr "��"
+msgstr "是"
 
 #: ../rpmdrake:1
 #, c-format
@@ -92,13 +92,13 @@ msgid ""
 "unselected now:\n"
 "\n"
 msgstr ""
-"����������֮���������ϵ����������ѡ��������������\n"
+"由于软件包之间的依赖关系，您不可以选择下列软件包：\n"
 "\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "everything was installed correctly"
-msgstr "����������������ȷ��װ"
+msgstr "所有软件包都已正确安装"
 
 #: ../rpmdrake:1
 #, c-format
@@ -106,7 +106,7 @@ msgid "%s KB"
 msgstr "%s KB"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Medias Manager, and then add a `Security\n"
@@ -114,10 +114,10 @@ msgid ""
 "\n"
 "Then, restart MandrakeUpdate."
 msgstr ""
-"���������ֶ�ѡ����ϣ��ʹ�õľ��񣺷����ǣ�ʹ������Դ��������\n"
-"Ȼ�����ӡ���ȫ���¡�Դ��\n"
+"您还可以手动选择您希望使用的镜像：方法是，使用软件源管理器，\n"
+"然后添加“安全更新”源。\n"
 "\n"
-"Ȼ���������� MandrakeUpdate��"
+"然后重新启动 MandrakeUpdate。"
 
 #: ../rpmdrake:1
 #, c-format
@@ -127,20 +127,20 @@ msgid ""
 "This tool will help you choose which software you want to remove from\n"
 "your computer."
 msgstr ""
-"��ӭʹ��������ɾ�����ߣ�\n"
+"欢迎使用软件包删除工具！\n"
 "\n"
-"�����߽�������ѡ����Ҫ�����ĵ�����ɾ������������"
+"本工具将帮助您删除掉您想要从您的电脑中删除的软件包。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
-msgstr "Ҫ����ı䣬���������������в�����ʡ�"
+msgstr "要保存改变，您必须在驱动器中插入介质。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Save and quit"
-msgstr "���沢�˳�"
+msgstr "保存并退出"
 
 #: ../rpmdrake:1
 #, c-format
@@ -149,53 +149,53 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"ɾ���������з���һ�����⣺\n"
+"删除包过程中发生一个问题：\n"
 "\n"
 "%s"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Size: "
-msgstr "����"
+msgstr "大小："
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Security updates"
-msgstr "��ȫ����"
+msgstr "安全更新"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Already existing update medias"
-msgstr "���Ӹ��½��ʳ���"
+msgstr "升级来源已经存在"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Maximum information"
-msgstr "�����Ϣ"
+msgstr "最多信息"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Proxy..."
-msgstr "����������..."
+msgstr "代理服务器..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your medias database."
 msgstr ""
-"��װʧ�ܣ�ȱ��ijЩ�ļ���\n"
-"��������Ҫ������������Դ���ݿ⡣"
+"安装失败，缺少某些文件。\n"
+"您可能需要更新您的软件源数据库。"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "United Kingdom"
-msgstr "Ӣ��"
+msgstr "英国"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "in names"
-msgstr "��������"
+msgstr "在名称中"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -206,22 +206,22 @@ msgid ""
 "the case when the architecture of your processor is not supported\n"
 "by Mandrake Linux Official Updates."
 msgstr ""
-"�Ҳ����κ��ʺϵľ���\n"
-"����������кܶ�ԭ������ľ������Ĵ������ܹ���Ϊ Mandrake\n"
-"Linux �ٷ�������֧�֡�"
+"找不到任何适合的镜像。\n"
+"此问题可能有很多原因；最常见的就是您的处理器架构不为 Mandrake\n"
+"Linux 官方更新所支持。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Remove .%s"
-msgstr "ɾ�� .%s"
+msgstr "删除 .%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Finland"
-msgstr "����"
+msgstr "芬兰"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The following packages have bad signatures:\n"
 "\n"
@@ -229,32 +229,32 @@ msgid ""
 "\n"
 "Do you want to continue installation?"
 msgstr ""
-"Ҫ��������������������ɾ��������������\n"
+"下列软件包的签名出现以下问题：\n"
 "\n"
 "%s\n"
 "\n"
-"ȷ��������"
+"确定继续吗？"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Examining distant file of media `%s'..."
-msgstr "���ڼ��Դ��%s���ľ����ļ�..."
+msgstr "正在检查来源“%s”的距离文件..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Verifying packages signatures..."
-msgstr ""
+msgstr "校验软件包的签名..."
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "France"
-msgstr "����"
+msgstr "法国"
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "More info"
-msgstr "������Ϣ"
+msgstr "更多信息"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -265,144 +265,144 @@ msgid ""
 msgstr ""
 "%s\n"
 "\n"
-"ȷ��������?"
+"确定继续吗？"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Reload the packages list"
-msgstr "����װ���������嵥"
+msgstr "重新装入软件包清单"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Choose a mirror..."
-msgstr "ѡ����..."
+msgstr "选择镜像..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Some packages can't be installed"
-msgstr "��Щ�������޷���װ"
+msgstr "有些软件包无法安装"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "���ɻָ��Ĵ��󣺶Բ���û�з��ֿɰ�װ����������"
+msgstr "不可恢复的错误：对不起，没有发现可安装的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All packages,"
-msgstr "ȫ����������"
+msgstr "全部软件包，"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Type of media:"
-msgstr "��Դ���ͣ�"
+msgstr "来源类型："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "in files"
-msgstr "���ļ���"
+msgstr "在文件中"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All requested packages were installed successfully."
-msgstr "����Ҫ������������ѳɹ���װ��"
+msgstr "所有要求的软件包都已成功安装。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Proxy hostname:"
-msgstr "������������������"
+msgstr "代理服务器主机名："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
-msgstr "�����ļ�"
+msgstr "本机文件"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspecting %s"
-msgstr "���ڼ�� %s"
+msgstr "正在检查 %s"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Israel"
-msgstr "��ɫ��"
+msgstr "以色列"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Help"
-msgstr "����"
+msgstr "帮助"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "HTTP server"
-msgstr "HTTP ������"
+msgstr "HTTP 服务器"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Installation failed"
-msgstr "��װʧ��"
+msgstr "安装失败"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Use .%s as main file"
-msgstr "ʹ�� .%s ��Ϊ���ļ�"
+msgstr "使用 .%s 作为主文件"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Search results"
-msgstr "�������"
+msgstr "搜索结果"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid " failed!"
-msgstr " ʧ�ܣ�"
+msgstr " 失败！"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Brazil"
-msgstr "����"
+msgstr "巴西"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
-msgstr "�Ѿ��и����ƵĽ��ʣ��������Ҫ�滻��"
+msgstr "已经有该名称的来源，您真的想要替换吗？"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Find:"
-msgstr "���ң�"
+msgstr "查找："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "All packages, alphabetical"
-msgstr "ȫ��������������ĸ��������"
+msgstr "全部软件包，按字母次序排列"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, searching..."
-msgstr "�������������Ժ�..."
+msgstr "正在搜索，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, reading packages database..."
-msgstr "���ڶ�ȡ���������ݿ⣬���Ժ�..."
+msgstr "正在读取软件包数据库，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "unknown package "
-msgstr "δ֪������"
+msgstr "未知软件包"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "��ѱ��Ϊ��%s���Ľ��ʷŽ��豸 [%s]"
+msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Reset the selection"
-msgstr "����ѡ��"
+msgstr "重置选中"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -410,7 +410,7 @@ msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr ""
-"�������Ҫ�ô������������������������Ͷ˿ڣ��﷨��<proxyhost[:port]>����"
+"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）："
 
 #: ../rpmdrake:1
 #, c-format
@@ -419,13 +419,13 @@ msgid ""
 "removed:\n"
 "\n"
 msgstr ""
-"Ϊ���������е�������ϵ����Ҫɾ��������������\n"
+"为了满足所有的依赖关系，需要删除下列软件包：\n"
 "\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Costa Rica"
-msgstr "��˹�����"
+msgstr "哥斯达黎加"
 
 #: ../rpmdrake:1
 #, c-format
@@ -434,69 +434,69 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"��װ�����з��������⣺\n"
+"安装过程中发生了问题：\n"
 "\n"
 "%s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, removing medium..."
-msgstr "����ɾ�����ʣ����Ժ�..."
+msgstr "正在删除临时文件，请稍候..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Password:"
-msgstr "���룺"
+msgstr "密码："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
-msgstr "�й�̨��"
+msgstr "中国台湾"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "User:"
-msgstr "�û�����"
+msgstr "用户名："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
-msgstr "���ڸ��½��ʣ����Ժ�..."
+msgstr "正在更新介质，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, listing packages..."
-msgstr "�����г������������Ժ�..."
+msgstr "正在列出软件包，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Information on packages"
-msgstr "������������Ϣ"
+msgstr "该软件包的信息"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Cancel"
-msgstr "ȡ��"
+msgstr "取消"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Everything installed successfully"
-msgstr "�������������ѳɹ���װ"
+msgstr "所有软件包都已成功安装"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media(s) you wish to update:"
-msgstr "ѡ��Ҫ���µ�Դ���ʣ�"
+msgstr "选择要更新的来源："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
-msgstr "���ڸ��½��ʣ����Ժ�..."
+msgstr "正在更新来源，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "A fatal error occurred: %s."
-msgstr ""
+msgstr "发生了一个致命错误：%s。"
 
 #: ../rpmdrake:1
 #, c-format
@@ -507,21 +507,21 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"Ҫ��������������������ɾ��������������\n"
+"要升级其它软件包，必须删除下列软件包：\n"
 "\n"
 "%s\n"
 "\n"
-"ȷ��������"
+"确定继续吗？"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "in descriptions"
-msgstr "��������"
+msgstr "在描述中"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
-msgstr "����������"
+msgstr "配置代理服务器"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -531,45 +531,45 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"��Ҫ���� MandrakeSoft ��վ���ܻ�þ����б���\n"
-"�������������Ƿ���ת������\n"
+"需要连接 MandrakeSoft 网站才能获得镜像列表。\n"
+"请检查您的网络是否运转正常。\n"
 "\n"
-"ȷ��������"
+"确定继续吗？"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please choose"
-msgstr "��ѡ��"
+msgstr "请选择"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected size: %d MB"
-msgstr "ѡ�д�С��%d MB"
+msgstr "选中大小：%d MB"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Initializing..."
-msgstr ""
+msgstr "正在初始化..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Save changes"
-msgstr "�����޸�"
+msgstr "保存修改"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
-msgstr "���س���"
+msgstr "下载出错"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Package installation..."
-msgstr "��������װ"
+msgstr "软件包安装..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Importance: "
-msgstr "��Ҫ�ԣ�"
+msgstr "重要性："
 
 #: ../rpmdrake:1
 #, c-format
@@ -578,18 +578,18 @@ msgid ""
 "to be installed:\n"
 "\n"
 msgstr ""
-"Ϊ����������ϵ������Ҫ��װ������������\n"
+"为满足依赖关系，还需要安装下列软件包：\n"
 "\n"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Add..."
-msgstr "����..."
+msgstr "添加..."
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
-msgstr "�޷��������ʡ�"
+msgstr "无法创建来源。"
 
 #: ../rpmdrake:1
 #, c-format
@@ -599,85 +599,85 @@ msgid ""
 "Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
 "you may now inspect some in order to take actions:"
 msgstr ""
-"��װ��ɣ�%s��\n"
+"安装完成；%s。\n"
 "\n"
-"һЩ�����ļ�������Ϊ��.rpmnew����.rpmsave����\n"
-"��ִ�в�����ǰ������Ҫ���һ�£�"
+"一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
+"在执行操作以前，您需要检查一下："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Browse..."
-msgstr "���..."
+msgstr "浏览..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Some packages can't be removed"
-msgstr "��Щ�������޷�ɾ��"
+msgstr "有些软件包无法删除"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Info..."
-msgstr "��Ϣ..."
+msgstr "信息..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
-msgstr "�����������ʲ��ܼ���"
+msgstr "您必须插入介质才能继续"
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Copying file for media `%s'..."
-msgstr "���ڸ���Դ��%s�����ļ�..."
+msgstr "正在复制介质“%s”的文件..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Remove"
-msgstr "�"
+msgstr "卸载"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "Preparing packages installation..."
-msgstr "��������װ"
+msgstr "准备安装软件包"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid "by media repository"
-msgstr "������Դ������"
+msgstr "按照来源库排列"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No mirror"
-msgstr "û�о���"
+msgstr "没有镜像"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to fill up at least the two first entries."
-msgstr "������Ҫ��дͷ���"
+msgstr "您至少要填写头两项。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Install"
-msgstr "��װ"
+msgstr "安装"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
-msgstr "�ձ�"
+msgstr "日本"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Do nothing"
-msgstr "�������"
+msgstr "不做任何事"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No update"
-msgstr "û�и���"
+msgstr "没有更新"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Description: "
-msgstr "������"
+msgstr "描述："
 
 #: ../rpmdrake:1
 #, c-format
@@ -689,125 +689,125 @@ msgid ""
 "\n"
 "Do you really want to install all the selected packages?"
 msgstr ""
-"���棺����ͼ���ӵ�������̫�࣬�п����ڰ�װ�Ĺ����е���ʣ���\n"
-"�̿ռ���������Ǻ�Σ�յģ���Ӧ��С�IJ�����\n"
+"警告：您试图添加的软件包太多，有可能在安装的过程中导致剩余磁\n"
+"盘空间告罄；这是很危险的，您应当小心操作。\n"
 "\n"
-"�������Ҫ��װ����ѡ�е���������"
+"您真的想要安装所有选中的软件包吗？"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Name: "
-msgstr "���ƣ�"
+msgstr "名称："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
-msgstr "���..."
+msgstr "检查..."
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Editing media \"%s\":"
-msgstr "�༭��Դ��%s����"
+msgstr "编辑来源“%s”："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "No package found for installation."
-msgstr "û�пɰ�װ����������"
+msgstr "没有可供安装的软件包。"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
-msgstr "�Ĵ�����"
+msgstr "澳大利亚"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Installation finished"
-msgstr "��װ���"
+msgstr "安装完成"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "by update availability"
-msgstr "�����Ƿ��������"
+msgstr "按照是否可用排列"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Poland"
-msgstr "����"
+msgstr "波兰"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Version: "
-msgstr "�汾��"
+msgstr "版本："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You may specify a user/password for the proxy authentication:"
-msgstr "�ڵ�¼����������ʱ��������Ҫָ���û��������룺"
+msgstr "在登录代理服务器时，您可能要指定用户名和密码："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Upgradable"
-msgstr "������"
+msgstr "可升级"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid " done."
-msgstr " ��ɡ�"
+msgstr " 完成。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Software Packages Installation"
-msgstr "��������װ"
+msgstr "软件包安装"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Additional packages needed"
-msgstr "��Ҫ�����������"
+msgstr "需要另外的软件包"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Bugfixes updates"
-msgstr "ȱ����������"
+msgstr "缺陷修正更新"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Download of `%s', time to go:%s, speed:%s"
-msgstr "���ء�%s����ʣ��ʱ�䣺%s���ٶȣ�%s"
+msgstr "下载“%s”，剩余时间：%s，速度：%s"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Germany"
-msgstr "�¹�"
+msgstr "德国"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Russia"
-msgstr "����˹"
+msgstr "俄罗斯"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Norway"
-msgstr "Ų��"
+msgstr "挪威"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Problem during installation"
-msgstr "�ڰ�װ�����з�������"
+msgstr "在安装过程中发生问题"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Search"
-msgstr "����"
+msgstr "搜索"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Edit a media"
-msgstr "�༭��Դ"
+msgstr "编辑来源"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Czech Republic"
-msgstr "�ݿ˹��͹�"
+msgstr "捷克共和国"
 
 #: ../rpmdrake:1
 #, c-format
@@ -819,101 +819,106 @@ msgid ""
 "\n"
 "Then, restart MandrakeUpdate."
 msgstr ""
+"你已经至少配置了一个升级来源，但是它们现在全部都\n"
+"不可用。你需要运行“软件源管理器”来启用其中的至\n"
+"少一项（检查它是否在“启用”那一栏中）。\n"
+"\n"
+"然后，重新启动“Mandrake 自动升级”。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Stop"
-msgstr "ֹͣ"
+msgstr "停止"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
-msgstr "����"
+msgstr "更新"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, removing packages..."
-msgstr "����ɾ�������������Ժ�..."
+msgstr "正在删除软件包，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Normal information"
-msgstr "������Ϣ"
+msgstr "正常信息"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Media: "
-msgstr ""
+msgstr "来源："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Downloading package `%s' (%s/%s)..."
-msgstr ""
+msgstr "正在下载软件包“%s”（%s/%s）..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "ѡ��������%d MB / ʣ����̿ռ䣺%d MB"
+msgstr "选中软件：%d MB / 剩余磁盘空间：%d MB"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media"
-msgstr ""
+msgstr "来源"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Spain"
-msgstr "������"
+msgstr "西班牙"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Normal updates"
-msgstr "��������"
+msgstr "正常更新"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "by selection state"
-msgstr "����ѡ��״̬����"
+msgstr "按照选择状态排列"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "���ڴ� MandrakeSoft ��վ���ؾ���վ��ĵ�ַ�����Ժ�"
+msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
-msgstr "��¼����"
+msgstr "登录名："
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Adding a media:"
-msgstr "����һ����Դ��"
+msgstr "添加一个来源："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Austria"
-msgstr "�µ���"
+msgstr "奥地利"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Fatal error"
-msgstr ""
+msgstr "致命错误"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Update..."
-msgstr "����..."
+msgstr "更新..."
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Starting download of `%s'..."
-msgstr "��ʼ���ء�%s��..."
+msgstr "开始下载“%s”..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "(none)"
-msgstr "���ޣ�"
+msgstr "（无）"
 
 #: ../rpmdrake:1
 #, c-format
@@ -921,113 +926,113 @@ msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"�Բ���ɾ����Щ�����������ܻٻ�����ϵͳ��\n"
+"对不起，删除这些软件包将可能毁坏您的系统：\n"
 "\n"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
-msgstr ""
+msgstr "正在安装软件包“%s”（%s/%s）..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Currently installed version: "
-msgstr "��ǰ��װ�İ汾��"
+msgstr "当前安装的版本："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Other"
-msgstr "����"
+msgstr "其他"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Reason for update: "
-msgstr "����ԭ��"
+msgstr "更新原因："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Please choose the desired mirror."
-msgstr "��ѡ��ϲ���ľ���վ�㡣"
+msgstr "请选择喜欢的镜像站点。"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
-msgstr "�༭"
+msgstr "编辑"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Please wait, finding available packages..."
-msgstr "����Ѱ�ҿ��õ������������Ժ�..."
+msgstr "正在寻找可用的软件包，请稍候..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
-msgstr "��� synthesis/hdlist ��·����"
+msgstr "相对 synthesis/hdlist 的路径："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Search results (none)"
-msgstr "����������ޣ�"
+msgstr "搜索结果（无）"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Danmark"
-msgstr "����"
+msgstr "丹麦"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "China"
-msgstr "�й�"
+msgstr "中国"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "United States"
-msgstr "����"
+msgstr "美国"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "changes:"
-msgstr "����:"
+msgstr "更改："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Some additional packages need to be removed"
-msgstr "����һЩ��������Ҫɾ��"
+msgstr "另外一些软件包需要删除"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "rpmdrake"
-msgstr "rpmdrake"
+msgstr "Drake RPM 管理器"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
-msgstr "��"
+msgstr "否"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid "Configure medias"
-msgstr "������Դ"
+msgstr "设置来源"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a media"
-msgstr "����һ����Դ"
+msgstr "添加一个来源"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Summary: "
-msgstr "ժҪ��"
+msgstr "摘要："
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
-msgstr "���ô�"
+msgstr "加拿大"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Greece"
-msgstr "ϣ��"
+msgstr "希腊"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1038,49 +1043,49 @@ msgid ""
 "The network, or MandrakeSoft website, are maybe unavailable.\n"
 "Please try again later."
 msgstr ""
-"���ؾ����б�ʱ��������\n"
+"下载镜像列表时发生错误：\n"
 "\n"
 "%s\n"
-"��������� MandrakeSoft ��վ���ܲ����á�\n"
-"���Ժ����ԡ�"
+"您的网络或 MandrakeSoft 网站可能不可用。\n"
+"请稍后再试。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
-msgstr "�Բ����޷��õ�Դ��������%s"
+msgstr "对不起，无法得到源软件包。%s"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Path:"
-msgstr "·����"
+msgstr "路径："
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Problem during removal"
-msgstr "��ɾ�������з�������"
+msgstr "在删除过程中发生问题"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Selected"
-msgstr "ѡ��"
+msgstr "选中"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Netherlands"
-msgstr "����"
+msgstr "荷兰"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Addable"
-msgstr "������"
+msgstr "可添加"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "(Not available)"
-msgstr "�������ã�"
+msgstr "（不可用）"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -1090,23 +1095,28 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"�Բ��𣬲���ѡ��������������\n"
+"对不起，不能选择下列软件包：\n"
 "\n"
+"%s\n"
+"\n"
+"原因如下：\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Not selected"
-msgstr "δѡ��"
+msgstr "未选中"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Software Packages Removal"
-msgstr "������ɾ��"
+msgstr "软件包删除"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Sweden"
-msgstr "���"
+msgstr "瑞典"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1118,7 +1128,7 @@ msgid ""
 msgstr ""
 "\n"
 "\n"
-"����Ĵ���\n"
+"报告的错误：\n"
 "%s"
 
 #: ../rpmdrake:1
@@ -1128,28 +1138,28 @@ msgid ""
 "no available update for the packages installed on your computer,\n"
 "or you already installed all of them."
 msgstr ""
-"�����б�Ϊ�ա�����ζ�ſ���������װ��������û����Ӧ�ĸ��£�\n"
-"�������Ѿ���װ��ȫ�����¡�"
+"更新列表为空。这意味着可能您所安装的软件包没有相应的更新，\n"
+"或者您已经安装了全部更新。"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Examining file of media `%s'..."
-msgstr "���ڼ��Դ��%s�����ļ�..."
+msgstr "正在检查源“%s”的文件..."
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Download of `%s', speed:%s"
-msgstr "���ء�%s�����ٶȣ�%s"
+msgstr "下载“%s”，速度：%s"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "One of the following packages is needed:"
-msgstr "��Ҫ����������֮һ��"
+msgstr "需要下列软件包之一："
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Quit"
-msgstr "�˳�"
+msgstr "退出"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1159,38 +1169,38 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"����Ҫ���Ӿ�����ܻ�����µĸ�����������\n"
-"�������������Ƿ���ת������\n"
+"我需要连接镜像才能获得最新的更新软件包。\n"
+"请检查您的网络是否运转正常。\n"
 "\n"
-"ȷ��������"
+"确定继续吗？"
 
 #: ../rpmdrake:1 ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid "Update media(s)"
-msgstr "��������Դ"
+msgstr "更新来源"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
-msgstr "ȷ��"
+msgstr "确定"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, adding medium..."
-msgstr "�������ӽ��ʣ����Ժ�..."
+msgstr "正在添加来源，请稍候..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Unable to get source packages."
-msgstr "Դ������δ�ҵ���"
+msgstr "源软件包未找到。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Too many packages are selected"
-msgstr "ѡ�еİ�̫��"
+msgstr "选中的包太多"
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Welcome to the Software Medias Manager!\n"
 "\n"
@@ -1198,15 +1208,15 @@ msgid ""
 "your computer. They will then be available to install new software package\n"
 "or to perform updates."
 msgstr ""
-"��ӭʹ��������Դ�༭����\n"
+"欢迎使用“软件源管理器”！\n"
 "\n"
-"�����߽�������������Ҫ�����ĵ�������ʹ�õ���������Դ����Щ��Դ���ڰ�װ��\n"
-"��������ִ�и���ʱʹ�á�"
+"本工具将帮助您配置要在您的电脑上使用的软件包来源。这些来源将在安装新\n"
+"软件包或执行更新时使用。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "%s conflicts with %s"
-msgstr ""
+msgstr "%s 与 %s 相冲突"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1216,359 +1226,362 @@ msgid ""
 "This tool will help you choose the updates you want to install on your\n"
 "computer."
 msgstr ""
-"��ӭʹ�� MandrakeUpdate �Զ����¹��ߣ�\n"
+"欢迎使用“Mandrake 自动升级”！\n"
 "\n"
-"�����߽�������Ϊ���ĵ����а�װ���µ���������"
+"本工具将帮助您为您的电脑中安装更新的软件包。"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Mandrake choices"
-msgstr "Mandrake ��ѡ"
+msgstr "Mandrake 精选"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Changelog:\n"
-msgstr "������־��\n"
+msgstr "更新日志：\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Korea"
-msgstr "����"
+msgstr "韩国"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Removable device"
-msgstr "���ƶ��豸"
+msgstr "可移动设备"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
-msgstr "����ʱ"
+msgstr "比利时"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Change medium"
-msgstr "��������"
+msgstr "更换来源"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Mandrake Update"
-msgstr "Mandrake ����"
+msgstr "Mandrake 自动升级"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "by size"
-msgstr "���մ�С����"
+msgstr "按照大小排列"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "FTP server"
-msgstr "FTP ������"
+msgstr "FTP 服务器"
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Files:\n"
-msgstr "�ļ���\n"
+msgstr "文件：\n"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to update medium; it will be automatically disabled.\n"
 "\n"
 "Errors:\n"
 "%s"
-msgstr "�޷����½��ʣ��ý��ʽ����Զ�ͣ�á�"
+msgstr ""
+"无法更新来源；该来源将被自动停用。\n"
+"\n"
+"错误如下：\n"
+"%s"
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
-msgstr ""
+msgstr "下载目录不存在"
 
 #: ../grpmi/curl_download/curl_download.xs:89
 #: ../grpmi/curl_download/curl_download.xs:213
 msgid "Out of memory\n"
-msgstr ""
+msgstr "内存耗尽\n"
 
 #: ../grpmi/curl_download/curl_download.xs:102
 msgid "Could not open output file in append mode"
-msgstr ""
+msgstr "不能在搜索路径中打开输出文件"
 
 #: ../grpmi/curl_download/curl_download.xs:133
 msgid "Unsupported protocol\n"
-msgstr ""
+msgstr "不被支持的协议\n"
 
 #: ../grpmi/curl_download/curl_download.xs:136
 msgid "Failed init\n"
-msgstr ""
+msgstr "初始化失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:139
 msgid "Bad URL format\n"
-msgstr ""
+msgstr "错误的 URL 类型\n"
 
 #: ../grpmi/curl_download/curl_download.xs:142
 msgid "Bad user format in URL\n"
-msgstr ""
+msgstr "在 URL 中有错误的用户\n"
 
 #: ../grpmi/curl_download/curl_download.xs:145
 msgid "Couldn't resolve proxy\n"
-msgstr ""
+msgstr "无法使用代理服务器\n"
 
 #: ../grpmi/curl_download/curl_download.xs:148
 msgid "Couldn't resolve host\n"
-msgstr ""
+msgstr "无法使用主机\n"
 
 #: ../grpmi/curl_download/curl_download.xs:151
 msgid "Couldn't connect\n"
-msgstr ""
+msgstr "无法连接\n"
 
 #: ../grpmi/curl_download/curl_download.xs:154
 msgid "FTP unexpected server reply\n"
-msgstr ""
+msgstr "FTP 服务器出现异常回应\n"
 
 #: ../grpmi/curl_download/curl_download.xs:157
 msgid "FTP access denied\n"
-msgstr ""
+msgstr "FTP 连接被拒绝\n"
 
 #: ../grpmi/curl_download/curl_download.xs:160
 msgid "FTP user password incorrect\n"
-msgstr ""
+msgstr "FTP 用户名、密码错误\n"
 
 #: ../grpmi/curl_download/curl_download.xs:163
 msgid "FTP unexpected PASS reply\n"
-msgstr ""
+msgstr "FTP 的 PASS 回应异常\n"
 
 #: ../grpmi/curl_download/curl_download.xs:166
 msgid "FTP unexpected USER reply\n"
-msgstr ""
+msgstr "FTP 的 USER 回应异常\n"
 
 #: ../grpmi/curl_download/curl_download.xs:169
 msgid "FTP unexpected PASV reply\n"
-msgstr ""
+msgstr "FTP 的 PASV 回应异常\n"
 
 #: ../grpmi/curl_download/curl_download.xs:172
 msgid "FTP unexpected 227 format\n"
-msgstr ""
+msgstr "FTP 的 227 格式异常\n"
 
 #: ../grpmi/curl_download/curl_download.xs:175
 msgid "FTP can't get host\n"
-msgstr ""
+msgstr "FTP 无法连接到主机\n"
 
 #: ../grpmi/curl_download/curl_download.xs:178
 msgid "FTP can't reconnect\n"
-msgstr ""
+msgstr "FTP 无法重新连接\n"
 
 #: ../grpmi/curl_download/curl_download.xs:181
 msgid "FTP couldn't set binary\n"
-msgstr ""
+msgstr "FTP 无法设成二进制模式\n"
 
 #: ../grpmi/curl_download/curl_download.xs:184
 msgid "Partial file\n"
-msgstr ""
+msgstr "部分文件\n"
 
 #: ../grpmi/curl_download/curl_download.xs:187
 msgid "FTP couldn't RETR file\n"
-msgstr ""
+msgstr "FTP 无法 RETR 文件\n"
 
 #: ../grpmi/curl_download/curl_download.xs:190
 msgid "FTP write error\n"
-msgstr ""
+msgstr "FTP 写入错误\n"
 
 #: ../grpmi/curl_download/curl_download.xs:195
 msgid "FTP quote error\n"
-msgstr ""
+msgstr "FTP 引用错误\n"
 
 #: ../grpmi/curl_download/curl_download.xs:198
 msgid "HTTP not found\n"
-msgstr ""
+msgstr "HTTP 无法找到\n"
 
 #: ../grpmi/curl_download/curl_download.xs:201
 msgid "Write error\n"
-msgstr ""
+msgstr "写入错误\n"
 
 #: ../grpmi/curl_download/curl_download.xs:204
 msgid "User name illegally specified\n"
-msgstr ""
+msgstr "用户名列入非法清单\n"
 
 #: ../grpmi/curl_download/curl_download.xs:207
 msgid "FTP couldn't STOR file\n"
-msgstr ""
+msgstr "FTP 无法 STOR 文件\n"
 
 #: ../grpmi/curl_download/curl_download.xs:210
 msgid "Read error\n"
-msgstr ""
+msgstr "读时出错\n"
 
 #: ../grpmi/curl_download/curl_download.xs:216
 msgid "Time out\n"
-msgstr ""
+msgstr "超时\n"
 
 #: ../grpmi/curl_download/curl_download.xs:219
 msgid "FTP couldn't set ASCII\n"
-msgstr ""
+msgstr "FTP 无法设成 ASCII 模式\n"
 
 #: ../grpmi/curl_download/curl_download.xs:222
 msgid "FTP PORT failed\n"
-msgstr ""
+msgstr "FTP PORT 失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:225
 msgid "FTP couldn't use REST\n"
-msgstr ""
+msgstr "FTP 无法使用 REST\n"
 
 #: ../grpmi/curl_download/curl_download.xs:228
 msgid "FTP couldn't get size\n"
-msgstr ""
+msgstr "FTP 无法获得大小\n"
 
 #: ../grpmi/curl_download/curl_download.xs:231
 msgid "HTTP range error\n"
-msgstr ""
+msgstr "HTTP 范围出错\n"
 
 #: ../grpmi/curl_download/curl_download.xs:234
 msgid "HTTP POST error\n"
-msgstr ""
+msgstr "HTTP POST 出错\n"
 
 #: ../grpmi/curl_download/curl_download.xs:237
 msgid "SSL connect error\n"
-msgstr ""
+msgstr "SSL 连接出错\n"
 
 #: ../grpmi/curl_download/curl_download.xs:240
 msgid "FTP bad download resume\n"
-msgstr ""
+msgstr "FTP 错误的下载续传\n"
 
 #: ../grpmi/curl_download/curl_download.xs:243
 msgid "File couldn't read file\n"
-msgstr ""
+msgstr "文件无法读取文件\n"
 
 #: ../grpmi/curl_download/curl_download.xs:246
 msgid "LDAP cannot bind\n"
-msgstr ""
+msgstr "LDAP 无法绑定\n"
 
 #: ../grpmi/curl_download/curl_download.xs:249
 msgid "LDAP search failed\n"
-msgstr ""
+msgstr "LDAP 搜索失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:252
 msgid "Library not found\n"
-msgstr ""
+msgstr "无法找到库\n"
 
 #: ../grpmi/curl_download/curl_download.xs:255
 msgid "Function not found\n"
-msgstr ""
+msgstr "无法找到函数\n"
 
 #: ../grpmi/curl_download/curl_download.xs:258
 msgid "Aborted by callback\n"
-msgstr ""
+msgstr "收回失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:261
 msgid "Bad function argument\n"
-msgstr ""
+msgstr "错误的函数变量\n"
 
 #: ../grpmi/curl_download/curl_download.xs:264
 msgid "Bad calling order\n"
-msgstr ""
+msgstr "错误的呼叫命令\n"
 
 #: ../grpmi/curl_download/curl_download.xs:267
-#, fuzzy
 msgid "HTTP Interface operation failed\n"
-msgstr "��װʧ��"
+msgstr "HTTP 界面操作失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:270
 msgid "my_getpass() returns fail\n"
-msgstr ""
+msgstr "my_getpass() 返回了失败消息\n"
 
 #: ../grpmi/curl_download/curl_download.xs:273
 msgid "catch endless re-direct loops\n"
-msgstr ""
+msgstr "得到了无休止的重复指挥\n"
 
 #: ../grpmi/curl_download/curl_download.xs:276
 msgid "User specified an unknown option\n"
-msgstr ""
+msgstr "用户指定了未知的选项\n"
 
 #: ../grpmi/curl_download/curl_download.xs:279
 msgid "Malformed telnet option\n"
-msgstr ""
+msgstr "畸形的 Telnet 选项\n"
 
 #: ../grpmi/curl_download/curl_download.xs:282
 msgid "removed after 7.7.3\n"
-msgstr ""
+msgstr "删除 7.7.3 之后的\n"
 
 #: ../grpmi/curl_download/curl_download.xs:285
 msgid "peer's certificate wasn't ok\n"
-msgstr ""
+msgstr "对等认证未成功\n"
 
 #: ../grpmi/curl_download/curl_download.xs:288
 msgid "when this is a specific error\n"
-msgstr ""
+msgstr "当这儿有特殊的错误时\n"
 
 #: ../grpmi/curl_download/curl_download.xs:291
 msgid "SSL crypto engine not found\n"
-msgstr ""
+msgstr "SSL 加密引擎没有找到\n"
 
 #: ../grpmi/curl_download/curl_download.xs:294
 msgid "can not set SSL crypto engine as default\n"
-msgstr ""
+msgstr "无法把 SSL 加密引擎设为默认\n"
 
 #: ../grpmi/curl_download/curl_download.xs:297
 msgid "failed sending network data\n"
-msgstr ""
+msgstr "发送网络数据时失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:300
 msgid "failure in receiving network data\n"
-msgstr ""
+msgstr "接收网络数据时失败\n"
 
 #: ../grpmi/curl_download/curl_download.xs:303
 msgid "share is in use\n"
-msgstr ""
+msgstr "共享已经被使用了\n"
 
 #: ../grpmi/curl_download/curl_download.xs:306
 msgid "problem with the local certificate\n"
-msgstr ""
+msgstr "本地认证时出现问题\n"
 
 #: ../grpmi/curl_download/curl_download.xs:309
 msgid "couldn't use specified cipher\n"
-msgstr ""
+msgstr "无法使用特殊的密码\n"
 
 #: ../grpmi/curl_download/curl_download.xs:312
 msgid "problem with the CA cert (path?)\n"
-msgstr ""
+msgstr "CA 事件使用时出现问题（路径？）\n"
 
 #: ../grpmi/curl_download/curl_download.xs:315
 msgid "Unrecognized transfer encoding\n"
-msgstr ""
+msgstr "无法识别的传输代码\n"
 
 #: ../grpmi/curl_download/curl_download.xs:320
 #, c-format
 msgid "Unknown error code %d\n"
-msgstr ""
+msgstr "未知的错误代码 %d\n"
 
 #: data/rpmdrake.desktop.in.h:1
 msgid "Install Software"
-msgstr "��װ����"
+msgstr "安装软件"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
-msgstr "ɾ������"
+msgstr "删除软件"
 
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
-msgstr "����Դ������"
+msgstr "软件源管理器"
 
 #~ msgid "Source: "
-#~ msgstr "��Դ��"
+#~ msgstr "来源："
 
 #~ msgid "Source"
-#~ msgstr "��Դ"
+#~ msgstr "来源"
 
 #~ msgid ""
 #~ "some packages failed to install\n"
 #~ "correctly"
-#~ msgstr "��Щ�������޷���ȷ��װ"
+#~ msgstr "有些软件包无法正确安装"
 
 #~ msgid "Please wait, removing packages to allow others to be upgraded..."
-#~ msgstr "Ϊ������������������ɾ���ɵ������������Ժ�..."
+#~ msgstr "为了升级软件包，正在删除旧的软件包，请稍候..."
 
 #~ msgid "A required program is missing (grpmi). Check your installation."
-#~ msgstr "ȱ��һ����Ҫ�ij���(grpmi)���������İ�װ��"
+#~ msgstr "缺少一个需要的程序(grpmi)。请检查您的安装。"
 
 #~ msgid "Program missing"
-#~ msgstr "ȱ�ٳ���"
+#~ msgstr "缺少程序"
 
 #~ msgid ""
 #~ "There was an error while adding the update medium via urpmi.\n"
@@ -1581,22 +1594,22 @@ msgstr "����Դ������"
 #~ "\n"
 #~ "Do you want to try another mirror?"
 #~ msgstr ""
-#~ "ͨ�� urpmi ���Ӹ��½���ʱ��������\n"
+#~ "通过 urpmi 添加更新介质时发生错误。\n"
 #~ "\n"
-#~ "����������ڽ������𻵻�����ʱ�����ã���Ȼ�������� Mandrake Linux �汾\n"
-#~ "(%s)��Ϊ Mandrake Linux �ٷ�������֧�֡�\n"
+#~ "这可能是由于介质已损坏或者临时不可用，不然就是您的 Mandrake Linux 版本\n"
+#~ "(%s)不为 Mandrake Linux 官方升级所支持。\n"
 #~ "\n"
-#~ "���Ƿ���Ҫ��������ľ���"
+#~ "您是否想要尝试另外的镜像？"
 
 #~ msgid "Please wait, contacting mirror to initialize updates packages."
-#~ msgstr "�������Ӿ����Ա��ʼ�����������������Ժ�"
+#~ msgstr "正在连接镜像以便初始化更新软件包，请稍候。"
 
 #~ msgid ""
 #~ "There was an unrecoverable error while updating packages information."
-#~ msgstr "������������Ϣʱ�������ɻָ��Ĵ���"
+#~ msgstr "更新软件包信息时发生不可恢复的错误。"
 
 #~ msgid "Error updating medium"
-#~ msgstr "���½��ʳ���"
+#~ msgstr "更新介质出错"
 
 #~ msgid "Please wait, contacting mirror to update packages information."
-#~ msgstr "�������Ӿ���������Եõ����µ���������Ϣ�����Ժ�"
+#~ msgstr "正在连接镜像服务器以得到更新的软件包信息，请稍候。"