gtk2

1 files changed, 354 insertions, 363 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5cde3244..0c0578bf 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-11-07 18:26+0100\n"
+"POT-Creation-Date: 2002-11-26 20:09+0100\n"
 "PO-Revision-Date: 2002-11-26 22:10+0800\n"
 "Last-Translator: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
 "Language-Team: Mandrake Simplified Chinese <mandrake@en2china.com>\n"
@@ -15,505 +15,427 @@ msgstr ""
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../edit-urpm-sources.pl_.c:41
+#: ../edit-urpm-sources.pl_.c:39
 msgid "Unable to create medium."
 msgstr "无法创建介质。"
 
-#: ../edit-urpm-sources.pl_.c:42
+#: ../edit-urpm-sources.pl_.c:40
 msgid "Unable to update medium; it will be automatically disabled."
 msgstr "无法更新介质; 将被自动停用。"
 
-#: ../edit-urpm-sources.pl_.c:53
+#: ../edit-urpm-sources.pl_.c:51
 msgid "Add a source"
 msgstr "添加一个来源"
 
-#: ../edit-urpm-sources.pl_.c:54
+#: ../edit-urpm-sources.pl_.c:52
 msgid "Local files"
 msgstr "本机文件"
 
-#: ../edit-urpm-sources.pl_.c:54
+#: ../edit-urpm-sources.pl_.c:52
 msgid "Path:"
 msgstr "路径:"
 
-#: ../edit-urpm-sources.pl_.c:55
+#: ../edit-urpm-sources.pl_.c:53
 msgid "FTP server"
 msgstr "FTP 服务器"
 
-#: ../edit-urpm-sources.pl_.c:55 ../edit-urpm-sources.pl_.c:56
-#: ../edit-urpm-sources.pl_.c:58 ../edit-urpm-sources.pl_.c:169
+#: ../edit-urpm-sources.pl_.c:53 ../edit-urpm-sources.pl_.c:54
+#: ../edit-urpm-sources.pl_.c:56 ../edit-urpm-sources.pl_.c:175
 msgid "URL:"
 msgstr "URL:"
 
-#: ../edit-urpm-sources.pl_.c:56
+#: ../edit-urpm-sources.pl_.c:54
 msgid "HTTP server"
 msgstr "HTTP 服务器"
 
-#: ../edit-urpm-sources.pl_.c:57
+#: ../edit-urpm-sources.pl_.c:55
 msgid "Path or mount point:"
 msgstr "路径或装载点:"
 
-#: ../edit-urpm-sources.pl_.c:57
+#: ../edit-urpm-sources.pl_.c:55
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:486
+#: ../edit-urpm-sources.pl_.c:56 ../rpmdrake_.c:508
 msgid "Security updates"
 msgstr "安全更新"
 
-#: ../edit-urpm-sources.pl_.c:69
+#: ../edit-urpm-sources.pl_.c:67
 msgid "Browse..."
 msgstr "浏览..."
 
-#: ../edit-urpm-sources.pl_.c:71
+#: ../edit-urpm-sources.pl_.c:69
 msgid "Choose a mirror..."
 msgstr "选择镜像..."
 
-#: ../edit-urpm-sources.pl_.c:91
+#: ../edit-urpm-sources.pl_.c:89
 msgid "Login:"
 msgstr "登录名:"
 
-#: ../edit-urpm-sources.pl_.c:91 ../edit-urpm-sources.pl_.c:210
+#: ../edit-urpm-sources.pl_.c:89 ../edit-urpm-sources.pl_.c:215
 msgid "Password:"
 msgstr "口令:"
 
-#: ../edit-urpm-sources.pl_.c:96
+#: ../edit-urpm-sources.pl_.c:94
 msgid "Name:"
 msgstr "名称:"
 
-#: ../edit-urpm-sources.pl_.c:98 ../edit-urpm-sources.pl_.c:170
+#: ../edit-urpm-sources.pl_.c:96 ../edit-urpm-sources.pl_.c:176
 msgid "Relative path to synthesis/hdlist:"
 msgstr "相对 synthesis/hdlist 的路径:"
 
-#: ../edit-urpm-sources.pl_.c:106
+#: ../edit-urpm-sources.pl_.c:104
 msgid "You need to fill up at least the two first entries."
 msgstr "您至少要填写头两项。"
 
