Merge messages; add new French messages, and fix some.

1 files changed, 270 insertions, 364 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index ab220b33..f19a7f27 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-06-15 17:56+0800\n"
+"POT-Creation-Date: 2005-06-29 18:17+0200\n"
 "PO-Revision-Date: 2005-06-25 01:06+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -30,13 +30,19 @@ msgstr ""
 "X-Generator: KBabel 1.0.2\n"
 
 #. This is a list of chars acceptable as a 'yes' answer to a Yes/No question;
+#. you can put here the letters for 'yes' for your language, so people
 #. can hit those keys in their keyboard to reply.
+#. please keep the 'Yy' for compatibility reasons
+#.
 #: placeholder.h:11
 msgid "Yy"
 msgstr "Yy是"
 
 #. This is a list of chars acceptable as a 'no' answer to a Yes/No question;
+#. you can put here the letters for 'no' for your language, so people
 #. can hit those keys in their keyboard to reply.
+#. please keep the 'Nn' for compatibility reasons
+#.
 #: placeholder.h:17
 msgid "Nn"
 msgstr "Nn否"
@@ -55,27 +61,22 @@ msgstr ""
 "自動化套件安裝...\n"
 "您要求安裝的套件 %s\n"
 
-#: ../_irpm:33
-#: ../urpme:29
-#: ../urpmi:478
+#: ../_irpm:33 ../urpme:31 ../urpmi:494
 #, c-format
 msgid "Is this OK?"
 msgstr "這樣可以嗎？"
 
-#: ../_irpm:35
+#: ../_irpm:35 ../urpmi:525
 #, c-format
 msgid "Ok"
 msgstr "確定"
 
-#: ../_irpm:36
+#: ../_irpm:36 ../urpmi:525
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44
-#: ../urpmi:384
-#: ../urpmi:402
-#: ../urpmi:482
+#: ../_irpm:44 ../urpmi:400 ../urpmi:418 ../urpmi:498
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -85,8 +86,7 @@ msgstr " (Y/n) (是/否) "
 msgid "%s: command not found\n"
 msgstr "%s：找不到指令\n"
 
-#: ../gurpmi:31
-#: ../gurpmi2:55
+#: ../gurpmi:31 ../gurpmi2:55
 #, c-format
 msgid "RPM installation"
 msgstr "RPM 套件安裝"
@@ -98,7 +98,8 @@ msgid ""
 "\n"
 "%s\n"
 "\n"
-"You probably didn't want to install it on your computer (installing it would allow you to make modifications to its sourcecode then compile it).\n"
+"You probably didn't want to install it on your computer (installing it would "
+"allow you to make modifications to its sourcecode then compile it).\n"
 "\n"
 "What would you like to do?"
 msgstr ""
@@ -151,8 +152,7 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:73
-#: ../gurpmi2:119
+#: ../gurpmi:73 ../gurpmi2:119
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -198,14 +198,12 @@ msgstr " (安裝用)"
 msgid "Package choice"
 msgstr "套件選擇"
 
-#: ../gurpmi2:119
-#: ../gurpmi2:142
+#: ../gurpmi2:119 ../gurpmi2:142
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
 
-#: ../gurpmi2:120
-#: ../urpmi:349
+#: ../gurpmi2:120 ../urpmi:360
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
@@ -229,7 +227,8 @@ msgstr ""
 #: ../gurpmi2:177
 #, c-format
 msgid ""
-"To satisfy dependencies, the following %d packages are going to be installed:\n"
+"To satisfy dependencies, the following %d packages are going to be "
+"installed:\n"
 "%s\n"
 msgstr ""
 "為了滿足相依性的需求，下面的 %d 個套件也必須一併安裝：\n"
@@ -240,15 +239,12 @@ msgstr ""
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../gurpmi2:186
-#: ../urpmi:491
-#: ../urpmq:308
+#: ../gurpmi2:186 ../urpmi:507 ../urpmq:308
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:200
-#: ../urpmi:502
+#: ../gurpmi2:200 ../urpmi:518
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將名為 \"%s\" 的媒體置入裝置 [%s] 內"
@@ -271,10 +267,7 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../gurpmi2:250
-#: ../gurpmi2:299
-#: ../urpmi:573
-#: ../urpmi:689
+#: ../gurpmi2:250 ../gurpmi2:299 ../urpmi:588 ../urpmi:704
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -285,15 +278,12 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:257
-#: ../urpme:116
-#: ../urpmi:616
+#: ../gurpmi2:257 ../urpme:118 ../urpmi:631
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:265
-#: ../urpm.pm:2877
+#: ../gurpmi2:265 ../urpm.pm:2877
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
@@ -303,11 +293,7 @@ msgstr "準備中..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:285
-#: ../urpmi:583
-#: ../urpmi:634
-#: ../urpmi:652
-#: ../urpmi:668
+#: ../gurpmi2:285 ../urpmi:598 ../urpmi:649 ../urpmi:667 ../urpmi:683
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
@@ -317,8 +303,7 @@ msgstr "安裝失敗"
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:302
-#: ../urpmi:705
+#: ../gurpmi2:302 ../urpmi:720
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
@@ -382,15 +367,12 @@ msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist，忽略
 msgid "medium \"%s\" trying to use an already used list, medium ignored"
 msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的列表，忽略這個媒體"
 
-#: ../urpm.pm:224
-#: ../urpm.pm:1293
-#: ../urpm.pm:1303
+#: ../urpm.pm:224 ../urpm.pm:1293 ../urpm.pm:1303
 #, c-format
 msgid "unable to access hdlist file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的 hdlist 檔案，忽略這個媒體"
 
-#: ../urpm.pm:227
-#: ../urpm.pm:2483
+#: ../urpm.pm:227 ../urpm.pm:2483
 #, c-format
 msgid "unable to access list file of \"%s\", medium ignored"
 msgstr "無法存取 \"%s\" 的列表，忽略這個媒體"
@@ -402,7 +384,9 @@ msgstr "正在嘗試避開現存的媒體  \"%s\"，正在避開"
 
 #: ../urpm.pm:265
 #, c-format
-msgid "virtual medium \"%s\" should not have defined hdlist or list file, medium ignored"
+msgid ""
+"virtual medium \"%s\" should not have defined hdlist or list file, medium "
+"ignored"
 msgstr "虛擬媒體 \"%s\" 不應該指定 hdlist 或列表檔案，忽略這個媒體"
 
 #: ../urpm.pm:270
@@ -450,8 +434,7 @@ msgstr "媒體 \"%s\" 是一個光碟映像檔，將立即掛載起來"
 msgid "using different removable device [%s] for \"%s\""
 msgstr "使用不同的可移除式裝置 [%s] 於 \"%s\" "
 
