updated po file

1 files changed, 413 insertions, 250 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index e4925091..24477fa6 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -11,16 +11,16 @@
 # Hilbert <freehil@yahoo.com>, 2003, 2004.
 # Hilbert <h@mandrake.org>, 2004.
 # Shiva Huang <blueshiva@giga.net.tw>, 2005.
-# Shvia Huang <shivahuang@gmail.com>, 2005-2006.
+# Shiva Huang <shivahuang@gmail.com>, 2005-2006.
 # yujia Kang <yujia.kang@gmail.com>, 2005.
-# You-Cheng Hsieh <yochenhsieh@xuite.net>, 2006.
+# You-Cheng Hsieh <yochenhsieh@xuite.net>, 2006-2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: rpmdrake\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2007-09-06 11:49+0200\n"
-"PO-Revision-Date: 2007-09-06 20:01+0800\n"
+"PO-Revision-Date: 2007-09-20 22:37+0800\n"
 "Last-Translator: You-Cheng Hsieh <yochenhsieh@gmail.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -32,7 +32,8 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Bookmarks: 350,351,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
-#: ../MandrivaUpdate:76 ../Rpmdrake/gui.pm:690
+#: ../MandrivaUpdate:76
+#: ../Rpmdrake/gui.pm:690
 #, c-format
 msgid ""
 "The list of updates is empty. This means that either there is\n"
@@ -42,7 +43,10 @@ msgstr ""
 "更新的清單項目是空的。也許是於您系統上安裝的套件沒有可用的更新，\n"
 "或者您已經全部安裝完畢了。"
 
-#: ../MandrivaUpdate:105 ../rpmdrake:63 ../rpmdrake:524 ../rpmdrake.pm:195
+#: ../MandrivaUpdate:105
+#: ../rpmdrake:63
+#: ../rpmdrake:524
+#: ../rpmdrake.pm:195
 #, c-format
 msgid "Software Management"
 msgstr "軟體套件管理程式"
@@ -52,22 +56,28 @@ msgstr "軟體套件管理程式"
 msgid "Here is the list of software package updates"
 msgstr "以下是套件軟體更新的清單"
 
-#: ../MandrivaUpdate:144 ../Rpmdrake/edit_urpm_sources.pm:1127 ../rpmdrake:454
+#: ../MandrivaUpdate:144
+#: ../Rpmdrake/edit_urpm_sources.pm:1127
+#: ../rpmdrake:454
 #, c-format
 msgid "Help"
 msgstr "輔助說明"
 
-#: ../MandrivaUpdate:148 ../rpmdrake:459 ../rpmdrake.pm:783
+#: ../MandrivaUpdate:148
+#: ../rpmdrake:459
+#: ../rpmdrake.pm:783
 #, c-format
 msgid "Select all"
 msgstr "全部選取"
 
-#: ../MandrivaUpdate:156 ../rpmdrake.pm:787
+#: ../MandrivaUpdate:156
+#: ../rpmdrake.pm:787
 #, c-format
 msgid "Update"
 msgstr "更新"
 
-#: ../MandrivaUpdate:164 ../rpmdrake:469
+#: ../MandrivaUpdate:164
+#: ../rpmdrake:469
 #, c-format
 msgid "Quit"
 msgstr "結束"
@@ -77,7 +87,8 @@ msgstr "結束"
 msgid "FTP"
 msgstr "FTP"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:61 ../Rpmdrake/edit_urpm_sources.pm:70
+#: ../Rpmdrake/edit_urpm_sources.pm:61
+#: ../Rpmdrake/edit_urpm_sources.pm:70
 #, c-format
 msgid "Local"
 msgstr "本地端"
@@ -92,7 +103,8 @@ msgstr "HTTP"
 msgid "HTTPS"
 msgstr "HTTPS"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:64 ../Rpmdrake/edit_urpm_sources.pm:67
+#: ../Rpmdrake/edit_urpm_sources.pm:64
+#: ../Rpmdrake/edit_urpm_sources.pm:67
 #, c-format
 msgid "NFS"
 msgstr "NFS"
@@ -115,14 +127,11 @@ msgstr "選擇媒體類型"
 #: ../Rpmdrake/edit_urpm_sources.pm:79
 #, 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 ""
@@ -185,8 +194,10 @@ msgstr "媒體路徑："
 msgid "FTP server"
 msgstr "FTP 伺服器"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:151 ../Rpmdrake/edit_urpm_sources.pm:152
-#: ../Rpmdrake/edit_urpm_sources.pm:153 ../Rpmdrake/edit_urpm_sources.pm:438
+#: ../Rpmdrake/edit_urpm_sources.pm:151
+#: ../Rpmdrake/edit_urpm_sources.pm:152
+#: ../Rpmdrake/edit_urpm_sources.pm:153
+#: ../Rpmdrake/edit_urpm_sources.pm:438
 #, c-format
 msgid "URL:"
 msgstr "URL:"
@@ -221,13 +232,15 @@ msgstr "瀏覽..."
 msgid "Login:"
 msgstr "登入："
 
-#: ../Rpmdrake/edit_urpm_sources.pm:199 ../Rpmdrake/edit_urpm_sources.pm:539
+#: ../Rpmdrake/edit_urpm_sources.pm:199
+#: ../Rpmdrake/edit_urpm_sources.pm:539
 #: ../rpmdrake.pm:135
 #, c-format
 msgid "Password:"
 msgstr "密碼："
 
-#: ../Rpmdrake/edit_urpm_sources.pm:204 ../Rpmdrake/edit_urpm_sources.pm:439
+#: ../Rpmdrake/edit_urpm_sources.pm:204
+#: ../Rpmdrake/edit_urpm_sources.pm:439
 #, c-format
 msgid "Relative path to synthesis/hdlist:"
 msgstr "synthesis/hdlist 檔案的相對路徑："
@@ -276,26 +289,48 @@ msgstr "正在新增一個媒體："
 msgid "Type of medium:"
 msgstr "媒體類別："
 
