merge and translate french

1 files changed, 1099 insertions, 661 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 004af202..3317144f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2003-05-28 16:30+0200\n"
+"POT-Creation-Date: 2003-05-28 20:14+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"
@@ -16,170 +16,184 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by size"
-msgstr "所有套件，"
-
-#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Enabled?"
-msgstr "開啟"
+msgid "Archiving/Other"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Path or mount point:"
-msgstr "路徑或是掛載點："
+msgid "Please wait, updating media..."
+msgstr "請稍後，更新媒介中..."
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Portugal"
-msgstr "埠號："
+#, c-format
+msgid "Canada"
+msgstr "加拿大"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software installation tool!\n"
-"\n"
-"Your Mandrake Linux system comes with several thousands of software\n"
-"packages on CDROM or DVD. This tool will help you choose which software\n"
-"you want to install on your computer."
+msgid "Sciences/Computer science"
 msgstr ""
-"Mandrake Linux 系統提供了包羅萬象的軟體套件，\n"
-"這些套件都位於CD 甚至 DVD光碟內。\n"
-"接下來程式將會協助您完成安裝上您所需要的套件項目。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Physics"
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name:"
-msgstr "名稱"
+msgid "Upgradable"
+msgstr "更新"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Italy"
-msgstr "安裝"
+msgid "everything was installed correctly"
+msgstr "所有項目已經都安裝成功了。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "How to choose manually your mirror"
-msgstr "如何手動選擇您需要的映射站台"
+msgid "Verifying packages signatures..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Configure medias"
+msgstr "設定套件來源位置？"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "URL:"
-msgstr "URL："
+msgid "You need to fill up at least the two first entries."
+msgstr "您至少需要輸入前面兩個項目。"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Some packages need to be removed"
-msgstr "某些套件需要順便移除"
+msgid "System/Configuration/Other"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by selection state"
-msgstr "依選擇狀態分類"
+#, c-format
+msgid "System/Configuration/Networking"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "More information on package..."
-msgstr "更多該套件資訊..."
+msgid "System/XFree86"
+msgstr ""
 
 #: ../rpmdrake.pm:1
-#, c-format
-msgid "Yes"
-msgstr "是"
+#, fuzzy, c-format
+msgid "France"
+msgstr "強迫"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"Because of their dependencies, the following package(s) must be\n"
-"unselected now:\n"
+"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"
 "\n"
+"您現在要繼續嗎？"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "everything was installed correctly"
-msgstr "所有項目已經都安裝成功了。"
+#, c-format
+msgid "Search results"
+msgstr "搜尋結果"
 
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "%s KB"
-msgstr "%.1f KB"
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Yes"
+msgstr "是"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
+#, c-format
 msgid ""
-"You may also choose your desired mirror manually: to do so,\n"
-"launch the Software Medias Manager, and then add a `Security\n"
-"updates' media.\n"
+"The installation is finished; %s.\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"Some configuration files were created as `.rpmnew' or `.rpmsave',\n"
+"you may now inspect some in order to take actions:"
 msgstr ""
-"您已經手動選擇您需要的映射站台了，建議您請稍後手動執行\n"
-"套件來源管理員，針對您的映射站台另外加入「安全修正」項目。\n"
+"已經完成安裝 %s 套件了。\n"
 "\n"
-"完成後，請重新啟動 MandrakeUpdate 程式。"
+"請注意一下，該套件可能另外產生了 '.rpmnew' 新版本設定檔案，\n"
+"或者是把原本設定檔案重新命名為 '.rpmsave'，為了能夠讓程式\n"
+"能夠正常執行工作，您需要檢視下面的步驟："
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"Welcome to the software removal tool!\n"
-"\n"
-"This tool will help you choose which software you want to remove from\n"
-"your computer."
+msgid "System/Configuration/Hardware"
 msgstr ""
-"歡迎來到套件移除程式!\n"
-"\n"
-"接下來程式將會引導你完成移除您認為不需要的套件項目。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
-msgstr "為了能夠儲存變更，請置入該媒介裝置後於磁碟機繼續。"
+msgid "Publishing"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Save and quit"
-msgstr "儲存並離開"
+msgid "How to choose manually your mirror"
+msgstr "如何手動選擇您需要的映射站台"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid ""
-"There was a problem during the removal of packages:\n"
-"\n"
-"%s"
+msgid "Package installation..."
+msgstr "正在準備安裝"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Software Packages Removal"
+msgstr "移除套件程式"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Shells"
 msgstr ""
-"安裝套件時發生了下面的錯誤：\n"
-"\n"
-"%s"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Graphics"
+msgstr ""
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Size: "
-msgstr "大小"
+msgid "Italy"
+msgstr "安裝"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by update availability"
-msgstr "依可供更新分類"
+#, c-format
+msgid "System/Kernel and hardware"
+msgstr ""
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Security updates"
-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"
+"but you may still browse the existing database."
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Already existing update medias"
-msgstr "新增更新媒介時發生錯誤"
+#, c-format
+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 "Maximum information"
-msgstr "完整資訊"
+msgid "URL:"
+msgstr "URL："
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Information on packages"
+msgstr "選擇套件"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
@@ -187,83 +201,61 @@ msgid "Proxy..."
 msgstr "錯誤..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Installation failed, some files are missing.\n"
