1 files changed, 934 insertions, 648 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cef3f059..47b312f9 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: 2003-01-30 11:22+0100\n"
+"POT-Creation-Date: 2002-12-05 19:52+0100\n"
 "PO-Revision-Date: 2003-02-10 19:49+0800\n"
 "Last-Translator: Shiyu Tang <shiyutang@netscape.net>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -15,867 +15,1157 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:43
-msgid "Unable to create medium."
-msgstr "无法创建介质。"
-
-#: ../edit-urpm-sources.pl_.c:44
-msgid "Unable to update medium; it will be automatically disabled."
-msgstr "无法更新介质；该介质将被自动停用。"
-
-#: ../edit-urpm-sources.pl_.c:54
-msgid "Add a source"
-msgstr "添加一个来源"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Local files"
-msgstr "本机文件"
-
-#: ../edit-urpm-sources.pl_.c:55
-msgid "Path:"
-msgstr "路径："
-
-#: ../edit-urpm-sources.pl_.c:56
-msgid "FTP server"
-msgstr "FTP 服务器"
-
-#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:57
-#: ../edit-urpm-sources.pl_.c:59 ../edit-urpm-sources.pl_.c:187
-msgid "URL:"
-msgstr "URL："
-
-#: ../edit-urpm-sources.pl_.c:57
-msgid "HTTP server"
-msgstr "HTTP 服务器"
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Path or mount point:"
-msgstr "路径或装载点："
-
-#: ../edit-urpm-sources.pl_.c:58
-msgid "Removable device"
-msgstr "可移动设备"
-
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:550
-msgid "Security updates"
-msgstr "安全更新"
-
-#: ../edit-urpm-sources.pl_.c:70
-msgid "Browse..."
-msgstr "浏览..."
-
-#: ../edit-urpm-sources.pl_.c:72
-msgid "Choose a mirror..."
-msgstr "选择镜像..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:92
-msgid "Login:"
-msgstr "登录名："
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software installation tool!\n"
+"\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
+msgstr ""
+"欢迎使用软件包安装工具！\n"
+"\n"
+"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
+"这个工具帮助您选择要为您的电脑安装的软件包。"
 
-#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:231
-msgid "Password:"
-msgstr "口令："
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to MandrakeUpdate!\n"
+"\n"
+"This tool will help you choose the updates you want to install on your\n"
+"computer."
+msgstr ""
+"欢迎使用 MandrakeUpdate 自动更新工具！\n"
+"\n"
+"这个工具帮助您为您的电脑中安装\n"
+"更新的软件包。"
 
-#: ../edit-urpm-sources.pl_.c:97
-msgid "Name:"
-msgstr "名称："
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"欢迎使用软件包删除工具！\n"
+"\n"
+"这个工具帮助您选择想要从您的电脑中删除\n"
+"的软件包。"
 
-#: ../edit-urpm-sources.pl_.c:99 ../edit-urpm-sources.pl_.c:188
-msgid "Relative path to synthesis/hdlist:"
-msgstr "相对 synthesis/hdlist 的路径："
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the removal of packages:\n"
+"\n"
+"%s"
+msgstr ""
+"删除包过程中发生一个问题：\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:107
-msgid "You need to fill up at least the two first entries."
-msgstr "您至少要填写头两项。"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during removal"
+msgstr "在删除过程中发生问题"
 
-#: ../edit-urpm-sources.pl_.c:120
-msgid "Adding a source:"
-msgstr "添加一个来源："
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages..."
+msgstr "正在删除软件包，请稍候..."
 
-#: ../edit-urpm-sources.pl_.c:121
-msgid "Type of source:"
-msgstr "来源类型："
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, reading packages database..."
+msgstr "正在读取软件包数据库，请稍候..."
 
-#: ../edit-urpm-sources.pl_.c:125 ../edit-urpm-sources.pl_.c:202
-#: ../edit-urpm-sources.pl_.c:235 ../rpmdrake.pm_.c:100 ../rpmdrake.pm_.c:139
-#: ../rpmdrake.pm_.c:322 ../rpmdrake_.c:355 ../rpmdrake_.c:367
-#: ../rpmdrake_.c:371 ../rpmdrake_.c:918 ../rpmdrake_.c:952
-msgid "Ok"
-msgstr "确定"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr ""
+"安装过程中有一个问题：\n"
+"\n"
+"%s"
 
-#: ../edit-urpm-sources.pl_.c:140 ../edit-urpm-sources.pl_.c:196
-#: ../edit-urpm-sources.pl_.c:202 ../edit-urpm-sources.pl_.c:242
-#: ../rpmdrake.pm_.c:322 ../rpmdrake.pm_.c:355 ../rpmdrake_.c:355
-#: ../rpmdrake_.c:952
-msgid "Cancel"
-msgstr "取消"
+#: ../rpmdrake:1
+#, c-format
+msgid "Problem during installation"
+msgstr "在安装过程中发生问题"
 
