sync with code

1 files changed, 118 insertions, 159 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a32a6d18..0c232f57 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,6 +1,6 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR Free Software Foundation, Inc.
-# 
+#
 # Translators:
 # Jesse Kuang <kjx@mandrakesoft.com>, 2001
 # Shiyu Tang <shiyutang@netscape.net>, 2003
@@ -10,14 +10,15 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-05-11 21:51+0200\n"
+"POT-Creation-Date: 2016-04-15 09:45+0200\n"
 "PO-Revision-Date: 2014-05-12 08:51+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/"
+"language/zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../control-center:93
@@ -35,8 +36,7 @@ msgstr "%s 控制中心"
 msgid "Loading... Please wait"
 msgstr "正在加载...请稍候"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:154 ../control-center:158
 #, c-format
 msgid "Software Management"
@@ -53,8 +53,7 @@ msgstr "其它"
 msgid "Server wizards"
 msgstr "服务器向导"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:182 ../control-center:185
 #, c-format
 msgid "Sharing"
@@ -112,8 +111,7 @@ msgstr "配置安装服务器"
 msgid "Set up server for network installations of %s"
 msgstr "设置 %s 的网络安装服务器"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:211 ../control-center:214
 #, c-format
 msgid "Network Services"
@@ -165,10 +163,8 @@ msgstr "设置服务器时间与外部时间服务器同步"
 msgid "OpenSSH daemon configuration"
 msgstr "OpenSSH 守护程序配置"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
-#. -PO: this message is already translated in drakx domain from which MCC will
-#. searchs it:
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
+#. -PO: this message is already translated in drakx domain from which MCC will searchs it:
 #: ../control-center:241 ../control-center:244 ../lib/MDV/Control_Center.pm:65
 #, c-format
 msgid "Authentication"
@@ -194,8 +190,7 @@ msgstr "配置 LDAP"
 msgid "Configure the LDAP directory services"
 msgstr "配置 LDAP 目录服务"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:263 ../control-center:266
 #, c-format
 msgid "Groupware"
@@ -231,8 +226,7 @@ msgstr "配置邮件"
 msgid "Configure the Internet Mail services"
 msgstr "配置 Internet 邮件服务"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:288 ../control-center:291
 #, c-format
 msgid "Online Administration"
@@ -263,8 +257,7 @@ msgstr "远程管理"
 msgid "Click here if you want to configure a remote box via Web interface"
 msgstr "如果您想要通过 Web 界面配置远程计算机，请单击此处"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:325
 #, c-format
 msgid "Hardware"
@@ -290,8 +283,7 @@ msgstr "配置鼠标和键盘"
 msgid "Configure printing and scanning"
 msgstr "配置打印和扫描"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:367 ../drakxconf:33
 #, c-format
 msgid "Network & Internet"
@@ -307,8 +299,7 @@ msgstr "管理网络设备"
 msgid "Personalize and Secure your network"
 msgstr "个性化与网络安全"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:402
 #, c-format
 msgid "System"
@@ -329,8 +320,7 @@ msgstr "本地化"
 msgid "Administration tools"
 msgstr "管理工具"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:438
 #, c-format
 msgid "Network Sharing"
@@ -351,8 +341,7 @@ msgstr "配置 NFS 共享"
 msgid "Configure WebDAV shares"
 msgstr "配置 WebDAV 共享"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:465 ../control-center:468
 #, c-format
 msgid "Local disks"
@@ -398,15 +387,13 @@ msgstr "ZIP 驱动器"
 msgid "Set where your ZIP drive is mounted"
 msgstr "设置 ZIP 驱动器挂载位置"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:514 ../control-center:517
 #, c-format
 msgid "Security"
 msgstr "安全"
 
-#. -PO: please keep the following message very short: it must fit in the left
-#. list of MCC!!!
+#. -PO: please keep the following message very short: it must fit in the left list of MCC!!!
 #: ../control-center:532
 #, c-format
 msgid "Boot"
@@ -417,117 +404,79 @@ msgstr "启动"
 msgid "Configure boot steps"
 msgstr "配置启动步骤"
 
-#: ../control-center:544
-#, c-format
-msgid "Boot look'n feel"
-msgstr "启动观感"
-
-#: ../control-center:561
+#: ../control-center:552
 #, c-format
 msgid "Additional wizards"
 msgstr "额外向导"
 
-#: ../control-center:616 ../control-center:617 ../control-center:618
-#: ../control-center:633
-#, c-format
-msgid "_Options"
-msgstr "选项(_O)"
-
-#: ../control-center:616
-#, c-format
-msgid "Display _Logs"
-msgstr "显示日志(_L)"
-
-#: ../control-center:617
-#, c-format
-msgid "_Embedded Mode"
-msgstr "嵌入模式(_E)"
-
-#: ../control-center:618
-#, c-format
-msgid "Expert mode in _wizards"
-msgstr "在向导中使用专家模式(_W)"
-
-#: ../control-center:628 ../control-center:629
+#: ../control-center:621
 #, c-format
 msgid "_File"
 msgstr "文件(_F)"
 
