Update Chinese (Simplified) translation from Tx

1 files changed, 107 insertions, 86 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 20ca1b3..c708317 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,17 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Translators:
-# 周潇波 <zhouxiaobo.500@gmail.com>, 2014
+# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014
 # xiao wenming <xwm-citcc5@hotmail.com>, 2015
 # zhangmin <zm1990s@gmail.com>, 2014
-# zwpwjwtz <zwpwjwtz@126.com>, 2016
-# 周潇波 <zhouxiaobo.500@gmail.com>, 2014
+# zwpwjwtz <zwpwjwtz@126.com>, 2016-2017
+# xiaobo zhou <zhouxiaobo.500@gmail.com>, 2014
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
 "Report-Msgid-Bugs-To: http://bugs.mageia.org\n"
-"POT-Creation-Date: 2016-01-22 00:27+0100\n"
-"PO-Revision-Date: 2016-03-05 12:45+0000\n"
+"POT-Creation-Date: 2017-07-22 08:50+0200\n"
+"PO-Revision-Date: 2017-10-22 14:04+0000\n"
 "Last-Translator: zwpwjwtz <zwpwjwtz@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/MageiaLinux/mageia/"
 "language/zh_CN/)\n"
@@ -23,202 +23,219 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:67
+#: ../usr/share/mageiawelcome/mageiawelcome.py:69
 msgid "Welcome to Mageia!"
 msgstr "欢迎来到Mageial！"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:68
+#: ../usr/share/mageiawelcome/mageiawelcome.py:70
 msgid "Show this window at startup"
 msgstr "在启动时显示该窗口"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:69
+#: ../usr/share/mageiawelcome/mageiawelcome.py:71
 msgid "Close"
 msgstr "关闭"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:72
+#: ../usr/share/mageiawelcome/mageiawelcome.py:74
 msgid "kernel:"
 msgstr "内核："
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:74
+#: ../usr/share/mageiawelcome/mageiawelcome.py:76
 msgid "arch:"
 msgstr "架构："
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:76
+#: ../usr/share/mageiawelcome/mageiawelcome.py:78
 msgid "Desktop:"
 msgstr "桌面（环境）："
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:78
+#: ../usr/share/mageiawelcome/mageiawelcome.py:80
 msgid "Welcome"
 msgstr "欢迎～"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:79
+#: ../usr/share/mageiawelcome/mageiawelcome.py:81
 msgid "Welcome<!--user//-->"
 msgstr "欢迎 <!--用户//--> "
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:81
+#: ../usr/share/mageiawelcome/mageiawelcome.py:83
 msgid ""
 "<p>Thank you for choosing Mageia!</p><p>We have put in a lot of effort to "
 "provide you with the best possible system. We hope you will have a good "
 "experience with Mageia. If you feel that our project is a good idea, we "
 "would also appreciate any contribution you can make to it for next versions."
-"</p><p>To find out how you can help <a class='weblink' href='http://www."
-"mageia.org/en/contribute/'>click here</a>.</p><p>Don't forget to tell your "
+"</p><p>To find out how you can help <a class='weblink' href='https://www."
+"mageia.org/contribute/'>click here</a>.</p><p>Don't forget to tell your "
 "friends about Mageia.</p>"
 msgstr ""
-"<p>感谢您选择 Mageia！</p><p>为了呈现给您一个完美的系统，我们为之付出了很多努"
-"力。我们希望您能够享受使用 Mageia 的每一天！如果您觉得用起来不错，感谢您能够"
-"为我们一下个版本作出贡献～</p><p>来看看如何帮助我们<a class='weblink' "
-"href='http://www.mageia.org/en/contribute/'>点这里</a>。</p><p>别忘了告诉你的"
-"碰你正在用 Mageia 哦～</p>"
+"<p>感谢您选择 Mageia！</p><p>我们竭尽最大努力为您提供一个优秀的系统，并希望"
+"Mageia能给您带来良好的体验。如果您觉得我们的Mageia计划还不错，那么也希望您能"
+"加入到下一个版本的开发中来。</p><p><a class='weblink' href='https://www."
+"mageia.org/contribute/'>点击这里</a>查看如何为Mageia添砖加瓦。</p><p>记得和您"
+"的好友推荐Mageia哦！</p>"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:82
+#: ../usr/share/mageiawelcome/mageiawelcome.py:84
 msgid "Mageia Control Center"
 msgstr "Mageia 控制中心"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:83
