updated po files

1 files changed, 254 insertions, 140 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index c27ef73c..45f2e1af 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "POT-Creation-Date: 2005-05-05 22:04+0200\n"
-"PO-Revision-Date: 2005-02-05 12:48+0800\n"
-"Last-Translator: Shiva Huang <blueshiva@giga.net.tw>\n"
+"PO-Revision-Date: 2005-05-13 00:21+0800\n"
+"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -34,14 +34,11 @@ msgstr "選擇媒體類型"
 #: ../edit-urpm-sources.pl:67
 #, c-format
 msgid ""
-"This step enables you to add sources from a Mandriva Linux web or FTP "
-"mirror.\n"
+"This step enables you to add sources from a Mandriva Linux web or FTP mirror.\n"
 "\n"
 "There are two kinds of official mirrors. You can choose to add sources that\n"
-"contain the complete set of packages of your distribution (usually a "
-"superset\n"
-"of what comes on the standard installation CDs), or sources that provide "
-"the\n"
+"contain the complete set of packages of your distribution (usually a superset\n"
+"of what comes on the standard installation CDs), or sources that provide the\n"
 "official updates for your distribution. (You can add both, but you'll have\n"
 "to do this in two steps.)"
 msgstr ""
@@ -104,7 +101,8 @@ msgstr "路徑："
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../edit-urpm-sources.pl:122 ../edit-urpm-sources.pl:123
+#: ../edit-urpm-sources.pl:122
+#: ../edit-urpm-sources.pl:123
 #: ../edit-urpm-sources.pl:382
 #, c-format
 msgid "URL:"
@@ -135,12 +133,15 @@ msgstr "瀏覽..."
 msgid "Login:"
 msgstr "登入："
 
-#: ../edit-urpm-sources.pl:170 ../edit-urpm-sources.pl:459 ../rpmdrake.pm:123
+#: ../edit-urpm-sources.pl:170
+#: ../edit-urpm-sources.pl:459
+#: ../rpmdrake.pm:123
 #, c-format
 msgid "Password:"
 msgstr "密碼："
 
-#: ../edit-urpm-sources.pl:175 ../edit-urpm-sources.pl:383
+#: ../edit-urpm-sources.pl:175
+#: ../edit-urpm-sources.pl:383
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist 檔案的相對路徑："
@@ -184,25 +185,48 @@ msgstr "正在新增一個媒體："
 msgid "Type of medium:"
 msgstr "媒體類別："
 
-#: ../edit-urpm-sources.pl:232 ../edit-urpm-sources.pl:302
-#: ../edit-urpm-sources.pl:389 ../edit-urpm-sources.pl:414
-#: ../edit-urpm-sources.pl:476 ../edit-urpm-sources.pl:557
-#: ../edit-urpm-sources.pl:597 ../edit-urpm-sources.pl:655
-#: ../edit-urpm-sources.pl:794 ../rpmdrake:165 ../rpmdrake:701
-#: ../rpmdrake:1505 ../rpmdrake:1513 ../rpmdrake.pm:539 ../rpmdrake.pm:628
+#: ../edit-urpm-sources.pl:232
+#: ../edit-urpm-sources.pl:302
+#: ../edit-urpm-sources.pl:389
+#: ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:476
+#: ../edit-urpm-sources.pl:557
+#: ../edit-urpm-sources.pl:597
+#: ../edit-urpm-sources.pl:655
+#: ../edit-urpm-sources.pl:794
+#: ../rpmdrake:165
+#: ../rpmdrake:701
+#: ../rpmdrake:1505
+#: ../rpmdrake:1513
+#: ../rpmdrake.pm:539
+#: ../rpmdrake.pm:628
 #: ../rpmdrake.pm:697
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../edit-urpm-sources.pl:234 ../edit-urpm-sources.pl:304
-#: ../edit-urpm-sources.pl:414 ../edit-urpm-sources.pl:466
-#: ../edit-urpm-sources.pl:554 ../edit-urpm-sources.pl:596
-#: ../edit-urpm-sources.pl:648 ../edit-urpm-sources.pl:720
-#: ../edit-urpm-sources.pl:787 ../edit-urpm-sources.pl:840
-#: ../edit-urpm-sources.pl:990 ../rpmdrake:165 ../rpmdrake:701 ../rpmdrake:718
-#: ../rpmdrake:723 ../rpmdrake:1446 ../rpmdrake:1505 ../rpmdrake:1648
-#: ../rpmdrake.pm:114 ../rpmdrake.pm:224 ../rpmdrake.pm:281 ../rpmdrake.pm:539
+#: ../edit-urpm-sources.pl:234
+#: ../edit-urpm-sources.pl:304
+#: ../edit-urpm-sources.pl:414
+#: ../edit-urpm-sources.pl:466
+#: ../edit-urpm-sources.pl:554
+#: ../edit-urpm-sources.pl:596
+#: ../edit-urpm-sources.pl:648
+#: ../edit-urpm-sources.pl:720
+#: ../edit-urpm-sources.pl:787
+#: ../edit-urpm-sources.pl:840
+#: ../edit-urpm-sources.pl:990
+#: ../rpmdrake:165
+#: ../rpmdrake:701
+#: ../rpmdrake:718
+#: ../rpmdrake:723
+#: ../rpmdrake:1446
+#: ../rpmdrake:1505
+#: ../rpmdrake:1648
+#: ../rpmdrake.pm:114
+#: ../rpmdrake.pm:224
+#: ../rpmdrake.pm:281
+#: ../rpmdrake.pm:539
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -262,7 +286,8 @@ msgstr "編輯媒體 \"%s\"："
 msgid "Save changes"
 msgstr "儲存變更"
 
