updated Spanish file, merged pot file

1 files changed, 84 insertions, 84 deletions

diff --git a/po/zh_CN.GB2312.po b/po/zh_CN.GB2312.po
index 0e537ee0..8cc93396 100644
--- a/po/zh_CN.GB2312.po
+++ b/po/zh_CN.GB2312.po
@@ -9,7 +9,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-04-09 12:40+0800\n"
 "Last-Translator: Jesse Kuang <kjx@mandrakesoft.com>\n"
 "Language-Team: future-cjk@mandrakesoft.com\n"
@@ -21,7 +21,7 @@ msgstr ""
 msgid "DrakConf: error"
 msgstr "DrakConf: 错误"
 
-#: logdrake:180 placeholder.h:8
+#: logdrake:191 placeholder.h:8
 msgid "Quit"
 msgstr "退出"
 
@@ -42,7 +42,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)"
 
@@ -54,11 +54,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)"
 
@@ -162,7 +162,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 "软件管理"
 
@@ -170,49 +170,12 @@ msgstr "软件管理"
 msgid "Logs"
 msgstr ""
 
-#: control-center:147 control-center:164 control-center:342
+#: control-center:147 control-center:164 control-center:222
 #, fuzzy
 msgid "Console"
 msgstr "关闭"
 
 #: control-center:212
-#, fuzzy
-msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
-msgstr "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
-
-#: 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 "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
-
-#: 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"
@@ -222,11 +185,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"
@@ -234,7 +197,7 @@ msgstr ""
 "等待20秒， 无法运行 \n"
 "检查是否安装"
 
-#: control-center:399
+#: control-center:279
 msgid ""
 "After 15 sec., Failed to launch \n"
 "See if it's installed"
@@ -242,20 +205,57 @@ 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
+#, fuzzy
+msgid "-adobe-times-bold-r-normal--17-*-100-100-p-*-iso8859-*,*-r-*"
+msgstr "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: 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 "-adobe-times-bold-r-normal--14-*-100-100-p-*-iso8859-*,*-r-*"
+
+#: 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"
@@ -266,7 +266,7 @@ msgstr ""
 " \n"
 " Mandrakesoft SA 版权所有 (c) 2001\n"
 
-#: control-center:488
+#: control-center:494
 msgid "Authors: "
 msgstr "作者:"
 
@@ -282,11 +282,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 "取消"
 
@@ -315,129 +315,129 @@ msgstr "正在配置..."
 msgid "User menu"
 msgstr "用户名: "
 
-#: logdrake:60
+#: logdrake:68
 msgid "usage: logdrake [--version]\n"
 msgstr ""
 
-#: logdrake:67 logdrake:331
+#: logdrake:79 logdrake:355
 #, fuzzy
 msgid "logdrake"
 msgstr "Mousedrake"
 
-#: logdrake:84
+#: logdrake:96
 #, fuzzy
 msgid "/File/_New"
 msgstr "/文件(F)/-"
 
-#: logdrake:84
+#: logdrake:96
 #, fuzzy
 msgid "<control>N"
 msgstr "<control>Q"
 
-#: logdrake:85
+#: logdrake:97
 #, fuzzy
 msgid "/File/_Open"
 msgstr "/文件(F)/-"
 
-#: logdrake:85
+#: logdrake:97
 #, fuzzy
 msgid "<control>O"
 msgstr "<control>Q"
 
-#: logdrake:86
+#: logdrake:98
 #, fuzzy
 msgid "/File/_Save"
 msgstr "/文件(F)/-"
 
-#: logdrake:86
+#: logdrake:98
 #, fuzzy
 msgid "<control>S"
 msgstr "<control>Q"
 
-#: logdrake:87
+#: logdrake:99
 msgid "/File/Save _As"
 msgstr ""
 
-#: logdrake:88
+#: logdrake:100
 msgid "/File/-"
 msgstr "/文件(F)/-"
 
-#: logdrake:89
+#: logdrake:101
 msgid "/File/_Quit"
 msgstr "/文件(F)/退出(_Q)"
 
-#: logdrake:90
+#: logdrake:102
 msgid "/_Options"
 msgstr ""
 
-#: logdrake:91
+#: logdrake:103
 msgid "/Options/Test"
 msgstr ""
 
-#: logdrake:93
+#: logdrake:105
 msgid "/Help/_About..."
 msgstr "/帮助(H)/关于(_A)..."
 
-#: logdrake:100
+#: logdrake:112
 msgid "-misc-fixed-medium-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr ""
 
-#: logdrake:101
+#: logdrake:113
 msgid "-misc-fixed-bold-r-*-*-*-100-*-*-*-*-*-*,*"
 msgstr ""
 
-#: logdrake:138
+#: logdrake:150
 msgid "authentification"
 msgstr ""
 
-#: logdrake:139
+#: logdrake:151
 #, fuzzy
 msgid "user"
 msgstr "用户:"
 
-#: logdrake:140
+#: logdrake:152
 msgid "messages"
 msgstr ""
 
-#: logdrake:141
+#: logdrake:153
 msgid "syslog"
 msgstr ""
 
-#: logdrake:147
-msgid "A tool to see your log"
+#: logdrake:159
+msgid "A tool to monitor your logs"
 msgstr ""
 
-#: logdrake:148
+#: logdrake:160
 msgid "Settings"
 msgstr ""
 
-#: logdrake:153
+#: logdrake:165
 #, fuzzy
 msgid "matching"
 msgstr "机器名:"
 
-#: logdrake:154
+#: logdrake:166
 #, fuzzy
 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 ""