-#: ../edit-urpm-sources.pl_.c:110
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"已经有一个介质使用这个名字, \n"
-"您确实要替换它吗?"
-
-#: ../edit-urpm-sources.pl_.c:118
+#: ../edit-urpm-sources.pl_.c:116
 msgid "Adding a source:"
 msgstr "添加一个来源:"
 
-#: ../edit-urpm-sources.pl_.c:119
+#: ../edit-urpm-sources.pl_.c:117
 msgid "Type of source:"
 msgstr "来源类型:"
 
-#: ../edit-urpm-sources.pl_.c:123 ../edit-urpm-sources.pl_.c:182
-#: ../edit-urpm-sources.pl_.c:214 ../rpmdrake.pm_.c:85 ../rpmdrake.pm_.c:105
-#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:339 ../rpmdrake_.c:869
-#: ../rpmdrake_.c:904
+#: ../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
 msgid "Ok"
 msgstr "确定"
 
-#: ../edit-urpm-sources.pl_.c:126 ../edit-urpm-sources.pl_.c:174
-#: ../edit-urpm-sources.pl_.c:182 ../edit-urpm-sources.pl_.c:215
-#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:339
-#: ../rpmdrake_.c:904
+#: ../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
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl_.c:143
+#: ../edit-urpm-sources.pl_.c:140
 msgid "Please wait, adding medium..."
 msgstr "正在添加介质, 请稍候..."
 
-#: ../edit-urpm-sources.pl_.c:152
+#: ../edit-urpm-sources.pl_.c:158
 msgid "Please wait, removing medium..."
 msgstr "正在删除介质, 请稍候..."
 
-#: ../edit-urpm-sources.pl_.c:163
+#: ../edit-urpm-sources.pl_.c:169
 msgid "Edit a source"
 msgstr "编辑来源"
 
-#: ../edit-urpm-sources.pl_.c:167
+#: ../edit-urpm-sources.pl_.c:173
 #, c-format
 msgid "Editing source \"%s\":"
 msgstr "编辑来源“%s”:"
 
-#: ../edit-urpm-sources.pl_.c:173
+#: ../edit-urpm-sources.pl_.c:179
 msgid "Save changes"
 msgstr "保存修改"
 
-#: ../edit-urpm-sources.pl_.c:180
+#: ../edit-urpm-sources.pl_.c:185
 msgid "You need to insert the medium to continue"
 msgstr "您必须插入介质才能继续"
 
-#: ../edit-urpm-sources.pl_.c:181
+#: ../edit-urpm-sources.pl_.c:186
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
 msgstr "要保存改变, 您必须在驱动器中插入介质。"
 
-#: ../edit-urpm-sources.pl_.c:186
+#: ../edit-urpm-sources.pl_.c:191
 msgid "Please wait, updating medium..."
 msgstr "正在更新介质, 请稍候..."
 
-#: ../edit-urpm-sources.pl_.c:197
+#: ../edit-urpm-sources.pl_.c:202
 msgid "Configure proxies"
 msgstr "配置代理服务器"
 
-#: ../edit-urpm-sources.pl_.c:202
+#: ../edit-urpm-sources.pl_.c:207
 msgid ""
 "If you need a proxy, enter the hostname and an optional port (syntax: "
 "<proxyhost[:port]>):"
 msgstr "如果您需要用代理服务器, 请输入主机名和端口(语法:<proxyhost[:port]>):"
 
-#: ../edit-urpm-sources.pl_.c:204
+#: ../edit-urpm-sources.pl_.c:209
 msgid "Proxy hostname:"
 msgstr "代理服务器主机名:"
 
-#: ../edit-urpm-sources.pl_.c:206
+#: ../edit-urpm-sources.pl_.c:211
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "在登陆代理服务器时, 您可能要指定用户名和密码:"
 
-#: ../edit-urpm-sources.pl_.c:208
+#: ../edit-urpm-sources.pl_.c:213
 msgid "User:"
 msgstr "用户名:"
 
-#: ../edit-urpm-sources.pl_.c:232
+#: ../edit-urpm-sources.pl_.c:235
 msgid "Configure sources"
 msgstr "配置来源"
 
-#: ../edit-urpm-sources.pl_.c:233
+#: ../edit-urpm-sources.pl_.c:242
 msgid "Enabled?"
 msgstr "启用?"
 
-#: ../edit-urpm-sources.pl_.c:233
+#: ../edit-urpm-sources.pl_.c:243
 msgid "Source"
 msgstr "来源"
 
