Update Chinese (Traditional) translation from Tx

1 files changed, 208 insertions, 206 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index feeb2e03..f3213dee 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -3,12 +3,12 @@
 #
 # Translators:
 # Cheng-Chia Tseng <pswo10680@gmail.com>, 2018
-# You-Cheng Hsieh <yochenhsieh@gmail.com>, 2013-2014
+# You-Cheng Hsieh <yochenhsieh@gmail.com>, 2013-2014,2018
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "POT-Creation-Date: 2016-10-16 11:23+0200\n"
-"PO-Revision-Date: 2018-12-10 05:47+0000\n"
+"PO-Revision-Date: 2018-12-10 14:27+0000\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/MageiaLinux/mageia/"
 "language/zh_TW/)\n"
@@ -25,7 +25,7 @@ msgid ""
 "no available update for the packages installed on your computer,\n"
 "or you already installed all of them."
 msgstr ""
-"更新的清單是空的。也許是於您系統上安裝的軟體包沒有可用的更新，\n"
+"更新的清單是空的。也許是於您系統上安裝的軟體套件沒有可用的更新，\n"
 "或者您已經全部安裝了。"
 
 #: ../MageiaUpdate:134 ../rpmdrake:96 ../rpmdrake:847 ../rpmdrake.pm:238
@@ -36,7 +36,7 @@ msgstr "軟體管理"
 #: ../MageiaUpdate:158
 #, c-format
 msgid "Here is the list of software package updates"
-msgstr "這是軟體包更新的清單"
+msgstr "這是軟體套件更新的清單"
 
 #: ../MageiaUpdate:165
 #, c-format
@@ -111,7 +111,7 @@ msgstr "NFS"
 #: ../Rpmdrake/edit_urpm_sources.pm:68
 #, c-format
 msgid "Removable"
-msgstr "可移除媒體"
+msgstr "可移除媒體來源"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:69
 #, c-format
@@ -121,12 +121,12 @@ msgstr "rsync"
 #: ../Rpmdrake/edit_urpm_sources.pm:72
 #, c-format
 msgid "Mirror list"
-msgstr "映射站台列表"
+msgstr "鏡像站台列表"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:114
 #, c-format
 msgid "Choose media type"
-msgstr "選擇媒體類型"
+msgstr "選擇媒體來源類型"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:115
 #, c-format
@@ -142,8 +142,8 @@ msgid ""
 "of sources."
 msgstr ""
 "為了保持您的系統的安全與穩定，您必須至少要設定正式的安全性與穩定性更新的來"
-"源。您也可以選擇完整的 Mageia 軟體包來源，讓您可以取得更多好用的軟體。請選擇"
-"您只要安裝更新的來源，還是要完整的來源。"
+"源。您也可以選擇完整的 Mageia 軟體套件來源，讓您可以取得更多好用的軟體。請選"
+"擇您只要安裝更新的來源，還是要完整的來源。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:122
 #, c-format
@@ -166,9 +166,9 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"這樣會試著安裝您的軟體包 (%s) 的所有正式的來源。\n"
+"這樣會試著安裝您的軟體套件 (%s) 的所有正式的來源。\n"
 "\n"
-"這個動作需要連線到 Mageia 網站以取得鏡射站台列表。\n"
+"這個動作需要連線到 Mageia 網站以取得鏡像站台列表。\n"
 "請確定您的網路連線沒有問題。\n"
 "\n"
 "可以繼續了嗎？"
@@ -176,12 +176,12 @@ msgstr ""
 #: ../Rpmdrake/edit_urpm_sources.pm:145 ../Rpmdrake/edit_urpm_sources.pm:160
 #, c-format
 msgid "Please wait, adding media..."
-msgstr "請稍後，新增媒體中..."
+msgstr "請稍後，新增媒體來源中..."
 
 #: ../Rpmdrake/edit_urpm_sources.pm:168
 #, c-format
 msgid "Add a medium"
-msgstr "新增一個媒體"
+msgstr "新增一個媒體來源"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:172
 #, c-format
@@ -191,7 +191,7 @@ msgstr "本地端檔案"
 #: ../Rpmdrake/edit_urpm_sources.pm:172
 #, c-format
 msgid "Medium path:"
-msgstr "媒體路徑："
+msgstr "媒體來源路徑："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:173
 #, c-format
@@ -243,17 +243,17 @@ msgstr "密碼："
 #: ../Rpmdrake/edit_urpm_sources.pm:230
 #, c-format
 msgid "Medium name:"
-msgstr "媒體名稱："
+msgstr "媒體來源名稱："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:236
 #, c-format
 msgid "Create media for a whole distribution"
-msgstr "建立一個適用於所有散布版的媒體"
+msgstr "建立一個適用於所有散布版的媒體來源"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:245
 #, c-format
 msgid "Tag this medium as an update medium"
-msgstr "標示這個媒體為更新媒介"
+msgstr "標示這個媒體來源為更新媒介"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:255
 #, c-format
@@ -266,18 +266,18 @@ msgid ""
 "There is already a medium by that name, do you\n"
 "really want to replace it?"
 msgstr ""
-"這個媒體的名稱已經存在了，\n"
+"這個媒體來源的名稱已經存在了，\n"
 "您確定要取代它嗎？"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:271
 #, c-format
 msgid "Adding a medium:"
-msgstr "正在新增一個媒體："
+msgstr "正在新增一個媒體來源："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:273
 #, c-format
 msgid "Type of medium:"
-msgstr "媒體類別："
+msgstr "媒體來源類別："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:283 ../Rpmdrake/edit_urpm_sources.pm:397
 #: ../Rpmdrake/edit_urpm_sources.pm:495 ../Rpmdrake/edit_urpm_sources.pm:522
@@ -304,7 +304,7 @@ msgstr "確定"
 #: ../Rpmdrake/edit_urpm_sources.pm:340
 #, c-format
 msgid "Global options for package installation"
-msgstr "關於軟體包安裝的全域選項"
+msgstr "關於軟體套件安裝的全域選項"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:342
 #, c-format
@@ -357,12 +357,12 @@ msgid ""
 "For remote media, specify when XML meta-data (file lists, changelogs & "
 "information) are downloaded."
 msgstr ""
-"針對遠端媒體，指定何時要下載 XML meta-data (檔案列表、更新，以及資訊)。"
+"針對遠端媒體來源，指定何時要下載 XML meta-data (檔案列表、更新，以及資訊)。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:380
 #, c-format
 msgid "For remote media, XML meta-data are never downloaded."
-msgstr "針對遠端媒體，永遠不下載 XML meta-data。"
+msgstr "針對遠端媒體來源，永遠不下載 XML meta-data。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:383
 #, c-format
@@ -372,19 +372,19 @@ msgstr "(這是預設值)"
 #: ../Rpmdrake/edit_urpm_sources.pm:384
 #, c-format
 msgid "The specific XML info file is downloaded when clicking on package."
-msgstr "指定的 XML 檔案會在軟體包被點選的時候下載。"
+msgstr "指定的 XML 檔案會在軟體套件被點選的時候下載。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:387
 #, c-format
 msgid ""
 "Updating media implies updating XML info files already required at least "
 "once."
-msgstr "更新媒體時一併更新之前看過的 XML 資訊檔。"
+msgstr "更新媒體來源時一併更新之前看過的 XML 資訊檔。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:390
 #, c-format
 msgid "All XML info files are downloaded when adding or updating media."
-msgstr "所有的 XML 資訊檔案會在新增或更新媒體時下載。"
+msgstr "所有的 XML 資訊檔案會在新增或更新媒體來源時下載。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:419
 #, c-format
@@ -404,17 +404,17 @@ msgstr "您確定要移除以下來源嗎？"
 #: ../Rpmdrake/edit_urpm_sources.pm:428
 #, c-format
 msgid "Please wait, removing medium..."
