merge

1 files changed, 139 insertions, 134 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 91a2ac7c..9dfe3766 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drakconf-zh_TW\n"
-"POT-Creation-Date: 2004-01-05 23:26+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-01-08 11:58+0000\n"
 "PO-Revision-Date: 2003-12-28 01:14+0800\n"
 "Last-Translator: Hilbert <freehil@yahoo.com>\n"
 "Language-Team: Chinese Traditional <zh@li.org>\n"
@@ -158,379 +159,379 @@ msgstr "Warly"
 msgid "bootsplash, databases, drakwizard, various other stuffs."
 msgstr "bootsplash, databases, drakwizard, various other stuffs."
 
-#: ../control-center_.c:79
+#: ../control-center_.c:78
 msgid "Mandrake Control Center"
 msgstr "Mandrake 控制中心"
 
-#: ../control-center_.c:84
+#: ../control-center_.c:83
 msgid "Loading... Please wait"
 msgstr "準備中... 請稍候..."
 
-#: ../control-center_.c:108
+#: ../control-center_.c:104
 #, fuzzy
 msgid "Auto Install floppy"
 msgstr "自動安裝"
 
-#: ../control-center_.c:109
+#: ../control-center_.c:105
 msgid "Autologin"
 msgstr ""
 
-#: ../control-center_.c:110
+#: ../control-center_.c:106
 msgid "Backups"
 msgstr "備份"
 
-#: ../control-center_.c:111
+#: ../control-center_.c:107
 msgid "Bootstrapping"
 msgstr ""
 
-#: ../control-center_.c:112
+#: ../control-center_.c:108
 msgid "Boot floppy"
 msgstr ""
 
-#: ../control-center_.c:113
+#: ../control-center_.c:109
 #, fuzzy
 msgid "Internet connection sharing"
 msgstr "監視連線"
 
-#: ../control-center_.c:114
+#: ../control-center_.c:110
 #, fuzzy
 msgid "New connection"
 msgstr "移除一連線"
 
-#: ../control-center_.c:115
+#: ../control-center_.c:111
 #, fuzzy
 msgid "Manage connections"
 msgstr "管理存在的連線"
 
-#: ../control-center_.c:116
+#: ../control-center_.c:112
 msgid "Monitor connections"
 msgstr "監視連線"
 
-#: ../control-center_.c:117
+#: ../control-center_.c:113
 #, fuzzy
 msgid "Internet access"
 msgstr "設定網際網路存取"
 
-#: ../control-center_.c:119
+#: ../control-center_.c:115
 msgid "Console"
 msgstr "終端機"
 
-#: ../control-center_.c:121
+#: ../control-center_.c:117
 #, fuzzy
 msgid "Date and time"
 msgstr "設定日期與時間"
 
-#: ../control-center_.c:122
+#: ../control-center_.c:118
 #, fuzzy
 msgid "Display manager"
 msgstr "選擇顯示管理員"
 
-#: ../control-center_.c:123
+#: ../control-center_.c:119
 msgid "Firewall"
 msgstr "防火牆"
 
-#: ../control-center_.c:124
+#: ../control-center_.c:120
 msgid "Fonts"
 msgstr "字型"
 
-#: ../control-center_.c:125
+#: ../control-center_.c:121
 msgid "Graphical server"
 msgstr ""
 
-#: ../control-center_.c:126
+#: ../control-center_.c:122
 msgid "Partitions"
 msgstr ""
 
-#: ../control-center_.c:127 ../control-center_.c:164
+#: ../control-center_.c:123 ../control-center_.c:160
 msgid "Hardware"
 msgstr "硬體清單"
 
-#: ../control-center_.c:128
+#: ../control-center_.c:124
 #, fuzzy
 msgid "Install"
 msgstr "自動安裝"
 
-#: ../control-center_.c:129
+#: ../control-center_.c:125
 msgid "Keyboard"
 msgstr "鍵盤"
 
-#: ../control-center_.c:130 ../control-center_.c:532
+#: ../control-center_.c:126
 msgid "Logs"
 msgstr "記錄檔日誌"
 
-#: ../control-center_.c:131
+#: ../control-center_.c:127
 msgid "Updates"
 msgstr ""
 
-#: ../control-center_.c:132
+#: ../control-center_.c:128
 msgid "Menus"
 msgstr "選單"
 