-#: ../edit-urpm-sources.pl:401 ../edit-urpm-sources.pl:977
+#: ../edit-urpm-sources.pl:401
+#: ../edit-urpm-sources.pl:977
 #, c-format
 msgid "Proxy..."
 msgstr "代理伺服器..."
@@ -274,8 +299,7 @@ msgstr "您需要置入媒體以便繼續"
 
 #: ../edit-urpm-sources.pl:413
 #, c-format
-msgid ""
-"In order to save the changes, you need to insert the medium in the drive."
+msgid "In order to save the changes, you need to insert the medium in the drive."
 msgstr "為了儲存變更，您需要在磁碟機置入該媒體。"
 
 #: ../edit-urpm-sources.pl:435
@@ -295,12 +319,8 @@ msgstr "全域代理伺服器設定"
 
 #: ../edit-urpm-sources.pl:448
 #, c-format
-msgid ""
-"If you need a proxy, enter the hostname and an optional port (syntax: "
-"<proxyhost[:port]>):"
-msgstr ""
-"如果您需要透過代理伺服器連線，請輸入該主機的名稱與通訊埠號 (語法：<proxyhost "
-"[:port]> 例如 proxy.hinet.net:80)："
+msgid "If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):"
+msgstr "如果您需要透過代理伺服器連線，請輸入該主機的名稱與通訊埠號 (語法：<proxyhost [:port]> 例如 proxy.hinet.net:80)："
 
 #: ../edit-urpm-sources.pl:451
 #, c-format
@@ -367,13 +387,17 @@ msgstr "通訊協定："
 msgid "Media limit:"
 msgstr "媒體極限："
 
-#: ../edit-urpm-sources.pl:634 ../edit-urpm-sources.pl:641
+#: ../edit-urpm-sources.pl:634
+#: ../edit-urpm-sources.pl:641
 #, c-format
 msgid "Add"
 msgstr "新增"
 
-#: ../edit-urpm-sources.pl:635 ../edit-urpm-sources.pl:642
-#: ../edit-urpm-sources.pl:700 ../edit-urpm-sources.pl:955 ../rpmdrake:1181
+#: ../edit-urpm-sources.pl:635
+#: ../edit-urpm-sources.pl:642
+#: ../edit-urpm-sources.pl:700
+#: ../edit-urpm-sources.pl:955
+#: ../rpmdrake:1181
 #, c-format
 msgid "Remove"
 msgstr "移除"
@@ -408,18 +432,23 @@ msgstr "媒體極限"
 msgid "Command"
 msgstr "指令"
 
-#: ../edit-urpm-sources.pl:684 ../rpmdrake:364 ../rpmdrake:382 ../rpmdrake:516
+#: ../edit-urpm-sources.pl:684
+#: ../rpmdrake:364
+#: ../rpmdrake:382
+#: ../rpmdrake:516
 #: ../rpmdrake:629
 #, c-format
 msgid "(none)"
 msgstr "(無)"
 
