merge

1 files changed, 312 insertions, 268 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 697c2b6d..b7c0a3de 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-06-18 19:02+0200\n"
+"POT-Creation-Date: 2003-06-27 14:18+0200\n"
 "PO-Revision-Date: 2002-08-25 06:10+0800\n"
 "Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
 "Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -20,14 +20,24 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Other"
+msgid "Enlightenment"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Remote access"
+msgstr "移除 .%s"
+
 #: ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍後，更新媒介中..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "FVWM based"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Canada"
@@ -35,12 +45,7 @@ msgstr "加拿大"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Computer science"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Physics"
+msgid "Python"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -58,25 +63,20 @@ msgstr "所有項目已經都安裝成功了。"
 msgid "Verifying packages signatures..."
 msgstr ""
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "您至少需要輸入前面兩個項目。"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Other"
+msgid "File transfer"
 msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Networking"
-msgstr ""
+#, fuzzy, c-format
+msgid "KDE and Qt"
+msgstr "開發更新"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/XFree86"
-msgstr ""
+msgid "You need to fill up at least the two first entries."
+msgstr "您至少需要輸入前面兩個項目。"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -111,6 +111,11 @@ msgstr ""
 msgid "Search results"
 msgstr "搜尋結果"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Yes"
@@ -137,11 +142,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Hardware"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "How to choose manually your mirror"
 msgstr "如何手動選擇您需要的映射站台"
 
@@ -155,6 +155,11 @@ msgstr ""
 msgid "Package installation..."
 msgstr "正在準備安裝"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "GNOME and GTK+"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Select the media you wish to update:"
@@ -172,21 +177,31 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphics"
+msgid "Chemistry"
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "安裝"
+msgid "True type"
+msgstr "類別"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Kernel and hardware"
+msgid "Base"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Italy"
+msgstr "安裝"
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "You are launching this program as a normal user.\n"
 "You will not be able to perform modifications on the system,\n"
@@ -198,11 +213,6 @@ msgstr ""
 msgid "One of the following packages is needed:"
 msgstr "將需要下列的其中之一套件："
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Python"
-msgstr "開發更新"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "URL:"
@@ -220,7 +230,7 @@ msgstr "錯誤..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Boot and Init"
+msgid "Litterature"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -322,21 +332,11 @@ msgid "Password:"
 msgstr "密碼："
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Servers"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Software Packages Installation"
 msgstr "正在準備安裝"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/KDE"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "in descriptions"
 msgstr "描述"
@@ -356,6 +356,11 @@ msgstr "為了可以全面運作正常這些額外的套件必須一同安裝"
 msgid "All packages, by update availability"
 msgstr "依可供更新分類"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Packaging"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Configure media"
@@ -372,6 +377,11 @@ msgid "Greece"
 msgstr "希臘"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "GNOME"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Monitoring"
 msgstr "沒有進行任何動作"
@@ -424,11 +434,6 @@ msgstr "選擇映射地址..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/WindowMaker"
-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"
@@ -498,6 +503,11 @@ msgstr "埠號："
 
 #: ../rpmdrake:1
 #, c-format
