sync with code

1 files changed, 157 insertions, 95 deletions

diff --git a/perl-install/standalone/po/zh_CN.po b/perl-install/standalone/po/zh_CN.po
index 9a8314bdd..750d8aa86 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: 2013-01-13 16:56+0100\n"
+"POT-Creation-Date: 2013-09-29 17:56+0100\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"
@@ -34,8 +34,8 @@ msgid "Authentication"
 msgstr "认证"
 
 #: drakauth:37 drakclock:115 drakclock:131 drakdvb:74 drakfont:213
-#: drakfont:226 drakfont:264 finish-install:134 logdrake:170 logdrake:445
-#: logdrake:450 scannerdrake:57 scannerdrake:99 scannerdrake:140
+#: drakfont:226 drakfont:264 finish-install:136 logdrake:173 logdrake:448
+#: logdrake:453 scannerdrake:57 scannerdrake:99 scannerdrake:140
 #: scannerdrake:198 scannerdrake:257 scannerdrake:727 scannerdrake:738
 #: scannerdrake:877 scannerdrake:888 scannerdrake:958
 #, c-format
@@ -47,17 +47,17 @@ msgstr "错误"
 msgid "No bootloader found, creating a new configuration"
 msgstr "未找到引导程序，创建新配置"
 
-#: drakboot:88 harddrake2:198 harddrake2:199 logdrake:71
+#: drakboot:88 harddrake2:198 harddrake2:199 logdrake:74
 #, c-format
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: drakboot:89 logdrake:77
+#: drakboot:89 logdrake:80
 #, c-format
 msgid "/File/_Quit"
 msgstr "/文件(F)/退出(_Q)"
 
-#: drakboot:89 harddrake2:199 logdrake:77
+#: drakboot:89 harddrake2:199 logdrake:80
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
@@ -175,7 +175,7 @@ msgstr "Mageia 故障报告工具"
 
 #: drakbug:62 drakbug:67 drakbug:72 drakbug:73 drakbug:99 drakfont:523
 #: drakfont:527 drakhelp:53 draksec:110 draksec:146 harddrake2:234
-#: harddrake2:238 logdrake:51
+#: harddrake2:238 logdrake:54
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
@@ -407,7 +407,7 @@ msgstr "请输入有效的 NTP 服务器地址。"
 msgid "Could not synchronize with %s."
 msgstr "无法与 %s 同步。"
 
-#: drakclock:133 drakdvb:149 logdrake:175 scannerdrake:489
+#: drakclock:133 drakdvb:149 logdrake:178 scannerdrake:489
 #, c-format
 msgid "Quit"
 msgstr "退出"
@@ -445,7 +445,7 @@ msgstr "无法获得可用频道的列表"
 #: drakdvb:80 draksec:69 drakups:99 finish-install:109 harddrake2:378
 #: scannerdrake:64 scannerdrake:68 scannerdrake:76 scannerdrake:317
 #: scannerdrake:366 scannerdrake:502 scannerdrake:506 scannerdrake:528
-#: service_harddrake:416
+#: service_harddrake:410
 #, c-format
 msgid "Please wait"
 msgstr "请稍候"
@@ -455,7 +455,7 @@ msgstr "请稍候"
 msgid "Detecting DVB channels, this will take a few minutes"
 msgstr "正在检测 DVB 频道，这一过程将持续几分钟"
 
-#: drakdvb:85 drakfont:572 drakfont:652 drakfont:736 drakups:217 logdrake:175
+#: drakdvb:85 drakfont:572 drakfont:652 drakfont:736 drakups:217 logdrake:178
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -1251,7 +1251,7 @@ msgstr "连接共享"
 msgid "Backups"
 msgstr "备份"
 
-#: draksec:163 logdrake:52
+#: draksec:163 logdrake:55
 #, c-format
 msgid "Logs"
 msgstr "日志"
@@ -1375,7 +1375,7 @@ msgstr "自动检测"
 msgid "Detection in progress"
 msgstr "检测进行中"
 
-#: drakups:118 drakups:157 logdrake:457 logdrake:463
+#: drakups:118 drakups:157 logdrake:460 logdrake:466
 #, c-format
 msgid "Congratulations"
 msgstr "恭喜"
