Update translation catalog

1 files changed, 115 insertions, 54 deletions

diff --git a/lib/CatDap/I18N/zh_CN.po b/lib/CatDap/I18N/zh_CN.po
index 0d42da6..63f5e74 100644
--- a/lib/CatDap/I18N/zh_CN.po
+++ b/lib/CatDap/I18N/zh_CN.po
@@ -18,13 +18,13 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: lib/CatDap/Controller/register.pm:134
+#: lib/CatDap/Controller/register.pm:142
 msgid "Activation"
 msgstr "激活"
 
-#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:11
+#: root/admin/account_addoc.tt:28 root/admin/account_group.tt:12
 #: root/admin/account_modify.tt:24 root/admin/group_modify.tt:21
-#: root/user/index.tt:19 root/user/index.tt:48
+#: root/user/index.tt:21 root/user/index.tt:50
 msgid "Add"
 msgstr "添加"
 
@@ -37,7 +37,7 @@ msgid "Add attribute"
 msgstr "添加属性"
 
 #. (uid)
-#: root/admin/account_group.tt:1
+#: root/admin/account_group.tt:2
 msgid "Add user %1 to a new group"
 msgstr "添加用户 %1 至新组"
 
@@ -46,20 +46,24 @@ msgstr "添加用户 %1 至新组"
 msgid "Adding objectclass %1 to dn %2"
 msgstr "添加 ObjectClass %1 至 dn %2"
 
-#: lib/CatDap/Controller/register.pm:50
+#: lib/CatDap/Controller/register.pm:54
 msgid "Addresses do not match"
 msgstr "地址不匹配"
 
-#: lib/CatDap/Controller/register.pm:90
+#: root/register/index.tt:10
+msgid "Allowed characters: lower case letters and numbers"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:98
 msgid "An account already exists with this email address"
 msgstr "该邮箱所对应的账户已经存在"
 
-#: lib/CatDap/Controller/register.pm:95
+#: lib/CatDap/Controller/register.pm:103
 msgid "An account already exists with this username"
 msgstr "该用户名所对应的账户已经存在"
 
 #. ($errors)
-#: lib/CatDap/Controller/register.pm:146
+#: lib/CatDap/Controller/register.pm:154
 msgid ""
 "An error occured sending the email, but your account was created. Please try "
 "the password recovery process if you entered the correct email address. "
@@ -84,11 +88,11 @@ msgstr "发送邮件失败，请稍后重试。错误 %1"
 msgid "Attribute"
 msgstr "属性"
 
-#: lib/CatDap/Controller/register.pm:57
+#: lib/CatDap/Controller/register.pm:62
 msgid "Cannot check /etc/passwd, please warn system administrators"
 msgstr "无法检查 /etc/passwd，请向系统管理员报告此错误"
 
-#: root/register/index.tt:29
+#: root/register/index.tt:30
 msgid "Captcha"
 msgstr "Captcha 验证"
 
@@ -100,6 +104,10 @@ msgstr "改变"
 msgid "Change password"
 msgstr "更换密码"
 
+#: root/admin/password.tt:5
+msgid "Change their password to a random string"
+msgstr ""
+
 #: root/register/complete.tt:5
 msgid "Check your mail for activation instructions."
 msgstr "请查看邮箱中的激活邮件。"
@@ -108,7 +116,7 @@ msgstr "请查看邮箱中的激活邮件。"
 msgid "Check your mail for password reset instructions."
 msgstr "请查看邮箱中的密码重置邮件。"
 
-#: root/register/index.tt:24
+#: root/register/index.tt:25
 msgid "Confirm Email address"
 msgstr "确认Email 地址"
 
@@ -123,13 +131,13 @@ msgstr "当前密码"
 msgid "Dear %1,"
 msgstr "尊敬的 %1，"
 
-#: root/admin/account_group.tt:27 root/admin/account_modify.tt:27
-#: root/user/index.tt:22
+#: root/admin/account_group.tt:29 root/admin/account_modify.tt:27
+#: root/user/index.tt:24
 msgid "Delete"
 msgstr "删除"
 
 #. (uid)
