merge two more strings

1 files changed, 163 insertions, 156 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index db3e8898..33bc2e1b 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-09-05 18:22+0200\n"
+"POT-Creation-Date: 2002-09-11 15:17+0200\n"
 "PO-Revision-Date: 2002-09-02 11:20+0800\n"
 "Last-Translator: Shiyu Tang <ShiyuTang@netscape.net>\n"
 "Language-Team: Simplified Chinese <future-cjk@mandrakesoft.com>\n"
@@ -56,7 +56,7 @@ msgstr "路径或装载点："
 msgid "Removable device"
 msgstr "可移动设备"
 
-#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:484
+#: ../edit-urpm-sources.pl_.c:58 ../rpmdrake_.c:487
 msgid "Security updates"
 msgstr "安全更新"
 
@@ -106,15 +106,15 @@ 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:338 ../rpmdrake_.c:862
-#: ../rpmdrake_.c:888
+#: ../rpmdrake.pm_.c:277 ../rpmdrake_.c:340 ../rpmdrake_.c:868
+#: ../rpmdrake_.c:899
 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:338
-#: ../rpmdrake_.c:888
+#: ../rpmdrake.pm_.c:277 ../rpmdrake.pm_.c:301 ../rpmdrake_.c:340
+#: ../rpmdrake_.c:899
 msgid "Cancel"
 msgstr "取消"
 
@@ -183,7 +183,7 @@ msgstr "激活?"
 msgid "Source"
 msgstr "来源"
 
-#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:658
+#: ../edit-urpm-sources.pl_.c:261 ../rpmdrake_.c:663
 msgid "Remove"
 msgstr "可卸装"
 
@@ -207,11 +207,11 @@ msgstr "代理服务器..."
 msgid "Save and quit"
 msgstr "保存并退出"
 
-#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:661
+#: ../edit-urpm-sources.pl_.c:272 ../rpmdrake_.c:666
 msgid "Quit"
 msgstr "离开"
 
-#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:988
+#: ../edit-urpm-sources.pl_.c:282 ../rpmdrake_.c:1014
 #, c-format
 msgid ""
 "%s\n"
@@ -412,7 +412,7 @@ msgstr ""
 msgid "Please choose the desired mirror."
 msgstr "请选择喜欢的镜像站点。"
 
-#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:563
+#: ../rpmdrake.pm_.c:293 ../rpmdrake_.c:566
 msgid "Update source(s)"
 msgstr "更新介质"
 
@@ -428,75 +428,75 @@ msgstr "更新"
 msgid "Please wait, updating media..."
 msgstr "更新介质，请稍候..."
 
-#: ../rpmdrake_.c:94
+#: ../rpmdrake_.c:96
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake_.c:131 ../rpmdrake_.c:443 ../rpmdrake_.c:444
+#: ../rpmdrake_.c:133 ../rpmdrake_.c:441 ../rpmdrake_.c:442
 msgid "(Not available)"
 msgstr "（不可用）"
 
-#: ../rpmdrake_.c:141 ../rpmdrake_.c:198
+#: ../rpmdrake_.c:143 ../rpmdrake_.c:200
 msgid "Search results"
 msgstr "搜寻结果"
 
-#: ../rpmdrake_.c:141
+#: ../rpmdrake_.c:143
 msgid "Search results (none)"
 msgstr "搜寻结果（无）"
 
-#: ../rpmdrake_.c:151 ../rpmdrake_.c:162
+#: ../rpmdrake_.c:153 ../rpmdrake_.c:164
 msgid "Please wait, searching..."
 msgstr "正在搜寻，请稍候..."
 
-#: ../rpmdrake_.c:165
+#: ../rpmdrake_.c:167
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake_.c:199 ../rpmdrake_.c:305
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
 msgid "Addable"
 msgstr "可添加的"
 
-#: ../rpmdrake_.c:199 ../rpmdrake_.c:305
+#: ../rpmdrake_.c:201 ../rpmdrake_.c:307
 msgid "Upgradable"
 msgstr "可升级的"
 
-#: ../rpmdrake_.c:201
+#: ../rpmdrake_.c:203
 msgid "Not selected"
 msgstr "没有选择"
 
-#: ../rpmdrake_.c:201
+#: ../rpmdrake_.c:203
 msgid "Selected"
 msgstr "选择"
 
