diff --git a/base/locale/zh_CN/LC_MESSAGES/django.po b/base/locale/zh_CN/LC_MESSAGES/django.po index 9411050d55..5b3802f283 100644 --- a/base/locale/zh_CN/LC_MESSAGES/django.po +++ b/base/locale/zh_CN/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-21 10:53+0800\n" +"POT-Creation-Date: 2013-01-31 13:07+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -50,6 +50,10 @@ msgstr "" msgid "The two password fields didn't match." msgstr "" +#: management/commands/createsuperuser.py:25 +msgid "Enter a valid e-mail address." +msgstr "" + #: templatetags/seahub_tags.py:80 msgid "Added" msgstr "添加了" @@ -90,55 +94,55 @@ msgstr "重命名了目录" msgid "Moved directory" msgstr "移动了目录" -#: templatetags/seahub_tags.py:100 -msgid "Reverted repo to status at" +#: templatetags/seahub_tags.py:102 +msgid "Reverted library to status at" msgstr "资料库内容还原到" -#: templatetags/seahub_tags.py:102 +#: templatetags/seahub_tags.py:104 msgid "Reverted file to status at" msgstr "文件内容还原到" -#: templatetags/seahub_tags.py:104 +#: templatetags/seahub_tags.py:106 msgid "Recovered deleted directory" msgstr "还原已删除的目录" -#: templatetags/seahub_tags.py:106 +#: templatetags/seahub_tags.py:108 msgid "Auto merge by seafile system" msgstr "系统自动合并修改" -#: templatetags/seahub_tags.py:163 templatetags/seahub_tags.py:197 +#: templatetags/seahub_tags.py:164 templatetags/seahub_tags.py:198 msgid "Just now" msgstr "刚才" -#: templatetags/seahub_tags.py:172 +#: templatetags/seahub_tags.py:173 #, python-format msgid "%(days)d day ago" msgid_plural "%(days)d days ago" msgstr[0] "%(days)d 天前" -#: templatetags/seahub_tags.py:179 +#: templatetags/seahub_tags.py:180 #, python-format msgid "%(hours)d hour ago" msgid_plural "%(hours)d hours ago" msgstr[0] "%(hours)d 小时前" -#: templatetags/seahub_tags.py:186 +#: templatetags/seahub_tags.py:187 #, python-format msgid "%(minutes)d minute ago" msgid_plural "%(minutes)d minutes ago" msgstr[0] "%(minutes)d 分钟前" -#: templatetags/seahub_tags.py:192 +#: templatetags/seahub_tags.py:193 #, python-format msgid "%(seconds)d second ago" msgid_plural "%(seconds)d seconds ago" msgstr[0] "%(seconds)d 秒前" -#: templatetags/seahub_tags.py:272 +#: templatetags/seahub_tags.py:273 msgid "Read-Write" msgstr "可读写" -#: templatetags/seahub_tags.py:274 +#: templatetags/seahub_tags.py:275 msgid "Read-Only" msgstr "只读" diff --git a/base/templatetags/seahub_tags.py b/base/templatetags/seahub_tags.py index f085c24f6d..6c7f027344 100644 --- a/base/templatetags/seahub_tags.py +++ b/base/templatetags/seahub_tags.py @@ -91,13 +91,17 @@ COMMIT_MSG_TRANSLATION_MAP = { @register.filter(name='translate_commit_desc') def translate_commit_desc(value): """Translate commit description.""" - + if value.startswith('Reverted repo'): + # Change 'repo' to 'library' in revert commit msg, since 'repo' is + # only used inside of seafile system. + value = value.replace('repo', 'library') + # Do nothing if current language is English. if translation.get_language() == 'en': return value - if value.startswith('Reverted repo'): - return value.replace('Reverted repo to status at', _('Reverted repo to status at')) + if value.startswith('Reverted library'): + return value.replace('Reverted library to status at', _('Reverted library to status at')) elif value.startswith('Reverted file'): return value.replace('Reverted file to status at', _('Reverted file to status at')) elif value.startswith('Recovered deleted directory'): diff --git a/group/templates/group/group_info.html b/group/templates/group/group_info.html index 786f838eeb..4eacc94b50 100644 --- a/group/templates/group/group_info.html +++ b/group/templates/group/group_info.html @@ -43,7 +43,7 @@
  • {% avatar member.user_name 16 %}{{ member.user_name|email2nickname }}
    • {% else %} {% if forloop.last %} -
  • ...
    • +
  • ...
    • {% endif %} {% endif %} {% endfor %} diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index 44744c109b..2e66c7be8e 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-30 21:15+0800\n" +"POT-Creation-Date: 2013-01-31 11:41+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -2076,7 +2076,7 @@ msgid "Encrypt" msgstr "加密" #: templates/snippets/repo_create_form.html:17 -msgid "(at lease 3 characters)" +msgid "(at least 3 characters)" msgstr "(至少3个字符)" #: templates/snippets/repo_create_form.html:19 @@ -2130,5 +2130,5 @@ msgid "Note(optional)" msgstr "备注(可选)" #: utils/__init__.py:69 -msgid "permissiong error" +msgid "permission error" msgstr "权限错误" diff --git a/templates/snippets/repo_create_form.html b/templates/snippets/repo_create_form.html index d6ff35f0bd..f474a48daf 100644 --- a/templates/snippets/repo_create_form.html +++ b/templates/snippets/repo_create_form.html @@ -14,7 +14,7 @@ {% endif %}

    - {% trans "(at lease 3 characters)"%}
    + {% trans "(at least 3 characters)"%}


    diff --git a/utils/__init__.py b/utils/__init__.py index 7c3f1d4dd6..d48dd67d79 100644 --- a/utils/__init__.py +++ b/utils/__init__.py @@ -66,7 +66,7 @@ def render_permission_error(request, msg=None, extra_ctx=None): """ ctx = {} - ctx['error_msg'] = msg or _('permissiong error') + ctx['error_msg'] = msg or _('permission error') if extra_ctx: for k in extra_ctx: