Updated POT file.

1 files changed, 349 insertions, 433 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index b7555cdb..6c93e66b 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-27 16:02+0200\n"
+"POT-Creation-Date: 2005-11-16 22:47+0800\n"
 "PO-Revision-Date: 2005-06-25 01:06+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -48,51 +48,20 @@ msgstr "Yy是"
 msgid "Nn"
 msgstr "Nn否"
 
-#: ../_irpm:23
-#, c-format
-msgid "installing %s\n"
-msgstr "正在安裝 %s\n"
+#: ../gurpmi:29 ../gurpmi2:55
+msgid "RPM installation"
+msgstr "RPM 套件安裝"
 
-#: ../_irpm:33
+#: ../gurpmi:42
 #, c-format
-msgid ""
-"Automatic installation of packages...\n"
-"You requested installation of package %s\n"
+msgid "Error: unable to find file %s, will cancel operation"
 msgstr ""
-"自動化套件安裝...\n"
-"您要求安裝的套件 %s\n"
 
-#: ../_irpm:33 ../urpme:31 ../urpmi:498
-#, c-format
-msgid "Is this OK?"
-msgstr "這樣可以嗎？"
-
-#: ../_irpm:35 ../urpmi:529
-#, c-format
-msgid "Ok"
-msgstr "確定"
-
-#: ../_irpm:36 ../urpmi:529
-#, c-format
-msgid "Cancel"
-msgstr "取消"
-
-#: ../_irpm:44 ../urpmi:404 ../urpmi:422 ../urpmi:502
-#, c-format
-msgid " (Y/n) "
-msgstr " (Y/n) (是/否) "
-
-#: ../_irpm:63
-#, c-format
-msgid "%s: command not found\n"
-msgstr "%s：找不到指令\n"
-
-#: ../gurpmi:31 ../gurpmi2:55
-#, c-format
-msgid "RPM installation"
-msgstr "RPM 套件安裝"
+#: ../gurpmi:43 ../gurpmi2:122 ../gurpmi2:145
+msgid "_Ok"
+msgstr "確定 (_O)"
 
-#: ../gurpmi:48
+#: ../gurpmi:57
 #, c-format
 msgid ""
 "You have selected a source package:\n"
@@ -113,67 +82,74 @@ msgstr ""
 "\n"
 "您想怎麼做？"
 
-#: ../gurpmi:56
+#: ../gurpmi:65 ../gurpmi:76
 #, c-format
 msgid ""
-"You are about to install the following software package on your computer:\n"
+"You are about to install the following software packages on your computer:\n"
 "\n"
 "%s\n"
 "\n"
-"You may prefer to just save it. What is your choice?"
+"Proceed?"
 msgstr ""
 "您正要在您的電腦上安裝下列軟體套件：\n"
 "\n"
 "%s\n"
 "\n"
-"您或許傾向儲存而非安裝它。您的選擇是什麼？"
+"要繼續嗎？"
 
-#: ../gurpmi:61
+#: ../gurpmi:71
 #, c-format
 msgid ""
-"You are about to install the following software packages on your computer:\n"
+"You are about to install the following software package on your computer:\n"
 "\n"
 "%s\n"
 "\n"
-"Proceed?"
+"You may prefer to just save it. What is your choice?"
 msgstr ""
 "您正要在您的電腦上安裝下列軟體套件：\n"
 "\n"
 "%s\n"
 "\n"
-"要繼續嗎？"
+"您或許傾向儲存而非安裝它。您的選擇是什麼？"
 
-#: ../gurpmi:71
-#, c-format
+#. - buttons
+#: ../gurpmi:86
 msgid "_Install"
 msgstr "安裝 (_I)"
 
-#: ../gurpmi:72
-#, c-format
+#: ../gurpmi:87
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:73 ../gurpmi2:119
-#, c-format
+#: ../gurpmi:88 ../gurpmi2:122
 msgid "_Cancel"
 msgstr "取消 (_C)"
 
-#: ../gurpmi:83
-#, c-format
+#: ../gurpmi:98
 msgid "Choose location to save file"
 msgstr "選擇存檔的位置"
 
+#: ../gurpmi.pm:62
+#, fuzzy, c-format
+msgid "Unknown option %s"
+msgstr ""
+"\n"
+"未知的選項 '%s'\n"
+
+#: ../gurpmi.pm:70
+#, fuzzy
+msgid "No packages specified"
+msgstr "沒有套件命名為 %s"
+
 #: ../gurpmi2:36
-#, c-format
 msgid "Please wait..."
 msgstr "請稍候..."
 
 #: ../gurpmi2:45
-#, c-format
 msgid "Must be root"
 msgstr "必須擁有管理者權限"
 
-#: ../gurpmi2:75
+#: ../gurpmi2:78
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -184,37 +160,27 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:115
-#, c-format
+#: ../gurpmi2:118
 msgid " (to upgrade)"
 msgstr " (升級用)"
 
-#: ../gurpmi2:116
-#, c-format
+#: ../gurpmi2:119
 msgid " (to install)"
 msgstr " (安裝用)"
 
-#: ../gurpmi2:119
-#, c-format
+#: ../gurpmi2:122
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:119 ../gurpmi2:142
-#, c-format
-msgid "_Ok"
-msgstr "確定 (_O)"
-
-#: ../gurpmi2:120 ../urpmi:364
-#, c-format
+#: ../gurpmi2:123 ../urpmi:366
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
-#: ../gurpmi2:143
-#, c-format
+#: ../gurpmi2:146
 msgid "_Abort"
 msgstr "放棄 (_A)"
 
-#: ../gurpmi2:163
+#: ../gurpmi2:166
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -225,7 +191,7 @@ msgstr ""
 "%s\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../gurpmi2:177
+#: ../gurpmi2:180
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be "
@@ -235,27 +201,25 @@ msgstr ""
 "為了滿足相依性的需求，下面的 %d 個套件也必須一併安裝：\n"
 "%s\n"
 
-#: ../gurpmi2:184
-#, c-format
+#: ../gurpmi2:187
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../gurpmi2:186 ../urpmi:511 ../urpmq:307
-#, c-format
+#: ../gurpmi2:189 ../urpmi:513 ../urpmq:308
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:200 ../urpmi:522
+#: ../gurpmi2:203 ../urpmi:524
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將名為 \"%s\" 的媒體置入裝置 [%s] 內"
 
-#: ../gurpmi2:229
+#: ../gurpmi2:232
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
 
-#: ../gurpmi2:244
+#: ../gurpmi2:247
 #, c-format
 msgid ""
 "The following packages have bad signatures:\n"
@@ -268,7 +232,7 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../gurpmi2:251 ../gurpmi2:300 ../urpmi:593 ../urpmi:710
+#: ../gurpmi2:254 ../gurpmi2:303 ../urpmi:595 ../urpmi:713
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -279,38 +243,33 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:258 ../urpme:118 ../urpmi:636
+#: ../gurpmi2:261 ../urpme:118 ../urpmi:638
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:266 ../urpm.pm:2901
-#, c-format
+#: ../gurpmi2:269 ../urpm.pm:2903
 msgid "Preparing..."
 msgstr "準備中..."
 
-#: ../gurpmi2:268
+#: ../gurpmi2:271
 #, c-format
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:286 ../urpmi:603 ../urpmi:655 ../urpmi:673 ../urpmi:689
-#, c-format
+#: ../gurpmi2:289 ../urpmi:605 ../urpmi:658 ../urpmi:676 ../urpmi:692
 msgid "Installation failed"
 msgstr "安裝失敗"
 
-#: ../gurpmi2:295
-#, c-format
+#: ../gurpmi2:298
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:303 ../urpmi:726
-#, c-format
+#: ../gurpmi2:306 ../urpmi:729
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
 
-#: ../gurpmi2:305
-#, c-format
+#: ../gurpmi2:308
 msgid "Installation finished"
 msgstr "安裝完畢"
 
@@ -324,17 +283,14 @@ msgstr ""
 "其中 [選項] 是由\n"
 
 #: ../rpm-find-leaves:16
