merge in latest changes

1 files changed, 175 insertions, 154 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9be30851..094573ad 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-02 00:20+0200\n"
+"POT-Creation-Date: 2002-08-05 18:39+0200\n"
 "PO-Revision-Date: 2001-09-27 11:30+0800\n"
 "Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
 "Language-Team: Simplified Chinese <future-cjk@mandrakesoft.com>\n"
@@ -63,7 +63,7 @@ msgstr "装载点:"
 msgid "Removable device"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:349
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:340
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -117,13 +117,13 @@ msgstr ""
 msgid "Type of source:"
 msgstr "介质类型:"
 
-#: ../edit-urpm-sources.pl_.c:124 ../rpmdrake.pm_.c:71 ../rpmdrake.pm_.c:84
-#: ../rpmdrake.pm_.c:271
+#: ../edit-urpm-sources.pl_.c:124 ../rpmdrake.pm_.c:74 ../rpmdrake.pm_.c:87
+#: ../rpmdrake.pm_.c:259 ../rpmdrake_.c:616
 msgid "Ok"
 msgstr ""
 
 #: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:174
-#: ../rpmdrake.pm_.c:271
+#: ../edit-urpm-sources.pl_.c:199 ../rpmdrake.pm_.c:259 ../rpmdrake_.c:616
 msgid "Cancel"
 msgstr "取消"
 
@@ -152,41 +152,65 @@ msgstr "软件包:"
 msgid "Please wait, updating medium..."
 msgstr "查找依赖性..."
 
-#: ../edit-urpm-sources.pl_.c:192
+#: ../edit-urpm-sources.pl_.c:191
+#, fuzzy
+msgid "Update source(s)"
+msgstr "编辑源介质"
+
+#: ../edit-urpm-sources.pl_.c:194
+#, fuzzy
+msgid "Select the source(s) you wish to update:"
+msgstr "选择要升级的软件包的源介质:"
+
+#: ../edit-urpm-sources.pl_.c:198
+#, fuzzy
+msgid "Update"
+msgstr "仅仅升级"
+
+#: ../edit-urpm-sources.pl_.c:206
+#, fuzzy
+msgid "Please wait, updating media..."
+msgstr "查找依赖性..."
+
+#: ../edit-urpm-sources.pl_.c:213
 #, fuzzy
 msgid "Configure sources"
 msgstr "配置源?"
 
-#: ../edit-urpm-sources.pl_.c:193
+#: ../edit-urpm-sources.pl_.c:214
 msgid "Enabled?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:193
+#: ../edit-urpm-sources.pl_.c:214
 msgid "Source"
 msgstr "源"
 
-#: ../edit-urpm-sources.pl_.c:221
-msgid "Add"
-msgstr ""
-
-#: ../edit-urpm-sources.pl_.c:223 ../rpmdrake_.c:436
+#: ../edit-urpm-sources.pl_.c:242 ../rpmdrake_.c:477
 #, fuzzy
 msgid "Remove"
 msgstr "可卸装"
 
-#: ../edit-urpm-sources.pl_.c:225
+#: ../edit-urpm-sources.pl_.c:244
 msgid "Edit"
 msgstr "编辑"
 
-#: ../edit-urpm-sources.pl_.c:229
+#: ../edit-urpm-sources.pl_.c:246
+msgid "Add..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:248
+msgid "Update..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:251
 msgid "Save and quit"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:230 ../rpmdrake_.c:439
+#: ../edit-urpm-sources.pl_.c:252 ../rpmdrake_.c:480
 msgid "Quit"
 msgstr "退出"
 
-#: ../edit-urpm-sources.pl_.c:240 ../rpmdrake_.c:656
+#: ../edit-urpm-sources.pl_.c:262 ../rpmdrake_.c:702
 #, c-format
 msgid ""
 "%s\n"
@@ -194,7 +218,7 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../edit-urpm-sources.pl_.c:243
+#: ../edit-urpm-sources.pl_.c:265
 msgid ""
 "Welcome to the packages source editor!\n"
 "\n"
