sync with code

1 files changed, 225 insertions, 212 deletions

diff --git a/perl-install/standalone/po/zh_TW.po b/perl-install/standalone/po/zh_TW.po
index 123286edd..598220f21 100644
--- a/perl-install/standalone/po/zh_TW.po
+++ b/perl-install/standalone/po/zh_TW.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-16 11:41+0100\n"
+"POT-Creation-Date: 2009-02-13 16:30+0100\n"
 "PO-Revision-Date: 2008-09-28 12:21+0800\n"
 "Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
 "Language-Team: Traditional Chinese <zh@li.org>\n"
@@ -28,14 +28,14 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
 
-#: drakauth:24 drakauth:26 draksec:291 draksec:340
+#: drakauth:24 drakauth:26 draksec:163
 #, c-format
 msgid "Authentication"
 msgstr "認證方式"
 
-#: drakauth:37 drakclock:111 drakclock:125 drakfont:213 drakfont:226
-#: drakfont:264 draksplash:202 finish-install:119 logdrake:170 logdrake:445
-#: logdrake:450 scannerdrake:59 scannerdrake:101 scannerdrake:142
+#: drakauth:37 drakclock:111 drakclock:125 drakdvb:72 drakfont:213
+#: drakfont:226 drakfont:264 draksplash:202 finish-install:119 logdrake:170
+#: logdrake:445 logdrake:450 scannerdrake:59 scannerdrake:101 scannerdrake:142
 #: scannerdrake:200 scannerdrake:259 scannerdrake:729 scannerdrake:740
 #: scannerdrake:879 scannerdrake:890 scannerdrake:960
 #, c-format
@@ -77,8 +77,8 @@ msgstr "顯示詳細訊息"
 msgid "Silent"
 msgstr "隱藏訊息"
 
-#: drakboot:137 drakbug:254 drakfont:682 drakperm:376 drakperm:386 drakups:27
-#: harddrake2:516 localedrake:43 notify-x11-free-driver-switch:15
+#: drakboot:137 drakbug:254 drakdvb:57 drakfont:682 drakperm:376 drakperm:386
+#: drakups:27 harddrake2:516 localedrake:43 notify-x11-free-driver-switch:15
 #: scannerdrake:51 scannerdrake:54 scannerdrake:297 scannerdrake:302
 #: scannerdrake:954
 #, c-format
@@ -316,7 +316,7 @@ msgstr "您應該安裝下列套件： %s"
 msgid "Please describe what you were doing when it crashed:"
 msgstr "請描述當它崩潰的時候您正在作什麼："
 
-#: drakbug:185 drakperm:136 draksec:450 draksec:452 draksec:471 draksec:473
+#: drakbug:185 drakperm:136
 #, c-format
 msgid "Help"
 msgstr "說明"
@@ -355,7 +355,7 @@ msgstr ""
 msgid "Thanks."
 msgstr "感謝。"
 
-#: drakclock:30 draksec:346
+#: drakclock:30 draksec:169
 #, c-format
 msgid "Date, Clock & Time Zone Settings"
 msgstr "日期、時間與時區設定"
@@ -429,7 +429,7 @@ msgstr "請輸入一個合法的 NTP 伺服器位址。"
 msgid "Could not synchronize with %s."
 msgstr "無法與 %s 同步。"
 
-#: drakclock:127 draksplash:125 logdrake:175 scannerdrake:491
+#: drakclock:127 drakdvb:122 draksplash:125 logdrake:175 scannerdrake:491
 #, c-format
 msgid "Quit"
 msgstr "離開"
@@ -444,6 +444,54 @@ msgstr "重試"
 msgid "Reset"
 msgstr "重設"
 