-#, c-format
 msgid "   -h|--help      - print this help message.\n"
 msgstr "   -h|--help      - 顯示此說明訊息。\n"
 
 #: ../rpm-find-leaves:17
-#, c-format
 msgid "   --root <path>  - use the given root instead of /\n"
 msgstr "   --root <path>  - 使用給定的根目錄而非 /\n"
 
 #: ../rpm-find-leaves:18
-#, c-format
 msgid "   -g [group]     - restrict results to given group.\n"
 msgstr "   -g [group]     - 限制為指定群組內的結果。\n"
 
@@ -343,54 +299,55 @@ msgstr "   -g [group]     - 限制為指定群組內的結果。\n"
 msgid "                    defaults is %s.\n"
 msgstr "                    預設為 %s。\n"
 
-#: ../rurpmi:8 ../urpmi:227
-#, c-format
+#. - need to be root if binary rpms are to be installed
+#: ../rurpmi:8 ../urpmi:229
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
 
 #: ../rurpmi:15
-#, c-format
 msgid "Running urpmi in restricted mode..."
 msgstr "以限制模式執行 urpmi..."
 
-#: ../urpm.pm:71
+#: ../urpm.pm:70
 #, c-format
 msgid "unknown protocol defined for %s"
 msgstr "%s 中定義了未知的通訊協定"
 
-#: ../urpm.pm:104
+#: ../urpm.pm:103
 #, c-format
 msgid "no webfetch found, supported webfetch are: %s\n"
 msgstr "沒有找到 webfetch，支援的 webfetch 有：%s\n"
 
-#: ../urpm.pm:120
+#: ../urpm.pm:119
 #, c-format
 msgid "unable to handle protocol: %s"
 msgstr "無法處理通訊協定：%s"
 
-#: ../urpm.pm:211
+#: ../urpm.pm:210
 #, c-format
 msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist，忽略這個媒體"
 
-#: ../urpm.pm:212
+#: ../urpm.pm:211
 #, c-format
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的列表，忽略這個媒體"
 
-#: ../urpm.pm:225 ../urpm.pm:1314 ../urpm.pm:1324
+#: ../urpm.pm:224 ../urpm.pm:1314 ../urpm.pm:1324
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的 hdlist 檔案，忽略這個媒體"
 
-#: ../urpm.pm:228 ../urpm.pm:2508
+#. list file exists but isn't readable
+#. report error only if no result found, list files are only readable by root
+#: ../urpm.pm:227 ../urpm.pm:2509
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的列表，忽略這個媒體"
 
-#: ../urpm.pm:258
-#, c-format
-msgid "trying to bypass existing medium \"%s\", avoiding"
+#: ../urpm.pm:255
+#, fuzzy, c-format
+msgid "trying to override existing medium \"%s\", skipping"
 msgstr "正在嘗試避開現存的媒體  \"%s\"，正在避開"
 
 #: ../urpm.pm:266
@@ -425,6 +382,7 @@ msgstr "\"%s\" 的列表檔案自相矛盾，忽略這個媒體"
 msgid "unable to inspect list file for \"%s\", medium ignored"
 msgstr "無法檢查 \"%s\" 的清單檔案，忽略這個媒體"
 
+#. - return value is suitable for an hash.
 #: ../urpm.pm:361
 #, c-format
 msgid "too many mount points for removable medium \"%s\""
@@ -461,7 +419,6 @@ msgid "wrote config file [%s]"
 msgstr "寫入設定檔 [%s]"
 
 #: ../urpm.pm:440
-#, c-format
 msgid "Can't use parallel mode with use-distrib mode"
 msgstr "無法於 use-distrib 模式下使用同步管理模式"
 
@@ -496,7 +453,6 @@ msgid "there doesn't seem to be devices in the chroot in \"%s\""
 msgstr "似乎沒有裝置在位於 \"%s\" 的 chroot 內"
 
 #: ../urpm.pm:495
-#, c-format
 msgid ""
 "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
 "update or --parallel"
@@ -504,6 +460,15 @@ msgstr ""
 "--synthesis 不能夠與 --media，--excludemedia，--sortmedia，--update 與 --"
 "parallel 一起使用"
 
+#. - XXX we could link the new hdlist to the old one.
+#. - (However links need to be managed. see bug #12391.)
+#. - as previously done, just read synthesis file here, this is enough.
+#. - as previously done, just read synthesis file here, this is enough, but only
+#. - if synthesis exists, else it needs to be recomputed.
+#. - XXX we could link the new hdlist to the old one.
+#. - (However links need to be managed. see bug #12391.)
+#. - as previously done, just read synthesis file here, this is enough.
+#. - read default synthesis (we have to make sure nothing get out of depslist).
 #: ../urpm.pm:556 ../urpm.pm:582 ../urpm.pm:1068 ../urpm.pm:1079
 #: ../urpm.pm:1151 ../urpm.pm:1168 ../urpm.pm:1238 ../urpm.pm:1297
 #: ../urpm.pm:1512 ../urpm.pm:1635 ../urpm.pm:1752 ../urpm.pm:1758
@@ -530,6 +495,7 @@ msgstr "虛擬媒體 \"%s\" 不在本地端，忽略這個媒體"
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
+#. - this is almost a fatal error, ignore it by default?
 #: ../urpm.pm:605 ../urpm.pm:1089 ../urpm.pm:1176 ../urpm.pm:1247
 #: ../urpm.pm:1643
 #, c-format
@@ -537,7 +503,6 @@ msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 hdlist 或 synthesis 檔案時發生問題"
 
 #: ../urpm.pm:612 ../urpm.pm:1899
-#, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在進行第二個步驟，相依性的計算\n"
 
@@ -551,9 +516,10 @@ msgstr "正在略過套件 %s"
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2565
-#: ../urpm.pm:2966 ../urpm.pm:3088
-#, c-format
+#. - beware this can be a child process or the main process now...
+#. - open in read/write mode unless testing installation.
+#: ../urpm.pm:652 ../urpm.pm:2315 ../urpm.pm:2376 ../urpm.pm:2566
+#: ../urpm.pm:2968 ../urpm.pm:3092
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
 
@@ -563,7 +529,6 @@ msgid "medium \"%s\" already exists"
 msgstr "媒體 \"%s\" 已經存在"
 
 #: ../urpm.pm:699
-#, c-format
 msgid "virtual medium needs to be local"
 msgstr "虛擬媒體必須在本地端"
 
@@ -573,42 +538,35 @@ msgid "added medium %s"
 msgstr "加入的媒體 %s"
 
 #: ../urpm.pm:769
-#, c-format
 msgid "unable to access first installation medium"
 msgstr "無法存取第一個安裝媒體"
 
 #: ../urpm.pm:773
-#, c-format
 msgid "copying hdlists file..."
 msgstr "正在複製 hdlist 檔案..."
 
 #: ../urpm.pm:775 ../urpm.pm:1192 ../urpm.pm:1267
-#, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
 #: ../urpm.pm:776 ../urpm.pm:1193 ../urpm.pm:1342 ../urpm.pm:1401
 #: ../urpm.pm:1581 ../urpm.pm:1588
-#, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
 #: ../urpm.pm:779 ../urpm.pm:804 ../urpm.pm:843
-#, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "無法存取第一個安裝媒體 (找不到 hdlists 檔案)"
 
 #: ../urpm.pm:786
-#, c-format
 msgid "retrieving hdlists file..."
 msgstr "擷取 hdlists 檔案..."
 
-#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2834
-#, c-format
+#: ../urpm.pm:798 ../urpm.pm:1625 ../urpm.pm:2115 ../urpm.pm:2835
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2836
+#: ../urpm.pm:800 ../urpm.pm:1609 ../urpm.pm:2119 ../urpm.pm:2837
 #, c-format
 msgid "...retrieving failed: %s"
 msgstr "...擷取失敗：%s"
@@ -623,6 +581,7 @@ msgstr "hdlists 檔案中包含了無效的 hdlist 敘述 \"%s\""
 msgid "trying to select nonexistent medium \"%s\""
 msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 