-#: ../edit-urpm-sources.pl_.c:147
-msgid "Please wait, adding medium..."
-msgstr "正在添加介质，请稍候..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed (is this supposed to happen at all?)."
+msgstr "所有软件包已经安装了（这是您希望的吗？）。"
 
-#: ../edit-urpm-sources.pl_.c:168
-msgid "Please wait, removing medium..."
-msgstr "正在删除介质，请稍候..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything already installed."
+msgstr "所有软件包已经安装了。"
 
-#: ../edit-urpm-sources.pl_.c:181
-msgid "Edit a source"
-msgstr "编辑来源"
+#: ../rpmdrake:1
+#, c-format
+msgid "All requested packages were installed successfully."
+msgstr "所有要求的软件包都已成功安装。"
 
-#: ../edit-urpm-sources.pl_.c:185
+#: ../rpmdrake:1
 #, c-format
-msgid "Editing source \"%s\":"
-msgstr "编辑来源“%s”："
+msgid "Everything installed successfully"
+msgstr "所有软件包都已成功安装"
 
-#: ../edit-urpm-sources.pl_.c:191
-msgid "Save changes"
-msgstr "保存修改"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The installation is finished; %s.\n"
+"\n"
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
+msgstr ""
+"安装完成；%s。\n"
+"\n"
+"一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
+"在执行动作以前，您需要检查一下："
 
-#: ../edit-urpm-sources.pl_.c:200
-msgid "You need to insert the medium to continue"
-msgstr "您必须插入介质才能继续"
+#: ../rpmdrake:1
+#, c-format
+msgid "everything was installed correctly"
+msgstr "所有软件包都已正确安装"
 
-#: ../edit-urpm-sources.pl_.c:201
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "要保存改变，您必须在驱动器中插入介质。"
-
-#: ../edit-urpm-sources.pl_.c:206
-msgid "Please wait, updating medium..."
-msgstr "正在更新介质，请稍候..."
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"有些软件包出现安装\n"
+"失败"
 
-#: ../edit-urpm-sources.pl_.c:217
-msgid "Configure proxies"
-msgstr "配置代理服务器"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, removing packages to allow others to be upgraded..."
+msgstr "为了升级软件包，正在删除旧的软件包，请稍候..."
 
-#: ../edit-urpm-sources.pl_.c:223
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+"Installation failed, some files are missing.\n"
+"You may want to update your sources database."
 msgstr ""
-"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）："
+"安装失败，缺少某些文件。\n"
+"您可能需要更新您的来源数据库。"
 
-#: ../edit-urpm-sources.pl_.c:225
-msgid "Proxy hostname:"
-msgstr "代理服务器主机名："
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation failed"
+msgstr "安装失败"
 
-#: ../edit-urpm-sources.pl_.c:227
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "在登录代理服务器时，您可能要指定用户名和密码："
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Cancel"
+msgstr "取消"
 
-#: ../edit-urpm-sources.pl_.c:229
-msgid "User:"
-msgstr "用户名："
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Ok"
+msgstr "确定"
 
-#: ../edit-urpm-sources.pl_.c:255
-msgid "Configure sources"
-msgstr "配置来源"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
-#: ../edit-urpm-sources.pl_.c:262
-msgid "Enabled?"
-msgstr "启用吗？"
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "更换介质"
 
-#: ../edit-urpm-sources.pl_.c:263
-msgid "Source"
-msgstr "来源"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages, sorry."
+msgstr "对不起，无法得到源软件包。"
 
-#: ../edit-urpm-sources.pl_.c:286 ../rpmdrake_.c:732
-msgid "Remove"
-msgstr "卸载"
+#: ../rpmdrake:1
+#, c-format
+msgid "Unable to get source packages."
+msgstr "源软件包未找到。"
 
-#: ../edit-urpm-sources.pl_.c:288
-msgid "Edit"
-msgstr "编辑"
+#: ../rpmdrake:1
+#, c-format
+msgid "A required program is missing (grpmi). Check your installation."
+msgstr "缺少一个需要的程序（grpmi）。请检查您的安装。"
 
-#: ../edit-urpm-sources.pl_.c:290
-msgid "Add..."
-msgstr "添加..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Program missing"
+msgstr "缺少程序"
 
-#: ../edit-urpm-sources.pl_.c:292
-msgid "Update..."
-msgstr "更新..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspect..."
+msgstr "检查..."
 
-#: ../edit-urpm-sources.pl_.c:293
-msgid "Proxy..."
-msgstr "代理服务器..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Installation finished"
+msgstr "安装完成"
 
-#: ../edit-urpm-sources.pl_.c:296
-msgid "Save and quit"
-msgstr "保存并退出"
+#: ../rpmdrake:1
+#, c-format
+msgid "Do nothing"
+msgstr "不做任何事"
 
-#: ../edit-urpm-sources.pl_.c:297 ../rpmdrake_.c:735
-msgid "Quit"
-msgstr "退出"
+#: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake.pm_.c:96
-msgid "Yes"
-msgstr "是"
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "删除 .%s"
 