-#: ../edit-urpm-sources.pl:704 ../edit-urpm-sources.pl:959
+#: ../edit-urpm-sources.pl:704
+#: ../edit-urpm-sources.pl:959
 #, c-format
 msgid "Edit"
 msgstr "編輯"
 
-#: ../edit-urpm-sources.pl:712 ../edit-urpm-sources.pl:965
+#: ../edit-urpm-sources.pl:712
+#: ../edit-urpm-sources.pl:965
 #, c-format
 msgid "Add..."
 msgstr "新增..."
@@ -429,7 +458,8 @@ msgstr "新增..."
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理數位套件簽章鑰匙"
 
-#: ../edit-urpm-sources.pl:732 ../edit-urpm-sources.pl:874
+#: ../edit-urpm-sources.pl:732
+#: ../edit-urpm-sources.pl:874
 #, c-format
 msgid "Medium"
 msgstr "媒體"
@@ -500,7 +530,8 @@ msgstr "更新媒體"
 msgid "Regenerate hdlist"
 msgstr "重新產生 hdlist"
 
-#: ../edit-urpm-sources.pl:898 ../rpmdrake.pm:621
+#: ../edit-urpm-sources.pl:898
+#: ../rpmdrake.pm:621
 #, c-format
 msgid "Please wait, updating media..."
 msgstr "請稍候，更新媒體中..."
@@ -540,7 +571,9 @@ msgstr "全域選項"
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../edit-urpm-sources.pl:1002 ../gurpmi.addmedia:74 ../rpmdrake:1759
+#: ../edit-urpm-sources.pl:1002
+#: ../gurpmi.addmedia:74
+#: ../rpmdrake:1759
 #, c-format
 msgid ""
 "%s\n"
@@ -599,73 +632,67 @@ msgstr "成功的新增了媒體 `%s'。"
 #: ../rpmdrake:31
 #, c-format
 msgid "Usage: %s [OPTION]..."
-msgstr "用法: %s [選項]..."
+msgstr "用法：%s [選項]..."
 
 #: ../rpmdrake:32
 #, c-format
-msgid ""
-"  --changelog-first      display changelog before filelist in the "
-"description window"
-msgstr ""
+msgid "  --changelog-first      display changelog before filelist in the description window"
+msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
 #: ../rpmdrake:33
 #, c-format
 msgid "  --media=medium1,..     limit to given media"
-msgstr ""
+msgstr "  --media=medium1,..     限制於給定的媒體"
 
 #: ../rpmdrake:34
 #, c-format
-msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
-msgstr ""
+msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
 #: ../rpmdrake:35
 #, c-format
 msgid "  --mode=MODE            set mode (install (default), remove, update)"
-msgstr ""
+msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、update)"
 
 #: ../rpmdrake:36
 #, c-format
-msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
-msgstr ""
+msgid "  --no-confirmation      don't ask first confirmation question in update mode"
+msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
 #: ../rpmdrake:37
-#, fuzzy, c-format
+#, c-format
 msgid "  --no-media-update      don't update media at startup"
-msgstr "  --update       - 只更新更新的媒體。\n"
+msgstr "  --no-media-update      啟動時不更新媒體"
 
 #: ../rpmdrake:38
-#, fuzzy, c-format
+#, c-format
 msgid "  --no-verify-rpm        don't verify packages signatures"
-msgstr "  --name          - 只顯示套件名稱。\n"
+msgstr "  --no-verify-rpm        不驗證套件簽章"
 
 #: ../rpmdrake:39
 #, c-format
-msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
+msgid "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps"
 msgstr ""
 
 #: ../rpmdrake:40
 #, c-format
 msgid "  --pkg-nosel=pkg1,..    show only these packages"
-msgstr ""
+msgstr "  --pkg-nosel=pkg1,..    僅顯示這些套件"
 
 #: ../rpmdrake:41
 #, c-format
 msgid "  --pkg-sel=pkg1,..      preselect these packages"
-msgstr ""
+msgstr "  --pkg-sel=pkg1,..      預先選取這些套件"
 
 #: ../rpmdrake:42
-#, fuzzy, c-format
+#, c-format
 msgid "  --root                 force to run as root"
-msgstr "                           "
+msgstr "  --root                 強制使用 root 來執行"
 
 #: ../rpmdrake:43
 #, c-format
 msgid "  --search=pkg           run search for \"pkg\""