+#. - several elements in found and/or foundi lists.
 #: ../urpm.pm:882
 #, c-format
 msgid "selecting multiple media: %s"
@@ -639,12 +598,10 @@ msgid "reconfiguring urpmi for media \"%s\""
 msgstr "正在重新設定媒體 \"%s\" 的 urpmi 設定"
 
 #: ../urpm.pm:978
-#, c-format
 msgid "...reconfiguration failed"
 msgstr "重新設定失敗"
 
 #: ../urpm.pm:985
-#, c-format
 msgid "reconfiguration done"
 msgstr "重新設定完成"
 
@@ -672,7 +629,6 @@ msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
 #: ../urpm.pm:1214 ../urpm.pm:1488
-#, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "計算來源 hdlist (或 synthesis) 的 md5sum"
 
@@ -687,7 +643,6 @@ msgid "copy of [%s] failed (file is suspiciously small)"
 msgstr "複製 [%s] 失敗 (檔案小得可疑)"
 
 #: ../urpm.pm:1282
-#, c-format
 msgid "computing md5sum of copied source hdlist (or synthesis)"
 msgstr "正在計算複製的來源 hdlist (或 synthesis) 的 md5sum"
 
@@ -707,7 +662,6 @@ msgid "reading rpm files from [%s]"
 msgstr "由 [%s] 讀取 rpm 檔案"
 
 #: ../urpm.pm:1374
-#, c-format
 msgid "no rpms read"
 msgstr "沒有讀取到任何的 rpm"
 
@@ -721,6 +675,8 @@ msgstr "無法由 [%s] 讀取 rpm 套件：%s"
 msgid "no rpm files found from [%s]"
 msgstr "在 [%s] 內找不到 rpm 檔案"
 
+#. - try to probe for possible with_hdlist parameter, unless
+#. - it is already defined (and valid).
 #: ../urpm.pm:1538
 #, c-format
 msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
@@ -732,17 +688,14 @@ msgid "found probed hdlist (or synthesis) as %s"
 msgstr "發現尋找到的 hdlist (或 synthesis) 為 %s"
 
 #: ../urpm.pm:1616
-#, c-format
 msgid "computing md5sum of retrieved source hdlist (or synthesis)"
 msgstr "正在計算來源 hdlist (或 synthesis) 的 md5sum"
 
 #: ../urpm.pm:1618
-#, c-format
 msgid "...retrieving failed: md5sum mismatch"
 msgstr "...擷取失敗：md5sum 不合"
 
 #: ../urpm.pm:1716
-#, c-format
 msgid "retrieval of source hdlist (or synthesis) failed"
 msgstr "擷取來源 hdlist (或 synthesis) 失敗"
 
@@ -801,6 +754,7 @@ msgstr "正在讀取媒體 \"%s\" 的標頭"
 msgid "building hdlist [%s]"
 msgstr "正在建立 hdlist [%s]"
 
+#. - XXX this happens when building a synthesis for a local media from RPMs... why ?
 #: ../urpm.pm:1933 ../urpm.pm:1968
 #, c-format
 msgid ""
@@ -808,7 +762,7 @@ msgid ""
 "corrupted."
 msgstr "無法為媒介 \"%s\" 建立 synthesis 檔。您的 hdlist 檔可能並不標準。"
 
-#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:321
+#: ../urpm.pm:1936 ../urpm.pm:1971 ../urpmi:323
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
@@ -849,17 +803,14 @@ msgid "unable to access rpm file [%s]"
 msgstr "無法存取 rpm 檔案 [%s]"
 
 #: ../urpm.pm:2129
-#, c-format
 msgid "unable to register rpm file"
 msgstr "無法註冊 rpm 檔案"
 
 #: ../urpm.pm:2132
-#, c-format
 msgid "error registering local packages"
 msgstr "註冊本地端套件錯誤"
 
 #: ../urpm.pm:2156
-#, c-format
 msgid "Search"
 msgstr "搜尋"
 
@@ -873,17 +824,17 @@ msgstr "沒有套件命名為 %s"
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
 
-#: ../urpm.pm:2439 ../urpm.pm:2485 ../urpm.pm:2516
+#: ../urpm.pm:2439 ../urpm.pm:2486 ../urpm.pm:2517
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多個套件具有相同的 rpm 檔名 \"%s\""
 
-#: ../urpm.pm:2499
+#: ../urpm.pm:2500
 #, c-format
 msgid "unable to correctly parse [%s] on value \"%s\""
 msgstr "在值 \"%2$s\" 上無法正確解析 [%1$s]"
 
-#: ../urpm.pm:2532
+#: ../urpm.pm:2533
 #, c-format
 msgid ""
 "medium \"%s\" uses an invalid list file:\n"
@@ -892,88 +843,88 @@ msgstr ""
 "媒體 \"%s\" 使用一個無效的列表檔案：\n"
 "  映射站可能不在最新狀態，正在嘗試使用替代的方案"
 
-#: ../urpm.pm:2536
+#: ../urpm.pm:2537
 #, c-format
 msgid "medium \"%s\" does not define any location for rpm files"
 msgstr "媒體 \"%s\" 沒有定義任何 rpm 檔案的位置"
 
-#: ../urpm.pm:2548
+#: ../urpm.pm:2549
 #, c-format
 msgid "package %s is not found."
 msgstr "沒有找到套件 %s。"
 
-#: ../urpm.pm:2606 ../urpm.pm:2620 ../urpm.pm:2640 ../urpm.pm:2654
-#, c-format
+#: ../urpm.pm:2607 ../urpm.pm:2621 ../urpm.pm:2641 ../urpm.pm:2655
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫被鎖住了"
 
-#: ../urpm.pm:2706 ../urpm.pm:2711 ../urpm.pm:2737
+#: ../urpm.pm:2707 ../urpm.pm:2712 ../urpm.pm:2738
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "媒體 \"%s\" 沒有被選取"
 
-#: ../urpm.pm:2733
+#. - fallback to use other method for retrieving the file later.
+#: ../urpm.pm:2734
 #, c-format
 msgid "unable to read rpm file [%s] from medium \"%s\""
 msgstr "無法由媒體 \"%2$s\" 讀取 [%1$s] rpm 檔"
 
-#: ../urpm.pm:2741
+#. - we have a removable device that is not removable, well...
+#: ../urpm.pm:2742
 #, c-format
 msgid "inconsistent medium \"%s\" marked removable but not really"
 msgstr "自相矛盾的媒體 \"%s\" 標示為可移除但是事實上卻不是這麼一回事"
 
-#: ../urpm.pm:2753
+#: ../urpm.pm:2754
 #, c-format
 msgid "unable to access medium \"%s\""
 msgstr "無法存取媒體 \"%s\" "
 
-#: ../urpm.pm:2812
+#: ../urpm.pm:2813
 #, c-format
 msgid "malformed input: [%s]"
 msgstr "輸入格式錯誤：[%s]"
 
-#: ../urpm.pm:2819
+#: ../urpm.pm:2820
 #, c-format
 msgid "retrieving rpm files from medium \"%s\"..."
 msgstr "正在由媒體 \"%s\" 擷取 rpm 檔案..."
 
-#: ../urpm.pm:2939
+#: ../urpm.pm:2941
 #, c-format
 msgid "using process %d for executing transaction"
 msgstr "正在使用第 %d 號程序執行交辦的安裝程序"
 
-#: ../urpm.pm:2970
+#: ../urpm.pm:2972
 #, c-format
 msgid ""
 "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已建立在 %s 上的安裝程序 (移除 = %d，安裝 = %d，升級 = %d)"
 
-#: ../urpm.pm:2973
-#, c-format
+#: ../urpm.pm:2975
 msgid "unable to create transaction"
 msgstr "無法建立安裝程序"
 
-#: ../urpm.pm:2981
+#: ../urpm.pm:2983
 #, c-format
 msgid "removing package %s"
 msgstr "正在移除套件 %s"
 