-"You may want to update your medias database."
+#, c-format
+msgid "System/Configuration/Boot and Init"
 msgstr ""
-"安裝失敗。安裝程式找不到一些要安裝上的程式套件。\n"
-"也許是系統資料庫太舊了，請先更新資料庫後再繼續。"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United Kingdom"
-msgstr "聯合國"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "in names"
-msgstr "依名稱"
+msgid "Russia"
+msgstr "蘇俄"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
 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."
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
 msgstr ""
-"安裝程式找不到適合的映射站台。\n"
-"\n"
-"會發生這個問題的情況相當多，比方 Mandrake Linux\n"
-"更新站台目前尚不支援您目前用的機器平台。"
+"如果您需要透過代理伺服器連線，請輸入該主機名稱與連結埠埠號(比方 proxy.hinet."
+"net:80)："
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Remove .%s"
-msgstr "移除 .%s"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Finland"
-msgstr "芬蘭"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"The following packages have bad signatures:\n"
-"\n"
-"%s\n"
+"Because of their dependencies, the following package(s) must be\n"
+"unselected now:\n"
 "\n"
-"Do you want to continue installation?"
 msgstr ""
-"下列的套件需要順便移除，以便於能夠進行其他套件的安裝更新：\n"
-"\n"
-"%s\n"
+"由於相依性的要求，下面的套件將會取消選取以便於能夠繼續進行下去：\n"
 "\n"
-"您確定要繼續嗎？"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining distant file of media `%s'..."
+msgid "Sound"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Verifying packages signatures..."
-msgstr ""
+msgid "Changelog:\n"
+msgstr "變更紀錄：\n"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "France"
-msgstr "強迫"
+#, c-format
+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"
+"您要繼續嗎？"
 
-#. -PO: Keep it short, this is gonna be on a button
 #: ../rpmdrake:1
 #, c-format
-msgid "More info"
-msgstr ""
+msgid "Please wait, searching..."
+msgstr "請稍候，搜尋中..."
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
@@ -278,168 +270,191 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reload the packages list"
-msgstr "重新載入套件清單"
+msgid "Initializing..."
+msgstr "初始化中..."
+
+#: ../rpmdrake:1
+#, c-format
+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"
+"或者是您的系統目前都已經安裝上最新的套件了。"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Emulators"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Choose a mirror..."
-msgstr "選擇映射地址..."
+msgid "Password:"
+msgstr "密碼："
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Some packages can't be installed"
-msgstr "套件 '%s' 無法被安裝\n"
+#, c-format
+msgid "System/Servers"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Unrecoverable error: no package found for installation, sorry."
+msgid "Software Packages Installation"
 msgstr "正在準備安裝"
 
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Type of media:"
-msgstr "來源類別："
-
 #: ../rpmdrake:1
 #, c-format
-msgid "in files"
-msgstr "依檔案"
+msgid "Graphical desktop/KDE"
+msgstr ""
 
 #: ../rpmdrake:1
-#, c-format
-msgid "All requested packages were installed successfully."
-msgstr "已經成功地安裝您需要的套件。"
+#, fuzzy, c-format
+msgid "in descriptions"
+msgstr "描述"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Proxy hostname:"
-msgstr "使用者名稱 (代理伺服器)："
+msgid " failed!"
+msgstr "依檔案"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Local files"
-msgstr "本機檔案"
+msgid "Some additional packages need to be removed"
+msgstr "為了可以全面運作正常這些額外的套件必須一同安裝"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by update availability"
+msgstr "依可供更新分類"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Inspecting %s"
-msgstr "正在檢查 %s"
+msgid "United States"
+msgstr "美國"
 
 #: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Israel"
-msgstr "安裝"
+#, c-format
+msgid "Greece"
+msgstr "希臘"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Help"
-msgstr "/說明 (_H)"
+msgid "Monitoring"
+msgstr "沒有進行任何動作"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "HTTP server"
-msgstr "HTTP 主機"
+msgid "Costa Rica"
+msgstr "哥斯大黎加"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation failed"
-msgstr "全部安裝"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Use .%s as main file"
-msgstr "使用 .%s 為主要檔案"
+msgid "Some packages can't be installed"
+msgstr "套件 '%s' 無法被安裝\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results"
-msgstr "搜尋結果"
+msgid ""
+"The help window has been started, it should appear shortly on your desktop."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid " failed!"
-msgstr "依檔案"
+msgid "No mirror"
+msgstr "映射："
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Add a media"
+msgstr "新增來源："
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Brazil"
-msgstr "巴西"
+msgid "Poland"
+msgstr "波蘭"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Reload the packages list"
+msgstr "重新載入套件清單"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid ""
-"There is already a medium by that name, do you\n"
-"really want to replace it?"
-msgstr ""
-"該媒介裝置項目已經存在了，\n"
-"您確定要置換原本項目嗎？"
+msgid "Path or mount point:"
+msgstr "路徑或是掛載點："
 
-#: ../rpmdrake:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Find:"
-msgstr "尋找："
+msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
+msgstr "請稍後，正在由 MandrakeSoft 總部取回映射站台清單。"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "All packages, alphabetical"
-msgstr "所有套件，依照字母順序分類"
+msgid "Choose a mirror..."
+msgstr "選擇映射地址..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please wait, searching..."
-msgstr "請稍候，搜尋中..."
+msgid "Graphical desktop/WindowMaker"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, reading packages database..."
+#, 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"
+"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"
+"的安裝，以避免任何問題發生。\n"
+"您確定還是要安裝您所選取的套件嗎？"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "unknown package "
-msgstr "不詳"
+msgid "Selected size: %d MB"
+msgstr "選擇了 %d 個套件：%.1f MB"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "請置入媒介名稱為 \"%s\" 的項目放置於 %s 裝置"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Reset the selection"
-msgstr "重置選取項目"
-
-#: ../edit-urpm-sources.pl:1
-#, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
+msgid "Please wait, reading packages database..."
 msgstr ""
-"如果您需要透過代理伺服器連線，請輸入該主機名稱與連結埠埠號(比方 proxy.hinet."
-"net:80)："
+"請稍候\n"
+"排序套件"
 
-#: ../rpmdrake:1
-#, c-format
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
 msgid ""
-"Because of their dependencies, the following package(s) also need to be\n"
-"removed:\n"
+"Welcome to the Software Medias Manager!\n"
 "\n"
+"This tool will help you configure the packages medias 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:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Costa Rica"
-msgstr "哥斯大黎加"
+msgid ""
+"In order to save the changes, you need to insert the medium in the drive."
+msgstr "為了能夠儲存變更，請置入該媒介裝置後於磁碟機繼續。"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by size"
+msgstr "所有套件，"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid ""
-"There was a problem during the installation:\n"
+"There was a problem during the removal of packages:\n"
 "\n"
 "%s"
 msgstr ""
@@ -448,73 +463,132 @@ msgstr ""
 "%s"
 
 #: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Path:"
+msgstr "埠號："
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, removing medium..."
-msgstr "請稍後，正在移除媒介來源..."
+msgid "Downloading package `%s' (%s/%s)..."
+msgstr "正在下載「%s」(%s/%s)..."
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Password:"
-msgstr "密碼："
+msgid "Other"
+msgstr "其他"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Taiwan"
-msgstr "台灣"
+msgid "Sweden"
+msgstr "瑞典"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "User:"
-msgstr "使用者名稱："
+msgid "Select the media(s) you wish to update:"
+msgstr "請選擇您要更新的來源："
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating medium..."
-msgstr "請稍後，更新媒介中..."
+msgid "Austria"
+msgstr "奧地利"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Info..."
+msgstr "資訊..."
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Please wait, listing packages..."
+#, c-format
+msgid "Networking/File transfer"
 msgstr ""
