sync with code

1 files changed, 150 insertions, 130 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index 7612fa813..f450ea899 100644
--- a/perl-install/standalone/po/zh_CN.po
+++ b/perl-install/standalone/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: DrakX 2007\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-01 13:42+0200\n"
+"POT-Creation-Date: 2007-08-06 12:30+0200\n"
 "PO-Revision-Date: 2006-09-16 07:01+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mandriva Linux i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -21,17 +21,17 @@ msgstr ""
 msgid "No bootloader found, creating a new configuration"
 msgstr "未找到引导程序，创建新配置"
 
-#: drakboot:83 harddrake2:194 harddrake2:195 logdrake:70
+#: drakboot:83 harddrake2:194 harddrake2:195 logdrake:71
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: drakboot:84 logdrake:76
+#: drakboot:84 logdrake:77
 #, c-format
 msgid "/File/_Quit"
 msgstr "/文件(F)/退出(_Q)"
 
-#: drakboot:84 harddrake2:195 logdrake:76
+#: drakboot:84 harddrake2:195 logdrake:77
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -139,62 +139,62 @@ msgstr ""
 "请选择视频模式, 该模式将应用到下面所选的每个启动项。\n"
 "请确定您的视频卡支持您所选的模式。"
 
-#: drakbug:43
+#: drakbug:46
 #, c-format
 msgid "Mandriva Linux Bug Report Tool"
 msgstr "Mandriva Linux 故障报告工具"
 
-#: drakbug:48
+#: drakbug:51
 #, c-format
 msgid "Mandriva Linux Control Center"
 msgstr "Mandriva Linux 控制中心"
 
-#: drakbug:49
+#: drakbug:52
 #, c-format
 msgid "First Time Wizard"
 msgstr "初次使用向导"
 
-#: drakbug:50
+#: drakbug:53
 #, c-format
 msgid "Synchronization tool"
 msgstr "同步工具"
 
-#: drakbug:51 drakbug:145
+#: drakbug:54 drakbug:168
 #, c-format
 msgid "Standalone Tools"
 msgstr "独立工具"
 
-#: drakbug:53
+#: drakbug:56 drakbug:57
 #, c-format
 msgid "Mandriva Online"
 msgstr "Mandriva 在线"
 
-#: drakbug:54
+#: drakbug:58
 #, c-format
 msgid "Remote Control"
 msgstr "远程控制"
 
-#: drakbug:55
+#: drakbug:59
 #, c-format
 msgid "Software Manager"
 msgstr "软件管理器"
 
-#: drakbug:56
+#: drakbug:60
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows 迁移工具"
 
-#: drakbug:57
+#: drakbug:61
 #, c-format
 msgid "Configuration Wizards"
 msgstr "配置向导"
 
-#: drakbug:79
+#: drakbug:83
 #, c-format
 msgid "Select Mandriva Tool:"
 msgstr "选择 Mandriva 工具:"
 
-#: drakbug:80
+#: drakbug:84
 #, c-format
 msgid ""
 "or Application Name\n"
@@ -203,47 +203,57 @@ msgstr ""
 "应用程序名\n"
 "(或完整路径): "
 
-#: drakbug:83
+#: drakbug:87
 #, c-format
 msgid "Find Package"
 msgstr "查找软件包"
 
-#: drakbug:85
+#: drakbug:89
 #, c-format
 msgid "Package: "
 msgstr "软件包: "
 
-#: drakbug:86
+#: drakbug:90
 #, c-format
 msgid "Kernel:"
 msgstr "内核: "
 
-#: drakbug:94
+#: drakbug:102
+#, c-format
+msgid "The \"%s\" program has crashed with the following error:"
+msgstr ""
+
+#: drakbug:104
+#, c-format
+msgid "The \"%s\" program has crashed."
+msgstr ""
+
+#: drakbug:106
 #, c-format
 msgid ""
 "To submit a bug report, click on the report button.  \n"
 "This will open a web browser window on %s where you'll find a form to fill "
 "in.  The information displayed above will be transferred to that server.  \n"
