Update translation catalog

1 files changed, 147 insertions, 118 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index b98d90a..c6b9885 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:
 # Danny Zeng <danny@zeng.com.cn>, 2000
 # Funda Wang <fundawang@linux.net.cn>, 2003
@@ -11,22 +11,23 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Mageia\n"
-"POT-Creation-Date: 2014-02-01 09:24+0200\n"
+"POT-Creation-Date: 2018-01-11 20:22+0200\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"
+"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"
 
-#: ../userdrake:58 ../userdrake:1307
+#: ../userdrake:59 ../userdrake:1401
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
 
-#: ../userdrake:63
+#: ../userdrake:64
 #, c-format
 msgid "Loading Users and Groups... Please wait"
 msgstr "正在加载用户和组... 请稍等"
@@ -131,7 +132,7 @@ msgstr "应用过滤器"
 msgid "Users"
 msgstr "用户"
 
-#: ../userdrake:190 ../userdrake:1069
+#: ../userdrake:190 ../userdrake:1163
 #, c-format
 msgid "Groups"
 msgstr "组"
@@ -152,7 +153,7 @@ msgstr "用户名"
 msgid "User ID"
 msgstr "用户 ID"
 
-#: ../userdrake:214 ../userdrake:1066
+#: ../userdrake:214 ../userdrake:1160
 #, c-format
 msgid "Primary Group"
 msgstr "主要的组"
@@ -212,7 +213,7 @@ msgstr "添加组"
 msgid "Add a group to the system"
 msgstr "向系统中添加一个组"
 
-#: ../userdrake:226 ../userdrake:767
+#: ../userdrake:226 ../userdrake:861
 #, c-format
 msgid "Edit"
 msgstr "编辑"
@@ -222,7 +223,7 @@ msgstr "编辑"
 msgid "Edit selected row"
 msgstr "编辑所选的行"
 
-#: ../userdrake:227 ../userdrake:702 ../userdrake:735 ../userdrake:767
+#: ../userdrake:227 ../userdrake:796 ../userdrake:829 ../userdrake:861
 #, c-format
 msgid "Delete"
 msgstr "删除"
@@ -242,418 +243,446 @@ msgstr "刷新"
 msgid "Refresh the list"
 msgstr "刷新列表"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Locked"
 msgstr "已锁定"
 
-#: ../userdrake:291
+#: ../userdrake:371
 #, c-format
 msgid "Expired"
 msgstr "已过期"
 
-#: ../userdrake:367
+#: ../userdrake:448
 #, c-format
 msgid "Click on the icon to change it"
 msgstr "单击图标进行更改"
 
-#: ../userdrake:413
+#: ../userdrake:494
 #, c-format
 msgid "Create New User"
 msgstr "创建新用户"
 
-#: ../userdrake:419
+#: ../userdrake:503
 #, c-format
 msgid "Create Home Directory"
 msgstr "创建主文件夹"
 
-#: ../userdrake:421
+#: ../userdrake:505
 #, c-format
 msgid "Home Directory: "
 msgstr "主文件夹："
 
-#: ../userdrake:424
+#: ../userdrake:508
 #, c-format
 msgid "Create a private group for the user"
 msgstr "为该用户创建一个私有组"
 
-#: ../userdrake:425
+#: ../userdrake:509
 #, c-format
 msgid "Specify user ID manually"
 msgstr "手动指定用户 ID"
 
-#: ../userdrake:442
+#: ../userdrake:526
 #, c-format
 msgid "User already exists, please choose another User Name"
 msgstr "用户已经存在，请选择其他用户名"
 
-#: ../userdrake:447 ../userdrake:887
+#: ../userdrake:531 ../userdrake:981
 #, c-format
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../userdrake:450 ../userdrake:890
+#: ../userdrake:534 ../userdrake:984
 #, c-format
 msgid ""
 "This password is too simple. \n"
 " Good passwords should be > 6 characters"
-msgstr "这个密码太简单了。\n好的密码应该大于 6 个字符"
+msgstr ""
+"这个密码太简单了。\n"
+"好的密码应该大于 6 个字符"
 
-#: ../userdrake:462
+#: ../userdrake:550
 #, c-format
 msgid "User Uid is < 1000"
 msgstr "用户的 UID 小于 1000"
 
-#: ../userdrake:463
+#: ../userdrake:551
 #, c-format
 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
+#: ../userdrake:566
 #, c-format
 msgid "Putting %s to 'users' group"
 msgstr "将 %s 添加到“users”组"
 