-#: ../Rpmdrake/edit_urpm_sources.pm:268 ../Rpmdrake/edit_urpm_sources.pm:344
-#: ../Rpmdrake/edit_urpm_sources.pm:448 ../Rpmdrake/edit_urpm_sources.pm:475
-#: ../Rpmdrake/edit_urpm_sources.pm:556 ../Rpmdrake/edit_urpm_sources.pm:643
-#: ../Rpmdrake/edit_urpm_sources.pm:684 ../Rpmdrake/edit_urpm_sources.pm:742
-#: ../Rpmdrake/edit_urpm_sources.pm:892 ../Rpmdrake/gui.pm:462
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:629 ../Rpmdrake/pkg.pm:671
-#: ../rpmdrake.pm:306 ../rpmdrake.pm:621 ../rpmdrake.pm:706 ../rpmdrake.pm:779
+#: ../Rpmdrake/edit_urpm_sources.pm:268
+#: ../Rpmdrake/edit_urpm_sources.pm:344
+#: ../Rpmdrake/edit_urpm_sources.pm:448
+#: ../Rpmdrake/edit_urpm_sources.pm:475
+#: ../Rpmdrake/edit_urpm_sources.pm:556
+#: ../Rpmdrake/edit_urpm_sources.pm:643
+#: ../Rpmdrake/edit_urpm_sources.pm:684
+#: ../Rpmdrake/edit_urpm_sources.pm:742
+#: ../Rpmdrake/edit_urpm_sources.pm:892
+#: ../Rpmdrake/gui.pm:462
+#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/pkg.pm:629
+#: ../Rpmdrake/pkg.pm:671
+#: ../rpmdrake.pm:306
+#: ../rpmdrake.pm:621
+#: ../rpmdrake.pm:706
+#: ../rpmdrake.pm:779
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:270 ../Rpmdrake/edit_urpm_sources.pm:346
-#: ../Rpmdrake/edit_urpm_sources.pm:475 ../Rpmdrake/edit_urpm_sources.pm:546
-#: ../Rpmdrake/edit_urpm_sources.pm:640 ../Rpmdrake/edit_urpm_sources.pm:683
-#: ../Rpmdrake/edit_urpm_sources.pm:735 ../Rpmdrake/edit_urpm_sources.pm:808
-#: ../Rpmdrake/edit_urpm_sources.pm:938 ../Rpmdrake/edit_urpm_sources.pm:1128
-#: ../Rpmdrake/gui.pm:462 ../Rpmdrake/gui.pm:478 ../Rpmdrake/gui.pm:483
-#: ../Rpmdrake/init.pm:136 ../Rpmdrake/pkg.pm:474 ../Rpmdrake/pkg.pm:671
-#: ../Rpmdrake/rpmnew.pm:179 ../rpmdrake.pm:126 ../rpmdrake.pm:245
-#: ../rpmdrake.pm:309 ../rpmdrake.pm:621
+#: ../Rpmdrake/edit_urpm_sources.pm:270
+#: ../Rpmdrake/edit_urpm_sources.pm:346
+#: ../Rpmdrake/edit_urpm_sources.pm:475
+#: ../Rpmdrake/edit_urpm_sources.pm:546
+#: ../Rpmdrake/edit_urpm_sources.pm:640
+#: ../Rpmdrake/edit_urpm_sources.pm:683
+#: ../Rpmdrake/edit_urpm_sources.pm:735
+#: ../Rpmdrake/edit_urpm_sources.pm:808
+#: ../Rpmdrake/edit_urpm_sources.pm:938
+#: ../Rpmdrake/edit_urpm_sources.pm:1128
+#: ../Rpmdrake/gui.pm:462
+#: ../Rpmdrake/gui.pm:478
+#: ../Rpmdrake/gui.pm:483
+#: ../Rpmdrake/init.pm:136
+#: ../Rpmdrake/pkg.pm:474
+#: ../Rpmdrake/pkg.pm:671
+#: ../Rpmdrake/rpmnew.pm:179
+#: ../rpmdrake.pm:126
+#: ../rpmdrake.pm:245
+#: ../rpmdrake.pm:309
+#: ../rpmdrake.pm:621
 #, c-format
 msgid "Ok"
 msgstr "確定"
@@ -377,8 +412,7 @@ msgstr "您需要置入媒體以便繼續"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:474
 #, 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 "為了儲存變更，您需要在磁碟機置入該媒體。"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:510
@@ -398,12 +432,8 @@ msgstr "全域代理伺服器設定"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:525
 #, 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)："
 
 #: ../Rpmdrake/edit_urpm_sources.pm:528
 #, c-format
@@ -470,14 +500,18 @@ msgstr "通訊協定："
 msgid "Media limit:"
 msgstr "媒體限定："
 
-#: ../Rpmdrake/edit_urpm_sources.pm:721 ../Rpmdrake/edit_urpm_sources.pm:728
-#: ../Rpmdrake/edit_urpm_sources.pm:926 ../Rpmdrake/edit_urpm_sources.pm:1115
+#: ../Rpmdrake/edit_urpm_sources.pm:721
+#: ../Rpmdrake/edit_urpm_sources.pm:728
+#: ../Rpmdrake/edit_urpm_sources.pm:926
+#: ../Rpmdrake/edit_urpm_sources.pm:1115
 #, c-format
 msgid "Add"
 msgstr "新增"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:722 ../Rpmdrake/edit_urpm_sources.pm:729
-#: ../Rpmdrake/edit_urpm_sources.pm:788 ../Rpmdrake/edit_urpm_sources.pm:930
+#: ../Rpmdrake/edit_urpm_sources.pm:722
+#: ../Rpmdrake/edit_urpm_sources.pm:729
+#: ../Rpmdrake/edit_urpm_sources.pm:788
+#: ../Rpmdrake/edit_urpm_sources.pm:930
 #: ../Rpmdrake/edit_urpm_sources.pm:1105
 #, c-format
 msgid "Remove"
@@ -513,8 +547,11 @@ msgstr "媒體限定"
 msgid "Command"
 msgstr "指令"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:772 ../Rpmdrake/gui.pm:687
-#: ../Rpmdrake/pkg.pm:100 ../Rpmdrake/pkg.pm:130 ../Rpmdrake/pkg.pm:170
+#: ../Rpmdrake/edit_urpm_sources.pm:772
+#: ../Rpmdrake/gui.pm:687
+#: ../Rpmdrake/pkg.pm:100
+#: ../Rpmdrake/pkg.pm:130
+#: ../Rpmdrake/pkg.pm:170
 #: ../Rpmdrake/rpmnew.pm:77
 #, c-format
 msgid "(none)"
@@ -535,7 +572,8 @@ msgstr "新增..."
 msgid "Manage keys for digital signatures of packages"
 msgstr "管理數位套件簽章鑰匙"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:822 ../Rpmdrake/edit_urpm_sources.pm:1036
+#: ../Rpmdrake/edit_urpm_sources.pm:822
+#: ../Rpmdrake/edit_urpm_sources.pm:1036
 #, c-format
 msgid "Medium"
 msgstr "媒體"
@@ -586,19 +624,26 @@ msgstr ""
 msgid "Configure media"
 msgstr "設定媒體"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:954 ../Rpmdrake/edit_urpm_sources.pm:955
-#: ../Rpmdrake/edit_urpm_sources.pm:956 ../rpmdrake:347 ../rpmdrake:350
-#: ../rpmdrake:355 ../rpmdrake:368 ../rpmdrake:369
+#: ../Rpmdrake/edit_urpm_sources.pm:954
+#: ../Rpmdrake/edit_urpm_sources.pm:955
+#: ../Rpmdrake/edit_urpm_sources.pm:956
+#: ../rpmdrake:347
+#: ../rpmdrake:350
+#: ../rpmdrake:355
+#: ../rpmdrake:368
+#: ../rpmdrake:369
 #, c-format
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:955 ../rpmdrake:369
+#: ../Rpmdrake/edit_urpm_sources.pm:955
+#: ../rpmdrake:369
 #, c-format
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:955 ../rpmdrake:369
+#: ../Rpmdrake/edit_urpm_sources.pm:955
+#: ../rpmdrake:369
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -613,10 +658,16 @@ msgstr "/更新 (_U)"
 msgid "<control>U"
 msgstr "<control>U"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:957 ../Rpmdrake/edit_urpm_sources.pm:958
-#: ../Rpmdrake/edit_urpm_sources.pm:959 ../Rpmdrake/edit_urpm_sources.pm:960
-#: ../Rpmdrake/edit_urpm_sources.pm:961 ../Rpmdrake/edit_urpm_sources.pm:962
-#: ../rpmdrake:344 ../rpmdrake:372 ../rpmdrake:376 ../rpmdrake:380
+#: ../Rpmdrake/edit_urpm_sources.pm:957
+#: ../Rpmdrake/edit_urpm_sources.pm:958
+#: ../Rpmdrake/edit_urpm_sources.pm:959
+#: ../Rpmdrake/edit_urpm_sources.pm:960
+#: ../Rpmdrake/edit_urpm_sources.pm:961
+#: ../Rpmdrake/edit_urpm_sources.pm:962
+#: ../rpmdrake:344
+#: ../rpmdrake:372
+#: ../rpmdrake:376
+#: ../rpmdrake:380
 #: ../rpmdrake:419
 #, c-format
 msgid "/_Options"
@@ -633,9 +684,9 @@ msgid "<control>G"
 msgstr "<control>G"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:978
-#, fuzzy, c-format
+#, c-format
 msgid "/_Add a custom media"
-msgstr "/新增媒體 (_A)"
+msgstr "/新增自訂媒體 (_A)"
 
 #: ../Rpmdrake/edit_urpm_sources.pm:978
 #, c-format
@@ -672,53 +723,66 @@ msgstr "/代理伺服器 (_R)"
 msgid "<control>R"
 msgstr "<control>R"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:964 ../Rpmdrake/edit_urpm_sources.pm:965