-"Things useful to include in your report are the output of lspcidrake -v, kernel "
-"version, and /proc/cpuinfo."
+"Things useful to include in your report are the output of lspcidrake -v, "
+"kernel version, and /proc/cpuinfo."
 msgstr ""
 "要提交故障报告, 单击报告按钮。\n"
 "它会打开一个浏览器窗口, 进入 %s, 那里有一个表格需要您填写。上面显示的信息将被"
 "传送到服务器。\n"
-"如果在您的报告中列出 lspcidrake -v 的输出、内核的版本以及 /proc/cpuinfo 的内容, 可能"
-"会更有帮助一些。"
+"如果在您的报告中列出 lspcidrake -v 的输出、内核的版本以及 /proc/cpuinfo 的内"
+"容, 可能会更有帮助一些。"
 
-#: drakbug:100
+#: drakbug:112
 #, c-format
 msgid "Report"
 msgstr "报告"
 
-#: drakbug:155
+#: drakbug:178
 #, c-format
 msgid "Not installed"
 msgstr "没有安装"
 
-#: drakbug:168
+#: drakbug:191
 #, c-format
 msgid "Package not installed"
 msgstr "软件包未安装"
@@ -381,8 +391,8 @@ msgstr "找不到字体"
 msgid "parse all fonts"
 msgstr "分析所有字体"
 
-#: drakfont:222 drakfont:263 drakfont:332 drakfont:373 drakfont:381
-#: drakfont:407 drakfont:425 drakfont:439
+#: drakfont:222 drakfont:263 drakfont:332 drakfont:373 drakfont:380
+#: drakfont:406 drakfont:424 drakfont:438
 #, c-format
 msgid "done"
 msgstr "完成"
@@ -447,17 +457,17 @@ msgstr "Ghostscript 引用"
 msgid "Suppress Temporary Files"
 msgstr "删除临时文件"
 
-#: drakfont:377 drakfont:435
+#: drakfont:376 drakfont:434
 #, c-format
 msgid "Restart XFS"
 msgstr "重新启动 XFS"
 
-#: drakfont:423 drakfont:433
+#: drakfont:422 drakfont:432
 #, c-format
 msgid "Suppress Fonts Files"
 msgstr "删除字体文件"
 
-#: drakfont:443
+#: drakfont:442
 #, c-format
 msgid ""
 "Before installing any fonts, be sure that you have the right to use and "
@@ -470,164 +480,164 @@ msgstr ""
 "\n"
 "通常字体安装可以正常进行。但有罕见的例外, 有问题的字体会使 X 挂住。"
 
-#: drakfont:483
+#: drakfont:482
 #, c-format
 msgid "Font Installation"
 msgstr "字体安装"
 
-#: drakfont:494
+#: drakfont:493
 #, c-format
 msgid "DrakFont"
 msgstr "Drak 字体"
 
-#: drakfont:495 drakfont:647
+#: drakfont:494 drakfont:646
 #, c-format
 msgid "Font List"
 msgstr "字体列表"
 
-#: drakfont:498
+#: drakfont:497
 #, c-format
 msgid "Get Windows Fonts"
 msgstr "获得 Windows 字体"
 
-#: drakfont:504
+#: drakfont:503
 #, c-format
 msgid "About"
 msgstr "关于"
 
-#: drakfont:506 drakfont:726
+#: drakfont:505 drakfont:725
 #, c-format
 msgid "Uninstall"
 msgstr "卸载"
 
-#: drakfont:507
+#: drakfont:506
 #, c-format
 msgid "Import"
 msgstr "导入"
 
-#: drakfont:525
+#: drakfont:524
 #, c-format
 msgid "Drakfont"
 msgstr "Drakfont"
 
-#: drakfont:527
+#: drakfont:526
 #, c-format
 msgid "Copyright (C) 2001-2006 by Mandriva"
 msgstr "版权 (C) 2001-2006 Mandriva"
 
-#: drakfont:529
+#: drakfont:528
 #, c-format
 msgid "Font installer."
 msgstr "字体安装程序。"
 
-#: drakfont:531 harddrake2:236
+#: drakfont:530 harddrake2:236
 #, 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>")