+msgid "IRC"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Downloading package `%s' (%s/%s)..."
 msgstr "正在下載「%s」(%s/%s)..."
 
@@ -508,6 +518,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "C"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Other"
 msgstr "其他"
 
@@ -516,60 +531,50 @@ msgstr "其他"
 msgid "Sweden"
 msgstr "瑞典"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Austria"
-msgstr "奧地利"
+msgid "Boards"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "資訊..."
+msgid "Austria"
+msgstr "奧地利"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Networking/File transfer"
+msgid "Faqs"
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Other"
-msgstr "開發更新"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "資訊..."
 
 #: ../rpmdrake:1
 #, c-format
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Cards"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Japan"
 msgstr "日本"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Networking/Remote access"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Summary: "
 msgstr "摘要"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/Type1"
+msgid "Backup"
 msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/C"
-msgstr "開發更新"
+#, c-format
+msgid "Boot and Init"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
@@ -586,6 +591,11 @@ msgstr "移除 .%s"
 msgid "Importance: "
 msgstr "重要性： "
 
+#: ../rpmdrake:1
+#, c-format
+msgid "WWW"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Unable to create medium."
@@ -626,11 +636,6 @@ msgid "Medium"
 msgstr "比利時"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "System/Internationalization"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Size: "
 msgstr "大小"
@@ -655,11 +660,6 @@ msgstr ""
 msgid "Update media"
 msgstr "更新來源"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Databases"
-msgstr "開發更新"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Please wait, updating medium..."
@@ -695,6 +695,11 @@ msgstr "安裝時發生問題"
 msgid "Terminals"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Kernel and hardware"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Edit"
@@ -705,16 +710,6 @@ msgstr "編輯"
 msgid "Selected: %d MB / Free disk space: %d MB"
 msgstr "已選擇：%d MB / 可用磁碟空間：%d MB"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Books/Other"
-msgstr "其他"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Other"
-msgstr ""
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Australia"
@@ -737,11 +732,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Adventure"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "in files"
 msgstr "依檔案"
 
@@ -751,13 +741,18 @@ msgid "All packages, by group"
 msgstr "所有套件，"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Kernel"
+msgstr "一般"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/FVWM based"
+msgid "Console"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Sports"
+msgid "C++"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -772,6 +767,16 @@ msgstr "搜尋結果 (無任何符合的項目)"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Cd burning"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid ""
 "Welcome to the software installation tool!\n"
 "\n"
@@ -788,11 +793,26 @@ msgstr ""
 msgid "Stop"
 msgstr "停止"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Biology"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Please wait, generating hdlist..."
 msgstr "請稍後，更新媒介中..."
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Internationalization"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Edit a medium"
@@ -847,6 +867,11 @@ msgstr ""
 msgid "Finland"
 msgstr "芬蘭"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "X11 bitmap"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media limit:"
@@ -863,13 +888,13 @@ msgid "Save changes"
 msgstr "儲存變更"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/News"
-msgstr "網路設定："
+#, c-format
+msgid "Instant messaging"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Faqs"
+msgid "News"
 msgstr ""
 
 #. -PO: Keep it short, this is gonna be on a button
@@ -880,6 +905,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer books"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Search"
 msgstr "尋找"
 
@@ -903,16 +933,6 @@ msgid "Spain"
 msgstr "西班牙"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Astronomy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Kernel"
-msgstr "開發更新"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Already existing update media"
 msgstr "新增更新媒介時發生錯誤"
@@ -923,11 +943,6 @@ msgid "Files:\n"
 msgstr "/檔案 (_F)"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Games/Arcade"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Unable to get source packages."
 msgstr "選擇套件"
@@ -937,6 +952,11 @@ msgstr "選擇套件"
 msgid "You may specify a user/password for the proxy authentication:"
 msgstr "您需要指定使用者帳號/密碼，以便於能夠使用代理伺服器認證："
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Chat"
+msgstr "中國大陸"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Update"
@@ -948,11 +968,6 @@ msgid "Additional packages needed"
 msgstr "需要額外的套件項目"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Chat"
-msgstr "網路"
-
-#: ../rpmdrake:1
 #, c-format
 msgid "Running in user mode"
 msgstr ""
@@ -1010,9 +1025,9 @@ msgid "Find:"
 msgstr "尋找："
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Perl"
-msgstr "開發更新"
+#, c-format
+msgid "XFree86"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1025,11 +1040,6 @@ msgid "Removable device"
 msgstr "可移除裝置"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Icewm"
-msgstr ""
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Preparing packages installation..."
 msgstr "正在準備安裝"
@@ -1046,21 +1056,11 @@ msgstr ""
 msgid "Please wait, adding medium..."
 msgstr "請稍後，正在加入媒介來源..."
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Games/Other"
-msgstr "其他"
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Login:"
 msgstr "登入："
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Other"
-msgstr "網路"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Belgium"
@@ -1071,21 +1071,16 @@ msgstr "比利時"
 msgid "File tools"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Archiving/Cd burning"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Sciences/Biology"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Configure proxies"
 msgstr "設定代理伺服器"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Printing"
+msgstr "警告"
+
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid "Starting download of `%s'..."
@@ -1093,11 +1088,6 @@ msgstr "確認 '%s' 套件的簽名資訊"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Libraries"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "A fatal error occurred: %s."
 msgstr ""
 
@@ -1111,16 +1101,6 @@ msgstr "檔案錯誤"
 msgid "Leaves only, sorted by install date"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Strategy"
-msgstr ""
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/Java"
-msgstr "開發更新"
-
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
 msgid ""
