From 0d0f12f76606009c7dc85da46e0531b5d155499e Mon Sep 17 00:00:00 2001 From: Weitian LI Date: Sat, 7 Jun 2014 14:00:41 +0800 Subject: Updated 'profile.html' and zh_CN locale messages * updated profile.html to show 'sjtu_id' and 'sjtu_initpass' info and show a related alert * updated zh_CN locale messages --- locale/zh_CN/LC_MESSAGES/django.mo | Bin 6488 -> 6877 bytes locale/zh_CN/LC_MESSAGES/django.po | 178 ++++++++++++++++++++----------------- 2 files changed, 95 insertions(+), 83 deletions(-) (limited to 'locale/zh_CN/LC_MESSAGES') diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 453dabe..1853439 100644 Binary files a/locale/zh_CN/LC_MESSAGES/django.mo and b/locale/zh_CN/LC_MESSAGES/django.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 67f2a6b..644ad8c 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-06-03 00:20+0800\n" +"POT-Creation-Date: 2014-06-07 13:09+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Weitian LI \n" "Language-Team: LANGUAGE \n" @@ -18,141 +18,147 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: account/admin.py:63 +#: account/admin.py:77 msgid "1 user was successfully approved." msgstr "1个用户被成功审定." -#: account/admin.py:65 -#, python-format +#: account/admin.py:79 msgid "%(num)s users were successfully approved." -msgstr "%(num)s个用户被成功审定." +msgstr "%(num)s 个用户被成功审定." -#: account/admin.py:67 +#: account/admin.py:81 msgid "Approve users" msgstr "审定用户" -#: account/admin.py:75 +#: account/admin.py:89 msgid "1 user was successfully sponsored." msgstr "1个用户被成功资助." -#: account/admin.py:77 -#, python-format +#: account/admin.py:91 msgid "%(num)s users were successfully sponsored." -msgstr "%(num)s个用户被成功资助." +msgstr "%(num)s 个用户被成功资助." -#: account/admin.py:79 +#: account/admin.py:93 msgid "Sponsor users" msgstr "资助用户" -#: account/admin.py:87 +#: account/admin.py:101 msgid "1 user was successfully cancelled approval." msgstr "1个用户的审定被取消." -#: account/admin.py:89 -#, python-format +#: account/admin.py:103 msgid "%(num)s users were successfully cancelled approval." -msgstr "%(num)s个用户的审定被取消." +msgstr "%(num)s 个用户的审定被取消." -#: account/admin.py:91 +#: account/admin.py:105 msgid "Cancel approve users" msgstr "取消用户审定" -#: account/admin.py:99 +#: account/admin.py:113 msgid "1 user was successfully cancelled sponsor." msgstr "1个用户的资助被取消." -#: account/admin.py:101 -#, python-format +#: account/admin.py:115 msgid "%(num)s users were successfully cancelled sponsor." -msgstr "%(num)s个用户的资助被取消." +msgstr "%(num)s 个用户的资助被取消." -#: account/admin.py:103 +#: account/admin.py:117 msgid "Cancel sponsor users" msgstr "取消用户资助" -#: account/admin.py:111 +#: account/admin.py:125 msgid "1 user was successfully reset approval." msgstr "1个用户的审定被重置." -#: account/admin.py:113 -#, python-format +#: account/admin.py:127 msgid "%(num)s users were successfully reset approval." -msgstr "%(num)s个用户的审定被重置." +msgstr "%(num)s 个用户的审定被重置." -#: account/admin.py:115 +#: account/admin.py:129 msgid "Reset approve users" msgstr "重置用户审定" -#: account/admin.py:123 +#: account/admin.py:137 msgid "1 user was successfully reset sponsor." msgstr "1个用户的资助被重置." -#: account/admin.py:125 -#, python-format +#: account/admin.py:139 msgid "%(num)s users were successfully reset sponsor." -msgstr "%(num)s个用户的审定被重置." +msgstr "%(num)s 个用户的审定被重置." -#: account/admin.py:127 +#: account/admin.py:141 msgid "Reset sponsor users" msgstr "重置用户资助" -#: account/admin.py:136 +#: account/admin.py:150 msgid "1 user was successfully marked as checkin." msgstr "1个用户被标记为已报到." -#: account/admin.py:138 -#, python-format +#: account/admin.py:152 msgid "%(num)s users were successfully marked as checkin." -msgstr "%(num)s个用户被标记为已报到." +msgstr "%(num)s 个用户被标记为已报到." -#: account/admin.py:140 +#: account/admin.py:154 msgid "Mark users as checked in" msgstr "标记用户为已报到" -#: account/admin.py:148 +#: account/admin.py:162 msgid "1 user was marked as not checkin." msgstr "1个用户被标记为未报到." -#: account/admin.py:150 -#, python-format +#: account/admin.py:164 msgid "%(num)s users were marked as not checkin." -msgstr "%(num)s个用户被标记为未报到." +msgstr "%(num)s 个用户被标记为未报到." -#: account/admin.py:152 +#: account/admin.py:166 msgid "Mark users as not checked in" msgstr "标记用户为未报到" -#: account/admin.py:160 +#: account/admin.py:174 msgid "1 user was reset status of checkin." msgstr "1个用户的报到状态被重置." -#: account/admin.py:162 -#, python-format +#: account/admin.py:176 msgid "%(num)s users were reset status of checkin." -msgstr "%(num)s个用户的报到状态被重置." +msgstr "%(num)s 个用户的报到状态被重置." -#: account/admin.py:164 +#: account/admin.py:178 msgid "Reset users checkin status" msgstr "重置用户报到状态" -#: account/admin.py:173 account/forms.py:58 account/forms.py:103 +#: account/admin.py:186 +msgid "ID" +msgstr "ID" + +#: account/admin.py:194 account/forms.py:80 account/forms.py:125 msgid "E-mail" msgstr "邮箱" -#: account/admin.py:186 account/admin.py:205 +#: account/admin.py:207 account/admin.py:226 msgid "Null" msgstr "无" -#: account/admin.py:188 account/models.py:80 +#: account/admin.py:209 account/models.py:80 msgid "Transcript" msgstr "成绩单" -#: account/admin.py:207 +#: account/admin.py:228 msgid "Attachments" msgstr "附件" +#: account/admin.py:245 account/models.py:88 +msgid "Is approved" +msgstr "是否审定" + +#: account/admin.py:261 account/models.py:90 +msgid "Is sponsored" +msgstr "是否资助" + +#: account/admin.py:277 account/models.py:92 +msgid "Is checkin" +msgstr "是否报到" + #: account/extra.py:52 -#, python-format msgid "Please keep filesize under %(maxsize)s. Current filesize %(filesize)s" msgstr "请使文件小于%(maxsize)s. 当前大小%(filesize)s" @@ -160,47 +166,57 @@ msgstr "请使文件小于%(maxsize)s. 当前大小%(filesize)s" msgid "Unsupported filetype" msgstr "不支持的文件类型" -#: account/forms.py:26 account/models.py:71 +#: account/forms.py:28 account/models.py:71 msgid "Name" msgstr "姓名" -#: account/forms.py:27 account/models.py:72 +#: account/forms.py:29 account/models.py:72 msgid "Gender" msgstr "性别" -#: account/forms.py:28 account/models.py:73 +#: account/forms.py:30 account/models.py:73 msgid "Institute (and major)" msgstr "单位(及专业)" -#: account/forms.py:29 account/models.py:74 +#: account/forms.py:31 account/models.py:74 msgid "Identity" msgstr "身份" -#: account/forms.py:30 +#: account/forms.py:32 msgid "Captcha" msgstr "验证码" -#: account/forms.py:54 +#: account/forms.py:61 +msgid "" +"4-30 characters. Start with letters and underscore. Contains letters, digits " +"and _.@+- characters." +msgstr "4-30个字符；必须以字母或下划线开头；只能包含字母、数字和_.@+-字符。" + +#: account/forms.py:65 +msgid "A user with that username already exists." +msgstr "" + +#: account/forms.py:76 msgid "Username" msgstr "用户名" -#: account/forms.py:55 +#: account/forms.py:77 msgid "This value may contain only letters, numbers and @/./+/-/_ characters." msgstr "请只使用英文字母数字和@.+-_字符" -#: account/forms.py:56 +#: account/forms.py:78 msgid "Is update email" msgstr "是否更新邮箱地址" -#: account/forms.py:64 +#: account/forms.py:86 msgid "Username not exists" msgstr "该用户名不存在" -#: account/forms.py:72 +#: account/forms.py:94 msgid "Email is required" msgstr "必须填写邮箱地址" -#: account/forms.py:146 +#: account/forms.py:168 msgid "Transcript is required." msgstr "必须上传成绩单" @@ -288,7 +304,7 @@ msgstr "副教授" msgid "Professor" msgstr "教授" -#: account/models.py:70 account/models.py:246 +#: account/models.py:70 account/models.py:255 msgid "User" msgstr "用户" @@ -306,56 +322,52 @@ msgstr "本科生(大三及以下)需要上传成绩单. 推荐上传PDF格式." msgid "Supplement" msgstr "补充说明" -#: account/models.py:88 -msgid "Is approved" -msgstr "是否审定" - -#: account/models.py:90 -msgid "Is sponsored" -msgstr "是否资助" +#: account/models.py:95 +msgid "SJTU student ID" +msgstr "SJTU学号" -#: account/models.py:92 -msgid "Is checkin" -msgstr "是否报到" +#: account/models.py:97 +msgid "SJTU initial password" +msgstr "SJTU初始密码" -#: account/models.py:96 +#: account/models.py:101 msgid "user profile" msgstr "用户信息" -#: account/models.py:97 +#: account/models.py:102 msgid "user profiles" msgstr "用户信息" -#: account/models.py:208 +#: account/models.py:215 msgid "attachments" msgstr "附件" -#: account/models.py:247 archive/models.py:18 notice/models.py:14 +#: account/models.py:256 archive/models.py:18 notice/models.py:14 #: notice/models.py:52 msgid "Title" msgstr "标题" -#: account/models.py:248 archive/models.py:22 notice/models.py:53 +#: account/models.py:257 archive/models.py:22 notice/models.py:53 msgid "Description" msgstr "描述" -#: account/models.py:250 archive/models.py:23 +#: account/models.py:259 archive/models.py:23 msgid "File" msgstr "文件" -#: account/models.py:254 archive/models.py:67 notice/models.py:41 +#: account/models.py:263 archive/models.py:67 notice/models.py:41 msgid "Created time" msgstr "创建时间" -#: account/models.py:256 +#: account/models.py:265 msgid "Modified time" msgstr "修改时间" -#: account/models.py:259 +#: account/models.py:268 msgid "user file" msgstr "用户文件" -#: account/models.py:260 +#: account/models.py:269 msgid "user files" msgstr "用户文件" -- cgit v1.2.2