-#: drakfont:538 harddrake2:241
+#: drakfont:537 harddrake2:241
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: drakfont:548
+#: drakfont:547
 #, c-format
 msgid "Choose the applications that will support the fonts:"
 msgstr "请选择要支持字体的应用程序: "
 
-#: drakfont:559
+#: drakfont:558
 #, c-format
 msgid "Ghostscript"
 msgstr "Ghostscript"
 
-#: drakfont:560
+#: drakfont:559
 #, c-format
 msgid "OpenOffice.org"
 msgstr "OpenOffice.org"
 
-#: drakfont:561
+#: drakfont:560
 #, c-format
 msgid "Abiword"
 msgstr "Abiword"
 
-#: drakfont:562
+#: drakfont:561
 #, c-format
 msgid "Generic Printers"
 msgstr "通用打印机"
 
-#: drakfont:576
+#: drakfont:575
 #, c-format
 msgid "Select the font file or directory and click on 'Add'"
 msgstr "选择字体文件或目录, 然后单击“添加”"
 
-#: drakfont:577
+#: drakfont:576
 #, c-format
 msgid "File Selection"
 msgstr "选择文件"
 
-#: drakfont:581
+#: drakfont:580
 #, c-format
 msgid "Fonts"
 msgstr "字体"
 
-#: drakfont:645
+#: drakfont:644
 #, c-format
 msgid "Import fonts"
 msgstr "导入字体"
 
-#: drakfont:658
+#: drakfont:657
 #, c-format
 msgid "Install"
 msgstr "安装"
 
-#: drakfont:689
+#: drakfont:688
 #, c-format
 msgid "Are you sure you want to uninstall the following fonts?"
 msgstr "您确定想要卸载下列字体吗?"
 
-#: drakfont:734
+#: drakfont:733
 #, c-format
 msgid "Unselected All"
 msgstr "全部不选"
 
-#: drakfont:737
+#: drakfont:736
 #, c-format
 msgid "Selected All"
 msgstr "全部选中"
 
-#: drakfont:751 drakfont:770
+#: drakfont:750 drakfont:769
 #, c-format
 msgid "Importing fonts"
 msgstr "导入字体"
 
-#: drakfont:755 drakfont:775
+#: drakfont:754 drakfont:774
 #, c-format
 msgid "Initial tests"
 msgstr "初始测试"
 
-#: drakfont:756
+#: drakfont:755
 #, c-format
 msgid "Copy fonts on your system"
 msgstr "复制系统中的字体"
 
-#: drakfont:757
+#: drakfont:756
 #, c-format
 msgid "Install & convert Fonts"
 msgstr "安装并转换字体"
 
-#: drakfont:758
+#: drakfont:757
 #, c-format
 msgid "Post Install"
 msgstr "安装后的设置"
 
-#: drakfont:776
+#: drakfont:775
 #, c-format
 msgid "Remove fonts on your system"
 msgstr "删除系统中的字体"
 
-#: drakfont:777
+#: drakfont:776
 #, c-format
 msgid "Post Uninstall"
 msgstr "删除后"
@@ -1364,7 +1374,7 @@ msgstr "自动检测"
 msgid "Detection in progress"
 msgstr "检测进行中"
 
-#: drakups:118 drakups:157 logdrake:449 logdrake:455
+#: drakups:118 drakups:157 logdrake:457 logdrake:463
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -2197,12 +2207,12 @@ msgid "Features"
 msgstr "特性"
 
 #. -PO: please keep all "/" characters !!!
-#: harddrake2:176 logdrake:77
+#: harddrake2:176 logdrake:78
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: harddrake2:177 harddrake2:206 logdrake:79
+#: harddrake2:177 harddrake2:206 logdrake:80
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
@@ -2340,171 +2350,171 @@ msgstr "刻录机"
 msgid "DVD"
 msgstr "DVD"
 
-#: localedrake:38
+#: localedrake:47
 #, c-format
 msgid "LocaleDrake"
 msgstr "Drak 语言设置"
 
-#: localedrake:44
+#: localedrake:53
 #, c-format
 msgid "You should install the following packages: %s"
 msgstr "您应该安装下列软件包：%s"
 
 #. -PO: the following is used to combine packages names. eg: "initscripts, harddrake, yudit"