@@ -1132,12 +1112,7 @@ msgstr "無法更新媒介，該項目將會暫時自動關閉。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Compression"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Litterature"
+msgid "Geosciences"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1152,25 +1127,20 @@ msgstr ""
 msgid "Communications"
 msgstr ""
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Graphical desktop/Sawfish"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Editing parallel group \"%s\":"
 msgstr "編輯來源 \"%s\"："
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Reason for update: "
-msgstr "更新的原因： "
+#, fuzzy, c-format
+msgid "Configuration"
+msgstr "設定套件來源位置？"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Mathematics"
-msgstr ""
+msgid "Reason for update: "
+msgstr "更新的原因： "
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -1199,7 +1169,7 @@ msgstr "安裝時發生問題"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Enlightenment"
+msgid "WindowMaker"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1224,23 +1194,38 @@ msgid "No package found for installation."
 msgstr "正在準備安裝"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Type1"
+msgstr "類別"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Medium: "
 msgstr ""
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Description: "
 msgstr "描述"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Archiving"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "%s KB"
 msgstr "%.1f KB"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Chemistry"
+msgid "System"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1248,6 +1233,16 @@ msgstr ""
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您需要的套件。"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Servers"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Puzzles"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Local files"
@@ -1275,11 +1270,6 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/IRC"
-msgstr "網路"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid "Name: "
 msgstr "名稱： %s"
 
@@ -1325,7 +1315,7 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Development/GNOME and GTK+"
+msgid "Perl"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1342,12 +1332,22 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Computer science"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "Maximum information"
 msgstr "完整資訊"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Archiving/Backup"
+msgid "Fonts"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Hardware"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1404,8 +1404,8 @@ msgstr "顯示修正錯誤的更新套件"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Networking/WWW"
-msgstr "網路"
+msgid "Java"
+msgstr "日本"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -1424,20 +1424,15 @@ msgstr ""
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Enabled?"
-msgstr "開啟"
-
 #: ../rpmdrake:1
 #, c-format
-msgid "Sciences/Geosciences"
+msgid "Sciences"
 msgstr ""
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "System/Fonts/Console"
-msgstr ""
+msgid "Enabled?"
+msgstr "開啟"
 
 #: ../rpmdrake:1
 #, c-format
@@ -1464,16 +1459,6 @@ msgstr "已安裝"
 msgid " done."
 msgstr ""
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Development/KDE and Qt"
-msgstr "開發更新"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Books/Howtos"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "You need to insert the medium to continue"
@@ -1481,13 +1466,13 @@ msgstr "請插入媒介裝置後繼續"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Games/Boards"
-msgstr ""
+msgid "Too many packages are selected"
+msgstr "選取太多了套件項目"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "選取太多了套件項目"
+msgid "Physics"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
@@ -1499,17 +1484,17 @@ msgstr "沒有進行任何動作"
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Networking/Mail"
-msgstr "網路"
-
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Error during download"
 msgstr "下載發生錯誤"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mail"
+msgstr "巴西"
+
+#: ../rpmdrake:1
 #, c-format
 msgid "Help"
 msgstr "說明"
@@ -1519,6 +1504,11 @@ msgstr "說明"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "抱歉，您需要具備 root 權限身份才可以進行套件安裝。"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Sports"
+msgstr ""
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Taiwan"
@@ -1546,7 +1536,7 @@ msgstr "依來源倉儲分類"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Fonts/X11 bitmap"
+msgid "Compression"
 msgstr ""
 
 #: ../rpmdrake.pm:1
@@ -1559,6 +1549,11 @@ msgstr ""
 msgid "Add a host"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development"
+msgstr "開發更新"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
@@ -1586,11 +1581,6 @@ msgstr "變更媒介"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/GNOME"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
 msgid "Reset the selection"
 msgstr "重置選取項目"
 
@@ -1599,6 +1589,11 @@ msgstr "重置選取項目"
 msgid "Mandrake Update"
 msgstr "MandrakeUpdate 編好設定"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Books"
+msgstr "其他"
+
 #: ../rpmdrake.pm:1
 #, c-format
 msgid ""
@@ -1616,12 +1611,12 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Books/Computer books"
+msgid "Howtos"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Base"
+msgid "Icewm"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1636,6 +1631,11 @@ msgstr ""
 "也許是系統資料庫太舊了，請先更新資料庫後再繼續。"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
 "Removing these packages would break your system, sorry:\n"