@@ -1510,7 +1510,7 @@ msgstr "级别"
 msgid "ACL name"
 msgstr "ACL 名称"
 
-#: drakups:297 finish-install:199
+#: drakups:297 finish-install:201
 #, c-format
 msgid "Password"
 msgstr "密码"
@@ -1566,27 +1566,27 @@ msgstr "请选择您使用的键盘布局。"
 msgid "Testing your connection..."
 msgstr ""
 
-#: finish-install:197 finish-install:215 finish-install:228
+#: finish-install:199 finish-install:217 finish-install:230
 #, c-format
 msgid "Encrypted home partition"
 msgstr "加密的主分区"
 
-#: finish-install:197
+#: finish-install:199
 #, c-format
 msgid "Please enter a password for the %s user"
 msgstr "请输入 %s 用户的密码"
 
-#: finish-install:200
+#: finish-install:202
 #, c-format
 msgid "Password (again)"
 msgstr "密码(请再输一次)"
 
-#: finish-install:215
+#: finish-install:217
 #, c-format
 msgid "Creating encrypted home partition"
 msgstr "创建加密的主分区"
 
-#: finish-install:228
+#: finish-install:230
 #, c-format
 msgid "Formatting encrypted home partition"
 msgstr "格式化加密的主分区"
@@ -2214,12 +2214,12 @@ msgid "Features"
 msgstr "特性"
 
 #. -PO: please keep all "/" characters !!!
-#: harddrake2:181 logdrake:78
+#: harddrake2:181 logdrake:81
 #, c-format
 msgid "/_Options"
 msgstr "/选项(_O)"
 
-#: harddrake2:182 harddrake2:208 logdrake:80
+#: harddrake2:182 harddrake2:208 logdrake:83
 #, c-format
 msgid "/_Help"
 msgstr "/帮助(_H)"
@@ -2383,220 +2383,220 @@ msgstr "您应该安装下列软件包：%s"
 msgid ", "
 msgstr "、"
 
-#: logdrake:51
+#: logdrake:54
 #, fuzzy, c-format
 msgid "%s Tools Logs"
 msgstr "Mageia 工具日志"
 
-#: logdrake:65
+#: logdrake:68
 #, c-format
 msgid "Show only for the selected day"
 msgstr "仅显示被选择的日期"
 
-#: logdrake:72
+#: logdrake:75
 #, c-format
 msgid "/File/_New"
 msgstr "/文件(F)/新建(_N)"
 
-#: logdrake:72
+#: logdrake:75
 #, c-format
 msgid "<control>N"
 msgstr "<control>N"
 
-#: logdrake:73
+#: logdrake:76
 #, c-format
 msgid "/File/_Open"
 msgstr "/文件(F)/打开(_O)"
 
-#: logdrake:73
+#: logdrake:76
 #, c-format
 msgid "<control>O"
 msgstr "<control>O"
 
-#: logdrake:74
+#: logdrake:77
 #, c-format
 msgid "/File/_Save"
 msgstr "/文件(F)/保存(_S)"
 
-#: logdrake:74
+#: logdrake:77
 #, c-format
 msgid "<control>S"
 msgstr "<control>S"
 
-#: logdrake:75
+#: logdrake:78
 #, c-format
 msgid "/File/Save _As"
 msgstr "/文件(F)/另存为(_A)"
 
-#: logdrake:76
+#: logdrake:79
 #, c-format
 msgid "/File/-"
 msgstr "/文件(F)/-"
 
-#: logdrake:79
+#: logdrake:82
 #, c-format
 msgid "/Options/Test"
 msgstr "/选项(O)/测试"
 
-#: logdrake:81
+#: logdrake:84
 #, c-format
 msgid "/Help/_About..."
 msgstr "/帮助(H)/关于(_A)..."
 
-#: logdrake:110
+#: logdrake:113
 #, c-format
 msgid ""
 "_:this is the auth.log log file\n"
 "Authentication"
 msgstr "身份认证"
 
-#: logdrake:111
+#: logdrake:114
 #, c-format
 msgid ""
 "_:this is the user.log log file\n"
 "User"
 msgstr "用户"
 