-#: ../Rpmdrake/edit_urpm_sources.pm:966 ../Rpmdrake/edit_urpm_sources.pm:967
-#: ../rpmdrake:384 ../rpmdrake:385 ../rpmdrake:386 ../rpmdrake:387
+#: ../Rpmdrake/edit_urpm_sources.pm:964
+#: ../Rpmdrake/edit_urpm_sources.pm:965
+#: ../Rpmdrake/edit_urpm_sources.pm:966
+#: ../Rpmdrake/edit_urpm_sources.pm:967
+#: ../rpmdrake:384
+#: ../rpmdrake:385
+#: ../rpmdrake:386
+#: ../rpmdrake:387
 #, c-format
 msgid "/_Help"
 msgstr "/輔助說明 (_H)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:965 ../rpmdrake:385
+#: ../Rpmdrake/edit_urpm_sources.pm:965
+#: ../rpmdrake:385
 #, c-format
 msgid "/_Report Bug"
 msgstr "/回報臭蟲 (_R)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:967 ../rpmdrake:387
+#: ../Rpmdrake/edit_urpm_sources.pm:967
+#: ../rpmdrake:387
 #, c-format
 msgid "/_About..."
 msgstr "/關於... (_A)"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:970 ../rpmdrake:390
+#: ../Rpmdrake/edit_urpm_sources.pm:970
+#: ../rpmdrake:390
 #, c-format
 msgid "Rpmdrake"
 msgstr "Rpmdrake"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:972 ../rpmdrake:392
+#: ../Rpmdrake/edit_urpm_sources.pm:972
+#: ../rpmdrake:392
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "Copyright (C) %s by Mandriva"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:974 ../rpmdrake:394
+#: ../Rpmdrake/edit_urpm_sources.pm:974
+#: ../rpmdrake:394
 #, c-format
 msgid "Rpmdrake is Mandriva Linux package management tool."
 msgstr "Rpmdrake 是 Mandriva Linux 的套件管理工具。"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:976 ../rpmdrake:396
+#: ../Rpmdrake/edit_urpm_sources.pm:976
+#: ../rpmdrake:396
 #, c-format
 msgid "Mandriva Linux"
 msgstr "Mandriva Linux"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../Rpmdrake/edit_urpm_sources.pm:981 ../rpmdrake:401
+#: ../Rpmdrake/edit_urpm_sources.pm:981
+#: ../rpmdrake:401
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr ""
 "Shiva Huang <shivahuang@gmail.com>\n"
 "You-Cheng Hsieh <yochenhsieh@xuite.net>\n"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1034 ../Rpmdrake/pkg.pm:214
+#: ../Rpmdrake/edit_urpm_sources.pm:1034
+#: ../Rpmdrake/pkg.pm:214
 #, c-format
 msgid "Enabled"
 msgstr "是否啟用？"
@@ -754,7 +818,8 @@ msgstr ""
 msgid "Edit"
 msgstr "編輯"
 
-#: ../Rpmdrake/edit_urpm_sources.pm:1143 ../Rpmdrake/init.pm:142
+#: ../Rpmdrake/edit_urpm_sources.pm:1143
+#: ../Rpmdrake/init.pm:142
 #: ../gurpmi.addmedia:99
 #, c-format
 msgid ""
@@ -796,12 +861,14 @@ msgstr ""
 msgid "None"
 msgstr "無"
 
-#: ../Rpmdrake/gui.pm:81 ../Rpmdrake/gui.pm:155
+#: ../Rpmdrake/gui.pm:81
+#: ../Rpmdrake/gui.pm:155
 #, c-format
 msgid "Importance: "
 msgstr "重要性："
 
-#: ../Rpmdrake/gui.pm:82 ../Rpmdrake/gui.pm:163
+#: ../Rpmdrake/gui.pm:82
+#: ../Rpmdrake/gui.pm:163
 #, c-format
 msgid "Reason for update: "
 msgstr "更新的原因："
@@ -811,7 +878,8 @@ msgstr "更新的原因："
 msgid "Security advisory"
 msgstr "安全性建言"
 
-#: ../Rpmdrake/gui.pm:94 ../Rpmdrake/gui.pm:165
+#: ../Rpmdrake/gui.pm:94
+#: ../Rpmdrake/gui.pm:165
 #, c-format
 msgid "No description"
 msgstr "沒有描述"
@@ -821,32 +889,39 @@ msgstr "沒有描述"
 msgid "Details:"
 msgstr "細節："
 
-#: ../Rpmdrake/gui.pm:100 ../Rpmdrake/gui.pm:150
+#: ../Rpmdrake/gui.pm:100
+#: ../Rpmdrake/gui.pm:150
 #, c-format
 msgid "Version: "
 msgstr "版本："
 
-#: ../Rpmdrake/gui.pm:103 ../Rpmdrake/gui.pm:145
+#: ../Rpmdrake/gui.pm:103
+#: ../Rpmdrake/gui.pm:145
 #, c-format
 msgid "Currently installed version: "
 msgstr "目前已安裝的版本："
 
-#: ../Rpmdrake/gui.pm:106 ../Rpmdrake/gui.pm:151
+#: ../Rpmdrake/gui.pm:106
+#: ../Rpmdrake/gui.pm:151
 #, c-format
 msgid "Architecture: "
 msgstr "硬體平台："
 
-#: ../Rpmdrake/gui.pm:107 ../Rpmdrake/gui.pm:152
+#: ../Rpmdrake/gui.pm:107
+#: ../Rpmdrake/gui.pm:152
 #, c-format
 msgid "Size: "
 msgstr "大小："
 
-#: ../Rpmdrake/gui.pm:107 ../Rpmdrake/gui.pm:152
+#: ../Rpmdrake/gui.pm:107
+#: ../Rpmdrake/gui.pm:152
 #, c-format
 msgid "%s KB"
 msgstr "%s KB"
 
-#: ../Rpmdrake/gui.pm:108 ../Rpmdrake/gui.pm:144 ../rpmdrake.pm:838
+#: ../Rpmdrake/gui.pm:108
+#: ../Rpmdrake/gui.pm:144
+#: ../rpmdrake.pm:838
 #, c-format
 msgid "Medium: "
 msgstr "媒體："
@@ -856,8 +931,11 @@ msgstr "媒體："
 msgid "Files:"
 msgstr "檔案 (_F)："
 
-#: ../Rpmdrake/gui.pm:118 ../Rpmdrake/gui.pm:123 ../Rpmdrake/gui.pm:137
-#: ../Rpmdrake/gui.pm:139 ../Rpmdrake/pkg.pm:136
+#: ../Rpmdrake/gui.pm:118
+#: ../Rpmdrake/gui.pm:123
+#: ../Rpmdrake/gui.pm:137
+#: ../Rpmdrake/gui.pm:139
+#: ../Rpmdrake/pkg.pm:136
 #, c-format
 msgid "(Not available)"
 msgstr "(無法使用)"
@@ -892,7 +970,9 @@ msgstr "摘要："
 msgid "Description: "
 msgstr "描述："
 
-#: ../Rpmdrake/gui.pm:359 ../Rpmdrake/pkg.pm:681 ../rpmdrake.pm:762
+#: ../Rpmdrake/gui.pm:359
+#: ../Rpmdrake/pkg.pm:681
+#: ../rpmdrake.pm:762
 #: ../rpmdrake.pm:877
 #, c-format
 msgid "Warning"
@@ -907,7 +987,9 @@ msgstr ""
 "「%s」套件在忽略清單中。\n"
 "您還是要選擇它嗎？"
 
-#: ../Rpmdrake/gui.pm:453 ../Rpmdrake/gui.pm:482 ../Rpmdrake/gui.pm:484
+#: ../Rpmdrake/gui.pm:453
+#: ../Rpmdrake/gui.pm:482
+#: ../Rpmdrake/gui.pm:484
 #, c-format
 msgid "More information on package..."
 msgstr "更多該套件的資訊..."
