sync with code

1 files changed, 55 insertions, 52 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4fcc824..6331662 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,95 +11,88 @@ msgid ""
 msgstr ""
 "Project-Id-Version: userdrake2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-02-02 03:03+0100\n"
+"POT-Creation-Date: 2013-04-23 19:48+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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../USER/USER.xs:86
-#, c-format
-msgid "Error reading `%s': %s"
-msgstr "读取“%s”出错：%s"
-
-#: ../USER/USER.xs:93 ../USER/USER.xs:526
-#, c-format
-msgid "Error creating `%s': %s"
-msgstr "创建“%s”出错：%s"
-
-#: ../USER/USER.xs:205 ../USER/USER.xs:234 ../USER/USER.xs:250
-#, c-format
-msgid "Error removing `%s': %s"
-msgstr "删除“%s”出错：%s"
-
-#: ../USER/USER.xs:490
+#: ../USER/USER.xs:83
 #, fuzzy, c-format
 msgid "Account creation failed: '%s'.\n"
 msgstr "创建邮件持出错。\n"
 
-#: ../USER/USER.xs:503
+#: ../USER/USER.xs:96
 msgid "Cannot get Uid number"
 msgstr ""
 
-#: ../USER/USER.xs:515
+#: ../USER/USER.xs:108
 msgid "Cannot retrieve value"
 msgstr ""
 
-#: ../USER/USER.xs:532
+#: ../USER/USER.xs:119
+#, c-format
+msgid "Error creating `%s': %s"
+msgstr "创建“%s”出错：%s"
+
+#: ../USER/USER.xs:125
+#, c-format
 msgid "Error creating mail spool: %s\n"
 msgstr "创建邮件持出错。: %s\n"
 
-#: ../USER/USER.xs:582
+#: ../USER/USER.xs:175
 #, fuzzy, c-format
 msgid "User could not be modified: '%s'.\n"
 msgstr "创建邮件持出错。\n"
 
-#: ../USER/USER.xs:592
+#: ../USER/USER.xs:185
 #, c-format
 msgid "User Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:618
+#: ../USER/USER.xs:211
 #, c-format
 msgid "Failed to set password: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:618
+#: ../USER/USER.xs:211
 msgid "unknown error"
 msgstr "未知错误"
 
-#: ../USER/USER.xs:685
+#: ../USER/USER.xs:278
 #, fuzzy
 msgid "Group creation failed.\n"
 msgstr "创建邮件持出错。\n"
 
-#: ../USER/USER.xs:695
+#: ../USER/USER.xs:288
 #, c-format
 msgid "Group could not be modified: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:705
+#: ../USER/USER.xs:298
 #, c-format
 msgid "Group could not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:863
+#: ../USER/USER.xs:456
 msgid "No home directory for the user.\n"
 msgstr ""
 
-#: ../USER/USER.xs:869 ../USER/USER.xs:871
+#: ../USER/USER.xs:462 ../USER/USER.xs:464
 #, c-format
 msgid "Home Directory Could Not be deleted: '%s'.\n"
 msgstr ""
 
-#: ../USER/USER.xs:881
+#: ../USER/USER.xs:475
+#, c-format
 msgid "Error deleting mail spool: %s\n"
 msgstr "删除邮件池出错。: %s\n"
 
-#: ../userdrake:59 ../userdrake:1275
+#: ../userdrake:59 ../userdrake:1276
 #, c-format
 msgid "Userdrake"
 msgstr "Userdrake"
@@ -366,12 +359,12 @@ msgstr "手动指定用户 ID"
 msgid "User already exists, please choose another User Name"
 msgstr "用户已经存在，请选择其他用户名"
 
-#: ../userdrake:419 ../userdrake:860
+#: ../userdrake:419 ../userdrake:859
 #, c-format
 msgid "Password Mismatch"
 msgstr "密码不匹配"
 
-#: ../userdrake:422 ../userdrake:863
+#: ../userdrake:422 ../userdrake:862
 #, c-format
 msgid ""
 "This password is too simple. \n"
@@ -422,17 +415,16 @@ msgid ""
 "Do you want to run the migration wizard in order to import Windows documents "
 "and settings in your Mageia distribution?"
 msgstr ""