+#: ../usr/share/mageiawelcome/mageiawelcome.py:85
 msgid "Configure media sources and update system"
 msgstr "配置媒介源并更新系统"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:84
+#: ../usr/share/mageiawelcome/mageiawelcome.py:86
 msgid "Install and remove software"
 msgstr "添加/删除 软件"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:85
+#: ../usr/share/mageiawelcome/mageiawelcome.py:87
 msgid "Documentation"
 msgstr "文档"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:86
+#: ../usr/share/mageiawelcome/mageiawelcome.py:88
+#: ../usr/share/mageiawelcome/mageiawelcome.py:102
 msgid "https://wiki.mageia.org/en/Documentation"
 msgstr "https://wiki.mageia.org/en/Documentation"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:87
+#: ../usr/share/mageiawelcome/mageiawelcome.py:89
 msgid "New Features"
 msgstr "新特性"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:88
+#. the {0} will be replaced by the release number
+#: ../usr/share/mageiawelcome/mageiawelcome.py:91
+#, python-brace-format
+msgid "https://doc.mageia.org/mcc/{0}/en/content/index.html"
+msgstr "https://doc.mageia.org/mcc/{0}/zh_CN/content/index.html"
+
+#: ../usr/share/mageiawelcome/mageiawelcome.py:92
 msgid "Release Notes"
 msgstr "版本通告"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:89
+#: ../usr/share/mageiawelcome/mageiawelcome.py:93
 msgid "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
 msgstr "https://wiki.mageia.org/en/Mageia_6_Release_Notes"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:90
+#: ../usr/share/mageiawelcome/mageiawelcome.py:94
 msgid "Errata"
 msgstr "勘误表"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:91
+#: ../usr/share/mageiawelcome/mageiawelcome.py:95
 msgid "https://wiki.mageia.org/en/Mageia_6_Errata"
 msgstr "https://wiki.mageia.org/en/Mageia_6_Errata"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:92
+#: ../usr/share/mageiawelcome/mageiawelcome.py:96
 msgid "Newcomers Howto"
 msgstr "新手指南"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:93
+#: ../usr/share/mageiawelcome/mageiawelcome.py:97
 msgid "https://wiki.mageia.org/en/Newcomers_start_here"
 msgstr "https://wiki.mageia.org/en/Newcomers_start_here"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:94
+#: ../usr/share/mageiawelcome/mageiawelcome.py:98
 msgid "Support"
 msgstr "支持"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:95
+#: ../usr/share/mageiawelcome/mageiawelcome.py:99
 msgid "Forums"
 msgstr "论坛"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:96
+#: ../usr/share/mageiawelcome/mageiawelcome.py:100
+msgid "https://forums.mageia.org/en/"
+msgstr "https://forums.mageia.org/en/"
+
+#: ../usr/share/mageiawelcome/mageiawelcome.py:101
 msgid "Wiki"
 msgstr "维基"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:97
+#: ../usr/share/mageiawelcome/mageiawelcome.py:103
 msgid "Chat Room"
 msgstr "聊天室"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:98
+#: ../usr/share/mageiawelcome/mageiawelcome.py:104
 msgid "Bugzilla"
 msgstr "Bugzilla 漏洞追踪"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:99
+#: ../usr/share/mageiawelcome/mageiawelcome.py:105
 msgid "Community"
 msgstr "社区"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:100
+#: ../usr/share/mageiawelcome/mageiawelcome.py:106
 msgid "Community Center"
 msgstr "社区中心"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:101
+#: ../usr/share/mageiawelcome/mageiawelcome.py:107
 msgid "Contribute"
 msgstr "贡献"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:102
+#: ../usr/share/mageiawelcome/mageiawelcome.py:108
 msgid "Donations"
 msgstr "捐赠"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:103
+#: ../usr/share/mageiawelcome/mageiawelcome.py:109
 msgid "Join us!"
 msgstr "加入我们～"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:104