-#: ../control-center_.c:133
+#: ../control-center_.c:129
 msgid "Monitor"
 msgstr "螢幕"
 
-#: ../control-center_.c:134
+#: ../control-center_.c:130
 msgid "Mouse"
 msgstr "滑鼠"
 
-#: ../control-center_.c:135
+#: ../control-center_.c:131
 #, fuzzy
 msgid "NFS mount points"
 msgstr "設定 NFS 掛載點"
 
-#: ../control-center_.c:136
+#: ../control-center_.c:132
 msgid "Local disk sharing"
 msgstr ""
 
-#: ../control-center_.c:137
+#: ../control-center_.c:133
 #, fuzzy
 msgid "Printers"
 msgstr "印表機"
 
-#: ../control-center_.c:138
+#: ../control-center_.c:134
 msgid "Scheduled tasks"
 msgstr ""
 
-#: ../control-center_.c:139
+#: ../control-center_.c:135
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../control-center_.c:140
+#: ../control-center_.c:136
 msgid "Remove a connection"
 msgstr "移除一連線"
 
-#: ../control-center_.c:141
+#: ../control-center_.c:137
 msgid "Remove"
 msgstr ""
 
-#: ../control-center_.c:142
+#: ../control-center_.c:138
 #, fuzzy
 msgid "Screen resolution"
 msgstr "解析度"
 
-#: ../control-center_.c:143
+#: ../control-center_.c:139
 #, fuzzy
 msgid "Samba mount points"
 msgstr "設定 Samba 掛載點"
 
-#: ../control-center_.c:144
+#: ../control-center_.c:140
 #, fuzzy
 msgid "Scanners"
 msgstr "掃描器"
 
-#: ../control-center_.c:145
+#: ../control-center_.c:141
 msgid "Level and checks"
 msgstr ""
 
-#: ../control-center_.c:146
+#: ../control-center_.c:142
 msgid "Permissions"
 msgstr ""
 
-#: ../control-center_.c:147
+#: ../control-center_.c:143
 msgid "Services"
 msgstr "服務"
 
-#: ../control-center_.c:148
+#: ../control-center_.c:144
 msgid "Media Manager"
 msgstr ""
 
-#: ../control-center_.c:149
+#: ../control-center_.c:145
 #, fuzzy
 msgid "TV card"
 msgstr "電視卡"
 
-#: ../control-center_.c:150
+#: ../control-center_.c:146
 msgid "Users and groups"
 msgstr ""
 
-#: ../control-center_.c:151
+#: ../control-center_.c:147
 #, fuzzy
 msgid "WebDAV mount points"
 msgstr "設定 WebDAV 掛載點"
 
-#: ../control-center_.c:156
+#: ../control-center_.c:152
 msgid "Boot"
 msgstr "開機"
 
-#: ../control-center_.c:177
+#: ../control-center_.c:173
 msgid "Mount Points"
 msgstr "掛載點"
 
-#: ../control-center_.c:192
+#: ../control-center_.c:188
 msgid "CD-ROM"
 msgstr "唯讀光碟機"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:189
 msgid "DVD"
 msgstr "DVD 光碟機"
 
-#: ../control-center_.c:193
+#: ../control-center_.c:189
 #, fuzzy
 msgid "DVD-ROM"
 msgstr "唯讀光碟機"
 
-#: ../control-center_.c:194
+#: ../control-center_.c:190
 msgid "CD Burner"
 msgstr "CD 燒錄器"
 
-#: ../control-center_.c:194
+#: ../control-center_.c:190
 #, fuzzy
 msgid "CD/DVD"
 msgstr "DVD 光碟機"
 
-#: ../control-center_.c:195
+#: ../control-center_.c:191
 msgid "Floppy"
 msgstr "軟碟機"
 
-#: ../control-center_.c:195
+#: ../control-center_.c:191
 #, fuzzy
 msgid "Floppy drive"
 msgstr "軟碟機"
 
-#: ../control-center_.c:196
+#: ../control-center_.c:192
 msgid "ZIP drive"
 msgstr ""
 
-#: ../control-center_.c:196
+#: ../control-center_.c:192
 msgid "Zip"
 msgstr "Zip 裝置"
 