-#: ../rpmdrake.pm_.c:98
-msgid "No"
-msgstr "否"
+#: ../rpmdrake:1
+#, c-format
+msgid "changes:"
+msgstr "更改："
 
-#: ../rpmdrake.pm_.c:130
-msgid "Info..."
-msgstr "信息..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "正在检查 %s"
 
-#: ../rpmdrake.pm_.c:183
-msgid "Austria"
-msgstr "奥地利"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, finding available packages..."
+msgstr "正在寻找可用的软件包，请稍候..."
 
-#: ../rpmdrake.pm_.c:184
-msgid "Australia"
-msgstr "澳大利亚"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:185
-msgid "Belgium"
-msgstr "比利时"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error adding update medium"
+msgstr "添加更新介质出错"
 
-#: ../rpmdrake.pm_.c:186
-msgid "Brazil"
-msgstr "巴西"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to initialize updates packages."
+msgstr "正在联系服务器来初始化更新软件包，请稍候。"
 
-#: ../rpmdrake.pm_.c:187
-msgid "Canada"
-msgstr "加拿大"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:188
-msgid "Costa Rica"
-msgstr "哥斯达黎加"
+#: ../rpmdrake:1
+#, c-format
+msgid "How to choose manually your mirror"
+msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake.pm_.c:189
-msgid "Czech Republic"
-msgstr "捷克"
+#: ../rpmdrake:1
+#, c-format
+msgid "There was an unrecoverable error while updating packages information."
+msgstr "更新软件包信息时发生不可恢复的错误。"
 
-#: ../rpmdrake.pm_.c:190
-msgid "Germany"
-msgstr "德国"
+#: ../rpmdrake:1
+#, c-format
+msgid "Error updating medium"
+msgstr "更新介质出错"
 
-#: ../rpmdrake.pm_.c:191
-msgid "Danmark"
-msgstr "丹麦"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, contacting mirror to update packages information."
+msgstr "正在连接镜像服务器以得到最新的更新软件包，请稍候。"
 
-#: ../rpmdrake.pm_.c:192 ../rpmdrake.pm_.c:196
-msgid "Greece"
-msgstr "希腊"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:193
-msgid "Spain"
-msgstr "西班牙"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Installation"
+msgstr "软件包安装"
 
-#: ../rpmdrake.pm_.c:194
-msgid "Finland"
-msgstr "芬兰"
+#: ../rpmdrake:1 data/mandrakeupdate.desktop.in.h:1
+#, c-format
+msgid "Mandrake Update"
+msgstr "Mandrake 更新"
 
-#: ../rpmdrake.pm_.c:195
-msgid "France"
-msgstr "法国"
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "软件包删除"
 
-#: ../rpmdrake.pm_.c:197
-msgid "Israel"
-msgstr "以色列"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Quit"
+msgstr "退出"
 
-#: ../rpmdrake.pm_.c:198
-msgid "Italy"
-msgstr "意大利"
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "安装"
 
-#: ../rpmdrake.pm_.c:199
-msgid "Japan"
-msgstr "日本"
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "卸载"
 
-#: ../rpmdrake.pm_.c:200
-msgid "Korea"
-msgstr "韩国"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "搜索"
 
-#: ../rpmdrake.pm_.c:201
-msgid "Netherlands"
-msgstr "荷兰"
+#: ../rpmdrake:1
+#, c-format
+msgid "Find:"
+msgstr "查找："
 
-#: ../rpmdrake.pm_.c:202
-msgid "Norway"
-msgstr "挪威"
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"\n"
+"%s\n"
+"\n"
+"Is it ok to continue?"
+msgstr ""
 
-#: ../rpmdrake.pm_.c:203
-msgid "Poland"
-msgstr "波兰"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages need to be removed"
+msgstr "需要删除一些软件包"
 
-#: ../rpmdrake.pm_.c:204
-msgid "Portugal"
-msgstr "葡萄牙"
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake.pm_.c:205
-msgid "Russia"
-msgstr "俄罗斯"
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "选中的包太多"
 
-#: ../rpmdrake.pm_.c:206
-msgid "Sweden"
-msgstr "瑞典"
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "最多信息"
 
-#: ../rpmdrake.pm_.c:207
-msgid "Taiwan"
-msgstr "中国台湾"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal information"
+msgstr "正常信息"
 
-#: ../rpmdrake.pm_.c:208
-msgid "United Kingdom"
-msgstr "英国"
+#: ../rpmdrake:1 ../rpmdrake.pm:1
+#, c-format
+msgid "Update source(s)"
+msgstr "更新源"
 
-#: ../rpmdrake.pm_.c:209
-msgid "China"
-msgstr "中国"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "重新装入软件包清单"
 