-#: ../urpm.pm:2983
+#: ../urpm.pm:2985
 #, c-format
 msgid "unable to remove package %s"
 msgstr "無法移除套件 %s"
 
-#: ../urpm.pm:2995
+#: ../urpm.pm:2997
 #, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
 msgstr "無法由 delta-rpm 套件包中取出套件 %s"
 
-#: ../urpm.pm:3001
+#: ../urpm.pm:3003
 #, c-format
 msgid "adding package %s (id=%d, eid=%d, update=%d, file=%s)"
 msgstr "正在新增套件 %s (id = %d，eid = %d，更新 = %d，檔案 = %s)"
 
-#: ../urpm.pm:3004
+#: ../urpm.pm:3006
 #, c-format
 msgid "unable to install package %s"
 msgstr "無法安裝套件 %s"
@@ -983,91 +934,183 @@ msgstr "無法安裝套件 %s"
 msgid "More information on package %s"
 msgstr "更多關於套件 %s 的資訊"
 
-#: ../urpm.pm:3228 ../urpm.pm:3261
+#: ../urpm.pm:3234 ../urpm.pm:3267
 #, c-format
 msgid "due to missing %s"
 msgstr "由於遺失了 %s"
 
-#: ../urpm.pm:3229 ../urpm.pm:3259
+#: ../urpm.pm:3235 ../urpm.pm:3265
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於未滿足 %s"
 
-#: ../urpm.pm:3230
+#: ../urpm.pm:3236
 #, c-format
 msgid "trying to promote %s"
 msgstr "正在試著促進 %s"
 
-#: ../urpm.pm:3231
+#: ../urpm.pm:3237
 #, c-format
 msgid "in order to keep %s"
 msgstr "為了要保留 %s"
 
-#: ../urpm.pm:3254
+#: ../urpm.pm:3260
 #, c-format
 msgid "in order to install %s"
 msgstr "為了要安裝 %s"
 
-#: ../urpm.pm:3265
+#: ../urpm.pm:3271
 #, c-format
 msgid "due to conflicts with %s"
 msgstr "由於與 %s 發生衝突"
 
-#: ../urpm.pm:3266
-#, c-format
+#: ../urpm.pm:3272
 msgid "unrequested"
 msgstr "未被要求"
 
-#: ../urpm.pm:3282
+#: ../urpm.pm:3288
 #, c-format
 msgid "Invalid signature (%s)"
 msgstr "無效的簽名 (%s)"
 
-#: ../urpm.pm:3314
+#: ../urpm.pm:3320
 #, c-format
 msgid "Invalid Key ID (%s)"
 msgstr "無效的公鑰 ID (%s)"
 
-#: ../urpm.pm:3316
+#: ../urpm.pm:3322
 #, c-format
 msgid "Missing signature (%s)"
 msgstr "遺失簽名 (%s)"
 
-#: ../urpm.pm:3365
-#, c-format
+#: ../urpm.pm:3382
 msgid "examining MD5SUM file"
 msgstr "正在檢驗 MD5SUM 檔案"
 
-#: ../urpm.pm:3376
+#: ../urpm.pm:3393
 #, c-format
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 
-#: ../urpm.pm:3398
-#, c-format
+#: ../urpm.pm:3415
 msgid "This operation is forbidden while running in restricted mode"
 msgstr "使用限制模式執行時禁止該操作程序"
 
 #: ../urpm/args.pm:99 ../urpm/args.pm:108
-#, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:217
-#, c-format
+#: ../urpm/args.pm:218
 msgid "You need to be root to use --use-distrib"
 msgstr "您必須是 root 才能使用 --use-distrib"
 
-#: ../urpm/args.pm:249
+#: ../urpm/args.pm:250
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 
 #: ../urpm/msg.pm:82
-#, c-format
 msgid "Sorry, bad choice, try again\n"
 msgstr "抱歉，選擇錯誤，請再試一次\n"
 
+#: ../urpm/parallel_ka_run.pm:9 ../urpm/parallel_ka_run.pm:103
+#: ../urpm/parallel_ka_run.pm:197
+msgid "mput failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:70 ../urpm/parallel_ka_run.pm:182
+#: ../urpm/parallel_ka_run.pm:211
+msgid "rshp failed, maybe a node is unreacheable"
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:79 ../urpm/parallel_ssh.pm:96
+#, c-format
+msgid "on node %s"
+msgstr ""
+
+#. - first propagate the synthesis file to all machine.
+#: ../urpm/parallel_ka_run.pm:101
+msgid "Propagating synthesis to nodes..."
+msgstr ""
+
+#. - now try an iteration of urpmq.
+#: ../urpm/parallel_ka_run.pm:152
+msgid "Resolving dependencies on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:195
+msgid "Distributing files to nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:201
+msgid "Verifying if install is possible on nodes..."
+msgstr ""
+
+#: ../urpm/parallel_ka_run.pm:215 ../urpm/parallel_ssh.pm:243
+#, fuzzy, c-format
+msgid "Installation failed on node %s"
+msgstr "安裝失敗"
+
+#: ../urpm/parallel_ka_run.pm:220 ../urpm/parallel_ssh.pm:248 ../urpmi:726
+msgid "Installation is possible"
+msgstr "可以安裝"
+
+#. - continue installation.
+#: ../urpm/parallel_ka_run.pm:225
+#, fuzzy
+msgid "Installing packages on nodes..."
+msgstr "正在安裝套件 `%s' (%s/%s)..."
+
+#: ../urpm/parallel_ssh.pm:22 ../urpm/parallel_ssh.pm:120
+#: ../urpm/parallel_ssh.pm:224
+#, c-format
+msgid "scp failed on host %s (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:118
+#, fuzzy, c-format
+msgid "Propagating synthesis to %s..."
+msgstr "檢驗 synthesis 檔案 [%s]"
+
+#: ../urpm/parallel_ssh.pm:171
+#, c-format
+msgid "Resolving dependencies on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:201
+#, c-format
+msgid "host %s does not have a good version of urpmi (%d)"
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:217
+#, fuzzy, c-format
+msgid "Distributing files to %s..."
+msgstr "正在發佈 %s"
+
+#: ../urpm/parallel_ssh.pm:231
+#, c-format
+msgid "Verifying if install is possible on %s..."
+msgstr ""
+
+#: ../urpm/parallel_ssh.pm:255
+#, fuzzy, c-format
+msgid "Performing install on %s..."
+msgstr "套件安裝..."
+
+#: ../urpm/parallel_ssh.pm:268
+#, fuzzy, c-format
+msgid "Installing %s on %s..."
+msgstr "正在由 %2$s 安裝 %1$s"
+
+#: ../urpm/parallel_ssh.pm:269
+#, fuzzy, c-format
+msgid "Preparing install on %s..."
+msgstr "套件安裝..."
+
+#: ../urpme:31 ../urpmi:500
+msgid "Is this OK?"
+msgstr "這樣可以嗎？"
+
 #: ../urpme:38
 #, c-format
 msgid ""
@@ -1084,40 +1127,33 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpme:43 ../urpmf:33 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpme:43 ../urpmf:33 ../urpmi:78 ../urpmi.addmedia:43
 #: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
-#, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息。\n"
 
-#: ../urpme:44 ../urpmi:86
-#, c-format
+#: ../urpme:44 ../urpmi:85
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動選擇套件。\n"
 
 #: ../urpme:45
-#, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
 
-#: ../urpme:46 ../urpmi:101 ../urpmq:64
-#, c-format
+#: ../urpme:46 ../urpmi:100 ../urpmq:64
 msgid ""
 "  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
 
-#: ../urpme:47 ../urpmi:106 ../urpmq:65
-#, c-format
+#: ../urpme:47 ../urpmi:105 ../urpmq:65
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
 
 #: ../urpme:48
-#, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
 
 #: ../urpme:49
-#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to (un)install a chroot with --root option.\n"
@@ -1127,42 +1163,35 @@ msgstr ""
 
 #: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
 #: ../urpmi.update:48 ../urpmq:91
-#, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
 
 #: ../urpme:52
-#, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 選擇所有符合描述的套件。\n"
 
 #: ../urpme:68