-msgstr "請稍候，正在移除媒體..."
+msgstr "請稍候，正在移除媒體來源..."
 
 #: ../Rpmdrake/edit_urpm_sources.pm:476
 #, c-format
 msgid "Edit a medium"
-msgstr "編輯媒體"
+msgstr "編輯媒體來源"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:483
 #, c-format
 msgid "Editing medium \"%s\":"
-msgstr "編輯媒體 \"%s\"："
+msgstr "編輯媒體來源 \"%s\"："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:487
 #, c-format
@@ -434,13 +434,13 @@ msgstr "代理伺服器..."
 #: ../Rpmdrake/edit_urpm_sources.pm:520
 #, c-format
 msgid "You need to insert the medium to continue"
-msgstr "您需要放入媒體以便繼續"
+msgstr "您需要放入媒體來源以便繼續"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:521
 #, c-format
 msgid ""
 "In order to save the changes, you need to insert the medium in the drive."
-msgstr "為了儲存變更，您需要在磁碟機置入該媒體。"
+msgstr "為了儲存變更，您需要在磁碟機置入該媒體來源。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:556
 #, c-format
@@ -450,7 +450,7 @@ msgstr "設定代理伺服器"
 #: ../Rpmdrake/edit_urpm_sources.pm:568
 #, c-format
 msgid "Proxy settings for media \"%s\""
-msgstr "媒體 \"%s\" 的代理伺服器設定"
+msgstr "媒體來源 \"%s\" 的代理伺服器設定"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:569
 #, c-format
@@ -494,12 +494,12 @@ msgstr "編輯同步管理群組"
 #: ../Rpmdrake/edit_urpm_sources.pm:700
 #, c-format
 msgid "Add a medium limit"
-msgstr "新增一媒體限定"
+msgstr "新增一媒體來源限定"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:700
 #, c-format
 msgid "Choose a medium to add to the media limit:"
-msgstr "選取要加入媒體限定中的媒體："
+msgstr "選取要加入媒體來源限定中的媒體來源："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:717
 #, c-format
@@ -529,7 +529,7 @@ msgstr "通訊協定："
 #: ../Rpmdrake/edit_urpm_sources.pm:738
 #, c-format
 msgid "Media limit:"
-msgstr "媒體限定："
+msgstr "媒體來源限定："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:743 ../Rpmdrake/edit_urpm_sources.pm:752
 #: ../Rpmdrake/edit_urpm_sources.pm:936 ../Rpmdrake/edit_urpm_sources.pm:1188
@@ -567,7 +567,7 @@ msgstr "通訊協定"
 #: ../Rpmdrake/edit_urpm_sources.pm:787
 #, c-format
 msgid "Media limit"
-msgstr "媒體限定"
+msgstr "媒體來源限定"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:788
 #, c-format
@@ -594,12 +594,12 @@ msgstr "新增..."
 #: ../Rpmdrake/edit_urpm_sources.pm:842
 #, c-format
 msgid "Manage keys for digital signatures of packages"
-msgstr "管理軟體包的數位簽章鑰匙"
+msgstr "管理軟體套件的數位簽章鑰匙"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:848 ../Rpmdrake/edit_urpm_sources.pm:1088
 #, c-format
 msgid "Medium"
-msgstr "媒體"
+msgstr "媒體來源"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:855
 #, c-format
@@ -621,7 +621,7 @@ msgstr "新增一把鑰匙"
 #: ../Rpmdrake/edit_urpm_sources.pm:898
 #, c-format
 msgid "Choose a key to add to the medium %s"
-msgstr "選擇一把要新增到媒體 %s 的鑰匙"
+msgstr "選擇一把要新增到媒體來源 %s 的鑰匙"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:917
 #, c-format
@@ -634,7 +634,7 @@ msgid ""
 "Are you sure you want to remove the key %s from medium %s?\n"
 "(name of the key: %s)"
 msgstr ""
-"您確定要由媒體 %2$s 移除鑰匙 %1$s ？\n"
+"您確定要由媒體來源 %2$s 移除鑰匙 %1$s ？\n"
 "(鑰匙名稱： %3$s)"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:958 ../rpmdrake:255
@@ -650,7 +650,7 @@ msgstr "Copyright (C) %s by Mandriva"
 #: ../Rpmdrake/edit_urpm_sources.pm:962 ../rpmdrake:260
 #, c-format
 msgid "Rpmdrake is the Mageia package management tool."
-msgstr "Rpmdrake 是 Mageia 的軟體包管理工具。"
+msgstr "Rpmdrake 是 Mageia 的軟體套件管理工具。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:964 ../rpmdrake:262
 #, c-format
@@ -669,7 +669,7 @@ msgstr ""
 #: ../Rpmdrake/edit_urpm_sources.pm:978 ../Rpmdrake/edit_urpm_sources.pm:1171
 #, c-format
 msgid "Configure media"
-msgstr "設定媒體"
+msgstr "設定媒體來源"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:986 ../rpmdrake:605
 #, c-format
@@ -689,7 +689,7 @@ msgstr "<control>U"
 #: ../Rpmdrake/edit_urpm_sources.pm:988
 #, c-format
 msgid "Add a specific _media mirror"
-msgstr "新增特定的媒體映射(_m)"
+msgstr "新增特定的媒體來源鏡像 (_M)"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:988
 #, c-format
@@ -699,7 +699,7 @@ msgstr "<control>M"
 #: ../Rpmdrake/edit_urpm_sources.pm:989
 #, c-format
 msgid "_Add a custom medium"
-msgstr "新增自訂媒體 (_A)"
+msgstr "新增自訂媒體來源 (_A)"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:989
 #, c-format
@@ -795,7 +795,7 @@ msgstr "類型"
 #: ../Rpmdrake/edit_urpm_sources.pm:1112
 #, c-format
 msgid "This medium needs to be updated to be usable. Update it now?"
-msgstr "此媒體需要更新才能使用。現在要更新嗎？"
+msgstr "此媒體來源需要更新才能使用。現在要更新嗎？"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:1142
 #, c-format
@@ -804,7 +804,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"無法更新媒體，錯誤訊息如下：\n"
+"無法更新媒體來源，錯誤訊息如下：\n"
 "\n"
 "%s"
 
@@ -821,8 +821,8 @@ msgid ""
 "manager on another desktop, or are you currently installing\n"
 "packages as well?"
 msgstr ""
-"軟體包資料庫被鎖定了。請關閉其它使用到軟體包資料庫的程式。您是否\n"
-"在其他工作區有其它的媒體管理程式，或者您正在安裝軟體包呢？)"
+"軟體套件資料庫被鎖定了。請關閉其它使用到軟體套件資料庫的程式。您是否\n"
+"在其他工作區有其它的媒體來源管理程式，或者您正在安裝軟體套件呢？"
 
 #: ../Rpmdrake/formatting.pm:102
 #, c-format
@@ -847,7 +847,7 @@ msgstr "將釋放 %s 磁碟空間。"
 #: ../Rpmdrake/formatting.pm:171
 #, c-format
 msgid "%s of packages will be retrieved."
-msgstr "將會取回 %s 軟體包。"
+msgstr "將會取回 %s 軟體套件。"
 
 #: ../Rpmdrake/gui.pm:77
 #, c-format
@@ -893,12 +893,12 @@ msgstr "該軟體並非自由軟體"
 #: ../Rpmdrake/gui.pm:164
 #, c-format
 msgid "This package contains a new version that was backported."
-msgstr "這個軟體包有一個較新的版本。"
+msgstr "這個軟體套件有一個較新的版本。"
 
 #: ../Rpmdrake/gui.pm:168
 #, c-format
 msgid "This package is a potential candidate for an update."
-msgstr "這個軟體包是更新檔的測試候選版本。"
+msgstr "這個軟體套件是更新檔的測試候選版本。"
 
 #: ../Rpmdrake/gui.pm:173
 #, c-format