-#: ../rpmdrake.pm_.c:210 ../rpmdrake.pm_.c:211 ../rpmdrake.pm_.c:212
-#: ../rpmdrake.pm_.c:213 ../rpmdrake.pm_.c:264
-msgid "United States"
-msgstr "美国"
+#: ../rpmdrake:1
+#, c-format
+msgid "Reset the selection"
+msgstr "重置选中"
 
-#: ../rpmdrake.pm_.c:277
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "在文件中"
 
-#: ../rpmdrake.pm_.c:283
-msgid "Error during download"
-msgstr "下载出错"
+#: ../rpmdrake:1
+#, c-format
+msgid "in descriptions"
+msgstr "在描述中"
 
-#: ../rpmdrake.pm_.c:292
-msgid "No mirror"
-msgstr "没有镜像"
+#: ../rpmdrake:1
+#, c-format
+msgid "in names"
+msgstr "在名称中"
 
-#: ../rpmdrake.pm_.c:310
-msgid "Please choose the desired mirror."
-msgstr "请选择喜欢的镜像站点。"
+#: ../rpmdrake:1
+#, c-format
+msgid "by update availability"
+msgstr "按照是否可更新"
 
-#: ../rpmdrake.pm_.c:342 ../rpmdrake_.c:629
-msgid "Update source(s)"
-msgstr "更新源"
+#: ../rpmdrake:1
+#, c-format
+msgid "by source repository"
+msgstr "按照来源库"
 
-#: ../rpmdrake.pm_.c:346
-msgid "Select the source(s) you wish to update:"
-msgstr "选择要更新的源介质:"
+#: ../rpmdrake:1
+#, c-format
+msgid "by selection state"
+msgstr "按照选择状态"
 
-#: ../rpmdrake.pm_.c:350
-msgid "Update"
-msgstr "更新"
+#: ../rpmdrake:1
+#, c-format
+msgid "by size"
+msgstr "按照大小"
 
-#: ../rpmdrake.pm_.c:360
-msgid "Please wait, updating media..."
-msgstr "正在更新介质，请稍候..."
+#: ../rpmdrake:1
+#, c-format
+msgid "by group"
+msgstr "按照组别"
 
-#: ../rpmdrake_.c:101
-msgid "Other"
-msgstr "其他"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages,"
+msgstr "全部软件包，"
 
-#: ../rpmdrake_.c:123 ../rpmdrake_.c:137 ../rpmdrake_.c:229 ../rpmdrake_.c:300
-msgid "(none)"
-msgstr "（无）"
+#: ../rpmdrake:1
+#, c-format
+msgid "All packages, alphabetical"
+msgstr "全部软件包，按字母次序"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:484 ../rpmdrake_.c:485
-msgid "(Not available)"
-msgstr "（不可用）"
+#: ../rpmdrake:1
+#, c-format
+msgid "Mandrake choices"
+msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:210
-msgid "Search results"
-msgstr "搜索结果"
+#: ../rpmdrake:1
+#, c-format
+msgid "Normal updates"
+msgstr "正常更新"
 
-#: ../rpmdrake_.c:153
-msgid "Search results (none)"
-msgstr "搜索结果（无）"
+#: ../rpmdrake:1
+#, c-format
+msgid "Bugfixes updates"
+msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:163 ../rpmdrake_.c:174
-msgid "Please wait, searching..."
-msgstr "正在搜索，请稍候..."
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Security updates"
+msgstr "安全更新"
 
-#: ../rpmdrake_.c:177
-msgid "Stop"
-msgstr "停止"
+#: ../rpmdrake:1
+#, c-format
+msgid "Description: "
+msgstr "描述："
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Addable"
-msgstr "可添加"
+#: ../rpmdrake:1
+#, c-format
+msgid "Summary: "
+msgstr "摘要："
 
-#: ../rpmdrake_.c:211 ../rpmdrake_.c:321
-msgid "Upgradable"
-msgstr "可升级"
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "重要性："
 
-#: ../rpmdrake_.c:213
-msgid "Not selected"
-msgstr "未选中"
+#: ../rpmdrake:1
+#, c-format
+msgid "%s KB"
+msgstr "%s KB"
 
-#: ../rpmdrake_.c:213
-msgid "Selected"
-msgstr "选中"
+#: ../rpmdrake:1
+#, c-format
+msgid "Size: "
+msgstr "大小："
 
-#: ../rpmdrake_.c:242
-msgid "rpmdrake"
-msgstr "rpmdrake"
+#: ../rpmdrake:1
+#, c-format
+msgid "Version: "
+msgstr "版本："
 
-#: ../rpmdrake_.c:260 ../rpmdrake_.c:362 ../rpmdrake_.c:364
-msgid "More information on package..."
-msgstr "该软件包的更多信息..."
+#: ../rpmdrake:1
+#, c-format
+msgid "Name: "
+msgstr "名称："
 
-#: ../rpmdrake_.c:261
-msgid "One of the following packages is needed:"
-msgstr "需要下列软件之一："
+#: ../rpmdrake:1
+#, c-format
+msgid "Reason for update: "
+msgstr "更新原因："
 
