1 files changed, 69 insertions, 53 deletions
diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index dd3a1aa97..803e630b5 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: 2011-05-17 17:47+0200\n"
+"POT-Creation-Date: 2011-12-04 03:44+0200\n"
 "PO-Revision-Date: 2009-04-09 11:56+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: Mageia i18n Team <cooker-i18n@mandrivalinux.org>\n"
@@ -18,12 +18,12 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: display_help:54 display_help:59 drakbug:186 drakperm:136
+#: display_help:54 display_help:59 drakbug:173 drakperm:136
 #, c-format
 msgid "Help"
 msgstr "帮助"
 
-#: display_help:67 drakbug:191 drakfont:506
+#: display_help:67 drakbug:178 drakfont:506
 #, c-format
 msgid "Close"
 msgstr "关闭"
@@ -77,10 +77,9 @@ msgstr "详细"
 msgid "Silent"
 msgstr "静默"
 
-#: drakboot:137 drakbug:263 drakdvb:57 drakfont:681 drakperm:376 drakperm:386
-#: drakups:27 harddrake2:537 localedrake:45 notify-x11-free-driver-switch:18
-#: scannerdrake:51 scannerdrake:54 scannerdrake:297 scannerdrake:302
-#: scannerdrake:954
+#: drakboot:137 drakbug:250 drakdvb:57 drakfont:681 drakperm:376 drakperm:386
+#: drakups:27 harddrake2:537 localedrake:45 scannerdrake:51 scannerdrake:54
+#: scannerdrake:297 scannerdrake:302 scannerdrake:954
 #, c-format
 msgid "Warning"
 msgstr "警告"
@@ -169,67 +168,67 @@ msgstr ""
 "请选择视频模式, 该模式将应用到下面所选的每个启动项。\n"
 "请确定您的视频卡支持您所选的模式。"
 
-#: drakbug:65 drakbug:153
+#: drakbug:52 drakbug:140
 #, c-format
 msgid "The \"%s\" program has crashed with the following error:"
 msgstr "“%s”程序已崩溃，并抛出如下错误："
 
-#: drakbug:76
+#: drakbug:62
 #, fuzzy, c-format
 msgid "%s Bug Report Tool"
 msgstr "Mageia 故障报告工具"
 
-#: drakbug:81
+#: drakbug:67
 #, fuzzy, c-format
 msgid "%s Control Center"
 msgstr "Mageia 控制中心"
 
-#: drakbug:82
+#: drakbug:68
 #, c-format
 msgid "First Time Wizard"
 msgstr "初次使用向导"
 
-#: drakbug:83
+#: drakbug:69
 #, c-format
 msgid "Synchronization tool"
 msgstr "同步工具"
 
-#: drakbug:84 drakbug:219
+#: drakbug:70 drakbug:206
 #, c-format
 msgid "Standalone Tools"
 msgstr "独立工具"
 
-#: drakbug:86 drakbug:87
+#: drakbug:72 drakbug:73
 #, fuzzy, c-format
 msgid "%s Online"
 msgstr "Mageia 在线"
 
-#: drakbug:88
+#: drakbug:74
 #, c-format
 msgid "Remote Control"
 msgstr "远程控制"
 
-#: drakbug:89
+#: drakbug:75
 #, c-format
 msgid "Software Manager"
 msgstr "软件管理器"
 
-#: drakbug:90
+#: drakbug:76
 #, c-format
 msgid "Windows Migration tool"
 msgstr "Windows 迁移工具"
 
-#: drakbug:91
+#: drakbug:77
 #, c-format
 msgid "Configuration Wizards"
 msgstr "配置向导"
 
-#: drakbug:113
+#: drakbug:99
 #, fuzzy, c-format
 msgid "Select %s Tool:"
 msgstr "选择 Mageia 工具:"
 
-#: drakbug:114
+#: drakbug:100
 #, c-format
 msgid ""
 "or Application Name\n"
@@ -238,37 +237,37 @@ msgstr ""
 "应用程序名\n"
 "(或完整路径): "
 
-#: drakbug:117
+#: drakbug:103
 #, c-format
 msgid "Find Package"
 msgstr "查找软件包"
 
-#: drakbug:118
+#: drakbug:104
 #, fuzzy, c-format
 msgid "Browse"
 msgstr "浏览"
 
-#: drakbug:120
+#: drakbug:106
 #, c-format
 msgid "Package: "
 msgstr "软件包: "
 
-#: drakbug:121
+#: drakbug:107
 #, c-format
 msgid "Kernel:"
 msgstr "内核: "
 
-#: drakbug:152
+#: drakbug:139
 #, c-format
 msgid "The \"%s\" program has segfaulted with the following error:"
 msgstr "“%s”程序已崩溃，并抛出如下错误："
 
-#: drakbug:156
-#, c-format
-msgid "Its GDB trace is:"
-msgstr "GDB 跟踪在此："
+#: drakbug:144
+#, fuzzy, c-format
+msgid "Used theme: %s"
+msgstr "用户: %s"
 
-#: drakbug:159
+#: drakbug:146
 #, c-format
 msgid ""
 "To submit a bug report, click on the report button.  \n"
@@ -279,7 +278,7 @@ msgstr ""
 "它会打开一个浏览器窗口, 进入 %s, 那里有一个表格需要您填写。上面显示的信息将被"
 "传送到服务器"
 