-#, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只有擁有管理者權限的使用者才能移除套件"
 
 #: ../urpme:89
-#, c-format
-msgid "unknown packages"
+msgid "unknown package"
 msgstr "未知的套件"
 
 #: ../urpme:89
-#, c-format
-msgid "unknown package"
+msgid "unknown packages"
 msgstr "未知的套件"
 
-#: ../urpme:99 ../urpmi:437
+#: ../urpme:99 ../urpmi:439
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
 #: ../urpme:102
-#, c-format
 msgid "Nothing to remove"
 msgstr "沒有東西可移除"
 
 #: ../urpme:106
-#, c-format
 msgid "Checking to remove the following packages"
 msgstr "正在檢查以移除下列套件"
 
@@ -1172,13 +1201,11 @@ msgid ""
 "To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "為了滿足相依性，下列 %d 個套件將被移除 (%d MB)"
 
-#: ../urpme:115 ../urpmi:456 ../urpmi:586
-#, c-format
+#: ../urpme:115 ../urpmi:458 ../urpmi:588
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
 
 #: ../urpme:122
-#, c-format
 msgid "Removing failed"
 msgstr "移除失敗"
 
@@ -1199,109 +1226,91 @@ msgstr ""
 "用法：\n"
 
 #: ../urpmf:34
-#, c-format
 msgid "  --version      - print this tool's version number.\n"
 msgstr "  --version      - 印出這個工具的版本編號。\n"
 
-#: ../urpmf:35 ../urpmi:121 ../urpmq:74
-#, c-format
+#: ../urpmf:35 ../urpmi:120 ../urpmq:74
 msgid "  --env          - use specific environment (typically a bug report).\n"
 msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 
-#: ../urpmf:36 ../urpmi:83 ../urpmq:47
-#, c-format
+#: ../urpmf:36 ../urpmi:82 ../urpmq:47
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
 #: ../urpmf:37
-#, c-format
 msgid ""
 "  --literal, -l  - don't match patterns, use argument as a literal string.\n"
 msgstr ""
 
-#: ../urpmf:38 ../urpmi:81 ../urpmq:45
-#, c-format
+#: ../urpmf:38 ../urpmi:80 ../urpmq:45
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:39 ../urpmi:84 ../urpmq:48
-#, c-format
+#: ../urpmf:39 ../urpmi:83 ../urpmq:48
 msgid ""
 "  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
 
-#: ../urpmf:40 ../urpmi:85 ../urpmq:49
-#, c-format
+#: ../urpmf:40 ../urpmi:84 ../urpmq:49
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
 #: ../urpmf:41
-#, c-format
 msgid "  --uniq         - do not print identical lines twice.\n"
 msgstr "  --uniq         - 不顯示相同的訊息。\n"
 
-#: ../urpmf:42 ../urpmi:80 ../urpmq:44
-#, c-format
+#: ../urpmf:42 ../urpmi:79 ../urpmq:44
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
 #: ../urpmf:43
-#, c-format
 msgid "  --verbose      - verbose mode.\n"
 msgstr "  --verbose      - 完整訊息模式。\n"
 
 #: ../urpmf:44
-#, c-format
 msgid "  -i             - ignore case distinctions in patterns.\n"
 msgstr "  -i             - 忽略每個樣版中的大小寫差異。\n"
 
 #: ../urpmf:45
-#, c-format
 msgid "  -F<str>        - change field separator (defaults to ':').\n"
 msgstr ""
 
 #: ../urpmf:46
-#, fuzzy, c-format
+#, fuzzy
 msgid "Pattern expressions:\n"
 msgstr "搜尋表示式："
 
 #: ../urpmf:47
-#, c-format
 msgid "  text           - any text is parsed as a regexp, unless -l is used.\n"
 msgstr ""
 
 #: ../urpmf:48
-#, c-format
 msgid "  -e             - include perl code directly as perl -e.\n"
 msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
 
 #: ../urpmf:49
-#, c-format
 msgid "  -a             - binary AND operator.\n"
 msgstr "  -a             - 二元 AND 運算子。\n"
 
 #: ../urpmf:50
-#, c-format
 msgid "  -o             - binary OR operator.\n"
 msgstr "  -o             - 二元 OR 運算子。\n"
 
 #: ../urpmf:51
-#, c-format
 msgid "  !              - unary NOT.\n"
 msgstr "  !              - 一元 NOT 運算子。\n"
 
 #: ../urpmf:52
-#, fuzzy, c-format
+#, fuzzy
 msgid "  ( )            - left and right parentheses.\n"
 msgstr "  )              - 右括弧用來表示一組表示式的結束。\n"
 
 #: ../urpmf:53
-#, fuzzy, c-format
+#, fuzzy
 msgid "List of tags:\n"
 msgstr "帳戶清單"
 
 #: ../urpmf:54
-#, c-format
 msgid "  --qf           - specify a printf-like output format\n"
 msgstr "  --qf           - 使用類似 printf 的輸出格式\n"
 
@@ -1311,132 +1320,109 @@ msgid "                   example: '%%name:%%files'\n"
 msgstr "                   範例：'%%name:%%files'\n"
 
 #: ../urpmf:56
-#, c-format
 msgid "  --arch         - architecture\n"
 msgstr "  --arch         - 硬體架構\n"
 
 #: ../urpmf:57
-#, c-format
 msgid "  --buildhost    - build host\n"
 msgstr "  --buildhost    - 建立主機\n"
 
 #: ../urpmf:58
-#, c-format
 msgid "  --buildtime    - build time\n"
 msgstr "  --buildtime    - 建立時間\n"
 
 #: ../urpmf:59
-#, c-format
 msgid "  --conffiles    - configuration files\n"
 msgstr "  --conffiles    - 組態檔\n"
 
 #: ../urpmf:60
-#, c-format
 msgid "  --conflicts    - conflict tags\n"
 msgstr "  --conflicts    - 衝突標籤\n"
 
 #: ../urpmf:61
-#, c-format
 msgid "  --description  - package description\n"
 msgstr "  --description   - 套件描述\n"
 
 #: ../urpmf:62
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --distribution - distribution\n"
 msgstr "視為郵件清單"
 
 #: ../urpmf:63
-#, c-format
 msgid "  --epoch        - epoch\n"
 msgstr "  --epoch        - 時期\n"
 
 #: ../urpmf:64
-#, c-format
 msgid "  --filename     - filename of the package\n"
 msgstr "  --filename     - 套件檔案名稱\n"
 
 #: ../urpmf:65
-#, c-format
 msgid "  --files        - list of files contained in the package\n"
 msgstr "  --files        - 列出套件內包含的檔案\n"
 
 #: ../urpmf:66
-#, c-format
 msgid "  --group        - group\n"
 msgstr "  --group        - 群組\n"
 
 #: ../urpmf:67
-#, c-format
 msgid "  --name         - package name\n"
 msgstr "  --name          - 套件名稱\n"
 
 #: ../urpmf:68
-#, fuzzy, c-format
+#, fuzzy
 msgid "  --obsoletes    - obsoletes tags\n"
 msgstr "  --obsoletes    - 顯示廢棄標籤：廢棄。\n"
 
 #: ../urpmf:69
-#, c-format
 msgid "  --packager     - packager\n"
 msgstr "  --packager     - 打包者\n"
 
 #: ../urpmf:70
-#, c-format
 msgid "  --provides     - provides tags\n"
 msgstr "  --provides     - 提供標籤\n"
 
 #: ../urpmf:71
-#, c-format
 msgid "  --requires     - requires tags\n"
 msgstr "  --requires     - 需要標籤\n"
 
 #: ../urpmf:72
-#, c-format
 msgid "  --size         - installed size\n"
 msgstr "  --size         - 安裝大小\n"
 
 #: ../urpmf:73
-#, c-format
 msgid "  --sourcerpm    - source rpm name\n"
 msgstr "  --sourcerpm    - 原始碼套件名稱\n"
 
 #: ../urpmf:74