@@ -203,125 +227,125 @@ msgid ""
 "or to perform updates."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:69
+#: ../rpmdrake.pm_.c:70
 msgid "Yes"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:70
+#: ../rpmdrake.pm_.c:72
 msgid "No"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:141
+#: ../rpmdrake.pm_.c:129
 msgid "Austria"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:142
+#: ../rpmdrake.pm_.c:130
 msgid "Belgium"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:143
+#: ../rpmdrake.pm_.c:131
 msgid "Brazil"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:144
+#: ../rpmdrake.pm_.c:132
 msgid "Canada"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:145
+#: ../rpmdrake.pm_.c:133
 msgid "Costa Rica"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:146
+#: ../rpmdrake.pm_.c:134
 msgid "Czech Republic"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:147
+#: ../rpmdrake.pm_.c:135
 msgid "Germany"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:148
+#: ../rpmdrake.pm_.c:136
 msgid "Danmark"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:149 ../rpmdrake.pm_.c:153
+#: ../rpmdrake.pm_.c:137 ../rpmdrake.pm_.c:141
 msgid "Greece"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:150
+#: ../rpmdrake.pm_.c:138
 msgid "Spain"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:151
+#: ../rpmdrake.pm_.c:139
 #, fuzzy
 msgid "Finland"
 msgstr "找到:"
 
-#: ../rpmdrake.pm_.c:152
+#: ../rpmdrake.pm_.c:140
 #, fuzzy
 msgid "France"
 msgstr "取消"
 
-#: ../rpmdrake.pm_.c:154
+#: ../rpmdrake.pm_.c:142
 #, fuzzy
 msgid "Israel"
 msgstr "已安装"
 
-#: ../rpmdrake.pm_.c:155
+#: ../rpmdrake.pm_.c:143
 #, fuzzy
 msgid "Italy"
 msgstr "已安装"
 
-#: ../rpmdrake.pm_.c:156
+#: ../rpmdrake.pm_.c:144
 msgid "Japan"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:157
+#: ../rpmdrake.pm_.c:145
 msgid "Korea"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:158
+#: ../rpmdrake.pm_.c:146
 msgid "Netherlands"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:159
+#: ../rpmdrake.pm_.c:147
 msgid "Norway"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:160
+#: ../rpmdrake.pm_.c:148
 msgid "Poland"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:161
+#: ../rpmdrake.pm_.c:149
 #, fuzzy
 msgid "Portugal"
 msgstr "端口:"
 
-#: ../rpmdrake.pm_.c:162
+#: ../rpmdrake.pm_.c:150
 msgid "Russia"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:163
+#: ../rpmdrake.pm_.c:151
 msgid "Sweden"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:164
+#: ../rpmdrake.pm_.c:152
 msgid "Taiwan"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:165
+#: ../rpmdrake.pm_.c:153
 msgid "United Kingdom"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:166
+#: ../rpmdrake.pm_.c:154
 msgid "China"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:221
+#: ../rpmdrake.pm_.c:155 ../rpmdrake.pm_.c:156 ../rpmdrake.pm_.c:157
+#: ../rpmdrake.pm_.c:158 ../rpmdrake.pm_.c:209
 msgid "United States"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:229
+#: ../rpmdrake.pm_.c:217
 msgid ""
 "I need to contact MandrakeSoft website to get the mirrors list.\n"
 "Please check that your network is currently running.\n"
@@ -329,15 +353,15 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:233
+#: ../rpmdrake.pm_.c:221
 msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:239
+#: ../rpmdrake.pm_.c:227
 msgid "Error during download"
 msgstr ""
 
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:228
 #, c-format
 msgid ""
 "There was an error downloading the mirrors list:\n"
@@ -347,12 +371,12 @@ msgid ""
 "Please try again later."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:248
