Update Chinese (Simplified) translation from Tx

1 files changed, 31 insertions, 78 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9834104..b98d90a 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,28 +1,25 @@
-#
-# Latest versions of po files are at http://www.mandrivalinux.org/l10n/zh_CN.php3
-#
-#  Chinese messages for userdrake
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Free Software Foundation, Inc.
+# 
+# Translators:
 # Danny Zeng <danny@zeng.com.cn>, 2000
-# Shiyu Tang <shiyutang@netscape.net>, 2003
 # Funda Wang <fundawang@linux.net.cn>, 2003
-# tuhaihe <1132321739qq@gmail.com>, 2013
-#
+# Shiyu Tang <shiyutang@netscape.net>, 2003
+# Dianjin Wang <1132321739qq@gmail.com>, 2013
+# xiao wenming <xwm-citcc5@hotmail.com>, 2015
+# zhangmin <zm1990s@gmail.com>, 2014
 msgid ""
 msgstr ""
-"Project-Id-Version: userdrake2\n"
-"Report-Msgid-Bugs-To: \n"
+"Project-Id-Version: Mageia\n"
 "POT-Creation-Date: 2014-02-01 09:24+0200\n"
-"PO-Revision-Date: 2004-01-17 18:50+0800\n"
-"Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
-"Language-Team: Chinese <zh@li.org>\n"
-"Language: zh\n"
+"PO-Revision-Date: 2015-02-13 05:26+0000\n"
+"Last-Translator: xiao wenming <xwm-citcc5@hotmail.com>\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/mageia/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8-bit\n"
+"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Language: zh_CN\n"
-"X-Source-Language: C\n"
 
 #: ../userdrake:58 ../userdrake:1307
 #, c-format
@@ -143,7 +140,7 @@ msgstr "组"
 #: ../userdrake:196
 #, c-format
 msgid "Users and groups"
-msgstr ""
+msgstr "用户和组"
 
 #: ../userdrake:214
 #, c-format
@@ -253,7 +250,7 @@ msgstr "已锁定"
 #: ../userdrake:291
 #, c-format
 msgid "Expired"
-msgstr "已到期"
+msgstr "已过期"
 
 #: ../userdrake:367
 #, c-format
@@ -300,9 +297,7 @@ msgstr "密码不匹配"
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr ""
-"这个密码太简单了。\n"
-"好的密码应该大于 6 个字符"
+msgstr "这个密码太简单了。\n好的密码应该大于 6 个字符"
 
 #: ../userdrake:462
 #, c-format
@@ -315,10 +310,7 @@ msgid ""
 "Creating a user with a UID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr ""
-"不推荐创建一个 UID 小于 1000 的用户。\n"
-"您确定您要这么做吗?\n"
-"\n"
+msgstr "不推荐创建一个 UID 小于 1000 的用户。\n您确定您要这么做吗?\n\n"
 
 #: ../userdrake:478
 #, c-format
@@ -343,10 +335,9 @@ msgstr "迁移向导"
 #: ../userdrake:507
 #, c-format
 msgid ""
-"Do you want to run the migration wizard in order to import Windows documents "
-"and settings in your Mageia distribution?"
-msgstr ""
-"您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版中？"
+"Do you want to run the migration wizard in order to import Windows documents"
+" and settings in your Mageia distribution?"
+msgstr "您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版中？"
 
 #: ../userdrake:512 ../userdrake:556 ../userdrake:615 ../userdrake:702
 #: ../userdrake:735 ../userdrake:1195
@@ -411,10 +402,7 @@ msgid ""
 "Creating a group with a GID less than 1000 is not recommended.\n"
 " Are you sure you want to do this?\n"
 "\n"
-msgstr ""
-"不推荐创建一个 GID 小于 1000 的组。\n"
-"您确定您要这么做吗？\n"
-"\n"
+msgstr "不推荐创建一个 GID 小于 1000 的组。\n您确定您要这么做吗？\n\n"
 
 #: ../userdrake:609
 #, c-format
@@ -436,9 +424,7 @@ msgstr "删除文件吗？"
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr ""
-"删除用户 %s\n"
-" 同时执行下列操作\n"
+msgstr "删除用户 %s\n 同时执行下列操作\n"
 
 #: ../userdrake:669
 #, c-format
@@ -465,9 +451,7 @@ msgstr "您真的想要删除组 %s 吗?"
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr ""
-"%s 是用户 %s 的主要组\n"
-"请先删除这个用户"
+msgstr "%s 是用户 %s 的主要组\n请先删除这个用户"
 
 #: ../userdrake:730
 #, c-format
@@ -514,9 +498,7 @@ msgstr "请为该用户选择至少一个用户组"
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr ""
-"请指定账户过期的\n"
-"年月日"
+msgstr "请指定账户过期的\n年月日"
 
 #: ../userdrake:941
 #, c-format
@@ -648,13 +630,12 @@ msgstr "用户管理"
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
+#. <jsmith@nowhere.com>")
 #: ../userdrake:1318
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr ""
-"Funda Wang <fundawang@gmail.com>\n"
-"tuhaihe <1132321739qq@gmail.com>\n"
+msgstr "Funda Wang <fundawang@gmail.com>\ntuhaihe <1132321739qq@gmail.com>\n"
 
 #: ../userdrake:1325
 #, c-format
@@ -678,13 +659,12 @@ msgid "Error"
 msgstr "错误"
 
 #: ../polkit/org.mageia.drakuser.policy.in.h:1
-#, fuzzy
 msgid "Run Mageia User Manager"
-msgstr "Mageia 用户管理工具"
+msgstr "打开Mageia 用户管理工具"
 
 #: ../polkit/org.mageia.drakuser.policy.in.h:2
 msgid "Authentication is required to run Mageia User Manager"
-msgstr ""
+msgstr "需要授权才能打开Mageia用户管理工具"
 
 #: ../USER/USER.xs:83
 #, c-format
@@ -754,31 +734,4 @@ msgstr "无法删除主文件夹：“%s”。\n"
 #: ../USER/USER.xs:475
 #, c-format
 msgid "Error deleting mail spool: %s\n"
-msgstr "删除邮件池出错：%s\n"
-
-#~ msgid "Error reading `%s': %s"
-#~ msgstr "读取“%s”出错：%s"
-
-#~ msgid "Error removing `%s': %s"
-#~ msgstr "删除“%s”出错：%s"
-
-#~ msgid "Unknown error"
-#~ msgstr "未知错误"
-
-#~ msgid "Error creating %s: %s.\n"
-#~ msgstr "创建“%s”出错：%s"
-
-#~ msgid "Authors: "
-#~ msgstr "作者: "
-
-#~ msgid "Choice"
-#~ msgstr "选择"
-
-#~ msgid "Yes"
-#~ msgstr "是"
-
-#~ msgid "No"
-#~ msgstr "否"
-
-#~ msgid "Delete files or not"
-#~ msgstr "是否删除文件"
+msgstr "删除邮件时出错：%s\n"