-#, c-format
 msgid "  --summary      - summary\n"
 msgstr "  --summary      - 摘要\n"
 
 #: ../urpmf:75
-#, c-format
 msgid "  --url          - url\n"
 msgstr "  --url          - URL\n"
 
 #: ../urpmf:76
-#, c-format
 msgid "  --vendor       - vendor\n"
 msgstr "  --vendor       - 提供者\n"
 
 #: ../urpmf:77
-#, c-format
 msgid "  -m             - the media in which the package was found\n"
 msgstr "  -m             - 這個套件被找到的媒介\n"
 
 #: ../urpmf:78 ../urpmq:80
-#, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
 
 #: ../urpmf:130
-#, c-format
 msgid "Incorrect format: you may use only one multi-valued tag"
 msgstr ""
 
-#: ../urpmf:172 ../urpmi:216 ../urpmq:115
+#: ../urpmf:172 ../urpmi:218 ../urpmq:116
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
 #: ../urpmf:218
-#, c-format
 msgid ""
 "Note: since no media searched uses hdlists, urpmf was unable to return any "
 "result\n"
@@ -1444,11 +1430,10 @@ msgstr ""
 "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
 #: ../urpmf:219
-#, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您或許想要使用 --name 參數來搜尋套件名稱。\n"
 
-#: ../urpmi:74
+#: ../urpmi:73
 #, c-format
 msgid ""
 "urpmi version %s\n"
@@ -1464,33 +1449,28 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpmi:82 ../urpmq:46
-#, c-format
+#: ../urpmi:81 ../urpmq:46
 msgid ""
 "  --searchmedia  - use only the given media to search requested (or updated) "
 "packages.\n"
 msgstr "  --searchmedia  - 只使用指定的媒體來搜尋或升級套件。\n"
 
-#: ../urpmi:87 ../urpmq:50
-#, c-format
+#: ../urpmi:86 ../urpmq:50
 msgid ""
 "  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動選擇要用來升級系統的套件。\n"
 
-#: ../urpmi:88
-#, c-format
+#: ../urpmi:87
 msgid ""
 "  --no-uninstall - never ask to uninstall a package, abort the "
 "installation.\n"
 msgstr "  --no-uninstall - 絕不要求移除套件，直接中斷安裝。\n"
 
-#: ../urpmi:89
-#, c-format
+#: ../urpmi:88
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安裝套件 (只下載)。\n"
 
-#: ../urpmi:90 ../urpmq:52
-#, c-format
+#: ../urpmi:89 ../urpmq:52
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
 "                   packages that lead to removals.\n"
@@ -1498,7 +1478,7 @@ msgstr ""
 "  --keep         - 盡可能的保留現存的套件，拒絕安裝會導致移除其他套件的\n"
 "                   套件。\n"
 
-#: ../urpmi:92
+#: ../urpmi:91
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1509,45 +1489,38 @@ msgstr ""
 "                   分割為幾個小的安裝程序。\n"
 "                   預設值為 %d。\n"
 
-#: ../urpmi:95
+#: ../urpmi:94
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小型安裝程序大小，預設值為 %d。\n"
 
-#: ../urpmi:96 ../urpmq:51
-#, c-format
+#: ../urpmi:95 ../urpmq:51
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 加上模糊搜尋 (與 -y 相同)。\n"
 
-#: ../urpmi:97 ../urpmq:60
-#, c-format
+#: ../urpmi:96 ../urpmq:60
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下個套件是原始碼套件 (與 -s 相同)。\n"
 
-#: ../urpmi:98
-#, c-format
+#: ../urpmi:97
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安裝原始碼套件 (不安裝二進位檔)。\n"
 
-#: ../urpmi:99
-#, c-format
+#: ../urpmi:98
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 在執行任何事前先由快取中移除 RPM 檔案。\n"
 
-#: ../urpmi:100
-#, c-format
+#: ../urpmi:99
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi:102
-#, c-format
+#: ../urpmi:101
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允許要求使用者不檢查相依性就安裝套件。\n"
 
-#: ../urpmi:104
-#, c-format
+#: ../urpmi:103
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
 "                   dependencies checking and integrity.\n"
@@ -1555,13 +1528,11 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件而不檢查相依性與完整\n"
 "                   性。\n"
 
-#: ../urpmi:107
-#, c-format
+#: ../urpmi:106
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
 
-#: ../urpmi:108
-#, c-format
+#: ../urpmi:107
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
 "                   to install a chroot with --root option.\n"
@@ -1569,23 +1540,19 @@ msgstr ""
 "  --use-distrib  - 由一個發行版樹即時設定 urpmi，有助於藉由 --root 選項\n"
 "                   安裝一個 chroot。\n"
 
-#: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
-#, c-format
+#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 使用 wget 擷取遠端檔案。\n"
 
-#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
-#, c-format
+#: ../urpmi:110 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
-#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33
-#, c-format
+#: ../urpmi:111 ../urpmi.addmedia:46 ../urpmi.update:33
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
 
-#: ../urpmi:113
-#, c-format
+#: ../urpmi:112
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
 "                   (--no-resume disables it, default is disabled).\n"
@@ -1593,8 +1560,7 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
-#, c-format
+#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
 "                   to be 1080 by default (format is <proxyhost[:port]>).\n"
@@ -1602,8 +1568,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:117 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
-#, c-format
+#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
 "                   authentication (format is <user:password>).\n"
@@ -1611,15 +1576,13 @@ msgstr ""
 "  --proxy-user   - 指定代理伺服器認證的使用者帳號與密碼\n"
 "                   (格式為 <user:password>)。\n"
 
-#: ../urpmi:119
-#, c-format
+#: ../urpmi:118
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
 
-#: ../urpmi:122
-#, c-format
+#: ../urpmi:121
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
 "                   (--no-verify-rpm disable it, default is enabled).\n"
@@ -1627,34 +1590,33 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽名.\n"
 "                   (--no-verify-rpm 停用它，預設值為啟用)。\n"
 
-#: ../urpmi:124
-#, c-format
+#: ../urpmi:123
 msgid ""
 "  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 確認安裝是否能夠正確完成。\n"
 
-#: ../urpmi:125
-#, c-format
+#: ../urpmi:124
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分隔的路徑。\n"
 
-#: ../urpmi:126
-#, c-format
+#: ../urpmi:125
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除說明文件檔案。\n"
 
-#: ../urpmi:127
-#, c-format
+#: ../urpmi:126
 msgid "  --ignoresize   - don't verify disk space before installation.\n"
 msgstr "  --ignoresize   - 安裝前不檢查剩餘的磁碟空間。\n"
 
+#: ../urpmi:127
+#, fuzzy
+msgid "  --noscripts    - do not execute package scriptlet(s)\n"
+msgstr "  --description   - 套件描述\n"
+
 #: ../urpmi:128
-#, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安裝時應該略過的套件。\n"
 
 #: ../urpmi:129
-#, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
@@ -1662,76 +1624,65 @@ msgstr ""
 "  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
 
 #: ../urpmi:131 ../urpmi.addmedia:68 ../urpmi.update:41
-#, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr ""
 "  --norebuild    - 如果 hdlist 檔案無法讀取，不要嘗試重新建立\n"
 "                   它。\n"
 
 #: ../urpmi:132
-#, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
 #: ../urpmi:133 ../urpmq:77
-#, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
 
 #: ../urpmi:134
-#, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 
 #: ../urpmi:135
-#, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
 
 #: ../urpmi:136 ../urpmq:92
-#, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
 
 #: ../urpmi:137 ../urpmq:89
-#, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始碼套件 (與 --src 相同)。\n"
 
 #: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
-#, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
 #: ../urpmi:140
-#, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:187
-#, c-format
+#: ../urpmi:189
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "使用 --install-src 時二進位 RPM 檔案可做的事"
 
-#: ../urpmi:206
+#: ../urpmi:208
 #, c-format
 msgid ""
 "Directory [%s] already exists, please use another directory for bug report "
 "or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:207
+#: ../urpmi:209
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:210 ../urpmi:331
-#, c-format
+#: ../urpmi:212 ../urpmi:333
 msgid "Copying failed"
 msgstr "複製失敗"
 