+#: ../rpmdrake.pm_.c:236
 #, fuzzy
 msgid "No mirror"
 msgstr "没有错误"
 
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:237
 msgid ""
 "I can't find any suitable mirror.\n"
 "\n"
@@ -361,22 +385,14 @@ msgid ""
 "by Mandrake Linux Official Updates."
 msgstr ""
 
-#: ../rpmdrake.pm_.c:263
+#: ../rpmdrake.pm_.c:251
 #, fuzzy
 msgid "Please choose the desired mirror."
 msgstr ""
 "请稍候\n"
 "正在读取 镜像站点清单"
 
-#: ../rpmdrake_.c:31
-#, c-format
-msgid ""
-"Usage: %s [OPTION]...\n"
-"  --noconfirmation       don't ask first confirmation question in "
-"MandrakeUpdate mode\n"
-msgstr ""
-
-#: ../rpmdrake_.c:78
+#: ../rpmdrake_.c:82
 msgid ""
 "Could not find /var/lib/urpmi/compssUsers.flat,\n"
 "the installer should have generated it for me :-(.\n"
@@ -384,52 +400,52 @@ msgid ""
 "Disabling \"Mandrake choices\" classification."
 msgstr ""
 
-#: ../rpmdrake_.c:118
+#: ../rpmdrake_.c:125
 msgid "(Non available)"
 msgstr ""
 
-#: ../rpmdrake_.c:133
+#: ../rpmdrake_.c:140
 msgid "One of the following packages is needed:"
 msgstr ""
 
-#: ../rpmdrake_.c:133
+#: ../rpmdrake_.c:140
 msgid "Please choose"
 msgstr ""
 
-#: ../rpmdrake_.c:163
+#: ../rpmdrake_.c:170
 #, fuzzy
 msgid "unknown package "
 msgstr "未知页"
 
-#: ../rpmdrake_.c:173
+#: ../rpmdrake_.c:180
 #, fuzzy
 msgid "Please wait, listing packages..."
 msgstr "正在删除软件包，请稍候:"
 
-#: ../rpmdrake_.c:198
+#: ../rpmdrake_.c:205
 msgid "Addable"
 msgstr ""
 
-#: ../rpmdrake_.c:198
+#: ../rpmdrake_.c:205
 msgid "Upgradable"
 msgstr ""
 
-#: ../rpmdrake_.c:231
+#: ../rpmdrake_.c:238
 msgid "This would break your system"
 msgstr ""
 
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:239
 msgid ""
 "Sorry, removing these packages would break your system:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:236
+#: ../rpmdrake_.c:243
 #, fuzzy
 msgid "Some additional packages need to be removed"
 msgstr "这些附加软件包应该安装:"
 
-#: ../rpmdrake_.c:237
+#: ../rpmdrake_.c:244
 #, fuzzy
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
@@ -439,54 +455,54 @@ msgstr ""
 "为了满足所有依赖关系,\n"
 "需要删除下列软件包:"
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:251
 msgid "Some packages can't be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:245 ../rpmdrake_.c:278
+#: ../rpmdrake_.c:252 ../rpmdrake_.c:285
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:259
+#: ../rpmdrake_.c:266
 msgid "Additional packages needed"
 msgstr ""
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:267
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:263
+#: ../rpmdrake_.c:270
 #, fuzzy
 msgid "Some packages can't be installed"
 msgstr "软件包已经安装"
 
-#: ../rpmdrake_.c:264
+#: ../rpmdrake_.c:271
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
 msgstr ""
 
-#: ../rpmdrake_.c:277 ../rpmdrake_.c:403
+#: ../rpmdrake_.c:284 ../rpmdrake_.c:444
 msgid "Some packages need to be removed"
 msgstr ""
 
-#: ../rpmdrake_.c:292
+#: ../rpmdrake_.c:299
 #, c-format
 msgid "Total size: %d / %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:293
+#: ../rpmdrake_.c:300
 #, c-format
 msgid "Total size: %d MB"
 msgstr ""
 