-#: ../urpm.pm:372
-#: ../urpm.pm:375
+#: ../urpm.pm:372 ../urpm.pm:375
 #, c-format
 msgid "unable to retrieve pathname for removable medium \"%s\""
 msgstr "無法擷取可移除式媒體 \"%s\" 的路徑名稱"
@@ -503,48 +486,30 @@ msgstr "似乎沒有裝置在位於 \"%s\" 的 chroot 內"
 
 #: ../urpm.pm:478
 #, c-format
-msgid "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update or --parallel"
-msgstr "--synthesis 不能夠與 --media，--excludemedia，--sortmedia，--update 與 --parallel 一起使用"
-
-#: ../urpm.pm:539
-#: ../urpm.pm:565
-#: ../urpm.pm:1047
-#: ../urpm.pm:1058
-#: ../urpm.pm:1130
-#: ../urpm.pm:1147
-#: ../urpm.pm:1217
-#: ../urpm.pm:1276
-#: ../urpm.pm:1491
-#: ../urpm.pm:1614
-#: ../urpm.pm:1731
-#: ../urpm.pm:1737
-#: ../urpm.pm:1840
-#: ../urpm.pm:1925
-#: ../urpm.pm:1929
+msgid ""
+"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
+"update or --parallel"
+msgstr ""
+"--synthesis 不能夠與 --media，--excludemedia，--sortmedia，--update 與 --"
+"parallel 一起使用"
+
+#: ../urpm.pm:539 ../urpm.pm:565 ../urpm.pm:1047 ../urpm.pm:1058
+#: ../urpm.pm:1130 ../urpm.pm:1147 ../urpm.pm:1217 ../urpm.pm:1276
+#: ../urpm.pm:1491 ../urpm.pm:1614 ../urpm.pm:1731 ../urpm.pm:1737
+#: ../urpm.pm:1840 ../urpm.pm:1925 ../urpm.pm:1929
 #, c-format
 msgid "examining synthesis file [%s]"
 msgstr "檢驗 synthesis 檔案 [%s]"
 
-#: ../urpm.pm:543
-#: ../urpm.pm:558
-#: ../urpm.pm:571
-#: ../urpm.pm:1050
-#: ../urpm.pm:1061
-#: ../urpm.pm:1136
-#: ../urpm.pm:1142
-#: ../urpm.pm:1222
-#: ../urpm.pm:1280
-#: ../urpm.pm:1495
-#: ../urpm.pm:1618
-#: ../urpm.pm:1725
-#: ../urpm.pm:1743
-#: ../urpm.pm:1935
+#: ../urpm.pm:543 ../urpm.pm:558 ../urpm.pm:571 ../urpm.pm:1050
+#: ../urpm.pm:1061 ../urpm.pm:1136 ../urpm.pm:1142 ../urpm.pm:1222
+#: ../urpm.pm:1280 ../urpm.pm:1495 ../urpm.pm:1618 ../urpm.pm:1725
+#: ../urpm.pm:1743 ../urpm.pm:1935
 #, c-format
 msgid "examining hdlist file [%s]"
 msgstr "檢驗 hdlist 檔案 [%s]"
 
-#: ../urpm.pm:553
-#: ../urpm.pm:1054
+#: ../urpm.pm:553 ../urpm.pm:1054
 #, c-format
 msgid "virtual medium \"%s\" is not local, medium ignored"
 msgstr "虛擬媒體 \"%s\" 不在本地端，忽略這個媒體"
@@ -554,17 +519,13 @@ msgstr "虛擬媒體 \"%s\" 不在本地端，忽略這個媒體"
 msgid "Search start: %s end: %s"
 msgstr "搜尋開始於：%s 結束於：%s"
 
-#: ../urpm.pm:588
-#: ../urpm.pm:1068
-#: ../urpm.pm:1155
-#: ../urpm.pm:1226
+#: ../urpm.pm:588 ../urpm.pm:1068 ../urpm.pm:1155 ../urpm.pm:1226
 #: ../urpm.pm:1622
 #, c-format
 msgid "problem reading hdlist or synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 hdlist 或 synthesis 檔案時發生問題"
 
-#: ../urpm.pm:595
-#: ../urpm.pm:1878
+#: ../urpm.pm:595 ../urpm.pm:1878
 #, c-format
 msgid "performing second pass to compute dependencies\n"
 msgstr "正在進行第二個步驟，相依性的計算\n"
@@ -579,12 +540,8 @@ msgstr "正在略過套件 %s"
 msgid "would install instead of upgrade package %s"
 msgstr "將會安裝而非升級套件 %s"
 
-#: ../urpm.pm:635
-#: ../urpm.pm:2290
-#: ../urpm.pm:2351
-#: ../urpm.pm:2540
-#: ../urpm.pm:2942
-#: ../urpm.pm:3065
+#: ../urpm.pm:635 ../urpm.pm:2290 ../urpm.pm:2351 ../urpm.pm:2540
+#: ../urpm.pm:2942 ../urpm.pm:3065
 #, c-format
 msgid "unable to open rpmdb"
 msgstr "無法開啟 rpmdb"
@@ -614,26 +571,18 @@ msgstr "無法存取第一個安裝媒體"
 msgid "copying hdlists file..."
 msgstr "正在複製 hdlist 檔案..."
 
-#: ../urpm.pm:757
-#: ../urpm.pm:1171
-#: ../urpm.pm:1246
+#: ../urpm.pm:757 ../urpm.pm:1171 ../urpm.pm:1246
 #, c-format
 msgid "...copying done"
 msgstr "...複製完成"
 
-#: ../urpm.pm:758
-#: ../urpm.pm:1172
-#: ../urpm.pm:1321
-#: ../urpm.pm:1380
-#: ../urpm.pm:1560
-#: ../urpm.pm:1567
+#: ../urpm.pm:758 ../urpm.pm:1172 ../urpm.pm:1321 ../urpm.pm:1380
+#: ../urpm.pm:1560 ../urpm.pm:1567
 #, c-format
 msgid "...copying failed"
 msgstr "...複製失敗"
 
-#: ../urpm.pm:761
-#: ../urpm.pm:786
-#: ../urpm.pm:825
+#: ../urpm.pm:761 ../urpm.pm:786 ../urpm.pm:825
 #, c-format
 msgid "unable to access first installation medium (no hdlists file found)"
 msgstr "無法存取第一個安裝媒體 (找不到 hdlists 檔案)"
@@ -643,18 +592,12 @@ msgstr "無法存取第一個安裝媒體 (找不到 hdlists 檔案)"
 msgid "retrieving hdlists file..."
 msgstr "擷取 hdlists 檔案..."
 
-#: ../urpm.pm:780
-#: ../urpm.pm:1604
-#: ../urpm.pm:2094
-#: ../urpm.pm:2810
+#: ../urpm.pm:780 ../urpm.pm:1604 ../urpm.pm:2094 ../urpm.pm:2810
 #, c-format
 msgid "...retrieving done"
 msgstr "...擷取完成"
 