-#: root/admin/account_group.tt:17
+#: root/admin/account_group.tt:19
 msgid "Delete user %1 from an existing group:"
 msgstr "将用户 %1 从现存组中移除："
 
@@ -137,14 +145,19 @@ msgstr "将用户 %1 从现存组中移除："
 msgid "Edit"
 msgstr "编辑"
 
-#: root/admin/account.tt:8 root/register/index.tt:20
+#: root/admin/account.tt:8 root/register/index.tt:21
 msgid "Email"
 msgstr "Email"
 
-#: root/forgot_password/index.tt:8 root/register/index.tt:21
+#: root/forgot_password/index.tt:8 root/register/index.tt:22
 msgid "Email address"
 msgstr "电子邮件地址"
 
+#: lib/CatDap/Controller/register.pm:74
+#, fuzzy
+msgid "Email domain is not authorized to be used"
+msgstr "此用户名未被授权使用"
+
 #: root/forgot_password/complete.tt:1
 msgid "Email sent."
 msgstr "邮件已发送。"
@@ -153,7 +166,7 @@ msgstr "邮件已发送。"
 msgid "Enter new password."
 msgstr "输入新密码"
 
-#: root/register/index.tt:32
+#: root/register/index.tt:37
 msgid "Enter text"
 msgstr "输入文本"
 
@@ -162,7 +175,7 @@ msgstr "输入文本"
 msgid "Error while searching for account: "
 msgstr "搜索账户时出错："
 
-#: root/register/index.tt:13
+#: root/register/index.tt:14
 msgid "First name"
 msgstr "名"
 
@@ -174,7 +187,7 @@ msgstr "忘记密码？"
 msgid "Forgotten password"
 msgstr "忘记密码"
 
-#: root/index.tt:17
+#: root/index.tt:11
 msgid "Forgotten password?"
 msgstr "已忘记密码？"
 
@@ -182,15 +195,11 @@ msgstr "已忘记密码？"
 msgid "Full Name"
 msgstr "全名"
 
-#: root/admin/group.tt:28
-msgid "Group Name"
-msgstr "组名"
-
-#: lib/CatDap/Controller/admin.pm:624
+#: lib/CatDap/Controller/admin.pm:625
 msgid "Group contains illegal characters"
 msgstr "组含有非法字符"
 
-#: root/admin/group.tt:9
+#: root/admin/group.tt:4
 msgid "Group name"
 msgstr "组名称"
 
@@ -206,20 +215,20 @@ msgstr "符号搜索条件的组"
 msgid "Groups you manage"
 msgstr "您管理的组"
 
-#: lib/CatDap/Controller/register.pm:53
+#: lib/CatDap/Controller/register.pm:58
 msgid "Incorrect validation text, please try again"
 msgstr "验证文本错误，请重试"
 
 #: lib/CatDap/Controller/forgot_password.pm:45
-#: lib/CatDap/Controller/register.pm:47
+#: lib/CatDap/Controller/register.pm:51
 msgid "Invalid email address"
 msgstr "email 地址无效"
 
-#: lib/CatDap/Controller/register.pm:43
+#: lib/CatDap/Controller/register.pm:44
 msgid "Invalid username"
 msgstr "用户名无效"
 
-#: lib/CatDap/Controller/register.pm:60
+#: lib/CatDap/Controller/register.pm:65
 msgid "Invalid username, already used by system"
 msgstr "该用户名无效（已被系统使用）"
 
@@ -227,11 +236,11 @@ msgstr "该用户名无效（已被系统使用）"
 msgid "List of users promoted :"
 msgstr "用于提示的用户列表："
 
-#: root/template/header:10 root/user/fake.tt:3
+#: root/template/header:9 root/user/fake.tt:3
 msgid "Log out"
 msgstr "注销"
 
-#: root/index.tt:1 root/index.tt:13
+#: root/index.tt:13 root/index.tt:3
 msgid "Login"
 msgstr "登录"
 
@@ -239,7 +248,7 @@ msgstr "登录"
 msgid "More than one ID Pool"
 msgstr "ID 池的数量不能大于一"
 