-msgstr ""
+msgstr "  --search=pkg           搜尋 \"pkg\" "
 
 #: ../rpmdrake:162
 #, c-format
@@ -688,7 +715,10 @@ msgstr ""
 msgid "Accessibility"
 msgstr "輔助功能"
 
-#: ../rpmdrake:173 ../rpmdrake:174 ../rpmdrake:175 ../rpmdrake:176
+#: ../rpmdrake:173
+#: ../rpmdrake:174
+#: ../rpmdrake:175
+#: ../rpmdrake:176
 #, c-format
 msgid "Archiving"
 msgstr "歸檔"
@@ -708,14 +738,23 @@ msgstr "光碟燒錄"
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../rpmdrake:176 ../rpmdrake:181 ../rpmdrake:193 ../rpmdrake:204
-#: ../rpmdrake:213 ../rpmdrake:225 ../rpmdrake:237 ../rpmdrake:245
+#: ../rpmdrake:176
+#: ../rpmdrake:181
+#: ../rpmdrake:193
+#: ../rpmdrake:204
+#: ../rpmdrake:213
+#: ../rpmdrake:225
+#: ../rpmdrake:237
+#: ../rpmdrake:245
 #: ../rpmdrake:333
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../rpmdrake:177 ../rpmdrake:178 ../rpmdrake:179 ../rpmdrake:180
+#: ../rpmdrake:177
+#: ../rpmdrake:178
+#: ../rpmdrake:179
+#: ../rpmdrake:180
 #: ../rpmdrake:181
 #, c-format
 msgid "Books"
@@ -741,7 +780,8 @@ msgstr "Howtos"
 msgid "Literature"
 msgstr "文獻"
 
-#: ../rpmdrake:182 ../rpmdrake:183
+#: ../rpmdrake:182
+#: ../rpmdrake:183
 #, c-format
 msgid "Cluster"
 msgstr "叢集"
@@ -761,14 +801,22 @@ msgstr "查詢服務"
 msgid "Communications"
 msgstr "通訊"
 
-#: ../rpmdrake:185 ../rpmdrake:188
+#: ../rpmdrake:185
+#: ../rpmdrake:188
 #, c-format
 msgid "Databases"
 msgstr "資料庫"
 
-#: ../rpmdrake:186 ../rpmdrake:187 ../rpmdrake:188 ../rpmdrake:189
-#: ../rpmdrake:190 ../rpmdrake:191 ../rpmdrake:192 ../rpmdrake:193
-#: ../rpmdrake:194 ../rpmdrake:195
+#: ../rpmdrake:186
+#: ../rpmdrake:187
+#: ../rpmdrake:188
+#: ../rpmdrake:189
+#: ../rpmdrake:190
+#: ../rpmdrake:191
+#: ../rpmdrake:192
+#: ../rpmdrake:193
+#: ../rpmdrake:194
+#: ../rpmdrake:195
 #, c-format
 msgid "Development"
 msgstr "開發"
@@ -833,8 +881,14 @@ msgstr "模擬器"
 msgid "File tools"
 msgstr "檔案工具"
 
-#: ../rpmdrake:200 ../rpmdrake:201 ../rpmdrake:202 ../rpmdrake:203
-#: ../rpmdrake:204 ../rpmdrake:205 ../rpmdrake:206 ../rpmdrake:207
+#: ../rpmdrake:200
+#: ../rpmdrake:201
+#: ../rpmdrake:202
+#: ../rpmdrake:203
+#: ../rpmdrake:204
+#: ../rpmdrake:205
+#: ../rpmdrake:206
+#: ../rpmdrake:207
 #, c-format
 msgid "Games"
 msgstr "遊戲"
@@ -874,8 +928,14 @@ msgstr "運動遊戲"
 msgid "Strategy"
 msgstr "戰略遊戲"
 
-#: ../rpmdrake:208 ../rpmdrake:209 ../rpmdrake:210 ../rpmdrake:211
-#: ../rpmdrake:212 ../rpmdrake:213 ../rpmdrake:214 ../rpmdrake:215
+#: ../rpmdrake:208
+#: ../rpmdrake:209
+#: ../rpmdrake:210
+#: ../rpmdrake:211
+#: ../rpmdrake:212
+#: ../rpmdrake:213
+#: ../rpmdrake:214
+#: ../rpmdrake:215
 #, c-format
 msgid "Graphical desktop"
 msgstr "圖形化桌面"
