From 4a67d64dd0cb01c40e675f48f0c6ea3d08e53664 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 28 Nov 2008 14:29:12 +0000 Subject: Relevant BUGIDs: Purpose of commit: new feature Commit summary: --------------- 2008-11-28 Tomas Mraz * modules/pam_tally2/pam_tally2.c (tally_check): Fix info format to be the same as in pam_tally. * configure.in: Add modules/pam_timestamp/Makefile. * doc/sag/Linux-PAM_SAG.xml: Include pam_timestamp.xml. * doc/sag/pam_timestamp.xml: New. * libpam/pam_static_modules.h: Add pam_timestamp static struct. * modules/Makefile.am: Add pam_timestamp directory. * modules/pam_timestamp/Makefile.am: New. * modules/pam_timestamp/README.xml: New. * modules/pam_timestamp/hmacsha1.h: New. * modules/pam_timestamp/sha1.h: New. * modules/pam_timestamp/pam_timestamp.8.xml: New. * modules/pam_timestamp/pam_timestamp_check.8.xml: New. * modules/pam_timestamp/pam_timestamp.c: New. * modules/pam_timestamp/pam_timestamp_check.c: New. * modules/pam_timestamp/hmacfile.c: New. * modules/pam_timestamp/hmacsha1.c: New. * modules/pam_timestamp/sha1.c: New. * modules/pam_timestamp/tst-pam_timestamp: New. * po/POTFILES.in: Add pam_timestamp sources. * po/*.po: Regenerate. * po/cs.po: Updated translations. --- po/zh_CN.po | 42 +++++++++++++++++++++++------------------- 1 file changed, 23 insertions(+), 19 deletions(-) (limited to 'po/zh_CN.po') diff --git a/po/zh_CN.po b/po/zh_CN.po index 4d251989..32e41700 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: Linux-PAM.tip\n" "Report-Msgid-Bugs-To: http://sourceforge.net/projects/pam\n" -"POT-Creation-Date: 2008-10-22 20:01+0200\n" +"POT-Creation-Date: 2008-11-28 15:16+0100\n" "PO-Revision-Date: 2008-10-20 15:43+1000\n" "Last-Translator: Leah Liu \n" "Language-Team: Simplified Chinese \n" @@ -169,19 +169,19 @@ msgid "Unknown PAM error" msgstr "未知的 PAM 错误" #: modules/pam_cracklib/pam_cracklib.c:64 -#: modules/pam_pwhistory/pam_pwhistory.c:61 +#: modules/pam_pwhistory/pam_pwhistory.c:62 #, c-format msgid "New %s%spassword: " msgstr "新的 %s%s密码：" #: modules/pam_cracklib/pam_cracklib.c:66 -#: modules/pam_pwhistory/pam_pwhistory.c:62 +#: modules/pam_pwhistory/pam_pwhistory.c:64 #, c-format msgid "Retype new %s%spassword: " msgstr "重新输入新的 %s%s密码：" #: modules/pam_cracklib/pam_cracklib.c:67 -#: modules/pam_pwhistory/pam_pwhistory.c:63 +#: modules/pam_pwhistory/pam_pwhistory.c:65 msgid "Sorry, passwords do not match." msgstr "抱歉，密码不匹配。" @@ -232,7 +232,7 @@ msgid "Password unchanged" msgstr "密码未更改" #: modules/pam_cracklib/pam_cracklib.c:584 -#: modules/pam_cracklib/pam_cracklib.c:709 +#: modules/pam_cracklib/pam_cracklib.c:710 #, c-format msgid "BAD PASSWORD: %s" msgstr "无效的密码： %s" @@ -354,13 +354,13 @@ msgstr "创建目录 '%s'。" msgid "Unable to create directory %s: %m" msgstr "无法创建目录 %s：%m" -#: modules/pam_pwhistory/pam_pwhistory.c:224 -#: modules/pam_pwhistory/pam_pwhistory.c:258 +#: modules/pam_pwhistory/pam_pwhistory.c:231 +#: modules/pam_pwhistory/pam_pwhistory.c:267 msgid "Password change aborted." msgstr "密码更改取消。" -#: modules/pam_pwhistory/pam_pwhistory.c:235 -#: modules/pam_pwhistory/pam_pwhistory.c:295 +#: modules/pam_pwhistory/pam_pwhistory.c:242 +#: modules/pam_pwhistory/pam_pwhistory.c:304 #: modules/pam_unix/pam_unix_passwd.c:470 msgid "Password has been already used. Choose another." msgstr "密码已使用。请选择其他密码。" @@ -425,20 +425,20 @@ msgstr "未能 pam_set_item()\n" msgid "login: failure forking: %m" msgstr "登录：故障派生：%m" -#: modules/pam_stress/pam_stress.c:476 +#: modules/pam_stress/pam_stress.c:475 #, c-format msgid "Changing STRESS password for %s." msgstr "为 %s 更改 STRESS 密码。" -#: modules/pam_stress/pam_stress.c:490 +#: modules/pam_stress/pam_stress.c:489 msgid "Enter new STRESS password: " msgstr "输入新的 STRESS 密码：" -#: modules/pam_stress/pam_stress.c:493 +#: modules/pam_stress/pam_stress.c:492 msgid "Retype new STRESS password: " msgstr "重新输入新的 STRESS 密码：" -#: modules/pam_stress/pam_stress.c:522 +#: modules/pam_stress/pam_stress.c:521 msgid "Verification mis-typed; password unchanged" msgstr "校验类型错误；密码未更改" @@ -447,7 +447,7 @@ msgstr "校验类型错误；密码未更改" msgid "Account temporary locked (%ld seconds left)" msgstr "帐户暂时锁住（还有 %ld 秒）" -#: modules/pam_tally/pam_tally.c:566 +#: modules/pam_tally/pam_tally.c:566 modules/pam_tally2/pam_tally2.c:520 #, c-format msgid "Account locked due to %u failed logins" msgstr "因为 %u 失败登录而锁定帐户" @@ -489,11 +489,6 @@ msgstr "%s: [--文件 根文件名] [--用户 用户名] [--重设置[=n]] [-- msgid "%s: Can't reset all users to non-zero\n" msgstr "%s: 无法将所有用户重设置为非零\n" -#: modules/pam_tally2/pam_tally2.c:520 -#, fuzzy, c-format -msgid "Account locked due to %hu failed logins" -msgstr "因为 %u 失败登录而锁定帐户" - #: modules/pam_tally2/pam_tally2.c:865 #, c-format msgid "Login Failures Latest failure From\n" @@ -507,6 +502,11 @@ msgid "" " [-r] [--reset[=n]] [--quiet]\n" msgstr "%s: [--文件 根文件名] [--用户 用户名] [--重设置[=n]] [--安静]\n" +#: modules/pam_timestamp/pam_timestamp.c:339 +#, c-format +msgid "Access granted (last access was %ld seconds ago)." +msgstr "" + #: modules/pam_unix/pam_unix_acct.c:228 modules/pam_unix/pam_unix_acct.c:250 msgid "Your account has expired; please contact your system administrator" msgstr "您的帐户已失效；请与系统管理员取得联系" @@ -559,3 +559,7 @@ msgstr "输入新的 UNIX 密码：" #: modules/pam_unix/pam_unix_passwd.c:678 msgid "Retype new UNIX password: " msgstr "重新输入新的 UNIX 密码：" + +#, fuzzy +#~ msgid "Account locked due to %hu failed logins" +#~ msgstr "因为 %u 失败登录而锁定帐户" -- cgit v1.2.3