updated po files

1 files changed, 294 insertions, 232 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 08fa276f..ab220b33 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -14,14 +14,15 @@
 # Hilbert <freehil@yahoo.com>, 2003, 2004.
 # Hilbert <h@mandrake.org>, 2004.
 # Shiva Huang <blueshiva@giga.net.tw>, 2005.
+# Shiva Huang <shivahuang@gmail.com>, 2005.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zh_TW\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2005-06-15 17:56+0800\n"
-"PO-Revision-Date: 2005-05-11 12:36+0800\n"
-"Last-Translator: Shiva Huang <blueshiva@giga.net.tw>\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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,19 +30,13 @@ 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否"
@@ -60,7 +55,9 @@ msgstr ""
 "自動化套件安裝...\n"
 "您要求安裝的套件 %s\n"
 
-#: ../_irpm:33 ../urpme:29 ../urpmi:478
+#: ../_irpm:33
+#: ../urpme:29
+#: ../urpmi:478
 #, c-format
 msgid "Is this OK?"
 msgstr "這樣可以嗎？"
@@ -75,7 +72,10 @@ msgstr "確定"
 msgid "Cancel"
 msgstr "取消"
 
-#: ../_irpm:44 ../urpmi:384 ../urpmi:402 ../urpmi:482
+#: ../_irpm:44
+#: ../urpmi:384
+#: ../urpmi:402
+#: ../urpmi:482
 #, c-format
 msgid " (Y/n) "
 msgstr " (Y/n) (是/否) "
@@ -85,7 +85,8 @@ 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 套件安裝"
@@ -97,8 +98,7 @@ 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,7 +151,8 @@ msgstr "安裝 (_I)"
 msgid "_Save"
 msgstr "儲存 (_S)"
 
-#: ../gurpmi:73 ../gurpmi2:119
+#: ../gurpmi:73
+#: ../gurpmi2:119
 #, c-format
 msgid "_Cancel"
 msgstr "取消 (_C)"
@@ -195,14 +196,16 @@ msgstr " (安裝用)"
 #: ../gurpmi2:119
 #, c-format
 msgid "Package choice"
-msgstr ""
+msgstr "套件選擇"
 
-#: ../gurpmi2:119 ../gurpmi2:142
+#: ../gurpmi2:119
+#: ../gurpmi2:142
 #, c-format
 msgid "_Ok"
 msgstr "確定 (_O)"
 
-#: ../gurpmi2:120 ../urpmi:349
+#: ../gurpmi2:120
+#: ../urpmi:349
 #, c-format
 msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
@@ -226,8 +229,7 @@ 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"
@@ -238,12 +240,15 @@ msgstr ""
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../gurpmi2:186 ../urpmi:491 ../urpmq:308
+#: ../gurpmi2:186
+#: ../urpmi:491
+#: ../urpmq:308
 #, c-format
 msgid "unable to get source packages, aborting"
 msgstr "無法取得原始碼套件，放棄"
 
-#: ../gurpmi2:200 ../urpmi:502
+#: ../gurpmi2:200
+#: ../urpmi:502
 #, c-format
 msgid "Please insert the medium named \"%s\" on device [%s]"
 msgstr "請將名為 \"%s\" 的媒體置入裝置 [%s] 內"
@@ -266,7 +271,10 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../gurpmi2:250 ../gurpmi2:299 ../urpmi:573 ../urpmi:689
+#: ../gurpmi2:250
+#: ../gurpmi2:299
+#: ../urpmi:573
+#: ../urpmi:689
 #, c-format
 msgid ""
 "Installation failed, some files are missing:\n"
@@ -277,12 +285,15 @@ msgstr ""
 "%s\n"
 "您或許要更新您的 urpmi 資料庫"
 
-#: ../gurpmi2:257 ../urpme:116 ../urpmi:616
+#: ../gurpmi2:257
+#: ../urpme:116
+#: ../urpmi:616
 #, c-format
 msgid "removing %s"
 msgstr "正在移除 %s"
 