-#: ../urpm.pm:782
-#: ../urpm.pm:1588
-#: ../urpm.pm:1597
-#: ../urpm.pm:2097
+#: ../urpm.pm:782 ../urpm.pm:1588 ../urpm.pm:1597 ../urpm.pm:2097
 #: ../urpm.pm:2812
 #, c-format
 msgid "...retrieving failed: %s"
@@ -675,8 +618,7 @@ msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm.pm:864
-#: ../urpmi.update:94
+#: ../urpm.pm:864 ../urpmi.update:97
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
@@ -705,23 +647,26 @@ msgstr "重新設定完成"
 #, c-format
 msgid ""
 "unable to access medium \"%s\",\n"
-"this could happen if you mounted manually the directory when creating the medium."
+"this could happen if you mounted manually the directory when creating the "
+"medium."
 msgstr ""
 "無法存取媒體 \"%s\"，\n"
 "這可能是因為您建立媒體時是手動將這個目錄掛載到系統裡的。"
 
 #: ../urpm.pm:1159
 #, c-format
-msgid "virtual medium \"%s\" should have valid source hdlist or synthesis, medium ignored"
-msgstr "虛擬媒體 \"%s\" 應該有個有效的來源 hdlist 或 synthesis 檔案，忽略這個媒體"
+msgid ""
+"virtual medium \"%s\" should have valid source hdlist or synthesis, medium "
+"ignored"
+msgstr ""
+"虛擬媒體 \"%s\" 應該有個有效的來源 hdlist 或 synthesis 檔案，忽略這個媒體"
 
 #: ../urpm.pm:1169
 #, c-format
 msgid "copying description file of \"%s\"..."
 msgstr "正在複製 \"%s\" 的敘述檔案..."
 
-#: ../urpm.pm:1193
-#: ../urpm.pm:1467
+#: ../urpm.pm:1193 ../urpm.pm:1467
 #, c-format
 msgid "computing md5sum of existing source hdlist (or synthesis)"
 msgstr "計算來源 hdlist (或 synthesis) 的 md5sum"
@@ -746,9 +691,7 @@ msgstr "正在計算複製的來源 hdlist (或 synthesis) 的 md5sum"
 msgid "copy of [%s] failed (md5sum mismatch)"
 msgstr "複製 [%s] 失敗 (md5sum 不合)"
 
-#: ../urpm.pm:1284
-#: ../urpm.pm:1499
-#: ../urpm.pm:1843
+#: ../urpm.pm:1284 ../urpm.pm:1499 ../urpm.pm:1843
 #, c-format
 msgid "problem reading synthesis file of medium \"%s\""
 msgstr "讀取 \"%s\" 媒體的 synthesis 檔案時發生問題"
@@ -803,8 +746,7 @@ msgstr "擷取來源 hdlist (或 synthesis) 失敗"
 msgid "no hdlist file found for medium \"%s\""
 msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
 
-#: ../urpm.pm:1713
-#: ../urpm.pm:1767
+#: ../urpm.pm:1713 ../urpm.pm:1767
 #, c-format
 msgid "file [%s] already used in the same medium \"%s\""
 msgstr "檔案 [%s] 已經在相同的媒體 \"%s\" 中使用了"
@@ -854,15 +796,14 @@ msgstr "正在讀取媒體 \"%s\" 的標頭"
 msgid "building hdlist [%s]"
 msgstr "正在建立 hdlist [%s]"
 
-#: ../urpm.pm:1912
-#: ../urpm.pm:1947
+#: ../urpm.pm:1912 ../urpm.pm:1947
 #, c-format
-msgid "Unable to build synthesis file for medium \"%s\". Your hdlist file may be corrupted."
+msgid ""
+"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
+"corrupted."
 msgstr "無法為媒介 \"%s\" 建立 synthesis 檔。您的 hdlist 檔可能並不標準。"
 
-#: ../urpm.pm:1915
-#: ../urpm.pm:1950
-#: ../urpmi:306
+#: ../urpm.pm:1915 ../urpm.pm:1950 ../urpmi:317
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
@@ -922,15 +863,12 @@ msgstr "搜尋"
 msgid "no package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm.pm:2220
-#: ../urpme:92
+#: ../urpm.pm:2220 ../urpme:94
 #, c-format
 msgid "The following packages contain %s: %s"
 msgstr "以下套件包含 %s：%s"
 
-#: ../urpm.pm:2414
-#: ../urpm.pm:2460
-#: ../urpm.pm:2491
+#: ../urpm.pm:2414 ../urpm.pm:2460 ../urpm.pm:2491
 #, c-format
 msgid "there are multiple packages with the same rpm filename \"%s\""
 msgstr "有多個套件具有相同的 rpm 檔名 \"%s\""
@@ -959,17 +897,12 @@ msgstr "媒體 \"%s\" 沒有定義任何 rpm 檔案的位置"
 msgid "package %s is not found."
 msgstr "沒有找到套件 %s。"
 
-#: ../urpm.pm:2581
-#: ../urpm.pm:2595
-#: ../urpm.pm:2615
-#: ../urpm.pm:2629
+#: ../urpm.pm:2581 ../urpm.pm:2595 ../urpm.pm:2615 ../urpm.pm:2629
 #, c-format
 msgid "urpmi database locked"
 msgstr "urpmi 資料庫被鎖住了"
 
-#: ../urpm.pm:2681
-#: ../urpm.pm:2686
-#: ../urpm.pm:2712
+#: ../urpm.pm:2681 ../urpm.pm:2686 ../urpm.pm:2712
 #, c-format
 msgid "medium \"%s\" is not selected"
 msgstr "媒體 \"%s\" 沒有被選取"
@@ -1006,7 +939,8 @@ msgstr "正在使用第 %d 號程序執行交辦的安裝程序"
 
 #: ../urpm.pm:2946
 #, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
 msgstr "已建立在 %s 上的安裝程序 (移除 = %d，安裝 = %d，升級 = %d)"
 
 #: ../urpm.pm:2949
@@ -1044,14 +978,12 @@ msgstr "無法安裝套件 %s"
 msgid "More information on package %s"
 msgstr "更多關於套件 %s 的資訊"
 
-#: ../urpm.pm:3205
-#: ../urpm.pm:3238
+#: ../urpm.pm:3205 ../urpm.pm:3238
 #, c-format
 msgid "due to missing %s"
 msgstr "由於遺失了 %s"
 
-#: ../urpm.pm:3206
-#: ../urpm.pm:3236
+#: ../urpm.pm:3206 ../urpm.pm:3236
 #, c-format
 msgid "due to unsatisfied %s"
 msgstr "由於未滿足 %s"