@@ -928,7 +1010,8 @@ msgid "One of the following packages is needed:"
 msgstr "需要下列套件之一："
 
 #. -PO: Keep it short, this is gonna be on a button
-#: ../Rpmdrake/gui.pm:462 ../Rpmdrake/gui.pm:467
+#: ../Rpmdrake/gui.pm:462
+#: ../Rpmdrake/gui.pm:467
 #, c-format
 msgid "More info"
 msgstr "更多資訊"
@@ -950,7 +1033,8 @@ msgid ""
 "removed:"
 msgstr "因為它們的相依性問題，以下的套件也需要移除： "
 
-#: ../Rpmdrake/gui.pm:509 ../Rpmdrake/gui.pm:518
+#: ../Rpmdrake/gui.pm:509
+#: ../Rpmdrake/gui.pm:518
 #, c-format
 msgid "Some packages can't be removed"
 msgstr "某些套件無法被移除"
@@ -964,7 +1048,8 @@ msgstr ""
 "移除下面這些套件將會破壞您的系統，抱歉：\n"
 "\n"
 
-#: ../Rpmdrake/gui.pm:519 ../Rpmdrake/gui.pm:586
+#: ../Rpmdrake/gui.pm:519
+#: ../Rpmdrake/gui.pm:586
 #, c-format
 msgid ""
 "Because of their dependencies, the following package(s) must be\n"
@@ -1026,7 +1111,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/gui.pm:585 ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/gui.pm:585
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Some packages need to be removed"
 msgstr "必須移除某些套件"
@@ -1062,12 +1148,14 @@ msgstr ""
 "\n"
 "您確定要安裝全部選取的套件嗎?"
 
-#: ../Rpmdrake/gui.pm:652 ../Rpmdrake/pkg.pm:250
+#: ../Rpmdrake/gui.pm:652
+#: ../Rpmdrake/pkg.pm:250
 #, c-format
 msgid "Fatal error"
 msgstr "致命的錯誤"
 
-#: ../Rpmdrake/gui.pm:653 ../Rpmdrake/pkg.pm:251
+#: ../Rpmdrake/gui.pm:653
+#: ../Rpmdrake/pkg.pm:251
 #, c-format
 msgid "A fatal error occurred: %s."
 msgstr "發生了一個致命的錯誤：%s。"
@@ -1082,17 +1170,20 @@ msgstr "排序套件中，請稍候..."
 msgid "No update"
 msgstr "無更新"
 
-#: ../Rpmdrake/gui.pm:713 ../rpmdrake:229
+#: ../Rpmdrake/gui.pm:713
+#: ../rpmdrake:229
 #, c-format
 msgid "All"
 msgstr "全部"
 
-#: ../Rpmdrake/gui.pm:722 ../rpmdrake:132
+#: ../Rpmdrake/gui.pm:722
+#: ../rpmdrake:132
 #, c-format
 msgid "Upgradable"
 msgstr "可供更新"
 
-#: ../Rpmdrake/gui.pm:722 ../rpmdrake:132
+#: ../Rpmdrake/gui.pm:722
+#: ../rpmdrake:132
 #, c-format
 msgid "Addable"
 msgstr "可供加入"
@@ -1107,8 +1198,11 @@ msgstr "這個套件沒有可用的說明\n"
 msgid "Accessibility"
 msgstr "輔助功能"
 
-#: ../Rpmdrake/icon.pm:36 ../Rpmdrake/icon.pm:37 ../Rpmdrake/icon.pm:38
-#: ../Rpmdrake/icon.pm:39 ../Rpmdrake/icon.pm:40
+#: ../Rpmdrake/icon.pm:36
+#: ../Rpmdrake/icon.pm:37
+#: ../Rpmdrake/icon.pm:38
+#: ../Rpmdrake/icon.pm:39
+#: ../Rpmdrake/icon.pm:40
 #, c-format
 msgid "Archiving"
 msgstr "歸檔"
@@ -1128,15 +1222,25 @@ msgstr "光碟燒錄"
 msgid "Compression"
 msgstr "壓縮"
 
-#: ../Rpmdrake/icon.pm:40 ../Rpmdrake/icon.pm:46 ../Rpmdrake/icon.pm:57
-#: ../Rpmdrake/icon.pm:71 ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:110
-#: ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:134 ../Rpmdrake/pkg.pm:77
+#: ../Rpmdrake/icon.pm:40
+#: ../Rpmdrake/icon.pm:46
+#: ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:71
+#: ../Rpmdrake/icon.pm:89
+#: ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/pkg.pm:77
 #, c-format
 msgid "Other"
 msgstr "其他"
 
-#: ../Rpmdrake/icon.pm:41 ../Rpmdrake/icon.pm:42 ../Rpmdrake/icon.pm:43
-#: ../Rpmdrake/icon.pm:44 ../Rpmdrake/icon.pm:45 ../Rpmdrake/icon.pm:46
+#: ../Rpmdrake/icon.pm:41
+#: ../Rpmdrake/icon.pm:42
+#: ../Rpmdrake/icon.pm:43
+#: ../Rpmdrake/icon.pm:44
+#: ../Rpmdrake/icon.pm:45
+#: ../Rpmdrake/icon.pm:46
 #, c-format
 msgid "Books"
 msgstr "書籍"
@@ -1166,16 +1270,27 @@ msgstr "文獻"
 msgid "Communications"
 msgstr "通訊"
 
-#: ../Rpmdrake/icon.pm:48 ../Rpmdrake/icon.pm:52
+#: ../Rpmdrake/icon.pm:48
+#: ../Rpmdrake/icon.pm:52
 #, c-format
 msgid "Databases"
 msgstr "資料庫"
 
-#: ../Rpmdrake/icon.pm:49 ../Rpmdrake/icon.pm:50 ../Rpmdrake/icon.pm:51
-#: ../Rpmdrake/icon.pm:52 ../Rpmdrake/icon.pm:53 ../Rpmdrake/icon.pm:54
-#: ../Rpmdrake/icon.pm:55 ../Rpmdrake/icon.pm:56 ../Rpmdrake/icon.pm:57
-#: ../Rpmdrake/icon.pm:58 ../Rpmdrake/icon.pm:59 ../Rpmdrake/icon.pm:60
-#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:172 ../Rpmdrake/icon.pm:173
+#: ../Rpmdrake/icon.pm:49
+#: ../Rpmdrake/icon.pm:50
+#: ../Rpmdrake/icon.pm:51
+#: ../Rpmdrake/icon.pm:52
+#: ../Rpmdrake/icon.pm:53
+#: ../Rpmdrake/icon.pm:54
+#: ../Rpmdrake/icon.pm:55
+#: ../Rpmdrake/icon.pm:56
+#: ../Rpmdrake/icon.pm:57
+#: ../Rpmdrake/icon.pm:58
+#: ../Rpmdrake/icon.pm:59
+#: ../Rpmdrake/icon.pm:60
+#: ../Rpmdrake/icon.pm:61
+#: ../Rpmdrake/icon.pm:172
+#: ../Rpmdrake/icon.pm:173
 #: ../Rpmdrake/icon.pm:174
 #, c-format
 msgid "Development"
@@ -1227,7 +1342,8 @@ msgid "Python"
 msgstr "Python"
 
 #. -PO: This is a package/product name. Only translate it if needed:
-#: ../Rpmdrake/icon.pm:61 ../Rpmdrake/icon.pm:149
+#: ../Rpmdrake/icon.pm:61
+#: ../Rpmdrake/icon.pm:149
 #, c-format
 msgid "X11"
 msgstr "X11"
@@ -1252,9 +1368,15 @@ msgstr "模擬器"
 msgid "File tools"
 msgstr "檔案工具"
 