-#: ../control-center_.c:205
+#: ../control-center_.c:201
 msgid "Network & Internet"
 msgstr "網路與網際網路"
 
-#: ../control-center_.c:216
+#: ../control-center_.c:212
 msgid "Security"
 msgstr "安全性"
 
-#: ../control-center_.c:223
+#: ../control-center_.c:219
 msgid "System"
 msgstr "系統"
 
-#: ../control-center_.c:239
+#: ../control-center_.c:235
 msgid "Software Management"
 msgstr "軟件管理"
 
-#: ../control-center_.c:248
+#: ../control-center_.c:244
 msgid "Server wizards"
 msgstr ""
 
-#: ../control-center_.c:255
+#: ../control-center_.c:251
 #, fuzzy
 msgid "Configure DHCP"
 msgstr "設定..."
 
-#: ../control-center_.c:256
+#: ../control-center_.c:252
 #, fuzzy
 msgid "Add a DNS client"
 msgstr "DNS 用戶端"
 
-#: ../control-center_.c:257
+#: ../control-center_.c:253
 #, fuzzy
 msgid "Configure DNS"
 msgstr "設定..."
 
-#: ../control-center_.c:258
+#: ../control-center_.c:254
 #, fuzzy
 msgid "Configure FTP"
 msgstr "設定..."
 
-#: ../control-center_.c:259
+#: ../control-center_.c:255
 #, fuzzy
 msgid "Configure news"
 msgstr "設定..."
 
-#: ../control-center_.c:260
+#: ../control-center_.c:256
 #, fuzzy
 msgid "Configure mail"
 msgstr "設定..."
 
-#: ../control-center_.c:261
+#: ../control-center_.c:257
 #, fuzzy
 msgid "Configure proxy"
 msgstr "設定..."
 
-#: ../control-center_.c:262
+#: ../control-center_.c:258
 #, fuzzy
 msgid "Configure Samba"
 msgstr "設定..."
 
-#: ../control-center_.c:263
+#: ../control-center_.c:259
 #, fuzzy
 msgid "Configure time"
 msgstr "設定..."
 
-#: ../control-center_.c:264
+#: ../control-center_.c:260
 #, fuzzy
 msgid "Configure web"
 msgstr "設定..."
 
-#: ../control-center_.c:269
+#: ../control-center_.c:265
 msgid "Online Administration"
 msgstr "線上管理"
 
-#: ../control-center_.c:276
+#: ../control-center_.c:272
 #, fuzzy
 msgid "Local administration"
 msgstr "線上管理"
 
-#: ../control-center_.c:277
+#: ../control-center_.c:273
 #, fuzzy
 msgid "Remote administration"
 msgstr "線上管理"
 
-#: ../control-center_.c:305
+#: ../control-center_.c:301
 msgid "/Display _Logs"
 msgstr "/顯示紀錄檔 (_L)"
 
 #. -PO Translators, please keep all "/" charaters !!!
-#: ../control-center_.c:305 ../control-center_.c:306 ../control-center_.c:307
-#: ../control-center_.c:326
+#: ../control-center_.c:301 ../control-center_.c:302 ../control-center_.c:303
+#: ../control-center_.c:322
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: ../control-center_.c:306
+#: ../control-center_.c:302
 msgid "/_Embedded Mode"
 msgstr "/嵌入模式 (_E)"
 
-#: ../control-center_.c:307
+#: ../control-center_.c:303
 msgid "/Expert mode in _wizards"
 msgstr "/專家模式於 _wizards"
 
-#: ../control-center_.c:311
+#: ../control-center_.c:307
 msgid "/_Profiles"
 msgstr "/型號 (_P)"
 
-#: ../control-center_.c:312
+#: ../control-center_.c:308
 msgid "/_Delete"
 msgstr "/刪除 (_D)"
 
-#: ../control-center_.c:313
+#: ../control-center_.c:309
 msgid "/_New"
 msgstr "/新增 (_N)"
 
-#: ../control-center_.c:324 ../control-center_.c:325
+#: ../control-center_.c:320 ../control-center_.c:321
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
-#: ../control-center_.c:325
+#: ../control-center_.c:321
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: ../control-center_.c:325
+#: ../control-center_.c:321
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../control-center_.c:325
+#: ../control-center_.c:321
 msgid "Quit"
 msgstr "離開"
 
