diff --git a/locale/zh_CN/LC_MESSAGES/django.mo b/locale/zh_CN/LC_MESSAGES/django.mo index 0bb80dbc77..553fd86045 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 3b147aa9f2..2662b85701 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: 2012-10-30 14:40+0800\n" +"POT-Creation-Date: 2012-10-30 20:27+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -27,11 +27,11 @@ msgstr "两次输入的密码不一致" #: forms.py:49 forms.py:222 msgid "Email is required" -msgstr "" +msgstr "请输入邮箱" #: forms.py:50 msgid "Email is not longer than 512 characters" -msgstr "邮箱太长，不超过512个字符" +msgstr "邮箱不能超过512个字符" #: forms.py:67 msgid "Name can't be empty" @@ -64,11 +64,11 @@ msgstr "名称 %s 含有无效字符" #: forms.py:124 forms.py:147 forms.py:171 forms.py:194 msgid "Repo id is required" -msgstr "需要 repo id" +msgstr "repo id 为必填项" #: forms.py:125 forms.py:148 forms.py:172 msgid "Parent dir is required" -msgstr "需要 parent dir" +msgstr "parent dir 为必填项" #: forms.py:128 forms.py:152 msgid "File name is too long" @@ -102,7 +102,7 @@ msgstr "目录名 %s 含有无效字符" #: forms.py:195 msgid "Username is required" -msgstr "需要 username" +msgstr "用户名为必填项" #: forms.py:196 msgid "Password can't be empty" @@ -231,8 +231,8 @@ msgstr "取消" #: templates/decrypt_repo_form.html:9 msgid "" -"This library is encrypt, please input password. The password will live on " -"server for 1 hour." +"This library is encrypted. Please input the password if you want to browse " +"it online. And the password will be kept on the server for only 1 hour." msgstr "" "该资料库已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂" "存1小时。" @@ -257,6 +257,65 @@ msgstr "密码：" msgid "Submit" msgstr "提交" +#: templates/file_revisions.html:6 +msgid "'s Version History" +msgstr " 版本历史" + +#: templates/file_revisions.html:7 +msgid "" +"Tip:a new version will be generated after each modification, and you can " +"restore the file to a previous version." +msgstr "Tip：每次修改后都会生成一个新的版本, 您可以将当前文件恢复到之前的某个版本。" + +#: templates/file_revisions.html:10 templates/text_diff.html:8 +msgid "Current Path:" +msgstr "当前路径：" + +#: templates/file_revisions.html:23 +msgid "Time" +msgstr "时间" + +#: templates/file_revisions.html:24 templates/repo_view_snapshot.html:16 +msgid "Last Modifier" +msgstr "最后修改者" + +#: templates/file_revisions.html:25 templates/repo.html:98 +#: templates/repo_history_view.html:51 +msgid "Size" +msgstr "大小" + +#: templates/file_revisions.html:26 templates/public_home.html:25 +#: templates/repo.html:99 templates/repo_view_snapshot.html:18 +#: templates/snippets/my_owned_repos.html:21 +#: templates/snippets/my_owned_repos.html:54 +msgid "Operations" +msgstr "操作" + +#: templates/file_revisions.html:33 +msgid "(current version)" +msgstr "(当前版本)" + +#: templates/file_revisions.html:43 templates/repo.html:58 +#: templates/repo_history.html:33 templates/repo_history_view.html:20 +#: templates/repo_view_snapshot.html:33 +msgid "Unknown" +msgstr "未知" + +#: templates/file_revisions.html:50 templates/repo_view_snapshot.html:44 +msgid "Restore" +msgstr "还原" + +#: templates/file_revisions.html:52 templates/public_home.html:46 +#: templates/repo.html:21 templates/repo.html.py:137 +#: templates/repo_view_file.html:123 templates/snippets/my_owned_repos.html:34 +#: templates/snippets/my_owned_repos.html:76 +msgid "Download" +msgstr "下载" + +#: templates/file_revisions.html:53 templates/repo_view_snapshot.html:43 +msgid "View" +msgstr "查看" + #: templates/myhome.html:15 msgid "No Nickname" msgstr "暂无昵称" @@ -393,13 +452,6 @@ msgstr "更新时间" msgid "Share From" msgstr "共享来源" -#: templates/public_home.html:25 templates/repo.html:99 -#: templates/repo_view_snapshot.html:18 -#: templates/snippets/my_owned_repos.html:21 -#: templates/snippets/my_owned_repos.html:54 -msgid "Operations" -msgstr "操作" - #: templates/public_home.html:31 templates/snippets/my_owned_repos.html:25 #: templates/snippets/my_owned_repos.html:61 #: templates/snippets/repo_create_form.html:11 @@ -413,13 +465,6 @@ msgstr "可读写" msgid "Read-Only" msgstr "只读" -#: templates/public_home.html:46 templates/repo.html:21 -#: templates/repo.html.py:137 templates/repo_view_file.html:123 -#: templates/snippets/my_owned_repos.html:34 -#: templates/snippets/my_owned_repos.html:76 -msgid "Download" -msgstr "下载" - #: templates/public_home.html:53 msgid "" "You can create a public library, others can view and download this library." @@ -458,11 +503,6 @@ msgstr "历史" msgid "Generated by system" msgstr "系统自动生成" -#: templates/repo.html:58 templates/repo_history.html:33 -#: templates/repo_history_view.html:20 templates/repo_view_snapshot.html:33 -msgid "Unknown" -msgstr "未知" - #: templates/repo.html:71 msgid "You can't access this library." msgstr "无法在线查看该资料库。" @@ -483,10 +523,6 @@ msgstr "目录" msgid "New File" msgstr "新建文件" -#: templates/repo.html:98 templates/repo_history_view.html:51 -msgid "Size" -msgstr "大小" - #: templates/repo.html:104 msgid "Directory icon" msgstr "目录图标" @@ -500,7 +536,7 @@ msgstr "更多操作" msgid "Delete" msgstr "删除" -#: templates/repo.html:116 templates/repo.html.py:146 templates/repo.html:286 +#: templates/repo.html:116 templates/repo.html.py:146 msgid "Rename" msgstr "重命名" @@ -558,6 +594,10 @@ msgstr "文件" msgid "directory" msgstr "目录" +#: templates/repo.html:286 +msgid "Rename " +msgstr "重命名" + #: templates/repo.html:286 templates/repo.html.py:348 msgid "to:" msgstr "到：" @@ -664,7 +704,7 @@ msgstr "获取中...请稍侯" msgid "The owner of this library has ran out of space. Upload failed." msgstr "该资料库拥有者的空间已用完， 文件上传失败。" -#: templates/repo_view_file.html:15 +#: templates/repo_view_file.html:15 templates/repo_view_snapshot.html:7 msgid "snapshots" msgstr "镜像" @@ -765,10 +805,6 @@ msgstr "操作失败：" msgid ", failed" msgstr "，操作失败" -#: templates/repo_view_snapshot.html:7 -msgid "snapshot viewing" -msgstr "镜像浏览" - #: templates/repo_view_snapshot.html:8 msgid "Back to modification history" msgstr "返回修改历史" @@ -777,30 +813,14 @@ msgstr "返回修改历史" msgid "Create Time" msgstr "生成时间" -#: templates/repo_view_snapshot.html:16 -msgid "Last Modifier" -msgstr "最后修改者" - #: templates/repo_view_snapshot.html:17 msgid "Detail" msgstr "修改内容" -#: templates/repo_view_snapshot.html:43 -msgid "View" -msgstr "查看" - -#: templates/repo_view_snapshot.html:44 -msgid "Restore" -msgstr "还原" - #: templates/text_diff.html:6 msgid "modification details" msgstr "修改详情" -#: templates/text_diff.html:8 -msgid "Current Path:" -msgstr "当前路径：" - #: templates/text_diff.html:19 msgid "It's a newly-created blank file." msgstr "该文件为新建空白文件。" @@ -890,7 +910,6 @@ msgid "We've send a password reset email to your email." msgstr "我们已经把密码重置说明发往您提交的邮箱里，请查收。" #: templates/registration/password_reset_email.html:2 -#, python-format msgid "" "You're receiving this e-mail because you requested a password reset for your " "user account at %(site_name)s. " @@ -909,7 +928,6 @@ msgid "Thanks for using our site!" msgstr "感谢使用！" #: templates/registration/password_reset_email.html:12 -#, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s 团队" @@ -1121,6 +1139,9 @@ msgstr "Tip：必须是团体内成员或群组，输入 all 共享到公共资 msgid "Tip: type all to share to public library." msgstr "Tip：输入 all 共享到公共资料" +#~ msgid "snapshot viewing" +#~ msgstr "镜像浏览" + #~ msgid "Folder" #~ msgstr "目录" diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.mo b/locale/zh_CN/LC_MESSAGES/djangojs.mo index 6a0d4e5c36..dc4d7dc217 100644 Binary files a/locale/zh_CN/LC_MESSAGES/djangojs.mo and b/locale/zh_CN/LC_MESSAGES/djangojs.mo differ diff --git a/locale/zh_CN/LC_MESSAGES/djangojs.po b/locale/zh_CN/LC_MESSAGES/djangojs.po index c46305abe1..a1e52d9793 100644 --- a/locale/zh_CN/LC_MESSAGES/djangojs.po +++ b/locale/zh_CN/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-10-29 20:24+0800\n" +"POT-Creation-Date: 2012-10-30 19:35+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/templates/decrypt_repo_form.html b/templates/decrypt_repo_form.html index a3874f6cdc..ad2cd6a62e 100644 --- a/templates/decrypt_repo_form.html +++ b/templates/decrypt_repo_form.html @@ -6,7 +6,7 @@
-