-#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:662
+#: ../edit-urpm-sources.pl_.c:264 ../rpmdrake_.c:688
 msgid "Remove"
 msgstr "可卸装"
 
-#: ../edit-urpm-sources.pl_.c:263
+#: ../edit-urpm-sources.pl_.c:266
 msgid "Edit"
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl_.c:265
+#: ../edit-urpm-sources.pl_.c:268
 msgid "Add..."
 msgstr "添加..."
 
-#: ../edit-urpm-sources.pl_.c:267
+#: ../edit-urpm-sources.pl_.c:270
 msgid "Update..."
 msgstr "更新..."
 
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:271
 msgid "Proxy..."
 msgstr "代理服务器..."
 
-#: ../edit-urpm-sources.pl_.c:271
+#: ../edit-urpm-sources.pl_.c:274
 msgid "Save and quit"
 msgstr "保存并退出"
 
-#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:665
+#: ../edit-urpm-sources.pl_.c:275 ../rpmdrake_.c:691
 msgid "Quit"
 msgstr "退出"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1016
-#, c-format
-msgid ""
-"%s\n"
-"\n"
-"Is it ok to continue?"
-msgstr ""
-"%s\n"
-"\n"
-"要继续吗?"
-
-#: ../edit-urpm-sources.pl_.c:285
-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"
-"可以使用这里定义的软件包来源。"
-
-#: ../rpmdrake.pm_.c:81
+#: ../rpmdrake.pm_.c:82
 msgid "Yes"
 msgstr "是"
 
-#: ../rpmdrake.pm_.c:83
+#: ../rpmdrake.pm_.c:84
 msgid "No"
 msgstr "否"
 
-#: ../rpmdrake.pm_.c:97
+#: ../rpmdrake.pm_.c:98
 msgid "Info..."
 msgstr "信息..."
 
-#: ../rpmdrake.pm_.c:147
+#: ../rpmdrake.pm_.c:150
 msgid "Austria"
 msgstr "奥地利"
 
-#: ../rpmdrake.pm_.c:148
+#: ../rpmdrake.pm_.c:151
 msgid "Australia"
 msgstr "澳大利亚"
 
-#: ../rpmdrake.pm_.c:149
+#: ../rpmdrake.pm_.c:152
 msgid "Belgium"
 msgstr "比利时"
 
-#: ../rpmdrake.pm_.c:150
+#: ../rpmdrake.pm_.c:153
 msgid "Brazil"
 msgstr "巴西"
 
-#: ../rpmdrake.pm_.c:151
+#: ../rpmdrake.pm_.c:154
 msgid "Canada"
 msgstr "加拿大"
 
-#: ../rpmdrake.pm_.c:152
+#: ../rpmdrake.pm_.c:155
 msgid "Costa Rica"
 msgstr "哥斯达黎加"
 
-#: ../rpmdrake.pm_.c:153
+#: ../rpmdrake.pm_.c:156
 msgid "Czech Republic"
 msgstr "捷克"
 
-#: ../rpmdrake.pm_.c:154
+#: ../rpmdrake.pm_.c:157
 msgid "Germany"
 msgstr "德国"
 
-#: ../rpmdrake.pm_.c:155
+#: ../rpmdrake.pm_.c:158
 msgid "Danmark"
 msgstr "丹麦"
 
-#: ../rpmdrake.pm_.c:156 ../rpmdrake.pm_.c:160
+#: ../rpmdrake.pm_.c:159 ../rpmdrake.pm_.c:163
 msgid "Greece"
 msgstr "希腊"
 
-#: ../rpmdrake.pm_.c:157
+#: ../rpmdrake.pm_.c:160
 msgid "Spain"
 msgstr "西班牙"
 
-#: ../rpmdrake.pm_.c:158
+#: ../rpmdrake.pm_.c:161
 msgid "Finland"
 msgstr "芬兰"
 
-#: ../rpmdrake.pm_.c:159
+#: ../rpmdrake.pm_.c:162
 msgid "France"
 msgstr "法国"
 
-#: ../rpmdrake.pm_.c:161
+#: ../rpmdrake.pm_.c:164
 msgid "Israel"
 msgstr "以色列"
 
-#: ../rpmdrake.pm_.c:162
+#: ../rpmdrake.pm_.c:165
 msgid "Italy"
 msgstr "意大利"
 