@@ -1106,13 +1038,17 @@ msgstr "正在檢驗 MD5SUM 檔案"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 
-#: ../urpm/args.pm:93
-#: ../urpm/args.pm:102
+#: ../urpm.pm:3375
+#, c-format
+msgid "This operation is forbidden while running in restricted mode"
+msgstr ""
+
+#: ../urpm/args.pm:93 ../urpm/args.pm:102
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
 
-#: ../urpm/args.pm:237
+#: ../urpm/args.pm:242
 #, c-format
 msgid "urpmq: cannot read rpm file \"%s\"\n"
 msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
@@ -1122,12 +1058,13 @@ msgstr "urpmq：無法讀取 rpm 檔案 \"%s\"\n"
 msgid "Sorry, bad choice, try again\n"
 msgstr "抱歉，選擇錯誤，請再試一次\n"
 
-#: ../urpme:36
+#: ../urpme:38
 #, c-format
 msgid ""
 "urpme version %s\n"
 "Copyright (C) 1999-2005 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1137,113 +1074,100 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpme:41
-#: ../urpmf:32
-#: ../urpmi:78
-#: ../urpmi.addmedia:43
-#: ../urpmi.removemedia:45
-#: ../urpmi.update:30
-#: ../urpmq:43
+#: ../urpme:43 ../urpmf:32 ../urpmi:79 ../urpmi.addmedia:43
+#: ../urpmi.removemedia:48 ../urpmi.update:30 ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息。\n"
 
-#: ../urpme:42
-#: ../urpmi:85
+#: ../urpme:44 ../urpmi:86
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動選擇套件。\n"
 
-#: ../urpme:43
+#: ../urpme:45
 #, c-format
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
 
-#: ../urpme:44
-#: ../urpmi:100
-#: ../urpmq:64
+#: ../urpme:46 ../urpmi:101 ../urpmq:64
 #, c-format
-msgid "  --force        - force invocation even if some packages do not exist.\n"
+msgid ""
+"  --force        - force invocation even if some packages do not exist.\n"
 msgstr "  --force        - 即使某些套件不存在仍然強制執行。\n"
 
-#: ../urpme:45
-#: ../urpmi:105
-#: ../urpmq:65
+#: ../urpme:47 ../urpmi:106 ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
 
-#: ../urpme:46
+#: ../urpme:48
 #, c-format
 msgid "  --root         - use another root for rpm removal.\n"
 msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
 
-#: ../urpme:47
+#: ../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"
-msgstr "  --use-distrib  - 立即由一個散佈套件樹設定 urpmi，有助於安裝/反安裝一個                   藉由 --root 選項的 chroot。\n"
+msgstr ""
+"  --use-distrib  - 立即由一個散佈套件樹設定 urpmi，有助於安裝/反安裝一"
+"個                   藉由 --root 選項的 chroot。\n"
 
-#: ../urpme:49
-#: ../urpmi:138
-#: ../urpmi.addmedia:74
-#: ../urpmi.removemedia:50
-#: ../urpmi.update:48
-#: ../urpmq:92
+#: ../urpme:51 ../urpmi:139 ../urpmi.addmedia:74 ../urpmi.removemedia:53
+#: ../urpmi.update:48 ../urpmq:92
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
 
-#: ../urpme:50
+#: ../urpme:52
 #, c-format
 msgid "  -a             - select all packages matching expression.\n"
 msgstr "  -a             - 選擇所有符合描述的套件。\n"
 
-#: ../urpme:66
+#: ../urpme:68
 #, c-format
 msgid "Only superuser is allowed to remove packages"
 msgstr "只有擁有管理者權限的使用者才能移除套件"
 
-#: ../urpme:87
+#: ../urpme:89
 #, c-format
 msgid "unknown packages"
 msgstr "未知的套件"
 
-#: ../urpme:87
+#: ../urpme:89
 #, c-format
 msgid "unknown package"
 msgstr "未知的套件"
 
-#: ../urpme:97
-#: ../urpmi:417
+#: ../urpme:99 ../urpmi:433
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
 
-#: ../urpme:100
+#: ../urpme:102
 #, c-format
 msgid "Nothing to remove"
 msgstr "沒有東西可移除"
 
-#: ../urpme:104
+#: ../urpme:106
 #, c-format
 msgid "Checking to remove the following packages"
 msgstr "正在檢查以移除下列套件"
 
-#: ../urpme:111
+#: ../urpme:113
 #, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages will be removed (%d MB)"
 msgstr "為了滿足相依性，下列 %d 個套件將被移除 (%d MB)"
 
-#: ../urpme:113
-#: ../urpmi:436
-#: ../urpmi:566
+#: ../urpme:115 ../urpmi:452 ../urpmi:581
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
 
-#: ../urpme:120
+#: ../urpme:122
 #, c-format
 msgid "Removing failed"
 msgstr "移除失敗"
@@ -1253,7 +1177,8 @@ msgstr "移除失敗"
 msgid ""
 "urpmf version %s\n"
 "Copyright (C) 2002-2004 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1263,36 +1188,28 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpmf:33
-#: ../urpmi:79
-#: ../urpmq:44
+#: ../urpmf:33 ../urpmi:80 ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
-#: ../urpmf:34
-#: ../urpmi:80
-#: ../urpmq:45
+#: ../urpmf:34 ../urpmi:81 ../urpmq:45
 #, c-format
 msgid "  --media        - use only the given media, separated by comma.\n"
 msgstr "  --media        - 只使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:35
-#: ../urpmi:82
-#: ../urpmq:47
+#: ../urpmf:35 ../urpmi:83 ../urpmq:47
 #, c-format
 msgid "  --excludemedia - do not use the given media, separated by comma.\n"
 msgstr "  --excludemedia - 不使用給定的媒體，不同媒體間請以逗號分隔。\n"
 
-#: ../urpmf:36
-#: ../urpmi:83
-#: ../urpmq:48
+#: ../urpmf:36 ../urpmi:84 ../urpmq:48
 #, c-format
-msgid "  --sortmedia    - sort media according to substrings separated by comma.\n"
+msgid ""
+"  --sortmedia    - sort media according to substrings separated by comma.\n"
 msgstr "  --sortmedia    - 依據子字串排序媒體，以逗號分開。\n"
 
-#: ../urpmf:37
-#: ../urpmq:49
+#: ../urpmf:37 ../urpmq:49
 #, c-format
 msgid "  --synthesis    - use the synthesis given instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用給定的 synthesis 檔，而非 urpmi 資料庫。\n"
@@ -1305,7 +1222,8 @@ msgstr "  --verbose      - 完整訊息模式。\n"
 #: ../urpmf:39
 #, c-format
 msgid ""
-"  --quiet        - do not print tag name (default if no tag given on command\n"
+"  --quiet        - do not print tag name (default if no tag given on "
+"command\n"
 "                   line, incompatible with interactive mode).\n"
 msgstr ""
 "  --quiet        - 不顯示標籤名稱 (除非在命令列給定參數，否則此為預\n"