@@ -930,9 +990,16 @@ msgstr "監視"
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../rpmdrake:219 ../rpmdrake:220 ../rpmdrake:221 ../rpmdrake:222
-#: ../rpmdrake:223 ../rpmdrake:224 ../rpmdrake:225 ../rpmdrake:226
-#: ../rpmdrake:227 ../rpmdrake:244
+#: ../rpmdrake:219
+#: ../rpmdrake:220
+#: ../rpmdrake:221
+#: ../rpmdrake:222
+#: ../rpmdrake:223
+#: ../rpmdrake:224
+#: ../rpmdrake:225
+#: ../rpmdrake:226
+#: ../rpmdrake:227
+#: ../rpmdrake:244
 #, c-format
 msgid "Networking"
 msgstr "網路"
@@ -992,8 +1059,14 @@ msgstr "公鑰"
 msgid "Publishing"
 msgstr "出版"
 
-#: ../rpmdrake:231 ../rpmdrake:232 ../rpmdrake:233 ../rpmdrake:234
-#: ../rpmdrake:235 ../rpmdrake:236 ../rpmdrake:237 ../rpmdrake:238
+#: ../rpmdrake:231
+#: ../rpmdrake:232
+#: ../rpmdrake:233
+#: ../rpmdrake:234
+#: ../rpmdrake:235
+#: ../rpmdrake:236
+#: ../rpmdrake:237
+#: ../rpmdrake:238
 #, c-format
 msgid "Sciences"
 msgstr "科學"
@@ -1043,11 +1116,24 @@ msgstr "Shells"
 msgid "Sound"
 msgstr "音效"
 
-#: ../rpmdrake:241 ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244
-#: ../rpmdrake:245 ../rpmdrake:246 ../rpmdrake:247 ../rpmdrake:248
-#: ../rpmdrake:249 ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252
-#: ../rpmdrake:253 ../rpmdrake:254 ../rpmdrake:255 ../rpmdrake:256
-#: ../rpmdrake:257 ../rpmdrake:258
+#: ../rpmdrake:241
+#: ../rpmdrake:242
+#: ../rpmdrake:243
+#: ../rpmdrake:244
+#: ../rpmdrake:245
+#: ../rpmdrake:246
+#: ../rpmdrake:247
+#: ../rpmdrake:248
+#: ../rpmdrake:249
+#: ../rpmdrake:250
+#: ../rpmdrake:251
+#: ../rpmdrake:252
+#: ../rpmdrake:253
+#: ../rpmdrake:254
+#: ../rpmdrake:255
+#: ../rpmdrake:256
+#: ../rpmdrake:257
+#: ../rpmdrake:258
 #, c-format
 msgid "System"
 msgstr "系統"
@@ -1057,8 +1143,12 @@ msgstr "系統"
 msgid "Base"
 msgstr "基本套件"
 
-#: ../rpmdrake:242 ../rpmdrake:243 ../rpmdrake:244 ../rpmdrake:245
-#: ../rpmdrake:246 ../rpmdrake:247
+#: ../rpmdrake:242
+#: ../rpmdrake:243
+#: ../rpmdrake:244
+#: ../rpmdrake:245
+#: ../rpmdrake:246
+#: ../rpmdrake:247
 #, c-format
 msgid "Configuration"
 msgstr "設定"
@@ -1093,7 +1183,10 @@ msgstr "部署"
 msgid "Deployment"
 msgstr "部署"
 
-#: ../rpmdrake:250 ../rpmdrake:251 ../rpmdrake:252 ../rpmdrake:253
+#: ../rpmdrake:250
+#: ../rpmdrake:251
+#: ../rpmdrake:252
+#: ../rpmdrake:253
 #, c-format
 msgid "Fonts"
 msgstr "字型"
@@ -1163,12 +1256,15 @@ msgstr "玩具"
 msgid "Video"
 msgstr "視訊"
 
-#: ../rpmdrake:388 ../rpmdrake:533 ../rpmdrake:535
+#: ../rpmdrake:388
+#: ../rpmdrake:533
+#: ../rpmdrake:535
 #, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
 
