updated Spanish file, merged pot file

1 files changed, 84 insertions, 83 deletions

diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9c0b585e..8caeb766 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: DrakConf 0.70\n"
-"POT-Creation-Date: 2001-08-13 04:57+0200\n"
+"POT-Creation-Date: 2001-08-13 13:49+0200\n"
 "PO-Revision-Date: 2001-08-13 09:18+0800\n"
 "Last-Translator: Joe Man <trmetal@yahoo.com.hk>\n"
 "Language-Team: Chinese <zh@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
 msgid "DrakConf: error"
 msgstr "DrakConf： 錯誤"
 
-#: logdrake:180 placeholder.h:8
+#: logdrake:191 placeholder.h:8
 msgid "Quit"
 msgstr "離開"
 
@@ -38,7 +38,7 @@ msgstr "無法找到任何程式\n"
 msgid "Mandrake Control Center %s"
 msgstr "Mandrake 控制中心 %s"
 
-#: control-center:81 logdrake:83
+#: control-center:81 logdrake:95
 msgid "/_File"
 msgstr "/檔案 (_F)"
 
@@ -50,11 +50,11 @@ msgstr "/檔案 (F)"
 msgid "/_Quit"
 msgstr "/離開 (_Q)"
 
-#: control-center:82 logdrake:89
+#: control-center:82 logdrake:101
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: control-center:83 logdrake:92
+#: control-center:83 logdrake:104
 msgid "/_Help"
 msgstr "/說明 (_H)"
 
@@ -158,7 +158,7 @@ msgstr "字型"
 msgid "Date & Time"
 msgstr "日期及時間"
 
-#: control-center:146 control-center:162 control-center:329
+#: control-center:146 control-center:162 control-center:209
 msgid "Software Manager"
 msgstr "套件管理員"
 
@@ -166,47 +166,11 @@ msgstr "套件管理員"
 msgid "Logs"
 msgstr "記錄檔"
 
-#: control-center:147 control-center:164 control-center:342
+#: control-center:147 control-center:164 control-center:222
 msgid "Console"
 msgstr "終端機"
 
 #: control-center:212
-msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr ""
-
-#: control-center:213
-msgid "The place where you can configure your Mandrake Box"
-msgstr "在這裡可以設定您的 Mandrake 系統"
-
-#: control-center:216
-msgid "cannot open this file for read: $!"
-msgstr "無法開啟檔案：$!"
-
-#: control-center:223 control-center:484
-msgid "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr ""
-
-#: control-center:227
-msgid "System:"
-msgstr "系統："
-
-#: control-center:228
-msgid "Hostname:"
-msgstr "主機名稱："
-
-#: control-center:229
-msgid "Kernel Version:"
-msgstr "內核版本："
-
-#: control-center:230
-msgid "Machine:"
-msgstr "中央處理器等級："
-
-#: control-center:260 control-center:478
-msgid "Close"
-msgstr "關閉"
-
-#: control-center:332
 #, c-format
 msgid ""
 "The application cannot be loaded,\n"
@@ -217,11 +181,11 @@ msgstr ""
 "找不到檔案 '%s'。\n"
 "請先行安裝此程式。 "
 
-#: control-center:361
+#: control-center:241
 msgid "Please wait while loading ..."
 msgstr "正載入中，請稍候..."
 
-#: control-center:398
+#: control-center:278
 msgid ""
 "After 20 sec., Failed to launch \n"
 "See if it's installed"
@@ -229,7 +193,7 @@ msgstr ""
 "已超逾 20 秒，仍未能啟動\n"
 "請檢查是否已安裝"
 
-#: control-center:399
+#: control-center:279
 msgid ""
 "After 15 sec., Failed to launch \n"
 "See if it's installed"
@@ -237,20 +201,56 @@ msgstr ""
 "已超逾 15 秒，仍未能啟動\n"
 "請檢查是否已安裝"
 
-#: control-center:407 control-center:422
+#: control-center:287 control-center:302
 msgid "cannot fork: $~"
 msgstr "無法啟動另一個行程：$~"
 
-#: control-center:458
+#: control-center:338
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: control-center:339
+msgid "The place where you can configure your Mandrake Box"
+msgstr "在這裡可以設定您的 Mandrake 系統"
+
+#: control-center:342
+msgid "cannot open this file for read: $!"
+msgstr "無法開啟檔案：$!"
+
+#: control-center:349 control-center:490
+msgid "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr ""
+
+#: control-center:353
+msgid "System:"
+msgstr "系統："
+
+#: control-center:354
+msgid "Hostname:"
+msgstr "主機名稱："
+
+#: control-center:355
+msgid "Kernel Version:"
+msgstr "內核版本："
+
+#: control-center:356
+msgid "Machine:"
+msgstr "中央處理器等級："
+
+#: control-center:386 control-center:484
+msgid "Close"
+msgstr "關閉"
+
+#: control-center:464
 msgid "Warning: No browser specified"
 msgstr "警告：沒有指定瀏覽視窗"
 