-#: ../control-center:629
+#: ../control-center:622
 #, c-format
 msgid "_Quit"
 msgstr "退出(_Q)"
 
-#. -PO: "<control>" must _NOT_ be translated. This is a keyboard shortcut for
-#. "Quit".
-#. -PO: you just have to select the proper letter for your language (eg:
-#. english: "Quit" => "Q")
+#. -PO: "<control>" must _NOT_ be translated. This is a keyboard shortcut for "Quit".
+#. -PO: you just have to select the proper letter for your language (eg: english: "Quit" => "Q")
 #: ../control-center:632
 #, c-format
 msgid "<control>Q"
 msgstr "<control>Q"
 
-#: ../control-center:632
-#, c-format
-msgid "Quit"
-msgstr "退出"
-
-#: ../control-center:653 ../control-center:656 ../control-center:669
+#: ../control-center:626
 #, c-format
-msgid "_Themes"
-msgstr "主题(_T)"
-
-#: ../control-center:659
-#, c-format
-msgid ""
-"This action will restart the control center.\n"
-"Any change not applied will be lost."
-msgstr "该操作将重新启动控制中心。\n没有应用的更改都将会丢失。"
+msgid "_Options"
+msgstr "选项(_O)"
 
-#: ../control-center:669
+#: ../control-center:627 ../control-center:639
 #, c-format
-msgid "_More themes"
-msgstr "更多主题(_M)"
+msgid "Display _Logs"
+msgstr "显示日志(_L)"
 
-#: ../control-center:671 ../control-center:672 ../control-center:673
-#: ../control-center:674 ../control-center:675 ../control-center:676
-#: ../control-center:679
+#: ../control-center:628 ../control-center:629
 #, c-format
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: ../control-center:672 ../control-center:673 ../control-center:674
-#: ../control-center:675
-#, c-format
-msgid "Help"
-msgstr "帮助"
+#: ../control-center:629
+#, fuzzy, c-format
+msgid "<control>H"
+msgstr "<control>Q"
 
-#: ../control-center:673
+#: ../control-center:630
 #, c-format
 msgid "_Release notes"
 msgstr "版本注解(_R)"
 
-#: ../control-center:674
+#: ../control-center:631
 #, c-format
 msgid "What's _New?"
 msgstr "新增内容(_N)"
 
-#: ../control-center:675
+#: ../control-center:632
 #, c-format
 msgid "_Errata"
 msgstr "勘误(_E)"
 
-#: ../control-center:676
+#: ../control-center:633
 #, c-format
 msgid "_Report Bug"
 msgstr "故障报告(_R)"
 
-#: ../control-center:679
+#: ../control-center:636
 #, c-format
 msgid "_About..."
 msgstr "关于(_A)..."
 
-#: ../control-center:741
+#: ../control-center:649
+#, c-format
+msgid "Expert mode in _wizards"
+msgstr "在向导中使用专家模式(_W)"
+
+#: ../control-center:727
 #, c-format
 msgid "Cancel"
 msgstr "取消"
@@ -542,15 +491,7 @@ msgstr "%s 控制中心 %s [位于 %s]"
 msgid "Error"
 msgstr "错误"
 
-#: ../control-center:1043
-#, c-format
-msgid ""
-"There's a bug in translations of your language (%s)\n"
-"\n"
-"Please report that bug."
-msgstr "您所用的语言(%s)中有翻译错误\n\n请向我们报告。"
-
-#: ../control-center:1109
+#: ../control-center:1096
 #, c-format
 msgid "Impossible to run unknown '%s' program"
 msgstr "无法运行未知的“%s”程序"
@@ -585,27 +526,7 @@ msgstr "警告"
 msgid "Close"
 msgstr "关闭"
 
-#: ../control-center:1410
-#, c-format
-msgid "More themes"
-msgstr "更多主题"
-
-#: ../control-center:1412
-#, c-format
-msgid "Getting new themes"
-msgstr "获取新的主题"
-
-#: ../control-center:1413
-#, c-format
-msgid "Additional themes"
-msgstr "额外主题"
-
-#: ../control-center:1415
-#, c-format
-msgid "Get additional themes on www.damz.net"
-msgstr "在 www.damz.net 上获取额外主题"
-
-#: ../control-center:1423
+#: ../control-center:1397
 #, c-format
 msgid "About - %s Control Center"
 msgstr "关于 - %s 控制中心"
@@ -630,8 +551,7 @@ msgstr "美工："
 msgid "Helene Durosini"
 msgstr "Helene Durosini"
 
-#. -PO: this is used as "language: translator" in credits part of the about
-#. dialog:
+#. -PO: this is used as "language: translator" in credits part of the about dialog:
 #: ../control-center:1467
 #, c-format
 msgid "- %s: %s\n"