@@ -913,7 +913,7 @@ msgstr "這是非正式的更新。"
 #: ../Rpmdrake/gui.pm:178
 #, c-format
 msgid "This is an official package supported by Mageia"
-msgstr "這是 Mageia 支援的官方軟體包。"
+msgstr "這是 Mageia 支援的官方軟體套件。"
 
 #: ../Rpmdrake/gui.pm:195
 #, c-format
@@ -963,7 +963,7 @@ msgstr "%s KB"
 #: ../Rpmdrake/gui.pm:215 ../Rpmdrake/gui.pm:327 ../rpmdrake.pm:902
 #, c-format
 msgid "Medium: "
-msgstr "媒體："
+msgstr "媒體來源："
 
 #: ../Rpmdrake/gui.pm:228
 #, c-format
@@ -973,7 +973,7 @@ msgstr "新的相依性："
 #: ../Rpmdrake/gui.pm:241
 #, c-format
 msgid "All dependencies installed."
-msgstr "全部相依的軟體包都已安裝了。"
+msgstr "全部相依的軟體套件都已安裝了。"
 
 #: ../Rpmdrake/gui.pm:264
 #, c-format
@@ -988,7 +988,7 @@ msgstr "細節："
 #: ../Rpmdrake/gui.pm:300
 #, c-format
 msgid "Files:"
-msgstr "檔案 (_F)："
+msgstr "檔案："
 
 #: ../Rpmdrake/gui.pm:302
 #, c-format
@@ -998,7 +998,7 @@ msgstr "更新紀錄："
 #: ../Rpmdrake/gui.pm:317
 #, c-format
 msgid "Files:\n"
-msgstr "檔案 (_F)：\n"
+msgstr "檔案：\n"
 
 #: ../Rpmdrake/gui.pm:322
 #, c-format
@@ -1030,12 +1030,12 @@ msgstr "警告"
 #: ../Rpmdrake/gui.pm:361
 #, c-format
 msgid "The package \"%s\" was found."
-msgstr "找到軟體包 \"%s\"。"
+msgstr "找到軟體套件 \"%s\"。"
 
 #: ../Rpmdrake/gui.pm:362
 #, c-format
 msgid "However this package is not in the package list."
-msgstr "但是這個軟體包沒有在軟體包列表中。"
+msgstr "但是這個軟體套件沒有在軟體套件列表中。"
 
 #: ../Rpmdrake/gui.pm:363
 #, c-format
@@ -1045,14 +1045,14 @@ msgstr "您可能需要更新您的 urpmi 資料庫。"
 #: ../Rpmdrake/gui.pm:365
 #, c-format
 msgid "Matching packages:"
-msgstr "符合的軟體包："
+msgstr "符合的軟體套件："
 
 #. -PO: this is list fomatting: "- <package_name> (medium: <medium_name>)"
 #. -PO: eg: "- rpmdrake (medium: "Main Release"
 #: ../Rpmdrake/gui.pm:371
 #, c-format
 msgid "- %s (medium: %s)"
-msgstr "- %s (媒體：%s)"
+msgstr "- %s (媒體來源：%s)"
 
 #: ../Rpmdrake/gui.pm:372
 #, c-format
@@ -1062,7 +1062,7 @@ msgstr "- %s"
 #: ../Rpmdrake/gui.pm:575
 #, c-format
 msgid "Removing package %s would break your system"
-msgstr "移除軟體包 %s 將會破壞您的系統"
+msgstr "移除軟體套件 %s 將會破壞您的系統"
 
 #: ../Rpmdrake/gui.pm:580
 #, c-format
@@ -1070,7 +1070,7 @@ msgid ""
 "The \"%s\" package is in urpmi skip list.\n"
 "Do you want to select it anyway?"
 msgstr ""
-"「%s」軟體包在忽略清單中。\n"
+"「%s」軟體套件在忽略清單中。\n"
 "您還是要選擇它嗎？"
 
 #: ../Rpmdrake/gui.pm:586 ../Rpmdrake/pkg.pm:712
@@ -1079,13 +1079,13 @@ msgid ""
 "Rpmdrake or one of its priority dependencies needs to be updated first. "
 "Rpmdrake will then restart."
 msgstr ""
-"Rpmdrake 或某個與它有相依性關係的軟體包需要先更新。完成後 Rpmdrake 將會重新啟"
-"動。"
+"Rpmdrake 或某個與它有相依性關係的軟體套件需要先更新。完成後 Rpmdrake 將會重新"
+"啟動。"
 
 #: ../Rpmdrake/gui.pm:714 ../Rpmdrake/gui.pm:744 ../Rpmdrake/gui.pm:746
 #, c-format
 msgid "More information on package..."
-msgstr "更多該軟體包的資訊..."
+msgstr "更多該軟體套件的資訊..."
 
 #: ../Rpmdrake/gui.pm:716
 #, c-format
@@ -1095,12 +1095,12 @@ msgstr "請選擇"
 #: ../Rpmdrake/gui.pm:717
 #, c-format
 msgid "The following package is needed:"
-msgstr "需要下列軟體包："
+msgstr "需要下列軟體套件："
 
 #: ../Rpmdrake/gui.pm:717
 #, c-format
 msgid "One of the following packages is needed:"
-msgstr "需要下列軟體包之一："
+msgstr "需要下列軟體套件之一："
 
 #. -PO: Keep it short, this is gonna be on a button
 #: ../Rpmdrake/gui.pm:732 ../Rpmdrake/gui.pm:737
@@ -1111,29 +1111,29 @@ msgstr "更多資訊"
 #: ../Rpmdrake/gui.pm:739
 #, c-format
 msgid "Information on packages"
-msgstr "軟體包資訊"
+msgstr "軟體套件資訊"
 
 #: ../Rpmdrake/gui.pm:767
 #, c-format
 msgid "Checking dependencies of package..."
-msgstr "正在檢查軟體包相依性..."
+msgstr "正在檢查軟體套件相依性..."
 
 #: ../Rpmdrake/gui.pm:772
 #, c-format
 msgid "Some additional packages need to be removed"
-msgstr "一些額外的軟體包必須被移除"
+msgstr "一些額外的軟體套件必須被移除"
 
 #: ../Rpmdrake/gui.pm:783
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) also need to be "
 "removed:"
-msgstr "因為軟體包之間的相依性問題，以下的軟體包將會一起被移除:"
+msgstr "因為軟體套件之間的相依性問題，以下的軟體套件將會一起被移除:"
 
 #: ../Rpmdrake/gui.pm:788
 #, c-format
 msgid "Some packages cannot be removed"
-msgstr "某些軟體包無法被移除"
+msgstr "某些軟體套件無法被移除"
 
 #: ../Rpmdrake/gui.pm:789
 #, c-format
@@ -1141,7 +1141,7 @@ msgid ""
 "Removing these packages would break your system, sorry:\n"
 "\n"
 msgstr ""
-"移除下面這些軟體包將會破壞您的系統，抱歉：\n"
+"移除下面這些軟體套件將會破壞您的系統，抱歉：\n"
 "\n"
 
 #: ../Rpmdrake/gui.pm:798 ../Rpmdrake/gui.pm:875
@@ -1151,13 +1151,13 @@ msgid ""
 "now:\n"
 "\n"
 msgstr ""
-"為了滿足軟體包相依性，以下的軟體包將會取消選取以便於能繼續進行:\n"
+"為了滿足軟體套件相依性，以下的軟體套件將會取消選取以便於能繼續進行:\n"
 " \n"
 
 #: ../Rpmdrake/gui.pm:827
 #, c-format
 msgid "Additional packages needed"
-msgstr "需要額外的軟體包"
+msgstr "需要額外的軟體套件"
 
 #: ../Rpmdrake/gui.pm:828
 #, c-format
@@ -1166,13 +1166,13 @@ msgid ""
 "installed:\n"
 "\n"
 msgstr ""