-#: control-center:466
+#: control-center:472
 msgid ""
 "Security Warning: I'm not allowed to connect to the internet as root user"
 msgstr "保安警告：不允許以 root 身份連線到互聯網"
 
-#: control-center:482
+#: control-center:488
 #, c-format
 msgid ""
 "Mandrake Control Center %s \n"
@@ -261,7 +261,7 @@ msgstr ""
 " \n"
 " 版權所有 (C) 2001 Mandrakesoft SA\n"
 
-#: control-center:488
+#: control-center:494
 msgid "Authors: "
 msgstr "作者："
 
@@ -277,11 +277,11 @@ msgstr "您的所屬時區？"
 msgid "Is your hardware clock set to GMT?"
 msgstr "您的硬體時鐘是否設成 GMT？"
 
-#: clock.pm:101 logdrake:179 logdrake:335 menus.pm:58
+#: clock.pm:101 logdrake:190 logdrake:359 menus.pm:58
 msgid "OK"
 msgstr "確定"
 
-#: clock.pm:118 logdrake:180 logdrake:342
+#: clock.pm:118 logdrake:191 logdrake:366
 msgid "Cancel"
 msgstr "取消"
 
@@ -311,118 +311,119 @@ msgstr "設定..."
 msgid "User menu"
 msgstr "使用者選單"
 
-#: logdrake:60
+#: logdrake:68
 msgid "usage: logdrake [--version]\n"
 msgstr "用法：logdrake [--version]\n"
 
-#: logdrake:67 logdrake:331
+#: logdrake:79 logdrake:355
 msgid "logdrake"
 msgstr "logdrake"
 
-#: logdrake:84
+#: logdrake:96
 msgid "/File/_New"
 msgstr "/檔案/新增 (_N)"
 
-#: logdrake:84
+#: logdrake:96
 msgid "<control>N"
 msgstr "<control>N"
 
-#: logdrake:85
+#: logdrake:97
 msgid "/File/_Open"
 msgstr "/檔案/開啟 (_O)"
 
-#: logdrake:85
+#: logdrake:97
 msgid "<control>O"
 msgstr "<control>O"
 
-#: logdrake:86
+#: logdrake:98
 msgid "/File/_Save"
 msgstr "/檔案/儲存 (_S)"
 
-#: logdrake:86
+#: logdrake:98
 msgid "<control>S"
 msgstr "<control>S"
 
-#: logdrake:87
+#: logdrake:99
 msgid "/File/Save _As"
 msgstr "/檔案/另存新檔 (_A)"
 
-#: logdrake:88
+#: logdrake:100
 msgid "/File/-"
 msgstr "/檔案/-"
 
-#: logdrake:89
+#: logdrake:101
 msgid "/File/_Quit"
 msgstr "/檔案/離開 (_Q)"
 
-#: logdrake:90
+#: logdrake:102
 msgid "/_Options"
 msgstr "/選項 (_O)"
 
-#: logdrake:91
+#: logdrake:103
 msgid "/Options/Test"
 msgstr "/選項/測試"
 
-#: logdrake:93
+#: logdrake:105
 msgid "/Help/_About..."
 msgstr "/說明/關於 (_A)..."
 
-#: logdrake:100
+#: logdrake:112
 msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: logdrake:101
+#: logdrake:113
 msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 
-#: logdrake:138
+#: logdrake:150
 msgid "authentification"
 msgstr "認證"
 
-#: logdrake:139
+#: logdrake:151
 msgid "user"
 msgstr "使用者"
 
-#: logdrake:140
+#: logdrake:152
 msgid "messages"
 msgstr "訊息"
 
-#: logdrake:141
+#: logdrake:153
 msgid "syslog"
 msgstr "syslog (系統記錄)"
 
-#: logdrake:147
-msgid "A tool to see your log"
+#: logdrake:159
+#, fuzzy
+msgid "A tool to monitor your logs"
 msgstr "檢視記錄檔的工具"
 
-#: logdrake:148
+#: logdrake:160
 msgid "Settings"
 msgstr "設定"
 
-#: logdrake:153
+#: logdrake:165
 msgid "matching"
 msgstr "相配的"
 
-#: logdrake:154
+#: logdrake:166
 msgid "but not matching"
 msgstr "但是不相配"
 
-#: logdrake:159
+#: logdrake:171
 msgid "Choose file"
 msgstr "選取檔案"
 
-#: logdrake:166
+#: logdrake:176
 msgid "Calendar"
 msgstr "行事曆"
 
-#: logdrake:172
+#: logdrake:182
 msgid "search"
 msgstr "尋找"
 
-#: logdrake:175
+#: logdrake:186
 msgid "Content of the file"
 msgstr "檔案的內容"
 
-#: logdrake:220
+#: logdrake:231
 msgid "please wait, parsing file: "
 msgstr "請稍候，正在解析檔案："