-#: ../gurpmi2:265 ../urpm.pm:2877
+#: ../gurpmi2:265
+#: ../urpm.pm:2877
 #, c-format
 msgid "Preparing..."
 msgstr "準備中..."
@@ -292,7 +303,11 @@ msgstr "準備中..."
 msgid "Installing package `%s' (%s/%s)..."
 msgstr "正在安裝套件 `%s' (%s/%s)..."
 
-#: ../gurpmi2:285 ../urpmi:583 ../urpmi:634 ../urpmi:652 ../urpmi:668
+#: ../gurpmi2:285
+#: ../urpmi:583
+#: ../urpmi:634
+#: ../urpmi:652
+#: ../urpmi:668
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
@@ -302,7 +317,8 @@ msgstr "安裝失敗"
 msgid "_Done"
 msgstr "完成 (_D)"
 
-#: ../gurpmi2:302 ../urpmi:705
+#: ../gurpmi2:302
+#: ../urpmi:705
 #, c-format
 msgid "The package(s) are already installed"
 msgstr "每個套件都已經安裝了"
@@ -366,12 +382,15 @@ 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\" 的列表，忽略這個媒體"
@@ -383,9 +402,7 @@ 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
@@ -433,7 +450,8 @@ 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\" 的路徑名稱"
@@ -485,30 +503,48 @@ 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\" 不在本地端，忽略這個媒體"
@@ -518,13 +554,17 @@ 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"
@@ -539,8 +579,12 @@ 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"
@@ -570,18 +614,26 @@ 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 檔案)"
@@ -591,12 +643,18 @@ 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"
@@ -617,7 +675,8 @@ msgstr "正在嘗試選擇不存在的媒體 \"%s\""
 msgid "selecting multiple media: %s"
 msgstr "正在選擇多個媒體：\"%s\""
 
-#: ../urpm.pm:864 ../urpmi.update:94
+#: ../urpm.pm:864
+#: ../urpmi.update:94
 #, c-format
 msgid "\"%s\""
 msgstr "\"%s\""
@@ -646,26 +705,23 @@ 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"
@@ -690,7 +746,9 @@ 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 檔案時發生問題"
@@ -745,7 +803,8 @@ 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\" 中使用了"
@@ -795,14 +854,15 @@ 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:306
 #, c-format
 msgid "built hdlist synthesis file for medium \"%s\""
 msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
@@ -862,12 +922,15 @@ msgstr "搜尋"
 msgid "no package named %s"
 msgstr "沒有套件命名為 %s"
 
-#: ../urpm.pm:2220 ../urpme:92
+#: ../urpm.pm:2220
+#: ../urpme:92
 #, 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\""
@@ -896,12 +959,17 @@ 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\" 沒有被選取"
@@ -938,8 +1006,7 @@ 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
@@ -958,9 +1025,9 @@ msgid "unable to remove package %s"
 msgstr "無法移除套件 %s"
 
 #: ../urpm.pm:2971
-#, fuzzy, c-format
+#, c-format
 msgid "unable to extract rpm from delta-rpm package %s"
-msgstr "無法移除套件 %s"
+msgstr "無法由 delta-rpm 套件包中取出套件 %s"
 
 #: ../urpm.pm:2977
 #, c-format
@@ -977,12 +1044,14 @@ 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"
@@ -1037,7 +1106,8 @@ msgstr "正在檢驗 MD5SUM 檔案"
 msgid "warning: md5sum for %s unavailable in MD5SUM file"
 msgstr "警告：在 MD5SUM 檔案中找不到 %s 的 md5sum"
 
-#: ../urpm/args.pm:93 ../urpm/args.pm:102
+#: ../urpm/args.pm:93
+#: ../urpm/args.pm:102
 #, c-format
 msgid "bad proxy declaration on command line\n"
 msgstr "命令列傳入的代理伺服器宣告錯誤\n"