-#: ../rpmdrake_.c:214 ../rpmdrake_.c:284
+#: ../rpmdrake_.c:216 ../rpmdrake_.c:286
 msgid "(none)"
 msgstr "（无）"
 
-#: ../rpmdrake_.c:242
+#: ../rpmdrake_.c:244
 msgid "More information on package..."
 msgstr "更多有关该软件包的信息..."
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:246
 msgid "One of the following packages is needed:"
 msgstr "需要下列软件之一："
 
-#: ../rpmdrake_.c:244
+#: ../rpmdrake_.c:246
 msgid "Please choose"
 msgstr "请选择"
 
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:262
 msgid "unknown package "
 msgstr "未知软件包"
 
-#: ../rpmdrake_.c:270
+#: ../rpmdrake_.c:272
 msgid "Please wait, listing packages..."
 msgstr "正在列出软件包，请稍候..."
 
-#: ../rpmdrake_.c:286
+#: ../rpmdrake_.c:288
 msgid "No update"
 msgstr "没有更新"
 
-#: ../rpmdrake_.c:287
+#: ../rpmdrake_.c:289
 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"
@@ -506,11 +506,11 @@ msgstr ""
 "安装的这些软件包没有更新，\n"
 "或者您已经安装过所有的更新。"
 
-#: ../rpmdrake_.c:344
+#: ../rpmdrake_.c:346
 msgid "Some additional packages need to be removed"
 msgstr "另外一些软件包需要删除"
 
-#: ../rpmdrake_.c:345
+#: ../rpmdrake_.c:347
 msgid ""
 "Because of their dependencies, the following package(s) also need to be\n"
 "removed:\n"
@@ -520,11 +520,11 @@ msgstr ""
 "需要删除下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:351
+#: ../rpmdrake_.c:353
 msgid "Some packages can't be removed"
 msgstr "有些软件包无法删除"
 
-#: ../rpmdrake_.c:352 ../rpmdrake_.c:410
+#: ../rpmdrake_.c:354 ../rpmdrake_.c:412
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
 "unselected now:\n"
@@ -534,11 +534,11 @@ msgstr ""
 "下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:380
+#: ../rpmdrake_.c:382
 msgid "Additional packages needed"
 msgstr "需要另外的软件包"
 
-#: ../rpmdrake_.c:381
+#: ../rpmdrake_.c:383
 msgid ""
 "To satisfy dependencies, the following package(s) also need\n"
 "to be installed:\n"
@@ -548,11 +548,11 @@ msgstr ""
 "下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:394
+#: ../rpmdrake_.c:396
 msgid "Some packages can't be installed"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:395
+#: ../rpmdrake_.c:397
 msgid ""
 "Sorry, the following package(s) can't be selected:\n"
 "\n"
@@ -560,149 +560,149 @@ msgstr ""
 "对不起，不能选择下列软件包：\n"
 "\n"
 
-#: ../rpmdrake_.c:409 ../rpmdrake_.c:619
+#: ../rpmdrake_.c:411 ../rpmdrake_.c:624
 msgid "Some packages need to be removed"
 msgstr "需要删除一些软件包"
 
-#: ../rpmdrake_.c:431
+#: ../rpmdrake_.c:433
 #, c-format
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "选中：%d MB / 空闲磁盘空间：%d MB"
 
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:435
 #, c-format
 msgid "Selected size: %d MB"
 msgstr "选中：%d MB"
 
 #: ../rpmdrake_.c:441
-msgid "Source: "
-msgstr "来源: "
-
-#: ../rpmdrake_.c:442
-msgid "Currently installed version: "
-msgstr ""
-
-#: ../rpmdrake_.c:443
 msgid "Files:\n"
 msgstr "文件：\n"
 
-#: ../rpmdrake_.c:444
+#: ../rpmdrake_.c:442
 msgid "Changelog:\n"
 msgstr "更新记录：\n"
 
-#: ../rpmdrake_.c:447
+#: ../rpmdrake_.c:445
+msgid "Source: "
+msgstr "来源: "
+
+#: ../rpmdrake_.c:446
+msgid "Currently installed version: "
+msgstr ""
+
+#: ../rpmdrake_.c:450
 msgid "Reason for update: "
 msgstr ""
 
-#: ../rpmdrake_.c:449
+#: ../rpmdrake_.c:452
 msgid "Name: "
 msgstr "名称： "
 