-"請稍候\n"
-"排序套件"
 
-#: ../rpmdrake:1
+#: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "All packages, by media repository"
-msgstr "依來源倉儲分類"
+msgid "Type of media:"
+msgstr "來源類別："
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Information on packages"
-msgstr "選擇套件"
+msgid "Development/Other"
+msgstr "開發更新"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Cancel"
-msgstr "取消"
+msgid "Inspect..."
+msgstr "檢查..."
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Everything installed successfully"
-msgstr "所有項目已經都安裝成功了。"
+msgid "Games/Cards"
+msgstr ""
 
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Select the media(s) you wish to update:"
-msgstr "請選擇您要更新的來源："
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"You already have at least one update media configured, but\n"
+"all of them are currently disabled. You should run the Software\n"
+"Medias Manager to enable at least one (check it in the Enabled?\n"
+"column).\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, updating media..."
-msgstr "請稍後，更新媒介中..."
+msgid "Japan"
+msgstr "日本"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "A fatal error occurred: %s."
+msgid "Networking/Remote access"
 msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Summary: "
+msgstr "摘要"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "%s conflicts with %s"
+msgstr " 與 %s-%s-%s 沖突"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Fonts/Type1"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/C"
+msgstr "開發更新"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "FTP server"
+msgstr "FTP 主機"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Remove .%s"
+msgstr "移除 .%s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Importance: "
+msgstr "重要性： "
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by media repository"
+msgstr "依來源倉儲分類"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Unable to create medium."
+msgstr "無法建立媒介項目。"
+
+#: ../rpmdrake:1
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -530,101 +604,191 @@ msgstr ""
 "您確定要繼續嗎？"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "System/Internationalization"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Examining file of media `%s'..."
+msgstr ""
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "in descriptions"
-msgstr "描述"
+msgid "Size: "
+msgstr "大小"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Office"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Everything installed successfully"
+msgstr "所有項目已經都安裝成功了。"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "unknown package "
+msgstr "不詳"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/Databases"
+msgstr "開發更新"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Configure proxies"
-msgstr "設定代理伺服器"
+msgid "Please wait, updating medium..."
+msgstr "請稍後，更新媒介中..."
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-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 "Installing package `%s' (%s/%s)..."
+msgstr "正在安裝套件 '%s (%s/%s)..."
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Not selected"
+msgstr "偵測到相衝突的資訊"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Please choose"
-msgstr "請選擇"
+msgid "in names"
+msgstr "依名稱"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected size: %d MB"
-msgstr "選擇了 %d 個套件：%.1f MB"
+msgid "Problem during installation"
+msgstr "安裝時發生問題"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Initializing..."
-msgstr "初始化中..."
+msgid "Terminals"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Save changes"
-msgstr "儲存變更"
+msgid "Edit"
+msgstr "編輯"
+
+#: ../rpmdrake:1
+#, c-format
+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 "Error during download"
-msgstr "下載發生錯誤"
+msgid "Australia"
+msgstr "澳洲"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Security updates"
+msgstr "顯示安全更新套件"
+
+#: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Korea"
+msgstr "強迫"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Adventure"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "in files"
+msgstr "依檔案"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Package installation..."
-msgstr "正在準備安裝"
+msgid "All packages, by group"
+msgstr "所有套件，"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Importance: "
-msgstr "重要性： "
+msgid "Graphical desktop/FVWM based"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Media: "
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Games/Sports"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Netherlands"
+msgstr "荷蘭"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Search results (none)"
+msgstr "搜尋結果 (無任何符合的項目)"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"To satisfy dependencies, the following package(s) also need\n"
-"to be installed:\n"
+"Welcome to the software installation tool!\n"
 "\n"