-#: ../rpmdrake.pm_.c:163
+#: ../rpmdrake.pm_.c:166
 msgid "Japan"
 msgstr "日本"
 
-#: ../rpmdrake.pm_.c:164
+#: ../rpmdrake.pm_.c:167
 msgid "Korea"
 msgstr "韩国"
 
-#: ../rpmdrake.pm_.c:165
+#: ../rpmdrake.pm_.c:168
 msgid "Netherlands"
 msgstr "荷兰"
 
-#: ../rpmdrake.pm_.c:166
+#: ../rpmdrake.pm_.c:169
 msgid "Norway"
 msgstr "挪威"
 
-#: ../rpmdrake.pm_.c:167
+#: ../rpmdrake.pm_.c:170
 msgid "Poland"
 msgstr "波兰"
 
-#: ../rpmdrake.pm_.c:168
+#: ../rpmdrake.pm_.c:171
 msgid "Portugal"
 msgstr "葡萄牙"
 
-#: ../rpmdrake.pm_.c:169
+#: ../rpmdrake.pm_.c:172
 msgid "Russia"
 msgstr "俄罗斯"
 
-#: ../rpmdrake.pm_.c:170
+#: ../rpmdrake.pm_.c:173
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm_.c:171
+#: ../rpmdrake.pm_.c:174
 msgid "Taiwan"
 msgstr "中国台湾"
 
-#: ../rpmdrake.pm_.c:172
+#: ../rpmdrake.pm_.c:175
 msgid "United Kingdom"
 msgstr "英国"
 
-#: ../rpmdrake.pm_.c:173
+#: ../rpmdrake.pm_.c:176
 msgid "China"
 msgstr "中国"
 
-#: ../rpmdrake.pm_.c:174 ../rpmdrake.pm_.c:175 ../rpmdrake.pm_.c:176
-#: ../rpmdrake.pm_.c:177 ../rpmdrake.pm_.c:227
+#: ../rpmdrake.pm_.c:177 ../rpmdrake.pm_.c:178 ../rpmdrake.pm_.c:179
+#: ../rpmdrake.pm_.c:180 ../rpmdrake.pm_.c:231
 msgid "United States"
 msgstr "美国"
 
-#: ../rpmdrake.pm_.c:235
-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"
-"可以继续吗?"
-
-#: ../rpmdrake.pm_.c:239
+#: ../rpmdrake.pm_.c:244
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr "正在从 MandrakeSoft 网站下载镜像站点的地址, 请稍候。"
 
-#: ../rpmdrake.pm_.c:245
+#: ../rpmdrake.pm_.c:250
 msgid "Error during download"
 msgstr "下载出错"
 
-#: ../rpmdrake.pm_.c:246
-#, c-format
-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"
-"请过一会儿再试。"
-
-#: ../rpmdrake.pm_.c:254
+#: ../rpmdrake.pm_.c:259
 msgid "No mirror"
 msgstr "没有镜像"
 
-#: ../rpmdrake.pm_.c:255
-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"
-"支持。"
-
-#: ../rpmdrake.pm_.c:269
+#: ../rpmdrake.pm_.c:277
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:565
+#: ../rpmdrake.pm_.c:309 ../rpmdrake_.c:587
 msgid "Update source(s)"
 msgstr "更新源"
 
-#: ../rpmdrake.pm_.c:296
+#: ../rpmdrake.pm_.c:313
 msgid "Select the source(s) you wish to update:"
 msgstr "选择要更新的源介质:"
 
-#: ../rpmdrake.pm_.c:300
+#: ../rpmdrake.pm_.c:317
 msgid "Update"
 msgstr "更新"
 
-#: ../rpmdrake.pm_.c:308
+#: ../rpmdrake.pm_.c:328
 msgid "Please wait, updating media..."
 msgstr "更新介质, 请稍候..."
 
-#: ../rpmdrake_.c:96
+#: ../rpmdrake_.c:97
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake_.c:114 ../rpmdrake_.c:127 ../rpmdrake_.c:216 ../rpmdrake_.c:285
+#: ../rpmdrake_.c:119 ../rpmdrake_.c:133 ../rpmdrake_.c:225 ../rpmdrake_.c:296
 msgid "(none)"
 msgstr "(无)"
 