-#: ../rpmdrake_.c:450
+#: ../rpmdrake_.c:453
 msgid "Version: "
 msgstr "版本： "
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:454
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../rpmdrake_.c:451
+#: ../rpmdrake_.c:454
 msgid "Size: "
 msgstr "大小： "
 
-#: ../rpmdrake_.c:452
+#: ../rpmdrake_.c:455
 msgid "Importance: "
 msgstr "重要性： "
 
-#: ../rpmdrake_.c:453
+#: ../rpmdrake_.c:456
 msgid "Summary: "
 msgstr "摘要： "
 
-#: ../rpmdrake_.c:454
+#: ../rpmdrake_.c:457
 #, fuzzy
 msgid "Description: "
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:463
+#: ../rpmdrake_.c:466
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:487
 msgid "Bugfixes updates"
 msgstr "缺陷修正更新"
 
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:487
 msgid "Normal updates"
 msgstr "正常更新"
 
-#: ../rpmdrake_.c:503
+#: ../rpmdrake_.c:506
 msgid "Mandrake choices"
 msgstr "Mandrake 精选"
 
-#: ../rpmdrake_.c:504
+#: ../rpmdrake_.c:507
 msgid "All packages, alphabetical"
 msgstr "全部软件包, 字母次序"
 
-#: ../rpmdrake_.c:505
+#: ../rpmdrake_.c:508
 msgid "All packages,"
 msgstr "全部软件包,"
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:531
 msgid "by group"
 msgstr "按照分组"
 
-#: ../rpmdrake_.c:528
+#: ../rpmdrake_.c:531
 msgid "by size"
 msgstr "按照大小"
 
-#: ../rpmdrake_.c:529
+#: ../rpmdrake_.c:532
 msgid "by selection state"
 msgstr "按照选择状态"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "by source repository"
 msgstr "按照来源"
 
-#: ../rpmdrake_.c:530
+#: ../rpmdrake_.c:533
 msgid "by update availability"
 msgstr "按照是否可更新"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in descriptions"
 msgstr "在描述中"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in files"
 msgstr "在文件中"
 
-#: ../rpmdrake_.c:551
+#: ../rpmdrake_.c:554
 msgid "in names"
 msgstr "在名称中"
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 #, fuzzy
 msgid "Reload the packages list"
 msgstr "软件包%s未经签署"
 
-#: ../rpmdrake_.c:562
+#: ../rpmdrake_.c:565
 msgid "Reset the selection"
 msgstr ""
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:592
 msgid "Maximum information"
 msgstr "最多信息"
 
-#: ../rpmdrake_.c:587
+#: ../rpmdrake_.c:592
 msgid "Normal information"
 msgstr "正常信息"
 
-#: ../rpmdrake_.c:609
+#: ../rpmdrake_.c:614
 #, fuzzy
 msgid "Too many packages are selected"
 msgstr "有些软件包无法安装"
 
-#: ../rpmdrake_.c:610
+#: ../rpmdrake_.c:615
 msgid ""
 "Warning: it seems that you are attempting to add so much\n"
 "packages that your filesystem may run out of free diskspace,\n"
@@ -712,7 +712,7 @@ msgid ""
 "Do you really want to install all the selected packages?"
 msgstr ""
 
-#: ../rpmdrake_.c:620
+#: ../rpmdrake_.c:625
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -727,35 +727,35 @@ msgstr ""
 "\n"
 "可以继续吗？"
 
-#: ../rpmdrake_.c:642
+#: ../rpmdrake_.c:647
 msgid "Find:"
 msgstr "找到："
 
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:652
 msgid "Search"
 msgstr "搜寻"
 
-#: ../rpmdrake_.c:659
+#: ../rpmdrake_.c:664
 msgid "Install"
 msgstr "安装"
 
-#: ../rpmdrake_.c:685
+#: ../rpmdrake_.c:691
 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:686 data/mandrakeupdate.desktop.in.h:1
+#: ../rpmdrake_.c:692 data/mandrakeupdate.desktop.in.h:1
 msgid "Mandrake Update"
 msgstr "Mandrake 更新"
 
-#: ../rpmdrake_.c:686
+#: ../rpmdrake_.c:692
 msgid "Software Packages Removal"
 msgstr " 软件包删除"
 