@@ -1057,8 +1127,7 @@ msgstr "抱歉，選擇錯誤，請再試一次\n"
 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 ""
@@ -1068,13 +1137,19 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpme:41 ../urpmf:32 ../urpmi:78 ../urpmi.addmedia:43
-#: ../urpmi.removemedia:45 ../urpmi.update:30 ../urpmq:43
+#: ../urpme:41
+#: ../urpmf:32
+#: ../urpmi:78
+#: ../urpmi.addmedia:43
+#: ../urpmi.removemedia:45
+#: ../urpmi.update:30
+#: ../urpmq:43
 #, c-format
 msgid "  --help         - print this help message.\n"
 msgstr "  --help         - 顯示此說明訊息。\n"
 
-#: ../urpme:42 ../urpmi:85
+#: ../urpme:42
+#: ../urpmi:85
 #, c-format
 msgid "  --auto         - automatically select a package in choices.\n"
 msgstr "  --auto         - 自動選擇套件。\n"
@@ -1084,13 +1159,16 @@ msgstr "  --auto         - 自動選擇套件。\n"
 msgid "  --test         - verify if the removal can be achieved correctly.\n"
 msgstr "  --test         - 確認刪除是否能夠正確進行。\n"
 
-#: ../urpme:44 ../urpmi:100 ../urpmq:64
+#: ../urpme:44
+#: ../urpmi:100
+#: ../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:45
+#: ../urpmi:105
+#: ../urpmq:65
 #, c-format
 msgid "  --parallel     - distributed urpmi across machines of alias.\n"
 msgstr "  --parallel     - 在同步管理的機器上分散式的執行 urpmi。\n"
@@ -1105,12 +1183,14 @@ msgstr "  --root         - 使用另一個根目錄移除 rpm 套件。\n"
 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:49
+#: ../urpmi:138
+#: ../urpmi.addmedia:74
+#: ../urpmi.removemedia:50
+#: ../urpmi.update:48
+#: ../urpmq:92
 #, c-format
 msgid "  -v             - verbose mode.\n"
 msgstr "  -v             - 完整訊息模式。\n"
@@ -1135,7 +1215,8 @@ msgstr "未知的套件"
 msgid "unknown package"
 msgstr "未知的套件"
 
-#: ../urpme:97 ../urpmi:417
+#: ../urpme:97
+#: ../urpmi:417
 #, c-format
 msgid "removing package %s will break your system"
 msgstr "移除套件 %s 將破壞您的系統"
@@ -1152,11 +1233,12 @@ msgstr "正在檢查以移除下列套件"
 
 #: ../urpme:111
 #, 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:113
+#: ../urpmi:436
+#: ../urpmi:566
 #, c-format
 msgid " (y/N) "
 msgstr " (y/N) (是/否) "
@@ -1171,8 +1253,7 @@ 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 ""
@@ -1182,28 +1263,36 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpmf:33 ../urpmi:79 ../urpmq:44
+#: ../urpmf:33
+#: ../urpmi:79
+#: ../urpmq:44
 #, c-format
 msgid "  --update       - use only update media.\n"
 msgstr "  --update       - 只使用更新媒體。\n"
 
-#: ../urpmf:34 ../urpmi:80 ../urpmq:45
+#: ../urpmf:34
+#: ../urpmi:80
+#: ../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:82
+#: ../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:83
+#: ../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"
@@ -1216,8 +1305,7 @@ 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"
@@ -1308,7 +1396,9 @@ msgstr "  --conflicts    - 顯示衝突標籤：衝突。\n"
 msgid "  --obsoletes    - print tag obsoletes: all obsoletes.\n"
 msgstr "  --obsoletes    - 顯示廢棄標籤：廢棄。\n"
 