@@ -1396,9 +1314,7 @@ msgstr "  --conflicts    - 顯示衝突標籤：衝突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - 顯示廢棄標籤：廢棄。\n"
 
-#: ../urpmf:58
-#: ../urpmi:120
-#: ../urpmq:74
+#: ../urpmf:58 ../urpmi:121 ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1410,8 +1326,7 @@ msgstr "  --env          - 使用特定環境 (一般用於臭蟲回報)。\n"
 msgid "  -i             - ignore case distinctions in every pattern.\n"
 msgstr "  -i             - 忽略每個樣版中的大小寫差異。\n"
 
-#: ../urpmf:61
-#: ../urpmq:81
+#: ../urpmf:61 ../urpmq:81
 #, c-format
 msgid "  -f             - print version, release and arch with name.\n"
 msgstr "  -f             - 顯示版本、發行編號與平台。\n"
@@ -1423,12 +1338,14 @@ msgstr "  -e             - 直接包含 perl 原始碼，類似 perl -e。\n"
 
 #: ../urpmf:63
 #, c-format
-msgid "  -a             - binary AND operator, true if both expression are true.\n"
+msgid ""
+"  -a             - binary AND operator, true if both expression are true.\n"
 msgstr "  -a             - 二元 AND 運算子，若兩表示式皆真則其值為真。\n"
 
 #: ../urpmf:64
 #, c-format
-msgid "  -o             - binary OR operator, true if one expression is true.\n"
+msgid ""
+"  -o             - binary OR operator, true if one expression is true.\n"
 msgstr "  -o             - 二元 OR 運算子，若表示式之一為真則其值為真。\n"
 
 #: ../urpmf:65
@@ -1455,29 +1372,31 @@ msgstr ""
 "回傳值：\n"
 "%s\n"
 
-#: ../urpmf:124
-#: ../urpmi:201
-#: ../urpmq:116
+#: ../urpmf:124 ../urpmi:212 ../urpmq:116
 #, c-format
 msgid "using specific environment on %s\n"
 msgstr "正在 %s 上使用特定的環境\n"
 
 #: ../urpmf:156
 #, c-format
-msgid "Note: since no media searched uses hdlists, urpmf was unable to return any result\n"
-msgstr "注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
+msgid ""
+"Note: since no media searched uses hdlists, urpmf was unable to return any "
+"result\n"
+msgstr ""
+"注意：因為所有搜尋過的媒體都沒有使用 hdlists，所以 urpmf 無法回傳任何結果\n"
 
 #: ../urpmf:157
 #, c-format
 msgid "You may want to use --name to search for package names.\n"
 msgstr "您或許想要使用 --name 參數來搜尋套件名稱。\n"
 
-#: ../urpmi:73
+#: ../urpmi:74
 #, c-format
 msgid ""
 "urpmi version %s\n"
 "Copyright (C) 1999-2005 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -1487,35 +1406,37 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpmi:81
-#: ../urpmq:46
+#: ../urpmi:82 ../urpmq:46
 #, c-format
-msgid "  --searchmedia  - use only the given media to search requested (or updated) packages.\n"
+msgid ""
+"  --searchmedia  - use only the given media to search requested (or updated) "
+"packages.\n"
 msgstr "  --searchmedia  - 只使用指定的媒體來搜尋或升級套件。\n"
 
-#: ../urpmi:84
+#: ../urpmi:85
 #, c-format
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpmi:86
-#: ../urpmq:50
+#: ../urpmi:87 ../urpmq:50
 #, c-format
-msgid "  --auto-select  - automatically select packages to upgrade the system.\n"
+msgid ""
+"  --auto-select  - automatically select packages to upgrade the system.\n"
 msgstr "  --auto-select  - 自動選擇要用來升級系統的套件。\n"
 
-#: ../urpmi:87
+#: ../urpmi:88
 #, c-format
-msgid "  --no-uninstall - never ask to uninstall a package, abort the installation.\n"
+msgid ""
+"  --no-uninstall - never ask to uninstall a package, abort the "
+"installation.\n"
 msgstr "  --no-uninstall - 絕不要求移除套件，直接中斷安裝。\n"
 
-#: ../urpmi:88
+#: ../urpmi:89
 #, c-format
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安裝套件 (只下載)。\n"
 
-#: ../urpmi:89
-#: ../urpmq:52
+#: ../urpmi:90 ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1524,7 +1445,7 @@ msgstr ""
 "  --keep         - 盡可能的保留現存的套件，拒絕安裝會導致移除其他套件的\n"
 "                   套件。\n"
 
-#: ../urpmi:91
+#: ../urpmi:92
 #, c-format
 msgid ""
 "  --split-level  - split in small transaction if more than given packages\n"
@@ -1535,46 +1456,44 @@ msgstr ""
 "                   分割為幾個小的安裝程序。\n"
 "                   預設值為 %d。\n"
 
-#: ../urpmi:94
+#: ../urpmi:95
 #, c-format
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小型安裝程序大小，預設值為 %d。\n"
 
-#: ../urpmi:95
-#: ../urpmq:51
+#: ../urpmi:96 ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 加上模糊搜尋 (與 -y 相同)。\n"
 
-#: ../urpmi:96
-#: ../urpmq:60
+#: ../urpmi:97 ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下個套件是原始碼套件 (與 -s 相同)。\n"
 
-#: ../urpmi:97
+#: ../urpmi:98
 #, c-format
 msgid "  --install-src  - install only source package (no binaries).\n"
 msgstr "  --install-src  - 只安裝原始碼套件 (不安裝二進位檔)。\n"
 
-#: ../urpmi:98
+#: ../urpmi:99
 #, c-format
 msgid "  --clean        - remove rpm from cache before anything else.\n"
 msgstr "  --clean        - 在執行任何事前先由快取中移除 RPM 檔案。\n"
 
-#: ../urpmi:99
+#: ../urpmi:100
 #, c-format
 msgid "  --noclean      - don't clean rpms from cache.\n"
 msgstr "  --noclean      - 不清除快取中的 RPM 檔案。\n"
 
-#: ../urpmi:101
+#: ../urpmi:102
 #, c-format
 msgid ""
 "  --allow-nodeps - allow asking user to install packages without\n"
 "                   dependencies checking.\n"
 msgstr "  --allow-nodeps - 允許要求使用者不檢查相依性就安裝套件。\n"
 
-#: ../urpmi:103
+#: ../urpmi:104
 #, c-format
 msgid ""
 "  --allow-force  - allow asking user to install packages without\n"
@@ -1583,12 +1502,12 @@ msgstr ""
 "  --allow-force  - 允許要求使用者安裝套件而不檢查相依性與完整\n"
 "                   性。\n"
 
-#: ../urpmi:106
+#: ../urpmi:107
 #, c-format
 msgid "  --root         - use another root for rpm installation.\n"
 msgstr "  --root         - 使用另一個根目錄進行 RPM 套件的安裝。\n"
 