{% trans "This library is encrypt, please input password. The password will live on server for 1 hour." %}

+

{% trans "This library is encrypted. Please input the password if you want to browse it online. And the password will be kept on the server for only 1 hour." %}

@@ -21,6 +21,3 @@
{% endblock %} - -{% block extra_script %} -{% endblock %} diff --git a/templates/file_revisions.html b/templates/file_revisions.html index 8cbb911728..bc5cda3975 100644 --- a/templates/file_revisions.html +++ b/templates/file_revisions.html @@ -1,13 +1,13 @@ {% extends base_template %} -{% load seahub_tags avatar_tags %} +{% load seahub_tags avatar_tags i18n %} {% load url from future %} {% block main_panel %} -

{{ u_filename }} 版本历史

-

Tip: 文件在每次修改后会生成一个新的版本，可以把当前文件内容“还原”到特定的版本。

+

{{ u_filename }}{% trans "'s Version History" %}

+

{% trans "Tip:a new version will be generated after each modification, and you can restore the file to a previous version." %}

-当前路径： +{% trans 'Current Path:' %} {% for name, link in zipped %} {% if not forloop.last %} {{ name }} / @@ -20,17 +20,17 @@

- - - - + + + + {% for commit in commits %} @@ -40,17 +40,17 @@ {{ commit.creator_name|email2nickname }} {% else %} - + {% endif %} {% endfor %} diff --git a/templates/repo.html b/templates/repo.html index 023a911a63..040d67edbe 100644 --- a/templates/repo.html +++ b/templates/repo.html @@ -283,7 +283,7 @@ $('.file-rename, .dir-rename').click(function () { var type = $(this).hasClass('file-rename') ? '{% trans "file" %} ' : '{% trans "directory" %} ', name = $(this).attr('data'); newname = $('#rename-form input[name="newname"]'); - $('#rename-hd').html( '{% trans "Rename" %}' + type + ' ' + name + ' {% trans "to:" %}'); + $('#rename-hd').html( '{% trans "Rename " %}' + type + ' ' + name + ' {% trans "to:" %}'); $('#rename-form input[name="oldname"]').val(name); $('#rename-form').modal({appendTo:'#main'}); newname.before('

' + name + '

'); diff --git a/templates/repo_view_snapshot.html b/templates/repo_view_snapshot.html index 6b21d6fce8..4d367946e2 100644 --- a/templates/repo_view_snapshot.html +++ b/templates/repo_view_snapshot.html @@ -4,7 +4,7 @@ {% block main_panel %}
-

{{repo.props.name}} {% trans "snapshot viewing"%}

+

{{repo.props.name}} {% trans "snapshots"%}

@@ -81,6 +81,6 @@ $('#back').click(function() { location.href = $(this).attr('data'); }); - addConfirmTo($(".repo-revert"), gettext('Confirm to restore this library?')); + addConfirmTo($(".repo-revert"), gettext('Really want to restore this library?')); {% endblock %}
版本生成时间最后修改者大小操作{% trans 'Time' %}{% trans 'Last Modifier' %}{% trans 'Size' %}{% trans 'Operations' %}
{{ commit.props.ctime|translate_commit_time }} {% if commit.is_current_version %} - (当前版本) + {% trans '(current version)' %} {% endif %} 未知{% trans 'Unknown' %}{{ commit.revision_file_size|filesizeformat }} {% if not commit.is_current_version %} - 还原 + {% trans 'Restore' %} {% endif %} - 下载 - 查看 + {% trans 'Download' %} + {% trans 'View' %}