@@ -649,7 +569,8 @@ msgstr "Funda Wang,ShiyuTang, tuhaihe"
 msgid ""
 "_: EMAIL OF TRANSLATORS\n"
 "Your emails"
-msgstr "fundawang@gmail.com,shiyutang_i18n@yahoo.com.cn, 1132321739qq@gmail.com"
+msgstr ""
+"fundawang@gmail.com,shiyutang_i18n@yahoo.com.cn, 1132321739qq@gmail.com"
 
 #: ../control-center:1486
 #, c-format
@@ -657,8 +578,7 @@ msgid "Translator: "
 msgstr "译者："
 
 #. -PO: Here, first %s will be replaced by 'Mageia'
-#. -PO: second %s will be replaced by the version (eg: "Mageia 1 (Free)
-#. Control Center")
+#. -PO: second %s will be replaced by the version (eg: "Mageia 1 (Free) Control Center")
 #: ../control-center:1495
 #, c-format
 msgid "%s %s (%s) Control Center"
@@ -801,17 +721,7 @@ msgstr "设置启动系统"
 msgid "Set up how the system boots"
 msgstr "设置系统引导方式"
 
-#: ../lib/MDV/Control_Center.pm:116
-#, c-format
-msgid "Set up boot graphical theme of system"
-msgstr "设置系统启动主题"
-
-#: ../lib/MDV/Control_Center.pm:117
-#, c-format
-msgid "Select the graphical theme of the system while booting"
-msgstr "选择系统引导时所用的图形主题"
-
-#: ../lib/MDV/Control_Center.pm:126 ../lib/MDV/Control_Center.pm:127
+#: ../lib/MDV/Control_Center.pm:116 ../lib/MDV/Control_Center.pm:117
 #, c-format
 msgid "Share the Internet connection with other local machines"
 msgstr "与其它计算机共享网络连接"
@@ -1269,22 +1179,10 @@ msgid ""
 "\n"
 "\n"
 "Choose which menu you want to configure"
-msgstr "\n\n选择您想要配置的菜单"
-
-#: ../print_launcher.pl:14 ../print_launcher.pl:21
-#, c-format
-msgid "Printing configuration"
-msgstr "打印配置"
-
-#: ../print_launcher.pl:30
-#, c-format
-msgid "Click here to configure the printing system"
-msgstr "单击此处配置打印系统"
-
-#: ../print_launcher.pl:37
-#, c-format
-msgid "Done"
-msgstr "完成"
+msgstr ""
+"\n"
+"\n"
+"选择您想要配置的菜单"
 
 #: ../data/autologin.desktop.in.h:1
 msgid "Autologin"
@@ -1425,3 +1323,64 @@ msgstr "打开Mageia控制中心"
 #: ../polkit/org.mageia.drakxconf.policy.in.h:2
 msgid "Authentication is required to run Mageia Control Center"
 msgstr "需要授权才能打开Mageia控制中心"
+
+#~ msgid "Boot look'n feel"
+#~ msgstr "启动观感"
+
+#~ msgid "_Embedded Mode"
+#~ msgstr "嵌入模式(_E)"
+
+#~ msgid "Quit"
+#~ msgstr "退出"
+
+#~ msgid "_Themes"
+#~ msgstr "主题(_T)"
+
+#~ msgid ""
+#~ "This action will restart the control center.\n"
+#~ "Any change not applied will be lost."
+#~ msgstr ""
+#~ "该操作将重新启动控制中心。\n"
+#~ "没有应用的更改都将会丢失。"
+
+#~ msgid "_More themes"
+#~ msgstr "更多主题(_M)"
+
+#~ msgid "Help"
+#~ msgstr "帮助"
+
+#~ msgid ""
+#~ "There's a bug in translations of your language (%s)\n"
+#~ "\n"
+#~ "Please report that bug."
+#~ msgstr ""
+#~ "您所用的语言(%s)中有翻译错误\n"
+#~ "\n"
+#~ "请向我们报告。"
+
+#~ msgid "More themes"
+#~ msgstr "更多主题"
+
+#~ msgid "Getting new themes"
+#~ msgstr "获取新的主题"
+
+#~ msgid "Additional themes"
+#~ msgstr "额外主题"
+
+#~ msgid "Get additional themes on www.damz.net"
+#~ msgstr "在 www.damz.net 上获取额外主题"
+
+#~ msgid "Set up boot graphical theme of system"
+#~ msgstr "设置系统启动主题"
+
+#~ msgid "Select the graphical theme of the system while booting"
+#~ msgstr "选择系统引导时所用的图形主题"
+
+#~ msgid "Printing configuration"
+#~ msgstr "打印配置"
+
+#~ msgid "Click here to configure the printing system"
+#~ msgstr "单击此处配置打印系统"
+
+#~ msgid "Done"
+#~ msgstr "完成"