-#: ../urpmi:107
+#: ../urpmi:108
 #, c-format
 msgid ""
 "  --use-distrib  - configure urpmi on the fly from a distrib tree, useful\n"
@@ -1597,30 +1516,22 @@ msgstr ""
 "  --use-distrib  - 由一個發行版樹即時設定 urpmi，有助於藉由 --root 選項\n"
 "                   安裝一個 chroot。\n"
 
-#: ../urpmi:109
-#: ../urpmi.addmedia:44
-#: ../urpmi.update:31
-#: ../urpmq:68
+#: ../urpmi:110 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
 #, c-format
 msgid "  --wget         - use wget to retrieve distant files.\n"
 msgstr "  --wget         - 使用 wget 擷取遠端檔案。\n"
 
-#: ../urpmi:110
-#: ../urpmi.addmedia:45
-#: ../urpmi.update:32
-#: ../urpmq:69
+#: ../urpmi:111 ../urpmi.addmedia:45 ../urpmi.update:32 ../urpmq:69
 #, c-format
 msgid "  --curl         - use curl to retrieve distant files.\n"
 msgstr "  --curl         - 使用 curl 擷取遠端檔案。\n"
 
-#: ../urpmi:111
-#: ../urpmi.addmedia:46
-#: ../urpmi.update:33
+#: ../urpmi:112 ../urpmi.addmedia:46 ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
 
-#: ../urpmi:112
+#: ../urpmi:113
 #, c-format
 msgid ""
 "  --resume       - resume transfer of partially-downloaded files\n"
@@ -1629,10 +1540,7 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:114
-#: ../urpmi.addmedia:47
-#: ../urpmi.update:34
-#: ../urpmq:70
+#: ../urpmi:115 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1641,10 +1549,7 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:116
-#: ../urpmi.addmedia:49
-#: ../urpmi.update:36
-#: ../urpmq:72
+#: ../urpmi:117 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1653,14 +1558,14 @@ msgstr ""
 "  --proxy-user   - 指定代理伺服器認證的使用者帳號與密碼\n"
 "                   (格式為 <user:password>)。\n"
 
-#: ../urpmi:118
+#: ../urpmi:119
 #, c-format
 msgid ""
 "  --bug          - output a bug report in directory indicated by\n"
 "                   next arg.\n"
 msgstr "  --bug          - 輸出臭蟲回報到下一個參數所指定的目錄。\n"
 
-#: ../urpmi:122
+#: ../urpmi:123
 #, c-format
 msgid ""
 "  --verify-rpm   - verify rpm signature before installation\n"
@@ -1669,115 +1574,111 @@ msgstr ""
 "  --verify-rpm   - 安裝前檢驗 RPM 檔案的簽名.\n"
 "                   (--no-verify-rpm 停用它，預設值為啟用)。\n"
 
-#: ../urpmi:124
+#: ../urpmi:125
 #, c-format
-msgid "  --test         - verify if the installation can be achieved correctly.\n"
+msgid ""
+"  --test         - verify if the installation can be achieved correctly.\n"
 msgstr "  --test         - 確認安裝是否能夠正確完成。\n"
 
-#: ../urpmi:125
+#: ../urpmi:126
 #, c-format
 msgid "  --excludepath  - exclude path separated by comma.\n"
 msgstr "  --excludepath  - 排除以逗號分隔的路徑。\n"
 
-#: ../urpmi:126
+#: ../urpmi:127
 #, c-format
 msgid "  --excludedocs  - exclude doc files.\n"
 msgstr "  --excludedocs  - 排除說明文件檔案。\n"
 
-#: ../urpmi:127
+#: ../urpmi:128
 #, c-format
 msgid "  --skip         - packages which installation should be skipped\n"
 msgstr "  --skip         - 安裝時應該略過的套件。\n"
 
-#: ../urpmi:128
+#: ../urpmi:129
 #, c-format
 msgid ""
 "  --more-choices - when several packages are found, propose more choices\n"
 "                   than the default.\n"
-msgstr "  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
+msgstr ""
+"  --more-choices - 當找到不只一個套件時，提供除了預設值之外的多個選擇。\n"
 
-#: ../urpmi:130
-#: ../urpmi.addmedia:68
-#: ../urpmi.update:41
+#: ../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:131
+#: ../urpmi:132
 #, c-format
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:132
-#: ../urpmq:78
+#: ../urpmi:133 ../urpmq:78
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
 
-#: ../urpmi:133
+#: ../urpmi:134
 #, c-format
 msgid "  -p             - allow search in provides to find package.\n"
 msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 
-#: ../urpmi:134
+#: ../urpmi:135
 #, c-format
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
 
-#: ../urpmi:135
-#: ../urpmq:93
+#: ../urpmi:136 ../urpmq:93
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
 
-#: ../urpmi:136
-#: ../urpmq:90
+#: ../urpmi:137 ../urpmq:90
 #, c-format
 msgid "  -s             - next package is a source package (same as --src).\n"
 msgstr "  -s             - 下個套件是原始碼套件 (與 --src 相同)。\n"
 
-#: ../urpmi:137
-#: ../urpmi.addmedia:73
-#: ../urpmi.removemedia:49
+#: ../urpmi:138 ../urpmi.addmedia:73 ../urpmi.removemedia:52
 #: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
 msgstr "  -q             - 安靜模式。\n"
 
-#: ../urpmi:139
+#: ../urpmi:140
 #, c-format
 msgid "  names or rpm files given on command line will be installed.\n"
 msgstr "  將會安裝於命令列指定的名稱或 RPM 檔案。\n"
 
-#: ../urpmi:182
+#: ../urpmi:183
 #, c-format
 msgid "What can be done with binary rpm files when using --install-src"
 msgstr "使用 --install-src 時二進位 RPM 檔案可做的事"
 
-#: ../urpmi:191
+#: ../urpmi:202
 #, c-format
-msgid "Directory [%s] already exists, please use another directory for bug report or delete it"
+msgid ""
+"Directory [%s] already exists, please use another directory for bug report "
+"or delete it"
 msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪除它"
 
-#: ../urpmi:192
+#: ../urpmi:203
 #, c-format
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:195
-#: ../urpmi:316
+#: ../urpmi:206 ../urpmi:327
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
 
-#: ../urpmi:212
+#: ../urpmi:223
 #, c-format
 msgid "Only superuser is allowed to install packages"
 msgstr "只有擁有管理者權限的使用者才能安裝套件"
 
-#: ../urpmi:221
+#: ../urpmi:232
 #, c-format
 msgid ""
 "Error: %s appears to be mounted read-only.\n"
@@ -1786,12 +1687,12 @@ msgstr ""
 "錯誤： %s 似乎被掛載為唯讀模式。\n"
 "使用 --allow-force 標籤來強制執行。"
 