-#: localedrake:47
+#: localedrake:56
 #, c-format
 msgid ", "
 msgstr "、"
 
-#: localedrake:55
+#: localedrake:64
 #, c-format
 msgid "The change is done, but to be effective you must logout"
 msgstr "修改已经完成, 不过您必须退出登录修改才会生效"
 
-#: logdrake:50
+#: logdrake:51
 #, c-format
 msgid "Mandriva Linux Tools Logs"
 msgstr "Mandriva Linux 工具日志"
 
-#: logdrake:51
+#: logdrake:52
 #, c-format
 msgid "Logs"
 msgstr "日志"
 
-#: logdrake:64
+#: logdrake:65
 #, c-format
 msgid "Show only for the selected day"
 msgstr "仅显示被选择的日期"
 
-#: logdrake:71
+#: logdrake:72
 #, c-format
 msgid "/File/_New"
 msgstr "/文件(F)/新建(_N)"
 
-#: logdrake:71
+#: logdrake:72
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: logdrake:72
+#: logdrake:73
 #, c-format
 msgid "/File/_Open"
 msgstr "/文件(F)/打开(_O)"
 
-#: logdrake:72
+#: logdrake:73
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: logdrake:73
+#: logdrake:74
 #, c-format
 msgid "/File/_Save"
 msgstr "/文件(F)/保存(_S)"
 
-#: logdrake:73
+#: logdrake:74
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: logdrake:74
+#: logdrake:75
 #, c-format
 msgid "/File/Save _As"
 msgstr "/文件(F)/另存为(_A)"
 
-#: logdrake:75
+#: logdrake:76
 #, c-format
 msgid "/File/-"
 msgstr "/文件(F)/-"
 
-#: logdrake:78
+#: logdrake:79
 #, c-format
 msgid "/Options/Test"
 msgstr "/选项(O)/测试"
 
-#: logdrake:80
+#: logdrake:81
 #, c-format
 msgid "/Help/_About..."
 msgstr "/帮助(H)/关于(_A)..."
 
-#: logdrake:109
+#: logdrake:110
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "身份认证"
 
-#: logdrake:110
+#: logdrake:111
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "用户"
 
-#: logdrake:111
+#: logdrake:112
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "消息"
 
-#: logdrake:112
+#: logdrake:113
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "系统日志"
 
-#: logdrake:116
+#: logdrake:117
 #, c-format
 msgid "search"
 msgstr "搜索"
 
-#: logdrake:128
+#: logdrake:129
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "日志监视工具"
 
-#: logdrake:130
+#: logdrake:131
 #, c-format
 msgid "Settings"
 msgstr "设置"
 
-#: logdrake:133
+#: logdrake:134
 #, c-format
 msgid "Matching"
 msgstr "匹配"
 
-#: logdrake:134
+#: logdrake:135
 #, c-format
 msgid "but not matching"
 msgstr "不匹配"
 
-#: logdrake:137
+#: logdrake:138
 #, c-format
 msgid "Choose file"
 msgstr "选择文件"
 
-#: logdrake:149
+#: logdrake:150
 #, c-format
 msgid "Calendar"
 msgstr "日历"
 
-#: logdrake:158
+#: logdrake:159
 #, c-format
 msgid "Content of the file"
 msgstr "文件内容"
 
-#: logdrake:162 logdrake:399
+#: logdrake:163 logdrake:407
 #, c-format
 msgid "Mail alert"
 msgstr "邮件提醒"
 
-#: logdrake:169
+#: logdrake:170
 #, c-format
 msgid "The alert wizard has failed unexpectedly:"
 msgstr "提醒向导意外失败:"
 
-#: logdrake:173
+#: logdrake:174
 #, c-format
 msgid "Save"
 msgstr "保存"
@@ -2514,62 +2524,72 @@ msgstr "保存"
 msgid "please wait, parsing file: %s"
 msgstr "请等待, 正在分析文件: %s"
 