-#: ../rpmdrake_.c:687
+#: ../rpmdrake_.c:693
 msgid "Software Packages Installation"
 msgstr "软件包安装"
 
-#: ../rpmdrake_.c:720
+#: ../rpmdrake_.c:726
 msgid ""
 "I need to contact the mirror to get latest update packages.\n"
 "Please check that your network is currently running.\n"
@@ -767,23 +767,23 @@ msgstr ""
 "\n"
 "可以继续吗？"
 
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:730
 msgid "Please wait, contacting mirror to update packages information."
 msgstr "正在连接镜像服务器以得到最新的更新软件包，请稍候。"
 
-#: ../rpmdrake_.c:726
+#: ../rpmdrake_.c:732
 msgid "Error updating medium"
 msgstr "更新介质出错"
 
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:733
 msgid "There was an unrecoverable error while updating packages information."
 msgstr "更新软件包信息时发生不可恢复的错误。"
 
-#: ../rpmdrake_.c:733
+#: ../rpmdrake_.c:739
 msgid "How to choose manually your mirror"
 msgstr "如何手工挑选您的镜像"
 
-#: ../rpmdrake_.c:734
+#: ../rpmdrake_.c:740
 msgid ""
 "You may also choose your desired mirror manually: to do so,\n"
 "launch the Software Sources Manager, and then add a `Security\n"
@@ -797,15 +797,15 @@ msgstr ""
 "\n"
 "然后，重新启动 MandrakeUpdate。"
 
-#: ../rpmdrake_.c:740
+#: ../rpmdrake_.c:746
 msgid "Please wait, contacting mirror to initialize updates packages."
 msgstr "正在联系服务器来初始化更新软件包，请稍候。"
 
-#: ../rpmdrake_.c:744
+#: ../rpmdrake_.c:750
 msgid "Error adding update medium"
 msgstr "添加更新介质出错"
 
-#: ../rpmdrake_.c:745
+#: ../rpmdrake_.c:751
 #, c-format
 msgid ""
 "There was an error while adding the update medium via urpmi.\n"
@@ -825,96 +825,63 @@ msgstr ""
 "\n"
 "要尝试另外的镜像服务器吗？"
 
-#: ../rpmdrake_.c:774
+#: ../rpmdrake_.c:780
 msgid "Please wait, finding available packages..."
 msgstr "正在寻找可安装的软件包，请稍候..."
 
-#: ../rpmdrake_.c:798
-msgid "All requested packages were installed successfully."
-msgstr "所有要求的软件包都已成功安装。"
-
-#: ../rpmdrake_.c:798
-msgid "Everything installed successfully"
-msgstr "所有软件包都已成功安装"
-
-#: ../rpmdrake_.c:801
+#: ../rpmdrake_.c:809
 msgid "Installation finished"
 msgstr "安装完成"
 
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:812
 #, c-format
 msgid "Inspecting %s"
 msgstr "正在检查 %s"
 
-#: ../rpmdrake_.c:820
+#: ../rpmdrake_.c:828
 #, c-format
 msgid "Remove .%s"
 msgstr "卸装 .%s"
 
-#: ../rpmdrake_.c:822
+#: ../rpmdrake_.c:830
 #, c-format
 msgid "Use .%s as main file"
 msgstr "使用 .%s 作为主文件"
 
-#: ../rpmdrake_.c:824
+#: ../rpmdrake_.c:832
 msgid "Do nothing"
 msgstr "不做任何事"
 
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:835
 msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
 
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:852
 msgid "Inspect..."
 msgstr "检查..."
 
-#: ../rpmdrake_.c:857
-#, 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"
-"在执行动作以前，你需要检查一下："
-
-#: ../rpmdrake_.c:858
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr ""
-"有些软件包出现安装\n"
-"失败"
-
-#: ../rpmdrake_.c:859
-msgid "everything was installed correctly"
-msgstr "所有软件包都已成功安装"
-
-#: ../rpmdrake_.c:878
+#: ../rpmdrake_.c:889
 msgid "Unable to get source packages."
 msgstr "源软件包未找到。"
 
-#: ../rpmdrake_.c:879
+#: ../rpmdrake_.c:890
 msgid "Unable to get source packages, sorry."
 msgstr "对不起，无法得到源软件包。"
 