-#: ../Rpmdrake/icon.pm:66 ../Rpmdrake/icon.pm:67 ../Rpmdrake/icon.pm:68
-#: ../Rpmdrake/icon.pm:69 ../Rpmdrake/icon.pm:70 ../Rpmdrake/icon.pm:71
-#: ../Rpmdrake/icon.pm:72 ../Rpmdrake/icon.pm:73 ../Rpmdrake/icon.pm:74
+#: ../Rpmdrake/icon.pm:66
+#: ../Rpmdrake/icon.pm:67
+#: ../Rpmdrake/icon.pm:68
+#: ../Rpmdrake/icon.pm:69
+#: ../Rpmdrake/icon.pm:70
+#: ../Rpmdrake/icon.pm:71
+#: ../Rpmdrake/icon.pm:72
+#: ../Rpmdrake/icon.pm:73
+#: ../Rpmdrake/icon.pm:74
 #, c-format
 msgid "Games"
 msgstr "遊戲"
@@ -1294,9 +1416,15 @@ msgstr "運動遊戲"
 msgid "Strategy"
 msgstr "戰略遊戲"
 
-#: ../Rpmdrake/icon.pm:75 ../Rpmdrake/icon.pm:76 ../Rpmdrake/icon.pm:79
-#: ../Rpmdrake/icon.pm:80 ../Rpmdrake/icon.pm:83 ../Rpmdrake/icon.pm:86
-#: ../Rpmdrake/icon.pm:89 ../Rpmdrake/icon.pm:90 ../Rpmdrake/icon.pm:93
+#: ../Rpmdrake/icon.pm:75
+#: ../Rpmdrake/icon.pm:76
+#: ../Rpmdrake/icon.pm:79
+#: ../Rpmdrake/icon.pm:80
+#: ../Rpmdrake/icon.pm:83
+#: ../Rpmdrake/icon.pm:86
+#: ../Rpmdrake/icon.pm:89
+#: ../Rpmdrake/icon.pm:90
+#: ../Rpmdrake/icon.pm:93
 #: ../Rpmdrake/icon.pm:96
 #, c-format
 msgid "Graphical desktop"
@@ -1359,20 +1487,29 @@ msgstr "圖形"
 msgid "Monitoring"
 msgstr "監視"
 
-#: ../Rpmdrake/icon.pm:101 ../Rpmdrake/icon.pm:102
+#: ../Rpmdrake/icon.pm:101
+#: ../Rpmdrake/icon.pm:102
 #, c-format
 msgid "Multimedia"
 msgstr "多媒體"
 
-#: ../Rpmdrake/icon.pm:102 ../Rpmdrake/icon.pm:153
+#: ../Rpmdrake/icon.pm:102
+#: ../Rpmdrake/icon.pm:153
 #, c-format
 msgid "Video"
 msgstr "視訊"
 
-#: ../Rpmdrake/icon.pm:103 ../Rpmdrake/icon.pm:104 ../Rpmdrake/icon.pm:105
-#: ../Rpmdrake/icon.pm:106 ../Rpmdrake/icon.pm:107 ../Rpmdrake/icon.pm:108
-#: ../Rpmdrake/icon.pm:109 ../Rpmdrake/icon.pm:110 ../Rpmdrake/icon.pm:111
-#: ../Rpmdrake/icon.pm:112 ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:103
+#: ../Rpmdrake/icon.pm:104
+#: ../Rpmdrake/icon.pm:105
+#: ../Rpmdrake/icon.pm:106
+#: ../Rpmdrake/icon.pm:107
+#: ../Rpmdrake/icon.pm:108
+#: ../Rpmdrake/icon.pm:109
+#: ../Rpmdrake/icon.pm:110
+#: ../Rpmdrake/icon.pm:111
+#: ../Rpmdrake/icon.pm:112
+#: ../Rpmdrake/icon.pm:133
 #, c-format
 msgid "Networking"
 msgstr "網路"
@@ -1397,7 +1534,8 @@ msgstr "IRC"
 msgid "Instant messaging"
 msgstr "即時通訊"
 
-#: ../Rpmdrake/icon.pm:108 ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:108
+#: ../Rpmdrake/icon.pm:179
 #, c-format
 msgid "Mail"
 msgstr "郵件"
@@ -1432,9 +1570,15 @@ msgstr "公鑰"
 msgid "Publishing"
 msgstr "出版"
 
-#: ../Rpmdrake/icon.pm:116 ../Rpmdrake/icon.pm:117 ../Rpmdrake/icon.pm:118
-#: ../Rpmdrake/icon.pm:119 ../Rpmdrake/icon.pm:120 ../Rpmdrake/icon.pm:121
-#: ../Rpmdrake/icon.pm:122 ../Rpmdrake/icon.pm:123 ../Rpmdrake/icon.pm:124
+#: ../Rpmdrake/icon.pm:116
+#: ../Rpmdrake/icon.pm:117
+#: ../Rpmdrake/icon.pm:118
+#: ../Rpmdrake/icon.pm:119
+#: ../Rpmdrake/icon.pm:120
+#: ../Rpmdrake/icon.pm:121
+#: ../Rpmdrake/icon.pm:122
+#: ../Rpmdrake/icon.pm:123
+#: ../Rpmdrake/icon.pm:124
 #, c-format
 msgid "Sciences"
 msgstr "科學"
@@ -1484,13 +1628,27 @@ msgstr "Shells"
 msgid "Sound"
 msgstr "音效"
 
-#: ../Rpmdrake/icon.pm:127 ../Rpmdrake/icon.pm:128 ../Rpmdrake/icon.pm:129
-#: ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132
-#: ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135
-#: ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:138
-#: ../Rpmdrake/icon.pm:139 ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141
-#: ../Rpmdrake/icon.pm:142 ../Rpmdrake/icon.pm:143 ../Rpmdrake/icon.pm:144
-#: ../Rpmdrake/icon.pm:145 ../Rpmdrake/icon.pm:146 ../Rpmdrake/icon.pm:147
+#: ../Rpmdrake/icon.pm:127
+#: ../Rpmdrake/icon.pm:128
+#: ../Rpmdrake/icon.pm:129
+#: ../Rpmdrake/icon.pm:130
+#: ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:132
+#: ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:135
+#: ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138
+#: ../Rpmdrake/icon.pm:139
+#: ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141
+#: ../Rpmdrake/icon.pm:142
+#: ../Rpmdrake/icon.pm:143
+#: ../Rpmdrake/icon.pm:144
+#: ../Rpmdrake/icon.pm:145
+#: ../Rpmdrake/icon.pm:146
+#: ../Rpmdrake/icon.pm:147
 #, c-format
 msgid "System"
 msgstr "系統"
@@ -1505,9 +1663,14 @@ msgstr "基本套件"
 msgid "Cluster"
 msgstr "叢集"
 
-#: ../Rpmdrake/icon.pm:130 ../Rpmdrake/icon.pm:131 ../Rpmdrake/icon.pm:132
-#: ../Rpmdrake/icon.pm:133 ../Rpmdrake/icon.pm:134 ../Rpmdrake/icon.pm:135
-#: ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:157
+#: ../Rpmdrake/icon.pm:130
+#: ../Rpmdrake/icon.pm:131
+#: ../Rpmdrake/icon.pm:132
+#: ../Rpmdrake/icon.pm:133
+#: ../Rpmdrake/icon.pm:134
+#: ../Rpmdrake/icon.pm:135
+#: ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:157
 #, c-format
 msgid "Configuration"
 msgstr "設定"
@@ -1527,13 +1690,17 @@ msgstr "硬體"
 msgid "Packaging"
 msgstr "包裝"
 
-#: ../Rpmdrake/icon.pm:136 ../Rpmdrake/icon.pm:145
+#: ../Rpmdrake/icon.pm:136
+#: ../Rpmdrake/icon.pm:145
 #, c-format
 msgid "Printing"
 msgstr "列印"
 