+#: ../usr/share/mageiawelcome/mageiawelcome.py:110
 msgid ""
 "Mageia Control Center (aka drakconf) is a set of tools to help you configure "
 "your system"
 msgstr "Mageia 控制中心 (drakconf) 是一系列帮助您配置系统的工具"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:105
+#: ../usr/share/mageiawelcome/mageiawelcome.py:111
 msgid "Software Management"
 msgstr "软件管理"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:106
+#. the {0} will be replaced by the release number
+#: ../usr/share/mageiawelcome/mageiawelcome.py:113
+#, python-brace-format
+msgid "https://doc.mageia.org/mcc/{0}/en/content/software-management.html"
+msgstr "https://doc.mageia.org/mcc/{0}/zh_CN/content/software-management.html"
+
+#: ../usr/share/mageiawelcome/mageiawelcome.py:114
 msgid "Online administration"
 msgstr "在线管理"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:107
+#: ../usr/share/mageiawelcome/mageiawelcome.py:115
 msgid "Hardware"
 msgstr "硬件"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:108
+#: ../usr/share/mageiawelcome/mageiawelcome.py:116
 msgid "Network & Internet"
 msgstr "网络"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:109
-#: ../usr/share/mageiawelcome/mageiawelcome.py:139
+#: ../usr/share/mageiawelcome/mageiawelcome.py:117
+#: ../usr/share/mageiawelcome/mageiawelcome.py:148
 msgid "System"
 msgstr "系统"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:110
+#: ../usr/share/mageiawelcome/mageiawelcome.py:118
 msgid "Network Sharing"
 msgstr "网络共享"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:111
+#: ../usr/share/mageiawelcome/mageiawelcome.py:119
 msgid "Local Disks"
 msgstr "本地磁盘"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:112
+#: ../usr/share/mageiawelcome/mageiawelcome.py:120
 msgid "Security"
 msgstr "安全"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:113
+#: ../usr/share/mageiawelcome/mageiawelcome.py:121
 msgid "Boot"
 msgstr "引导"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:114
+#: ../usr/share/mageiawelcome/mageiawelcome.py:122
 msgid "Administrator password is needed"
 msgstr "需要管理员密码"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:115
+#: ../usr/share/mageiawelcome/mageiawelcome.py:123
 msgid "User password is needed"
 msgstr "需要用户密码"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:116
+#: ../usr/share/mageiawelcome/mageiawelcome.py:124
 msgid "Configure media sources ..."
 msgstr "正在配置媒介源。。。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:117
+#: ../usr/share/mageiawelcome/mageiawelcome.py:125
 msgid "Mageia official repositories contain:"
 msgstr "Mageia 官方内容库"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:118
+#: ../usr/share/mageiawelcome/mageiawelcome.py:126
 msgid ""
 "<span class='label green'>core</span> - the free-open-source packages, i.e. "
 "software licensed under a free-open-source license"
@@ -226,7 +243,7 @@ msgstr ""
 "<span class='label green'>核心</span> 开放源软件包。例如：基于开放源代码许可"
 "证的软件"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:119
+#: ../usr/share/mageiawelcome/mageiawelcome.py:127
 msgid ""
 "<span class='label red'>non-free</span> - some programs which are not free, "
 "or closed source. For example this repository includes Nvidia and ATI "
@@ -235,7 +252,7 @@ msgstr ""
 "<span class='label red'>非自由软件</span> 一些不免费或闭源软件。例如软件仓库"
 "内的Nvidia和ATI的显卡专有驱动，固件以及不同的WiFi硬件驱动。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:120
+#: ../usr/share/mageiawelcome/mageiawelcome.py:128
 msgid ""
 "<span class='label red'>tainted</span> - includes packages released under a "
 "free license. However, they may infringe on patents and copyright laws in "
@@ -246,27 +263,27 @@ msgstr ""
 "某些国家它们可能会侵犯专利权和版权法，例如播放很多音视频文件所需的多媒体解码"
 "器； 播放商业视频DVD的软件包，等等。 "
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:121
+#: ../usr/share/mageiawelcome/mageiawelcome.py:129
 msgid "<strong>Note!</strong> non-free and tainted are not enabled by default."
 msgstr "<strong>注意！</strong> non-free 和 tainted 默认不开启。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:122