-#: ../urpmi:236
+#: ../urpmi:238
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1740,12 +1691,12 @@ msgstr ""
 "錯誤： %s 似乎被掛載為唯讀模式。\n"
 "使用 --allow-force 標籤來強制執行。"
 
-#: ../urpmi:366
+#: ../urpmi:368
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:396
+#: ../urpmi:398
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1755,8 +1706,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:404 ../urpmi:422
-#, c-format
+#: ../urpmi:406 ../urpmi:424
 msgid ""
 "\n"
 "Continue installation anyway?"
@@ -1764,7 +1714,11 @@ msgstr ""
 "\n"
 "無論如何都要繼續安裝嗎？"
 
-#: ../urpmi:415
+#: ../urpmi:406 ../urpmi:424 ../urpmi:504
+msgid " (Y/n) "
+msgstr " (Y/n) (是/否) "
+
+#: ../urpmi:417
 #, c-format
 msgid ""
 "Some requested packages cannot be installed:\n"
@@ -1773,7 +1727,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:445
+#: ../urpmi:447
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1783,7 +1737,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:450
+#: ../urpmi:452
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1792,21 +1746,21 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:485 ../urpmi:496
+#: ../urpmi:487 ../urpmi:498
 #, c-format
 msgid ""
 "To satisfy dependencies, the following %d packages are going to be installed "
 "(%d MB)"
 msgstr "為了滿足相依性，下列的 %d 個套件 (%d MB) 將一併安裝"
 
-#: ../urpmi:486 ../urpmi:497
+#: ../urpmi:488 ../urpmi:499
 #, c-format
 msgid ""
 "To satisfy dependencies, the following package is going to be installed (%d "
 "MB)"
 msgstr "為了滿足相依性，下列的套件 (%d MB) 將一併安裝"
 
-#: ../urpmi:492
+#: ../urpmi:494
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1815,68 +1769,69 @@ msgstr ""
 "您必須具有管理者權限以安裝下列的相依性項目：\n"
 "%s\n"
 
-#: ../urpmi:523
-#, c-format
+#: ../urpmi:525
 msgid "Press Enter when ready..."
 msgstr "準備好時請按 Enter..."
 
-#: ../urpmi:577
-#, c-format
+#: ../urpmi:531
+msgid "Cancel"
+msgstr "取消"
+
+#: ../urpmi:531
+msgid "Ok"
+msgstr "確定"
+
+#: ../urpmi:579
 msgid "The following packages have bad signatures"
 msgstr "下列套件有不正確不正確的簽章"
 
-#: ../urpmi:578
-#, c-format
+#: ../urpmi:580
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續安裝嗎？"
 
-#: ../urpmi:620
+#: ../urpmi:622
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpmi:631
+#. - there's a common prefix, simplify message
+#: ../urpmi:633
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpmi:633
+#: ../urpmi:635
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpmi:662
-#, c-format
+#: ../urpmi:665
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../urpmi:678
-#, c-format
+#: ../urpmi:681
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../urpmi:715
+#: ../urpmi:718
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 個安裝程序失敗"
 
-#: ../urpmi:723
-#, c-format
-msgid "Installation is possible"
-msgstr "可以安裝"
-
-#: ../urpmi:730
+#: ../urpmi:733
 #, c-format
 msgid "The following package names were assumed: %s"
 msgstr "以下套件名稱是臆測的：%s"
 
-#: ../urpmi:747
-#, c-format
+#: ../urpmi:750
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
 
+#. Translator: The URI types strings 'file:', 'ftp:', 'http:',
+#. Translator: and 'removable:' must not be translated!
+#. Translator: neither the ``with''.
+#. Translator: only what is between <brackets> can be translated.
 #: ../urpmi.addmedia:34
-#, c-format
 msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
@@ -1901,29 +1856,24 @@ msgstr ""
 "而 [選項] 來自\n"
 
 #: ../urpmi.addmedia:51
-#, c-format
 msgid "  --update       - create an update medium.\n"
 msgstr "  --update       - 建立更新的媒體。\n"
 
 #: ../urpmi.addmedia:52
-#, c-format
 msgid "  --probe-synthesis - try to find and use synthesis file.\n"
 msgstr "  --probe-synthesis - 嘗試尋找並使用 synthesis 檔案。\n"
 
 #: ../urpmi.addmedia:53
-#, c-format
 msgid "  --probe-hdlist - try to find and use hdlist file.\n"
 msgstr "  --probe-hdlist - 嘗試尋找並使用 hdlist 檔案。\n"
 
 #: ../urpmi.addmedia:54
-#, c-format
 msgid ""
 "  --no-probe     - do not try to find any synthesis or\n"
 "                   hdlist file.\n"
 msgstr "  --no-probe     - 不尋找任何 synthesis 或 hdlist 檔案。\n"
 
 #: ../urpmi.addmedia:56
-#, c-format
 msgid ""
 "  --distrib      - automatically create all media from an installation\n"
 "                   medium.\n"
@@ -1939,7 +1889,6 @@ msgstr ""
 "                   %s\n"
 
 #: ../urpmi.addmedia:60
-#, c-format
 msgid ""
 "  --version      - use specified distribution version, the default is taken\n"
 "                   from the version of the distribution told by the\n"
@@ -1949,7 +1898,6 @@ msgstr ""
 "                   mandriva-release 套件回報的散佈套件版本。\n"
 
 #: ../urpmi.addmedia:63
-#, c-format
 msgid ""
 "  --arch         - use specified architecture, the default is arch of\n"
 "                   mandriva-release package installed.\n"
@@ -1958,7 +1906,6 @@ msgstr ""
 "                   mandriva-release 套件所使用的平台。\n"
 
 #: ../urpmi.addmedia:65
-#, c-format
 msgid ""
 "  --virtual      - create virtual media wich are always up-to-date,\n"
 "                   only file:// protocol is allowed.\n"
@@ -1967,27 +1914,22 @@ msgstr ""
 "                   通訊協定。\n"
 
 #: ../urpmi.addmedia:67 ../urpmi.update:39
-#, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 
 #: ../urpmi.addmedia:69
-#, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
 msgstr "  --nopubkey     - 不匯入新增的媒體的公鑰\n"
 
 #: ../urpmi.addmedia:70
-#, c-format
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 加入這個媒介到設定檔中，但不更新它。\n"
 
 #: ../urpmi.addmedia:71 ../urpmi.removemedia:50 ../urpmi.update:45
-#, c-format
 msgid "  -c             - clean headers cache directory.\n"
 msgstr "  -c             - 清除標頭快取目錄。\n"
 
 #: ../urpmi.addmedia:72 ../urpmi.update:46
-#, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 強制產生 hdlist 檔案。\n"
 
@@ -1997,7 +1939,6 @@ msgid "unable to update medium \"%s\"\n"
 msgstr "無法更新媒體 \"%s\"\n"
 
 #: ../urpmi.addmedia:117
-#, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只有管理者才能新增媒體"
 
@@ -2012,17 +1953,14 @@ msgid "Can't create config file [%s]"
 msgstr "無法建立設定檔 [%s]"
 
 #: ../urpmi.addmedia:128
-#, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 參數時不需給予 <hdlist 檔案的相對路徑>"
 
 #: ../urpmi.addmedia:138
-#, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 檔案的相對路徑> 遺失\n"
 
 #: ../urpmi.addmedia:140
-#, c-format
 msgid "`with' missing for network media\n"
 msgstr "使用網路媒體時遺漏了 `with'\n"
 
@@ -2032,7 +1970,6 @@ msgid "unable to create medium \"%s\"\n"
 msgstr "無法建立媒體 \"%s\"\n"
 
 #: ../urpmi.removemedia:46
-#, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
 "where <name> is a medium name to remove.\n"
@@ -2041,12 +1978,10 @@ msgstr ""
 "其中 <名稱> 是要移除的媒體名稱。\n"
 
 #: ../urpmi.removemedia:49
-#, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 選擇全部的媒體。\n"
 
 #: ../urpmi.removemedia:51