-#: ../urpmf:58 ../urpmi:120 ../urpmq:74
+#: ../urpmf:58
+#: ../urpmi:120
+#: ../urpmq:74
 #, c-format
 msgid ""
 "  --env          - use specific environment (typically a bug\n"
@@ -1320,7 +1410,8 @@ 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"
@@ -1332,14 +1423,12 @@ 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
@@ -1366,18 +1455,17 @@ msgstr ""
 "回傳值：\n"
 "%s\n"
 
-#: ../urpmf:124 ../urpmi:201 ../urpmq:116
+#: ../urpmf:124
+#: ../urpmi:201
+#: ../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
@@ -1389,8 +1477,7 @@ msgstr "您或許想要使用 --name 參數來搜尋套件名稱。\n"
 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 ""
@@ -1400,11 +1487,10 @@ msgstr ""
 "\n"
 "使用方式：\n"
 
-#: ../urpmi:81 ../urpmq:46
+#: ../urpmi:81
+#: ../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
@@ -1412,17 +1498,15 @@ msgstr "  --searchmedia  - 只使用指定的媒體來搜尋或升級套件。\n
 msgid "  --synthesis    - use the given synthesis instead of urpmi db.\n"
 msgstr "  --synthesis    - 使用指定的 synthesis 檔而非 urpmi 資料庫。\n"
 
-#: ../urpmi:86 ../urpmq:50
+#: ../urpmi:86
+#: ../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
 #, 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
@@ -1430,7 +1514,8 @@ msgstr "  --no-uninstall - 絕不要求移除套件，直接中斷安裝。\n"
 msgid "  --no-install   - don't install packages (only download)\n"
 msgstr "  --no-install   - 不安裝套件 (只下載)。\n"
 
-#: ../urpmi:89 ../urpmq:52
+#: ../urpmi:89
+#: ../urpmq:52
 #, c-format
 msgid ""
 "  --keep         - keep existing packages if possible, reject requested\n"
@@ -1455,12 +1540,14 @@ msgstr ""
 msgid "  --split-length - small transaction length, default is %d.\n"
 msgstr "  --split-length - 小型安裝程序大小，預設值為 %d。\n"
 
-#: ../urpmi:95 ../urpmq:51
+#: ../urpmi:95
+#: ../urpmq:51
 #, c-format
 msgid "  --fuzzy        - impose fuzzy search (same as -y).\n"
 msgstr "  --fuzzy        - 加上模糊搜尋 (與 -y 相同)。\n"
 
-#: ../urpmi:96 ../urpmq:60
+#: ../urpmi:96
+#: ../urpmq:60
 #, c-format
 msgid "  --src          - next package is a source package (same as -s).\n"
 msgstr "  --src          - 下個套件是原始碼套件 (與 -s 相同)。\n"
@@ -1510,17 +1597,25 @@ msgstr ""
 "  --use-distrib  - 由一個發行版樹即時設定 urpmi，有助於藉由 --root 選項\n"
 "                   安裝一個 chroot。\n"
 
-#: ../urpmi:109 ../urpmi.addmedia:44 ../urpmi.update:31 ../urpmq:68
+#: ../urpmi:109
+#: ../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:110
+#: ../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:111
+#: ../urpmi.addmedia:46
+#: ../urpmi.update:33
 #, c-format
 msgid "  --limit-rate   - limit the download speed.\n"
 msgstr "  --limit-rate   - 限制下載的速度。\n"
@@ -1534,7 +1629,10 @@ msgstr ""
 "  --resume       - 接著傳送下載到一半的檔案\n"
 "                   (--no-resume 選項停用它，預設值為停用)。\n"
 
-#: ../urpmi:114 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:70
+#: ../urpmi:114
+#: ../urpmi.addmedia:47
+#: ../urpmi.update:34
+#: ../urpmq:70
 #, c-format
 msgid ""
 "  --proxy        - use specified HTTP proxy, the port number is assumed\n"