-#: drakbug:161
+#: drakbug:148
 #, c-format
 msgid ""
 "It would be very useful to attach to your report the output of the following "
@@ -289,37 +288,37 @@ msgid_plural ""
 "commands: %s."
 msgstr[0] "如果在您的报告中列出以下命令的输出，可能会更有帮助一些：%s。"
 
-#: drakbug:164
+#: drakbug:151
 #, c-format
 msgid "'%s'"
 msgstr "“%s”"
 
-#: drakbug:167
+#: drakbug:154
 #, c-format
 msgid "You should also attach the following files: %s as well as %s."
 msgstr "您还应该附加下列文件：%s 和 %s。"
 
-#: drakbug:174
+#: drakbug:161
 #, c-format
 msgid "Please describe what you were doing when it crashed:"
 msgstr "请描述崩溃时您正在执行的操作："
 
-#: drakbug:190
+#: drakbug:177
 #, c-format
 msgid "Report"
 msgstr "报告"
 
-#: drakbug:226
+#: drakbug:213
 #, c-format
 msgid "Not installed"
 msgstr "没有安装"
 
-#: drakbug:239
+#: drakbug:226
 #, c-format
 msgid "Package not installed"
 msgstr "软件包未安装"
 
-#: drakbug:264
+#: drakbug:251
 #, c-format
 msgid ""
 "You must type in what you were doing when this bug happened in order to "
@@ -327,7 +326,7 @@ msgid ""
 msgstr ""
 "您必须输入在此错误发生时您正在执行的操作，以便让我们可以重现此错误并修复它。"
 
-#: drakbug:265
+#: drakbug:252
 #, c-format
 msgid "Thanks."
 msgstr "感谢。"
@@ -696,8 +695,8 @@ msgstr "Ghostscript"
 
 #: drakfont:554
 #, c-format
-msgid "OpenOffice.org"
-msgstr "OpenOffice.org"
+msgid "LibreOffice"
+msgstr ""
 
 #: drakfont:555
 #, c-format
@@ -2692,12 +2691,15 @@ msgstr "向导已经成功禁用了邮件提醒。"
 msgid "Save as.."
 msgstr "另存为..."
 
+#: notify-x11-free-driver-switch:18 service_harddrake:454
+#, c-format
+msgid "Display driver setup"
+msgstr ""
+
 #: notify-x11-free-driver-switch:20
 #, c-format
-msgid ""
-"The proprietary driver for your graphic card cannot be found, the system is "
-"now using the free software driver (%s)."
-msgstr "找不到您显示卡的私有驱动程序，系统现在正使用自有软件驱动程序(%s)。"
+msgid "The display driver has been automatically switched to '%s'."
+msgstr ""
 
 #: notify-x11-free-driver-switch:21
 #, c-format
@@ -3223,7 +3225,7 @@ msgstr "无法安装共享您的扫描仪所需的软件包。"
 
 #: service_harddrake:153
 #, fuzzy, c-format
-msgid "The graphic card '%s' is no more supported by the '%s' driver"
+msgid "The graphics card '%s' is no longer supported by driver '%s'"
 msgstr "%2$s 版本不支持 %1$s。"
 
 #: service_harddrake:163
@@ -3233,7 +3235,7 @@ msgstr ""
 
 #: service_harddrake:254
 #, c-format
-msgid "The proprietary kernel driver was not found for '%s' X.org driver"
+msgid "The proprietary kernel driver was not found for X.org driver '%s'"
 msgstr ""
 
 #: service_harddrake:293
@@ -3271,12 +3273,12 @@ msgstr "您想要运行相应的配置工具吗?"
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"
 
-#: service_harddrake:430
+#: service_harddrake:433 service_harddrake:438
 #, c-format
 msgid "Display driver issue"
 msgstr ""
 
-#: service_harddrake:431
+#: service_harddrake:434
 #, c-format
 msgid ""
 "The display driver currently configured requires you to use the 'nokmsboot' "
@@ -3285,17 +3287,20 @@ msgid ""
 "specified."
 msgstr ""
 
-#: service_harddrake:445
+#: service_harddrake:439
 #, c-format
-msgid "Display driver setup"
+msgid ""
+"Detected a loaded display driver kernel module which conflicts with the "
+"driver the X server is configured to use. Startup of the X server may now "
+"fail."
 msgstr ""
 
-#: service_harddrake:445
+#: service_harddrake:454
 #, c-format
 msgid "The system has to be rebooted due to a display driver change."
 msgstr ""
 
-#: service_harddrake:446
+#: service_harddrake:455
 #, c-format
 msgid "Press Cancel within %d seconds to abort."
 msgstr ""
@@ -3328,6 +3333,17 @@ msgstr "语言和国家配置"
 msgid "Regional Settings"
 msgstr "区域设置"
 
+#~ msgid "Its GDB trace is:"
+#~ msgstr "GDB 跟踪在此："
+
+#~ msgid "OpenOffice.org"
+#~ msgstr "OpenOffice.org"
+
+#~ msgid ""
+#~ "The proprietary driver for your graphic card cannot be found, the system "
+#~ "is now using the free software driver (%s)."
+#~ msgstr "找不到您显示卡的私有驱动程序，系统现在正使用自有软件驱动程序(%s)。"
+
 #, fuzzy
 #~ msgid "Copyright (C) %s by Mageia"
 #~ msgstr "版权 (C) %s Mageia"