-#: ../rpmdrake_.c:133 ../rpmdrake_.c:440 ../rpmdrake_.c:441
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:453 ../rpmdrake_.c:454
 msgid "(Not available)"
 msgstr "(不可用)"
 
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:200
+#: ../rpmdrake_.c:149 ../rpmdrake_.c:206
 msgid "Search results"
 msgstr "搜索结果"
 
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:149
 msgid "Search results (none)"
 msgstr "搜索结果(无)"
 
-#: ../rpmdrake_.c:153 ../rpmdrake_.c:164
+#: ../rpmdrake_.c:159 ../rpmdrake_.c:170
 msgid "Please wait, searching..."
 msgstr "正在搜索, 请稍候..."
 
-#: ../rpmdrake_.c:167
+#: ../rpmdrake_.c:173
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake_.c:201 ../rpmdrake_.c:306
+#: ../rpmdrake_.c:207 ../rpmdrake_.c:317
 msgid "Addable"
 msgstr "可添加"
 
-#: ../rpmdrake_.c:201 ../rpmdrake_.c:306
+#: ../rpmdrake_.c:207 ../rpmdrake_.c:317
 msgid "Upgradable"
 msgstr "可升级"
 
-#: ../rpmdrake_.c:203
+#: ../rpmdrake_.c:209
 msgid "Not selected"
 msgstr "未选中"
 
-#: ../rpmdrake_.c:203
+#: ../rpmdrake_.c:209
 msgid "Selected"
 msgstr "选中"
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:238
+msgid "rpmdrake"
+msgstr "rpmdrake"
+
+#: ../rpmdrake_.c:256
 msgid "More information on package..."
 msgstr "更多有关该软件包的信息..."
 
-#: ../rpmdrake_.c:246
+#: ../rpmdrake_.c:257
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件之一:"
 
-#: ../rpmdrake_.c:246
+#: ../rpmdrake_.c:257
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake_.c:262
+#: ../rpmdrake_.c:273
 msgid "unknown package "
 msgstr "未知软件包"
 
-#: ../rpmdrake_.c:272
+#: ../rpmdrake_.c:283
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包, 请稍候..."
 
-#: ../rpmdrake_.c:287
+#: ../rpmdrake_.c:298
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake_.c:288
-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"
-"或者您已经安装过所有的更新。"
-
-#: ../rpmdrake_.c:345
+#: ../rpmdrake_.c:356
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake_.c:346
+#: ../rpmdrake_.c:357
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -523,11 +445,11 @@ msgstr ""
 "需要删除下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:352
+#: ../rpmdrake_.c:363
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake_.c:353 ../rpmdrake_.c:411
+#: ../rpmdrake_.c:364 ../rpmdrake_.c:422
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -537,11 +459,11 @@ msgstr ""
 "下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:381
+#: ../rpmdrake_.c:392
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake_.c:382
+#: ../rpmdrake_.c:393
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -551,11 +473,11 @@ msgstr ""
 "下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:395
+#: ../rpmdrake_.c:406
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:396
+#: ../rpmdrake_.c:407
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -563,337 +485,255 @@ msgstr ""
 "对不起, 不能选择下列软件包:\n"
 "\n"
 
-#: ../rpmdrake_.c:410 ../rpmdrake_.c:623
+#: ../rpmdrake_.c:421 ../rpmdrake_.c:644
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake_.c:432
+#: ../rpmdrake_.c:443
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中软件:%d MB / 剩余磁盘空间:%d MB"
 
-#: ../rpmdrake_.c:434
+#: ../rpmdrake_.c:445
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中大小:%d MB"
 
-#: ../rpmdrake_.c:440
+#: ../rpmdrake_.c:453
 msgid "Files:\n"
 msgstr "文件:\n"
 
-#: ../rpmdrake_.c:441
+#: ../rpmdrake_.c:454
 msgid "Changelog:\n"
 msgstr "更新日志:\n"
 
-#: ../rpmdrake_.c:444
+#: ../rpmdrake_.c:457
 msgid "Source: "
 msgstr "来源: "
 
-#: ../rpmdrake_.c:445
+#: ../rpmdrake_.c:458
 msgid "Currently installed version: "
 msgstr "当前安装的版本: "
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:462
 msgid "Reason for update: "
 msgstr "更新原因: "
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:464
 msgid "Name: "
 msgstr "名称: "
 