-"為了滿足軟體包相依性，以下的軟體包也必須一併安裝：\n"
+"為了滿足軟體套件相依性，以下的軟體套件也必須一併安裝：\n"
 " \n"
 
 #: ../Rpmdrake/gui.pm:836
 #, c-format
 msgid "Conflicting Packages"
-msgstr "互相衝突的軟體包"
+msgstr "互相衝突的軟體套件"
 
 #: ../Rpmdrake/gui.pm:850
 #, c-format
@@ -1182,12 +1182,12 @@ msgstr "%s (屬於略過的列表)"
 #: ../Rpmdrake/gui.pm:854
 #, c-format
 msgid "One package cannot be installed"
-msgstr "一個軟體包無法安裝"
+msgstr "一個軟體套件無法安裝"
 
 #: ../Rpmdrake/gui.pm:854
 #, c-format
 msgid "Some packages cannot be installed"
-msgstr "某些軟體包無法被安裝"
+msgstr "某些軟體套件無法被安裝"
 
 #: ../Rpmdrake/gui.pm:856
 #, c-format
@@ -1196,7 +1196,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"抱歉，以下軟體包無法選取：\n"
+"抱歉，以下軟體套件無法選取：\n"
 "\n"
 "%s"
 
@@ -1207,19 +1207,19 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"抱歉，以下軟體包無法選取：\n"
+"抱歉，以下軟體套件無法選取：\n"
 "\n"
 "%s"
 
 #: ../Rpmdrake/gui.pm:874 ../Rpmdrake/pkg.pm:716
 #, c-format
 msgid "Some packages need to be removed"
-msgstr "必須移除某些軟體包"
+msgstr "必須移除某些軟體套件"
 
 #: ../Rpmdrake/gui.pm:909
 #, c-format
 msgid "Some packages are selected."
-msgstr "有些軟體包已被選取"
+msgstr "有些軟體套件已被選取"
 
 #: ../Rpmdrake/gui.pm:909
 #, c-format
@@ -1234,12 +1234,12 @@ msgstr "錯誤：%s 似乎被掛載為唯讀模式。"
 #: ../Rpmdrake/gui.pm:922
 #, c-format
 msgid "You need to select some packages first."
-msgstr "您必須先選擇一些軟體包。"
+msgstr "您必須先選擇一些軟體套件。"
 
 #: ../Rpmdrake/gui.pm:927
 #, c-format
 msgid "Too many packages are selected"
-msgstr "選取了太多軟體包"
+msgstr "選取了太多軟體套件"
 
 #: ../Rpmdrake/gui.pm:928
 #, c-format
@@ -1251,11 +1251,11 @@ msgid ""
 "\n"
 "Do you really want to install all the selected packages?"
 msgstr ""
-"警告：您似乎於軟體包安裝中或之後企圖新增大量的軟體包，\n"
+"警告：您似乎於軟體套件安裝中或之後企圖新增大量的軟體套件，\n"
 "導致於您的磁碟空間已經不敷使用； \n"
 "這是非常危險且應該小心考慮的。\n"
 "\n"
-"您確定要安裝全部選取的軟體包嗎？"
+"您確定要安裝全部選取的軟體套件嗎？"
 
 #: ../Rpmdrake/gui.pm:955 ../Rpmdrake/open_db.pm:84
 #, c-format
@@ -1270,7 +1270,7 @@ msgstr "發生了一個致命的錯誤：%s。"
 #: ../Rpmdrake/gui.pm:992
 #, c-format
 msgid "Please wait, listing packages..."
-msgstr "列出軟體包中，請稍候..."
+msgstr "列出軟體套件中，請稍候..."
 
 #: ../Rpmdrake/gui.pm:1005
 #, c-format
@@ -1301,7 +1301,7 @@ msgstr "可供加入"
 #: ../Rpmdrake/gui.pm:1056
 #, c-format
 msgid "Description not available for this package\n"
-msgstr "這個軟體包沒有可用的說明\n"
+msgstr "這個軟體套件沒有可用的說明\n"
 
 #: ../Rpmdrake/icon.pm:36
 #, c-format
@@ -2040,7 +2040,7 @@ msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯�
 #: ../Rpmdrake/init.pm:52
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
-msgstr "  --media=medium1,..     限制於給定的媒體"
+msgstr "  --media=medium1,..     限制於給定的媒體來源"
 
 #: ../Rpmdrake/init.pm:53
 #, c-format
@@ -2069,12 +2069,12 @@ msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問�
 #: ../Rpmdrake/init.pm:57
 #, c-format
 msgid "  --no-media-update      don't update media at startup"
-msgstr "  --no-media-update      啟動時不更新媒體"
+msgstr "  --no-media-update      啟動時不更新媒體來源"
 
 #: ../Rpmdrake/init.pm:58
 #, c-format
 msgid "  --no-verify-rpm        don't verify package signatures"
-msgstr "  --no-verify-rpm        不驗證軟體包簽章"
+msgstr "  --no-verify-rpm        不驗證軟體套件簽章"
 
 #: ../Rpmdrake/init.pm:59
 #, c-format
@@ -2094,7 +2094,7 @@ msgstr "  --rpm-root=path        rpm 安裝時使用其他的根目錄"
 #, c-format
 msgid ""
 "  --urpmi-root           use another root for urpmi db & rpm installation"
-msgstr "  --urpmi-root          使用另一個根目錄進行 RPM 軟體包的安裝。"
+msgstr "  --urpmi-root          使用另一個根目錄進行 RPM 軟體套件的安裝。"
 
 #: ../Rpmdrake/init.pm:62
 #, c-format
@@ -2153,18 +2153,18 @@ msgstr "請稍候"
 #: ../Rpmdrake/pkg.pm:148
 #, c-format
 msgid "No xml info for medium \"%s\", only partial result for package %s"
-msgstr "媒體 \"%s\" 沒有 xml 資訊，軟體包 %s 只有部份的結果"
+msgstr "媒體來源 \"%s\" 沒有 xml 資訊，軟體套件 %s 只有部份的結果"
 
 #: ../Rpmdrake/pkg.pm:150
 #, c-format
 msgid ""
 "No xml info for medium \"%s\", unable to return any result for package %s"
-msgstr "媒體 \"%s\" 沒有 xml 資訊，無法傳回軟體包 %s 的任何結果"
+msgstr "媒體來源 \"%s\" 沒有 xml 資訊，無法傳回軟體套件 %s 的任何結果"
 
 #: ../Rpmdrake/pkg.pm:204 ../Rpmdrake/pkg.pm:209
 #, c-format
 msgid "Downloading package `%s'..."
-msgstr "正在下載軟體包 `%s'..."
+msgstr "正在下載軟體套件 `%s'..."
 
 #: ../Rpmdrake/pkg.pm:211
 #, c-format
@@ -2189,7 +2189,7 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"我需要連線到映射站台以取得最新的更新軟體包。\n"
+"我需要連線到鏡像站台以取得最新的更新軟體套件。\n"
 "請確定您能夠正常的連結到網際網路上。\n"
 "\n"
 "您要繼續嗎?"
@@ -2202,7 +2202,7 @@ msgstr "下一次不用詢問我"
 #: ../Rpmdrake/pkg.pm:264
 #, c-format
 msgid "Already existing update media"
-msgstr "更新媒體已存在"
+msgstr "更新媒體來源已存在"
 
 #: ../Rpmdrake/pkg.pm:265
 #, c-format
@@ -2214,8 +2214,8 @@ msgid ""
 "\n"
 "Then, restart \"%s\"."
 msgstr ""
-"您已經設定好了至少一個更新媒體，但它們現在全部都是停用的。\n"
-"您應該執行軟體媒體管理員來啟用至少一個媒體 (選取「%s」欄位)。\n"
+"您已經設定好了至少一個更新媒體來源，但它們現在全部都是停用的。\n"
+"您應該執行軟體媒體來源管理員來啟用至少一個媒體來源 (選取「%s」欄位)。\n"
 "\n"
 "完成後，請重新啟動「%s」。"
 
@@ -2234,7 +2234,7 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"這個動作需要連線到 Mageia 網站以取得鏡射站台列表。\n"
+"這個動作需要連線到 Mageia 網站以取得鏡像站台列表。\n"
 "請檢查您的網路連線沒有問題。\n"
 "\n"
 "可以繼續了嗎？"
@@ -2242,7 +2242,7 @@ msgstr ""
 #: ../Rpmdrake/pkg.pm:283
 #, c-format
 msgid "How to choose manually your mirror"
-msgstr "如何手動選擇您需要的映射站台"
+msgstr "如何手動選擇您需要的鏡像站台"
 
 #: ../Rpmdrake/pkg.pm:284
 #, c-format
@@ -2253,15 +2253,15 @@ msgid ""
 "\n"
 "Then, restart %s."
 msgstr ""
-"您也可以手動選擇想要使用的映射站台。要這樣作的話，請開啟軟體\n"
-"媒體管理員，然後新增一個「安全性更新」的媒體。\n"
+"您也可以手動選擇想要使用的鏡像站台。要這樣作的話，請開啟軟體\n"
+"媒體來源管理員，然後新增一個「安全性更新」的媒體來源。\n"
 "\n"
 "完成後，請重新啟動 %s。"
 
 #: ../Rpmdrake/pkg.pm:438 ../Rpmdrake/pkg.pm:736
 #, c-format
 msgid "Package installation..."
-msgstr "軟體包安裝..."
+msgstr "軟體套件安裝..."
 
 #: ../Rpmdrake/pkg.pm:438
 #, c-format
@@ -2276,12 +2276,12 @@ msgstr "讀取更新描述"
 #: ../Rpmdrake/pkg.pm:459 ../Rpmdrake/pkg.pm:494
 #, c-format
 msgid "Please wait, finding available packages..."
-msgstr "請稍候，正在尋找可用的軟體包..."
+msgstr "請稍候，正在尋找可用的軟體套件..."
 
 #: ../Rpmdrake/pkg.pm:465
 #, c-format
 msgid "Please wait, listing base packages..."
-msgstr "列出基礎軟體包中，請稍候..."
+msgstr "列出基礎軟體套件中，請稍候..."
 
 #: ../Rpmdrake/pkg.pm:470 ../Rpmdrake/pkg.pm:849 ../Rpmdrake/pkg.pm:874
 #: ../rpmdrake.pm:814 ../rpmdrake.pm:900 ../rpmdrake.pm:924
@@ -2292,7 +2292,7 @@ msgstr "錯誤"
 #: ../Rpmdrake/pkg.pm:478
 #, c-format
 msgid "Please wait, finding installed packages..."
-msgstr "請稍候，正在尋找已安裝的軟體包..."
+msgstr "請稍候，正在尋找已安裝的軟體套件..."
 
 #: ../Rpmdrake/pkg.pm:590
 #, c-format
@@ -2302,22 +2302,22 @@ msgstr "升級資訊"
 #: ../Rpmdrake/pkg.pm:592
 #, c-format
 msgid "These packages come with upgrade information"
-msgstr "這些軟體包附帶了升級資訊"
+msgstr "這些軟體套件附帶了升級資訊"
 
 #: ../Rpmdrake/pkg.pm:600
 #, c-format
 msgid "Upgrade information about this package"
-msgstr "關於該軟體包的升級資訊"
+msgstr "關於該軟體套件的升級資訊"
 
 #: ../Rpmdrake/pkg.pm:603
 #, c-format
 msgid "Upgrade information about package %s"
-msgstr "關於 %s 軟體包的升級資訊"
+msgstr "關於 %s 軟體套件的升級資訊"
 
 #: ../Rpmdrake/pkg.pm:625 ../Rpmdrake/pkg.pm:866
 #, c-format
 msgid "All requested packages were installed successfully."
-msgstr "已經成功地安裝您要求的全部軟體包。"
+msgstr "已經成功地安裝您要求的全部軟體套件。"
 
 #: ../Rpmdrake/pkg.pm:629 ../Rpmdrake/pkg.pm:835
 #, c-format
@@ -2343,17 +2343,17 @@ msgstr "安裝失敗"
 #: ../Rpmdrake/pkg.pm:673
 #, c-format
 msgid "Checking validity of requested packages..."
-msgstr "正在檢查要求的軟體包的正確性..."
+msgstr "正在檢查要求的軟體套件的正確性..."
 
 #: ../Rpmdrake/pkg.pm:692
 #, c-format
 msgid "Unable to get source packages."
-msgstr "無法取得來源軟體包。"
+msgstr "無法取得來源軟體套件。"
 
 #: ../Rpmdrake/pkg.pm:693
 #, c-format
 msgid "Unable to get source packages, sorry. %s"
-msgstr "無法取得來源軟體包，抱歉。%s"
+msgstr "無法取得來源軟體套件，抱歉。%s"
 
 #: ../Rpmdrake/pkg.pm:694
 #, c-format
@@ -2372,23 +2372,23 @@ msgstr ""
 #, c-format
 msgid "The following package is going to be installed:"
 msgid_plural "The following %d packages are going to be installed:"
-msgstr[0] "將會安裝以下 %d 個軟體包："
+msgstr[0] "將會安裝以下 %d 個軟體套件："
 
 #: ../Rpmdrake/pkg.pm:719
 #, c-format
 msgid "Remove one package?"
 msgid_plural "Remove %d packages?"
-msgstr[0] "移除 %d 個軟體包？"
+msgstr[0] "移除 %d 個軟體套件？"
 
 #: ../Rpmdrake/pkg.pm:721
 #, c-format
 msgid "The following package has to be removed for others to be upgraded:"
-msgstr "需要移除以下軟體包以便更新其他軟體包："
+msgstr "需要移除以下軟體套件以便更新其他軟體套件："
 
 #: ../Rpmdrake/pkg.pm:722
 #, c-format
 msgid "The following packages have to be removed for others to be upgraded:"
-msgstr "必須移除以下軟體包以便升級其他軟體包："
+msgstr "必須移除以下軟體套件以便升級其他軟體套件："
 
 #: ../Rpmdrake/pkg.pm:726
 #, c-format
@@ -2398,23 +2398,23 @@ msgstr "您要繼續嗎？"
 #: ../Rpmdrake/pkg.pm:743 ../Rpmdrake/pkg.pm:909
 #, c-format
 msgid "Orphan packages"
-msgstr "孤兒軟體包"
+msgstr "孤兒軟體套件"
 
 #: ../Rpmdrake/pkg.pm:743
 #, c-format
 msgid "The following orphan package will be removed."
 msgid_plural "The following orphan packages will be removed."
-msgstr[0] "下列不被其他軟體需要的軟體包將會被移除。"
+msgstr[0] "下列不被其他軟體需要的軟體套件將會被移除。"
 
 #: ../Rpmdrake/pkg.pm:809
 #, c-format
 msgid "Change medium"
-msgstr "變更媒體"
+msgstr "變更媒體來源"
 
 #: ../Rpmdrake/pkg.pm:810
 #, c-format
 msgid "Please insert the medium named \"%s\""
-msgstr "請置入名為 \"%s\" 的媒體"
+msgstr "請置入名為 \"%s\" 的媒體來源"
 
 #: ../Rpmdrake/pkg.pm:836
 #, c-format
@@ -2424,7 +2424,7 @@ msgstr "有 %d 個安裝業務失敗"
 #: ../Rpmdrake/pkg.pm:850
 #, c-format
 msgid "Unrecoverable error: no package found for installation, sorry."
-msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的軟體包。"
+msgstr "無法回復的錯誤：抱歉，沒有找到可供安裝的軟體套件。"
 
 #: ../Rpmdrake/pkg.pm:853
 #, c-format
@@ -2467,7 +2467,7 @@ msgstr "細節"
 #: ../Rpmdrake/pkg.pm:927 ../Rpmdrake/pkg.pm:938
 #, c-format
 msgid "Please wait, removing packages..."
-msgstr "正在移除軟體包，請稍候..."
+msgstr "正在移除軟體套件，請稍候..."
 
 #: ../Rpmdrake/pkg.pm:951
 #, c-format
@@ -2481,7 +2481,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"移除軟體包時發生問題：\n"
+"移除軟體套件時發生問題：\n"
 "\n"
 "%s"
 
@@ -2562,8 +2562,8 @@ msgid ""
 "That means you will be able to add new software packages\n"
 "to your system from these new media."
 msgstr ""
-"您正要新增新的軟體包媒體。\n"
-"那表示您將可以由新的媒體安裝新的軟體包到您的系統上。"
+"您正要新增新的軟體套件媒體來源。\n"
+"那表示您將可以由新的媒體來源安裝新的軟體套件到您的系統上。"
 
 #: ../gurpmi.addmedia:125
 #, c-format
@@ -2572,8 +2572,8 @@ msgid ""
 "That means you will be able to add new software packages\n"
 "to your system from these new media."
 msgstr ""
-"您正要新增新的軟體包媒體 %s。\n"
-"那表示您將可以由新的媒體安裝新的軟體包到您的系統上。"
+"您正要新增新的軟體套件媒體來源 %s。\n"
+"那表示您將可以由新的媒體來源安裝新的軟體套件到您的系統上。"
 
 #: ../gurpmi.addmedia:128
 #, c-format
@@ -2582,23 +2582,23 @@ msgid ""
 "That means you will be able to add new software packages\n"
 "to your system from that new medium."
 msgstr ""
-"您正要新增一個新的軟體包媒體 `%s'。\n"
-"那表示您將可以由這個新的媒體安裝新的軟體包到您的系統上。"
+"您正要新增一個新的軟體套件媒體來源 `%s'。\n"
+"那表示您將可以由這個新的媒體來源安裝新的軟體套件到您的系統上。"
 
 #: ../gurpmi.addmedia:152
 #, c-format
 msgid "Successfully added media."
-msgstr "成功的新增了媒體"
+msgstr "成功的新增了媒體來源"
 
 #: ../gurpmi.addmedia:154
 #, c-format
 msgid "Successfully added media %s."
-msgstr "成功的新增了媒體 %s。"
+msgstr "成功的新增了媒體來源 %s。"
 
 #: ../gurpmi.addmedia:155
 #, c-format
 msgid "Successfully added medium `%s'."
-msgstr "成功的新增了媒體 `%s'。"
+msgstr "成功的新增了媒體來源 `%s'。"
 
 #: ../rpmdrake:106
 #, c-format
@@ -2608,7 +2608,7 @@ msgstr "停止"
 #: ../rpmdrake:140
 #, c-format
 msgid "no xml-info available for medium \"%s\""
-msgstr "媒體 \"%s\" 沒有可用的 xml-info"
+msgstr "媒體來源 \"%s\" 沒有可用的 xml-info"
 
 #: ../rpmdrake:156 ../rpmdrake:184
 #, c-format
@@ -2650,12 +2650,12 @@ msgstr "已選擇：%s / 可用磁碟空間：%s"
 #: ../rpmdrake:330
 #, c-format
 msgid "Select packages for (un)installing them"
-msgstr "選取要（解除）安裝的軟體包"
+msgstr "選取要（解除）安裝的軟體套件"
 
 #: ../rpmdrake:337
 #, c-format
 msgid "Package"
-msgstr "軟體包"
+msgstr "軟體套件"
 
 #. -PO: "Architecture" but to be kept *small* !!!
 #: ../rpmdrake:351
@@ -2666,7 +2666,7 @@ msgstr "硬體架構"
 #: ../rpmdrake:353
 #, c-format
 msgid "This shows the architecture for which the package has been built"
-msgstr "這會顯示軟體包所建置的硬體架構目標"
+msgstr "這會顯示軟體套件所建置的硬體架構目標"
 
 #. -PO: "Status" should be kept *small* !!!
 #: ../rpmdrake:381
@@ -2677,36 +2677,36 @@ msgstr "狀態"
 #: ../rpmdrake:388
 #, c-format
 msgid "The icon shows the package status:"
-msgstr "該圖示顯示軟體包的狀態："
+msgstr "該圖示顯示軟體套件的狀態："
 
 #: ../rpmdrake:389
 #, c-format
 msgid "A green icon means the package is installed"
-msgstr "綠色圖示代表軟體包已安裝"
+msgstr "綠色圖示代表軟體套件已安裝"
 
 #: ../rpmdrake:390
 #, c-format
 msgid "A blue icon means this is an update for an installed package"
-msgstr "藍色圖示代表安裝的軟體包有更新可用"
+msgstr "藍色圖示代表安裝的軟體套件有更新可用"
 
 #: ../rpmdrake:391
 #, c-format
 msgid "A red stop sign means the package cannot be removed"
-msgstr "紅色的停止符號代表軟體包無法移除"
+msgstr "紅色的停止符號代表軟體套件無法移除"
 
 #: ../rpmdrake:392
 #, c-format
 msgid ""
 "An orange icon with a down arrow means this package has been selected to be "
 "installed"
-msgstr "橙色圖示加下箭號代表此軟體包已經選取要安裝"
+msgstr "橙色圖示加下箭號代表此軟體套件已經選取要安裝"
 
 #: ../rpmdrake:393
 #, c-format
 msgid ""
 "A red icon with an up arrow means this package has been selected to be "
 "uninstalled"
-msgstr "紅色圖示加上箭號代表此軟體包已經選取要解除安裝"
+msgstr "紅色圖示加上箭號代表此軟體套件已經選取要解除安裝"
 
 #: ../rpmdrake:432
 #, c-format
@@ -2716,12 +2716,12 @@ msgstr "未安裝"
 #: ../rpmdrake:447
 #, c-format
 msgid "All packages, alphabetical"
-msgstr "所有軟體包，依照字母順序排列"
+msgstr "所有軟體套件，依照字母順序排列"
 
 #: ../rpmdrake:448
 #, c-format
 msgid "All packages, by group"
-msgstr "所有軟體包，依照群組分類"
+msgstr "所有軟體套件，依照群組分類"
 
 #: ../rpmdrake:449
 #, c-format
@@ -2731,22 +2731,22 @@ msgstr "不分類，僅依安裝時間排序"
 #: ../rpmdrake:450
 #, c-format
 msgid "All packages, by update availability"
-msgstr "全部軟體包，依可供更新分類"
+msgstr "全部軟體套件，依可供更新分類"
 
 #: ../rpmdrake:451
 #, c-format
 msgid "All packages, by selection state"
-msgstr "全部軟體包，依選取狀態分類"
+msgstr "全部軟體套件，依選取狀態分類"
 
 #: ../rpmdrake:452
 #, c-format
 msgid "All packages, by size"
-msgstr "所有軟體包，依大小排序"
+msgstr "所有軟體套件，依大小排序"
 
 #: ../rpmdrake:453
 #, c-format
 msgid "All packages, by medium repository"
-msgstr "全部軟體包，依媒體分類"
+msgstr "全部軟體套件，依媒體來源分類"
 
 #. -PO: Backports media are newer but less-tested versions of some packages in main
 #. -PO: See http://wiki.mandriva.com/en/Policies/SoftwareMedia#.2Fmain.2Fbackports
@@ -2758,12 +2758,12 @@ msgstr "Backports"
 #: ../rpmdrake:462
 #, c-format
 msgid "Meta packages"