+#: ../usr/share/mageiawelcome/mageiawelcome.py:130
 msgid "Edit software sources"
 msgstr "编辑软件源"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:123
+#: ../usr/share/mageiawelcome/mageiawelcome.py:131
 msgid "... and update system"
 msgstr "...以及更新系统"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:124
+#: ../usr/share/mageiawelcome/mageiawelcome.py:132
 msgid "Check system updates"
 msgstr "检查系统更新"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:125
+#: ../usr/share/mageiawelcome/mageiawelcome.py:133
 msgid "GUI - RPMDrake"
 msgstr "图形用户界面- RPMDrake"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:126
+#: ../usr/share/mageiawelcome/mageiawelcome.py:134
 msgid ""
 "<span class='label green'>Rpmdrake</span> is a program for installing, "
 "uninstalling and updating packages. It is the graphical user interface of "
@@ -275,79 +292,83 @@ msgstr ""
 "<span class='label green'>Rpmdrake</span>是一个安装、卸载、更新软件包的程序。"
 "它是<span class='label green'>urpmi</span>的图形界面。"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:127
+#: ../usr/share/mageiawelcome/mageiawelcome.py:135
 msgid "read more (wiki)"
 msgstr "了解更多 (wiki)"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:128
+#: ../usr/share/mageiawelcome/mageiawelcome.py:136
+msgid "https://wiki.mageia.org/en/URPMI"
+msgstr "https://wiki.mageia.org/en/URPMI"
+
+#: ../usr/share/mageiawelcome/mageiawelcome.py:137
 msgid "RPMdrake"
 msgstr "RPMdrake"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:129
+#: ../usr/share/mageiawelcome/mageiawelcome.py:138
 msgid "URPMI - from command line"
 msgstr "URPMI - 使用命令行"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:130
+#: ../usr/share/mageiawelcome/mageiawelcome.py:139
 msgid "Terminal"
 msgstr "终端"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:131
+#: ../usr/share/mageiawelcome/mageiawelcome.py:140
 msgid "This is just small selection of popular packages, for more run"
 msgstr "这仅仅是一个关于流行软件包的小节，要了解更多信息请运行"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:132
+#: ../usr/share/mageiawelcome/mageiawelcome.py:141
 msgid "Featured"
 msgstr "特征"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:133
+#: ../usr/share/mageiawelcome/mageiawelcome.py:142
 msgid "Games"
 msgstr "游戏"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:134
+#: ../usr/share/mageiawelcome/mageiawelcome.py:143
 msgid "Internet"
 msgstr "互联网"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:135
+#: ../usr/share/mageiawelcome/mageiawelcome.py:144
 msgid "Video"
 msgstr "视频"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:136
+#: ../usr/share/mageiawelcome/mageiawelcome.py:145
 msgid "Audio"
 msgstr "音频"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:137
+#: ../usr/share/mageiawelcome/mageiawelcome.py:146
 msgid "Office"
 msgstr "办公"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:138
+#: ../usr/share/mageiawelcome/mageiawelcome.py:147
 msgid "Graphics"
 msgstr "图形"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:140
+#: ../usr/share/mageiawelcome/mageiawelcome.py:149
 msgid "Programming"
 msgstr "开发"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:141
+#: ../usr/share/mageiawelcome/mageiawelcome.py:150
 msgid "Selected packages:"
 msgstr "选择包"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:142
+#: ../usr/share/mageiawelcome/mageiawelcome.py:151
 msgid "Install selected"
 msgstr "安装所选内容"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:143
+#: ../usr/share/mageiawelcome/mageiawelcome.py:152
 msgid "You can always launch MageiaWelcome from menu"
 msgstr "您可以从菜单启动Mageia欢迎中心"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:145
+#: ../usr/share/mageiawelcome/mageiawelcome.py:154
 msgid "Applications"
 msgstr "应用程序"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:148
+#: ../usr/share/mageiawelcome/mageiawelcome.py:157
 msgid "Be sure you have enabled <a>online repositories</a>"
 msgstr "请确保已打开 <a>在线源</a>"
 
-#: ../usr/share/mageiawelcome/mageiawelcome.py:160
+#: ../usr/share/mageiawelcome/mageiawelcome.py:169
 msgid "About"
 msgstr "关于"