-#: ../userdrake:485
+#: ../userdrake:573
 #, c-format
 msgid "Creating new group: %s"
 msgstr "创建新组：%s"
 
-#: ../userdrake:494
+#: ../userdrake:582
 #, c-format
 msgid "Adding user: %s"
 msgstr "添加用户：%s"
 
-#: ../userdrake:506
+#: ../userdrake:589
+#, fuzzy, c-format
+msgid "Home directory already exists"
+msgstr "主文件夹："
+
+#: ../userdrake:589
+#, c-format
+msgid ""
+"The requested home directory already exists. Would you like to preserve the "
+"existing home directory?"
+msgstr ""
+
+#: ../userdrake:600
 #, c-format
 msgid "Migration wizard"
 msgstr "迁移向导"
 
-#: ../userdrake:507
+#: ../userdrake:601
 #, 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
+#: ../userdrake:606 ../userdrake:650 ../userdrake:709 ../userdrake:796
+#: ../userdrake:829 ../userdrake:1289
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:512 ../userdrake:549 ../userdrake:615 ../userdrake:1195
-#: ../userdrake:1347
+#: ../userdrake:606 ../userdrake:643 ../userdrake:709 ../userdrake:1289
+#: ../userdrake:1442
 #, c-format
 msgid "Ok"
 msgstr "确定"
 
-#: ../userdrake:525
+#: ../userdrake:619
 #, c-format
 msgid "UID: "
 msgstr "UID："
 
-#: ../userdrake:538
+#: ../userdrake:632
 #, c-format
 msgid "Choose group"
 msgstr "选择组"
 
-#: ../userdrake:540 ../userdrake:541
+#: ../userdrake:634 ../userdrake:635
 #, c-format
 msgid "Add to the existing group"
 msgstr "添加到已有组"
 
-#: ../userdrake:542
+#: ../userdrake:636
 #, c-format
 msgid "Add to the 'users' group"
 msgstr "添加到“users”组"
 
-#: ../userdrake:544
+#: ../userdrake:638
 #, c-format
 msgid "A group with this name already exists.  What would you like to do?"
 msgstr "已经存在同名组。您想要怎么做？"
 
-#: ../userdrake:574
+#: ../userdrake:668
 #, c-format
 msgid "Create New Group"
 msgstr "创建新组"
 
-#: ../userdrake:579
+#: ../userdrake:673
 #, c-format
 msgid "Specify group ID manually"
 msgstr "手动指定组 ID"
 
-#: ../userdrake:595
+#: ../userdrake:689
 #, c-format
 msgid "Group already exists, please choose another Group Name"
 msgstr "组已经存在，请使用其他组名"
 
-#: ../userdrake:601
+#: ../userdrake:695
 #, c-format
 msgid " Group Gid is < 1000"
 msgstr "组的 GID 小于 1000"
 
-#: ../userdrake:602
+#: ../userdrake:696
 #, c-format
 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
+#: ../userdrake:703
 #, c-format
 msgid "Adding group: %s "
 msgstr "添加组：%s"
 
-#: ../userdrake:619
+#: ../userdrake:713
 #, c-format
 msgid "GID: "
 msgstr "GID："
 
-#: ../userdrake:664
+#: ../userdrake:758
 #, c-format
 msgid "Delete files or not?"
 msgstr "删除文件吗？"
 
-#: ../userdrake:667
+#: ../userdrake:761
 #, c-format
 msgid ""
 "Deleting user %s\n"
 " Also perform the following actions\n"
-msgstr "删除用户 %s\n 同时执行下列操作\n"
+msgstr ""
+"删除用户 %s\n"
+" 同时执行下列操作\n"
 
-#: ../userdrake:669
+#: ../userdrake:763
 #, c-format
 msgid "Delete Home Directory: %s"
 msgstr "删除主文件夹：%s"
 
-#: ../userdrake:670
+#: ../userdrake:764
 #, c-format
 msgid "Delete Mailbox: /var/spool/mail/%s"
 msgstr "删除邮箱：/var/spool/mail/%s"
 
-#: ../userdrake:679
+#: ../userdrake:773
 #, c-format
 msgid "Removing user: %s"
 msgstr "删除用户：%s"
 
-#: ../userdrake:712
+#: ../userdrake:806
 #, c-format
 msgid "Do you really want to delete the group %s?"
 msgstr "您真的想要删除组 %s 吗?"
 