-#: logdrake:112
+#: logdrake:115
 #, c-format
 msgid ""
 "_:this is the /var/log/messages log file\n"
 "Messages"
 msgstr "消息"
 
-#: logdrake:113
+#: logdrake:116
 #, c-format
 msgid ""
 "_:this is the /var/log/syslog log file\n"
 "Syslog"
 msgstr "系统日志"
 
-#: logdrake:117
+#: logdrake:120
 #, c-format
 msgid "search"
 msgstr "搜索"
 
-#: logdrake:129
+#: logdrake:132
 #, c-format
 msgid "A tool to monitor your logs"
 msgstr "日志监视工具"
 
-#: logdrake:131
+#: logdrake:134
 #, c-format
 msgid "Settings"
 msgstr "设置"
 
-#: logdrake:134
+#: logdrake:137
 #, c-format
 msgid "Matching"
 msgstr "匹配"
 
-#: logdrake:135
+#: logdrake:138
 #, c-format
 msgid "but not matching"
 msgstr "不匹配"
 
-#: logdrake:138
+#: logdrake:141
 #, c-format
 msgid "Choose file"
 msgstr "选择文件"
 
-#: logdrake:150
+#: logdrake:153
 #, c-format
 msgid "Calendar"
 msgstr "日历"
 
-#: logdrake:159
+#: logdrake:162
 #, c-format
 msgid "Content of the file"
 msgstr "文件内容"
 
-#: logdrake:163 logdrake:407
+#: logdrake:166 logdrake:410
 #, c-format
 msgid "Mail alert"
 msgstr "邮件提醒"
 
-#: logdrake:170
+#: logdrake:173
 #, c-format
 msgid "The alert wizard has failed unexpectedly:"
 msgstr "提醒向导意外失败:"
 
-#: logdrake:174
+#: logdrake:177
 #, c-format
 msgid "Save"
 msgstr "保存"
 
-#: logdrake:222
+#: logdrake:225
 #, c-format
 msgid "please wait, parsing file: %s"
 msgstr "请等待, 正在分析文件: %s"
 
-#: logdrake:244
+#: logdrake:247
 #, c-format
 msgid "Sorry, log file isn't available!"
 msgstr "抱歉，没有可用的日志文件！"
 
-#: logdrake:292
+#: logdrake:295
 #, c-format
 msgid "Error while opening \"%s\" log file: %s\n"
 msgstr "打开日志文件“%s”时出错：%s\n"
 
-#: logdrake:385
+#: logdrake:388
 #, c-format
 msgid "Apache World Wide Web Server"
 msgstr "Apache WWW 服务器"
 
-#: logdrake:386
+#: logdrake:389
 #, c-format
 msgid "Domain Name Resolver"
 msgstr "域名解析器"
 
-#: logdrake:387
+#: logdrake:390
 #, c-format
 msgid "Ftp Server"
 msgstr "FTP 服务器"
 
-#: logdrake:388
+#: logdrake:391
 #, c-format
 msgid "Postfix Mail Server"
 msgstr "Postfix 邮件服务"
 
-#: logdrake:389
+#: logdrake:392
 #, c-format
 msgid "Samba Server"
 msgstr "Samba 服务器"
 
-#: logdrake:390
+#: logdrake:393
 #, c-format
 msgid "SSH Server"
 msgstr "SSH 服务器"
 
-#: logdrake:391
+#: logdrake:394
 #, c-format
 msgid "Webmin Service"
 msgstr "Webmin 服务"
 
-#: logdrake:392
+#: logdrake:395
 #, c-format
 msgid "Xinetd Service"
 msgstr "Xinetd 服务"
 
-#: logdrake:401
+#: logdrake:404
 #, c-format
 msgid "Configure the mail alert system"
 msgstr "配置邮件提醒系统"
 
-#: logdrake:402
+#: logdrake:405
 #, c-format
 msgid "Stop the mail alert system"
 msgstr "停止邮件提醒系统"
 
-#: logdrake:410
+#: logdrake:413
 #, c-format
 msgid "Mail alert configuration"
 msgstr "邮件提醒设定"
 