-#: ../rpmdrake_.c:300
+#: ../rpmdrake_.c:307
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -499,7 +515,7 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:304
+#: ../rpmdrake_.c:311
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -511,54 +527,67 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#: ../rpmdrake_.c:330
-msgid "By selection"
-msgstr ""
-
-#: ../rpmdrake_.c:330
-#, fuzzy
-msgid "By size"
-msgstr "深度 大小"
-
-#: ../rpmdrake_.c:331
-msgid "By presence"
-msgstr ""
-
-#: ../rpmdrake_.c:331
-#, fuzzy
-msgid "By source"
-msgstr "源"
-
-#: ../rpmdrake_.c:349
+#: ../rpmdrake_.c:340
 #, fuzzy
 msgid "Bugfixes updates"
 msgstr "安全更新"
 
-#: ../rpmdrake_.c:349
+#: ../rpmdrake_.c:340
 #, fuzzy
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:368
+#: ../rpmdrake_.c:359
 #, fuzzy
 msgid "Mandrake choices"
 msgstr "MandrakeUpdate更新精灵"
 
-#: ../rpmdrake_.c:369
+#: ../rpmdrake_.c:360
+msgid "All packages, alphabetical"
+msgstr ""
+
+#: ../rpmdrake_.c:361
 #, fuzzy
-msgid "All packages, by group"
+msgid "All packages,"
 msgstr "0 软件包， 0 字节"
 
-#: ../rpmdrake_.c:370
-msgid "All packages, alphabetical"
+#: ../rpmdrake_.c:384
+msgid "by group"
+msgstr ""
+
+#: ../rpmdrake_.c:384
+#, fuzzy
+msgid "by size"
+msgstr "深度 大小"
+
+#: ../rpmdrake_.c:385
+msgid "by selection state"
+msgstr ""
+
+#: ../rpmdrake_.c:386
+msgid "by source repository"
 msgstr ""
 
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:395
+#: ../rpmdrake_.c:386
+msgid "by update availability"
+msgstr ""
+
+#: ../rpmdrake_.c:409 ../rpmdrake_.c:435
 #, fuzzy
 msgid "Search results"
 msgstr "搜寻结果"
 
-#: ../rpmdrake_.c:404
+#: ../rpmdrake_.c:409
+#, fuzzy
+msgid "Search results (none)"
+msgstr "搜寻结果"
+
+#: ../rpmdrake_.c:415
+#, fuzzy
+msgid "Please wait, searching in files..."
+msgstr "正在删除软件包，请稍候:"
+
+#: ../rpmdrake_.c:445
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -568,42 +597,42 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:421
+#: ../rpmdrake_.c:462
 msgid "Find:"
 msgstr "找到:"
 
-#: ../rpmdrake_.c:425
+#: ../rpmdrake_.c:466
 #, fuzzy
 msgid "Search"
 msgstr "搜寻"
 
-#: ../rpmdrake_.c:437
+#: ../rpmdrake_.c:478
 #, fuzzy
 msgid "Install"
 msgstr "已安装"
 
-#: ../rpmdrake_.c:448
+#: ../rpmdrake_.c:489
 msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
 msgstr ""
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:490
 #, fuzzy
 msgid "Mandrake Update"
 msgstr ""
 "Mandrake\n"
 "更新"
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:490
 #, fuzzy
 msgid "Software Packages Removal"
 msgstr " 软件管理器 "
 
-#: ../rpmdrake_.c:450
+#: ../rpmdrake_.c:491
 #, fuzzy
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:479
+#: ../rpmdrake_.c:520
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -611,27 +640,27 @@ msgid ""
 "Is it ok to continue?"
 msgstr ""
 
-#: ../rpmdrake_.c:483
+#: ../rpmdrake_.c:524
 msgid "Please wait, contacting mirror to update packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:526
 msgid "Error updating medium"
 msgstr ""
 
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:527
 msgid "There was an unrecoverable error while updating packages information."
 msgstr ""
 