@@ -1543,7 +1641,10 @@ msgstr ""
 "  --proxy        - 使用指定的 HTTP 代理伺服器，通訊埠假設為預設值 1080 \n"
 "                   (格式為 <proxyhost[:port]>)。\n"
 
-#: ../urpmi:116 ../urpmi.addmedia:49 ../urpmi.update:36 ../urpmq:72
+#: ../urpmi:116
+#: ../urpmi.addmedia:49
+#: ../urpmi.update:36
+#: ../urpmq:72
 #, c-format
 msgid ""
 "  --proxy-user   - specify user and password to use for proxy\n"
@@ -1570,8 +1671,7 @@ msgstr ""
 
 #: ../urpmi:124
 #, 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
@@ -1594,10 +1694,11 @@ msgstr "  --skip         - 安裝時應該略過的套件。\n"
 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:130
+#: ../urpmi.addmedia:68
+#: ../urpmi.update:41
 #, c-format
 msgid "  --norebuild    - don't try to rebuild hdlist if not readable.\n"
 msgstr ""
@@ -1609,7 +1710,8 @@ msgstr ""
 msgid "  --strict-arch  - upgrade only packages with the same architecture.\n"
 msgstr "  --strict-arch  - 只升級相同平台的套件。\n"
 
-#: ../urpmi:132 ../urpmq:78
+#: ../urpmi:132
+#: ../urpmq:78
 #, c-format
 msgid "  -a             - select all matches on command line.\n"
 msgstr "  -a             - 選擇命令列中所有符合的項目。\n"
@@ -1624,17 +1726,21 @@ msgstr "  -p             - 允許於 provides 中搜尋套件。\n"
 msgid "  -P             - do not search in provides to find package.\n"
 msgstr "  -P             - 不在 provides 中搜尋套件。\n"
 
-#: ../urpmi:135 ../urpmq:93
+#: ../urpmi:135
+#: ../urpmq:93
 #, c-format
 msgid "  -y             - impose fuzzy search (same as --fuzzy).\n"
 msgstr "  -y             - 加上模糊搜尋 (與 --fuzzy 相同)。\n"
 
-#: ../urpmi:136 ../urpmq:90
+#: ../urpmi:136
+#: ../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:137
+#: ../urpmi.addmedia:73
+#: ../urpmi.removemedia:49
 #: ../urpmi.update:47
 #, c-format
 msgid "  -q             - quiet mode.\n"
@@ -1652,9 +1758,7 @@ msgstr "使用 --install-src 時二進位 RPM 檔案可做的事"
 
 #: ../urpmi:191
 #, 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
@@ -1662,7 +1766,8 @@ msgstr "目錄 [%s] 已經存在，請指定另一個目錄給臭蟲回報或刪
 msgid "Unable to create directory [%s] for bug report"
 msgstr "無法建立 [%s] 目錄給臭蟲回報使用"
 
-#: ../urpmi:195 ../urpmi:316
+#: ../urpmi:195
+#: ../urpmi:316
 #, c-format
 msgid "Copying failed"
 msgstr "複製失敗"
@@ -1696,7 +1801,8 @@ msgstr ""
 "下列套件無法安裝，因為它們需要比您系統上的套件為舊的版本：\n"
 "%s"
 
-#: ../urpmi:384 ../urpmi:402
+#: ../urpmi:384
+#: ../urpmi:402
 #, c-format
 msgid ""
 "\n"
@@ -1733,18 +1839,16 @@ msgstr ""
 "下列套件必須移除給其他套件來升級：\n"
 "%s"
 
-#: ../urpmi:465 ../urpmi:476
+#: ../urpmi:465
+#: ../urpmi:476
 #, 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:466
+#: ../urpmi:477
 #, 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
@@ -1817,8 +1921,7 @@ 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"
@@ -1828,8 +1931,7 @@ 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"
@@ -1902,7 +2004,8 @@ 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"
@@ -1910,19 +2013,22 @@ msgstr "  --no-md5sum    - 不使用 MD5SUM 檔案檢查功能。\n"
 #: ../urpmi.addmedia:69
 #, c-format
 msgid "  --nopubkey     - don't import pubkey of added media\n"
