sync with code

1 files changed, 55 insertions, 45 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index e2aadc332..73e0f4e5c 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-10-01 09:49+0200\n"
+"POT-Creation-Date: 2008-01-17 14:33+0100\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,8 +21,8 @@ msgstr ""
 msgid "Authentication"
 msgstr "认证"
 
-#: drakauth:36 drakclock:110 drakclock:124 drakfont:214 drakfont:227
-#: drakfont:265 draksplash:169 finish-install:82 logdrake:170 logdrake:445
+#: drakauth:36 drakclock:111 drakclock:125 drakfont:214 drakfont:227
+#: drakfont:265 draksplash:169 finish-install:85 logdrake:170 logdrake:445
 #: logdrake:450 scannerdrake:59 scannerdrake:101 scannerdrake:142
 #: scannerdrake:200 scannerdrake:259 scannerdrake:730 scannerdrake:741
 #: scannerdrake:880 scannerdrake:891 scannerdrake:961
@@ -170,67 +170,67 @@ msgstr ""
 "请选择视频模式, 该模式将应用到下面所选的每个启动项。\n"
 "请确定您的视频卡支持您所选的模式。"
 
-#: drakbug:48 drakbug:113
+#: drakbug:64 drakbug:136
 #, c-format
 msgid "The \"%s\" program has crashed with the following error:"
 msgstr "“%s”程序已崩溃，并抛出如下错误："
 
-#: drakbug:54
+#: drakbug:75
 #, c-format
 msgid "Mandriva Linux Bug Report Tool"
 msgstr "Mandriva Linux 故障报告工具"
 
-#: drakbug:59
+#: drakbug:80
 #, c-format
 msgid "Mandriva Linux Control Center"
 msgstr "Mandriva Linux 控制中心"
 
-#: drakbug:60
+#: drakbug:81
 #, c-format
 msgid "First Time Wizard"
 msgstr "初次使用向导"
 
-#: drakbug:61
+#: drakbug:82
 #, c-format
 msgid "Synchronization tool"
 msgstr "同步工具"
 
-#: drakbug:62 drakbug:186
+#: drakbug:83 drakbug:222
 #, c-format
 msgid "Standalone Tools"
 msgstr "独立工具"
 
-#: drakbug:64 drakbug:65
+#: drakbug:85 drakbug:86
 #, c-format
 msgid "Mandriva Online"
 msgstr "Mandriva 在线"
 
-#: drakbug:66
+#: drakbug:87
 #, c-format
 msgid "Remote Control"
 msgstr "远程控制"
 
-#: drakbug:67
+#: drakbug:88
 #, c-format
 msgid "Software Manager"
 msgstr "软件管理器"
 
-#: drakbug:68
+#: drakbug:89
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows 迁移工具"
 
-#: drakbug:69
+#: drakbug:90
 #, c-format
 msgid "Configuration Wizards"
 msgstr "配置向导"
 
-#: drakbug:91
+#: drakbug:112
 #, c-format
 msgid "Select Mandriva Tool:"
 msgstr "选择 Mandriva 工具:"
 
-#: drakbug:92
+#: drakbug:113
 #, c-format
 msgid ""
 "or Application Name\n"
@@ -239,22 +239,32 @@ msgstr ""
 "应用程序名\n"
 "(或完整路径): "
 
-#: drakbug:95
+#: drakbug:116
 #, c-format
 msgid "Find Package"
 msgstr "查找软件包"
 
-#: drakbug:97
+#: drakbug:118
 #, c-format
 msgid "Package: "
 msgstr "软件包: "
 
-#: drakbug:98
+#: drakbug:119
 #, c-format
 msgid "Kernel:"
 msgstr "内核: "
 
-#: drakbug:121
+#: drakbug:135
+#, fuzzy, c-format
+msgid "The \"%s\" program has segfaulted with the following error:"
+msgstr "“%s”程序已崩溃，并抛出如下错误："
+
+#: drakbug:145
+#, c-format
+msgid "Its gdb trace is:"
+msgstr ""
+
+#: drakbug:153
 #, c-format
 msgid ""
 "To submit a bug report, click on the report button.  \n"
@@ -269,27 +279,27 @@ msgstr ""
 "如果在您的报告中列出 lspcidrake -v 的输出、内核的版本以及 /proc/cpuinfo 的内"
 "容, 可能会更有帮助一些。"
 