-#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:652
+#: lib/CatDap/Controller/admin.pm:515 lib/CatDap/Controller/admin.pm:631
 msgid "More than one entry matched"
 msgstr "匹配项超过一个"
 
@@ -248,7 +257,7 @@ msgstr "匹配项超过一个"
 msgid "New Password"
 msgstr "新密码"
 
-#: lib/CatDap/Controller/user.pm:299
+#: lib/CatDap/Controller/user.pm:297
 msgid "New passwords dont match"
 msgstr "新密码不相同"
 
@@ -256,11 +265,11 @@ msgstr "新密码不相同"
 msgid "Operation was successful."
 msgstr "操作成功。"
 
-#: root/index.tt:10
+#: root/index.tt:9
 msgid "Password : "
 msgstr "密码："
 
-#: lib/CatDap/Controller/user.pm:293
+#: lib/CatDap/Controller/user.pm:291
 msgid "Password incorrect"
 msgstr "密码不正确"
 
@@ -272,7 +281,7 @@ msgstr "密码已重置，请查收密码重置邮件"
 msgid "Password reset failed: "
 msgstr "密码重置失败："
 
-#: root/register/index.tt:12
+#: root/register/index.tt:13
 msgid "Personal Information"
 msgstr "个人信息"
 
@@ -288,10 +297,6 @@ msgstr "请使用上方的菜单"
 msgid "Primary group"
 msgstr "主组"
 
-#: lib/CatDap/Controller/forgot_password.pm:82
-msgid "Privileged accounts may not recover passwords via this mechanism"
-msgstr "私有账户无法通过此功能找回密码"
-
 #: root/admin/account_modify.tt:71
 msgid "Promote"
 msgstr "提示"
@@ -300,10 +305,15 @@ msgstr "提示"
 msgid "Promote user to posixAccount with primary group:"
 msgstr "提示用户输入 posix 账户及相应的主组："
 
-#: root/index.tt:16 root/register/index.tt:3 root/register/index.tt:35
+#: root/index.tt:29 root/register/index.tt:3 root/register/index.tt:40
 msgid "Register"
 msgstr "注册"
 
+#: root/index.tt:18
+#, fuzzy
+msgid "Register an account"
+msgstr "注册完成"
+
 #: root/register/complete.tt:1
 msgid "Registration completed"
 msgstr "注册完成"
@@ -317,35 +327,62 @@ msgstr "注册成功。"
 msgid "Repeat New Password"
 msgstr "重复新密码"
 
+#: root/admin/password.tt:16
+msgid "Reset"
+msgstr ""
+
 #: root/admin/account_modify.tt:1 root/forgot_password/index.tt:12
 msgid "Reset password"
 msgstr "重设密码"
 
-#: root/admin/account.tt:22
+#. (uid)
+#: root/admin/password.tt:3
+msgid "Resetting the users (%1) password will:"
+msgstr ""
+
+#: root/admin/account.tt:22 root/admin/group.tt:16
 msgid "Search"
 msgstr "搜索"
 
-#: root/admin/account.tt:4 root/admin/group.tt:5
+#: root/admin/account.tt:4
 msgid "Search by"
 msgstr "搜索由"
 
+#: root/admin/password.tt:7
+msgid ""
+"Send an email containing a link to change their password to the following "
+"addresses:"
+msgstr ""
+
 #: root/forgot_password/confirm.tt:16
 msgid "Set new password"
 msgstr "设置新密码"
 
+#: root/admin/password.tt:6
+msgid "Set the pwdReset attribute on their entry"
+msgstr ""
+
+#: root/register/index.tt:31
+msgid "Some characters are turned around."
+msgstr ""
+
 #: root/register/check.tt:1
 msgid "Success"
 msgstr "成功"
 
-#: root/admin/account.tt:10 root/register/index.tt:16
+#: root/admin/account.tt:10 root/register/index.tt:17
 msgid "Surname"
 msgstr "姓"
 