-#: ../rpmdrake_.c:261
-msgid "Please choose"
-msgstr "请选择"
+#: ../rpmdrake:1
+#, c-format
+msgid "Currently installed version: "
+msgstr "当前安装的版本："
 
-#: ../rpmdrake_.c:277
-msgid "unknown package "
-msgstr "未知软件包"
+#: ../rpmdrake:1
+#, c-format
+msgid "Source: "
+msgstr "来源："
 
-#: ../rpmdrake_.c:287
-msgid "Please wait, listing packages..."
-msgstr "正在列出软件包，请稍候..."
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "（不可用）"
 
-#: ../rpmdrake_.c:302
-msgid "No update"
-msgstr "没有更新"
+#: ../rpmdrake:1
+#, c-format
+msgid "Changelog:\n"
+msgstr "更新日志：\n"
 
-#: ../rpmdrake_.c:355 ../rpmdrake_.c:356
-msgid "More infos"
-msgstr "更多信息"
+#: ../rpmdrake:1
+#, c-format
+msgid "Files:\n"
+msgstr "文件：\n"
 
-#: ../rpmdrake_.c:357
-msgid "Information on packages"
-msgstr "该软件包的信息"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected size: %d MB"
+msgstr "选中大小：%d MB"
 
-#: ../rpmdrake_.c:378
-msgid "Some additional packages need to be removed"
-msgstr "另外一些软件包需要删除"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected: %d MB / Free disk space: %d MB"
+msgstr "选中软件：%d MB / 剩余磁盘空间：%d MB"
 
-#: ../rpmdrake_.c:379
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
 msgstr ""
-"为了满足所有的依赖关系，\n"
-"需要删除下列软件包：\n"
+"由于软件包之间的依赖关系，您不可以选择\n"
+"下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:385 ../rpmdrake_.c:393
-msgid "Some packages can't be removed"
-msgstr "有些软件包无法删除"
-
-#: ../rpmdrake_.c:386
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Removing these packages would break your system, sorry:\n"
+"Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
-"对不起，删除这些软件包将可能毁坏您的系统：\n"
+"对不起，不能选择下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:394 ../rpmdrake_.c:453
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be installed"
+msgstr "有些软件包无法安装"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\n"
 "\n"
 msgstr ""
-"由于软件包之间的依赖关系，您不可以选择\n"
+"为满足依赖关系，还需要安装\n"
 "下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:423
+#: ../rpmdrake:1
+#, c-format
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake_.c:424
+#: ../rpmdrake:1
+#, c-format
+msgid "Some packages can't be removed"
+msgstr "有些软件包无法删除"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"为满足依赖关系，还需要安装\n"
-"下列软件包：\n"
+"对不起，删除这些软件包将可能毁坏您的系统：\n"
 "\n"
 
-#: ../rpmdrake_.c:437
-msgid "Some packages can't be installed"
-msgstr "有些软件包无法安装"
-
-#: ../rpmdrake_.c:438
+#: ../rpmdrake:1
+#, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
 msgstr ""
-"对不起，不能选择下列软件包：\n"
+"为了满足所有的依赖关系，\n"
+"需要删除下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:452 ../rpmdrake_.c:686
-msgid "Some packages need to be removed"
-msgstr "需要删除一些软件包"
+#: ../rpmdrake:1
+#, c-format
+msgid "Some additional packages need to be removed"
+msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake_.c:474
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "选中软件：%d MB / 剩余磁盘空间：%d MB"
+msgid "More information on package..."
+msgstr "该软件包的更多信息..."
 
-#: ../rpmdrake_.c:476
+#: ../rpmdrake:1
 #, c-format
-msgid "Selected size: %d MB"
-msgstr "选中大小：%d MB"
+msgid "Information on packages"
+msgstr "该软件包的信息"
 
-#: ../rpmdrake_.c:484
-msgid "Files:\n"
-msgstr "文件：\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "More infos"
+msgstr "更多信息"
 
-#: ../rpmdrake_.c:485
-msgid "Changelog:\n"
-msgstr "更新日志：\n"
+#: ../rpmdrake:1
+#, c-format
+msgid "Addable"
+msgstr "可添加"
 
-#: ../rpmdrake_.c:488
-msgid "Source: "
-msgstr "来源："
+#: ../rpmdrake:1
+#, c-format
+msgid "Upgradable"
+msgstr "可升级"
 
-#: ../rpmdrake_.c:489
-msgid "Currently installed version: "
-msgstr "当前安装的版本："
+#: ../rpmdrake:1
+#, c-format
+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 ""
 
-#: ../rpmdrake_.c:493
-msgid "Reason for update: "
-msgstr "更新原因："
+#: ../rpmdrake:1
+#, c-format
+msgid "No update"
+msgstr "没有更新"
 