-#: logdrake:411
+#: logdrake:414
 #, c-format
 msgid ""
 "Welcome to the mail configuration utility.\n"
@@ -2607,71 +2607,71 @@ msgstr ""
 "\n"
 "您可以在这里配置提醒。\n"
 
-#: logdrake:414
+#: logdrake:417
 #, c-format
 msgid "What do you want to do?"
 msgstr "您想做什么?"
 
-#: logdrake:421
+#: logdrake:424
 #, c-format
 msgid "Services settings"
 msgstr "服务设置"
 
-#: logdrake:422
+#: logdrake:425
 #, c-format
 msgid ""
 "You will receive an alert if one of the selected services is no longer "
 "running"
 msgstr "如果选中的服务中有任何一个停止运行, 您将收到提醒"
 
-#: logdrake:429
+#: logdrake:432
 #, c-format
 msgid "Load setting"
 msgstr "负载设置"
 
-#: logdrake:430
+#: logdrake:433
 #, c-format
 msgid "You will receive an alert if the load is higher than this value"
 msgstr "当负载超过这个值时您会收到一个警报"
 
-#: logdrake:431
+#: logdrake:434
 #, c-format
 msgid ""
 "_: load here is a noun, the load of the system\n"
 "Load"
 msgstr "负载"
 
-#: logdrake:436
+#: logdrake:439
 #, c-format
 msgid "Alert configuration"
 msgstr "提醒配置"
 
-#: logdrake:437
+#: logdrake:440
 #, c-format
 msgid "Please enter your email address below "
 msgstr "请在下面输入您的电子邮件地址 "
 
-#: logdrake:438
+#: logdrake:441
 #, c-format
 msgid "and enter the name (or the IP) of the SMTP server you wish to use"
 msgstr "请输入您想使用的 SMTP 服务器的名称(或 IP 地址)"
 
-#: logdrake:440
+#: logdrake:443
 #, fuzzy, c-format
 msgid "Email address"
 msgstr "IP 地址"
 
-#: logdrake:441
+#: logdrake:444
 #, fuzzy, c-format
 msgid "Email server"
 msgstr "Samba 服务器"
 
-#: logdrake:445
+#: logdrake:448
 #, c-format
 msgid "\"%s\" neither is a valid email nor is an existing local user!"
 msgstr "“%s”既不是有效的电子邮件, 也不是已存在的本地用户!"
 
-#: logdrake:450
+#: logdrake:453
 #, c-format
 msgid ""
 "\"%s\" is a local user, but you did not select a local smtp, so you must use "
@@ -2679,22 +2679,22 @@ msgid ""
 msgstr ""
 "“%s”是本地用户, 但是您没有选择本地 SMTP, 所以您必须使用完整的电子邮件地址!"
 
-#: logdrake:457
+#: logdrake:460
 #, c-format
 msgid "The wizard successfully configured the mail alert."
 msgstr "向导已经成功配置了邮件提醒。"
 
-#: logdrake:463
+#: logdrake:466
 #, c-format
 msgid "The wizard successfully disabled the mail alert."
 msgstr "向导已经成功禁用了邮件提醒。"
 
-#: logdrake:522
+#: logdrake:525
 #, c-format
 msgid "Save as.."
 msgstr "另存为..."
 
-#: notify-x11-free-driver-switch:18 service_harddrake:458
+#: notify-x11-free-driver-switch:18 service_harddrake:452
 #, c-format
 msgid "Display driver setup"
 msgstr ""
@@ -3261,27 +3261,27 @@ msgstr "添加了一些设备: %s\n"
 msgid "- %s was added\n"
 msgstr "- %s 已添加\n"
 
-#: service_harddrake:390
+#: service_harddrake:384
 #, c-format
 msgid "Hardware changes in \"%s\" class (%s seconds to answer)"
 msgstr "在“%s”类别更改了硬件(还剩 %s 秒回答)"
 
-#: service_harddrake:391
+#: service_harddrake:385
 #, c-format
 msgid "Do you want to run the appropriate config tool?"
 msgstr "您想要运行相应的配置工具吗?"
 