-#: ../control-center_.c:347 ../control-center_.c:350 ../control-center_.c:363
+#: ../control-center_.c:337 ../control-center_.c:340 ../control-center_.c:353
 msgid "/_Themes"
 msgstr "/佈景主題 (_T)"
 
-#: ../control-center_.c:353
+#: ../control-center_.c:343
 msgid ""
 "This action will restart the control center.\n"
 "Any change not applied will be lost."
@@ -538,71 +539,71 @@ msgstr ""
 "此動作將會重新啟動控制中心.\n"
 "任何尚未儲存的變更將會遺失."
 
-#: ../control-center_.c:363
+#: ../control-center_.c:353
 msgid "/_More themes"
 msgstr "/佈景主題 (_T)"
 
-#: ../control-center_.c:367
+#: ../control-center_.c:357
 msgid "New profile..."
 msgstr "新的型號..."
 
-#: ../control-center_.c:370
+#: ../control-center_.c:360
 msgid ""
 "Name of the profile to create (the new profile is created as a copy of the "
 "current one):"
 msgstr "要建立的型號名稱 (新的型號被建立為現在的型號之 一副本):"
 
-#: ../control-center_.c:374 ../control-center_.c:407 ../control-center_.c:524
+#: ../control-center_.c:364 ../control-center_.c:397 ../control-center_.c:522
 msgid "Cancel"
 msgstr "取消"
 
-#: ../control-center_.c:376 ../control-center_.c:408
+#: ../control-center_.c:366 ../control-center_.c:398
 msgid "Ok"
 msgstr "確定"
 
-#: ../control-center_.c:382
+#: ../control-center_.c:372
 msgid "Error"
 msgstr "錯誤"
 
-#: ../control-center_.c:382
+#: ../control-center_.c:372
 #, c-format
 msgid "The \"%s\" profile already exists!"
 msgstr "\"%s\" 型號已經存在!"
 
-#: ../control-center_.c:400
+#: ../control-center_.c:390
 msgid "Delete profile"
 msgstr "刪除型號"
 
-#: ../control-center_.c:402
+#: ../control-center_.c:392
 msgid "Profile to delete:"
 msgstr "要刪除的型號:"
 
-#: ../control-center_.c:411 ../control-center_.c:472 ../control-center_.c:947
+#: ../control-center_.c:401 ../control-center_.c:461 ../control-center_.c:911
 msgid "Warning"
 msgstr "警告"
 
-#: ../control-center_.c:411
+#: ../control-center_.c:401
 msgid "You can not delete the current profile"
 msgstr "你無法刪除現在的型號"
 
-#: ../control-center_.c:427 ../control-center_.c:428 ../control-center_.c:429
-#: ../control-center_.c:430
+#: ../control-center_.c:416 ../control-center_.c:417 ../control-center_.c:418
+#: ../control-center_.c:419
 msgid "/_Help"
 msgstr "/說明 (_H)"
 
-#: ../control-center_.c:428
+#: ../control-center_.c:417
 msgid "Help"
 msgstr "說明"
 
-#: ../control-center_.c:429
+#: ../control-center_.c:418
 msgid "/_Report Bug"
 msgstr "/臭蟲報告 (_R)"
 
-#: ../control-center_.c:430
+#: ../control-center_.c:419
 msgid "/_About..."
 msgstr "/關於 (_A)..."
 
-#: ../control-center_.c:473
+#: ../control-center_.c:462
 #, fuzzy, c-format
 msgid ""
 "We are about to switch from the \"%s\" profile to the \"%s\" profile.\n"
@@ -613,119 +614,123 @@ msgstr ""
 "\n"
 "你確定想要做轉換嗎?"
 
-#: ../control-center_.c:521
+#: ../control-center_.c:509
 msgid "Please wait..."
 msgstr "請稍候..."
 
-#: ../control-center_.c:535
+#: ../control-center_.c:527
 msgid "Previous"
 msgstr "上一頁"
 
-#: ../control-center_.c:543
-#, c-format
-msgid "Mandrake Control Center %s"
+#: ../control-center_.c:542
+#, fuzzy, c-format
+msgid "Mandrake Control Center %s [on %s]"
 msgstr "Mandrake 控制中心 %s"
 