-msgstr "Meta 軟體包"
+msgstr "Meta 軟體套件"
 
 #: ../rpmdrake:463
 #, c-format
 msgid "Packages with GUI"
-msgstr "有 GUI 的軟體包"
+msgstr "有 GUI 的軟體套件"
 
 #: ../rpmdrake:464
 #, c-format
@@ -2818,7 +2818,7 @@ msgstr "依檔案名稱"
 #: ../rpmdrake:607
 #, c-format
 msgid "_Update media"
-msgstr "更新媒體 (_U)"
+msgstr "更新媒體來源 (_U)"
 
 #: ../rpmdrake:612
 #, c-format
@@ -2828,7 +2828,7 @@ msgstr "重新選取 (_R)"
 #: ../rpmdrake:613
 #, c-format
 msgid "Reload the _packages list"
-msgstr "重新載入軟體包清單 (_P)"
+msgstr "重新載入軟體套件清單 (_P)"
 
 #: ../rpmdrake:614
 #, c-format
@@ -2843,7 +2843,7 @@ msgstr "<control>Q"
 #: ../rpmdrake:618
 #, c-format
 msgid "_Media Manager"
-msgstr "媒體管理員(_M)"
+msgstr "媒體來源管理員 (_M)"
 
 #: ../rpmdrake:624
 #, c-format
@@ -2853,7 +2853,7 @@ msgstr "檢視 (_V)"
 #: ../rpmdrake:636
 #, c-format
 msgid "_Select dependencies without asking"
-msgstr "選擇相依軟體包而不詢問 (_S)"
+msgstr "選擇相依軟體套件而不詢問 (_S)"
 
 #: ../rpmdrake:643
 #, c-format
@@ -2863,7 +2863,7 @@ msgstr "成功安裝後清除下載快取"
 #: ../rpmdrake:650
 #, c-format
 msgid "_Show automatically selected packages"
-msgstr "顯示自動選取的軟體包(_S)"
+msgstr "顯示自動選取的軟體套件 (_S)"
 
 #: ../rpmdrake:654
 #, c-format
@@ -2873,7 +2873,7 @@ msgstr "啟動時計算更新(_C)"
 #: ../rpmdrake:657
 #, c-format
 msgid "Search in _full package names"
-msgstr "搜尋完整軟體包名稱 (_F)"
+msgstr "搜尋完整軟體套件名稱 (_F)"
 
 #: ../rpmdrake:660
 #, c-format
@@ -2903,18 +2903,18 @@ msgstr "快速導覽"
 #: ../rpmdrake:795
 #, c-format
 msgid "You can browse the packages through the categories tree on the left."
-msgstr "您可以藉由左側的分類樹來瀏覽軟體軟體包。"
+msgstr "您可以藉由左側的分類目錄來瀏覽軟體套件。"
 
 #: ../rpmdrake:796
 #, c-format
 msgid ""
 "You can view information about a package by clicking on it on the right list."
-msgstr "您可以藉由點擊右側清單中的軟體包來看到它的資訊。"
+msgstr "您可以藉由點擊右側清單中的軟體套件來看到它的資訊。"
 
 #: ../rpmdrake:797
 #, c-format
 msgid "To install, update or remove a package, just click on its \"checkbox\"."
-msgstr "要安裝、升級或者移除一個軟體包，請點擊它的 \"核取按鈕\"。"
+msgstr "要安裝、升級或者移除一個軟體套件，請點擊它的 \"核取按鈕\"。"
 
 #: ../rpmdrake:843
 #, c-format
@@ -2944,17 +2944,17 @@ msgstr "用戶名稱："
 #: ../rpmdrake.pm:233
 #, c-format
 msgid "Software Packages Removal"
-msgstr "軟體包移除"
+msgstr "軟體套件移除"
 
 #: ../rpmdrake.pm:234 ../rpmdrake.pm:238
 #, c-format
 msgid "Software Packages Update"
-msgstr "軟體包升級"
+msgstr "軟體套件升級"
 
 #: ../rpmdrake.pm:235
 #, c-format
 msgid "Software Packages Installation"
-msgstr "軟體包安裝"
+msgstr "軟體套件安裝"
 
 #: ../rpmdrake.pm:283
 #, c-format
@@ -3129,12 +3129,12 @@ msgstr "美國"
 #: ../rpmdrake.pm:578
 #, c-format
 msgid "Please wait, downloading mirror addresses."
-msgstr "請稍候，正在取回映射站台位址。"
+msgstr "請稍候，正在取回鏡像站台位址。"
 
 #: ../rpmdrake.pm:579
 #, c-format
 msgid "Please wait, downloading mirror addresses from the Mageia website."
-msgstr "請稍候，正在從 Mageia 網站下載鏡射站台的列表。"
+msgstr "請稍候，正在從 Mageia 網站下載鏡像站台的列表。"
 
 #: ../rpmdrake.pm:600
 #, c-format
@@ -3149,7 +3149,7 @@ msgid ""
 "\n"
 "Is it ok to continue?"
 msgstr ""
-"我必須連線網際網路上取回映射站台的列表。\n"
+"我必須連線網際網路上取回鏡像站台的列表。\n"
 "請確定您能夠正常的連結到網際網路上。\n"
 "\n"
 "您要繼續嗎？"
@@ -3157,7 +3157,7 @@ msgstr ""
 #: ../rpmdrake.pm:630 ../rpmdrake.pm:669
 #, c-format
 msgid "Mirror choice"
-msgstr "映射站台選擇"
+msgstr "鏡像站台選擇"
 
 #: ../rpmdrake.pm:642
 #, c-format
@@ -3173,7 +3173,7 @@ msgid ""
 "The network, or the website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
-"下載映射站台列表時發生錯誤：\n"
+"下載鏡像站台列表時發生錯誤：\n"
 "\n"
 "%s\n"
 "也許是網路連線失敗，或者是 Mandriva 站台暫時無法聯繫上，\n"
@@ -3188,7 +3188,7 @@ msgid ""
 "The network, or the Mageia website, may be unavailable.\n"
 "Please try again later."
 msgstr ""
-"下載鏡射站台列表時發生問題。\n"
+"下載鏡像站台列表時發生問題。\n"
 "\n"
 "%s\n"
 "網路連線，或是 Mageia 網站可能目前無法使用。\n"
@@ -3197,12 +3197,12 @@ msgstr ""
 #: ../rpmdrake.pm:659
 #, c-format
 msgid "No mirror"
-msgstr "無映射站台"
+msgstr "無鏡像站台"
 
 #: ../rpmdrake.pm:661
 #, c-format
 msgid "I can't find any suitable mirror."
-msgstr "我找不到任何適合的映射站台。"
+msgstr "我找不到任何適合的鏡像站台。"
 
 #: ../rpmdrake.pm:662
 #, c-format
@@ -3213,30 +3213,30 @@ msgid ""
 "the case when the architecture of your processor is not supported\n"
 "by Mageia Official Updates."
 msgstr ""
-"找不到任何合適的鏡射站台。\n"
+"找不到任何合適的鏡像站台。\n"
 "\n"
-"這個問題有很多種可能，最常見的原因是 Mageia 正式更新軟體包並未支援您的處理器"
-"的架構。"
+"這個問題有很多種可能，最常見的原因是 Mageia 正式更新軟體套件並未支援您的處理"
+"器的架構。"
 
 #: ../rpmdrake.pm:681
 #, c-format
 msgid "Please choose the desired mirror."
-msgstr "請選取想要的映射站台。"
+msgstr "請選取想要的鏡像站台。"
 
 #: ../rpmdrake.pm:722
 #, c-format
 msgid "Copying file for medium `%s'..."
-msgstr "正在複製媒體 `%s' 的檔案..."
+msgstr "正在複製媒體來源 `%s' 的檔案..."
 
 #: ../rpmdrake.pm:725
 #, c-format
 msgid "Examining file of medium `%s'..."