-#: ../Rpmdrake/icon.pm:137 ../Rpmdrake/icon.pm:138 ../Rpmdrake/icon.pm:139
-#: ../Rpmdrake/icon.pm:140 ../Rpmdrake/icon.pm:141
+#: ../Rpmdrake/icon.pm:137
+#: ../Rpmdrake/icon.pm:138
+#: ../Rpmdrake/icon.pm:139
+#: ../Rpmdrake/icon.pm:140
+#: ../Rpmdrake/icon.pm:141
 #, c-format
 msgid "Fonts"
 msgstr "字型"
@@ -1593,9 +1760,15 @@ msgstr "文字工具"
 msgid "Toys"
 msgstr "玩具"
 
-#: ../Rpmdrake/icon.pm:156 ../Rpmdrake/icon.pm:157 ../Rpmdrake/icon.pm:158
-#: ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:160 ../Rpmdrake/icon.pm:161
-#: ../Rpmdrake/icon.pm:162 ../Rpmdrake/icon.pm:163 ../Rpmdrake/icon.pm:164
+#: ../Rpmdrake/icon.pm:156
+#: ../Rpmdrake/icon.pm:157
+#: ../Rpmdrake/icon.pm:158
+#: ../Rpmdrake/icon.pm:159
+#: ../Rpmdrake/icon.pm:160
+#: ../Rpmdrake/icon.pm:161
+#: ../Rpmdrake/icon.pm:162
+#: ../Rpmdrake/icon.pm:163
+#: ../Rpmdrake/icon.pm:164
 #: ../Rpmdrake/icon.pm:165
 #, c-format
 msgid "Workstation"
@@ -1606,7 +1779,8 @@ msgstr "工作站"
 msgid "Console Tools"
 msgstr "Console 工具"
 
-#: ../Rpmdrake/icon.pm:159 ../Rpmdrake/icon.pm:174
+#: ../Rpmdrake/icon.pm:159
+#: ../Rpmdrake/icon.pm:174
 #, c-format
 msgid "Documentation"
 msgstr "文件檔案"
@@ -1641,8 +1815,11 @@ msgstr "辦公軟體平台"
 msgid "Scientific Workstation"
 msgstr "科學工作站"
 
-#: ../Rpmdrake/icon.pm:166 ../Rpmdrake/icon.pm:168 ../Rpmdrake/icon.pm:169
-#: ../Rpmdrake/icon.pm:170 ../Rpmdrake/icon.pm:171
+#: ../Rpmdrake/icon.pm:166
+#: ../Rpmdrake/icon.pm:168
+#: ../Rpmdrake/icon.pm:169
+#: ../Rpmdrake/icon.pm:170
+#: ../Rpmdrake/icon.pm:171
 #, c-format
 msgid "Graphical Environment"
 msgstr "圖形環境"
@@ -1667,9 +1844,14 @@ msgstr "KDE 工作站"
 msgid "Other Graphical Desktops"
 msgstr "其他圖型桌面軟體"
 
-#: ../Rpmdrake/icon.pm:175 ../Rpmdrake/icon.pm:176 ../Rpmdrake/icon.pm:177
-#: ../Rpmdrake/icon.pm:178 ../Rpmdrake/icon.pm:179 ../Rpmdrake/icon.pm:180
-#: ../Rpmdrake/icon.pm:181 ../Rpmdrake/icon.pm:182
+#: ../Rpmdrake/icon.pm:175
+#: ../Rpmdrake/icon.pm:176
+#: ../Rpmdrake/icon.pm:177
+#: ../Rpmdrake/icon.pm:178
+#: ../Rpmdrake/icon.pm:179
+#: ../Rpmdrake/icon.pm:180
+#: ../Rpmdrake/icon.pm:181
+#: ../Rpmdrake/icon.pm:182
 #, c-format
 msgid "Server"
 msgstr "伺服器"
@@ -1716,9 +1898,7 @@ msgstr ""
 
 #: ../Rpmdrake/init.pm:41
 #, c-format
-msgid ""
-"  --changelog-first      display changelog before filelist in the "
-"description window"
+msgid "  --changelog-first      display changelog before filelist in the description window"
 msgstr "  --changelog-first      在描述視窗中先顯示更新資訊再顯示檔案列表"
 
 #: ../Rpmdrake/init.pm:42
@@ -1728,8 +1908,7 @@ msgstr "  --media=medium1,..     限制於給定的媒體"
 
 #: ../Rpmdrake/init.pm:43
 #, c-format
-msgid ""
-"  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
+msgid "  --merge-all-rpmnew     propose to merge all .rpmnew/.rpmsave files found"
 msgstr "  --merge-all-rpmnew     計畫合併所有找到的 .rpmnew/.rpmsave 檔案"
 
 #: ../Rpmdrake/init.pm:44
@@ -1739,15 +1918,12 @@ msgstr "  --mode=MODE            設定模式 (install (預設值)、remove、up
 
 #: ../Rpmdrake/init.pm:45
 #, c-format
-msgid ""
-"  --justdb               update the database, but do not modify the "
-"filesystem"
+msgid "  --justdb               update the database, but do not modify the filesystem"
 msgstr ""
 
 #: ../Rpmdrake/init.pm:46
 #, c-format
-msgid ""
-"  --no-confirmation      don't ask first confirmation question in update mode"
+msgid "  --no-confirmation      don't ask first confirmation question in update mode"
 msgstr "  --no-confirmation      在升級模式時不詢問第一個確認問題"
 
 #: ../Rpmdrake/init.pm:47
@@ -1762,12 +1938,8 @@ msgstr "  --no-verify-rpm        不驗證套件簽章"
 
 #: ../Rpmdrake/init.pm:49
 #, c-format
-msgid ""
-"  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host"
-"\" machine to show needed deps"
-msgstr ""
-"  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host"
-"\" 主機名稱來顯示相依性"
+msgid "  --parallel=alias,host  be in parallel mode, use \"alias\" group, use \"host\" machine to show needed deps"
+msgstr "  --parallel=alias,host  在同步管理模式下，使用 \"alias\" 別名群組或 \"host\" 主機名稱來顯示相依性"
 
 #: ../Rpmdrake/init.pm:50
 #, c-format
@@ -1786,8 +1958,7 @@ msgstr ""
 
 #: ../Rpmdrake/init.pm:53
 #, c-format
-msgid ""
-"  --urpmi-root           use another root for urpmi db & rpm installation"
+msgid "  --urpmi-root           use another root for urpmi db & rpm installation"
 msgstr "  --urpmi-root          使用另一個根目錄進行 RPM 套件的安裝。"
 
 #: ../Rpmdrake/init.pm:54
@@ -1831,7 +2002,8 @@ msgstr ""
 "您無法對系統進行修改，\n"
 "但是您仍然可以瀏覽現存的資料庫。"
 
-#: ../Rpmdrake/init.pm:141 ../Rpmdrake/init.pm:166
+#: ../Rpmdrake/init.pm:141
+#: ../Rpmdrake/init.pm:166
 #, c-format
 msgid "Welcome"
 msgstr "歡迎使用"
@@ -1890,7 +2062,8 @@ msgstr "軟體安裝工具可以設定媒體來源。"
 msgid "Do you want to add media sources now?"
 msgstr "您確定要現在新增媒體來源嗎？"
 
-#: ../Rpmdrake/pkg.pm:194 ../Rpmdrake/pkg.pm:563
+#: ../Rpmdrake/pkg.pm:194
+#: ../Rpmdrake/pkg.pm:563
 #, c-format
 msgid "Confirmation"
 msgstr "確認"
@@ -1952,18 +2125,23 @@ msgstr ""
 "\n"
 "完成後，請重新啟動 %s。"
 
-#: ../Rpmdrake/pkg.pm:275 ../Rpmdrake/pkg.pm:578 ../Rpmdrake/pkg.pm:748
+#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:578
+#: ../Rpmdrake/pkg.pm:748
 #: ../rpmdrake.pm:334
 #, c-format
 msgid "Please wait"
 msgstr "請稍候"
 
