merge two more strings

1 files changed, 162 insertions, 155 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 46d63a3d..4dfaaaa6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.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-06 05:50-+800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\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 "取消"
 
@@ -184,7 +184,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 "移除"
 
@@ -208,11 +208,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"
@@ -413,7 +413,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 "更新來源"
 
@@ -429,75 +429,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"
@@ -519,11 +519,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"
@@ -532,11 +532,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"
@@ -545,11 +545,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"
@@ -557,146 +557,146 @@ 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
 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
 msgid "Reload the packages list"
 msgstr "重新載入套件清單"
 
-#: ../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
 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"
@@ -710,7 +710,7 @@ msgstr ""
 "的安裝，以避免任何問題發生。\n"
 "您確定還是要安裝您所選取的套件嗎？"
 
-#: ../rpmdrake_.c:620
+#: ../rpmdrake_.c:625
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -725,35 +725,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"
@@ -765,23 +765,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"
@@ -794,15 +794,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"
@@ -821,95 +821,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' 新版本設定檔案，\n"
-"或者是把原本設定檔案重新命名為 '.rpmsave'，為了能夠讓程式\n"
-"能夠正常執行工作，您需要檢視下面的步驟："
-
-#: ../rpmdrake_.c:858
-msgid ""
-"some packages failed to install\n"
-"correctly"
-msgstr "某些套件無法安裝上"
-
-#: ../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."
@@ -917,35 +885,80 @@ 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' 新版本設定檔案，\n"
+"或者是把原本設定檔案重新命名為 '.rpmsave'，為了能夠讓程式\n"
+"能夠正常執行工作，您需要檢視下面的步驟："
+
+#: ../rpmdrake_.c:932
+msgid ""
+"some packages failed to install\n"
+"correctly"
+msgstr "某些套件無法安裝上"
+
+#: ../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"
@@ -956,7 +969,7 @@ msgstr ""
 "\n"
 "接下來程式將會引導你完成移除您認為不需要的套件項目。"
 
-#: ../rpmdrake_.c:997
+#: ../rpmdrake_.c:1023
 msgid ""
 "Welcome to MandrakeUpdate!\n"
 "\n"
@@ -966,7 +979,7 @@ msgstr ""
 "歡迎來到套件更新程式!\n"
 "接下來程式將會引導你完成套件更新與安裝。"
 
-#: ../rpmdrake_.c:1002
+#: ../rpmdrake_.c:1028
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -1064,9 +1077,6 @@ msgstr "安裝套件"
 #~ "\n"
 #~ msgstr "抱歉，若是移除下面這些套件可能會讓您的系統出錯：\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"
@@ -1268,9 +1278,6 @@ msgstr "安裝套件"
 #~ msgid "Force"
 #~ msgstr "強迫"
 
-#~ msgid "Problems occured during installation"
-#~ msgstr "安裝時發生問題"
-
 #~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
 #~ msgstr "用法: grpmi <[-noupgrade] rpms>\n"