-#: ../rpmdrake_.c:452
+#: ../rpmdrake_.c:465
 msgid "Version: "
 msgstr "版本: "
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:466
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:466
 msgid "Size: "
 msgstr "大小: "
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:468
 msgid "Importance: "
 msgstr "重要性: "
 
-#: ../rpmdrake_.c:455
+#: ../rpmdrake_.c:469
 msgid "Summary: "
 msgstr "摘要: "
 
-#: ../rpmdrake_.c:456
+#: ../rpmdrake_.c:470
 msgid "Description: "
 msgstr "描述:"
 
-#: ../rpmdrake_.c:465
-msgid "rpmdrake"
-msgstr "rpmdrake"
-
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:508
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:508
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:505
+#: ../rpmdrake_.c:527
 msgid "Mandrake choices"
 msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:506
+#: ../rpmdrake_.c:528
 msgid "All packages, alphabetical"
 msgstr "全部软件包, 字母次序"
 
-#: ../rpmdrake_.c:507
+#: ../rpmdrake_.c:529
 msgid "All packages,"
 msgstr "全部软件包,"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:552
 msgid "by group"
 msgstr "按照分组"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:552
 msgid "by size"
 msgstr "按照大小"
 
-#: ../rpmdrake_.c:531
+#: ../rpmdrake_.c:553
 msgid "by selection state"
 msgstr "按照选择状态"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:554
 msgid "by source repository"
 msgstr "按照来源库"
 
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:554
 msgid "by update availability"
 msgstr "按照是否可更新"
 
-#: ../rpmdrake_.c:553
+#: ../rpmdrake_.c:575
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:553
+#: ../rpmdrake_.c:575
 msgid "in files"
 msgstr "在文件中"
 
-#: ../rpmdrake_.c:553
+#: ../rpmdrake_.c:575
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake_.c:564
+#: ../rpmdrake_.c:586
 msgid "Reload the packages list"
 msgstr "重新装入软件包清单"
 
-#: ../rpmdrake_.c:564
+#: ../rpmdrake_.c:586
 msgid "Reset the selection"
 msgstr "重置选中"
 
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:612
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:612
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:634
 msgid "Too many packages are selected"
 msgstr "选中的包太多"
 
-#: ../rpmdrake_.c:614
-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"
-"您真的想要安装选中包吗?"
-
-#: ../rpmdrake_.c:624
-#, 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 ""
-"要安装其它软件包, 必须删除下列软件包:\n"
-"\n"
-"%s\n"
-"\n"
-"可以继续吗?"
-
-#: ../rpmdrake_.c:646
+#: ../rpmdrake_.c:678
 msgid "Find:"
 msgstr "查找:"
 
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:683
 msgid "Search"
 msgstr "搜索"
 
-#: ../rpmdrake_.c:663
+#: ../rpmdrake_.c:689
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake_.c:690
-msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-
-#: ../rpmdrake_.c:691 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:697 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:691
-msgid "Software Packages Removal"
-msgstr "软件包删除"
-
-#: ../rpmdrake_.c:692
+#: ../rpmdrake_.c:697
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:725
-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"
-"可以继续吗?"
+#: ../rpmdrake_.c:697
+msgid "Software Packages Removal"
+msgstr "软件包删除"
 
-#: ../rpmdrake_.c:729
+#: ../rpmdrake_.c:738
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "正在连接镜像服务器以得到最新的更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:740
 msgid "Error updating medium"
 msgstr "更新介质出错"
 
-#: ../rpmdrake_.c:732
+#: ../rpmdrake_.c:741
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "更新软件包信息时发生不可恢复的错误。"
 
-#: ../rpmdrake_.c:738
+#: ../rpmdrake_.c:746
 msgid "How to choose manually your mirror"
 msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake_.c:739
-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。"
-
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:754
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "正在联系服务器来初始化更新软件包, 请稍候。"
 
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:757
 msgid "Error adding update medium"
 msgstr "添加更新介质出错"
 
-#: ../rpmdrake_.c:750
-#, 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 ""
-"通过 urpmi 添加更新介质时出错。\n"
-"\n"
-"可能是由于镜像服务器出错或暂时不能连接, 或者您的\n"
-"Mandrake Linux 版本(%s)没有被 Mandrake Linux \n"
-"官方升级所支持。\n"
-"\n"
-"要尝试另外的镜像服务器吗?"
-
-#: ../rpmdrake_.c:781
+#: ../rpmdrake_.c:789
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可用的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:810
+#: ../rpmdrake_.c:818
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:822
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake_.c:829
+#: ../rpmdrake_.c:841
+#, fuzzy
+msgid "changes:"
+msgstr "保存修改"
+
+#: ../rpmdrake_.c:845
 #, c-format
 msgid "Remove .%s"
 msgstr "删除 .%s"
 