@@ -1668,22 +1668,12 @@ msgstr "目前已安裝的版本："
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Development/C++"
-msgstr "開發更新"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Configuration/Printing"
-msgstr ""
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Games/Puzzles"
-msgstr ""
+msgid "Games"
+msgstr "名稱"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "System/Configuration/Packaging"
+msgid "Astronomy"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1708,7 +1698,7 @@ msgstr "名稱"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Graphical desktop/Other"
+msgid "KDE"
 msgstr ""
 
 #: ../rpmdrake:1
@@ -1716,6 +1706,11 @@ msgstr ""
 msgid "No update"
 msgstr "更新"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking"
+msgstr "網路"
+
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
@@ -1726,6 +1721,16 @@ msgstr "確定"
 msgid "Text tools"
 msgstr ""
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Cards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sawfish"
+msgstr ""
+
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Group name:"
@@ -1738,6 +1743,11 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Arcade"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
 msgid "rpmdrake"
 msgstr "rpmdrake"
 
@@ -1746,11 +1756,6 @@ msgstr "rpmdrake"
 msgid "Editing medium \"%s\":"
 msgstr "編輯來源 \"%s\"："
 
-#: ../rpmdrake:1
-#, c-format
-msgid "Networking/Instant messaging"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Add a medium limit"
@@ -1812,11 +1817,6 @@ msgstr ""
 "歡迎來到套件更新程式!\n"
 "接下來程式將會引導你完成套件更新與安裝。"
 
-#: ../rpmdrake:1
-#, c-format
-msgid "System/Fonts/True type"
-msgstr ""
-
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "User:"
@@ -2101,6 +2101,62 @@ msgid "Software Sources Manager"
 msgstr "套件來源管理員"
 
 #, fuzzy
+#~ msgid "Server"
+#~ msgstr "FTP 主機"
+
+#, fuzzy
+#~ msgid "Development/Python"
+#~ msgstr "開發更新"
+
+#, fuzzy
+#~ msgid "Development/Other"
+#~ msgstr "開發更新"
+
+#, fuzzy
+#~ msgid "Development/Databases"
+#~ msgstr "開發更新"
+
+#, fuzzy
+#~ msgid "Networking/News"
+#~ msgstr "網路設定："
+
+#, fuzzy
+#~ msgid "Development/Kernel"
+#~ msgstr "開發更新"
+
+#, fuzzy
+#~ msgid "Networking/Chat"
+#~ msgstr "網路"
+
+#, fuzzy
+#~ msgid "Development/Perl"
+#~ msgstr "開發更新"
+
+#, fuzzy
+#~ msgid "Games/Other"
+#~ msgstr "其他"
+
+#, fuzzy
+#~ msgid "Networking/Other"
+#~ msgstr "網路"
+
+#, fuzzy
+#~ msgid "Development/Java"
+#~ msgstr "開發更新"
+
+#, fuzzy
+#~ msgid "Networking/WWW"
+#~ msgstr "網路"
+
+#, fuzzy
+#~ msgid "Networking/Mail"
+#~ msgstr "網路"
+
+#, fuzzy
+#~ msgid "Development/C++"
+#~ msgstr "開發更新"
+
+#, fuzzy
 #~ msgid "%s conflicts with %s"
 #~ msgstr " 與 %s-%s-%s 沖突"
 
@@ -2389,9 +2445,6 @@ msgstr "套件來源管理員"
 #~ msgid "security"
 #~ msgstr "安全"
 
-#~ msgid "general"
-#~ msgstr "一般"
-
 #~ msgid "bugfix"
 #~ msgstr "錯誤修正"
 
@@ -2409,9 +2462,6 @@ msgstr "套件來源管理員"
 #~ "無法取得須要更新的套件清單\n"
 #~ "嘗試其它映射地址"
 
-#~ msgid "Warning"
-#~ msgstr "警告"
-
 #~ msgid ""
 #~ "Caution! These packages are NOT well tested.\n"
 #~ "You really can screw up your system\n"
@@ -2486,15 +2536,9 @@ msgstr "套件來源管理員"
 #~ msgid "/Help/_About..."
 #~ msgstr "/說明/關於 (_A)..."
 
-#~ msgid "Name"
-#~ msgstr "名稱"
-
 #~ msgid "Installed"
 #~ msgstr "已安裝"
 
-#~ msgid "Type"
-#~ msgstr "類別"
-
 #~ msgid "MandrakeUpdate, version 7.2\n"
 #~ msgstr "MandrakeUpdate，版本 7.2\n"