+"Your Mandrake Linux system comes with several thousands of software\n"
+"packages on CDROM or DVD. This tool will help you choose which software\n"
+"you want to install on your computer."
 msgstr ""
-"為了能夠滿足相依性的要求，下面的套件也必須一同安裝上：\n"
-"\n"
+"Mandrake Linux 系統提供了包羅萬象的軟體套件，\n"
+"這些套件都位於CD 甚至 DVD光碟內。\n"
+"接下來程式將會協助您完成安裝上您所需要的套件項目。"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Add..."
-msgstr "新增..."
+msgid "Stop"
+msgstr "停止"
 
-#: ../rpmdrake.pm:1
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Unable to create medium."
-msgstr "無法建立媒介項目。"
+msgid ""
+"There is already a medium by that name, do you\n"
+"really want to replace it?"
+msgstr ""
+"該媒介裝置項目已經存在了，\n"
+"您確定要置換原本項目嗎？"
 
 #: ../rpmdrake:1
 #, c-format
 msgid ""
-"The installation is finished; %s.\n"
+"To satisfy dependencies, the following package(s) also need\n"
+"to be installed:\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"
 "\n"
-"請注意一下，該套件可能另外產生了 '.rpmnew' 新版本設定檔案，\n"
-"或者是把原本設定檔案重新命名為 '.rpmsave'，為了能夠讓程式\n"
-"能夠正常執行工作，您需要檢視下面的步驟："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Browse..."
-msgstr "瀏覽..."
+msgid "HTTP server"
+msgstr "HTTP 主機"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unrecoverable error: no package found for installation, sorry."
+msgstr "正在準備安裝"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
@@ -633,183 +797,327 @@ msgstr "套件 '%s' 無法被安裝\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Info..."
-msgstr "資訊..."
+msgid "Finland"
+msgstr "芬蘭"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "More information on package..."
+msgstr "更多該套件資訊..."
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You need to insert the medium to continue"
-msgstr "請插入媒介裝置後繼續"
+msgid "Save changes"
+msgstr "儲存變更"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"You may also choose your desired mirror manually: to do so,\n"
+"launch the Software Medias Manager, and then add a `Security\n"
+"updates' media.\n"
+"\n"
+"Then, restart MandrakeUpdate."
+msgstr ""
+"您已經手動選擇您需要的映射站台了，建議您請稍後手動執行\n"
+"套件來源管理員，針對您的映射站台另外加入「安全修正」項目。\n"
+"\n"
+"完成後，請重新啟動 MandrakeUpdate 程式。"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/News"
+msgstr "網路設定："
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Books/Faqs"
+msgstr ""
+
+#. -PO: Keep it short, this is gonna be on a button
+#: ../rpmdrake:1
+#, c-format
+msgid "More info"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Search"
+msgstr "尋找"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Copying file for media `%s'..."
+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"
+"\n"
+"會發生這個問題的情況相當多，比方 Mandrake Linux\n"
+"更新站台目前尚不支援您目前用的機器平台。"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Remove"
-msgstr "移除"
+msgid "Spain"
+msgstr "西班牙"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Astronomy"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Preparing packages installation..."
-msgstr "正在準備安裝"
+msgid "Development/Kernel"
+msgstr "開發更新"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1 ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "No mirror"
-msgstr "映射："
+msgid "Update media(s)"
+msgstr "更新來源"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Files:\n"
+msgstr "/檔案 (_F)"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "You need to fill up at least the two first entries."
-msgstr "您至少需要輸入前面兩個項目。"
+msgid "Games/Arcade"
+msgstr ""
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages."
+msgstr "選擇套件"
+
+#: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Install"
-msgstr "安裝"
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr "您需要指定使用者帳號/密碼，以便於能夠使用代理伺服器認證："
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Japan"
-msgstr "日本"
+msgid "Update"
+msgstr "更新"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Do nothing"
-msgstr "沒有進行任何動作"
+msgid "Additional packages needed"
+msgstr "需要額外的套件項目"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "No update"
-msgstr "更新"
+msgid "Networking/Chat"
+msgstr "網路"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Description: "
-msgstr "描述"
+#, c-format
+msgid "Running in user mode"
+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"
-"during or after package installation ; this is particularly\n"
-"dangerous and should be considered with care.\n"
+"Because of their dependencies, the following package(s) also need to be\n"
+"removed:\n"
 "\n"
-"Do you really want to install all the selected packages?"
 msgstr ""
-"警告： 您選取了許多要安裝更新的套件，不過您的磁碟空間\n"
-"似乎已經不敷使用，建議您先整理挪出可用的空間再進行下面\n"
-"的安裝，以避免任何問題發生。\n"
-"您確定還是要安裝您所選取的套件嗎？"
+"為了要滿足相依性需求，這些套件需要被移除：\n"
+"\n"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Editing media \"%s\":"
+msgstr "編輯來源 \"%s\"："
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Name: "
-msgstr "名稱： %s"
+msgid "Please wait, listing packages..."
+msgstr ""
+"請稍候\n"
+"排序套件"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Inspect..."
-msgstr "檢查..."
+msgid "Find:"
+msgstr "尋找："
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Editing media \"%s\":"
-msgstr "編輯來源 \"%s\"："
+msgid "Development/Perl"
+msgstr "開發更新"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "No package found for installation."
-msgstr "正在準備安裝"
+#, c-format
+msgid "Normal information"
+msgstr "一般資訊"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Australia"
-msgstr "澳洲"
+msgid "Copying file for media `%s'..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Removable device"
+msgstr "可移除裝置"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/Icewm"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Installation finished"
-msgstr "已安裝"
+msgid "Preparing packages installation..."
+msgstr "正在準備安裝"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please wait, removing packages..."
+msgstr ""
+"請稍候\n"
+"排序套件"
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Poland"
-msgstr "波蘭"
+msgid "Please wait, adding medium..."
+msgstr "請稍後，正在加入媒介來源..."
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Version: "
-msgstr "版本："
+msgid "Games/Other"
+msgstr "其他"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "You may specify a user/password for the proxy authentication:"
-msgstr "您需要指定使用者帳號/密碼，以便於能夠使用代理伺服器認證："
+msgid "Login:"
+msgstr "登入："
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Upgradable"
-msgstr "更新"
+msgid "Networking/Other"
+msgstr "網路"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid " done."
+msgid "Belgium"
+msgstr "比利時"
+
+#: ../rpmdrake:1
+#, c-format
+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.pm:1
 #, fuzzy, c-format