-msgstr "正在驗證媒體中的檔案 `%s'..."
+msgstr "正在驗證媒體來源中的檔案 `%s'..."
 
 #: ../rpmdrake.pm:728
 #, c-format
 msgid "Examining remote file of medium `%s'..."
-msgstr "正在驗證遠端媒體中的檔案 `%s'..."
+msgstr "正在驗證遠端媒體來源中的檔案 `%s'..."
 
 #: ../rpmdrake.pm:732
 #, c-format
@@ -3252,7 +3252,7 @@ msgstr " 失敗！"
 #: ../rpmdrake.pm:741
 #, c-format
 msgid "%s from medium %s"
-msgstr "媒體 %2$s 中的 %1$s"
+msgstr "媒體來源 %2$s 中的 %1$s"
 
 #: ../rpmdrake.pm:745
 #, c-format
@@ -3276,7 +3276,7 @@ msgstr "下載 `%s'，速率：%s"
 #: ../rpmdrake.pm:763
 #, c-format
 msgid "Please wait, updating media..."
-msgstr "請稍候，更新媒體中..."
+msgstr "請稍候，更新媒體來源中..."
 
 #: ../rpmdrake.pm:773
 #, c-format
@@ -3286,7 +3286,7 @@ msgstr "已取消"
 #: ../rpmdrake.pm:790
 #, c-format
 msgid "Error retrieving packages"
-msgstr "接收軟體包時發生錯誤"
+msgstr "接收軟體套件時發生錯誤"
 
 #: ../rpmdrake.pm:791
 #, c-format
@@ -3298,25 +3298,27 @@ msgid ""
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 msgstr ""
-"無法由媒體 `%s' 中取得新軟體包的列表。可能是因為這個更新媒體設定錯誤，\n"
-"您必須使用軟體包媒體管理員來移除並重新加入這個媒體來重新設定；或者\n"
-"是因為這個媒體現在無法聯繫上，請您稍待一會再試試看。"
+"無法由媒體來源 `%s' 中取得新軟體套件的列表。可能是因為這個更新媒體來源設定錯"
+"誤，\n"
+"您必須使用軟體套件媒體來源管理員來移除並重新加入這個媒體來源來重新設定；或"
+"者\n"
+"是因為這個媒體來源現在無法聯繫上，請您稍待一會再試試看。"
 
 #: ../rpmdrake.pm:822
 #, c-format
 msgid "Update media"
-msgstr "更新媒體"
+msgstr "更新媒體來源"
 
 #: ../rpmdrake.pm:827
 #, c-format
 msgid ""
 "No active medium found. You must enable some media to be able to update them."
-msgstr "找不到有作用的媒體。您必須啟動這些媒體後才能進行更新。"
+msgstr "找不到有作用的媒體來源。您必須啟動這些媒體來源後才能進行更新。"
 
 #: ../rpmdrake.pm:834
 #, c-format
 msgid "Select the media you wish to update:"
-msgstr "請選擇您要更新的媒體："
+msgstr "請選擇您要更新的媒體來源："
 
 #: ../rpmdrake.pm:880
 #, c-format
@@ -3326,7 +3328,7 @@ msgid ""
 "Errors:\n"
 "%s"
 msgstr ""
-"無法更新媒體，該項目將會自動停用。\n"
+"無法更新媒體來源，該項目將會自動停用。\n"
 "\n"
 "錯誤：\n"
 "%s"
@@ -3338,19 +3340,19 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"無法新增媒體，錯誤訊息如下：\n"
+"無法新增媒體來源，錯誤訊息如下：\n"
 "\n"
 "%s"
 
 #: ../rpmdrake.pm:924
 #, c-format
 msgid "Unable to create medium."
-msgstr "無法建立媒體。"
+msgstr "無法建立媒體來源。"
 
 #: ../rpmdrake.pm:929
 #, c-format
 msgid "Failure when adding medium"
-msgstr "新增媒體時發生錯誤"
+msgstr "新增媒體來源時發生錯誤"
 
 #: ../rpmdrake.pm:930
 #, c-format
@@ -3359,7 +3361,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"新增媒體時發生了下面的錯誤：\n"
+"新增媒體來源時發生了下面的錯誤：\n"
 "\n"
 "%s"
 
@@ -3370,7 +3372,7 @@ msgid ""
 "running (%s).\n"
 "It will be disabled."
 msgstr ""
-"您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
+"您用來更新系統的媒體來源 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
 "它將會被停用。"
 
 #: ../rpmdrake.pm:946
@@ -3380,7 +3382,7 @@ msgid ""
 "you're running (%s).\n"
 "It will be disabled."
 msgstr ""
-"您更新使用的媒體 \"%s\" 與目前您的 Mageia 的版本 (%s) 不符。它將被關閉。"
+"您更新使用的媒體來源 \"%s\" 與目前您的 Mageia 的版本 (%s) 不符。它將被關閉。"
 
 #: ../rpmdrake.pm:977
 #, c-format
@@ -3399,7 +3401,7 @@ msgstr "檢視可用的軟體"
 
 #: ../data/rpmdrake-browse-only.desktop.in.h:2
 msgid "A graphical front end for browsing installed & available packages"
-msgstr "檢視已安裝及可用的軟體包"
+msgstr "檢視已安裝及可用的軟體套件"
 
 #: ../data/rpmdrake.desktop.in.h:1
 msgid "Install & Remove Software"
@@ -3411,39 +3413,39 @@ msgstr "安裝、移除與更新軟體"
 
 #: ../data/rpmdrake-sources.desktop.in.h:1
 msgid "Software Media Manager"
-msgstr "軟體包媒體管理員"
+msgstr "軟體套件媒體來源管理員"
 
 #: ../mime/gurpmi.addmedia.desktop.in.h:1
 msgid "Add urpmi media"
-msgstr "新增 urpmi 媒體"
+msgstr "新增 urpmi 媒體來源"
 
 #: ../mime/x-urpmi-media.desktop.in.h:1
 msgid "Urpmi medium info"
-msgstr "Urpmi 媒體資訊"
+msgstr "Urpmi 媒體來源資訊"
 
 #: ../polkit/org.mageia.drakrpm-addmedia.policy.in.h:1
 msgid "Run Mageia Package Media Adder"
-msgstr "新增 Mageia 軟體包來源媒體"
+msgstr "新增 Mageia 軟體套件媒體來源"
 
 #: ../polkit/org.mageia.drakrpm-addmedia.policy.in.h:2
 msgid "Authentication is required to run Mageia Package Media Adder"
-msgstr "新增 Mageia 軟體包來源媒體需要認證"
+msgstr "新增 Mageia 軟體套件媒體來源需要認證"
 
 #: ../polkit/org.mageia.drakrpm-editmedia.policy.in.h:1
 msgid "Run Mageia Package Media Editor"
-msgstr "編輯 Mageia 軟體包來源媒體"
+msgstr "編輯 Mageia 軟體套件媒體來源"
 
 #: ../polkit/org.mageia.drakrpm-editmedia.policy.in.h:2
 msgid "Authentication is required to run Mageia Package Media Editor"
-msgstr "編輯 Mageia 軟體包來源媒體需要認證"
+msgstr "編輯 Mageia 軟體套件媒體來源需要認證"
 
 #: ../polkit/org.mageia.drakrpm.policy.in.h:1
 msgid "Run Mageia Package Manager"
-msgstr "執行 Mageia 軟體包管理員"
+msgstr "執行 Mageia 軟體套件管理員"
 
 #: ../polkit/org.mageia.drakrpm.policy.in.h:2
 msgid "Authentication is required to run Mageia Package Manager"
-msgstr "執行 Mageia 軟體包管理員需要認證"
+msgstr "執行 Mageia 軟體套件管理員需要認證"
 
 #: ../polkit/org.mageia.drakrpm-update.policy.in.h:1
 msgid "Run Mageia Updater"