-#: ../userdrake:725
+#: ../userdrake:819
 #, c-format
 msgid ""
 "%s is a primary group for user %s\n"
 " Remove the user first"
-msgstr "%s 是用户 %s 的主要组\n请先删除这个用户"
+msgstr ""
+"%s 是用户 %s 的主要组\n"
+"请先删除这个用户"
 
-#: ../userdrake:730
+#: ../userdrake:824
 #, c-format
 msgid "Removing group: %s"
 msgstr "删除组：%s"
 
-#: ../userdrake:826
+#: ../userdrake:920
 #, c-format
 msgid "Full Name:"
 msgstr "全名："
 
-#: ../userdrake:828
+#: ../userdrake:922
 #, c-format
 msgid "Login:"
 msgstr "登录名："
 
-#: ../userdrake:830
+#: ../userdrake:924
 #, c-format
 msgid "Password:"
 msgstr "密码："
 
-#: ../userdrake:832
+#: ../userdrake:926
 #, c-format
 msgid "Confirm Password:"
 msgstr "确认密码："
 
-#: ../userdrake:834
+#: ../userdrake:928
 #, c-format
 msgid "Login Shell:"
 msgstr "登录 Shell："
 
-#: ../userdrake:847
+#: ../userdrake:941
 #, c-format
 msgid "Group Name:"
 msgstr "组名："
 
-#: ../userdrake:921
+#: ../userdrake:1015
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "请为该用户选择至少一个用户组"
 
-#: ../userdrake:931
+#: ../userdrake:1025
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
 " for Account Expiration "
-msgstr "请指定账户过期的\n年月日"
+msgstr ""
+"请指定账户过期的\n"
+"年月日"
 
-#: ../userdrake:941
+#: ../userdrake:1035
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "请填满密码时效的所有域\n"
 
-#: ../userdrake:993
+#: ../userdrake:1087
 #, c-format
 msgid "You cannot remove user '%s' from their primary group"
 msgstr "您不能从用户“%s”的主要组中删除该用户"
 
-#: ../userdrake:1014
+#: ../userdrake:1108
 #, c-format
 msgid "Home:"
 msgstr "主文件夹："
 
-#: ../userdrake:1016
+#: ../userdrake:1110
 #, c-format
 msgid "User Data"
 msgstr "用户数据"
 
-#: ../userdrake:1020
+#: ../userdrake:1114
 #, c-format
 msgid "Enable account expiration"
 msgstr "启用账号过期"
 
-#: ../userdrake:1022
+#: ../userdrake:1116
 #, c-format
 msgid "Account expires (YYYY-MM-DD):"
 msgstr "账号过期时间 (YYYY-MM-DD)："
 
-#: ../userdrake:1030
+#: ../userdrake:1124
 #, c-format
 msgid "Lock User Account"
 msgstr "锁定用户账号"
 
-#: ../userdrake:1033
+#: ../userdrake:1127
 #, c-format
 msgid "Account Info"
 msgstr "账号信息"
 
-#: ../userdrake:1038
+#: ../userdrake:1132
 #, c-format
 msgid "User last changed password on: "
 msgstr "用户最后一次修改密码的时间： "
 
-#: ../userdrake:1045
+#: ../userdrake:1139
 #, c-format
 msgid "Enable Password Expiration"
 msgstr "启用密码过期"
 
-#: ../userdrake:1050
+#: ../userdrake:1144
 #, c-format
 msgid "Days before change allowed:"
 msgstr "允许修改前的天数："
 
-#: ../userdrake:1052
+#: ../userdrake:1146
 #, c-format
 msgid "Days before change required:"
 msgstr "必须修改前的天数："
 
-#: ../userdrake:1054
+#: ../userdrake:1148
 #, c-format
 msgid "Days warning before change:"
 msgstr "更改前警告的天数："
 
-#: ../userdrake:1056
+#: ../userdrake:1150
 #, c-format
 msgid "Days before account inactive:"
 msgstr "账户不被激活前的天数:"
 
-#: ../userdrake:1059
+#: ../userdrake:1153
 #, c-format
 msgid "Password Info"
 msgstr "密码信息"
 
-#: ../userdrake:1063
+#: ../userdrake:1157
 #, c-format
 msgid "Select the groups that the user will be a member of:"
 msgstr "选择该用户将属于哪些组："
 
-#: ../userdrake:1130
+#: ../userdrake:1224
 #, c-format
 msgid "Group Data"
 msgstr "组数据"
 