-#: drakbug:127 drakperm:134 draksec:440 draksec:442 draksec:461 draksec:463
+#: drakbug:161 drakperm:134 draksec:438 draksec:440 draksec:459 draksec:461
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: drakbug:129
+#: drakbug:163
 #, c-format
 msgid "Report"
 msgstr "报告"
 
-#: drakbug:160 drakfont:517
+#: drakbug:196 drakfont:517
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: drakbug:196
+#: drakbug:232
 #, c-format
 msgid "Not installed"
 msgstr "没有安装"
 
-#: drakbug:209
+#: drakbug:245
 #, c-format
 msgid "Package not installed"
 msgstr "软件包未安装"
@@ -358,27 +368,27 @@ msgstr "服务器:"
 msgid "Timezone"
 msgstr "时区"
 
-#: drakclock:110
+#: drakclock:111
 #, c-format
 msgid "Please enter a valid NTP server address."
 msgstr "请输入有效的 NTP 服务器地址。"
 
-#: drakclock:125
+#: drakclock:126
 #, c-format
 msgid "Could not synchronize with %s."
 msgstr "无法与 %s 同步。"
 
-#: drakclock:126 draksplash:93 logdrake:175 scannerdrake:492
+#: drakclock:127 draksplash:93 logdrake:175 scannerdrake:492
 #, c-format
 msgid "Quit"
 msgstr "退出(Q)"
 
-#: drakclock:127
+#: drakclock:128
 #, c-format
 msgid "Retry"
 msgstr "重试"
 
-#: drakclock:149 drakclock:159
+#: drakclock:151 drakclock:161
 #, c-format
 msgid "Reset"
 msgstr "重置"
@@ -1234,7 +1244,7 @@ msgstr "Root 密码"
 msgid "User password"
 msgstr "用户密码"
 
-#: draksec:314 draksec:363
+#: draksec:314 draksec:360
 #, c-format
 msgid "Software Management"
 msgstr "软件管理"
@@ -1329,32 +1339,32 @@ msgstr "用户"
 msgid "Boot Configuratoin"
 msgstr "启动配置"
 
-#: draksec:364
+#: draksec:361
 #, c-format
 msgid "Hardware"
 msgstr "硬件"
 
-#: draksec:365
+#: draksec:362
 #, c-format
 msgid "Network"
 msgstr "网络"
 
-#: draksec:366
+#: draksec:363
 #, c-format
 msgid "System"
 msgstr "系统"
 
-#: draksec:367
+#: draksec:364
 #, c-format
 msgid "Boot"
 msgstr "启动"
 
-#: draksec:391
+#: draksec:389
 #, c-format
 msgid "Please wait, setting security level..."
 msgstr "请稍候, 正在设置安全级别..."
 
-#: draksec:397
+#: draksec:395
 #, c-format
 msgid "Please wait, setting security options..."
 msgstr "请稍候, 正在设置安全选项..."
@@ -1758,7 +1768,7 @@ msgstr "级别"
 msgid "ACL name"
 msgstr "ACL 名称"
 
-#: drakups:297 finish-install:116
+#: drakups:297 finish-install:119
 #, c-format
 msgid "Password"
 msgstr "密码"
@@ -1805,37 +1815,37 @@ msgstr ""
 "\n"
 "http://www.mandarkelinux.com/zh_CN/hardware.php3"
 
-#: finish-install:43
+#: finish-install:46
 #, c-format
 msgid "Keyboard"
 msgstr "键盘"
 
-#: finish-install:44
+#: finish-install:47
 #, c-format
 msgid "Please, choose your keyboard layout."
 msgstr "请选择您使用的键盘布局。"
 
-#: finish-install:114 finish-install:132 finish-install:144
+#: finish-install:117 finish-install:135 finish-install:147
 #, c-format
 msgid "Encrypted home partition"
 msgstr "加密的主分区"
 
-#: finish-install:114
+#: finish-install:117
 #, c-format
 msgid "Please enter a password for the %s user"
 msgstr "请输入 %s 用户的密码"
 
-#: finish-install:117
+#: finish-install:120
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: finish-install:132
+#: finish-install:135
 #, c-format
 msgid "Creating encrypted home partition"
 msgstr "创建加密的主分区"
 
-#: finish-install:144
+#: finish-install:147
 #, c-format
 msgid "Formatting encrypted home partition"
 msgstr "格式化加密的主分区"