-#: ../rpmdrake_.c:831
+#: ../rpmdrake_.c:847
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake_.c:833
+#: ../rpmdrake_.c:849
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake_.c:836
-msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-
-#: ../rpmdrake_.c:853
+#: ../rpmdrake_.c:867
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake_.c:878
+#: ../rpmdrake_.c:889
 msgid "Program missing"
 msgstr "缺少程序"
 
-#: ../rpmdrake_.c:879
+#: ../rpmdrake_.c:890
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "缺少一个需要的程序(grpmi)。请检查您的安装。"
 
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:905
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake_.c:895
+#: ../rpmdrake_.c:906
 msgid "Unable to get source packages, sorry."
 msgstr "对不起, 无法得到源软件包。"
 
-#: ../rpmdrake_.c:902
+#: ../rpmdrake_.c:913
 msgid "Change medium"
 msgstr "更换介质"
 
-#: ../rpmdrake_.c:903
+#: ../rpmdrake_.c:914
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把标记为“%s”的介质放进设备 [%s]"
 
-#: ../rpmdrake_.c:911
+#: ../rpmdrake_.c:922
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:912
+#: ../rpmdrake_.c:923
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -901,11 +741,11 @@ msgstr ""
 "安装失败, 缺少某些文件。\n"
 "您可能需要更新您的来源数据库。"
 
-#: ../rpmdrake_.c:915
+#: ../rpmdrake_.c:926
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "为了升级软件包, 正在删除旧的软件包, 请稍候..."
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:947
 #, c-format
 msgid ""
 "The installation is finished; %s.\n"
@@ -918,7 +758,7 @@ msgstr ""
 "一些配置文件被保存为“.rpmnew”或“.rpmsave”, \n"
 "在执行动作以前, 您需要检查一下:"
 
-#: ../rpmdrake_.c:934
+#: ../rpmdrake_.c:947
 msgid ""
 "some packages failed to install\n"
 "correctly"
@@ -926,31 +766,31 @@ msgstr ""
 "有些软件包出现安装\n"
 "失败"
 
-#: ../rpmdrake_.c:935
+#: ../rpmdrake_.c:948
 msgid "everything was installed correctly"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:937
+#: ../rpmdrake_.c:950
 msgid "Everything installed successfully"
 msgstr "所有软件包都已成功安装"
 
-#: ../rpmdrake_.c:938
+#: ../rpmdrake_.c:951
 msgid "All requested packages were installed successfully."
 msgstr "所有要求的软件包都已成功安装。"
 
-#: ../rpmdrake_.c:940
+#: ../rpmdrake_.c:953
 msgid "Everything already installed."
 msgstr "所有软件包已经安装了。"
 
-#: ../rpmdrake_.c:941
+#: ../rpmdrake_.c:954
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "所有软件包已经安装了(这是您希望的吗?)。"
 
-#: ../rpmdrake_.c:944
+#: ../rpmdrake_.c:957
 msgid "Problem during installation"
 msgstr "在安装过程中发生问题"
 
-#: ../rpmdrake_.c:945
+#: ../rpmdrake_.c:958
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -961,15 +801,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake_.c:955
+#: ../rpmdrake_.c:968
 msgid "Please wait, reading packages database..."
 msgstr "正在读取软件包数据库, 请稍候..."
 
-#: ../rpmdrake_.c:993
+#: ../rpmdrake_.c:1006
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包, 请稍候..."
 
-#: ../rpmdrake_.c:1020
+#: ../rpmdrake_.c:1035
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -981,7 +821,7 @@ msgstr ""
 "这个工具帮助您选择想要从您的电脑中删除\n"
 "的软件包。"
 
-#: ../rpmdrake_.c:1025
+#: ../rpmdrake_.c:1040
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -993,7 +833,7 @@ msgstr ""
 "这个工具帮助您为您的电脑中安装\n"
 "更新的软件包。"
 
-#: ../rpmdrake_.c:1030
+#: ../rpmdrake_.c:1045
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1017,3 +857,154 @@ 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--*-*-*-*-*,*"