-#: lib/CatDap/Controller/register.pm:71
+#: lib/CatDap/Controller/register.pm:79
 msgid "The first name supplied contains illegal characters"
 msgstr "名中包含无效字符"
 
-#: lib/CatDap/Controller/register.pm:76
+#: root/register/index.tt:32
+msgid "The following characters can be used:"
+msgstr ""
+
+#: lib/CatDap/Controller/register.pm:84
 msgid "The surname supplied contains illegal characters"
 msgstr "姓中包含无效字符"
 
@@ -365,7 +402,7 @@ msgstr "要重置账户密码，请点击以下链接。"
 msgid "Transaction ID mismatch"
 msgstr "事务 ID 不匹配"
 
-#: root/admin/account_modify.tt:35 root/user/index.tt:29
+#: root/admin/account_modify.tt:35 root/user/index.tt:31
 msgid "Update"
 msgstr "更新"
 
@@ -377,7 +414,7 @@ msgstr "用户名"
 msgid "Username : "
 msgstr "用户名："
 
-#: lib/CatDap/Controller/register.pm:66
+#: lib/CatDap/Controller/register.pm:71
 msgid "Username is not authorized to be used"
 msgstr "此用户名未被授权使用"
 
@@ -386,6 +423,24 @@ msgstr "此用户名未被授权使用"
 msgid "Value"
 msgstr "值"
 
+#: lib/CatDap/Controller/forgot_password.pm:82
+msgid ""
+"You have a privileged account, and may not recover your password this way: "
+"please get in touch with a member of the sysadmin team (#mageia-sysadm on "
+"IRC).."
+msgstr ""
+
+#: root/index.tt:20
+msgid ""
+"You will need an account when you want to participate in Mageia,\n"
+"            through <a href=\"http://ml.mageia.org/\">mailing-lists</a>,\n"
+"            <a href=\"http://wiki.mageia.org/\">wiki</a>,\n"
+"            <a href=\"http://bugs.mageia.org/\">bugzilla</a>,\n"
+"            our <a href=\"http://svnweb.mageia.org/\">code</a>\n"
+"            <a href=\"http://gitweb.mageia.org/\">repositories</a>,        \n"
+"            <a href=\"http://forums.mageia.org/\">forums</a>, etc."
+msgstr ""
+
 #. (c.config.organisation)
 #: root/email/forgot_password.tt:2
 msgid ""
@@ -405,11 +460,11 @@ msgstr "您的 %1 账户已成功创建，但需要进行验证才能使用。"
 msgid "Your password was reset by %1"
 msgstr "您的密码被 %1 重置"
 
-#: lib/CatDap/Controller/user.pm:61
+#: lib/CatDap/Controller/user.pm:62
 msgid "Your session has expired"
 msgstr "您的会话已过期"
 
-#: root/admin/account.tt:15 root/admin/group.tt:15
+#: root/admin/account.tt:15 root/admin/group.tt:9
 msgid "contains"
 msgstr "包含"
 
@@ -417,19 +472,19 @@ msgstr "包含"
 msgid "delete"
 msgstr "删除"
 
-#: root/admin/account.tt:17 root/admin/group.tt:17
+#: root/admin/account.tt:17 root/admin/group.tt:11
 msgid "greater than or equal to"
 msgstr "大于等于"
 
-#: root/admin/account.tt:16 root/admin/group.tt:16
+#: root/admin/account.tt:16 root/admin/group.tt:10
 msgid "is exactly"
 msgstr "为"
 
-#: root/admin/account.tt:18 root/admin/group.tt:18
+#: root/admin/account.tt:18 root/admin/group.tt:12
 msgid "less than"
 msgstr "少于"
 
-#: root/admin/group.tt:10
+#: root/admin/group.tt:5
 msgid "member"
 msgstr "成员"
 
@@ -440,3 +495,9 @@ msgstr "密码重置"
 #: root/admin/account_modify.tt:53
 msgid "with value"
 msgstr "为"
+
+#~ msgid "Group Name"
+#~ msgstr "组名"
+
+#~ msgid "Privileged accounts may not recover passwords via this mechanism"
+#~ msgstr "私有账户无法通过此功能找回密码"