-msgstr ""
+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:47 ../urpmi.update:45
+#: ../urpmi.addmedia:71
+#: ../urpmi.removemedia:47
+#: ../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"
@@ -2082,8 +2188,7 @@ 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 ""
@@ -2120,8 +2225,7 @@ 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
@@ -2135,8 +2239,7 @@ 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
@@ -2154,9 +2257,9 @@ msgid "  --changelog    - print changelog.\n"
 msgstr "  --changelog    - 顯示更新紀錄。\n"
 
 #: ../urpmq:77
-#, fuzzy, c-format
+#, c-format
 msgid "  --summary, -S  - print summary.\n"
-msgstr "  --summary      - 列印摘要標籤：摘要。\n"
+msgstr "  --summary, -S  - 顯示摘要。\n"
 
 #: ../urpmq:79
 #, c-format
@@ -2185,8 +2288,7 @@ 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
@@ -2205,16 +2307,13 @@ msgid "  -R             - reverse search to what requires package.\n"
 msgstr "  -R             - 逆向搜尋何者需要此套件。\n"
 
 #: ../urpmq:89
-#, fuzzy, c-format
-msgid ""
-"  -RR            - extended reverse search (includes virtual packages).\n"
-msgstr "  -R             - 逆向搜尋何者需要此套件。\n"
+#, c-format
+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
@@ -2233,9 +2332,9 @@ msgid "--list-nodes can only be used with --parallel"
 msgstr "--list-nodes 參數只能夠配合 --parallel 參數一起使用"
 
 #: ../urpmq:344
-#, fuzzy, c-format
+#, c-format
 msgid "skipping media %s: no hdlist"
-msgstr "略過媒體 %s：沒有 hdlist 檔\n"
+msgstr "略過媒體 %s：沒有 hdlist 檔"
 
 #: ../urpmq:415
 #, c-format
@@ -2247,40 +2346,3 @@ msgstr "沒有找到檔案列表\n"
 msgid "No changelog found\n"
 msgstr "沒有找到更新紀錄\n"
 
-#, fuzzy
-#~ msgid ""
-#~ "  --keep         - keep existing packages if possible, reject requested\n"
-#~ "                   packages that leads to remove.\n"
-#~ msgstr ""
-#~ "  --keep         - 盡可能的保留現存的套件，拒絕安裝會導致移除其他套件的\n"
-#~ "                   套件。\n"
-
-#~ msgid "unable to write file [%s]"
-#~ msgstr "無法寫入檔案 [%s]"
-
-#~ msgid ""
-#~ "  --distrib-XXX  - automatically create a medium for XXX part of a\n"
-#~ "                   distribution, XXX may be main, contrib, updates or\n"
-#~ "                   anything else that has been configured ;-)\n"
-#~ msgstr ""
-#~ "  --distrib-XXX  - 自動根據散佈套件的 XXX 部份建立媒體，其中 XXX 可以\n"
-#~ "                   是 main、contrib、updates 或其他任何的設定。;-)\n"
-
-#~ msgid "found version %s and arch %s ..."
-#~ msgstr "找到版本號 %s 及硬體平台 %s ..."
-
-#~ msgid "cannot add updates of a cooker distribution\n"
-#~ msgstr "無法為 cooker 版的散佈套件新增更新媒體\n"
-
-#~ msgid "retrieving mirrors at %s ..."
-#~ msgstr "正在由 %s 擷取映射站台..."
-
-#, fuzzy
-#~ msgid "Unknown option %s"
-#~ msgstr ""
-#~ "\n"
-#~ "未知選項 '%s'\n"
-
-#, fuzzy
-#~ msgid "No packages specified"
-#~ msgstr "無指令指定"