+#: drakdvb:30
+#, fuzzy, c-format
+msgid "DVB"
+msgstr "DVD"
+
+#: drakdvb:39 harddrake2:100
+#, c-format
+msgid "Channel"
+msgstr "取消"
+
+#: drakdvb:57
+#, c-format
+msgid "%s already exists and its contents will be lost"
+msgstr ""
+
+#: drakdvb:72
+#, c-format
+msgid "Could not get the list of available channels"
+msgstr ""
+
+#: drakdvb:78 draksec:73 drakups:99 harddrake2:370 scannerdrake:66
+#: scannerdrake:70 scannerdrake:78 scannerdrake:319 scannerdrake:368
+#: scannerdrake:504 scannerdrake:508 scannerdrake:530 service_harddrake:264
+#, c-format
+msgid "Please wait"
+msgstr "請稍候"
+
+#: drakdvb:82
+#, c-format
+msgid "Detecting DVB channels, this will take a few minutes"
+msgstr ""
+
+#: drakdvb:83 drakfont:572 drakfont:652 drakfont:736 draksplash:213
+#: drakups:217 logdrake:175
+#, c-format
+msgid "Cancel"
+msgstr "取消"
+
+#: drakdvb:121
+#, fuzzy, c-format
+msgid "Detect Channels"
+msgstr "取消"
+
+#: drakdvb:123
+#, fuzzy, c-format
+msgid "View Channel"
+msgstr "取消"
+
 #: drakedm:41
 #, c-format
 msgid "GDM (GNOME Display Manager)"
@@ -702,18 +750,12 @@ msgstr "選取字型檔案或目錄並點選 '加入'"
 msgid "File Selection"
 msgstr "檔案選取"
 
-#: drakfont:572 drakfont:652 drakfont:736 draksplash:213 drakups:217
-#: logdrake:175
-#, c-format
-msgid "Cancel"
-msgstr "取消"
-
 #: drakfont:576
 #, c-format
 msgid "Fonts"
 msgstr "字型"
 
-#: drakfont:640 draksec:342
+#: drakfont:640 draksec:165
 #, c-format
 msgid "Import fonts"
 msgstr "匯入字型"
@@ -738,12 +780,12 @@ msgstr "安裝"
 msgid "Are you sure you want to uninstall the following fonts?"
 msgstr "您確定您要移除下列的字型？"
 
-#: drakfont:688 draksec:59 harddrake2:324
+#: drakfont:688 draksec:60 harddrake2:324
 #, c-format
 msgid "Yes"
 msgstr "是的"
 
-#: drakfont:690 draksec:58 harddrake2:325
+#: drakfont:690 draksec:59 harddrake2:325
 #, c-format
 msgid "No"
 msgstr "否"
@@ -882,7 +924,7 @@ msgstr "使用者"
 msgid "Group"
 msgstr "群組"
 
-#: drakperm:50 drakperm:109 drakperm:332
+#: drakperm:50 drakperm:109 drakperm:332 draksec:180
 #, c-format
 msgid "Permissions"
 msgstr "權限"
@@ -1107,323 +1149,171 @@ msgstr "使用者：%s"
 msgid "Group: %s"
 msgstr "群組：%s"
 
-#: draksec:53
+#: draksec:54
 #, c-format
 msgid "ALL"
 msgstr "全部"
 
-#: draksec:54
+#: draksec:55
 #, c-format
 msgid "LOCAL"
 msgstr "本地端"
 
-#: draksec:55
+#: draksec:56
 #, c-format
 msgid "NONE"
 msgstr "無"
 
-#: draksec:56
+#: draksec:57
 #, c-format
 msgid "Default"
 msgstr "預設"
 
-#: draksec:57
+#: draksec:58
 #, c-format
 msgid "Ignore"
 msgstr "忽略"
 