-#: ../urpmi:351
+#: ../urpmi:362
 #, c-format
 msgid "What is your choice? (1-%d) "
 msgstr "您要選擇何者？ (1-%d) "
 
-#: ../urpmi:376
+#: ../urpmi:392
 #, c-format
 msgid ""
 "The following packages can't be installed because they depend on packages\n"
@@ -1801,8 +1702,7 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:384
-#: ../urpmi:402
+#: ../urpmi:400 ../urpmi:418
 #, c-format
 msgid ""
 "\n"
@@ -1811,7 +1711,7 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: ../urpmi:395
+#: ../urpmi:411
 #, c-format
 msgid ""
 "Some package requested cannot be installed:\n"
@@ -1820,7 +1720,7 @@ msgstr ""
 "某些要求的套件無法安裝：\n"
 "%s"
 
-#: ../urpmi:425
+#: ../urpmi:441
 #, c-format
 msgid ""
 "The installation cannot continue because the following packages\n"
@@ -1830,7 +1730,7 @@ msgstr ""
 "安裝無法繼續，因為下列套件必須移除給其他套件來升級：\n"
 "%s\n"
 
-#: ../urpmi:430
+#: ../urpmi:446
 #, c-format
 msgid ""
 "The following packages have to be removed for others to be upgraded:\n"
@@ -1839,19 +1739,21 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:465
-#: ../urpmi:476
+#: ../urpmi:481 ../urpmi:492
 #, c-format
-msgid "To satisfy dependencies, the following %d packages are going to be installed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following %d packages are going to be installed "
+"(%d MB)"
 msgstr "為了滿足相依性，下列的 %d 個套件 (%d MB) 將一併安裝"
 
-#: ../urpmi:466
-#: ../urpmi:477
+#: ../urpmi:482 ../urpmi:493
 #, c-format