-#: ../userdrake:1133
+#: ../userdrake:1227
 #, c-format
 msgid "Select the users to join this group:"
 msgstr "选择要加入该组的用户："
 
-#: ../userdrake:1135
+#: ../userdrake:1229
 #, c-format
 msgid "Group Users"
 msgstr "组用户"
 
-#: ../userdrake:1155
+#: ../userdrake:1249
 #, c-format
 msgid "Edit Groups / Users"
 msgstr "编辑组/用户"
 
-#: ../userdrake:1188
+#: ../userdrake:1282
 #, c-format
 msgid "An error occurred:"
 msgstr "发生了一个错误："
 
-#: ../userdrake:1299
+#: ../userdrake:1393
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权所有 (C) %s Mandriva"
 
-#: ../userdrake:1309
+#: ../userdrake:1403
 #, c-format
 msgid "Copyright (C) %s by Mageia"
 msgstr "版权所有 (C) %s Mageia"
 
-#: ../userdrake:1312
+#: ../userdrake:1406
 #, c-format
 msgid "Users Management"
 msgstr "用户管理"
 
-#: ../userdrake:1314
+#: ../userdrake:1409
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
-#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith
-#. <jsmith@nowhere.com>")
-#: ../userdrake:1318
+#. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
+#: ../userdrake:1413
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
-msgstr "Funda Wang <fundawang@gmail.com>\ntuhaihe <1132321739qq@gmail.com>\n"
+msgstr ""
+"Funda Wang <fundawang@gmail.com>\n"
+"tuhaihe <1132321739qq@gmail.com>\n"
 
-#: ../userdrake:1325
+#: ../userdrake:1420
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名称栏为空，请提供一个名称"
 
-#: ../userdrake:1327
+#: ../userdrake:1422
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名称只能为小写拉丁字母、数字、“-”和“_”"
 
-#: ../userdrake:1330
+#: ../userdrake:1425
 #, c-format
 msgid "Name is too long"
 msgstr "名称过长"
 
-#: ../userdrake:1343
+#: ../userdrake:1438
 #, c-format
 msgid "Error"
 msgstr "错误"
@@ -666,72 +695,72 @@ msgstr "打开Mageia 用户管理工具"
 msgid "Authentication is required to run Mageia User Manager"
 msgstr "需要授权才能打开Mageia用户管理工具"
 
-#: ../USER/USER.xs:83
+#: ../USER/USER.xs:84
 #, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "无法创建账号：“%s”。\n"
 
-#: ../USER/USER.xs:96
+#: ../USER/USER.xs:97
 msgid "Cannot get Uid number"
 msgstr "无法获取 Uid 编号"
 
-#: ../USER/USER.xs:108
+#: ../USER/USER.xs:109
 msgid "Cannot retrieve value"
 msgstr "无法获取数值"
 
-#: ../USER/USER.xs:119
+#: ../USER/USER.xs:120
 #, c-format
 msgid "Error creating `%s': %s"
 msgstr "创建“%s”出错：%s"
 
-#: ../USER/USER.xs:125
+#: ../USER/USER.xs:126
 #, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "创建邮件池出错：%s\n"
 
-#: ../USER/USER.xs:175
+#: ../USER/USER.xs:176
 #, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "无法更改用户：“%s”。\n"
 
-#: ../USER/USER.xs:185
+#: ../USER/USER.xs:186
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr "无法删除用户：“%s”。\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr "无法设置密码：“%s”。\n"
 
-#: ../USER/USER.xs:211
+#: ../USER/USER.xs:213
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../USER/USER.xs:278
+#: ../USER/USER.xs:280
 msgid "Group creation failed.\n"
 msgstr "用户组创建失败。\n"
 
-#: ../USER/USER.xs:288
+#: ../USER/USER.xs:290
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr "用户组无法更改：“%s”。\n"
 
-#: ../USER/USER.xs:298
+#: ../USER/USER.xs:300
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr "用户组无法删除：“%s”。\n"
 
-#: ../USER/USER.xs:456
+#: ../USER/USER.xs:458
 msgid "No home directory for the user.\n"
 msgstr "该用户没有主文件夹。\n"
 
-#: ../USER/USER.xs:462 ../USER/USER.xs:464
+#: ../USER/USER.xs:464 ../USER/USER.xs:466
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr "无法删除主文件夹：“%s”。\n"
 
-#: ../USER/USER.xs:475
+#: ../USER/USER.xs:477
 #, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "删除邮件时出错：%s\n"