-msgid "Software Packages Installation"
-msgstr "正在準備安裝"
+msgid "Starting download of `%s'..."
+msgstr "確認 '%s' 套件的簽名資訊"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Additional packages needed"
-msgstr "需要額外的套件項目"
+msgid "System/Libraries"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Leaves only, sorted by install date"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Bugfixes updates"
-msgstr "顯示修正錯誤的更新套件"
+msgid "Fatal error"
+msgstr "檔案錯誤"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Download of `%s', time to go:%s, speed:%s"
+msgid "A fatal error occurred: %s."
 msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Germany"
-msgstr "德國"
+msgid "Games/Strategy"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/Java"
+msgstr "開發更新"
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid ""
+"Unable to update medium; it will be automatically disabled.\n"
+"\n"
+"Errors:\n"
+"%s"
+msgstr "無法更新媒介，該項目將會暫時自動關閉。"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Russia"
-msgstr "蘇俄"
+msgid "Archiving/Compression"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Books/Litterature"
+msgstr ""
 
 #: ../rpmdrake.pm:1
+#, fuzzy, c-format
+msgid "Please choose the desired mirror."
+msgstr ""
+"請稍候\n"
+"正在取回映射地址的清單"
+
+#: ../rpmdrake:1
 #, c-format
-msgid "Norway"
-msgstr "挪威"
+msgid "Communications"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during installation"
-msgstr "安裝時發生問題"
+#, c-format
+msgid "Graphical desktop/Sawfish"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search"
-msgstr "尋找"
+msgid "Reason for update: "
+msgstr "更新的原因： "
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Sciences/Mathematics"
+msgstr ""
+
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Remove"
+msgstr "移除"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Edit a media"
-msgstr "編輯套件來源"
+msgid "Portugal"
+msgstr "埠號："
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -818,222 +1126,423 @@ msgstr "捷克共和國"
 
 #: ../rpmdrake:1
 #, c-format
+msgid "Some packages need to be removed"
+msgstr "某些套件需要順便移除"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Problem during removal"
+msgstr "安裝時發生問題"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/Enlightenment"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Help launched in background"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
 msgid ""
-"You already have at least one update media configured, but\n"
-"all of them are currently disabled. You should run the Software\n"
-"Medias Manager to enable at least one (check it in the Enabled?\n"
-"column).\n"
+"Installation failed, some files are missing.\n"
+"You may want to update your medias database."
+msgstr ""
+"安裝失敗。安裝程式找不到一些要安裝上的程式套件。\n"
+"也許是系統資料庫太舊了，請先更新資料庫後再繼續。"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"There was a problem during the installation:\n"
 "\n"
-"Then, restart MandrakeUpdate."
+"%s"
 msgstr ""
+"安裝套件時發生了下面的錯誤：\n"
+"\n"
+"%s"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Stop"
-msgstr "停止"
+#, fuzzy, c-format
+msgid "No package found for installation."
+msgstr "正在準備安裝"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Update"
-msgstr "更新"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Description: "
+msgstr "描述"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, removing packages..."
+msgid "%s KB"
+msgstr "%.1f KB"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"Sorry, the following package(s) can't be selected:\n"
+"\n"
+"%s\n"
+"\n"
+"Reasons follow:\n"
+"\n"
+"%s"
 msgstr ""
-"請稍候\n"
-"排序套件"
+"抱歉，下面的套件項目將不能夠被選取：\n"
+"\n"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Normal information"
-msgstr "一般資訊"
+msgid "Sciences/Chemistry"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Media: "
-msgstr ""
+msgid "All requested packages were installed successfully."
+msgstr "已經成功地安裝您需要的套件。"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Local files"
+msgstr "本機檔案"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Downloading package `%s' (%s/%s)..."
-msgstr "正在下載「%s」(%s/%s)..."
+msgid "Addable"
+msgstr "可供加入"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Selected: %d MB / Free disk space: %d MB"
-msgstr "已選擇：%d MB / 可用磁碟空間：%d MB"
+msgid "Please choose"
+msgstr "請選擇"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Databases"
+msgstr ""
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/IRC"
+msgstr "網路"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
 msgid "Media"
 msgstr ""
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Name: "
+msgstr "名稱： %s"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Proxy hostname:"
+msgstr "使用者名稱 (代理伺服器)："
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid ""
+"The following packages have bad signatures:\n"
+"\n"
+"%s\n"
+"\n"
+"Do you want to continue installation?"
+msgstr ""
+"下列的套件需要順便移除，以便於能夠進行其他套件的安裝更新：\n"
+"\n"
+"%s\n"
+"\n"
+"您確定要繼續嗎？"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Spain"
-msgstr "西班牙"
+msgid "Download of `%s', speed:%s"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Inspecting %s"
+msgstr "正在檢查 %s"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Video"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Development/GNOME and GTK+"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
 msgid "Normal updates"
 msgstr "正常更新"
 
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Selected"
+msgstr ""
+"全\n"
+"選 "
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Maximum information"
+msgstr "完整資訊"
+
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
-msgstr "請稍後，正在由 MandrakeSoft 總部取回映射站台清單。"
+msgid "Examining distant file of media `%s'..."
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Login:"
-msgstr "登入："
+msgid "Archiving/Backup"
+msgstr ""
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
+#, c-format
+msgid "Quit"
+msgstr "離開"
+
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Adding a media:"
-msgstr "新增來源："
+msgid "Version: "
+msgstr "版本："
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Austria"
-msgstr "奧地利"
+msgid "Norway"
+msgstr "挪威"
 
 #: ../rpmdrake:1