-#: draksec:72 drakups:99 harddrake2:370 scannerdrake:66 scannerdrake:70
-#: scannerdrake:78 scannerdrake:319 scannerdrake:368 scannerdrake:504
-#: scannerdrake:508 scannerdrake:530 service_harddrake:264
-#, c-format
-msgid "Please wait"
-msgstr "請稍候"
-
-#. -PO: Do not alter the <span ..> and </span> tags.
-#. -PO: Translate the security levels (Poor, Standard, High, Higher and Paranoid) in the same way, you translated these individuals words.
-#. -PO: keep the double empty lines between sections, this is formatted a la LaTeX.
-#: draksec:93
-#, c-format
-msgid ""
-"Here, you can setup the security level and administrator of your machine.\n"
-"\n"
-"\n"
-"The '<span weight=\"bold\">Security Administrator</span>' is the one who "
-"will receive security alerts if the\n"
-"'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
-"username or an email.\n"
-"\n"
-"\n"
-"The '<span weight=\"bold\">Security Level</span>' menu allows you to select "
-"one of the six preconfigured security levels\n"
-"provided with msec. These levels range from '<span weight=\"bold\">poor</"
-"span>' security and ease of use, to\n"
-"'<span weight=\"bold\">paranoid</span>' config, suitable for very sensitive "
-"server applications:\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
-"very\n"
-"easy to use security level. It should only be used for machines not "
-"connected to\n"
-"any network and that are not accessible to everybody.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Standard</span>: This is the standard "
-"security\n"
-"recommended for a computer that will be used to connect to the Internet as "
-"a\n"
-"client.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">High</span>: There are already some\n"
-"restrictions, and more automatic checks are run every night.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Higher</span>: The security is now high "
-"enough\n"
-"to use the system as a server which can accept connections from many "
-"clients. If\n"
-"your machine is only a client on the Internet, you should choose a lower "
-"level.\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
-"previous\n"
-"level, but the system is entirely closed and security features are at their\n"
-"maximum"
-msgstr ""
-"在這裡，您可以設定您電腦的安全層級以及安全性管理者。\n"
-"\n"
-"\n"
-"所謂的 '<span weight=\"bold\">安全性管理者</span>' 是當\n"
-"'<span weight=\"bold\">安全警示</span>' 項目啟用後會收到安全警示的人。他可以"
-"是個使用者名稱或者電子郵件信箱。\n"
-"\n"
-"\n"
-"而 '<span weight=\"bold\">安全層級</span>' 選單則允許您從六個 msec 預先設定好"
-"的安全層級中挑一個來使用。\n"
-"它們的範圍從 '<span weight=\"bold\">鬆散</span>' 的安全性卻容易使用，到\n"
-"'<span weight=\"bold\">偏執</span>' 的設定，適合用於非常敏感的伺服器應用：\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">鬆散</span>：這是個完全不安全但卻非常容易使用"
-"的安全層級。\n"
-"它只應該供那些不連線到任何網路，也因此無法讓任何人連線到的機器所使用。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">標準</span>：這是建議用於聯結到網路上作為客戶"
-"端電腦的標準安全層級。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">高</span>：有一些安全性限制，以及更多每晚自動"
-"執行的檢查。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">更高</span>：這個安全層級已經讓這個系統足夠擔"
-"負一個\n"
-"接受眾多客戶端連線的伺服器之責任。\n"
-"如果您的機器只是網路上的客戶端，您應該選擇一個低一點的層級。\n"
-"\n"
-"\n"
-"<span foreground=\"royalblue3\">偏執</span>：這與前一個等級類似，但系統是完全"
-"封閉且安全性\n"
-"功能都在最嚴密的程度。"
-
-#: draksec:147 harddrake2:214
-#, c-format
-msgid ""
-"Description of the fields:\n"
-"\n"
-msgstr ""
-"欄位的描述資訊：\n"
-"\n"
-
-#: draksec:161
-#, c-format
-msgid "(default value: %s)"
-msgstr "(預設值：%s)"
-
-#: draksec:166
+#: draksec:91
 #, c-format
 msgid "Security Level and Checks"
 msgstr "安全層級與檢查"
 
-#: draksec:203
+#: draksec:114
 #, c-format
-msgid "Security Level:"
-msgstr "安全層級："
-
-#: draksec:206
-#, c-format
-msgid "Security Alerts:"
-msgstr "安全警示："
-
-#: draksec:210
-#, c-format
-msgid "Security Administrator:"
-msgstr "安全性管理者："
-
-#: draksec:212
-#, c-format
-msgid "Basic options"
-msgstr "基本選項"
-
-#: draksec:226
-#, c-format
-msgid "Network Options"
-msgstr "網路選項"
-
-#: draksec:226
-#, c-format
-msgid "System Options"
-msgstr "系統選項"
-
-#: draksec:269
-#, c-format
-msgid "Periodic Checks"
-msgstr "週期性檢查"
+msgid "Configure authentication required to access Mandriva tools"
+msgstr ""
 
-#: draksec:294
+#: draksec:117
 #, c-format
 msgid "No password"
 msgstr "沒有密碼"
 
-#: draksec:295
+#: draksec:118
 #, c-format
 msgid "Root password"
 msgstr "Root 密碼"
 
-#: draksec:296
+#: draksec:119
 #, c-format
 msgid "User password"
 msgstr "使用者密碼"
 
-#: draksec:326 draksec:372
+#: draksec:149 draksec:203
 #, c-format
 msgid "Software Management"
 msgstr "軟體管理"
 
-#: draksec:327
+#: draksec:150
 #, c-format
 msgid "Mandriva Update"
 msgstr "Mandriva 更新"
 