-#: ../rpmdrake_.c:886
+#: ../rpmdrake_.c:897
 msgid "Change medium"
 msgstr "更换介质"
 
-#: ../rpmdrake_.c:887
+#: ../rpmdrake_.c:898
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "请把标记为 \"%s\" 的介质放进设备 [%s]"
 
-#: ../rpmdrake_.c:895
+#: ../rpmdrake_.c:906
 msgid "Installation failed"
 msgstr "安装失败"
 
-#: ../rpmdrake_.c:896
+#: ../rpmdrake_.c:907
 msgid ""
 "Installation failed, some files are missing.\n"
 "You may want to update your sources database."
@@ -922,35 +889,81 @@ msgstr ""
 "安装失败，缺少某些文件。\n"
 "您可能需要更新您的来源数据库。"
 
-#: ../rpmdrake_.c:899
+#: ../rpmdrake_.c:910
 msgid "Please wait, removing packages to allow others to be upgraded..."
 msgstr "为了升级软件包，正在删除旧的软件包，请稍候..."
 
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:921
 msgid "Program missing"
 msgstr "缺少程序"
 
-#: ../rpmdrake_.c:911
+#: ../rpmdrake_.c:922
 msgid "A required program is missing (grpmi). Check your installation."
 msgstr "缺少一个需要的程序（grpmi）。请检查您的安装。"
 
-#: ../rpmdrake_.c:928
+#: ../rpmdrake_.c:932
+#, 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"
+"在执行动作以前，你需要检查一下："
+
+#: ../rpmdrake_.c:932
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr ""
+"有些软件包出现安装\n"
+"失败"
+
+#: ../rpmdrake_.c:933
+msgid "everything was installed correctly"
+msgstr "所有软件包都已成功安装"
+
+#: ../rpmdrake_.c:935
+msgid "Everything installed successfully"
+msgstr "所有软件包都已成功安装"
+
+#: ../rpmdrake_.c:936
+msgid "All requested packages were installed successfully."
+msgstr "所有要求的软件包都已成功安装。"
+
+#: ../rpmdrake_.c:938
 msgid "Everything already installed."
 msgstr "所有软件包已经安装了。"
 
-#: ../rpmdrake_.c:929
+#: ../rpmdrake_.c:939
 msgid "Everything already installed (is this supposed to happen at all?)."
 msgstr "所有软件包已经安装了（这是您希望的吗？）。"
 
-#: ../rpmdrake_.c:939
+#: ../rpmdrake_.c:942
+#, fuzzy
+msgid "Problem during installation"
+msgstr "在安装过程中发生问题"
+
+#: ../rpmdrake_.c:943
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
+"\n"
+"%s"
+msgstr "安装过程中有一个问题。"
+
+#: ../rpmdrake_.c:953
 msgid "Please wait, reading packages database..."
 msgstr "读取软件包数据库，请稍候..."
 
-#: ../rpmdrake_.c:977
+#: ../rpmdrake_.c:991
 msgid "Please wait, removing packages..."
 msgstr "正在删除软件包，请稍候..."
 
-#: ../rpmdrake_.c:992
+#: ../rpmdrake_.c:1018
 msgid ""
 "Welcome to the software removal tool!\n"
 "\n"
@@ -962,7 +975,7 @@ msgstr ""
 "这个工具帮助您选择想要从您的电脑中删除\n"
 "的软件包。"
 
-#: ../rpmdrake_.c:997
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -974,7 +987,7 @@ msgstr ""
 "这个工具帮助您为您的电脑中安装\n"
 "更新的软件包。"
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1071,9 +1084,6 @@ msgstr "安装软件"
 #~ "对不起，删除这些软件包会破坏您的系统：\n"
 #~ "\n"
 
-#~ msgid "There was a problem during installation."
-#~ msgstr "安装过程中有一个问题。"
-
 #~ msgid ""
 #~ "Could not find /var/lib/urpmi/compssUsers.flat,\n"
 #~ "the installer should have generated it for me :-(.\n"
@@ -1275,9 +1285,6 @@ msgstr "安装软件"
 #~ msgid "Force"
 #~ msgstr "强迫"
 
-#~ msgid "Problems occured during installation"
-#~ msgstr "在安装过程中发生问题"
-
 #~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
 #~ msgstr "用法: grpmi <[-noupgrade] rpms>\n"