+#, c-format
+msgid "Use .%s as main file"
+msgstr "使用 .%s 為主要檔案"
+
+#: ../rpmdrake.pm:1
 #, fuzzy, c-format
-msgid "Fatal error"
-msgstr "檔案錯誤"
+msgid "Israel"
+msgstr "安裝"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "China"
+msgstr "中國大陸"
+
+#: ../rpmdrake:1
+#, c-format
+msgid ""
+"Welcome to the software removal tool!\n"
+"\n"
+"This tool will help you choose which software you want to remove from\n"
+"your computer."
+msgstr ""
+"歡迎來到套件移除程式!\n"
+"\n"
+"接下來程式將會引導你完成移除您認為不需要的套件項目。"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "(Not available)"
+msgstr "(無法使用)"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Bugfixes updates"
+msgstr "顯示修正錯誤的更新套件"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/WWW"
+msgstr "網路"
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
 msgid "Update..."
 msgstr "更新"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Starting download of `%s'..."
-msgstr "確認 '%s' 套件的簽名資訊"
+msgid "Please wait, finding available packages..."
+msgstr ""
+"請稍候\n"
+"排序套件"
 
-#: ../rpmdrake:1
+#: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
-msgid "(none)"
-msgstr "(無)"
+msgid "Cancel"
+msgstr "取消"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Enabled?"
+msgstr "開啟"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid ""
-"Removing these packages would break your system, sorry:\n"
-"\n"
-msgstr "抱歉，若是移除下面這些套件可能會讓您的系統出錯：\n"
+#, c-format
+msgid "Sciences/Geosciences"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Installing package `%s' (%s/%s)..."
-msgstr "正在安裝套件 '%s (%s/%s)..."
+msgid "System/Fonts/Console"
+msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Currently installed version: "
-msgstr "目前已安裝的版本："
+msgid "All packages, alphabetical"
+msgstr "所有套件，依照字母順序分類"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Other"
-msgstr "其他"
+msgid "Mandrake choices"
+msgstr "Mandrake 分類"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Reason for update: "
-msgstr "更新的原因： "
+msgid "Toys"
+msgstr ""
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please choose the desired mirror."
-msgstr ""
-"請稍候\n"
-"正在取回映射地址的清單"
+msgid "Installation finished"
+msgstr "已安裝"
 
-#: ../edit-urpm-sources.pl:1
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Edit"
-msgstr "編輯"
+msgid " done."
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Please wait, finding available packages..."
+msgid "Development/KDE and Qt"
+msgstr "開發更新"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Books/Howtos"
 msgstr ""