-#: draksec:328
+#: draksec:151
 #, c-format
 msgid "Software Media Manager"
 msgstr "軟體套件媒體管理員"
 
-#: draksec:329
+#: draksec:152
 #, c-format
 msgid "Configure 3D Desktop effects"
 msgstr "設定 3D 桌面效果"
 
-#: draksec:330
+#: draksec:153
 #, c-format
 msgid "Graphical Server Configuration"
 msgstr "圖形伺服器組態設定"
 
-#: draksec:331
+#: draksec:154
 #, c-format
 msgid "Mouse Configuration"
 msgstr "滑鼠組態設定"
 
-#: draksec:332
+#: draksec:155
 #, c-format
 msgid "Keyboard Configuration"
 msgstr "鍵盤組態設定"
 
-#: draksec:333
+#: draksec:156
 #, c-format
 msgid "UPS Configuration"
 msgstr "UPS 組態設定"
 
-#: draksec:334
+#: draksec:157
 #, c-format
 msgid "Network Configuration"
 msgstr "網路組態設定"
 
-#: draksec:335
+#: draksec:158
 #, c-format
 msgid "Hosts definitions"
 msgstr "主機定義"
 
-#: draksec:336
+#: draksec:159
 #, c-format
 msgid "Network Center"
 msgstr "網路中心"
 
-#: draksec:337
+#: draksec:160
 #, c-format
 msgid "VPN"
 msgstr "VPN"
 
-#: draksec:338
+#: draksec:161
 #, c-format
 msgid "Proxy Configuration"
 msgstr "Proxy 組態設定"
 
-#: draksec:339
+#: draksec:162
 #, c-format
 msgid "Connection Sharing"
 msgstr "連線共享"
 
-#: draksec:341
+#: draksec:164
 #, c-format
 msgid "Backups"
 msgstr "備份"
 
-#: draksec:343 logdrake:52
+#: draksec:166 logdrake:52
 #, c-format
 msgid "Logs"
 msgstr "日誌記錄"
 
-#: draksec:344
+#: draksec:167
 #, c-format
 msgid "Services"
 msgstr "服務"
 
-#: draksec:345
+#: draksec:168
 #, c-format
 msgid "Users"
 msgstr "使用者"
 
-#: draksec:347
+#: draksec:170
 #, c-format
 msgid "Boot Configuration"
 msgstr "開機組態設定"
 
-#: draksec:373
+#: draksec:204
 #, c-format
 msgid "Hardware"
 msgstr "硬體"
 
-#: draksec:374
+#: draksec:205
 #, c-format
 msgid "Network"
 msgstr "網路"
 
-#: draksec:375
+#: draksec:206
 #, c-format
 msgid "System"
 msgstr "系統"
 
-#: draksec:376
+#: draksec:207
 #, c-format
 msgid "Boot"
 msgstr "開機"
 
-#: draksec:401
-#, c-format
-msgid "Please wait, setting security level..."
-msgstr "請稍候，正在設定安全層級..."
-
-#: draksec:407
-#, c-format
-msgid "Please wait, setting security options..."
-msgstr "請稍後，正在設定安全選項..."
-
 #: draksound:48
 #, c-format
 msgid "No Sound Card detected!"
@@ -2394,11 +2284,6 @@ msgstr "這個磁碟機所支援的軟碟格式"
 
 #: harddrake2:100
 #, c-format
-msgid "Channel"
-msgstr "取消"
-
-#: harddrake2:100
-#, c-format
 msgid "EIDE/SCSI channel"
 msgstr "EIDE/SCSI 通道"
 
@@ -2626,6 +2511,15 @@ msgstr "/欄位的描述資訊 (_F)"
 msgid "Harddrake help"
 msgstr "Harddrake 說明"
 
+#: harddrake2:214
+#, c-format
+msgid ""
+"Description of the fields:\n"
+"\n"
+msgstr ""
+"欄位的描述資訊：\n"
+"\n"
+
 #: harddrake2:222
 #, c-format
 msgid "Select a device!"
@@ -3635,6 +3529,125 @@ msgstr "語言與國家設定"
 msgid "Regional Settings"
 msgstr "區域設定"
 