-#: ../Rpmdrake/pkg.pm:275 ../Rpmdrake/pkg.pm:578
+#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:578
 #, c-format
 msgid "Package installation..."
 msgstr "套件安裝..."
 
-#: ../Rpmdrake/pkg.pm:275 ../Rpmdrake/pkg.pm:578 ../Rpmdrake/pkg.pm:748
+#: ../Rpmdrake/pkg.pm:275
+#: ../Rpmdrake/pkg.pm:578
+#: ../Rpmdrake/pkg.pm:748
 #, c-format
 msgid "Initializing..."
 msgstr "初始化中..."
@@ -1973,7 +2151,8 @@ msgstr "初始化中..."
 msgid "Reading updates description"
 msgstr "讀取更新描述"
 
-#: ../Rpmdrake/pkg.pm:291 ../Rpmdrake/pkg.pm:367
+#: ../Rpmdrake/pkg.pm:291
+#: ../Rpmdrake/pkg.pm:367
 #, c-format
 msgid "Please wait, finding available packages..."
 msgstr "請稍候，正在尋找可用的套件..."
@@ -2013,17 +2192,21 @@ msgstr "關於 %s 套件的升級資訊"
 msgid "Could not create temporary directory '%s'"
 msgstr "無法建立暫存目錄「%s」"
 
-#: ../Rpmdrake/pkg.pm:491 ../Rpmdrake/pkg.pm:725
+#: ../Rpmdrake/pkg.pm:491
+#: ../Rpmdrake/pkg.pm:725
 #, c-format
 msgid "All requested packages were installed successfully."
 msgstr "已經成功地安裝您要求的全部套件。"
 
-#: ../Rpmdrake/pkg.pm:495 ../Rpmdrake/pkg.pm:701
+#: ../Rpmdrake/pkg.pm:495
+#: ../Rpmdrake/pkg.pm:701
 #, c-format
 msgid "Problem during installation"
 msgstr "安裝時發生問題"
 
-#: ../Rpmdrake/pkg.pm:496 ../Rpmdrake/pkg.pm:515 ../Rpmdrake/pkg.pm:703
+#: ../Rpmdrake/pkg.pm:496
+#: ../Rpmdrake/pkg.pm:515
+#: ../Rpmdrake/pkg.pm:703
 #, c-format
 msgid ""
 "There was a problem during the installation:\n"
@@ -2034,7 +2217,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../Rpmdrake/pkg.pm:514 ../Rpmdrake/pkg.pm:691
+#: ../Rpmdrake/pkg.pm:514
+#: ../Rpmdrake/pkg.pm:691
 #, c-format
 msgid "Installation failed"
 msgstr "安裝失敗"
@@ -2049,7 +2233,8 @@ msgstr "無法取得來源套件。"
 msgid "Unable to get source packages, sorry. %s"
 msgstr "無法取得來源套件，抱歉。%s"
 
-#: ../Rpmdrake/pkg.pm:546 ../Rpmdrake/pkg.pm:694
+#: ../Rpmdrake/pkg.pm:546
+#: ../Rpmdrake/pkg.pm:694
 #, c-format
 msgid ""
 "\n"
@@ -2119,13 +2304,18 @@ msgstr "正在安裝套件 `%s' (%s/%s)..."
 msgid "Total: %s/%s"
 msgstr "總計：%s/%s"
 
-#: ../Rpmdrake/pkg.pm:623 ../Rpmdrake/pkg.pm:710 ../Rpmdrake/pkg.pm:730
-#: ../rpmdrake.pm:749 ../rpmdrake.pm:836 ../rpmdrake.pm:860
+#: ../Rpmdrake/pkg.pm:623
+#: ../Rpmdrake/pkg.pm:710
+#: ../Rpmdrake/pkg.pm:730
+#: ../rpmdrake.pm:749
+#: ../rpmdrake.pm:836
+#: ../rpmdrake.pm:860
 #, c-format
 msgid "Error"
 msgstr "錯誤"
 
-#: ../Rpmdrake/pkg.pm:628 ../Rpmdrake/pkg.pm:633
+#: ../Rpmdrake/pkg.pm:628
+#: ../Rpmdrake/pkg.pm:633
 #, c-format
 msgid "Downloading package `%s'..."
 msgstr "正在下載套件 `%s'..."
@@ -2191,7 +2381,8 @@ msgstr ""
 "有些設定檔被建立時以 `.rpmnew' 或 `.rpmsave' 命名，您\n"
 "現在可以檢查一下以確保它正常運作："
 
-#: ../Rpmdrake/pkg.pm:748 ../Rpmdrake/pkg.pm:764
+#: ../Rpmdrake/pkg.pm:748
+#: ../Rpmdrake/pkg.pm:764
 #, c-format
 msgid "Please wait, removing packages..."
 msgstr "正在移除套件，請稍候..."
@@ -2224,14 +2415,11 @@ msgstr "變更："
 
 #: ../Rpmdrake/rpmnew.pm:111
 #, c-format
-msgid ""
-"You can either remove the .%s file, use it as main file or do nothing. If "
-"unsure, keep the current file (\"%s\")."
-msgstr ""
-"您可以選擇移除 .%s 檔案，使用它作為主要檔案或者兩者皆否。若不確定，保留目前的"
-"檔案 (「%s」)。"
+msgid "You can either remove the .%s file, use it as main file or do nothing. If unsure, keep the current file (\"%s\")."
+msgstr "您可以選擇移除 .%s 檔案，使用它作為主要檔案或者兩者皆否。若不確定，保留目前的檔案 (「%s」)。"
 
-#: ../Rpmdrake/rpmnew.pm:112 ../Rpmdrake/rpmnew.pm:117
+#: ../Rpmdrake/rpmnew.pm:112
+#: ../Rpmdrake/rpmnew.pm:117
 #, c-format
 msgid "Remove .%s"
 msgstr "移除 .%s"
@@ -2256,7 +2444,8 @@ msgstr "安裝完成"
 msgid "Inspect..."
 msgstr "檢查..."
 
-#: ../Rpmdrake/rpmnew.pm:189 ../rpmdrake:68
+#: ../Rpmdrake/rpmnew.pm:189
+#: ../rpmdrake:68
 #, c-format
 msgid "Please wait, searching..."
 msgstr "搜尋中，請稍候..."
@@ -2301,7 +2490,8 @@ msgstr "成功的新增了媒體 %s。"
 msgid "Successfully added medium `%s'."
 msgstr "成功的新增了媒體 `%s'。"
 
-#: ../rpmdrake:56 ../rpmdrake:131
+#: ../rpmdrake:56
+#: ../rpmdrake:131
 #, c-format
 msgid "Search results"
 msgstr "搜尋結果"
@@ -2337,19 +2527,19 @@ msgid "Selected size: %d MB"
 msgstr "已選擇的大小：%d MB"
 
 #: ../rpmdrake:189
-#, fuzzy, c-format
+#, c-format
 msgid "Package"
-msgstr "包裝"
+msgstr "套件"
 
 #: ../rpmdrake:190
-#, fuzzy, c-format
+#, c-format
 msgid "Version"
-msgstr "版本："
+msgstr "版本"
 
 #: ../rpmdrake:191
-#, fuzzy, c-format
+#, c-format
 msgid "Arch"
-msgstr "歸檔"
+msgstr "硬體架構"
 
 #: ../rpmdrake:234
 #, c-format
@@ -2426,7 +2616,8 @@ msgstr "臭蟲修正更新"
 msgid "Normal updates"
 msgstr "一般更新"
 
-#: ../rpmdrake:300 ../rpmdrake:305
+#: ../rpmdrake:300
+#: ../rpmdrake:305
 #, c-format
 msgid "in names"
 msgstr "依名稱"
@@ -2449,7 +2640,7 @@ msgstr "依檔案名稱"
 #: ../rpmdrake:344
 #, c-format
 msgid "/_Select dependencies without asking"