-"請稍候\n"
-"排序套件"
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "Relative path to synthesis/hdlist:"
-msgstr "synthesis/hdlist 檔案的相對路徑："
+msgid "You need to insert the medium to continue"
+msgstr "請插入媒介裝置後繼續"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Search results (none)"
-msgstr "搜尋結果 (無任何符合的項目)"
+msgid "Games/Boards"
+msgstr ""
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Too many packages are selected"
+msgstr "選取太多了套件項目"
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "China"
-msgstr "中國大陸"
+msgid "Do nothing"
+msgstr "沒有進行任何動作"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Networking/Mail"
+msgstr "網路"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "United States"
-msgstr "美國"
+msgid "Error during download"
+msgstr "下載發生錯誤"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "changes:"
-msgstr "儲存變更"
+msgid "Help"
+msgstr "/說明 (_H)"
 
 #: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Unable to get source packages, sorry. %s"
+msgstr "抱歉，您需要具備 root 權限身份才可以進行套件安裝。"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Edit a media"
+msgstr "編輯套件來源"
+
+#: ../rpmdrake.pm:1
 #, c-format
-msgid "Some additional packages need to be removed"
-msgstr "為了可以全面運作正常這些額外的套件必須一同安裝"
+msgid "Taiwan"
+msgstr "台灣"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "rpmdrake"
-msgstr "rpmdrake"
+msgid "(none)"
+msgstr "(無)"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Germany"
+msgstr "德國"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "System/Fonts/X11 bitmap"
+msgstr ""
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "Download of `%s', time to go:%s, speed:%s"
+msgstr ""
 
 #: ../rpmdrake.pm:1
 #, c-format
 msgid "No"
 msgstr "否"
 
+#: ../rpmdrake:1
+#, c-format
+msgid "Install"
+msgstr "安裝"
+
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Configure medias"
-msgstr "設定套件來源位置？"
+#, c-format
+msgid "Add..."
+msgstr "新增..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Change medium"
+msgstr "變更媒介"
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Graphical desktop/GNOME"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
 #, fuzzy, c-format
-msgid "Add a media"
+msgid "Adding a media:"
 msgstr "新增來源："
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Summary: "
-msgstr "摘要"
-
-#: ../rpmdrake.pm:1
 #, c-format
-msgid "Canada"
-msgstr "加拿大"
+msgid "Reset the selection"
+msgstr "重置選取項目"
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Greece"
-msgstr "希臘"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Mandrake Update"
+msgstr "MandrakeUpdate 編好設定"
 
 #: ../rpmdrake.pm:1
 #, c-format
@@ -1051,171 +1560,150 @@ msgstr ""
 "請稍後再試。"
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages, sorry. %s"
-msgstr "抱歉，您需要具備 root 權限身份才可以進行套件安裝。"
-
-#: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid "Path:"
-msgstr "埠號："
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "All packages, by group"
-msgstr "所有套件，"
+#, c-format
+msgid "Books/Computer books"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Problem during removal"
-msgstr "安裝時發生問題"
+#, c-format
+msgid "System/Base"
+msgstr ""
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Selected"
-msgstr ""
-"全\n"
-"選 "
+msgid ""
+"Removing these packages would break your system, sorry:\n"
+"\n"
+msgstr "抱歉，若是移除下面這些套件可能會讓您的系統出錯：\n"
 
 #: ../rpmdrake.pm:1
 #, c-format
-msgid "Netherlands"
-msgstr "荷蘭"
+msgid "Brazil"
+msgstr "巴西"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "Addable"
-msgstr "可供加入"
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "全部安裝"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "(Not available)"
-msgstr "(無法使用)"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
 msgid ""
-"Sorry, the following package(s) can't be selected:\n"
-"\n"
-"%s\n"
 "\n"
-"Reasons follow:\n"
 "\n"
+"Error(s) reported:\n"
 "%s"
 msgstr ""
-"抱歉，下面的套件項目將不能夠被選取：\n"
-"\n"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Not selected"
-msgstr "偵測到相衝突的資訊"
+msgid "Already existing update medias"
+msgstr "新增更新媒介時發生錯誤"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Software Packages Removal"
-msgstr "移除套件程式"
+msgid "Currently installed version: "
+msgstr "目前已安裝的版本："
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Sweden"
-msgstr "瑞典"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Development/C++"
+msgstr "開發更新"
 
 #: ../rpmdrake:1
 #, c-format
-msgid ""
-"\n"
-"\n"
-"Error(s) reported:\n"
-"%s"
+msgid "System/Configuration/Printing"
 msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-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."
+msgid "Games/Puzzles"
 msgstr ""
-"更新的清單項目是空的，也許是您尚未新增任何更新的媒介項目，\n"
-"或者是您的系統目前都已經安裝上最新的套件了。"
 