-#: service_harddrake:416
+#: service_harddrake:410
 #, c-format
 msgid "Hardware probing in progress"
 msgstr "硬件检测进行中"
 
-#: service_harddrake:437 service_harddrake:442
+#: service_harddrake:431 service_harddrake:436
 #, c-format
 msgid "Display driver issue"
 msgstr ""
 
-#: service_harddrake:438
+#: service_harddrake:432
 #, c-format
 msgid ""
 "The display driver currently configured requires you to use the 'nokmsboot' "
@@ -3290,7 +3290,7 @@ msgid ""
 "specified."
 msgstr ""
 
-#: service_harddrake:443
+#: service_harddrake:437
 #, c-format
 msgid ""
 "Detected a loaded display driver kernel module which conflicts with the "
@@ -3298,24 +3298,16 @@ msgid ""
 "fail."
 msgstr ""
 
-#: service_harddrake:458
+#: service_harddrake:452
 #, c-format
 msgid "The system has to be rebooted due to a display driver change."
 msgstr ""
 
-#: service_harddrake:459
+#: service_harddrake:453
 #, c-format
 msgid "Press Cancel within %d seconds to abort."
 msgstr ""
 
-#: ../menu/localedrake-system.desktop.in.h:1
-msgid "System Regional Settings"
-msgstr "系统区域设置"
-
-#: ../menu/localedrake-system.desktop.in.h:2
-msgid "System wide language & country configurator"
-msgstr "系统级语言和国家配置"
-
 #: ../menu/harddrake.desktop.in.h:1
 msgid "HardDrake"
 msgstr "Drak 硬件管理"
@@ -3328,6 +3320,14 @@ msgstr "硬件中心配置/信息工具"
 msgid "Hardware Configuration Tool"
 msgstr "硬件配置工具"
 
+#: ../menu/localedrake-system.desktop.in.h:1
+msgid "System Regional Settings"
+msgstr "系统区域设置"
+
+#: ../menu/localedrake-system.desktop.in.h:2
+msgid "System wide language & country configurator"
+msgstr "系统级语言和国家配置"
+
 #: ../menu/localedrake-user.desktop.in.h:1
 msgid "Regional Settings"
 msgstr "区域设置"
@@ -3336,6 +3336,68 @@ msgstr "区域设置"
 msgid "Language & country configuration"
 msgstr "语言和国家配置"
 
+#: ../polkit/policy/org.mageia.drakauth.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia Authentication Configuration"
+msgstr "邮件提醒设定"
+
+#: ../polkit/policy/org.mageia.drakauth.policy.in.h:2
+msgid "Authentication is required to run Mageia Authentication Configuration"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.drakboot.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia Boot Configuration"
+msgstr "启动配置"
+
+#: ../polkit/policy/org.mageia.drakboot.policy.in.h:2
+msgid "Authentication is required to run Mageia Boot Configuration"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.drakclock.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia Date and Time Configuration"
+msgstr "邮件提醒设定"
+
+#: ../polkit/policy/org.mageia.drakclock.policy.in.h:2
+msgid "Authentication is required to run Mageia Date and Time Configuration"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.drakfont.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia Font Configuration"
+msgstr "语言和国家配置"
+
+#: ../polkit/policy/org.mageia.drakfont.policy.in.h:2
+msgid "Authentication is required to run Mageia Font Configuration"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.draklog.policy.in.h:1
+msgid "Run Mageia Log Viewer"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.draklog.policy.in.h:2
+msgid "Authentication is required to run Mageia Log Viewer"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.drakups.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia UPS Configuration"
+msgstr "UPS 配置"
+
+#: ../polkit/policy/org.mageia.drakups.policy.in.h:2
+msgid "Authentication is required to run Mageia UPS Configuration"
+msgstr ""
+
+#: ../polkit/policy/org.mageia.drakxservices.policy.in.h:1
+#, fuzzy
+msgid "Run Mageia Service Configuration"
+msgstr "图形服务器配置"
+
+#: ../polkit/policy/org.mageia.drakxservices.policy.in.h:2
+msgid "Authentication is required to run Mageia Service Configuration"
+msgstr ""
+
 #~ msgid "Verbose"
 #~ msgstr "详细"