-#: ../control-center_.c:558
+#: ../control-center_.c:553
+msgid "_banner font: Sans 20"
+msgstr ""
+
+#: ../control-center_.c:555
 msgid "Welcome to the Mandrake Control Center"
 msgstr "歡迎來到 Mandrake 控制中心"
 
-#: ../control-center_.c:620
+#: ../control-center_.c:698
 msgid "The modifications done in the current module won't be saved."
 msgstr "於現在的模組中的變更不會被儲存."
 
-#: ../control-center_.c:810
+#: ../control-center_.c:774
 #, c-format
 msgid "cannot fork: %s"
 msgstr "cannot fork: %s"
 
-#: ../control-center_.c:820
+#: ../control-center_.c:784
 #, c-format
 msgid "cannot fork and exec \"%s\" since it is not executable"
 msgstr "cannot fork and exec \"%s\" 因為它不可執行"
 
-#: ../control-center_.c:938
+#: ../control-center_.c:902
 msgid "This program has exited abnormally"
 msgstr "這程式已經不正常離開"
 
-#: ../control-center_.c:957
+#: ../control-center_.c:921
 msgid "Close"
 msgstr "關閉"
 
-#: ../control-center_.c:964
+#: ../control-center_.c:928
 msgid "More themes"
 msgstr "更多佈景主題"
 
-#: ../control-center_.c:966
+#: ../control-center_.c:930
 msgid "Getting new themes"
 msgstr "取得更多的佈景主題"
 
-#: ../control-center_.c:967
+#: ../control-center_.c:931
 msgid "Additional themes"
 msgstr "額外的佈景主題"
 
-#: ../control-center_.c:969
+#: ../control-center_.c:933
 msgid "Get additional themes on www.damz.net"
 msgstr "由 www.damz.net 下載更多佈景主題"
 
-#: ../control-center_.c:977
+#: ../control-center_.c:941
 msgid "About - Mandrake Control Center"
 msgstr "關於 - Mandrake 控制中心"
 
-#: ../control-center_.c:987
+#: ../control-center_.c:951
 msgid "Authors: "
 msgstr "作者: "
 
-#: ../control-center_.c:988
+#: ../control-center_.c:952
 msgid "(original C version)"
 msgstr "(original C version)"
 
 #. -PO "perl" here is the programming language
-#: ../control-center_.c:990 ../control-center_.c:993
+#: ../control-center_.c:954 ../control-center_.c:957
 msgid "(perl version)"
 msgstr "(perl version)"
 
-#: ../control-center_.c:995
+#: ../control-center_.c:959
 msgid "Artwork: "
 msgstr "美工設計: "
 
-#: ../control-center_.c:996
+#: ../control-center_.c:960
 msgid "(design)"
 msgstr "(設計)"
 
 #. -PO If your language allows it, use eacute for first "e" and egrave for 2nd one.
-#: ../control-center_.c:998
+#: ../control-center_.c:962
 msgid "Helene Durosini"
 msgstr "Helene Durosini"
 
 #. -PO Add your Name here to find it in the About section in your language.
-#: ../control-center_.c:1012
+#: ../control-center_.c:976
 msgid "~ * ~"
 msgstr "~ * ~"
 
 #. -PO Add your E-Mail address here if you want to show it in the about doialog.
-#: ../control-center_.c:1014
+#: ../control-center_.c:978
 msgid "~ @ ~"
 msgstr "~ @ ~"
 
-#: ../control-center_.c:1016
+#: ../control-center_.c:980
 msgid "Translator: "
 msgstr "翻譯者: "
 
-#: ../control-center_.c:1022
+#: ../control-center_.c:986
 #, c-format
 msgid "Mandrake Control Center %s\n"
 msgstr "Mandrake 控制中心 %s\n"
 
-#: ../control-center_.c:1023
+#: ../control-center_.c:987
 msgid "Copyright (C) 1999-2003 Mandrakesoft SA"
 msgstr "版權所有 (C) 1999-2003 Mandrakesoft SA"
 
-#: ../control-center_.c:1027
+#: ../control-center_.c:991
 msgid "Authors"
 msgstr "作者"
 
-#: ../control-center_.c:1028
+#: ../control-center_.c:992
 msgid "Mandrake Linux Contributors"
 msgstr "Mandrake Linux 貢獻者"