-#, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 對媒體名稱進行模糊比對。\n"
 
@@ -2060,12 +1995,10 @@ msgstr ""
 "未知的選項 '%s'\n"
 
 #: ../urpmi.removemedia:63
-#, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只有管理者才可以移除媒體"
 
 #: ../urpmi.removemedia:73
-#, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可以移除 (使用 urpmi.addmedia 來新增一個媒體)\n"
 
@@ -2079,7 +2012,6 @@ msgstr ""
 "(%s 的其中之一)\n"
 
 #: ../urpmi.update:28
-#, c-format
 msgid ""
 "usage: urpmi.update [options] <name> ...\n"
 "where <name> is a medium name to update.\n"
@@ -2088,37 +2020,30 @@ msgstr ""
 "其中 <名稱> 為要更新的媒體名稱。\n"
 
 #: ../urpmi.update:38
-#, c-format
 msgid "  --update       - update only update media.\n"
 msgstr "  --update       - 只更新更新的媒體。\n"
 
 #: ../urpmi.update:40
-#, c-format
 msgid "  --force-key    - force update of gpg key.\n"
 msgstr "  --force-key    - 強制更新 gpg 鑰匙。\n"
 
 #: ../urpmi.update:42
-#, c-format
 msgid "  --ignore       - don't update, mark the media as ignored.\n"
 msgstr "  --ignore       - 不更新，並標示此媒體為略過。\n"
 
 #: ../urpmi.update:43
-#, c-format
 msgid "  --no-ignore    - don't update, mark the media as enabled.\n"
 msgstr "  --no-ignore    - 不更新，並將此媒體標示為啟用。\n"
 
 #: ../urpmi.update:44
-#, c-format
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 選擇所有不可移除式媒體。\n"
 
 #: ../urpmi.update:67
-#, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只有管理者才能跟新媒體"
 
 #: ../urpmi.update:75
-#, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
@@ -2138,13 +2063,13 @@ msgstr "\"%s\""
 
 #: ../urpmi.update:98
 #, c-format
-msgid "ignoring media %s"
-msgstr "略過媒體 %s"
+msgid "enabling media %s"
+msgstr "啟用媒體 %s"
 
 #: ../urpmi.update:98
 #, c-format
-msgid "enabling media %s"
-msgstr "啟用媒體 %s"
+msgid "ignoring media %s"
+msgstr "略過媒體 %s"
 
 #: ../urpmq:38
 #, c-format
@@ -2163,38 +2088,31 @@ msgstr ""
 "使用方式：\n"
 
 #: ../urpmq:54
-#, c-format
 msgid "  --list         - list available packages.\n"
 msgstr "  --list         - 列出可用的的套件。\n"
 
 #: ../urpmq:55
-#, c-format
 msgid "  --list-media   - list available media.\n"
 msgstr "  --list-media   - 列出可用的媒體。\n"
 
 #: ../urpmq:56
-#, c-format
 msgid "  --list-url     - list available media and their url.\n"
 msgstr "  --list-url     - 列出可用的媒體與其 URL。\n"
 
 #: ../urpmq:57
-#, c-format
 msgid "  --list-nodes   - list available nodes when using --parallel.\n"
 msgstr "  --list-nodes   - 當使用 --parallel 選項時列出可用的節點。\n"
 
 #: ../urpmq:58
-#, c-format
 msgid "  --list-aliases - list available parallel aliases.\n"
 msgstr "  --list-aliases - 列出可用的同步管理別名。\n"
 
 #: ../urpmq:59
-#, c-format
 msgid ""
 "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 的參數形式的匯出設定值。\n"
 
 #: ../urpmq:61
-#, c-format
 msgid ""
 "  --headers      - extract headers for package listed from urpmi db to\n"
 "                   stdout (root only).\n"
@@ -2203,13 +2121,11 @@ msgstr ""
 "                   使用)。\n"
 
 #: ../urpmq:63
-#, c-format
 msgid ""
 "  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下載前先給予所有的原始碼套件 (僅供管理者使用).\n"
 
 #: ../urpmq:66
-#, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree.\n"
 "                   This permit to querying a distro.\n"
@@ -2218,104 +2134,104 @@ msgstr ""
 "                   套件。\n"
 
 #: ../urpmq:75
-#, c-format
 msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 顯示更新紀錄。\n"
 
 #: ../urpmq:76
-#, c-format
 msgid "  --summary, -S  - print summary.\n"
 msgstr "  --summary, -S  - 顯示摘要。\n"
 
 #: ../urpmq:78
-#, c-format
 msgid "  -c             - complete output with package to be removed.\n"
 msgstr "  -c             - 完整輸出要移除的套件。\n"
 
 #: ../urpmq:79
-#, c-format
 msgid "  -d             - extend query to package dependencies.\n"
 msgstr "  -d             - 延伸套件相依性的查詢。\n"
 
 #: ../urpmq:81
-#, c-format
 msgid "  -g             - print groups with name also.\n"
 msgstr "  -g             - 顯示群組名稱。\n"
 
 #: ../urpmq:82
-#, c-format
 msgid "  -i             - print useful information in human readable form.\n"
 msgstr "  -i             - 以人類可讀的形式顯示有用資訊。\n"
 
 #: ../urpmq:83
-#, c-format
 msgid "  -l             - list files in package.\n"
 msgstr "  -l             - 列出套件內包含的檔案。\n"
 
 #: ../urpmq:84
-#, c-format
 msgid ""
 "  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - 不於 provides 中搜尋套件 (預設值)。\n"
 
 #: ../urpmq:85
-#, c-format
 msgid "  -p             - search in provides to find package.\n"
 msgstr "  -p             - 於 provides 中搜尋套件。\n"
 
 #: ../urpmq:86
-#, c-format
 msgid "  -r             - print version and release with name also.\n"
 msgstr "  -r             - 顯示版本與發行名稱。\n"
 
 #: ../urpmq:87
-#, c-format
 msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆向搜尋何者需要此套件。\n"
 
 #: ../urpmq:88
-#, c-format
 msgid ""
 "  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - 進階逆向搜尋 (包含虛擬套件)。\n"
 
 #: ../urpmq:90
-#, c-format
 msgid ""
 "  -u             - remove package if a more recent version is already "
 "installed.\n"
 msgstr "  -u             - 若已經安裝較新的版本則移除套件。\n"
 
 #: ../urpmq:93
-#, c-format
 msgid "  -Y             - like -y, but forces to match case-insensitively.\n"
 msgstr "  -Y             - 類似 -y 參數，但強制比對大小寫。\n"
 
 #: ../urpmq:94
-#, c-format
 msgid "  names or rpm files given on command line are queried.\n"
 msgstr "  查詢命令列給予的套件名稱或 RPM 檔案。\n"
 
-#: ../urpmq:156
-#, c-format
+#: ../urpmq:157
 msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
 
-#: ../urpmq:343
+#. TODO rewrite rpm2header in perl
+#: ../urpmq:313
+msgid "rpm2header utility not found, impossible to use the --header option"
+msgstr ""
+
+#: ../urpmq:362
 #, c-format
 msgid "skipping media %s: no hdlist"
 msgstr "略過媒體 %s：沒有 hdlist 檔"
 
-#: ../urpmq:414
-#, c-format
+#: ../urpmq:437
 msgid "No filelist found\n"
 msgstr "沒有找到檔案列表\n"
 
-#: ../urpmq:424
-#, c-format
+#: ../urpmq:449
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
+#~ msgid "installing %s\n"
+#~ msgstr "正在安裝 %s\n"
+
+#~ msgid ""
+#~ "Automatic installation of packages...\n"
+#~ "You requested installation of package %s\n"
+#~ msgstr ""
+#~ "自動化套件安裝...\n"
+#~ "您要求安裝的套件 %s\n"
+
+#~ msgid "%s: command not found\n"
+#~ msgstr "%s：找不到指令\n"
+
 #~ msgid ""
 #~ "Some package requested cannot be installed:\n"
 #~ "%s\n"