-#: ../rpmdrake:417 ../rpmdrake:497
+#: ../rpmdrake:417
+#: ../rpmdrake:497
 #, c-format
 msgid "Search results"
 msgstr "搜尋結果"
@@ -1178,12 +1274,16 @@ msgstr "搜尋結果"
 msgid "Search results (none)"
 msgstr "搜尋結果 (無)"
 
-#: ../rpmdrake:428 ../rpmdrake:455
+#: ../rpmdrake:428
+#: ../rpmdrake:455
 #, c-format
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
 
-#: ../rpmdrake:450 ../rpmdrake:576 ../rpmdrake:1235 ../rpmdrake:1546
+#: ../rpmdrake:450
+#: ../rpmdrake:576
+#: ../rpmdrake:1235
+#: ../rpmdrake:1546
 #: ../rpmdrake:1758
 #, c-format
 msgid "Rpmdrake"
@@ -1194,12 +1294,14 @@ msgstr "Rpmdrake"
 msgid "Stop"
 msgstr "停止"
 
-#: ../rpmdrake:498 ../rpmdrake:664
+#: ../rpmdrake:498
+#: ../rpmdrake:664
 #, c-format
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../rpmdrake:498 ../rpmdrake:664
+#: ../rpmdrake:498
+#: ../rpmdrake:664
 #, c-format
 msgid "Addable"
 msgstr "可供加入"
@@ -1279,7 +1381,10 @@ msgstr "描述："
 msgid "No description"
 msgstr "沒有描述"
 
-#: ../rpmdrake:592 ../rpmdrake:714 ../rpmdrake:716 ../rpmdrake:1638
+#: ../rpmdrake:592
+#: ../rpmdrake:714
+#: ../rpmdrake:716
+#: ../rpmdrake:1638
 #, c-format
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
@@ -1320,12 +1425,14 @@ msgid "All"
 msgstr "全部"
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../rpmdrake:701 ../rpmdrake:706
+#: ../rpmdrake:701
+#: ../rpmdrake:706
 #, c-format
 msgid "More info"
 msgstr "更多資訊"
 
-#: ../rpmdrake:709 ../rpmdrake:1627
+#: ../rpmdrake:709
+#: ../rpmdrake:1627
 #, c-format
 msgid "Information on packages"
 msgstr "套件資訊"
@@ -1345,7 +1452,8 @@ msgstr ""
 "因為它們的相依性問題，以下的套件也需要移除：\n"
 "\n"
 
-#: ../rpmdrake:738 ../rpmdrake:747
+#: ../rpmdrake:738
+#: ../rpmdrake:747
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
@@ -1359,7 +1467,8 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../rpmdrake:748 ../rpmdrake:810
+#: ../rpmdrake:748
+#: ../rpmdrake:810
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1405,7 +1514,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../rpmdrake:809 ../rpmdrake:1075
+#: ../rpmdrake:809
+#: ../rpmdrake:1075
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
@@ -1566,7 +1676,10 @@ msgstr "軟體套件升級"
 msgid "Software Packages Installation"
 msgstr "軟體套件安裝"
 
-#: ../rpmdrake:1117 ../rpmdrake:1120 ../rpmdrake:1129 ../rpmdrake:1140
+#: ../rpmdrake:1117
+#: ../rpmdrake:1120
+#: ../rpmdrake:1129
+#: ../rpmdrake:1140
 #: ../rpmdrake:1145
 #, c-format
 msgid "/_File"
@@ -1597,17 +1710,21 @@ msgstr "/離開 (_Q)"
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../rpmdrake:1148 ../rpmdrake:1149 ../rpmdrake:1156
+#: ../rpmdrake:1148
+#: ../rpmdrake:1149
+#: ../rpmdrake:1156
 #, c-format
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../rpmdrake:1149 ../rpmdrake:1156
+#: ../rpmdrake:1149
+#: ../rpmdrake:1156
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
 
-#: ../rpmdrake:1153 ../rpmdrake:1154
+#: ../rpmdrake:1153
+#: ../rpmdrake:1154
 #, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
@@ -1734,22 +1851,27 @@ msgstr "安裝完成"
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../rpmdrake:1468 ../rpmdrake:1623
+#: ../rpmdrake:1468
+#: ../rpmdrake:1623
 #, c-format
 msgid "Everything installed successfully"
 msgstr "所有項目安裝成功"
 