-msgid "To satisfy dependencies, the following package is going to be installed (%d MB)"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed (%d "
+"MB)"
 msgstr "為了滿足相依性，下列的套件 (%d MB) 將一併安裝"
 
-#: ../urpmi:472
+#: ../urpmi:488
 #, c-format
 msgid ""
 "You need to be root to install the following dependencies:\n"
@@ -1860,57 +1762,57 @@ msgstr ""
 "您必須具有管理者權限以安裝下列的相依性項目：\n"
 "%s\n"
 
-#: ../urpmi:503
+#: ../urpmi:519
 #, c-format
 msgid "Press Enter when ready..."
 msgstr "準備好時請按 Enter..."
 
-#: ../urpmi:557
+#: ../urpmi:572
 #, c-format
 msgid "The following packages have bad signatures"
 msgstr "下列套件有不正確不正確的簽章"
 
-#: ../urpmi:558
+#: ../urpmi:573
 #, c-format
 msgid "Do you want to continue installation ?"
 msgstr "您要繼續安裝嗎？"
 
-#: ../urpmi:600
+#: ../urpmi:615
 #, c-format
 msgid "distributing %s"
 msgstr "正在發佈 %s"
 
-#: ../urpmi:611
+#: ../urpmi:626
 #, c-format
 msgid "installing %s from %s"
 msgstr "正在由 %2$s 安裝 %1$s"
 
-#: ../urpmi:613
+#: ../urpmi:628
 #, c-format
 msgid "installing %s"
 msgstr "正在安裝 %s"
 
-#: ../urpmi:641
+#: ../urpmi:656
 #, c-format
 msgid "Try installation without checking dependencies? (y/N) "
 msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
 
-#: ../urpmi:657
+#: ../urpmi:672
 #, c-format
 msgid "Try installation even more strongly (--force)? (y/N) "
 msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
 
-#: ../urpmi:694
+#: ../urpmi:709
 #, c-format
 msgid "%d installation transactions failed"
 msgstr "%d 個安裝程序失敗"
 
-#: ../urpmi:702
+#: ../urpmi:717
 #, c-format
 msgid "Installation is possible"
 msgstr "可以安裝"
 
-#: ../urpmi:721
+#: ../urpmi:736
 #, c-format
 msgid "restarting urpmi"
 msgstr "正在重新啟動 urpmi"
@@ -1921,7 +1823,8 @@ msgid ""
 "usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
 "where <url> is one of\n"
 "       [file:/]/<path> with <relative filename of hdlist>\n"
-"       ftp://<login>:<password>@<host>/<path> with <relative filename of hdlist>\n"
+"       ftp://<login>:<password>@<host>/<path> with <relative filename of "
+"hdlist>\n"
 "       ftp://<host>/<path> with <relative filename of hdlist>\n"
 "       http://<host>/<path> with <relative filename of hdlist>\n"
 "       removable://<path>\n"
@@ -1931,7 +1834,8 @@ msgstr ""
 "用法: urpmi.addmedia [選項] <名稱> <url> [with <相對路徑>]\n"
 "其中 <url> 是以下其中一項\n"
 "         [file:/]/<路徑> with <hdlist 的相對檔案名稱>\n"
-"         ftp://<登入名稱>:<密碼>@<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
+"         ftp://<登入名稱>:<密碼>@<主機名稱>/<路徑> with <hdlist 的相對檔案名"
+"稱>\n"
 "         ftp://<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
 "         http://<主機名稱>/<路徑> with <hdlist 的相對檔案名稱>\n"
 "         removable://<路徑>\n"
@@ -2004,8 +1908,7 @@ msgstr ""
 "  --virtual      - 建立長保持於最新狀態的虛擬媒體，僅接受 file:// \n"
 "                   通訊協定。\n"
 
-#: ../urpmi.addmedia:67
-#: ../urpmi.update:39
+#: ../urpmi.addmedia:67 ../urpmi.update:39
 #, c-format
 msgid "  --no-md5sum    - disable MD5SUM file checking.\n"
 msgstr "  --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
@@ -2020,15 +1923,12 @@ msgstr "  --nopubkey     - 不匯入新增的媒體的公鑰\n"
 msgid "  --raw          - add the media in config, but don't update it.\n"
 msgstr "  --raw          - 加入這個媒介到設定檔中，但不更新它。\n"
 
-#: ../urpmi.addmedia:71
-#: ../urpmi.removemedia:47
-#: ../urpmi.update:45
+#: ../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
+#: ../urpmi.addmedia:72 ../urpmi.update:46
 #, c-format
 msgid "  -f             - force generation of hdlist files.\n"
 msgstr "  -f             - 強制產生 hdlist 檔案。\n"
@@ -2038,42 +1938,42 @@ msgstr "  -f             - 強制產生 hdlist 檔案。\n"
 msgid "unable to update medium \"%s\"\n"
 msgstr "無法更新媒體 \"%s\"\n"
 
-#: ../urpmi.addmedia:114
+#: ../urpmi.addmedia:117
 #, c-format
 msgid "Only superuser is allowed to add media"
 msgstr "只有管理者才能新增媒體"
 
-#: ../urpmi.addmedia:117
+#: ../urpmi.addmedia:120
 #, c-format
 msgid "Will create config file [%s]"
 msgstr "將建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:118
+#: ../urpmi.addmedia:121
 #, c-format
 msgid "Can't create config file [%s]"
 msgstr "無法建立設定檔 [%s]"
 
-#: ../urpmi.addmedia:125
+#: ../urpmi.addmedia:128
 #, c-format
 msgid "no need to give <relative path of hdlist> with --distrib"
 msgstr "使用 --distrib 參數時不需給予 <hdlist 檔案的相對路徑>"
 
-#: ../urpmi.addmedia:135
+#: ../urpmi.addmedia:138
 #, c-format
 msgid "<relative path of hdlist> missing\n"
 msgstr "<hdlist 檔案的相對路徑> 遺失\n"
 
-#: ../urpmi.addmedia:137
+#: ../urpmi.addmedia:140
 #, c-format
 msgid "`with' missing for network media\n"
 msgstr "使用網路媒體時遺漏了 `with'\n"
 
-#: ../urpmi.addmedia:153
+#: ../urpmi.addmedia:156
 #, c-format
 msgid "unable to create medium \"%s\"\n"
 msgstr "無法建立媒體 \"%s\"\n"
 
-#: ../urpmi.removemedia:43
+#: ../urpmi.removemedia:46
 #, c-format
 msgid ""
 "usage: urpmi.removemedia [-a] <name> ...\n"
@@ -2082,17 +1982,17 @@ msgstr ""
 "用法：urpmi.removemedia [-a] <名稱> ...\n"
 "其中 <名稱> 是要移除的媒體名稱。\n"
 
-#: ../urpmi.removemedia:46
+#: ../urpmi.removemedia:49
 #, c-format
 msgid "  -a             - select all media.\n"
 msgstr "  -a             - 選擇全部的媒體。\n"
 
-#: ../urpmi.removemedia:48
+#: ../urpmi.removemedia:51
 #, c-format
 msgid "  -y             - fuzzy match on media names.\n"
 msgstr "  -y             - 對媒體名稱進行模糊比對。\n"
 
-#: ../urpmi.removemedia:51
+#: ../urpmi.removemedia:54
 #, c-format
 msgid ""
 "\n"
@@ -2101,17 +2001,17 @@ msgstr ""
 "\n"
 "未知的選項 '%s'\n"
 
-#: ../urpmi.removemedia:60
+#: ../urpmi.removemedia:63
 #, c-format
 msgid "Only superuser is allowed to remove media"
 msgstr "只有管理者才可以移除媒體"
 
-#: ../urpmi.removemedia:70
+#: ../urpmi.removemedia:73
 #, c-format
 msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可以移除 (使用 urpmi.addmedia 來新增一個媒體)\n"
 
-#: ../urpmi.removemedia:72
+#: ../urpmi.removemedia:75
 #, c-format
 msgid ""
 "the entry to remove is missing\n"
@@ -2154,17 +2054,17 @@ msgstr "  --no-ignore    - 不更新，並將此媒體標示為啟用。\n"
 msgid "  -a             - select all non-removable media.\n"
 msgstr "  -a             - 選擇所有不可移除式媒體。\n"
 
-#: ../urpmi.update:64
+#: ../urpmi.update:67
 #, c-format
 msgid "Only superuser is allowed to update media"
 msgstr "只有管理者才能跟新媒體"
 
-#: ../urpmi.update:72
+#: ../urpmi.update:75
 #, c-format
 msgid "nothing to update (use urpmi.addmedia to add a media)\n"
 msgstr "沒有東西可供更新 (使用 urpmi.addmedia 以新增一個媒體)\n"
 
-#: ../urpmi.update:90
+#: ../urpmi.update:93
 #, c-format
 msgid ""
 "the entry to update is missing\n"
@@ -2173,12 +2073,12 @@ msgstr ""
 "要更新的項目遺失\n"
 "(%s 的其中之一)\n"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:98
 #, c-format
 msgid "ignoring media %s"
 msgstr "略過媒體 %s"
 
-#: ../urpmi.update:95
+#: ../urpmi.update:98
 #, c-format
 msgid "enabling media %s"
 msgstr "啟用媒體 %s"
@@ -2188,7 +2088,8 @@ msgstr "啟用媒體 %s"
 msgid ""
 "urpmq version %s\n"
 "Copyright (C) 2000-2005 Mandriva.\n"
-"This is free software and may be redistributed under the terms of the GNU GPL.\n"
+"This is free software and may be redistributed under the terms of the GNU "
+"GPL.\n"
 "\n"
 "usage:\n"
 msgstr ""
@@ -2225,7 +2126,8 @@ msgstr "  --list-aliases - 列出可用的同步管理別名。\n"
 
 #: ../urpmq:59
 #, c-format
-msgid "  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+"  --dump-config  - dump the config in form of urpmi.addmedia argument.\n"
 msgstr "  --dump-config  - 以 urpmi.addmedia 的參數形式的匯出設定值。\n"
 
 #: ../urpmq:61
@@ -2239,7 +2141,8 @@ msgstr ""
 
 #: ../urpmq:63
 #, c-format
-msgid "  --sources      - give all source packages before downloading (root only).\n"
+msgid ""
+"  --sources      - give all source packages before downloading (root only).\n"
 msgstr "  --sources      - 下載前先給予所有的原始碼套件 (僅供管理者使用).\n"
 
 #: ../urpmq:66
@@ -2288,7 +2191,8 @@ msgstr "  -l             - 列出套件內包含的檔案。\n"
 
 #: ../urpmq:85
 #, c-format
-msgid "  -P             - do not search in provides to find package (default).\n"
+msgid ""
+"  -P             - do not search in provides to find package (default).\n"
 msgstr "  -P             - 不於 provides 中搜尋套件 (預設值)。\n"
 
 #: ../urpmq:86
@@ -2308,12 +2212,15 @@ msgstr "  -R             - 逆向搜尋何者需要此套件。\n"
 
 #: ../urpmq:89
 #, c-format
-msgid "  -RR            - extended reverse search (includes virtual packages).\n"
+msgid ""
+"  -RR            - extended reverse search (includes virtual packages).\n"
 msgstr "  -RR            - 進階逆向搜尋 (包含虛擬套件)。\n"
 
 #: ../urpmq:91
 #, c-format
-msgid "  -u             - remove package if a more recent version is already installed.\n"
+msgid ""
+"  -u             - remove package if a more recent version is already "
+"installed.\n"
 msgstr "  -u             - 若已經安裝較新的版本則移除套件。\n"
 
 #: ../urpmq:94
@@ -2345,4 +2252,3 @@ msgstr "沒有找到檔案列表\n"
 #, c-format
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
-