-#: ../rpmdrake_.c:495
-msgid "Name: "
-msgstr "名称："
+#: ../rpmdrake:1
+#, c-format
+msgid "(none)"
+msgstr "（无）"
 
-#: ../rpmdrake_.c:496
-msgid "Version: "
-msgstr "版本："
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, listing packages..."
+msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake_.c:497
+#: ../rpmdrake:1
 #, c-format
-msgid "%s KB"
-msgstr "%s KB"
+msgid "unknown package "
+msgstr "未知软件包"
 
-#: ../rpmdrake_.c:497
-msgid "Size: "
-msgstr "大小："
+#: ../rpmdrake:1
+#, c-format
+msgid "One of the following packages is needed:"
+msgstr "需要下列软件之一："
 
-#: ../rpmdrake_.c:499
-msgid "Importance: "
-msgstr "重要性："
+#: ../rpmdrake:1
+#, c-format
+msgid "Please choose"
+msgstr "请选择"
 
-#: ../rpmdrake_.c:500
-msgid "Summary: "
-msgstr "摘要："
+#: ../rpmdrake:1
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:501
-msgid "Description: "
-msgstr "描述："
+#: ../rpmdrake:1
+#, c-format
+msgid "Not selected"
+msgstr "未选中"
 
-#: ../rpmdrake_.c:550
-msgid "Bugfixes updates"
-msgstr "缺陷修正更新"
+#: ../rpmdrake:1
+#, c-format
+msgid "Selected"
+msgstr "选中"
 
-#: ../rpmdrake_.c:550
-msgid "Normal updates"
-msgstr "正常更新"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results"
+msgstr "搜索结果"
 
-#: ../rpmdrake_.c:569
-msgid "Mandrake choices"
-msgstr "Mandrake 精选"
+#: ../rpmdrake:1
+#, c-format
+msgid "Stop"
+msgstr "停止"
 
-#: ../rpmdrake_.c:570
-msgid "All packages, alphabetical"
-msgstr "全部软件包，按字母次序"
+#: ../rpmdrake:1
+#, c-format
+msgid "Please wait, searching..."
+msgstr "正在搜索，请稍候..."
 
-#: ../rpmdrake_.c:571
-msgid "All packages,"
-msgstr "全部软件包，"
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "搜索结果（无）"
 
-#: ../rpmdrake_.c:594
-msgid "by group"
-msgstr "按照组别"
+#: ../rpmdrake:1
+#, c-format
+msgid "Other"
+msgstr "其他"
 
-#: ../rpmdrake_.c:594
-msgid "by size"
-msgstr "按照大小"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+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 ""
 
-#: ../rpmdrake_.c:595
-msgid "by selection state"
-msgstr "按照选择状态"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save and quit"
+msgstr "保存并退出"
 
-#: ../rpmdrake_.c:596
-msgid "by source repository"
-msgstr "按照来源库"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy..."
+msgstr "代理服务器..."
 
-#: ../rpmdrake_.c:596
-msgid "by update availability"
-msgstr "按照是否可更新"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Update..."
+msgstr "更新..."
 
-#: ../rpmdrake_.c:617
-msgid "in descriptions"
-msgstr "在描述中"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add..."
+msgstr "添加..."
 
-#: ../rpmdrake_.c:617
-msgid "in files"
-msgstr "在文件中"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit"
+msgstr "编辑"
 
-#: ../rpmdrake_.c:617
-msgid "in names"
-msgstr "在名称中"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Source"
+msgstr "来源"
 
-#: ../rpmdrake_.c:628
-msgid "Reload the packages list"
-msgstr "重新装入软件包清单"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "启用吗？"
 
-#: ../rpmdrake_.c:628
-msgid "Reset the selection"
-msgstr "重置选中"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure sources"
+msgstr "配置来源"
 
-#: ../rpmdrake_.c:654
-msgid "Maximum information"
-msgstr "最多信息"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Password:"
+msgstr "口令："
 
-#: ../rpmdrake_.c:654
-msgid "Normal information"
-msgstr "正常信息"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "User:"
+msgstr "用户名："
 
-#: ../rpmdrake_.c:676
-msgid "Too many packages are selected"
-msgstr "选中的包太多"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "在登录代理服务器时，您可能要指定用户名和密码："
 
-#: ../rpmdrake_.c:722
-msgid "Find:"
-msgstr "查找："
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Proxy hostname:"
+msgstr "代理服务器主机名："
 
-#: ../rpmdrake_.c:727
-msgid "Search"
-msgstr "搜索"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"如果您需要用代理服务器，请输入主机名和端口（语法：<proxyhost[:port]>）："
 
-#: ../rpmdrake_.c:733
-msgid "Install"
-msgstr "安装"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Configure proxies"
+msgstr "配置代理服务器"
 
-#: ../rpmdrake_.c:740 data/mandrakeupdate.desktop.in.h:1
-msgid "Mandrake Update"
-msgstr "Mandrake 更新"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, updating medium..."
+msgstr "正在更新介质，请稍候..."
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Installation"
-msgstr "软件包安装"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "要保存改变，您必须在驱动器中插入介质。"
 