-#: logdrake:377
+#: logdrake:244
+#, c-format
+msgid "Sorry, log file isn't available!"
+msgstr ""
+
+#: logdrake:292
+#, c-format
+msgid "Error while opening \"%s\" log file: %s\n"
+msgstr ""
+
+#: logdrake:385
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWW 服务器"
 
-#: logdrake:378
+#: logdrake:386
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "域名解析器"
 
-#: logdrake:379
+#: logdrake:387
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP 服务器"
 
-#: logdrake:380
+#: logdrake:388
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix 邮件服务"
 
-#: logdrake:381
+#: logdrake:389
 #, c-format
 msgid "Samba Server"
 msgstr "Samba 服务器"
 
-#: logdrake:382
+#: logdrake:390
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 服务器"
 
-#: logdrake:383
+#: logdrake:391
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin 服务"
 
-#: logdrake:384
+#: logdrake:392
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd 服务"
 
-#: logdrake:393
+#: logdrake:401
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "配置邮件提醒系统"
 
-#: logdrake:394
+#: logdrake:402
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "停止邮件提醒系统"
 
-#: logdrake:402
+#: logdrake:410
 #, c-format
 msgid "Mail alert configuration"
 msgstr "邮件提醒设定"
 
-#: logdrake:403
+#: logdrake:411
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -2580,61 +2600,61 @@ msgstr ""
 "\n"
 "您可以在这里配置提醒。\n"
 
-#: logdrake:406
+#: logdrake:414
 #, c-format
 msgid "What do you want to do?"
 msgstr "您想做什么?"
 
-#: logdrake:413
+#: logdrake:421
 #, c-format
 msgid "Services settings"
 msgstr "服务设置"
 
-#: logdrake:414
+#: logdrake:422
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "如果选中的服务中有任何一个停止运行, 您将收到提醒"
 
-#: logdrake:421
+#: logdrake:429
 #, c-format
 msgid "Load setting"
 msgstr "负载设置"
 
-#: logdrake:422
+#: logdrake:430
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "当负载超过这个值时您会收到一个警报"
 
-#: logdrake:423
+#: logdrake:431
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "负载"
 
-#: logdrake:428
+#: logdrake:436
 #, c-format
 msgid "Alert configuration"
 msgstr "提醒配置"
 
-#: logdrake:429
+#: logdrake:437
 #, c-format
 msgid "Please enter your email address below "
 msgstr "请在下面输入您的电子邮件地址 "
 
-#: logdrake:430
+#: logdrake:438
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "请输入您想使用的 SMTP 服务器的名称(或 IP 地址)"
 
-#: logdrake:437
+#: logdrake:445
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "“%s”既不是有效的电子邮件, 也不是已存在的本地用户!"
 
-#: logdrake:442
+#: logdrake:450
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -2642,17 +2662,17 @@ msgid ""
 msgstr ""
 "“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
 
-#: logdrake:449
+#: logdrake:457
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "向导已经成功配置了邮件提醒。"
 
-#: logdrake:455
+#: logdrake:463
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "向导已经成功禁用了邮件提醒。"
 
-#: logdrake:514
+#: logdrake:522
 #, c-format
 msgid "Save as.."
 msgstr "另存为..."
@@ -3158,27 +3178,27 @@ msgstr ""
 msgid "Your scanner(s) will not be available on the network."
 msgstr "您的扫描仪将不会在网络上出现。"
 
-#: service_harddrake:137
+#: service_harddrake:131
 #, c-format
 msgid "Some devices in the \"%s\" hardware class were removed:\n"
 msgstr "删除了一些“%s”类别的设备:\n"
 
-#: service_harddrake:138
+#: service_harddrake:132
 #, c-format
 msgid "- %s was removed\n"
 msgstr "- %s 已删除\n"
 
-#: service_harddrake:141
+#: service_harddrake:135
 #, c-format
 msgid "Some devices were added: %s\n"
 msgstr "添加了一些设备: %s\n"
 
-#: service_harddrake:142
+#: service_harddrake:136
 #, c-format
 msgid "- %s was added\n"
 msgstr "- %s 已添加\n"
 
-#: service_harddrake:265
+#: service_harddrake:259
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"