-#: ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Examining file of media `%s'..."
+msgid "System/Configuration/Packaging"
 msgstr ""
 
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Download of `%s', speed:%s"
-msgstr ""
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Please insert the medium named \"%s\" on device [%s]"
+msgstr "請置入媒介名稱為 \"%s\" 的項目放置於 %s 裝置"
 
 #: ../rpmdrake:1
-#, c-format
-msgid "One of the following packages is needed:"
-msgstr "將需要下列的其中之一套件："
+#, fuzzy, c-format
+msgid "You need to select some packages first."
+msgstr "選擇套件"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Quit"
-msgstr "離開"
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "All packages, by selection state"
+msgstr "依選擇狀態分類"
+
+#: ../edit-urpm-sources.pl:1
+#, fuzzy, c-format
+msgid "Name:"
+msgstr "名稱"
 
 #: ../rpmdrake:1
 #, c-format
-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?"
+msgid "Graphical desktop/Other"
 msgstr ""
-"安裝程式需要連線到映射站台以便於取回最新的更新套件。\n"
-"請確定您目前的網路能夠正常連線到外面。\n"
-"\n"
-"您現在要繼續嗎？"
 
-#: ../rpmdrake:1 ../rpmdrake.pm:1
+#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Update media(s)"
-msgstr "更新來源"
+msgid "No update"
+msgstr "更新"
 
 #: ../rpmdrake:1 ../edit-urpm-sources.pl:1 ../rpmdrake.pm:1
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../rpmdrake:1 ../edit-urpm-sources.pl:1
+#: ../rpmdrake:1
 #, c-format
-msgid "Please wait, adding medium..."
-msgstr "請稍後，正在加入媒介來源..."
+msgid "Text tools"
+msgstr ""
 
 #: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Unable to get source packages."
-msgstr "選擇套件"
+#, c-format
+msgid "rpmdrake"
+msgstr "rpmdrake"
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Too many packages are selected"
-msgstr "選取太多了套件項目"
+msgid "Networking/Instant messaging"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, fuzzy, c-format
-msgid ""
-"Welcome to the Software Medias Manager!\n"
-"\n"
-"This tool will help you configure the packages medias you wish to use on\n"
-"your computer. They will then be available to install new software package\n"
-"or to perform updates."
+#, c-format
+msgid "Please wait, removing medium..."
+msgstr "請稍後，正在移除媒介來源..."
+
+#: ../rpmdrake:1
+#, c-format
+msgid "Accessibility"
 msgstr ""
-"歡迎來到套件來源編輯程式!\n"
-"\n"
-"接下來程式將會引導你完成編輯套件來源的項目，\n"
-"以便於提供您能夠使用您所設定的項目進行軟體的安裝與更新。"
 
 #: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "%s conflicts with %s"
-msgstr " 與 %s-%s-%s 沖突"
+msgid "changes:"
+msgstr "儲存變更"
+
+#: ../rpmdrake:1
+#, fuzzy, c-format
+msgid "Editors"
+msgstr "編輯"
+
+#: ../rpmdrake.pm:1
+#, c-format
+msgid "United Kingdom"
+msgstr "聯合國"
+
+#: ../edit-urpm-sources.pl:1
+#, c-format
+msgid "Relative path to synthesis/hdlist:"
+msgstr "synthesis/hdlist 檔案的相對路徑："
 
 #: ../rpmdrake:1
 #, c-format
@@ -1230,62 +1718,18 @@ msgstr ""
 
 #: ../rpmdrake:1
 #, c-format
-msgid "Mandrake choices"
-msgstr "Mandrake 分類"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Changelog:\n"
-msgstr "變更紀錄：\n"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid "Korea"
-msgstr "強迫"
+msgid "System/Fonts/True type"
+msgstr ""
 
 #: ../edit-urpm-sources.pl:1
-#, c-format
-msgid "Removable device"
-msgstr "可移除裝置"
-
-#: ../rpmdrake.pm:1
-#, c-format
-msgid "Belgium"
-msgstr "比利時"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Change medium"
-msgstr "變更媒介"
-
-#: ../rpmdrake:1
 #, fuzzy, c-format
-msgid "Mandrake Update"
-msgstr "MandrakeUpdate 編好設定"
+msgid "User:"
+msgstr "使用者名稱："
 
 #: ../edit-urpm-sources.pl:1
 #, c-format
-msgid "FTP server"
-msgstr "FTP 主機"
-
-#: ../rpmdrake:1
-#, fuzzy, c-format
-msgid "Files:\n"
-msgstr "/檔案 (_F)"
-
-#: ../rpmdrake.pm:1
-#, fuzzy, c-format
-msgid ""
-"Unable to update medium; it will be automatically disabled.\n"
-"\n"
-"Errors:\n"
-"%s"
-msgstr "無法更新媒介，該項目將會暫時自動關閉。"
-
-#: ../rpmdrake:1
-#, c-format
-msgid "Leaves only, sorted by install date"
-msgstr ""
+msgid "Browse..."
+msgstr "瀏覽..."
 
 #: ../grpmi/curl_download/curl_download.xs:86
 msgid "Download directory does not exist"
@@ -1560,6 +2004,9 @@ msgstr "移除套件"
 msgid "Software Sources Manager"
 msgstr "套件來源管理員"
 
+#~ msgid "Save and quit"
+#~ msgstr "儲存並離開"
+
 #~ msgid "by group"
 #~ msgstr "依群組分類"
 
@@ -1997,9 +2444,6 @@ msgstr "套件來源管理員"
 #~ msgid "Normal Updates"
 #~ msgstr "正常更新"
 
-#~ msgid "Development Updates"
-#~ msgstr "開發更新"
-
 #~ msgid ""
 #~ "The packages are the updates for Mandrake\n"
 #~ "Select the one(s) you want to update\n"
@@ -2069,15 +2513,9 @@ msgstr "套件來源管理員"
 #~ msgid "Disk"
 #~ msgstr "磁碟"
 
-#~ msgid "Network"
-#~ msgstr "網路"
-
 #~ msgid "RPM directory"
 #~ msgstr "RPM 目錄"
 
-#~ msgid "Network settings:"
-#~ msgstr "網路設定："
-
 #~ msgid "Show security updates"
 #~ msgstr "顯示安全更新套件"