-#: ../rpmdrake:1469 ../rpmdrake:1624
+#: ../rpmdrake:1469
+#: ../rpmdrake:1624
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../rpmdrake:1471 ../rpmdrake:1608
+#: ../rpmdrake:1471
+#: ../rpmdrake:1608
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../rpmdrake:1472 ../rpmdrake:1609 ../rpmdrake:1664
+#: ../rpmdrake:1472
+#: ../rpmdrake:1609
+#: ../rpmdrake:1664
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -1770,7 +1892,8 @@ msgstr "無法取得來源套件。"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../rpmdrake:1487 ../rpmdrake:1558
+#: ../rpmdrake:1487
+#: ../rpmdrake:1558
 #, c-format
 msgid ""
 "\n"
@@ -1828,7 +1951,8 @@ msgstr ""
 "\n"
 "您要繼續安裝嗎？"
 
-#: ../rpmdrake:1555 ../rpmdrake:1663
+#: ../rpmdrake:1555
+#: ../rpmdrake:1663
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
@@ -1981,9 +2105,9 @@ msgid "Mandriva Linux Update"
 msgstr "Mandriva Linux 更新"
 
 #: ../rpmdrake.pm:122
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter your credentials for accessing proxy\n"
-msgstr "請於下方輸入你的 e-mail"
+msgstr "請輸入您的憑證以使用代理伺服器\n"
 
 #: ../rpmdrake.pm:123
 #, c-format
@@ -2055,7 +2179,8 @@ msgstr "德國"
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:353 ../rpmdrake.pm:357
+#: ../rpmdrake.pm:353
+#: ../rpmdrake.pm:357
 #, c-format
 msgid "Greece"
 msgstr "希臘"
@@ -2150,7 +2275,10 @@ msgstr "英國"
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:373 ../rpmdrake.pm:374 ../rpmdrake.pm:375 ../rpmdrake.pm:376
+#: ../rpmdrake.pm:373
+#: ../rpmdrake.pm:374
+#: ../rpmdrake.pm:375
+#: ../rpmdrake.pm:376
 #: ../rpmdrake.pm:453
 #, c-format
 msgid "United States"
@@ -2312,8 +2440,7 @@ msgstr "接收套件時發生錯誤"
 msgid ""
 "It's impossible to retrieve the list of new packages from the media\n"
 "`%s'. Either this update media is misconfigured, and in this case\n"
-"you should use the Software Media Manager to remove it and re-add it in "
-"order\n"
+"you should use the Software Media Manager to remove it and re-add it in order\n"
 "to reconfigure it, either it is currently unreachable and you should retry\n"
 "later."
 msgstr ""
@@ -2354,7 +2481,8 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:751 ../rpmdrake.pm:760
+#: ../rpmdrake.pm:751
+#: ../rpmdrake.pm:760
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2389,8 +2517,7 @@ msgstr ""
 #: ../rpmdrake.pm:791
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of %s you're "
-"running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of %s you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 %s 版本 (%s) 不符。\n"
@@ -2399,8 +2526,7 @@ msgstr ""
 #: ../rpmdrake.pm:794
 #, c-format
 msgid ""
-"Your medium `%s', used for updates, does not match the version of Mandriva "
-"Linux you're running (%s).\n"
+"Your medium `%s', used for updates, does not match the version of Mandriva Linux you're running (%s).\n"
 "It will be disabled."
 msgstr ""
 "您用來更新系統的媒體 `%s' 與您正在使用的 Mandriva Linux 版本 (%s) 不符。\n"
@@ -2413,8 +2539,7 @@ msgstr "於背景啟動說明"
 
 #: ../rpmdrake.pm:811
 #, c-format
-msgid ""
-"The help window has been started, it should appear shortly on your desktop."
+msgid "The help window has been started, it should appear shortly on your desktop."
 msgstr "說明視窗已經啟動，它將馬上出現於您的桌面。"
 
 #: ../grpmi/curl_download/curl_download.xs:86
@@ -2687,14 +2812,3 @@ msgstr "移除軟體"
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
-#~ msgid "Keys"
-#~ msgstr "鑰匙"
-
-#~ msgid "Rpmdrake %s"
-#~ msgstr "Rpmdrake %s"
-
-#~ msgid "/_View"
-#~ msgstr "/檢視 (_V)"
-
-#~ msgid "<no description>"
-#~ msgstr "<沒有描述>"