+#~ msgid ""
+#~ "Here, you can setup the security level and administrator of your "
+#~ "machine.\n"
+#~ "\n"
+#~ "\n"
+#~ "The '<span weight=\"bold\">Security Administrator</span>' is the one who "
+#~ "will receive security alerts if the\n"
+#~ "'<span weight=\"bold\">Security Alerts</span>' option is set. It can be a "
+#~ "username or an email.\n"
+#~ "\n"
+#~ "\n"
+#~ "The '<span weight=\"bold\">Security Level</span>' menu allows you to "
+#~ "select one of the six preconfigured security levels\n"
+#~ "provided with msec. These levels range from '<span weight=\"bold\">poor</"
+#~ "span>' security and ease of use, to\n"
+#~ "'<span weight=\"bold\">paranoid</span>' config, suitable for very "
+#~ "sensitive server applications:\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Poor</span>: This is a totally unsafe but "
+#~ "very\n"
+#~ "easy to use security level. It should only be used for machines not "
+#~ "connected to\n"
+#~ "any network and that are not accessible to everybody.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Standard</span>: This is the standard "
+#~ "security\n"
+#~ "recommended for a computer that will be used to connect to the Internet "
+#~ "as a\n"
+#~ "client.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">High</span>: There are already some\n"
+#~ "restrictions, and more automatic checks are run every night.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Higher</span>: The security is now high "
+#~ "enough\n"
+#~ "to use the system as a server which can accept connections from many "
+#~ "clients. If\n"
+#~ "your machine is only a client on the Internet, you should choose a lower "
+#~ "level.\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">Paranoid</span>: This is similar to the "
+#~ "previous\n"
+#~ "level, but the system is entirely closed and security features are at "
+#~ "their\n"
+#~ "maximum"
+#~ msgstr ""
+#~ "在這裡，您可以設定您電腦的安全層級以及安全性管理者。\n"
+#~ "\n"
+#~ "\n"
+#~ "所謂的 '<span weight=\"bold\">安全性管理者</span>' 是當\n"
+#~ "'<span weight=\"bold\">安全警示</span>' 項目啟用後會收到安全警示的人。他可"
+#~ "以是個使用者名稱或者電子郵件信箱。\n"
+#~ "\n"
+#~ "\n"
+#~ "而 '<span weight=\"bold\">安全層級</span>' 選單則允許您從六個 msec 預先設"
+#~ "定好的安全層級中挑一個來使用。\n"
+#~ "它們的範圍從 '<span weight=\"bold\">鬆散</span>' 的安全性卻容易使用，到\n"
+#~ "'<span weight=\"bold\">偏執</span>' 的設定，適合用於非常敏感的伺服器應"
+#~ "用：\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">鬆散</span>：這是個完全不安全但卻非常容易"
+#~ "使用的安全層級。\n"
+#~ "它只應該供那些不連線到任何網路，也因此無法讓任何人連線到的機器所使用。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">標準</span>：這是建議用於聯結到網路上作為"
+#~ "客戶端電腦的標準安全層級。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">高</span>：有一些安全性限制，以及更多每晚"
+#~ "自動執行的檢查。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">更高</span>：這個安全層級已經讓這個系統足"
+#~ "夠擔負一個\n"
+#~ "接受眾多客戶端連線的伺服器之責任。\n"
+#~ "如果您的機器只是網路上的客戶端，您應該選擇一個低一點的層級。\n"
+#~ "\n"
+#~ "\n"
+#~ "<span foreground=\"royalblue3\">偏執</span>：這與前一個等級類似，但系統是"
+#~ "完全封閉且安全性\n"
+#~ "功能都在最嚴密的程度。"
+
+#~ msgid "(default value: %s)"
+#~ msgstr "(預設值：%s)"
+
+#~ msgid "Security Level:"
+#~ msgstr "安全層級："
+
+#~ msgid "Security Alerts:"
+#~ msgstr "安全警示："
+
+#~ msgid "Security Administrator:"
+#~ msgstr "安全性管理者："
+
+#~ msgid "Basic options"
+#~ msgstr "基本選項"
+
+#~ msgid "Network Options"
+#~ msgstr "網路選項"
+
+#~ msgid "System Options"
+#~ msgstr "系統選項"
+
+#~ msgid "Periodic Checks"
+#~ msgstr "週期性檢查"
+
+#~ msgid "Please wait, setting security level..."
+#~ msgstr "請稍候，正在設定安全層級..."
+
+#~ msgid "Please wait, setting security options..."
+#~ msgstr "請稍後，正在設定安全選項..."
+
 #, fuzzy
 #~ msgid ""
 #~ "The following localization packages do not seem to be useful for your "