-#: ../rpmdrake_.c:494
+#: ../rpmdrake_.c:535
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr ""
 
-#: ../rpmdrake_.c:498
+#: ../rpmdrake_.c:539
 msgid "Error adding update medium"
 msgstr ""
 
-#: ../rpmdrake_.c:499
+#: ../rpmdrake_.c:540
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -644,68 +673,68 @@ msgid ""
 "Do you want to try another mirror?"
 msgstr ""
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:569
 #, fuzzy
 msgid "Please wait, finding available packages..."
 msgstr "刷新软件包列表"
 
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:606
 #, fuzzy
 msgid "Unable to get source packages."
 msgstr "糟,软件包未找到或读不出"
 
-#: ../rpmdrake_.c:566
+#: ../rpmdrake_.c:607
 msgid "Unable to get source packages, sorry."
 msgstr ""
 
-#: ../rpmdrake_.c:573
+#: ../rpmdrake_.c:614
 msgid "Change medium"
 msgstr ""
 
-#: ../rpmdrake_.c:574
+#: ../rpmdrake_.c:615
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr ""
 
-#: ../rpmdrake_.c:582 ../rpmdrake_.c:590
+#: ../rpmdrake_.c:623 ../rpmdrake_.c:631
 #, fuzzy
 msgid "Installation failed"
 msgstr "可安装"
 
-#: ../rpmdrake_.c:583
+#: ../rpmdrake_.c:624
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
 msgstr ""
 
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:627
 #, fuzzy
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "选择要升级的软件包"
 
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:632
 msgid "There was a problem during installation."
 msgstr ""
 
-#: ../rpmdrake_.c:595
+#: ../rpmdrake_.c:636
 #, fuzzy
 msgid "Everything already installed."
 msgstr "软件包已经安装"
 
-#: ../rpmdrake_.c:596
+#: ../rpmdrake_.c:637
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr ""
 
-#: ../rpmdrake_.c:612
+#: ../rpmdrake_.c:655
 msgid "Please wait, reading packages database..."
 msgstr ""
 
-#: ../rpmdrake_.c:629
+#: ../rpmdrake_.c:672
 #, fuzzy
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候:"
 
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:706
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -713,7 +742,7 @@ msgid ""
 "your computer."
 msgstr ""
 
-#: ../rpmdrake_.c:665
+#: ../rpmdrake_.c:711
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -721,7 +750,7 @@ msgid ""
 "computer."
 msgstr ""
 
-#: ../rpmdrake_.c:670
+#: ../rpmdrake_.c:716
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -731,6 +760,10 @@ msgid ""
 msgstr ""
 
 #, fuzzy
+#~ msgid "By source"
+#~ msgstr "源"
+
+#, fuzzy
 #~ msgid "Unable to update medium."
 #~ msgstr "无法创建报告文件， 中止.\n"
 
@@ -739,10 +772,6 @@ msgstr ""
 #~ msgstr "查找依赖性..."
 
 #, fuzzy
-#~ msgid "Please wait, saving changes..."
-#~ msgstr "正在删除软件包，请稍候:"
-
-#, fuzzy
 #~ msgid "rpmdrake.pl"
 #~ msgstr "启动 rpmdrake"
 
@@ -962,9 +991,6 @@ msgstr ""
 #~ msgid "All"
 #~ msgstr "所有"
 
-#~ msgid "Updates only"
-#~ msgstr "仅仅升级"
-
 #~ msgid "Non-installed only"
 #~ msgstr "仅仅卸载"
 
@@ -1050,11 +1076,6 @@ msgstr ""
 #~ msgstr "更新的源介质"
 
 #~ msgid ""
-#~ "Please choose the sources\n"
-#~ "you want to update:"
-#~ msgstr "选择要升级的软件包的源介质:"
-
-#~ msgid ""
 #~ "Welcome to the Mandrake Update utility!\n"
 #~ "\n"
 #~ "Here, you'll be able to upgrade your system\n"