-#: ../rpmdrake_.c:740
-msgid "Software Packages Removal"
-msgstr "软件包删除"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "You need to insert the medium to continue"
+msgstr "您必须插入介质才能继续"
 
-#: ../rpmdrake_.c:781
-msgid "Please wait, contacting mirror to update packages information."
-msgstr "正在连接镜像服务器以得到最新的更新软件包，请稍候。"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Save changes"
+msgstr "保存修改"
 
-#: ../rpmdrake_.c:783
-msgid "Error updating medium"
-msgstr "更新介质出错"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "相对 synthesis/hdlist 的路径："
 
-#: ../rpmdrake_.c:784
-msgid "There was an unrecoverable error while updating packages information."
-msgstr "更新软件包信息时发生不可恢复的错误。"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "URL:"
+msgstr "URL："
 
-#: ../rpmdrake_.c:789
-msgid "How to choose manually your mirror"
-msgstr "如何手工挑选您的镜像"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Editing source \"%s\":"
+msgstr "编辑来源“%s”："
 
-#: ../rpmdrake_.c:797
-msgid "Please wait, contacting mirror to initialize updates packages."
-msgstr "正在联系服务器来初始化更新软件包，请稍候。"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Edit a source"
+msgstr "编辑来源"
 
-#: ../rpmdrake_.c:800
-msgid "Error adding update medium"
-msgstr "添加更新介质出错"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "正在删除介质，请稍候..."
 
-#: ../rpmdrake_.c:831
-msgid "Please wait, finding available packages..."
-msgstr "正在寻找可用的软件包，请稍候..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Please wait, adding medium..."
+msgstr "正在添加介质，请稍候..."
 
-#: ../rpmdrake_.c:863
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "正在检查 %s"
+msgid "Type of source:"
+msgstr "来源类型："
 
-#: ../rpmdrake_.c:882
-msgid "changes:"
-msgstr "更改："
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Adding a source:"
+msgstr "添加一个来源："
 
-#: ../rpmdrake_.c:886
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Remove .%s"
-msgstr "删除 .%s"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
 
-#: ../rpmdrake_.c:888
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Use .%s as main file"
-msgstr "使用 .%s 作为主文件"
+msgid "You need to fill up at least the two first entries."
+msgstr "您至少要填写头两项。"
 
-#: ../rpmdrake_.c:890
-msgid "Do nothing"
-msgstr "不做任何事"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Name:"
+msgstr "名称："
 
-#: ../rpmdrake_.c:902
-msgid "Installation finished"
-msgstr "安装完成"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Login:"
+msgstr "登录名："
 
-#: ../rpmdrake_.c:912
-msgid "Inspect..."
-msgstr "检查..."
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Choose a mirror..."
+msgstr "选择镜像..."
 
-#: ../rpmdrake_.c:927
-msgid "Program missing"
-msgstr "缺少程序"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Browse..."
+msgstr "浏览..."
 
-#: ../rpmdrake_.c:928
-msgid "A required program is missing (grpmi). Check your installation."
-msgstr "缺少一个需要的程序（grpmi）。请检查您的安装。"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Path or mount point:"
+msgstr "路径或装载点："
 
-#: ../rpmdrake_.c:942
-msgid "Unable to get source packages."
-msgstr "源软件包未找到。"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "可移动设备"
 
-#: ../rpmdrake_.c:943
-msgid "Unable to get source packages, sorry."
-msgstr "对不起，无法得到源软件包。"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "HTTP server"
+msgstr "HTTP 服务器"
 
-#: ../rpmdrake_.c:950
-msgid "Change medium"
-msgstr "更换介质"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP 服务器"
 
-#: ../rpmdrake_.c:951
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "请把标记为“%s”的介质放进设备 [%s]"
+msgid "Path:"
+msgstr "路径："
 
-#: ../rpmdrake_.c:959
-msgid "Installation failed"
-msgstr "安装失败"
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "本机文件"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Add a source"
+msgstr "添加一个来源"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to update medium; it will be automatically disabled."
+msgstr "无法更新介质；该介质将被自动停用。"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "无法创建介质。"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, updating media..."
+msgstr "正在更新介质，请稍候..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Update"
+msgstr "更新"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Select the source(s) you wish to update:"
+msgstr "选择要更新的源介质:"
 
-#: ../rpmdrake_.c:960
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please choose the desired mirror."
+msgstr "请选择喜欢的镜像站点。"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your sources database."
+"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"
-"您可能需要更新您的来源数据库。"
 
-#: ../rpmdrake_.c:963
-msgid "Please wait, removing packages to allow others to be upgraded..."
-msgstr "为了升级软件包，正在删除旧的软件包，请稍候..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No mirror"
+msgstr "没有镜像"
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"There was an error downloading the mirrors list:\n"
 "\n"