-"您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版"
-"中？"
+"您是否想要运行迁移向导将 Windows 文档和设置导入到您的 Mageia 发行版中？"
 
 #: ../userdrake:484 ../userdrake:528 ../userdrake:587 ../userdrake:674
-#: ../userdrake:707 ../userdrake:1166
+#: ../userdrake:707 ../userdrake:1167
 #, c-format
 msgid "Cancel"
 msgstr "取消"
 
-#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1166
-#: ../userdrake:1317
+#: ../userdrake:484 ../userdrake:521 ../userdrake:587 ../userdrake:1167
+#: ../userdrake:1318
 #, c-format
 msgid "Ok"
 msgstr "确定"
@@ -576,17 +568,17 @@ msgstr "确认密码:"
 msgid "Login Shell:"
 msgstr "登录 Shell:"
 
-#: ../userdrake:820
+#: ../userdrake:819
 #, c-format
 msgid "Group Name:"
 msgstr "组名:"
 
-#: ../userdrake:894
+#: ../userdrake:893
 #, c-format
 msgid "Please select at least one group for the user"
 msgstr "请为这个用户至少选择一个组"
 
-#: ../userdrake:904
+#: ../userdrake:903
 #, c-format
 msgid ""
 "Please specify Year, Month and Day \n"
@@ -595,7 +587,7 @@ msgstr ""
 "请指定账户过期的\n"
 "年月日"
 
-#: ../userdrake:914
+#: ../userdrake:913
 #, c-format
 msgid "Please fill up all fields in password aging\n"
 msgstr "请填满密码时效的所有域\n"
@@ -695,58 +687,69 @@ msgstr "组用户"
 msgid "Edit Groups / Users"
 msgstr "编辑组/用户"
 
-#: ../userdrake:1159
+#: ../userdrake:1160
 #, c-format
 msgid "An error occurred:"
 msgstr "发生了一个错误:"
 
-#: ../userdrake:1267
+#: ../userdrake:1268
 #, c-format
 msgid "Close"
 msgstr "关闭"
 
-#: ../userdrake:1277
+#: ../userdrake:1278
 #, c-format
 msgid "Copyright (C) %s by Mandriva"
 msgstr "版权 (C) %s Mandriva"
 
-#: ../userdrake:1280
+#: ../userdrake:1278
+#, fuzzy, c-format
+msgid "Copyright (C) %s by Mageia"
+msgstr "版权 (C) %s Mandriva"
+
+#: ../userdrake:1281
 #, c-format
 msgid "Users Management"
 msgstr "用户管理"
 
-#: ../userdrake:1282
+#: ../userdrake:1283
 #, c-format
 msgid "Mageia"
 msgstr "Mageia"
 
 #. -PO: put here name(s) and email(s) of translator(s) (eg: "John Smith <jsmith@nowhere.com>")
-#: ../userdrake:1288
+#: ../userdrake:1289
 #, c-format
 msgid "_: Translator(s) name(s) & email(s)\n"
 msgstr "Funda Wang <fundawang@gmail.com>\n"
 
-#: ../userdrake:1295
+#: ../userdrake:1296
 #, c-format
 msgid "Name field is empty please provide a name"
 msgstr "名字栏是空的，请提供一个名字"
 
-#: ../userdrake:1297
+#: ../userdrake:1298
 #, c-format
 msgid ""
 "The name must contain only lower cased latin letters, numbers, `-' and `_'"
 msgstr "名字只能小写的拉丁字母、数字、“-”和“_”"
 
-#: ../userdrake:1300
+#: ../userdrake:1301
 #, c-format
 msgid "Name is too long"
 msgstr "名字太长了"
 
-#: ../userdrake:1313
+#: ../userdrake:1314
 #, c-format
 msgid "Error"
 msgstr "错误"
 
+#~ msgid "Error reading `%s': %s"
+#~ msgstr "读取“%s”出错：%s"
+
+#~ msgid "Error removing `%s': %s"
+#~ msgstr "删除“%s”出错：%s"
+
 #, fuzzy
 #~ msgid "Unknown error"
 #~ msgstr "未知错误"