-msgstr ""
+msgstr "/選擇相依套件而不詢問 (_S)"
 
 #: ../rpmdrake:345
 #, c-format
@@ -2476,7 +2667,8 @@ msgstr "/重新載入套件清單 (_P)"
 msgid "/_Media Manager"
 msgstr "/軟體套件媒體管理程式 (_M)"
 
-#: ../rpmdrake:380 ../rpmdrake:419
+#: ../rpmdrake:380
+#: ../rpmdrake:419
 #, c-format
 msgid "/_Show automatically selected packages"
 msgstr "/顯示自動選取的套件 (_S)"
@@ -2513,8 +2705,7 @@ msgstr "您可以藉由左側的分類樹來瀏覽軟體套件。"
 
 #: ../rpmdrake:487
 #, c-format
-msgid ""
-"You can view information about a package by clicking on it on the right list."
+msgid "You can view information about a package by clicking on it on the right list."
 msgstr "您可以藉由點擊右側清單中的軟體套件來看到它的資訊。"
 
 #: ../rpmdrake:488
@@ -2547,7 +2738,8 @@ msgstr "用戶名稱："
 msgid "Software Packages Removal"
 msgstr "軟體套件移除"
 
-#: ../rpmdrake.pm:191 ../rpmdrake.pm:195
+#: ../rpmdrake.pm:191
+#: ../rpmdrake.pm:195
 #, c-format
 msgid "Software Packages Update"
 msgstr "軟體套件升級"
@@ -2622,7 +2814,8 @@ msgstr "德國"
 msgid "Danmark"
 msgstr "丹麥"
 
-#: ../rpmdrake.pm:423 ../rpmdrake.pm:427
+#: ../rpmdrake.pm:423
+#: ../rpmdrake.pm:427
 #, c-format
 msgid "Greece"
 msgstr "希臘"
@@ -2722,7 +2915,10 @@ msgstr "英國"
 msgid "China"
 msgstr "中國"
 
-#: ../rpmdrake.pm:444 ../rpmdrake.pm:445 ../rpmdrake.pm:446 ../rpmdrake.pm:447
+#: ../rpmdrake.pm:444
+#: ../rpmdrake.pm:445
+#: ../rpmdrake.pm:446
+#: ../rpmdrake.pm:447
 #, c-format
 msgid "United States"
 msgstr "美國"
@@ -2753,7 +2949,8 @@ msgstr ""
 "\n"
 "您要繼續嗎？"
 
-#: ../rpmdrake.pm:555 ../rpmdrake.pm:593
+#: ../rpmdrake.pm:555
+#: ../rpmdrake.pm:593
 #, c-format
 msgid "Mirror choice"
 msgstr "映射站台選擇"
@@ -2893,8 +3090,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 ""
@@ -2909,8 +3105,7 @@ msgstr "更新媒體"
 
 #: ../rpmdrake.pm:762
 #, c-format
-msgid ""
-"No active medium found. You must enable some media to be able to update them."
+msgid "No active medium found. You must enable some media to be able to update them."
 msgstr "找不到有作用的媒體。您必須啟動這些媒體後才能進行更新。"
 
 #: ../rpmdrake.pm:769
@@ -2931,7 +3126,8 @@ msgstr ""
 "錯誤：\n"
 "%s"
 
-#: ../rpmdrake.pm:837 ../rpmdrake.pm:848
+#: ../rpmdrake.pm:837
+#: ../rpmdrake.pm:848
 #, c-format
 msgid ""
 "Unable to add medium, errors reported:\n"
@@ -2966,8 +3162,7 @@ msgstr ""
 #: ../rpmdrake.pm:879
 #, 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"
@@ -2976,8 +3171,7 @@ msgstr ""
 #: ../rpmdrake.pm:882
 #, 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"
@@ -2990,8 +3184,7 @@ msgstr "於背景啟動說明"
 
 #: ../rpmdrake.pm:900
 #, 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
@@ -3273,34 +3466,26 @@ msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
 #: mime/gurpmi.addmedia.desktop.in.h:1
-#, fuzzy
 msgid "Add urpmi media"
-msgstr "/新增媒體 (_A)"
+msgstr "新增 urpmi 媒體"
 
 #: mime/x-urpmi-media.desktop.in.h:1
-#, fuzzy
 msgid "Urpmi medium info"
-msgstr "更新媒體"
+msgstr "Urpmi 媒體資訊"
 
 #, fuzzy
 #~ msgid "/_Automatically resolve queries"
 #~ msgstr "/顯示自動選取的套件 (_S)"
-
 #~ msgid "/_Auto solve dependancies"
 #~ msgstr "/自動處理相依性 (_A)"
-
 #~ msgid "Path:"
 #~ msgstr "路徑："
-
 #~ msgid "Name:"
 #~ msgstr "名稱："
-
 #~ msgid "Add custom..."
 #~ msgstr "新增自訂..."
-
 #~ msgid "Update..."
 #~ msgstr "更新..."
-
 #~ msgid ""
 #~ "The following packages have bad signatures:\n"
 #~ "\n"
@@ -3313,50 +3498,36 @@ msgstr "更新媒體"
 #~ "%s\n"
 #~ "\n"
 #~ "您要繼續安裝嗎？"
-
 #~ msgid "installing %s from %s"
 #~ msgstr "正在由 %2$s 安裝 %1$s"
-
 #~ msgid "installing %s"
 #~ msgstr "正在安裝 %s"
-
 #~ msgid "removing %s"
 #~ msgstr "正在移除 %s"
-
 #~ msgid "Installation failed:"
 #~ msgstr "安裝失敗；"
-
 #~ msgid "Try installation without checking dependencies? (y/N) "
 #~ msgstr "嘗試不檢查相依性直接安裝？ (y/N)(是/否)"
-
 #~ msgid "Try harder to install (--force)? (y/N) "
 #~ msgstr "嘗試採用強制安裝的方式 (--force)？ (y/N)(是/否)"
-
 #~ msgid "Preparing..."
 #~ msgstr "準備中..."
-
 #~ msgid "Message Passing"
 #~ msgstr "傳遞訊息中"
-
 #~ msgid "Queueing Services"
 #~ msgstr "查詢服務"
-
 #~ msgid "Deploiement"
 #~ msgstr "部署"
-
 #~ msgid "Deployment"
 #~ msgstr "部署"
-
 #~ msgid "Add a key..."
 #~ msgstr "新增一把鑰匙..."
-
 #~ msgid "Remove key"
 #~ msgstr "移除鑰匙"
 
 #, fuzzy
 #~ msgid "  --version              output version information and exit"
 #~ msgstr "  --root                 強制使用 root 來執行"
-
 #~ msgid "unable to access rpm file [%s]"
 #~ msgstr "無法存取 rpm 檔案 [%s]"
 
@@ -3371,30 +3542,22 @@ msgstr "更新媒體"
 #~ msgstr[0] ""
 #~ "為了滿足相依性的需求，下面的 %d 個套件也必須一併安裝：\n"
 #~ "%s\n"
-
 #~ msgid "Please wait, reading packages database..."
 #~ msgstr "正在讀取套件資料庫，請稍候..."
-
 #~ msgid "XFree86"
 #~ msgstr "XFree86"
-
 #~ msgid "No package found for installation."
 #~ msgstr "沒有找到可供安裝的套件。"
-
 #~ msgid "All packages, by medium repository"
 #~ msgstr "全部套件，依媒體分類"
-
 #~ msgid "Maximum information"
 #~ msgstr "詳細資訊"
-
 #~ msgid "everything was installed correctly"
 #~ msgstr "所有項目都已經正確的安裝了"
-
 #~ msgid "Regenerate hdlist"
 #~ msgstr "重新產生 hdlist"
-
 #~ msgid "Please wait, generating hdlist..."
 #~ msgstr "請稍候，正在產生 hdlist..."
-
 #~ msgid "Everything installed successfully"
 #~ msgstr "所有項目安裝成功"
+