-"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
-"you may now inspect some in order to take actions:"
+"%s\n"
+"The network, or MandrakeSoft website, are maybe unavailable.\n"
+"Please try again later."
 msgstr ""
-"安装完成；%s。\n"
-"\n"
-"一些配置文件被保存为“.rpmnew”或“.rpmsave”，\n"
-"在执行动作以前，您需要检查一下："
 
-#: ../rpmdrake_.c:984
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Error during download"
+msgstr "下载出错"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址，请稍候。"
+
+#: ../rpmdrake.pm:1
+#, c-format
 msgid ""
-"some packages failed to install\n"
-"correctly"
+"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 ""
-"有些软件包出现安装\n"
-"失败"
 
-#: ../rpmdrake_.c:985
-msgid "everything was installed correctly"
-msgstr "所有软件包都已正确安装"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United States"
+msgstr "美国"
 
-#: ../rpmdrake_.c:987
-msgid "Everything installed successfully"
-msgstr "所有软件包都已成功安装"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "中国"
 
-#: ../rpmdrake_.c:988
-msgid "All requested packages were installed successfully."
-msgstr "所有要求的软件包都已成功安装。"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "英国"
 
-#: ../rpmdrake_.c:991
-msgid "Everything already installed."
-msgstr "所有软件包已经安装了。"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Taiwan"
+msgstr "中国台湾"
 
-#: ../rpmdrake_.c:992
-msgid "Everything already installed (is this supposed to happen at all?)."
-msgstr "所有软件包已经安装了（这是您希望的吗？）。"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Sweden"
+msgstr "瑞典"
 
-#: ../rpmdrake_.c:999
-msgid "Problem during installation"
-msgstr "在安装过程中发生问题"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Russia"
+msgstr "俄罗斯"
 
-#: ../rpmdrake_.c:1000
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the installation:\n"
-"\n"
-"%s"
-msgstr ""
-"安装过程中有一个问题：\n"
-"\n"
-"%s"
+msgid "Portugal"
+msgstr "葡萄牙"
 
-#: ../rpmdrake_.c:1014
-msgid "Please wait, reading packages database..."
-msgstr "正在读取软件包数据库，请稍候..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Poland"
+msgstr "波兰"
 
-#: ../rpmdrake_.c:1055
-msgid "Please wait, removing packages..."
-msgstr "正在删除软件包，请稍候..."
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Norway"
+msgstr "挪威"
 
-#: ../rpmdrake_.c:1058
-msgid "Problem during removal"
-msgstr "在删除过程中发生问题"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "荷兰"
 
-#: ../rpmdrake_.c:1059
+#: ../rpmdrake.pm:1
 #, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
-msgstr ""
-"删除包过程中发生一个问题：\n"
-"\n"
-"%s"
+msgid "Korea"
+msgstr "韩国"
 
-#: ../rpmdrake_.c:1091
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
-msgstr ""
-"欢迎使用软件包删除工具！\n"
-"\n"
-"这个工具帮助您选择想要从您的电脑中删除\n"
-"的软件包。"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Japan"
+msgstr "日本"
 
-#: ../rpmdrake_.c:1096
-msgid ""
-"Welcome to MandrakeUpdate!\n"
-"\n"
-"This tool will help you choose the updates you want to install on your\n"
-"computer."
-msgstr ""
-"欢迎使用 MandrakeUpdate 自动更新工具！\n"
-"\n"
-"这个工具帮助您为您的电脑中安装\n"
-"更新的软件包。"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Italy"
+msgstr "意大利"
 
-#: ../rpmdrake_.c:1101
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
-msgstr ""
-"欢迎使用软件包安装工具！\n"
-"\n"
-"您的 Mandrake Linux 的安装光盘包含有数千个软件包。\n"
-"这个工具帮助您选择要为您的电脑安装的软件包。"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Israel"
+msgstr "以色列"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Greece"
+msgstr "希腊"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "France"
+msgstr "法国"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Finland"
+msgstr "芬兰"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Spain"
+msgstr "西班牙"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Danmark"
+msgstr "丹麦"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "德国"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Czech Republic"
+msgstr "捷克"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Costa Rica"
+msgstr "哥斯达黎加"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Canada"
+msgstr "加拿大"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Brazil"
+msgstr "巴西"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Belgium"
+msgstr "比利时"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Australia"
+msgstr "澳大利亚"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Austria"
+msgstr "奥地利"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "信息..."
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "No"
+msgstr "否"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "是"
+
+#: data/rpmdrake.desktop.in.h:1
+msgid "Install Software"
+msgstr "安装软件"
 
 #: data/rpmdrake-remove.desktop.in.h:1
 msgid "Remove Software"
@@ -884,7 +1174,3 @@ msgstr "删除软件"
 #: data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Sources Manager"
 msgstr "软件源管理器"
-
-#: data/rpmdrake.desktop.in.h:1
-msgid "Install Software"
-msgstr "安装软件"